From 614ca05ab04509f12a3bcff71db0068a6ac8af48 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Apr 2018 14:58:40 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From e85f7ac21ce6ce6d0bbe035d30d5a9ec59d5d88c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Apr 2018 15:00:28 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 41db0517cea14688306593ff5f50a1f60dc00e89 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Apr 2018 15:02:46 +0200 Subject: 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(-) (limited to 'gnu') 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. -- cgit v1.2.3 From d12dff4526def2bc8c3681c2e6af6641647734a8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Apr 2018 15:14:00 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 30d900d4eeb203ab6766bb7dabfeba62263d1617 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Apr 2018 21:36:44 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 1f172d8003e23f4d0679ef99ca0566f2b8777a4e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 30 Apr 2018 20:01:06 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From c98fe1d0648ba5d94f2954e9e5c3b2a22ef18fb6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 30 Apr 2018 20:02:56 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 957aac763bc7fcad5fec362938be04cdd9b2f055 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 30 Apr 2018 21:19:04 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 48869860bed868708c3b830da0fd94886fab3af0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 1 May 2018 03:28:48 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 32c18fcb3c3cb10303aa4ef07571867e8ce3fe8d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 18 Apr 2018 03:34:17 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 38e4d5956f8d585b1c0263a1a6c79e749d7e7c90 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 1 May 2018 03:34:47 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 5ecd5fefd0e9fb0965662f2094c16363325ba614 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 1 May 2018 03:45:03 +0200 Subject: 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 +- .../patches/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 (limited to 'gnu') 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 - -- cgit v1.2.3 From b745e216e4e17272d2ccd8f92acd6a9065db9112 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 1 May 2018 06:12:59 +0200 Subject: 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 (limited to 'gnu') 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. + */ -- cgit v1.2.3 From 4eef81d9ae5216829e74a803db1ab1a156a2aee0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 1 May 2018 06:27:32 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From ca2c342181771b83d46a94aec9786f8dd0e0a0b8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 1 May 2018 06:39:40 +0200 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From 3f649c79c1f2c9431b0aea1463b2759eacd24540 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 1 May 2018 01:39:55 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From a551ba9ba75ca8de136949b4e7ebe9f44d0c7d2e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 1 May 2018 14:59:20 +0200 Subject: 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(-) (limited to 'gnu') 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" -- cgit v1.2.3 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: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 475c11b1a7699e63467c0182da3602fbe6222378 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 9 May 2018 15:37:16 +0200 Subject: 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 (limited to 'gnu') 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 -- cgit v1.2.3 From ffd526e61ab1b45c6c913ab4e139193e4d5bee9b Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Tue, 22 May 2018 07:41:45 +0300 Subject: gnu: cmake: Delete Emacs library. * gnu/packages/cmake.scm (cmake)[arguments]: Delete Emacs library. --- gnu/packages/cmake.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu') 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 -- cgit v1.2.3 From 5e6bd3ebdcfad2bdb5c65427b5ebfe44a9e436d8 Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Thu, 31 May 2018 14:05:01 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 52630ca08487f8b65fe316aebc5ad9d8c050d731 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Jun 2018 17:26:10 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From d577e00f969dbee50930b9aabf096ce9b277ac81 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jun 2018 02:27:43 +0200 Subject: 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(-) (limited to 'gnu') 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. -- cgit v1.2.3 From f68f5e28ed9ff02cac7c569b35bccc0d8df091ab Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jun 2018 13:27:47 +0200 Subject: 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 (limited to 'gnu') 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. - */ -- cgit v1.2.3 From 5ccd6e2b53758ff770826820091df34f8a1fb087 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 10 Jun 2018 19:04:30 +0200 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From 5b5a8d6b21ec01b8d0d3ba4d5c9b9e81577072ed Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jun 2018 02:35:27 +0200 Subject: 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(-) (limited to 'gnu') 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/") -- cgit v1.2.3 From ac98b7a96bcd29948bd54a76cf304e3d2d90b6c4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 10 Jun 2018 20:22:08 +0200 Subject: 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(-) (limited to 'gnu') 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))) -- cgit v1.2.3 From eb5d2792a0c32dd4e087359920c0375fb7486509 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jun 2018 13:35:26 +0200 Subject: 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 ++-- gnu/packages/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 (limited to 'gnu') 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; -+ } - } - - -- cgit v1.2.3 From 2008bc6b8f23c1425cb48dea431009e71d487d3a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jun 2018 13:48:53 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 605f0621f3dfaa06d54cc81502f813ba43542b77 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 10 Jun 2018 20:22:23 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 1a1d055903155fbfb05c7f72d9c0ab73a189465f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jun 2018 14:59:04 +0200 Subject: 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(-) (limited to 'gnu') 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))) -- cgit v1.2.3 From f9bb942adf919360f0f70e3a83a126d5c1a82c6b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jun 2018 15:32:52 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 86c19ed94a4b1fea3de82ea6049dd94271449ce8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jun 2018 16:47:15 +0200 Subject: 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(-) (limited to 'gnu') 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") -- cgit v1.2.3 From 314dcec1c0833efdc02c78e54aec1c7d34f31904 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jun 2018 17:06:55 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From eca24b2f3de369477b268d902dfad6daed85433a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jun 2018 17:09:29 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 4f3958dacb13713842ec5d1aaf7150d5b3716ef8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jun 2018 19:22:30 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From f1799efb31be3e9d655efb9e30c391ff9f6cd58f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jun 2018 21:01:45 +0200 Subject: 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(-) (limited to 'gnu') 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") -- cgit v1.2.3 From d30e9e61098a4fc1b0e5764a77ca15d2d63d8ae4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Jun 2018 13:06:38 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 551a2f9e696c598dbaf91a12039fee839a1524e0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 12 Jun 2018 18:09:32 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 7391a938d0b897fd5c456e785f2dbf5a8fb8c8d4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 12 Jun 2018 18:22:06 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 53411dfcd6e696fc4aea11c70d411db5300ac5e2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 12 Jun 2018 18:28:40 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 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: 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. --- gnu/packages/patches/gcc-strmov-store-file-names.patch | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'gnu') 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; -- cgit v1.2.3 From dbe1bd5dd9ca7a8a52e679f573b409340a2632d6 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Fri, 22 Jun 2018 23:34:04 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 8839b6beb163b4bbe11018990d16f927f68e9196 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Jun 2018 10:35:43 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 695c501dbed1fdd974861ab36cc702aaccf33d24 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 29 Jun 2018 09:11:03 +0200 Subject: 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(+) (limited to 'gnu') 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 -- cgit v1.2.3 From 3e1ebaab35e96f60bb2736af6c6cea244ae415c3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 29 Jun 2018 16:47:41 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 698ec949079ae9930ff10c869ca1a90264c05210 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 29 Jun 2018 17:01:24 +0200 Subject: 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(-) (limited to 'gnu') 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. -- cgit v1.2.3 From 9ca381f0f1f5fe34f34bb8dc87f7d1739880bca1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 29 Jun 2018 21:02:50 +0200 Subject: 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(-) (limited to 'gnu') 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") -- cgit v1.2.3 From cda7f4bc8ecf331d623c7d37b01931a46830c648 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 29 Jun 2018 22:09:36 +0200 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From cb9a84bd89f9d38f1177afd86e8a04080709588b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Jul 2018 10:41:02 +0300 Subject: 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(-) (limited to 'gnu') 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") -- cgit v1.2.3 From 1aa5c246e91c0c9f926783c110322c4953249349 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Jul 2018 10:41:57 +0300 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 38a978154effb371c2e845e4e16cc59f32cc7176 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Jun 2018 21:19:51 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 9dfbf405864e988359461408d75b6938c97aef33 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 12 Jul 2018 10:59:58 -0400 Subject: 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(-) (limited to 'gnu') 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") -- cgit v1.2.3 From 7de44023a2d357ee634cd015d685a334a8eedcbf Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 12 Jul 2018 11:09:20 -0400 Subject: 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(-) (limited to 'gnu') 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/") -- cgit v1.2.3 From 9bb98f6425f2d9bd45a7dd432b2480e5a8cb7306 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Jul 2018 11:21:47 +0300 Subject: 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(-) (limited to 'gnu') 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") -- cgit v1.2.3 From 49b92a24144b207170703fd09036e893d933997f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 16 Jul 2018 22:39:06 +0300 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 5212c52ce524ebfd78fae5bc68a0499148f3bf80 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 14 Jul 2018 22:11:45 +0200 Subject: 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(-) (limited to 'gnu') 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)))) -- cgit v1.2.3 From 45719c1dfb7bdce3c91086e5bed26643dccf8191 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 14 Jul 2018 22:39:01 +0200 Subject: 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(+) (limited to 'gnu') 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 -- cgit v1.2.3 From 6c4709889c665f194822677dc7a1fcd513e46708 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 18 Jul 2018 13:46:20 +0200 Subject: 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 (limited to 'gnu') 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 */ -- cgit v1.2.3 From 50849734e986a5824bcca20fe64b2886f8f1a42b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Jul 2018 21:14:59 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From ebd551705c99db0d82c875001d0ad44c7408883e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 18 Jul 2018 14:05:46 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 1d3de9796778f5a11dc91c666ec2f19e8dd56969 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 18 Jul 2018 14:37:08 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From f94a8654d686b7ec36fdb28b6f0e8b0f48b14447 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Jul 2018 00:21:02 +0200 Subject: 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 - .../patches/perl-archive-tar-CVE-2018-12015.patch | 36 ----- .../patches/perl-deterministic-ordering.patch | 6 +- .../patches/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 (limited to 'gnu') 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")))) -- cgit v1.2.3 From 463ad503b1a0e107e2b6b8317745acc13f49ad2f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Jul 2018 01:03:12 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 78a9a2501d121c370684a86ffe105ffdc8ca7d70 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Jul 2018 23:15:12 +0200 Subject: 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 + gnu/packages/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 (limited to 'gnu') 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")))) -- cgit v1.2.3 From 56cd03d68673484d70841cd23a48c2324cbd021b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Jul 2018 14:40:55 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From d64edd2c81499cc2b5013d31f570463ee6a00752 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Jul 2018 14:44:10 +0200 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From f2ca4fa5c34ba719fae8a2fd86cacc10c6096481 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Jul 2018 14:48:42 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From c9566534136b32519b200878c846a0017409d603 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Jul 2018 14:54:34 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 7da8ba2eaeb17382ef3c26051e244bc94ef4ae51 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Jul 2018 14:56:27 +0200 Subject: 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(-) (limited to 'gnu') 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. -- cgit v1.2.3 From 0d517c073d5f6b7f4cddc57013d75c7fb19a9c75 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Jul 2018 15:00:43 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 08b87ab0dfa4bae0eb57f3d8915f655bf20d94fc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 22 Jul 2018 17:54:54 +0200 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From 5a0b3c34088d36ac03e705dea573f62f84d96f11 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Jul 2018 20:42:40 +0200 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From 99cfdfb10c7bf42911f2ff59ef3489761ebc063d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Jul 2018 20:42:48 +0200 Subject: 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(-) (limited to 'gnu') 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")) -- cgit v1.2.3 From 41e2e58a2afce2ad55f1f90374d9f92af27f3d6c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Jul 2018 20:44:40 +0200 Subject: 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(-) (limited to 'gnu') 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") -- cgit v1.2.3 From dcf105da63993abd25e76ae8b152deb09baf5cf9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Jul 2018 20:46:41 +0200 Subject: 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(-) (limited to 'gnu') 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") -- cgit v1.2.3 From fa258af20c29ad7e0c300553eb5cde2bb7ef15f6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Jul 2018 20:52:22 +0200 Subject: 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(-) (limited to 'gnu') 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") -- cgit v1.2.3 From 52f1687dc7bbe0928f801ab2f1a9e3716930e150 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Jul 2018 01:04:07 +0200 Subject: 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(-) (limited to 'gnu') 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") -- cgit v1.2.3 From 95bbab76cdaa1d203cfeafe63d436c8d222c69de Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Jul 2018 15:36:46 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 3b92441bc16f335b0a8fb2b3f6c660ec7e16df4f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Jul 2018 15:43:35 +0200 Subject: 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(-) (limited to 'gnu') 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))) -- cgit v1.2.3 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: 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 +--- 2 files changed, 3 insertions(+), 19 deletions(-) (limited to 'gnu') 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. -- cgit v1.2.3 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: 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. --- gnu/packages/guile.scm | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'gnu') 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)) -- cgit v1.2.3 From b148506df74e48006194448a089eb16d4fcffc59 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 25 Jul 2018 01:57:46 +0200 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From fbd2b8da5d7e6edb16ba7128324f6bc48ac68569 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 25 Jul 2018 04:36:02 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 5f8642ea6ae675d0fb5b06e616064458433087d3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 28 Jul 2018 15:40:21 +0200 Subject: 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(+) (limited to 'gnu') 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'. -- cgit v1.2.3 From 7ba79d5d76327054f96f66625c314e365d5d9fd9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 28 Jul 2018 15:47:24 +0200 Subject: 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(+) (limited to 'gnu') 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' -- cgit v1.2.3 From d66146073def03d1a3d61607bc6b77997284904b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 17:08:30 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From a1454169e0080d834cbddf94f04c5bcb7c3703e9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 17:14:15 +0200 Subject: 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 +++++++++++-------------------------------------- 1 file changed, 13 insertions(+), 48 deletions(-) (limited to 'gnu') 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) -- cgit v1.2.3 From 81d967075ebe0facc4cbaf6718b89405ea9195d8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 18:25:16 +0200 Subject: 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(-) (limited to 'gnu') 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"))) -- cgit v1.2.3 From a422e2478e695bd1211fda827c767134de39fb2c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 20:53:50 +0200 Subject: 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(-) (limited to 'gnu') 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"))) -- cgit v1.2.3 From bc46a45ae7937c03c3cb1889ce1a461313a8e154 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 20:59:22 +0200 Subject: 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(+) (limited to 'gnu') 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 -- cgit v1.2.3 From a0d77eba72da7f589970a4da2723fbb869a10df7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 21:00:53 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 3765c9c95b226228fdf9fe9bbfc777140ac38b6a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 21:02:21 +0200 Subject: 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(-) (limited to 'gnu') 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, -- cgit v1.2.3 From e8e7cd12c744024005a3698d652bc274cdac0fff Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 21:06:17 +0200 Subject: 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(-) (limited to 'gnu') 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") -- cgit v1.2.3 From 9e7d6e818cbea2049a2d2b2eb4c689d3b0d3efb8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 21:09:10 +0200 Subject: 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(-) (limited to 'gnu') 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))) -- cgit v1.2.3 From fdf5344a23359ead55df86e7f1da9f0545bc2d97 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 21:21:55 +0200 Subject: 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(-) (limited to 'gnu') 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") -- cgit v1.2.3 From d0205dfd92bf8e515a5efc2400543fcaba0bdd0c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 21:32:03 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From fb4c6115f5aa1fb940e6501388f9fd25b738bc8a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 21:59:01 +0200 Subject: 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(-) (limited to 'gnu') 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))) -- cgit v1.2.3 From 153812ee0d2fb643b6db3a6c918fced512198d4d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 22:09:03 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 85f1342f01ad0fe6e5b23cabd5a6365b6a8e22bf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 22:17:43 +0200 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From 9f585a528eb7dc9ae5e1c1d901f84189ef8063e9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 23:47:41 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 1166b9c795e3762ece2623143ae2fe0984b4a158 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 23:41:37 +0200 Subject: 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(+) (limited to 'gnu') 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") -- cgit v1.2.3 From a9ae30b78ed591e8212a4b918024c771f0896a4f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Jul 2018 00:11:01 +0200 Subject: 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(-) (limited to 'gnu') 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))) -- cgit v1.2.3 From 25ccb99347d7f8e54fecf0d8b397e21c3879d0fa Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Jul 2018 00:12:14 +0200 Subject: 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(-) (limited to 'gnu') 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))) -- cgit v1.2.3 From fc8778e2934e623b4cfae253942a721cea42a43b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Jul 2018 01:09:39 +0200 Subject: 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 (limited to 'gnu') 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 + -- cgit v1.2.3 From 4696368108c2e1500a8f1d8a0d75b5f0aef1c37a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Jul 2018 02:31:30 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From a4b7a1cb4abc2614d898b8722c3ac779ce148fa0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 26 Jul 2018 17:12:01 +0300 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From 20b0aaf986be704c477c558de999bcd390959fc6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 28 Jul 2018 23:37:52 +0200 Subject: 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(-) (limited to 'gnu') 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)) -- cgit v1.2.3 From d37d975b748f65a1ace4b2434d04e30ed558a7a8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 28 Jul 2018 23:39:00 +0200 Subject: 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(-) (limited to 'gnu') 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))) -- cgit v1.2.3 From b4052c96ee252bd65ede6b7f0983942cb653a36c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 30 Jul 2018 16:22:04 +0200 Subject: 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(-) (limited to 'gnu') 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/") -- cgit v1.2.3 From d9f84612507423bb95bad91c6276c03e8cb934ef Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 30 Jul 2018 16:33:50 +0200 Subject: 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(+) (limited to 'gnu') 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") -- cgit v1.2.3 From cd9ad095c73057bd1d60c5011e7122ab7ac9fecf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 30 Jul 2018 16:35:35 +0200 Subject: 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(+) (limited to 'gnu') 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 -- cgit v1.2.3 From 1f2d64e4a86fbd77cfd7c773a9621a001516e1ce Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 30 Jul 2018 16:42:59 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 85b44823083f94bfc2bd552fb0460f188bd765f4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 30 Jul 2018 16:58:56 +0200 Subject: 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(+) (limited to 'gnu') 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 -- cgit v1.2.3 From a44426ee01de3751c1016de570bfc82da0287f79 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 30 Jul 2018 16:59:33 +0200 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From 7b844100464633db5455a3931858bb57c9e529e6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 30 Jul 2018 17:00:07 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From b90289dadc8ee15848ce911a2bdcd3ae8302d58c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 30 Jul 2018 17:09:07 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From e076d9392df69f6730318d337b0e96f99b5cff12 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 1 Aug 2018 13:06:14 +0200 Subject: 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(-) (limited to 'gnu') 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. -- cgit v1.2.3 From 07ca7165f90079948e7174468b47ecc7cd38531d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 1 Aug 2018 15:02:36 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From d60869805e313f2a733aa7a69932f1c5d2224845 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 8 Aug 2018 13:07:54 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 4e8d9015e06ca3ea432da1b53f7518c767d32a11 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 8 Aug 2018 14:18:10 +0200 Subject: 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 +-- gnu/packages/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 (limited to 'gnu') 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); -- cgit v1.2.3 From 029c2ba0c591d19537ec717f0d96c62459bc543b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 8 Aug 2018 14:19:02 +0200 Subject: 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(+) (limited to 'gnu') 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) -- cgit v1.2.3 From d3028f5b273d50a490a790fba94f49494f0c7b4c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 8 Aug 2018 14:55:40 +0200 Subject: 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(+) (limited to 'gnu') 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 -- cgit v1.2.3 From ccdc1690bd871a7a4dfa466087a85b9d180db903 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 12 Jun 2018 16:03:43 -0400 Subject: gnu: Cython: Update to 0.28.4. * gnu/packages/python.scm (python-cython, python2-cython): Update to 0.28.4. [arguments]: Use invoke. --- gnu/packages/python.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') 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 -- cgit v1.2.3 From cfe62fb22b96c76efde2872398d2814df3ecf113 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 8 Aug 2018 22:06:07 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 2df4ecd61d663211b3ce5a0036e25ff143b3b4b1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 8 Aug 2018 22:06:46 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 5417c92877c9893e23cb4023e4cebb332c6847f5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 8 Aug 2018 22:24:13 +0200 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From bc731eada6b318c46325e614173f16f0501bc1ee Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 8 Aug 2018 23:08:29 +0200 Subject: 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(-) (limited to 'gnu') 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") -- cgit v1.2.3 From 9611080117cc169ac9c5fba498f504f2431ef4d4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 10 Aug 2018 08:43:49 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From bedf0535ff97f7875c5006ed8af1bbd01897c377 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 10 Aug 2018 08:44:20 +0200 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From a3baaaa07a77ae03e891ed5b462d0836d8a2a66e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 10 Aug 2018 16:00:22 +0200 Subject: gnu: meson: Update to 0.47.1. * gnu/packages/build-tools.scm (meson): Update to 0.47.1. * gnu/packages/patches/meson-for-build-rpath.patch: Adjust. --- gnu/packages/build-tools.scm | 6 ++-- gnu/packages/patches/meson-for-build-rpath.patch | 36 +++++++++++++----------- 2 files changed, 22 insertions(+), 20 deletions(-) (limited to 'gnu') 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() -- cgit v1.2.3 From 25bd72678ae4048b0b84ee82bc5f2644367e9715 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 10 Aug 2018 17:00:27 +0200 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 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: 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 (limited to 'gnu') 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, "-")) + { -- cgit v1.2.3 From c0b3867c21d60c35dca6ecd44f00dc81afa87476 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Aug 2018 15:07:34 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 3f35e0da86ea8524859905fe81eeffb712b2601e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 03:20:19 +0200 Subject: 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(-) (limited to 'gnu') 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" -- cgit v1.2.3 From 11e5bf70d5108db9f792113fd423f0b20805ac47 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Aug 2018 19:46:42 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From a5dae0c03c4a12f6b92c89c01f1d41b2aec398df Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Aug 2018 19:48:53 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 09118c58dacfd8cd7ceff0cc3fea9c3e54ed9ef4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Aug 2018 19:51:06 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From f203e533861005431e26adbbd1bb053c22dbf0de Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Aug 2018 19:53:38 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 1c61a086bcb2644e6d6c6fc714dde498402cc561 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Aug 2018 19:55:14 +0200 Subject: 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(-) (limited to 'gnu') 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") -- cgit v1.2.3 From 85932a7b8ee2b4e0834da26465b5c5c77cddb025 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Aug 2018 20:03:44 +0200 Subject: 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(-) (limited to 'gnu') 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. -- cgit v1.2.3 From fdf16a81b2440964a8fc5f5e40cad84c70d165e1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Aug 2018 20:06:26 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 27885fcc26b7f9eed37c0e587d6be00ee8bb9cb3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Aug 2018 00:12:45 +0200 Subject: 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(-) (limited to 'gnu') 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.") -- cgit v1.2.3 From e2da8bcd9ed9042db46ae37a32be5374acab4f45 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Aug 2018 21:43:45 +0200 Subject: 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(-) (limited to 'gnu') 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") -- cgit v1.2.3 From 7f5d3445af3316ab67b5db4eb3def5c0265205ac Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Aug 2018 00:20:25 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From e241f9a0207776a8fb11dc20ea705d3133bf9610 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Aug 2018 01:05:58 +0200 Subject: 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(-) (limited to 'gnu') 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))) -- cgit v1.2.3 From 67a7da1f31d5a900802e11537876f2d75a2d3f87 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Aug 2018 01:13:00 +0200 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From b3751f9cea64ddb52d3d1c97ea62369967497469 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Aug 2018 03:31:23 +0200 Subject: 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(-) (limited to 'gnu') 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") -- cgit v1.2.3 From c69d231c2a5656fe064a4fc2b6906fe3e194c7cf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Aug 2018 04:24:44 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From f6cd3f7970c5b5a1ca008a1a51db4bddb8ce8ae2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Aug 2018 04:31:51 +0200 Subject: 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(-) (limited to 'gnu') 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") -- cgit v1.2.3 From d76cd3defd96b656a504322103921d167eb6e3d8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Aug 2018 04:50:12 +0200 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From 827509a30caa7233877e5e22f7a188ce16f3747a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Aug 2018 05:02:45 +0200 Subject: 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(-) (limited to 'gnu') 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") -- cgit v1.2.3 From e63199ec68747a590f7429a575302917857c37dd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Aug 2018 14:59:43 +0200 Subject: 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(-) (limited to 'gnu') 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") -- cgit v1.2.3 From 1935b8d56a4c739f468af973ac9057463c18d1bc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Aug 2018 16:36:19 +0200 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From 7b0faf32e955ce3af6defae696e0406624a40bdc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Aug 2018 17:25:16 +0200 Subject: 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(-) (limited to 'gnu') 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. -- cgit v1.2.3 From e2c7b7bb68594c2f4f3a13e98da1e32509a080a5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Aug 2018 23:13:00 +0200 Subject: 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(-) (limited to 'gnu') 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") -- cgit v1.2.3 From 4750b3a268ed511fd50e6b348a1a81b5f76b5a40 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 05:46:47 +0200 Subject: 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(-) (limited to 'gnu') 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") -- cgit v1.2.3 From 9764dac51146dab653c2abf2c7c94832504d2517 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 06:08:39 +0200 Subject: 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(-) (limited to 'gnu') 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") -- cgit v1.2.3 From 4c36fc705199d60dc441328d4d1d0c90b792575a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 06:13:31 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 26aef5e9560e177d80ff34036c021ce4e537d241 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 06:18:29 +0200 Subject: 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(-) (limited to 'gnu') 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.") -- cgit v1.2.3 From c52ff2ed7670b67b3b523c8d7c8f4fcf030c068a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 06:59:53 +0200 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From 632900f58650f104ba9ae7125282ca13b38f010e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 07:00:17 +0200 Subject: 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(+) (limited to 'gnu') 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))) -- cgit v1.2.3 From 9871a896aacd4daa0d57fb83aa18eaf5f85c74f5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 07:11:00 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 2be1b754ba9d460b7fd16f790922aed4b3d45037 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 07:19:33 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From cb5ba282ccbf75ec092030daab41dfb6ae19b7c8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 07:26:24 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From b3a21b2cf92bfaa95e27072fb4bae57c39ff12eb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 07:33:01 +0200 Subject: 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(-) (limited to 'gnu') 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))) -- cgit v1.2.3 From 88166588a0a4bea41e505ba908af391b855de5c3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 07:33:30 +0200 Subject: 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(-) (limited to 'gnu') 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") -- cgit v1.2.3 From efada0946dd1a3241af58d9988566523debb06e2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 07:44:39 +0200 Subject: 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(-) (limited to 'gnu') 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))) -- cgit v1.2.3 From 5f2707a255585dd7e8bd22eb05e43c72e8fec886 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 07:40:12 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From f65ef0055651b1bd554549d7d1d1fef7935320bb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 07:45:08 +0200 Subject: 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(-) (limited to 'gnu') 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. -- cgit v1.2.3 From f70785a4c0e12eb2db0ee8e66a41d3a9952a1f63 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 07:58:09 +0200 Subject: 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(+) (limited to 'gnu') 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") -- cgit v1.2.3 From 3bbfc451edcb9af438eb8e205d3016203e0ef8e4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 15:41:29 +0200 Subject: 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 | 81 +++++++++++----------------------------------- 2 files changed, 23 insertions(+), 66 deletions(-) (limited to 'gnu') 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,14 +2410,14 @@ 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 @@ -2426,7 +2426,15 @@ integrate Sphinx documents in web templates and to handle searches.") (lambda _ ;; Requires Internet access. (delete-file "tests/test_build_linkcheck.py") - (zero? (system* "make" "test"))))))) + (substitute* "tests/test_build_latex.py" + (("@pytest.mark.sphinx\\('latex', testroot='images'\\)") + "@pytest.mark.skip()")) + (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-imagesize" ,python-imagesize) ("python-sphinx-alabaster-theme" @@ -2435,14 +2443,18 @@ integrate Sphinx documents in web templates and to handle searches.") ("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-six" ,python-six) + ("python-sphinxcontrib-websupport" ,python-sphinxcontrib-websupport))) (native-inputs `(("graphviz" ,graphviz) + ("imagemagick" ,imagemagick) ;for "convert" ("python-html5lib" ,python-html5lib) ("python-mock" ,python-mock) - ("python-nose" ,python-nose))) + ("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 @@ -2451,62 +2463,6 @@ 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 - (replace 'check - (lambda _ - ;; Requires Internet access. - (delete-file "tests/test_build_linkcheck.py") - (substitute* "tests/test_build_latex.py" - (("@pytest.mark.sphinx\\('latex', testroot='images'\\)") - "@pytest.mark.skip()")) - (zero? (system* "make" "test"))))))) - (propagated-inputs - `(("python-sphinxcontrib-websupport" ,python-sphinxcontrib-websupport) - ,@(package-propagated-inputs python-sphinx))) - (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))))) - (define-public python2-sphinx (let ((base (package-with-python2 (strip-python2-variant python-sphinx)))) (package @@ -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) -- cgit v1.2.3 From a8c9321368604df74269217ede5c8058009e3ba0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 15:13:20 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 7eab5e7377de82666d41a8e58e3d9f7e116df5ff Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 16:00:38 +0200 Subject: 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(-) (limited to 'gnu') 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") -- cgit v1.2.3 From 25febeedc6457b8c064aa4045394b39efc46d22c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 17:15:13 +0200 Subject: 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(-) (limited to 'gnu') 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))) -- cgit v1.2.3 From fdb222033c7bf4580bea0158840e9bb7905a00bc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 17:25:23 +0200 Subject: 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(-) (limited to 'gnu') 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") -- cgit v1.2.3 From fb76ef8477f189d35c1e91bf026236f5627f3a27 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Aug 2018 16:45:17 +0200 Subject: 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 (limited to 'gnu') 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) -- cgit v1.2.3 From 00ffbfd39416e91e1d0e3ce1ee5337a7a2665dfd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Aug 2018 17:10:32 +0200 Subject: 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(-) (limited to 'gnu') 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") -- cgit v1.2.3 From 064732bd0c3bb43a07da30bdfc39e0ac255550b4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Aug 2018 17:25:58 +0200 Subject: 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(-) (limited to 'gnu') 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") -- cgit v1.2.3 From a20016e15a8f1a02dcc77666603ad71538b5a2f4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Aug 2018 17:41:30 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 22cf2f4abfa2b1ad5620d35644b6538b7041dbf1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Aug 2018 18:00:16 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From bd65ecf4608152d586be610add0c9d2ab2b4ac25 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Aug 2018 20:03:29 +0200 Subject: 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(-) (limited to 'gnu') 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") -- cgit v1.2.3 From 3ea66dadf6113f885ecc26484a535a0003bd2383 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Aug 2018 15:36:59 +0200 Subject: 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(-) (limited to 'gnu') 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") -- cgit v1.2.3 From e13b547407b0db6c0f8205154ea43d6f99e8b186 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 1 Aug 2018 16:13:45 +0200 Subject: 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 +-- gnu/packages/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 (limited to 'gnu') 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) + -- cgit v1.2.3 From 1aef659e86242020c7ec813e9a1f6ad35431de9d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 1 Aug 2018 23:19:28 +0200 Subject: 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 + gnu/packages/patches/gcc-libsanitizer-ustat.patch | 41 +++++++++++++++++++++++ 3 files changed, 43 insertions(+) create mode 100644 gnu/packages/patches/gcc-libsanitizer-ustat.patch (limited to 'gnu') 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 -- cgit v1.2.3 From 95895d53b06015fa74f07643cf98f86ae21551d7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 2 Aug 2018 13:32:29 +0200 Subject: 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 (limited to 'gnu') 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. */ + -- cgit v1.2.3 From c7b87eeda272fcc6c9212452355ad5b4f780bb36 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 2 Aug 2018 13:54:44 +0200 Subject: 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(+) (limited to 'gnu') 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" -- cgit v1.2.3 From a8dcf6cec7c5ded4bd0967f00b9b502d7d66e5ef Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Aug 2018 16:14:07 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 8c8ded2cc9201e69e87999bb40ef09c6c868deb8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Aug 2018 16:37:50 +0200 Subject: 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(+) (limited to 'gnu') 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. -- cgit v1.2.3 From 2fa4066c0a7c44ec5686a6197542e56c9e47fa45 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Aug 2018 17:24:51 +0200 Subject: 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 + gnu/packages/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 (limited to 'gnu') 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, -- cgit v1.2.3 From 34f4c214b63c46ee609bbaa15b063e20bc739ce3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 25 Aug 2018 15:34:59 +0200 Subject: 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(-) (limited to 'gnu') 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)))) -- cgit v1.2.3 From cf59c62853c079938f3e415a2fb0c5821df7c607 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 25 Aug 2018 15:37:35 +0200 Subject: gnu: Remove bison@2.7. * gnu/packages/bison.scm (bison-2.7): Remove variable. --- gnu/packages/bison.scm | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'gnu') 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")))))) -- cgit v1.2.3 From 27c1df05a866b639a61e16d48b3f2da8fa5eb767 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 25 Aug 2018 16:27:46 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 65ba72d74954e85412144b4737fccfa914ff107b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 25 Aug 2018 16:57:35 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From c37e932764f42df90b77b97af4dd71e5b485800b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 25 Aug 2018 19:23:35 +0200 Subject: 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 (limited to 'gnu') 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 - -- cgit v1.2.3 From fa2146f769fd5323081561141073108964524062 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 25 Aug 2018 20:13:08 +0200 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From 7d01ee66d46c30152f1a8c855c20042e376d207c Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Wed, 18 Jul 2018 14:11:16 -0400 Subject: gnu: Add avogadro. * gnu/packages/chemistry.scm (avogadro): New variable. * gnu/packages/patches/avogadro-boost148.patch, gnu/packages/patches/avogadro-eigen3-update.patch, gnu/packages/patches/avogadro-python-eigen-lib.patch: New files. * gnu/local.mk (dist_patch_DATA): Add them. --- gnu/local.mk | 3 + gnu/packages/chemistry.scm | 80 +++ gnu/packages/patches/avogadro-boost148.patch | 69 +++ gnu/packages/patches/avogadro-eigen3-update.patch | 603 +++++++++++++++++++++ .../patches/avogadro-python-eigen-lib.patch | 161 ++++++ 5 files changed, 916 insertions(+) create mode 100644 gnu/packages/patches/avogadro-boost148.patch create mode 100644 gnu/packages/patches/avogadro-eigen3-update.patch create mode 100644 gnu/packages/patches/avogadro-python-eigen-lib.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 60db25a60c..b1bd1c089c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -584,6 +584,9 @@ dist_patch_DATA = \ %D%/packages/patches/audacity-build-with-system-portaudio.patch \ %D%/packages/patches/automake-skip-amhello-tests.patch \ %D%/packages/patches/avahi-localstatedir.patch \ + %D%/packages/patches/avogadro-boost148.patch \ + %D%/packages/patches/avogadro-eigen3-update.patch \ + %D%/packages/patches/avogadro-python-eigen-lib.patch \ %D%/packages/patches/avidemux-install-to-lib.patch \ %D%/packages/patches/awesome-reproducible-png.patch \ %D%/packages/patches/azr3.patch \ diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm index 2d7cb7aad1..03120aaeee 100644 --- a/gnu/packages/chemistry.scm +++ b/gnu/packages/chemistry.scm @@ -23,16 +23,96 @@ #:use-module (guix download) #:use-module (gnu packages) #:use-module (gnu packages algebra) + #:use-module (gnu packages boost) #:use-module (gnu packages compression) + #:use-module (gnu packages documentation) + #:use-module (gnu packages gl) #:use-module (gnu packages gv) #:use-module (gnu packages maths) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages qt) #:use-module (gnu packages xml) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system python)) +(define-public avogadro + (package + (name "avogadro") + (version "1.2.0") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/cryos/avogadro/archive/" + version ".tar.gz")) + (sha256 + (base32 + "02v4h6hi1m7ilv0apdf74a8l1cm6dxnxyqp0rdaidrp3i9pf6lv4")) + (file-name (string-append name "-" version ".tar.gz")) + (patches + (search-patches "avogadro-eigen3-update.patch" + "avogadro-python-eigen-lib.patch" + "avogadro-boost148.patch")))) + (build-system cmake-build-system) + (arguments + '(#:tests? #f + #:configure-flags + (list "-DENABLE_GLSL=ON" + (string-append "-DPYTHON_LIBRARIES=" + (assoc-ref %build-inputs "python") + "/lib") + (string-append "-DPYTHON_INCLUDE_DIRS=" + (assoc-ref %build-inputs "python") + "/include/python2.7")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-python-lib-path + (lambda* (#:key outputs #:allow-other-keys) + ;; This is necessary to install the Python module in the correct + ;; directory. + (substitute* "libavogadro/src/python/CMakeLists.txt" + (("^EXECUTE_PROCESS.*$") "") + (("^.*from sys import stdout.*$") "") + (("^.*OUTPUT_VARIABLE.*") + (string-append "set(PYTHON_LIB_PATH \"" + (assoc-ref outputs "out") + "/lib/python2.7/site-packages\")"))) + #t)) + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Make sure 'avogadro' runs with the correct PYTHONPATH. + (let* ((out (assoc-ref outputs "out"))) + (setenv "PYTHONPATH" + (string-append + (assoc-ref outputs "out") + "/lib/python2.7/site-packages:" + (getenv "PYTHONPATH"))) + (wrap-program (string-append out "/bin/avogadro") + `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))))) + #t))))) + (native-inputs + `(("doxygen" ,doxygen) + ("pkg-config" ,pkg-config))) + (inputs + `(("boost" ,boost) + ("eigen" ,eigen) + ("glew" ,glew) + ("openbabel" ,openbabel) + ("python" ,python-2) + ("python-numpy" ,python2-numpy) + ("python-pyqt" ,python2-pyqt-4) + ("python-sip" ,python2-sip) + ("qt" ,qt-4) + ("zlib" ,zlib))) + (home-page "https://avogadro.cc") + (synopsis "Advanced molecule editor") + (description + "Avogadro is an advanced molecule editor and visualizer designed for use +in computational chemistry, molecular modeling, bioinformatics, materials +science, and related areas. It offers flexible high quality rendering and a +powerful plugin architecture.") + (license license:gpl2+))) + (define-public domainfinder (package (name "domainfinder") diff --git a/gnu/packages/patches/avogadro-boost148.patch b/gnu/packages/patches/avogadro-boost148.patch new file mode 100644 index 0000000000..f244f14674 --- /dev/null +++ b/gnu/packages/patches/avogadro-boost148.patch @@ -0,0 +1,69 @@ +Index: avogadro-1.2.0/libavogadro/src/pythonengine_p.h +=================================================================== +--- avogadro-1.2.0.orig/libavogadro/src/pythonengine_p.h ++++ avogadro-1.2.0/libavogadro/src/pythonengine_p.h +@@ -31,7 +31,9 @@ + + #include + #include ++#ifndef Q_MOC_RUN + #include ++#endif + + namespace Avogadro { + +Index: avogadro-1.2.0/libavogadro/src/pythonextension_p.h +=================================================================== +--- avogadro-1.2.0.orig/libavogadro/src/pythonextension_p.h ++++ avogadro-1.2.0/libavogadro/src/pythonextension_p.h +@@ -33,7 +33,9 @@ + #include + #include + #include ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + #include +Index: avogadro-1.2.0/libavogadro/src/pythontool_p.h +=================================================================== +--- avogadro-1.2.0.orig/libavogadro/src/pythontool_p.h ++++ avogadro-1.2.0/libavogadro/src/pythontool_p.h +@@ -31,7 +31,9 @@ + + #include + #include ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + #include +Index: avogadro-1.2.0/libavogadro/src/pythoninterpreter.h +=================================================================== +--- avogadro-1.2.0.orig/libavogadro/src/pythoninterpreter.h ++++ avogadro-1.2.0/libavogadro/src/pythoninterpreter.h +@@ -26,7 +26,9 @@ + #define PYTHONINTERPRETER_H + + #include ++#ifndef Q_MOC_RUN + #include ++#endif + #include + #include + +Index: avogadro-1.2.0/libavogadro/src/pythonscript.h +=================================================================== +--- avogadro-1.2.0.orig/libavogadro/src/pythonscript.h ++++ avogadro-1.2.0/libavogadro/src/pythonscript.h +@@ -27,6 +27,8 @@ + #define PYTHONSCRIPT_H + + #include ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "pythonerror.h" diff --git a/gnu/packages/patches/avogadro-eigen3-update.patch b/gnu/packages/patches/avogadro-eigen3-update.patch new file mode 100644 index 0000000000..a5f669292f --- /dev/null +++ b/gnu/packages/patches/avogadro-eigen3-update.patch @@ -0,0 +1,603 @@ +From 43af3c117b0b3220b15c2fe2895b94bbd83d3a60 Mon Sep 17 00:00:00 2001 +From: Claudio Fernandes +Date: Sun, 15 Jan 2017 21:23:39 -0200 +Subject: [PATCH] Adapt Avogadro to Eigen 3.3 + +--- + CMakeLists.txt | 9 +------ + avogadro/src/mainwindow.cpp | 5 ++-- + libavogadro/src/camera.cpp | 10 ++++---- + libavogadro/src/camera.h | 14 +++++------ + libavogadro/src/engines/wireengine.cpp | 4 ++-- + .../crystallography/crystallographyextension.cpp | 2 +- + .../crystallography/ui/ceviewoptionswidget.cpp | 2 +- + .../src/extensions/orca/orcaanalysedialog.cpp | 1 - + .../src/extensions/orca/orcainputdialog.cpp | 1 - + .../src/extensions/qtaim/qtaimmathutilities.cpp | 1 + + .../qtaim/qtaimwavefunctionevaluator.cpp | 28 +++++++++++----------- + .../extensions/surfaces/openqube/gamessukout.cpp | 1 + + .../src/extensions/surfaces/openqube/slaterset.cpp | 6 +++-- + libavogadro/src/glpainter_p.cpp | 14 +++++------ + libavogadro/src/glwidget.cpp | 4 ++-- + libavogadro/src/molecule.cpp | 26 ++++++++++++++++++-- + libavogadro/src/navigate.cpp | 2 +- + libavogadro/src/tools/bondcentrictool.cpp | 28 +++++++++++----------- + libavogadro/src/tools/manipulatetool.cpp | 17 +++++++------ + libavogadro/src/tools/navigatetool.cpp | 3 ++- + libavogadro/src/tools/skeletontree.cpp | 7 +++--- + libavogadro/src/tools/skeletontree.h | 2 +- + 22 files changed, 102 insertions(+), 85 deletions(-) + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -231,14 +231,7 @@ if(NOT Linguist_FOUND) + message(WARNING " Qt4 Linguist not found, please install it if you want Avogadro translations") + endif() + +-find_package(Eigen3) # find and setup Eigen3 if available +-if(NOT EIGEN3_FOUND) +- message(STATUS "Cannot find Eigen3, trying Eigen2") +- find_package(Eigen2 REQUIRED) # Some version is required +-else() +-# Use Stage10 Eigen3 support +- set (EIGEN2_SUPPORT_STAGE10_FULL_EIGEN2_API TRUE) +-endif() ++find_package(Eigen3 REQUIRED) # find and setup Eigen3 if available + + find_package(ZLIB REQUIRED) + find_package(OpenBabel2 REQUIRED) # find and setup OpenBabel +--- a/avogadro/src/mainwindow.cpp ++++ b/avogadro/src/mainwindow.cpp +@@ -115,7 +115,6 @@ + #include + + #include +-#include + #define USEQUAT + // This is a "hidden" exported Qt function on the Mac for Qt-4.x. + #ifdef Q_WS_MAC +@@ -2775,7 +2774,7 @@ protected: + linearGoal.row(1) = linearGoal.row(2).cross(linearGoal.row(0)); + + // calculate the translation matrix +- Transform3d goal(linearGoal); ++ Projective3d goal(linearGoal); + + goal.pretranslate(- 3.0 * (d->glWidget->radius() + CAMERA_NEAR_DISTANCE) * Vector3d::UnitZ()); + +@@ -2840,7 +2839,7 @@ protected: + Matrix3d linearGoal = Matrix3d::Identity(); + + // calculate the translation matrix +- Transform3d goal(linearGoal); ++ Projective3d goal(linearGoal); + + goal.pretranslate(- 3.0 * (d->glWidget->radius() + CAMERA_NEAR_DISTANCE) * Vector3d::UnitZ()); + +--- a/libavogadro/src/camera.cpp ++++ b/libavogadro/src/camera.cpp +@@ -47,7 +47,7 @@ namespace Avogadro + + CameraPrivate() {}; + +- Eigen::Transform3d modelview, projection; ++ Eigen::Projective3d modelview, projection; + const GLWidget *parent; + double angleOfViewY; + double orthoScale; +@@ -169,20 +169,20 @@ namespace Avogadro + + double Camera::distance(const Eigen::Vector3d & point) const + { +- return ( d->modelview * point ).norm(); ++ return ( d->modelview * point.homogeneous() ).head<3>().norm(); + } + +- void Camera::setModelview(const Eigen::Transform3d &matrix) ++ void Camera::setModelview(const Eigen::Projective3d &matrix) + { + d->modelview = matrix; + } + +- const Eigen::Transform3d & Camera::modelview() const ++ const Eigen::Projective3d & Camera::modelview() const + { + return d->modelview; + } + +- Eigen::Transform3d & Camera::modelview() ++ Eigen::Projective3d & Camera::modelview() + { + return d->modelview; + } +--- a/libavogadro/src/camera.h ++++ b/libavogadro/src/camera.h +@@ -101,16 +101,16 @@ namespace Avogadro { + double angleOfViewY() const; + /** Sets 4x4 "modelview" matrix representing the camera orientation and position. + * @param matrix the matrix to copy from +- * @sa Eigen::Transform3d & modelview(), applyModelview() */ +- void setModelview(const Eigen::Transform3d &matrix); ++ * @sa Eigen::Projective3d & modelview(), applyModelview() */ ++ void setModelview(const Eigen::Projective3d &matrix); + /** @return a constant reference to the 4x4 "modelview" matrix representing + * the camera orientation and position +- * @sa setModelview(), Eigen::Transform3d & modelview() */ +- const Eigen::Transform3d & modelview() const; ++ * @sa setModelview(), Eigen::Projective3d & modelview() */ ++ const Eigen::Projective3d & modelview() const; + /** @return a non-constant reference to the 4x4 "modelview" matrix representing + * the camera orientation and position +- * @sa setModelview(), const Eigen::Transform3d & modelview() const */ +- Eigen::Transform3d & modelview(); ++ * @sa setModelview(), const Eigen::Projective3d & modelview() const */ ++ Eigen::Projective3d & modelview(); + /** Calls gluPerspective() or glOrtho() with parameters automatically chosen + * for rendering the GLWidget's molecule with this camera. Should be called + * only in GL_PROJECTION matrix mode. Example code is given +@@ -342,7 +342,7 @@ namespace Avogadro { + * @return {x/w, y/w, z/w} vector + */ + Eigen::Vector3d V4toV3DivW(const Eigen::Vector4d & v4) { +- return v4.start<3>()/v4.w(); ++ return v4.head<3>()/v4.w(); + } + }; + +--- a/libavogadro/src/engines/wireengine.cpp ++++ b/libavogadro/src/engines/wireengine.cpp +@@ -109,7 +109,7 @@ namespace Avogadro { + const Camera *camera = pd->camera(); + + // perform a rough form of frustum culling +- Eigen::Vector3d transformedPos = pd->camera()->modelview() * v; ++ Eigen::Vector3d transformedPos = (pd->camera()->modelview() * v.homogeneous()).head<3>(); + double dot = transformedPos.z() / transformedPos.norm(); + if(dot > -0.8) + return true; +@@ -167,7 +167,7 @@ namespace Avogadro { + map = pd->colorMap(); // fall back to global color map + + // perform a rough form of frustum culling +- Eigen::Vector3d transformedEnd1 = pd->camera()->modelview() * v1; ++ Eigen::Vector3d transformedEnd1 = (pd->camera()->modelview() * v1.homogeneous()).head<3>(); + double dot = transformedEnd1.z() / transformedEnd1.norm(); + if(dot > -0.8) + return true; // i.e., don't bother rendering +--- a/libavogadro/src/extensions/crystallography/crystallographyextension.cpp ++++ b/libavogadro/src/extensions/crystallography/crystallographyextension.cpp +@@ -1989,7 +1989,7 @@ namespace Avogadro + // fix coordinates + // Apply COB matrix: + Eigen::Matrix3d invCob; +- cob.computeInverse(&invCob); ++ invCob = cob.inverse(); + for (QList::iterator + it = fcoords.begin(), + it_end = fcoords.end(); +--- a/libavogadro/src/extensions/crystallography/ui/ceviewoptionswidget.cpp ++++ b/libavogadro/src/extensions/crystallography/ui/ceviewoptionswidget.cpp +@@ -139,7 +139,7 @@ namespace Avogadro + { + // View into a Miller plane + Camera *camera = m_glWidget->camera(); +- Eigen::Transform3d modelView; ++ Eigen::Projective3d modelView; + modelView.setIdentity(); + + // OK, so we want to rotate to look along the normal at the plane +--- a/libavogadro/src/extensions/orca/orcaanalysedialog.cpp ++++ b/libavogadro/src/extensions/orca/orcaanalysedialog.cpp +@@ -41,7 +41,6 @@ + #include + + #include +-#include + + #include + +--- a/libavogadro/src/extensions/orca/orcainputdialog.cpp ++++ b/libavogadro/src/extensions/orca/orcainputdialog.cpp +@@ -33,7 +33,6 @@ + #include + + #include +-#include + + #include + +--- a/libavogadro/src/extensions/qtaim/qtaimmathutilities.cpp ++++ b/libavogadro/src/extensions/qtaim/qtaimmathutilities.cpp +@@ -28,6 +28,7 @@ + + #include + #include ++#include + + namespace Avogadro { + namespace QTAIMMathUtilities { +--- a/libavogadro/src/extensions/qtaim/qtaimwavefunctionevaluator.cpp ++++ b/libavogadro/src/extensions/qtaim/qtaimwavefunctionevaluator.cpp +@@ -35,21 +35,21 @@ namespace Avogadro + m_nprim=wfn.numberOfGaussianPrimitives(); + m_nnuc=wfn.numberOfNuclei(); + +- m_nucxcoord=Map >(wfn.xNuclearCoordinates(),m_nnuc); +- m_nucycoord=Map >(wfn.yNuclearCoordinates(),m_nnuc); +- m_nuczcoord=Map >(wfn.zNuclearCoordinates(),m_nnuc); +- m_nucz=Map >(wfn.nuclearCharges(),m_nnuc); +- m_X0=Map >(wfn.xGaussianPrimitiveCenterCoordinates(),m_nprim,1); +- m_Y0=Map >(wfn.yGaussianPrimitiveCenterCoordinates(),m_nprim,1); +- m_Z0=Map >(wfn.zGaussianPrimitiveCenterCoordinates(),m_nprim,1); +- m_xamom=Map >(wfn.xGaussianPrimitiveAngularMomenta(),m_nprim,1); +- m_yamom=Map >(wfn.yGaussianPrimitiveAngularMomenta(),m_nprim,1); +- m_zamom=Map >(wfn.zGaussianPrimitiveAngularMomenta(),m_nprim,1); +- m_alpha=Map >(wfn.gaussianPrimitiveExponentCoefficients(),m_nprim,1); ++ m_nucxcoord=Map >(const_cast(wfn.xNuclearCoordinates()),m_nnuc); ++ m_nucycoord=Map >(const_cast(wfn.yNuclearCoordinates()),m_nnuc); ++ m_nuczcoord=Map >(const_cast(wfn.zNuclearCoordinates()),m_nnuc); ++ m_nucz=Map >(const_cast(wfn.nuclearCharges()),m_nnuc); ++ m_X0=Map >(const_cast(wfn.xGaussianPrimitiveCenterCoordinates()),m_nprim,1); ++ m_Y0=Map >(const_cast(wfn.yGaussianPrimitiveCenterCoordinates()),m_nprim,1); ++ m_Z0=Map >(const_cast(wfn.zGaussianPrimitiveCenterCoordinates()),m_nprim,1); ++ m_xamom=Map >(const_cast(wfn.xGaussianPrimitiveAngularMomenta()),m_nprim,1); ++ m_yamom=Map >(const_cast(wfn.yGaussianPrimitiveAngularMomenta()),m_nprim,1); ++ m_zamom=Map >(const_cast(wfn.zGaussianPrimitiveAngularMomenta()),m_nprim,1); ++ m_alpha=Map >(const_cast(wfn.gaussianPrimitiveExponentCoefficients()),m_nprim,1); + // TODO Implement screening for unoccupied molecular orbitals. +- m_occno=Map >(wfn.molecularOrbitalOccupationNumbers(),m_nmo,1); +- m_orbe=Map >(wfn.molecularOrbitalEigenvalues(),m_nmo,1); +- m_coef=Map >(wfn.molecularOrbitalCoefficients(),m_nmo,m_nprim); ++ m_occno=Map >(const_cast(wfn.molecularOrbitalOccupationNumbers()),m_nmo,1); ++ m_orbe=Map >(const_cast(wfn.molecularOrbitalEigenvalues()),m_nmo,1); ++ m_coef=Map >(const_cast(wfn.molecularOrbitalCoefficients()),m_nmo,m_nprim); + m_totalEnergy=wfn.totalEnergy(); + m_virialRatio=wfn.virialRatio(); + +--- a/libavogadro/src/extensions/surfaces/openqube/gamessukout.cpp ++++ b/libavogadro/src/extensions/surfaces/openqube/gamessukout.cpp +@@ -19,6 +19,7 @@ + using Eigen::Vector3d; + using std::vector; + ++#include + #include + + namespace OpenQube +--- a/libavogadro/src/extensions/surfaces/openqube/slaterset.cpp ++++ b/libavogadro/src/extensions/surfaces/openqube/slaterset.cpp +@@ -25,9 +25,9 @@ + + #include "cube.h" + +-#include + #include + #include ++#include + + #include + +@@ -250,7 +250,9 @@ bool SlaterSet::initialize() + + SelfAdjointEigenSolver s(m_overlap); + MatrixXd p = s.eigenvectors(); +- MatrixXd m = p * s.eigenvalues().cwise().inverse().cwise().sqrt().asDiagonal() * p.inverse(); ++ // TODO check if this is correct ++ MatrixXd m1 = (s.eigenvalues().array().inverse().sqrt()); ++ MatrixXd m = p.array()*(m1.diagonal().array())*p.inverse().array(); + m_normalized = m * m_eigenVectors; + + if (!(m_overlap*m*m).isIdentity()) +--- a/libavogadro/src/glpainter_p.cpp ++++ b/libavogadro/src/glpainter_p.cpp +@@ -789,13 +789,13 @@ namespace Avogadro + } else { + points[theta-1] = Eigen::AngleAxisd(theta * (M_PI / 180.0) / 2, n) * u; + } +- points[theta-1] = d->widget->camera()->modelview() * (origin + points[theta-1]); ++ points[theta-1] = (d->widget->camera()->modelview() * (origin + points[theta-1]).homogeneous()).head<3>(); + } + + // Get vectors representing the points' positions in terms of the model view. +- Eigen::Vector3d _origin = d->widget->camera()->modelview() * origin; +- Eigen::Vector3d _direction1 = d->widget->camera()->modelview() * (origin+u); +- Eigen::Vector3d _direction2 = d->widget->camera()->modelview() * (origin+v); ++ Eigen::Vector3d _origin = (d->widget->camera()->modelview() * origin.homogeneous()).head<3>(); ++ Eigen::Vector3d _direction1 = (d->widget->camera()->modelview() * (origin+u).homogeneous()).head<3>(); ++ Eigen::Vector3d _direction2 = (d->widget->camera()->modelview() * (origin+v).homogeneous()).head<3>(); + + glPushAttrib(GL_ALL_ATTRIB_BITS); + glPushMatrix(); +@@ -880,12 +880,12 @@ namespace Avogadro + } else { + points[theta-1] = Eigen::AngleAxisd(theta * (M_PI / 180.0) / 2, n) * u; + } +- points[theta-1] = d->widget->camera()->modelview() * (origin + points[theta-1]); ++ points[theta-1] = (d->widget->camera()->modelview() * (origin + points[theta-1]).homogeneous()).head<3>(); + } + + // Get vectors representing the points' positions in terms of the model view. +- Eigen::Vector3d _direction1 = d->widget->camera()->modelview() * (origin + u); +- Eigen::Vector3d _direction2 = d->widget->camera()->modelview() * (origin + v); ++ Eigen::Vector3d _direction1 = (d->widget->camera()->modelview() * (origin + u).homogeneous()).head<3>(); ++ Eigen::Vector3d _direction2 = (d->widget->camera()->modelview() * (origin + v).homogeneous()).head<3>(); + + glPushAttrib(GL_ALL_ATTRIB_BITS); + glPushMatrix(); +--- a/libavogadro/src/glwidget.cpp ++++ b/libavogadro/src/glwidget.cpp +@@ -765,7 +765,7 @@ namespace Avogadro { + GLfloat fogColor[4]= {static_cast(d->background.redF()), static_cast(d->background.greenF()), + static_cast(d->background.blueF()), static_cast(d->background.alphaF())}; + glFogfv(GL_FOG_COLOR, fogColor); +- Vector3d distance = camera()->modelview() * d->center; ++ Vector3d distance = (camera()->modelview() * d->center.homogeneous()).head<3>(); + double distanceToCenter = distance.norm(); + glFogf(GL_FOG_DENSITY, 1.0); + glHint(GL_FOG_HINT, GL_NICEST); +@@ -1711,7 +1711,7 @@ namespace Avogadro { + + if (d->renderModelViewDebug) { + // Model view matrix: +- const Eigen::Transform3d &modelview = d->camera->modelview(); ++ const Eigen::Projective3d &modelview = d->camera->modelview(); + y += d->pd->painter()->drawText + (x, y, tr("ModelView row 1: %L1 %L2 %L3 %L4") + .arg(modelview(0, 0), 6, 'f', 2, ' ') +--- a/libavogadro/src/molecule.cpp ++++ b/libavogadro/src/molecule.cpp +@@ -38,7 +38,7 @@ + #include "zmatrix.h" + + #include +-#include ++#include + + #include + +@@ -1907,7 +1907,29 @@ namespace Avogadro{ + } + d->center /= static_cast(nAtoms); + Eigen::Hyperplane planeCoeffs; +- Eigen::fitHyperplane(numAtoms(), atomPositions, &planeCoeffs); ++ //Eigen::fitHyperplane(numAtoms(), atomPositions, &planeCoeffs); ++ ++ // TODO check if this is OK ++ /************************/ ++ typedef Eigen::Matrix CovMatrixType; ++ typedef Eigen::Vector3d VectorType; ++ ++ VectorType mean = d->center; ++ int size=3; ++ int numPoints=numAtoms(); ++ VectorType ** points=atomPositions; ++ CovMatrixType covMat = CovMatrixType::Zero(size, size); ++ VectorType remean = VectorType::Zero(size); ++ for(int i = 0; i < numPoints; ++i) ++ { ++ VectorType diff = (*(points[i]) - mean).conjugate(); ++ covMat += diff * diff.adjoint(); ++ } ++ Eigen::SelfAdjointEigenSolver eig(covMat); ++ planeCoeffs.normal() = eig.eigenvectors().col(0); ++ /************************/ ++ ++ + delete[] atomPositions; + d->normalVector = planeCoeffs.normal(); + } +--- a/libavogadro/src/navigate.cpp ++++ b/libavogadro/src/navigate.cpp +@@ -40,7 +40,7 @@ namespace Avogadro { + void Navigate::zoom(GLWidget *widget, const Eigen::Vector3d &goal, + double delta) + { +- Vector3d transformedGoal = widget->camera()->modelview() * goal; ++ Vector3d transformedGoal = (widget->camera()->modelview() * goal.homogeneous()).head<3>(); + double distanceToGoal = transformedGoal.norm(); + + double t = ZOOM_SPEED * delta; +--- a/libavogadro/src/tools/bondcentrictool.cpp ++++ b/libavogadro/src/tools/bondcentrictool.cpp +@@ -578,8 +578,8 @@ namespace Avogadro { + + Vector3d clicked = *m_clickedAtom->pos(); + +- Vector3d axis = Vector3d(0, 0, ((widget->camera()->modelview() * other).z() >= +- (widget->camera()->modelview() * center).z() ? -1 : 1)); ++ Vector3d axis = Vector3d(0, 0, ((widget->camera()->modelview() * other.homogeneous()).z() >= ++ (widget->camera()->modelview() * center.homogeneous()).z() ? -1 : 1)); + + Vector3d centerProj = widget->camera()->project(center); + centerProj -= Vector3d(0,0,centerProj.z()); +@@ -673,8 +673,8 @@ namespace Avogadro { + + Vector3d clicked = *m_clickedAtom->pos(); + +- Vector3d axis = Vector3d(0, 0, ((widget->camera()->modelview() * other).z() >= +- (widget->camera()->modelview() * center).z() ? -1 : 1)); ++ Vector3d axis = Vector3d(0, 0, ((widget->camera()->modelview() * other.homogeneous()).z() >= ++ (widget->camera()->modelview() * center.homogeneous()).z() ? -1 : 1)); + + Vector3d centerProj = widget->camera()->project(center); + centerProj -= Vector3d(0,0,centerProj.z()); +@@ -1362,10 +1362,10 @@ namespace Avogadro { + + planeVec = length * (planeVec / planeVec.norm()); + +- Vector3d topLeft = widget->camera()->modelview() * (left + planeVec); +- Vector3d topRight = widget->camera()->modelview() * (right + planeVec); +- Vector3d botRight = widget->camera()->modelview() * (right - planeVec); +- Vector3d botLeft = widget->camera()->modelview() * (left - planeVec); ++ Vector3d topLeft = (widget->camera()->modelview() * (left + planeVec).homogeneous()).head<3>(); ++ Vector3d topRight = (widget->camera()->modelview() * (right + planeVec).homogeneous()).head<3>(); ++ Vector3d botRight = (widget->camera()->modelview() * (right - planeVec).homogeneous()).head<3>(); ++ Vector3d botLeft = (widget->camera()->modelview() * (left - planeVec).homogeneous()).head<3>(); + + float alpha = 0.4; + double lineWidth = 1.5; +@@ -1444,10 +1444,10 @@ namespace Avogadro { + C = D + ((C-D).normalized() * minWidth); + } + +- Vector3d topLeft = widget->camera()->modelview() * D; +- Vector3d topRight = widget->camera()->modelview() * C; +- Vector3d botRight = widget->camera()->modelview() * B; +- Vector3d botLeft = widget->camera()->modelview() * A; ++ Vector3d topLeft = (widget->camera()->modelview() * D.homogeneous()).head<3>(); ++ Vector3d topRight = (widget->camera()->modelview() * C.homogeneous()).head<3>(); ++ Vector3d botRight = (widget->camera()->modelview() * B.homogeneous()).head<3>(); ++ Vector3d botLeft = (widget->camera()->modelview() * A.homogeneous()).head<3>(); + + float alpha = 0.4; + double lineWidth = 1.5; +@@ -1506,12 +1506,12 @@ namespace Avogadro { + Vector3d positionVector) + { + //Rotate skeleton around a particular axis and center point +- Eigen::Transform3d rotation; ++ Eigen::Projective3d rotation; + rotation = Eigen::AngleAxisd(angle, rotationVector); + rotation.pretranslate(centerVector); + rotation.translate(-centerVector); + +- return rotation*positionVector; ++ return (rotation*positionVector.homogeneous()).head<3>(); + } + + // ########## showAnglesChanged ########## +--- a/libavogadro/src/tools/manipulatetool.cpp ++++ b/libavogadro/src/tools/manipulatetool.cpp +@@ -40,7 +40,6 @@ + #include + + using Eigen::Vector3d; +-using Eigen::Transform3d; + using Eigen::AngleAxisd; + + namespace Avogadro { +@@ -138,7 +137,7 @@ namespace Avogadro { + double yRotate = m_settingsWidget->yRotateSpinBox->value() * DEG_TO_RAD; + double zRotate = m_settingsWidget->zRotateSpinBox->value() * DEG_TO_RAD; + +- Eigen::Transform3d rotation; ++ Eigen::Projective3d rotation; + rotation.matrix().setIdentity(); + rotation.translation() = center; + rotation.rotate(AngleAxisd(xRotate, Vector3d::UnitX()) +@@ -152,12 +151,12 @@ namespace Avogadro { + if (p->type() == Primitive::AtomType) { + Atom *atom = static_cast(p); + tempPos = translate + *(atom->pos()); +- atom->setPos(rotation * tempPos); ++ atom->setPos((rotation * tempPos.homogeneous()).head<3>()); + } + } else { + foreach(Atom *atom, widget->molecule()->atoms()) { + tempPos = translate + *(atom->pos()); +- atom->setPos(rotation * tempPos); ++ atom->setPos((rotation * tempPos.homogeneous()).head<3>()); + } + } + +@@ -199,7 +198,7 @@ namespace Avogadro { + widget->setCursor(Qt::SizeVerCursor); + + // Move the selected atom(s) in to or out of the screen +- Vector3d transformedGoal = widget->camera()->modelview() * *goal; ++ Vector3d transformedGoal = (widget->camera()->modelview() * goal->homogeneous()).head<3>(); + double distanceToGoal = transformedGoal.norm(); + + double t = ZOOM_SPEED * delta; +@@ -255,7 +254,7 @@ namespace Avogadro { + + // Rotate the selected atoms about the center + // rotate only selected primitives +- Transform3d fragmentRotation; ++ Eigen::Projective3d fragmentRotation; + fragmentRotation.matrix().setIdentity(); + fragmentRotation.translation() = *center; + fragmentRotation.rotate( +@@ -266,7 +265,7 @@ namespace Avogadro { + + foreach(Primitive *p, widget->selectedPrimitives()) + if (p->type() == Primitive::AtomType) +- static_cast(p)->setPos(fragmentRotation * *static_cast(p)->pos()); ++ static_cast(p)->setPos((fragmentRotation * static_cast(p)->pos()->homogeneous()).head<3>()); + widget->molecule()->update(); + } + +@@ -274,7 +273,7 @@ namespace Avogadro { + double delta) const + { + // Tilt the selected atoms about the center +- Transform3d fragmentRotation; ++ Eigen::Projective3d fragmentRotation; + fragmentRotation.matrix().setIdentity(); + fragmentRotation.translation() = *center; + fragmentRotation.rotate(AngleAxisd(delta * ROTATION_SPEED, widget->camera()->backTransformedZAxis())); +@@ -282,7 +281,7 @@ namespace Avogadro { + + foreach(Primitive *p, widget->selectedPrimitives()) + if (p->type() == Primitive::AtomType) +- static_cast(p)->setPos(fragmentRotation * *static_cast(p)->pos()); ++ static_cast(p)->setPos((fragmentRotation * static_cast(p)->pos()->homogeneous()).head<3>()); + widget->molecule()->update(); + } + +--- a/libavogadro/src/tools/navigatetool.cpp ++++ b/libavogadro/src/tools/navigatetool.cpp +@@ -92,7 +92,8 @@ namespace Avogadro { + double sumOfWeights = 0.; + QList atoms = widget->molecule()->atoms(); + foreach (Atom *atom, atoms) { +- Vector3d transformedAtomPos = widget->camera()->modelview() * *atom->pos(); ++ Vector3d transformedAtomPos = (widget->camera()->modelview() * ++ atom->pos()->homogeneous()).head<3>(); + double atomDistance = transformedAtomPos.norm(); + double dot = transformedAtomPos.z() / atomDistance; + double weight = exp(-30. * (1. + dot)); +--- a/libavogadro/src/tools/skeletontree.cpp ++++ b/libavogadro/src/tools/skeletontree.cpp +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + using namespace Eigen; + using namespace std; +@@ -221,7 +222,7 @@ namespace Avogadro { + { + if (m_rootNode) { + //Rotate skeleton around a particular axis and center point +- Eigen::Transform3d rotation; ++ Eigen::Projective3d rotation; + rotation = Eigen::AngleAxisd(angle, rotationAxis); + rotation.pretranslate(centerVector); + rotation.translate(-centerVector); +@@ -248,11 +249,11 @@ namespace Avogadro { + // ########## recursiveRotate ########## + + void SkeletonTree::recursiveRotate(Node* n, +- const Eigen::Transform3d &rotationMatrix) ++ const Eigen::Projective3d &rotationMatrix) + { + // Update the root node with the new position + Atom* a = n->atom(); +- a->setPos(rotationMatrix * (*a->pos())); ++ a->setPos((rotationMatrix * (*a->pos()).homogeneous()).head<3>()); + a->update(); + + // Now update the children +--- a/libavogadro/src/tools/skeletontree.h ++++ b/libavogadro/src/tools/skeletontree.h +@@ -230,6 +230,6 @@ namespace Avogadro { + * @param centerVector Center location to rotate around. + */ + void recursiveRotate(Node* n, +- const Eigen::Transform3d &rotationMatrix); ++ const Eigen::Projective3d &rotationMatrix); + + }; + } // End namespace Avogadro \ No newline at end of file diff --git a/gnu/packages/patches/avogadro-python-eigen-lib.patch b/gnu/packages/patches/avogadro-python-eigen-lib.patch new file mode 100644 index 0000000000..ac9f2e30af --- /dev/null +++ b/gnu/packages/patches/avogadro-python-eigen-lib.patch @@ -0,0 +1,161 @@ +From 2d4be7ede177a8df7340fe3b209698d591ee8a04 Mon Sep 17 00:00:00 2001 +From: Claudio Fernandes +Date: Mon, 16 Jan 2017 19:48:23 -0200 +Subject: [PATCH] Adapt libavogadro/python to Eigen 3.3 + +--- + libavogadro/src/python/camera.cpp | 2 +- + libavogadro/src/python/eigen.cpp | 60 +++++++++++++++++++-------------------- + 2 files changed, 31 insertions(+), 31 deletions(-) + +diff --git a/libavogadro/src/python/camera.cpp b/libavogadro/src/python/camera.cpp +index 69ca87bf8..30b32af7d 100644 +--- a/libavogadro/src/python/camera.cpp ++++ b/libavogadro/src/python/camera.cpp +@@ -10,7 +10,7 @@ using namespace Avogadro; + void export_Camera() + { + +- const Eigen::Transform3d& (Camera::*modelview_ptr)() const = &Camera::modelview; ++ const Eigen::Projective3d& (Camera::*modelview_ptr)() const = &Camera::modelview; + Eigen::Vector3d (Camera::*unProject_ptr1)(const Eigen::Vector3d&) const = &Camera::unProject; + Eigen::Vector3d (Camera::*unProject_ptr2)(const QPoint&, const Eigen::Vector3d&) const = &Camera::unProject; + Eigen::Vector3d (Camera::*unProject_ptr3)(const QPoint&) const = &Camera::unProject; +diff --git a/libavogadro/src/python/eigen.cpp b/libavogadro/src/python/eigen.cpp +index c1faedbcc..20b4e719d 100644 +--- a/libavogadro/src/python/eigen.cpp ++++ b/libavogadro/src/python/eigen.cpp +@@ -305,9 +305,9 @@ template <> struct ScalarTraits + struct innerclass + { + // +- // Eigen::Transform3d --> python array (4x4) ++ // Eigen::Projective3d --> python array (4x4) + // +- static PyObject* convert(Eigen::Transform3d const &trans) ++ static PyObject* convert(Eigen::Projective3d const &trans) + { + npy_intp dims[2] = { 4, 4 }; + PyObject *result = PyArray_SimpleNew(2, dims, PyArray_DOUBLE); +@@ -321,9 +321,9 @@ template <> struct ScalarTraits + return incref(result); + } + // +- // Eigen::Transform3d* --> python array (4x4) ++ // Eigen::Projective3d* --> python array (4x4) + // +- static PyObject* convert(Eigen::Transform3d *trans) ++ static PyObject* convert(Eigen::Projective3d *trans) + { + npy_intp dims[2] = { 4, 4 }; + PyObject *result = PyArray_SimpleNew(2, dims, PyArray_DOUBLE); +@@ -337,9 +337,9 @@ template <> struct ScalarTraits + return incref(result); + } + // +- // const Eigen::Transform3d* --> python array (4x4) ++ // const Eigen::Projective3d* --> python array (4x4) + // +- static PyObject* convert(const Eigen::Transform3d *trans) ++ static PyObject* convert(const Eigen::Projective3d *trans) + { + npy_intp dims[2] = { 4, 4 }; + PyObject *result = PyArray_SimpleNew(2, dims, PyArray_DOUBLE); +@@ -358,10 +358,10 @@ template <> struct ScalarTraits + Transform3d_to_python_array() + { + #ifndef WIN32 +- to_python_converter(); ++ to_python_converter(); + #endif +- to_python_converter(); +- to_python_converter(); ++ to_python_converter(); ++ to_python_converter(); + } + + }; +@@ -373,17 +373,17 @@ template <> struct ScalarTraits + // Insert an rvalue from_python converter at the tail of the + // chain. Used for implicit conversions + // +- // python array --> Eigen::Transform3d ++ // python array --> Eigen::Projective3d + // + // used for: + // +- // void function(Eigen::Transform3d vec) +- // void function(Eigen::Transform3d & vec) +- // void function(const Eigen::Transform3d & vec) ++ // void function(Eigen::Projective3d vec) ++ // void function(Eigen::Projective3d & vec) ++ // void function(const Eigen::Projective3d & vec) + // +- converter::registry::push_back( &convertible, &construct, type_id() ); ++ converter::registry::push_back( &convertible, &construct, type_id() ); + +- converter::registry::insert( &convert, type_id() ); ++ converter::registry::insert( &convert, type_id() ); + } + + static void* convert(PyObject *obj_ptr) +@@ -401,7 +401,7 @@ template <> struct ScalarTraits + throw_error_already_set(); // the 1D array does not have exactly 3 elements + + double *values = reinterpret_cast(array->data); +- Eigen::Transform3d *c_obj = new Eigen::Transform3d(); ++ Eigen::Projective3d *c_obj = new Eigen::Projective3d(); + double *dataPtr = c_obj->data(); + + for (int i = 0; i < 16; ++i) +@@ -432,7 +432,7 @@ template <> struct ScalarTraits + // I think this is a better way to get at the double array, where is this + // deleted though? Does Boost::Python do it? + double *values = reinterpret_cast(array->data); +- Eigen::Transform3d *storage = new Eigen::Transform3d(); ++ Eigen::Projective3d *storage = new Eigen::Projective3d(); + double *dataPtr = storage->data(); + + for (int i = 0; i < 16; ++i) +@@ -467,21 +467,21 @@ class EigenUnitTestHelper + void set_vector3d_ptr(Eigen::Vector3d* vec) { m_vector3d = *vec; } + void set_const_vector3d_ptr(const Eigen::Vector3d* const vec) { m_vector3d = *vec; } + +- //Eigen::Transform3d transform3d() { return m_transform3d; } +- //Eigen::Transform3d& transform3d_ref() { return m_transform3d; } +- const Eigen::Transform3d& const_transform3d_ref() { return m_transform3d; } +- Eigen::Transform3d* transform3d_ptr() { return &m_transform3d; } +- const Eigen::Transform3d* const_transform3d_ptr() { return &m_transform3d; } +- +- //void set_transform3d(Eigen::Transform3d vec) { m_transform3d = vec; } +- //void set_transform3d_ref(Eigen::Transform3d& vec) { m_transform3d = vec; } +- void set_const_transform3d_ref(const Eigen::Transform3d& vec) { m_transform3d = vec; } +- void set_transform3d_ptr(Eigen::Transform3d* vec) { m_transform3d = *vec; } +- void set_const_transform3d_ptr(const Eigen::Transform3d* const vec) { m_transform3d = *vec; } ++ //Eigen::Projective3d transform3d() { return m_transform3d; } ++ //Eigen::Projective3d& transform3d_ref() { return m_transform3d; } ++ const Eigen::Projective3d& const_transform3d_ref() { return m_transform3d; } ++ Eigen::Projective3d* transform3d_ptr() { return &m_transform3d; } ++ const Eigen::Projective3d* const_transform3d_ptr() { return &m_transform3d; } ++ ++ //void set_transform3d(Eigen::Projective3d vec) { m_transform3d = vec; } ++ //void set_transform3d_ref(Eigen::Projective3d& vec) { m_transform3d = vec; } ++ void set_const_transform3d_ref(const Eigen::Projective3d& vec) { m_transform3d = vec; } ++ void set_transform3d_ptr(Eigen::Projective3d* vec) { m_transform3d = *vec; } ++ void set_const_transform3d_ptr(const Eigen::Projective3d* const vec) { m_transform3d = *vec; } + + private: + Eigen::Vector3d m_vector3d; +- Eigen::Transform3d m_transform3d; ++ Eigen::Projective3d m_transform3d; + + }; + #endif +@@ -529,6 +529,6 @@ void export_Eigen() + Vector3x_to_python_array(); + Vector3x_from_python_array(); + +- // Eigen::Transform3d ++ // Eigen::Projective3d + Transform3d_to_python_array(); + Transform3d_from_python_array(); -- cgit v1.2.3 From 8ad65841030759797bf3fd39261ca17a561ec51f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 26 Aug 2018 01:04:45 +0200 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From 8a9e0b6ebf23d737443b3767c6d6322a012d7808 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Fri, 24 Aug 2018 23:30:33 -0400 Subject: gnu: emacs-recent-addresses: Add missing words to description. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs.scm (emacs-recent-addresses)[description]: Add missing words. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 2322581a30..54170b91ab 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -11392,9 +11392,9 @@ wiki.") (build-system emacs-build-system) (synopsis "Record recently-used email addressed and auto-complete them") (description - "@code{recent-addresses} is an Emacs allows you to quickly look up -previously used email addresses. It can be used alongside the Gnus email -client.") + "@code{recent-addresses} is an Emacs package that allows you to quickly +look up previously used email addresses. It can be used alongside the Gnus +email client.") (license license:gpl2+)))) (define-public emacs-fold-dwim -- cgit v1.2.3 From bff861ece5c5b4d5f8058893c6206f794c5072bf Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sat, 25 Aug 2018 02:37:45 -0400 Subject: gnu: Add emacs-git-annex. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs.scm (emacs-git-annex): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 54170b91ab..11a1774ad9 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -11643,3 +11643,30 @@ comments and Org files in the Magit status buffer. Activating an item jumps to it in its file. By default, it uses keywords from @code{hl-todo}, minus a few (like NOTE).") (license license:gpl3)))) + +(define-public emacs-git-annex + ;; Unreleased version has a fontification fix. + (let ((commit "ebdb44aef1883f1b2b8058e05d30fb9315b03707") + (revision "1")) + (package + (name "emacs-git-annex") + (version (string-append "1.1-" revision "." (string-take commit 8))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jwiegley/git-annex-el") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1mzv40gj7k10h7h5s43my8msgzjpj680qprqa9pp8nbyhl49v3wh")))) + (build-system emacs-build-system) + (home-page "https://github.com/jwiegley/git-annex-el") + (synopsis "Emacs integration for git-annex") + (description "Enhances Dired and buffers visiting annex files with +git-annex functionality. In Dired, the names of annex files are shortened by +hiding the symbolic links and fontified based on whether content is present. +Commands for performing some common operations (e.g., unlocking and adding +files) are provided.") + (license license:gpl2+)))) -- cgit v1.2.3 From 64daf2177fca3b08727fbfaea5e8cd0b916bddbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 26 Aug 2018 00:32:03 +0200 Subject: gnu: emacs-recent-addresses: Switch to a branch that works with Helm. * gnu/packages/emacs.scm (emacs-recent-addresses)[source]: Change URL and update to afbbfdc. --- gnu/packages/emacs.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 11a1774ad9..18aac36f02 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -11374,8 +11374,8 @@ wiki.") (license license:expat))) (define-public emacs-recent-addresses - (let ((commit "d9da58db542089a1ceb5ef29e420dbfbc4a36373") - (revision "0")) + (let ((commit "afbbfdc43b81e620acf827ca20d297e0c517b6eb") + (revision "1")) (package (name "emacs-recent-addresses") (home-page "http://nschum.de/src/emacs/recent-addresses/") @@ -11383,11 +11383,13 @@ wiki.") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/nschum/recent-addresses.el") + ;; Note: Use a branch that works with Helm. Submitted + ;; at . + (url "https://github.com/civodul/recent-addresses.el") (commit commit))) (sha256 (base32 - "175rvcwmkb5z7ss7q2y5178mvdvp5bhn39irz80qinlvaz8fm4nk")) + "0ajrq0galjmdyjdjyxazykjyax3gh6hvfk4s7l657pi11g0q5zax")) (file-name (git-file-name name version)))) (build-system emacs-build-system) (synopsis "Record recently-used email addressed and auto-complete them") -- cgit v1.2.3 From 032712f6217ce1dca1b198b279e295e8ca5a4db1 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 26 Aug 2018 00:35:30 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.152. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.152. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9b9cf01560..4d51ce5aec 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -451,8 +451,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.151" - "0irzdq4p8a6dxyx5basgrc7af7w48hmyjwbk5hff8wn8jy71p9zm" + (make-linux-libre "4.4.152" + "082aajyr363ca95pxlg9iascf5d7k2gbw9ggsbsa1hj6nhspsxw6" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From 8d55adfa6771551f9b46d93f499177679bc3660c Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 26 Aug 2018 00:36:11 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.124. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.124. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 4d51ce5aec..fe50482add 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -445,8 +445,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.123" - "1rljdp3vzhmdc6qha6b9dq0d1a3xz06rn51pb4ad3a2y61mph9sv" + (make-linux-libre "4.9.124" + "0p78gx5jiqvaf2cadf5jp40lzgarrg0m0ybf9w2499v28vjsp30q" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From fabe2c73548e88004b01f5218d1110141a2114d5 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 26 Aug 2018 00:36:42 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.67. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.67. (%linux-libre-4.14-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index fe50482add..b29ac23f6a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -435,8 +435,8 @@ It has been modified to remove all non-free binary blobs.") #:patches %linux-libre-4.18-patches #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.66") -(define %linux-libre-4.14-hash "1sf18m6xjyg535yviz3yjbislf57s180y67z7mzbcl5pq9352bg9") +(define %linux-libre-4.14-version "4.14.67") +(define %linux-libre-4.14-hash "050zvdxjy6sc64q75pr1gxsmh49chwav2pwxz8xlif39bvahnrpg") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.2.3 From cfb15a51631b7e7a4cf84b7aac452dd24dc8023e Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 26 Aug 2018 00:38:41 -0400 Subject: gnu: linux-libre: Update to 4.18.5. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.18.5. (%linux-libre-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b29ac23f6a..9ef695c4b2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -404,8 +404,8 @@ It has been modified to remove all non-free binary blobs.") ;; supports qemu "virt" machine and possibly a large number of ARM boards. ;; See : https://wiki.debian.org/DebianKernel/ARMMP. -(define %linux-libre-version "4.18.4") -(define %linux-libre-hash "1q3bndhwxwcrlyi0qcgxjsp5fl92wkfgk4y41qwrrywfv9xj3sl7") +(define %linux-libre-version "4.18.5") +(define %linux-libre-hash "1y52ns34vh9p4pfj08xsycv8p0xywm6dbpdi0wwpkll1xgpqikvf") (define %linux-libre-4.18-patches (list %boot-logo-patch -- cgit v1.2.3 From 3c30054290b743c134c19ce7c1eb73b90089b734 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sun, 26 Aug 2018 10:37:06 +0530 Subject: gnu: ghc-optparse-applicative: Update to 0.14.2.0. * gnu/packages/haskell.scm (ghc-optparse-applicative): Update to 0.14.2.0. [arguments]: Enable tests. --- gnu/packages/haskell.scm | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 759ca6044e..540c2e9ce7 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4256,7 +4256,7 @@ simple general-purpose data structure\".") (define-public ghc-optparse-applicative (package (name "ghc-optparse-applicative") - (version "0.13.0.0") + (version "0.14.2.0") (source (origin (method url-fetch) @@ -4265,15 +4265,8 @@ simple general-purpose data structure\".") "/optparse-applicative-" version ".tar.gz")) (sha256 (base32 - "1b0c5fdq8bd070g24vrjrwlq979r8dk8mys6aji9hy1l9pcv3inf")))) + "0c3z1mvynlyv1garjbdmdd3npm40dabgm75js4r07cf766c1wd71")))) (build-system haskell-build-system) - ;; These tests fail because the package doesn't come with all needed test - ;; files: - ;; - prop_drops_back_contexts - ;; - prop_context_carry - ;; - prop_help_on_empty - ;; - prop_help_on_empty_sub - (arguments `(#:tests? #f)) (inputs `(("ghc-transformers-compat" ,ghc-transformers-compat) ("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint))) -- cgit v1.2.3 From b625f3a5fbfa3badc294cdb7bc0c0399d8ca1839 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Fri, 24 Aug 2018 12:30:16 +0530 Subject: gnu: ghc-smallcheck: Update to 1.1.5. * gnu/packages/haskell.scm (ghc-smallcheck): Update to 1.1.5. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 540c2e9ce7..eefc1dc0a6 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3268,7 +3268,7 @@ This is a better maintained fork of the \"temporary\" package.") (define-public ghc-smallcheck (package (name "ghc-smallcheck") - (version "1.1.1") + (version "1.1.5") (source (origin (method url-fetch) @@ -3278,7 +3278,7 @@ This is a better maintained fork of the \"temporary\" package.") ".tar.gz")) (sha256 (base32 - "1ygrabxh40bym3grnzqyfqn96lirnxspb8cmwkkr213239y605sd")))) + "195fj7w3v03d1y1nm2ylavzrwxjcdbq0lb6zsw1dwyx5jmwfc84h")))) (build-system haskell-build-system) (inputs `(("ghc-logict" ,ghc-logict) -- cgit v1.2.3 From 7550f4b0ef250268af7b5cc97ea9e1215371cec4 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Fri, 24 Aug 2018 12:18:27 +0530 Subject: gnu: ghc-integer-logarithms: Update to 1.0.2.1. * gnu/packages/haskell.scm (ghc-integer-logarithms): Update to 1.0.2.1. [inputs]: Move ghc-quickcheck, ghc-smallcheck, ghc-tasty, ghc-tasty-hunit, ghc-tasty-quickcheck, ghc-tasty-smallcheck ... [native-inputs]: ... to here. [home-page]: Update URI. --- gnu/packages/haskell.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index eefc1dc0a6..cb4c0efef6 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5054,7 +5054,7 @@ occurrences of a substring (the first in case of overlaps) with another.") (define-public ghc-integer-logarithms (package (name "ghc-integer-logarithms") - (version "1.0.2") + (version "1.0.2.1") (source (origin (method url-fetch) @@ -5063,16 +5063,16 @@ occurrences of a substring (the first in case of overlaps) with another.") version ".tar.gz")) (sha256 (base32 - "0w5mhak181zi6qr5h2zbcs9ymaqacisp9jwk99naz6s8zz5rq1ii")))) + "1wj8kgjg5bn2yrs4zh9qfjv85cx6w998j9pi39yrbv305944mb9j")))) (build-system haskell-build-system) - (inputs - `(("ghc-tasty" ,ghc-tasty) - ("ghc-tasty-smallcheck" ,ghc-tasty-smallcheck) - ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-smallcheck" ,ghc-smallcheck) + ("ghc-tasty" ,ghc-tasty) ("ghc-tasty-hunit" ,ghc-tasty-hunit) - ("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-smallcheck" ,ghc-smallcheck))) - (home-page "https://github.com/phadej/integer-logarithms") + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) + ("ghc-tasty-smallcheck" ,ghc-tasty-smallcheck))) + (home-page "https://github.com/Bodigrim/integer-logarithms") (synopsis "Integer logarithms") (description "This package provides the following modules: -- cgit v1.2.3 From 2cad58ca6f1b1dfe23a1ca6f608df75935459b33 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Fri, 24 Aug 2018 12:43:52 +0530 Subject: gnu: ghc-scientific: Update to 0.3.6.2. * gnu/packages/haskell.scm (ghc-scientific): Update to 0.3.6.2. [inputs]: Move ghc-tasty ... [native-inputs]: ... to here. --- gnu/packages/haskell.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index cb4c0efef6..7d7d85f951 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5086,7 +5086,7 @@ in migrated modules.") (define-public ghc-scientific (package (name "ghc-scientific") - (version "0.3.5.2") + (version "0.3.6.2") (source (origin (method url-fetch) @@ -5096,14 +5096,15 @@ in migrated modules.") ".tar.gz")) (sha256 (base32 - "0msnjz7ml0zycw9bssslxbg0nigziw7vs5km4q3vjbs8jpzpkr2w")))) + "03ql2f0ac8bsl524idy9xxa3kxisb2sj3avflzw580j5hzy0m397")))) (build-system haskell-build-system) (inputs `(("ghc-integer-logarithms" ,ghc-integer-logarithms) ("ghc-text" ,ghc-text) ("ghc-hashable" ,ghc-hashable) - ("ghc-primitive" ,ghc-primitive) - ("ghc-tasty" ,ghc-tasty) + ("ghc-primitive" ,ghc-primitive))) + (native-inputs + `(("ghc-tasty" ,ghc-tasty) ("ghc-tasty-ant-xml" ,ghc-tasty-ant-xml) ("ghc-tasty-hunit" ,ghc-tasty-hunit) ("ghc-tasty-smallcheck" ,ghc-tasty-smallcheck) -- cgit v1.2.3 From 6948fa087522928b277288aa84e1b3270ca7474b Mon Sep 17 00:00:00 2001 From: Christopher Lemmer Webber Date: Sun, 26 Aug 2018 07:02:04 -0400 Subject: gnu: emacs-racket-mode: Update to commit add0190. * gnu/packages/emacs.scm (emacs-racket-mode): Update to commit add0190. --- gnu/packages/emacs.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 18aac36f02..92d02df49c 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -10025,8 +10025,8 @@ perform regression test for packages that provide font-lock rules.") (license license:gpl3+)))) (define-public emacs-racket-mode - (let ((commit "1b78827d310b6d655782b7bba0f2360c9ef34ff6") - (revision "2")) + (let ((commit "add0190d3c9bdad25fee57f8efd0460c9a45c2ec") + (revision "1")) (package (name "emacs-racket-mode") (version (string-append "0.0.2" "-" revision "." @@ -10040,7 +10040,7 @@ perform regression test for packages that provide font-lock rules.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "04mzxcg32av8p6v0pqb0si6qk5qxbrbllx6m3j16fp32bdz71sps")))) + "0bf6s4nqjfacij20x9vppdnq8fq1bf53cch6p4g8xqcqri3ms4jw")))) (build-system emacs-build-system) (arguments `(#:include '("\\.el$" "\\.rkt$"))) -- cgit v1.2.3 From 60ecc10f18117b5f1603d7e4d52add8a6427ab0d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 26 Aug 2018 16:17:31 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 8d48f358e965536f01a2d9b1e51f74d428091b90 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 26 Aug 2018 16:20:04 +0200 Subject: 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 (limited to 'gnu') 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 -- cgit v1.2.3 From 45c78bf92487fbc659593a9ae75f15281a1068b7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 26 Aug 2018 16:50:39 +0200 Subject: 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(+) (limited to 'gnu') 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 -- cgit v1.2.3 From 69502b5eb43aa6316ddf1ad2ee9a373346d0b765 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 26 Aug 2018 14:52:31 +0200 Subject: gnu: Add guile-aa-tree. * gnu/packages/guile.scm (guile-aa-tree): New variable. --- gnu/packages/guile.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index f2a252b8d3..a585dd6dc8 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -2013,6 +2013,30 @@ Vicare Scheme and IronScheme. Right now it contains: @end itemize\n") (license license:bsd-3))) +(define-public guile-aa-tree + (package + (name "guile-aa-tree") + (version "3.1.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://savannah/guile-aa-tree/guile-aa-tree-" + version ".tar.gz")) + (sha256 + (base32 + "0044c105r3q9vpl17pv3phl1b79kjm1llhkakqgiasixyav01blh")))) + (build-system guile-build-system) + (native-inputs `(("guile" ,guile-2.2))) + ;; https://savannah.nongnu.org/projects/guile-aa-tree + (home-page "https://qlfiles.net/guile-aa-tree/") + (synopsis "AA tree data structure for Guile") + (description + "This package provides an implementation of @dfn{AA trees}, a +self-balancing binary tree data structure, for Guile. It ensure @math{O(log +n)} worst case performance for core operations. The module provides +non-mutating insert, delete, and search operations, with support for +convenient nested tree operations.") + (license license:gpl3+))) + (define-public guile-simple-zmq (let ((commit "1f3b7c0b9b249c6fde8e8a632b252d8a1b794424") (revision "1")) -- cgit v1.2.3 From 1ca54999db34b0197e6c7fa3f0a852fc0d193e70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 26 Aug 2018 19:29:25 +0200 Subject: gnu: Add Lepton-EDA. * gnu/packages/engineering.scm (lepton-eda): New variable. --- gnu/packages/engineering.scm | 70 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index f11ce71f5a..3b433a1bfe 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -59,6 +59,7 @@ #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gperf) + #:use-module (gnu packages groff) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages image) @@ -76,6 +77,7 @@ #:use-module (gnu packages readline) #:use-module (gnu packages swig) #:use-module (gnu packages tcl) + #:use-module (gnu packages texinfo) #:use-module (gnu packages tls) #:use-module (gnu packages tex) #:use-module (gnu packages wxwidgets) @@ -224,6 +226,74 @@ tool to forward annotation from your schematic to layout using PCB; some minor utilities.") (license license:gpl2+))) +(define-public lepton-eda + ;; This is a fork of gEDA/gaf started in late 2016. One of its goal is to + ;; keep and to extend Guile support. + (package + (inherit geda-gaf) + (name "lepton-eda") + (version "1.9.5-20180820") + (home-page "https://github.com/lepton-eda/lepton-eda") + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) (commit version))) + (sha256 + (base32 + "1ayaccvw18zh4g7a4x5jf6yxkphi5xafb0hpc732g59qkgwfcmlr")) + (file-name (git-file-name name version)))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("gettext" ,gnu-gettext) + ("texinfo" ,texinfo) + ("groff" ,groff) + ("which" ,which) + ,@(package-native-inputs geda-gaf))) + ;; For now it's Guile 2.0, not 2.2. + (arguments + (substitute-keyword-arguments (package-arguments geda-gaf) + ((#:configure-flags flags ''()) + ;; 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 . + `(cons "ac_cv_path_MSGMERGE=true" ,flags)) + ((#:phases phases '%standard-phases) + `(modify-phases ,phases + (add-before 'bootstrap 'prepare + (lambda _ + ;; Some of the scripts there are invoked by autogen.sh. + (for-each patch-shebang (find-files "build-tools")) + + ;; Make sure 'msgmerge' can modify the PO files. + (for-each (lambda (po) + (chmod po #o666)) + (find-files "." "\\.po$")) + + ;; This would normally be created by invoking 'git', but it + ;; doesn't work here. + (call-with-output-file "version.h" + (lambda (port) + (format port "#define PACKAGE_DATE_VERSION \"~a\"~%" + ,(string-drop version + (+ 1 (string-index version #\-)))) + (format port "#define PACKAGE_DOTTED_VERSION \"~a\"~%" + ,(string-take version + (string-index version #\-))) + (format port "#define PACKAGE_GIT_COMMIT \"cabbag3\"~%"))) + #t)))))) + (description + "Lepton EDA ia an @dfn{electronic design automation} (EDA) tool set +forked from gEDA/gaf in late 2016. EDA tools are used for electrical circuit +design, schematic capture, simulation, prototyping, and production. Lepton +EDA includes tools for schematic capture, attribute management, bill of +materials (BOM) generation, netlisting into over 20 netlist formats, analog +and digital simulation, and printed circuit board (PCB) layout, and many other +features."))) + (define-public pcb (package (name "pcb") -- cgit v1.2.3 From 2aeee872a60841962ad7df7a6377ed1bc54d8260 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 27 Aug 2018 10:06:46 +0200 Subject: gnu: weston: Update to 5.0.0. * gnu/packages/freedesktop.scm (weston): Update to 5.0.0. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index c8758f7a52..41d1300fc7 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -495,7 +495,7 @@ applications, X servers (rootless or fullscreen) or other display servers.") (define-public weston (package (name "weston") - (version "4.0.0") + (version "5.0.0") (source (origin (method url-fetch) (uri (string-append @@ -503,7 +503,7 @@ applications, X servers (rootless or fullscreen) or other display servers.") "weston-" version ".tar.xz")) (sha256 (base32 - "0n2big8xw6g6n46zm1jyf00dv9r4d84visdz5b8vxpw3xzkhmz50")))) + "1bsc9ry566mpk6fdwkqpvwq2j7m79d9cvh7d3lgf6igsphik98hm")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From c0fdc5a53d8cc9df27a571834afee0467c2a04ca Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 27 Aug 2018 10:14:21 +0200 Subject: 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(-) (limited to 'gnu') 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)) -- cgit v1.2.3 From 4715f92ef0b9650cc4075c69f17aa51e84da3f21 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 27 Aug 2018 14:46:26 +0200 Subject: Update email for Pierre Neidhardt. * .mailmap: Add name and email for Pierre Neidhardt. * gnu/packages/c.scm, gnu/packages/code.scm, gnu/packages/compression.scm, gnu/packages/disk.scm, gnu/packages/emacs.scm, gnu/packages/freedesktop.scm, gnu/packages/golang.scm, gnu/packages/image.scm, gnu/packages/music.scm, gnu/packages/networking.scm, gnu/packages/password-utils.scm, gnu/packages/perl-check.scm, gnu/packages/perl.scm, gnu/packages/textutils.scm, gnu/packages/video.scm, gnu/packages/xdisorg.scm: Update email for Pierre Neidhardt. --- gnu/packages/c.scm | 2 +- gnu/packages/code.scm | 2 +- gnu/packages/compression.scm | 2 +- gnu/packages/disk.scm | 2 +- gnu/packages/emacs.scm | 2 +- gnu/packages/freedesktop.scm | 2 +- gnu/packages/golang.scm | 2 +- gnu/packages/image.scm | 2 +- gnu/packages/music.scm | 2 +- gnu/packages/networking.scm | 2 +- gnu/packages/password-utils.scm | 2 +- gnu/packages/perl-check.scm | 2 +- gnu/packages/perl.scm | 2 +- gnu/packages/textutils.scm | 2 +- gnu/packages/video.scm | 2 +- gnu/packages/xdisorg.scm | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index d82db532aa..e6df1d23c7 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2016, 2018 Ludovic Courtès ;;; Copyright © 2016, 2017 Ricardo Wurmus ;;; Copyright © 2018 Tobias Geerinckx-Rice -;;; Copyright © 2018 Pierre Neidhardt +;;; Copyright © 2018 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index ee7447b024..be178a5f99 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2017, 2018 Clément Lassieur ;;; Copyright © 2017 Andy Wingo ;;; Copyright © 2018 Fis Trivial -;;; Copyright © 2018 Pierre Neidhardt +;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2014 Mark H Weaver diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 8104b9d55c..666c9bfc3e 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -22,7 +22,7 @@ ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2018 Rutger Helling ;;; Copyright © 2018 Joshua Sierles, Nextjournal -;;; Copyright © 2018 Pierre Neidhardt +;;; Copyright © 2018 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index f1b3f265fe..c7103c565a 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2018 Vasile Dumitrascu ;;; Copyright © 2018 Eric Bavier ;;; Copyright © 2018 Rutger Helling -;;; Copyright © 2018 Pierre Neidhardt +;;; Copyright © 2018 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 92d02df49c..5150705963 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -34,7 +34,7 @@ ;;; Copyright © 2017, 2018 Maxim Cournoyer ;;; Copyright © 2018 Sohom Bhattacharjee ;;; Copyright © 2018 Mathieu Lirzin -;;; Copyright © 2018 Pierre Neidhardt +;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Tim Gesthuizen ;;; Copyright © 2018 Jack Hill ;;; Copyright © 2018 Pierre-Antoine Rouby diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 41d1300fc7..626d883648 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2017, 2018 Rutger Helling ;;; Copyright © 2017 Brendan Tildesley ;;; Copyright © 2018 Tobias Geerinckx-Rice -;;; Copyright © 2018 Pierre Neidhardt +;;; Copyright © 2018 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 20b203aa6f..b4a088a051 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2018 Christopher Baines ;;; Copyright © 2018 Tomáš Čech ;;; Copyright © 2018 Pierre-Antoine Rouby -;;; Copyright © 2018 Pierre Neidhardt +;;; Copyright © 2018 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index e50802d24f..81d22ed42d 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -18,7 +18,7 @@ ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2018 Joshua Sierles, Nextjournal ;;; Copyright © 2018 Fis Trivial -;;; Copyright © 2018 Pierre Neidhardt +;;; Copyright © 2018 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index af2dcf8eaf..edffcfce96 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -16,7 +16,7 @@ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 nee ;;; Copyright © 2018 Stefan Reichör -;;; Copyright © 2018 Pierre Neidhardt +;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 95cdd5c513..943bcecb86 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -25,7 +25,7 @@ ;;; Copyright © 2018 Theodoros Foradis ;;; Copyright © 2018 Marius Bakke ;;; Copyright © 2018 Oleg Pykhalov -;;; Copyright © 2018 Pierre Neidhardt +;;; Copyright © 2018 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index a63fd9bb36..e09bbea5cc 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2018 Konrad Hinsen ;;; Copyright © 2018 Thomas Sigurdsen ;;; Copyright © 2018 Arun Isaac -;;; Copyright © 2018 Pierre Neidhardt +;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Amirouche Boubekki ;;; ;;; This file is part of GNU Guix. diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index a2900c34c0..16010b441f 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2017 Petter ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Oleg Pykhalov -;;; Copyright © 2018 Pierre Neidhardt +;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Kei Kebreau ;;; ;;; This file is part of GNU Guix. diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 9f62608860..a2d368306a 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017 Christopher Allan Webber ;;; Copyright © 2018 Oleg Pykhalov -;;; Copyright © 2018 Pierre Neidhardt +;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Kei Kebreau ;;; ;;; This file is part of GNU Guix. diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 355683df8a..ce34423713 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2017 Kei Kebreau ;;; Copyright © 2017 Alex Vong ;;; Copyright © 2018 Tobias Geerinckx-Rice -;;; Copyright © 2018 Pierre Neidhardt +;;; Copyright © 2018 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 01e41b1914..6825cd7d2d 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -24,7 +24,7 @@ ;;; Copyright © 2017, 2018 Rutger Helling ;;; Copyright © 2018 Roel Janssen ;;; Copyright © 2018 Marius Bakke -;;; Copyright © 2018 Pierre Neidhardt +;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Leo Famulari ;;; Copyright © 2018 Brendan Tildesley ;;; Copyright © 2018 Arun Isaac diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 169cc720f5..7c326eb8d0 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -23,7 +23,7 @@ ;;; Copyright © 2017 Mike Gerwitz ;;; Copyright © 2018 Thomas Sigurdsen ;;; Copyright © 2018 Rutger Helling -;;; Copyright © 2018 Pierre Neidhardt +;;; Copyright © 2018 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; -- cgit v1.2.3 From d7c82e8e030c777750aec790ef7255cf5afcf3af Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Aug 2018 16:05:11 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From a30cbd5dfb57681bf381ead54263def2d0236536 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Lassieur?= Date: Mon, 27 Aug 2018 16:06:51 +0200 Subject: gnu: cuirass: Update to 8d40c49. * gnu/packages/ci.scm (cuirass): Update to 8d40c49. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 599fd8cbbc..e26983da3b 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -185,8 +185,8 @@ their dependencies.") (license l:gpl3+)))) (define-public cuirass - (let ((commit "4db99f647b3677086a2007763726d05a59b0cdcb") - (revision "18")) + (let ((commit "8d40c49170971ad7bbf8b97336934dbb3d949fc1") + (revision "19")) (package (name "cuirass") (version (string-append "0.0.1-" revision "." (string-take commit 7))) @@ -198,7 +198,7 @@ their dependencies.") (file-name (string-append name "-" version)) (sha256 (base32 - "1lg3w0xjg6b806y8gfxj2dq1g0djm5pyk886j8g7n5n9ljlhjzxj")))) + "0xxcapf9ag3zx6131v128vhin5m2j3w2gjbjbpdwr0qkaysh0gvf")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From e30fc54637c3e47a1e0ab30a5b5f9f35f4c70071 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Aug 2018 16:28:06 +0200 Subject: 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(-) (limited to 'gnu') 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)) -- cgit v1.2.3 From 74f3fdbdb3738e191b8723df9132f5d33d9dd11e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Aug 2018 16:30:02 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From b49e1e81db2234ea408b903d1cdf9c93434e237c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Aug 2018 16:33:48 +0200 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From 397334d9777592176608184adc5e59d2494719ea Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Aug 2018 16:49:05 +0200 Subject: 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 - .../patches/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 (limited to 'gnu') 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 2575d6f612..0000000000 Binary files a/gnu/packages/patches/python-pillow-fix-failing-tests.patch and /dev/null differ diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a761fcfc22..6730dc3f1b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3930,19 +3930,17 @@ the OleFileIO module from PIL, the Python Image Library.") (define-public python-pillow (package (name "python-pillow") - (version "4.3.0") + (version "5.2.0") (source (origin (method url-fetch) (uri (pypi-uri "Pillow" version)) (sha256 (base32 - "09xmn7rl6840sli2iz1k3fgxfgmri2nqz6vkinmb9mgg8ifp2z59")) - (patch-flags '("-p1" "--binary")) - (patches (search-patches "python-pillow-fix-failing-tests.patch")))) + "1ary9mj2ddllq3lkxgn6aac7qxqiwbcg2pacrl94py58ql9x9czq")))) (build-system python-build-system) (native-inputs - `(("python-nose" ,python-nose))) + `(("python-pytest" ,python-pytest))) (inputs `(("freetype" ,freetype) ("lcms" ,lcms) @@ -3963,9 +3961,8 @@ the OleFileIO module from PIL, the Python Image Library.") ;; Make installed package available for running the ;; tests (add-installed-pythonpath inputs outputs) - (and (zero? (system* "python" "selftest.py" - "--installed")) - (zero? (system* "python" "test-installed.py")))))) + (invoke "python" "selftest.py" "--installed") + (invoke "python" "-m" "pytest" "-vv")))) (delete 'check)))) (home-page "https://pypi.python.org/pypi/Pillow") (synopsis "Fork of the Python Imaging Library") -- cgit v1.2.3 From 4053585e3f4d85a8c51ca2152e63f700d42bc5a5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Aug 2018 17:13:07 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From b651a5ab35414da54887780d03ea786ad4c894f2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Aug 2018 18:28:29 +0200 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From cbc8a92011d3a439b25201039941aac803870ec2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Aug 2018 19:48:55 +0200 Subject: 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 +- gnu/packages/patches/cairo-setjmp-wrapper.patch | 78 +++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/cairo-setjmp-wrapper.patch (limited to 'gnu') 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); + -- cgit v1.2.3 From eb637c64fe059ba9c3c0456f4cb5dc55124e1e49 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Aug 2018 20:31:06 +0200 Subject: 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(-) (limited to 'gnu') 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. -- cgit v1.2.3 From 1abe0554a4a19966b029f09afb7545209f8faca6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Aug 2018 20:06:46 +0200 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From a1d3874293fb210250cbd9b39e1b49b71b1c06b0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Aug 2018 20:37:10 +0200 Subject: 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(-) (limited to 'gnu') 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))) -- cgit v1.2.3 From 57dac1ee935edfab91e9b182c1f7c9ddae794656 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Aug 2018 20:15:08 +0200 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From 6635a3cc7f92a0c2b389761ecc599f5922186cf9 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 27 Aug 2018 15:12:04 -0400 Subject: gnu: python-pygit2: Update to 0.26.4. * gnu/packages/python.scm (python-pygit2, python2-pygit2): Update to 0.26.4. [source]: Remove 'python-pygit2-disable-network-tests.patch'. * gnu/packages/patches/python-pygit2-disable-network-tests.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - .../python-pygit2-disable-network-tests.patch | 43 ---------------------- gnu/packages/python.scm | 6 +-- 3 files changed, 2 insertions(+), 48 deletions(-) delete mode 100644 gnu/packages/patches/python-pygit2-disable-network-tests.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index b1bd1c089c..d0e84c5972 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1087,7 +1087,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-mox3-python3.6-compat.patch \ %D%/packages/patches/python-paste-remove-website-test.patch \ %D%/packages/patches/python-paste-remove-timing-test.patch \ - %D%/packages/patches/python-pygit2-disable-network-tests.patch \ %D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \ %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ %D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \ diff --git a/gnu/packages/patches/python-pygit2-disable-network-tests.patch b/gnu/packages/patches/python-pygit2-disable-network-tests.patch deleted file mode 100644 index 5578e4c375..0000000000 --- a/gnu/packages/patches/python-pygit2-disable-network-tests.patch +++ /dev/null @@ -1,43 +0,0 @@ -Disable tests trying to look up remote servers. - -diff --git a/test/test_credentials.py b/test/test_credentials.py ---- a/test/test_credentials.py -+++ b/test/test_credentials.py -@@ -68,6 +68,7 @@ class CredentialCreateTest(utils.NoRepoTestCase): - self.assertEqual((username, None, None, None), cred.credential_tuple) - - -+@unittest.skipIf(True, "network tests are not supported in Guix") - class CredentialCallback(utils.RepoTestCase): - def test_callback(self): - class MyCallbacks(pygit2.RemoteCallbacks): -@@ -92,6 +93,7 @@ class CredentialCallback(utils.RepoTestCase): - remote = self.repo.create_remote("github", url) - self.assertRaises(TypeError, lambda: remote.fetch(callbacks=MyCallbacks())) - -+@unittest.skipIf(True, "network tests are not supported in Guix") - class CallableCredentialTest(utils.RepoTestCase): - - def test_user_pass(self): -diff --git a/test/test_repository.py b/test/test_repository.py ---- a/test/test_repository.py -+++ b/test/test_repository.py -@@ -573,6 +573,7 @@ class CloneRepositoryTest(utils.NoRepoTestCase): - self.assertTrue('refs/remotes/custom_remote/master' in repo.listall_references()) - self.assertIsNotNone(repo.remotes["custom_remote"]) - -+ @unittest.skipIf(True, "network tests are not supported in Guix") - def test_clone_with_credentials(self): - repo = clone_repository( - "https://bitbucket.org/libgit2/testgitrepository.git", -diff --git a/test/test_submodule.py b/test/test_submodule.py ---- a/test/test_submodule.py -+++ b/test/test_submodule.py -@@ -42,6 +42,7 @@ SUBM_PATH = 'submodule' - SUBM_URL = 'https://github.com/libgit2/pygit2' - SUBM_HEAD_SHA = '819cbff552e46ac4b8d10925cc422a30aa04e78e' - -+@unittest.skipIf(True, "network tests are not supported in Guix") - class SubmoduleTest(utils.SubmoduleRepoTestCase): - - def test_lookup_submodule(self): diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 3c46102da1..6ab6763a96 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3265,16 +3265,14 @@ association studies (GWAS) on extremely large data sets.") (define-public python-pygit2 (package (name "python-pygit2") - (version "0.26.0") + (version "0.26.4") (source (origin (method url-fetch) (uri (pypi-uri "pygit2" version)) (sha256 (base32 - "1cbc488ra3kg7r3qky17ms0szi3cda2d96qfkv1l9djsy9hnvw57")) - (patches - (search-patches "python-pygit2-disable-network-tests.patch")))) + "145k3fsd21274swia7mcc7n3kzlbd47xmg55mxsjdb5d9b7fr858")))) (build-system python-build-system) (propagated-inputs `(("python-six" ,python-six) -- cgit v1.2.3 From f2d2dc70fcc65703562ee09aaab13372f09f267c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 27 Aug 2018 16:57:37 -0400 Subject: gnu: libexif: Update home-page URL. * gnu/packages/photo.scm (libexif)[home-page]: Update URL. --- gnu/packages/photo.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 5b5ec89fc2..3fd3d0854b 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -109,7 +109,7 @@ cameras (CRW/CR2, NEF, RAF, DNG, and others).") (base32 "06nlsibr3ylfwp28w8f5466l6drgrnydgxrm4jmxzrmk5svaxk8n")))) (build-system gnu-build-system) - (home-page "http://libexif.sourceforge.net/") + (home-page "https://libexif.github.io/") (synopsis "Read and manipulate EXIF data in digital photographs") (description "The libexif C library allows applications to read, edit, and save EXIF -- cgit v1.2.3 From 0de33cb364a75c15d3ffad84f980e629d8753d60 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 27 Aug 2018 16:59:06 -0400 Subject: gnu: feh: Enable EXIF support. * gnu/packages/image-viewers.scm (feh)[arguments]: Enable EXIF support. (inputs): Add libexif. --- gnu/packages/image-viewers.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 3410880a67..87546045a6 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -74,12 +74,14 @@ '(#:phases (modify-phases %standard-phases (delete 'configure)) #:test-target "test" #:make-flags - (list "CC=gcc" (string-append "PREFIX=" (assoc-ref %outputs "out"))))) + (list "CC=gcc" (string-append "PREFIX=" (assoc-ref %outputs "out")) + "exif=1"))) (native-inputs `(("perl" ,perl) ("perl-test-command" ,perl-test-command))) (inputs `(("imlib2" ,imlib2) ("curl" ,curl) + ("libexif" ,libexif) ("libpng" ,libpng) ("libxt" ,libxt) ("libx11" ,libx11) -- cgit v1.2.3 From 3c3c3d1d92a6eca36cb79fb4edd4fd874ed6b842 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 26 Aug 2018 00:51:24 +0200 Subject: gnu: emacs-async: Download using git. The MELPA tarball hash changed. Prevent this problem in the future by downloading a git checkout. * gnu/packages/emacs.scm (emacs-async)[home-page]: Update to actual. [source]: Use GIT-FETCH. --- gnu/packages/emacs.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 5150705963..8665356f5c 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1179,16 +1179,18 @@ rather than the contents of files.") (define-public emacs-async (package (name "emacs-async") + (home-page "https://github.com/jwiegley/emacs-async") (version "1.9.3") (source (origin - (method url-fetch) - (uri (string-append "https://stable.melpa.org/packages/async-" - version ".tar")) + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0xvi50y96y2qh81qkhj8p6ar1xnfasg58qvlsvgvvmdf4g8srlij")))) + "1zsnb6dy8p6y68xgidv3dfxaga4biramfw8fq7wac0sc50vc98vq")))) (build-system emacs-build-system) - (home-page "https://elpa.gnu.org/packages/async.html") (synopsis "Asynchronous processing in Emacs") (description "This package provides the ability to call asynchronous functions and -- cgit v1.2.3 From eb87b634a7723111bdbc84f1971fe64bc96a8963 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 26 Aug 2018 01:19:02 +0200 Subject: gnu: slang: Update to 2.3.2. * gnu/packages/slang.scm (slang): Update to 2.3.2. --- gnu/packages/slang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/slang.scm b/gnu/packages/slang.scm index f9956d0113..24eb5fa137 100644 --- a/gnu/packages/slang.scm +++ b/gnu/packages/slang.scm @@ -37,14 +37,14 @@ (define-public slang (package (name "slang") - (version "2.3.1a") + (version "2.3.2") (source (origin (method url-fetch) (uri (string-append "http://www.jedsoft.org/releases/slang/slang-" version ".tar.bz2")) (sha256 (base32 - "0dlcy0hn0j6cj9qj5x6hpb0axifnvzzmv5jqq0wq14fygw0c7w2l")) + "06p379fqn6w38rdpqi98irxi2bf4llb0rja3dlgkqz7nqh7kp7pw")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 2987b2e0d2dba6569799452353890ce5e967898d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Aug 2018 22:34:16 +0200 Subject: gnu: seabios: Update source URI. * gnu/packages/firmware.scm (seabios)[source](uri): Download from seabios.org. --- gnu/packages/firmware.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 176eef5137..0b5a82e9e5 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -188,7 +188,7 @@ by the b43-open driver of Linux-libre.") (version "1.11.0") (source (origin (method url-fetch) - (uri (string-append "https://code.coreboot.org/p/seabios/downloads/get/" + (uri (string-append "https://www.seabios.org/downloads/" "seabios-" version ".tar.gz")) (sha256 (base32 -- cgit v1.2.3 From 526ce419303ac511be8d51b41471022bed472e6b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 28 Aug 2018 00:18:34 +0200 Subject: gnu: GRUB: Check for errors from efibootmgr. * gnu/packages/patches/grub-check-error-efibootmgr.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/bootloaders.scm (grub)[source](patches): New field. --- gnu/local.mk | 1 + gnu/packages/bootloaders.scm | 3 +- .../patches/grub-check-error-efibootmgr.patch | 176 +++++++++++++++++++++ 3 files changed, 179 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/grub-check-error-efibootmgr.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index d0e84c5972..a2e538570b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -769,6 +769,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-check-error-efibootmgr.patch \ %D%/packages/patches/gsl-test-i686.patch \ %D%/packages/patches/gspell-dash-test.patch \ %D%/packages/patches/guile-1.8-cpp-4.5.patch \ diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 727789a96e..e9abf399ab 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -85,7 +85,8 @@ (uri (string-append "mirror://gnu/grub/grub-" version ".tar.xz")) (sha256 (base32 - "03vvdfhdmf16121v7xs8is2krwnv15wpkhkf16a4yf8nsfc3f2w1")))) + "03vvdfhdmf16121v7xs8is2krwnv15wpkhkf16a4yf8nsfc3f2w1")) + (patches (search-patches "grub-check-error-efibootmgr.patch")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/patches/grub-check-error-efibootmgr.patch b/gnu/packages/patches/grub-check-error-efibootmgr.patch new file mode 100644 index 0000000000..b2fd160c9a --- /dev/null +++ b/gnu/packages/patches/grub-check-error-efibootmgr.patch @@ -0,0 +1,176 @@ +Without this patch, GRUB may proceed to wipe all firmware boot entries +and report a successful installation, even if efibootmgr hit an error. + +Origin URL: +https://git.sv.gnu.org/cgit/grub.git/commit/?id=6400613ad0b463abc93362086a491cd2a5e99b0d + +From 6400613ad0b463abc93362086a491cd2a5e99b0d Mon Sep 17 00:00:00 2001 +From: Steve McIntyre +Date: Wed, 31 Jan 2018 21:49:36 +0000 +Subject: Make grub-install check for errors from efibootmgr + +Code is currently ignoring errors from efibootmgr, giving users +clearly bogus output like: + + Setting up grub-efi-amd64 (2.02~beta3-4) ... + Installing for x86_64-efi platform. + Could not delete variable: No space left on device + Could not prepare Boot variable: No space left on device + Installation finished. No error reported. + +and then potentially unbootable systems. If efibootmgr fails, grub-install +should know that and report it! + +We've been using similar patch in Debian now for some time, with no ill effects. + +diff --git a/grub-core/osdep/unix/platform.c b/grub-core/osdep/unix/platform.c +index a3fcfca..ca448bc 100644 +--- a/grub-core/osdep/unix/platform.c ++++ b/grub-core/osdep/unix/platform.c +@@ -78,19 +78,20 @@ get_ofpathname (const char *dev) + dev); + } + +-static void ++static int + grub_install_remove_efi_entries_by_distributor (const char *efi_distributor) + { + int fd; + pid_t pid = grub_util_exec_pipe ((const char * []){ "efibootmgr", NULL }, &fd); + char *line = NULL; + size_t len = 0; ++ int rc; + + if (!pid) + { + grub_util_warn (_("Unable to open stream from %s: %s"), + "efibootmgr", strerror (errno)); +- return; ++ return errno; + } + + FILE *fp = fdopen (fd, "r"); +@@ -98,7 +99,7 @@ grub_install_remove_efi_entries_by_distributor (const char *efi_distributor) + { + grub_util_warn (_("Unable to open stream from %s: %s"), + "efibootmgr", strerror (errno)); +- return; ++ return errno; + } + + line = xmalloc (80); +@@ -119,23 +120,25 @@ grub_install_remove_efi_entries_by_distributor (const char *efi_distributor) + bootnum = line + sizeof ("Boot") - 1; + bootnum[4] = '\0'; + if (!verbosity) +- grub_util_exec ((const char * []){ "efibootmgr", "-q", ++ rc = grub_util_exec ((const char * []){ "efibootmgr", "-q", + "-b", bootnum, "-B", NULL }); + else +- grub_util_exec ((const char * []){ "efibootmgr", ++ rc = grub_util_exec ((const char * []){ "efibootmgr", + "-b", bootnum, "-B", NULL }); + } + + free (line); ++ return rc; + } + +-void ++int + grub_install_register_efi (grub_device_t efidir_grub_dev, + const char *efifile_path, + const char *efi_distributor) + { + const char * efidir_disk; + int efidir_part; ++ int ret; + efidir_disk = grub_util_biosdisk_get_osdev (efidir_grub_dev->disk); + efidir_part = efidir_grub_dev->disk->partition ? efidir_grub_dev->disk->partition->number + 1 : 1; + +@@ -151,23 +154,26 @@ grub_install_register_efi (grub_device_t efidir_grub_dev, + grub_util_exec ((const char * []){ "modprobe", "-q", "efivars", NULL }); + #endif + /* Delete old entries from the same distributor. */ +- grub_install_remove_efi_entries_by_distributor (efi_distributor); ++ ret = grub_install_remove_efi_entries_by_distributor (efi_distributor); ++ if (ret) ++ return ret; + + char *efidir_part_str = xasprintf ("%d", efidir_part); + + if (!verbosity) +- grub_util_exec ((const char * []){ "efibootmgr", "-q", ++ ret = grub_util_exec ((const char * []){ "efibootmgr", "-q", + "-c", "-d", efidir_disk, + "-p", efidir_part_str, "-w", + "-L", efi_distributor, "-l", + efifile_path, NULL }); + else +- grub_util_exec ((const char * []){ "efibootmgr", ++ ret = grub_util_exec ((const char * []){ "efibootmgr", + "-c", "-d", efidir_disk, + "-p", efidir_part_str, "-w", + "-L", efi_distributor, "-l", + efifile_path, NULL }); + free (efidir_part_str); ++ return ret; + } + + void +diff --git a/include/grub/util/install.h b/include/grub/util/install.h +index 5910b0c..0dba8b6 100644 +--- a/include/grub/util/install.h ++++ b/include/grub/util/install.h +@@ -210,7 +210,7 @@ grub_install_create_envblk_file (const char *name); + const char * + grub_install_get_default_x86_platform (void); + +-void ++int + grub_install_register_efi (grub_device_t efidir_grub_dev, + const char *efifile_path, + const char *efi_distributor); +diff --git a/util/grub-install.c b/util/grub-install.c +index 5e4cdfd..690f180 100644 +--- a/util/grub-install.c ++++ b/util/grub-install.c +@@ -1848,9 +1848,13 @@ main (int argc, char *argv[]) + if (!removable && update_nvram) + { + /* Try to make this image bootable using the EFI Boot Manager, if available. */ +- grub_install_register_efi (efidir_grub_dev, +- "\\System\\Library\\CoreServices", +- efi_distributor); ++ int ret; ++ ret = grub_install_register_efi (efidir_grub_dev, ++ "\\System\\Library\\CoreServices", ++ efi_distributor); ++ if (ret) ++ grub_util_error (_("efibootmgr failed to register the boot entry: %s"), ++ strerror (ret)); + } + + grub_device_close (ins_dev); +@@ -1871,6 +1875,7 @@ main (int argc, char *argv[]) + { + char * efifile_path; + char * part; ++ int ret; + + /* Try to make this image bootable using the EFI Boot Manager, if available. */ + if (!efi_distributor || efi_distributor[0] == '\0') +@@ -1887,8 +1892,11 @@ main (int argc, char *argv[]) + efidir_grub_dev->disk->name, + (part ? ",": ""), (part ? : "")); + grub_free (part); +- grub_install_register_efi (efidir_grub_dev, +- efifile_path, efi_distributor); ++ ret = grub_install_register_efi (efidir_grub_dev, ++ efifile_path, efi_distributor); ++ if (ret) ++ grub_util_error (_("efibootmgr failed to register the boot entry: %s"), ++ strerror (ret)); + } + break; + -- cgit v1.2.3 From 8f1022d0a85a1f42a156b2319513baf0e0d2e827 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Aug 2018 21:38:23 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From d9362003b6cbbc77d2cab838aa06514aef6ac4f2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 28 Aug 2018 00:39:11 +0200 Subject: 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 +- gnu/packages/patches/grub-binutils-compat.patch | 53 +++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/grub-binutils-compat.patch (limited to 'gnu') 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 + } + }, -- cgit v1.2.3 From 5dfd80e1c5c9803a281804801592d191cf9148ae Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Sun, 22 Jul 2018 16:23:53 -0700 Subject: services: tor: Add a system test. * gnu/services/networking.scm (tor-configuration->torrc): Set PidFile to /var/run/tor/tor.pid in the base torrc configuration. (tor-shepherd-service) : Call make-forkexec-constructor/container with a new #:pid-file argument to tell Shepherd where to find the PID file. Add a a new to its existing #:mappings argument to share /var/run/tor with the the container. (tor-hidden-services-activation): Update docstring. Create /var/run/tor and set its permissions so only the tor user can access it. * gnu/tests/networking.scm (%test-tor, %tor-os): New variables. (run-tor-test): New procedure. --- gnu/services/networking.scm | 22 +++++++++++++++--- gnu/tests/networking.scm | 56 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 74 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index d5d0cf9d1d..66772e48b7 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Chris Marusich ;;; ;;; This file is part of GNU Guix. ;;; @@ -612,6 +613,7 @@ demand."))) ### These lines were generated from your system configuration: User tor DataDirectory /var/lib/tor +PidFile /var/run/tor/tor.pid Log notice syslog\n" port) (for-each (match-lambda @@ -639,7 +641,7 @@ HiddenServicePort ~a ~a~%" #t)))))))) (define (tor-shepherd-service config) - "Return a running TOR." + "Return a running Tor." (match config (($ tor) (let ((torrc (tor-configuration->torrc config))) @@ -665,12 +667,17 @@ HiddenServicePort ~a ~a~%" (writable? #t)) (file-system-mapping (source "/dev/log") ;for syslog - (target source))))) + (target source)) + (file-system-mapping + (source "/var/run/tor") + (target source) + (writable? #t))) + #:pid-file "/var/run/tor/tor.pid")) (stop #~(make-kill-destructor)) (documentation "Run the Tor anonymous network overlay.")))))))) (define (tor-hidden-service-activation config) - "Return the activation gexp for SERVICES, a list of hidden services." + "Set up directories for Tor and its hidden services, if any." #~(begin (use-modules (guix build utils)) @@ -686,6 +693,15 @@ HiddenServicePort ~a ~a~%" ;; The daemon bails out if we give wider permissions. (chmod directory #o700))) + ;; Allow Tor to write its PID file. + (mkdir-p "/var/run/tor") + (chown "/var/run/tor" (passwd:uid %user) (passwd:gid %user)) + ;; Set the group permissions to rw so that if the system administrator + ;; has specified UnixSocksGroupWritable=1 in their torrc file, members + ;; of the "tor" group will be able to use the SOCKS socket. + (chmod "/var/run/tor" #o750) + + ;; Allow Tor to access the hidden services' directories. (mkdir-p "/var/lib/tor") (chown "/var/lib/tor" (passwd:uid %user) (passwd:gid %user)) (chmod "/var/lib/tor" #o700) diff --git a/gnu/tests/networking.scm b/gnu/tests/networking.scm index 323679e7fc..5e54edc462 100644 --- a/gnu/tests/networking.scm +++ b/gnu/tests/networking.scm @@ -30,7 +30,7 @@ #:use-module (gnu packages bash) #:use-module (gnu packages networking) #:use-module (gnu services shepherd) - #:export (%test-inetd %test-openvswitch %test-dhcpd)) + #:export (%test-inetd %test-openvswitch %test-dhcpd %test-tor)) (define %inetd-os ;; Operating system with 2 inetd services. @@ -339,3 +339,57 @@ subnet 192.168.1.0 netmask 255.255.255.0 { (name "dhcpd") (description "Test a running DHCP daemon configuration.") (value (run-dhcpd-test)))) + + +;;; +;;; Services related to Tor +;;; + +(define %tor-os + (simple-operating-system + (tor-service))) + +(define (run-tor-test) + (define os + (marionette-operating-system %tor-os + #:imported-modules '((gnu services herd)) + #:requirements '(tor))) + + (define test + (with-imported-modules '((gnu build marionette)) + #~(begin + (use-modules (gnu build marionette) + (ice-9 popen) + (ice-9 rdelim) + (srfi srfi-64)) + + (define marionette + (make-marionette (list #$(virtual-machine os)))) + + (mkdir #$output) + (chdir #$output) + + (test-begin "tor") + + (test-assert "tor is alive" + (marionette-eval + '(begin + (use-modules (gnu services herd) + (srfi srfi-1)) + (live-service-running + (find (lambda (live) + (memq 'tor + (live-service-provision live))) + (current-services)))) + marionette)) + + (test-end) + (exit (= (test-runner-fail-count (test-runner-current)) 0))))) + + (gexp->derivation "tor-test" test)) + +(define %test-tor + (system-test + (name "tor") + (description "Test a running Tor daemon configuration.") + (value (run-tor-test)))) -- cgit v1.2.3 From d973915e4842b8b1bfc2266ed42d3b8c2ca77e93 Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Wed, 25 Jul 2018 02:51:41 -0700 Subject: services: tor: Rename activation procedure. * gnu/services/networking.scm: Rename the procedure tor-hidden-service-activation to tor-activation. --- gnu/services/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index 66772e48b7..b7f2bfe7b3 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -676,7 +676,7 @@ HiddenServicePort ~a ~a~%" (stop #~(make-kill-destructor)) (documentation "Run the Tor anonymous network overlay.")))))))) -(define (tor-hidden-service-activation config) +(define (tor-activation config) "Set up directories for Tor and its hidden services, if any." #~(begin (use-modules (guix build utils)) @@ -721,7 +721,7 @@ HiddenServicePort ~a ~a~%" (service-extension account-service-type (const %tor-accounts)) (service-extension activation-service-type - tor-hidden-service-activation))) + tor-activation))) ;; This can be extended with hidden services. (compose concatenate) -- cgit v1.2.3 From 4dd53a83b5292d4e90ca221d6bcf03350ed8dc45 Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Mon, 30 Jul 2018 22:47:43 -0700 Subject: marionette: Add support for QEMU's "quit" command. * gnu/build/marionette.scm (marionette-control): Don't wait for the monitor prompt when the command was "quit". --- gnu/build/marionette.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/build/marionette.scm b/gnu/build/marionette.scm index bb018fc9c1..61284b8980 100644 --- a/gnu/build/marionette.scm +++ b/gnu/build/marionette.scm @@ -222,7 +222,8 @@ pcsys_monitor\")." (($ _ _ monitor) (display command monitor) (newline monitor) - (wait-for-monitor-prompt monitor)))) + ;; The "quit" command terminates QEMU immediately, with no output. + (unless (string=? command "quit") (wait-for-monitor-prompt monitor))))) (define* (marionette-screen-text marionette #:key -- cgit v1.2.3 From cb29343940dfffe8863c0a6b1e2b3494c7836b53 Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Mon, 30 Jul 2018 22:50:16 -0700 Subject: marionette: Add wait-for-unix-socket. * gnu/build/marionette.scm (wait-for-unix-socket): New variable. --- gnu/build/marionette.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/build/marionette.scm b/gnu/build/marionette.scm index 61284b8980..f94eab5cc0 100644 --- a/gnu/build/marionette.scm +++ b/gnu/build/marionette.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017, 2018 Ludovic Courtès +;;; Copyright © 2018 Chris Marusich ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,6 +28,7 @@ marionette-eval wait-for-file wait-for-tcp-port + wait-for-unix-socket marionette-control marionette-screen-text wait-for-screen-text @@ -214,6 +216,29 @@ MARIONETTE. Raise an error on failure." ('failure (error "nobody's listening on port" port)))) +(define* (wait-for-unix-socket file-name marionette + #:key (timeout 20)) + "Wait for up to TIMEOUT seconds for FILE-NAME, a Unix domain socket, to +accept connections in MARIONETTE. Raise an error on failure." + (match (marionette-eval + `(begin + (let ((sock (socket PF_UNIX SOCK_STREAM 0))) + (let loop ((i 0)) + (catch 'system-error + (lambda () + (connect sock AF_UNIX ,file-name) + 'success) + (lambda args + (if (< i ,timeout) + (begin + (sleep 1) + (loop (+ 1 i))) + 'failure)))))) + marionette) + ('success #t) + ('failure + (error "nobody's listening on unix domain socket" file-name)))) + (define (marionette-control command marionette) "Run COMMAND in the QEMU monitor of MARIONETTE. COMMAND is a string such as \"sendkey ctrl-alt-f1\" or \"screendump foo.ppm\" (info \"(qemu-doc) -- cgit v1.2.3 From b0f951e4f04766892933e3b60d1b24ab3a8589c2 Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Mon, 30 Jul 2018 22:53:47 -0700 Subject: tests: tor: Add more test cases. * gnu/tests/networking.scm (%tor-os/unix-socks-socket): New variable. (run-tor-test) : New variables. <"tor is alive">: Move common code from this test case... : ...into this new procedure. <"tor is listening", "tor is alive, even when using a SOCKS socket"> <"tor is listening, even when using a SOCKS socket">: New test cases. --- gnu/tests/networking.scm | 59 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 53 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/tests/networking.scm b/gnu/tests/networking.scm index 5e54edc462..7ca71f0c2c 100644 --- a/gnu/tests/networking.scm +++ b/gnu/tests/networking.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017 Marius Bakke +;;; Copyright © 2018 Chris Marusich ;;; ;;; This file is part of GNU Guix. ;;; @@ -349,12 +350,29 @@ subnet 192.168.1.0 netmask 255.255.255.0 { (simple-operating-system (tor-service))) +(define %tor-os/unix-socks-socket + (simple-operating-system + (service tor-service-type + (tor-configuration + (config-file + (plain-file "test-torrc" + "\ +SocksPort unix:/var/run/tor/socks-sock +UnixSocksGroupWritable 1 +") + ))))) + (define (run-tor-test) (define os (marionette-operating-system %tor-os #:imported-modules '((gnu services herd)) #:requirements '(tor))) + (define os/unix-socks-socket + (marionette-operating-system %tor-os/unix-socks-socket + #:imported-modules '((gnu services herd)) + #:requirements '(tor))) + (define test (with-imported-modules '((gnu build marionette)) #~(begin @@ -366,12 +384,7 @@ subnet 192.168.1.0 netmask 255.255.255.0 { (define marionette (make-marionette (list #$(virtual-machine os)))) - (mkdir #$output) - (chdir #$output) - - (test-begin "tor") - - (test-assert "tor is alive" + (define (tor-is-alive? marionette) (marionette-eval '(begin (use-modules (gnu services herd) @@ -383,6 +396,40 @@ subnet 192.168.1.0 netmask 255.255.255.0 { (current-services)))) marionette)) + (mkdir #$output) + (chdir #$output) + + (test-begin "tor") + + ;; Test the usual Tor service. + + (test-assert "tor is alive" + (tor-is-alive? marionette)) + + (test-assert "tor is listening" + (let ((default-port 9050)) + (wait-for-tcp-port default-port marionette))) + + ;; Don't run two VMs at once. + (marionette-control "quit" marionette) + + ;; Test the Tor service using a SOCKS socket. + + (let* ((socket-directory "/tmp/more-sockets") + (_ (mkdir socket-directory)) + (marionette/unix-socks-socket + (make-marionette + (list #$(virtual-machine os/unix-socks-socket)) + ;; We can't use the same socket directory as the first + ;; marionette. + #:socket-directory socket-directory))) + (test-assert "tor is alive, even when using a SOCKS socket" + (tor-is-alive? marionette/unix-socks-socket)) + + (test-assert "tor is listening, even when using a SOCKS socket" + (wait-for-unix-socket "/var/run/tor/socks-sock" + marionette/unix-socks-socket))) + (test-end) (exit (= (test-runner-fail-count (test-runner-current)) 0))))) -- cgit v1.2.3 From 3bcb305b98e02f6c9d98e7325813fc00f18f0e6c Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Tue, 31 Jul 2018 01:13:48 -0700 Subject: services: tor: Make it easier to use UNIX sockets. * doc/guix.texi (Networking Services): Document it, and mention that tor-service is deprecated. * gnu/services/networking.scm () : New field. (tor-configuration->torrc): When socks-socket-type is 'unix, set SocksPort to UNIX domain socket /var/run/tor/socks-sock and set UnixSocksGroupWritable to 1. * gnu/tests/networking.scm (%tor-os/unix-socks-socket): Instead of using a custom config file, just set socks-socket-type to 'unix. --- gnu/services/networking.scm | 10 ++++++++-- gnu/tests/networking.scm | 8 +------- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index b7f2bfe7b3..b6b5ee3fec 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -577,7 +577,9 @@ demand."))) (config-file tor-configuration-config-file (default (plain-file "empty" ""))) (hidden-services tor-configuration-hidden-services - (default '()))) + (default '())) + (socks-socket-type tor-configuration-socks-socket-type ; 'tcp or 'unix + (default 'tcp))) (define %tor-accounts ;; User account and groups for Tor. @@ -599,7 +601,7 @@ demand."))) (define (tor-configuration->torrc config) "Return a 'torrc' file for CONFIG." (match config - (($ tor config-file services) + (($ tor config-file services socks-socket-type) (computed-file "torrc" (with-imported-modules '((guix build utils)) @@ -615,6 +617,10 @@ User tor DataDirectory /var/lib/tor PidFile /var/run/tor/tor.pid Log notice syslog\n" port) + (when (eq? 'unix '#$socks-socket-type) + (display "\ +SocksPort unix:/var/run/tor/socks-sock +UnixSocksGroupWritable 1\n" port)) (for-each (match-lambda ((service (ports hosts) ...) diff --git a/gnu/tests/networking.scm b/gnu/tests/networking.scm index 7ca71f0c2c..381c5caf14 100644 --- a/gnu/tests/networking.scm +++ b/gnu/tests/networking.scm @@ -354,13 +354,7 @@ subnet 192.168.1.0 netmask 255.255.255.0 { (simple-operating-system (service tor-service-type (tor-configuration - (config-file - (plain-file "test-torrc" - "\ -SocksPort unix:/var/run/tor/socks-sock -UnixSocksGroupWritable 1 -") - ))))) + (socks-socket-type 'unix))))) (define (run-tor-test) (define os -- cgit v1.2.3 From 8b1f8f64c80c37167cfa10aab357e0993293ac3c Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Mon, 27 Aug 2018 18:30:01 +0300 Subject: gnu: openmw: Update to 0.44.0. * gnu/packages/game-development.scm (openmw): Update to 0.44.0. --- gnu/packages/game-development.scm | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 8d66317ce7..86f2877f82 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1037,23 +1037,18 @@ of use.") (license license:expat))) (define-public openmw - ;; XXX The current version does not support qt 5.11, but the upcoming - ;; version (0.44) will do. - (let ((commit "5bc073603e8c7887e015a0ef41b4cefd6e688aaf") - (revision "1")) (package (name "openmw") - (version (git-version "0.43" revision commit)) + (version "0.44.0") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.com/OpenMW/openmw.git") - (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (method url-fetch) + (uri + (string-append "https://github.com/OpenMW/openmw/archive/" + name "-" version ".tar.gz")) (sha256 (base32 - "1sp4n3f1syvv0iz7n72wh226fyc0jh98cg8bvs574jvvqx6qn851")))) + "03fgm2f2r7y0aqlgp038pdlnllgvm3jimrp968p4nhz1sffvjzcy")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; No test target @@ -1080,7 +1075,7 @@ the 2002 open-world RPG Morrowind. The engine comes with its own editor, called OpenMW-CS which allows the user to edit or create their own original games.") (home-page "https://openmw.org") - (license license:gpl3)))) + (license license:gpl3))) (define-public godot (package -- cgit v1.2.3 From 40f7ebac66913a531854cc18f9b417624508d654 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Sun, 26 Aug 2018 14:27:33 +0300 Subject: gnu: Add emacs-build-farm. * gnu/packages/emacs.scm (emacs-build-farm): New variable. --- gnu/packages/emacs.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 8665356f5c..6d34f626af 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1722,6 +1722,32 @@ management tasks from Emacs. To begin with, run @code{M-x guix-about} or @code{M-x guix-help} command.") (license license:gpl3+))) +(define-public emacs-build-farm + (package + (name "emacs-build-farm") + (version "0.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/alezost-emacs/build-farm") + (commit "fa7fa54901416fc5c216a5014394cbd73a61efc6"))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1zw3pivma6cv9j7k7qm02jd6wnxmsc1v2mjcssd50im99zzrqflh")))) + (build-system emacs-build-system) + (propagated-inputs + `(("bui" ,emacs-bui) + ("magit-popup" ,emacs-magit-popup))) + (home-page "https://gitlab.com/alezost-emacs/build-farm") + (synopsis "Emacs interface for Hydra and Cuirass build farms") + (description + "This Emacs package provides an interface for Hydra and +Cuirass (build farms used by Nix and Guix). It allows you to look at +various data related to the build farm projects, jobsets, builds and +evaluations. The entry point is @code{M-x build-farm} command.") + (license license:gpl3+))) + (define-public emacs-d-mode (package (name "emacs-d-mode") -- cgit v1.2.3 From d2434b6966b06893a4d2b15d0620b05e921fd182 Mon Sep 17 00:00:00 2001 From: Ison111 Date: Tue, 28 Aug 2018 12:19:40 +0200 Subject: gnu: Add SpaceFM. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxde.scm (spacefm): New variable. Co-authored-by: Ludovic Courtès --- gnu/packages/lxde.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 9a0d8e957d..19938fa93c 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -5,6 +5,8 @@ ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 Brendan Tildesley ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Ison111 +;;; Copyright © 2018 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,17 +26,21 @@ (define-module (gnu packages lxde) #:use-module (gnu packages) #:use-module (gnu packages autotools) + #:use-module (gnu packages bash) #:use-module (gnu packages docbook) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) #:use-module (gnu packages image-viewers) #:use-module (gnu packages linux) + #:use-module (gnu packages lsof) #:use-module (gnu packages openbox) #:use-module (gnu packages pkg-config) #:use-module (gnu packages polkit) #:use-module (gnu packages text-editors) + #:use-module (gnu packages video) #:use-module (gnu packages wm) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) @@ -230,6 +236,48 @@ with freedesktop.org standard.") (home-page "https://lxde.org") (license license:gpl2+))) +(define-public spacefm + ;; SpaceFM is based on PCManFM. + (package + (name "spacefm") + (version "1.0.6") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/IgnorantGuru/spacefm/archive/" + version ".tar.gz")) + (sha256 + (base32 + "1jg7xfyr7kihjnalxp8wxyb9qjk8hqf5l36rp3s0lvkpmpyakppy")) + (file-name (string-append name "-" version ".tar.gz")))) + (build-system gnu-build-system) + (native-inputs `(("pkg-config" ,pkg-config) + ("intltool" ,intltool))) + (inputs `(("bash" ,bash) + ("gtk+" ,gtk+) + ("eudev" ,eudev) + ("desktop-file-utils" ,desktop-file-utils) + ("shared-mime-info" ,shared-mime-info) + ("ffmpegthumbnailer" ,ffmpegthumbnailer) + ("jmtpfs" ,jmtpfs) + ("lsof" ,lsof) + ("udisks" ,udisks))) + (arguments + `(#:configure-flags (list (string-append "--with-bash-path=" + (assoc-ref %build-inputs "bash") + "/bin/bash") + (string-append "--sysconfdir=" + (assoc-ref %outputs "out") + "/etc")))) + (home-page "http://ignorantguru.github.io/spacefm/") + (synopsis "Multi-panel tabbed file manager") + (description "SpaceFM is a graphical, multi-panel, tabbed file manager +based on PCManFM with built-in virtual file system, udev-based device manager, +customizable menu system, and Bash integration.") + + ;; The combination is GPLv3+ but src/exo is under LGPLv3+. + (license license:gpl3+))) + (define-public lxmenu-data (package (name "lxmenu-data") -- cgit v1.2.3 From 1ae29e3f5a1f13b4ddfedd066b2e55556db031ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 28 Aug 2018 12:25:06 +0200 Subject: gnu: dico: Update to 2.6. * gnu/packages/dico.scm (dico): Update to 2.6. [inputs]: Switch to GUILE-2.2. --- gnu/packages/dico.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/dico.scm b/gnu/packages/dico.scm index b374a9b996..a85987d9b1 100644 --- a/gnu/packages/dico.scm +++ b/gnu/packages/dico.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016 Ludovic Courtès +;;; Copyright © 2015, 2016, 2018 Ludovic Courtès ;;; Copyright © 2016, 2018 Efraim Flashner ;;; ;;; This file is part of GNU Guix. @@ -37,14 +37,14 @@ (define-public dico (package (name "dico") - (version "2.5") + (version "2.6") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/dico/dico-" version ".tar.xz")) (sha256 (base32 - "0szm3z4xvq0pjj8kxl4paq63byamf281kzn1la0cdm5ngavypxxq")))) + "0zmi041gv5nd5fmyzgdrgrsy2pvjaq9p8dvvhxwi842hiyng5b7i")))) (build-system gnu-build-system) (arguments '(#:configure-flags (list (string-append "--with-guile-site-dir=" %output @@ -62,7 +62,7 @@ `(("m4" ,m4) ;used at run time ("pcre" ,pcre) ("python" ,python-2) - ("guile" ,guile-2.0) + ("guile" ,guile-2.2) ("gsasl" ,gsasl) ("groff" ,groff) ("readline" ,readline) -- cgit v1.2.3 From 6772ed1e07d6b8ce557199d91aaa1442c77186c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 28 Aug 2018 12:33:50 +0200 Subject: services: openssh: Add 'log-level' field. * gnu/services/ssh.scm ()[log-level]: New field. (openssh-config-file): Honor it. * doc/guix.texi (Networking Services): Document it. --- gnu/services/ssh.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm index dd96ad6aec..056602248f 100644 --- a/gnu/services/ssh.scm +++ b/gnu/services/ssh.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès +;;; Copyright © 2014, 2015, 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2016 David Craven ;;; Copyright © 2016 Julien Lepiller ;;; Copyright © 2017 Clément Lassieur @@ -319,6 +319,10 @@ The other options should be self-descriptive." (accepted-environment openssh-configuration-accepted-environment (default '())) + ;; symbol + (log-level openssh-configuration-log-level + (default 'info)) + ;; list of user-name/file-like tuples (authorized-keys openssh-authorized-keys (default '())) @@ -451,6 +455,10 @@ of user-name/file-like tuples." (format port "PrintLastLog ~a\n" #$(if (openssh-configuration-print-last-log? config) "yes" "no")) + (format port "LogLevel ~a\n" + #$(string-upcase + (symbol->string + (openssh-configuration-log-level config)))) ;; Add '/etc/authorized_keys.d/%u', which we populate. (format port "AuthorizedKeysFile \ -- cgit v1.2.3 From 8a5a1eff422c5e3bca785f3967d444d0eafcf9c3 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 27 Aug 2018 15:13:01 -0400 Subject: gnu: dropbear: Fix CVE-2018-15599. * gnu/packages/patches/dropbear-CVE-2018-15599.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/ssh.scm (dropbear)[source]: Use it. --- gnu/local.mk | 1 + gnu/packages/patches/dropbear-CVE-2018-15599.patch | 240 +++++++++++++++++++++ gnu/packages/ssh.scm | 1 + 3 files changed, 242 insertions(+) create mode 100644 gnu/packages/patches/dropbear-CVE-2018-15599.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index a2e538570b..7b980b2f20 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -651,6 +651,7 @@ dist_patch_DATA = \ %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/dropbear-CVE-2018-15599.patch \ %D%/packages/patches/dvd+rw-tools-add-include.patch \ %D%/packages/patches/elfutils-tests-ptrace.patch \ %D%/packages/patches/elogind-glibc-2.27.patch \ diff --git a/gnu/packages/patches/dropbear-CVE-2018-15599.patch b/gnu/packages/patches/dropbear-CVE-2018-15599.patch new file mode 100644 index 0000000000..a474552cd2 --- /dev/null +++ b/gnu/packages/patches/dropbear-CVE-2018-15599.patch @@ -0,0 +1,240 @@ +Fix CVE-2018-15599: + +http://lists.ucc.gu.uwa.edu.au/pipermail/dropbear/2018q3/002108.html +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-15599 + +Patch copied from upstream source repository: + +https://github.com/mkj/dropbear/commit/52adbb34c32d3e2e1bcdb941e20a6f81138b8248 + +From 52adbb34c32d3e2e1bcdb941e20a6f81138b8248 Mon Sep 17 00:00:00 2001 +From: Matt Johnston +Date: Thu, 23 Aug 2018 23:43:12 +0800 +Subject: [PATCH] Wait to fail invalid usernames + +--- + auth.h | 6 +++--- + svr-auth.c | 19 +++++-------------- + svr-authpam.c | 26 ++++++++++++++++++++++---- + svr-authpasswd.c | 27 ++++++++++++++------------- + svr-authpubkey.c | 11 ++++++++++- + 5 files changed, 54 insertions(+), 35 deletions(-) + +diff --git a/auth.h b/auth.h +index da498f5b..98f54683 100644 +--- a/auth.h ++++ b/auth.h +@@ -37,9 +37,9 @@ void recv_msg_userauth_request(void); + void send_msg_userauth_failure(int partial, int incrfail); + void send_msg_userauth_success(void); + void send_msg_userauth_banner(const buffer *msg); +-void svr_auth_password(void); +-void svr_auth_pubkey(void); +-void svr_auth_pam(void); ++void svr_auth_password(int valid_user); ++void svr_auth_pubkey(int valid_user); ++void svr_auth_pam(int valid_user); + + #if DROPBEAR_SVR_PUBKEY_OPTIONS_BUILT + int svr_pubkey_allows_agentfwd(void); +diff --git a/svr-auth.c b/svr-auth.c +index c19c0901..edde86bc 100644 +--- a/svr-auth.c ++++ b/svr-auth.c +@@ -149,10 +149,8 @@ void recv_msg_userauth_request() { + if (methodlen == AUTH_METHOD_PASSWORD_LEN && + strncmp(methodname, AUTH_METHOD_PASSWORD, + AUTH_METHOD_PASSWORD_LEN) == 0) { +- if (valid_user) { +- svr_auth_password(); +- goto out; +- } ++ svr_auth_password(valid_user); ++ goto out; + } + } + #endif +@@ -164,10 +162,8 @@ void recv_msg_userauth_request() { + if (methodlen == AUTH_METHOD_PASSWORD_LEN && + strncmp(methodname, AUTH_METHOD_PASSWORD, + AUTH_METHOD_PASSWORD_LEN) == 0) { +- if (valid_user) { +- svr_auth_pam(); +- goto out; +- } ++ svr_auth_pam(valid_user); ++ goto out; + } + } + #endif +@@ -177,12 +173,7 @@ void recv_msg_userauth_request() { + if (methodlen == AUTH_METHOD_PUBKEY_LEN && + strncmp(methodname, AUTH_METHOD_PUBKEY, + AUTH_METHOD_PUBKEY_LEN) == 0) { +- if (valid_user) { +- svr_auth_pubkey(); +- } else { +- /* pubkey has no failure delay */ +- send_msg_userauth_failure(0, 0); +- } ++ svr_auth_pubkey(valid_user); + goto out; + } + #endif +diff --git a/svr-authpam.c b/svr-authpam.c +index 05e4f3e5..d201bc96 100644 +--- a/svr-authpam.c ++++ b/svr-authpam.c +@@ -178,13 +178,14 @@ pamConvFunc(int num_msg, + * Keyboard interactive would be a lot nicer, but since PAM is synchronous, it + * gets very messy trying to send the interactive challenges, and read the + * interactive responses, over the network. */ +-void svr_auth_pam() { ++void svr_auth_pam(int valid_user) { + + struct UserDataS userData = {NULL, NULL}; + struct pam_conv pamConv = { + pamConvFunc, + &userData /* submitted to pamvConvFunc as appdata_ptr */ + }; ++ const char* printable_user = NULL; + + pam_handle_t* pamHandlep = NULL; + +@@ -204,12 +205,23 @@ void svr_auth_pam() { + + password = buf_getstring(ses.payload, &passwordlen); + ++ /* We run the PAM conversation regardless of whether the username is valid ++ in case the conversation function has an inherent delay. ++ Use ses.authstate.username rather than ses.authstate.pw_name. ++ After PAM succeeds we then check the valid_user flag too */ ++ + /* used to pass data to the PAM conversation function - don't bother with + * strdup() etc since these are touched only by our own conversation + * function (above) which takes care of it */ +- userData.user = ses.authstate.pw_name; ++ userData.user = ses.authstate.username; + userData.passwd = password; + ++ if (ses.authstate.pw_name) { ++ printable_user = ses.authstate.pw_name; ++ } else { ++ printable_user = ""; ++ } ++ + /* Init pam */ + if ((rc = pam_start("sshd", NULL, &pamConv, &pamHandlep)) != PAM_SUCCESS) { + dropbear_log(LOG_WARNING, "pam_start() failed, rc=%d, %s", +@@ -242,7 +254,7 @@ void svr_auth_pam() { + rc, pam_strerror(pamHandlep, rc)); + dropbear_log(LOG_WARNING, + "Bad PAM password attempt for '%s' from %s", +- ses.authstate.pw_name, ++ printable_user, + svr_ses.addrstring); + send_msg_userauth_failure(0, 1); + goto cleanup; +@@ -253,12 +265,18 @@ void svr_auth_pam() { + rc, pam_strerror(pamHandlep, rc)); + dropbear_log(LOG_WARNING, + "Bad PAM password attempt for '%s' from %s", +- ses.authstate.pw_name, ++ printable_user, + svr_ses.addrstring); + send_msg_userauth_failure(0, 1); + goto cleanup; + } + ++ if (!valid_user) { ++ /* PAM auth succeeded but the username isn't allowed in for another reason ++ (checkusername() failed) */ ++ send_msg_userauth_failure(0, 1); ++ } ++ + /* successful authentication */ + dropbear_log(LOG_NOTICE, "PAM password auth succeeded for '%s' from %s", + ses.authstate.pw_name, +diff --git a/svr-authpasswd.c b/svr-authpasswd.c +index bdee2aa1..69c7d8af 100644 +--- a/svr-authpasswd.c ++++ b/svr-authpasswd.c +@@ -48,22 +48,14 @@ static int constant_time_strcmp(const char* a, const char* b) { + + /* Process a password auth request, sending success or failure messages as + * appropriate */ +-void svr_auth_password() { ++void svr_auth_password(int valid_user) { + + char * passwdcrypt = NULL; /* the crypt from /etc/passwd or /etc/shadow */ + char * testcrypt = NULL; /* crypt generated from the user's password sent */ +- char * password; ++ char * password = NULL; + unsigned int passwordlen; +- + unsigned int changepw; + +- passwdcrypt = ses.authstate.pw_passwd; +- +-#ifdef DEBUG_HACKCRYPT +- /* debugging crypt for non-root testing with shadows */ +- passwdcrypt = DEBUG_HACKCRYPT; +-#endif +- + /* check if client wants to change password */ + changepw = buf_getbool(ses.payload); + if (changepw) { +@@ -73,12 +65,21 @@ void svr_auth_password() { + } + + password = buf_getstring(ses.payload, &passwordlen); +- +- /* the first bytes of passwdcrypt are the salt */ +- testcrypt = crypt(password, passwdcrypt); ++ if (valid_user) { ++ /* the first bytes of passwdcrypt are the salt */ ++ passwdcrypt = ses.authstate.pw_passwd; ++ testcrypt = crypt(password, passwdcrypt); ++ } + m_burn(password, passwordlen); + m_free(password); + ++ /* After we have got the payload contents we can exit if the username ++ is invalid. Invalid users have already been logged. */ ++ if (!valid_user) { ++ send_msg_userauth_failure(0, 1); ++ return; ++ } ++ + if (testcrypt == NULL) { + /* crypt() with an invalid salt like "!!" */ + dropbear_log(LOG_WARNING, "User account '%s' is locked", +diff --git a/svr-authpubkey.c b/svr-authpubkey.c +index aa6087c9..ff481c87 100644 +--- a/svr-authpubkey.c ++++ b/svr-authpubkey.c +@@ -79,7 +79,7 @@ static int checkfileperm(char * filename); + + /* process a pubkey auth request, sending success or failure message as + * appropriate */ +-void svr_auth_pubkey() { ++void svr_auth_pubkey(int valid_user) { + + unsigned char testkey; /* whether we're just checking if a key is usable */ + char* algo = NULL; /* pubkey algo */ +@@ -102,6 +102,15 @@ void svr_auth_pubkey() { + keybloblen = buf_getint(ses.payload); + keyblob = buf_getptr(ses.payload, keybloblen); + ++ if (!valid_user) { ++ /* Return failure once we have read the contents of the packet ++ required to validate a public key. ++ Avoids blind user enumeration though it isn't possible to prevent ++ testing for user existence if the public key is known */ ++ send_msg_userauth_failure(0, 0); ++ goto out; ++ } ++ + /* check if the key is valid */ + if (checkpubkey(algo, algolen, keyblob, keybloblen) == DROPBEAR_FAILURE) { + send_msg_userauth_failure(0, 0); diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index a58ebff481..03c4e3cc0b 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -440,6 +440,7 @@ TCP, not the SSH protocol.") (uri (string-append "https://matt.ucc.asn.au/" name "/releases/" name "-" version ".tar.bz2")) + (patches (search-patches "dropbear-CVE-2018-15599.patch")) (sha256 (base32 "0rgavbzw7jrs5wslxm0dnwx2m409yzxd9hazd92r7kx8xikr3yzj")))) -- cgit v1.2.3 From 84fbb4b223cb46472d444ea9aae060789fce5d24 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 27 Aug 2018 23:24:47 -0700 Subject: gnu: electron-cash: Update to 3.3.1. * gnu/packages/finance.scm (electron-cash): Update to 3.3.1. Signed-off-by: Leo Famulari --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 2cbd4854ec..7aeaffcc5d 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -335,7 +335,7 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") (package (inherit electrum) (name "electron-cash") - (version "3.3") + (version "3.3.1") (source (origin (method url-fetch) @@ -346,7 +346,7 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") ".tar.gz")) (sha256 (base32 - "1x487hyacdm1qhik1mhfimr4jwcwz7sgsbkh11awrb6j19sxdxym")) + "1jdy89rfdwc2jadx3rqj5yvynpcn90cx6482ax9f1cj9gfxp9j2b")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 967de7c5b0100e49acf2ea1fd85bf8503b9d2057 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Jul 2018 12:36:45 +0300 Subject: gnu: Add ephoto. * gnu/packages/enlightenment.scm (ephoto): New variable. --- gnu/packages/enlightenment.scm | 47 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index cff5ab14a9..15ec492793 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -421,3 +421,50 @@ and in creating applications based on the Enlightenment Foundation Library suite "Simple PDF viewer based on the Enlightenment Foundation Libraries.") (home-page "https://github.com/kaihu/lekha") (license license:gpl3+))) + +(define-public ephoto + (package + (name "ephoto") + (version "1.5") + (source + (origin + (method url-fetch) + (uri (list (string-append "http://www.smhouston.us/stuff/ephoto-" + version ".tar.xz") + (string-append "https://download.enlightenment.org/rel/" + "apps/ephoto/ephoto-" version ".tar.xz"))) + (sha256 + (base32 + "04kli43sfsy6s660g13pjc0kjmgdcmq8m4qh02vvpcwv60mf9mgz")))) + (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-home-directory + ;; FATAL: Cannot create run dir '/homeless-shelter/.run' - errno=2 + (lambda _ (setenv "HOME" "/tmp") #t))))) + (native-inputs + `(("check" ,check) + ("pkg-config" ,pkg-config))) + (inputs + `(("efl" ,efl))) + (home-page "http://smhouston.us/ephoto/") + (synopsis "EFL image viewer/editor/manipulator/slideshow creator") + (description "Ephoto is an image viewer and editor written using the +@dfn{Enlightenment Foundation Libraries} (EFL). It focuses on simplicity and ease +of use, while taking advantage of the speed and small footprint the EFL provide. + +Ephoto’s features include: +@enumerate +@item Browsing the filesystem and displaying images in an easy to use grid view. +@item Browsing images in a single image view format. +@item Viewing images in a slideshow. +@item Editing your image with features such as cropping, auto enhance, +blurring, sharpening, brightness/contrast/gamma adjustments, hue/saturation/value +adjustments, and color level adjustment. +@item Applying artistic filters to your image such as black and white and old photo. +@item Drag And Drop along with file operations to easy maintain your photo directories. +@end enumerate\n") + (license (list + license:bsd-2 ; Ephoto's thumbnailing code + license:bsd-3)))) -- cgit v1.2.3 From dc8675afa76a996c7d1d55edba1dcb17d044a9a6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Jul 2018 12:42:05 +0300 Subject: gnu: Add urlscan. * gnu/packages/mail.scm (urlscan): New variable. --- gnu/packages/mail.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index d1c1c096e5..fc8436452a 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2596,3 +2596,29 @@ processes mailboxes based on the results. It can be used to delete, copy, move, flag, etc. messages residing in mailboxes at the same or different mail servers. The 4rev1 and 4 versions of IMAP are supported.") (license license:expat))) + +(define-public urlscan + (package + (name "urlscan") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "urlscan" version)) + (sha256 + (base32 + "133f28bisr4xj0nihpwpil8dyadss62mp8qgqdyzd676hg9xjfyc")))) + (build-system python-build-system) + (propagated-inputs + `(("python-urwid" ,python-urwid))) + (home-page "https://github.com/firecat53/urlscan") + (synopsis "View/select the URLs in an email message or file") + (description + "Urlscan is a small program that is designed to integrate with the +@code{mutt} mailreader to allow you to easily launch a Web browser for URLs +contained in email messages. It parses an email message or file and scans it +for URLs and email addresses. It then displays the URLs and their context +within the message, and allows you to choose one or more URLs to send to your +Web browser. Alternatively, it send a list of all URLs to stdout. It is a +replacement for the @code{urlview} program.") + (license gpl2))) -- cgit v1.2.3 From f96ed06805db934ff735e80596f1373dc1c2b5a8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 26 Aug 2018 18:42:23 +0200 Subject: 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 (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 7b980b2f20..73d43547d8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1140,6 +1140,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 666c9bfc3e..4619f385bb 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1154,14 +1154,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 + -- cgit v1.2.3 From 4fca5a44f6eda4a0f623a9f61a96df0c2655ef38 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 28 Aug 2018 13:37:09 +0200 Subject: gnu: libntlm: Update to 1.5. * gnu/packages/gsasl.scm (libntlm): Update to 1.5. [source]: Use HTTPS. --- gnu/packages/gsasl.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gsasl.scm b/gnu/packages/gsasl.scm index 9dcebe9832..127b476ef3 100644 --- a/gnu/packages/gsasl.scm +++ b/gnu/packages/gsasl.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2012 Andreas Enge ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2017 Eric Bavier +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,14 +34,14 @@ (define-public libntlm (package (name "libntlm") - (version "1.4") + (version "1.5") (source (origin (method url-fetch) - (uri (string-append "http://www.nongnu.org/libntlm/releases/" + (uri (string-append "https://www.nongnu.org/libntlm/releases/" "libntlm-" version ".tar.gz")) (sha256 (base32 - "129532iiip2cjr5h03bgz184v64v27sfm1r70v3ms4yk65gdf5c4")))) + "1gcvv7f9rggpxay81qv6kw5hr6gd4qiyzkbwhzz02fx9jvv9kmsk")))) (build-system gnu-build-system) (synopsis "Library that implements NTLM authentication") (description -- cgit v1.2.3 From 7bbdd943e77b68d64bcdfa1693e293e31676cfc3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 28 Aug 2018 19:53:55 +0200 Subject: gnu: claws-mail: Update to 3.17.1. * gnu/packages/mail.scm (claws-mail): Update to 3.17.1. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index fc8436452a..1f7e971d60 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1011,7 +1011,7 @@ compresses it.") (define-public claws-mail (package (name "claws-mail") - (version "3.17.0") + (version "3.17.1") (source (origin (method url-fetch) (uri (string-append @@ -1019,7 +1019,7 @@ compresses it.") ".tar.xz")) (sha256 (base32 - "119y6q9p8zwm2xqlbkgqd119a529kjqlyldmb4h940z6c2qyjhqm")))) + "1wknxbwyzm5xjh3cqmddcxmvp1rkp301qga5n5rgfi7vcd0myyvm")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("bogofilter" ,bogofilter) -- cgit v1.2.3 From e29bb27d88355ee37c2c90f6c090f53e7f2966e6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 28 Aug 2018 17:25:22 +0200 Subject: gnu: r-pracma: Update to 2.1.5. * gnu/packages/maths.scm (r-pracma): Update to 2.1.5. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 3d571e8cc9..ad33ccbcc6 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2049,12 +2049,12 @@ programming problems.") (define-public r-pracma (package (name "r-pracma") - (version "2.1.4") + (version "2.1.5") (source (origin (method url-fetch) (uri (cran-uri "pracma" version)) (sha256 - (base32 "1ygm81i7mqvh229dp9935djjyb120p3bqvaf4k572sa4q63fzjhc")))) + (base32 "18cv7c2gvagbmggfbsy2xk9bpn47izd0qrmqnc3q7afvj6pr6nf9")))) (build-system r-build-system) (propagated-inputs `(("r-quadprog" ,r-quadprog))) -- cgit v1.2.3 From f882d7c7c5c3f0c0cf7b26ba51fc0c80d1704fba Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 28 Aug 2018 15:15:29 +0200 Subject: gnu: python-apipkg: Update home page. * gnu/packages/python.scm (python-apipkg)[home-page]: Update. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 6ab6763a96..33bbc28edf 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7378,7 +7378,7 @@ applications.") (description "With apipkg you can control the exported namespace of a Python package and greatly reduce the number of imports for your users. It is a small pure Python module that works on virtually all Python versions.") - (home-page "https://bitbucket.org/hpk42/apipkg") + (home-page "https://github.com/pytest-dev/apipkg") (license license:expat))) (define-public python2-apipkg -- cgit v1.2.3 From 2c3d30ef51a427f8abfb3632073843dcd8c4eac5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 28 Aug 2018 13:46:03 +0200 Subject: gnu: r-plotrix: Update to 3.7-3. * gnu/packages/statistics.scm (r-plotrix): Update to 3.7-3. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 5367554d82..56dfa0d15f 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2455,13 +2455,13 @@ disk (or a connection).") (define-public r-plotrix (package (name "r-plotrix") - (version "3.7-2") + (version "3.7-3") (source (origin (method url-fetch) (uri (cran-uri "plotrix" version)) (sha256 (base32 - "0hx3xv94gzlyy7ny5k4mzs7w1798h1zka175m5bkzc524493cm88")))) + "18702y1gbyis56mh219z5ww0nrkh6qx7bgqv3khyn80g2giwk7cf")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/plotrix") (synopsis "Various plotting functions") -- cgit v1.2.3 From acf18cb19097e85ee5917b60aa32e3d69e752899 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 24 Aug 2018 02:59:02 +0200 Subject: gnu: capstone: Use HTTPS home page. * gnu/packages/engineering.scm (capstone)[home-page]: Use HTTPS. --- gnu/packages/engineering.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 3b433a1bfe..d53b25cff9 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1101,7 +1101,7 @@ language, ADMS transforms Verilog-AMS code into other target languages.") (setenv "LDFLAGS" (string-append "-Wl,-rpath=" (assoc-ref outputs "out") "/lib")) #t))))) - (home-page "http://www.capstone-engine.org") + (home-page "https://www.capstone-engine.org") (synopsis "Lightweight multi-platform, multi-architecture disassembly framework") (description "Capstone is a lightweight multi-platform, multi-architecture disassembly -- cgit v1.2.3 From 59b55def00361b1dbe2e979c2d0d4517d861c60c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 29 Aug 2018 13:10:58 +0200 Subject: gnu: Add r-infotheo. * gnu/packages/cran.scm (r-infotheo): New variable. --- gnu/packages/cran.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index eb6bf9c38b..76f0359312 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4944,3 +4944,22 @@ developers to generate user interfaces easy to maintain.") models. The methods employed are applicable to virtually any predictive model and make comparisons between different methodologies straightforward.") (license license:gpl2+))) + +(define-public r-infotheo + (package + (name "r-infotheo") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "infotheo" version)) + (sha256 + (base32 + "18xacczfq3z3xpy434js4nf3l19lczngzd0lq26wh22pvg1yniwv")))) + (build-system r-build-system) + (home-page "http://homepage.meyerp.com/software") + (synopsis "Information-theoretic measures") + (description + "This package implements various measures of information theory based on +several entropy estimators.") + (license license:gpl3+))) -- cgit v1.2.3 From 9587544b447db9a4952b8c368c5600f8ac439ff9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 17 Aug 2018 16:55:43 +0200 Subject: gnu: Add ghc 8.4.3. * gnu/packages/haskell.scm (ghc-8): Rename this... (ghc-8.0): ...to this. (ghc): Point at ghc-8.0. (ghc-8): New variable for GHC 8.4.3. Co-authored-by: Timothy Samplet --- gnu/packages/haskell.scm | 129 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 127 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 7d7d85f951..a07bb049a2 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -34,6 +34,7 @@ (define-module (gnu packages haskell) #:use-module (gnu packages) + #:use-module (gnu packages base) #:use-module (gnu packages bootstrap) #:use-module (gnu packages check) #:use-module (gnu packages compression) @@ -322,7 +323,7 @@ top of CLISP.") interactive environment for the functional language Haskell.") (license license:bsd-3))) -(define-public ghc-8 +(define-public ghc-8.0 (package (name "ghc") (version "8.0.2") @@ -434,7 +435,131 @@ interactive environment for the functional language Haskell.") interactive environment for the functional language Haskell.") (license license:bsd-3))) -(define-public ghc ghc-8) +(define-public ghc-8 + (package (inherit ghc-8.0) + (name "ghc") + (version "8.4.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.haskell.org/ghc/dist/" + version "/" name "-" version "-src.tar.xz")) + (sha256 + (base32 "1mk046vb561j75saz05rghhbkps46ym5aci4264dwc2qk3dayixf")))) + (inputs + `(("gmp" ,gmp) + ("ncurses" ,ncurses) + ("libffi" ,libffi) + ("target-binutils" ,binutils) + ("target-gcc" ,gcc) + ("target-ld-wrapper" ,(make-ld-wrapper "ld-wrapper" + #:binutils binutils)))) + (native-inputs + `(("perl" ,perl) + ("python" ,python) ; for tests + ("ghostscript" ,ghostscript) ; for tests + ;; GHC 8.4.3 is built with GHC 8. + ("ghc-bootstrap" ,ghc-8.0) + ("ghc-testsuite" + ,(origin + (method url-fetch) + (uri (string-append + "https://www.haskell.org/ghc/dist/" + version "/" name "-" version "-testsuite.tar.xz")) + (sha256 + (base32 + "1z55b1z0m3plqd2d1ks6w5wvx7igm7zsk3i4v7cms003z0as0hzz")))))) + (arguments + `(#:test-target "test" + ;; We get a smaller number of test failures by disabling parallel test + ;; execution. + #:parallel-tests? #f + + ;; The DSOs use $ORIGIN to refer to each other, but (guix build + ;; gremlin) doesn't support it yet, so skip this phase. + #:validate-runpath? #f + + ;; Don't pass --build=, because the configure script + ;; auto-detects slightly different triplets for --host and --target and + ;; then complains that they don't match. + #:build #f + + #:configure-flags + (list + (string-append "--with-gmp-libraries=" + (assoc-ref %build-inputs "gmp") "/lib") + (string-append "--with-gmp-includes=" + (assoc-ref %build-inputs "gmp") "/include") + "--with-system-libffi" + (string-append "--with-ffi-libraries=" + (assoc-ref %build-inputs "libffi") "/lib") + (string-append "--with-ffi-includes=" + (assoc-ref %build-inputs "libffi") "/include") + (string-append "--with-curses-libraries=" + (assoc-ref %build-inputs "ncurses") "/lib") + (string-append "--with-curses-includes=" + (assoc-ref %build-inputs "ncurses") "/include")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'unpack-testsuite + (lambda* (#:key inputs #:allow-other-keys) + (invoke "tar" "xvf" + (assoc-ref inputs "ghc-testsuite") + "--strip-components=1") + #t)) + (add-after 'unpack-testsuite 'fix-shell-wrappers + (lambda _ + (substitute* '("driver/ghci/ghc.mk" + "utils/mkdirhier/ghc.mk" + "rules/shell-wrapper.mk") + (("echo '#!/bin/sh'") + (format #f "echo '#!~a'" (which "sh")))) + #t)) + ;; This is necessary because the configure system no longer uses + ;; “AC_PATH_” but “AC_CHECK_”, setting the variables to just the + ;; plain command names. + (add-before 'configure 'set-target-programs + (lambda* (#:key inputs #:allow-other-keys) + (let ((binutils (assoc-ref inputs "target-binutils")) + (gcc (assoc-ref inputs "target-gcc")) + (ld-wrapper (assoc-ref inputs "target-ld-wrapper"))) + (setenv "CC" (string-append gcc "/bin/gcc")) + (setenv "CXX" (string-append gcc "/bin/g++")) + (setenv "LD" (string-append ld-wrapper "/bin/ld")) + (setenv "NM" (string-append binutils "/bin/nm")) + (setenv "RANLIB" (string-append binutils "/bin/ranlib")) + (setenv "STRIP" (string-append binutils "/bin/strip")) + ;; The 'ar' command does not follow the same pattern. + (setenv "fp_prog_ar" (string-append binutils "/bin/ar")) + #t))) + (add-before 'build 'fix-references + (lambda _ + (substitute* '("testsuite/timeout/Makefile" + "testsuite/timeout/timeout.py" + "testsuite/timeout/timeout.hs" + "testsuite/tests/programs/life_space_leak/life.test" + ;; libraries + "libraries/process/System/Process/Posix.hs" + "libraries/process/tests/process001.hs" + "libraries/process/tests/process002.hs" + "libraries/unix/cbits/execvpe.c") + (("/bin/sh") (which "sh")) + (("/bin/ls") (which "ls")) + (("/bin/rm") "rm")) + #t)) + (add-before 'build 'fix-environment + (lambda _ + (unsetenv "GHC_PACKAGE_PATH") + (setenv "CONFIG_SHELL" (which "bash")) + #t))))) + (native-search-paths (list (search-path-specification + (variable "GHC_PACKAGE_PATH") + (files (list + (string-append "lib/ghc-" version))) + (file-pattern ".*\\.conf\\.d$") + (file-type 'directory)))))) + +(define-public ghc ghc-8.0) (define-public ghc-hostname (package -- cgit v1.2.3 From 9e17757ff5d8d5159bda789cf4b3e28105b40adf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 29 Aug 2018 16:58:54 +0200 Subject: Revert "gnu: snappy: Optimise." This causes too many rebuilds for the master branch. This reverts commit f96ed06805db934ff735e80596f1373dc1c2b5a8. --- gnu/local.mk | 1 - gnu/packages/compression.scm | 17 +++++----- .../snappy-add-O2-flag-in-CmakeLists.txt.patch | 36 ---------------------- 3 files changed, 8 insertions(+), 46 deletions(-) delete mode 100644 gnu/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 73d43547d8..7b980b2f20 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1140,7 +1140,6 @@ 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 4619f385bb..666c9bfc3e 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1154,15 +1154,14 @@ 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")) - (patches (search-patches "snappy-add-O2-flag-in-CmakeLists.txt.patch")))) + (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")))) (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 deleted file mode 100644 index 561763dabe..0000000000 --- a/gnu/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch +++ /dev/null @@ -1,36 +0,0 @@ -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 - -- cgit v1.2.3 From 8892cac329d3d99391ca38d9498507409cb68b36 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 29 Aug 2018 17:04:13 +0200 Subject: gnu: Add python-llvmlite. * gnu/packages/llvm.scm (python-llvmlite): New variable. --- gnu/packages/llvm.scm | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index add7f1b40c..cd710bcb79 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2015, 2017, 2018 Ludovic Courtès ;;; Copyright © 2016 Dennis Mungai -;;; Copyright © 2016 Ricardo Wurmus +;;; Copyright © 2016, 2018 Ricardo Wurmus ;;; Copyright © 2017 Roel Janssen ;;; Copyright © 2018 Marius Bakke ;;; Copyright © 2018 Tobias Geerinckx-Rice @@ -30,6 +30,7 @@ #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) + #:use-module (guix build-system python) #:use-module (gnu packages) #:use-module (gnu packages gcc) #:use-module (gnu packages bootstrap) ;glibc-dynamic-linker @@ -380,3 +381,53 @@ code analysis tools.") (patches (list (search-patch "llvm-for-extempore.patch"))))) ;; Extempore refuses to build on architectures other than x86_64 (supported-systems '("x86_64-linux")))) + +(define-public python-llvmlite + (package + (name "python-llvmlite") + (version "0.24.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "llvmlite" version)) + (sha256 + (base32 + "01zwjlc3c5mhrwmv4b73zgbskwqps9ly0nrh54bbj1f1l72f839j")))) + (build-system python-build-system) + (inputs + `(("llvm" + ,(package + (inherit llvm) + (source (origin + (inherit (package-source llvm)) + (patches + (list + (origin + (method url-fetch) + (uri (string-append "https://raw.githubusercontent.com/numba/" + "llvmlite/v" version "/conda-recipes/" + "D47188-svml.patch")) + (sha256 + (base32 + "0mrj24jvkv3hjcmyg98zmvmyl1znlh2j63rdr69f6g7s96d2pfv1"))) + (origin + (method url-fetch) + (uri (string-append "https://raw.githubusercontent.com/numba/" + "llvmlite/v" version "/conda-recipes/" + "twine_cfg_undefined_behavior.patch")) + (sha256 + (base32 + "07h71n2m1mn9zcfgw04zglffknplb233zqbcd6pckq0wygkrxflp"))) + (origin + (method url-fetch) + (uri (string-append "https://raw.githubusercontent.com/numba/" + "llvmlite/v" version "/conda-recipes/" + "0001-Transforms-Add-missing-header-for-InstructionCombini.patch")) + (sha256 + (base32 + "1pp0z9696l6j4dwz7ypjrm4vvkj0d3mlf1g8zmiyk08akw5lz0cb"))))))))))) + (home-page "http://llvmlite.pydata.org") + (synopsis "Wrapper around basic LLVM functionality") + (description + "This package provides a Python binding to LLVM for use in Numba.") + (license license:bsd-3))) -- cgit v1.2.3 From d8b8eb3ff5453676ffd5251f17424dad5e9966e8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 20 Aug 2018 20:00:17 +0200 Subject: gnu: Add python-numba. * gnu/packages/python.scm (python-numba): New variable. --- gnu/packages/python.scm | 84 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 33bbc28edf..7575ab1859 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -99,6 +99,7 @@ #:use-module (gnu packages libevent) #:use-module (gnu packages libffi) #:use-module (gnu packages linux) + #:use-module (gnu packages llvm) #:use-module (gnu packages machine-learning) #:use-module (gnu packages man) #:use-module (gnu packages maths) @@ -13895,3 +13896,86 @@ Let's Encrypt.") development that supports command line argument parsing, command string validation testing and application logic.") (license license:expat))) + +;; Make sure to upgrade python-llvmlite in (gnu packages llvm) together with +;; python-numba. They have a very unflexible relationship. +(define-public python-numba + (package + (name "python-numba") + (version "0.39.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "numba" version)) + (sha256 + (base32 + "1bibvkwga1v8293i9ivl469d8bzgabn3vgr2ig7c1i68v8frsx07")))) + (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 + (add-after 'unpack 'disable-proprietary-features + (lambda _ + (setenv "NUMBA_DISABLE_HSA" "1") + (setenv "NUMBA_DISABLE_CUDA" "1") + #t)) + (add-after 'unpack 'remove-failing-tests + (lambda _ + ;; FIXME: these tests fail for unknown reasons: + ;; test_non_writable_pycache, test_non_creatable_pycache, and + ;; test_frozen (all in numba.tests.test_dispatcher.TestCache). + (substitute* "numba/tests/test_dispatcher.py" + (("def test(_non_writable_pycache)" _ m) + (string-append "def guix_skip" m)) + (("def test(_non_creatable_pycache)" _ m) + (string-append "def guix_skip" m)) + (("def test(_frozen)" _ m) + (string-append "def guix_skip" m))) + + ;; These tests fail because we don't run the tests from the build + ;; directory: test_setup_py_distutils, test_setup_py_setuptools + ;; They ar in numba.tests.test_pycc.TestDistutilsSupport. + (substitute* "numba/tests/test_pycc.py" + (("def test(_setup_py_distutils|_setup_py_setuptools)" _ m) + (string-append "def guix_skip" m))) + #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"))) + ;; Something is wrong with the PYTHONPATH when running the + ;; tests from the build directory, as it complains about not being + ;; able to import certain modules. + (with-directory-excursion "/tmp" + (invoke "python3" "-m" "numba.runtests" "-v" "-m"))) + #t))))) + (propagated-inputs + `(("python-llvmlite" ,python-llvmlite) + ("python-numpy" ,python-numpy) + ("python-singledispatch" ,python-singledispatch))) + ;; Needed for tests. + (inputs + `(("python-jinja2" ,python-jinja2) + ("python-pygments" ,python-pygments))) + (home-page "https://numba.pydata.org") + (synopsis "Compile Python code using LLVM") + (description "Numba gives you the power to speed up your applications with +high performance functions written directly in Python. With a few +annotations, array-oriented and math-heavy Python code can be just-in-time +compiled to native machine instructions, similar in performance to C, C++ and +Fortran, without having to switch languages or Python interpreters. + +Numba works by generating optimized machine code using the LLVM compiler +infrastructure at import time, runtime, or statically (using the included pycc +tool).") + (license license:bsd-3))) -- cgit v1.2.3 From 22b770ce0003b7d6fe98299292f8f5c0569f0712 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 20 Aug 2018 20:00:18 +0200 Subject: gnu: Add python-anndata. * gnu/packages/python.scm (python-anndata): New variable. --- gnu/packages/python.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 7575ab1859..f59e24d5ff 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -13979,3 +13979,29 @@ Numba works by generating optimized machine code using the LLVM compiler infrastructure at import time, runtime, or statically (using the included pycc tool).") (license license:bsd-3))) + +(define-public python-anndata + (package + (name "python-anndata") + (version "0.6.9") + (source + (origin + (method url-fetch) + (uri (pypi-uri "anndata" version)) + (sha256 + (base32 + "1fh461xyyc7pcrjfgd013bdc2alf53r46ss3gfw3431mbb1gappi")))) + (build-system python-build-system) + (propagated-inputs + `(("python-h5py" ,python-h5py) + ("python-natsort" ,python-natsort) + ("python-pandas" ,python-pandas) + ("python-scipy" ,python-scipy))) + (home-page "https://github.com/theislab/anndata") + (synopsis "Annotated data for data analysis pipelines") + (description "Anndata is a package for simple (functional) high-level APIs +for data analysis pipelines. In this context, it provides an efficient, +scalable way of keeping track of data together with learned annotations and +reduces the code overhead typically encountered when using a mostly +object-oriented library such as @code{scikit-learn}.") + (license license:bsd-3))) -- cgit v1.2.3 From c7fe888b424faec05a0d55e8b9321d6852ffb1f2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 29 Aug 2018 17:05:46 +0200 Subject: gnu: Add python-scanpy. * gnu/packages/bioinformatics.scm (python-scanpy): New variable. --- gnu/packages/bioinformatics.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index cb3c4bc1fd..3c300e48e9 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13458,3 +13458,39 @@ conversions, region filtering, FASTA sequence extraction and more.") spliced (back-spliced) sequencing reads, indicative of circular RNA (circRNA) in RNA-seq data.") (license license:gpl3)))) + +(define-public python-scanpy + (package + (name "python-scanpy") + (version "1.2.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "scanpy" version)) + (sha256 + (base32 + "1ak7bxms5a0yvf65prppq2g38clkv7c7jnjbnfpkh3xxv7q512jz")))) + (build-system python-build-system) + (propagated-inputs + `(("python-anndata" ,python-anndata) + ("python-igraph" ,python-igraph) + ("python-numba" ,python-numba) + ("python-joblib" ,python-joblib) + ("python-natsort" ,python-natsort) + ("python-networkx" ,python-networkx) + ("python-statsmodels" ,python-statsmodels) + ("python-scikit-learn" ,python-scikit-learn) + ("python-matplotlib" ,python-matplotlib) + ("python-pandas" ,python-pandas) + ("python-scipy" ,python-scipy) + ("python-seaborn" ,python-seaborn) + ("python-h5py" ,python-h5py) + ("python-tables" ,python-tables))) + (home-page "http://github.com/theislab/scanpy") + (synopsis "Single-Cell Analysis in Python.") + (description "Scanpy is a scalable toolkit for analyzing single-cell gene +expression data. It includes preprocessing, visualization, clustering, +pseudotime and trajectory inference and differential expression testing. The +Python-based implementation efficiently deals with datasets of more than one +million cells.") + (license license:bsd-3))) -- cgit v1.2.3 From ac94ccb9b43186264e1cb3aa0c337b1e13772cca Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sun, 12 Aug 2018 20:26:34 +0200 Subject: gnu: Add python-pyudev. * gnu/packages/admin.scm (python-pyudev): New variable. --- gnu/packages/admin.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index c9230c3295..b372cd0079 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2750,3 +2750,42 @@ support forum. It runs with the @code{/exec} command in most IRC clients.") (description "@code{pscircle} visualizes Linux processes in the form of a radial tree.") (license license:gpl2+))) + +(define-public python-pyudev + (package + (name "python-pyudev") + (version "0.21.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pyudev" version)) + (sha256 + (base32 + "0arz0dqp75sszsmgm6vhg92n1lsx91ihddx3m944f4ah0487ljq9")))) + (build-system python-build-system) + (arguments + `(#:tests? #f ; Tests require /sys + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-ctypes-udev + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((eudev (assoc-ref inputs "eudev"))) + (substitute* "src/pyudev/core.py" + (("'udev'") + (string-append "'" eudev "/lib/libudev.so'"))) + (substitute* "src/pyudev/_ctypeslib/utils.py" + ;; Use absolute paths instead of keys. + (("= find_library") "= ")) + #t)))))) + (inputs + `(("eudev" ,eudev))) + (native-inputs + `(("python-docutils" ,python-docutils) + ("python-hypothesis" ,python-hypothesis) + ("python-mock" ,python-mock) + ("python-pytest" ,python-pytest) + ("python-sphinx" ,python-sphinx))) + (home-page "http://pyudev.readthedocs.org/") + (synopsis "Python udev binding") + (description "This package provides @code{udev} bindings for Python.") + (license license:lgpl2.1))) -- cgit v1.2.3 From 15c56e82735380c73894e704643cfbcee45a1c45 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Wed, 15 Aug 2018 19:46:08 +0200 Subject: gnu: Add solaar. * gnu/packages/admin.scm (solaar): New variable. --- gnu/packages/admin.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index b372cd0079..3d58780b95 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2789,3 +2789,42 @@ support forum. It runs with the @code{/exec} command in most IRC clients.") (synopsis "Python udev binding") (description "This package provides @code{udev} bindings for Python.") (license license:lgpl2.1))) + +(define-public solaar + (package + (name "solaar") + (version "0.9.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pwr/Solaar.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "085mfa13dap3wqik1dqlad0d7kff4rv7j4ljh99c7l8nhczkqgwm")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-prefix-detection + (lambda _ + (substitute* "setup.py" + (("'--prefix' in sys\\.argv") + "len([x.startswith('--prefix=') for x in sys.argv]) > 0")) + #t)) + (replace 'build + (lambda _ + (invoke "python" "setup.py" "build"))) + (add-before 'check 'setenv-PATH + (lambda _ + (setenv "PYTHONPATH" (string-append "lib:" (getenv "PYTHONPATH"))) + #t))))) + (propagated-inputs + `(("python-pygobject" ,python-pygobject) + ("python-pyudev" ,python-pyudev))) + (home-page "https://smxi.org/docs/inxi.htm") + (synopsis "Linux devices manager for the Logitech Unifying Receiver") + (description "This package provides tools to manage clients of the +Logitech Unifying Receiver.") + (license license:gpl2))) -- cgit v1.2.3 From 9e21f2170ec36f04097cee6ee76ba14c888cc81c Mon Sep 17 00:00:00 2001 From: pimi Date: Tue, 28 Aug 2018 22:32:44 +0200 Subject: gnu: Add r-abcoptim. gnu/packages/cran.scm (r-abcoptim): New variable. Signed-off-by: Leo Famulari --- gnu/packages/cran.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 76f0359312..016d1b1e41 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4963,3 +4963,28 @@ and make comparisons between different methodologies straightforward.") "This package implements various measures of information theory based on several entropy estimators.") (license license:gpl3+))) + +(define-public r-abcoptim + (package + (name "r-abcoptim") + (version "0.15.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "ABCoptim" version)) + (sha256 + (base32 "1ih0xk88qhsmpvnxf56041wx5sk8as2f4f2gdnpnwdym9mbr9n4b")))) + (properties `((upstream-name . "ABCoptim"))) + (build-system r-build-system) + (propagated-inputs `(("r-rcpp" ,r-rcpp))) + (home-page "https://github.com/gvegayon/ABCoptim/") + (synopsis "Optimization of Artificial Bee Colony algorithm") + (description + "Artificial Bee Colony (ABC) is one of the most recently defined algorithms by Dervis +Karaboga in 2005, motivated by the intelligent behavior of honey bees. It is as +simple as Particle Swarm Optimization (PSO) and Differential Evolution (DE) +algorithms, and uses only common control parameters such as colony size and +maximum cycle number. The @code{r-abcoptim} implements the Artificial bee +colony optimization algorithm @url{http://mf.erciyes.edu.tr/abc/pub/tr06_2005.pdf}. + This version is a work-in-progress and is written in R code.") + (license license:expat))) -- cgit v1.2.3 From 4f9355c3606ecbe83dce78e6d01fa974d912bd4a Mon Sep 17 00:00:00 2001 From: pimi Date: Tue, 28 Aug 2018 22:26:13 +0200 Subject: gnu: Add gffcompare. gnu/packages/bioinformatics.scm (gffcompare): New variable. Signed-off-by: Leo Famulari --- gnu/packages/bioinformatics.scm | 64 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 3c300e48e9..22a00894c2 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2018 Joshua Sierles, Nextjournal ;;; Copyright © 2018 Gábor Boskovits +;;; Copyright © 2018 Mădălin Ionel Patrașcu ;;; ;;; This file is part of GNU Guix. ;;; @@ -13494,3 +13495,66 @@ pseudotime and trajectory inference and differential expression testing. The Python-based implementation efficiently deals with datasets of more than one million cells.") (license license:bsd-3))) + +(define-public gffcompare + (let ((commit "be56ef4349ea3966c12c6397f85e49e047361c41") + (revision "1")) + (package + (name "gffcompare") + (version (git-version "0.10.15" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gpertea/gffcompare/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0cp5qpxdhw4mxpya5dld8wi3jk00zyklm6rcri426wydinrnfmkg")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no check target + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'copy-gclib-source + (lambda* (#:key inputs #:allow-other-keys) + (mkdir "../gclib") + (copy-recursively + (assoc-ref inputs "gclib-source") "../gclib") + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) + (install-file "gffcompare" bin) + #t)))))) + (native-inputs + `(("gclib-source" ; see 'README.md' of gffcompare + ,(let ((commit "54917d0849c1e83cfb057b5f712e5cb6a35d948f") + (revision "1") + (name "gclib") + (version (git-version "0.10.3" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gpertea/gclib/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0b51lc0b8syrv7186fd7n8f15rwnf264qgfmm2palrwks1px24mr"))))))) + (home-page "https://github.com/gpertea/gffcompare/") + (synopsis "Tool for comparing or classifing transcripts of RNA-Seq") + (description + "@code{gffcompare} is a tool that can: +@enumerate +@item compare and evaluate the accuracy of RNA-Seq transcript assemblers +(Cufflinks, Stringtie); +@item collapse (merge) duplicate transcripts from multiple GTF/GFF3 files (e.g. +resulted from assembly of different samples); +@item classify transcripts from one or multiple GTF/GFF3 files as they relate to +reference transcripts provided in a annotation file (also in GTF/GFF3 format). +@end enumerate") + (license + (list + license:expat ;license for gffcompare + license:artistic2.0))))) ;license for gclib -- cgit v1.2.3 From b4c698c8c99952fef0c9aa8c53c36631d84b5ef7 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Tue, 28 Aug 2018 14:50:39 -0700 Subject: gnu: python-trezor: Update to 0.10.2. * gnu/packages/finance.scm (python-trezor): Update to 0.10.2. [arguments]: Replace check with tests that do not require hardware device. [propagated-inputs]: Add python-click, python-libusb1, python-pyblake2 and python-typing. [native-inputs]: Add python-mock and python-pytest. Signed-off-by: Leo Famulari --- gnu/packages/finance.scm | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 7aeaffcc5d..28bfb28f49 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -664,23 +664,38 @@ Ledger Blue/Nano S.") (define-public python-trezor (package (name "python-trezor") - (version "0.7.16") + (version "0.10.2") (source (origin (method url-fetch) (uri (pypi-uri "trezor" version)) (sha256 (base32 - "055kii56wgwadl5z911s59ya2fnsqzk3n5i19s2hb9sv2by6knvb")))) + "138k6zsqqpb46k3rcpyslm9q7yq5i6k4myvr9n425jnkadf4vfjd")))) (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Default tests run device-specific tests which fail, only run specific tests. + (replace 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + (invoke "python" "-m" "pytest" "--pyarg" "trezorlib.tests.unit_tests") + (invoke "python" "-m" "pytest" "-m" "slow_cosi" "--pyarg" "trezorlib.tests.unit_tests") + ))))) (propagated-inputs - `(("python-ecdsa" ,python-ecdsa) + `(("python-click" ,python-click) + ("python-ecdsa" ,python-ecdsa) ("python-hidapi" ,python-hidapi) + ("python-libusb1" ,python-libusb1) ("python-mnemonic" ,python-mnemonic) ("python-protobuf" ,python-protobuf) - ("python-requests" ,python-requests))) + ("python-pyblake2" ,python-pyblake2) + ("python-requests" ,python-requests) + ("python-typing" ,python-typing))) (native-inputs - `(("python-pyqt" ,python-pyqt))) ; Tests + `(("python-mock" ,python-mock) ; Tests + ("python-pyqt" ,python-pyqt) ; Tests + ("python-pytest" ,python-pytest))) ; Tests (home-page "https://github.com/trezor/python-trezor") (synopsis "Python library for communicating with TREZOR Hardware Wallet") (description "@code{trezor} is a Python library for communicating with -- cgit v1.2.3 From caf8a003b33f9ed59c8f9bf6fc2ca9929b96b63b Mon Sep 17 00:00:00 2001 From: Christopher Lemmer Webber Date: Wed, 29 Aug 2018 15:52:05 -0400 Subject: gnu: emacs-racket-mode: Update to commit 92c3348. * gnu/packages/emacs.scm (emacs-racket-mode): Update to commit 92c3348. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 6d34f626af..a1ce64ffaa 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -10053,7 +10053,7 @@ perform regression test for packages that provide font-lock rules.") (license license:gpl3+)))) (define-public emacs-racket-mode - (let ((commit "add0190d3c9bdad25fee57f8efd0460c9a45c2ec") + (let ((commit "92c33487f6c707880ac3f6169e7ea65ddffd1463") (revision "1")) (package (name "emacs-racket-mode") @@ -10068,7 +10068,7 @@ perform regression test for packages that provide font-lock rules.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0bf6s4nqjfacij20x9vppdnq8fq1bf53cch6p4g8xqcqri3ms4jw")))) + "19q6ym10gj2xdzzcgh3wdbq1xv8cv7nlrhv2b0bjvvdjzhiki472")))) (build-system emacs-build-system) (arguments `(#:include '("\\.el$" "\\.rkt$"))) -- cgit v1.2.3 From d258c791441b46705f4360cf141343363d1751f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 29 Aug 2018 22:32:05 +0200 Subject: tests: Warn about test module load failures. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reported by Clément Lassieur and Leo Famulari at . * gnu/tests.scm (test-modules): Pass #:warn to 'scheme-modules'. --- gnu/tests.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/tests.scm b/gnu/tests.scm index 5d4a4f8062..9e8eed7d95 100644 --- a/gnu/tests.scm +++ b/gnu/tests.scm @@ -22,6 +22,7 @@ #:use-module (guix gexp) #:use-module (guix utils) #:use-module (guix records) + #:use-module ((guix ui) #:select (warn-about-load-error)) #:use-module (gnu bootloader) #:use-module (gnu bootloader grub) #:use-module (gnu system) @@ -258,7 +259,8 @@ the system under test." (define (test-modules) "Return the list of modules that define system tests." (scheme-modules (dirname (search-path %load-path "guix.scm")) - "gnu/tests")) + "gnu/tests" + #:warn warn-about-load-error)) (define (fold-system-tests proc seed) "Invoke PROC on each system test, passing it the test and the previous -- cgit v1.2.3 From 4db7a9dc663c5b26e45ec35538bf68ff87acdf7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 29 Aug 2018 23:29:03 +0200 Subject: linux-modules: Raise an error when a kernel module cannot be found. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously we'd get an unhelpful backtrace like this: In gnu/build/linux-modules.scm: 184:47 4 (recursive-module-dependencies _ #:lookup-module _) 98:14 3 (module-dependencies _) 85:18 2 (modinfo-section-contents _) In ice-9/ports.scm: 439:11 1 (call-with-input-file #f # ?) In unknown file: 0 (open-file #f "r" #:encoding #f #:guess-encoding #f) ERROR: In procedure open-file: Wrong type (expecting string): #f builder for `/gnu/store/…-linux-modules.drv' failed with exit code 1 * gnu/build/linux-modules.scm (find-module-file): When MODULE cannot be found, raise an error instead of returning #f. This is more useful to the user. --- gnu/build/linux-modules.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/build/linux-modules.scm b/gnu/build/linux-modules.scm index ae141b6f54..2d81175041 100644 --- a/gnu/build/linux-modules.scm +++ b/gnu/build/linux-modules.scm @@ -136,7 +136,7 @@ and normalizing it." (define (find-module-file directory module) "Lookup module NAME under DIRECTORY, and return its absolute file name. NAME can be a file name with or without '.ko', or it can be a module name. -Return #f if it could not be found. +Raise an error if it could not be found. Module names can differ from file names in interesting ways; for instance, module names usually (always?) use underscores as the inter-word separator, @@ -162,7 +162,7 @@ whereas file names often, but not always, use hyphens. Examples: ((file) file) (() - #f) + (error "kernel module not found" module directory)) ((_ ...) (error "several modules by that name" module directory)))) -- cgit v1.2.3 From 8490a8346b5c8207f5798be55bea1de865b0bd42 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Fri, 13 Jul 2018 11:49:13 +0300 Subject: services: Add ddclient service. * gnu/services/dns.scm (ddclient-configuration, ddclient-service-type): New variables. (uglify-field-name, serialize-field, serialize-boolean, serialize-integer, serialize-string, serialize-list, serialize-extra-options, ddclient-activation, ddclient-shepherd-service, generate-ddclient-documentation): New procedures. * doc/guix.texi (DNS Services): Document it. --- gnu/services/dns.scm | 168 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 167 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/services/dns.scm b/gnu/services/dns.scm index 2c57a36b84..16bd039f59 100644 --- a/gnu/services/dns.scm +++ b/gnu/services/dns.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Julien Lepiller +;;; Copyright © 2018 Oleg Pykhalov ;;; ;;; This file is part of GNU Guix. ;;; @@ -45,7 +46,10 @@ zone-entry dnsmasq-service-type - dnsmasq-configuration)) + dnsmasq-configuration + + ddclient-service-type + ddclient-configuration)) ;;; ;;; Knot DNS. @@ -670,3 +674,165 @@ (compose list dnsmasq-shepherd-service)))) (default-value (dnsmasq-configuration)) (description "Run the dnsmasq DNS server."))) + + +;;; +;;; ddclient +;;; + +(define (uglify-field-name field-name) + (string-delete #\? (symbol->string field-name))) + +(define (serialize-field field-name val) + (format #t "~a=~a\n" (uglify-field-name field-name) val)) + +(define (serialize-boolean field-name val) + (serialize-field field-name (if val "yes" "no"))) + +(define (serialize-integer field-name val) + (serialize-field field-name (number->string val))) + +(define (serialize-string field-name val) + (if (and (string? val) (string=? val "")) + "" + (serialize-field field-name val))) + +(define (serialize-list field-name val) + (if (null? val) "" (serialize-field field-name (string-join val)))) + +(define (serialize-extra-options extra-options) + (string-join extra-options "\n" 'suffix)) + +(define-configuration ddclient-configuration + (ddclient + (package ddclient) + "The ddclient package.") + (daemon + (integer 300) + "The period after which ddclient will retry to check IP and domain name.") + (syslog + (boolean #t) + "Use syslog for the output.") + (mail + (string "root") + "Mail to user.") + (mail-failure + (string "root") + "Mail failed update to user.") + (pid + (string "/var/run/ddclient/ddclient.pid") + "The ddclient PID file.") + (ssl + (boolean #t) + "Enable SSL support.") + (user + (string "ddclient") + "Specifies the user name or ID that is used when running ddclient +program.") + (group + (string "ddclient") + "Group of the user who will run the ddclient program.") + (secret-file + (string "/etc/ddclient/secrets.conf") + "Secret file which will be appended to @file{ddclient.conf} file. This +file contains credentials for use by ddclient. You are expected to create it +manually.") + (extra-options + (list '()) + "Extra options will be appended to @file{ddclient.conf} file.")) + +(define (ddclient-account config) + "Return the user accounts and user groups for CONFIG." + (let ((ddclient-user (ddclient-configuration-user config)) + (ddclient-group (ddclient-configuration-group config))) + (list (user-group + (name ddclient-group) + (system? #t)) + (user-account + (name ddclient-user) + (system? #t) + (group ddclient-group) + (comment "ddclientd privilege separation user") + (home-directory (string-append "/var/run/" ddclient-user)))))) + +(define (ddclient-activation config) + "Return the activation GEXP for CONFIG." + (with-imported-modules '((guix build utils) + (ice-9 rdelim)) + #~(begin + (use-modules (guix build utils) + (ice-9 rdelim)) + (let ((ddclient-user + #$(passwd:uid (getpw (ddclient-configuration-user config)))) + (ddclient-group + #$(passwd:gid (getpw (ddclient-configuration-group config)))) + (ddclient-secret-file + #$(ddclient-configuration-secret-file config))) + ;; 'ddclient' complains about ddclient.conf file permissions, which + ;; rules out /gnu/store. Thus we copy the ddclient.conf to /etc. + (for-each (lambda (dir) + (mkdir-p dir) + (chmod dir #o700) + (chown dir ddclient-user ddclient-group)) + '("/var/cache/ddclient" "/var/run/ddclient" + "/etc/ddclient")) + (with-output-to-file "/etc/ddclient/ddclient.conf" + (lambda () + (display + (string-append + "# Generated by 'ddclient-service'.\n\n" + #$(with-output-to-string + (lambda () + (serialize-configuration config + ddclient-configuration-fields))) + (if (string-null? ddclient-secret-file) + "" + (format #f "\n\n# Appended from '~a'.\n\n~a" + ddclient-secret-file + (with-input-from-file ddclient-secret-file + read-string))))))) + (chmod "/etc/ddclient/ddclient.conf" #o600) + (chown "/etc/ddclient/ddclient.conf" + ddclient-user ddclient-group))))) + +(define (ddclient-shepherd-service config) + "Return a for ddclient with CONFIG." + (let ((ddclient (ddclient-configuration-ddclient config)) + (ddclient-pid (ddclient-configuration-pid config)) + (ddclient-user (ddclient-configuration-user config)) + (ddclient-group (ddclient-configuration-group config))) + (list (shepherd-service + (provision '(ddclient)) + (documentation "Run ddclient daemon.") + (start #~(make-forkexec-constructor + (list #$(file-append ddclient "/bin/ddclient") + "-foreground" + "-file" "/etc/ddclient/ddclient.conf") + #:pid-file #$ddclient-pid + #:environment-variables + (list "SSL_CERT_DIR=/run/current-system/profile\ +/etc/ssl/certs" + "SSL_CERT_FILE=/run/current-system/profile\ +/etc/ssl/certs/ca-certificates.crt") + #:user #$ddclient-user + #:group #$ddclient-group)) + (stop #~(make-kill-destructor)))))) + +(define ddclient-service-type + (service-type + (name 'ddclient) + (extensions + (list (service-extension account-service-type + ddclient-account) + (service-extension shepherd-root-service-type + ddclient-shepherd-service) + (service-extension activation-service-type + ddclient-activation))) + (default-value (ddclient-configuration)) + (description "Configure address updating utility for dynamic DNS services, +ddclient."))) + +(define (generate-ddclient-documentation) + (generate-documentation + `((ddclient-configuration ,ddclient-configuration-fields)) + 'ddclient-configuration)) -- cgit v1.2.3 From 16de7f15cb2e9111916542dd538286d50086f100 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 26 Aug 2018 18:42:23 +0200 Subject: 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 (limited to 'gnu') 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 + -- cgit v1.2.3 From 99e0fb24fb7984304f139cb02b31643216642491 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Wed, 29 Aug 2018 19:47:12 -0400 Subject: gnu: audacity: Fix GtkFileChooserDialog. * gnu/packages/audio.scm (audacity)[arguments]: Add 'wrap-program' phase to fix GtkFileChooserDialog. [inputs]: Rename "gtk" to "gtk+". --- gnu/packages/audio.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index f7f831918b..5468742c81 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -324,7 +324,7 @@ engineers, musicians, soundtrack editors and composers.") (build-system gnu-build-system) (inputs `(("wxwidgets" ,wxwidgets) - ("gtk" ,gtk+) + ("gtk+" ,gtk+) ("alsa-lib" ,alsa-lib) ("jack" ,jack-1) ("expat" ,expat) @@ -410,6 +410,15 @@ engineers, musicians, soundtrack editors and composers.") (("../lib-src/portmidi/porttime/porttime.h") "porttime.h")) (substitute* "src/prefs/MidiIOPrefs.cpp" (("../../lib-src/portmidi/pm_common/portmidi.h") "portmidi.h")) + #t)) + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (wrap-program (string-append (assoc-ref outputs "out") + "/bin/audacity") + ;; For GtkFileChooserDialog. + `("GSETTINGS_SCHEMA_DIR" = + (,(string-append (assoc-ref inputs "gtk+") + "/share/glib-2.0/schemas")))) #t))) ;; The test suite is not "well exercised" according to the developers, ;; and fails with various errors. See -- cgit v1.2.3 From 7bb7920f64a871eadd8e76687f72673ef2298746 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 29 Aug 2018 23:15:18 +0200 Subject: gnu: duplicity: Update to 0.7.18.1. * gnu/packages/backup.scm (duplicity): Update to 0.7.18.1. [arguments]: Remove upstreamed '--ignore-mdc-error' kluge. Rename 'patch-source' phase to 'use-store-file-names'. --- gnu/packages/backup.scm | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index b36bb74f6f..bd4a177ecd 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -67,7 +67,7 @@ (define-public duplicity (package (name "duplicity") - (version "0.7.18") + (version "0.7.18.1") (source (origin (method url-fetch) @@ -77,7 +77,7 @@ version ".tar.gz")) (sha256 (base32 - "1qlika4l1k1nx8zr657ihcy0yzr1c1cdnjlbs325l5krvc3zbc5b")))) + "17c0203y5qz9w8iyhs26l44qf6a1vp26b5ykz1ypdr2kv6g02df9")))) (build-system python-build-system) (native-inputs `(("util-linux" ,util-linux) ; setsid command, for the tests @@ -99,21 +99,12 @@ #:test-target "test" #:phases (modify-phases %standard-phases - (add-before 'build 'patch-source + (add-before 'build 'use-store-file-names (lambda* (#:key inputs #:allow-other-keys) - ;; Embed gpg store name. (substitute* "duplicity/gpginterface.py" (("self.call = 'gpg'") (string-append "self.call = '" (assoc-ref inputs "gnupg") "/bin/gpg'"))) - ;; This matches up with an unreleased upstream fix, it should be - ;; removed when the package is updated. - ;; https://bazaar.launchpad.net/~duplicity-team/duplicity/0.8-series/revision/1308 - (substitute* "duplicity/gpg.py" - (("--no-secmem-warning'\\)") - "--no-secmem-warning') - gnupg.options.extra_args.append('--ignore-mdc-error')")) - (substitute* '("testing/functional/__init__.py" "testing/overrides/bin/lftp") (("/bin/sh") (which "sh"))) -- cgit v1.2.3 From 1f0f9514eb77632bb0c22894fbcff6ca08534b19 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 29 Aug 2018 02:43:56 +0200 Subject: gnu: gparted: Update to 0.32.0. * gnu/packages/disk.scm (gparted): Update to 0.32.0. --- gnu/packages/disk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index c7103c565a..58c867d765 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -336,14 +336,14 @@ and can dramatically shorten the lifespan of the drive if left unchecked.") (define-public gparted (package (name "gparted") - (version "0.31.0") + (version "0.32.0") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gparted/gparted/gparted-" version "/gparted-" version ".tar.gz")) (sha256 - (base32 "1fh7rpgb4xxdhgyjsirb83zvjfc5mfngb8a1pjbv7r6r6jj4jyrv")))) + (base32 "1fjp4c8jc0kjbbih1x1vs9v40d9lncma642kflnmy0bixxnvh7df")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; tests require a network connection -- cgit v1.2.3 From a82b561fef437d2f4a041e5f4df8305963552069 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 24 Aug 2018 04:00:47 +0200 Subject: gnu: robocut: Don't use unstable tarball. * gnu/packages/printers.scm (robocut)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/printers.scm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/printers.scm b/gnu/packages/printers.scm index f8890cb7f1..dff9ed3010 100644 --- a/gnu/packages/printers.scm +++ b/gnu/packages/printers.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Ludovic Courtès +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -18,7 +19,7 @@ (define-module (gnu packages printers) #:use-module (guix packages) - #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages libusb) @@ -32,15 +33,15 @@ (package (name "robocut") (version "1.0.11") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/Timmmm/robocut/archive/v" - version ".tar.gz")) - (sha256 - (base32 - "0nmr1plq1f6sarxwqwy4vzbxkljlx8y4xalm7r05vx4lrdai5pad")) - (file-name (string-append name "-" version ".tar.gz")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Timmmm/robocut.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0dp9cssyik63yvkk35s51v94a873x751iqg93qzd8dpqkmz5z8gn")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 33eea5c4393329db159652609605fbb5e6c1ebf0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 29 Aug 2018 03:23:45 +0200 Subject: gnu: perl-sub-identify: Update to 0.14. * gnu/packages/perl.scm (perl-sub-identify): Update to 0.14. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index a2d368306a..4d70e019b9 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -7631,7 +7631,7 @@ renaming exports, if they try to use them.") (define-public perl-sub-identify (package (name "perl-sub-identify") - (version "0.10") + (version "0.14") (source (origin (method url-fetch) @@ -7639,7 +7639,7 @@ renaming exports, if they try to use them.") "Sub-Identify-" version ".tar.gz")) (sha256 (base32 - "087fjcg6w576w47i1slj6mjfd3gl1b0airgddmn3prn0nff6nn2m")))) + "0vxdxyfh6037xy88ic7500wydzmsxldhp95n8bld2kaihqh2g386")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/Sub-Identify") (synopsis "Retrieve names of code references") -- cgit v1.2.3 From ad3306f62fc607fe553fca7c4b01f87a46499e03 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 29 Aug 2018 02:52:47 +0200 Subject: gnu: perl-gd: Update to 2.69. * gnu/packages/gd.scm (perl-gd): Update to 2.69. --- gnu/packages/gd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gd.scm b/gnu/packages/gd.scm index 56553a6745..c374695524 100644 --- a/gnu/packages/gd.scm +++ b/gnu/packages/gd.scm @@ -94,7 +94,7 @@ most common applications of GD involve website development.") (define-public perl-gd (package (name "perl-gd") - (version "2.68") + (version "2.69") (source (origin (method url-fetch) @@ -102,7 +102,7 @@ most common applications of GD involve website development.") "GD-" version ".tar.gz")) (sha256 (base32 - "0p2ya641nl5cvcqgw829xgabh835qijfd6vq2ba12862946xx8va")))) + "0palmq7l42fibqxhrabnjm7di4q8kciq9323902d717x3i4jvc6x")))) (build-system perl-build-system) (inputs `(("fontconfig" ,fontconfig) -- cgit v1.2.3 From bfb994d8be24d27378d77d0d280cf01b44eaa344 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 29 Aug 2018 03:52:18 +0200 Subject: gnu: r-car: Update to 3.0-2. * gnu/packages/statistics.scm (r-car): Update to 3.0-2. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 56dfa0d15f..97246dc31d 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5172,14 +5172,14 @@ Companion to Applied Regression, Third Edition, Sage.") (define-public r-car (package (name "r-car") - (version "3.0-1") + (version "3.0-2") (source (origin (method url-fetch) (uri (cran-uri "car" version)) (sha256 (base32 - "0rdk7hgahs38j6yv861i31wpmsmyvksxcv8jarvvcjl60whizhb2")))) + "0l3wyc9ia0ypcbap2p39slazfpbl84mjzydqvpsywrzdiyxajnfz")))) (build-system r-build-system) (propagated-inputs `(("r-abind" ,r-abind) -- cgit v1.2.3 From 9986316618c471a9a100d1b317a342aee8d5e6df Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 28 Aug 2018 22:04:16 +0200 Subject: gnu: mujs: Update to 1.0.4. * gnu/packages/javascript.scm (mujs): Update to 1.0.4. --- gnu/packages/javascript.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index 3a9e88ad08..75517caf6b 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2017 Ricardo Wurmus -;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2018 Nicolas Goaziou ;;; @@ -26,6 +26,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages compression) #:use-module (gnu packages lisp) + #:use-module (gnu packages readline) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) @@ -412,7 +413,7 @@ external server.") (define-public mujs (package (name "mujs") - (version "1.0.3") + (version "1.0.4") (source (origin (method git-fetch) (uri (git-reference @@ -421,14 +422,16 @@ external server.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "15ml3rzjl44lqdb1yxipdh8bhh0rvk2g6w6sjv667q8xywijwqv8")))) + "1ly0yybs66nk63517kg4dmdc7dbikhqqqf2r2kvccgzzvv6k0vs8")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases - (delete 'configure)) ; no configure + (delete 'configure)) ; no configure #:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out")) (string-append "CC=gcc")) - #:tests? #f)) ; no tests + #:tests? #f)) ; no tests + (inputs + `(("readline" ,readline))) (home-page "https://artifex.com/mujs/") (synopsis "JavaScript interpreter written in C") (description "MuJS is a lightweight Javascript interpreter designed for -- cgit v1.2.3 From a28604ee8152a436f9d7384057a375a0362f34af Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 30 Aug 2018 00:53:01 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.153. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.153. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9ef695c4b2..49fc84c17b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -451,8 +451,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.152" - "082aajyr363ca95pxlg9iascf5d7k2gbw9ggsbsa1hj6nhspsxw6" + (make-linux-libre "4.4.153" + "195vzkkmjiicqfzd38hgf381rlz665rl06abzf8cww0gbnzvrf72" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From fa4131f2aa7ee97885169b9d3dcbf784c9382159 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 29 Aug 2018 13:58:35 -0500 Subject: netsurf-buildsystem: Upgrade to 1.7. * gnu/packages/web.scm (netsurf-buildsystem): Upgrade to 1.7. --- gnu/packages/web.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index aea75654be..b9c2e9e1a7 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus ;;; Copyright © 2018 Raoul Jean Pierre Bonnal ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer -;;; Copyright © 2015, 2016, 2017 Eric Bavier +;;; Copyright © 2015, 2016, 2017, 2018 Eric Bavier ;;; Copyright © 2015 Eric Dvorsak ;;; Copyright © 2016 Sou Bunnbu ;;; Copyright © 2016 Jelle Licht @@ -4275,7 +4275,7 @@ tools they trust (e.g. wget).") (define netsurf-buildsystem (package (name "netsurf-buildsystem") - (version "1.6") + (version "1.7") (source (origin (method url-fetch) @@ -4283,7 +4283,7 @@ tools they trust (e.g. wget).") "buildsystem-" version ".tar.gz")) (sha256 (base32 - "0p5k708lcq8dip9xxck6hml32bjrbyipprm22bbsvdnsc0pqm71x")))) + "1q23aaycv35ma5471l1gxib8lfq2s9kprrkaqgfc926d04rlbmhw")))) (build-system gnu-build-system) (inputs `(("perl" ,perl))) (arguments -- cgit v1.2.3 From ea9b34c2f55b7b2b44a6a2ef1abf23c787c90b10 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 29 Aug 2018 13:59:35 -0500 Subject: libparserutils: Upgrade to 0.2.4. * gnu/packages/web.scm (libparserutils): Upgrade to 0.2.4. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index b9c2e9e1a7..6381aec18c 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4314,7 +4314,7 @@ libraries.") (define-public libparserutils (package (name "libparserutils") - (version "0.2.3") + (version "0.2.4") (source (origin (method url-fetch) @@ -4322,7 +4322,7 @@ libraries.") name "-" version "-src.tar.gz")) (sha256 (base32 - "01gzlsabgl6x0icd8758d9jqs8rrf9574bdkjainn04w3fs3znf5")))) + "1n2794y2l0c8nv8z2pxwfnbn882987ifmxjv60zdxkhcndhswarj")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem) -- cgit v1.2.3 From b06bf74b4139e6718926dfdb3aff3cdda0cbd793 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 29 Aug 2018 14:00:11 -0500 Subject: hubbub: Upgrade to 0.3.5. * gnu/packages/web.scm (hubbub): Upgrade to 0.3.5. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 6381aec18c..5fe149a75d 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4339,7 +4339,7 @@ C. It is developed as part of the NetSurf project.") (define-public hubbub (package (name "hubbub") - (version "0.3.4") + (version "0.3.5") (source (origin (method url-fetch) @@ -4347,7 +4347,7 @@ C. It is developed as part of the NetSurf project.") "lib" name "-" version "-src.tar.gz")) (sha256 (base32 - "1shi4hv8drn9zy8f2f6yhnz2dqnpg5jkybvqhzggfjx1q35fbxz3")) + "13yq1k96a7972x4r71i9bcsz9yiglj0yx7lj0ziq5r94w5my70ma")) (patches (search-patches "hubbub-sort-entities.patch")))) (build-system gnu-build-system) (native-inputs -- cgit v1.2.3 From 60e411fc94b06c11a32a3b4209e9ea5244d63aee Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 29 Aug 2018 14:00:39 -0500 Subject: libwapcaplet: Upgrade to 0.4.1. * gnu/packages/web.scm (libwapcaplet): Upgrade to 0.4.1. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 5fe149a75d..9d3c4439f7 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4453,7 +4453,7 @@ commenting.") (define-public libwapcaplet (package (name "libwapcaplet") - (version "0.4.0") + (version "0.4.1") (source (origin (method url-fetch) @@ -4461,7 +4461,7 @@ commenting.") name "-" version "-src.tar.gz")) (sha256 (base32 - "15yr0pl6qa6biy36qkmd949ydbjzpqiaccpx3sprh4jknabsk1vv")))) + "134pljlm8kby1yy49826f0ixnpig8iqak6xpyl3aivagnsjnxzy8")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem) -- cgit v1.2.3 From 2bb1752b7d74f638af6703fdb6d8f210dac75364 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 29 Aug 2018 14:07:21 -0500 Subject: libcss: Upgrade to 0.8.0. * gnu/packages/web.scm (libcss): Upgrade to 0.8.0. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 9d3c4439f7..f8e77aa026 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4479,7 +4479,7 @@ developed as part of the Netsurf project.") (define-public libcss (package (name "libcss") - (version "0.7.0") + (version "0.8.0") (source (origin (method url-fetch) @@ -4487,7 +4487,7 @@ developed as part of the Netsurf project.") name "-" version "-src.tar.gz")) (sha256 (base32 - "16mns3h8vj7iw8myvgnw58q84irvbjlvfkxh8mdw6fbkjvaa7cnz")))) + "0pxdqbxn6brj03nv57bsvac5n70k4scn3r5msaw0jgn2k06lk81m")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem) -- cgit v1.2.3 From f8311c0feed593a5777303ee2d740c87b4a3970f Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 29 Aug 2018 14:08:07 -0500 Subject: libdom: Upgrade to 0.3.3. * gnu/packages/web.scm (libdom): Upgrade to 0.3.3. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index f8e77aa026..05f327b166 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4507,7 +4507,7 @@ written in C. It is developed as part of the NetSurf project.") (define-public libdom (package (name "libdom") - (version "0.3.2") + (version "0.3.3") (source (origin (method url-fetch) @@ -4515,7 +4515,7 @@ written in C. It is developed as part of the NetSurf project.") name "-" version "-src.tar.gz")) (sha256 (base32 - "1zb7x2qwm6p11lph6j2vcyp4a0a8i1klkqilnk5vb4qmlzzpcv7i")))) + "1919757mdl3gii2pl6kzm8b1cal0h06r5nqd2y0kny6hc5yrhsp0")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem) -- cgit v1.2.3 From bb38628fab4448254350664c167351f2722b4d52 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 29 Aug 2018 14:10:28 -0500 Subject: libsvgtiny: Upgrade to 0.1.7. * gnu/packages/web.scm (libsvgtiny): Upgrade to 0.1.7. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 05f327b166..68ffd2a6a3 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4543,7 +4543,7 @@ developed as part of the NetSurf project.") (define-public libsvgtiny (package (name "libsvgtiny") - (version "0.1.6") + (version "0.1.7") (source (origin (method url-fetch) @@ -4551,7 +4551,7 @@ developed as part of the NetSurf project.") name "-" version "-src.tar.gz")) (sha256 (base32 - "12ppy2r7m21ykrjgbf067cgi6dn48fkj7i4b7m64xl4dc13y0ah6")))) + "10bpkmvfpydj74im3r6kqm9vnvgib6afy0alx71q5n0w5yawy39c")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem) -- cgit v1.2.3 From ef2198ac5bbfcc6c80e765e7c46f308a714522da Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 29 Aug 2018 14:10:52 -0500 Subject: libnsbmp: Upgrade to 0.1.5. * gnu/packages/web.scm (libnsbmp): Upgrade to 0.1.5. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 68ffd2a6a3..4142551d60 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4574,7 +4574,7 @@ project.") (define-public libnsbmp (package (name "libnsbmp") - (version "0.1.4") + (version "0.1.5") (source (origin (method url-fetch) @@ -4582,7 +4582,7 @@ project.") name "-" version "-src.tar.gz")) (sha256 (base32 - "0y4a0gn4l6lq4z9183wix0mdsgalqyw24k19k8jr8sz4h3lb7jrb")))) + "0lib2m07d1i0k80m4blkwnj0g7rha4jbm5vrgd0wwbkyfa0hvk35")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem))) -- cgit v1.2.3 From 1dc02e727b7a1c0a41c0bf33a6e582f64060af9d Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 29 Aug 2018 14:11:18 -0500 Subject: libnsgif: Upgrade to 0.2.1. * gnu/packages/web.scm (libnsgif): Upgrade to 0.2.1. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 4142551d60..8ffdce79ff 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4597,7 +4597,7 @@ written in C. It is developed as part of the NetSurf project.") (define-public libnsgif (package (name "libnsgif") - (version "0.2.0") + (version "0.2.1") (source (origin (method url-fetch) @@ -4605,7 +4605,7 @@ written in C. It is developed as part of the NetSurf project.") name "-" version "-src.tar.gz")) (sha256 (base32 - "1phwf0m24m6nd7096fw14hanl4f8gr9bcppi834lbik04agxk38a")))) + "0jwshypgmx16xlsbx3d8njk8a5khazlplca5mxd3rdbhrlsabbly")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem))) -- cgit v1.2.3 From 3e1035d738ba6d65121f8094df8f0ca5a690c492 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 29 Aug 2018 14:11:39 -0500 Subject: libnsutils: Upgrade to 0.0.5. * gnu/packages/web.scm (libnsutils): Upgrade to 0.0.5. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 8ffdce79ff..938bcce6c2 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4620,7 +4620,7 @@ C. It is developed as part of the NetSurf project.") (define-public libnsutils (package (name "libnsutils") - (version "0.0.3") + (version "0.0.5") (source (origin (method url-fetch) @@ -4628,7 +4628,7 @@ C. It is developed as part of the NetSurf project.") name "-" version "-src.tar.gz")) (sha256 (base32 - "0wrxn4rcn7xrfnkmf60jafqn3n1kicgsdpnakd821q56bmqvzf0m")))) + "09w1rixps1iiq6wirjwxmd6h87llvjzvw565rahjb3rlyhcplfqf")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem))) -- cgit v1.2.3 From 1be70775728f1809201f287d0b3de1da31b046c6 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 29 Aug 2018 14:12:04 -0500 Subject: libnspsl: Upgrade to 0.1.3. * gnu/packages/web.scm (libnspsl): Upgrade to 0.1.3. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 938bcce6c2..44ebf6d722 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4643,7 +4643,7 @@ developed as part of the NetSurf project.") (define-public libnspsl (package (name "libnspsl") - (version "0.1.2") + (version "0.1.3") (source (origin (method url-fetch) @@ -4651,7 +4651,7 @@ developed as part of the NetSurf project.") name "-" version "-src.tar.gz")) (sha256 (base32 - "0wim5hwzwrfrvvap096whf79m2mnfivbqhqlh03ci9d89xb1w0y9")))) + "1rsk1k2a495axxgv8060s0p1phhhcxrv75252kllbkvr8id5kqld")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem))) -- cgit v1.2.3 From c558113fb9ac60b8ec9ffca6f8059518514c548c Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 29 Aug 2018 14:12:22 -0500 Subject: nsgenbind: Upgrade to 0.6. * gnu/packages/web.scm (nsgenbind): Upgrade to 0.6. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 44ebf6d722..6fc917b6be 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4666,7 +4666,7 @@ Public Suffix List. It is developed as part of the NetSurf project.") (define-public nsgenbind (package (name "nsgenbind") - (version "0.5") + (version "0.6") (source (origin (method url-fetch) @@ -4674,7 +4674,7 @@ Public Suffix List. It is developed as part of the NetSurf project.") name "-" version "-src.tar.gz")) (sha256 (base32 - "1iwjpdaan0njlhb9ir6a2q5vpxfmkqfldkvnqszqdz50b44vd1jv")))) + "0v1cb1rz5fix9ql31nzmglj7sybya6d12b2fkaypm1avcca59xwj")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem) -- cgit v1.2.3 From f9e140a243b6d6b5d28bd0813b69604562a39653 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 29 Aug 2018 14:12:58 -0500 Subject: netsurf: Upgrade to 3.8. * gnu/packages/patches/netsurf-message-timestamp.patch: New patch. * gnu/packages/patches/netsurf-system-utf8proc.patch: Adjust to new source. * gnu/packages/web.scm (netsurf): Upgrade to 3.8. [source]: Add the new patch. --- .../patches/netsurf-message-timestamp.patch | 11 ++++++++++ gnu/packages/patches/netsurf-system-utf8proc.patch | 25 +++++++++++----------- gnu/packages/web.scm | 7 +++--- 3 files changed, 28 insertions(+), 15 deletions(-) create mode 100644 gnu/packages/patches/netsurf-message-timestamp.patch (limited to 'gnu') diff --git a/gnu/packages/patches/netsurf-message-timestamp.patch b/gnu/packages/patches/netsurf-message-timestamp.patch new file mode 100644 index 0000000000..8df9dbf8f7 --- /dev/null +++ b/gnu/packages/patches/netsurf-message-timestamp.patch @@ -0,0 +1,11 @@ +--- netsurf-3.8/utils/split-messages.pl.orig 1969-12-31 18:00:00.000000000 -0600 ++++ netsurf-3.8/utils/split-messages.pl 2018-08-30 00:18:58.158367530 -0500 +@@ -238,7 +238,7 @@ + + if( $opt{gzip} ) + { +- $ofh = new IO::Compress::Gzip( $ofh, AutoClose => 1, -Level => 9 ); ++ $ofh = new IO::Compress::Gzip( $ofh, AutoClose => 1, -Level => 9, Time => 0 ); + } + + return $ofh; diff --git a/gnu/packages/patches/netsurf-system-utf8proc.patch b/gnu/packages/patches/netsurf-system-utf8proc.patch index 654d45d017..a2ee52ca05 100644 --- a/gnu/packages/patches/netsurf-system-utf8proc.patch +++ b/gnu/packages/patches/netsurf-system-utf8proc.patch @@ -17,23 +17,23 @@ Work around upstream's lack of a pkg-config file and update API. # Optional libraries with pkgconfig ---- netsurf-3.6/utils/idna.c -+++ netsurf-3.6/utils/idna.c -@@ -26,7 +26,7 @@ - #include +--- netsurf-3.8/utils/idna.c ++++ netsurf-3.8/utils/idna.c +@@ -27,7 +27,7 @@ #include #include + #include -#include +#include - #include "utils/errors.h" - #include "utils/idna.h" ---- netsurf-3.7/test/Makefile 2017-10-15 08:39:24.000000000 -0500 -+++ netsurf-3.7/test/Makefile 2017-11-05 11:14:46.219013218 -0600 -@@ -139,14 +139,14 @@ - -D_XOPEN_SOURCE=600 \ + #include "netsurf/inttypes.h" + +--- netsurf-3.8/test/Makefile ++++ netsurf-3.8/test/Makefile +@@ -142,14 +142,15 @@ -Itest -Iinclude -Icontent/handlers -Ifrontends -I. -I.. \ -Dnsgtk \ + $(SAN_FLAGS) \ - $(shell pkg-config --cflags libcurl libparserutils libwapcaplet libdom libnsutils libutf8proc) \ + $(shell pkg-config --cflags libcurl libparserutils libwapcaplet libdom libnsutils) \ $(LIB_CFLAGS) @@ -43,7 +43,8 @@ Work around upstream's lack of a pkg-config file and update API. TESTLDFLAGS := -L$(TESTROOT) \ - $(shell pkg-config --libs libcurl libparserutils libwapcaplet libdom libnsutils libutf8proc) -lz \ -+ $(shell pkg-config --libs libcurl libparserutils libwapcaplet libdom libnsutils) -lz -lutf8proc \ ++ $(shell pkg-config --libs libcurl libparserutils libwapcaplet libdom libnsutils) \ ++ $(LDFLAGS) \ + $(SAN_FLAGS) \ $(LIB_LDFLAGS)\ $(COV_LDFLAGS) - diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 6fc917b6be..0d27fa0054 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4694,7 +4694,7 @@ w3c webidl files and a binding configuration file.") (define-public netsurf (package (name "netsurf") - (version "3.7") + (version "3.8") (source (origin (method url-fetch) @@ -4702,10 +4702,11 @@ w3c webidl files and a binding configuration file.") "releases/source/netsurf-" version "-src.tar.gz")) (sha256 (base32 - "05kynfzzwd4fc03vbqdjpghh5xnk2yrh43w7vikak89vla30mhpg")) + "0hjm1h4m1i913y4mhkl7yqdifn8k70fwi58zdh6faypawzryc3m0")) (patches (search-patches "netsurf-system-utf8proc.patch" "netsurf-y2038-tests.patch" - "netsurf-longer-test-timeout.patch")))) + "netsurf-longer-test-timeout.patch" + "netsurf-message-timestamp.patch")))) (build-system glib-or-gtk-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem) -- cgit v1.2.3 From b5d1286f2d796ce6dfcf45b9eeb0cf5630c191a9 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Mon, 27 Aug 2018 14:13:25 +0300 Subject: gnu: net-snmp: Specify '--with-openssl' configuration flag. * gnu/packages/networking.scm (net-snmp)[arguments]: Add '--with-openssl' flag. --- gnu/packages/networking.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 943bcecb86..61c0ad7fba 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2013,7 +2013,9 @@ Features: (list (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib") - "--with-logfile=/var/log/snmpd.log") + "--with-logfile=/var/log/snmpd.log" + (string-append "--with-openssl=" + (assoc-ref %build-inputs "openssl"))) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-tests -- cgit v1.2.3 From 471884ed112e072b59ea4cf360b2827a684e700e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 29 Aug 2018 21:41:18 +0200 Subject: gnu: lilv: Propagate LV2. * gnu/packages/audio.scm (lilv)[propagated-inputs]: Add LV2. [inputs]: Remove. --- gnu/packages/audio.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 5468742c81..e731569ae1 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1749,11 +1749,10 @@ included are the command line utilities @code{send_osc} and @code{dump_osc}.") #t))))) ;; Required by lilv-0.pc. (propagated-inputs - `(("serd" ,serd) + `(("lv2" ,lv2) + ("serd" ,serd) ("sord" ,sord) ("sratom" ,sratom))) - (inputs - `(("lv2" ,lv2))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://drobilla.net/software/lilv/") -- cgit v1.2.3 From 99088aa7514d462374b8deac8d78015cf8d78c12 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 30 Aug 2018 17:53:16 +0200 Subject: gnu: p11-kit: Update to 0.23.14. * gnu/packages/tls.scm (p11-kit): Update to 0.23.14. --- gnu/packages/tls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 28d2ea5fd5..e42b6dfc6c 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -120,7 +120,7 @@ in intelligent transportation networks.") (define-public p11-kit (package (name "p11-kit") - (version "0.23.13") + (version "0.23.14") (source (origin (method url-fetch) @@ -128,7 +128,7 @@ in intelligent transportation networks.") "download/" version "/p11-kit-" version ".tar.gz")) (sha256 (base32 - "1w92k6p4bhg8p24igfb6ifc6vixr2zdjh3x6gjhsphy778z40rda")))) + "0w0dkq9388grbbn4bv2p55vy1j51f7nd9hzlc9gz4fbm4dnzmf8w")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 652940d060fba5df8e058ff6073a270758d43448 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 30 Aug 2018 17:56:09 +0200 Subject: gnu: ldb: Update to 1.3.6. * gnu/packages/samba.scm (ldb): Update to 1.3.6. --- gnu/packages/samba.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 16b9470e7c..3316e665f0 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -341,14 +341,14 @@ many event types, including timers, signals, and the classic file descriptor eve (define-public ldb (package (name "ldb") - (version "1.3.3") + (version "1.3.6") (source (origin (method url-fetch) (uri (string-append "https://www.samba.org/ftp/ldb/ldb-" version ".tar.gz")) (sha256 (base32 - "14gsrm7dvyjpbpnc60z75j6fz2p187abm2h353lq95kx2bv70c1b")) + "16lkz3gyvsm9als1wyimsl573hclr72xy6454mshwjanncs33lji")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From d3c1075c144c14d884290eb3012af946a5935ca1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 30 Aug 2018 17:57:37 +0200 Subject: gnu: samba: Update to 4.8.5. * gnu/packages/samba.scm (samba): Update to 4.8.5. --- gnu/packages/samba.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 3316e665f0..345655d584 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -150,14 +150,14 @@ anywhere.") (define-public samba (package (name "samba") - (version "4.8.4") + (version "4.8.5") (source (origin (method url-fetch) (uri (string-append "https://download.samba.org/pub/samba/stable/" "samba-" version ".tar.gz")) (sha256 (base32 - "01jlk8xlawfp3yyhi5migcd1fy7dkavbh56in444m281kqa4s17m")))) + "0mailvhjsma19k6b6zjl02z9n2hbbyfybvicjfw2hh9d4sqyd3p5")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From e50c7278782a02a01ca3eb35670d75c8cb4f7fd9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 30 Aug 2018 18:01:54 +0200 Subject: gnu: rng-tools: Update to 6.4. * gnu/packages/linux.scm (rng-tools): Update to 6.4. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 49fc84c17b..63b3ece8e1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3625,7 +3625,7 @@ The following service daemons are also provided: (define-public rng-tools (package (name "rng-tools") - (version "6.3.1") + (version "6.4") (source (origin (method url-fetch) (uri (string-append "https://github.com/nhorman/rng-tools/" @@ -3633,7 +3633,7 @@ The following service daemons are also provided: (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "04p7wvcm389s21y9mq8ss6z2szxi4nfrfixzwqjkq2qciz705i4s")))) + "005krksl8iz37l5p1nx8apl1yg7q78yrsb6inby31d2g5ck8nnwa")))) (build-system gnu-build-system) (arguments `(;; Avoid using OpenSSL, curl, and libxml2, reducing the closure by 166 MiB. -- cgit v1.2.3 From 4c13cb36f8a4dafcc3647441e301ffdabdae9166 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 30 Aug 2018 18:20:16 +0200 Subject: gnu: GnuPG: Update to 2.2.10. * gnu/packages/gnupg.scm (gnupg): Update to 2.2.10. --- gnu/packages/gnupg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index d5fb12650f..067a2338d4 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -247,14 +247,14 @@ compatible to GNU Pth.") (define-public gnupg (package (name "gnupg") - (version "2.2.9") + (version "2.2.10") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/gnupg/gnupg-" version ".tar.bz2")) (sha256 (base32 - "0r11mx8nkh7ysrnshs560amha5csx8zcaggb5kxcksx1zymyly32")))) + "05f9804g72pffdxgvxjmjzkfcpjg1x221g9rwcr8fi51hrxd77br")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 883832b4804cde76239ceef1cdc7f9ed808435f3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 30 Aug 2018 18:41:27 +0200 Subject: gnu: appstream-glib: Update to 0.7.12. * gnu/packages/glib.scm (appstream-glib): Update to 0.7.12. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 33b77555b5..14d2a8b315 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -787,7 +787,7 @@ programming langauage. It also contains the utility (define-public appstream-glib (package (name "appstream-glib") - (version "0.7.10") + (version "0.7.12") (source (origin (method url-fetch) (uri (string-append "https://people.freedesktop.org/~hughsient/" @@ -795,7 +795,7 @@ programming langauage. It also contains the utility "appstream-glib-" version ".tar.xz")) (sha256 (base32 - "08bs0hnkvdzqv9pakv1y4c4ph77rmzjq22g760w20sv7vs63nia3")))) + "1jcb2bggcic3iczr2hn8zp8a3c2hl1xjij0aawr7kwqmzh9b3jms")))) (build-system meson-build-system) (native-inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From 7693f678d1de222e47af6b34ce62c41ea69934c8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 30 Aug 2018 18:57:10 +0200 Subject: gnu: pango: Replace with 1.42.4. Fixes . * gnu/packages/gtk.scm (pango)[replacement]: New field. (pango-1.42.4): New public variable. --- gnu/packages/gtk.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 8b11e3fb1f..6c43a3ab56 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -218,6 +218,7 @@ affine transformation (scale, rotation, shear, etc.).") (package (name "pango") (version "1.42.0") + (replacement pango-1.42.4) (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/pango/" @@ -253,6 +254,19 @@ used throughout the world.") (license license:lgpl2.0+) (home-page "https://developer.gnome.org/pango/"))) +(define-public pango-1.42.4 + (package + (inherit pango) + (version "1.42.4") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/pango/" + (version-major+minor version) "/" + "pango-" version ".tar.xz")) + (sha256 + (base32 + "17bwb7dgbncrfsmchlib03k9n3xaalirb39g3yb43gg8cg6p8aqx")))))) + (define-public pangox-compat (package (name "pangox-compat") -- cgit v1.2.3 From aadd1d241cc9891a857dda9a5cf8389673b3c76c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 30 Aug 2018 16:53:24 +0200 Subject: gnu: Add ddcutil. * gnu/packages/hardware.scm: New file. (ddcutil): New public variable. * gnu/local.mk (GNU_SYSTEM_MODULES): Add the new file. --- gnu/local.mk | 1 + gnu/packages/hardware.scm | 75 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 gnu/packages/hardware.scm (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 7b980b2f20..3b92a7ac0e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -213,6 +213,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/guile-wm.scm \ %D%/packages/gv.scm \ %D%/packages/gxmessage.scm \ + %D%/packages/hardware.scm \ %D%/packages/haskell.scm \ %D%/packages/haskell-check.scm \ %D%/packages/haskell-crypto.scm \ diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm new file mode 100644 index 0000000000..d3a99af358 --- /dev/null +++ b/gnu/packages/hardware.scm @@ -0,0 +1,75 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages hardware) + #:use-module (gnu packages compression) + #:use-module (gnu packages glib) + #:use-module (gnu packages libusb) + #:use-module (gnu packages linux) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages xdisorg) + #:use-module (gnu packages xorg) + #:use-module (guix build-system gnu) + #:use-module (guix download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages)) + +;; This is a module for packages related to physical hardware that don't (yet) +;; have a more specific home like gps.scm, security-token.scm, &c. + +(define-public ddcutil + (package + (name "ddcutil") + (version "0.9.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.ddcutil.com/tarballs/" + name "-" version ".tar.gz")) + (sha256 + (base32 "1b4bm3zhk5vnad6fxf0mn8nrlj3fngifl7nzxgxw0n56hlv7ccv0")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("eudev" ,eudev) + ("glib" ,glib) + ("libdrm" ,libdrm) ; enhanced diagnostics + ("libusb" ,libusb) ; support USB monitors + ("libx11" ,libx11) ; enhanced diagnostics + ("libxrandr" ,libxrandr) + ("zlib" ,zlib))) + (home-page "https://www.ddcutil.com/") + (synopsis "Control external monitor settings") + (description + "ddcutil can query and modify most external monitors' settings, such as +brightness, colour levels, and input sources. Generally speaking, any setting +that can be changed by pressing buttons on the monitor can be modified by +ddcutil. + +ddcutil communicates directly with monitors implementing the Monitor Control +Command Set (@dfn{MCCS}). It usually does so through the the Display Data +Channel Command Interface (@dfn{DDC/CI}) protocol on the I2C bus, but can also +communicate over USB as per the USB Monitor Control Class Specification. + +One particular use case is in colour profile management. Monitor calibration +is relative to the monitor colour settings currently in effect, e.g. red gain. +ddcutil allows colour-related settings to be saved at the time a monitor is +calibrated, and restored when the calibration is applied.") + (license (list license:bsd-3 ; FindDDCUtil.cmake + license:gpl2+)))) ; everything else -- cgit v1.2.3 From 6e8c75b88435550906e251dd4a9c2eb732f803d4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 30 Aug 2018 17:50:48 +0200 Subject: gnu: Add msr-tools. * gnu/packages/hardware.scm (msr-tools): New public variable. --- gnu/packages/hardware.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index d3a99af358..f77336e504 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -73,3 +73,52 @@ ddcutil allows colour-related settings to be saved at the time a monitor is calibrated, and restored when the calibration is applied.") (license (list license:bsd-3 ; FindDDCUtil.cmake license:gpl2+)))) ; everything else + +(define-public msr-tools + (package + (name "msr-tools") + (version "1.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://01.org/sites/default/files/downloads/" + name "/" name "-" version ".zip")) + (sha256 + (base32 "07hxmddg0l31kjfmaq84ni142lbbvgq6391r8bd79wpm819pnigr")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags + (list (string-append "sbindir=" (assoc-ref %outputs "out") "/sbin")) + #:phases + (modify-phases %standard-phases + (delete 'configure) ; no configure script + (add-before 'install 'create-output-directory + (lambda* (#:key outputs #:allow-other-keys) + ;; 'make install' assumes that sbindir exists. + (let* ((out (assoc-ref outputs "out")) + (sbin (string-append out "/sbin"))) + (mkdir-p sbin) + #t)))) + #:tests? #f)) ; no test suite + (native-inputs + `(("unzip" ,unzip))) + ;; These registers and the CPUID instruction only exist on (most) x86 chips. + (supported-systems (list "i686-linux" "x86_64-linux")) + (home-page "https://01.org/msr-tools/") + (synopsis "Read and write Model-Specific Registers (@dfn{MSR})") + (description + "The MSR Tools project provides console utilities to directly access the +Model-Specific Registers (@dfn{MSR}s) and CPU ID of Intel-compatible processors: + +@itemize +@item @command{cpuid}: show identification and feature information of any CPU +@item @command{rdmsr}: read MSRs from any CPU or all CPUs +@item @command{wrmsr}: write to MSRs on any CPU or all CPUs +@end itemize + +These tools can be used to query and modify certain low-level CPU parameters, +such as the Turbo Boost ratio and Thermal Design Power (@dfn{TDP}) limits. + +MSR addresses differ (greatly) between processors, and any such modification can +be dangerous and may void your CPU or system board's warranty.") + (license license:gpl2))) ; cpuid.c is gpl2, {rd,wr}msr.c are gpl2+ -- cgit v1.2.3 From 8294362688096145547464ceaa25edd5cc65d024 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 21 Mar 2018 00:26:15 +0100 Subject: gnu: Add pipewalker. * gnu/packages/games.scm (pipewalker): New public variable. --- gnu/packages/games.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 0142fc8ed2..3c5063f69b 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -793,6 +793,46 @@ role, and your gender.") (license:fsdg-compatible "https://nethack.org/common/license.html")))) +(define-public pipewalker + (package + (name "pipewalker") + (version "0.9.4") + (source + (origin + (method url-fetch) + (uri (string-append "http://downloads.sourceforge.net/pipewalker/" + name "-" version ".tar.gz")) + (sha256 + (base32 + "1x46wgk0s55562pd96cxagxkn6wpgglq779f9b64ff1k3xzp3myn")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list (string-append "--docdir=" (assoc-ref %outputs "out") + "/share/doc/" ,name "-" ,version)) + #:phases + (modify-phases %standard-phases + (add-after 'configure 'patch-docdir + ;; Makefile.in ignores configure's ‘--docdir=...’ option. Fix that. + (lambda _ + (substitute* "Makefile" + (("(pkgdocdatadir = ).*" _ assignment) + (string-append assignment "$(docdir)\n"))) + #t))))) + (inputs + `(("libpng" ,libpng) + ("mesa" ,mesa) + ("sdl" ,sdl))) + (home-page "http://pipewalker.sourceforge.net/") + (synopsis "Logical tile puzzle") + (description + "PipeWalker is a simple puzzle game with many diffent themes: connect all +computers to one network server, bring water from a source to the taps, etc. +The underlying mechanism is always the same: you must turn each tile in the +grid in the right direction to combine all components into a single circuit. +Every puzzle has a complete solution, although there may be more than one.") + (license license:gpl3+))) + (define-public prboom-plus (package (name "prboom-plus") -- cgit v1.2.3 From d6d9ca1017e6fce811862409b79cdbf692f1fc8e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 24 Aug 2018 03:51:38 +0200 Subject: gnu: Don't use unstable tarballs in (packages opencl). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/opencl.scm (opencl-clhpp, clinfo, beignet, pocl) [source]: Use GIT-FETCH and GIT-FILE-NAME. (pocl)[arguments]: Remove ‘remove-headers’ phase. (make-opencl-headers)[source]: Use GIT-FILE-NAME. --- gnu/packages/opencl.scm | 96 +++++++++++++++++++++++-------------------------- 1 file changed, 45 insertions(+), 51 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/opencl.scm b/gnu/packages/opencl.scm index 42cedd1544..d32e696438 100644 --- a/gnu/packages/opencl.scm +++ b/gnu/packages/opencl.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Fis Trivial +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -57,7 +58,7 @@ (uri (git-reference (url "https://github.com/KhronosGroup/OpenCL-Headers.git") (commit commit))) - (file-name (string-append name "-" commit)) + (file-name (git-file-name name version)) (sha256 (base32 "176ydpbyws5nr4av6hf8p41pkhc0rc4m4vrah9w6gp2fw2i32838")))) @@ -102,15 +103,15 @@ programming.") (package (name "opencl-clhpp") (version "2.0.10") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/KhronosGroup/OpenCL-CLHPP/archive/v" - version ".tar.gz")) - (sha256 - (base32 - "0awg6yznbz3h285kmnd47fykx2qa34a07sr4x1657yn3jmi4a9zs")) - (file-name (string-append name "-" version ".tar.gz")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/KhronosGroup/OpenCL-CLHPP.git") + (commit (string-append "v" version)))) + (sha256 + (base32 "0h5kpg5cl8wzfnqmv6i26aig2apv06ffm9p3rh35938n9r8rladm")) + (file-name (git-file-name name version)))) (native-inputs `(("python" ,python-wrapper))) (propagated-inputs @@ -124,7 +125,7 @@ programming.") (string-append "-DCMAKE_INSTALL_PREFIX=" (assoc-ref %outputs "out") "/include"))) - ;; regression tests requires a lot more dependencies + ;; The regression tests require a lot more dependencies. #:tests? #f)) (build-system cmake-build-system) (home-page "http://github.khronos.org/OpenCL-CLHPP/") @@ -174,15 +175,15 @@ Loader as provided by this package.") (package (name "clinfo") (version "2.2.18.04.06") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/Oblomov/clinfo/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0v7cy01irwdgns6lzaprkmm0502pp5a24zhhffydxz1sgfjj2w7p")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Oblomov/clinfo.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0y2q0lz5yzxy970b7w7340vp4fl25vndahsyvvrywcrn51ipgplx")))) (build-system gnu-build-system) (native-inputs `(("opencl-headers" ,opencl-headers))) @@ -216,22 +217,21 @@ the system.") (package (name "beignet") (version "1.3.2") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/intel/beignet/archive/Release_v" - version - ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "18r0lq3dkd4yn6bxa45s2lrr9cjbg70nr2nn6xablvgqwzw0jb0r")) - (patches (search-patches "beignet-correct-file-names.patch")) - (modules '((guix build utils))) - (snippet - ;; There's a suspicious .isa binary file under kernels/. - ;; Remove it. - '(for-each delete-file (find-files "." "\\.isa$"))))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/intel/beignet.git") + (commit (string-append "Release_v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0lpv3lvi2vrmzb8blflrpbd3jgin76zqmz6jcv17vn9mylqdrfnd")) + (patches (search-patches "beignet-correct-file-names.patch")) + (modules '((guix build utils))) + (snippet + ;; There's a suspicious .isa binary file under kernels/. + ;; Remove it. + '(for-each delete-file (find-files "." "\\.isa$"))))) (native-inputs `(("pkg-config" ,pkg-config) ("python" ,python))) (inputs `(("clang@3.7" ,clang-3.7) @@ -295,15 +295,15 @@ back-end for the LLVM compiler framework.") (package (name "pocl") (version "1.1") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/pocl/pocl/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0lrw3hlb0w53xzmrf2hvbda406l70ar4gyadflvlkj4879lx138y")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pocl/pocl.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1z3sqn20ddv1030adchpzs65qng436gc2mb99p213mkh95jkh1l5")))) (build-system cmake-build-system) (native-inputs `(("libltdl" ,libltdl) @@ -323,12 +323,6 @@ back-end for the LLVM compiler framework.") (assoc-ref %build-inputs "libc") "/lib")) #:phases (modify-phases %standard-phases - (add-after 'install 'remove-headers - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (delete-file-recursively - (string-append out "/include")) - #t))) (add-before 'check 'set-HOME (lambda _ (setenv "HOME" "/tmp") -- cgit v1.2.3 From 8a68b71d99a2cbb0b252cd18fc52e1593aa10acd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 30 Aug 2018 18:58:41 +0200 Subject: gnu: keyutils: Update to 1.5.11. * gnu/packages/crypto.scm (keyutils): Update to 1.5.11. [inputs]: Add mit-krb5. --- gnu/packages/crypto.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index ae6150b0ab..e070ef61ac 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -40,6 +40,7 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages gnupg) #:use-module (gnu packages image) + #:use-module (gnu packages kerberos) #:use-module (gnu packages libbsd) #:use-module (gnu packages libffi) #:use-module (gnu packages linux) @@ -277,7 +278,7 @@ the wrong hands.") (define-public keyutils (package (name "keyutils") - (version "1.5.10") + (version "1.5.11") (source (origin (method url-fetch) @@ -286,9 +287,9 @@ the wrong hands.") version ".tar.bz2")) (sha256 (base32 - "1dmgjcf7mnwc6h72xkvpaqpzxw8vmlnsmzz0s27pg0giwzm3sp0i")) + "1ddig6j5xjyk6g9l2wlqc7k1cgvryxdqbsv3c9rk1p3f42448n0i")) (modules '((guix build utils))) - ;; Create relative symbolic links instead of absolute ones to /lib/* + ;; Create relative symbolic links instead of absolute ones to /lib/*. (snippet '(begin (substitute* "Makefile" (("\\$\\(LNS\\) \\$\\(LIBDIR\\)/") "$(LNS) ")) @@ -306,6 +307,8 @@ the wrong hands.") "MANDIR=/share/man" "SHAREDIR=/share/keyutils") #:test-target "test")) + (inputs + `(("mit-krb5" ,mit-krb5))) (home-page "https://people.redhat.com/dhowells/keyutils/") (synopsis "Linux key management utilities") (description -- cgit v1.2.3 From 0c048c11a492dda58cf1c8445bcfefe0199d7e0c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 30 Aug 2018 19:27:00 +0200 Subject: gnu: cmocka: Update to 1.1.2. * gnu/packages/check.scm (cmocka): Update to 1.1.2. --- gnu/packages/check.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 17a69bcd1c..f4596010ea 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -269,7 +269,7 @@ problem, and shows the differences.") (define-public cmocka (package (name "cmocka") - (version "1.1.1") + (version "1.1.2") (source (origin (method url-fetch) (uri (string-append "https://cmocka.org/files/" @@ -277,10 +277,10 @@ problem, and shows the differences.") version ".tar.xz")) (sha256 (base32 - "1283zi9qf5613g8iadm1fxmjh4rzxqd5np2j3lcpgairf25g8bph")))) + "1p9b6ccv939wjsgapn7wx24xw278awsw9h81lm0g4zw257hx276i")))) (build-system cmake-build-system) (arguments - `(#:tests? #f)) ; No test target + `(#:tests? #f)) ; no test target (home-page "https://cmocka.org/") (synopsis "Unit testing framework for C") (description "Cmocka is a unit testing framework for C with support for -- cgit v1.2.3 From be4c63f48406006ded84511cf82f10b9f5400f7c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 31 Aug 2018 07:04:17 +0200 Subject: gnu: mame: Update to 0.201. * gnu/packages/emulators.scm (mame): Update to 0.201. [arguments]: Remove unnecessary fix. --- gnu/packages/emulators.scm | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 141423d7bf..919392c72f 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1175,7 +1175,7 @@ play them on systems for which they were never designed!") (define-public mame (package (name "mame") - (version "0.200") + (version "0.201") (source (origin (method git-fetch) @@ -1185,7 +1185,7 @@ play them on systems for which they were never designed!") (file-name (git-file-name name version)) (sha256 (base32 - "0ddw8635hdm21lgpf13k1vhfywy3460rwciv93vrqmpkq2dvpmib")) + "00whiig4ld3d4fkl34q48vlf28ygvvp5g7fp0rb5n31ymhl4kajk")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. @@ -1211,17 +1211,6 @@ play them on systems for which they were never designed!") #:tests? #f ;no test in regular release #:phases (modify-phases %standard-phases - ;; Add missing include lines for "fmin" and "ceil" functions. - ;; Reported upstream. Will be fixed in 0.201. - (add-after 'unpack 'add-missing-include - (lambda _ - (substitute* "src/devices/cpu/mips/mips3.cpp" - (("#include \"ps2vu.h\"" all) - (string-append all "\n#include "))) - (substitute* "src/devices/cpu/mips/ps2vif1.cpp" - (("#include \"ps2vif1.h\"" all) - (string-append all "\n#include "))) - #t)) (delete 'configure) (add-after 'build 'build-documentation (lambda _ (invoke "make" "-C" "docs" "man" "info"))) -- cgit v1.2.3 From 0b6678cd441006d5cd65a8aa33f17458b3588a19 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Fri, 31 Aug 2018 08:24:38 +0200 Subject: gnu: retroarch: Update to 1.7.4. * gnu/packages/emulators.scm (retroarch): Update to 1.7.4. --- gnu/packages/emulators.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 919392c72f..8e68c676ef 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1055,7 +1055,7 @@ emulation community. It provides highly accurate emulation.") (define-public retroarch (package (name "retroarch") - (version "1.7.3") + (version "1.7.4") (source (origin (method url-fetch) @@ -1063,7 +1063,7 @@ emulation community. It provides highly accurate emulation.") version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1si78dbwbsq4i0r42q94nmlpaxdyqch113nxavdprf4vc1224356")))) + (base32 "0h6y2hpjg4b470jvn9ghwp0k3a527sbb6xhia17frlm9w9v5028w")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no tests -- cgit v1.2.3 From 9fc2922794ffaae48e0a7c536e530ea2e0d46cf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Lassieur?= Date: Mon, 13 Aug 2018 21:05:55 +0200 Subject: services: nginx: Get the Shepherd to respawn NGINX. * gnu/services/web.scm (nginx-shepherd-service): Change 'start' (that is, all actions that don't send a signal to the master process) to return the PID. Wait until the PID file is created and contains an integer because it might be created after the parent process exits. --- gnu/services/web.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 97976509b6..467656444e 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -599,19 +599,33 @@ of index files." (nginx file run-directory) (let* ((nginx-binary (file-append nginx "/sbin/nginx")) + (pid-file (in-vicinity run-directory "pid")) (nginx-action (lambda args #~(lambda _ (invoke #$nginx-binary "-c" #$(or file (default-nginx-config config)) - #$@args))))) + #$@args) + (match '#$args + (("-s" . _) #t) + (_ + (let loop ((duration 0)) + ;; https://bugs.launchpad.net/ubuntu/+source/nginx/+bug/1581864/comments/7 + (sleep duration) + (if (file-exists? #$pid-file) + (let ((pid (call-with-input-file #$pid-file read))) + ;; it could be # + (if (integer? pid) pid (loop 1))) + (loop 1))))))))) ;; TODO: Add 'reload' action. (list (shepherd-service (provision '(nginx)) (documentation "Run the nginx daemon.") (requirement '(user-processes loopback)) + (modules `((ice-9 match) + ,@%default-modules)) (start (nginx-action "-p" run-directory)) (stop (nginx-action "-s" "stop"))))))) -- cgit v1.2.3 From 0e2d6d2698c5fbb0550d103475473b9800264abe Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 31 Aug 2018 16:34:34 +0200 Subject: gnu: Add python-pyqt-without-qtwebkit. * gnu/packages/qt.scm (python-pyqt-without-qtwebkit): New variable. --- gnu/packages/qt.scm | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index f6eb2831fd..7dfdade979 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1834,6 +1834,15 @@ framework. The bindings are implemented as a set of Python modules and contain over 620 classes.") (license license:gpl3))) +;; XXX: This is useful because qtwebkit does not build reliably at this time. +;; Ultimately, it would be nicer to have a more modular set of python-pyqt-* +;; packages that could be used together. +(define-public python-pyqt-without-qtwebkit + (package (inherit python-pyqt) + (name "python-pyqt-without-qtwebkit") + (inputs + (alist-delete "qtwebkit" (package-inputs python-pyqt))))) + (define-public python2-pyqt (package (inherit python-pyqt) (name "python2-pyqt") -- cgit v1.2.3 From 9ce2f07ab6c614ea0afda3bdac601bdc0ef958c9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 31 Aug 2018 16:37:00 +0200 Subject: gnu: python-matplotlib: Use python-pyqt-without-qtwebkit. * gnu/packages/python.scm (python-matplotlib)[propagated-inputs]: Replace python-pyqt with python-pyqt-without-qtwebkit. --- gnu/packages/python.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index f59e24d5ff..fd1fdbf82d 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3503,7 +3503,8 @@ convert between colorspaces like sRGB, XYZ, CIEL*a*b*, CIECAM02, CAM02-UCS, etc. ;; object. For this reason we need to import both libraries. ;; https://pythonhosted.org/cairocffi/cffi_api.html#converting-pycairo ("python-pycairo" ,python-pycairo) - ("python-pyqt" ,python-pyqt) + ;; XXX: qtwebkit cannot be built reliably. + ("python-pyqt" ,python-pyqt-without-qtwebkit) ("python-cairocffi" ,python-cairocffi))) (inputs `(("libpng" ,libpng) -- cgit v1.2.3 From 220458b0987959d2920afa7dd8ff35f7d1f531b0 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Thu, 19 Apr 2018 09:11:05 -0500 Subject: gnu: hypre: Update to 2.14.0. * gnu/packages/maths.scm (hypre): Update to 2.14.0 --- gnu/packages/maths.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index ad33ccbcc6..377e47bc58 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3517,7 +3517,7 @@ set.") (define-public hypre (package (name "hypre") - (version "2.11.0") + (version "2.14.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/LLNL/hypre/archive/" @@ -3525,7 +3525,7 @@ set.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0q69ia0jivzcr8p049dn3mg8yjpn6nwq4sw9iqac8vr63vi54l6m")) + "0v515i73bvaz378h5465b1dy9v2gf924zy2q94cpq4qqarawvkqh")) (modules '((guix build utils))) (snippet '(begin @@ -3533,7 +3533,7 @@ set.") ;; substitute the tarball creation time. (substitute* "src/utilities/HYPRE_utilities.h" (("Date Compiled: .*$") - "Date Compiled: Mar 28 2016 20:19:59 +0000\"\n")) + "Date Compiled: Apr 11 2018 16:24:59 +0000\"\n")) #t)))) (build-system gnu-build-system) (outputs '("out" ;6.1 MiB of headers and libraries -- cgit v1.2.3 From 600f1ad8e61e65ad9a1f22d099d16c5948cb1f48 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 28 Aug 2018 01:22:18 -0400 Subject: gnu: KDE: Update to 5.49.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . * gnu/packages/kde-frameworks.scm (attica, baloo, bluez-qt, breeze-icons, extra-cmake-modules, kactivities, kactivities-stats, kapidox, karchive, kauth, kbookmarks, kcmutils, kcodecs, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kcrash, kdbusaddons, kde-framework-integration, kdeclarative, kded, kdesignerplugin, kdesu, kdewebkit, kdnssd, kdoctools, kemoticons, kfilemetadata, kglobalaccel, kguiaddons, ki18n, kiconthemes, kidletime, kimageformats, kinit, kio, kirigami, kitemmodels, kitemview, kjobwidgets, knewstuff, knotification, knotifyconfig, kpackage, kparts, kpeople, kplotting, kpty, krunner, kservice, ksyntaxhighlighting, ktexteditor, ktextwidgets, kunitcoversion, kwallet, kwayland, kwidgetsaddons, kwindowsystem, kxmlgui, kxmlrpcclient, modemmanager-qt, networkmanager-qt, oxygen-icons, plasma-framework, prison, qqc2-desktop-style, solid, sonnet, threadweaver): Update to 5.49.0. (extra-cmake-modules)[arguments]: Remove obsolete workaround. (attica)[arguments]: Disable some new tests. Co-authored-by: Björn Höfling --- gnu/packages/kde-frameworks.scm | 296 ++++++++++++++++++++-------------------- 1 file changed, 148 insertions(+), 148 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 7dc2cf37fe..5295a356a2 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -75,7 +75,7 @@ (define-public extra-cmake-modules (package (name "extra-cmake-modules") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -84,21 +84,13 @@ name "-" version ".tar.xz")) (sha256 (base32 - "1ml6s3ssr5izm3vnzlg5gn2nkcbz5l5nmapvyr4ml7n0089b43a3")))) + "07pdgjyrxniacqcfvrzw8ij3kasx5pkbq38k6491qbhzfm8vi7y0")))) (build-system cmake-build-system) (native-inputs `(("qtbase" ,qtbase))) ; For tests (needs qmake) (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'post-5.42.0-release-fix - ;; FIXME: Remove for > 5.42.0 - ;; ECMToolchainAndroidTest doesn't exist anymore - ;; https://cgit.kde.org/extra-cmake-modules.git/commit?id=30f31c46d8caf4 - (lambda _ - (substitute* "tests/CMakeLists.txt" - (("^add_test_macro\\(ECMToolchainAndroidTest dummy\\)") "")) - #t)) (add-after 'unpack 'fix-lib-path (lambda _ ;; Always install into /lib and not into /lib64. @@ -283,7 +275,7 @@ Phonon-GStreamer is a backend based on the GStreamer multimedia library.") (define-public attica (package (name "attica") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -292,8 +284,16 @@ Phonon-GStreamer is a backend based on the GStreamer multimedia library.") name "-" version ".tar.xz")) (sha256 (base32 - "0icjsk5sbri6nwybb2301wc6ysc1h4p35rxqp0adifyksq8akyxd")))) + "1iqclahs9yzyjnkzbzr8hl9j6q8m2djdm6mix92xwrakgirnl3gn")))) (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-network-tests + (lambda _ + ;; These tests require network access. + (substitute* "autotests/CMakeLists.txt" + ((".*providertest.cpp") ""))))))) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) (inputs @@ -315,7 +315,7 @@ http://freedesktop.org/wiki/Specifications/open-collaboration-services/") (define-public bluez-qt (package (name "bluez-qt") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -324,7 +324,7 @@ http://freedesktop.org/wiki/Specifications/open-collaboration-services/") name "-" version ".tar.xz")) (sha256 (base32 - "0pbb0nn70hbsnp9q8jvqr3s85gh4bnnh1mp8xfkia2hp4c63ws9f")))) + "0mgnq7w52ksr8b7ys2f1m3irnviy011bsaggh489fjy0xlzk5ard")))) (build-system cmake-build-system) (native-inputs `(("dbus" ,dbus) @@ -348,7 +348,7 @@ Bluetooth stack. It is used by the KDE Bluetooth stack, BlueDevil.") (define-public breeze-icons (package (name "breeze-icons") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -357,7 +357,7 @@ Bluetooth stack. It is used by the KDE Bluetooth stack, BlueDevil.") name "-" version ".tar.xz")) (sha256 (base32 - "0mrj0b022yfy669qqby09k4ij6aqyky23gpnjcp85df9saq0x44r")))) + "178620hhqlv6dl8qal2bmiw55s8b3p4h16q8cgkmq5q5i59nzcph")))) (build-system cmake-build-system) (arguments `(#:phases @@ -388,7 +388,7 @@ It is the default icon theme for the KDE Plasma 5 desktop.") (define-public kapidox (package (name "kapidox") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -397,7 +397,7 @@ It is the default icon theme for the KDE Plasma 5 desktop.") name "-" version ".tar.xz")) (sha256 (base32 - "0izyd66p5403gl09l7irzy97mb9b14n4zyjrwap800zjlpwh41pz")))) + "09jph3hvasqx1ia0l7is9brc08nxvh9qmg8564nh5cmqaxdwj559")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; has no test target @@ -430,7 +430,7 @@ documentation.") (define-public karchive (package (name "karchive") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -439,7 +439,7 @@ documentation.") name "-" version ".tar.xz")) (sha256 (base32 - "1vq2ngdxmdl6hzjwdcrv66ban8v9s5jiqwy1mgdqv4ak14l31qbi")))) + "1p1gwqda2bsjdysp4ggwdsldbasyfl075xn3wchqyakdv2bdzmn0")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -464,7 +464,7 @@ GZip format, via a subclass of QIODevice.") (define-public kcodecs (package (name "kcodecs") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -473,7 +473,7 @@ GZip format, via a subclass of QIODevice.") name "-" version ".tar.xz")) (sha256 (base32 - "0b19z432r9dnyjknvwffhcmrg969yhydjvy4qrkrf22026f4smwc")))) + "07va63gsfjrc5ha9rdli923cwyzxpb3v8xgf1zfhw75cfkgda3nz")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -500,7 +500,7 @@ Internet).") (define-public kconfig (package (name "kconfig") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -509,7 +509,7 @@ Internet).") name "-" version ".tar.xz")) (sha256 (base32 - "08gg0d20c09j7hyxm8ydpzk2yf30c87g9ag7a9nfykrmi6cqirdq")))) + "0cb3crnlr8hr5npq3ykfxqd4yckmkykzrrizfs89ryhmznc2ngsf")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -567,7 +567,7 @@ propagate their changes to their respective configuration files.") (define-public kcoreaddons (package (name "kcoreaddons") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -576,7 +576,7 @@ propagate their changes to their respective configuration files.") name "-" version ".tar.xz")) (sha256 (base32 - "17qv7r6z72mm9a0hyx5dgk90ikhhgm41bkvnq2hjal0py2lsnrs9")))) + "00s22jvbwav20cidnp8v9fgc6pqbp4wnqkb2spv18mjhg4pv3bqj")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -607,7 +607,7 @@ many more.") (define-public kdbusaddons (package (name "kdbusaddons") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -616,7 +616,7 @@ many more.") name "-" version ".tar.xz")) (sha256 (base32 - "1613pc3r70jnzvpwm1xjdbdsmcpx28jwvcs2qq9swlywr5qr9hbd")) + "1fnmrrffp3kfwyjfzqkzlizflpyqgzbjljb51ppmdypcq8wy9ibh")) (patches (search-patches "kdbusaddons-kinit-file-name.patch")))) (build-system cmake-build-system) (native-inputs @@ -652,7 +652,7 @@ as well as an API to create KDED modules.") (define-public kdnssd (package (name "kdnssd") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -661,7 +661,7 @@ as well as an API to create KDED modules.") name "-" version ".tar.xz")) (sha256 (base32 - "1k1rz62h3mafliik5n0k98dc56b5v2v6qyqj40696mcyc2d1yvll")))) + "1n61id2x1iianshg8g6fw389mqihz4h8sj9hnng7cdg4csh72ffr")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -680,7 +680,7 @@ infrastructure.") (define-public kguiaddons (package (name "kguiaddons") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -689,7 +689,7 @@ infrastructure.") name "-" version ".tar.xz")) (sha256 (base32 - "193i8b4f13dkgp88m3pk9wzi0dhx7qmsnmpizxia3457gg016wn7")))) + "1zkjd3l5pyvvilcc9lbdgqaxnpvh586yf0cndl90h3x89hy1d4xk")))) (build-system cmake-build-system) ;; TODO: Build packages for the Python bindings. Ideally this will be ;; done for all versions of python guix supports. Requires python, @@ -718,7 +718,7 @@ interfaces in the areas of colors, fonts, text, images, keyboard input.") (define-public ki18n (package (name "ki18n") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -727,7 +727,7 @@ interfaces in the areas of colors, fonts, text, images, keyboard input.") name "-" version ".tar.xz")) (sha256 (base32 - "1rpriflb2a48j94zxgh63l6rzq4nlnlkvy89ns1vkdw42bnqrjx9")))) + "1i4rdrxann45zl6fkmfd1b96q52g0mpc5x19fx9h80crapkm8jjz")))) (build-system cmake-build-system) (propagated-inputs `(("gettext" ,gettext-minimal) @@ -761,7 +761,7 @@ translation scripting.") (define-public kidletime (package (name "kidletime") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -770,7 +770,7 @@ translation scripting.") name "-" version ".tar.xz")) (sha256 (base32 - "019r41r28pcrcn1kwxsll53za705jkc9n23b6sr2lplgjk05bcxh")))) + "1fd02anlmaa0hnnp5q1s9973m3asy56qppwq1va1g6ga3csv3wrv")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -792,7 +792,7 @@ or user activity.") ;; plasma-framework which is tier 3. (package (name "kirigami") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -801,7 +801,7 @@ or user activity.") "kirigami2-" version ".tar.xz")) (sha256 (base32 - "11gqn7amp0r9bgh8ldgisfc2lrkzkn5mq2a1madf24nvjbkvqnqv")))) + "1wan9h7kvjzvyzfjfjd512lxiac5prhs493xjqwxgags6kxwglaz")))) (properties `((upstream-name . "kirigami2"))) (build-system cmake-build-system) (native-inputs @@ -841,7 +841,7 @@ of applications that follow the Kirigami Human Interface Guidelines.") (define-public kitemmodels (package (name "kitemmodels") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -850,7 +850,7 @@ of applications that follow the Kirigami Human Interface Guidelines.") name "-" version ".tar.xz")) (sha256 (base32 - "0mcdzdqwmvf9pwirsrnjbhrgqphnfmanbl9zij4qsmin8n866mhc")))) + "1frha301540js45mrxiw034m9b2rwsa56xphkqn6cm4jmn48qdjg")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -900,7 +900,7 @@ model to observers (define-public kitemviews (package (name "kitemviews") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -909,7 +909,7 @@ model to observers name "-" version ".tar.xz")) (sha256 (base32 - "1j1q0b08f8mnfc3r2a7rplyb2nv9f0aq5a3fxskinvg70c6y248w")))) + "1aj605q2p72w4rb9i0f2xb93bn5xfjq9sl5i4h6rqflcvvy7qpdp")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -935,7 +935,7 @@ to flat and hierarchical lists.") (define-public kplotting (package (name "kplotting") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -944,7 +944,7 @@ to flat and hierarchical lists.") name "-" version ".tar.xz")) (sha256 (base32 - "109b9grshrwralyp8ilkbf1k0akaggygqh6wafqdf0ris0ps13l9")))) + "13fzqqkyxs4ja6n5yb9lc5jx4qpsmrbsiihnwrgj3lhpzhlr91n0")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -970,7 +970,7 @@ pixel units.") (define-public ksyntaxhighlighting (package (name "ksyntaxhighlighting") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -979,7 +979,7 @@ pixel units.") "syntax-highlighting-" version ".tar.xz")) (sha256 (base32 - "1iwiym50859jki4x41rfdmbd14jiq5lr2hdg46pjkyw17njdjd60")))) + "17rkgzkfiz5dv0xr67na7ikqszgwjnf2gc11b2h47qdsr7pgx95v")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1019,7 +1019,7 @@ integration with a custom editor as well as a ready-to-use (define-public kwayland (package (name "kwayland") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1028,7 +1028,7 @@ integration with a custom editor as well as a ready-to-use name "-" version ".tar.xz")) (sha256 (base32 - "0wr6ygppahxsx3dh71h2wmybv7z7iyqdv7wn80cxb0mp4zpyinh7")))) + "0d95l2i3j1xxkc15n57w4rhf3di02zna4zzn4gap9qdhfxlfbqi6")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1058,7 +1058,7 @@ represented by a QPoint or a QSize.") (define-public kwidgetsaddons (package (name "kwidgetsaddons") - (version "5.42.1") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1067,7 +1067,7 @@ represented by a QPoint or a QSize.") name "-" version ".tar.xz")) (sha256 (base32 - "0h0vfrfl5zi01fpvmd825kazzlyawz3i66qrfkymdrnvqmfzcmlg")))) + "1frgqz9njbc81pfy6gl6p0hyh1977lg31ynrx5wy7lg7fwaxwl92")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1105,7 +1105,7 @@ configuration pages, message boxes, and password requests.") (define-public kwindowsystem (package (name "kwindowsystem") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1114,7 +1114,7 @@ configuration pages, message boxes, and password requests.") name "-" version ".tar.xz")) (sha256 (base32 - "15k6x0f93qxka3mz7qfzak2ibdd88q77pz6akil8s3g41zsg2dqv")))) + "175rzwrjndhawyy4x11lbihdr1r9gwxmxjpbz4x06hlz4g50wffp")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1170,7 +1170,7 @@ lower level classes for interaction with the X Windowing System.") (define-public modemmanager-qt (package (name "modemmanager-qt") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1179,7 +1179,7 @@ lower level classes for interaction with the X Windowing System.") name "-" version ".tar.xz")) (sha256 (base32 - "0q6qzn60z55h0gyc9xwdfaq45mjpk3zrr6d4qqjjfkqsr3866sfx")))) + "1wf3v552vbr4kh2d770zn3yn0q3bqjqbfrvnf813mnld7961m7p2")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1208,7 +1208,7 @@ messages.") (define-public networkmanager-qt (package (name "networkmanager-qt") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1217,7 +1217,7 @@ messages.") name "-" version ".tar.xz")) (sha256 (base32 - "03hhvx8d52mfgbhd4gn0vhsk9k1fv1pvq24ixxdgs2mw44v884xq")))) + "16pnd52m9srcb2ml3vc3kd9k1yak5rq09yci39qp7z5jbdy7jk2z")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1247,7 +1247,7 @@ which are used in DBus communication.") (define-public oxygen-icons (package (name "oxygen-icons") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1256,7 +1256,7 @@ which are used in DBus communication.") name "5" "-" version ".tar.xz")) (sha256 (base32 - "0pnav9h0xmvbaamzpcyznjjv25slz8maszshx7sj7h07b5a23x46")))) + "0llx06sr36cd6vgkgm3jw6k4cv1cfx3r6x6lmb477wpahis0n75g")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1272,7 +1272,7 @@ which are used in DBus communication.") (define-public prison (package (name "prison") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) @@ -1280,7 +1280,7 @@ which are used in DBus communication.") (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "0bhg2fjdwsv7mk16jh1nc3miwggz1dl9l99l2f20xvi75hn7rryg")))) + (base32 "0dppz9x6k84sl0aiyjlh3xigqgda64r8mij3bzxcdkv2wbc4ld9d")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1297,7 +1297,7 @@ provides uniform access to generation of barcodes with data.") (define-public qqc2-desktop-style (package (name "qqc2-desktop-style") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1306,7 +1306,7 @@ provides uniform access to generation of barcodes with data.") name "-" version ".tar.xz")) (sha256 (base32 - "1arlfhcshfs11pgf87jzjgln1p711zlx0v0q014740mbzb9g5wnk")))) + "1vbms7b8x1y7yh8im8dv1q3wwl3j2x4r47yqg86f28grw2r2n2zj")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1331,7 +1331,7 @@ feel.") (define-public solid (package (name "solid") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1340,7 +1340,7 @@ feel.") name "-" version ".tar.xz")) (sha256 (base32 - "10lr8paaq6vaiqn833kzcdc3kkyv8j9fdchy7h8pvi9ajjjwq0lq")))) + "1p7rdmf2f8520xc7zp7wxlcizyyjfxwq5mf95qsfpwc4dl0c43gp")))) (build-system cmake-build-system) (arguments `(#:phases @@ -1370,7 +1370,7 @@ system.") (define-public sonnet (package (name "sonnet") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1379,7 +1379,7 @@ system.") name "-" version ".tar.xz")) (sha256 (base32 - "1r3amddmy0nm8klw0jzvb8bl1l9hkrx50d8j0zq2lbjy36h3yliw")))) + "0m5pmka1hwjsg3c3qvx087z3fjrfw0ayk7ylgjls5iwd39kkl1b3")))) (build-system cmake-build-system) (arguments `(#:phases @@ -1407,7 +1407,7 @@ ASpell and HUNSPELL.") (define-public threadweaver (package (name "threadweaver") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1416,7 +1416,7 @@ ASpell and HUNSPELL.") name "-" version ".tar.xz")) (sha256 (base32 - "1isqlpnfxzxyz7mdm7yfrafgnx09mcndicdgdw3mi4r4misbrrbn")))) + "099bs429p71dzrqy25z61rvn48w3b73p7yag4q69jnxcpj0qcyz7")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1437,7 +1437,7 @@ uses a job-based interface to queue tasks and execute them in an efficient way." (define-public kactivities (package (name "kactivities") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1446,7 +1446,7 @@ uses a job-based interface to queue tasks and execute them in an efficient way." name "-" version ".tar.xz")) (sha256 (base32 - "0z0ac426npq99s1b8yzrqkjjjc34nbxlpw8pw388yj7fa41hw21r")))) + "117f3zrdbs0pa10wn7vy691n02m01h6x4pm8m1q3f4pjm0k4kqim")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1482,7 +1482,7 @@ with other frameworks.") (define-public kauth (package (name "kauth") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1491,7 +1491,7 @@ with other frameworks.") name "-" version ".tar.xz")) (sha256 (base32 - "04kqb2hhr9lkpkxiaqlnyk0kmk6p89z5fgp5i5g83hsi8maz7swi")))) + "0qg3zwg3kfx2snmvsw4ixr0qds7bd7992dxggvi9dcny7dm9q0n8")))) (build-system cmake-build-system) (native-inputs `(("dbus" ,dbus) @@ -1529,7 +1529,7 @@ utilities.") (define-public kcompletion (package (name "kcompletion") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1538,7 +1538,7 @@ utilities.") name "-" version ".tar.xz")) (sha256 (base32 - "0yqci2v0dk5v1mz4n3gca599a7mpihy563zc6sl8hsa30ld8li0f")))) + "16br6wnqzndk8v41im23h2ww4hypi2i1qfg6m9c49mpxflgmspbi")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1565,7 +1565,7 @@ integrated it into your application's other widgets.") (define-public kcrash (package (name "kcrash") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1574,7 +1574,7 @@ integrated it into your application's other widgets.") name "-" version ".tar.xz")) (sha256 (base32 - "049y0xdyw37y0qid3d3plj8szfys5gw98j7lhcakiini8mn5cins")))) + "0xmr9rrl0xahpnq1rw4bbar1nbr21x2bk4hhv79la6dsg9ha25b3")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1600,7 +1600,7 @@ application crashes.") (define-public kdoctools (package (name "kdoctools") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1609,7 +1609,7 @@ application crashes.") name "-" version ".tar.xz")) (sha256 (base32 - "1bby3avdllch1mji0mxzcix8q5yir5a0i6wpjs5lwckv1glh6kmz")))) + "1dmpk453s71ls0q8hgpqqd5dcr7zlimf5wykizcy2wn7p77gzsgl")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1657,7 +1657,7 @@ from DocBook files.") (define-public kfilemetadata (package (name "kfilemetadata") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1666,7 +1666,7 @@ from DocBook files.") name "-" version ".tar.xz")) (sha256 (base32 - "03wk38q3sq354ykz9dwbgykn73ldf94ryx6hxvpr66bq3a59jmwz")))) + "045k1mgn8kg0qfsr5sl1499nzhzmbcvrqc205pmq6sh4r14nvk80")))) (build-system cmake-build-system) (arguments `(#:phases @@ -1709,7 +1709,7 @@ by applications to write metadata.") (define-public kimageformats (package (name "kimageformats") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1718,7 +1718,7 @@ by applications to write metadata.") name "-" version ".tar.xz")) (sha256 (base32 - "1k67yrmszx7azjzrg478rimbz991lghx4d6dmg22p6dknajd78a6")))) + "1q7019gbk59fwampna1ayjvw016c0q79hmldpaqh3xa9sh082wy4")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1763,7 +1763,7 @@ formats.") (define-public kjobwidgets (package (name "kjobwidgets") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1772,7 +1772,7 @@ formats.") name "-" version ".tar.xz")) (sha256 (base32 - "1m3csdl7wh18ywv5p0qpbjpixvflgjcq3yvk3vlvh0sxxlwcz8k4")))) + "04i5cvbxii7n0jr3ai1dh44miqbdkxb6an5w8s7qvkv0xmkml35g")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1791,7 +1791,7 @@ asynchronous jobs.") (define-public knotifications (package (name "knotifications") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1800,7 +1800,7 @@ asynchronous jobs.") name "-" version ".tar.xz")) (sha256 (base32 - "0awmwypmd104vhaj2v9k83niflxj26d4mbl6mzfcj75lgka6kffc")))) + "10481j2irlqhqd16xi412xbglnyjl0ndanlv9s0d3fxirs95zdd9")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1837,7 +1837,7 @@ covers feedback and persistent events.") (define-public kpackage (package (name "kpackage") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1846,7 +1846,7 @@ covers feedback and persistent events.") name "-" version ".tar.xz")) (sha256 (base32 - "10amhh07x8d0jkyylb19cyzjs71k8dq1y8isfahqzb2kd43vijqa")))) + "1xbfjwxb4gff8gg0hs5m9s0jcnzqk27rs2jr71g5ckhvs5psnkcd")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1875,7 +1875,7 @@ were traditional plugins.") (define-public kpty (package (name "kpty") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1884,7 +1884,7 @@ were traditional plugins.") name "-" version ".tar.xz")) (sha256 (base32 - "07s16zxs03ixy7yxy9fda83yqhcgqzx42gnvwjwkyc8q05njmma6")))) + "1pnj07079l6gkz6171fcvljh0dcdy9s77p1q0l9nnkknjbr102pg")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1912,7 +1912,7 @@ and communicating with them using a pty.") (define-public kunitconversion (package (name "kunitconversion") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1921,7 +1921,7 @@ and communicating with them using a pty.") name "-" version ".tar.xz")) (sha256 (base32 - "0219pna4l3vvhyf5acsc87n48jzdnws6kwyhaiy3hy1pzrilv32l")))) + "11jnqz218rga3f4ppf1d927c7qhh2qpghwjpsrnrxdkz5nrvnf79")))) (build-system cmake-build-system) (arguments `(#:phases @@ -1955,7 +1955,7 @@ gallons).") (define-public baloo (package (name "baloo") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1964,7 +1964,7 @@ gallons).") name "-" version ".tar.xz")) (sha256 (base32 - "18yknkcls1ypsp8n5l254bhlffiq4as5w1wgcjzhnf49cacys8nl")))) + "0xj12v0k58sr3snxyj4vx7dqhinrvk6qm0ikymscqgbmw9ijwxph")))) (build-system cmake-build-system) (propagated-inputs `(("kcoreaddons" ,kcoreaddons) @@ -2019,7 +2019,7 @@ maintaining an index of the contents of your files.") (define-public kactivities-stats (package (name "kactivities-stats") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -2028,7 +2028,7 @@ maintaining an index of the contents of your files.") name "-" version ".tar.xz")) (sha256 (base32 - "0si70hayf4brr83jzdjdsfvp8nc1sb7vdk0q532liafhf8hw9mq8")))) + "129z2m5330j0l1nw8g3qjib60xmx54c6d2g9vnp4w8z0agnihs5f")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2049,7 +2049,7 @@ by which applications, and what documents have been linked to which activity.") (define-public kbookmarks (package (name "kbookmarks") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -2058,7 +2058,7 @@ by which applications, and what documents have been linked to which activity.") name "-" version ".tar.xz")) (sha256 (base32 - "08q413mr5ib04gwnqznvm9vkkfmnh16rgf6rqdvclnci9w7ml5x2")))) + "0clmfdcc1fc98q3vbfjf8x140a6df88ixhz0mny3dpv1wcr5cz53")))) (build-system cmake-build-system) (propagated-inputs `(("kwidgetsaddons" ,kwidgetsaddons))) @@ -2092,7 +2092,7 @@ using the XBEL format.") (define-public kcmutils (package (name "kcmutils") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -2101,7 +2101,7 @@ using the XBEL format.") name "-" version ".tar.xz")) (sha256 (base32 - "1q67b0m6w3xvm22kq8b0b0rib1jzf25gf6dz7h286987zfbbs5n7")))) + "0xv899p9f0hj6hd089mhn910qn66bihzpaa11ikrhbimckw8g19q")))) (build-system cmake-build-system) (propagated-inputs `(("kconfigwidgets" ,kconfigwidgets) @@ -2131,7 +2131,7 @@ KCModules can be created with the KConfigWidgets framework.") (define-public kconfigwidgets (package (name "kconfigwidgets") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -2140,7 +2140,7 @@ KCModules can be created with the KConfigWidgets framework.") name "-" version ".tar.xz")) (sha256 (base32 - "191zm24q2n001b65hcnfh2639k4iqhxwdmgdw29php3n2648xq4z")))) + "1nqcrqr67m3kvq2r83x45zcdghk12bas9fp0s43s68imrhy5xikz")))) (build-system cmake-build-system) (propagated-inputs `(("kauth" ,kauth) @@ -2174,7 +2174,7 @@ their settings.") (define-public kdeclarative (package (name "kdeclarative") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -2183,7 +2183,7 @@ their settings.") name "-" version ".tar.xz")) (sha256 (base32 - "1w604jy6vg2247vggz0ivl7wy2h5iapkz2z86mah3aw99f7dqa22")))) + "0kgawb8wfx4snk2ckwxj0hmpgcvq3k1zpsxqdawi4cmsy4bxzfs9")))) (build-system cmake-build-system) (propagated-inputs `(("kconfig" ,kconfig) @@ -2237,7 +2237,7 @@ that offer bindings to some of the Frameworks.") (define-public kded (package (name "kded") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -2246,7 +2246,7 @@ that offer bindings to some of the Frameworks.") name "-" version ".tar.xz")) (sha256 (base32 - "0w25dl4pnvby28gz0yvij32vi9n3p8si4nm4x45j7zsi2cb70j4l")))) + "1l6hs3spbs3618jwg3n7r3hrrkqxmmd43f0km8849x4641p72zyc")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2270,7 +2270,7 @@ started on demand.") (define-public kdesignerplugin (package (name "kdesignerplugin") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -2279,7 +2279,7 @@ started on demand.") name "-" version ".tar.xz")) (sha256 (base32 - "004axa1fkj954d65x7l9z8dmw04209hb368rwa4gjzb8naf13ib6")))) + "0hj4ng0i22rvw4kl0irhqhww3kvn4c0pncn38w1j5vim4gxv0xcd")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -2321,7 +2321,7 @@ ini-style description files.") (define-public kdesu (package (name "kdesu") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -2330,7 +2330,7 @@ ini-style description files.") name "-" version ".tar.xz")) (sha256 (base32 - "0402p1h7wifk6sppg7ca9w0zfjllbhc1j5gsxj7ypq55g94np7hx")))) + "1gwvby51qqbkrs2vjpnplxr6m6xa5ddfdjs1iygh8kpqsh8a765k")))) (build-system cmake-build-system) (propagated-inputs `(("kpty" ,kpty))) @@ -2352,7 +2352,7 @@ with su and ssh respectively.") (define-public kdewebkit (package (name "kdewebkit") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -2361,7 +2361,7 @@ with su and ssh respectively.") name "-" version ".tar.xz")) (sha256 (base32 - "1csd4p996im7ygxc5rfdkzgdpngjgzyqakj12rl9rnfbsd15i8kb")))) + "05idyw94ayjh7qdia9pnjmx29r5lsch421kv8h5ivr7ixcbrgk6n")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2384,7 +2384,7 @@ engine WebKit via QtWebKit.") (define-public kemoticons (package (name "kemoticons") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -2393,7 +2393,7 @@ engine WebKit via QtWebKit.") name "-" version ".tar.xz")) (sha256 (base32 - "0f6an1bwxnga41a2b35b2pdcni4p0hh76k4jvanl3g046v07f2wr")))) + "0mz9hkhnprjbrfq54mqcvj8w87h025785m1bas80brsqzvni5krn")))) (build-system cmake-build-system) (propagated-inputs `(("kservice" ,kservice))) @@ -2425,7 +2425,7 @@ emoticons coming from different providers.") (define-public kglobalaccel (package (name "kglobalaccel") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -2434,7 +2434,7 @@ emoticons coming from different providers.") name "-" version ".tar.xz")) (sha256 (base32 - "0nlza73i0qd79yhwhpnvgbh2xa9lvd1n2xg25p3bvfzwidcfdxg6")))) + "1fk7wazfwr7smqiym3phm5yvw6cmiczag52y1vad8fgb3izd6zhl")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -2469,7 +2469,7 @@ window does not need focus for them to be activated.") (define-public kiconthemes (package (name "kiconthemes") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -2478,7 +2478,7 @@ window does not need focus for them to be activated.") name "-" version ".tar.xz")) (sha256 (base32 - "1nbxxpf8bv835xl35b17rk8s3zs110bh31078kqqh7dhvwzlxic7")))) + "1f7pk6smi2f0mm7jkrw5ymmkhd9gi8vnmppyblp1v3pvmy571c2m")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -2516,7 +2516,7 @@ in applications using the KDE Frameworks.") (define-public kinit (package (name "kinit") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -2525,7 +2525,7 @@ in applications using the KDE Frameworks.") name "-" version ".tar.xz")) (sha256 (base32 - "05vpac41pw1n8y58l2z08vyknzv950x8dxxw66dnymm2v31w07ia")))) + "1rq9b59gdgcpvwd694l8h55sqahpdaky0n7ag5psjlfn5myf1d95")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -2563,7 +2563,7 @@ makes starting KDE applications faster and reduces memory consumption.") (define-public kio (package (name "kio") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -2572,7 +2572,7 @@ makes starting KDE applications faster and reduces memory consumption.") name "-" version ".tar.xz")) (sha256 (base32 - "1526a89x11ank55dp3rfp7xd04w8x7prjg3y6i7n2q9nabwhw7gc")))) + "0rrsg3g1b204cdp58vxd5dig1ggwyvk1382p1c86vn6w8qbrq27k")))) (build-system cmake-build-system) (propagated-inputs `(("kbookmarks" ,kbookmarks) @@ -2655,7 +2655,7 @@ KIO enabled infrastructure.") (define-public knewstuff (package (name "knewstuff") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -2664,7 +2664,7 @@ KIO enabled infrastructure.") name "-" version ".tar.xz")) (sha256 (base32 - "0i2gmyp67xzf2m5wnv7v574q3gsp1yxfflv1jgl0wy57vchwn9g6")))) + "1vhcl2z9rcqg8390l1cwn3yyi1n17pn6mn8fsplp25qhzimb8bmk")))) (build-system cmake-build-system) (propagated-inputs `(("attica" ,attica) @@ -2712,7 +2712,7 @@ specification.") (define-public knotifyconfig (package (name "knotifyconfig") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -2721,7 +2721,7 @@ specification.") name "-" version ".tar.xz")) (sha256 (base32 - "1h07bjj71611v6912m5ajli6qszh9w925zqbk3vih8rn6pd2s3mc")))) + "09v4aq5x98sqg2awhw0n0y0rnjkr77kbf51xij0fiykd4llp9lfa")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2754,7 +2754,7 @@ notifications which can be embedded in your application.") (define-public kparts (package (name "kparts") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -2763,7 +2763,7 @@ notifications which can be embedded in your application.") name "-" version ".tar.xz")) (sha256 (base32 - "1mb5gp2ckmmrb4ym7cqvyl81wnp7cryk85gmizl7cnn69svlf40h")))) + "0zdz0byj0gsbgb007y8x37w8yf1gkw6dsp2s9bbdc4w6h9ipdj2k")))) (build-system cmake-build-system) (propagated-inputs `(("kio" ,kio) @@ -2807,7 +2807,7 @@ widgets with a user-interface defined in terms of actions.") (define-public kpeople (package (name "kpeople") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -2816,7 +2816,7 @@ widgets with a user-interface defined in terms of actions.") name "-" version ".tar.xz")) (sha256 (base32 - "050km3rpx58acx2341si46lxc2hywa59m8rwd849c2dnsxw3w1hm")))) + "0i5pd1d2jphsvpc3dpdw28dsdal1qrnnrx3k6qx4wax3f8ph5khv")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2850,7 +2850,7 @@ to easily extend the contacts collection.") (define-public krunner (package (name "krunner") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -2859,7 +2859,7 @@ to easily extend the contacts collection.") name "-" version ".tar.xz")) (sha256 (base32 - "0xh9kss67l09am1ilsr9zyx1yhlmaq3g9x60hw0sx7h7wrl6zsw6")))) + "02l5gch9hpag1q5ixnb541g7m9lx25pbggldpa8zykp63apyca19")))) (build-system cmake-build-system) (propagated-inputs `(("plasma-framework" ,plasma-framework))) @@ -2919,7 +2919,7 @@ typed.") (define-public kservice (package (name "kservice") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -2928,7 +2928,7 @@ typed.") name "-" version ".tar.xz")) (sha256 (base32 - "0z8zfpd00ndvkm1klp8l4mrcksshhyg280zgmg3gffz5rgh3gwri")))) + "1wwb6c6m8f3b16p47adkc05rrlszvvym7ckks5xp08s58pk1dm8z")))) (build-system cmake-build-system) (propagated-inputs `(("kconfig" ,kconfig) @@ -2964,7 +2964,7 @@ types or handled by application specific code.") (define-public ktexteditor (package (name "ktexteditor") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -2973,7 +2973,7 @@ types or handled by application specific code.") name "-" version ".tar.xz")) (sha256 (base32 - "020y3j6vm15sfpiwainr3qsx9i93j15mrvq523wmbmdj1z36yrh2")))) + "14iss8svx49vav0h2kg8vhv8g5hg4ky30s7049csfwz7xhp7jmcj")))) (build-system cmake-build-system) (propagated-inputs `(("kparts" ,kparts))) @@ -3044,7 +3044,7 @@ library.") (define-public ktextwidgets (package (name "ktextwidgets") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -3053,7 +3053,7 @@ library.") name "-" version ".tar.xz")) (sha256 (base32 - "088azbv95ycwxmxxw4l63i2l14fmn8l473pb4djh2mvz1ypfqayk")))) + "14gclshmpwmfwkp2hzlnf823pjjmknd9q0gdclsh3yy268c2rsw1")))) (build-system cmake-build-system) (propagated-inputs `(("ki18n" ,ki18n) @@ -3091,7 +3091,7 @@ It supports rich text as well as plain text.") (define-public kwallet (package (name "kwallet") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -3100,7 +3100,7 @@ It supports rich text as well as plain text.") name "-" version ".tar.xz")) (sha256 (base32 - "1kv3v7593srfn0wd7qp4rhvb30rxp7d2qmlwi0n4nc9s6v59pabn")))) + "13bmks9jb3yhp6clv25qkqkrvbhfyk9z16laxsv79jdd82lxgn1z")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -3133,7 +3133,7 @@ the passwords on KDE work spaces.") (define-public kxmlgui (package (name "kxmlgui") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -3142,7 +3142,7 @@ the passwords on KDE work spaces.") name "-" version ".tar.xz")) (sha256 (base32 - "0kfxjx8wrhkys5bydnv84nqxc2jqvv92zb2l6zpi0km5ggmia5y0")))) + "0wsgs5ya3wnc5cryi1r9i30sq8dnnhh15p02skdjlhwjfvdhxmfa")))) (build-system cmake-build-system) (propagated-inputs `(("kconfig" ,kconfig) @@ -3185,7 +3185,7 @@ descriptions for integrating actions from plugins.") (define-public kxmlrpcclient (package (name "kxmlrpcclient") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -3194,7 +3194,7 @@ descriptions for integrating actions from plugins.") name "-" version ".tar.xz")) (sha256 (base32 - "0ciip27ilsfk9s3gslpbi06v8i6ipdbmcig2jf43z3amsxpq0ncn")))) + "0l4jnvn7s77jkvd2z44mz24mfzcw499plms79j21pjryc88drh06")))) (build-system cmake-build-system) (propagated-inputs `(("kio" ,kio))) @@ -3228,7 +3228,7 @@ setUrl, setUserAgent and call.") (define-public plasma-framework (package (name "plasma-framework") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -3237,7 +3237,7 @@ setUrl, setUserAgent and call.") name "-" version ".tar.xz")) (sha256 (base32 - "079c8h0lmbkfr3srj5m8a40b50kyrxbgmy1n66329l8js9xrvaah")))) + "1yrccbkdpnfbgn7fzpmzzxm5c7fhkv1vqygq1f96r30fia0cj5jv")))) (build-system cmake-build-system) (propagated-inputs `(("kpackage" ,kpackage) @@ -3324,7 +3324,7 @@ script engines.") (define-public kde-frameworkintegration (package (name "kde-frameworkintegration") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -3333,7 +3333,7 @@ script engines.") "frameworkintegration-" version ".tar.xz")) (sha256 (base32 - "17fyny3c5chv7bipr19ayfjmd1amp2nms4ba5r7mwjp97xkphry7")))) + "1ni4jrny630zf3zwmqbm8z7dqgiar58992lylfv7kspdg5crcgfx")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) -- cgit v1.2.3 From d84a887a5f5313fda6bebc13153435b1154d24de Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 28 Aug 2018 01:22:38 -0400 Subject: gnu: libksysguard: Update to 5.13.4. * gnu/packages/kde.scm (libksysguard): Update to 5.13.4. --- gnu/packages/kde.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 1d14e4b820..8c932f2eeb 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -418,7 +418,7 @@ used in KDE development tools Kompare and KDevelop.") (define-public libksysguard (package (name "libksysguard") - (version "5.11.5") + (version "5.13.4") (source (origin (method url-fetch) @@ -426,7 +426,7 @@ used in KDE development tools Kompare and KDevelop.") "/libksysguard-" version ".tar.xz")) (sha256 (base32 - "0f2py4zkqzpxxf3mqaij0q8ka0v3nschj17dv6rbzzmr5mjv825f")))) + "0k8q5bxk9zyv7c3nny1c399v8acqs618nw39q20pj2qdijl9ibvh")))) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("pkg-config" ,pkg-config))) @@ -468,7 +468,7 @@ used in KDE development tools Kompare and KDevelop.") (lambda _ ;; TODO: Fix this failing test-case (zero? (system* "ctest" "-E" "processtest"))))))) - (home-page "https://www.kde.org/info/plasma-5.11.5.php") + (home-page "https://www.kde.org/info/plasma-5.13.4.php") (synopsis "Network enabled task and system monitoring") (description "KSysGuard can obtain information on system load and manage running processes. It obtains this information by interacting -- cgit v1.2.3 From 7ce9eaf0132ab00b7adf26953eb193f152ee7f2f Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 28 Aug 2018 01:07:55 -0400 Subject: gnu: Krita: Update to 4.1.1. * gnu/packages/kde.scm (krita): Update to 4.1.1. --- gnu/packages/kde.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 8c932f2eeb..0f2ede7f83 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -236,7 +236,7 @@ plugins, as well as code to create plugins, or complete applications.") (define-public krita (package (name "krita") - (version "4.0.1") + (version "4.1.1") (source (origin (method url-fetch) (uri (string-append @@ -245,7 +245,7 @@ plugins, as well as code to create plugins, or complete applications.") "/" name "-" version ".tar.gz")) (sha256 (base32 - "0k55ybvna40dx4fqygnix7bnhjaanak3ckb108hny2k7sspy62pc")))) + "1qz9bjvnwa5gc2b0063i2p72jq6y1b6kgqdj39599acp7ws11asw")))) (build-system cmake-build-system) (arguments `(#:tests? #f -- cgit v1.2.3 From fd67d793c27f4f675708862df59336cb1133ade1 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 28 Aug 2018 01:02:59 -0400 Subject: gnu: Krita: Build with libraw 0.18. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . Reported by Björn Höfling . * gnu/packages/photo.scm (libraw-0.18): New variable. * gnu/packages/kde.scm (krita)[inputs]: Use libraw-0.18. --- gnu/packages/kde.scm | 2 +- gnu/packages/photo.scm | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 0f2ede7f83..7b157853d3 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -316,7 +316,7 @@ plugins, as well as code to create plugins, or complete applications.") ("fftw" ,fftw) ("gsl" ,gsl) ("poppler-qt5" ,poppler-qt5) - ("libraw" ,libraw) + ("libraw" ,libraw-0.18) ("libtiff" ,libtiff) ("perl" ,perl) ("ilmbase" ,ilmbase) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 3fd3d0854b..7bdf04cb49 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -95,6 +95,18 @@ cameras (CRW/CR2, NEF, RAF, DNG, and others).") ;; both two licensing modes for your changes/additions." (license (list license:lgpl2.1 license:cddl1.0)))) +(define-public libraw-0.18 + (package (inherit libraw) + (name "libraw") + (version "0.18.12") + (source (origin + (method url-fetch) + (uri (string-append "https://www.libraw.org/data/LibRaw-" + version ".tar.gz")) + (sha256 + (base32 + "1m2khr2cij8z6lawgbmdksjn14fpnjsy8ad4qahnpqapm1slsxap")))))) + (define-public libexif (package (name "libexif") -- cgit v1.2.3 From ea59f0487b5b441e249e95ec93a2d39b5a413c2c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 28 Aug 2018 02:56:05 -0400 Subject: gnu: Remove Krita 3. Krita 3 fails to build with Qt 5.11.1. Since it's also unmaintained upstream, remove it. * gnu/packages/kde.scm (krita-3): Remove variable. --- gnu/packages/kde.scm | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 7b157853d3..aa5be6b515 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -329,23 +329,6 @@ illustrators, matte and texture artists, and the VFX industry. Notable features include brush stabilizers, brush engines and wrap-around mode.") (license license:gpl2+))) -;; Krita 3 and 4's file formats are incompatible, so we are keeping Krita 3 -;; for now. -(define-public krita-3 - (package - (inherit krita) - (name "krita") - (version "3.3.3") - (source (origin - (inherit (package-source krita)) - (uri (string-append - "mirror://kde/stable/krita/" - (version-prefix version 3) - "/" name "-" version ".tar.gz")) - (sha256 - (base32 - "0pc6hnakkqy81x5b5ncivaps6hqv43i50sjwgi3i3cz9j8rlxh5y")))))) - (define-public kholidays (package (name "kholidays") -- cgit v1.2.3 From a446cf26d7f386a81b8667f5ec75fb5f6232d202 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 31 Aug 2018 17:05:24 +0200 Subject: 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 + gnu/packages/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 (limited to 'gnu') 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")))) -- cgit v1.2.3 From 3469a5ea47ba7481bda9b2ff144bc13efd943c87 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 31 Aug 2018 17:40:40 +0200 Subject: 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 (limited to 'gnu') 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 -- cgit v1.2.3 From 53b7c9716e59555477ed39c066463f1bb4e0e03b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 1 Sep 2018 11:02:07 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 279ed3efee9c71116d368163f805fe9494518687 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 1 Sep 2018 12:48:08 +0200 Subject: 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 + gnu/packages/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 (limited to 'gnu') 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 -- cgit v1.2.3 From 7ea90c217fe6343b435434e409451eb0bd6fb6eb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 1 Sep 2018 13:23:39 +0200 Subject: gnu: nspr: Update to 4.20. * gnu/packages/gnuzilla.scm (nspr): Update to 4.20. --- gnu/packages/gnuzilla.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index b6bf89a75b..a543e040ff 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -323,7 +323,7 @@ in C/C++.") (define-public nspr (package (name "nspr") - (version "4.19") + (version "4.20") (source (origin (method url-fetch) (uri (string-append @@ -331,7 +331,7 @@ in C/C++.") version "/src/nspr-" version ".tar.gz")) (sha256 (base32 - "0agpv3f17h8kmzi0ifibaaxc1k3xc0q61wqw3l6r2xr2z8bmkn9f")))) + "0vjms4j75zvv5b2siyafg7hh924ysx2cwjad8spzp7x87n8n929c")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) -- cgit v1.2.3 From e59588482b2d0db4511571ba8971839251e24ec0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 1 Sep 2018 13:26:13 +0200 Subject: gnu: nss, nss-certs: Update to 3.39 [fixes CVE-2018-12384]. * gnu/packages/gnuzilla.scm (nss): Update to 3.39. * gnu/packages/certs.scm (nss-certs): Likewise. --- gnu/packages/certs.scm | 4 ++-- gnu/packages/gnuzilla.scm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm index cb05fb83fc..6af6877423 100644 --- a/gnu/packages/certs.scm +++ b/gnu/packages/certs.scm @@ -76,7 +76,7 @@ (define-public nss-certs (package (name "nss-certs") - (version "3.38") + (version "3.39") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -87,7 +87,7 @@ "nss-" version ".tar.gz"))) (sha256 (base32 - "0qigcy3d169cf67jzv3rbai0m6dn34vp8h2z696mz4yn10y3sr1c")))) + "0jw6qlfl2g47hhx056nvnj6h92bk3sn46hy3ig61a911dzblvrkb")))) (build-system gnu-build-system) (outputs '("out")) (native-inputs diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index a543e040ff..77a74a0ec4 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -359,7 +359,7 @@ in the Mozilla clients.") (define-public nss (package (name "nss") - (version "3.38") + (version "3.39") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -370,7 +370,7 @@ in the Mozilla clients.") "nss-" version ".tar.gz"))) (sha256 (base32 - "0qigcy3d169cf67jzv3rbai0m6dn34vp8h2z696mz4yn10y3sr1c")) + "0jw6qlfl2g47hhx056nvnj6h92bk3sn46hy3ig61a911dzblvrkb")) ;; Create nss.pc and nss-config. (patches (search-patches "nss-pkgconfig.patch" "nss-increase-test-timeout.patch")))) -- cgit v1.2.3 From ead46692ec8a17ed9cf668131343d7cf1b3725e5 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Fri, 31 Aug 2018 05:50:33 +0300 Subject: gnu: Add zabbix-agentd and zabbix-server. * gnu/packages/monitoring.scm (zabbix-agentd, zabbix-server): New variables. --- gnu/packages/monitoring.scm | 85 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 83 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index fae62d5493..a59e51a5e3 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -3,7 +3,8 @@ ;;; Copyright © 2018 Sou Bunnbu ;;; Copyright © 2017, 2018 Ricardo Wurmus ;;; Copyright © 2018 Tobias Geerinckx-Rice -;;; Copyright © 2018 Gábor Boskovits +;;; Copyright © 2018 Gábor Boskovits w +;;; Copyright © 2018 Oleg Pykhalov ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,18 +30,25 @@ #:use-module (guix build-system python) #:use-module (guix build-system gnu) #:use-module (guix build-system go) + #:use-module (guix utils) #:use-module (gnu packages admin) #:use-module (gnu packages base) + #:use-module (gnu packages curl) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages databases) #:use-module (gnu packages django) #:use-module (gnu packages gd) #:use-module (gnu packages image) #:use-module (gnu packages mail) + #:use-module (gnu packages networking) + #:use-module (gnu packages libevent) + #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages python) #:use-module (gnu packages python-web) - #:use-module (gnu packages time)) + #:use-module (gnu packages time) + #:use-module (gnu packages tls)) (define-public nagios (package @@ -138,6 +146,79 @@ etc. via a Web interface. Features include: @end itemize\n") (license license:gpl2))) +(define-public zabbix-agentd + (package + (name "zabbix-agentd") + (version "3.4.11") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://sourceforge/zabbix/ZABBIX%20Latest%20Stable/" version + "/zabbix-" version ".tar.gz")) + (sha256 + (base32 + "0qxgf6hx7ibhjmxd2sxizkjc8df4c9d31wz5hhql409ws98qf173")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list "--enable-agent" + (string-append "--with-iconv=" + (assoc-ref %build-inputs "libiconv")) + (string-append "--with-libpcre=" + (assoc-ref %build-inputs "pcre"))))) + (inputs + `(("libiconv" ,libiconv) + ("pcre" ,pcre))) + (home-page "https://www.zabbix.com/") + (synopsis "Distributed monitoring solution (client-side agent)") + (description "This package provides a distributed monitoring +solution (client-side agent)") + (license license:gpl2))) + +(define-public zabbix-server + (package + (inherit zabbix-agentd) + (name "zabbix-server") + (arguments + (substitute-keyword-arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'install-frontend + (lambda* (#:key outputs #:allow-other-keys) + (let* ((php (string-append (assoc-ref outputs "out") + "/share/zabbix/php")) + (front-end-conf (string-append php "/conf")) + (etc (string-append php "/etc"))) + (mkdir-p php) + (copy-recursively "./frontends/php" php) + (rename-file front-end-conf + (string-append front-end-conf "-example")) + (symlink "/etc/zabbix" front-end-conf))))) + ,@(package-arguments zabbix-agentd)) + ((#:configure-flags flags) + `(cons* "--enable-server" + "--with-postgresql" + (string-append "--with-libevent=" + (assoc-ref %build-inputs "libevent")) + "--with-net-snmp" + (string-append "--with-gnutls=" + (assoc-ref %build-inputs "gnutls")) + "--with-libcurl" + ,flags)))) + (inputs + `(("curl" ,curl) + ("libevent" ,libevent) + ("gnutls" ,gnutls) + ("postgresql" ,postgresql) + ("zlib" ,zlib) + ("net-snmp" ,net-snmp) + ("curl" ,curl) + ,@(package-inputs zabbix-agentd))) + (synopsis "Distributed monitoring solution (server-side)") + (description "This package provides a distributed monitoring +solution (server-side)"))) + (define-public darkstat (package (name "darkstat") -- cgit v1.2.3 From 352b5d7e746674b1dd4b8a30b05ef8ac567afa14 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 11:49:51 +0200 Subject: gnu: Add ruby-concurrent. * gnu/packages/ruby.scm (ruby-concurrent): New variable. --- gnu/packages/ruby.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 908dfd5751..e0a76fed2c 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -193,6 +193,25 @@ a focus on simplicity and productivity.") (("/bin/sh") (which "sh"))) #t))))))) +(define-public ruby-concurrent + (package + (name "ruby-concurrent") + (version "1.0.5") + (source (origin + (method url-fetch) + (uri (rubygems-uri "concurrent-ruby" version)) + (sha256 + (base32 + "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf")))) + (build-system ruby-build-system) + (arguments `(#:tests? #f)); No rakefile + (home-page "https://github.com/ruby-concurrency/concurrent-ruby") + (synopsis "Concurrency tools for Ruby") + (description "This gem provides concurrency tools for Ruby. It provides +a library of common thread-safe types and data-structures as well as abstractions +for concurrency and communication between threads.") + (license license:expat))) + (define-public ruby-highline (package (name "ruby-highline") -- cgit v1.2.3 From cbb50182adc4e5252e4f1bf9010c09ada94f7ae1 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 11:51:17 +0200 Subject: gnu: ruby-i18n: Update to 1.1.0. * gnu/packages/ruby.scm (ruby-i18n): Update to 1.1.0. --- gnu/packages/ruby.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index e0a76fed2c..ef6cc24f7f 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -281,16 +281,17 @@ packaging native C and Java extensions in Ruby.") (define-public ruby-i18n (package (name "ruby-i18n") - (version "0.7.0") + (version "1.1.0") (source (origin (method url-fetch) (uri (rubygems-uri "i18n" version)) (sha256 (base32 - "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758")))) + "0ppvmla21hssvrfm8g1n2fnb4lxn4yhy9qmmba0imanflgldrjmr")))) (build-system ruby-build-system) (arguments '(#:tests? #f)) ; no tests + (propagated-inputs `(("concurrent-ruby" ,ruby-concurrent))) (synopsis "Internationalization library for Ruby") (description "Ruby i18n is an internationalization and localization solution for Ruby programs. It features translation and localization, -- cgit v1.2.3 From ef381322d57e07153aad7c93e8c5b6a9ec5525fc Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 12:20:53 +0200 Subject: gnu: ruby-activesupport: Update to 5.2.1. * gnu/packages/ruby.scm (ruby-activesupport): Update to 5.2.1. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index ef6cc24f7f..3ead6d710b 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3036,14 +3036,14 @@ you about the changes.") (define-public ruby-activesupport (package (name "ruby-activesupport") - (version "5.1.4") + (version "5.2.1") (source (origin (method url-fetch) (uri (rubygems-uri "activesupport" version)) (sha256 (base32 - "0sgf4rsfr7jcaqsx0wwzx4l4k9xsjlwv0mzl08pxiyp1qzyx8scr")))) + "0ziy6xk31k4fs115cdkba1ys4i8nzcyri7a2jig7nx7k5h7li6l2")))) (build-system ruby-build-system) (arguments `(#:phases -- cgit v1.2.3 From afb7a3e8d56f34b60c99f5d636a7ce152667fc80 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 12:38:32 +0200 Subject: gnu: ruby-ttfunk: Update to 1.5.1. * gnu/packages/ruby.scm (ruby-ttfunk): Update to 1.5.1. --- gnu/packages/ruby.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 3ead6d710b..5bbd81f261 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -4678,7 +4678,7 @@ binary-to-text encoding. The main modern use of Ascii85 is in PostScript and (define-public ruby-ttfunk (package (name "ruby-ttfunk") - (version "1.4.0") + (version "1.5.1") (source (origin (method url-fetch) @@ -4689,12 +4689,18 @@ binary-to-text encoding. The main modern use of Ascii85 is in PostScript and (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1izq84pnm9niyvkzp8k0vl232q9zj41hwmp9na9fzycfh1pbnsl6")))) + "1ymcn12n5iws401yz03zsj8rr653fdqq13czsrciq09phgh9jzc5")))) (build-system ruby-build-system) (arguments `(#:test-target "spec" #:phases (modify-phases %standard-phases + (add-before 'build 'remove-ssh + (lambda _ + ;; remove dependency on an ssh key pair that doesn't exist + (substitute* "ttfunk.gemspec" + (("spec.signing_key.*") "")) + #t)) (add-before 'check 'remove-rubocop (lambda _ ;; remove rubocop as a dependency as not needed for testing @@ -4702,10 +4708,11 @@ binary-to-text encoding. The main modern use of Ascii85 is in PostScript and (("spec.add_development_dependency\\('rubocop'.*") "")) (substitute* "Rakefile" (("require 'rubocop/rake_task'") "") - (("Rubocop::RakeTask.new") "")) + (("RuboCop::RakeTask.new") "")) #t))))) (native-inputs `(("ruby-rspec" ,ruby-rspec) + ("ruby-yard" ,ruby-yard) ("bundler" ,bundler))) (synopsis "Font metrics parser for the Prawn PDF generator") (description -- cgit v1.2.3 From 0d16905b60bd4dab70dfafdb0a8d6fd29a304c44 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 12:39:15 +0200 Subject: gnu: Add ruby-public-suffix. * gnu/packages/ruby.scm (ruby-public-suffix): New variable. --- gnu/packages/ruby.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 5bbd81f261..367832d277 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5097,3 +5097,27 @@ programs running in the background, in Ruby.") (sha256 (base32 "0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p")))))) + +(define-public ruby-public-suffix + (package + (name "ruby-public-suffix") + (version "3.0.3") + (source (origin + (method url-fetch) + (uri (rubygems-uri "public_suffix" version)) + (sha256 + (base32 + "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l")))) + (build-system ruby-build-system) + (arguments + ;; Tests require network + `(#:tests? #f)) + (home-page "https://simonecarletti.com/code/publicsuffix-ruby/") + (synopsis "Domain name parser") + (description "The gem @code{public_suffix} is a domain name parser, +written in Ruby, and based on the @dfn{Public Suffix List}. A public suffix +is one under which Internet users can (or historically could) directly +register names. Some examples of public suffixes are @code{.com}, +@code{.co.uk} and @code{pvt.k12.ma.us}. The Public Suffix List is a list of +all known public suffixes.") + (license license:expat))) -- cgit v1.2.3 From 6f2c4efb56520f8f63ee7f15f694f5582b4d04c4 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 12:40:12 +0200 Subject: gnu: Add ruby-addressable. * gnu/package/ruby.scm (ruby-addressable): New variable. --- gnu/packages/ruby.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 367832d277..862193f305 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5121,3 +5121,26 @@ register names. Some examples of public suffixes are @code{.com}, @code{.co.uk} and @code{pvt.k12.ma.us}. The Public Suffix List is a list of all known public suffixes.") (license license:expat))) + +(define-public ruby-addressable + (package + (name "ruby-addressable") + (version "2.5.2") + (source (origin + (method url-fetch) + (uri (rubygems-uri "addressable" version)) + (sha256 + (base32 + "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk")))) + (build-system ruby-build-system) + (propagated-inputs + `(("ruby-public-suffix" ,ruby-public-suffix))) + (arguments + ;; No test target + `(#:tests? #f)) + (home-page "https://github.com/sporkmonger/addressable") + (synopsis "Alternative URI implementation") + (description "Addressable is a replacement for the URI implementation that +is part of Ruby's standard library. It more closely conforms to RFC 3986, +RFC 3987, and RFC 6570 (level 4), providing support for IRIs and URI templates.") + (license license:asl2.0))) -- cgit v1.2.3 From 9c7f15c048636fcba8f64f6e257482a01396ae6f Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 13:08:32 +0200 Subject: gnu: Add ruby-colorator. * gnu/packages/ruby.scm (ruby-colorator): New variable. --- gnu/packages/ruby.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 862193f305..90af1481c9 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5144,3 +5144,23 @@ all known public suffixes.") is part of Ruby's standard library. It more closely conforms to RFC 3986, RFC 3987, and RFC 6570 (level 4), providing support for IRIs and URI templates.") (license license:asl2.0))) + +(define-public ruby-colorator + (package + (name "ruby-colorator") + (version "1.1.0") + (source (origin + (method url-fetch) + (uri (rubygems-uri "colorator" version)) + (sha256 + (base32 + "0f7wvpam948cglrciyqd798gdc6z3cfijciavd0dfixgaypmvy72")))) + (build-system ruby-build-system) + (arguments + ;; No test target + `(#:tests? #f)) + (home-page "http://octopress.org/colorator/") + (synopsis "Terminal color library") + (description "Colorator is a Ruby gem that helps you colorize your text +for the terminal.") + (license license:expat))) -- cgit v1.2.3 From 78b9c291f6d656e2912f59b9eaf8dfaca925ea94 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 13:10:06 +0200 Subject: gnu: Add ruby-command-line-reporter. * gnu/packages/ruby.scm (ruby-command-line-reporter): New variable. --- gnu/packages/ruby.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 90af1481c9..7dab7b834f 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5164,3 +5164,36 @@ RFC 3987, and RFC 6570 (level 4), providing support for IRIs and URI templates." (description "Colorator is a Ruby gem that helps you colorize your text for the terminal.") (license license:expat))) + +(define-public ruby-command-line-reporter + (package + (name "ruby-command-line-reporter") + (version "4.0.0") + (source (origin + (method url-fetch) + (uri (rubygems-uri "command_line_reporter" version)) + (sha256 + (base32 + "1qma35xrb772whxwy1rs9bicb9d6lvz0s2dd2dnn4fr6zcbcxc0a")))) + (build-system ruby-build-system) + (arguments + ;; No Rakefile + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-before 'build 'fix-dependencies + (lambda _ + (substitute* ".gemspec" + ;; colored is unmaintained + (("colored") "colorator") + ;; colorator version + (("= 1.2") "= 1.1")) + #t))))) + (propagated-inputs `(("ruby-colorator" ,ruby-colorator))) + (home-page "https://github.com/wbailey/command_line_reporter") + (synopsis "Report production while executing Ruby scripts") + (description "This gem provides a DSL that makes it easy to write reports +of various types in ruby. It eliminates the need to litter your source with +puts statements, instead providing a more readable, expressive interface to +your application.") + (license license:asl2.0))) -- cgit v1.2.3 From f22c038799a9c83816ce6e19bf2220d4022ba642 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 13:41:18 +0200 Subject: gnu: Add ruby-command-line-reporter-3. * gnu/packages/ruby.scm (ruby-command-line-reporter-3): New variable. --- gnu/packages/ruby.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 7dab7b834f..8321dda4cc 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5197,3 +5197,14 @@ of various types in ruby. It eliminates the need to litter your source with puts statements, instead providing a more readable, expressive interface to your application.") (license license:asl2.0))) + +(define-public ruby-command-line-reporter-3 + (package + (inherit ruby-command-line-reporter) + (version "3.3.6") + (source (origin + (method url-fetch) + (uri (rubygems-uri "command_line_reporter" version)) + (sha256 + (base32 + "1h39zqqxp3k4qk49ajpx0jps1vmvxgkh43mqkb6znk583bl0fv71")))))) -- cgit v1.2.3 From 6bba8ecf7b9a087d405d30373bd18a5e524f4918 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 13:42:29 +0200 Subject: gnu: Add ruby-rdoc. * gnu/packages/ruby.scm (ruby-rdoc): New variable. --- gnu/packages/ruby.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 8321dda4cc..cd88ea921c 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5208,3 +5208,24 @@ your application.") (sha256 (base32 "1h39zqqxp3k4qk49ajpx0jps1vmvxgkh43mqkb6znk583bl0fv71")))))) + +(define-public ruby-rdoc + (package + (name "ruby-rdoc") + (version "6.0.4") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "rdoc" version)) + (sha256 + (base32 + "0anv42cqcdc6g4n386mrva7mgav5i0c2ry3yzvzzc6z6hymkmcr7")))) + (build-system ruby-build-system) + (native-inputs + `(("bundler" ,bundler))) + (home-page "https://ruby.github.io/rdoc/") + (synopsis "HTML and command-line documentation utility") + (description "RDoc produces HTML and command-line documentation for Ruby +projects. RDoc includes the +rdoc+ and +ri+ tools for generating and displaying +documentation from the command-line.") + (license license:gpl2+))) -- cgit v1.2.3 From 18077ffc4613be27d087eb4d3dadd5cdf189cd74 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 13:43:30 +0200 Subject: gnu: Add ruby-sass-listen. * gnu/packages/ruby.scm (ruby-sass-listen): New variable. --- gnu/packages/ruby.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index cd88ea921c..60869be9b8 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5229,3 +5229,26 @@ your application.") projects. RDoc includes the +rdoc+ and +ri+ tools for generating and displaying documentation from the command-line.") (license license:gpl2+))) + +(define-public ruby-sass-listen + (package + (name "ruby-sass-listen") + (version "4.0.0") + (source (origin + (method url-fetch) + (uri (rubygems-uri "sass-listen" version)) + (sha256 + (base32 + "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df")))) + (build-system ruby-build-system) + (arguments + ;; No test target + `(#:tests? #f)) + (propagated-inputs + `(("ruby-rb-fsevent" ,ruby-rb-fsevent) + ("ruby-rb-inotify" ,ruby-rb-inotify))) + (home-page "https://github.com/sass/listen") + (synopsis "File modification notification library") + (description "The Listen gem listens to file modifications and notifies you +about the changes.") + (license license:expat))) -- cgit v1.2.3 From 0c8eedc153cb7293f2bf148be32171a0e1ea7a39 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 13:47:16 +0200 Subject: gnu: Add ruby-terminfo. * gnu/packages/ruby.scm (ruby-terminfo): New variable. --- gnu/packages/ruby.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 60869be9b8..5fdf53c9c9 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -37,6 +37,7 @@ #:use-module (gnu packages java) #:use-module (gnu packages libffi) #:use-module (gnu packages maths) + #:use-module (gnu packages ncurses) #:use-module (gnu packages networking) #:use-module (gnu packages python) #:use-module (gnu packages ragel) @@ -5252,3 +5253,30 @@ documentation from the command-line.") (description "The Listen gem listens to file modifications and notifies you about the changes.") (license license:expat))) + +(define-public ruby-terminfo + (package + (name "ruby-terminfo") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "ruby-terminfo" version)) + (sha256 + (base32 + "0rl4ic5pzvrpgd42z0c1s2n3j39c9znksblxxvmhkzrc0ckyg2cm")))) + (build-system ruby-build-system) + (arguments + `(#:test-target "test" + ;; Rakefile requires old packages and would need modification to + ;; work with current software. + #:tests? #f)) + (inputs + `(("ncurses" ,ncurses))) + (native-inputs + `(("ruby-rubygems-tasks" ,ruby-rubygems-tasks) + ("ruby-rdoc" ,ruby-rdoc))) + (home-page "http://www.a-k-r.org/ruby-terminfo/") + (synopsis "Terminfo binding for Ruby") + (description "Ruby-terminfo provides terminfo binding for Ruby.") + (license license:bsd-3))) -- cgit v1.2.3 From ddc3a66798919afe98173dbd176ce818c57949af Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 13:48:13 +0200 Subject: gnu: Add ruby-diffy. * gnu/packages/ruby.scm (ruby-diffy): New variable. --- gnu/packages/ruby.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 5fdf53c9c9..0f2b66139f 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5280,3 +5280,26 @@ about the changes.") (synopsis "Terminfo binding for Ruby") (description "Ruby-terminfo provides terminfo binding for Ruby.") (license license:bsd-3))) + +(define-public ruby-diffy + (package + (name "ruby-diffy") + (version "3.2.1") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "diffy" version)) + (sha256 + (base32 + "119imrkn01agwhx5raxhknsi331y5i4yda7r0ws0an6905ximzjg")))) + (build-system ruby-build-system) + (arguments + ;; No tests + `(#:tests? #f)) + (native-inputs + `(("ruby-rspec" ,ruby-rspec))) + (home-page "https://github.com/samg/diffy") + (synopsis "Convenient diffing in ruby") + (description "Diffy provides a convenient way to generate a diff from two +strings or files.") + (license license:expat))) -- cgit v1.2.3 From 6456beef016fea4189b24a5f960ce8e98cd245cc Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 13:50:52 +0200 Subject: gnu: Add ruby-sass-spec. * gnu/packages/ruby.scm (ruby-sass-spec): New variable. --- gnu/packages/ruby.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 0f2b66139f..c644ba75bd 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5303,3 +5303,29 @@ about the changes.") (description "Diffy provides a convenient way to generate a diff from two strings or files.") (license license:expat))) + +(define-public ruby-sass-spec + (package + (name "ruby-sass-spec") + (version "3.5.4") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/sass/sass-spec/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0nx8lp7c9qa58w489crgqa3c489xsyarn1a8h4np9mwwfqm1h3rr")))) + (build-system ruby-build-system) + (propagated-inputs + `(("ruby-command-line-reporter-3" ,ruby-command-line-reporter-3) + ("ruby-diffy" ,ruby-diffy) + ("ruby-terminfo" ,ruby-terminfo))) + (arguments + ;; No Rakefile + `(#:tests? #f)) + (home-page "https://github.com/sass/sass-spec") + (synopsis "Test suite for Sass") + (description "Sass Spec is a test suite for Sass. Test cases are all in +the @file{spec} directory.") + (license license:expat))) -- cgit v1.2.3 From f00f4492236e9006c022972d4e7ef21c6e301c4b Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 13:54:09 +0200 Subject: gnu: Add ruby-sass. * gnu/packages/ruby.scm (ruby-sass): New variable. --- gnu/packages/ruby.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index c644ba75bd..58a9c97ded 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5329,3 +5329,24 @@ strings or files.") (description "Sass Spec is a test suite for Sass. Test cases are all in the @file{spec} directory.") (license license:expat))) + +(define-public ruby-sass + (package + (name "ruby-sass") + (version "3.5.7") + (source (origin + (method url-fetch) + (uri (rubygems-uri "sass" version)) + (sha256 + (base32 + "1sy7xsbgpcy90j5ynbq967yplffp74pvph3r8ivn2sv2b44q6i61")))) + (build-system ruby-build-system) + (propagated-inputs + `(("ruby-sass-listen" ,ruby-sass-listen))) + (native-inputs + `(("ruby-sass-spec" ,ruby-sass-spec))) + (home-page "http://sass-lang.com/") + (synopsis "CSS extension language") + (description "Sass is a CSS extension language. It extends CSS with +features that don't exist yet like variables, nesting, mixins and inheritance.") + (license license:expat))) -- cgit v1.2.3 From 5e242cb44ca0f57cc2fb483e8b3a211cd633b9bc Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 14:07:08 +0200 Subject: gnu: Add ruby-jekyll-sass-converter. * gnu/packages/ruby.scm (ruby-jekyll-sass-converter): New variable. --- gnu/packages/ruby.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 58a9c97ded..548d79e428 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5350,3 +5350,25 @@ the @file{spec} directory.") (description "Sass is a CSS extension language. It extends CSS with features that don't exist yet like variables, nesting, mixins and inheritance.") (license license:expat))) + +(define-public ruby-jekyll-sass-converter + (package + (name "ruby-jekyll-sass-converter") + (version "1.5.2") + (source (origin + (method url-fetch) + (uri (rubygems-uri "jekyll-sass-converter" version)) + (sha256 + (base32 + "008ikh5fk0n6ri54mylcl8jn0mq8p2nfyfqif2q3pp0lwilkcxsk")))) + (build-system ruby-build-system) + (propagated-inputs + `(("ruby-sass" ,ruby-sass))) + (arguments + ;; No rakefile + `(#:tests? #f)) + (home-page "https://github.com/jekyll/jekyll-sass-converter") + (synopsis "Sass converter for Jekyll") + (description "This gem provide built-in support for the Sass converter +in Jekyll.") + (license license:expat))) -- cgit v1.2.3 From 88ed727fc5513ffbb87cba52604d0689939f3b3d Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 14:08:06 +0200 Subject: gnu: Add ruby-listen-3.0. * gnu/packages/ruby.scm (ruby-listen-3.0): New variable. --- gnu/packages/ruby.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 548d79e428..a21e1fea9a 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3034,6 +3034,17 @@ you about the changes.") (home-page "https://github.com/guard/listen") (license license:expat))) +(define-public ruby-listen-3.0 + (package + (inherit ruby-listen) + (version "3.0.8") + (source (origin + (method url-fetch) + (uri (rubygems-uri "listen" version)) + (sha256 + (base32 + "1l0y7hbyfiwpvk172r28hsdqsifq1ls39hsfmzi1vy4ll0smd14i")))))) + (define-public ruby-activesupport (package (name "ruby-activesupport") -- cgit v1.2.3 From ceac6f6f5bca77d541f793b2825d9de401be8aa6 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 14:11:13 +0200 Subject: gnu: Add ruby-jekyll-watch. * gnu/packages/ruby.scm (ruby-jekyll-watch): New variable. --- gnu/packages/ruby.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index a21e1fea9a..58cd6fc6d7 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5383,3 +5383,25 @@ features that don't exist yet like variables, nesting, mixins and inheritance.") (description "This gem provide built-in support for the Sass converter in Jekyll.") (license license:expat))) + +(define-public ruby-jekyll-watch + (package + (name "ruby-jekyll-watch") + (version "2.0.0") + (source (origin + (method url-fetch) + (uri (rubygems-uri "jekyll-watch" version)) + (sha256 + (base32 + "0m7scvj3ki8bmyx5v8pzibpg6my10nycnc28lip98dskf8iakprp")))) + (build-system ruby-build-system) + (propagated-inputs + `(("ruby-listen-3.0" ,ruby-listen-3.0))) + (arguments + ;; No rakefile + `(#:tests? #f)) + (home-page "https://github.com/jekyll/jekyll-watch") + (synopsis "Jekyll auto-rebuild support") + (description "This gems add the @code{--watch} switch to the jekyll CLI +interface. It allows Jekyll to rebuild your site when a file changes.") + (license license:expat))) -- cgit v1.2.3 From 3224a5a84a261fcc8a6972ace1cbd0018371d34f Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 15:24:40 +0200 Subject: gnu: Add ruby-parallel. * gnu/packages/ruby.scm (ruby-parallel): New variable. --- gnu/packages/ruby.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 58cd6fc6d7..c3ce6ca39a 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5405,3 +5405,22 @@ in Jekyll.") (description "This gems add the @code{--watch} switch to the jekyll CLI interface. It allows Jekyll to rebuild your site when a file changes.") (license license:expat))) + +(define-public ruby-parallel + (package + (name "ruby-parallel") + (version "1.12.1") + (source (origin + (method url-fetch) + (uri (rubygems-uri "parallel" version)) + (sha256 + (base32 + "01hj8v1qnyl5ndrs33g8ld8ibk0rbcqdpkpznr04gkbxd11pqn67")))) + (build-system ruby-build-system) + (arguments `(#:tests? #f)); No rakefile + (home-page "https://github.com/grosser/parallel") + (synopsis "Parallel processing in Ruby") + (description "Parallel allows you to run any code in parallel Processes +(to use all CPUs) or Threads(to speedup blocking operations). It is best +suited for map-reduce or e.g. parallel downloads/uploads.") + (license license:expat))) -- cgit v1.2.3 From 83d9f672212907bb0c683f0be428c1d847bf6001 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 15:28:00 +0200 Subject: gnu: Add ruby-cane. * gnu/packages/ruby.scm (ruby-cane): New variable. --- gnu/packages/ruby.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index c3ce6ca39a..b7a55fa31f 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5424,3 +5424,22 @@ interface. It allows Jekyll to rebuild your site when a file changes.") (to use all CPUs) or Threads(to speedup blocking operations). It is best suited for map-reduce or e.g. parallel downloads/uploads.") (license license:expat))) + +(define-public ruby-cane + (package + (name "ruby-cane") + (version "3.0.0") + (source (origin + (method url-fetch) + (uri (rubygems-uri "cane" version)) + (sha256 + (base32 + "0yf5za3l7lhrqa3g56sah73wh33lbxy5y3cb7ij0a2bp1b4kwhih")))) + (build-system ruby-build-system) + (arguments `(#:tests? #f)); No rakefile + (home-page "https://github.com/square/cane") + (propagated-inputs + `(("ruby-parallel" ,ruby-parallel))) + (synopsis "Code quality threshold checking") + (description "Cane fails your build if code quality thresholds are not met.") + (license license:asl2.0))) -- cgit v1.2.3 From 00d71efca6be6bff7e2bb0f5a61ae8a7929af39a Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 15:33:08 +0200 Subject: gnu: Add ruby-morecane. * gnu/packages/ruby.scm (ruby-morecane): New variable. --- gnu/packages/ruby.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index b7a55fa31f..93ed29443e 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5443,3 +5443,25 @@ suited for map-reduce or e.g. parallel downloads/uploads.") (synopsis "Code quality threshold checking") (description "Cane fails your build if code quality thresholds are not met.") (license license:asl2.0))) + +(define-public ruby-morecane + (package + (name "ruby-morecane") + (version "0.2.0") + (source (origin + (method url-fetch) + (uri (rubygems-uri "morecane" version)) + (sha256 + (base32 + "0w70vb8z5bdhvr21h660aa43m5948pv0bd27z7ngai2iwdvqd771")))) + (build-system ruby-build-system) + (home-page "https://github.com/yob/morecane") + (arguments `(#:tests? #f)); No rakefile + (propagated-inputs + `(("ruby-parallel" ,ruby-parallel))) + (synopsis "Extra checks for cane") + (description "The cane gem provides a great framework for running quality +checks over your ruby project as part of continuous integration build. It +comes with a few checks out of the box, but also provides an API for loading +custom checks. This gem provides a set of additional checks.") + (license license:expat))) -- cgit v1.2.3 From abbe629c6a25bea320e49163fff71d33521bb127 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 15:35:36 +0200 Subject: gnu: Add ruby-pdf-reader. * gnu/packages/ruby.scm (ruby-pdf-reader): New variable. --- gnu/packages/ruby.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 93ed29443e..86b00ef8ae 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5465,3 +5465,33 @@ checks over your ruby project as part of continuous integration build. It comes with a few checks out of the box, but also provides an API for loading custom checks. This gem provides a set of additional checks.") (license license:expat))) + +(define-public ruby-pdf-reader + (package + (name "ruby-pdf-reader") + (version "2.1.0") + (source (origin + (method url-fetch) + (uri (rubygems-uri "pdf-reader" version)) + (sha256 + (base32 + "1b3ig4wpcgdbqa7yw0ahwbmikkkywn2a22bfmrknl5ls7g066x45")))) + (build-system ruby-build-system) + (arguments `(#:test-target "spec")) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rspec" ,ruby-rspec) + ("ruby-cane" ,ruby-cane) + ("ruby-morecane" ,ruby-morecane))) + (propagated-inputs + `(("ruby-afm" ,ruby-afm) + ("ruby-ascii85" ,ruby-ascii85) + ("ruby-hashery" ,ruby-hashery) + ("ruby-rc4" ,ruby-rc4) + ("ruby-ttfunk" ,ruby-ttfunk))) + (home-page "https://github.com/yob/pdf-reader") + (synopsis "PDF parser in Ruby") + (description "The PDF::Reader library implements a PDF parser conforming as +much as possible to the PDF specification from Adobe. It provides programmatic +access to the contents of a PDF file with a high degree of flexibility.") + (license license:gpl3+))) -- cgit v1.2.3 From 461fb8598efc319a61d3be0996a4f7d402839539 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 15:46:24 +0200 Subject: gnu: Add ruby-pdf-inspector. * gnu/packages/ruby.scm (ruby-pdf-inspector): New variable. --- gnu/packages/ruby.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 86b00ef8ae..1ea41109cc 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5495,3 +5495,24 @@ custom checks. This gem provides a set of additional checks.") much as possible to the PDF specification from Adobe. It provides programmatic access to the contents of a PDF file with a high degree of flexibility.") (license license:gpl3+))) + +(define-public ruby-pdf-inspector + (package + (name "ruby-pdf-inspector") + (version "1.3.0") + (source (origin + (method url-fetch) + (uri (rubygems-uri "pdf-inspector" version)) + (sha256 + (base32 + "1g853az4xzgqxr5xiwhb76g4sqmjg4s79mm35mp676zjsrwpa47w")))) + (build-system ruby-build-system) + (propagated-inputs + `(("ruby-pdf-reader" ,ruby-pdf-reader))) + (arguments `(#:tests? #f)); No rakefile + (home-page "https://github.com/prawnpdf/pdf-inspector") + (synopsis "Analysis classes for inspecting PDF output") + (description "This library provides a number of PDF::Reader based tools for +use in testing PDF output. Presently, the primary purpose of this tool is to +support the tests found in Prawn, a pure Ruby PDF generation library.") + (license license:gpl3+))) -- cgit v1.2.3 From 770e3b535e0c90764ce58ee8bfb2d68bc0324f7a Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 15:57:51 +0200 Subject: gnu: Add ruby-pdf-core. * gnu/packages/ruby.scm (ruby-pdf-core): New variable. --- gnu/packages/ruby.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 1ea41109cc..c21e4cc2d4 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5516,3 +5516,23 @@ access to the contents of a PDF file with a high degree of flexibility.") use in testing PDF output. Presently, the primary purpose of this tool is to support the tests found in Prawn, a pure Ruby PDF generation library.") (license license:gpl3+))) + +(define-public ruby-pdf-core + (package + (name "ruby-pdf-core") + (version "0.8.1") + (source (origin + (method url-fetch) + (uri (rubygems-uri "pdf-core" version)) + (sha256 + (base32 + "15d6m99bc8bbzlkcg13qfpjjzphfg5x905pjbfygvpcxsm8gnsvg")))) + (build-system ruby-build-system) + (arguments + ; No test target + `(#:tests? #f)) + (home-page "https://github.com/prawnpdf/pdf-core") + (synopsis "Low level PDF features for Prawn") + (description "This is an experimental gem that extracts low-level PDF +functionality from Prawn.") + (license license:gpl3+))) -- cgit v1.2.3 From 37fbced73c3aeb85472c1f3008eb32a2d87f67ef Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 16:00:00 +0200 Subject: gnu: Add ruby-yard. * gnu/packages/ruby.scm (ruby-yard): New variable. --- gnu/packages/ruby.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index c21e4cc2d4..7085adc1a0 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5536,3 +5536,24 @@ support the tests found in Prawn, a pure Ruby PDF generation library.") (description "This is an experimental gem that extracts low-level PDF functionality from Prawn.") (license license:gpl3+))) + +(define-public ruby-yard + (package + (name "ruby-yard") + (version "0.9.16") + (source (origin + (method url-fetch) + (uri (rubygems-uri "yard" version)) + (sha256 + (base32 + "0lmmr1839qgbb3zxfa7jf5mzy17yjl1yirwlgzdhws4452gqhn67")))) + (build-system ruby-build-system) + (arguments `(#:test-target "spec")) + (home-page "https://yardoc.org/") + (synopsis "Ruby documentation tool") + (description "YARD is a documentation generation tool for the Ruby +programming language. It enables the user to generate consistent, usable +documentation that can be exported to a number of formats very easily, and +also supports extending for custom Ruby constructs such as custom class level +definitions.") + (license license:expat))) -- cgit v1.2.3 From 7ad8dd086c982e7cf971385d7fadd2a0d1feb209 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 16:07:25 +0200 Subject: gnu: Add ruby-prawn. * gnu/packages/ruby.scm (ruby-prawn): New variable. --- gnu/packages/ruby.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 7085adc1a0..b1da911d9d 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5557,3 +5557,38 @@ documentation that can be exported to a number of formats very easily, and also supports extending for custom Ruby constructs such as custom class level definitions.") (license license:expat))) + +(define-public ruby-prawn + (package + (name "ruby-prawn") + (version "2.2.2") + (source (origin + (method url-fetch) + (uri (rubygems-uri "prawn" version)) + (sha256 + (base32 + "1qdjf1v6sfl44g3rqxlg8k4jrzkwaxgvh2l4xws97a8f3xv4na4m")))) + (build-system ruby-build-system) + (arguments + ; No tests + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-before 'build 'fix-dependencies + (lambda _ + (substitute* "prawn.gemspec" + (("~> 0.7.0") "~> 0.7")) + #t))))) + (propagated-inputs + `(("ruby-pdf-core" ,ruby-pdf-core) + ("ruby-ttfunk" ,ruby-ttfunk))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-pdf-inspector" ,ruby-pdf-inspector) + ("ruby-rspec" ,ruby-rspec) + ("ruby-simplecov" ,ruby-simplecov) + ("ruby-yard" ,ruby-yard))) + (home-page "http://prawnpdf.org/api-docs/2.0/") + (synopsis "PDF generation for Ruby") + (description "Prawn is a pure Ruby PDF generation library.") + (license license:gpl3+))) -- cgit v1.2.3 From 197ca8ecd20e52bc5993dbc2f223274fcdb85e36 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 16:09:04 +0200 Subject: gnu: Add ruby-prawn-table. * gnu/packages/ruby.scm (ruby-prawn-table): New variable. --- gnu/packages/ruby.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index b1da911d9d..dcc79732a5 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5592,3 +5592,22 @@ definitions.") (synopsis "PDF generation for Ruby") (description "Prawn is a pure Ruby PDF generation library.") (license license:gpl3+))) + +(define-public ruby-prawn-table + (package + (name "ruby-prawn-table") + (version "0.2.2") + (source (origin + (method url-fetch) + (uri (rubygems-uri "prawn-table" version)) + (sha256 + (base32 + "1nxd6qmxqwl850icp18wjh5k0s3amxcajdrkjyzpfgq0kvilcv9k")))) + (build-system ruby-build-system) + (arguments `(#:tests? #f)); No rakefile + (propagated-inputs + `(("ruby-prawn" ,ruby-prawn))) + (home-page "https://github.com/prawnpdf/prawn-table") + (synopsis "Tables support for Prawn") + (description "This gem provides tables support for Prawn.") + (license license:gpl3+))) -- cgit v1.2.3 From 0312706955d9b790671af4c8553bf70cf07057d0 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 16:19:36 +0200 Subject: gnu: Add ruby-kramdown. * gnu/packages/ruby.scm (ruby-kramdown): New variable. --- gnu/packages/ruby.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index dcc79732a5..f7688aa51a 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5611,3 +5611,26 @@ definitions.") (synopsis "Tables support for Prawn") (description "This gem provides tables support for Prawn.") (license license:gpl3+))) + +(define-public ruby-kramdown + (package + (name "ruby-kramdown") + (version "1.17.0") + (source (origin + (method url-fetch) + (uri (rubygems-uri "kramdown" version)) + (sha256 + (base32 + "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq")))) + (build-system ruby-build-system) + (arguments `(#:tests? #f)); FIXME: some test failures + (native-inputs + `(("ruby-prawn" ,ruby-prawn) + ("ruby-prawn-table" ,ruby-prawn-table))) + (home-page "https://kramdown.gettalong.org/") + (synopsis "Markdown parsing and converting library") + (description "Kramdown is a library for parsing and converting a superset +of Markdown. It is completely written in Ruby, supports standard Markdown +(with some minor modifications) and various extensions that have been made +popular by the PHP @code{Markdown Extra} package and @code{Maruku}.") + (license license:expat))) -- cgit v1.2.3 From fa0063bcf437e375d32126d33fa5f1d1044e8b08 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 16:48:39 +0200 Subject: gnu: Add ruby-http-parser.rb. * gnu/packages/ruby.scm (ruby-http-parser.rb): New variable. --- gnu/packages/ruby.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index f7688aa51a..93772d9300 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5634,3 +5634,27 @@ of Markdown. It is completely written in Ruby, supports standard Markdown (with some minor modifications) and various extensions that have been made popular by the PHP @code{Markdown Extra} package and @code{Maruku}.") (license license:expat))) + +(define-public ruby-http-parser.rb + (package + (name "ruby-http-parser.rb") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "http_parser.rb" version)) + (sha256 + (base32 + "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi")))) + (build-system ruby-build-system) + (arguments + ;; No tests + `(#:tests? #f)) + (native-inputs + `(("ruby-rake-compiler" ,ruby-rake-compiler) + ("ruby-rspec" ,ruby-rspec))) + (home-page "https://github.com/tmm1/http_parser.rb") + (synopsis "HTTP parser un Ruby") + (description "This gem is a simple callback-based HTTP request/response +parser for writing http servers, clients and proxies.") + (license license:expat))) -- cgit v1.2.3 From 5e2f74bdb847db3b4dd429efcacd6dd4432a771b Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 16:55:00 +0200 Subject: gnu: Add ruby-em-websocket. * gnu/packages/ruby.scm (ruby-em-websocket): New variable. --- gnu/packages/ruby.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 93772d9300..024a99ab4c 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5658,3 +5658,30 @@ popular by the PHP @code{Markdown Extra} package and @code{Maruku}.") (description "This gem is a simple callback-based HTTP request/response parser for writing http servers, clients and proxies.") (license license:expat))) + +(define-public ruby-em-websocket + (package + (name "ruby-em-websocket") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "em-websocket" version)) + (sha256 + (base32 + "1bsw8vjz0z267j40nhbmrvfz7dvacq4p0pagvyp17jif6mj6v7n3")))) + (build-system ruby-build-system) + (arguments + ;; No tests + `(#:tests? #f)) + (propagated-inputs + `(("ruby-eventmachine" ,ruby-eventmachine) + ("ruby-http-parser.rb" ,ruby-http-parser.rb))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rspec" ,ruby-rspec))) + (home-page "https://github.com/igrigorik/em-websocket") + (synopsis "EventMachine based WebSocket server") + (description "Em-websocket is an EventMachine based WebSocket server +implementation.") + (license license:expat))) -- cgit v1.2.3 From 4ce0414bca13f609db27371a4f75c6e37111d10f Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 17:03:59 +0200 Subject: gnu: Add ruby-rouge. * gnu/packages/ruby.scm (ruby-rouge): New variable. --- gnu/packages/ruby.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 024a99ab4c..e605f3e6de 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5685,3 +5685,26 @@ parser for writing http servers, clients and proxies.") (description "Em-websocket is an EventMachine based WebSocket server implementation.") (license license:expat))) + +(define-public ruby-rouge + (package + (name "ruby-rouge") + (version "3.2.1") + (source (origin + (method url-fetch) + (uri (rubygems-uri "rouge" version)) + (sha256 + (base32 + "0h79gn2wmn1wix2d27lgiaimccyj8gvizrllyym500pir408x62f")))) + (build-system ruby-build-system) + (arguments `(#:tests? #f)); No rakefile + (home-page "http://rouge.jneen.net/") + (synopsis "Code highlighter") + (description "Rouge is a code highlighter written in Ruby. It supports more +than 100 languages and outputs HTML or ANSI 256-color text. Its HTML output +is compatible with stylesheets designed for pygments.") + (license (list + ;; rouge is licensed under expat + license:expat + ;; pygments is licensed under bsd-2 + license:bsd-2)))) -- cgit v1.2.3 From 2c5028bd97d50723b1a0ad1b2b5781487779b78b Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 17:04:59 +0200 Subject: gnu: Add ruby-rouge-2. * gnu/packages/ruby.scm (ruby-rouge-2): New variable. --- gnu/packages/ruby.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index e605f3e6de..9aabd4ff8f 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5708,3 +5708,14 @@ is compatible with stylesheets designed for pygments.") license:expat ;; pygments is licensed under bsd-2 license:bsd-2)))) + +(define-public ruby-rouge-2 + (package + (inherit ruby-rouge) + (version "2.2.1") + (source (origin + (method url-fetch) + (uri (rubygems-uri "rouge" version)) + (sha256 + (base32 + "02kpahk5nkc33yxnn75649kzxaz073wvazr2zyg491nndykgnvcs")))))) -- cgit v1.2.3 From 2e072e37aa0c5cf0fc612c9e4d5540cec6189b13 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 17:08:08 +0200 Subject: gnu: Add ruby-hashie. * gnu/packages/ruby.scm (ruby-hashie): New variable. --- gnu/packages/ruby.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 9aabd4ff8f..bfb98a0bff 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5719,3 +5719,23 @@ is compatible with stylesheets designed for pygments.") (sha256 (base32 "02kpahk5nkc33yxnn75649kzxaz073wvazr2zyg491nndykgnvcs")))))) + +(define-public ruby-hashie + (package + (name "ruby-hashie") + (version "3.6.0") + (source (origin + (method url-fetch) + (uri (rubygems-uri "hashie" version)) + (sha256 + (base32 + "13bdzfp25c8k51ayzxqkbzag3wj5gc1jd8h7d985nsq6pn57g5xh")))) + (build-system ruby-build-system) + (native-inputs + `(("bundler" ,bundler))) + (arguments `(#:tests? #f)); FIXME: Could not locate Gemfile or .bundle/ directory + (home-page "https://github.com/intridea/hashie") + (synopsis "Extensions to Ruby Hashes") + (description "Hashie is a collection of classes and mixins that make Ruby +hashes more powerful.") + (license license:expat))) -- cgit v1.2.3 From 73bfc125ef61980920cd01691032153deba4b98d Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 17:10:37 +0200 Subject: gnu: Add ruby-heredoc-unindent. * gnu/packages/ruby.scm (ruby-heredoc-unindent): New variable. --- gnu/packages/ruby.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index bfb98a0bff..34d883284d 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5739,3 +5739,29 @@ is compatible with stylesheets designed for pygments.") (description "Hashie is a collection of classes and mixins that make Ruby hashes more powerful.") (license license:expat))) + +(define-public ruby-heredoc-unindent + (package + (name "ruby-heredoc-unindent") + (version "1.2.0") + (source (origin + (method url-fetch) + (uri (rubygems-uri "heredoc_unindent" version)) + (sha256 + (base32 + "14ijr2fsjwhrkjkcaz81d5xnfa4vvgvcflrff83avqw9klm011yw")))) + (build-system ruby-build-system) + (native-inputs + `(("ruby-hoe" ,ruby-hoe))) + (home-page "https://github.com/adrianomitre/heredoc_unindent") + (synopsis "Heredoc indentation cleaner") + (description "This gem removes common margin from indented strings, such +as the ones produced by indented heredocs. In other words, it strips out +leading whitespace chars at the beggining of each line, but only as much as +the line with the smallest margin. + +It is acknowledged that many strings defined by heredocs are just code and +fact is that most parsers are insensitive to indentation. If, however, the +strings are to be used otherwise, be it for printing or testing, the extra +indentation will probably be an issue and hence this gem.") + (license license:expat))) -- cgit v1.2.3 From f8ae2ee528be1b9d92a61b6dc6b470821e645afd Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 17:12:19 +0200 Subject: gnu: Add ruby-safe-yaml. * gnu/packages/ruby.scm (ruby-safe-yaml): New variable. --- gnu/packages/ruby.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 34d883284d..3f0cfcfcfa 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5765,3 +5765,26 @@ fact is that most parsers are insensitive to indentation. If, however, the strings are to be used otherwise, be it for printing or testing, the extra indentation will probably be an issue and hence this gem.") (license license:expat))) + +(define-public ruby-safe-yaml + (package + (name "ruby-safe-yaml") + (version "1.0.4") + (source (origin + (method url-fetch) + (uri (rubygems-uri "safe_yaml" version)) + (sha256 + (base32 + "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094")))) + (build-system ruby-build-system) + (native-inputs + `(("ruby-rspec" ,ruby-rspec) + ("ruby-hashie" ,ruby-hashie) + ("ruby-heredoc-unindent" ,ruby-heredoc-unindent))) + (arguments `(#:test-target "spec" + #:tests? #f));; FIXME: one failure + (home-page "https://github.com/dtao/safe_yaml") + (synopsis "YAML parser") + (description "The SafeYAML gem provides an alternative implementation of +YAML.load suitable for accepting user input in Ruby applications.") + (license license:expat))) -- cgit v1.2.3 From f1ec4d761122f68a5fb42d5ddaf6a626b6f7837d Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 17:28:10 +0200 Subject: gnu: Add ruby-mercenary. * gnu/packages/ruby.scm (ruby-mercenary): New variable. --- gnu/packages/ruby.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 3f0cfcfcfa..4947e1b43b 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5788,3 +5788,23 @@ indentation will probably be an issue and hence this gem.") (description "The SafeYAML gem provides an alternative implementation of YAML.load suitable for accepting user input in Ruby applications.") (license license:expat))) + +(define-public ruby-mercenary + (package + (name "ruby-mercenary") + (version "0.3.6") + (source (origin + (method url-fetch) + (uri (rubygems-uri "mercenary" version)) + (sha256 + (base32 + "10la0xw82dh5mqab8bl0dk21zld63cqxb1g16fk8cb39ylc4n21a")))) + (build-system ruby-build-system) + (arguments `(#:test-target "spec")) + (native-inputs + `(("bundler" ,bundler))) + (home-page "https://github.com/jekyll/mercenary") + (synopsis "Command-line apps library in Ruby") + (description "Mercenary is a lightweight and flexible library for writing +command-line apps in Ruby.") + (license license:expat))) -- cgit v1.2.3 From a13d451e1855c6e5f1dc3e197d872bc46951e78e Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 17:30:06 +0200 Subject: gnu: Add ruby-liquid. * gnu/packages/ruby.scm (ruby-liquid): New variable. --- gnu/packages/ruby.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 4947e1b43b..7e4c3b4f13 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5808,3 +5808,21 @@ YAML.load suitable for accepting user input in Ruby applications.") (description "Mercenary is a lightweight and flexible library for writing command-line apps in Ruby.") (license license:expat))) + +(define-public ruby-liquid + (package + (name "ruby-liquid") + (version "4.0.0") + (source (origin + (method url-fetch) + (uri (rubygems-uri "liquid" version)) + (sha256 + (base32 + "17fa0jgwm9a935fyvzy8bysz7j5n1vf1x2wzqkdfd5k08dbw3x2y")))) + (build-system ruby-build-system) + (arguments `(#:tests? #f)); No rakefile + (home-page "https://shopify.github.io/liquid/") + (synopsis "Template language") + (description "Liquid is a template language written in Ruby. It is used +to load dynamic content on storefronts.") + (license license:expat))) -- cgit v1.2.3 From 49395112c43e62605a75dd02fcce688deb2d5f67 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 17:59:15 +0200 Subject: gnu: Add ruby-forwardable-extended. * gnu/packages/ruby.scm (ruby-forwardable-extended): New variable. --- gnu/packages/ruby.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 7e4c3b4f13..3395cc6aa2 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5826,3 +5826,21 @@ command-line apps in Ruby.") (description "Liquid is a template language written in Ruby. It is used to load dynamic content on storefronts.") (license license:expat))) + +(define-public ruby-forwardable-extended + (package + (name "ruby-forwardable-extended") + (version "2.6.0") + (source (origin + (method url-fetch) + (uri (rubygems-uri "forwardable-extended" version)) + (sha256 + (base32 + "15zcqfxfvsnprwm8agia85x64vjzr2w0xn9vxfnxzgcv8s699v0v")))) + (build-system ruby-build-system) + (arguments `(#:tests? #f)); Cyclic dependency on luna-rspec-formatters + (home-page "https://github.com/envygeeks/forwardable-extended") + (synopsis "Delegation to hashes and instance variables in Forwardable") + (description "Forwardable Extended provides more @code{Forwardable} +methods for your source as @code{Forwardable::Extended}.") + (license license:expat))) -- cgit v1.2.3 From 37296113799dfadc81a5606d5dace89b406403d8 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 18:04:43 +0200 Subject: gnu: Add ruby-pathutil. * gnu/packages/ruby.scm (ruby-pathutil): New variable. --- gnu/packages/ruby.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 3395cc6aa2..5d8a8873e4 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5844,3 +5844,28 @@ to load dynamic content on storefronts.") (description "Forwardable Extended provides more @code{Forwardable} methods for your source as @code{Forwardable::Extended}.") (license license:expat))) + +(define-public ruby-pathutil + (package + (name "ruby-pathutil") + (version "0.16.1") + (source (origin + (method url-fetch) + (uri (rubygems-uri "pathutil" version)) + (sha256 + (base32 + "0wc18ms1rzi44lpjychyw2a96jcmgxqdvy2949r4vvb5f4p0lgvz")))) + (build-system ruby-build-system) + (propagated-inputs + `(("ruby-forwardable-extended" ,ruby-forwardable-extended))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rspec" ,ruby-rspec))) + ;; Fails with: cannot load such file -- + ;; /tmp/guix-build-ruby-pathutil-0.16.0.drv-0/gem/benchmark/support/task + (arguments `(#:tests? #f)) + (home-page "https://github.com/envygeeks/pathutil") + (synopsis "Extended implementation of Pathname") + (description "Pathutil tries to be a faster pure Ruby implementation of +Pathname.") + (license license:expat))) -- cgit v1.2.3 From 49e1dde53fd0a2e3c1d636364c067de8dbb611d7 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 17:30:58 +0200 Subject: gnu: Add jekyll. * gnu/packages/ruby.scm (jekyll): New variable. --- gnu/packages/ruby.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 5d8a8873e4..70c071f921 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5869,3 +5869,42 @@ methods for your source as @code{Forwardable::Extended}.") (description "Pathutil tries to be a faster pure Ruby implementation of Pathname.") (license license:expat))) + +(define-public jekyll + (package + (name "jekyll") + (version "3.8.3") + (source (origin + (method url-fetch) + (uri (rubygems-uri "jekyll" version)) + (sha256 + (base32 + "1iw90wihk9dscgmppf5v6lysg3kjmnx50mjyl4gghkdb4spw97xk")))) + (build-system ruby-build-system) + (arguments + ;; No rakefile, but a test subdirectory + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-before 'build 'fix-i18n + (lambda _ + (substitute* ".gemspec" + (("~> 0.7") ">= 0.7")) + #t))))) + (propagated-inputs + `(("ruby-addressable" ,ruby-addressable) + ("ruby-colorator" ,ruby-colorator) + ("ruby-em-websocket" ,ruby-em-websocket) + ("ruby-i18n" ,ruby-i18n) + ("ruby-jekyll-sass-converter" ,ruby-jekyll-sass-converter) + ("ruby-jekyll-watch" ,ruby-jekyll-watch) + ("ruby-kramdown" ,ruby-kramdown) + ("ruby-liquid" ,ruby-liquid) + ("ruby-mercenary" ,ruby-mercenary) + ("ruby-pathutil" ,ruby-pathutil) + ("ruby-rouge" ,ruby-rouge-2) + ("ruby-safe-yaml" ,ruby-safe-yaml))) + (home-page "https://jekyllrb.com/") + (synopsis "Static site generator") + (description "Jekyll is a simple, blog aware, static site generator.") + (license license:expat))) -- cgit v1.2.3 From 37a0f47073e1788e8991567c4fce5d2acaa8ce67 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 17:33:20 +0200 Subject: gnu: Add ruby-jekyll-paginate-v2. * gnu/packages/ruby.scm (ruby-jekyll-paginate-v2): New variable. --- gnu/packages/ruby.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 70c071f921..616b86934d 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5908,3 +5908,22 @@ Pathname.") (synopsis "Static site generator") (description "Jekyll is a simple, blog aware, static site generator.") (license license:expat))) + +(define-public ruby-jekyll-paginate-v2 + (package + (name "ruby-jekyll-paginate-v2") + (version "2.0.0") + (source (origin + (method url-fetch) + (uri (rubygems-uri "jekyll-paginate-v2" version)) + (sha256 + (base32 + "154bfpyml6abxww9868hhyfvxasl8qhsc5zy2q30c7dxaj0igdib")))) + (build-system ruby-build-system) + (propagated-inputs + `(("jekyll" ,jekyll))) + (home-page "https://github.com/sverrirs/jekyll-paginate-v2") + (synopsis "Pagination Generator for Jekyll 3") + (description "The Pagination Generator forms the core of the pagination +logic in Jekyll. It calculates and generates the pagination pages.") + (license license:expat))) -- cgit v1.2.3 From a0a273c1eec438c80cf0c716987514e551b3b8f4 Mon Sep 17 00:00:00 2001 From: Manuel Graf Date: Fri, 31 Aug 2018 17:24:42 +0200 Subject: gnu: Add perftest. * gnu/packages/linux.scm (perftest): New variable. Signed-off-by: Leo Famulari --- gnu/packages/linux.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 63b3ece8e1..02d723316d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -29,6 +29,7 @@ ;;; Copyright © 2017 Dave Love ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2018 Brendan Tildesley +;;; Copyright © 2018 Manuel Graf ;;; ;;; This file is part of GNU Guix. ;;; @@ -3622,6 +3623,48 @@ The following service daemons are also provided: license:cc0 ; most files in ccan/ license:bsd-3)))) ; providers/hfi1verbs are dual GPL2/BSD-3 +(define-public perftest + (package + (name "perftest") + (version "4.2-0.8") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/linux-rdma/perftest/releases/download/V" + version "/perftest-" version ".g0e24e67.tar.gz")) + (sha256 + (base32 "1r3pxn7cx3grb8myb4q1b0pk447pc06cifd0v7ym13xw00372dlx")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-header-paths + (lambda _ + (substitute* '("src/raw_ethernet_fs_rate.c" + "src/raw_ethernet_resources.c" + "src/raw_ethernet_resources.h" + "src/raw_ethernet_send_burst_lat.c" + "src/raw_ethernet_send_bw.c" + "src/raw_ethernet_send_lat.c") + (("/usr/include/netinet/ip.h") "netinet/ip.h")) + #t))))) + (inputs `(("rdma-core" ,rdma-core))) + (home-page "https://github.com/linux-rdma/perftest/") + (synopsis "Open Fabrics Enterprise Distribution (OFED) Performance Tests") + (description "This is a collection of tests written over uverbs intended for +use as a performance micro-benchmark. The tests may be used for hardware or +software tuning as well as for functional testing. + +The collection contains a set of bandwidth and latency benchmark such as: +@enumerate +@item Send - @code{ib_send_bw} and @code{ib_send_lat} +@item RDMA Read - @code{ib_read_bw} and @code{ib_read_lat} +@item RDMA Write - @code{ib_write_bw} and @code{ib_wriet_lat} +@item RDMA Atomic - @code{ib_atomic_bw} and @code{ib_atomic_lat} +@item Native Ethernet (when working with MOFED2) - @code{raw_ethernet_bw}, @code{raw_ethernet_lat} +@end enumerate") + (license license:gpl2))) + (define-public rng-tools (package (name "rng-tools") -- cgit v1.2.3 From 3159ef7c99c646b78b04cedb1bd3525c301ef978 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sat, 1 Sep 2018 19:31:45 +0200 Subject: gnu: rust: Bootstrap (only) Rust 1.19.0 by mrustc. * gnu/packages/patches/rust-1.19-mrustc.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/rust.scm (rust-1.19)[source]: Add patch "rust-1.19-mrustc.patch". [arguments]<#:modules>: New field. <#:phases>[patch-cargo-tomls]: New phase. <#:phases>[build]: Modify. <#:phases>[install]: Modify. [native-inputs]: Replace rust-bootstrap by mrustc. (rust-1.23)[native-inputs]: New field. [arguments]<#:phases>: Delete phase "patch-cargo-tomls". --- gnu/local.mk | 1 + gnu/packages/patches/rust-1.19-mrustc.patch | 28 ++++++ gnu/packages/rust.scm | 127 +++++++++++++++++++++++++++- 3 files changed, 152 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/rust-1.19-mrustc.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 3b92a7ac0e..91de38c5a3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1124,6 +1124,7 @@ dist_patch_DATA = \ %D%/packages/patches/ruby-concurrent-test-arm.patch \ %D%/packages/patches/ruby-rack-ignore-failing-test.patch \ %D%/packages/patches/ruby-tzinfo-data-ignore-broken-test.patch\ + %D%/packages/patches/rust-1.19-mrustc.patch \ %D%/packages/patches/rust-bootstrap-stage0-test.patch \ %D%/packages/patches/rust-coresimd-doctest.patch \ %D%/packages/patches/rxvt-unicode-escape-sequences.patch \ diff --git a/gnu/packages/patches/rust-1.19-mrustc.patch b/gnu/packages/patches/rust-1.19-mrustc.patch new file mode 100644 index 0000000000..261162172e --- /dev/null +++ b/gnu/packages/patches/rust-1.19-mrustc.patch @@ -0,0 +1,28 @@ +See https://github.com/thepowersgang/mrustc/archive/v0.8.0.tar.gz + +--- rustc-1.19.0-src-orig/src/libcore/intrinsics.rs ++++ rustc-1.19.0-src/src/libcore/intrinsics.rs +@@ -678,5 +678,9 @@ + pub fn min_align_of_val(_: &T) -> usize; + ++ /// Obtain the length of a slice pointer ++ #[cfg(rust_compiler="mrustc")] ++ pub fn mrustc_slice_len(pointer: *const [T]) -> usize; ++ + /// Gets a static string slice containing the name of a type. + pub fn type_name() -> &'static str; + +--- rustc-1.19.0-src-orig/src/libcore/slice/mod.rs ++++ rustc-1.19.0-src/src/libcore/slice/mod.rs +@@ -413,6 +413,8 @@ + #[inline] + fn len(&self) -> usize { +- unsafe { +- mem::transmute::<&[T], Repr>(self).len +- } ++ #[cfg(not(rust_compiler="mrustc"))] ++ let rv = unsafe { mem::transmute::<&[T], Repr>(self).len }; ++ #[cfg(rust_compiler="mrustc")] ++ let rv = unsafe { ::intrinsics::mrustc_slice_len(self) }; ++ rv + } diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 0695f8c7d2..41195c0e10 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -171,10 +171,12 @@ in turn be used to build the final Rust.") (package (name "rust") (version "1.19.0") - (source (rust-source version "0l8c14qsf42rmkqy92ahij4vf356dbyspxcips1aswpvad81y8qm")) + (source (rust-source version "0l8c14qsf42rmkqy92ahij4vf356dbyspxcips1aswpvad81y8qm" + #:patches '("rust-1.19-mrustc.patch"))) (outputs '("out" "cargo")) (arguments `(#:imported-modules ,%cargo-build-system-modules ;for `generate-checksums' + #:modules ((guix build utils) (ice-9 match) (guix build gnu-build-system)) #:phases (modify-phases %standard-phases (add-after 'unpack 'set-env @@ -187,6 +189,24 @@ in turn be used to build the final Rust.") ;; guix llvm-3.9.1 package installs only shared libraries (setenv "LLVM_LINK_SHARED" "1") #t)) + (add-after 'unpack 'patch-cargo-tomls + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "src/librustc_errors/Cargo.toml" + (("[[]dependencies[]]") " +[dependencies] +term = \"0.4.4\" +")) + (substitute* "src/librustc/Cargo.toml" + (("[[]dependencies[]]") " +[dependencies] +getopts = { path = \"../libgetopts\" } +")) + (substitute* "src/librustdoc/Cargo.toml" + (("[[]dependencies[]]") " +[dependencies] +test = { path = \"../libtest\" } +")) + #t)) (add-after 'unpack 'patch-tests (lambda* (#:key inputs #:allow-other-keys) (let ((bash (assoc-ref inputs "bash"))) @@ -243,12 +263,97 @@ in turn be used to build the final Rust.") (generate-checksums dir ,%cargo-reference-project-file))) (find-files "src/vendor" ".cargo-checksum.json")) #t)) + ;; This phase is overridden by newer versions. (replace 'configure (const #t)) + ;; This phase is overridden by newer versions. + (replace 'build + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((rustc-bootstrap (assoc-ref inputs "rustc-bootstrap"))) + (setenv "CFG_COMPILER_HOST_TRIPLE" + ,(nix-system->gnu-triplet (%current-system))) + (setenv "CFG_RELEASE" "") + (setenv "CFG_RELEASE_CHANNEL" "stable") + (setenv "CFG_LIBDIR_RELATIVE" "lib") + (setenv "CFG_VERSION" "1.19.0-stable-mrustc") + ; bad: (setenv "CFG_PREFIX" "mrustc") ; FIXME output path. + (mkdir-p "output") + (invoke (string-append rustc-bootstrap "/tools/bin/minicargo") + "src/rustc" "--vendor-dir" "src/vendor" + "--output-dir" "output/rustc-build" + "-L" (string-append rustc-bootstrap "/lib/mrust") + "-j" "1") + (install-file "output/rustc-build/rustc" "output") ; FIXME: Remove? + (setenv "CFG_COMPILER_HOST_TRIPLE" #f) + (setenv "CFG_RELEASE" #f) + (setenv "CFG_RELEASE_CHANNEL" #f) + (setenv "CFG_VERSION" #f) + (setenv "CFG_PREFIX" #f) + (setenv "CFG_LIBDIR_RELATIVE" #f) + (invoke (string-append rustc-bootstrap "/tools/bin/minicargo") + "src/tools/cargo" "--vendor-dir" "src/vendor" + "--output-dir" "output/cargo-build" + "-L" "output/" + "-L" (string-append rustc-bootstrap "/lib/mrust") + "-j" "1") + ;; Now use the newly-built rustc to build the libraries. + ;; One day that could be replaced by: + ;; (invoke "output/cargo-build/cargo" "build" + ;; "--manifest-path" "src/bootstrap/Cargo.toml" + ;; "--verbose") ; "--locked" "--frozen" + ;; but right now, Cargo has problems with libstd's circular + ;; dependencies. + (mkdir-p "output/target-libs") + (for-each ((@ (ice-9 match) match-lambda) + ((name . flags) + (write name) + (newline) + (apply invoke + "output/rustc-build/rustc" + "-C" (string-append "linker=" + (getenv "CC")) + "-L" "output/target-libs" + (string-append "src/" name "/lib.rs") + "-o" + (string-append "output/target-libs/" + (car (string-split name #\/)) + ".rlib") + flags))) + '(("libcore") + ("libstd_unicode") + ("liballoc") + ("libcollections") + ("librand") + ("liblibc/src" "--cfg" "stdbuild") + ("libunwind" "-l" "gcc_s") + ("libcompiler_builtins") + ("liballoc_system") + ("libpanic_unwind") + ;; Uses "cc" to link. + ("libstd" "-l" "dl" "-l" "rt" "-l" "pthread") + ("libarena"))) + #t))) + ;; This phase is overridden by newer versions. (replace 'check (const #t)) + ;; This phase is overridden by newer versions. (replace 'install - (const #t))))) + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (target-system ,(or (%current-target-system) + (nix-system->gnu-triplet + (%current-system)))) + (out-libs (string-append out "/lib/rustlib/" + target-system "/lib"))) + ;(setenv "CFG_PREFIX" out) + (mkdir-p out-libs) + (copy-recursively "output/target-libs" out-libs) + (install-file "output/rustc-build/rustc" + (string-append out "/bin")) + (install-file "output/cargo-build/cargo" + (string-append (assoc-ref outputs "cargo") + "/bin"))) + #t))))) (build-system gnu-build-system) (native-inputs `(("bison" ,bison) ; For the tests @@ -258,8 +363,8 @@ in turn be used to build the final Rust.") ("git" ,git) ("procps" ,procps) ; For the tests ("python-2" ,python-2) - ("rustc-bootstrap" ,rust-bootstrap) - ("cargo-bootstrap" ,rust-bootstrap "cargo") + ("rustc-bootstrap" ,mrustc) + ("cargo-bootstrap" ,mrustc "cargo") ("pkg-config" ,pkg-config) ; For "cargo" ("which" ,which))) (inputs @@ -400,6 +505,18 @@ safety and thread safety guarantees.") (version "1.23.0") (source (rust-source version "14fb8vhjzsxlbi6yrn1r6fl5dlbdd1m92dn5zj5gmzfwf4w9ar3l")) (outputs '("out" "doc" "cargo")) + (native-inputs + `(("bison" ,bison) ; For the tests + ("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" ,rust-bootstrap) + ("cargo-bootstrap" ,rust-bootstrap "cargo") + ("pkg-config" ,pkg-config) ; For "cargo" + ("which" ,which))) (arguments (substitute-keyword-arguments (package-arguments rust-1.19) ((#:phases phases) @@ -410,6 +527,8 @@ safety and thread safety guarantees.") (substitute* "src/binaryen/CMakeLists.txt" (("ADD_COMPILE_FLAG\\(\\\"-march=native\\\"\\)") "")) #t)) + ;; TODO: Revisit this and find out whether that's needed after all. + (delete 'patch-cargo-tomls) (add-after 'patch-tests 'patch-cargo-tests (lambda _ (substitute* "src/tools/cargo/tests/build.rs" -- cgit v1.2.3 From 24d298b459c170bfc652489464f1e2935e804117 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sun, 2 Sep 2018 00:22:53 +0200 Subject: gnu: rust: Move rust-1.19 down. --- gnu/packages/rust.scm | 208 +++++++++++++++++++++++++------------------------- 1 file changed, 104 insertions(+), 104 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 41195c0e10..631dcfd67c 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -167,6 +167,110 @@ in turn be used to build the final Rust.") (snippet '(begin (delete-file-recursively "src/llvm") #t)) (patches (map search-patch patches)))) +(define* (rust-bootstrapped-package base-rust version checksum + #:key (patches '())) + "Bootstrap rust VERSION with source checksum CHECKSUM patched with PATCHES using BASE-RUST." + (package + (inherit base-rust) + (version version) + (source + (rust-source version checksum #:patches patches)) + (native-inputs + (alist-replace "cargo-bootstrap" (list base-rust "cargo") + (alist-replace "rustc-bootstrap" (list base-rust) + (package-native-inputs base-rust)))))) + +(define-public mrustc + (let ((rustc-version "1.19.0")) + (package + (name "mrustc") + (version "0.8.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/thepowersgang/mrustc.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0a7v8ccyzp1sdkwni8h1698hxpfz2sxhcpx42n6l2pbm0rbjp08i")))) + (outputs '("out" "cargo")) + (build-system gnu-build-system) + (inputs + `(("llvm" ,llvm-3.9.1))) + (native-inputs + `(("bison" ,bison) + ("flex" ,flex) + ;; Required for the libstd sources. + ("rustc" + ,(rust-source "1.19.0" "0l8c14qsf42rmkqy92ahij4vf356dbyspxcips1aswpvad81y8qm")))) + (arguments + `(#:tests? #f + #:make-flags (list (string-append "LLVM_CONFIG=" + (assoc-ref %build-inputs "llvm") + "/bin/llvm-config")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-date + (lambda _ + (substitute* "Makefile" + (("shell date") "shell date -d @1")) + #t)) + (add-after 'patch-date 'unpack-target-compiler + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "minicargo.mk" + ;; Don't try to build LLVM. + (("^[$][(]LLVM_CONFIG[)]:") "xxx:") + ;; Build for the correct target architecture. + (("^RUSTC_TARGET := x86_64-unknown-linux-gnu") + (string-append "RUSTC_TARGET := " + ,(or (%current-target-system) + (nix-system->gnu-triplet-for-rust))))) + (invoke "tar" "xf" (assoc-ref inputs "rustc")) + (chdir "rustc-1.19.0-src") + (invoke "patch" "-p0" "../rust_src.patch") + (chdir "..") + #t)) + (replace 'configure + (lambda* (#:key inputs #:allow-other-keys) + (setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc")) + #t)) + (add-after 'build 'build-minicargo + (lambda _ + (for-each (lambda (target) + (invoke "make" "-f" "minicargo.mk" target)) + '("output/libstd.hir" "output/libpanic_unwind.hir" + "output/libproc_macro.hir" "output/libtest.hir")) + ;; Technically the above already does it - but we want to be clear. + (invoke "make" "-C" "tools/minicargo"))) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (tools-bin (string-append out "/tools/bin")) + (cargo-out (assoc-ref outputs "cargo")) + (cargo-bin (string-append cargo-out "/bin")) + (lib (string-append out "/lib")) + (lib/rust (string-append lib "/mrust")) + (gcc (assoc-ref inputs "gcc"))) + ;; These files are not reproducible. + (for-each delete-file (find-files "output" "\\.txt$")) + (mkdir-p lib) + (copy-recursively "output" lib/rust) + (mkdir-p bin) + (mkdir-p tools-bin) + (install-file "bin/mrustc" bin) + ;; minicargo uses relative paths to resolve mrustc. + (install-file "tools/bin/minicargo" tools-bin) + (install-file "tools/bin/minicargo" cargo-bin) + #t)))))) + (synopsis "Compiler for the Rust progamming language") + (description "Rust is a systems programming language that provides memory +safety and thread safety guarantees.") + (home-page "https://github.com/thepowersgang/mrustc") + ;; Dual licensed. + (license (list license:asl2.0 license:expat))))) + (define rust-1.19 (package (name "rust") @@ -394,110 +498,6 @@ safety and thread safety guarantees.") ;; Dual licensed. (license (list license:asl2.0 license:expat)))) -(define* (rust-bootstrapped-package base-rust version checksum - #:key (patches '())) - "Bootstrap rust VERSION with source checksum CHECKSUM patched with PATCHES using BASE-RUST." - (package - (inherit base-rust) - (version version) - (source - (rust-source version checksum #:patches patches)) - (native-inputs - (alist-replace "cargo-bootstrap" (list base-rust "cargo") - (alist-replace "rustc-bootstrap" (list base-rust) - (package-native-inputs base-rust)))))) - -(define-public mrustc - (let ((rustc-version "1.19.0")) - (package - (name "mrustc") - (version "0.8.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/thepowersgang/mrustc.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0a7v8ccyzp1sdkwni8h1698hxpfz2sxhcpx42n6l2pbm0rbjp08i")))) - (outputs '("out" "cargo")) - (build-system gnu-build-system) - (inputs - `(("llvm" ,llvm-3.9.1))) - (native-inputs - `(("bison" ,bison) - ("flex" ,flex) - ;; Required for the libstd sources. - ("rustc" - ,(rust-source "1.19.0" "0l8c14qsf42rmkqy92ahij4vf356dbyspxcips1aswpvad81y8qm")))) - (arguments - `(#:tests? #f - #:make-flags (list (string-append "LLVM_CONFIG=" - (assoc-ref %build-inputs "llvm") - "/bin/llvm-config")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-date - (lambda _ - (substitute* "Makefile" - (("shell date") "shell date -d @1")) - #t)) - (add-after 'patch-date 'unpack-target-compiler - (lambda* (#:key inputs outputs #:allow-other-keys) - (substitute* "minicargo.mk" - ;; Don't try to build LLVM. - (("^[$][(]LLVM_CONFIG[)]:") "xxx:") - ;; Build for the correct target architecture. - (("^RUSTC_TARGET := x86_64-unknown-linux-gnu") - (string-append "RUSTC_TARGET := " - ,(or (%current-target-system) - (nix-system->gnu-triplet-for-rust))))) - (invoke "tar" "xf" (assoc-ref inputs "rustc")) - (chdir "rustc-1.19.0-src") - (invoke "patch" "-p0" "../rust_src.patch") - (chdir "..") - #t)) - (replace 'configure - (lambda* (#:key inputs #:allow-other-keys) - (setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc")) - #t)) - (add-after 'build 'build-minicargo - (lambda _ - (for-each (lambda (target) - (invoke "make" "-f" "minicargo.mk" target)) - '("output/libstd.hir" "output/libpanic_unwind.hir" - "output/libproc_macro.hir" "output/libtest.hir")) - ;; Technically the above already does it - but we want to be clear. - (invoke "make" "-C" "tools/minicargo"))) - (replace 'install - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (tools-bin (string-append out "/tools/bin")) - (cargo-out (assoc-ref outputs "cargo")) - (cargo-bin (string-append cargo-out "/bin")) - (lib (string-append out "/lib")) - (lib/rust (string-append lib "/mrust")) - (gcc (assoc-ref inputs "gcc"))) - ;; These files are not reproducible. - (for-each delete-file (find-files "output" "\\.txt$")) - (mkdir-p lib) - (copy-recursively "output" lib/rust) - (mkdir-p bin) - (mkdir-p tools-bin) - (install-file "bin/mrustc" bin) - ;; minicargo uses relative paths to resolve mrustc. - (install-file "tools/bin/minicargo" tools-bin) - (install-file "tools/bin/minicargo" cargo-bin) - #t)))))) - (synopsis "Compiler for the Rust progamming language") - (description "Rust is a systems programming language that provides memory -safety and thread safety guarantees.") - (home-page "https://github.com/thepowersgang/mrustc") - ;; Dual licensed. - (license (list license:asl2.0 license:expat))))) - (define-public rust-1.23 (package (inherit rust-1.19) -- cgit v1.2.3 From 9bf98520f2c44e291c7d335b8f3a834642361133 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sun, 2 Sep 2018 12:44:20 +0800 Subject: gnu: rosegarden: Update to 18.06. * gnu/packages/music.scm (rosegarden): Update to 18.06. [home-page]: Use HTTPS. --- gnu/packages/music.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index edffcfce96..ba21e5da2b 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3685,7 +3685,7 @@ specification and header.") (define-public rosegarden (package (name "rosegarden") - (version "17.04") + (version "18.06") (source (origin (method url-fetch) (uri (string-append @@ -3693,7 +3693,7 @@ specification and header.") version "/rosegarden-" version ".tar.bz2")) (sha256 (base32 - "1khfcj22asdhjh0jvhkqsz200wgmigkhsrcz09ffia5hqm0n32lq")))) + "04qc80sqb2ji42pq3mayhvqqn39hlxzymsywpbpzfpchr19chxx7")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-DUSE_QT5=1") ; "-DCMAKE_BUILD_TYPE=Release" @@ -3747,6 +3747,7 @@ specification and header.") ;; Tests create files in $HOME/.local/share/rosegarden . (mkdir-p "/tmp/foo") (setenv "HOME" "/tmp/foo") + (setenv "XDG_RUNTIME_DIR" "/tmp/foo") #t))))) (inputs `(("alsa-lib" ,alsa-lib) @@ -3773,7 +3774,7 @@ sequencer") (description "Rosegarden is a music composition and editing environment based around a MIDI sequencer that features a rich understanding of music notation and includes basic support for digital audio.") - (home-page "http://www.rosegardenmusic.com/") + (home-page "https://www.rosegardenmusic.com/") (license license:gpl2))) (define-public patchmatrix -- cgit v1.2.3 From ab2e38e206049ffd377a0a9d7890d8216e90816f Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Sun, 2 Sep 2018 08:49:39 +0200 Subject: gnu: wine-staging-patchset-data: Update to 3.15. * gnu/packages/wine.scm (wine-staging-patchset-data): Update to 3.15. --- gnu/packages/wine.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 9c1257b2a1..c50dd26f85 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -225,7 +225,7 @@ integrate Windows applications into your desktop.") (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") - (version "3.14") + (version "3.15") (source (origin (method git-fetch) @@ -235,7 +235,7 @@ integrate Windows applications into your desktop.") (file-name (git-file-name name version)) (sha256 (base32 - "0h6gck0p92hin0m13q1hnlfnqs4vy474w66ppinvqms2zn3vibgi")))) + "1rgbx4qnxaarkq5n8nvj57q0rhxcqbwm5897ws962fgxh6zymg9n")))) (build-system trivial-build-system) (native-inputs `(("bash" ,bash) -- cgit v1.2.3 From 87284c6b48981bdf5976dba127c688f43579a24b Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Sun, 2 Sep 2018 08:51:06 +0200 Subject: gnu: wine-staging: Update to 3.15. * gnu/packages/wine.scm (wine-staging): Update to 3.15. --- gnu/packages/wine.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index c50dd26f85..b818a3ccb5 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -281,7 +281,7 @@ integrate Windows applications into your desktop.") (file-name (string-append name "-" version ".tar.xz")) (sha256 (base32 - "01dhn3a6k3dwnrbz4bxvszhh5sxwy6s89y459g805hjmq8s6d2a7")))) + "07mmd8r70ciqrxzdg2m2mg34kcnb43dk9nw1ljm8jbcznsawv8ic")))) (inputs `(("autoconf" ,autoconf) ; for autoreconf ("gtk+" ,gtk+) ("libva" ,libva) -- cgit v1.2.3 From fe634eaf93ba40862acdf62d7f197c6f19f0651c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 27 Aug 2018 15:38:59 +0200 Subject: Add (guix describe) and use it to initialize '%package-search-path'. * guix/describe.scm: New file. * Makefile.am (MODULES): Add it. * gnu/packages.scm (%default-package-module-path): New variable. (%package-module-path): Honor 'package-path-entries'. * build-aux/update-NEWS.scm (main): Use %DEFAULT-PACKAGE-MODULE-PATH instead of (last (%package-module-path)). --- gnu/packages.scm | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages.scm b/gnu/packages.scm index 7b954769e9..532297239d 100644 --- a/gnu/packages.scm +++ b/gnu/packages.scm @@ -30,6 +30,7 @@ #:select ((package-name->name+version . hyphen-separated-name->name+version))) #:autoload (guix profiles) (packages->manifest) + #:use-module (guix describe) #:use-module (ice-9 vlist) #:use-module (ice-9 match) #:use-module (srfi srfi-1) @@ -46,6 +47,7 @@ %auxiliary-files-path %bootstrap-binaries-path %package-module-path + %default-package-module-path fold-packages @@ -130,22 +132,31 @@ for system '~a'") ("gnu/packages.scm" gnu/) ("guix.scm")))) +(define %default-package-module-path + ;; Default search path for package modules. + `((,%distro-root-directory . "gnu/packages"))) + (define %package-module-path ;; Search path for package modules. Each item must be either a directory ;; name or a pair whose car is a directory and whose cdr is a sub-directory ;; to narrow the search. (let* ((not-colon (char-set-complement (char-set #\:))) (environment (string-tokenize (or (getenv "GUIX_PACKAGE_PATH") "") - not-colon))) - ;; Automatically add items from $GUIX_PACKAGE_PATH to Guile's search path. - (for-each (lambda (directory) - (set! %load-path (cons directory %load-path)) - (set! %load-compiled-path - (cons directory %load-compiled-path))) - environment) + not-colon)) + (channels (package-path-entries))) + ;; Automatically add channels and items from $GUIX_PACKAGE_PATH to Guile's + ;; search path. For historical reasons, $GUIX_PACKAGE_PATH goes to the + ;; front; channels go to the back so that they don't override Guix' own + ;; modules. + (set! %load-path + (append environment %load-path channels)) + (set! %load-compiled-path + (append environment %load-compiled-path channels)) (make-parameter - (append environment `((,%distro-root-directory . "gnu/packages")))))) + (append environment + %default-package-module-path + channels)))) (define %patch-path ;; Define it after '%package-module-path' so that '%load-path' contains user -- cgit v1.2.3 From 351b6463af81b43840f7725ea6e174dc6499c1d4 Mon Sep 17 00:00:00 2001 From: Konrad Hinsen Date: Tue, 28 Aug 2018 15:00:43 +0200 Subject: gnu: emacs-elisp-refs: Update to 1.3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs.scm (emacs-elisp-refs): Update to 1.3. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index a1ce64ffaa..d8a5c54791 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -9003,7 +9003,7 @@ continue.") (define-public emacs-elisp-refs (package (name "emacs-elisp-refs") - (version "1.2") + (version "1.3") (source (origin (method url-fetch) @@ -9012,14 +9012,15 @@ continue.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0fj6wphwrvbslw46w7wgdk3b4bfr312ygj3lbgr9qw63lpqw26nl")))) + "02nzcn3v14n7mp7q32j5r4wdlpsw3zixzh6cf0cdyarfir6dly3p")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash) ("emacs-f" ,emacs-f) ("emacs-list-utils" ,emacs-list-utils) ("emacs-loop" ,emacs-loop) - ("emacs-s" ,emacs-s))) + ("emacs-s" ,emacs-s) + ("emacs-shut-up" ,emacs-shut-up))) (home-page "https://github.com/Wilfred/elisp-refs") (synopsis "Find callers of elisp functions or macros") (description "Find references to functions, macros or variables. Unlike a -- cgit v1.2.3 From b21a55a9f218c32cf9df561ad0e8d10d1b596cf0 Mon Sep 17 00:00:00 2001 From: Konrad Hinsen Date: Tue, 28 Aug 2018 15:01:32 +0200 Subject: gnu: emacs-helpful: Update to 0.13. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs.scm (emacs-helpful): Update to 0.13. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index d8a5c54791..2b8796f72e 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -9660,7 +9660,7 @@ downloading manager for Emacs.") (define-public emacs-helpful (package (name "emacs-helpful") - (version "0.1") + (version "0.13") (source (origin (method url-fetch) (uri (string-append @@ -9669,7 +9669,7 @@ downloading manager for Emacs.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "16dx566qzrjj0bf43lnw7h1qlvgs94brqplamw8kppp2ylr72qs9")))) + "11kj04y1fa3vnw2991cyqf6adz6bb3hlrdkvypjnmpb0s64q64b6")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-elisp-refs" ,emacs-elisp-refs))) -- cgit v1.2.3 From 2bd6ed9e4c32928312eee9cd71137d5adf09f955 Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Sun, 2 Sep 2018 07:47:05 +0800 Subject: gnu: haskell-mode: Fix test failure. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . Thanks to Jack Hill for exploring different solutions at . * gnu/packages/patches/haskell-mode-unused-variables.patch, gnu/packages/patches/haskell-mode-make-check.patch: New files. * gnu/local.mk (dist_patch_DATA): Add them. * gnu/packages/emacs.scm (haskell-mode)[source]: Use them. [arguments]: Adjust 'pre-build' phase to embed file name. Co-authored-by: Ludovic Courtès --- gnu/local.mk | 2 + gnu/packages/emacs.scm | 17 +++++---- gnu/packages/patches/haskell-mode-make-check.patch | 35 +++++++++++++++++ .../patches/haskell-mode-unused-variables.patch | 44 ++++++++++++++++++++++ 4 files changed, 91 insertions(+), 7 deletions(-) create mode 100644 gnu/packages/patches/haskell-mode-make-check.patch create mode 100644 gnu/packages/patches/haskell-mode-unused-variables.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 91de38c5a3..d929ec0da8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -791,6 +791,8 @@ dist_patch_DATA = \ %D%/packages/patches/gtkglext-disable-disable-deprecated.patch \ %D%/packages/patches/gzdoom-search-in-installed-share.patch \ %D%/packages/patches/handbrake-pkg-config-path.patch \ + %D%/packages/patches/haskell-mode-unused-variables.patch \ + %D%/packages/patches/haskell-mode-make-check.patch \ %D%/packages/patches/hdf4-architectures.patch \ %D%/packages/patches/hdf4-reproducibility.patch \ %D%/packages/patches/hdf4-shared-fortran.patch \ diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 2b8796f72e..08554280c7 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -646,7 +646,11 @@ only a handful of functions that are not resource-specific.") "https://github.com/haskell/haskell-mode/archive/v" version ".tar.gz")) (sha256 - (base32 "0g6lcjw7lcgavv3yrd8xjcyqgfyjl787y32r1z14amw2f009m78h")))) + (base32 "0g6lcjw7lcgavv3yrd8xjcyqgfyjl787y32r1z14amw2f009m78h")) + (patches + (search-patches ; backport test failure fixes + "haskell-mode-unused-variables.patch" + "haskell-mode-make-check.patch")))) (inputs `(("emacs-el-search" ,emacs-el-search) ; for tests ("emacs-stream" ,emacs-stream))) ; for tests @@ -686,12 +690,11 @@ only a handful of functions that are not resource-specific.") (_ "")) inputs))) (substitute* (find-files "." "\\.el") (("/bin/sh") sh)) - (substitute* "tests/haskell-code-conventions.el" - ;; Function name recently changed in "emacs-el-search". - (("el-search--search-pattern") "el-search-forward") - ;; Don't contact home. - (("\\(when \\(>= emacs-major-version 25\\)") - "(require 'el-search) (when nil")) + ;; embed filename to fix test failure + (let ((file "tests/haskell-cabal-tests.el")) + (substitute* file + (("\\(buffer-file-name\\)") + (format #f "(or (buffer-file-name) ~s)" file)))) #t))) (replace 'install diff --git a/gnu/packages/patches/haskell-mode-make-check.patch b/gnu/packages/patches/haskell-mode-make-check.patch new file mode 100644 index 0000000000..a4d4d525f2 --- /dev/null +++ b/gnu/packages/patches/haskell-mode-make-check.patch @@ -0,0 +1,35 @@ +Copied from upstream repository. +Hunk #2 is removed since it cannot be applied and it is not needed. + +From 7cead7137bf54851c1b7df5a3854351296d21276 Mon Sep 17 00:00:00 2001 +From: Vasantha Ganesh K +Date: Thu, 22 Jun 2017 23:38:40 +0530 +Subject: [PATCH] removed `check-conventions' from make + +--- + Makefile | 7 +- + tests/haskell-code-conventions.el | 165 ------------------------------ + 2 files changed, 1 insertion(+), 171 deletions(-) + delete mode 100644 tests/haskell-code-conventions.el + +diff --git a/Makefile b/Makefile +index b2c89d6..aa907c5 100644 +--- a/Makefile ++++ b/Makefile +@@ -79,12 +79,7 @@ build-$(EMACS_VERSION)/build-flag : build-$(EMACS_VERSION) $(patsubst %.el,build + check-%: tests/%-tests.el + $(BATCH) -l "$<" -f ert-run-tests-batch-and-exit; + +-check: compile $(AUTOLOADS) check-ert check-conventions +- +-check-conventions : +- $(BATCH) -l tests/haskell-code-conventions.el \ +- -f haskell-check-conventions-batch-and-exit +- @echo "conventions are okay" ++check: compile $(AUTOLOADS) check-ert + + check-ert: $(ELCHECKS) + $(BATCH) --eval "(when (= emacs-major-version 24) \ +-- +2.18.0 + diff --git a/gnu/packages/patches/haskell-mode-unused-variables.patch b/gnu/packages/patches/haskell-mode-unused-variables.patch new file mode 100644 index 0000000000..b175fae28c --- /dev/null +++ b/gnu/packages/patches/haskell-mode-unused-variables.patch @@ -0,0 +1,44 @@ +Copied verbatim from upstream repository. + +From cee22450ee30e79952f594796721dc6b17798ee6 Mon Sep 17 00:00:00 2001 +From: Sascha Wilde +Date: Fri, 23 Sep 2016 15:35:59 +0200 +Subject: [PATCH] Removed unused lexical variables. + +--- + haskell-lexeme.el | 3 +-- + haskell-process.el | 4 +--- + 2 files changed, 2 insertions(+), 5 deletions(-) + +diff --git a/haskell-lexeme.el b/haskell-lexeme.el +index 4256a79..b832560 100644 +--- a/haskell-lexeme.el ++++ b/haskell-lexeme.el +@@ -138,8 +138,7 @@ When match is successful, match-data will contain: + (match-text 2) - whole qualified identifier + (match-text 3) - unqualified part of identifier + (match-text 4) - closing backtick" +- (let ((begin (point)) +- (match-data-old (match-data)) ++ (let ((match-data-old (match-data)) + first-backtick-start + last-backtick-start + qid-start +diff --git a/haskell-process.el b/haskell-process.el +index b4efba2..4f3f859 100644 +--- a/haskell-process.el ++++ b/haskell-process.el +@@ -160,9 +160,7 @@ HPTYPE is the result of calling `'haskell-process-type`' function." + (defun haskell-process-log (msg) + "Effective append MSG to the process log (if enabled)." + (when haskell-process-log +- (let* ((append-to (get-buffer-create "*haskell-process-log*")) +- (windows (get-buffer-window-list append-to t t)) +- move-point-in-windows) ++ (let* ((append-to (get-buffer-create "*haskell-process-log*"))) + (with-current-buffer append-to + ;; point should follow insertion so that it stays at the end + ;; of the buffer +-- +2.18.0 + -- cgit v1.2.3 From 391097782311c82c04b171db7373a0bbfc1d8653 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sun, 2 Sep 2018 19:14:37 +0300 Subject: gnu: monitoring.scm: Fix copyright line. This is a follow-up to ead46692ec8a17ed9cf668131343d7cf1b3725e5. --- gnu/packages/monitoring.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index a59e51a5e3..12d736a76a 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2018 Sou Bunnbu ;;; Copyright © 2017, 2018 Ricardo Wurmus ;;; Copyright © 2018 Tobias Geerinckx-Rice -;;; Copyright © 2018 Gábor Boskovits w +;;; Copyright © 2018 Gábor Boskovits ;;; Copyright © 2018 Oleg Pykhalov ;;; ;;; This file is part of GNU Guix. -- cgit v1.2.3 From 647465ace9fdb474c924585c18e4056fe12a6052 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 2 Sep 2018 16:56:05 +0300 Subject: gnu: jellyfish: Update to 2.2.10. * gnu/packages/bioinformatics.scm (jellyfish): Update to 2.2.10. [supported-systems]: Add aarch64-linux, mips64el-linux. --- gnu/packages/bioinformatics.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 22a00894c2..f60fc4c84c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -3602,7 +3602,7 @@ experiments and provide highly stable thresholds based on reproducibility.") (define-public jellyfish (package (name "jellyfish") - (version "2.2.7") + (version "2.2.10") (source (origin (method url-fetch) (uri (string-append "https://github.com/gmarcais/Jellyfish/" @@ -3610,7 +3610,7 @@ experiments and provide highly stable thresholds based on reproducibility.") "/jellyfish-" version ".tar.gz")) (sha256 (base32 - "1a1iwq9pq54k2m9ypvwl5s0bqfl64gwh9dx5af9i382ajas2016q")))) + "1k4pc3fvv6w1km2yph4m5sd78fbxp21d6xyzgmy0gjihzc6mb249")))) (build-system gnu-build-system) (outputs '("out" ;for library "ruby" ;for Ruby bindings @@ -3647,8 +3647,8 @@ DNA sequences. It outputs its k-mer counts in a binary format, which can be translated into a human-readable text format using the @code{jellyfish dump} command, or queried for specific k-mers with @code{jellyfish query}.") (home-page "http://www.genome.umd.edu/jellyfish.html") - ;; From their website: JELLYFISH runs on 64-bit Intel-compatible processors - (supported-systems '("x86_64-linux")) + ;; JELLYFISH seems to be 64-bit only. + (supported-systems '("x86_64-linux" "aarch64-linux" "mips64el-linux")) ;; The combined work is published under the GPLv3 or later. Individual ;; files such as lib/jsoncpp.cpp are released under the Expat license. (license (list license:gpl3+ license:expat)))) -- cgit v1.2.3 From aa613d71ece1ae56431b788c9aba55fdacd7a22f Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 3 Sep 2018 08:18:50 +0200 Subject: gnu: openrct2: Update to 0.2.1. * gnu/packages/games.scm (openrct2-objects): Update to 1.0.6. * gnu/packages/games.scm (openrct2): Update to 0.2.1. --- gnu/packages/games.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 3c5063f69b..728f763806 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2470,7 +2470,7 @@ Transport Tycoon Deluxe.") (define openrct2-objects (package (name "openrct2-objects") - (version "1.0.2") + (version "1.0.6") (source (origin (method url-fetch) @@ -2479,7 +2479,7 @@ Transport Tycoon Deluxe.") (file-name (string-append name "-" version ".zip")) (sha256 (base32 - "1z92afhbv13j1ig6fz0x8w9vdmfchssv16vwwhb0vj40pn1g1rwy")))) + "00kfy95zx6g4ldr6br5p7bwkwfx6pw9v78fd3rvghjnwyvf5fhki")))) (build-system trivial-build-system) (native-inputs `(("bash" ,bash) @@ -2511,7 +2511,7 @@ Transport Tycoon Deluxe.") (define-public openrct2 (package (name "openrct2") - (version "0.2.0") + (version "0.2.1") (source (origin (method url-fetch) @@ -2519,7 +2519,7 @@ Transport Tycoon Deluxe.") version ".tar.gz")) (sha256 (base32 - "1yrbjra27n2xxb1x47v962lc3qi8gwm5ws4f97952nvn533zrwxz")) + "1fxzk037xphpyk7vv5jfrcz739zrj86p43pnf5gjjv9rjxwv7m8f")) (file-name (string-append name "-" version ".tar.gz")))) (build-system cmake-build-system) (arguments -- cgit v1.2.3 From 26baaaf49b18c84f56bfacd0760d62b1e9ccf04c Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 3 Sep 2018 08:19:15 +0200 Subject: gnu: c-toxcore: Update to 0.2.7. * gnu/packages/messaging.scm (c-toxcore): Update to 0.2.7. --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index b03cb8f03a..afbb458ad9 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -873,7 +873,7 @@ protocols.") (define-public c-toxcore (package (name "c-toxcore") - (version "0.2.6") + (version "0.2.7") (source (origin (method url-fetch) @@ -882,7 +882,7 @@ protocols.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "04b3ifkj64yy06vph0hlq24mw9fh24zmq1qdf40fmj24vvgfmjpl")))) + "1lcw979zakyb5kzy8yfk87js3bzfz3k2jxidda6ga6ljdnqdpxmy")))) (arguments `(#:tests? #f)) ; FIXME: Testsuite seems to stay stuck on test 3. Disable ; for now. -- cgit v1.2.3 From 02ddafef5516c23caa91c821926774f618e48ad0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Sep 2018 13:47:01 +0200 Subject: gnu: python-scipy: Disable broken tests. * gnu/packages/python.scm (python-scipy)[arguments]: Skip two broken tests. --- gnu/packages/python.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index fd1fdbf82d..9fdadfbd73 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3755,6 +3755,18 @@ functions.") (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'disable-broken-tests + (lambda _ + (substitute* "scipy/sparse/linalg/dsolve/tests/test_linsolve.py" + (("^( +)def test_threads_parallel\\(self\\):" m indent) + (string-append indent + "@pytest.mark.skip(reason=\"Disabled by Guix\")\n" + m))) + (substitute* "scipy/sparse/linalg/eigen/arpack/tests/test_arpack.py" + (("^def test_parallel_threads\\(\\):" m) + (string-append "@pytest.mark.skip(reason=\"Disabled by Guix\")\n" + m))) + #t)) (add-before 'build 'configure-openblas (lambda* (#:key inputs #:allow-other-keys) (call-with-output-file "site.cfg" -- cgit v1.2.3 From 290bef39f689f8c36807533214bc1a450be32522 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 3 Sep 2018 13:10:58 +0300 Subject: gnu: efl: Update to 1.21.0. * gnu/packages/enlightenment.scm (efl): Update to 1.21.0. --- gnu/packages/enlightenment.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 15ec492793..0cc9bb9575 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -62,7 +62,7 @@ (define-public efl (package (name "efl") - (version "1.20.7") + (version "1.21.0") (source (origin (method url-fetch) (uri (string-append @@ -70,7 +70,7 @@ version ".tar.xz")) (sha256 (base32 - "1zkn5ix81xck3n84dxvkjh4alwc6zj8x989d0zqi5c6ppijvgadh")))) + "0jxfrcz2aq1synxzd6sh9nhxz7fg9qgz0idr8zj6gaiplmwbwrby")))) (outputs '("out" ; 49 MB "include")) ; 17 MB (build-system gnu-build-system) -- cgit v1.2.3 From 0cc64476691dd47b79d93a38c89c488b1c985323 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 3 Sep 2018 17:32:21 +0300 Subject: gnu: python-efl: Update to 1.21.0. * gnu/packages/enlightenment.scm (python-efl): Update to 1.21.0. [source]: Don't use pypi source. [arguments]: Delete network tests. --- gnu/packages/enlightenment.scm | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 0cc9bb9575..40a5ec1cf4 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -312,35 +312,36 @@ embedded systems.") (define-public python-efl (package (name "python-efl") - (version "1.20.0") + (version "1.21.0") (source (origin (method url-fetch) - (uri (list - (pypi-uri "python-efl" version) - (string-append "http://download.enlightenment.org/rel/bindings/" - "python/python-efl-" version ".tar.gz"))) + (uri (string-append "http://download.enlightenment.org/rel/bindings/" + "python/python-efl-" version ".tar.xz")) (sha256 (base32 - "1680pgpf501nhbc9arm0nfj6rpcw17aryh0pgmmmszxlgpifpdzy")))) + "08x2cv8hnf004c3711250wrax21ffj5y8951pvk77h98als4pq47")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases - (replace 'build - (lambda _ - (zero? - (system* "env" "ENABLE_CYTHON=1" "python" "setup.py" "build")))) + (replace 'build + (lambda _ + (setenv "ENABLE_CYTHON" "1") + (invoke "python" "setup.py" "build"))) (add-before 'build 'set-flags - (lambda _ - (setenv "CFLAGS" - (string-append "-I" (assoc-ref %build-inputs "python-dbus") - "/include/dbus-1.0")) - #t)) + (lambda _ + (setenv "CFLAGS" + (string-append "-I" (assoc-ref %build-inputs "python-dbus") + "/include/dbus-1.0")) + #t)) (add-before 'check 'set-environment (lambda _ ;; Some tests require write access to HOME. (setenv "HOME" "/tmp") + ;; These tests try to connect to the internet. + (delete-file "tests/ecore/test_09_file_download.py") + (delete-file "tests/ecore/test_11_con.py") #t))))) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From fb458bf3bc98805dfb4a4c16cf4ca9d6d394495c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 3 Sep 2018 17:03:50 +0200 Subject: gnu: sudo: Update to 1.8.25. * gnu/packages/admin.scm (sudo): Update to 1.8.25. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 3d58780b95..8807ab18b5 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -963,7 +963,7 @@ system administrator.") (define-public sudo (package (name "sudo") - (version "1.8.24") + (version "1.8.25") (source (origin (method url-fetch) (uri @@ -973,7 +973,7 @@ system administrator.") version ".tar.gz"))) (sha256 (base32 - "1s2v49n905wf3phmdnaa6v1dwck2lrcin0flg85z7klf35x5b25l")) + "0hfw6pcwjvv1vvnhb4n1p210306jm4npz99p9cfhbd33yrhhzkwx")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From cfcfc6ab627cbba2d5cd7893352e77d5e3667175 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 31 Aug 2018 16:53:27 +0200 Subject: Fix some typos. * doc/guix.texi (Sound Services, DNS Services): Fix typos. * gnu/packages/cpp.scm (json-modern-cxx)[description]: Likewise. * gnu/packages/emacs.scm (emacs-fancy-narrow)[synopsis, description]: Likewise. Edit & mark up while we're here. * gnu/packages/mail.scm (alot)[synopsis, description]: Ditto. --- gnu/packages/cpp.scm | 2 +- gnu/packages/emacs.scm | 11 ++++++----- gnu/packages/mail.scm | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 0160e42f6a..d591e6a884 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -236,7 +236,7 @@ as ordering relation.") (build-system cmake-build-system) (synopsis "JSON parser and printer library for C++") (description "JSON for Modern C++ is a C++ JSON library that provides -intutive syntax and trivial integration.") +intuitive syntax and trivial integration.") (license license:expat))) (define-public xtl diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 08554280c7..8f0c564f88 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -9567,11 +9567,12 @@ duplicate hook and function names further into a single declarative call.") "0rf2rnzg82pdqch041yyx3f9ddixffkk9s2ydzg8hwy66sg3385n")))) (build-system emacs-build-system) (home-page "https://github.com/Malabarba/fancy-narrow/releases") - (synopsis "Immitate narrow-to-region with more eye-candy") - (description "Unlike narrow-to-region, which completely hides text outside -the narrowed region, this package simply deemphasizes the text, makes it -readonly, and makes it unreachable. This leads to a much more natural -feeling, where the region stays static (instead of being brutally moved to a + (synopsis "Imitate @code{narrow-to-region} with more eye candy") + (description + "Unlike @code{narrow-to-region}, which completely hides text outside +the narrowed region, this package simply de-emphasizes the text, makes it +read-only, and makes it unreachable. This leads to a much more natural +feeling where the region stays static (instead of being brutally moved to a blank slate) and is clearly highlighted with respect to the rest of the buffer.") (license license:gpl2+))) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 1f7e971d60..4944dd7622 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -706,9 +706,9 @@ attachments, create new maildirs, and so on.") ("python2-pygpgme" ,python2-pygpgme) ("python2-notmuch" ,python2-notmuch))) (home-page "https://github.com/pazz/alot") - (synopsis "Commandline MUA using notmuch") + (synopsis "Command-line MUA using @code{notmuch}") (description - "Alot is an experimental terminal mail user agent (MUA) based on + "Alot is an experimental terminal mail user agent (@dfn{MUA}) based on @code{notmuch} mail. It is written in Python using the @code{urwid} toolkit.") (license gpl3+))) -- cgit v1.2.3 From b619b7f67b9ebc7bc5617ccbf6c638bfa9a0d481 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 30 Aug 2018 21:57:36 +0200 Subject: gnu: libircclient: Update to 1.10. * gnu/packages/messaging.scm (libircclient): Update to 1.10. --- gnu/packages/messaging.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index afbb458ad9..4d7cc6923e 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1565,7 +1565,7 @@ using ncurses and libmesode, inspired by Irssi.") (define-public libircclient (package (name "libircclient") - (version "1.9") + (version "1.10") (source (origin (method url-fetch) @@ -1573,7 +1573,7 @@ using ncurses and libmesode, inspired by Irssi.") version "/libircclient-" version ".tar.gz")) (sha256 (base32 - "0r60i76jh4drjh2jgp5sx71chagqllmkaq49zv67nrhqwvp9ghw1")))) + "0b9wa0h3xc31wpqlvgxgnvqp5wgx3kwsf5s9432m5cj8ycx6zcmv")))) (build-system gnu-build-system) (inputs `(("openssl" ,openssl))) @@ -1584,8 +1584,7 @@ using ncurses and libmesode, inspired by Irssi.") "--enable-shared" "--enable-ipv6" "--enable-openssl") - ;; no test suite - #:tests? #f)) + #:tests? #f)) ; no test suite (home-page "https://www.ulduzsoft.com/libircclient/") (synopsis "Library implementing the client IRC protocol") (description "Libircclient is a library which implements the client IRC -- cgit v1.2.3 From 38a8cd329d82fdd5f5a1b3b4813869294dbf6544 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 31 Aug 2018 10:24:21 +0200 Subject: gnu: python-nbxmpp: Update to 0.6.7. * gnu/packages/messaging.scm (python-nbxmpp): Update to 0.6.7. --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 4d7cc6923e..42a0847b7a 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -548,14 +548,14 @@ simultaneously and therefore appear under the same nickname on IRC.") (define-public python-nbxmpp (package (name "python-nbxmpp") - (version "0.6.6") + (version "0.6.7") (source (origin (method url-fetch) (uri (pypi-uri "nbxmpp" version)) (sha256 (base32 - "0bp60syqc3qp2i28phvadxlpwizjbr6bxw4m363p9yn5fl687qnh")))) + "0fas4iawjfdmkz8vr042wpq6b2qispi6fy35g4a62jw50jb1saav")))) (build-system python-build-system) (arguments `(#:tests? #f)) ; no tests -- cgit v1.2.3 From a5896da34e93754a7b69b2adf049444833b1a402 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 3 Sep 2018 19:33:14 +0300 Subject: gnu: gnu-pw-mgr: Update to 2.4.2. * gnu/packages/gnu-pw-mgr.scm (gnu-pw-mgr): Update to 2.4.2. --- gnu/packages/gnu-pw-mgr.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnu-pw-mgr.scm b/gnu/packages/gnu-pw-mgr.scm index 38f9e8187a..a56bc09e61 100644 --- a/gnu/packages/gnu-pw-mgr.scm +++ b/gnu/packages/gnu-pw-mgr.scm @@ -30,7 +30,7 @@ (define-public gnu-pw-mgr (package (name "gnu-pw-mgr") - (version "2.3.3") + (version "2.4.2") (source (origin (method url-fetch) @@ -38,7 +38,7 @@ version ".tar.xz")) (sha256 (base32 - "04xh38j7l0sfnb01kp05xc908pvqfc0lph94k7n9bi46zy3qy7ma")))) + "1yvdzc5w37qrjrkby5699ygj9bhkvgi3zk9k9jcjry1j6b7wdl17")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 915620619954ff100ebc097f048adcc65715b0a0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 1 Sep 2018 12:08:20 +0200 Subject: gnu: simplescreenrecorder: Build against modular Qt. * gnu/packages/video.scm (simplescreenrecorder)[inputs]: Remove QT. Add QTBASE and QTX11EXTRAS. --- gnu/packages/video.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 6825cd7d2d..3e074e6c3f 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2217,7 +2217,8 @@ making @dfn{screencasts}.") ("jack" ,jack-1) ("libxi" ,libxi) ("pulseaudio" ,pulseaudio) - ("qt" ,qt))) + ("qtbase" ,qtbase) + ("qtx11extras" ,qtx11extras))) (native-inputs `(("pkg-config" ,pkg-config))) (arguments `(#:configure-flags -- cgit v1.2.3 From 1ae2c577a6c79ac2914e268ffca89459b196dcb2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 1 Sep 2018 15:09:50 +0200 Subject: gnu: ilmbase: Update to 2.3.0. * gnu/packages/graphics.scm (ilmbase): Update to 2.3.0. [source](uri): Change to new download location. --- gnu/packages/graphics.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 6632c9a1a3..e5ec318e1b 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -228,14 +228,15 @@ many more.") (define-public ilmbase (package (name "ilmbase") - (version "2.2.1") + (version "2.3.0") (source (origin (method url-fetch) - (uri (string-append "mirror://savannah/openexr/ilmbase-" + (uri (string-append "https://github.com/openexr/openexr/releases" + "/download/v" version "/ilmbase-" version ".tar.gz")) (sha256 (base32 - "17k0hq19wplx9s029kjrq6c51x2ryrfmaavcappkd0g67gk0dhna")) + "0qiq5bqq9rxhqjiym2k36sx4vq8adgrz6xf6qwizi9bqm78phsa5")) (patches (search-patches "ilmbase-fix-tests.patch")))) (build-system gnu-build-system) (home-page "http://www.openexr.com/") -- cgit v1.2.3 From fcde1d27bb668f3a5972b31031bdb19f5d8ef68e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 1 Sep 2018 15:15:26 +0200 Subject: gnu: openexr: Update to 2.3.0. * gnu/packages/graphics.scm (openexr): Update to 2.3.0. [source](uri): Change to new download location. [source](snippet): Remove workaround. [source](patches): Remove. * gnu/packages/patches/openexr-missing-samples.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/graphics.scm | 17 +++++----------- gnu/packages/patches/openexr-missing-samples.patch | 23 ---------------------- 3 files changed, 5 insertions(+), 36 deletions(-) delete mode 100644 gnu/packages/patches/openexr-missing-samples.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index d929ec0da8..1924ae9467 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1000,7 +1000,6 @@ dist_patch_DATA = \ %D%/packages/patches/ola-readdir-r.patch \ %D%/packages/patches/openbabel-fix-crash-on-nwchem-output.patch \ %D%/packages/patches/opencascade-oce-glibc-2.26.patch \ - %D%/packages/patches/openexr-missing-samples.patch \ %D%/packages/patches/openfoam-4.1-cleanup.patch \ %D%/packages/patches/openldap-CVE-2017-9287.patch \ %D%/packages/patches/openocd-nrf52.patch \ diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index e5ec318e1b..9c2869c12b 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -320,29 +320,22 @@ graphics.") (define-public openexr (package (name "openexr") - (version "2.2.1") + (version "2.3.0") (source (origin (method url-fetch) - (uri (string-append "mirror://savannah/openexr/openexr-" + (uri (string-append "https://github.com/openexr/openexr/releases" + "/download/v" version "/openexr-" version ".tar.gz")) (sha256 (base32 - "1kdf2gqznsdinbd5vcmqnif442nyhdf9l7ckc51410qm2gv5m6lg")) + "19jywbs9qjvsbkvlvzayzi81s976k53wg53vw4xj66lcgylb6v7x")) (modules '((guix build utils))) (snippet '(begin (substitute* (find-files "." "tmpDir\\.h") (("\"/var/tmp/\"") "\"/tmp/\"")) - - ;; Install 'ImfStdIO.h'. Reported at - ;; - ;; and . - (substitute* "IlmImf/Makefile.in" - (("ImfIO\\.h") - "ImfIO.h ImfStdIO.h")) - #t)) - (patches (search-patches "openexr-missing-samples.patch")))) + #t)))) (build-system gnu-build-system) (arguments '(#:phases diff --git a/gnu/packages/patches/openexr-missing-samples.patch b/gnu/packages/patches/openexr-missing-samples.patch deleted file mode 100644 index 16cc9bb625..0000000000 --- a/gnu/packages/patches/openexr-missing-samples.patch +++ /dev/null @@ -1,23 +0,0 @@ -This patch comments out tests that rely on files that are missing -from the source tarball. - ---- openexr-2.2.0/IlmImfTest/testSampleImages.cpp 2015-02-25 16:19:21.565105625 +0100 -+++ openexr-2.2.0/IlmImfTest/testSampleImages.cpp 2015-02-25 16:21:46.394128206 +0100 -@@ -162,16 +162,6 @@ testSampleImages (const std::string&) - compareImages (ILM_IMF_TEST_IMAGEDIR "comp_b44.exr", - ILM_IMF_TEST_IMAGEDIR "comp_b44_piz.exr"); - -- compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwaa_v1.exr", -- ILM_IMF_TEST_IMAGEDIR "comp_dwaa_piz.exr"); -- compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwaa_v2.exr", -- ILM_IMF_TEST_IMAGEDIR "comp_dwaa_piz.exr"); -- -- compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwab_v1.exr", -- ILM_IMF_TEST_IMAGEDIR "comp_dwab_piz.exr"); -- compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwab_v2.exr", -- ILM_IMF_TEST_IMAGEDIR "comp_dwab_piz.exr"); -- - - cout << "ok\n" << endl; - } - -- cgit v1.2.3 From 84aa18ff7ff06a2738187d5911dafeb3df39a679 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 1 Sep 2018 15:54:09 +0200 Subject: gnu: re2: Update to 2018-09-01. * gnu/packages/regex.scm (re2): Update to 2018-09-01. --- gnu/packages/regex.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/regex.scm b/gnu/packages/regex.scm index 3f501a0736..c9d9e8a359 100644 --- a/gnu/packages/regex.scm +++ b/gnu/packages/regex.scm @@ -29,7 +29,7 @@ (define-public re2 (package (name "re2") - (version "2018-08-01") + (version "2018-09-01") (home-page "https://github.com/google/re2") (source (origin (method url-fetch) @@ -37,7 +37,7 @@ (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0lmpc3cb9bvc27fp27jacx6qjn176v8z8p7k70byc092q68mr6bw")))) + "0hygr88hvy7if1i45m5r6x60zf73439j2fwzw7wwcw9gb01v690l")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) -- cgit v1.2.3 From cbd7c65709b1195de9196772c7f8ae6863797b35 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 3 Sep 2018 15:35:23 +0200 Subject: gnu: ppp: Return #t from all phases. * gnu/packages/samba.scm (ppp)[arguments]: Return #t from phase. --- gnu/packages/samba.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 345655d584..a6d6ee30cd 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -417,7 +417,8 @@ key-value pair databases and a real LDAP database.") (("/usr/include/crypt\\.h") (string-append libc "/include/crypt.h")) (("/usr/include/pcap-bpf.h") - (string-append libpcap "/include/pcap-bpf.h"))))))))) + (string-append libpcap "/include/pcap-bpf.h"))) + #t)))))) (inputs `(("libpcap" ,libpcap))) (synopsis "Implementation of the Point-to-Point Protocol") -- cgit v1.2.3 From 1f7d142000ad15d037cf3d934f7b6233f3a5b434 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 1 Sep 2018 19:27:01 +0200 Subject: gnu: python-matplotlib: Update to 2.2.3. * gnu/packages/python.scm (python-matplotlib): Update to 2.2.3. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 9fdadfbd73..8cf5550f81 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3468,14 +3468,14 @@ convert between colorspaces like sRGB, XYZ, CIEL*a*b*, CIECAM02, CAM02-UCS, etc. (define-public python-matplotlib (package (name "python-matplotlib") - (version "2.2.2") + (version "2.2.3") (source (origin (method url-fetch) (uri (pypi-uri "matplotlib" version)) (sha256 (base32 - "1s6dv225w3k4fv52h8lfjc7qq5y56i9755ayx0mz48ddi99fzisd")))) + "1rcc7x9ig3hpchkc4cwdvym3y451w74275fxr455zkfagrsvymbk")))) (build-system python-build-system) (propagated-inputs ; the following packages are all needed at run time `(("python-cycler" ,python-cycler) -- cgit v1.2.3 From 91bb495b85e9870773f9a4785f325c0cc9a2c3d1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 3 Sep 2018 19:00:59 +0200 Subject: gnu: arpack-ng: Drop redundant phase. * gnu/packages/maths.scm (arpack-ng)[arguments]: Remove. --- gnu/packages/maths.scm | 5 ----- 1 file changed, 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 377e47bc58..36a77b1f0a 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -470,11 +470,6 @@ computing convex hulls.") (base32 "0f8jx3fifmj9qdp289zr7r651y1q48k1jya859rqxq62mvis7xsh")))) (build-system gnu-build-system) - (arguments - '(#:phases (modify-phases %standard-phases - (add-after 'unpack 'autoreconf - (lambda _ - (invoke "autoreconf" "-vfi")))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- cgit v1.2.3 From c702749dfd47ea6983768cd5b8cf828898445af0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 3 Sep 2018 19:01:32 +0200 Subject: gnu: arpack-ng: Update to 3.6.2. * gnu/packages/maths.scm (arpack-ng): Update to 3.6.2. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 36a77b1f0a..50c0a320e0 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -459,7 +459,7 @@ computing convex hulls.") (define-public arpack-ng (package (name "arpack-ng") - (version "3.5.0") + (version "3.6.2") (home-page "https://github.com/opencollab/arpack-ng") (source (origin @@ -468,7 +468,7 @@ computing convex hulls.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0f8jx3fifmj9qdp289zr7r651y1q48k1jya859rqxq62mvis7xsh")))) + "16jrvdl0gh78rrfnvrcxwys4slwfh6qmwwjhfc9d6vwrvq184g37")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From 65a58f390704878e8adc8712786333ebd79c6a64 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 3 Sep 2018 15:42:42 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 38fe6449c0d1fac6f64fcbabfbc94943752830b9 Mon Sep 17 00:00:00 2001 From: Benjamin Slade Date: Mon, 3 Sep 2018 23:19:30 +0200 Subject: gnu: Add transset-df. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xorg.scm (transset-df): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/xorg.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 3875765d25..c89661272b 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Kei Kebreau ;;; Copyright © 2018 Oleg Pykhalov +;;; Copyright © 2018 Benjamin Slade ;;; ;;; This file is part of GNU Guix. ;;; @@ -6196,3 +6197,44 @@ and embedded platforms.") cursor to any point on the screen with a few key strokes. It also simulates mouse click. You can do everything mouse can do with a keyboard.") (license license:bsd-3))) + +(define-public transset-df + (package + (name "transset-df") + (version "6") + (source (origin + (method url-fetch) + (uri (string-append "http://forchheimer.se/" name "/" name "-" version + ".tar.gz")) + (sha256 + (base32 + "1vnykwwrv75miigbhmcwxniw8xnhsdyzhqydip2m9crxi2lwhqs5")))) + (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'setenv + (lambda _ + (setenv "CC" (which "gcc")) + #t)) + (delete 'configure) + (delete 'check) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (install-file "transset-df" bin) + #t)))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs `(("libxcomposite" ,libxcomposite) + ("libxdamager" ,libxdamage) + ("libxrender" ,libxrender))) + (synopsis "Set the transparency of X11 windows") + (description "The @command{transset-df} command allows you to set the +opacity of X11 windows. This patched version of X.Org's @command{transset} +adds functionality, including: selecting window by clicking (as transset), +selecting windows by pointing select actual focused X11 window, selecting by +window name or id, forcing toggle, increase or decrease opacity.") + (home-page "http://forchheimer.se/transset-df/") + (license license:x11))) -- cgit v1.2.3 From 5108c18e7e163c3b45568f1f4c3416581a2cea19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= Date: Mon, 3 Sep 2018 10:20:06 +0200 Subject: gnu: perl: Add support for cross-compilation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/perl.scm (perl): use cross-libc when cross-compiling Signed-off-by: Ludovic Courtès --- gnu/packages/perl.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 4d70e019b9..b10be9567d 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -48,6 +48,7 @@ #: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 cross-base) #:use-module (gnu packages freedesktop) #:use-module (gnu packages perl-check) #:use-module (gnu packages perl-web) @@ -79,7 +80,7 @@ "perl-reproducible-build-date.patch")))) (build-system gnu-build-system) (arguments - '(#:tests? #f + `(#:tests? #f #:configure-flags (let ((out (assoc-ref %outputs "out")) (libc (assoc-ref %build-inputs "libc"))) @@ -128,7 +129,10 @@ (add-after 'install 'remove-extra-references (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (libc (assoc-ref inputs "libc")) + (libc (assoc-ref inputs + (if ,(%current-target-system) + "cross-libc" + "libc"))) (config1 (car (find-files (string-append out "/lib/perl5") "^Config_heavy\\.pl$"))) (config2 (find-files (string-append out "/lib/perl5") -- cgit v1.2.3 From fd95f37f361ad9444fb13faebda29662d3bf7be6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 3 Sep 2018 23:49:06 +0200 Subject: Revert "gnu: perl: Add support for cross-compilation" This reverts commit 5108c18e7e163c3b45568f1f4c3416581a2cea19, which was accidentally committed. --- gnu/packages/perl.scm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index b10be9567d..4d70e019b9 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -48,7 +48,6 @@ #: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 cross-base) #:use-module (gnu packages freedesktop) #:use-module (gnu packages perl-check) #:use-module (gnu packages perl-web) @@ -80,7 +79,7 @@ "perl-reproducible-build-date.patch")))) (build-system gnu-build-system) (arguments - `(#:tests? #f + '(#:tests? #f #:configure-flags (let ((out (assoc-ref %outputs "out")) (libc (assoc-ref %build-inputs "libc"))) @@ -129,10 +128,7 @@ (add-after 'install 'remove-extra-references (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (libc (assoc-ref inputs - (if ,(%current-target-system) - "cross-libc" - "libc"))) + (libc (assoc-ref inputs "libc")) (config1 (car (find-files (string-append out "/lib/perl5") "^Config_heavy\\.pl$"))) (config2 (find-files (string-append out "/lib/perl5") -- cgit v1.2.3 From 9c4b522f1572db2c5dab81976982b95d5da51e6e Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Fri, 24 Aug 2018 00:36:15 +0530 Subject: gnu: Add ghc-wcwidth. * gnu/packages/haskell.scm (ghc-wcwidth): New variable. --- gnu/packages/haskell.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index a07bb049a2..6e19cd67ee 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -10152,4 +10152,29 @@ tools are not needed to actually run Gtk2Hs programs.") backends provided by the @code{Cairo} and @code{Diagrams} libraries.") (license license:bsd-3))) +(define-public ghc-wcwidth + (package + (name "ghc-wcwidth") + (version "0.0.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/wcwidth/wcwidth-" + version ".tar.gz")) + (sha256 + (base32 + "1n1fq7v64b59ajf5g50iqj9sa34wm7s2j3viay0kxpmvlcv8gipz")))) + (build-system haskell-build-system) + (inputs + `(("ghc-setlocale" ,ghc-setlocale) + ("ghc-utf8-string" ,ghc-utf8-string) + ("ghc-attoparsec" ,ghc-attoparsec))) + (home-page "https://github.com/solidsnack/wcwidth/") + (synopsis "Haskell bindings to wcwidth") + (description "This package provides Haskell bindings to your system's +native wcwidth and a command line tool to examine the widths assigned by it. +The command line tool can compile a width table to Haskell code that assigns +widths to the Char type.") + (license license:bsd-3))) + ;;; haskell.scm ends here -- cgit v1.2.3 From 3ad6b8909025a8f4d3e1f1f5ea16bcd0cace557c Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Fri, 24 Aug 2018 12:14:17 +0530 Subject: gnu: ghc-tasty: Update to 1.1.0.3. * gnu/packages/haskell-check.scm (ghc-tasty): Update to 1.1.0.3. [inputs]: Add ghc-wcwidth. (ghc-attoparsec-bootstrap, ghc-integer-logarithms-bootstrap, ghc-scientific-bootstrap): New variables. (ghc-wcwidth)[inputs]: Replace ghc-attoparsec with ghc-attoparsec-bootstrap. (ghc-scientific)[inputs]: Replace ghc-integer-logarithms with ghc-integer-logarithms-bootstrap. (ghc-attoparsec)[inputs]: Replace ghc-scientific with ghc-scientific-bootstrap. --- gnu/packages/haskell-check.scm | 7 ++++--- gnu/packages/haskell.scm | 27 ++++++++++++++++++++++++--- 2 files changed, 28 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index c3ef85f3f0..1064872fec 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -183,7 +183,7 @@ timer functions of different operating systems via a unified API.") (define-public ghc-tasty (package (name "ghc-tasty") - (version "0.11.0.4") + (version "1.1.0.3") (source (origin (method url-fetch) @@ -193,7 +193,7 @@ timer functions of different operating systems via a unified API.") ".tar.gz")) (sha256 (base32 - "05pxjzgbgjdn7477xry0ssjrnmnsydqiq6nm6ck8n2da1baliqp0")))) + "14riid753hjqr6lca1kgxpnvq0wykf0k3qc5jpag42hh8bszav22")))) (build-system haskell-build-system) (inputs `(("ghc-stm" ,ghc-stm) @@ -205,7 +205,8 @@ timer functions of different operating systems via a unified API.") ("ghc-unbounded-delays" ,ghc-unbounded-delays) ("ghc-async" ,ghc-async) ("ghc-ansi-terminal" ,ghc-ansi-terminal) - ("ghc-clock-bootstrap" ,ghc-clock-bootstrap))) + ("ghc-clock-bootstrap" ,ghc-clock-bootstrap) + ("ghc-wcwidth" ,ghc-wcwidth))) (home-page "http://documentup.com/feuerbach/tasty") (synopsis "Modern and extensible testing framework") (description "Tasty is a modern testing framework for Haskell. It lets diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 6e19cd67ee..70929ddae6 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2866,7 +2866,7 @@ with slicing and Clang-style colored diagnostics.") ;; re-enable them. (arguments `(#:tests? #f)) (inputs - `(("ghc-scientific" ,ghc-scientific) + `(("ghc-scientific-bootstrap" ,ghc-scientific-bootstrap) ("ghc-text" ,ghc-text))) (native-inputs `(("ghc-tasty" ,ghc-tasty) @@ -2881,6 +2881,13 @@ aimed particularly at dealing efficiently with network protocols and complicated text/binary file formats.") (license license:bsd-3))) +(define ghc-attoparsec-bootstrap + (package + (inherit ghc-attoparsec) + (name "ghc-attoparsec-bootstrap") + (arguments '(#:tests? #f)) + (native-inputs '()))) + (define-public ghc-zip-archive (package (name "ghc-zip-archive") @@ -5208,6 +5215,13 @@ occurrences of a substring (the first in case of overlaps) with another.") in migrated modules.") (license license:expat))) +(define ghc-integer-logarithms-bootstrap + (package + (inherit ghc-integer-logarithms) + (name "ghc-integer-logarithms-bootstrap") + (arguments `(#:tests? #f)) + (native-inputs '()))) + (define-public ghc-scientific (package (name "ghc-scientific") @@ -5224,7 +5238,7 @@ in migrated modules.") "03ql2f0ac8bsl524idy9xxa3kxisb2sj3avflzw580j5hzy0m397")))) (build-system haskell-build-system) (inputs - `(("ghc-integer-logarithms" ,ghc-integer-logarithms) + `(("ghc-integer-logarithms-bootstrap" ,ghc-integer-logarithms-bootstrap) ("ghc-text" ,ghc-text) ("ghc-hashable" ,ghc-hashable) ("ghc-primitive" ,ghc-primitive))) @@ -5245,6 +5259,13 @@ and space efficient. They are represented using notation}.") (license license:bsd-3))) +(define ghc-scientific-bootstrap + (package + (inherit ghc-scientific) + (name "ghc-scientific-bootstrap") + (arguments `(#:tests? #f)) + (native-inputs '()))) + (define-public ghc-boxes (package (name "ghc-boxes") @@ -10168,7 +10189,7 @@ backends provided by the @code{Cairo} and @code{Diagrams} libraries.") (inputs `(("ghc-setlocale" ,ghc-setlocale) ("ghc-utf8-string" ,ghc-utf8-string) - ("ghc-attoparsec" ,ghc-attoparsec))) + ("ghc-attoparsec-bootstrap" ,ghc-attoparsec-bootstrap))) (home-page "https://github.com/solidsnack/wcwidth/") (synopsis "Haskell bindings to wcwidth") (description "This package provides Haskell bindings to your system's -- cgit v1.2.3 From 8374cc4b051e31905581250fbc0697b1513db60a Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 4 Sep 2018 15:21:56 +0530 Subject: gnu: ghc-tasty-ant-xml: Update to 1.1.4. * gnu/packages/haskell-check.scm (ghc-tasty-ant-xml): Update to 1.1.4. --- gnu/packages/haskell-check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 1064872fec..65333f8269 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -39,7 +39,7 @@ (define-public ghc-tasty-ant-xml (package (name "ghc-tasty-ant-xml") - (version "1.0.2") + (version "1.1.4") (source (origin (method url-fetch) @@ -49,7 +49,7 @@ ".tar.gz")) (sha256 (base32 - "0pgz2lclg2hp72ykljcbxd88pjanfdfk8m5vb2qzcyjr85kwrhxv")))) + "0v0gsb90kh6hwlgxbclzawsskywc6yf7n8xhiifia97l4y0yx2m8")))) (build-system haskell-build-system) (inputs `(("ghc-generic-deriving" ,ghc-generic-deriving) -- cgit v1.2.3 From 6300ba5b6669e6e1a3864144390a358b8c260296 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 4 Sep 2018 15:24:32 +0530 Subject: gnu: ghc-integer-logarithms: Allow building with newer tasty. * gnu/packages/haskell.scm (ghc-integer-logarithms)[arguments]: Allow building with newer tasty. --- gnu/packages/haskell.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 70929ddae6..e7072633de 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5197,6 +5197,8 @@ occurrences of a substring (the first in case of overlaps) with another.") (base32 "1wj8kgjg5bn2yrs4zh9qfjv85cx6w998j9pi39yrbv305944mb9j")))) (build-system haskell-build-system) + (arguments + `(#:configure-flags (list "--allow-newer=tasty"))) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck) ("ghc-smallcheck" ,ghc-smallcheck) -- cgit v1.2.3 From 906a396bff28ba46b37014a0efc5d4fbf417dc82 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 4 Sep 2018 17:26:14 +0530 Subject: gnu: ghc-zlib: Enable tests. * gnu/packages/haskell.scm (ghc-zlib)[arguments]: Enable tests. Allow building with newer tasty. [native-inputs]: Add ghc-quickcheck, ghc-tasty, ghc-tasty-hunit and ghc-tasty-quickcheck. --- gnu/packages/haskell.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index e7072633de..b8ae26346e 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2078,9 +2078,13 @@ literals.") (base32 "1vbzf0awb6zb456xf48za1kl22018646cfzq4frvxgb9ay97vk0d")))) (build-system haskell-build-system) - ;; Tests require older versions of testy. - (arguments `(#:tests? #f)) + (arguments `(#:configure-flags (list "--allow-newer=tasty"))) (inputs `(("zlib" ,zlib))) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) (home-page "https://hackage.haskell.org/package/zlib") (synopsis "Compression and decompression in the gzip and zlib formats") -- cgit v1.2.3 From b50658fe8ac898544a5c481f232a454c485524b9 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Thu, 16 Aug 2018 13:33:48 +0200 Subject: gnu: kicad: Update to 5.0.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/engineering.scm (kicad): Update to 5.0.0. [source]: Change from git to url-fetch. [arguments]: Remove now unneeded build version parameter. [inputs]: Add opencascade-oce. Signed-off-by: Ludovic Courtès --- gnu/packages/engineering.scm | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index d53b25cff9..ee524ec78e 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Clément Lassieur +;;; Copyright © 2018 Jonathan Brielmaier ;;; ;;; This file is part of GNU Guix. ;;; @@ -680,24 +681,19 @@ language.") (define-public ao (deprecated-package "ao-cad" libfive)) -;; We use kicad from a git commit, because support for boost 1.61.0 has been -;; recently added. (define-public kicad - (let ((commit "5f4599fb56da4dd748845ab10abec02961d477f3") - (revision "2")) (package (name "kicad") - (version (string-append "4.0-" revision "." - (string-take commit 7))) + (version "5.0.0") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://git.launchpad.net/kicad") - (commit commit))) + (method url-fetch) + (file-name (string-append name "-" version ".tar.xz")) + (uri (string-append + "https://launchpad.net/kicad/5.0/" version "/+download/" name + "-" version ".tar.xz")) (sha256 - (base32 "1833pln2975gmc5s18xf7s8m9vg834lmxxdjk0wlk3lq7bvjjnff")) - (file-name (string-append name "-" version "-checkout")))) + (base32 "17nqjszyvd25wi6550j981whlnb1wxzmlanljdjihiki53j84x9p")))) (build-system cmake-build-system) (arguments `(#:out-of-source? #t @@ -706,8 +702,6 @@ language.") #:configure-flags (list "-DKICAD_STABLE_VERSION=ON" "-DKICAD_REPO_NAME=stable" - ,(string-append "-DKICAD_BUILD_VERSION=4.0-" - (string-take commit 7)) "-DKICAD_SKIP_BOOST=ON"; Use our system's boost library. "-DKICAD_SCRIPTING=ON" "-DKICAD_SCRIPTING_MODULES=ON" @@ -754,6 +748,7 @@ language.") ("libngspice" ,libngspice) ("libsm" ,libsm) ("mesa" ,mesa) + ("opencascade-oce" ,opencascade-oce) ("openssl" ,openssl) ("python" ,python-2) ("wxwidgets" ,wxwidgets-gtk2) @@ -764,7 +759,7 @@ language.") boards and electrical circuits. The software has a number of programs that perform specific functions, for example, pcbnew (Editing PCB), eeschema (editing electrical diagrams), gerbview (viewing Gerber files) and others.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public kicad-library (let ((version "4.0.7")) -- cgit v1.2.3 From 71ca16b58d20aa26157acc4c345c0af80ec8df5d Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Mon, 3 Sep 2018 11:57:38 +0100 Subject: gnu: petsc-openmpi: Configure with support for hdf5 data format. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (petsc-openmpi)[inputs]: Add hdf5-parallel-openmpi. [arguments]: Add '--with-hdf5-include' and '--with-hdf5-lib' flags. Add 'set-test-environment' phase. Signed-off-by: Ludovic Courtès --- gnu/packages/maths.scm | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 50c0a320e0..42136f65ea 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2016, 2017 Thomas Danckaert -;;; Copyright © 2017 Paul Garlick +;;; Copyright © 2017, 2018 Paul Garlick ;;; Copyright © 2017 Nils Gillmann ;;; Copyright © 2017 Ben Woodcroft ;;; Copyright © 2017 Theodoros Foradis @@ -1685,6 +1685,7 @@ scientific applications modeled by partial differential equations.") (name "petsc-openmpi") (inputs `(("openmpi" ,openmpi) + ("hdf5" ,hdf5-parallel-openmpi) ,@(package-inputs petsc))) (arguments (substitute-keyword-arguments (package-arguments petsc) @@ -1692,7 +1693,21 @@ scientific applications modeled by partial differential equations.") ``("--with-mpiexec=mpirun" ,(string-append "--with-mpi-dir=" (assoc-ref %build-inputs "openmpi")) - ,@(delete "--with-mpi=0" ,cf))))) + ,(string-append "--with-hdf5-include=" + (assoc-ref %build-inputs "hdf5") "/include") + ,(string-append "--with-hdf5-lib=" + (assoc-ref %build-inputs "hdf5") "/lib/libhdf5.a") + ,@(delete "--with-mpi=0" ,cf))) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'check 'set-test-environment + (lambda _ + ;; By default, running the test suite would fail because 'ssh' + ;; could not be found in $PATH. Define this variable to + ;; placate Open MPI without adding a dependency on OpenSSH (the + ;; agent isn't used anyway.) + (setenv "OMPI_MCA_plm_rsh_agent" (which "cat")) + #t)))))) (synopsis "Library to solve PDEs (with MPI support)"))) (define-public petsc-complex-openmpi -- cgit v1.2.3 From 1bf758767d1553594b6d7534ca8c38a2171b5afe Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Mon, 3 Sep 2018 02:25:31 +0800 Subject: gnu: Add emacs-picpocket. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs.scm (emacs-picpocket): New public variable. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs.scm | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 8f0c564f88..957b72f4e7 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2016, 2017 Nils Gillmann ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2016, 2017, 2018 Nicolas Goaziou -;;; Copyright © 2016, 2017 Alex Vong +;;; Copyright © 2016, 2017, 2018 Alex Vong ;;; Copyright © 2016, 2017, 2018 Arun Isaac ;;; Copyright © 2017 Christopher Baines ;;; Copyright © 2017, 2018 Mathieu Othacehe @@ -11315,6 +11315,43 @@ e.g. the package dependencies it requires. See function file.") (license license:gpl3+)))) +(define-public emacs-picpocket + (let ((version "20180610.1059") ; taken from melpa + (commit "ce4b6ed088384f2414af82e8e4eae5b92c2874bf")) + (package + (name "emacs-picpocket") + (version version) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/johanclaesson/picpocket") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "15vpbcv83mc4j1pvrk7xic0klh2bl9gzg2xxs7c2lmnix52hy8mv")))) + (build-system emacs-build-system) + (arguments ; needed for running tests + `(#:tests? #t + #:emacs ,emacs + #:test-command '("emacs" "--batch" + "-l" "picpocket-test.el" + "-f" "ert-run-tests-batch-and-exit"))) + (home-page "https://github.com/johanclaesson/picpocket") + (synopsis "Image viewer for Emacs") + (description + "Picpocket is an image viewer for GNU Emacs. It has commands for: + +@itemize +@item File operations on the picture files (delete, move, copy, hardlink). +@item Scale and rotate the picture. +@item Associate pictures with tags which are saved to disk. +@item Filter pictures according to tags. +@item Customizing keystrokes for quick tagging and file operations. +@item Undo and browse history of undoable commands. +@end itemize") + (license license:gpl3+)))) + (define-public emacs-wgrep-helm ;; `emacs-wgrep-helm' was mistakenly added. (deprecated-package "emacs-wgrep-helm" emacs-wgrep)) -- cgit v1.2.3 From ca719424455465fca4b872c371daf2a46de88b33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 31 Aug 2018 17:07:07 +0200 Subject: Switch to Guile-Gcrypt. This removes (guix hash) and (guix pk-crypto), which now live as part of Guile-Gcrypt (version 0.1.0.) * guix/gcrypt.scm, guix/hash.scm, guix/pk-crypto.scm, tests/hash.scm, tests/pk-crypto.scm: Remove. * configure.ac: Test for Guile-Gcrypt. Remove LIBGCRYPT and LIBGCRYPT_LIBDIR assignments. * m4/guix.m4 (GUIX_ASSERT_LIBGCRYPT_USABLE): Remove. * README: Add Guile-Gcrypt to the dependencies; move libgcrypt as "required unless --disable-daemon". * doc/guix.texi (Requirements): Likewise. * gnu/packages/bash.scm, guix/derivations.scm, guix/docker.scm, guix/git.scm, guix/http-client.scm, guix/import/cpan.scm, guix/import/cran.scm, guix/import/crate.scm, guix/import/elpa.scm, guix/import/gnu.scm, guix/import/hackage.scm, guix/import/texlive.scm, guix/import/utils.scm, guix/nar.scm, guix/pki.scm, guix/scripts/archive.scm, guix/scripts/authenticate.scm, guix/scripts/download.scm, guix/scripts/hash.scm, guix/scripts/pack.scm, guix/scripts/publish.scm, guix/scripts/refresh.scm, guix/scripts/substitute.scm, guix/store.scm, guix/store/deduplication.scm, guix/tests.scm, tests/base32.scm, tests/builders.scm, tests/challenge.scm, tests/cpan.scm, tests/crate.scm, tests/derivations.scm, tests/gem.scm, tests/nar.scm, tests/opam.scm, tests/pki.scm, tests/publish.scm, tests/pypi.scm, tests/store-deduplication.scm, tests/store.scm, tests/substitute.scm: Adjust imports. * gnu/system/vm.scm: Likewise. (guile-sqlite3&co): Rename to... (gcrypt-sqlite3&co): ... this. Add GUILE-GCRYPT. (expression->derivation-in-linux-vm)[config]: Remove. (iso9660-image)[config]: Remove. (qemu-image)[config]: Remove. (system-docker-image)[config]: Remove. * guix/scripts/pack.scm: Adjust imports. (guile-sqlite3&co): Rename to... (gcrypt-sqlite3&co): ... this. Add GUILE-GCRYPT. (self-contained-tarball)[build]: Call 'make-config.scm' without #:libgcrypt argument. (squashfs-image)[libgcrypt]: Remove. [build]: Call 'make-config.scm' without #:libgcrypt. (docker-image)[config, json]: Remove. [build]: Add GUILE-GCRYPT to the extensions Remove (guix config) from the imported modules. * guix/self.scm (specification->package): Remove "libgcrypt", add "guile-gcrypt". (compiled-guix): Remove #:libgcrypt. [guile-gcrypt]: New variable. [dependencies]: Add it. [*core-modules*]: Remove #:libgcrypt from 'make-config.scm' call. Add #:extensions. [*config*]: Remove #:libgcrypt from 'make-config.scm' call. (%dependency-variables): Remove %libgcrypt. (make-config.scm): Remove #:libgcrypt. * build-aux/build-self.scm (guile-gcrypt): New variable. (make-config.scm): Remove #:libgcrypt. (build-program)[fake-gcrypt-hash]: New variable. Add (gcrypt hash) to the imported modules. Adjust load path assignments. * gnu/packages/package-management.scm (guix)[propagated-inputs]: Add GUILE-GCRYPT. [arguments]: In 'wrap-program' phase, add GUILE-GCRYPT to the search path. --- gnu/packages/bash.scm | 2 +- gnu/packages/package-management.scm | 5 +++- gnu/system/vm.scm | 48 +++++++++++++++---------------------- 3 files changed, 24 insertions(+), 31 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 64f7782f58..121a459fa6 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -36,7 +36,7 @@ #:use-module (guix store) #:use-module (guix build-system gnu) #:autoload (guix gnupg) (gnupg-verify*) - #:autoload (guix hash) (port-sha256) + #:autoload (gcrypt hash) (port-sha256) #:autoload (guix base32) (bytevector->nix-base32-string) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 78db0abfa8..e40a94a844 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -213,6 +213,7 @@ ;; Guile-JSON, and Guile-Git automatically. (let* ((out (assoc-ref outputs "out")) (guile (assoc-ref inputs "guile")) + (gcrypt (assoc-ref inputs "guile-gcrypt")) (json (assoc-ref inputs "guile-json")) (sqlite (assoc-ref inputs "guile-sqlite3")) (git (assoc-ref inputs "guile-git")) @@ -220,7 +221,8 @@ "guile-bytestructures")) (ssh (assoc-ref inputs "guile-ssh")) (gnutls (assoc-ref inputs "gnutls")) - (deps (list json sqlite gnutls git bs ssh)) + (deps (list gcrypt json sqlite gnutls + git bs ssh)) (effective (read-line (open-pipe* OPEN_READ @@ -279,6 +281,7 @@ '()))) (propagated-inputs `(("gnutls" ,gnutls) + ("guile-gcrypt" ,guile-gcrypt) ("guile-json" ,guile-json) ("guile-sqlite3" ,guile-sqlite3) ("guile-ssh" ,guile-ssh) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index b505b0cf6b..3898872a46 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -32,7 +32,7 @@ #:use-module (guix modules) #:use-module (guix scripts pack) #:use-module (guix utils) - #:use-module (guix hash) + #:use-module (gcrypt hash) #:use-module (guix base32) #:use-module ((guix self) #:select (make-config.scm)) @@ -43,7 +43,7 @@ #:use-module (gnu packages cdrom) #:use-module (gnu packages compression) #:use-module (gnu packages guile) - #:autoload (gnu packages gnupg) (libgcrypt) + #:autoload (gnu packages gnupg) (guile-gcrypt) #:use-module (gnu packages gawk) #:use-module (gnu packages bash) #:use-module (gnu packages less) @@ -124,10 +124,12 @@ (('gnu rest ...) #t) (rest #f))) -(define guile-sqlite3&co - ;; Guile-SQLite3 and its propagated inputs. - (cons guile-sqlite3 - (package-transitive-propagated-inputs guile-sqlite3))) +(define gcrypt-sqlite3&co + ;; Guile-Gcrypt, Guile-SQLite3, and their propagated inputs. + (append-map (lambda (package) + (cons package + (package-transitive-propagated-inputs package))) + (list guile-gcrypt guile-sqlite3))) (define* (expression->derivation-in-linux-vm name exp #:key @@ -164,10 +166,6 @@ based on the size of the closure of REFERENCES-GRAPHS. When REFERENCES-GRAPHS is true, it must be a list of file name/store path pairs, as for `derivation'. The files containing the reference graphs are made available under the /xchg CIFS share." - (define config - ;; (guix config) module for consumption by (guix gcrypt). - (make-config.scm #:libgcrypt libgcrypt)) - (define user-builder (program-file "builder-in-linux-vm" exp)) @@ -195,12 +193,14 @@ made available under the /xchg CIFS share." (define builder ;; Code that launches the VM that evaluates EXP. - (with-extensions guile-sqlite3&co + (with-extensions gcrypt-sqlite3&co (with-imported-modules `(,@(source-module-closure '((guix build utils) (gnu build vm)) #:select? not-config?) - ((guix config) => ,config)) + + ;; For consumption by (gnu store database). + ((guix config) => ,(make-config.scm))) #~(begin (use-modules (guix build utils) (gnu build vm)) @@ -255,9 +255,6 @@ made available under the /xchg CIFS share." "Return a bootable, stand-alone iso9660 image. INPUTS is a list of inputs (as for packages)." - (define config - (make-config.scm #:libgcrypt libgcrypt)) - (define schema (and register-closures? (local-file (search-path %load-path @@ -265,12 +262,12 @@ INPUTS is a list of inputs (as for packages)." (expression->derivation-in-linux-vm name - (with-extensions guile-sqlite3&co + (with-extensions gcrypt-sqlite3&co (with-imported-modules `(,@(source-module-closure '((gnu build vm) (guix store database) (guix build utils)) #:select? not-config?) - ((guix config) => ,config)) + ((guix config) => ,(make-config.scm))) #~(begin (use-modules (gnu build vm) (guix store database) @@ -347,9 +344,6 @@ INPUTS is a list of inputs (as for packages). When COPY-INPUTS? is true, copy all of INPUTS into the image being built. When REGISTER-CLOSURES? is true, register INPUTS in the store database of the image so that Guix can be used in the image." - (define config - (make-config.scm #:libgcrypt libgcrypt)) - (define schema (and register-closures? (local-file (search-path %load-path @@ -357,13 +351,13 @@ the image." (expression->derivation-in-linux-vm name - (with-extensions guile-sqlite3&co + (with-extensions gcrypt-sqlite3&co (with-imported-modules `(,@(source-module-closure '((gnu build vm) (gnu build bootloader) (guix store database) (guix build utils)) #:select? not-config?) - ((guix config) => ,config)) + ((guix config) => ,(make-config.scm))) #~(begin (use-modules (gnu build bootloader) (gnu build vm) @@ -462,10 +456,6 @@ makes sense when you want to build a GuixSD Docker image that has Guix installed inside of it. If you don't need Guix (e.g., your GuixSD Docker image just contains a web server that is started by the Shepherd), then you should set REGISTER-CLOSURES? to #f." - (define config - ;; (guix config) module for consumption by (guix gcrypt). - (make-config.scm #:libgcrypt libgcrypt)) - (define schema (and register-closures? (local-file (search-path %load-path @@ -475,8 +465,8 @@ should set REGISTER-CLOSURES? to #f." (name -> (string-append name ".tar.gz")) (graph -> "system-graph")) (define build - (with-extensions (cons guile-json ;for (guix docker) - guile-sqlite3&co) ;for (guix store database) + (with-extensions (cons guile-json ;for (guix docker) + gcrypt-sqlite3&co) ;for (guix store database) (with-imported-modules `(,@(source-module-closure '((guix docker) (guix store database) @@ -484,7 +474,7 @@ should set REGISTER-CLOSURES? to #f." (guix build store-copy) (gnu build vm)) #:select? not-config?) - ((guix config) => ,config)) + ((guix config) => ,(make-config.scm))) #~(begin (use-modules (guix docker) (guix build utils) -- cgit v1.2.3 From 95681e55862991a5303449a4eb3961441b337033 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 4 Sep 2018 15:08:13 -0400 Subject: gnu: Zsh: Update to 5.6 [fixes CVE-2018-{0502,13259}]. * gnu/packages/shells.scm (zsh): Update to 5.6. [arguments]: Skip some tests. --- gnu/packages/shells.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 6dbe1c4db7..c3647221aa 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -292,7 +292,7 @@ history mechanism, job control and a C-like syntax.") (define-public zsh (package (name "zsh") - (version "5.5.1") + (version "5.6") (source (origin (method url-fetch) (uri (list (string-append @@ -303,7 +303,7 @@ history mechanism, job control and a C-like syntax.") ".tar.xz"))) (sha256 (base32 - "105aqkdfsdxc4531anrj2zis2ywz6icagjam9lsc235yzh48ihz1")))) + "1mp6h2452z2029n12mxipjv4b0cc8i8sb72g8p8jklg8275iysvl")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-tcsetpgrp" "--enable-pcre") #:phases @@ -336,6 +336,11 @@ history mechanism, job control and a C-like syntax.") (("command -pv") "command -v") (("command -p") "command ") (("'command' -p") "'command' ")) + ;; Several of these tests fail spuriously in the Guix + ;; build environment due to assumptions about PATH and + ;; the location of the test files. It was easier to just + ;; skip them than try to make them work. + (delete-file "Test/A05execution.ztst") #t))))) (native-inputs `(("autoconf" ,autoconf))) (inputs `(("ncurses" ,ncurses) -- cgit v1.2.3 From fcf4841c0ee16631e8330d797cf3788dac0eca05 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 4 Sep 2018 18:33:06 -0400 Subject: gnu: Zsh: Patch some tests that began failing in 5.6. * gnu/packages/shells.scm (zsh)[arguments]: Patch the tests rather than deleting them. --- gnu/packages/shells.scm | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index c3647221aa..900c8ec686 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -336,11 +336,19 @@ history mechanism, job control and a C-like syntax.") (("command -pv") "command -v") (("command -p") "command ") (("'command' -p") "'command' ")) - ;; Several of these tests fail spuriously in the Guix - ;; build environment due to assumptions about PATH and - ;; the location of the test files. It was easier to just - ;; skip them than try to make them work. - (delete-file "Test/A05execution.ztst") + ;; This file is ISO-8859-1 encoded. + (with-fluids ((%default-port-encoding #f)) + (substitute* "Test/A05execution.ztst" + ;; Help it find `sh` + (("PATH=/bin:\\$\\{ZTST_testdir\\}/command.tmp/ tstcmd-slashless") + (string-append "PATH=/bin:" + (assoc-ref %build-inputs "bash") "/bin:" + "${ZTST_testdir}/command.tmp/ tstcmd-slashless")) + ;; Help it find `echo` + (("PATH=/bin:\\$\\{ZTST_testdir\\}/command.tmp tstcmd-arg") + (string-append "PATH=/bin:" + (assoc-ref %build-inputs "coreutils") "/bin:" + "PATH=/bin:${ZTST_testdir}/command.tmp tstcmd-arg")))) #t))))) (native-inputs `(("autoconf" ,autoconf))) (inputs `(("ncurses" ,ncurses) -- cgit v1.2.3 From fefe17b0888b467383ea91fed73a9586295c49f0 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 5 Sep 2018 10:19:25 +0200 Subject: gnu: dolphin-emu: Update to commit 5f0d825. * gnu/packages/emulators.scm (dolphin-emu): Update to commit 5f0d825. --- gnu/packages/emulators.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 8e68c676ef..e02339af62 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -117,8 +117,8 @@ ;; Building from recent Git because the official 5.0 release no longer builds. (define-public dolphin-emu - (let ((commit "806c1ee8f0ed824008185212bfab2658d400b576") - (revision "2")) + (let ((commit "5f0d825f40b8aabe13eaef32d44ab667ff8e8c28") + (revision "3")) (package (name "dolphin-emu") (version (git-version "5.0" revision commit)) @@ -144,7 +144,7 @@ #t)) (sha256 (base32 - "1sdc7rh6z7gjx4kxg18jrv7srfpx1vgf936zg5y43radnlscrh1j")))) + "0dh7mih16aif9ynbgcsn7n10f89g8d232i86xqfp2rijsdggcmzl")))) (build-system cmake-build-system) (arguments '(#:tests? #f -- cgit v1.2.3 From ca1dc4c76a81d289360c0601fed16a7852833d9b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 11:44:15 +0200 Subject: gnu: nss-pam-ldapd: Update to 0.9.10. * gnu/packages/openldap.scm (nss-pam-ldapd): Update to 0.9.10. --- gnu/packages/openldap.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm index 12964e302a..4b615b5d32 100644 --- a/gnu/packages/openldap.scm +++ b/gnu/packages/openldap.scm @@ -108,14 +108,14 @@ (define-public nss-pam-ldapd (package (name "nss-pam-ldapd") - (version "0.9.9") + (version "0.9.10") (source (origin (method url-fetch) (uri (string-append "https://arthurdejong.org/nss-pam-ldapd/" "nss-pam-ldapd-" version ".tar.gz")) (sha256 (base32 - "1lj7qkjlg3bshwdc5x5r1ny37rly4wgm1c8b6w6b5f4wa11nmji0")))) + "1cqamcr6qpgwxijlr6kg7jspjamjra8w0haan0qssn0yxn95d7c0")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 0d7974c376c4b84dd26096ba0c53ed2535afcbc9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 11:07:26 +0200 Subject: gnu: libbigwig: Update to 0.4.2. * gnu/packages/bioinformatics.scm (libbigwig): Update to 0.4.2. [source]: Fetch from git. [arguments]: Disable tests; remove build phases "disable-curl-test" and "create-target-dirs". [native-inputs]: Add python-2. --- gnu/packages/bioinformatics.scm | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index f60fc4c84c..7f865ae878 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1887,42 +1887,33 @@ other types of unwanted sequence from high-throughput sequencing reads.") (define-public libbigwig (package (name "libbigwig") - (version "0.1.4") + (version "0.4.2") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/dpryan79/libBigWig/" - "archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/dpryan79/libBigWig.git") + (commit version))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "098rjh35pi4a9q83n8wiwvyzykjqj6l8q189p1xgfw4ghywdlvw1")))) + "0h2smg24v5srdcqzrmz2g23cmlp4va465mgx8r2z571sfz8pv454")))) (build-system gnu-build-system) (arguments `(#:test-target "test" + #:tests? #f ; tests require access to the web #:make-flags (list "CC=gcc" (string-append "prefix=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases - (delete 'configure) - (add-before 'check 'disable-curl-test - (lambda _ - (substitute* "Makefile" - (("./test/testRemote.*") "")) - #t)) - ;; This has been fixed with the upstream commit 4ff6959cd8a0, but - ;; there has not yet been a release containing this change. - (add-before 'install 'create-target-dirs - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (mkdir-p (string-append out "/lib")) - (mkdir-p (string-append out "/include")) - #t)))))) + (delete 'configure)))) (inputs `(("zlib" ,zlib) ("curl" ,curl))) (native-inputs - `(("doxygen" ,doxygen))) + `(("doxygen" ,doxygen) + ;; Need for tests + ("python" ,python-2))) (home-page "https://github.com/dpryan79/libBigWig") (synopsis "C library for handling bigWig files") (description -- cgit v1.2.3 From 8afdeb87518f09383d93cf0dc9b86bde237ba561 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 11:08:25 +0200 Subject: gnu: python-pybigwig: Update to 0.3.12. * gnu/packages/bioinformatics.scm (python-pybigwig): Update to 0.3.12. [propagated-inputs]: Add python-numpy. --- gnu/packages/bioinformatics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 7f865ae878..05d516165e 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1924,13 +1924,13 @@ files.") (define-public python-pybigwig (package (name "python-pybigwig") - (version "0.2.5") + (version "0.3.12") (source (origin (method url-fetch) (uri (pypi-uri "pyBigWig" version)) (sha256 (base32 - "0yrpdxg3y0sny25x4w22lv1k47jzccqjmg7j4bp0hywklvp0hg7d")) + "00w4kfnm2c5l7wdwr2nj1z5djv8kzgf7h1zhsgv6njff1rwr26g0")) (modules '((guix build utils))) (snippet '(begin @@ -1946,6 +1946,8 @@ files.") (substitute* "setup.py" (("libs=\\[") "libs=[\"BigWig\", ")) #t))))) + (propagated-inputs + `(("python-numpy" ,python-numpy))) (inputs `(("libbigwig" ,libbigwig) ("zlib" ,zlib) -- cgit v1.2.3 From 4fd2622df8615ce3e4d081124bee824315f00f85 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 11:09:01 +0200 Subject: gnu: python-tables: Update to 3.4.4. * gnu/packages/python.scm (python-tables): Update to 3.4.4. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 8cf5550f81..8c7c9d3c33 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6297,14 +6297,14 @@ printing of sub-tables by specifying a row range.") (define-public python-tables (package (name "python-tables") - (version "3.2.2") + (version "3.4.4") (source (origin (method url-fetch) (uri (pypi-uri "tables" version)) (sha256 (base32 - "117s6w7s3yxafpmf3zz3svana7xfrsviw01va1xp7h8ylx8v6r1m")) + "0affz7k8babh8wdmsgrz5jxrd569by2w8ffimcxs9wiaf5rw1idx")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 185948b8a83f583135de050698cff983e46c8145 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 5 Sep 2018 13:57:43 +0200 Subject: gnu: xorg: Fix typo. * gnu/packages/xorg.scm: Fix typo in Benjamin's email address. --- gnu/packages/xorg.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index c89661272b..30e46fac7c 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Kei Kebreau ;;; Copyright © 2018 Oleg Pykhalov -;;; Copyright © 2018 Benjamin Slade +;;; Copyright © 2018 Benjamin Slade ;;; ;;; This file is part of GNU Guix. ;;; -- cgit v1.2.3 From 53166aec987957efba917c83f093817d6cf6e943 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 5 Sep 2018 14:31:48 +0200 Subject: gnu: guix: Update to 3d43017. * gnu/packages/package-management.scm (guix): Update to 3d43017. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index e40a94a844..b0941b50de 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -101,8 +101,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "0.15.0") - (commit "8bbb79cf95a07a40950448a8a09d888254404ed4") - (revision 2)) + (commit "3d43017026f9995ad128915db8ca5eafe061bf75") + (revision 3)) (package (name "guix") @@ -118,7 +118,7 @@ (commit commit))) (sha256 (base32 - "0h83l91v2cg9bb78c7vqx9wj71ckz22jbjmm2fy4vqs9216jnvc0")) + "167rzz2h33xmmchkplwzfq94s5jwdn5nabsq2lb84s54ps0sm89m")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 998100e6e8be64d4cc14e6509f744d3f5c37cf27 Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Wed, 5 Sep 2018 02:10:48 +0800 Subject: gnu: eyed3: Update home page. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/mp3.scm (eyed3)[home-page]: Update to redirected HTTPS URL. Signed-off-by: 宋文武 --- gnu/packages/mp3.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 579127d06e..fb919c6e6c 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -491,7 +491,7 @@ specifically mp3 files containing ID3 metadata (i.e. song info). It provides a command-line tool (eyeD3) and a Python library (import eyed3) that can be used to write your own applications or plugins that are callable from the command-line tool.") - (home-page "http://eyed3.nicfit.net/") + (home-page "https://eyed3.readthedocs.io/en/latest/") (license license:gpl2+))) (define-public chromaprint -- cgit v1.2.3 From 296f091b4879679cf970e1526d919c671c80a473 Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Wed, 5 Sep 2018 02:16:53 +0800 Subject: gnu: packages: mp3: Use HTTPS where possible. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/mp3.scm (libmad)[home-page]: Use HTTPS. (libid3tag)[home-page]: Likewise. (mp3info)[source, home-page]: Likewise. (mpg123)[source]: Likewise. (libmpcdec)[source, home-page]: Likewise. Signed-off-by: 宋文武 --- gnu/packages/mp3.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index fb919c6e6c..c9effbafa3 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -84,7 +84,7 @@ fully implemented. This package contains the library.") (license license:gpl2+) - (home-page "http://www.underbit.com/products/mad/"))) + (home-page "https://www.underbit.com/products/mad/"))) (define-public libid3tag (package @@ -105,7 +105,7 @@ This package contains the library.") "Libid3tag is a library for reading ID3 tags, both ID3v1 and the various versions of ID3v2.") (license license:gpl2+) - (home-page "http://www.underbit.com/products/mad/"))) + (home-page "https://www.underbit.com/products/mad/"))) (define-public id3lib (package @@ -184,7 +184,7 @@ Speex, WavPack TrueAudio, WAV, AIFF, MP4 and ASF files.") (source (origin (method url-fetch) (uri (string-append - "http://ibiblio.org" + "https://ibiblio.org" "/pub/linux/apps/sound/mp3-utils/mp3info/mp3info-" version ".tgz")) (sha256 @@ -231,7 +231,7 @@ Speex, WavPack TrueAudio, WAV, AIFF, MP4 and ASF files.") (inputs `(("gtk+" ,gtk+-2) ("ncurses" ,ncurses))) - (home-page "http://www.ibiblio.org/mp3info/") + (home-page "https://www.ibiblio.org/mp3info/") (synopsis "MP3 technical info viewer and ID3 1.x tag editor") (description "MP3Info is a little utility used to read and modify the ID3 tags of MP3 @@ -309,7 +309,7 @@ This package contains the binary.") (uri (list (string-append "mirror://sourceforge/mpg123/mpg123/" version "/mpg123-" version ".tar.bz2") (string-append - "http://www.mpg123.org/download/mpg123-" + "https://www.mpg123.org/download/mpg123-" version ".tar.bz2"))) (sha256 (base32 @@ -413,7 +413,7 @@ for album and track information.") (source (origin (method url-fetch) (uri (string-append - "http://files.musepack.net/source/libmpcdec-" + "https://files.musepack.net/source/libmpcdec-" version ".tar.bz2")) (sha256 (base32 @@ -424,7 +424,7 @@ for album and track information.") "This library supports decoding of the Musepack (MPC) audio compression format.") (license license:bsd-3) - (home-page "http://musepack.net"))) + (home-page "https://musepack.net"))) (define-public mpc123 (package -- cgit v1.2.3 From b26e4f26ff0bfede3dc17db48dce2936ecd0c129 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 31 Jul 2018 11:04:19 -0500 Subject: gnu: Add SUNDIALS. * gnu/packages/maths.scm (sundials, sundials-openmpi): New variables. --- gnu/packages/maths.scm | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 42136f65ea..c6bcec844b 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4042,3 +4042,80 @@ terminal do calculations simply and quickly. The formula to be calculated can be fed to @command{tcalc} through the command line.") (home-page "https://sites.google.com/site/mohammedisam2000/tcalc") (license license:gpl3+))) + +(define-public sundials + (package + (name "sundials") + (version "3.1.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://computation.llnl.gov/projects/sundials/download/" + "sundials-" version ".tar.gz")) + (sha256 + (base32 + "090s8ymhd0g1s1d44fa73r5yi32hb4biwahhbfi327zd64yn8kd2")))) + (build-system cmake-build-system) + (native-inputs + `(("python" ,python-2))) ;for tests; syntax incompatible with python 3 + (inputs + `(("fortran" ,gfortran) ;for fcmix + ("blas" ,openblas) + ("suitesparse" ,suitesparse))) ;TODO: Add hypre + (arguments + `(#:configure-flags `("-DEXAMPLES_ENABLE_C:BOOL=ON" + "-DEXAMPLES_ENABLE_CXX:BOOL=ON" + "-DEXAMPLES_ENABLE_F77:BOOL=ON" + "-DEXAMPLES_ENABLE_F90:BOOL=ON" + "-DEXAMPLES_INSTALL:BOOL=OFF" + + "-DFCMIX_ENABLE:BOOL=ON" + + "-DKLU_ENABLE:BOOL=ON" + ,(string-append "-DKLU_INCLUDE_DIR=" + (assoc-ref %build-inputs "suitesparse") + "/include") + ,(string-append "-DKLU_LIBRARY_DIR=" + (assoc-ref %build-inputs "suitesparse") + "/lib")))) + (home-page "https://computation.llnl.gov/projects/sundials") + (synopsis "Suite of nonlinear and differential/algebraic equation solvers") + (description "SUNDIALS is a family of software packages implemented with +the goal of providing robust time integrators and nonlinear solvers that can +easily be incorporated into existing simulation codes.") + (license license:bsd-3))) + +(define-public sundials-openmpi + (package (inherit sundials) + (name "sundials-openmpi") + (inputs + `(("mpi" ,openmpi) + ("petsc" ,petsc-openmpi) ;support in SUNDIALS requires MPI + ,@(package-inputs sundials))) + (arguments + (substitute-keyword-arguments (package-arguments sundials) + ((#:configure-flags flags '()) + `(cons* "-DMPI_ENABLE:BOOL=ON" + "-DPETSC_ENABLE:BOOL=ON" + (string-append "-DPETSC_INCLUDE_DIR=" + (assoc-ref %build-inputs "petsc") + "/include") + (string-append "-DPETSC_LIBRARY_DIR=" + (assoc-ref %build-inputs "petsc") + "/lib") + ,flags)) + ((#:phases phases '%standard-phases) + `(modify-phases ,phases + (add-before 'check 'set-test-environment + (lambda _ + ;; By default, running the test suite would fail because 'ssh' + ;; could not be found in $PATH. Define this variable to + ;; placate Open MPI without adding a dependency on OpenSSH (the + ;; agent isn't used anyway.) + (setenv "OMPI_MCA_plm_rsh_agent" (which "cat")) + ;; Allow oversubscription in case there are less + ;; physical cores available in the build environment + ;; than SUNDIALS wants while testing. + (setenv "OMPI_MCA_rmaps_base_oversubscribe" "yes") + #t)))))) + (synopsis "SUNDIALS with OpenMPI support"))) -- cgit v1.2.3 From a3a99e27bb727b0407da13955ef47566a1919629 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 31 Jul 2018 11:31:59 -0500 Subject: petsc: Move example code to "examples" output. * gnu/packages/maths.scm (petsc)[arguments]: New 'move-examples' phase. --- gnu/packages/maths.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index c6bcec844b..ba39531bdb 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1589,6 +1589,8 @@ September 2004}") "petsc-lite-" version ".tar.gz")) (sha256 (base32 "1lajbk3c29hnh83v6cbmm3a8wv6bdykh0p70kwrr4vrnizalk88s")))) + (outputs '("out" ;libraries and headers + "examples")) ;~24MiB of examples (build-system gnu-build-system) (native-inputs `(("python" ,python-2))) @@ -1662,6 +1664,15 @@ September 2004}") "PETScBuildInternal.cmake" ;; Once installed, should uninstall with Guix "uninstall.py")) + #t))) + (add-after 'install 'move-examples + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (examples (assoc-ref outputs "examples")) + (exdir (string-append out "/share/petsc/examples")) + (exdir' (string-append examples "/share/petsc/examples"))) + (copy-recursively exdir exdir') + (delete-file-recursively exdir) #t)))))) (home-page "http://www.mcs.anl.gov/petsc") (synopsis "Library to solve PDEs") -- cgit v1.2.3 From c15be1280e103c781f8c57bb621e92124e8e2cc5 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 31 Jul 2018 11:32:57 -0500 Subject: petsc: Upgrade to 3.9.3. * gnu/packages/maths.scm (petsc): Upgrade to 3.9.3. [arguments]: Remove unnecessary configure flags. --- gnu/packages/maths.scm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index ba39531bdb..ef20f239e5 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1580,7 +1580,7 @@ September 2004}") (define-public petsc (package (name "petsc") - (version "3.8.0") + (version "3.9.3") (source (origin (method url-fetch) @@ -1588,9 +1588,9 @@ September 2004}") (uri (string-append "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/" "petsc-lite-" version ".tar.gz")) (sha256 - (base32 "1lajbk3c29hnh83v6cbmm3a8wv6bdykh0p70kwrr4vrnizalk88s")))) + (base32 "1fwkbwv4g7zf2lc8fw865xd0bl9anb6jaczfis5dff7h449gwa48")))) (outputs '("out" ;libraries and headers - "examples")) ;~24MiB of examples + "examples")) ;~30MiB of examples (build-system gnu-build-system) (native-inputs `(("python" ,python-2))) @@ -1607,11 +1607,7 @@ September 2004}") #:configure-flags `("--with-mpi=0" "--with-openmp=1" - "--with-superlu=1" - ,(string-append "--with-superlu-include=" - (assoc-ref %build-inputs "superlu") "/include") - ,(string-append "--with-superlu-lib=" - (assoc-ref %build-inputs "superlu") "/lib/libsuperlu.a")) + "--with-superlu=1") #:make-flags ;; Honor (parallel-job-count) for build. Do not use --with-make-np, ;; whose value is dumped to $out/lib/petsc/conf/petscvariables. -- cgit v1.2.3 From 3f5e6ccf9be46381b21f63638f89853ee81bfb64 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 31 Jul 2018 12:14:54 -0500 Subject: slepc: Upgrade to 3.9.2. * gnu/packages/maths.scm (slepc): Upgrade to 3.9.2. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index ef20f239e5..d2b9df01a7 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1760,7 +1760,7 @@ savings are consistently > 5x.") (define-public slepc (package (name "slepc") - (version "3.8.2") + (version "3.9.2") (source (origin (method url-fetch) @@ -1768,7 +1768,7 @@ savings are consistently > 5x.") version ".tar.gz")) (sha256 (base32 - "04zd48p43rnvg68p6cp28zll0px5whglc5v0sc3s6vdj1v920z8y")))) + "0gmhdqac8zm3jx43h935z7bflazjnpvqxjv4jh5za2y1z2rqax94")))) (build-system gnu-build-system) (native-inputs `(("python" ,python-2))) -- cgit v1.2.3 From 5e3082df1c8eb07f7c7cd02f118cd9975eb32bb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 5 Sep 2018 15:33:25 +0200 Subject: =?UTF-8?q?gnu:=20guile-fibers:=20Install=20.go=20files=20to=20"?= =?UTF-8?q?=E2=80=A6/site-ccache".?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/guile.scm (guile-fibers)[arguments]: New field. --- gnu/packages/guile.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index a585dd6dc8..f594cd13ed 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -1817,6 +1817,20 @@ Note that 8sync is only available for Guile 2.2.") (base32 "0vjkg72ghgdgphzbjz9ig8al8271rq8974viknb2r1rg4lz92ld0")))) (build-system gnu-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (add-after 'install 'mode-guile-objects + (lambda* (#:key outputs #:allow-other-keys) + ;; .go files are installed to "lib/guile/X.Y/cache". + ;; This phase moves them to "…/site-ccache". + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib/guile")) + (old (car (find-files lib "^ccache$" + #:directories? #t))) + (new (string-append (dirname old) + "/site-ccache"))) + (rename-file old new) + #t)))))) (native-inputs `(("texinfo" ,texinfo) ("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 7903f00a74871ac4ecd41878ac9846fdae91e276 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 5 Sep 2018 14:46:28 +0200 Subject: gnu: cuirass: Add dependency on Guile-Gcrypt. This is a followup to 53166aec987957efba917c83f093817d6cf6e943, which added a hard dependency of Guix on Guile-Gcrypt. * gnu/packages/ci.scm (cuirass)[inputs]: Add GUILE-GCRYPT. [arguments]: In 'wrap-program' phase, use 'string-join' to compute 'mods'. Define 'objs' for use in GUILE_LOAD_COMPILED_PATH, and take objects from lib/guile/X.Y/site-ccache. --- gnu/packages/ci.scm | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index e26983da3b..067a288004 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -32,6 +32,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages databases) #:use-module (gnu packages guile) + #:use-module (gnu packages gnupg) #:use-module (gnu packages mail) #:use-module (gnu packages package-management) #:use-module (gnu packages perl) @@ -223,39 +224,42 @@ their dependencies.") (lambda* (#:key inputs outputs #:allow-other-keys) ;; Wrap the 'cuirass' command to refer to the right modules. (let* ((out (assoc-ref outputs "out")) + (gcrypt (assoc-ref inputs "guile-gcrypt")) (json (assoc-ref inputs "guile-json")) (sqlite (assoc-ref inputs "guile-sqlite3")) (git (assoc-ref inputs "guile-git")) (bytes (assoc-ref inputs "guile-bytestructures")) (fibers (assoc-ref inputs "guile-fibers")) (guix (assoc-ref inputs "guix")) + (deps (list gcrypt json sqlite git bytes fibers guix)) (guile (assoc-ref %build-inputs "guile")) (effective (read-line (open-pipe* OPEN_READ (string-append guile "/bin/guile") "-c" "(display (effective-version))"))) - (mods (string-append json "/share/guile/site/" - effective ":" - git "/share/guile/site/" - effective ":" - bytes "/share/guile/site/" - effective ":" - sqlite "/share/guile/site/" - effective ":" - fibers "/share/guile/site/" - effective ":" - guix "/share/guile/site/" - effective))) + (mods (string-drop-right ;drop trailing colon + (string-join deps + (string-append "/share/guile/site/" + effective ":") + 'suffix) + 1)) + (objs (string-drop-right + (string-join deps + (string-append "/lib/guile/" effective + "/site-ccache:") + 'suffix) + 1))) ;; Make sure 'cuirass' can find the 'evaluate' command, as ;; well as the relevant Guile modules. (wrap-program (string-append out "/bin/cuirass") `("PATH" ":" prefix (,(string-append out "/bin"))) `("GUILE_LOAD_PATH" ":" prefix (,mods)) - `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,mods))) + `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,objs))) #t)))))) (inputs `(("guile" ,guile-2.2) ("guile-fibers" ,guile-fibers) + ("guile-gcrypt" ,guile-gcrypt) ("guile-json" ,guile-json) ("guile-sqlite3" ,guile-sqlite3) ("guile-git" ,guile-git) -- cgit v1.2.3 From 3b0153bd828f68804f7226ca655d26aaa1a0c065 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 5 Sep 2018 15:48:04 +0200 Subject: gnu: guix-daemon: Add dependency on Guile-Gcrypt. This is a followup to 53166aec987957efba917c83f093817d6cf6e943, which made Guile-Gcrypt a hard dependency. * gnu/packages/package-management.scm (guix-daemon)[inputs]: Add GUILE-GCRYPT. --- gnu/packages/package-management.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index b0941b50de..529d2943c4 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -317,6 +317,7 @@ the Nix package manager.") (inputs `(("gnutls" ,gnutls) ("guile-git" ,guile-git) + ("guile-gcrypt" ,guile-gcrypt) ,@(fold alist-delete (package-inputs guix) '("boot-guile" "boot-guile/i686" "util-linux")))) -- cgit v1.2.3 From 356230da4a77eef1345e4b2079db7020df98cdc6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 12:26:56 +0200 Subject: gnu: Add r-fansi. * gnu/packages/cran.scm (r-fansi): New variable. --- gnu/packages/cran.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 016d1b1e41..be64aa3a98 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4424,6 +4424,27 @@ packages. It contains also functions for simplifying some clustering analysis steps and provides ggplot2-based elegant data visualization.") (license license:gpl2))) +(define-public r-fansi + (package + (name "r-fansi") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "fansi" version)) + (sha256 + (base32 + "135qj7bcc3mwn0vg55hiiadf66lx6zaxvkicfmfw9x0zr7ah2r6x")))) + (build-system r-build-system) + (native-inputs + `(("r-knitr" ,r-knitr))) ; for vignettes + (home-page "https://github.com/brodieG/fansi") + (synopsis "ANSI control sequence aware string functions") + (description + "This package provides counterparts to R string manipulation functions +that account for the effects of ANSI text formatting control sequences.") + (license license:gpl2+))) + (define-public r-nbclust (package (name "r-nbclust") -- cgit v1.2.3 From 53718658d20388f47fcf3747264f454c944c451e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 12:56:40 +0200 Subject: gnu: Add r-polynom. * gnu/packages/cran.scm (r-polynom): New variable. --- gnu/packages/cran.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index be64aa3a98..a142e9f1c7 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4516,6 +4516,25 @@ patterned after functions in the Python @code{itertools} module, and others patterned after functions in the snow package.") (license license:gpl2))) +(define-public r-polynom + (package + (name "r-polynom") + (version "1.3-9") + (source + (origin + (method url-fetch) + (uri (cran-uri "polynom" version)) + (sha256 + (base32 + "1s4xxv5rvpigawknvq27v9vzvs83phfsj5h8mim2lmf5bj950nnk")))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/web/packages/polynom/") + (synopsis "Functions for univariate polynomial manipulations") + (description + "This package provides a collection of functions to implement a class for +univariate polynomial manipulations.") + (license license:gpl2))) + (define-public r-writexl (package (name "r-writexl") -- cgit v1.2.3 From dd954dd7436b47494c8708cefd0856bf6719ac68 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 13:38:39 +0200 Subject: gnu: Add r-gbrd. * gnu/packages/cran.scm (r-gbrd): New variable. --- gnu/packages/cran.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a142e9f1c7..64dba2c9de 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4535,6 +4535,27 @@ patterned after functions in the snow package.") univariate polynomial manipulations.") (license license:gpl2))) +(define-public r-gbrd + (package + (name "r-gbrd") + (version "0.4-11") + (source + (origin + (method url-fetch) + (uri (cran-uri "gbRd" version)) + (sha256 + (base32 + "06x97rw5i6v6cgjxkfhxnw4dn7lghn5q6ra7ri5ag1x9dkfzcl82")))) + (properties `((upstream-name . "gbRd"))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/web/packages/gbRd/") + (synopsis "Utilities for processing Rd objects and files") + (description + "This package provides utilities for processing Rd objects and files. +Extract argument descriptions and other parts of the help pages of +functions.") + (license license:gpl2+))) + (define-public r-writexl (package (name "r-writexl") -- cgit v1.2.3 From 6a8469755cd63a2fd9deb617962bff22f8542485 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 13:38:51 +0200 Subject: gnu: Add r-rdpack. * gnu/packages/cran.scm (r-rdpack): New variable. --- gnu/packages/cran.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 64dba2c9de..f09bdbd06f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4556,6 +4556,33 @@ Extract argument descriptions and other parts of the help pages of functions.") (license license:gpl2+))) +(define-public r-rdpack + (package + (name "r-rdpack") + (version "0.9-0") + (source + (origin + (method url-fetch) + (uri (cran-uri "Rdpack" version)) + (sha256 + (base32 + "067w0w6kza0hkzcnx58danl83yfvl9yjacr47mnid2bg856gdd1b")))) + (properties `((upstream-name . "Rdpack"))) + (build-system r-build-system) + (propagated-inputs + `(("r-bibtex" ,r-bibtex) + ("r-gbrd" ,r-gbrd))) + (home-page "https://github.com/GeoBosh/Rdpack") + (synopsis "Update and manipulate Rd documentation objects") + (description + "This package provides functions for manipulation of R documentation +objects, including functions @code{reprompt()} and @code{ereprompt()} for +updating Rd documentation for functions, methods and classes; it also includes +Rd macros for citations and import of references from bibtex files for use in +Rd files and roxygen2 comments, as well as many functions for manipulation of +references and Rd files.") + (license license:gpl2+))) + (define-public r-writexl (package (name "r-writexl") -- cgit v1.2.3 From 88e4ed55d68ffeaf67e5dad128f0e762e5814d26 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 13:41:11 +0200 Subject: gnu: Add r-clipr. * gnu/packages/cran.scm (r-clipr): New variable. --- gnu/packages/cran.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f09bdbd06f..2082378aae 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -43,6 +43,25 @@ #:use-module (gnu packages tls) #:use-module (gnu packages web)) +(define-public r-clipr + (package + (name "r-clipr") + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "clipr" version)) + (sha256 + (base32 + "061x84ildc7g1p91yw5iyj8lpqdf4hqv36as85lw8c6qv9ywbsqv")))) + (build-system r-build-system) + (home-page "https://github.com/mdlincoln/clipr") + (synopsis "Read and write from the system clipboard") + (description + "This package provides simple utility functions to read from and write to +the system clipboards.") + (license license:gpl3))) + (define-public r-tidyverse (package (name "r-tidyverse") -- cgit v1.2.3 From 65050163e01d40d197f57748dc82072026676445 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 13:42:00 +0200 Subject: gnu: r-chippeakanno: Update to 3.14.1. * gnu/packages/bioconductor.scm (r-chippeakanno): Update to 3.14.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 7e993189d6..1ff86779e8 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -363,14 +363,14 @@ expressed genes in DNA microarray experiments.") (define-public r-chippeakanno (package (name "r-chippeakanno") - (version "3.14.0") + (version "3.14.1") (source (origin (method url-fetch) (uri (bioconductor-uri "ChIPpeakAnno" version)) (sha256 (base32 - "1kcnc3cnmrhdk1x7q3y6zsz09pgd3xn9xy1hfbxz48cajlb18ad0")))) + "1cn1hfc3nvsf2n3563lkmvwjxfbiygx7f84zk683p89gy7zi1gyj")))) (properties `((upstream-name . "ChIPpeakAnno"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From ce0e762bf926bcd6f126466c3556a820833621ba Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 13:44:42 +0200 Subject: gnu: r-annotationforge: Update to 1.22.2. * gnu/packages/bioinformatics.scm (r-annotationforge): Update to 1.22.2. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 05d516165e..6028311b3c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6371,14 +6371,14 @@ exploration of the results.") (define-public r-annotationforge (package (name "r-annotationforge") - (version "1.22.0") + (version "1.22.2") (source (origin (method url-fetch) (uri (bioconductor-uri "AnnotationForge" version)) (sha256 (base32 - "12ffj7h95adiya5mzyjxazqn1qgr434ajpabfcyhrj5v83s4vk65")))) + "17kmy7nvpyyj6w5jyrjciw87rydmmmc8q6cnwqjv1j7li9bp09gr")))) (properties `((upstream-name . "AnnotationForge"))) (build-system r-build-system) -- cgit v1.2.3 From 3c0437561401986d90de358a8d5fae50d6593261 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 13:46:03 +0200 Subject: gnu: r-biocviews: Update to 1.48.3. * gnu/packages/bioinformatics.scm (r-biocviews): Update to 1.48.3. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 6028311b3c..e900bd6194 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6957,13 +6957,13 @@ Bioconductor, CRAN, and Github.") (define-public r-biocviews (package (name "r-biocviews") - (version "1.48.2") + (version "1.48.3") (source (origin (method url-fetch) (uri (bioconductor-uri "biocViews" version)) (sha256 (base32 - "01yiafayl1m5704xdd2cn3zjc78rs10dqyz66lr3qkf6d8w66938")))) + "1rxvwikqivsgxjjcazlszy8xgz346lfh5rw4llxw6fz38fjgb0k5")))) (properties `((upstream-name . "biocViews"))) (build-system r-build-system) -- cgit v1.2.3 From 5728d9c6c081b7a0eeb6d29ec221d4638f6dd083 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 13:46:20 +0200 Subject: gnu: r-iranges: Update to 2.14.11. * gnu/packages/bioinformatics.scm (r-iranges): Update to 2.14.11. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index e900bd6194..5aec3cc6ae 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7176,13 +7176,13 @@ utilities for sequence data management under the ACNUC system.") (define-public r-iranges (package (name "r-iranges") - (version "2.14.10") + (version "2.14.11") (source (origin (method url-fetch) (uri (bioconductor-uri "IRanges" version)) (sha256 (base32 - "10ccw930vfmkskkrzbps14xglqlkxf588623dr7f1a9ckx7yr2p6")))) + "0wz63hysspyjihqadg91dbvllc5a61zzjrsz0b9498lihqc6m1la")))) (properties `((upstream-name . "IRanges"))) (build-system r-build-system) -- cgit v1.2.3 From 1adf4596a6d268c3d2a249d235569631f8df306f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 13:48:36 +0200 Subject: gnu: r-edger: Update to 3.22.3. * gnu/packages/bioinformatics.scm (r-edger): Update to 3.22.3. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 5aec3cc6ae..b6b6e7267c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7256,13 +7256,13 @@ names in their natural, rather than lexicographic, order.") (define-public r-edger (package (name "r-edger") - (version "3.22.2") + (version "3.22.3") (source (origin (method url-fetch) (uri (bioconductor-uri "edgeR" version)) (sha256 (base32 - "07py2g6vg9jbflwhc1hnzr2silbinrjwxq3mkq30nzjgf0n0hrf3")))) + "0w3jv29n0kkaiig8dbbdqy2dkng8xfaihch82mj9ci5hphrx3nng")))) (properties `((upstream-name . "edgeR"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 33a103a54393f4e8994b2cb46f6be7d8942cc42e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 13:51:48 +0200 Subject: gnu: r-variantannotation: Update to 1.26.1. * gnu/packages/bioinformatics.scm (r-variantannotation): Update to 1.26.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b6b6e7267c..6efb6f1c1b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7284,13 +7284,13 @@ CAGE.") (define-public r-variantannotation (package (name "r-variantannotation") - (version "1.26.0") + (version "1.26.1") (source (origin (method url-fetch) (uri (bioconductor-uri "VariantAnnotation" version)) (sha256 (base32 - "06bccdf57vja7m63chmgc4539lwng3q3b8zxn285fj8524l6mcn7")))) + "1r55ki951dj81qvy73knfcy69ik5vzkd56wnk3f6vvf9vngqb8jr")))) (properties `((upstream-name . "VariantAnnotation"))) (inputs -- cgit v1.2.3 From 688cb0852706d1e2d0cc03c707a04098ab59b98b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 13:52:03 +0200 Subject: gnu: r-limma: Update to 3.36.3. * gnu/packages/bioinformatics.scm (r-limma): Update to 3.36.3. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 6efb6f1c1b..29558768c0 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7322,13 +7322,13 @@ coding changes and predict coding outcomes.") (define-public r-limma (package (name "r-limma") - (version "3.36.1") + (version "3.36.3") (source (origin (method url-fetch) (uri (bioconductor-uri "limma" version)) (sha256 (base32 - "1982g5v35ilfgxm2vkq1p3j1bbir795pjvfzx4nzam2rlqqymbqm")))) + "0iiifszr6hcqih6kszdsbkx3gacfg3d7v8hdx0lbjqnjqgqz7pwk")))) (build-system r-build-system) (home-page "http://bioinf.wehi.edu.au/limma") (synopsis "Package for linear models for microarray and RNA-seq data") -- cgit v1.2.3 From 1d56c79f86cd0c776e76a1bece26622f56c28f12 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 13:52:53 +0200 Subject: gnu: r-genomicranges: Update to 1.32.6. * gnu/packages/bioinformatics.scm (r-genomicranges): Update to 1.32.6. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 29558768c0..2b467145d0 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7377,13 +7377,13 @@ different technologies, including microarrays, RNA-seq, and quantitative PCR.") (define-public r-genomicranges (package (name "r-genomicranges") - (version "1.32.3") + (version "1.32.6") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicRanges" version)) (sha256 (base32 - "03gmka6rlz18vd4229796l5l3l6446v5cb90sn2nb5knjbp84hni")))) + "0p58yk2i5gqvjlkx548mnrr49wvs0xfcl06l9rqj2hi6hkkbvnp3")))) (properties `((upstream-name . "GenomicRanges"))) (build-system r-build-system) -- cgit v1.2.3 From a02340058c15a22cf8c942c96d0053b8e0881452 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 13:58:33 +0200 Subject: gnu: r-biocparallel: Update to 1.14.2. * gnu/packages/bioinformatics.scm (r-biocparallel): Update to 1.14.2. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 2b467145d0..9d55198f4f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7488,13 +7488,13 @@ powerful online queries from gene annotation to database mining.") (define-public r-biocparallel (package (name "r-biocparallel") - (version "1.14.1") + (version "1.14.2") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocParallel" version)) (sha256 (base32 - "00qg1kg2l9qqpyjaw5q910cmf84vwfiw1fhsx3ig784gwinwgj6n")))) + "1llb5a62hn4yxpdgqdh2l7i5zd06mjkk8hagsna69cq65wv6iifm")))) (properties `((upstream-name . "BiocParallel"))) (build-system r-build-system) -- cgit v1.2.3 From 3e61c2a8b1dfbc03f9506aaf10df57651728a7d8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 13:58:44 +0200 Subject: gnu: r-rsamtools: Update to 1.32.3. * gnu/packages/bioinformatics.scm (r-rsamtools): Update to 1.32.3. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9d55198f4f..c682399ace 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7539,13 +7539,13 @@ biological sequences or sets of sequences.") (define-public r-rsamtools (package (name "r-rsamtools") - (version "1.32.0") + (version "1.32.3") (source (origin (method url-fetch) (uri (bioconductor-uri "Rsamtools" version)) (sha256 (base32 - "1s65y5wn4d0x8zsljg2kmhcl6r9884h95kr041j7hp49bmxg3an6")))) + "1hpjr22h33pf4fgv0sj83rqzv6l5l7s6fpmmqvchh45ikks1mnhq")))) (properties `((upstream-name . "Rsamtools"))) (build-system r-build-system) -- cgit v1.2.3 From aea1b6fb8a9b48b35139e146faffaf27463091b8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 13:59:06 +0200 Subject: gnu: r-delayedarray: Update to 0.6.5. * gnu/packages/bioinformatics.scm (r-delayedarray): Update to 0.6.5. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index c682399ace..d9d70ea97b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7583,13 +7583,13 @@ files.") (define-public r-delayedarray (package (name "r-delayedarray") - (version "0.6.1") + (version "0.6.5") (source (origin (method url-fetch) (uri (bioconductor-uri "DelayedArray" version)) (sha256 (base32 - "0sjwszxdi0vkj2i2di5i46gh9chc660yr3gs5nk9qnqp77713zds")))) + "10b03zrnvz5isfh4z55hasya2m71lrfx10l5lm2sdmqs0gwkanrd")))) (properties `((upstream-name . "DelayedArray"))) (build-system r-build-system) -- cgit v1.2.3 From f2e79823c697843afd880e79e7f810ad69411722 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 13:59:25 +0200 Subject: gnu: r-rtracklayer: Update to 1.40.6. * gnu/packages/bioinformatics.scm (r-rtracklayer): Update to 1.40.6. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index d9d70ea97b..3610f823dc 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7678,13 +7678,13 @@ alignments.") (define-public r-rtracklayer (package (name "r-rtracklayer") - (version "1.40.3") + (version "1.40.6") (source (origin (method url-fetch) (uri (bioconductor-uri "rtracklayer" version)) (sha256 (base32 - "0kvsjdaypn1jnxbnsxpycildwdyxwnjkigfq8qm8mlyfc4ahdgy3")))) + "1wxxxlyps19dw3i0pw4mlm3kinnswsc35rgvlnbwvpnpjbca6w4l")))) (build-system r-build-system) (arguments `(#:phases -- cgit v1.2.3 From ad2ed8d01fa3a5486072f0f484beb74129928796 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 13:59:44 +0200 Subject: gnu: r-genomicfeatures: Update to 1.32.2. * gnu/packages/bioinformatics.scm (r-genomicfeatures): Update to 1.32.2. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 3610f823dc..0631d59651 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7725,13 +7725,13 @@ as well as query and modify the browser state, such as the current viewport.") (define-public r-genomicfeatures (package (name "r-genomicfeatures") - (version "1.32.0") + (version "1.32.2") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicFeatures" version)) (sha256 (base32 - "1cqcl72q0k5wylw1brn4g4h7xzys1v06piry19cvp0gjcvm5sp7a")))) + "0kfyyg1ib8fkq2hxraal10z4bx3rg8figdskw4yhn1mbh6l42q5f")))) (properties `((upstream-name . "GenomicFeatures"))) (build-system r-build-system) -- cgit v1.2.3 From 48b21f8b6b7fcd6d0857fc1ac75dddb52bbabdf4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:00:00 +0200 Subject: gnu: r-seqminer: Update to 6.1. * gnu/packages/bioinformatics.scm (r-seqminer): Update to 6.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 0631d59651..878f5723da 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9321,14 +9321,14 @@ unmodeled, or latent sources of noise.") (define-public r-seqminer (package (name "r-seqminer") - (version "6.0") + (version "6.1") (source (origin (method url-fetch) (uri (cran-uri "seqminer" version)) (sha256 (base32 - "057j1l6dip35l1aivilapl2zv9db677b3di2pb3sfgq2sxg0ps3l")))) + "15yhg4vfc7jg1jnqb3371j00pgbmbyc9l1xx63hq1l3p34lazq2l")))) (build-system r-build-system) (inputs `(("zlib" ,zlib))) -- cgit v1.2.3 From 4ee8c37cca305dd7c581a7bf0fcf82fa351104a8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:00:56 +0200 Subject: gnu: r-maldiquant: Update to 1.18. * gnu/packages/bioinformatics.scm (r-maldiquant): Update to 1.18. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 878f5723da..5b8a1a23b0 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9375,14 +9375,14 @@ trait.") (define-public r-maldiquant (package (name "r-maldiquant") - (version "1.17") + (version "1.18") (source (origin (method url-fetch) (uri (cran-uri "MALDIquant" version)) (sha256 (base32 - "047s6007ydc38x8wm027mlb4mngz15n0d4238fr8h43wyll5zy0z")))) + "18nl214xjsxkcpbg79jkmw0yznwm5szyh2qb84n7ip46mm779ha6")))) (properties `((upstream-name . "MALDIquant"))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/MALDIquant") -- cgit v1.2.3 From 07bd90ce90784eb6803c581a18d8b335ce49e1bd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:01:19 +0200 Subject: gnu: r-msnbase: Update to 2.6.3. * gnu/packages/bioinformatics.scm (r-msnbase): Update to 2.6.3. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 5b8a1a23b0..01603d2937 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9619,14 +9619,14 @@ structure (pcaRes) to provide a common interface to the PCA results.") (define-public r-msnbase (package (name "r-msnbase") - (version "2.6.1") + (version "2.6.3") (source (origin (method url-fetch) (uri (bioconductor-uri "MSnbase" version)) (sha256 (base32 - "0zrpx9r93q5ca2zdak5rs2m9sjm0wjdra1xfj3d3sx6p5gzfyg6n")))) + "15jhqg02ypmznc0wxksw56yij02csy678vqy531fdv86fsmypwa0")))) (properties `((upstream-name . "MSnbase"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 6f6aef80e3def1ffa7c8e4b0f75b22bd2ececc74 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:20:56 +0200 Subject: gnu: r-seurat: Update to 2.3.4. * gnu/packages/bioinformatics.scm (r-seurat): Update to 2.3.4. [source]: Remove snippet. [arguments]: Remove. [native-inputs]: Remove. [propagated-inputs]: Remove r-caret, r-diffusionmap, r-fnn, r-gdata, r-ranger, r-stringr, r-tclust, and rvgam; add r-httr. --- gnu/packages/bioinformatics.scm | 39 ++++----------------------------------- 1 file changed, 4 insertions(+), 35 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 01603d2937..c29122b0cf 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9701,58 +9701,31 @@ and irregular enzymatic cleavages, mass measurement accuracy, etc.") (define-public r-seurat (package (name "r-seurat") - (version "2.3.2") + (version "2.3.4") (source (origin (method url-fetch) (uri (cran-uri "Seurat" version)) (sha256 (base32 - "1sjpy5rrpvlpm6hs7qy7qpglgbp7zrgfybcsalpmjb51rhxhgcg1")) - ;; Delete pre-built jar. - (snippet - '(begin (delete-file "inst/java/ModularityOptimizer.jar") - #t)))) + "0l8bv4i9nzz26mirnva10mq6pimibj24vk7vpvfypgn7xk4942hd")))) (properties `((upstream-name . "Seurat"))) (build-system r-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'build-jar - (lambda* (#:key inputs #:allow-other-keys) - (let ((classesdir "tmp-classes")) - (setenv "JAVA_HOME" (assoc-ref inputs "jdk")) - (mkdir classesdir) - (with-output-to-file "manifest" - (lambda _ - (display "Manifest-Version: 1.0 -Main-Class: ModularityOptimizer\n"))) - (and (zero? (apply system* `("javac" "-d" ,classesdir - ,@(find-files "java" "\\.java$")))) - (zero? (system* "jar" - "-cmf" "manifest" - "inst/java/ModularityOptimizer.jar" - "-C" classesdir "."))))))))) - (native-inputs - `(("jdk" ,icedtea "jdk"))) (propagated-inputs `(("r-ape" ,r-ape) - ("r-caret" ,r-caret) ("r-cluster" ,r-cluster) ("r-cowplot" ,r-cowplot) - ("r-diffusionmap" ,r-diffusionmap) ("r-dosnow" ,r-dosnow) ("r-dplyr" ,r-dplyr) ("r-dtw" ,r-dtw) ("r-fitdistrplus" ,r-fitdistrplus) - ("r-fnn" ,r-fnn) ("r-foreach" ,r-foreach) ("r-fpc" ,r-fpc) - ("r-gdata" ,r-gdata) ("r-ggplot2" ,r-ggplot2) ("r-ggridges" ,r-ggridges) ("r-gplots" ,r-gplots) ("r-hdf5r" ,r-hdf5r) ("r-hmisc" ,r-hmisc) + ("r-httr" ,r-httr) ("r-ica" ,r-ica) ("r-igraph" ,r-igraph) ("r-irlba" ,r-irlba) @@ -9765,7 +9738,6 @@ Main-Class: ModularityOptimizer\n"))) ("r-pbapply" ,r-pbapply) ("r-plotly" ,r-plotly) ("r-png" ,r-png) - ("r-ranger" ,r-ranger) ("r-rann" ,r-rann) ("r-rcolorbrewer" ,r-rcolorbrewer) ("r-rcpp" ,r-rcpp) @@ -9776,11 +9748,8 @@ Main-Class: ModularityOptimizer\n"))) ("r-rocr" ,r-rocr) ("r-rtsne" ,r-rtsne) ("r-sdmtools" ,r-sdmtools) - ("r-stringr" ,r-stringr) - ("r-tclust" ,r-tclust) ("r-tidyr" ,r-tidyr) - ("r-tsne" ,r-tsne) - ("r-vgam" ,r-vgam))) + ("r-tsne" ,r-tsne))) (home-page "http://www.satijalab.org/seurat") (synopsis "Seurat is an R toolkit for single cell genomics") (description -- cgit v1.2.3 From c273bcdfce1f1cac53990e6c26455fb6a749763f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:22:33 +0200 Subject: gnu: r-diffusionmap: Update to 1.1-0.1. * gnu/packages/graph.scm (r-diffusionmap): Update to 1.1-0.1. --- gnu/packages/graph.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index b393919e66..998e4ead46 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -130,14 +130,14 @@ more.") (define-public r-diffusionmap (package (name "r-diffusionmap") - (version "1.1-0") + (version "1.1-0.1") (source (origin (method url-fetch) (uri (cran-uri "diffusionMap" version)) (sha256 (base32 - "1l985q2hfc8ss5afajik4p25dx628yikvhdimz5s0pql800q2yv3")))) + "11l4kbciawvli5nlsi4qaf8afmgk5xgqiqpdyhvaqri5mx0zhk5j")))) (properties `((upstream-name . "diffusionMap"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From eb251fe524127e5490b26e86a4c826bb6c79003c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:22:44 +0200 Subject: gnu: r-igraph: Update to 1.2.2. * gnu/packages/graph.scm (r-igraph): Update to 1.2.2. --- gnu/packages/graph.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index 998e4ead46..3b222d6ee8 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -98,14 +98,14 @@ more.") (define-public r-igraph (package (name "r-igraph") - (version "1.2.1") + (version "1.2.2") (source (origin (method url-fetch) (uri (cran-uri "igraph" version)) (sha256 (base32 - "1hcr6b1lz030lgay1bz8y8sxaf2j93ds8n8gsqr6qhssz141hd2m")))) + "1bggm7b8v3bh7q2589w26qvd7sgs69m4qiij7d0rbm0ykkgxm8lx")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) -- cgit v1.2.3 From 3c553046888943842d953012759aacde255c4e0c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:27:26 +0200 Subject: gnu: r-edaseq: Update to 2.14.1. * gnu/packages/bioinformatics.scm (r-edaseq): Update to 2.14.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index c29122b0cf..0860d85bab 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9822,14 +9822,14 @@ distribution.") (define-public r-edaseq (package (name "r-edaseq") - (version "2.14.0") + (version "2.14.1") (source (origin (method url-fetch) (uri (bioconductor-uri "EDASeq" version)) (sha256 (base32 - "1832pb3jkim4vrqzb8lajwx9r482bhww5n9nz3s6crvyamlp2dj0")))) + "0970w9d5ddqw1qxqqafdidkxh6hmcv9j5djwgnpz3fgl05kmysg8")))) (properties `((upstream-name . "EDASeq"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From ff7c7d62f464d0a8d5e91ef058579ad03247d817 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:29:51 +0200 Subject: gnu: r-keggrest: Update to 1.20.1. * gnu/packages/bioinformatics.scm (r-keggrest): Update to 1.20.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 0860d85bab..eb7d2b840a 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9949,14 +9949,14 @@ microarrays or GRanges for sequencing data.") (define-public r-keggrest (package (name "r-keggrest") - (version "1.20.0") + (version "1.20.1") (source (origin (method url-fetch) (uri (bioconductor-uri "KEGGREST" version)) (sha256 (base32 - "1349vidgl9m10l1rbrp3pkwwgi2xcbsw9h9z2xqbvg97lmqc4r8j")))) + "1ss0xd5570x570v01r6lp64rr1apjrzp0j62520pvm3g8knjhfvs")))) (properties `((upstream-name . "KEGGREST"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 70daf9362b328079886ed7854e6afe4d96181323 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:30:16 +0200 Subject: gnu: r-biovizbase: Update to 1.28.2. * gnu/packages/bioinformatics.scm (r-biovizbase): Update to 1.28.2. [propagated-inputs]: Add r-rlang. --- gnu/packages/bioinformatics.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index eb7d2b840a..f65dad5f96 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10169,14 +10169,14 @@ the fact that each of these packages implements a select methods.") (define-public r-biovizbase (package (name "r-biovizbase") - (version "1.28.0") + (version "1.28.2") (source (origin (method url-fetch) (uri (bioconductor-uri "biovizBase" version)) (sha256 (base32 - "0lkiqdr3ics6hgv47lwkykcy761823bbkhffbn4ykyfzyqwl4p67")))) + "0wc45j3hfn01i44bkkxjj3n8b8xzbkkcdv35mrkzb1f9yprkf8gq")))) (properties `((upstream-name . "biovizBase"))) (build-system r-build-system) (propagated-inputs @@ -10193,6 +10193,7 @@ the fact that each of these packages implements a select methods.") ("r-hmisc" ,r-hmisc) ("r-iranges" ,r-iranges) ("r-rcolorbrewer" ,r-rcolorbrewer) + ("r-rlang" ,r-rlang) ("r-rsamtools" ,r-rsamtools) ("r-s4vectors" ,r-s4vectors) ("r-scales" ,r-scales) -- cgit v1.2.3 From 16527f1cbc8af73b1034ddce2edf9e2bce094564 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:31:06 +0200 Subject: gnu: r-ggbio: Update to 1.28.5. * gnu/packages/bioinformatics.scm (r-ggbio): Update to 1.28.5. [propagated-inputs]: Add r-rlang. --- gnu/packages/bioinformatics.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index f65dad5f96..9882356a08 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10211,14 +10211,14 @@ effort and encourages consistency.") (define-public r-ggbio (package (name "r-ggbio") - (version "1.28.0") + (version "1.28.5") (source (origin (method url-fetch) (uri (bioconductor-uri "ggbio" version)) (sha256 (base32 - "0wszh3w8yia5zw758h837i1q35k99sn444y2hahcxqbdmmlbf7in")))) + "19s2v40fycwf44fl3lm791y635xzw67b30sq2g0qq4a6phjik42d")))) (build-system r-build-system) (propagated-inputs `(("r-annotationdbi" ,r-annotationdbi) @@ -10241,6 +10241,7 @@ effort and encourages consistency.") ("r-iranges" ,r-iranges) ("r-organismdbi" ,r-organismdbi) ("r-reshape2" ,r-reshape2) + ("r-rlang" ,r-rlang) ("r-rsamtools" ,r-rsamtools) ("r-rtracklayer" ,r-rtracklayer) ("r-s4vectors" ,r-s4vectors) -- cgit v1.2.3 From e69c07e61a870861f5c9d9f114e2783cba213934 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:32:25 +0200 Subject: gnu: r-hdf5array: Update to 1.8.1. * gnu/packages/bioinformatics.scm (r-hdf5array): Update to 1.8.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9882356a08..53bf86180f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10696,14 +10696,14 @@ problems in genomics, brain imaging, astrophysics, and data mining.") (define-public r-hdf5array (package (name "r-hdf5array") - (version "1.8.0") + (version "1.8.1") (source (origin (method url-fetch) (uri (bioconductor-uri "HDF5Array" version)) (sha256 (base32 - "1l0276qxkhgdxsfck3jmi8jvnsr20g10gjki53g0mqa45wnhm3ck")))) + "1s44zgm9jg82bk4b8k3dh7xw7mxychlfm3grs8516mxnw91zpvy5")))) (properties `((upstream-name . "HDF5Array"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 8e44ff0c0de2ee752ccaf9189d882735d3185c65 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:37:02 +0200 Subject: gnu: r-scater: Update to 1.8.4. * gnu/packages/bioinformatics.scm (r-scater): Update to 1.8.4. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 53bf86180f..687cb131d2 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10842,13 +10842,13 @@ libraries.") (define-public r-scater (package (name "r-scater") - (version "1.8.0") + (version "1.8.4") (source (origin (method url-fetch) (uri (bioconductor-uri "scater" version)) (sha256 (base32 - "0bhpikgz3b9f510dawsay4zry9rlp8vjx5n6zvwbcpwrd94p3903")))) + "173lfpas2fqsp4xxsw01wkxd4496c5p8himw9b4r9z4npxkfyv16")))) (build-system r-build-system) (propagated-inputs `(("r-beachmat" ,r-beachmat) -- cgit v1.2.3 From f0771741781ff75af42ea59027a592ac159bcf98 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:41:37 +0200 Subject: gnu: r-scran: Update to 1.8.4. * gnu/packages/bioinformatics.scm (r-scran): Update to 1.8.4. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 687cb131d2..760b716408 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10886,14 +10886,14 @@ quality control.") (define-public r-scran (package (name "r-scran") - (version "1.8.2") + (version "1.8.4") (source (origin (method url-fetch) (uri (bioconductor-uri "scran" version)) (sha256 (base32 - "0nbn5x75gf9d0p18w7vpkbv30cpdqvp5bz8xvila0h7jla7xdyih")))) + "17vq9vb9ak7n4mcqpwnm9x3z91vmr7xnsgj8f45b8dbj7m0v126j")))) (build-system r-build-system) (propagated-inputs `(("r-beachmat" ,r-beachmat) -- cgit v1.2.3 From 1ec1989f8007d0b90cc3b5ac379bb2f7133e299f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:42:01 +0200 Subject: gnu: r-httpuv: Update to 1.4.5. * gnu/packages/web.scm (r-httpuv): Update to 1.4.5. [native-inputs]: Add pkg-config. --- gnu/packages/web.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 0d27fa0054..918548513d 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3823,15 +3823,17 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") (define-public r-httpuv (package (name "r-httpuv") - (version "1.4.4.1") + (version "1.4.5") (source (origin (method url-fetch) (uri (cran-uri "httpuv" version)) (sha256 (base32 - "12kwq10xa8glrip7rai9xb4hnpysng00g2l0rw7swfzq5lk4z966")))) + "1ddpcarzf694h0gy5pdz7l5glqfv4hr9dmxb4vw7yqd0bga174gi")))) (build-system r-build-system) - (native-inputs `(("r-rcpp" ,r-rcpp))) + (native-inputs + `(("r-rcpp" ,r-rcpp) + ("pkg-config" ,pkg-config))) (propagated-inputs `(("r-bh" ,r-bh) ("r-later" ,r-later) -- cgit v1.2.3 From 4f8247b54b4bb95fc58b3c4f0c30d635909496e2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:46:33 +0200 Subject: gnu: Add r-pkgbuild. * gnu/packages/cran.scm (r-pkgbuild): New variable. --- gnu/packages/cran.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2082378aae..ae51844dab 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -499,6 +499,33 @@ print, summary, plot, update, etc. processes. Most of its code is based on the @code{psutil} Python package.") (license license:bsd-3))) +(define-public r-pkgbuild + (package + (name "r-pkgbuild") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "pkgbuild" version)) + (sha256 + (base32 + "10iz8057mixl9j73pq2cbp4ib6dadfsgi3fcsjjm7l3wwb9issd9")))) + (build-system r-build-system) + (propagated-inputs + `(("r-callr" ,r-callr) + ("r-crayon" ,r-crayon) + ("r-desc" ,r-desc) + ("r-r6" ,r-r6) + ("r-rprojroot" ,r-rprojroot) + ("r-withr" ,r-withr))) + (home-page "https://github.com/r-pkgs/pkgbuild") + (synopsis "Find tools needed to build R packages") + (description + "This package provides functions used to build R packages. It locates +compilers needed to build R packages on various platforms and ensures the PATH +is configured appropriately so R can use them.") + (license license:gpl3))) + (define-public r-rcpp (package (name "r-rcpp") -- cgit v1.2.3 From e362be8e899707fa85e7ae3102cbb5013d51bb69 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:46:49 +0200 Subject: gnu: Add r-pkgload. * gnu/packages/cran.scm (r-pkgload): New variable. --- gnu/packages/cran.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ae51844dab..9d736d4d6e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -526,6 +526,33 @@ compilers needed to build R packages on various platforms and ensures the PATH is configured appropriately so R can use them.") (license license:gpl3))) +(define-public r-pkgload + (package + (name "r-pkgload") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "pkgload" version)) + (sha256 + (base32 + "1rjj229nq9fsl4ki4m75ybsavjgpqqhsr1zjzapwicsrxv6212px")))) + (build-system r-build-system) + (propagated-inputs + `(("r-desc" ,r-desc) + ("r-pkgbuild" ,r-pkgbuild) + ("r-rlang" ,r-rlang) + ("r-rprojroot" ,r-rprojroot) + ("r-rstudioapi" ,r-rstudioapi) + ("r-withr" ,r-withr))) + (home-page "https://github.com/r-lib/pkgload") + (synopsis "Simulate package installation and attach") + (description + "This package simulates the process of installing a package and then +attaching it. This is a key part of the @code{devtools} package as it allows +you to rapidly iterate while developing a package.") + (license license:gpl3))) + (define-public r-rcpp (package (name "r-rcpp") -- cgit v1.2.3 From 97c81cc174b31fe898263cf4e802e00e95f76ef3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:52:33 +0200 Subject: gnu: r-stringi: Update to 1.2.4. * gnu/packages/statistics.scm (r-stringi): Update to 1.2.4. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 97246dc31d..1f03649fa5 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -960,14 +960,14 @@ solution for sending email, including attachments, from within R.") (define-public r-stringi (package (name "r-stringi") - (version "1.2.3") + (version "1.2.4") (source (origin (method url-fetch) (uri (cran-uri "stringi" version)) (sha256 (base32 - "1sgg4krw03qkz1n4dwiya0djggk7giwd0w21qlp0pfjqi0rxq6qx")))) + "1y46xab7g1lsjmilp4hbl7pjad6pcxp66hdj8wnfdg9518h0lmq1")))) (build-system r-build-system) (inputs `(("icu4c" ,icu4c))) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 3bf390279d9fce490fcfbab21330a0009a4d178c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:52:53 +0200 Subject: gnu: r-scales: Update to 1.0.0. * gnu/packages/statistics.scm (r-scales): Update to 1.0.0. [propagated-inputs]: Remove r-dichromat and r-plyr. --- gnu/packages/statistics.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 1f03649fa5..35f89f2dc5 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1033,19 +1033,17 @@ using just two functions: melt and dcast (or acast).") (define-public r-scales (package (name "r-scales") - (version "0.5.0") + (version "1.0.0") (source (origin (method url-fetch) (uri (cran-uri "scales" version)) (sha256 - (base32 "0zg9wfzmsdjxpbld0nzv7hcpq5r0wazqxmn7grvvif2agj0w1z6v")))) + (base32 "0353dkh3d7x78463c6ds80hcml59lrqwr8rlv82a8dnkxla4l7qc")))) (build-system r-build-system) (propagated-inputs - `(("r-dichromat" ,r-dichromat) - ("r-labeling" ,r-labeling) + `(("r-labeling" ,r-labeling) ("r-munsell" ,r-munsell) - ("r-plyr" ,r-plyr) ("r-rcolorbrewer" ,r-rcolorbrewer) ("r-rcpp" ,r-rcpp) ("r-r6" ,r-r6) -- cgit v1.2.3 From 2a96a093ec9a812bf7ccb6e095b3377df81d75aa Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:53:36 +0200 Subject: gnu: r-evaluate: Update to 0.11. * gnu/packages/statistics.scm (r-evaluate): Update to 0.11. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 35f89f2dc5..09470fa0a0 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1249,13 +1249,13 @@ for template use among CRAN packages.") (define-public r-evaluate (package (name "r-evaluate") - (version "0.10.1") + (version "0.11") (source (origin (method url-fetch) (uri (cran-uri "evaluate" version)) (sha256 (base32 - "070vvmnbdlp7sz2zhza7fhd2a6mlwiln8fn4hyzhsiizbn4n79y9")))) + "1k8vcd4vsgg0hf7kdz8rlqp1dx4ygvg35aj4n3ay50kdnpzhaj5h")))) (build-system r-build-system) (propagated-inputs `(("r-stringr" ,r-stringr))) -- cgit v1.2.3 From 3299bc1c5e43a146ba1ea380fc905b2c096f9174 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:53:49 +0200 Subject: gnu: r-yaml: Update to 2.2.0. * gnu/packages/statistics.scm (r-yaml): Update to 2.2.0. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 09470fa0a0..b7118b672a 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1354,13 +1354,13 @@ syntax that can be converted to XHTML or other formats.") (define-public r-yaml (package (name "r-yaml") - (version "2.1.19") + (version "2.2.0") (source (origin (method url-fetch) (uri (cran-uri "yaml" version)) (sha256 (base32 - "04bzrnfgbpk0rhkvzwp3k3ip7jpq26bjxz71bx5mwxmcjdb07nz5")))) + "0in562nd0i23cg91a8kdbqgim656fgscykwi0icsnq53xj3srg2m")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/yaml/") (synopsis "Methods to convert R data to YAML and back") -- cgit v1.2.3 From 6b02569f1db9a3943305afcdea3f5970f80ecf74 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:54:02 +0200 Subject: gnu: r-dbplyr: Update to 1.2.2. * gnu/packages/statistics.scm (r-dbplyr): Update to 1.2.2. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index b7118b672a..ac0d5d613c 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1654,14 +1654,14 @@ database.") (define-public r-dbplyr (package (name "r-dbplyr") - (version "1.2.1") + (version "1.2.2") (source (origin (method url-fetch) (uri (cran-uri "dbplyr" version)) (sha256 (base32 - "1nwrls9c3kc9q7405jp6b9sh23642sz13yw55iikgw134shffj5k")))) + "0j5w6a1qim972kv4vmvinp3j50yr4idmm9cd3w7y3zsz0nq0nhcx")))) (build-system r-build-system) (propagated-inputs `(("r-assertthat" ,r-assertthat) -- cgit v1.2.3 From 7f38b31ecbeab97f3efdc633504c4caa1a3a0621 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:54:19 +0200 Subject: gnu: r-xtable: Update to 1.8-3. * gnu/packages/statistics.scm (r-xtable): Update to 1.8-3. --- gnu/packages/statistics.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index ac0d5d613c..88b9ee6037 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1787,17 +1787,17 @@ and fast file reading.") (define-public r-xtable (package (name "r-xtable") - (version "1.8-2") + (version "1.8-3") (source (origin (method url-fetch) (uri (cran-uri "xtable" version)) (sha256 (base32 - "0398qkpvlw3dv0myz4mjcyqwpwc2m31l127r8vdzwc71wb6s28qn")))) + "09f311gq9g7dzf8jdvcx72j11xb7p00jlg066jjbpa6pz3zv1cjk")))) (build-system r-build-system) (native-inputs - `(("r-knitr" ,r-knitr))) + `(("r-knitr" ,r-knitr))) ; for vignettes (home-page "http://xtable.r-forge.r-project.org/") (synopsis "Export R tables to LaTeX or HTML") (description -- cgit v1.2.3 From 9b7e8df85bc8f06a662f0a9631231bd56939cfb2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:54:35 +0200 Subject: gnu: r-ade4: Update to 1.7-13. * gnu/packages/statistics.scm (r-ade4): Update to 1.7-13. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 88b9ee6037..c74e198449 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1934,14 +1934,14 @@ chain.") (define-public r-ade4 (package (name "r-ade4") - (version "1.7-11") + (version "1.7-13") (source (origin (method url-fetch) (uri (cran-uri "ade4" version)) (sha256 (base32 - "0wm54wcpn87rdh6vyw04cr8vgba899y6jsl61f22bmlvx6d7kkac")))) + "16z9jk4qj35ghsk4lwmq241dgc770y8a70dlmp9q4gz6d8ssgl7m")))) (build-system r-build-system) (propagated-inputs `(("r-mass" ,r-mass))) -- cgit v1.2.3 From 2848c52c5ec537e9d4ee23bedd6658c610ff02fd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:54:52 +0200 Subject: gnu: r-roxygen2: Update to 6.1.0. * gnu/packages/statistics.scm (r-roxygen2): Update to 6.1.0. [propagated-inputs]: Add r-pkgload and r-purrr. [native-inputs]: Add r-knitr. --- gnu/packages/statistics.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index c74e198449..43d0197395 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2235,24 +2235,28 @@ tables, autolinks and strikethrough text.") (define-public r-roxygen2 (package (name "r-roxygen2") - (version "6.0.1") + (version "6.1.0") (source (origin (method url-fetch) (uri (cran-uri "roxygen2" version)) (sha256 (base32 - "0xpzziminf225kjwhyl51kgkzhplyzhk5farhf5s822krl2xqbfj")))) + "0ji9k4s1bvfbl8wimfqj1lqr33h1claaz30vb5pgksxyg77j5xaa")))) (build-system r-build-system) (propagated-inputs `(("r-brew" ,r-brew) ("r-commonmark" ,r-commonmark) ("r-desc" ,r-desc) ("r-digest" ,r-digest) + ("r-pkgload" ,r-pkgload) + ("r-purrr" ,r-purrr) ("r-r6" ,r-r6) ("r-rcpp" ,r-rcpp) ("r-stringi" ,r-stringi) ("r-stringr" ,r-stringr) ("r-xml2" ,r-xml2))) + (native-inputs + `(("r-knitr" ,r-knitr))) ; for vignettes (home-page "https://github.com/klutometis/roxygen") (synopsis "In-source documentation system for R") (description -- cgit v1.2.3 From 19cb93be55e4cffab4b48542835d9b18ef74d949 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:58:00 +0200 Subject: gnu: r-git2r: Update to 0.23.0. * gnu/packages/statistics.scm (r-git2r): Update to 0.23.0. [native-inputs]: Add pkg-config. --- gnu/packages/statistics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 43d0197395..164e0b5851 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2322,13 +2322,13 @@ functions make it easy to control additional request components.") (define-public r-git2r (package (name "r-git2r") - (version "0.21.0") + (version "0.23.0") (source (origin (method url-fetch) (uri (cran-uri "git2r" version)) (sha256 (base32 - "11xgddmxzh9cy85k8fb90il43qswpvryz0h9r0j1gbclfg2f9004")))) + "01250jz255fnyy2ap90nskvzhd8nhlmbhwgpvb43mk1fax077lrz")))) (build-system r-build-system) ;; This R package contains modified sources of libgit2. This modified ;; version of libgit2 is built as the package is built. Hence libgit2 is @@ -2337,6 +2337,8 @@ functions make it easy to control additional request components.") `(("libssh2" ,libssh2) ("openssl" ,openssl) ("zlib" ,zlib))) + (native-inputs + `(("pkg-config" ,pkg-config))) (home-page "https://github.com/ropensci/git2r") (synopsis "Access Git repositories with R") (description -- cgit v1.2.3 From 41f6685388da9e2258ababbdb5e16be56993e949 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:58:39 +0200 Subject: gnu: r-rcpparmadillo: Update to 0.9.100.5.0. * gnu/packages/statistics.scm (r-rcpparmadillo): Update to 0.9.100.5.0. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 164e0b5851..2e8bfb33fa 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2518,13 +2518,13 @@ well as additional utilities such as panel and axis annotation functions.") (define-public r-rcpparmadillo (package (name "r-rcpparmadillo") - (version "0.8.500.0") + (version "0.9.100.5.0") (source (origin (method url-fetch) (uri (cran-uri "RcppArmadillo" version)) (sha256 (base32 - "1sh36dx6inmb56m40nigy94gxlgjva816qnlmjwg7y2bdvqj8vsi")))) + "1iyjqhfjip1nxrkllzh7r1m01jjnx7cahqkf3s557w34p987f2l1")))) (properties `((upstream-name . "RcppArmadillo"))) (build-system r-build-system) (native-inputs -- cgit v1.2.3 From 2aafa73a94daa2ea0399ba0873b87fdfb9d03ff0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:59:01 +0200 Subject: gnu: r-xml: Update to 3.98-1.16. * gnu/packages/statistics.scm (r-xml): Update to 3.98-1.16. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 2e8bfb33fa..f02c40b43a 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2803,13 +2803,13 @@ ldap, and also supports cookies, redirects, authentication, etc.") (define-public r-xml (package (name "r-xml") - (version "3.98-1.11") + (version "3.98-1.16") (source (origin (method url-fetch) (uri (cran-uri "XML" version)) (sha256 (base32 - "18izvlg2x9mzr6yb3yf02ghwbyn00frki3av4lpc44r22m4djnsh")))) + "0nl1kk354r8snhj6p9mc74m7awvqc6akmd4y3a46y78yv3g15njp")))) (properties `((upstream-name . "XML"))) (build-system r-build-system) -- cgit v1.2.3 From e926159eb3fd006c6c688729e03043741a456bf9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:59:24 +0200 Subject: gnu: r-e1071: Update to 1.7-0. * gnu/packages/statistics.scm (r-e1071): Update to 1.7-0. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index f02c40b43a..0bdf0783d0 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3285,14 +3285,14 @@ Stochastic Neighbor Embedding using a Barnes-Hut implementation.") (define-public r-e1071 (package (name "r-e1071") - (version "1.6-8") + (version "1.7-0") (source (origin (method url-fetch) (uri (cran-uri "e1071" version)) (sha256 (base32 - "08n6i26nfckjpxjkzi8phhanc3ahsrirkv5rz38y2jcv7ds031pn")))) + "0fk4pw67cw1663d0n9rf1qfdqzz8k5nqkjgp3hi5jr422qp9lsck")))) (build-system r-build-system) (propagated-inputs `(("r-class" ,r-class))) -- cgit v1.2.3 From eefa7c7f3dc48a144e39d9167d3befa74f4f8645 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:59:45 +0200 Subject: gnu: r-r-utils: Update to 2.7.0. * gnu/packages/statistics.scm (r-r-utils): Update to 2.7.0. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 0bdf0783d0..9d03d5df1f 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3463,13 +3463,13 @@ maintenance for package developers.") (define-public r-r-utils (package (name "r-r-utils") - (version "2.6.0") + (version "2.7.0") (source (origin (method url-fetch) (uri (cran-uri "R.utils" version)) (sha256 (base32 - "03j7hrs03kyj9qrjxyp5kqv4lpqqpk6xwbkzx6j15d8928yrjr2x")))) + "0cxhn14a57x4gcyrwpfz1d6dw4xh0jcpqkb33hx8imnr340blh7n")))) (properties `((upstream-name . "R.utils"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From e2a2c3378ecba09fc94ad2114c3e21df3460050e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 15:00:00 +0200 Subject: gnu: r-r-rsp: Update to 0.43.0. * gnu/packages/statistics.scm (r-r-rsp): Update to 0.43.0. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 9d03d5df1f..4b1001a0cd 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3511,13 +3511,13 @@ persistent (on the file system).") (define-public r-r-rsp (package (name "r-r-rsp") - (version "0.42.0") + (version "0.43.0") (source (origin (method url-fetch) (uri (cran-uri "R.rsp" version)) (sha256 (base32 - "1zcq0hzi0j7fvj2rs796a1i120wbr0387vck17rrd644awwbsbm0")))) + "0ax6781kfylx0acz0i3sqnpkxmrq73x29wwfic59ng7vj0ws0gyd")))) (properties `((upstream-name . "R.rsp"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 195eec737c13a871c39f9ebfeb3641a5e7b9d583 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 15:00:16 +0200 Subject: gnu: r-matrixstats: Update to 0.54.0. * gnu/packages/statistics.scm (r-matrixstats): Update to 0.54.0. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 4b1001a0cd..a5c44b485f 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3562,13 +3562,13 @@ t-probabilities, quantiles, random deviates and densities.") (define-public r-matrixstats (package (name "r-matrixstats") - (version "0.53.1") + (version "0.54.0") (source (origin (method url-fetch) (uri (cran-uri "matrixStats" version)) (sha256 (base32 - "0bkiz5fm09d3512mfr2ymj9qsb1b8aic5l5m6fkaf5j7nsgvqw6z")))) + "0vx00ldsg2zvdrjn49jxczk2c9iaabgvzgpdka5j02ihh7hv83cg")))) (properties `((upstream-name . "matrixStats"))) (build-system r-build-system) (native-inputs -- cgit v1.2.3 From 88cb7aa9e7d18db3c7266424f6efc356a575c0f1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 15:00:41 +0200 Subject: gnu: r-plotly: Update to 4.8.0. * gnu/packages/statistics.scm (r-plotly): Update to 4.8.0. [propagated-inputs]: Add r-promises and r-rlang. --- gnu/packages/statistics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index a5c44b485f..68255ccf3a 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3743,13 +3743,13 @@ features present in other programming languages.") (define-public r-plotly (package (name "r-plotly") - (version "4.7.1") + (version "4.8.0") (source (origin (method url-fetch) (uri (cran-uri "plotly" version)) (sha256 (base32 - "0wj9lw7w28z8w9ip9vadv6sydjhqyg65kfiai9m3bndzz50b1m3w")))) + "19p8pa03q9mw5vaan7r56xgd13d90ssiz0flbrkvpfrir2105ybq")))) (build-system r-build-system) (propagated-inputs `(("r-base64enc" ,r-base64enc) @@ -3765,8 +3765,10 @@ features present in other programming languages.") ("r-jsonlite" ,r-jsonlite) ("r-lazyeval" ,r-lazyeval) ("r-magrittr" ,r-magrittr) + ("r-promises" ,r-promises) ("r-purrr" ,r-purrr) ("r-rcolorbrewer" ,r-rcolorbrewer) + ("r-rlang" ,r-rlang) ("r-scales" ,r-scales) ("r-tibble" ,r-tibble) ("r-tidyr" ,r-tidyr) -- cgit v1.2.3 From 5dbe7aa92026ef7143d36036570e7e027ab85b64 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 15:01:09 +0200 Subject: gnu: r-googlesheets: Update to 0.3.0. * gnu/packages/statistics.scm (r-googlesheets): Update to 0.3.0. [propagated-inputs]: Add r-tibble. --- gnu/packages/statistics.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 68255ccf3a..dd7494db49 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3850,14 +3850,14 @@ character vector.") (define-public r-googlesheets (package (name "r-googlesheets") - (version "0.2.2") + (version "0.3.0") (source (origin (method url-fetch) (uri (cran-uri "googlesheets" version)) (sha256 (base32 - "18q0xmxn09b52rmky7gr5flp0awndcnsgb7zcvkzvkrkvmwad52b")))) + "11q07nxys72wkxx9mawmjyf20gvwvrb7h3gpa73h6lgh2vgrwnv8")))) (build-system r-build-system) (propagated-inputs `(("r-cellranger" ,r-cellranger) @@ -3867,6 +3867,7 @@ character vector.") ("r-purrr" ,r-purrr) ("r-readr" ,r-readr) ("r-stringr" ,r-stringr) + ("r-tibble" ,r-tibble) ("r-tidyr" ,r-tidyr) ("r-xml2" ,r-xml2))) (home-page "https://github.com/jennybc/googlesheets") -- cgit v1.2.3 From c183fa26881d363c2c078dad534c9098e05456cd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 15:12:31 +0200 Subject: gnu: Add r-officer. * gnu/packages/cran.scm (r-officer): New variable. --- gnu/packages/cran.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9d736d4d6e..a7a42573ae 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4656,6 +4656,41 @@ Rd files and roxygen2 comments, as well as many functions for manipulation of references and Rd files.") (license license:gpl2+))) +(define-public r-officer + (package + (name "r-officer") + (version "0.3.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "officer" version)) + (sha256 + (base32 + "14b6ii9h3fi5g8ja929mfhxps9r7x78flqjdy437y9aygkhmiz2i")))) + (build-system r-build-system) + (propagated-inputs + `(("r-base64enc" ,r-base64enc) + ("r-digest" ,r-digest) + ("r-htmltools" ,r-htmltools) + ("r-magrittr" ,r-magrittr) + ("r-r6" ,r-r6) + ("r-rcpp" ,r-rcpp) + ("r-uuid" ,r-uuid) + ("r-xml2" ,r-xml2) + ("r-zip" ,r-zip))) + (home-page "https://davidgohel.github.io/officer") + (synopsis "Manipulation of Word and PowerPoint documents") + (description + "This package provides tools to access and manipulate Word and PowerPoint +documents from R. The package focuses on tabular and graphical reporting from +R; it also provides two functions that let users get document content into +data objects. A set of functions lets add and remove images, tables and +paragraphs of text in new or existing documents. When working with PowerPoint +presentations, slides can be added or removed; shapes inside slides can also +be added or removed. When working with Word documents, a cursor can be used +to help insert or delete content at a specific location in the document.") + (license license:gpl3))) + (define-public r-writexl (package (name "r-writexl") -- cgit v1.2.3 From bfee9ce88f3c6bd49a1dfc003128d1cb3b7aa421 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 15:12:47 +0200 Subject: gnu: Add r-snakecase. * gnu/packages/cran.scm (r-snakecase): New variable. --- gnu/packages/cran.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a7a42573ae..e26deabd6e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4691,6 +4691,28 @@ be added or removed. When working with Word documents, a cursor can be used to help insert or delete content at a specific location in the document.") (license license:gpl3))) +(define-public r-snakecase + (package + (name "r-snakecase") + (version "0.9.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "snakecase" version)) + (sha256 + (base32 + "1g6xai53dl24ws0mwhqrkcv583ziaq505cv3z8v5dhjgy98kilyj")))) + (build-system r-build-system) + (propagated-inputs + `(("r-stringi" ,r-stringi) + ("r-stringr" ,r-stringr))) + (home-page "https://github.com/Tazinho/snakecase") + (synopsis "Convert strings into any case") + (description + "This package provides a consistent, flexible and easy to use tool to +parse and convert strings into cases like snake or camel among others.") + (license license:gpl3))) + (define-public r-writexl (package (name "r-writexl") -- cgit v1.2.3 From de059e4bd3dce2937a4ac7853731f7f65e950475 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 15:12:57 +0200 Subject: gnu: Add r-prediction. * gnu/packages/cran.scm (r-prediction): New variable. --- gnu/packages/cran.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e26deabd6e..64156f5aa6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4713,6 +4713,30 @@ to help insert or delete content at a specific location in the document.") parse and convert strings into cases like snake or camel among others.") (license license:gpl3))) +(define-public r-prediction + (package + (name "r-prediction") + (version "0.3.6") + (source + (origin + (method url-fetch) + (uri (cran-uri "prediction" version)) + (sha256 + (base32 + "19d7312f5lkqfglfvlgssnvyw7gl161s0xradcry44r1i6qp05j1")))) + (build-system r-build-system) + (propagated-inputs + `(("r-data-table" ,r-data-table))) + (home-page "https://github.com/leeper/prediction") + (synopsis "Tidy, type-safe prediction methods") + (description + "This package provides the @code{prediction()} function, a type-safe +alternative to @code{predict()} that always returns a data frame. The package +currently supports common model types (e.g., @code{\"lm\"}, @code{\"glm\"}) +from the @code{stats} package, as well as numerous other model classes from +other add-on packages.") + (license license:expat))) + (define-public r-writexl (package (name "r-writexl") -- cgit v1.2.3 From cfc06314334933f0045e1851449722a612e28f5b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 15:14:17 +0200 Subject: gnu: Add r-sjlabelled. * gnu/packages/cran.scm (r-sjlabelled): New variable. --- gnu/packages/cran.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 64156f5aa6..bf942f03f6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4737,6 +4737,39 @@ from the @code{stats} package, as well as numerous other model classes from other add-on packages.") (license license:expat))) +(define-public r-sjlabelled + (package + (name "r-sjlabelled") + (version "1.0.13") + (source + (origin + (method url-fetch) + (uri (cran-uri "sjlabelled" version)) + (sha256 + (base32 + "0xizj7mrhnbn8kwjgm076si9w68a7lgrx4vj1sbqmv9jx055h8wv")))) + (build-system r-build-system) + (propagated-inputs + `(("r-broom" ,r-broom) + ("r-dplyr" ,r-dplyr) + ("r-haven" ,r-haven) + ("r-magrittr" ,r-magrittr) + ("r-prediction" ,r-prediction) + ("r-purrr" ,r-purrr) + ("r-rlang" ,r-rlang) + ("r-snakecase" ,r-snakecase) + ("r-tibble" ,r-tibble) + ("r-tidyselect" ,r-tidyselect))) + (home-page "https://github.com/strengejacke/sjlabelled") + (synopsis "Labelled data utility functions") + (description + "This package provides a collection of functions dealing with labelled +data, like reading and writing data between R and other statistical software +packages. This includes easy ways to get, set or change value and variable +label attributes, to convert labelled vectors into factors or numeric (and +vice versa), or to deal with multiple declared missing values.") + (license license:gpl3))) + (define-public r-writexl (package (name "r-writexl") -- cgit v1.2.3 From 1f560b9cdb820569e796caa9949557d9a18f8549 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 15:14:33 +0200 Subject: gnu: Add r-sjmisc. * gnu/packages/cran.scm (r-sjmisc): New variable. --- gnu/packages/cran.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index bf942f03f6..65474d8f8b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4770,6 +4770,43 @@ label attributes, to convert labelled vectors into factors or numeric (and vice versa), or to deal with multiple declared missing values.") (license license:gpl3))) +(define-public r-sjmisc + (package + (name "r-sjmisc") + (version "2.7.4") + (source + (origin + (method url-fetch) + (uri (cran-uri "sjmisc" version)) + (sha256 + (base32 + "11cy09k1d2y5wwqvafqxr01hzk4x68ji2pqlwj7fnpw27i3ap4q4")))) + (build-system r-build-system) + (propagated-inputs + `(("r-broom" ,r-broom) + ("r-crayon" ,r-crayon) + ("r-dplyr" ,r-dplyr) + ("r-haven" ,r-haven) + ("r-magrittr" ,r-magrittr) + ("r-pillar" ,r-pillar) + ("r-purrr" ,r-purrr) + ("r-rlang" ,r-rlang) + ("r-sjlabelled" ,r-sjlabelled) + ("r-stringdist" ,r-stringdist) + ("r-stringr" ,r-stringr) + ("r-tibble" ,r-tibble) + ("r-tidyr" ,r-tidyr) + ("r-tidyselect" ,r-tidyselect))) + (home-page "https://github.com/strengejacke/sjmisc") + (synopsis "Data and variable transformation functions") + (description + "This package is a collection of miscellaneous utility functions, +supporting data transformation tasks like recoding, dichotomizing or grouping +variables, setting and replacing missing values. The data transformation +functions also support labelled data, and all integrate seamlessly into a +tidyverse workflow.") + (license license:gpl3))) + (define-public r-writexl (package (name "r-writexl") -- cgit v1.2.3 From aaed237d1bcae69bd3c65f06633a8a4c88f2e382 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 15:14:45 +0200 Subject: gnu: Add r-nortest. * gnu/packages/cran.scm (r-nortest): New variable. --- gnu/packages/cran.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 65474d8f8b..4d6bd269b1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4807,6 +4807,25 @@ functions also support labelled data, and all integrate seamlessly into a tidyverse workflow.") (license license:gpl3))) +(define-public r-nortest + (package + (name "r-nortest") + (version "1.0-4") + (source + (origin + (method url-fetch) + (uri (cran-uri "nortest" version)) + (sha256 + (base32 + "17r0wpz72z9312c70nwi1i1kp1v9fm1h6jg7q5cx1mc1h420m1d3")))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/web/packages/nortest/") + (synopsis "Tests for normality") + (description + "This package provides five omnibus tests for testing the composite +hypothesis of normality.") + (license license:gpl2+))) + (define-public r-writexl (package (name "r-writexl") -- cgit v1.2.3 From 0fd7d59dc387eea437482f7584d03c5a20399faa Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 15:14:56 +0200 Subject: gnu: Add r-moonbook. * gnu/packages/cran.scm (r-moonbook): New variable. --- gnu/packages/cran.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4d6bd269b1..1025ff093a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4826,6 +4826,35 @@ tidyverse workflow.") hypothesis of normality.") (license license:gpl2+))) +(define-public r-moonbook + (package + (name "r-moonbook") + (version "0.2.3") + (source + (origin + (method url-fetch) + (uri (cran-uri "moonBook" version)) + (sha256 + (base32 + "0hys56mwbm776ff7dibi8wzyf69qiais9rs1jazv79lk6h56s9s6")))) + (properties `((upstream-name . "moonBook"))) + (build-system r-build-system) + (propagated-inputs + `(("r-magrittr" ,r-magrittr) + ("r-nortest" ,r-nortest) + ("r-purrr" ,r-purrr) + ("r-sjmisc" ,r-sjmisc) + ("r-stringr" ,r-stringr) + ("r-survival" ,r-survival))) + (home-page "https://github.com/cardiomoon/moonBook") + (synopsis "Functions and datasets for the book by Keon-Woong Moon") + (description + "This package provides several analysis-related functions for the book +entitled \"R statistics and graph for medical articles\" (written in Korean), +version 1, by Keon-Woong Moon with Korean demographic data with several plot +functions.") + (license license:gpl2))) + (define-public r-writexl (package (name "r-writexl") -- cgit v1.2.3 From 90708323a13c94bf36a56735da9c21a2203e9fde Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 18:39:43 +0200 Subject: Revert "gnu: ghc-base-compat: Update to 0.10.4." This reverts commit 0fa2c552fcd5176b0484b77b7f7c94d82d46415e. We may not upgrade base-compat at this point because we haven't upgraded the default GHC yet. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index b8ae26346e..31a0d6d7ee 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4231,7 +4231,7 @@ system.") (define-public ghc-base-compat (package (name "ghc-base-compat") - (version "0.10.4") + (version "0.9.3") (source (origin (method url-fetch) @@ -4241,7 +4241,7 @@ system.") ".tar.gz")) (sha256 (base32 - "0ksp990gxs731mq19rzbxrbs43nazfljjc8krlx5bjqblw3kfs8d")))) + "0452l6zf6fjhy4kxqwv6i6hhg6yfx4wcg450k3axpyj30l7jnq3x")))) (build-system haskell-build-system) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck) -- cgit v1.2.3 From f9f4578ba0c4b5b22cdac86e8183dc542d66cc85 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 18:43:11 +0200 Subject: Revert "gnu: ghc-tasty: Update to 1.1.0.3." This reverts commit 3ad6b8909025a8f4d3e1f1f5ea16bcd0cace557c. --- gnu/packages/haskell-check.scm | 7 +++---- gnu/packages/haskell.scm | 27 +++------------------------ 2 files changed, 6 insertions(+), 28 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 65333f8269..31407ca259 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -183,7 +183,7 @@ timer functions of different operating systems via a unified API.") (define-public ghc-tasty (package (name "ghc-tasty") - (version "1.1.0.3") + (version "0.11.0.4") (source (origin (method url-fetch) @@ -193,7 +193,7 @@ timer functions of different operating systems via a unified API.") ".tar.gz")) (sha256 (base32 - "14riid753hjqr6lca1kgxpnvq0wykf0k3qc5jpag42hh8bszav22")))) + "05pxjzgbgjdn7477xry0ssjrnmnsydqiq6nm6ck8n2da1baliqp0")))) (build-system haskell-build-system) (inputs `(("ghc-stm" ,ghc-stm) @@ -205,8 +205,7 @@ timer functions of different operating systems via a unified API.") ("ghc-unbounded-delays" ,ghc-unbounded-delays) ("ghc-async" ,ghc-async) ("ghc-ansi-terminal" ,ghc-ansi-terminal) - ("ghc-clock-bootstrap" ,ghc-clock-bootstrap) - ("ghc-wcwidth" ,ghc-wcwidth))) + ("ghc-clock-bootstrap" ,ghc-clock-bootstrap))) (home-page "http://documentup.com/feuerbach/tasty") (synopsis "Modern and extensible testing framework") (description "Tasty is a modern testing framework for Haskell. It lets diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 31a0d6d7ee..eb629cf138 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2870,7 +2870,7 @@ with slicing and Clang-style colored diagnostics.") ;; re-enable them. (arguments `(#:tests? #f)) (inputs - `(("ghc-scientific-bootstrap" ,ghc-scientific-bootstrap) + `(("ghc-scientific" ,ghc-scientific) ("ghc-text" ,ghc-text))) (native-inputs `(("ghc-tasty" ,ghc-tasty) @@ -2885,13 +2885,6 @@ aimed particularly at dealing efficiently with network protocols and complicated text/binary file formats.") (license license:bsd-3))) -(define ghc-attoparsec-bootstrap - (package - (inherit ghc-attoparsec) - (name "ghc-attoparsec-bootstrap") - (arguments '(#:tests? #f)) - (native-inputs '()))) - (define-public ghc-zip-archive (package (name "ghc-zip-archive") @@ -5221,13 +5214,6 @@ occurrences of a substring (the first in case of overlaps) with another.") in migrated modules.") (license license:expat))) -(define ghc-integer-logarithms-bootstrap - (package - (inherit ghc-integer-logarithms) - (name "ghc-integer-logarithms-bootstrap") - (arguments `(#:tests? #f)) - (native-inputs '()))) - (define-public ghc-scientific (package (name "ghc-scientific") @@ -5244,7 +5230,7 @@ in migrated modules.") "03ql2f0ac8bsl524idy9xxa3kxisb2sj3avflzw580j5hzy0m397")))) (build-system haskell-build-system) (inputs - `(("ghc-integer-logarithms-bootstrap" ,ghc-integer-logarithms-bootstrap) + `(("ghc-integer-logarithms" ,ghc-integer-logarithms) ("ghc-text" ,ghc-text) ("ghc-hashable" ,ghc-hashable) ("ghc-primitive" ,ghc-primitive))) @@ -5265,13 +5251,6 @@ and space efficient. They are represented using notation}.") (license license:bsd-3))) -(define ghc-scientific-bootstrap - (package - (inherit ghc-scientific) - (name "ghc-scientific-bootstrap") - (arguments `(#:tests? #f)) - (native-inputs '()))) - (define-public ghc-boxes (package (name "ghc-boxes") @@ -10195,7 +10174,7 @@ backends provided by the @code{Cairo} and @code{Diagrams} libraries.") (inputs `(("ghc-setlocale" ,ghc-setlocale) ("ghc-utf8-string" ,ghc-utf8-string) - ("ghc-attoparsec-bootstrap" ,ghc-attoparsec-bootstrap))) + ("ghc-attoparsec" ,ghc-attoparsec))) (home-page "https://github.com/solidsnack/wcwidth/") (synopsis "Haskell bindings to wcwidth") (description "This package provides Haskell bindings to your system's -- cgit v1.2.3 From 78f2c08c0b780dd2fe72548b901df7eb887da7f1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:22:20 +0200 Subject: gnu: r-rmarkdown: Use latest version of Pandoc. * gnu/packages/statistics.scm (r-rmarkdown)[propagated-inputs]: Replace "ghc-pandoc-1" with "ghc-pandoc". --- gnu/packages/statistics.scm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index dd7494db49..69c72541a7 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2633,11 +2633,7 @@ certain criterion, e.g., it contains a certain regular file.") ("r-stringr" ,r-stringr) ("r-tinytex" ,r-tinytex) ("r-yaml" ,r-yaml) - ;; rmarkdown works with the 2.x release of Pandoc, but with degraded - ;; functionality. For example, tabbed plots do not currently work with - ;; Pandoc 2. The authors of rmarkdown recommend the use of Pandoc 1 - ;; for the time being. - ("ghc-pandoc" ,ghc-pandoc-1))) + ("ghc-pandoc" ,ghc-pandoc))) (home-page "http://rmarkdown.rstudio.com") (synopsis "Convert R Markdown documents into a variety of formats") (description -- cgit v1.2.3 From 589bd1c4260a429536d3a69a4b7c0a7bcd2e4357 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:23:51 +0200 Subject: gnu: Add r-flextable. * gnu/packages/cran.scm (r-flextable): New variable. --- gnu/packages/cran.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 1025ff093a..ea3f1c4981 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4855,6 +4855,37 @@ version 1, by Keon-Woong Moon with Korean demographic data with several plot functions.") (license license:gpl2))) +(define-public r-flextable + (package + (name "r-flextable") + (version "0.4.5") + (source + (origin + (method url-fetch) + (uri (cran-uri "flextable" version)) + (sha256 + (base32 + "09j2y0z7rkc0w1cl9pp1cpk6fnzzfr6245mxa3ca42z9k2cy2jfl")))) + (build-system r-build-system) + (propagated-inputs + `(("r-gdtools" ,r-gdtools) + ("r-htmltools" ,r-htmltools) + ("r-knitr" ,r-knitr) + ("r-officer" ,r-officer) + ("r-r6" ,r-r6) + ("r-rmarkdown" ,r-rmarkdown) + ("r-stringr" ,r-stringr) + ("r-xml2" ,r-xml2))) + (home-page "https://davidgohel.github.io/flextable") + (synopsis "Functions for tabular reporting") + (description + "This package provides tools to create pretty tables for HTML documents +and other formats. Functions are provided to let users create tables, modify +and format their content. It extends the @code{officer} package and can be +used within R markdown documents when rendering to HTML and to Word +documents.") + (license license:gpl3))) + (define-public r-writexl (package (name "r-writexl") -- cgit v1.2.3 From cb96d81be47ac5e553dc7b14ce64823a9b6f99a5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:24:12 +0200 Subject: gnu: r-doby: Update to 4.6-2. * gnu/packages/cran.scm (r-doby): Update to 4.6-2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ea3f1c4981..56b6462fae 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5079,14 +5079,14 @@ Group (Non-)Overlap considerations.") (define-public r-doby (package (name "r-doby") - (version "4.6-1") + (version "4.6-2") (source (origin (method url-fetch) (uri (cran-uri "doBy" version)) (sha256 (base32 - "1y02awzid23bxz8hx6j8pxd6i7jaq8pdw3k60rag8y6m69incrw5")))) + "02vbv9nfgywg6lsiialkmfnax5z3rkyb9nr8j9l2cp8xi6ml95mb")))) (properties `((upstream-name . "doBy"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 2cdd9d4f832bf11d9b419e15fdfcdcf49ec99520 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:24:41 +0200 Subject: gnu: r-reticulate: Update to 1.10. * gnu/packages/cran.scm (r-reticulate): Update to 1.10. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 56b6462fae..9033fac0a6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4236,14 +4236,14 @@ obtain a better initial configuration in non-metric MDS.") (define-public r-reticulate (package (name "r-reticulate") - (version "1.8") + (version "1.10") (source (origin (method url-fetch) (uri (cran-uri "reticulate" version)) (sha256 (base32 - "0zwb4ikf021nw7axdn7qlr6bq4xkph3anfy314idkspy1iil4nmr")))) + "0bz3lxbisjwn6cv23090zivpy0bxcncr82g5qja13l37i8xnvqsq")))) (build-system r-build-system) (inputs `(("python" ,python))) (propagated-inputs -- cgit v1.2.3 From e3c1e93e35f25fc746476226e3c7b8c633eb2b8e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:25:04 +0200 Subject: gnu: r-reprex: Update to 0.2.0. * gnu/packages/cran.scm (r-reprex): Update to 0.2.0. [propagated-inputs]: Add r-clipr, r-rlang, and r-withr. --- gnu/packages/cran.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9033fac0a6..2c6de3ddd2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -162,20 +162,23 @@ package is a port of the Python package @code{cssselect}.") (define-public r-reprex (package (name "r-reprex") - (version "0.1.2") + (version "0.2.0") (source (origin (method url-fetch) (uri (cran-uri "reprex" version)) (sha256 (base32 - "105d9vsmqfilgpw8psfb2wyiz1hvcycvh4cqhb3ab37lm3rcavvs")))) + "1l44pxjiz3g0jkk3v6rg5jps3llihfiah0qyv40s0bxvxa6gm8v9")))) (build-system r-build-system) (propagated-inputs `(("r-callr" ,r-callr) + ("r-clipr" ,r-clipr) ("r-knitr" ,r-knitr) + ("r-rlang" ,r-rlang) ("r-rmarkdown" ,r-rmarkdown) - ("r-whisker" ,r-whisker))) + ("r-whisker" ,r-whisker) + ("r-withr" ,r-withr))) (home-page "https://github.com/tidyverse/reprex") (synopsis "Prepare reproducible R code examples for sharing") (description -- cgit v1.2.3 From b72de5b3f674e3b360f1d7c5032d9fb47e0992d7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:25:42 +0200 Subject: gnu: r-callr: Update to 3.0.0. * gnu/packages/cran.scm (r-callr): Update to 3.0.0. [propagated-inputs]: Add r-base64enc. --- gnu/packages/cran.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2c6de3ddd2..5c3c7ed821 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -193,17 +193,18 @@ such as copy/paste from an R session.") (define-public r-callr (package (name "r-callr") - (version "2.0.4") + (version "3.0.0") (source (origin (method url-fetch) (uri (cran-uri "callr" version)) (sha256 (base32 - "1053qqq632z94pqq2v5dynjpgyv1b1c8zvidmcllw7zn8zha8gqf")))) + "1rxbxy6kn7dj90z9hpppr9cnpvnxzknba2dwrdp0lrk5dh462qz3")))) (build-system r-build-system) (propagated-inputs - `(("r-r6" ,r-r6) + `(("r-base64enc" ,r-base64enc) + ("r-r6" ,r-r6) ("r-processx" ,r-processx))) (home-page "https://github.com/r-lib/callr#readme") (synopsis "Call R from R") -- cgit v1.2.3 From b00e8ae77105d8fe398f5b9d47812844aa21b5dd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:26:04 +0200 Subject: gnu: r-glue: Update to 1.3.0. * gnu/packages/cran.scm (r-glue): Update to 1.3.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 5c3c7ed821..6ef31e09dd 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -392,14 +392,14 @@ colors are provided.") (define-public r-glue (package (name "r-glue") - (version "1.2.0") + (version "1.3.0") (source (origin (method url-fetch) (uri (cran-uri "glue" version)) (sha256 (base32 - "0vi9y8ix95g6hjqdz9c9y4119apbdjcypdv0ag8cl6vaxqs5n9qr")))) + "1vhw5497lpfr4m8lcx9bs0fgdp4ax0sycrk6n8yksp33qd25m7kq")))) (build-system r-build-system) (home-page "https://github.com/tidyverse/glue") (synopsis "Interpreted string literals") -- cgit v1.2.3 From c73752cac5e74691d9f28c3c8c29a2fbb8291f4c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:26:18 +0200 Subject: gnu: r-pls: Update to 2.7-0. * gnu/packages/cran.scm (r-pls): Update to 2.7-0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6ef31e09dd..c6f4f73f53 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -453,14 +453,14 @@ error stream.") (define-public r-pls (package (name "r-pls") - (version "2.6-0") + (version "2.7-0") (source (origin (method url-fetch) (uri (cran-uri "pls" version)) (sha256 (base32 - "15j59p5x0rkdrk7iqzkipsy50rsyjl31w8zxc4w3v1j5gzxhi1rx")))) + "0xaqqgmdvfh7g7v1m4bcwjqzph68b9cq3bn4kjisfsadl54i5p2x")))) (build-system r-build-system) (home-page "http://mevik.net/work/software/pls.html") (synopsis "Partial Least Squares and Principal Component Regression") -- cgit v1.2.3 From 2d2b95d15141f55f747b785ca0094aeaf3001268 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:26:33 +0200 Subject: gnu: r-ipred: Update to 0.9-7. * gnu/packages/cran.scm (r-ipred): Update to 0.9-7. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c6f4f73f53..b2768cc403 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1755,14 +1755,14 @@ provided.") (define-public r-ipred (package (name "r-ipred") - (version "0.9-6") + (version "0.9-7") (source (origin (method url-fetch) (uri (cran-uri "ipred" version)) (sha256 (base32 - "1vrw1pqcpnc04x1r2h9grdfm6bivs358sww5gg90jwlvxcw69lxq")))) + "0q53cqs46501wsd4cmfsmr78l8nv1hkbamk9m0ns5qy02df5r254")))) (build-system r-build-system) (propagated-inputs `(("r-class" ,r-class) -- cgit v1.2.3 From 45c156bf812e227b07e94b0420d41ed57ae10220 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:26:58 +0200 Subject: gnu: r-broom: Update to 0.5.0. * gnu/packages/cran.scm (r-broom): Update to 0.5.0. [propagated-inputs]: Add r-backports, r-dplyr, r-purrr, and r-tibble; remove r-plyr and r-psych. --- gnu/packages/cran.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b2768cc403..4cf7d6295e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1816,22 +1816,23 @@ created using basic graphics.") (define-public r-broom (package (name "r-broom") - (version "0.4.5") + (version "0.5.0") (source (origin (method url-fetch) (uri (cran-uri "broom" version)) (sha256 (base32 - "1mrrqqw1bmjf2v88ziqwb5y86g29h0a3rsx2jpw0hrzrzb8i5kcb")))) + "1r3831vq0fd5sh5841xr844sghg88z7ws91hg4jgnzbbkxfjp4ag")))) (build-system r-build-system) (propagated-inputs - `(("r-dplyr" ,r-dplyr) + `(("r-backports" ,r-backports) + ("r-dplyr" ,r-dplyr) ("r-nlme" ,r-nlme) - ("r-plyr" ,r-plyr) - ("r-psych" ,r-psych) + ("r-purrr" ,r-purrr) ("r-reshape2" ,r-reshape2) ("r-stringr" ,r-stringr) + ("r-tibble" ,r-tibble) ("r-tidyr" ,r-tidyr))) (home-page "https://github.com/tidyverse/broom") (synopsis "Convert statistical analysis objects into tidy data frames") -- cgit v1.2.3 From dc66835226858236c12c498cc9de0e98c8c86e18 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:32:40 +0200 Subject: gnu: Add r-ucminf. * gnu/packages/cran.scm (r-ucminf): New variable. --- gnu/packages/cran.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4cf7d6295e..f64b48da5f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1981,6 +1981,30 @@ can be computed between character vectors while taking proper care of encoding or between integer vectors representing generic sequences.") (license license:gpl3+))) +(define-public r-ucminf + (package + (name "r-ucminf") + (version "1.1-4") + (source + (origin + (method url-fetch) + (uri (cran-uri "ucminf" version)) + (sha256 + (base32 + "01vggwg1w71k98qs6fhb0x1843vi322mf4g3hbclks94kcpkisx2")))) + (build-system r-build-system) + (native-inputs `(("gfortran" ,gfortran))) + (home-page "https://cran.r-project.org/web/packages/ucminf/") + (synopsis "General-purpose unconstrained non-linear optimization") + (description + "This package provides an implementation of an algorithm for +general-purpose unconstrained non-linear optimization. The algorithm is of +quasi-Newton type with BFGS updating of the inverse Hessian and soft line +search with a trust region type monitoring of the input to the line search +algorithm. The interface of @code{ucminf} is designed for easy interchange +with the package @code{optim}.") + (license license:gpl2+))) + (define-public r-jomo (package (name "r-jomo") -- cgit v1.2.3 From b8f6e2f82a733759017269170e7b8813f04a9425 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:32:50 +0200 Subject: gnu: Add r-ordinal. * gnu/packages/cran.scm (r-ordinal): New variable. --- gnu/packages/cran.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f64b48da5f..590d2c90d3 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2005,6 +2005,33 @@ algorithm. The interface of @code{ucminf} is designed for easy interchange with the package @code{optim}.") (license license:gpl2+))) +(define-public r-ordinal + (package + (name "r-ordinal") + (version "2018.8-25") + (source + (origin + (method url-fetch) + (uri (cran-uri "ordinal" version)) + (sha256 + (base32 + "03cv9hcrw8j3lhamzhz8sk2p3ns4cw9z41x49h301k2b3pajv43h")))) + (build-system r-build-system) + (propagated-inputs + `(("r-mass" ,r-mass) + ("r-matrix" ,r-matrix) + ("r-numderiv" ,r-numderiv) + ("r-ucminf" ,r-ucminf))) + (home-page "https://github.com/runehaubo/ordinal") + (synopsis "Regression models for ordinal data") + (description + "This package provides an implementation of cumulative link (mixed) +models also known as ordered regression models, proportional odds models, +proportional hazards models for grouped survival times and ordered models. +Estimation is via maximum likelihood and mixed models are fitted with the +Laplace approximation and adaptive Gauss-Hermite quadrature.") + (license license:gpl2+))) + (define-public r-jomo (package (name "r-jomo") -- cgit v1.2.3 From e7630cc93182f38b486c1c6825bf7a9ca5c3a6b0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:27:42 +0200 Subject: gnu: r-jomo: Update to 2.6-4. * gnu/packages/cran.scm (r-jomo): Update to 2.6-4. [propagated-inputs]: Add r-ordinal. --- gnu/packages/cran.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 590d2c90d3..8f9a463a0f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2035,17 +2035,18 @@ Laplace approximation and adaptive Gauss-Hermite quadrature.") (define-public r-jomo (package (name "r-jomo") - (version "2.6-3") + (version "2.6-4") (source (origin (method url-fetch) (uri (cran-uri "jomo" version)) (sha256 (base32 - "14s8q0j5zgl1g1pfxg3a4y1jzvs0wl61ir4992wsj7safskj7zvi")))) + "05g2rj9g7rgyb22b0gybw042nydyqsqsb31v05hifzavri8ij01x")))) (build-system r-build-system) (propagated-inputs `(("r-lme4" ,r-lme4) + ("r-ordinal" ,r-ordinal) ("r-survival" ,r-survival))) (home-page "https://cran.r-project.org/web/packages/jomo/") (synopsis "Multilevel Joint Modelling Multiple Imputation") -- cgit v1.2.3 From a7265593d3385423adc2dbeaeb4827db586b2e34 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:33:37 +0200 Subject: gnu: r-pan: Update to 1.6. * gnu/packages/cran.scm (r-pan): Update to 1.6. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8f9a463a0f..46cb3e16a5 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2062,14 +2062,14 @@ impute compatibly with the substantive model.") (define-public r-pan (package (name "r-pan") - (version "1.4") + (version "1.6") (source (origin (method url-fetch) (uri (cran-uri "pan" version)) (sha256 (base32 - "1p3nigmhrnlch86g89hn7l0wvkifx3k9n59g0psi95yck43kza76")))) + "1dk3jjj826p7xrz10qz04vyc068xnypg7bp0pj4c32z3da0xzh5d")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) (home-page "https://cran.r-project.org/web/packages/pan/") -- cgit v1.2.3 From 1b3b2a72eeaa5a134e0db8928f43e42340df36f6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:33:48 +0200 Subject: gnu: r-mice: Update to 3.3.0. * gnu/packages/cran.scm (r-mice): Update to 3.3.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 46cb3e16a5..3865ffa150 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2107,14 +2107,14 @@ analysis of multiply imputed data sets.") (define-public r-mice (package (name "r-mice") - (version "3.1.0") + (version "3.3.0") (source (origin (method url-fetch) (uri (cran-uri "mice" version)) (sha256 (base32 - "0xpn215yfzib4hw09cwilnyg9zbvq460njavfvm84mvgwbm25byi")))) + "1p0ipbqk5aqdi7iikw3qrjyvdi9sdhpnw1h5mwakwvv0yl0pzbyx")))) (build-system r-build-system) (propagated-inputs `(("r-broom" ,r-broom) -- cgit v1.2.3 From 69bf449bf10fe3c6ea5fc643ee49ed6ee8e50b84 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:34:29 +0200 Subject: gnu: r-xts: Update to 0.11-0. * gnu/packages/cran.scm (r-xts): Update to 0.11-0. [native-inputs]: Remove. --- gnu/packages/cran.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 3865ffa150..afba068dd6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2312,17 +2312,16 @@ training models for classification or ranking.") (define-public r-xts (package (name "r-xts") - (version "0.10-2") + (version "0.11-0") (source (origin (method url-fetch) (uri (cran-uri "xts" version)) (sha256 (base32 - "1i11fczks4lh8rpi6xbm9bm7f3jpcp6xw03kv178g3n3361qhmc1")))) + "1v50yn4bsjzdyk7r90isn6dxmpkapillrhpx3gqsshd180vwzqk9")))) (build-system r-build-system) (propagated-inputs `(("r-zoo" ,r-zoo))) - (native-inputs `(("gfortran" ,gfortran))) (home-page "https://github.com/joshuaulrich/xts") (synopsis "Extensible time series") (description -- cgit v1.2.3 From 6f5b157e3dab1ee7db0e62552ba6350b91c66d1e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:34:57 +0200 Subject: gnu: r-pillar: Update to 1.3.0. * gnu/packages/cran.scm (r-pillar): Update to 1.3.0. [propagated-inputs]: Add r-fansi. --- gnu/packages/cran.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index afba068dd6..7d2f93a394 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2798,18 +2798,19 @@ display.") (define-public r-pillar (package (name "r-pillar") - (version "1.2.3") + (version "1.3.0") (source (origin (method url-fetch) (uri (cran-uri "pillar" version)) (sha256 (base32 - "1rzhssprqgam1nq3s0f5rzxhxsq02azcghvxf6k8kmsmddf1n7f8")))) + "1q6arybmfqxhp5zqj1fri5pb8v7ywcv7bmgf81rrmgl892p4bn5f")))) (build-system r-build-system) (propagated-inputs `(("r-cli" ,r-cli) ("r-crayon" ,r-crayon) + ("r-fansi" ,r-fansi) ("r-rlang" ,r-rlang) ("r-utf8" ,r-utf8))) (home-page "https://github.com/r-lib/pillar") -- cgit v1.2.3 From d97d98e142e40820807b050c656df40a33e8d020 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:35:24 +0200 Subject: gnu: r-tinytex: Update to 0.8. * gnu/packages/cran.scm (r-tinytex): Update to 0.8. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 7d2f93a394..b7827931c1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2843,14 +2843,14 @@ terminals.") (define-public r-tinytex (package (name "r-tinytex") - (version "0.6") + (version "0.8") (source (origin (method url-fetch) (uri (cran-uri "tinytex" version)) (sha256 (base32 - "16y9dldaff2kx1fkm92p7zlph0dcrdmlmavpdgf5y9jbhmc8g83f")))) + "1bgpr5i5399jf9n6pg2mm4aamisbhppg082ad0wv1j4g0rlxf1gy")))) (build-system r-build-system) (propagated-inputs `(("r-xfun" ,r-xfun))) -- cgit v1.2.3 From e32368c130893da22b35b4318f06606baacd5056 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:35:46 +0200 Subject: gnu: r-metap: Update to 1.0. * gnu/packages/cran.scm (r-metap): Update to 1.0. [propagated-inputs]: Add r-rdpack. --- gnu/packages/cran.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b7827931c1..784f476145 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2867,17 +2867,18 @@ automatically.") (define-public r-metap (package (name "r-metap") - (version "0.9") + (version "1.0") (source (origin (method url-fetch) (uri (cran-uri "metap" version)) (sha256 (base32 - "03vg0mb6q7j2z0pkxykbak0hcp6dcak7zxs1lw9hswz9kqrq5jhz")))) + "18rzvqfzyk8fn54gjvy2qd21nk9w69j7ihww477ma3f3ab6i982h")))) (build-system r-build-system) (propagated-inputs - `(("r-lattice" ,r-lattice))) + `(("r-lattice" ,r-lattice) + ("r-rdpack" ,r-rdpack))) (home-page "http://www.dewey.myzen.co.uk/meta/meta.html") (synopsis "Meta-analysis of significance values") (description -- cgit v1.2.3 From be5642eb69d3b0dba1685742291b5d635f004c66 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:36:12 +0200 Subject: gnu: r-statnet-common: Update to 4.1.4. * gnu/packages/cran.scm (r-statnet-common): Update to 4.1.4. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 784f476145..fb398f56b8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2912,14 +2912,14 @@ supports arbitrary vertex/edge/graph attributes.") (define-public r-statnet-common (package (name "r-statnet-common") - (version "4.1.2") + (version "4.1.4") (source (origin (method url-fetch) (uri (cran-uri "statnet.common" version)) (sha256 (base32 - "0h3g687214rlycca0fjrpy1lqbqsrginxqhmhl2mb2jinqqxcfgd")))) + "14dydm4c4dzc4v6ldxpn04q551nczzfablwibrd8lzgja8x9ksic")))) (properties `((upstream-name . "statnet.common"))) (build-system r-build-system) -- cgit v1.2.3 From 1fe9919a575b5d2d97dc7dee65251a2689709ed4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:36:31 +0200 Subject: gnu: r-tsa: Update to 1.2. * gnu/packages/cran.scm (r-tsa): Update to 1.2. [propagated-inputs]: Remove r-tseries. --- gnu/packages/cran.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index fb398f56b8..478df95eaf 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3141,21 +3141,20 @@ University Press, 2000.") (define-public r-tsa (package (name "r-tsa") - (version "1.01") + (version "1.2") (source (origin (method url-fetch) (uri (cran-uri "TSA" version)) (sha256 (base32 - "0cm97hwxm6vfgy9mc3kgwq6dnmn86p8a4avnfjbai048qnwrn6hx")))) + "0gjfqibwdznz0nka95k4fjm935svxjpnqfywwz403crn2lh30h6q")))) (properties `((upstream-name . "TSA"))) (build-system r-build-system) (propagated-inputs `(("r-leaps" ,r-leaps) ("r-locfit" ,r-locfit) - ("r-mgcv" ,r-mgcv) - ("r-tseries" ,r-tseries))) + ("r-mgcv" ,r-mgcv))) (home-page "http://www.stat.uiowa.edu/~kchan/TSA.htm") (synopsis "Time series analysis") (description -- cgit v1.2.3 From 19950821d74e5ae008919f28511bb8caa8c516ce Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:37:05 +0200 Subject: gnu: r-heatmaply: Update to 0.15.2. * gnu/packages/cran.scm (r-heatmaply): Update to 0.15.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 478df95eaf..706f612344 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3407,14 +3407,14 @@ exponentiation.") (define-public r-heatmaply (package (name "r-heatmaply") - (version "0.14.1") + (version "0.15.2") (source (origin (method url-fetch) (uri (cran-uri "heatmaply" version)) (sha256 (base32 - "03p2caclhfgqgpx3wwck5h06jy3mxgs05gjmwkb7hmwghkjh41jc")))) + "0h8s5djzj4mrmaswlcaap6jbwxrkbzc43bbqik3qf8vrqz335w04")))) (build-system r-build-system) (propagated-inputs `(("r-assertthat" ,r-assertthat) -- cgit v1.2.3 From 7a96c4e0a00e0c527862df289aa48cab231380dc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:39:09 +0200 Subject: gnu: r-fnn: Update to 1.1.2.1. * gnu/packages/cran.scm (r-fnn): Update to 1.1.2.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 706f612344..9e7cb04f91 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3763,14 +3763,14 @@ multivariate plot methods.") (define-public r-fnn (package (name "r-fnn") - (version "1.1") + (version "1.1.2.1") (source (origin (method url-fetch) (uri (cran-uri "FNN" version)) (sha256 (base32 - "1kncmiaraq1mrykb9fj3fsxswabk3l71fnp1vks0x9aay5xfk8mj")))) + "1n61jrcmakqif8f827x4qnlhm2jqpj5fgjj65c4p0kdd8lzw8pqp")))) (properties `((upstream-name . "FNN"))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/FNN") -- cgit v1.2.3 From 12132229b0c9c57b1f99db158e02a81922a1aabf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:39:23 +0200 Subject: gnu: r-maptools: Update to 0.9-3. * gnu/packages/cran.scm (r-maptools): Update to 0.9-3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9e7cb04f91..116fdf42cb 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4055,14 +4055,14 @@ simple method for converting between file types.") (define-public r-maptools (package (name "r-maptools") - (version "0.9-2") + (version "0.9-3") (source (origin (method url-fetch) (uri (cran-uri "maptools" version)) (sha256 (base32 - "075lmb3b62171cw2dg8fv1vwmvfzg39r1ji7jwb8s5k9dz88ry1v")))) + "0hxbv01im9zk1qrwgigpc510w6x0kzdzip4gx2jzfqmmwr8m17r8")))) (build-system r-build-system) (propagated-inputs `(("r-foreign" ,r-foreign) -- cgit v1.2.3 From 2e6909baf0512cb5f4de9553e6dad3329db7e47c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:39:46 +0200 Subject: gnu: r-later: Update to 0.7.4. * gnu/packages/cran.scm (r-later): Update to 0.7.4. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 116fdf42cb..82111ff96e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4083,14 +4083,14 @@ exchanging spatial objects with other R packages.") (define-public r-later (package (name "r-later") - (version "0.7.3") + (version "0.7.4") (source (origin (method url-fetch) (uri (cran-uri "later" version)) (sha256 (base32 - "04j2phymxgkk4hv9pfa5w3s98w5d7fvm11blrdhxmray4n618msw")))) + "125zc499gj702x2bch95lsfzk2qb4dzv3604x9afym2i3ylrmm64")))) (build-system r-build-system) (propagated-inputs `(("r-bh" ,r-bh) -- cgit v1.2.3 From a9b02ddd73adf938d5ef68658c2873dac64b7f04 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:39:58 +0200 Subject: gnu: r-codedepends: Update to 0.6.5. * gnu/packages/cran.scm (r-codedepends): Update to 0.6.5. [propagated-inputs]: Add r-graph. --- gnu/packages/cran.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 82111ff96e..8eac103109 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4180,18 +4180,19 @@ it.") (define-public r-codedepends (package (name "r-codedepends") - (version "0.5-3") + (version "0.6.5") (source (origin (method url-fetch) (uri (cran-uri "CodeDepends" version)) (sha256 (base32 - "03p82s0abca2jimzqvxdzykfzca7c7fhm5xsjxybcksr4gggr5sc")))) + "0l7kiv3awx50glf5cs841b4zzsff1ml90f0zr868ygvwsr4ps1hq")))) (properties `((upstream-name . "CodeDepends"))) (build-system r-build-system) (propagated-inputs `(("r-codetools" ,r-codetools) + ("r-graph" ,r-graph) ("r-xml" ,r-xml))) (home-page "http://cran.r-project.org/web/packages/CodeDepends") (synopsis "Analysis of R code for reproducible research and code comprehension") -- cgit v1.2.3 From caaec8865117a15392a5220fe29f0acacef1a318 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:40:20 +0200 Subject: gnu: r-ggpubr: Update to 0.1.8. * gnu/packages/cran.scm (r-ggpubr): Update to 0.1.8. [propagated-inputs]: Add r-glue and r-polynom. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8eac103109..9f3d1bfd09 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4411,14 +4411,14 @@ and adds the annotation to the plot.") (define-public r-ggpubr (package (name "r-ggpubr") - (version "0.1.7") + (version "0.1.8") (source (origin (method url-fetch) (uri (cran-uri "ggpubr" version)) (sha256 (base32 - "110ny8p41kmbz0a5rl0mv9cqpjkx6yr3ybflp1r0fmcvhwv7cr3i")))) + "0psl2zndm4wk6nnj1nv305islpxfvfgd87gjh2ph8yqn4mxpnfi1")))) (build-system r-build-system) (propagated-inputs `(("r-cowplot" ,r-cowplot) @@ -4427,8 +4427,10 @@ and adds the annotation to the plot.") ("r-ggrepel" ,r-ggrepel) ("r-ggsci" ,r-ggsci) ("r-ggsignif" ,r-ggsignif) + ("r-glue" ,r-glue) ("r-gridextra" ,r-gridextra) ("r-magrittr" ,r-magrittr) + ("r-polynom" ,r-polynom) ("r-purrr" ,r-purrr) ("r-scales" ,r-scales) ("r-tidyr" ,r-tidyr))) -- cgit v1.2.3 From 5dfe491290b14a1ee7efd70f9cd083969c24e1c2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:46:12 +0200 Subject: gnu: r-graph: Move from bioinformatics to bioconductor. * gnu/packages/bioinformatics.scm (r-graph): Move from here... * gnu/packages/bioconductor.scm (r-graph): ...to here. --- gnu/packages/bioconductor.scm | 19 +++++++++++++++++++ gnu/packages/bioinformatics.scm | 19 ------------------- 2 files changed, 19 insertions(+), 19 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 1ff86779e8..fc01c2283b 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -360,6 +360,25 @@ cutoffs. The procedures are directly applicable to identifying differentially expressed genes in DNA microarray experiments.") (license license:lgpl3))) +(define-public r-graph + (package + (name "r-graph") + (version "1.58.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "graph" version)) + (sha256 + (base32 + "1zx445lk36g1s6i5dbhhf00nzzazyklfjxxjfax6q8hnhvgm9759")))) + (build-system r-build-system) + (propagated-inputs + `(("r-biocgenerics" ,r-biocgenerics))) + (home-page "https://bioconductor.org/packages/graph") + (synopsis "Handle graph data structures in R") + (description + "This package implements some simple graph handling capabilities for R.") + (license license:artistic2.0))) + (define-public r-chippeakanno (package (name "r-chippeakanno") diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 760b716408..a03d37c5b0 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7787,25 +7787,6 @@ extracting the desired features in a convenient format.") information about the latest version of the Gene Ontologies.") (license license:artistic2.0))) -(define-public r-graph - (package - (name "r-graph") - (version "1.58.0") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "graph" version)) - (sha256 - (base32 - "1zx445lk36g1s6i5dbhhf00nzzazyklfjxxjfax6q8hnhvgm9759")))) - (build-system r-build-system) - (propagated-inputs - `(("r-biocgenerics" ,r-biocgenerics))) - (home-page "https://bioconductor.org/packages/graph") - (synopsis "Handle graph data structures in R") - (description - "This package implements some simple graph handling capabilities for R.") - (license license:artistic2.0))) - (define-public r-topgo (package (name "r-topgo") -- cgit v1.2.3 From a207bca2adf5371aabe41f28203c0e3e7bfbacad Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:47:19 +0200 Subject: gnu: r-codedepends: Move from cran to bioconductor. * gnu/packages/cran.scm (r-codedepends): Move from here... * gnu/packages/bioconductor.scm (r-codedepends): ...to here. --- gnu/packages/bioconductor.scm | 28 ++++++++++++++++++++++++++++ gnu/packages/cran.scm | 28 ---------------------------- 2 files changed, 28 insertions(+), 28 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index fc01c2283b..a47a5aad05 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -379,6 +379,34 @@ expressed genes in DNA microarray experiments.") "This package implements some simple graph handling capabilities for R.") (license license:artistic2.0))) +(define-public r-codedepends + (package + (name "r-codedepends") + (version "0.6.5") + (source + (origin + (method url-fetch) + (uri (cran-uri "CodeDepends" version)) + (sha256 + (base32 + "0l7kiv3awx50glf5cs841b4zzsff1ml90f0zr868ygvwsr4ps1hq")))) + (properties `((upstream-name . "CodeDepends"))) + (build-system r-build-system) + (propagated-inputs + `(("r-codetools" ,r-codetools) + ("r-graph" ,r-graph) + ("r-xml" ,r-xml))) + (home-page "http://cran.r-project.org/web/packages/CodeDepends") + (synopsis "Analysis of R code for reproducible research and code comprehension") + (description + "This package provides tools for analyzing R expressions or blocks of +code and determining the dependencies between them. It focuses on R scripts, +but can be used on the bodies of functions. There are many facilities +including the ability to summarize or get a high-level view of code, +determining dependencies between variables, code improvement suggestions.") + ;; Any version of the GPL + (license (list license:gpl2+ license:gpl3+)))) + (define-public r-chippeakanno (package (name "r-chippeakanno") diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9f3d1bfd09..447be5657a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4177,34 +4177,6 @@ to the cluster management tool @code{sfCluster}, but can also used without it.") (license license:gpl2+))) -(define-public r-codedepends - (package - (name "r-codedepends") - (version "0.6.5") - (source - (origin - (method url-fetch) - (uri (cran-uri "CodeDepends" version)) - (sha256 - (base32 - "0l7kiv3awx50glf5cs841b4zzsff1ml90f0zr868ygvwsr4ps1hq")))) - (properties `((upstream-name . "CodeDepends"))) - (build-system r-build-system) - (propagated-inputs - `(("r-codetools" ,r-codetools) - ("r-graph" ,r-graph) - ("r-xml" ,r-xml))) - (home-page "http://cran.r-project.org/web/packages/CodeDepends") - (synopsis "Analysis of R code for reproducible research and code comprehension") - (description - "This package provides tools for analyzing R expressions or blocks of -code and determining the dependencies between them. It focuses on R scripts, -but can be used on the bodies of functions. There are many facilities -including the ability to summarize or get a high-level view of code, -determining dependencies between variables, code improvement suggestions.") - ;; Any version of the GPL - (license (list license:gpl2+ license:gpl3+)))) - (define-public r-rappdirs (package (name "r-rappdirs") -- cgit v1.2.3 From c0608f815c4706ede4e7533409f3e7da127b767f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:49:33 +0200 Subject: gnu: r-adaptivesparsity: Update to 1.6. * gnu/packages/machine-learning.scm (r-adaptivesparsity): Update to 1.6. [propagated-inputs]: Add r-mass and r-matrix. --- gnu/packages/machine-learning.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index a86bdcb5ed..ec917e4442 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -560,13 +560,13 @@ I/O.") (define-public r-adaptivesparsity (package (name "r-adaptivesparsity") - (version "1.4") + (version "1.6") (source (origin (method url-fetch) (uri (cran-uri "AdaptiveSparsity" version)) (sha256 (base32 - "1az7isvalf3kmdiycrfl6s9k9xqk22k1mc6rh8v0jmcz402qyq8z")))) + "0imr5m8mll9j6n4icsv6z9rl5kbnwsp9wvzrg7n90nnmcxq2cz91")))) (properties `((upstream-name . "AdaptiveSparsity"))) (build-system r-build-system) @@ -579,7 +579,9 @@ I/O.") (("PKG_LIBS=" prefix) (string-append prefix "-larmadillo")))))))) (propagated-inputs - `(("r-rcpp" ,r-rcpp) + `(("r-mass" ,r-mass) + ("r-matrix" ,r-matrix) + ("r-rcpp" ,r-rcpp) ("r-rcpparmadillo" ,r-rcpparmadillo))) (inputs `(("armadillo" ,armadillo))) -- cgit v1.2.3 From c28d8d8db06e165faa168a8e197651d941bbb9ee Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:50:14 +0200 Subject: gnu: r-kernlab: Update to 0.9-27. * gnu/packages/machine-learning.scm (r-kernlab): Update to 0.9-27. --- gnu/packages/machine-learning.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index ec917e4442..7790e78779 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -596,14 +596,14 @@ geometric models.") (define-public r-kernlab (package (name "r-kernlab") - (version "0.9-26") + (version "0.9-27") (source (origin (method url-fetch) (uri (cran-uri "kernlab" version)) (sha256 (base32 - "0xv0slf3ggw3sswsi34416lb1g3h1pqkrr2h7r1n1kvgii3l0jcm")))) + "1m0xqf6gyvwayz7w3c83y32ayvnlz0jicj8ijk808zq9sh7dbbgn")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/kernlab") (synopsis "Kernel-based machine learning tools") -- cgit v1.2.3 From 8da236a377f4c0c6679334bcc76704d858ae088f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:50:43 +0200 Subject: gnu: r-gtools: Update to 3.8.1. * gnu/packages/statistics.scm (r-gtools): Update to 3.8.1. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 69c72541a7..4fefdcd7f2 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4091,14 +4091,14 @@ Zurich, including many that are related to graphics.") (define-public r-gtools (package (name "r-gtools") - (version "3.5.0") + (version "3.8.1") (source (origin (method url-fetch) (uri (cran-uri "gtools" version)) (sha256 (base32 - "1xknwk9xlsj027pg0nwiizigcrsc84hdrig0jn0cgcyxj8dabdl6")))) + "0f5syk1qq6cjq6hwymvkiyhzwa389z94722v881ipbfqkd2q8505")))) (build-system r-build-system) (arguments `(#:phases -- cgit v1.2.3 From f0519c8faec872b599debde5f2f91d6dbf57a5b4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:50:59 +0200 Subject: gnu: r-zoo: Update to 1.8-3. * gnu/packages/statistics.scm (r-zoo): Update to 1.8-3. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 4fefdcd7f2..eb4063c984 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4231,13 +4231,13 @@ mechanism.") (define-public r-zoo (package (name "r-zoo") - (version "1.8-2") + (version "1.8-3") (source (origin (method url-fetch) (uri (cran-uri "zoo" version)) (sha256 (base32 - "1lpwigxmi5sc23xrha4gcsccsm4yfsg0sa97y6vac3pg1lliblvx")))) + "15jmkgwvq2mm9f09vijgx7sff8pszh90fndcwhk2vw9i0p183di0")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice))) -- cgit v1.2.3 From e5db6890adb1b842d4ad5dc3313a65f6628ec3bf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:51:15 +0200 Subject: gnu: r-ztable: Update to 0.2.0. * gnu/packages/statistics.scm (r-ztable): Update to 0.2.0. [propagated-inputs]: Add r-flextable, r-magrittr, r-moonbook, r-officer, r-rcolorbrewer, r-scales, and r-stringr. --- gnu/packages/statistics.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index eb4063c984..ccff5fc293 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4251,14 +4251,22 @@ series of numeric vectors/matrices and factors.") (define-public r-ztable (package (name "r-ztable") - (version "0.1.8") + (version "0.2.0") (source (origin (method url-fetch) (uri (cran-uri "ztable" version)) (sha256 (base32 - "1hk5k9614n52dpfrhdws06w4gvwhnz8q47x4cwxx88qmrzm8z2m3")))) + "0g7khk5ifsdh9p31wlwh2l5mn1hzxzpv6qcn1wh34vsfjdmijjwy")))) (build-system r-build-system) + (propagated-inputs + `(("r-flextable" ,r-flextable) + ("r-magrittr" ,r-magrittr) + ("r-moonbook" ,r-moonbook) + ("r-officer" ,r-officer) + ("r-rcolorbrewer" ,r-rcolorbrewer) + ("r-scales" ,r-scales) + ("r-stringr" ,r-stringr))) (home-page "https://cran.r-project.org/web/packages/ztable") (synopsis "Zebra-striped tables in LaTeX and HTML formats for R") (description -- cgit v1.2.3 From 314e8e763f9a2b3a3d5f98e8e435691f9dc01501 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:52:05 +0200 Subject: gnu: r-ggthemes: Update to 4.0.1. * gnu/packages/statistics.scm (r-ggthemes): Update to 4.0.1. [propagated-inputs]: Remove r-assertthat and r-colorspace; add r-purrr, r-stringr, and r-tibble. --- gnu/packages/statistics.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index ccff5fc293..51a3c1fada 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4361,19 +4361,20 @@ data at that region, and avoids over-plotting.") (define-public r-ggthemes (package (name "r-ggthemes") - (version "3.5.0") + (version "4.0.1") (source (origin (method url-fetch) (uri (cran-uri "ggthemes" version)) (sha256 (base32 - "0drbzzb4i5jq1579fx1wmgh87ybnswjn7srak2l8g771ip49xwb8")))) + "0y6570wv135sf7pv57l7bqilzw47rziaqx4vsk45pf1w4lmj0w8b")))) (build-system r-build-system) (propagated-inputs - `(("r-assertthat" ,r-assertthat) - ("r-colorspace" ,r-colorspace) - ("r-ggplot2" ,r-ggplot2) - ("r-scales" ,r-scales))) + `(("r-ggplot2" ,r-ggplot2) + ("r-purrr" ,r-purrr) + ("r-scales" ,r-scales) + ("r-stringr" ,r-stringr) + ("r-tibble" ,r-tibble))) (home-page "https://cran.rstudio.com/web/packages/ggthemes") (synopsis "Extra themes, scales and geoms for @code{ggplot2}") (description "This package provides extra themes and scales for -- cgit v1.2.3 From 8e499d756a4a7c5f875e023da2500536bdc10258 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:53:17 +0200 Subject: gnu: r-rann: Update to 2.6. * gnu/packages/statistics.scm (r-rann): Update to 2.6. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 51a3c1fada..d832003791 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4413,13 +4413,13 @@ dispersion modeling and Tweedie power-law families.") (define-public r-rann (package (name "r-rann") - (version "2.5.1") + (version "2.6") (source (origin (method url-fetch) (uri (cran-uri "RANN" version)) (sha256 (base32 - "0il5i99vbcagnxvb15af5n37g04a4q1x96bz73zh3jhki9fpw9vm")))) + "1r6rivh9ba4gwnzryip0aiwsbm46zma7nvd9z5y456p2dgzp9lii")))) (properties `((upstream-name . "RANN"))) (build-system r-build-system) -- cgit v1.2.3 From 0d279d607aeccc2365a4502db4c58ec247724bb4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:53:34 +0200 Subject: gnu: r-robustbase: Update to 0.93-2. * gnu/packages/statistics.scm (r-robustbase): Update to 0.93-2. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index d832003791..07e180cf53 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4735,14 +4735,14 @@ can be efficiently implemented directly in the R language.") (define-public r-robustbase (package (name "r-robustbase") - (version "0.93-0") + (version "0.93-2") (source (origin (method url-fetch) (uri (cran-uri "robustbase" version)) (sha256 (base32 - "130pzibn5cb8mycv8byc6npzcpddghz8m7jqwk15qmx4g3cj8zgy")))) + "1632p73iv9iqqm0v3k9rfv9way0him3fl35si1nly9wi5kpq5ci7")))) (build-system r-build-system) (inputs `(("gfortran" ,gfortran))) -- cgit v1.2.3 From f33a4748b7343a0f2ae3e560047b6eeca0f95235 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:53:52 +0200 Subject: gnu: r-modelmetrics: Update to 1.2.0. * gnu/packages/statistics.scm (r-modelmetrics): Update to 1.2.0. [propagated-inputs]: Add r-data-table. --- gnu/packages/statistics.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 07e180cf53..ce7335619b 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5011,18 +5011,19 @@ decompositions of such matrices, and solutions of linear systems.") (define-public r-modelmetrics (package (name "r-modelmetrics") - (version "1.1.0") + (version "1.2.0") (source (origin (method url-fetch) (uri (cran-uri "ModelMetrics" version)) (sha256 (base32 - "119xxmzb5biq7k1yxqsf0jmmarmfn6lds9x9hfgv593xlpym6za8")))) + "1sgdyrf6fbsn18gk8slir4a1yhv133kfhyg2crfs759nff4aw89h")))) (properties `((upstream-name . "ModelMetrics"))) (build-system r-build-system) (propagated-inputs - `(("r-rcpp" ,r-rcpp))) + `(("r-rcpp" ,r-rcpp) + ("r-data-table" ,r-data-table))) (home-page "https://cran.r-project.org/web/packages/ModelMetrics") (synopsis "Rapid calculation of model metrics") (description -- cgit v1.2.3 From dff5640a59da533fc91fa285b6d7d7fec2f7e60a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:55:00 +0200 Subject: gnu: r-rcas: Use standard version of ghc-pandoc-citeproc. * gnu/packages/bioinformatics.scm (r-rcas)[native-inputs]: Replace "ghc-pandoc-citeproc-with-pandoc-1" with "ghc-pandoc-citeproc". --- gnu/packages/bioinformatics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a03d37c5b0..028643aeb4 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8518,7 +8518,7 @@ paired-end data.") `(("r-testthat" ,r-testthat) ;; During vignette building knitr checks that "pandoc-citeproc" ;; is in the PATH. - ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc-with-pandoc-1))) + ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc))) (propagated-inputs `(("r-biocgenerics" ,r-biocgenerics) ("r-biomart" ,r-biomart) -- cgit v1.2.3 From ca248f1db90c2e7b01d734aaa51d330a29fe0937 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:55:56 +0200 Subject: gnu: pigx-rnaseq: Use latest version of Pandoc. * gnu/packages/bioinformatics.scm (pigx-rnaseq)[inputs]: Replace "ghc-pandoc-citeproc-with-pandoc-1" with "ghc-pandoc-citeproc", and "ghc-pandoc-1" with "ghc-pandoc". --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 028643aeb4..99313824e9 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -12830,8 +12830,8 @@ once. This package provides tools to perform Drop-seq analyses.") ("r-rtracklayer" ,r-rtracklayer) ("r-rjson" ,r-rjson) ("salmon" ,salmon) - ("ghc-pandoc" ,ghc-pandoc-1) - ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc-with-pandoc-1) + ("ghc-pandoc" ,ghc-pandoc) + ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc) ("python-wrapper" ,python-wrapper) ("python-pyyaml" ,python-pyyaml))) (home-page "http://bioinformatics.mdc-berlin.de/pigx/") -- cgit v1.2.3 From 7cd40c8c5dee1b323117ec85787566505be2d9ad Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:56:38 +0200 Subject: gnu: pigx-chipseq: Use latest version of Pandoc. * gnu/packages/bioinformatics.scm (pigx-chipseq)[inputs]: Replace "ghc-pandoc-citeproc-with-pandoc-1" with "ghc-pandoc-citeproc", and "ghc-pandoc-1" with "ghc-pandoc". --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 99313824e9..e1d953561b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -12892,8 +12892,8 @@ expression report comparing samples in an easily configurable manner.") ("macs" ,macs) ("multiqc" ,multiqc) ("perl" ,perl) - ("ghc-pandoc" ,ghc-pandoc-1) - ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc-with-pandoc-1) + ("ghc-pandoc" ,ghc-pandoc) + ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc) ("fastqc" ,fastqc) ("bowtie" ,bowtie) ("idr" ,idr) -- cgit v1.2.3 From c2b4f81e51bab9a3ca6f2d1ba81ab1ff3b573ab4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:56:53 +0200 Subject: gnu: pigx-bsseq: Use latest version of Pandoc. * gnu/packages/bioinformatics.scm (pigx-bsseq)[inputs]: Replace "ghc-pandoc-citeproc-with-pandoc-1" with "ghc-pandoc-citeproc", and "ghc-pandoc-1" with "ghc-pandoc". --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index e1d953561b..7c25a71c6b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -12954,8 +12954,8 @@ in an easily configurable manner.") ("r-bookdown" ,r-bookdown) ("r-ggplot2" ,r-ggplot2) ("r-ggbio" ,r-ggbio) - ("ghc-pandoc" ,ghc-pandoc-1) - ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc-with-pandoc-1) + ("ghc-pandoc" ,ghc-pandoc) + ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc) ("python-wrapper" ,python-wrapper) ("python-pyyaml" ,python-pyyaml) ("snakemake" ,snakemake-4) -- cgit v1.2.3 From 00a43cb81cecb30d40f9940407c9f1ba08d3d38e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:57:09 +0200 Subject: gnu: pigx-scrnaseq: Use latest version of Pandoc. * gnu/packages/bioinformatics.scm (pigx-scrnaseq)[inputs]: Replace "ghc-pandoc-citeproc-with-pandoc-1" with "ghc-pandoc-citeproc", and "ghc-pandoc-1" with "ghc-pandoc". --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 7c25a71c6b..92b6e7d50c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13005,8 +13005,8 @@ methylation and segmentation.") ("python-magic" ,python-magic) ("python-numpy" ,python-numpy) ("python-loompy" ,python-loompy) - ("ghc-pandoc" ,ghc-pandoc-1) - ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc-with-pandoc-1) + ("ghc-pandoc" ,ghc-pandoc) + ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc) ("samtools" ,samtools) ("snakemake" ,snakemake-4) ("star" ,star) -- cgit v1.2.3 From a5c70c2e0e91ede6061ba130c27e5fdedbcbf2d8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 6 Sep 2018 02:29:48 +0200 Subject: gnu: libmpdclient: Update to 2.15. * gnu/packages/mpd.scm (libmpdclient): Update to 2.15. --- gnu/packages/mpd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 2554ec9efd..5c82bf9ba1 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -56,7 +56,7 @@ (define-public libmpdclient (package (name "libmpdclient") - (version "2.14") + (version "2.15") (source (origin (method url-fetch) (uri @@ -65,7 +65,7 @@ "/libmpdclient-" version ".tar.xz")) (sha256 (base32 - "0whk0qw0lsd3kaimdznz0c45bfym0p4885zf4b7pfc7y3dwy510a")))) + "1la60ar6i4ghpscrlgm45kci9b74bvkpsfybhg0ygs4rzpwzdnxl")))) (build-system meson-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From d83477adf92f18bd3a19b1ab2d22a0312bbaf294 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 6 Sep 2018 02:23:49 +0200 Subject: gnu: font-fira-code: Update to 1.205. * gnu/packages/fonts.scm (font-fira-code): Update to 1.205. --- gnu/packages/fonts.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 4d02b4bc62..ce07d3ad4c 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -887,7 +887,7 @@ designed to work well in user interface environments.") (define-public font-fira-code (package (name "font-fira-code") - (version "1.204") + (version "1.205") (source (origin (method url-fetch/zipbomb) (uri (string-append "https://github.com/tonsky/FiraCode/releases/" @@ -895,7 +895,7 @@ designed to work well in user interface environments.") "/FiraCode_" version ".zip")) (sha256 (base32 - "17wky221b3igrqhmxgmqiyv1xdfn0nw471vzhpkrvv1w2w1w1k18")))) + "13bxgf59g6fw5191xclcjzn22hj8jk9k5jjwf7vz07mpjbgadcl5")))) (build-system font-build-system) (home-page "https://mozilla.github.io/Fira/") (synopsis "Monospaced font with programming ligatures") -- cgit v1.2.3 From 79b283e433be171c7917fd5d9f10fa2185862a36 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 6 Sep 2018 02:21:26 +0200 Subject: gnu: ccache: Update to 3.4.3. * gnu/packages/ccache.scm (ccache): Update to 3.4.3. [arguments]: Remove obsolete 'munge-failing-test' phase. --- gnu/packages/ccache.scm | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ccache.scm b/gnu/packages/ccache.scm index af06b741a7..af29cee565 100644 --- a/gnu/packages/ccache.scm +++ b/gnu/packages/ccache.scm @@ -30,7 +30,7 @@ (define-public ccache (package (name "ccache") - (version "3.4.2") + (version "3.4.3") (source (origin (method url-fetch) @@ -38,7 +38,7 @@ version ".tar.xz")) (sha256 (base32 - "1qpy6k9f06kpr6bxy26ncdxcszqv1skcncvczcvksgfncx1v3a0q")))) + "0jjzq5340qw3jm5gkajjkkb5wd0yqqy1dyjw3mf3jy15cakmazi9")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) ; for test.sh ("which" ,(@ (gnu packages base) which)))) @@ -49,13 +49,6 @@ (lambda _ (substitute* '("unittest/test_hashutil.c" "test/suites/base.bash") (("#!/bin/sh") (string-append "#!" (which "sh")))) - #t)) - (add-before 'check 'munge-failing-test - (lambda _ - ;; XXX The new ‘Multiple -fdebug-prefix-map’ test added in - ;; 3.3.5 fails (why?). Force it to report success instead. - (substitute* "test/suites/debug_prefix_map.bash" - (("grep \"name\"") "true")) #t))))) (home-page "https://ccache.samba.org/") (synopsis "Compiler cache") -- cgit v1.2.3 From d53aeeafccb91fd03c6c540153720717eceb92a4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Sep 2018 04:53:32 +0200 Subject: Add missing use-modules clause. This is a follow-up to commit 5dfe491290b14a1ee7efd70f9cd083969c24e1c2. Sorry! * gnu/packages/bioinformatics.scm, gnu/packages/graph.scm: Use (gnu packages bioconductor). --- gnu/packages/bioinformatics.scm | 1 + gnu/packages/graph.scm | 1 + 2 files changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 92b6e7d50c..2d5ec6d170 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -51,6 +51,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bison) + #:use-module (gnu packages bioconductor) #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages compression) diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index 3b222d6ee8..245ee8f956 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -28,6 +28,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) #:use-module (gnu packages gcc) + #:use-module (gnu packages bioconductor) #:use-module (gnu packages bioinformatics) #:use-module (gnu packages compression) #:use-module (gnu packages cran) -- cgit v1.2.3 From 96d6c41dfa5d69d4f25c8b53cb74e2ee621165d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 6 Sep 2018 10:43:01 +0200 Subject: gnu: guile-commonmark: Install .go files to libdir. * gnu/packages/guile.scm (guile-commonmark)[source](snippet): Change the "modir = " and "godir = " line separately, allowing .go files to be installed to $(libdir). --- gnu/packages/guile.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index f594cd13ed..335bd6219f 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -1612,8 +1612,10 @@ you send to a FIFO file.") (("ac_subst_vars='") "ac_subst_vars='GUILE_EFFECTIVE_VERSION\n")) (substitute* "Makefile.in" - (("/site/2.0") - "/site/@GUILE_EFFECTIVE_VERSION@")) + (("moddir =.*") + "moddir = $(datadir)/guile/site/@GUILE_EFFECTIVE_VERSION@\n") + (("godir =.*") + "godir = $(libdir)/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache\n")) #t)))) (build-system gnu-build-system) (inputs -- cgit v1.2.3 From b3ca2d8883f7aa5c8505e04427f2d892148f61e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 6 Sep 2018 10:46:07 +0200 Subject: gnu: hpcguix-web: Update to 9ff40fc. * gnu/packages/web.scm (hpcguix-web): Update to 9ff40fc. [arguments]: In 'wrap-program' phase, add guile-gcrypt, guile-git, and guile-bytestructures to DEPS. --- gnu/packages/web.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 918548513d..9567254424 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6708,10 +6708,11 @@ compressed JSON header blocks. (license l:expat))) (define-public hpcguix-web - (let ((commit "87cb51611c0f1fd3863b830614ab1364599cf1ca")) + (let ((commit "9ff40fcc77f248901d861756dbbddc80270c380c") + (revision "2")) (package (name "hpcguix-web") - (version (git-version "0.0.1" "1" commit)) + (version (git-version "0.0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -6720,7 +6721,7 @@ compressed JSON header blocks. (file-name (git-file-name name version)) (sha256 (base32 - "0p66fl8r3v73v13fqg9rbqbzbdzvyznchxbq2s1jwq6qfsn2w3gr")))) + "0lxcj9s3wxrv1l7lrxxx374jwzx7h60gxwkbgr46lzcbgvb3k26s")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) @@ -6741,10 +6742,13 @@ compressed JSON header blocks. (let* ((out (assoc-ref outputs "out")) (guix (assoc-ref inputs "guix")) (guile (assoc-ref inputs "guile")) + (gcrypt (assoc-ref inputs "guile-gcrypt")) + (git (assoc-ref inputs "guile-git")) + (bs (assoc-ref inputs "guile-bytestructures")) (json (assoc-ref inputs "guile-json")) (guile-cm (assoc-ref inputs "guile-commonmark")) - (deps (list guile guile-cm guix json)) + (deps (list guile gcrypt git bs guile-cm guix json)) (effective (read-line (open-pipe* OPEN_READ -- cgit v1.2.3 From 89874fd15610bc35c586b38a0d575522140ff5b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 6 Sep 2018 10:48:44 +0200 Subject: gnu: guile-charting: Install .go files to libdir. * gnu/packages/plotutils.scm (guile-charting)[source](modules, snippet): Remove. --- gnu/packages/plotutils.scm | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 0e65cb319f..2a330695c6 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.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 © 2015 Eric Bavier ;;; Copyright © 2016, 2017 Nicolas Goaziou ;;; Copyright © 2018 Tobias Geerinckx-Rice @@ -93,15 +93,7 @@ scientific data.") "guile-charting-" version ".tar.gz")) (sha256 (base32 - "0w5qiyv9v0ip5li22x762bm48g8xnw281w66iyw094zdw611pb2m")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Use the standard location for modules. - (substitute* "Makefile.in" - (("godir = .*$") - "godir = $(moddir)\n")) - #t)))) + "0w5qiyv9v0ip5li22x762bm48g8xnw281w66iyw094zdw611pb2m")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("guile" ,guile-2.2))) -- cgit v1.2.3 From b290a631a0f9ee9a52095be66c843780dc0366f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 6 Sep 2018 10:49:42 +0200 Subject: gnu: guile-present: Install .go files to libdir. * gnu/packages/plotutils.scm (guile-present)[source](modules, snippet): Remove. --- gnu/packages/gtk.scm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 6c43a3ab56..4daaad0ebc 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -903,14 +903,7 @@ images onto Cairo surfaces.") (sha256 (base32 "1qam447m05sxxv6x8dlzg7qnyfc4dh8apjw1idpfhpns671gfr6m")) - (patches (search-patches "guile-present-coding.patch")) - (modules '((guix build utils))) - (snippet - '(begin - (substitute* "Makefile.in" - (("godir = .*$") - "godir = $(moddir)\n")) - #t)))) + (patches (search-patches "guile-present-coding.patch")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From f66be84d08b90a9ecf08f79c8156d072ad359c36 Mon Sep 17 00:00:00 2001 From: Eric Brown Date: Sun, 2 Sep 2018 09:27:56 -0500 Subject: gnu: gfortran, gcc-objc, gcc-objc++: Add version 8. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gcc.scm (gfortran-8, gcc-objc-8, gcc-objc++-8): New variables. Signed-off-by: Ludovic Courtès --- gnu/packages/gcc.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index bdff2ddada..0dd5d64464 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -663,6 +663,10 @@ as the 'native-search-paths' field." (custom-gcc gcc-7 "gfortran" '("fortran") %generic-search-paths)) +(define-public gfortran-8 + (custom-gcc gcc-8 "gfortran" '("fortran") + %generic-search-paths)) + (define-public gfortran ;; Note: Update this when GCC changes! We cannot use ;; (custom-gcc gcc "fortran" …) because that would lead to a package object @@ -723,6 +727,15 @@ as the 'native-search-paths' field." (variable "LIBRARY_PATH") (files '("lib" "lib64")))))) +(define-public gcc-objc-8 + (custom-gcc gcc-8 "gcc-objc" '("objc") + (list (search-path-specification + (variable "OBJC_INCLUDE_PATH") + (files '("include"))) + (search-path-specification + (variable "LIBRARY_PATH") + (files '("lib" "lib64")))))) + (define-public gcc-objc gcc-objc-5) (define-public gcc-objc++-4.8 @@ -770,6 +783,15 @@ as the 'native-search-paths' field." (variable "LIBRARY_PATH") (files '("lib" "lib64")))))) +(define-public gcc-objc++-8 + (custom-gcc gcc-8 "gcc-objc++" '("obj-c++") + (list (search-path-specification + (variable "OBJCPLUS_INCLUDE_PATH") + (files '("include"))) + (search-path-specification + (variable "LIBRARY_PATH") + (files '("lib" "lib64")))))) + (define-public gcc-objc++ gcc-objc++-5) (define (make-libstdc++-doc gcc) -- cgit v1.2.3 From 7df945656cd448b13969f90a7a95d8a4e9d442f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 6 Sep 2018 13:49:06 +0200 Subject: services: hpcguix-web: Set SSL_CERT_DIR. Previously Git pulls over HTTPS would fail with: guix/git.scm:132:7: In procedure update-cached-checkout: Throw to key `git-error' with args `(#< code: -17 message: "the SSL certificate is invalid" class: 16>)'. * gnu/services/web.scm (hpcguix-web-shepherd-service): Pass "SSL_CERT_DIR=/etc/ssl/certs". * doc/guix.texi (Web Services): Mention certificates. --- gnu/services/web.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 467656444e..3778efd048 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -967,7 +967,8 @@ a webserver.") #:user "hpcguix-web" #:group "hpcguix-web" #:environment-variables - (list "XDG_CACHE_HOME=/var/cache"))) + (list "XDG_CACHE_HOME=/var/cache" + "SSL_CERT_DIR=/etc/ssl/certs"))) (stop #~(make-kill-destructor)))))) (define hpcguix-web-service-type -- cgit v1.2.3 From 21f5f351fb4a21a8051cdb2b747fef57aa2fa8d4 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 6 Sep 2018 10:55:21 -0400 Subject: gnu: libgme: Update to 0.6.2. * gnu/packages/music.scm (libgme): Update to 0.6.2. [native-inputs]: Add gcc-4.9. --- gnu/packages/music.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index ba21e5da2b..e39478e794 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -786,18 +786,23 @@ interface. It is implemented as a frontend to @code{klick}.") (define-public libgme (package (name "libgme") - (version "0.6.1") + (version "0.6.2") (source (origin (method url-fetch) (uri (string-append "https://bitbucket.org/mpyne/game-music-emu/" "downloads/game-music-emu-" version - ".tar.bz2")) + ".tar.xz")) (sha256 (base32 - "08fk7zddpn7v93d0fa7fcypx7hvgwx9b5psj9l6m8b87k2hbw4fw")))) + "0hkkmxbaas2sirlb5i4r10mgbbiaapjx8pazifabwba23m3wnijh")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ; no check target + (native-inputs + `(;; Use gcc-4.9 to work around an internal compiler error that happens + ;; when using gcc-5.5.0. FIXME: Try removing this when the default + ;; compiler is no longer gcc-5.5.0. + ("gcc" ,gcc-4.9))) (home-page "https://bitbucket.org/mpyne/game-music-emu") (synopsis "Video game music file playback library") (description -- cgit v1.2.3 From 1e066f070611b64d24af4544efe8075bb1999d30 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 6 Sep 2018 16:43:10 -0400 Subject: gnu: curl: Update replacement to 7.61.1 [fixes CVE-2018-14618]. * gnu/packages/curl.scm (curl)[replacement]: Update to 7.61.1. (curl-7.61.0): Replace variable with ... (curl-7.61.1): ... new variable. --- gnu/packages/curl.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 1907d2dc3d..6d45dc0cc5 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -51,7 +51,7 @@ (package (name "curl") (version "7.59.0") - (replacement curl-7.61.0) + (replacement curl-7.61.1) (source (origin (method url-fetch) (uri (string-append "https://curl.haxx.se/download/curl-" @@ -141,10 +141,10 @@ tunneling, and so on.") "See COPYING in the distribution.")) (home-page "https://curl.haxx.se/"))) -(define-public curl-7.61.0 +(define-public curl-7.61.1 (package (inherit curl) - (version "7.61.0") + (version "7.61.1") (source (origin (method url-fetch) @@ -152,7 +152,7 @@ tunneling, and so on.") version ".tar.xz")) (sha256 (base32 - "080p9r2kln8cbfj0rqfn6wqp5kdn9k5wp720nirkcw845lcmavpg")))))) + "148qv1f32290r9pwg07mccawihz4srznkzsdwdl2xllvlgb16n9x")))))) (define-public kurly (package -- cgit v1.2.3 From 91cc2a38ded0f9a637c37d83d72fa514a13fe6bd Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 6 Sep 2018 16:46:08 -0400 Subject: gnu: Wireshark: Update to 2.6.3 [fixes CVE-2018-{14994,16056,16057,16058}]. * gnu/packages/networking.scm (wireshark): Update to 2.6.3. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 61c0ad7fba..acf523d366 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -580,7 +580,7 @@ of the same name.") (define-public wireshark (package (name "wireshark") - (version "2.6.2") + (version "2.6.3") (source (origin (method url-fetch) @@ -588,7 +588,7 @@ of the same name.") version ".tar.xz")) (sha256 (base32 - "153h6prxamv5a62f3pfadkry0y57696xrgxfy2gfy5xswdg8kcj9")))) + "1v538h02y8avwy3cr11xz6wkyf9xd8qva4ng4sl9f2fw4skahn6i")))) (build-system gnu-build-system) (inputs `(("c-ares" ,c-ares) ("glib" ,glib) -- cgit v1.2.3 From 0012e0dd5642fbbb8ee40a68f65afc184952fc98 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 7 Sep 2018 02:57:28 +0200 Subject: gnu: knot: Update to 2.7.2. * gnu/packages/dns.scm (knot): Update to 2.7.2. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 7a80e1bd9b..29c3d9b923 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -498,14 +498,14 @@ Extensions} (DNSSEC).") (define-public knot (package (name "knot") - (version "2.7.1") + (version "2.7.2") (source (origin (method url-fetch) (uri (string-append "https://secure.nic.cz/files/knot-dns/" name "-" version ".tar.xz")) (sha256 (base32 - "108k6x3hjsnyf06pv5rlxqhynjbbz13pzwax1mqff3hgv85f4skx")) + "0cc4wgb02ch09x99a1fnr7vsdik8k920q7jafzcamjvy3kpb4w6b")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 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: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From 1540075c790dfaeff52c93392f2fc63b9e23b77e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 7 Sep 2018 09:50:26 +0200 Subject: vm: Make UUID computation really deterministic. Fixes . * gnu/system/vm.scm (operating-system-uuid)[service-name, file-system-digest]: New procedures. Map these over services and file systems and hash the result. * tests/guix-system.sh: Add test. --- gnu/system/vm.scm | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 3898872a46..91e117b9f3 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -529,17 +529,42 @@ should set REGISTER-CLOSURES? to #f." (define* (operating-system-uuid os #:optional (type 'dce)) "Compute UUID object with a deterministic \"UUID\" for OS, of the given TYPE (one of 'iso9660 or 'dce). Return a UUID object." + ;; Note: For this to be deterministic, we must not hash things that contains + ;; (directly or indirectly) procedures, for example. That rules out + ;; anything that contains gexps, thunk or delayed record fields, etc. + + (define service-name + (compose service-type-name service-kind)) + + (define (file-system-digest fs) + ;; Return a hashable digest that does not contain 'dependencies' since + ;; this field can contain procedures. + (let ((device (file-system-device fs))) + (list (file-system-mount-point fs) + (file-system-type fs) + (cond ((file-system-label? device) + (file-system-label->string device)) + ((uuid? device) + (uuid->string device)) + ((string? device) + device) + (else #f)) + (file-system-options fs)))) + (if (eq? type 'iso9660) (let ((pad (compose (cut string-pad <> 2 #\0) number->string)) - (h (hash (operating-system-services os) 3600))) + (h (hash (map service-name (operating-system-services os)) + 3600))) (bytevector->uuid (string->iso9660-uuid (string-append "1970-01-01-" (pad (hash (operating-system-host-name os) 24)) "-" (pad (quotient h 60)) "-" (pad (modulo h 60)) "-" - (pad (hash (operating-system-file-systems os) 100)))) + (pad (hash (map file-system-digest + (operating-system-file-systems os)) + 100)))) 'iso9660)) (bytevector->uuid (uint-list->bytevector @@ -547,9 +572,9 @@ TYPE (one of 'iso9660 or 'dce). Return a UUID object." (- (expt 2 32) 1)) (hash (operating-system-host-name os) (- (expt 2 32) 1)) - (hash (operating-system-services os) + (hash (map service-name (operating-system-services os)) (- (expt 2 32) 1)) - (hash (operating-system-file-systems os) + (hash (map file-system-digest (operating-system-file-systems os)) (- (expt 2 32) 1))) (endianness little) 4) -- cgit v1.2.3 From 12498b59e76c0285f0d9babb0107e8e82855aa60 Mon Sep 17 00:00:00 2001 From: Alex Branham Date: Thu, 6 Sep 2018 18:35:36 +0200 Subject: gnu: emacs-ess: Update to 17.11. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs.scm (emacs-ess): Update to 17.11 [url]: Use github for https [snippet]: update julia-mode substitution, only build info doc, bypass failing test [propagated-inputs]: Add emacs-julia-mode [description]: Mention that ESS supports Julia and JAGS (which replaces OpenBUGS) [arguments]: Remove 'set-home' phase. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs.scm | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 957b72f4e7..1f64a5e84a 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -38,6 +38,7 @@ ;;; Copyright © 2018 Tim Gesthuizen ;;; Copyright © 2018 Jack Hill ;;; Copyright © 2018 Pierre-Antoine Rouby +;;; Copyright © 2018 Alex Branham ;;; ;;; This file is part of GNU Guix. ;;; @@ -4123,22 +4124,34 @@ programming language.") (define-public emacs-ess (package (name "emacs-ess") - (version "16.10") + (version "17.11") (source (origin (method url-fetch) - (uri (string-append "http://ess.r-project.org/downloads/ess/ess-" - version ".tgz")) + (uri (string-append "https://github.com/emacs-ess/ESS/archive/v" + version ".tar.gz")) (sha256 (base32 - "04m8lwp3ylh2vl7k2bjjs7mxbm64j4sdckqpvnm9k0qhaqf02pjk")) + "0cbilbsiwvcyf6d5y24mymp57m3ana5dkzab3knfs83w4a3a4c5c")) + (file-name (string-append name "-" version ".tar.gz")) (modules '((guix build utils))) (snippet '(begin ;; Stop ESS from trying to bundle an external julia-mode.el. (substitute* "lisp/Makefile" (("^\tjulia-mode.elc\\\\\n") "") - (("^all: \\$\\(ELC\\) ess-custom.el julia-mode.el") - "all: $(ELC) ess-custom.el")) + (("^dist: all julia-mode.el") + "dist: all")) + ;; No need to build docs in so many formats. Also, skipping + ;; pdf lets us not pull in texlive. + (substitute* "doc/Makefile" + (("all : info text html pdf") + "all : info") + (("install: install-info install-other-docs") + "install: install-info")) + ;; Test fails upstream + (substitute* "test/ess-r-tests.el" + (("ert-deftest ess-r-namespaced-eval-no-srcref-in-errors ()") + "ert-deftest ess-r-namespaced-eval-no-srcref-in-errors () :expected-result :failed")) #t)))) (build-system gnu-build-system) (arguments @@ -4157,10 +4170,6 @@ programming language.") (("SHELL = /bin/sh") (string-append "SHELL = " (which "sh")))) #t)) - ;; FIXME: the texlive-union insists on regenerating fonts. It stores - ;; them in HOME, so it needs to be writeable. - (add-before 'build 'set-HOME - (lambda _ (setenv "HOME" "/tmp") #t)) (replace 'check (lambda _ (invoke "make" "test"))))))) @@ -4169,16 +4178,14 @@ programming language.") ("r-minimal" ,r-minimal))) (native-inputs `(("perl" ,perl) - ("texinfo" ,texinfo) - ("texlive" ,(texlive-union (list texlive-latex-natbib - texlive-latex-seminar - texlive-latex-hyperref - texlive-tex-texinfo))))) + ("texinfo" ,texinfo))) + (propagated-inputs + `(("emacs-julia-mode" ,emacs-julia-mode))) (home-page "https://ess.r-project.org/") (synopsis "Emacs mode for statistical analysis programs") (description "Emacs Speaks Statistics (ESS) is an add-on package for GNU Emacs. It is designed to support editing of scripts and interaction with -various statistical analysis programs such as R and OpenBUGS.") +various statistical analysis programs such as R, Julia, and JAGS.") (license license:gpl2+))) (define-public emacs-smex -- cgit v1.2.3 From 40c10917bc3b8df853001c193da882d643db1bd1 Mon Sep 17 00:00:00 2001 From: pimi Date: Wed, 29 Aug 2018 09:24:34 +0200 Subject: gnu: Add r-abcp2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cran.scm (r-abcp2): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/cran.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 447be5657a..c713a9904b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5411,3 +5411,24 @@ maximum cycle number. The @code{r-abcoptim} implements the Artificial bee colony optimization algorithm @url{http://mf.erciyes.edu.tr/abc/pub/tr06_2005.pdf}. This version is a work-in-progress and is written in R code.") (license license:expat))) + +(define-public r-abcp2 + (package + (name "r-abcp2") + (version "1.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "ABCp2" version)) + (sha256 + (base32 "1s2skkxpzss7c29i8600psgrp0hl46jcrxqrmy2b4db8hc0kcnbx")))) + (properties `((upstream-name . "ABCp2"))) + (build-system r-build-system) + (propagated-inputs `(("r-mass" ,r-mass))) + (home-page "https://cran.r-project.org/web/packages/ABCp2/") + (synopsis "Approximate Bayesian Computational Model for Estimating P2") + (description + "This package tests the goodness of fit of a distribution of offspring to the Normal, +Poisson, and Gamma distribution and estimates the proportional paternity of the +second male (P2) based on the best fit distribution.") + (license license:gpl2))) -- cgit v1.2.3 From cadc10a513af2624c9233fb2cffb4c4ff5471197 Mon Sep 17 00:00:00 2001 From: pimi Date: Wed, 29 Aug 2018 09:32:45 +0200 Subject: gnu: Add r-abcrf. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cran.scm (r-abcrf): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/cran.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c713a9904b..93c111bccc 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5432,3 +5432,31 @@ colony optimization algorithm @url{http://mf.erciyes.edu.tr/abc/pub/tr06_2005.pd Poisson, and Gamma distribution and estimates the proportional paternity of the second male (P2) based on the best fit distribution.") (license license:gpl2))) + +(define-public r-abcrf + (package + (name "r-abcrf") + (version "1.7.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "abcrf" version)) + (sha256 + (base32 "06vy3inikrr9hv36q4djhrgzi9zizdfnhz17wpra8kadmr7qj441")))) + (build-system r-build-system) + (propagated-inputs + `(("r-mass" ,r-mass) + ("r-matrixstats" ,r-matrixstats) + ("r-ranger" ,r-ranger) + ("r-rcpp" ,r-rcpp) + ("r-rcpparmadillo" ,r-rcpparmadillo) + ("r-readr" ,r-readr) + ("r-stringr" ,r-stringr))) + (home-page "https://cran.r-project.org/web/packages/abcrf/") + (synopsis "Approximate bayesian computation via random forests") + (description + "This package performs approximate bayesian computation (ABC) model choice and +parameter inference via random forests. This machine learning tool named random +forests (RF) can conduct selection among the highly complex models covered by +ABC algorithms.") + (license license:gpl2+))) -- cgit v1.2.3 From 12da2a5e58c6f518892376df5e1af4a511f12e6b Mon Sep 17 00:00:00 2001 From: pimi Date: Wed, 29 Aug 2018 09:39:17 +0200 Subject: gnu: Add r-abctools. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cran.scm (r-abctools): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/cran.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 93c111bccc..aa58efce7c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5460,3 +5460,28 @@ parameter inference via random forests. This machine learning tool named random forests (RF) can conduct selection among the highly complex models covered by ABC algorithms.") (license license:gpl2+))) + +(define-public r-abctools + (package + (name "r-abctools") + (version "1.1.3") + (source + (origin + (method url-fetch) + (uri (cran-uri "abctools" version)) + (sha256 + (base32 "07s9dg10i8lsxl73b4n2hynca2fjgb0ykb0dz8c3zv6cgw3cyx97")))) + (build-system r-build-system) + (propagated-inputs + `(("r-abc" ,r-abc) + ("r-abind" ,r-abind) + ("r-hmisc" ,r-hmisc) + ("r-plyr" ,r-plyr))) + (home-page "https://github.com/dennisprangle/abctools/") + (synopsis "Tools for ABC analyses") + (description + "This @code{r-abctools} package provides tools for approximate Bayesian computation +including summary statistic selection and assessing coverage. This includes +recent dimension reduction algorithms to tune the choice of summary statistics, +and coverage methods to tune the choice of threshold.") + (license license:gpl2+))) -- cgit v1.2.3 From 77b33e0ede4bd015d863f0b1f63f492c62fb1943 Mon Sep 17 00:00:00 2001 From: pimi Date: Wed, 29 Aug 2018 10:09:12 +0200 Subject: gnu: Add r-ggstance. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit gnu/packages/cran.scm (r-ggstance): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/cran.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index aa58efce7c..8026f99736 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5485,3 +5485,29 @@ including summary statistic selection and assessing coverage. This includes recent dimension reduction algorithms to tune the choice of summary statistics, and coverage methods to tune the choice of threshold.") (license license:gpl2+))) + +(define-public r-ggstance + (package + (name "r-ggstance") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "ggstance" version)) + (sha256 + (base32 "0v7f3xdaaridw6d4jvnsfwxmpjrasvx5vl555wsrn50aah17fkvh")))) + (build-system r-build-system) + (propagated-inputs + `(("r-ggplot2" ,r-ggplot2) + ("r-plyr" ,r-plyr) + ("r-rlang" ,r-rlang) + ("r-withr" ,r-withr))) + (home-page "https://cran.r-project.org/web/packages/ggstance/") + (synopsis "Horizontal and vertical versions of @code{r-ggplot2}") + (description + "This package is a @code{r-ggplot2} extension that provides flipped components: +@enumerate +@item horizontal versions of @code{r-ggplot2} stats and @code{r-ggplot2} geoms; +@item vertical versions of @code{r-ggplot2} positions. +@end enumerate") + (license license:gpl3))) -- cgit v1.2.3 From c61f7bc543d98781d9c24989edbfde39af7e7320 Mon Sep 17 00:00:00 2001 From: pimi Date: Wed, 29 Aug 2018 10:16:11 +0200 Subject: gnu: Add r-mosaiccore. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cran.scm (r-mosaiccore): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/cran.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8026f99736..3be7fd7d62 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5511,3 +5511,27 @@ and coverage methods to tune the choice of threshold.") @item vertical versions of @code{r-ggplot2} positions. @end enumerate") (license license:gpl3))) + +(define-public r-mosaiccore + (package + (name "r-mosaiccore") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "mosaicCore" version)) + (sha256 + (base32 "1klw97h6lchw1cpcl8s637ikcl428cckmjq0czi7mibh9q9mw72z")))) + (properties `((upstream-name . "mosaicCore"))) + (build-system r-build-system) + (propagated-inputs + `(("r-dplyr" ,r-dplyr) + ("r-lazyeval" ,r-lazyeval) + ("r-mass" ,r-mass) + ("r-rlang" ,r-rlang) + ("r-tidyr" ,r-tidyr))) + (home-page "https://github.com/ProjectMOSAIC/mosaicCore/") + (synopsis "Common utilities for mosaic family packages") + (description + "Common utilities used in other Mosaic family packages are collected here.") + (license license:gpl2+))) -- cgit v1.2.3 From 214452ffd339491f63560d19d2aeab4e668029a4 Mon Sep 17 00:00:00 2001 From: pimi Date: Wed, 29 Aug 2018 10:19:55 +0200 Subject: gnu: Add r-ggformula. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cran.scm (r-ggformula): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/cran.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 3be7fd7d62..8144391729 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5535,3 +5535,32 @@ and coverage methods to tune the choice of threshold.") (description "Common utilities used in other Mosaic family packages are collected here.") (license license:gpl2+))) + +(define-public r-ggformula + (package + (name "r-ggformula") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "ggformula" version)) + (sha256 + (base32 "1pmpdfjfbrc6kcpq70cr1kbj2qy711hw940g2aiis6l443z706kh")))) + (build-system r-build-system) + (propagated-inputs + `(("r-ggplot2" ,r-ggplot2) + ("r-ggstance" ,r-ggstance) + ("r-magrittr" ,r-magrittr) + ("r-mosaiccore" ,r-mosaiccore) + ("r-rlang" ,r-rlang) + ("r-stringr" ,r-stringr) + ("r-tibble" ,r-tibble) + ("r-tidyr" ,r-tidyr))) + (home-page "https://github.com/ProjectMOSAIC/ggformula/") + (synopsis "Formula interface for the @code{r-ggplot2}") + (description + "The @code{r-ggformula} introduces a family of graphics functions, gf_point(), +gf_density(), and so on, bring the formula interface to ggplot(). This captures +and extends the excellent simplicity of the lattice-graphics formula interface, +while providing the intuitive capabilities of @code{r-ggplot2}.") + (license license:expat))) -- cgit v1.2.3 From 15214828a52b66f95890ee29f7fb25dec3c5b065 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 7 Sep 2018 17:03:49 +0200 Subject: gnu: guile-json: Update to 1.2.0. * gnu/packages/guile.scm (guile-json): Update to 1.2.0. [license]: Change to GPL3+. --- gnu/packages/guile.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 335bd6219f..05d9315214 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -897,7 +897,7 @@ for Guile\".") (define-public guile-json (package (name "guile-json") - (version "1.1.1") + (version "1.2.0") (home-page "https://github.com/aconchillo/guile-json") (source (origin (method url-fetch) @@ -906,7 +906,7 @@ for Guile\".") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "12jqkn9qgwdlxbasy2n25a2a7apf30dww1nnxqfam5735k3jdngv")))) + "02kqv0q98fmchn7i4y7ycmrjlh4b2c93ij0z7k036qwpp204w4gh")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) @@ -924,7 +924,9 @@ specification. These are the main features: @item Unicode support for strings. @item Allows JSON pretty printing. @end itemize\n") - (license license:lgpl3+))) + + ;; Version 1.2.0 switched to GPLv3+ (from LGPLv3+). + (license license:gpl3+))) (define-public guile2.2-json (deprecated-package "guile2.2-json" guile-json)) -- cgit v1.2.3 From 6b4f99102c4e3f57cc657c14ff196b211654f88b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 7 Sep 2018 17:38:08 +0200 Subject: gnu: gdb: Update to 8.2. * gnu/packages/gdb.scm (gdb): Update to 8.2. --- gnu/packages/gdb.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm index f0c4c8b804..74eb0f8994 100644 --- a/gnu/packages/gdb.scm +++ b/gnu/packages/gdb.scm @@ -37,14 +37,14 @@ (define-public gdb (package (name "gdb") - (version "8.1.1") + (version "8.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gdb/gdb-" version ".tar.xz")) (sha256 (base32 - "0g6hv9xk12aa58w77fydaldqr9a6b0a6bnwsq87jfc6lkcbc7p4p")))) + "0fbw6j4z7kmvywwgavn7w3knp860i5i9qnjffc5p52bwkji43963")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; FIXME "make check" fails on single-processor systems. -- cgit v1.2.3 From afdd1555c4639dbd378fddffdee702933d14a1b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 7 Sep 2018 17:57:04 +0200 Subject: gnu: indent: Add version 2.2.12. * gnu/packages/code.scm (indent-2.2.12): New variable. --- gnu/packages/code.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index be178a5f99..85ee6c2877 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -651,6 +651,19 @@ extensions over the standard utility.") (license license:gpl3+) (home-page "https://www.gnu.org/software/indent/"))) +(define-public indent-2.2.12 + (package + (inherit indent) + (version "2.2.12") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/indent/indent-" version + ".tar.gz")) + (sha256 + (base32 + "12xvcd16cwilzglv9h7sgh4h1qqjd1h8s48ji2dla58m4706hzg7")))) + (native-inputs `(("texinfo" ,texinfo))))) + (define-public amalgamate (let* ((commit "c91f07eea1133aa184f652b8f1398eaf03586208") (revision "0") -- cgit v1.2.3 From 9f1f200c0462d5fa798e4d7b8c3c09294f8bfb95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 7 Sep 2018 17:59:16 +0200 Subject: gnu: diffoscope: Update to 100. * gnu/packages/package-management.scm (diffoscope): Update to 100. --- gnu/packages/package-management.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 529d2943c4..5edfb5dffb 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -568,13 +568,13 @@ transactions from C or Python.") (define-public diffoscope (package (name "diffoscope") - (version "96") + (version "100") (source (origin (method url-fetch) (uri (pypi-uri name version)) (sha256 (base32 - "1x66f2x8miy3giff14higpcs70c0zb5d3gj6yn8ac6p183sngl72")))) + "0sh7g26i5ndpa8l7xq6rnijbi3jz5izjn0b98zcnm6wpgghszw48")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 9b6c4355645534d1ae799bfef6761b75ed8b3a41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 7 Sep 2018 23:00:39 +0200 Subject: services: 'instantiate-missing-services' reaches fixed point. Fixes a bug whereby services indirectly depended on would not be automatically instantiated. * gnu/services.scm (instantiate-missing-services): Loop back when the length of ADJUSTED is greater than that of INSTANCES. * tests/services.scm ("instantiate-missing-services, indirect"): New test. --- gnu/services.scm | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/services.scm b/gnu/services.scm index 49cf01a4f8..f151bbaa9d 100644 --- a/gnu/services.scm +++ b/gnu/services.scm @@ -732,13 +732,23 @@ instantiated; other missing services lead to a instances (service-type-extensions (service-kind svc)))) - (let ((instances (fold (lambda (service result) - (vhash-consq (service-kind service) service - result)) - vlist-null services))) - (fold2 adjust-service-list - services instances - services))) + (let loop ((services services)) + (define instances + (fold (lambda (service result) + (vhash-consq (service-kind service) service + result)) + vlist-null services)) + + (define adjusted + (fold2 adjust-service-list + services instances + services)) + + ;; If we instantiated services, they might in turn depend on missing + ;; services. Loop until we've reached fixed point. + (if (= (length adjusted) (vlist-length instances)) + adjusted + (loop adjusted)))) (define* (fold-services services #:key (target-type system-service-type)) -- cgit v1.2.3 From 48d17ba1d333109876bc53fe6ede6f8b3f519609 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 7 Sep 2018 21:01:48 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.154. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.154. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 02d723316d..1670cf7a3c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -452,8 +452,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.153" - "195vzkkmjiicqfzd38hgf381rlz665rl06abzf8cww0gbnzvrf72" + (make-linux-libre "4.4.154" + "08i9fvrmswkydj538wg6c7ggxmhll0ff0bjkw8rnyslqwilfwr1i" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From ddb419ce046f6ef7732b71af9f145c46d4aa42de Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 7 Sep 2018 21:02:30 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.125. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.125. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1670cf7a3c..cabc34b0df 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -446,8 +446,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.124" - "0p78gx5jiqvaf2cadf5jp40lzgarrg0m0ybf9w2499v28vjsp30q" + (make-linux-libre "4.9.125" + "1saihk61l1kk42jf8yfsfkm77zalq31f0bdlam3c1g7yw702wj9g" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From 4be8fdd3ccb5d41438812d6781379457800345bd Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 7 Sep 2018 21:03:03 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.68. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.68. (%linux-libre-4.14-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index cabc34b0df..2b02870a73 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -436,8 +436,8 @@ It has been modified to remove all non-free binary blobs.") #:patches %linux-libre-4.18-patches #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.67") -(define %linux-libre-4.14-hash "050zvdxjy6sc64q75pr1gxsmh49chwav2pwxz8xlif39bvahnrpg") +(define %linux-libre-4.14-version "4.14.68") +(define %linux-libre-4.14-hash "05l5y0vbbl60jxdbqglqr9c99a8g8lfsp4mcqfpcx1pkh5br7i3l") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.2.3 From 090e3768e8a3157d440f6fdf513b4bf058328b0f Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 7 Sep 2018 21:05:14 -0400 Subject: gnu: linux-libre: Update to 4.18.6. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.18.6. (%linux-libre-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2b02870a73..7d5b3aed86 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -405,8 +405,8 @@ It has been modified to remove all non-free binary blobs.") ;; supports qemu "virt" machine and possibly a large number of ARM boards. ;; See : https://wiki.debian.org/DebianKernel/ARMMP. -(define %linux-libre-version "4.18.5") -(define %linux-libre-hash "1y52ns34vh9p4pfj08xsycv8p0xywm6dbpdi0wwpkll1xgpqikvf") +(define %linux-libre-version "4.18.6") +(define %linux-libre-hash "1l5caid77vbfb54zrfxkk7qj7lrf9ck9kpn96kr45spkwl51wm8m") (define %linux-libre-4.18-patches (list %boot-logo-patch -- cgit v1.2.3 From 39b5d8fd9d0383124c93b85fd22c6d35545f694f Mon Sep 17 00:00:00 2001 From: Benjamin Slade Date: Fri, 7 Sep 2018 21:08:15 -0600 Subject: gnu: Add frotz, frotz-dumb-terminal, and frotz-sdl. * gnu/packages/games.scm (frotz, frotz-dumb-terminal, frotz-sdl): New variables. Signed-off-by: Kei Kebreau --- gnu/packages/games.scm | 157 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 157 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 728f763806..2015e3ce47 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -34,6 +34,7 @@ ;;; Copyright © 2018 okapi ;;; Copyright © 2018 Tim Gesthuizen ;;; Copyright © 2018 Madalin Ionel-Patrascu +;;; Copyright © 2018 Benjamin Slade ;;; ;;; This file is part of GNU Guix. ;;; @@ -5553,3 +5554,159 @@ open-source FPS of its kind.") (license (list license:gpl2+ license:bsd-3 ; /source/d0_blind_id folder and others (license:x11-style "" "See file rcon.pl."))))) + +(define-public frotz + (package + (name "frotz") + (version "2.44") + (source (origin + (method url-fetch) + (uri (list (string-append + "http://www.ifarchive.org/if-archive/infocom/interpreters/" + name "/" name "-" version ".tar.gz") + (string-append + "ftp://ftp.ifarchive.org/if-archive/infocom/interpreters/" + name "/" name "-" version ".tar.gz"))) + (sha256 + (base32 + "1v735xr3blznac8fnwa27s1vhllx4jpz7kw7qdw1bsfj6kq21v3k")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; there are no tests + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'curses + (lambda _ + (substitute* "Makefile" + (("lcurses") "lncurses")) + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (man (string-append out "/share/man/man6"))) + (install-file "frotz" bin) + (mkdir-p man) + (install-file "doc/frotz.6" man) + #t)))))) + (inputs `(("libmodplug" ,libmodplug) + ("libsamplerate" ,libsamplerate) + ("libsndfile" ,libsndfile) + ("libvorbis" ,libvorbis) + ("ncurses" ,ncurses))) + (synopsis "Portable Z-machine interpreter (ncurses version) for text adventure games") + (description "Frotz is an interpreter for Infocom games and other Z-machine +games in the text adventure/interactive fiction genre. This version of Frotz +complies with standard 1.0 of Graham Nelson's specification. It plays all +Z-code games V1-V8, including V6, with sound support through libao, and uses +ncurses for text display.") + (home-page "http://frotz.sourceforge.net") + (license license:gpl2+))) + +(define-public frotz-dumb-terminal + (package + (name "frotz-dumb-terminal") + (version "2.44") + (source (origin + (method url-fetch) + (uri (list (string-append + "http://www.ifarchive.org/if-archive/infocom/interpreters/" + "frotz" "/" "frotz" "-" version ".tar.gz") + (string-append + "ftp://ftp.ifarchive.org/if-archive/infocom/interpreters/" + "frotz" "/" "frotz" "-" version ".tar.gz"))) + (sha256 + (base32 + "1v735xr3blznac8fnwa27s1vhllx4jpz7kw7qdw1bsfj6kq21v3k")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; there are no tests + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda _ + (invoke "make" "dumb"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (man (string-append out "/share/man/man6"))) + (install-file "dfrotz" bin) + (mkdir-p man) + (install-file "doc/dfrotz.6" man) + #t)))))) + (synopsis "Portable Z-machine dumb interpreter for text adventure games") + (description "Frotz is an interpreter for Infocom games and +other Z-machine games in the text adventure/interactive fiction genre. +dfrotz is the dumb interface version. You get no screen control; everything +is just printed to the terminal line by line. The terminal handles all the +scrolling. Maybe you'd like to experience what it's like to play Adventure on +a teletype. A much cooler use for compiling Frotz with the dumb interface is +that it can be wrapped in CGI scripting, PHP, and the like to allow people +to play games on webpages. It can also be made into a chat bot.") + (home-page "http://frotz.sourceforge.net") + (license license:gpl2+))) + +(define-public frotz-sdl + (let* ((commit "4de8c34f2116fff554af6216c30ec9d41bf50b24")) + (package + (name "frotz-sdl") + (version "2.45pre") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/DavidGriffith/frotz") + (commit commit))) + (sha256 + (base32 + "18ms21pcrl7ipcnyqnf8janamkryzx78frsgd9kfk67jvbj0z2k8")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; there are no tests + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'patch-makefile + (lambda _ + (substitute* "Makefile" + (("lcurses") "lncurses") + (("^BUILD_DATE_TIME =.*$") + "BUILD_DATE_TIME = \"2.45pre-20180907.00000\"\n")) + #t)) + (replace 'build + (lambda _ + (invoke "make" "sdl"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (man (string-append out "/share/man/man6"))) + (install-file "sfrotz" bin) + (mkdir-p man) + (install-file "doc/sfrotz.6" man) + #t)))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("which" ,which) + ("perl" ,perl))) + (inputs `(("sdl2" ,sdl2) + ("sdl2-mixer" ,sdl2-mixer) + ("libmodplug" ,libmodplug) + ("libsamplerate" ,libsamplerate) + ("libsndfile" ,libsndfile) + ("libvorbis" ,libvorbis) + ("ncurses" ,ncurses) + ("freetype" ,freetype) + ("libjpeg-turbo" ,libjpeg-turbo))) + (synopsis "Portable Z-machine interpreter (SDL port) for text adventure games") + (description "Frotz is an interpreter for Infocom games and other Z-machine +games in the text adventure/interactive fiction genre. This version of Frotz +using SDL fully supports all these versions of the Z-Machine including the +graphical version 6. Graphics and sound are created through the use of the SDL +libraries. AIFF sound effects and music in MOD and OGG formats are supported +when packaged in Blorb container files or optionally from individual files.") + (home-page "http://frotz.sourceforge.net") + (license license:gpl2+)))) -- cgit v1.2.3 From 445ecce92307aa7ab70cf02b70078e860de17dc0 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 8 Sep 2018 16:55:32 +0200 Subject: gnu: nyacc: Update to 0.86.0. * gnu/packages/patches/nyacc-binary-literals.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/mes.scm (nyacc): Update to 0.86.0, add patch. --- gnu/local.mk | 1 + gnu/packages/mes.scm | 6 ++--- gnu/packages/patches/nyacc-binary-literals.patch | 29 ++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/nyacc-binary-literals.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 1924ae9467..847e45e8cc 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -988,6 +988,7 @@ dist_patch_DATA = \ %D%/packages/patches/nvi-assume-preserve-path.patch \ %D%/packages/patches/nvi-dbpagesize-binpower.patch \ %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/ocaml-bisect-fix-camlp4-in-another-directory.patch \ %D%/packages/patches/ocaml-bitstring-fix-configure.patch \ diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 81d4145439..7bdad5e32f 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -39,15 +39,15 @@ (define-public nyacc (package (name "nyacc") - (version "0.83.3") + (version "0.86.0") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/nyacc/" name "-" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (patches (search-patches "nyacc-binary-literals.patch")) (sha256 (base32 - "0120n0mdb6r58c4jc024dhwqy5s8a20waknijfhqjc59a884lrd6")))) + "0lkd9lyspvhxlfs0496gsllwinh62jk9wij6gpadvx9gwz6yavd9")))) (build-system gnu-build-system) (native-inputs `(("guile" ,guile-2.2))) diff --git a/gnu/packages/patches/nyacc-binary-literals.patch b/gnu/packages/patches/nyacc-binary-literals.patch new file mode 100644 index 0000000000..8159d74032 --- /dev/null +++ b/gnu/packages/patches/nyacc-binary-literals.patch @@ -0,0 +1,29 @@ +From 6a08014b77bf435f025ecdac08396580b85f159a Mon Sep 17 00:00:00 2001 +From: Jan Nieuwenhuizen +Date: Sat, 8 Sep 2018 20:22:45 +0200 +Subject: [PATCH] fix binary literals. + +--- + module/nyacc/lex.scm | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/module/nyacc/lex.scm b/module/nyacc/lex.scm +index 2ec9895..b205212 100644 +--- a/module/nyacc/lex.scm ++++ b/module/nyacc/lex.scm +@@ -345,10 +345,11 @@ + ((char-numeric? ch) (iter chl '$fixed ba 1 ch)) + ((char=? #\. ch) (iter (cons ch chl) #f ba 15 (read-char))) + (else #f))) +- ((10) ;; allow x after 0 ++ ((10) ;; allow x, b after 0 + (cond + ((eof-object? ch) (iter chl ty ba 5 ch)) + ((char=? #\x ch) (iter (cons ch chl) ty 16 1 (read-char))) ++ ((char=? #\b ch) (iter (cons ch chl) ty 2 1 (read-char))) + (else (iter chl ty ba 1 ch)))) + ((15) ;; got `.' only + (cond +-- +2.18.0 + -- cgit v1.2.3 From c665774a1ca9431746b1d559b06e24c1b05625d8 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 8 Sep 2018 16:58:37 +0200 Subject: gnu: mes: Update to 0.17.1. * gnu/packages/patches/mes-nyacc-0.86.0.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/mes.scm (mes): Update to 0.17.1, depend on latest Nyacc 0.86.0. (nyacc-for-mes): Remove. --- gnu/local.mk | 1 + gnu/packages/mes.scm | 20 +-- gnu/packages/patches/mes-nyacc-0.86.0.patch | 197 ++++++++++++++++++++++++++++ 3 files changed, 202 insertions(+), 16 deletions(-) create mode 100644 gnu/packages/patches/mes-nyacc-0.86.0.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 847e45e8cc..278afbb257 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -953,6 +953,7 @@ dist_patch_DATA = \ %D%/packages/patches/mcrypt-CVE-2012-4409.patch \ %D%/packages/patches/mcrypt-CVE-2012-4426.patch \ %D%/packages/patches/mcrypt-CVE-2012-4527.patch \ + %D%/packages/patches/mes-nyacc-0.86.0.patch \ %D%/packages/patches/mesa-skip-disk-cache-test.patch \ %D%/packages/patches/meson-for-build-rpath.patch \ %D%/packages/patches/metabat-fix-compilation.patch \ diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 7bdad5e32f..63a8db449a 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -59,36 +59,24 @@ extensive examples, including parsers for the Javascript and C99 languages.") (home-page "https://savannah.nongnu.org/projects/nyacc") (license (list gpl3+ lgpl3+)))) -(define-public nyacc-for-mes - (package - (inherit nyacc) - (version "0.80.42") - (source (origin - (method url-fetch) - (uri (string-append "https://gitlab.com/janneke/nyacc" - "/-/archive/v" version - "/nyacc-" version ".tar.gz")) - (sha256 - (base32 - "0c8c8kxir0h2d4nxr131xbkfs7c80haipmkp2g6677sh14wn0b3y")))))) - (define-public mes (let ((triplet "i686-unknown-linux-gnu")) (package (name "mes") - (version "0.17") + (version "0.17.1") (source (origin (method url-fetch) (uri (string-append "http://alpha.gnu.org/gnu/mes/" "mes-" version ".tar.gz")) + (patches (search-patches "mes-nyacc-0.86.0.patch")) (sha256 (base32 - "1j32x4zqy2cqjlg9m35f2411mwac2b0p5ch4hm99gddmfbxzgyhg")))) + "02g8zig53ffd0ai8kqhv2zj7bj2366a8hr6ydkwakmi2d1amyrna")))) (build-system gnu-build-system) (supported-systems '("i686-linux" "x86_64-linux")) (propagated-inputs `(("mescc-tools" ,mescc-tools) - ("nyacc" ,nyacc-for-mes))) + ("nyacc" ,nyacc))) (native-inputs `(("guile" ,guile-2.2) ,@(if (not (string-prefix? "i686-linux" (or (%current-target-system) diff --git a/gnu/packages/patches/mes-nyacc-0.86.0.patch b/gnu/packages/patches/mes-nyacc-0.86.0.patch new file mode 100644 index 0000000000..58dfc5a46b --- /dev/null +++ b/gnu/packages/patches/mes-nyacc-0.86.0.patch @@ -0,0 +1,197 @@ +From 9e610736bf779f3295c1192e748cd19cbbe3be28 Mon Sep 17 00:00:00 2001 +From: Jan Nieuwenhuizen +Date: Wed, 5 Sep 2018 20:28:06 +0200 +Subject: [PATCH 1/2] mes: Support Nyacc 0.85.3: Add char-set-copy. + +* mes/module/srfi/srfi-14.mes (char-set-copy): New function> +--- + mes/module/srfi/srfi-14.mes | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/mes/module/srfi/srfi-14.mes b/mes/module/srfi/srfi-14.mes +index 0be39b1e..a16d16ce 100644 +--- a/mes/module/srfi/srfi-14.mes ++++ b/mes/module/srfi/srfi-14.mes +@@ -52,3 +52,6 @@ + + (define (char-whitespace? c) + (char-set-contains? char-set:whitespace c)) ++ ++(define (char-set-copy cs) ++ (map identity cs)) +-- +2.18.0 + +From b952bdf44f11edbfc277600dc35236aae1769b54 Mon Sep 17 00:00:00 2001 +From: Jan Nieuwenhuizen +Date: Wed, 5 Sep 2018 22:14:34 +0200 +Subject: [PATCH 2/2] mes: Support Nyacc 0.85.3: Integrate progress. + +* mes/module/nyacc/lang/sx-util.mes: New file. +* mes/module/nyacc/version.mes: New file. +* mes/module/nyacc/lang/c99/cpp.mes (nyacc): Include them. +* mes/module/nyacc/lang/c99/parser.mes (nyacc): Include them. +* module/mescc/preprocess.scm (need-progress): New function. +(progress): New function. +(insert-progress-monitors): Use them to Integrate progress. +--- + mes/module/mescc/preprocess.mes | 1 + + mes/module/nyacc/lang/c99/cpp.mes | 1 + + mes/module/nyacc/lang/c99/parser.mes | 1 + + mes/module/nyacc/lang/sx-util.mes | 27 +++++++++++++++++++++ + mes/module/nyacc/version.mes | 26 +++++++++++++++++++++ + module/mescc/preprocess.scm | 35 ++++++++++++++++++++++++++++ + 6 files changed, 91 insertions(+) + create mode 100644 mes/module/nyacc/lang/sx-util.mes + create mode 100644 mes/module/nyacc/version.mes + +diff --git a/mes/module/mescc/preprocess.mes b/mes/module/mescc/preprocess.mes +index c7c5fcaa..022a372c 100644 +--- a/mes/module/mescc/preprocess.mes ++++ b/mes/module/mescc/preprocess.mes +@@ -24,4 +24,5 @@ + (mes-use-module (srfi srfi-13)) + (mes-use-module (srfi srfi-26)) + (mes-use-module (nyacc lang c99 parser)) ++(mes-use-module (nyacc version)) + (include-from-path "mescc/preprocess.scm") +diff --git a/mes/module/nyacc/lang/c99/cpp.mes b/mes/module/nyacc/lang/c99/cpp.mes +index fad1dc55..b25c4a93 100644 +--- a/mes/module/nyacc/lang/c99/cpp.mes ++++ b/mes/module/nyacc/lang/c99/cpp.mes +@@ -28,5 +28,6 @@ + + (mes-use-module (nyacc parse)) + (mes-use-module (nyacc lex)) ++(mes-use-module (nyacc lang sx-util)) + (mes-use-module (nyacc lang util)) + (include-from-path "nyacc/lang/c99/cpp.scm") +diff --git a/mes/module/nyacc/lang/c99/parser.mes b/mes/module/nyacc/lang/c99/parser.mes +index c51552d6..1a9aaf73 100644 +--- a/mes/module/nyacc/lang/c99/parser.mes ++++ b/mes/module/nyacc/lang/c99/parser.mes +@@ -32,6 +32,7 @@ + + (mes-use-module (nyacc lex)) + (mes-use-module (nyacc parse)) ++(mes-use-module (nyacc lang sx-util)) + (mes-use-module (nyacc lang util)) + (mes-use-module (nyacc lang c99 cpp)) + +diff --git a/mes/module/nyacc/lang/sx-util.mes b/mes/module/nyacc/lang/sx-util.mes +new file mode 100644 +index 00000000..41ac5b4a +--- /dev/null ++++ b/mes/module/nyacc/lang/sx-util.mes +@@ -0,0 +1,27 @@ ++;;; -*-scheme-*- ++ ++;;; GNU Mes --- Maxwell Equations of Software ++;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen ++;;; ++;;; This file is part of GNU Mes. ++;;; ++;;; GNU Mes is free software; you can redistribute it and/or modify it ++;;; under the terms of the GNU General Public License as published by ++;;; the Free Software Foundation; either version 3 of the License, or (at ++;;; your option) any later version. ++;;; ++;;; GNU Mes is distributed in the hope that it will be useful, but ++;;; WITHOUT ANY WARRANTY; without even the implied warranty of ++;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++;;; GNU General Public License for more details. ++;;; ++;;; You should have received a copy of the GNU General Public License ++;;; along with GNU Mes. If not, see . ++ ++;;; Commentary: ++ ++;;; Code: ++ ++(mes-use-module (srfi srfi-1)) ++(mes-use-module (srfi srfi-16)) ++(include-from-path "nyacc/lang/sx-util.scm") +diff --git a/mes/module/nyacc/version.mes b/mes/module/nyacc/version.mes +new file mode 100644 +index 00000000..b9db628e +--- /dev/null ++++ b/mes/module/nyacc/version.mes +@@ -0,0 +1,26 @@ ++;;; -*-scheme-*- ++ ++;;; GNU Mes --- Maxwell Equations of Software ++;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen ++;;; ++;;; This file is part of GNU Mes. ++;;; ++;;; GNU Mes is free software; you can redistribute it and/or modify it ++;;; under the terms of the GNU General Public License as published by ++;;; the Free Software Foundation; either version 3 of the License, or (at ++;;; your option) any later version. ++;;; ++;;; GNU Mes is distributed in the hope that it will be useful, but ++;;; WITHOUT ANY WARRANTY; without even the implied warranty of ++;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++;;; GNU General Public License for more details. ++;;; ++;;; You should have received a copy of the GNU General Public License ++;;; along with GNU Mes. If not, see . ++ ++;;; Commentary: ++ ++;;; Code: ++ ++(include-from-path "nyacc/version.scm") ++(display "nyacc version\n") +diff --git a/module/mescc/preprocess.scm b/module/mescc/preprocess.scm +index 9e341cba..c2efb32c 100644 +--- a/module/mescc/preprocess.scm ++++ b/module/mescc/preprocess.scm +@@ -26,9 +26,44 @@ + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26) + #:use-module (nyacc lang c99 parser) ++ #:use-module (nyacc lang c99 parser) ++ #:use-module (nyacc version) + #:use-module (mes guile) + #:export (c99-input->ast)) + ++(format (current-error-port) "*nyacc-version*=~a\n" *nyacc-version*) ++;; list of which rules you want progress reported ++(define need-progress ++ (assoc-ref ++ '(("0.85.3" (1 2 3)) ++ ("0.86.0" (1 2 3))) ++ *nyacc-version*)) ++ ++(define (progress o) ++ (when (and o (getenv "NYACC_DEBUG")) ++ (display " :" (current-error-port)) ++ (display o (current-error-port)) ++ (display "\n" (current-error-port)))) ++ ++(define (insert-progress-monitors act-v len-v) ++ (let ((n (vector-length act-v))) ++ (let loop ((ix 0)) ++ (when (< ix n) ++ (if (memq ix need-progress) ++ (vector-set ++ act-v ix ++ (lambda args ++ (progress (list-ref args (1- (vector-ref len-v ix)))) ++ (apply (vector-ref act-v ix) args)))) ++ (loop (1+ ix)))))) ++ ++(cond-expand ++ (guile ++ (insert-progress-monitors (@@ (nyacc lang c99 parser) c99-act-v) ++ (@@ (nyacc lang c99 parser) c99-len-v))) ++ (mes ++ (insert-progress-monitors c99-act-v c99-len-v))) ++ + (define (logf port string . rest) + (apply format (cons* port string rest)) + (force-output port) +-- +2.18.0 + -- cgit v1.2.3 From 985975ae80fe5a8e58319b3a5aaf14da940c4419 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 8 Sep 2018 18:48:48 +0200 Subject: services: nginx: Don't read PID file when passed a custom config file. Fixes . * gnu/services/web.scm (nginx-shepherd-service): Check whether FILE is true and don't read the PID file if it is; use 'read-pid-file' instead of a potentially endless loop. --- gnu/services/web.scm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 3778efd048..1c993b29fe 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -610,14 +610,12 @@ of index files." (match '#$args (("-s" . _) #t) (_ - (let loop ((duration 0)) - ;; https://bugs.launchpad.net/ubuntu/+source/nginx/+bug/1581864/comments/7 - (sleep duration) - (if (file-exists? #$pid-file) - (let ((pid (call-with-input-file #$pid-file read))) - ;; it could be # - (if (integer? pid) pid (loop 1))) - (loop 1))))))))) + ;; When FILE is true, we cannot be sure that PID-FILE will + ;; be created, so assume it won't show up. When FILE is + ;; false, read PID-FILE. + #$(if file + #~#t + #~(read-pid-file #$pid-file)))))))) ;; TODO: Add 'reload' action. (list (shepherd-service -- cgit v1.2.3 From e80c725db7d11618dec7c3f92845f71b0a9715b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 8 Sep 2018 18:50:55 +0200 Subject: services: nginx: 'stop' returns #f. Previously we'd return #t, which the Shepherd would consider a failure to stop the service. * gnu/services/web.scm (nginx-shepherd-service): In 'nginx-action', return #f when stopping the service. --- gnu/services/web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 1c993b29fe..df82a6de61 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -608,7 +608,7 @@ of index files." (default-nginx-config config)) #$@args) (match '#$args - (("-s" . _) #t) + (("-s" . _) #f) (_ ;; When FILE is true, we cannot be sure that PID-FILE will ;; be created, so assume it won't show up. When FILE is -- cgit v1.2.3 From 4ab6a2f23d43f6c7e4a5a7420db613c5ba5b03b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 8 Sep 2018 22:59:04 +0200 Subject: tests: base: Add Guile-Gcrypt & co. to the search path. Fixes a regression introduced in ca719424455465fca4b872c371daf2a46de88b33, whereby (gcrypt hash) would not be found in the system under test, leading to a failure of the "/run/current-system is a GC root" test. * gnu/tests/base.scm (run-basic-test)[guix&co]: New variable. [test]: Add all of GUIX&CO to %LOAD-PATH. --- gnu/tests/base.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm index f27064af85..f97581de33 100644 --- a/gnu/tests/base.scm +++ b/gnu/tests/base.scm @@ -42,6 +42,7 @@ #:use-module (guix monads) #:use-module (guix packages) #:use-module (srfi srfi-1) + #:use-module (ice-9 match) #:export (run-basic-test %test-basic-os %test-halt @@ -68,6 +69,11 @@ initialization step, such as entering a LUKS passphrase." (fold-services (operating-system-services os) #:target-type special-files-service-type))) + (define guix&co + (match (package-transitive-propagated-inputs guix) + (((labels packages) ...) + (cons guix packages)))) + (define test (with-imported-modules '((gnu build marionette) (guix build syscalls)) @@ -345,8 +351,14 @@ info --version") 'success! (marionette-eval '(begin ;; Make sure the (guix …) modules are found. - (add-to-load-path - #+(file-append guix "/share/guile/site/2.2")) + (eval-when (expand load eval) + (set! %load-path + (append (map (lambda (package) + (string-append package + "/share/guile/site/" + (effective-version))) + '#$guix&co) + %load-path))) (use-modules (srfi srfi-34) (guix store)) -- cgit v1.2.3 From d7f99b3b767e50e73afbe041a2887aa1c878d990 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sun, 9 Sep 2018 18:56:18 +0800 Subject: gnu: perl: Improve description. Fixes . * gnu/packages/perl.scm (perl)[description]: Use description from 'perlintro'. --- gnu/packages/perl.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 4d70e019b9..1bf4cb15fe 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -156,8 +156,10 @@ (files '("lib/perl5/site_perl"))))) (synopsis "Implementation of the Perl programming language") (description - "Perl 5 is a highly capable, feature-rich programming language with over -24 years of development.") + "Perl is a general-purpose programming language originally developed for +text manipulation and now used for a wide range of tasks including system +administration, web development, network programming, GUI development, and +more.") (home-page "http://www.perl.org/") (license gpl1+))) ; or "Artistic" -- cgit v1.2.3 From 6930ea33c979b3d4713c9a1c59bd24ca0f642980 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 17 Aug 2018 16:09:33 +0200 Subject: gnu: aircrack-ng: Use HTTPS. * gnu/packages/networking.scm (aircrack-ng)[source, home-page]: Use HTTPS. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index acf523d366..5a85a9d40d 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -766,7 +766,7 @@ live network and disk I/O bandwidth monitor.") (source (origin (method url-fetch) - (uri (string-append "http://download.aircrack-ng.org/aircrack-ng-" + (uri (string-append "https://download.aircrack-ng.org/aircrack-ng-" version ".tar.gz")) (sha256 (base32 @@ -807,7 +807,7 @@ live network and disk I/O bandwidth monitor.") (("\\$\\(ethtool") (string-append "$(" ethtool))) #t)))))) - (home-page "http://www.aircrack-ng.org") + (home-page "https://www.aircrack-ng.org") (synopsis "Assess WiFi network security") (description "Aircrack-ng is a complete suite of tools to assess WiFi network -- cgit v1.2.3 From b9114ccbad64db553b88d2b17206a34585b60e37 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 17 Aug 2018 16:13:51 +0200 Subject: gnu: aircrack-ng: Update to 1.3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/networking.scm (aircrack-ng): Update to 1.3. [native-inputs]: Add autoconf, automake, libtool, and which. [inputs]: Add libpcap. [arguments]: Use conventional --options in #:configure-flags. Restore ‘configure’ phase. Add ‘patch-evalrev’ and customise ‘bootstrap’ phases. Simplify ‘absolutize-tools’ phase. --- gnu/packages/networking.scm | 48 +++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 21 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 5a85a9d40d..abc616de3c 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -762,7 +762,7 @@ live network and disk I/O bandwidth monitor.") (define-public aircrack-ng (package (name "aircrack-ng") - (version "1.2-rc4") + (version "1.3") (source (origin (method url-fetch) @@ -770,42 +770,48 @@ live network and disk I/O bandwidth monitor.") version ".tar.gz")) (sha256 (base32 - "0dpzx9kddxpgzmgvdpl3rxn0jdaqhm5wxxndp1xd7d75mmmc2fnr")))) + "1jl30d0kibc82447fr3lgw75arik0l9729k94z76l7vl51y8mq4a")))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config) + ("which" ,which))) (inputs `(("libgcrypt" ,libgcrypt) ("libnl" ,libnl) + ("libpcap" ,libpcap) ("ethtool" ,ethtool) ("pcre" ,pcre) ("sqlite" ,sqlite) ("zlib" ,zlib))) (arguments - `(#:make-flags `("sqlite=true" - "gcrypt=true" - "libnl=true" - "pcre=true" - "experimental=true" ;build wesside-ng, etc. - "AVX2FLAG=N" "AVX1FLAG=N" - ,,@(match (%current-system) - ((or "x86_64-linux" "i686-linux") - `("SSEFLAG=Y")) - (_ - `("NEWSSE=false"))) - ,(string-append "prefix=" %output)) + `(#:configure-flags + (list "--with-experimental=yes" ; build wesside-ng, etc. + "--with-gcrypt") ; openssl's the default #:phases (modify-phases %standard-phases - (delete 'configure) ;no configure phase + (add-before 'bootstrap 'patch-evalrev + (lambda _ + ;; Called by ./autogen.sh below, before the default + ;; ‘patch-shebangs’ phase has had a chance to run. + (substitute* "evalrev" + (("/bin/sh") + (which "sh"))) + #t)) + (replace 'bootstrap + (lambda _ + ;; Patch shebangs in generated files before running + ;; ./configure. + (setenv "NOCONFIGURE" "please") + (invoke "bash" "./autogen.sh"))) (add-after 'build 'absolutize-tools (lambda* (#:key inputs #:allow-other-keys) (let ((ethtool (string-append (assoc-ref inputs "ethtool") "/sbin/ethtool"))) (substitute* "scripts/airmon-ng" - (("\\[ ! -x \"\\$\\(command -v ethtool 2>&1)\" \\]") - (string-append "! " ethtool " --version " - ">/dev/null 2>&1")) - (("\\$\\(ethtool") - (string-append "$(" ethtool))) + (("ethtool ") + (string-append ethtool " "))) #t)))))) (home-page "https://www.aircrack-ng.org") (synopsis "Assess WiFi network security") -- cgit v1.2.3 From a0fad0374e583d44a73d6f76ead3bfeefc6d6b08 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 9 Sep 2018 14:59:49 +0200 Subject: gnu: links: Update to 2.17. * gnu/packages/web-browsers.scm (links): Update to 2.17. --- gnu/packages/web-browsers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 45252c933d..2c2767dbbc 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -86,14 +86,14 @@ older or slower computers and embedded systems.") (define-public links (package (name "links") - (version "2.16") + (version "2.17") (source (origin (method url-fetch) (uri (string-append "http://links.twibright.com/download/" name "-" version ".tar.bz2")) (sha256 (base32 - "0gsa2gpb1grhssl5jzpc5pa0zi21mxi8g25rh5bacl70slw31w42")))) + "0dh2gbzcw8kxy81z4ggsynibnqs56b83vy8qgz7illsag1irff6q")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 2d32a6572ddcd23aa1ae598a5d9b6e36f7f87b09 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 9 Sep 2018 14:38:44 +0200 Subject: gnu: perl-params-validate: Update to 1.29. * gnu/packages/perl.scm (perl-params-validate): Update to 1.29. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 1bf4cb15fe..8dea2051a6 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -6744,7 +6744,7 @@ checking parameters easier.") (define-public perl-params-validate (package (name "perl-params-validate") - (version "1.26") + (version "1.29") (source (origin (method url-fetch) @@ -6752,7 +6752,7 @@ checking parameters easier.") "Params-Validate-" version ".tar.gz")) (sha256 (base32 - "1vbj78qd46ip09i06dsbb62jfwpzp4bg7yi617v98nvim77w66l2")))) + "0cwpf8yxwyxbnwhf6rx4wnaq1q38j38i34a78a005shb8gxqv9j9")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build) -- cgit v1.2.3 From 49e63e38846977342c6b6cb44349db0b070f2a84 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 9 Sep 2018 14:38:35 +0200 Subject: gnu: perl-datetime: Update to 1.50. * gnu/packages/perl.scm (perl-datetime): Update to 1.50. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 8dea2051a6..a3f899fdb3 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -2180,7 +2180,7 @@ hours, minutes, seconds, and time zones.") (define-public perl-datetime (package (name "perl-datetime") - (version "1.49") + (version "1.50") (source (origin (method url-fetch) @@ -2188,7 +2188,7 @@ hours, minutes, seconds, and time zones.") "DateTime-" version ".tar.gz")) (sha256 (base32 - "0hbw4zq1562slnz7g7hyhfhyq98dzkk3i5g21x3xra5cvfix93kh")))) + "165iqk1xvhs5j0kzsipa7aqycx3h37wqsl2r4jl104yqvmqhqszd")))) (build-system perl-build-system) (native-inputs `(("perl-cpan-meta-check" ,perl-cpan-meta-check) -- cgit v1.2.3 From 04fc0b9489e97e55914d0e1f9b1439a5b7964854 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 9 Sep 2018 14:13:51 +0200 Subject: gnu: perl-namespace-clean: Update to 0.27. * gnu/packages/perl.scm (perl-namespace-clean): Update to 0.27. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index a3f899fdb3..c81829165e 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -6364,7 +6364,7 @@ anything that looks like a method.") (define-public perl-namespace-clean (package (name "perl-namespace-clean") - (version "0.25") + (version "0.27") (source (origin (method url-fetch) @@ -6372,7 +6372,7 @@ anything that looks like a method.") "namespace-clean-" version ".tar.gz")) (sha256 (base32 - "016dds70ql1mp18b07chkxiy4drn976ibnbshqc2hmhrh9xjnsll")))) + "17dg64pd4bwi2ad3p8ykwys1zha7kg8a8ykvks7wfg8q7qyah44a")))) (build-system perl-build-system) (propagated-inputs `(("perl-package-stash" ,perl-package-stash) -- cgit v1.2.3 From 748e6e1271750319cfa1096f28f9c8588356bcf5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 9 Sep 2018 14:13:43 +0200 Subject: gnu: perl-getopt-long-descriptive: Update to 0.103. * gnu/packages/perl.scm (perl-getopt-long-descriptive): Update to 0.103. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index c81829165e..1c6b251198 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -3812,7 +3812,7 @@ single-letter approach, is provided but not enabled by default.") (define-public perl-getopt-long-descriptive (package (name "perl-getopt-long-descriptive") - (version "0.102") + (version "0.103") (source (origin (method url-fetch) @@ -3820,7 +3820,7 @@ single-letter approach, is provided but not enabled by default.") "Getopt-Long-Descriptive-" version ".tar.gz")) (sha256 (base32 - "0ii8xafvlph5vzcqp3dpc83lg7nkg3l1l2hmqdf5382a567vkm4s")))) + "1cpl240qxmh7jf85ai9sfkp3nzm99syya4jxidizp7aa83kvmqbh")))) (build-system perl-build-system) (native-inputs `(("perl-cpan-meta-check" ,perl-cpan-meta-check) -- cgit v1.2.3 From 4e77b75e114d8ab50ead5e28ae04556abc6c6883 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 9 Sep 2018 14:13:32 +0200 Subject: gnu: perl-extutils-helpers: Update to 0.026. * gnu/packages/perl.scm (perl-extutils-helpers): Update to 0.026. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 1c6b251198..0de597ca59 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -3232,7 +3232,7 @@ XS interface besides the perl one.") (define-public perl-extutils-helpers (package (name "perl-extutils-helpers") - (version "0.022") + (version "0.026") (source (origin (method url-fetch) @@ -3240,7 +3240,7 @@ XS interface besides the perl one.") "ExtUtils-Helpers-" version ".tar.gz")) (sha256 (base32 - "15dalfwmpfmifw312i5pwiai8134pxf7b2804shlqhdk1xqczy6k")))) + "05ilqcj1rg5izr09dsqmy5di4fvq6ph4k0chxks7qmd4j1kip46y")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/ExtUtils-Helpers") (synopsis "Various portability utilities for module builders") -- cgit v1.2.3 From 15dbc911f6deb7c30e7fde2e9bb17e3b671183e5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 9 Sep 2018 14:13:22 +0200 Subject: gnu: perl-extutils-installpaths: Update to 0.012. * gnu/packages/perl.scm (perl-extutils-installpaths): Update to 0.012. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 0de597ca59..54dd29deec 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -3168,7 +3168,7 @@ only about 40% as many lines of code and with zero non-core dependencies.") (define-public perl-extutils-installpaths (package (name "perl-extutils-installpaths") - (version "0.011") + (version "0.012") (source (origin (method url-fetch) @@ -3176,7 +3176,7 @@ only about 40% as many lines of code and with zero non-core dependencies.") "ExtUtils-InstallPaths-" version ".tar.gz")) (sha256 (base32 - "0z06y0fhx9hy9x01abb7s2xdbqrh9x4ps7avmlf4bwfwih2gl2bn")))) + "1v9lshfhm9ck4p0v77arj5f7haj1mmkqal62lgzzvcds6wq5www4")))) (build-system perl-build-system) (propagated-inputs `(("perl-extutils-config" ,perl-extutils-config))) -- cgit v1.2.3 From 9ad80992d0111afeedfb47cd3594397e844517ba Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 9 Sep 2018 14:13:12 +0200 Subject: gnu: perl-config-autoconf: Update to 0.317. * gnu/packages/perl.scm (perl-config-autoconf): Update to 0.317. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 54dd29deec..fc0553798b 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -1409,7 +1409,7 @@ supports XML, YAML, JSON, Apache-style configuration, and Perl code.") (define-public perl-config-autoconf (package (name "perl-config-autoconf") - (version "0.315") + (version "0.317") (source (origin (method url-fetch) @@ -1417,7 +1417,7 @@ supports XML, YAML, JSON, Apache-style configuration, and Perl code.") "Config-AutoConf-" version ".tar.gz")) (sha256 (base32 - "0h39x9rzrhhilpg8yxlzpka269qrzsjg0iy0c1b9xflqlvhx2g2b")))) + "1qcwib4yaml5z2283qy5khjcydyibklsnk8zrk9wzdzc5wnv5r01")))) (build-system perl-build-system) (propagated-inputs `(("perl-capture-tiny" ,perl-capture-tiny))) -- cgit v1.2.3 From bb5e06a35e55d687cbc5c64299d039e5de7d9c8c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 9 Sep 2018 13:23:03 +0200 Subject: gnu: perl-pegex: Update to 0.67. * gnu/packages/perl.scm (perl-pegex): Update to 0.67. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index fc0553798b..c4c3b665db 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -6937,7 +6937,7 @@ for correctness.") (define-public perl-pegex (package (name "perl-pegex") - (version "0.64") + (version "0.67") (source (origin (method url-fetch) @@ -6946,7 +6946,7 @@ for correctness.") version ".tar.gz")) (sha256 (base32 - "1kb7y2cc3nibbn8i8y3vrzz1f9h3892nbf8jj88c5fdgpmj05q17")))) + "149015ra2figalxrnj72fz02qc5cm96xg6x8d6kmyanfmrrxzf9w")))) (build-system perl-build-system) (native-inputs `(("perl-file-sharedir-install" ,perl-file-sharedir-install) -- cgit v1.2.3 From bb105673b88cea5c290ea9a16094ce29fcf0f475 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 9 Sep 2018 13:17:08 +0200 Subject: gnu: musl: Update to 1.1.20. * gnu/packages/musl.scm (musl): Update to 1.1.20. --- gnu/packages/musl.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/musl.scm b/gnu/packages/musl.scm index ff789b8c6f..357372becd 100644 --- a/gnu/packages/musl.scm +++ b/gnu/packages/musl.scm @@ -28,17 +28,17 @@ (define-public musl (package (name "musl") - (version "1.1.19") + (version "1.1.20") (source (origin (method url-fetch) (uri (string-append "http://www.musl-libc.org/releases/" name "-" version ".tar.gz")) (sha256 (base32 - "1nf1wh44bhm8gdcfr75ayib29b99vpq62zmjymrq7f96h9bshnfv")))) + "0q8dsjxl41dccscv9a0r78bs7jap57mn4mni5pwbbip6s1qqggj4")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; Musl has no tests + `(#:tests? #f ; Musl has no tests #:configure-flags (list "--disable-gcc-wrapper"))) (synopsis "Small C standard library") -- cgit v1.2.3 From c2311644a5432eb118d5e789288a0ddf43990684 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 8 Sep 2018 14:56:54 +0200 Subject: gnu: signify: Update to 24. * gnu/packages/crypto.scm (signify): Update to 24. --- gnu/packages/crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index e070ef61ac..d9111135e8 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -126,7 +126,7 @@ communication, encryption, decryption, signatures, etc.") (define-public signify (package (name "signify") - (version "23") + (version "24") (source (origin (method url-fetch) (uri (string-append "https://github.com/aperezdc/signify/" @@ -134,7 +134,7 @@ communication, encryption, decryption, signatures, etc.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0c70mzawgahsvmsv4xdrass4pgyynd67ipd9lij0fgi8wkq0ns8w")))) + "0594vyvkq176xxzaz9xbq8qs0xdnr8s9gkd1prblwpdvnzmw0xvc")))) (build-system gnu-build-system) ;; TODO Build with libwaive (described in README.md), to implement something ;; like OpenBSD's pledge(). -- cgit v1.2.3 From b64e67ad40f7cf6d4867cd38eee0e4ec16cd6e9a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 8 Sep 2018 14:55:12 +0200 Subject: gnu: cloc: Update to 1.78. * gnu/packages/code.scm (cloc): Update to 1.78. [source]: Update URI. --- gnu/packages/code.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 85ee6c2877..b3fbea0b38 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -211,16 +211,16 @@ COCOMO model or user-provided parameters.") (define-public cloc (package (name "cloc") - (version "1.76") + (version "1.78") (source (origin (method url-fetch) (uri (string-append - "https://github.com/AlDanial/cloc/releases/download/v" version + "https://github.com/AlDanial/cloc/releases/download/" version "/cloc-" version ".tar.gz")) (sha256 (base32 - "05srlvzwisr7y7ymvzb5yfdsrspja27ysqdmkwhiiivy84mq2gnl")))) + "176xklr2qsgxh9zdb565gib6pp4gsm585rz5fvyphgjy4i679wkv")))) (build-system gnu-build-system) (inputs `(("coreutils" ,coreutils) -- cgit v1.2.3 From 81bf0fd0d4a7e78febb394576ea849285fc2d329 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Sep 2018 18:53:13 +0200 Subject: gnu: julia: Update objconv input. * gnu/packages/julia.scm (julia)[inputs]: Update the hash of "objconv", which does not have a stable URL. Add a file name and use HTTPS while at it. --- gnu/packages/julia.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index 39e2322739..fb9b0eeedf 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -355,10 +355,12 @@ ("objconv" ,(origin (method url-fetch) - (uri "http://www.agner.org/optimize/objconv.zip") + ;; No versioned URL, see for updates. + (uri "https://www.agner.org/optimize/objconv.zip") + (file-name "objconv-2018-08-15.zip") (sha256 (base32 - "1fi7qa2sd9vb35dvkgripjf0fayzg2qmff215f8agfqfiwd1g8qs")))) + "09y4pwxfs6fl47cyingbf95i2rxx74wmycl9fd4ldcgvpx9bzdrx")))) ("dsfmt" ,(origin (method url-fetch) -- cgit v1.2.3 From 617cf5de922e54042e93696d341350149942c6c4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 6 Sep 2018 19:14:39 +0200 Subject: gnu: mpfr: Update home page. * gnu/packages/multiprecision.scm (mpfr)[home-page]: Use HTTPS. --- gnu/packages/multiprecision.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index e185a98359..4f5eac16b9 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -108,7 +108,7 @@ algebra.") library for performing multiple-precision, floating-point computations with correct rounding.") (license lgpl3+) - (home-page "http://www.mpfr.org/"))) + (home-page "https://www.mpfr.org/"))) (define-public mpc (package -- cgit v1.2.3 From 249846bfdee20e28cc38425aa454ce2f932441f9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Sep 2018 13:28:20 +0200 Subject: gnu: libsoup: Update to 2.64.0. * gnu/packages/gnome.scm (libsoup): Update to 2.64.0. [inputs]: Add LIBPSL. --- gnu/packages/gnome.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 13eb41e055..1a0cc9cc11 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2455,7 +2455,7 @@ libxml to ease remote use of the RESTful API.") (define-public libsoup (package (name "libsoup") - (version "2.62.3") + (version "2.64.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libsoup/" @@ -2463,7 +2463,7 @@ libxml to ease remote use of the RESTful API.") name "-" version ".tar.xz")) (sha256 (base32 - "0whi8p03kpbp68kg6fg3vb7rhykjp7wn3nlbzy9j0p298zjss4nk")))) + "09z7g3spww3f84y8jmicdd6lqp360mbggpg5h1fq1v4p5ihcjnyr")))) (build-system gnu-build-system) (outputs '("out" "doc")) (arguments @@ -2567,6 +2567,7 @@ libxml to ease remote use of the RESTful API.") ("libxml2" ,libxml2))) (inputs `(("glib-networking" ,glib-networking) + ("libpsl" ,libpsl) ("sqlite" ,sqlite))) (home-page "https://live.gnome.org/LibSoup/") (synopsis "GLib-based HTTP Library") -- cgit v1.2.3 From 37f9cfae43d8614904335434c91ea1c0d9d69508 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Sep 2018 13:34:31 +0200 Subject: gnu: msmtp: Update to 1.8.0. * gnu/packages/mail.scm (msmtp): Update to 1.8.0. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 4944dd7622..91a8822cfd 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1071,7 +1071,7 @@ which can add many functionalities to the base client.") (define-public msmtp (package (name "msmtp") - (version "1.6.8") + (version "1.8.0") (source (origin (method url-fetch) @@ -1079,7 +1079,7 @@ which can add many functionalities to the base client.") "/msmtp-" version ".tar.xz")) (sha256 (base32 - "1ysrnshvwhzwmvb2walw5i9jdzlvmckj7inr0xnvb26q0jirbzsm")))) + "1k9wwlapkxk9ql3xq05y6vwn6ziqk9b1v8lyhj1866qd02zhqwxx")))) (build-system gnu-build-system) (inputs `(("libidn" ,libidn) -- cgit v1.2.3 From 91b3a6d4db848ae5de65ca511dc2deb27c7cb7dc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Sep 2018 13:39:31 +0200 Subject: gnu: msmtp: Remove unneeded input. * gnu/packages/mail.scm (msmtp)[inputs]: Remove LIBIDN, which is only required when using OpenSSL (or GnuTLS sans IDN support). --- gnu/packages/mail.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 91a8822cfd..024e75aaa1 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1082,8 +1082,7 @@ which can add many functionalities to the base client.") "1k9wwlapkxk9ql3xq05y6vwn6ziqk9b1v8lyhj1866qd02zhqwxx")))) (build-system gnu-build-system) (inputs - `(("libidn" ,libidn) - ("libsecret" ,libsecret) + `(("libsecret" ,libsecret) ("gnutls" ,gnutls) ("zlib" ,zlib) ("gsasl" ,gsasl))) -- cgit v1.2.3 From e9c1492f66b0ca5c86d6f23655b713978a4d7644 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Sep 2018 13:58:31 +0200 Subject: gnu: glm: Update to 0.9.9.1. * gnu/packages/maths.scm (glm): Update to 0.9.9.1. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index d2b9df01a7..ebbe2b0294 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3253,7 +3253,7 @@ Failure to do so will result in a library with poor performance.") (define-public glm (package (name "glm") - (version "0.9.9.0") + (version "0.9.9.1") (source (origin (method url-fetch) @@ -3261,7 +3261,7 @@ Failure to do so will result in a library with poor performance.") version "/glm-" version ".zip")) (sha256 (base32 - "0ihjadp2sb8w312a276skfjsljm3y41bjscbxf79wn23gi00giz1")))) + "042a23hmxfs429czkmlg5ixf28aikzfbw18780prj2gcd4flgw8h")))) (build-system cmake-build-system) (native-inputs `(("unzip" ,unzip))) -- cgit v1.2.3 From 1448fa254732a76fc138059043a6b5f12c71367b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Sep 2018 19:29:00 +0200 Subject: gnu: openal: Update to 1.19.0. * gnu/packages/audio.scm (openal): Update to 1.19.0. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index e731569ae1..3b898c024a 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1908,7 +1908,7 @@ lv2-c++-tools.") (define-public openal (package (name "openal") - (version "1.18.2") + (version "1.19.0") (source (origin (method url-fetch) (uri (string-append @@ -1916,7 +1916,7 @@ lv2-c++-tools.") version ".tar.bz2")) (sha256 (base32 - "10kydm8701a2kppiss9sdidn1820cmzhqgx1b2bsa5dsgzic32lz")))) + "1mhf5bsb58s1xk6hvxl7ly7rd4rpl9z8h07xl1q94brywykg7bgi")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; no check target -- cgit v1.2.3 From a617fd55df0fbdae951ec82b81ad512436e972ed Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Sep 2018 20:01:57 +0200 Subject: gnu: OpenBLAS: Update source URI. * gnu/packages/maths.scm (openblas)[source](uri): Use the more stable SourceForge mirror. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index ebbe2b0294..01bd03c600 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2846,8 +2846,8 @@ parts of it.") (source (origin (method url-fetch) - (uri (string-append "https://github.com/xianyi/OpenBLAS/tarball/v" - version)) + (uri (string-append "mirror://sourceforge/openblas/v" version "/OpenBLAS%20" + version "%20version.tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 -- cgit v1.2.3 From 910a20e2b8ac6d1c331ff79535831cce6222b3a3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 8 Sep 2018 07:59:06 +0200 Subject: gnu: jbig2dec: Replace with 0.15 [security fixes]. * gnu/packages/image.scm (jbig2dec-0.15): New public variable. (jbig2dec)[replacement]: New field. --- gnu/packages/image.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 81d22ed42d..78fb30c279 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2018 Joshua Sierles, Nextjournal ;;; Copyright © 2018 Fis Trivial ;;; Copyright © 2018 Pierre Neidhardt +;;; Copyright © 2018 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -495,6 +496,7 @@ arithmetic ops.") (package (name "jbig2dec") (version "0.14") + (replacement jbig2dec-0.15) (source (origin (method url-fetch) @@ -519,6 +521,21 @@ 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") -- cgit v1.2.3 From 0084744b3af0a6f8e125120143f57567902339a8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 8 Sep 2018 12:46:22 +0200 Subject: gnu: ghostscript: Update replacement to 9.24 [security fixes]. The following CVEs are fixed with this release: CVE-2018-15908, CVE-2018-15909, CVE-2018-15910, CVE-2018-15911, CVE-2018-16509, CVE-2018-16510, CVE-2018-16511, CVE-2018-16513, CVE-2018-16539, CVE-2018-16540, CVE-2018-16541, CVE-2018-16542, CVE-2018-16543. * gnu/packages/patches/ghostscript-CVE-2018-10194.patch: Delete file. * gnu/packages/patches/ghostscript-CVE-2018-16509.patch, gnu/packages/patches/ghostscript-bug-699708.patch: New files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/ghostscript.scm (ghostscript/fixed): Update to 9.24. [source](patches): Remove 'ghostscript-CVE-2018-10194.patch' and 'ghostscript-runpath.patch'. Add 'ghostscript-CVE-2018-16509.patch' and 'ghostscript-bug-699708.patch'. [arguments]: Add LDFLAGS to #:configure-flags, and a phase to create output directory. --- gnu/local.mk | 3 +- gnu/packages/ghostscript.scm | 37 +++- .../patches/ghostscript-CVE-2018-10194.patch | 52 ------ .../patches/ghostscript-CVE-2018-16509.patch | 193 +++++++++++++++++++++ gnu/packages/patches/ghostscript-bug-699708.patch | 160 +++++++++++++++++ 5 files changed, 389 insertions(+), 56 deletions(-) delete mode 100644 gnu/packages/patches/ghostscript-CVE-2018-10194.patch create mode 100644 gnu/packages/patches/ghostscript-CVE-2018-16509.patch create mode 100644 gnu/packages/patches/ghostscript-bug-699708.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 278afbb257..0407fdc597 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -726,7 +726,8 @@ 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 \ diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 1240b1dc16..518e18397b 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -38,8 +39,10 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix build-system gnu) - #:use-module (guix build-system trivial)) + #:use-module (guix build-system trivial) + #:use-module (srfi srfi-1)) (define-public lcms (package @@ -255,11 +258,39 @@ output file formats and printers.") (hidden-package (package (inherit ghostscript) + (version "9.24") (source (origin (inherit (package-source ghostscript)) - (patches (append (origin-patches (package-source ghostscript)) - (search-patches "ghostscript-CVE-2018-10194.patch")))))))) + (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 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-CVE-2018-16509.patch b/gnu/packages/patches/ghostscript-CVE-2018-16509.patch new file mode 100644 index 0000000000..50ffa3cb98 --- /dev/null +++ b/gnu/packages/patches/ghostscript-CVE-2018-16509.patch @@ -0,0 +1,193 @@ +Ghostscript 9.24 was released with an incomplete fix for CVE-2018-16509: +https://nvd.nist.gov/vuln/detail/CVE-2018-16509 +https://bugs.chromium.org/p/project-zero/issues/detail?id=1640#c19 +https://bugs.ghostscript.com/show_bug.cgi?id=699718 + +The reproducers no longer work after applying these commits: + +https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=5812b1b78fc4d36fdc293b7859de69241140d590 +https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=e914f1da46e33decc534486598dc3eadf69e6efb +https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=3e5d316b72e3965b7968bb1d96baa137cd063ac6 +https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=643b24dbd002fb9c131313253c307cf3951b3d47 + +This patch is a "squashed" version of those. + +diff --git a/Resource/Init/gs_setpd.ps b/Resource/Init/gs_setpd.ps +index bba3c8c0e..8fa7c51df 100644 +--- a/Resource/Init/gs_setpd.ps ++++ b/Resource/Init/gs_setpd.ps +@@ -95,27 +95,41 @@ level2dict begin + { % Since setpagedevice doesn't create new device objects, + % we must (carefully) reinstall the old parameters in + % the same device. +- .currentpagedevice pop //null currentdevice //null .trysetparams ++ .currentpagedevice pop //null currentdevice //null ++ { .trysetparams } .internalstopped ++ { ++ //null ++ } if + dup type /booleantype eq + { pop pop } +- { % This should never happen! ++ { + SETPDDEBUG { (Error in .trysetparams!) = pstack flush } if +- cleartomark pop pop pop ++ {cleartomark pop pop pop} .internalstopped pop ++ % if resetting the entire device state failed, at least put back the ++ % security related key ++ currentdevice //null //false mark /.LockSafetyParams ++ currentpagedevice /.LockSafetyParams .knownget not ++ {systemdict /SAFER .knownget not {//false} } if ++ .putdeviceparamsonly + /.installpagedevice cvx /rangecheck signalerror + } + ifelse pop pop + % A careful reading of the Red Book reveals that an erasepage + % should occur, but *not* an initgraphics. + erasepage .beginpage +- } bind def ++ } bind executeonly def + + /.uninstallpagedevice +- { 2 .endpage { .currentnumcopies //false .outputpage } if ++ { ++ {2 .endpage { .currentnumcopies //false .outputpage } if} .internalstopped pop + nulldevice + } bind def + + (%grestorepagedevice) cvn +- { .uninstallpagedevice grestore .installpagedevice ++ { ++ .uninstallpagedevice ++ grestore ++ .installpagedevice + } bind def + + (%grestoreallpagedevice) cvn +diff --git a/psi/zdevice2.c b/psi/zdevice2.c +index 0c7080d57..159a0c0d9 100644 +--- a/psi/zdevice2.c ++++ b/psi/zdevice2.c +@@ -251,8 +251,8 @@ z2currentgstate(i_ctx_t *i_ctx_p) + /* ------ Wrappers for operators that reset the graphics state. ------ */ + + /* Check whether we need to call out to restore the page device. */ +-static bool +-restore_page_device(const gs_gstate * pgs_old, const gs_gstate * pgs_new) ++static int ++restore_page_device(i_ctx_t *i_ctx_p, const gs_gstate * pgs_old, const gs_gstate * pgs_new) + { + gx_device *dev_old = gs_currentdevice(pgs_old); + gx_device *dev_new; +@@ -260,9 +260,10 @@ restore_page_device(const gs_gstate * pgs_old, const gs_gstate * pgs_new) + gx_device *dev_t2; + bool samepagedevice = obj_eq(dev_old->memory, &gs_int_gstate(pgs_old)->pagedevice, + &gs_int_gstate(pgs_new)->pagedevice); ++ bool LockSafetyParams = dev_old->LockSafetyParams; + + if ((dev_t1 = (*dev_proc(dev_old, get_page_device)) (dev_old)) == 0) +- return false; ++ return 0; + /* If we are going to putdeviceparams in a callout, we need to */ + /* unlock temporarily. The device will be re-locked as needed */ + /* by putdeviceparams from the pgs_old->pagedevice dict state. */ +@@ -271,23 +272,51 @@ restore_page_device(const gs_gstate * pgs_old, const gs_gstate * pgs_new) + dev_new = gs_currentdevice(pgs_new); + if (dev_old != dev_new) { + if ((dev_t2 = (*dev_proc(dev_new, get_page_device)) (dev_new)) == 0) +- return false; +- if (dev_t1 != dev_t2) +- return true; ++ samepagedevice = true; ++ else if (dev_t1 != dev_t2) ++ samepagedevice = false; ++ } ++ ++ if (LockSafetyParams && !samepagedevice) { ++ const int required_ops = 512; ++ const int required_es = 32; ++ ++ /* The %grestorepagedevice must complete: the biggest danger ++ is operand stack overflow. As we use get/putdeviceparams ++ that means pushing all the device params onto the stack, ++ pdfwrite having by far the largest number of parameters ++ at (currently) 212 key/value pairs - thus needing (currently) ++ 424 entries on the op stack. Allowing for working stack ++ space, and safety margin..... ++ */ ++ if (required_ops + ref_stack_count(&o_stack) >= ref_stack_max_count(&o_stack)) { ++ gs_currentdevice(pgs_old)->LockSafetyParams = LockSafetyParams; ++ return_error(gs_error_stackoverflow); ++ } ++ /* We also want enough exec stack space - 32 is an overestimate of ++ what we need to complete the Postscript call out. ++ */ ++ if (required_es + ref_stack_count(&e_stack) >= ref_stack_max_count(&e_stack)) { ++ gs_currentdevice(pgs_old)->LockSafetyParams = LockSafetyParams; ++ return_error(gs_error_execstackoverflow); ++ } + } + /* + * The current implementation of setpagedevice just sets new + * parameters in the same device object, so we have to check + * whether the page device dictionaries are the same. + */ +- return !samepagedevice; ++ return samepagedevice ? 0 : 1; + } + + /* - grestore - */ + static int + z2grestore(i_ctx_t *i_ctx_p) + { +- if (!restore_page_device(igs, gs_gstate_saved(igs))) ++ int code = restore_page_device(i_ctx_p, igs, gs_gstate_saved(igs)); ++ if (code < 0) return code; ++ ++ if (code == 0) + return gs_grestore(igs); + return push_callout(i_ctx_p, "%grestorepagedevice"); + } +@@ -297,7 +326,9 @@ static int + z2grestoreall(i_ctx_t *i_ctx_p) + { + for (;;) { +- if (!restore_page_device(igs, gs_gstate_saved(igs))) { ++ int code = restore_page_device(i_ctx_p, igs, gs_gstate_saved(igs)); ++ if (code < 0) return code; ++ if (code == 0) { + bool done = !gs_gstate_saved(gs_gstate_saved(igs)); + + gs_grestore(igs); +@@ -328,11 +359,15 @@ z2restore(i_ctx_t *i_ctx_p) + if (code < 0) return code; + + while (gs_gstate_saved(gs_gstate_saved(igs))) { +- if (restore_page_device(igs, gs_gstate_saved(igs))) ++ code = restore_page_device(i_ctx_p, igs, gs_gstate_saved(igs)); ++ if (code < 0) return code; ++ if (code > 0) + return push_callout(i_ctx_p, "%restore1pagedevice"); + gs_grestore(igs); + } +- if (restore_page_device(igs, gs_gstate_saved(igs))) ++ code = restore_page_device(i_ctx_p, igs, gs_gstate_saved(igs)); ++ if (code < 0) return code; ++ if (code > 0) + return push_callout(i_ctx_p, "%restorepagedevice"); + + code = dorestore(i_ctx_p, asave); +@@ -355,9 +390,12 @@ static int + z2setgstate(i_ctx_t *i_ctx_p) + { + os_ptr op = osp; ++ int code; + + check_stype(*op, st_igstate_obj); +- if (!restore_page_device(igs, igstate_ptr(op))) ++ code = restore_page_device(i_ctx_p, igs, igstate_ptr(op)); ++ if (code < 0) return code; ++ if (code == 0) + return zsetgstate(i_ctx_p); + return push_callout(i_ctx_p, "%setgstatepagedevice"); + } diff --git a/gnu/packages/patches/ghostscript-bug-699708.patch b/gnu/packages/patches/ghostscript-bug-699708.patch new file mode 100644 index 0000000000..1567be1c6f --- /dev/null +++ b/gnu/packages/patches/ghostscript-bug-699708.patch @@ -0,0 +1,160 @@ +Additional security fix that missed 9.24. + +Taken from upstream: +http://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=fb713b3818b52d8a6cf62c951eba2e1795ff9624 + +From fb713b3818b52d8a6cf62c951eba2e1795ff9624 Mon Sep 17 00:00:00 2001 +From: Chris Liddell +Date: Thu, 6 Sep 2018 09:16:22 +0100 +Subject: [PATCH] Bug 699708 (part 1): 'Hide' non-replaceable error handlers + for SAFER + +We already had a 'private' dictionary for non-standard errors: gserrordict. + +This now includes all the default error handlers, the dictionary is made +noaccess and all the prodedures are bound and executeonly. + +When running with -dSAFER, in the event of a Postscript error, instead of +pulling the handler from errordict, we'll pull it from gserrordict - thus +malicious input cannot trigger problems by the use of custom error handlers. + +errordict remains open and writeable, so files such as the Quality Logic tests +that install their own handlers will still 'work', with the exception that the +custom error handlers will not be called. + +This is a 'first pass', 'sledgehammer' approach: a nice addition would to allow +an integrator to specify a list of errors that are not to be replaced (for +example, embedded applications would probably want to ensure that VMerror is +always handled as they intend). +--- + Resource/Init/gs_init.ps | 29 ++++++++++++++++++----------- + psi/interp.c | 30 +++++++++++++++++++++--------- + 2 files changed, 39 insertions(+), 20 deletions(-) + +diff --git a/Resource/Init/gs_init.ps b/Resource/Init/gs_init.ps +index 071c39205..bc8b7951c 100644 +--- a/Resource/Init/gs_init.ps ++++ b/Resource/Init/gs_init.ps +@@ -881,7 +881,7 @@ userdict /.currentresourcefile //null put + { not exch pop exit } { pop } ifelse + } + for exch pop .quit +- } bind def ++ } bind executeonly def + /.errorhandler % .errorhandler - + { % Detect an internal 'stopped'. + 1 .instopped { //null eq { pop pop stop } if } if +@@ -926,7 +926,7 @@ userdict /.currentresourcefile //null put + $error /globalmode get $error /.nosetlocal get and .setglobal + $error /.inerror //false put + stop +- } bind def ++ } bind executeonly def + % Define the standard handleerror. We break out the printing procedure + % (.printerror) so that it can be extended for binary output + % if the Level 2 facilities are present. +@@ -976,7 +976,7 @@ userdict /.currentresourcefile //null put + ifelse % newerror + end + flush +- } bind def ++ } bind executeonly def + /.printerror_long % long error printout, + % $error is on the dict stack + { % Push the (anonymous) stack printing procedure. +@@ -1053,14 +1053,14 @@ userdict /.currentresourcefile //null put + { (Current file position is ) print position = } + if + +- } bind def ++ } bind executeonly def + % Define a procedure for clearing the error indication. + /.clearerror + { $error /newerror //false put + $error /errorname //null put + $error /errorinfo //null put + 0 .setoserrno +- } bind def ++ } bind executeonly def + + % Define $error. This must be in local VM. + .currentglobal //false .setglobal +@@ -1086,11 +1086,15 @@ end + /errordict ErrorNames length 3 add dict + .forcedef % errordict is local, systemdict is global + .setglobal % back to global VM +-% For greater Adobe compatibility, we put all non-standard errors in a +-% separate dictionary, gserrordict. It does not need to be in local VM, +-% because PostScript programs do not access it. ++% gserrordict contains all the default error handling methods, but unlike ++% errordict it is noaccess after creation (also it is in global VM). ++% When running 'SAFER', we'll ignore the contents of errordict, which ++% may have been tampered with by the running job, and always use gserrordict ++% gserrordict also contains any non-standard errors, for better compatibility ++% with Adobe. ++% + % NOTE: the name gserrordict is known to the interpreter. +-/gserrordict 5 dict def ++/gserrordict ErrorNames length 3 add dict def + % Register an error in errordict. We make this a procedure because we only + % register the Level 1 errors here: the rest are registered by "feature" + % files. However, ErrorNames contains all of the error names regardless of +@@ -1119,8 +1123,11 @@ errordict begin + } bind def + end % errordict + +-% Put non-standard errors in gserrordict. +-gserrordict /unknownerror errordict /unknownerror get put ++% Put all the default handlers in gserrordict ++gserrordict ++errordict {2 index 3 1 roll put} forall ++noaccess pop ++% remove the non-standard errors from errordict + errordict /unknownerror .undef + % Define a stable private copy of handleerror that we will always use under + % JOBSERVER mode. +diff --git a/psi/interp.c b/psi/interp.c +index c27b70dca..d41a9d3f5 100644 +--- a/psi/interp.c ++++ b/psi/interp.c +@@ -661,16 +661,28 @@ again: + return code; + if (gs_errorname(i_ctx_p, code, &error_name) < 0) + return code; /* out-of-range error code! */ +- /* +- * For greater Adobe compatibility, only the standard PostScript errors +- * are defined in errordict; the rest are in gserrordict. ++ ++ /* If LockFilePermissions is true, we only refer to gserrordict, which ++ * is not accessible to Postcript jobs + */ +- if (dict_find_string(systemdict, "errordict", &perrordict) <= 0 || +- (dict_find(perrordict, &error_name, &epref) <= 0 && +- (dict_find_string(systemdict, "gserrordict", &perrordict) <= 0 || +- dict_find(perrordict, &error_name, &epref) <= 0)) +- ) +- return code; /* error name not in errordict??? */ ++ if (i_ctx_p->LockFilePermissions) { ++ if (((dict_find_string(systemdict, "gserrordict", &perrordict) <= 0 || ++ dict_find(perrordict, &error_name, &epref) <= 0)) ++ ) ++ return code; /* error name not in errordict??? */ ++ } ++ else { ++ /* ++ * For greater Adobe compatibility, only the standard PostScript errors ++ * are defined in errordict; the rest are in gserrordict. ++ */ ++ if (dict_find_string(systemdict, "errordict", &perrordict) <= 0 || ++ (dict_find(perrordict, &error_name, &epref) <= 0 && ++ (dict_find_string(systemdict, "gserrordict", &perrordict) <= 0 || ++ dict_find(perrordict, &error_name, &epref) <= 0)) ++ ) ++ return code; /* error name not in errordict??? */ ++ } + doref = *epref; + epref = &doref; + /* Push the error object on the operand stack if appropriate. */ +-- +2.18.0 + -- cgit v1.2.3 From 842c44c9746f2acb132aab276338b1fac2143364 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 9 Sep 2018 17:54:32 +0200 Subject: 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 -------------------- gnu/packages/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 (limited to 'gnu') 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) -- cgit v1.2.3 From 16676fc3b1736781d085b0c047dbb6ae296ac4f1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 9 Sep 2018 17:55:33 +0200 Subject: 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(-) (limited to 'gnu') 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") -- cgit v1.2.3 From 0171019418435888afb6024d04702683482d0294 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 9 Sep 2018 17:57:39 +0200 Subject: 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 (limited to 'gnu') 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" -- cgit v1.2.3 From 6bbbdb1a34607690ca8413f29bb7bf5cacae2bcc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 31 Aug 2018 16:11:59 +0200 Subject: 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 (limited to 'gnu') 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 */ -- cgit v1.2.3 From 436969904cef613b2fa0809cfa453d3db7e18d52 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Sep 2018 13:31:41 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From f6f8645cc9337309eeae21e0d036a3167c4a85bc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Sep 2018 13:32:54 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 6cd715adef33e9ad6215e2183f5ab8e7ab0802d2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Sep 2018 14:17:06 +0200 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From 529c36225a623aa1b89d3b10c589db7e5cae0f99 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Sep 2018 14:28:46 +0200 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From ad8ae693c8518c927ec119e2aabe05bdf86e2912 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Sep 2018 17:36:04 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 5d948c0c5de68187ea7c9397641b2332a66ad2ba Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Sep 2018 17:36:26 +0200 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From 9bb8b563a895132f2345d415b5877accbc1cd0b8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Sep 2018 18:48:50 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 9adaf1f4085e16667a034fc58984af847cab6b05 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Sep 2018 20:04:05 +0200 Subject: 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(-) (limited to 'gnu') 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" -- cgit v1.2.3 From 589aca1c183ef1dfdef54d40fdd6a258bbcd39d0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Sep 2018 20:19:32 +0200 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From 2246c19218ca2d55f1126c15e82c666685af8540 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Sep 2018 21:28:22 +0200 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From 7b1ad8b1d979b68313d6070134dcc449fe6f2626 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Sep 2018 21:54:21 +0200 Subject: 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(-) (limited to 'gnu') 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")) -- cgit v1.2.3 From a34ce3308e8ac6cd515bf027ed191e722fb48e8d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Sep 2018 22:26:44 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 334bd08c425efe9827d6baed415e7651a957e497 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 8 Sep 2018 07:07:32 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From de781c05e7dafde6468d371a8e34502b6930fe0a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 9 Sep 2018 11:58:45 +0200 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From 5e537222498d7f47ddda666de54ab5e0b3828462 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 9 Sep 2018 12:59:11 +0200 Subject: 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(+) (limited to 'gnu') 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 -- cgit v1.2.3 From 1d957c79b698241df612fc64b57a1c55cc7b55be Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 9 Sep 2018 13:19:50 +0200 Subject: 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(-) (limited to 'gnu') 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: -- cgit v1.2.3 From 4333d48a825c2327c22464de631cf81d05dd2719 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 9 Sep 2018 13:22:43 +0200 Subject: 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(-) (limited to 'gnu') 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 _ -- cgit v1.2.3 From c36d972531efd1afdc9e4e0dd4e73f5bb4146229 Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Sun, 9 Sep 2018 21:59:08 +0200 Subject: gnu: Update texmaker to 5.0.2. * gnu/packages/tex.scm (texmaker): Update to 5.0.2. --- gnu/packages/tex.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 6ab999b2d5..be75bda7dd 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -4244,14 +4244,14 @@ PDF documents.") (define-public texmaker (package (name "texmaker") - (version "4.5") + (version "5.0.2") (source (origin (method url-fetch) (uri (string-append "http://www.xm1math.net/texmaker/texmaker-" version ".tar.bz2")) (sha256 (base32 - "056njk6j8wma23mlp7xa3rgfaxx0q8ynwx8wkmj7iy0b85p9ds9c")))) + "0y81mjm89b99pr9svcwpaf4iz2q9pc9hjas5kiwd1pbgl5vqskm9")))) (build-system gnu-build-system) (arguments `(#:phases @@ -4262,9 +4262,9 @@ PDF documents.") (let ((out (assoc-ref outputs "out"))) (invoke "qmake" (string-append "PREFIX=" out) - (string-append "DESKTOPDIR=" out - "/share/applications") + (string-append "DESKTOPDIR=" out "/share/applications") (string-append "ICONDIR=" out "/share/pixmaps") + (string-append "METAINFODIR=" out "/share/metainfo") "texmaker.pro"))))))) (inputs `(("poppler-qt5" ,poppler-qt5) -- cgit v1.2.3 From 35c076e619c0a7c25456fceb2e694f76e0315db5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 9 Sep 2018 15:35:54 +0200 Subject: gnu: r-chippeakanno: Update to 3.14.2. * gnu/packages/bioconductor.scm (r-chippeakanno): Update to 3.14.2. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index a47a5aad05..108f3c398f 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -410,14 +410,14 @@ determining dependencies between variables, code improvement suggestions.") (define-public r-chippeakanno (package (name "r-chippeakanno") - (version "3.14.1") + (version "3.14.2") (source (origin (method url-fetch) (uri (bioconductor-uri "ChIPpeakAnno" version)) (sha256 (base32 - "1cn1hfc3nvsf2n3563lkmvwjxfbiygx7f84zk683p89gy7zi1gyj")))) + "13rksc65lxxzyw11galh6xzvgzp5ii0gwiwpvrm395v2r17rhwsc")))) (properties `((upstream-name . "ChIPpeakAnno"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From ab50580a9d9379b62b9d3e9db5f3402b8462dd98 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 9 Sep 2018 15:36:10 +0200 Subject: gnu: r-annotationhub: Update to 2.12.1. * gnu/packages/bioinformatics.scm (r-annotationhub): Update to 2.12.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 2d5ec6d170..6580cac531 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9866,14 +9866,14 @@ Shiny-based display methods for Bioconductor objects.") (define-public r-annotationhub (package (name "r-annotationhub") - (version "2.12.0") + (version "2.12.1") (source (origin (method url-fetch) (uri (bioconductor-uri "AnnotationHub" version)) (sha256 (base32 - "11gh7qkgazs90czdqgv74gh2hz26xrmdp6wsz9x5pygbxls8xdw3")))) + "02ls279k1qlch147vw8kwvlhcqyzvi495bgv110m0xnnbpgbln6g")))) (properties `((upstream-name . "AnnotationHub"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 45350539aa2c977ae04bfda0483834a2bd638fb3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 9 Sep 2018 15:36:19 +0200 Subject: gnu: r-chron: Update to 2.3-53. * gnu/packages/statistics.scm (r-chron): Update to 2.3-53. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index ce7335619b..04979ffe25 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1749,13 +1749,13 @@ and density estimation.") (define-public r-chron (package (name "r-chron") - (version "2.3-52") + (version "2.3-53") (source (origin (method url-fetch) (uri (cran-uri "chron" version)) (sha256 (base32 - "185lfp75cv3l4cavg64sccj8lgc5sivch13n6gkannv3pd5cyzy4")))) + "02bkywwsxwrxc035hv51dxgdm1fjxdm7dn19ivifln59dfs1862j")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/chron") (synopsis "Chronological R objects which can handle dates and times") -- cgit v1.2.3 From ced98c7e89a22c551dd23acd7a1b4f861958d876 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 9 Sep 2018 17:48:24 -0400 Subject: gnu: libgd: Fix CVE-2018-{5711,1000222}. * gnu/packages/patches/gd-CVE-2018-1000222.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/gd.scm (gd/fixed): New variable. * gnu/packages/php.scm (gd-for-php)[source]: Use 'gd-CVE-2018-1000222.patch'. --- gnu/local.mk | 1 + gnu/packages/gd.scm | 11 ++++ gnu/packages/patches/gd-CVE-2018-1000222.patch | 87 ++++++++++++++++++++++++++ gnu/packages/php.scm | 3 +- 4 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/gd-CVE-2018-1000222.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 0407fdc597..374e25165e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -719,6 +719,7 @@ dist_patch_DATA = \ %D%/packages/patches/gcr-disable-failing-tests.patch \ %D%/packages/patches/gcr-fix-collection-tests-to-work-with-gpg-21.patch \ %D%/packages/patches/gd-CVE-2018-5711.patch \ + %D%/packages/patches/gd-CVE-2018-1000222.patch \ %D%/packages/patches/gd-fix-tests-on-i686.patch \ %D%/packages/patches/gd-freetype-test-failure.patch \ %D%/packages/patches/gdm-CVE-2018-14424.patch \ diff --git a/gnu/packages/gd.scm b/gnu/packages/gd.scm index c374695524..327a1f1545 100644 --- a/gnu/packages/gd.scm +++ b/gnu/packages/gd.scm @@ -39,6 +39,7 @@ (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. @@ -91,6 +92,16 @@ 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/patches/gd-CVE-2018-1000222.patch b/gnu/packages/patches/gd-CVE-2018-1000222.patch new file mode 100644 index 0000000000..7e94295bb6 --- /dev/null +++ b/gnu/packages/patches/gd-CVE-2018-1000222.patch @@ -0,0 +1,87 @@ +Fix CVE-2018-1000222: + +https://github.com/libgd/libgd/issues/447 +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-1000222 + +Patch copied from upstream source repository: + +https://github.com/libgd/libgd/commit/4b1e18a00ce7c4b7e6919c3b3109a034393b805a + +From 4b1e18a00ce7c4b7e6919c3b3109a034393b805a Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Sat, 14 Jul 2018 13:54:08 -0400 +Subject: [PATCH] bmp: check return value in gdImageBmpPtr + +Closes #447. + +(cherry picked from commit ac16bdf2d41724b5a65255d4c28fb0ec46bc42f5) +--- + src/gd_bmp.c | 17 ++++++++++++++--- + 1 file changed, 14 insertions(+), 3 deletions(-) + +diff --git a/src/gd_bmp.c b/src/gd_bmp.c +index ccafdcd..d625da1 100644 +--- a/src/gd_bmp.c ++++ b/src/gd_bmp.c +@@ -48,6 +48,8 @@ static int bmp_read_4bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, bmp + static int bmp_read_8bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, bmp_hdr_t *header); + static int bmp_read_rle(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info); + ++static int _gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression); ++ + #define BMP_DEBUG(s) + + static int gdBMPPutWord(gdIOCtx *out, int w) +@@ -88,8 +90,10 @@ BGD_DECLARE(void *) gdImageBmpPtr(gdImagePtr im, int *size, int compression) + void *rv; + gdIOCtx *out = gdNewDynamicCtx(2048, NULL); + if (out == NULL) return NULL; +- gdImageBmpCtx(im, out, compression); +- rv = gdDPExtractData(out, size); ++ if (!_gdImageBmpCtx(im, out, compression)) ++ rv = gdDPExtractData(out, size); ++ else ++ rv = NULL; + out->gd_free(out); + return rv; + } +@@ -142,6 +146,11 @@ BGD_DECLARE(void) gdImageBmp(gdImagePtr im, FILE *outFile, int compression) + compression - whether to apply RLE or not. + */ + BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) ++{ ++ _gdImageBmpCtx(im, out, compression); ++} ++ ++static int _gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) + { + int bitmap_size = 0, info_size, total_size, padding; + int i, row, xpos, pixel; +@@ -149,6 +158,7 @@ BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) + unsigned char *uncompressed_row = NULL, *uncompressed_row_start = NULL; + FILE *tmpfile_for_compression = NULL; + gdIOCtxPtr out_original = NULL; ++ int ret = 1; + + /* No compression if its true colour or we don't support seek */ + if (im->trueColor) { +@@ -326,6 +336,7 @@ BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) + out_original = NULL; + } + ++ ret = 0; + cleanup: + if (tmpfile_for_compression) { + #ifdef _WIN32 +@@ -339,7 +350,7 @@ cleanup: + if (out_original) { + out_original->gd_free(out_original); + } +- return; ++ return ret; + } + + static int compress_row(unsigned char *row, int length) +-- +2.18.0 + diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index 121ffab767..4981c60554 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -57,7 +57,8 @@ (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-5711.patch" + "gd-CVE-2018-1000222.patch")))))) (define-public php (package -- cgit v1.2.3 From d4bd2453ec6c2342d071cb9a9708280cf45b23ca Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 9 Sep 2018 16:38:22 -0400 Subject: gnu: certbot: Update to 0.27.1. * gnu/packages/tls.scm (python-acme): Update to 0.27.1. [arguments]: Use invoke. (certbot): Update to 0.27.1. [native-inputs]: Use python-sphinx-1.6. --- gnu/packages/tls.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index e42b6dfc6c..5e49509ddd 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -518,20 +518,20 @@ netcat implementation that supports TLS.") (package (name "python-acme") ;; Remember to update the hash of certbot when updating python-acme. - (version "0.26.1") + (version "0.27.1") (source (origin (method url-fetch) (uri (pypi-uri "acme" version)) (sha256 (base32 - "1glhwqj6yyb11820lspgd0gl5dqdfljn43kcy4ar5caccpsbbrw6")))) + "142gynlfx7yv0sdba3gpdxlnhg9chhz7hpdxdrp630z17h1bk9ri")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases (add-after 'build 'build-documentation (lambda _ - (zero? (system* "make" "-C" "docs" "man" "info")))) + (invoke "make" "-C" "docs" "man" "info"))) (add-after 'install 'install-documentation (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -575,7 +575,7 @@ netcat implementation that supports TLS.") (uri (pypi-uri name version)) (sha256 (base32 - "0rnayqhdabm0rljxh76blqd11h51dqnwlwvql0j6xwzpccym30s9")))) + "0anh3vjy9sif1bkp25nj76ii37xx8hh0igcx60ppag12xlabsw1m")))) (build-system python-build-system) (arguments `(,@(substitute-keyword-arguments (package-arguments python-acme) @@ -596,7 +596,7 @@ netcat implementation that supports TLS.") `(("python-nose" ,python-nose) ("python-mock" ,python-mock) ;; For documentation - ("python-sphinx" ,python-sphinx) + ("python-sphinx" ,python-sphinx-1.6) ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme) ("python-sphinx-repoze-autointerface" ,python-sphinx-repoze-autointerface) ("python-sphinxcontrib-programoutput" ,python-sphinxcontrib-programoutput) -- cgit v1.2.3 From 18784d8f11f62a3ebeb4050ff2d8be5e3623dbbf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 00:54:03 +0200 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From fb94354a69cacbeed1a24d30c46ba7f056186b65 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 01:00:26 +0200 Subject: 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(-) (limited to 'gnu') 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") -- cgit v1.2.3 From 68a08dfbe53301fb5c15470b52185e0578b5293e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 01:30:06 +0200 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From 2bdc73fb26fda3a212a8efd358a6f3fd2adae9c0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 01:17:50 +0200 Subject: 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(-) (limited to 'gnu') 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" -- cgit v1.2.3 From 02107081daaa4086744ee11870ce7a3529de4410 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 01:19:17 +0200 Subject: 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(-) (limited to 'gnu') 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" -- cgit v1.2.3 From de15ff1a6c319a46046093d26baa6117c6a22e73 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 8 Aug 2018 01:00:13 -0400 Subject: gnu: Add asignify. * gnu/packages/crypto.scm (asignify): New variable. --- gnu/packages/crypto.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index d9111135e8..33f4abb5ae 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -816,3 +816,41 @@ which is also used in the Advanced Encryption Standard (AES, see @url{http://www.nist.gov/aes}). This cipher is believed to provide very strong security.") (license license:gpl2))) + +(define-public asignify + (let ((commit "f58e7977a599f040797975d649ed318e25cbd2d5") + (revision "0")) + (package + (name "asignify") + (version (git-version "1.1" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vstakhov/asignify.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1zl68qq6js6fdahxzyhvhrpyrwlv8c2zhdplycnfxyr1ckkhq8dw")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list "--enable-openssl" + (string-append "--with-openssl=" + (assoc-ref %build-inputs "openssl"))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) + (inputs + `(("openssl" ,openssl-next))) + (home-page "https://github.com/vstakhov/asignify") + (synopsis "Cryptographic authentication and encryption tool and library") + (description "Asignify offers public cryptographic signatures and +encryption with a library or a command-line tool. The tool is heavily inspired +by signify as used in OpenBSD. The main goal of this project is to define a +high level API for signing files, validating signatures and encrypting using +public-key cryptography. Asignify is designed to be portable and self-contained +with zero external dependencies. Asignify can verify OpenBSD signatures, but it +cannot sign messages in OpenBSD format yet.") + (license license:bsd-2)))) -- cgit v1.2.3 From d930374014eb159ef1e01d7c54d04fadd4889e4a Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Sat, 8 Sep 2018 23:50:57 +0800 Subject: gnu: youtube-dl: Update to 2018.08.04. * gnu/packages/video.scm (youtube-dl): Update to 2018.08.04. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 3e074e6c3f..900575b828 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1270,7 +1270,7 @@ access to mpv's powerful playback capabilities.") (define-public youtube-dl (package (name "youtube-dl") - (version "2018.08.04") + (version "2018.09.08") (source (origin (method url-fetch) (uri (string-append "https://yt-dl.org/downloads/" @@ -1278,7 +1278,7 @@ access to mpv's powerful playback capabilities.") version ".tar.gz")) (sha256 (base32 - "1hcx99qbbyigc8k98c8bcc6a2wnhq6493fmrkl7rysc8krlxr0pm")))) + "0vwc4faqdddrb3nm4fzmkr60n5rc2zwyy8jwrrjad60kcp8isf05")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion -- cgit v1.2.3 From 19de8273eefceac1ba6ddc8d7e374a13f57c678b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 7 Sep 2018 22:29:40 +0200 Subject: services: tailon: Move to (gnu services web). This allows (gnu services admin) to remain deeper in the module graph and to be used by (gnu services web). * gnu/services/admin.scm () (tailon-configuration-files-string) (tailon-configuration-file-compiler, ) (tailon-shepherd-service, %tailon-accounts) (tailon-service-type): Move to... * gnu/services/web.scm: ... here. * gnu/tests/admin.scm: Remove. Move test to... * gnu/tests/web.scm (%tailon-os) (run-tailon-test, %test-tailon): ... here. --- gnu/local.mk | 1 - gnu/services/admin.scm | 174 +------------------------------------------------ gnu/services/web.scm | 172 +++++++++++++++++++++++++++++++++++++++++++++++- gnu/tests/admin.scm | 127 ------------------------------------ gnu/tests/web.scm | 99 +++++++++++++++++++++++++++- 5 files changed, 270 insertions(+), 303 deletions(-) delete mode 100644 gnu/tests/admin.scm (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 374e25165e..bc01a3cd36 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -529,7 +529,6 @@ GNU_SYSTEM_MODULES = \ %D%/build/vm.scm \ \ %D%/tests.scm \ - %D%/tests/admin.scm \ %D%/tests/audio.scm \ %D%/tests/base.scm \ %D%/tests/databases.scm \ diff --git a/gnu/services/admin.scm b/gnu/services/admin.scm index aaf0b904fd..f08c896334 100644 --- a/gnu/services/admin.scm +++ b/gnu/services/admin.scm @@ -20,19 +20,14 @@ (define-module (gnu services admin) #:use-module (gnu packages admin) #:use-module (gnu packages base) - #:use-module (gnu packages logging) #:use-module (gnu services) #:use-module (gnu services mcron) #:use-module (gnu services shepherd) - #:use-module (gnu services web) - #:use-module (gnu system shadow) #:use-module (guix gexp) - #:use-module (guix store) #:use-module (guix packages) #:use-module (guix records) #:use-module (srfi srfi-1) #:use-module (ice-9 vlist) - #:use-module (ice-9 match) #:export (%default-rotations %rotated-files @@ -46,29 +41,7 @@ rottlog-configuration rottlog-configuration? rottlog-service - rottlog-service-type - - - tailon-configuration-file - tailon-configuration-file? - tailon-configuration-file-files - tailon-configuration-file-bind - tailon-configuration-file-relative-root - tailon-configuration-file-allow-transfers? - tailon-configuration-file-follow-names? - tailon-configuration-file-tail-lines - tailon-configuration-file-allowed-commands - tailon-configuration-file-debug? - tailon-configuration-file-http-auth - tailon-configuration-file-users - - - tailon-configuration - tailon-configuration? - tailon-configuration-config-file - tailon-configuration-package - - tailon-service-type)) + rottlog-service-type)) ;;; Commentary: ;;; @@ -203,149 +176,4 @@ Old log files are removed or compressed according to the configuration.") rotations))))) (default-value (rottlog-configuration)))) - -;;; -;;; Tailon -;;; - -(define-record-type* - tailon-configuration-file make-tailon-configuration-file - tailon-configuration-file? - (files tailon-configuration-file-files - (default '("/var/log"))) - (bind tailon-configuration-file-bind - (default "localhost:8080")) - (relative-root tailon-configuration-file-relative-root - (default #f)) - (allow-transfers? tailon-configuration-file-allow-transfers? - (default #t)) - (follow-names? tailon-configuration-file-follow-names? - (default #t)) - (tail-lines tailon-configuration-file-tail-lines - (default 200)) - (allowed-commands tailon-configuration-file-allowed-commands - (default '("tail" "grep" "awk"))) - (debug? tailon-configuration-file-debug? - (default #f)) - (wrap-lines tailon-configuration-file-wrap-lines - (default #t)) - (http-auth tailon-configuration-file-http-auth - (default #f)) - (users tailon-configuration-file-users - (default #f))) - -(define (tailon-configuration-files-string files) - (string-append - "\n" - (string-join - (map - (lambda (x) - (string-append - " - " - (cond - ((string? x) - (simple-format #f "'~A'" x)) - ((list? x) - (string-join - (cons (simple-format #f "'~A':" (car x)) - (map - (lambda (x) (simple-format #f " - '~A'" x)) - (cdr x))) - "\n")) - (else (error x))))) - files) - "\n"))) - -(define-gexp-compiler (tailon-configuration-file-compiler - (file ) system target) - (match file - (($ files bind relative-root - allow-transfers? follow-names? - tail-lines allowed-commands debug? - wrap-lines http-auth users) - (text-file - "tailon-config.yaml" - (string-concatenate - (filter-map - (match-lambda - ((key . #f) #f) - ((key . value) (string-append key ": " value "\n"))) - - `(("files" . ,(tailon-configuration-files-string files)) - ("bind" . ,bind) - ("relative-root" . ,relative-root) - ("allow-transfers" . ,(if allow-transfers? "true" "false")) - ("follow-names" . ,(if follow-names? "true" "false")) - ("tail-lines" . ,(number->string tail-lines)) - ("commands" . ,(string-append "[" - (string-join allowed-commands ", ") - "]")) - ("debug" . ,(if debug? "true" #f)) - ("wrap-lines" . ,(if wrap-lines "true" "false")) - ("http-auth" . ,http-auth) - ("users" . ,(if users - (string-concatenate - (cons "\n" - (map (match-lambda - ((user . pass) - (string-append - " " user ":" pass))) - users))) - #f))))))))) - -(define-record-type* - tailon-configuration make-tailon-configuration - tailon-configuration? - (config-file tailon-configuration-config-file - (default (tailon-configuration-file))) - (package tailon-configuration-package - (default tailon))) - -(define tailon-shepherd-service - (match-lambda - (($ config-file package) - (list (shepherd-service - (provision '(tailon)) - (documentation "Run the tailon daemon.") - (start #~(make-forkexec-constructor - `(,(string-append #$package "/bin/tailon") - "-c" ,#$config-file) - #:user "tailon" - #:group "tailon")) - (stop #~(make-kill-destructor))))))) - -(define %tailon-accounts - (list (user-group (name "tailon") (system? #t)) - (user-account - (name "tailon") - (group "tailon") - (system? #t) - (comment "tailon") - (home-directory "/var/empty") - (shell (file-append shadow "/sbin/nologin"))))) - -(define tailon-service-type - (service-type - (name 'tailon) - (description - "Run Tailon, a Web application for monitoring, viewing, and searching log -files.") - (extensions - (list (service-extension shepherd-root-service-type - tailon-shepherd-service) - (service-extension account-service-type - (const %tailon-accounts)))) - (compose concatenate) - (extend (lambda (parameter files) - (tailon-configuration - (inherit parameter) - (config-file - (let ((old-config-file - (tailon-configuration-config-file parameter))) - (tailon-configuration-file - (inherit old-config-file) - (files (append (tailon-configuration-file-files old-config-file) - files)))))))) - (default-value (tailon-configuration)))) - ;;; admin.scm ends here diff --git a/gnu/services/web.scm b/gnu/services/web.scm index df82a6de61..16e77f8243 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2017 nee ;;; Copyright © 2017, 2018 Clément Lassieur ;;; Copyright © 2018 Pierre-Antoine Rouby +;;; Copyright © 2017 Christopher Baines ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,9 +33,11 @@ #:use-module (gnu packages web) #:use-module (gnu packages php) #:use-module (gnu packages guile) + #:use-module (gnu packages logging) #:use-module (guix records) #:use-module (guix modules) #:use-module (guix gexp) + #:use-module ((guix store) #:select (text-file)) #:use-module ((guix utils) #:select (version-major)) #:use-module ((guix packages) #:select (package-version)) #:use-module (srfi srfi-1) @@ -164,7 +167,29 @@ hpcguix-web-configuration hpcguix-web-configuration? - hpcguix-web-service-type)) + hpcguix-web-service-type + + + tailon-configuration-file + tailon-configuration-file? + tailon-configuration-file-files + tailon-configuration-file-bind + tailon-configuration-file-relative-root + tailon-configuration-file-allow-transfers? + tailon-configuration-file-follow-names? + tailon-configuration-file-tail-lines + tailon-configuration-file-allowed-commands + tailon-configuration-file-debug? + tailon-configuration-file-http-auth + tailon-configuration-file-users + + + tailon-configuration + tailon-configuration? + tailon-configuration-config-file + tailon-configuration-package + + tailon-service-type)) ;;; Commentary: ;;; @@ -980,3 +1005,148 @@ a webserver.") (const %hpcguix-web-activation)) (service-extension shepherd-root-service-type (compose list hpcguix-web-shepherd-service)))))) + + +;;; +;;; Tailon +;;; + +(define-record-type* + tailon-configuration-file make-tailon-configuration-file + tailon-configuration-file? + (files tailon-configuration-file-files + (default '("/var/log"))) + (bind tailon-configuration-file-bind + (default "localhost:8080")) + (relative-root tailon-configuration-file-relative-root + (default #f)) + (allow-transfers? tailon-configuration-file-allow-transfers? + (default #t)) + (follow-names? tailon-configuration-file-follow-names? + (default #t)) + (tail-lines tailon-configuration-file-tail-lines + (default 200)) + (allowed-commands tailon-configuration-file-allowed-commands + (default '("tail" "grep" "awk"))) + (debug? tailon-configuration-file-debug? + (default #f)) + (wrap-lines tailon-configuration-file-wrap-lines + (default #t)) + (http-auth tailon-configuration-file-http-auth + (default #f)) + (users tailon-configuration-file-users + (default #f))) + +(define (tailon-configuration-files-string files) + (string-append + "\n" + (string-join + (map + (lambda (x) + (string-append + " - " + (cond + ((string? x) + (simple-format #f "'~A'" x)) + ((list? x) + (string-join + (cons (simple-format #f "'~A':" (car x)) + (map + (lambda (x) (simple-format #f " - '~A'" x)) + (cdr x))) + "\n")) + (else (error x))))) + files) + "\n"))) + +(define-gexp-compiler (tailon-configuration-file-compiler + (file ) system target) + (match file + (($ files bind relative-root + allow-transfers? follow-names? + tail-lines allowed-commands debug? + wrap-lines http-auth users) + (text-file + "tailon-config.yaml" + (string-concatenate + (filter-map + (match-lambda + ((key . #f) #f) + ((key . value) (string-append key ": " value "\n"))) + + `(("files" . ,(tailon-configuration-files-string files)) + ("bind" . ,bind) + ("relative-root" . ,relative-root) + ("allow-transfers" . ,(if allow-transfers? "true" "false")) + ("follow-names" . ,(if follow-names? "true" "false")) + ("tail-lines" . ,(number->string tail-lines)) + ("commands" . ,(string-append "[" + (string-join allowed-commands ", ") + "]")) + ("debug" . ,(if debug? "true" #f)) + ("wrap-lines" . ,(if wrap-lines "true" "false")) + ("http-auth" . ,http-auth) + ("users" . ,(if users + (string-concatenate + (cons "\n" + (map (match-lambda + ((user . pass) + (string-append + " " user ":" pass))) + users))) + #f))))))))) + +(define-record-type* + tailon-configuration make-tailon-configuration + tailon-configuration? + (config-file tailon-configuration-config-file + (default (tailon-configuration-file))) + (package tailon-configuration-package + (default tailon))) + +(define tailon-shepherd-service + (match-lambda + (($ config-file package) + (list (shepherd-service + (provision '(tailon)) + (documentation "Run the tailon daemon.") + (start #~(make-forkexec-constructor + `(,(string-append #$package "/bin/tailon") + "-c" ,#$config-file) + #:user "tailon" + #:group "tailon")) + (stop #~(make-kill-destructor))))))) + +(define %tailon-accounts + (list (user-group (name "tailon") (system? #t)) + (user-account + (name "tailon") + (group "tailon") + (system? #t) + (comment "tailon") + (home-directory "/var/empty") + (shell (file-append shadow "/sbin/nologin"))))) + +(define tailon-service-type + (service-type + (name 'tailon) + (description + "Run Tailon, a Web application for monitoring, viewing, and searching log +files.") + (extensions + (list (service-extension shepherd-root-service-type + tailon-shepherd-service) + (service-extension account-service-type + (const %tailon-accounts)))) + (compose concatenate) + (extend (lambda (parameter files) + (tailon-configuration + (inherit parameter) + (config-file + (let ((old-config-file + (tailon-configuration-config-file parameter))) + (tailon-configuration-file + (inherit old-config-file) + (files (append (tailon-configuration-file-files old-config-file) + files)))))))) + (default-value (tailon-configuration)))) diff --git a/gnu/tests/admin.scm b/gnu/tests/admin.scm deleted file mode 100644 index a5abbe9ad4..0000000000 --- a/gnu/tests/admin.scm +++ /dev/null @@ -1,127 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017 Christopher Baines -;;; Copyright © 2018 Clément Lassieur -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (gnu tests admin) - #:use-module (gnu tests) - #:use-module (gnu system) - #:use-module (gnu system file-systems) - #:use-module (gnu system shadow) - #:use-module (gnu system vm) - #:use-module (gnu services) - #:use-module (gnu services admin) - #:use-module (gnu services networking) - #:use-module (guix gexp) - #:use-module (guix store) - #:use-module (guix monads) - #:export (%test-tailon)) - -(define %tailon-os - ;; Operating system under test. - (simple-operating-system - (dhcp-client-service) - (service tailon-service-type - (tailon-configuration - (config-file - (tailon-configuration-file - (bind "0.0.0.0:8080"))))))) - -(define* (run-tailon-test #:optional (http-port 8081)) - "Run tests in %TAILON-OS, which has tailon running and listening on -HTTP-PORT." - (define os - (marionette-operating-system - %tailon-os - #:imported-modules '((gnu services herd) - (guix combinators)))) - - (define vm - (virtual-machine - (operating-system os) - (port-forwardings `((,http-port . 8080))))) - - (define test - (with-imported-modules '((gnu build marionette)) - #~(begin - (use-modules (srfi srfi-11) (srfi srfi-64) - (ice-9 match) - (gnu build marionette) - (web uri) - (web client) - (web response)) - - (define marionette - ;; Forward the guest's HTTP-PORT, where tailon is listening, to - ;; port 8080 in the host. - (make-marionette (list #$vm))) - - (mkdir #$output) - (chdir #$output) - - (test-begin "tailon") - - (test-assert "service running" - (marionette-eval - '(begin - (use-modules (gnu services herd)) - (start-service 'tailon)) - marionette)) - - (define* (retry-on-error f #:key times delay) - (let loop ((attempt 1)) - (match (catch - #t - (lambda () - (cons #t - (f))) - (lambda args - (cons #f - args))) - ((#t . return-value) - return-value) - ((#f . error-args) - (if (>= attempt times) - error-args - (begin - (sleep delay) - (loop (+ 1 attempt)))))))) - - (test-equal "http-get" - 200 - (retry-on-error - (lambda () - (let-values (((response text) - (http-get #$(format - #f - "http://localhost:~A/" - http-port) - #:decode-body? #t))) - (response-code response))) - #:times 10 - #:delay 5)) - - (test-end) - (exit (= (test-runner-fail-count (test-runner-current)) 0))))) - - (gexp->derivation "tailon-test" test)) - -(define %test-tailon - (system-test - (name "tailon") - (description "Connect to a running Tailon server.") - (value (run-tailon-test)))) diff --git a/gnu/tests/web.scm b/gnu/tests/web.scm index 73d502dd0e..45fcb668fb 100644 --- a/gnu/tests/web.scm +++ b/gnu/tests/web.scm @@ -33,7 +33,8 @@ #:export (%test-httpd %test-nginx %test-php-fpm - %test-hpcguix-web)) + %test-hpcguix-web + %test-tailon)) (define %index.html-contents ;; Contents of the /index.html file. @@ -359,3 +360,99 @@ HTTP-PORT, along with php-fpm." (name "hpcguix-web") (description "Connect to a running hpcguix-web server.") (value (run-hpcguix-web-server-test name %hpcguix-web-os)))) + + +(define %tailon-os + ;; Operating system under test. + (simple-operating-system + (dhcp-client-service) + (service tailon-service-type + (tailon-configuration + (config-file + (tailon-configuration-file + (bind "0.0.0.0:8080"))))))) + +(define* (run-tailon-test #:optional (http-port 8081)) + "Run tests in %TAILON-OS, which has tailon running and listening on +HTTP-PORT." + (define os + (marionette-operating-system + %tailon-os + #:imported-modules '((gnu services herd) + (guix combinators)))) + + (define vm + (virtual-machine + (operating-system os) + (port-forwardings `((,http-port . 8080))))) + + (define test + (with-imported-modules '((gnu build marionette)) + #~(begin + (use-modules (srfi srfi-11) (srfi srfi-64) + (ice-9 match) + (gnu build marionette) + (web uri) + (web client) + (web response)) + + (define marionette + ;; Forward the guest's HTTP-PORT, where tailon is listening, to + ;; port 8080 in the host. + (make-marionette (list #$vm))) + + (mkdir #$output) + (chdir #$output) + + (test-begin "tailon") + + (test-assert "service running" + (marionette-eval + '(begin + (use-modules (gnu services herd)) + (start-service 'tailon)) + marionette)) + + (define* (retry-on-error f #:key times delay) + (let loop ((attempt 1)) + (match (catch + #t + (lambda () + (cons #t + (f))) + (lambda args + (cons #f + args))) + ((#t . return-value) + return-value) + ((#f . error-args) + (if (>= attempt times) + error-args + (begin + (sleep delay) + (loop (+ 1 attempt)))))))) + + (test-equal "http-get" + 200 + (retry-on-error + (lambda () + (let-values (((response text) + (http-get #$(format + #f + "http://localhost:~A/" + http-port) + #:decode-body? #t))) + (response-code response))) + #:times 10 + #:delay 5)) + + (test-end) + (exit (= (test-runner-fail-count (test-runner-current)) 0))))) + + (gexp->derivation "tailon-test" test)) + +(define %test-tailon + (system-test + (name "tailon") + (description "Connect to a running Tailon server.") + (value (run-tailon-test)))) -- cgit v1.2.3 From 81317071fb9ad704ee75d40b5e8830650d37b34b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 7 Sep 2018 22:47:34 +0200 Subject: services: hpcguix-web: Produce a log file and rotate it. * gnu/services/web.scm (%hpcguix-web-log-file) (%hpcguix-web-log-rotations): New variables. (hpcguix-web-shepherd-service): Pass #:log-file. (hpcguix-web-service-type): Extend ROTTLOG-SERVICE-TYPE. --- gnu/services/web.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 16e77f8243..1c38e7d8d3 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 David Thompson -;;; Copyright © 2015, 2016, 2017 Ludovic Courtès +;;; Copyright © 2015, 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2016 Nils Gillmann ;;; Copyright © 2016, 2017, 2018 Julien Lepiller ;;; Copyright © 2017 Christopher Baines @@ -27,6 +27,7 @@ (define-module (gnu services web) #:use-module (gnu services) #:use-module (gnu services shepherd) + #:use-module (gnu services admin) #:use-module (gnu system pam) #:use-module (gnu system shadow) #:use-module (gnu packages admin) @@ -974,6 +975,14 @@ a webserver.") (chown home-dir (passwd:uid user) (passwd:gid user)) (chmod home-dir #o755)))) +(define %hpcguix-web-log-file + "/var/log/hpcguix-web.log") + +(define %hpcguix-web-log-rotations + (list (log-rotation + (files (list %hpcguix-web-log-file)) + (frequency 'weekly)))) + (define (hpcguix-web-shepherd-service config) (let ((specs (hpcguix-web-configuration-specs config)) (hpcguix-web (hpcguix-web-package config))) @@ -991,7 +1000,8 @@ a webserver.") #:group "hpcguix-web" #:environment-variables (list "XDG_CACHE_HOME=/var/cache" - "SSL_CERT_DIR=/etc/ssl/certs"))) + "SSL_CERT_DIR=/etc/ssl/certs") + #:log-file #$%hpcguix-web-log-file)) (stop #~(make-kill-destructor)))))) (define hpcguix-web-service-type @@ -1003,6 +1013,8 @@ a webserver.") (const %hpcguix-web-accounts)) (service-extension activation-service-type (const %hpcguix-web-activation)) + (service-extension rottlog-service-type + (const %hpcguix-web-log-rotations)) (service-extension shepherd-root-service-type (compose list hpcguix-web-shepherd-service)))))) -- cgit v1.2.3 From 94b3b6041d8b141b99e79f4cf95c5a31a3739d17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 10 Sep 2018 12:18:14 +0200 Subject: gnu: hpcguix-web: Update to 53e09ea. * gnu/packages/web.scm (hpcguix-web): Update to 53e09ea. --- gnu/packages/web.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 9567254424..6ff53a69e4 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6708,8 +6708,8 @@ compressed JSON header blocks. (license l:expat))) (define-public hpcguix-web - (let ((commit "9ff40fcc77f248901d861756dbbddc80270c380c") - (revision "2")) + (let ((commit "53e09ea59ec0380b41a4cbda32df8bdb9a10004d") + (revision "3")) (package (name "hpcguix-web") (version (git-version "0.0.1" revision commit)) @@ -6721,7 +6721,7 @@ compressed JSON header blocks. (file-name (git-file-name name version)) (sha256 (base32 - "0lxcj9s3wxrv1l7lrxxx374jwzx7h60gxwkbgr46lzcbgvb3k26s")))) + "1ah4pn9697vazhbvd45n4b1rrkx2nbhnw384cr0b941q3sz1dfyc")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) -- cgit v1.2.3 From e5eef324459291a7d48661e5d80954d6160f2a55 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 14:13:36 +0200 Subject: 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(-) (limited to 'gnu') 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") -- cgit v1.2.3 From d4c04e509bb58e34ae14f76f05c54f1d7c1334d5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 14:24:34 +0200 Subject: 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(-) (limited to 'gnu') 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") -- cgit v1.2.3 From d06940882dad48607a99b1cb42f41a8609fac924 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 14:25:25 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 073705e7253d59cfc2b3c629566027edd25308f1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 14:28:42 +0200 Subject: 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(-) (limited to 'gnu') 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/") -- cgit v1.2.3 From 4d19a14e777a2f53700453844504fedb7fb51946 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 14:29:40 +0200 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From 57d70dbabc5a274a63c0a2892bbd739520774f7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C4=83d=C4=83lin=20Ionel=20Patra=C8=99cu?= Date: Sat, 8 Sep 2018 22:54:58 +0200 Subject: gnu: Add yad. * gnu/packages/gtk.scm (yad): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/gtk.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 4daaad0ebc..0b85a1723f 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1658,3 +1658,46 @@ Parcellite and adds bugfixes and features.") it does not deal with windowing system surfaces, drawing, scene graphs, or input.") (license license:expat))) + +(define-public yad + (package + (name "yad") + (version "0.40.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/v1cont/yad.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1vpgbjbkkbk5plicyklzpf65j1vlig4n4bi3qpvrz5bb09ic5alw")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + '("--with-gtk=gtk3" + "--enable-html" + "--enable-gio" + "--enable-spell" + "--enable-icon-browser") + #:phases + (modify-phases %standard-phases + (replace 'bootstrap + (lambda _ + (invoke "autoreconf" "-vif") + (invoke "intltoolize" "--force" "--automake") + #t))))) + (inputs + `(("gtk+" ,gtk+))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("intltool" ,intltool) + ("pkg-config" ,pkg-config))) + (home-page "https://sourceforge.net/projects/yad-dialog/") + (synopsis "GTK+ dialog boxes for shell scripts") + (description + "This program allows you to display GTK+ dialog boxes from command line or +shell scripts. Example of how to use @code{yad} can be consulted at +@url{https://sourceforge.net/p/yad-dialog/wiki/browse_pages/}.") + (license license:gpl3+))) -- cgit v1.2.3 From f2d4944086e16e2e60d47b64189d2f04c1a3fb75 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 14:49:46 +0200 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From f6c8a97a048131db67ffd275cbdebb5046247b91 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 9 Sep 2018 21:45:48 +0200 Subject: gnu: spectrwm: Update to 3.2.0. * gnu/packages/wm.scm (spectrwm): Update to 3.2.0. [arguments]: Remove 'fix-freetype-include' phase. --- gnu/packages/wm.scm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 1a78b2ac94..08f82ba2d2 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -848,7 +848,7 @@ Keybinder works with GTK-based applications using the X Window System.") (define-public spectrwm (package (name "spectrwm") - (version "3.1.0") + (version "3.2.0") (source (origin (method url-fetch) @@ -859,7 +859,7 @@ Keybinder works with GTK-based applications using the X Window System.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "16lxcharxslf9rc39wxa3mr2nx5d8kzm9ls7p7dal8yrwr7y59dp")))) + "0z7gjmp1x6y8q3dnw6swvbv8x2wd4ykzjvi3ibk2sxhgc910907v")))) (build-system gnu-build-system) (arguments `(#:make-flags (let ((pkg-config (lambda (flag) @@ -871,7 +871,7 @@ Keybinder works with GTK-based applications using the X Window System.") (string-append "PREFIX=" %output) (string-append "INCS=-I. " (pkg-config "--cflags")) (string-append "LIBS=" (pkg-config "--libs") " -lm"))) - #:tests? #f ;No test suite + #:tests? #f ;no test suite #:phases (modify-phases %standard-phases (add-before 'build 'change-dir @@ -881,13 +881,7 @@ Keybinder works with GTK-based applications using the X Window System.") (lambda _ (substitute* "Makefile" (("-g") "")))) - (add-after 'change-dir 'fix-freetype-include - (lambda _ - (substitute* "Makefile" - (("/usr/include/freetype2") - (string-append (assoc-ref %build-inputs "freetype") - "/include/freetype2"))))) - (delete 'configure)))) ;no 'configure' exists + (delete 'configure)))) ;no 'configure' exists (inputs `(("freetype" ,freetype) ("fontconfig" ,fontconfig) -- cgit v1.2.3 From 419aa05e1b38d53e21c851baf89327d53fca07f3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 9 Sep 2018 21:57:05 +0200 Subject: gnu: tinyproxy: Update to 1.10.0. * gnu/packages/web.scm (tinyproxy): Update to 1.10.0. [native-inputs]: Remove asciidoc. --- gnu/packages/web.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 6ff53a69e4..b6bee57f9f 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -889,7 +889,7 @@ used to validate and fix HTML data.") (define-public tinyproxy (package (name "tinyproxy") - (version "1.8.4") + (version "1.10.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/tinyproxy/tinyproxy/" @@ -897,7 +897,7 @@ used to validate and fix HTML data.") version ".tar.xz")) (sha256 (base32 - "002hi97687czhfkwsjkr174yvlp10224qi6gd5s53z230bgls7x4")))) + "10jnk6y2swld25mm47mjc0nkffyzsfysnsxwr7cs0ns1kil8ggjr")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -912,9 +912,6 @@ used to validate and fix HTML data.") ;; (substitute* "docs/man5/Makefile" (("a2x") "a2x -v")) ;; (setenv "XML_DEBUG_CATALOG" "1") #t))))) - ;; All of the below are used to generate the documentation - ;; (Should they be propagated inputs of asciidoc ??) - (native-inputs `(("asciidoc" ,asciidoc))) (home-page "https://tinyproxy.github.io/") (synopsis "Light-weight HTTP/HTTPS proxy daemon") (description "Tinyproxy is a light-weight HTTP/HTTPS proxy -- cgit v1.2.3 From 82d5c7c6de164df56d582ed779f02c6bbfd90b33 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 10 Sep 2018 06:03:53 +0200 Subject: gnu: python-typing: Update to 3.6.6. * gnu/packages/python.scm (python-typing): Update to 3.6.6. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 8c7c9d3c33..ea1093cf5e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -13234,14 +13234,14 @@ source bytes using the UTF-8 encoding and then rewrites Python 3.6 style (define-public python-typing (package (name "python-typing") - (version "3.6.4") + (version "3.6.6") (source (origin (method url-fetch) (uri (pypi-uri "typing" version)) (sha256 (base32 - "1wmk9nkh30n37cbrqwkbggmj2390lhrlagjkd0ikm02l88saj06l")))) + "0ba9acs4awx15bf9v3nrs781msbd2nx826906nj6fqks2bvca9s0")))) (build-system python-build-system) (home-page "https://docs.python.org/3/library/typing.html") (synopsis "Type hints for Python") -- cgit v1.2.3 From fc6256725174ec726caa05a33116b64974037509 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 15:54:50 +0200 Subject: gnu: Add python-dill. * gnu/packages/python.scm (python-dill): New variable. --- gnu/packages/python.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ea1093cf5e..6f9a557c36 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -14018,3 +14018,30 @@ scalable way of keeping track of data together with learned annotations and reduces the code overhead typically encountered when using a mostly object-oriented library such as @code{scikit-learn}.") (license license:bsd-3))) + +(define-public python-dill + (package + (name "python-dill") + (version "0.2.8.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "dill" version)) + (sha256 + (base32 + "1cymzn9fxwdy33h21zkk4gqgzvd25110hh3zdqnvnwa3p52c4kb2")))) + (build-system python-build-system) + ;; FIXME: The check phase fails with "don't know how to make test". + (arguments '(#:tests? #f)) + (home-page "https://pypi.org/project/dill") + (synopsis "Serialize all of Python") + (description "Dill extends Python's @code{pickle} module for serializing +and de-serializing Python objects to the majority of the built-in Python +types. Dill provides the user the same interface as the @code{pickle} module, +and also includes some additional features. In addition to pickling Python +objects, @code{dill} provides the ability to save the state of an interpreter +session in a single command. Hence, it would be feasable to save a +interpreter session, close the interpreter, ship the pickled file to another +computer, open a new interpreter, unpickle the session and thus continue from +the saved state of the original interpreter session.") + (license license:bsd-3))) -- cgit v1.2.3 From 943a4cb60158c28da1348e3b490e958551557d6a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 15:54:51 +0200 Subject: gnu: Add python-multiprocess. * gnu/packages/python.scm (python-multiprocess): New variable. --- gnu/packages/python.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 6f9a557c36..59b62fec14 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -14045,3 +14045,25 @@ interpreter session, close the interpreter, ship the pickled file to another computer, open a new interpreter, unpickle the session and thus continue from the saved state of the original interpreter session.") (license license:bsd-3))) + +(define-public python-multiprocess + (package + (name "python-multiprocess") + (version "0.70.6.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "multiprocess" version)) + (sha256 + (base32 + "1ip5caz67b3q0553mr8gm8xwsb8x500jn8ml0gihgyfy52m2ypcq")))) + (build-system python-build-system) + (propagated-inputs + `(("python-dill" ,python-dill))) + (home-page "https://pypi.org/project/multiprocess") + (synopsis "Multiprocessing and multithreading in Python") + (description + "This package is a fork of the multiprocessing Python package, a package +which supports the spawning of processes using the API of the standard +library's @code{threading} module.") + (license license:bsd-3))) -- cgit v1.2.3 From 7cd51cd28e401fc610ad49e3d0d3c8da1598d111 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 15:54:52 +0200 Subject: gnu: Add python-toolz. * gnu/packages/python.scm (python-toolz): New variable. --- gnu/packages/python.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 59b62fec14..eff28a9102 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -14067,3 +14067,25 @@ the saved state of the original interpreter session.") which supports the spawning of processes using the API of the standard library's @code{threading} module.") (license license:bsd-3))) + +(define-public python-toolz + (package + (name "python-toolz") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "toolz" version)) + (sha256 + (base32 + "1j9i7fdjnx9dz35fdj5gvgxx6585ja9sxgaiv65if77nlxz0m7wj")))) + (build-system python-build-system) + ;; FIXME: tests cannot be computed: "Can't perform this operation for + ;; unregistered loader type" + (arguments '(#:tests? #f)) + (home-page "https://github.com/pytoolz/toolz/") + (synopsis "List processing tools and functional utilities") + (description + "This package provides a set of utility functions for iterators, +functions, and dictionaries.") + (license license:bsd-3))) -- cgit v1.2.3 From 098cb1e9c4548ccd78405141b32b6ec6d556c4b6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 15:54:53 +0200 Subject: gnu: Add python-cytoolz. * gnu/packages/python.scm (python-cytoolz): New variable. --- gnu/packages/python.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index eff28a9102..b6665ce3b5 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -14089,3 +14089,30 @@ library's @code{threading} module.") "This package provides a set of utility functions for iterators, functions, and dictionaries.") (license license:bsd-3))) + +(define-public python-cytoolz + (package + (name "python-cytoolz") + (version "0.9.0.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "cytoolz" version)) + (sha256 + (base32 + "1r80p88hm3f3r4zpixzr047y5hw4bzy41m4xywnhycda83x0dk44")))) + (build-system python-build-system) + ;; FIXME: tests fail with "module 'cytoolz.curried' has no attribute + ;; 'exceptions'" + (arguments '(#:tests? #f)) + (propagated-inputs + `(("python-toolz" ,python-toolz))) + (native-inputs + `(("python-cython" ,python-cython))) + (home-page "https://github.com/pytoolz/cytoolz") + (synopsis "High performance functional utilities") + (description + "The cytoolz package implements the same API as provided by toolz. The +main differences are that @code{cytoolz} is faster and cytoolz offers a C API +that is accessible to other projects developed in Cython.") + (license license:bsd-3))) -- cgit v1.2.3 From 3d352cb9cf2d6ddd63e345a1eb2df7e3624d66a2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 15:54:54 +0200 Subject: gnu: Add python-sortedcontainers. * gnu/packages/python.scm (python-sortedcontainers): New variable. --- gnu/packages/python.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b6665ce3b5..b87c4787db 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -14116,3 +14116,24 @@ functions, and dictionaries.") main differences are that @code{cytoolz} is faster and cytoolz offers a C API that is accessible to other projects developed in Cython.") (license license:bsd-3))) + +(define-public python-sortedcontainers + (package + (name "python-sortedcontainers") + (version "2.0.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "sortedcontainers" version)) + (sha256 + (base32 + "10hrk2k0hbf9x78vd3f0lj277m1yzfhzzxr0hja718liwb398wk0")))) + (build-system python-build-system) + (native-inputs + `(("python-tox" ,python-tox))) + (home-page "http://www.grantjenks.com/docs/sortedcontainers/") + (synopsis "Sorted List, Sorted Dict, Sorted Set") + (description + "This package provides a sorted collections library, written in +pure-Python.") + (license license:asl2.0))) -- cgit v1.2.3 From 930ba31d20f204ca0cee9ea6fedf1aab24195d49 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 15:59:56 +0200 Subject: gnu: Add python-cloudpickle. * gnu/packages/python.scm (python-cloudpickle): New variable. --- gnu/packages/python.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b87c4787db..c029fd1410 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -14137,3 +14137,37 @@ that is accessible to other projects developed in Cython.") "This package provides a sorted collections library, written in pure-Python.") (license license:asl2.0))) + +(define-public python-cloudpickle + (package + (name "python-cloudpickle") + (version "0.5.5") + (source + (origin + (method url-fetch) + (uri (pypi-uri "cloudpickle" version)) + (sha256 + (base32 + "0gdg5n025v4wqmdg65rm0n6fvp6731ip30ji0rmn2kqsyr4bb93f")))) + (build-system python-build-system) + ;; FIXME: there are 5 errors in 122 tests: + ;; ERROR: test_function_pickle_compat_0_4_0 (tests.cloudpickle_test.CloudPickleTest) + ;; ERROR: test_function_pickle_compat_0_4_1 (tests.cloudpickle_test.CloudPickleTest) + ;; ERROR: test_function_pickle_compat_0_4_0 (tests.cloudpickle_test.Protocol2CloudPickleTest) + ;; ERROR: test_function_pickle_compat_0_4_1 (tests.cloudpickle_test.Protocol2CloudPickleTest) + ;; ERROR: test_temp_file (tests.cloudpickle_file_test.CloudPickleFileTests) + ;; TypeError: cannot serialize '_io.BufferedRandom' object + (arguments '(#:tests? #f)) + (native-inputs + `(("python-pytest" ,python-pytest) + ("python-mock" ,python-mock) + ("python-tornado" ,python-tornado))) + (home-page "https://github.com/cloudpipe/cloudpickle") + (synopsis "Extended pickling support for Python objects") + (description + "Cloudpickle makes it possible to serialize Python constructs not +supported by the default pickle module from the Python standard library. It +is especially useful for cluster computing where Python expressions are +shipped over the network to execute on remote hosts, possibly close to the +data.") + (license license:bsd-3))) -- cgit v1.2.3 From b2b8226244ce176de63ca9f412efca1e3d80984c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 15:59:57 +0200 Subject: gnu: Add python-locket. * gnu/packages/python.scm (python-locket): New variable. --- gnu/packages/python.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c029fd1410..0a77355fba 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -14171,3 +14171,22 @@ is especially useful for cluster computing where Python expressions are shipped over the network to execute on remote hosts, possibly close to the data.") (license license:bsd-3))) + +(define-public python-locket + (package + (name "python-locket") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "locket" version)) + (sha256 + (base32 + "1d4z2zngrpqkrfhnd4yhysh66kjn4mblys2l06sh5dix2p0n7vhz")))) + (build-system python-build-system) + (home-page "https://github.com/mwilliamson/locket.py") + (synopsis "File-based locks for Python") + (description + "Locket implements a lock that can be used by multiple processes provided +they use the same path.") + (license license:bsd-2))) -- cgit v1.2.3 From c27a9d8a880a07a3c108dac85d84d38bf287b2be Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 15:59:58 +0200 Subject: gnu: Add python-blosc. * gnu/packages/python.scm (python-blosc): New variable. --- gnu/packages/python.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 0a77355fba..97b4ca86cd 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -14190,3 +14190,34 @@ data.") "Locket implements a lock that can be used by multiple processes provided they use the same path.") (license license:bsd-2))) + +(define-public python-blosc + (package + (name "python-blosc") + (version "1.5.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "blosc" version)) + (sha256 + (base32 + "1cm91c6r431yla2mbs4895bgiianjf30dfz14vvv99dslygd65jw")))) + (build-system python-build-system) + ;; FIXME: all tests pass, but then this error is printed: + ;; TypeError: calling returned None, not a test + (arguments '(#:tests? #f)) + (propagated-inputs + `(("python-numpy" ,python-numpy))) + (home-page "https://github.com/blosc/python-blosc") + (synopsis "Python wrapper for the Blosc data compressor library") + (description "Blosc is a high performance compressor optimized for binary +data. It has been designed to transmit data to the processor cache faster +than the traditional, non-compressed, direct memory fetch approach via a +@code{memcpy()} system call. + +Blosc works well for compressing numerical arrays that contains data with +relatively low entropy, like sparse data, time series, grids with +regular-spaced values, etc. + +This Python package wraps the Blosc library.") + (license license:bsd-3))) -- cgit v1.2.3 From 035989c403252f22015e363124bdc82a1116907f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 15:59:59 +0200 Subject: gnu: Add python-partd. * gnu/packages/python.scm (python-partd): New variable. --- gnu/packages/python.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 97b4ca86cd..b771452629 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -14221,3 +14221,28 @@ regular-spaced values, etc. This Python package wraps the Blosc library.") (license license:bsd-3))) + +(define-public python-partd + (package + (name "python-partd") + (version "0.3.8") + (source + (origin + (method url-fetch) + (uri (pypi-uri "partd" version)) + (sha256 + (base32 + "03s0i5qfgkx6y24bmfgyd5hnsjznkbbfafwb2khf7k9790f1yab7")))) + (build-system python-build-system) + (propagated-inputs + `(("python-blosc" ,python-blosc) + ("python-locket" ,python-locket) + ("python-numpy" ,python-numpy) + ("python-pandas" ,python-pandas) + ("python-pyzmq" ,python-pyzmq) + ("python-toolz" ,python-toolz))) + (home-page "https://github.com/dask/partd/") + (synopsis "Appendable key-value storage") + (description "Partd stores key-value pairs. Values are raw bytes. We +append on old values. Partd excels at shuffling operations.") + (license license:bsd-3))) -- cgit v1.2.3 From a6a7156aa970b08821a00599d7941740d8a22b70 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 16:00:00 +0200 Subject: gnu: Add python-dask. * gnu/packages/python.scm (python-dask): New variable. --- gnu/packages/python.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b771452629..1d4b069d09 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -14246,3 +14246,48 @@ This Python package wraps the Blosc library.") (description "Partd stores key-value pairs. Values are raw bytes. We append on old values. Partd excels at shuffling operations.") (license license:bsd-3))) + +(define-public python-dask + (package + (name "python-dask") + (version "0.19.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "dask" version)) + (sha256 + (base32 + "1pm1163qb6s22p8fnvj0zlfazihvs7hxjn8l2n52bzs7shw6kdz3")))) + (build-system python-build-system) + ;; A single test out of 5000+ fails. This test is marked as xfail when + ;; pytest-xdist is used. + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-broken-test + (lambda _ + (substitute* "dask/tests/test_threaded.py" + (("def test_interrupt\\(\\)" m) + (string-append "@pytest.mark.skip(reason=\"Disabled by Guix\")\n" + m))) + #t))))) + (propagated-inputs + `(("python-cloudpickle" ,python-cloudpickle) + ("python-numpy" ,python-numpy) + ("python-pandas" ,python-pandas) + ("python-partd" ,python-partd) + ("python-toolz" ,python-toolz) + ("python-pyyaml" ,python-pyyaml))) + (native-inputs + `(("python-pytest" ,python-pytest) + ("python-pytest-runner" ,python-pytest-runner))) + (home-page "https://github.com/dask/dask/") + (synopsis "Parallel computing with task scheduling") + (description + "Dask is a flexible parallel computing library for analytics. It +consists of two components: dynamic task scheduling optimized for computation, +and large data collections like parallel arrays, dataframes, and lists that +extend common interfaces like NumPy, Pandas, or Python iterators to +larger-than-memory or distributed environments. These parallel collections +run on top of the dynamic task schedulers. ") + (license license:bsd-3))) -- cgit v1.2.3 From a9d496b353e71f22e5ace5bff9319fc74dfb6643 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 16:00:01 +0200 Subject: gnu: Add python-intervaltree. * gnu/packages/bioinformatics.scm (python-intervaltree): New variable. --- gnu/packages/bioinformatics.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 6580cac531..dd8ed725d8 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13504,3 +13504,31 @@ reference transcripts provided in a annotation file (also in GTF/GFF3 format). (list license:expat ;license for gffcompare license:artistic2.0))))) ;license for gclib + +(define-public python-intervaltree + (package + (name "python-intervaltree") + (version "2.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "intervaltree" version)) + (sha256 + (base32 + "02w191m9zxkcjqr1kv2slxvhymwhj3jnsyy3a28b837pi15q19dc")))) + (build-system python-build-system) + ;; FIXME: error when collecting tests + (arguments '(#:tests? #f)) + (propagated-inputs + `(("python-sortedcontainers" ,python-sortedcontainers))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://github.com/chaimleib/intervaltree") + (synopsis "Editable interval tree data structure") + (description + "This package provides a mutable, self-balancing interval tree +implementation for Python. Queries may be by point, by range overlap, or by +range envelopment. This library was designed to allow tagging text and time +intervals, where the intervals include the lower bound but not the upper +bound.") + (license license:asl2.0))) -- cgit v1.2.3 From 1f41f01c1499fb0aa5933b9b60d2a18c2bef9d5c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 16:00:02 +0200 Subject: gnu: Add python-pypairix. * gnu/packages/bioinformatics.scm (python-pypairix): New variable. --- gnu/packages/bioinformatics.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index dd8ed725d8..9b047c21b8 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13532,3 +13532,27 @@ range envelopment. This library was designed to allow tagging text and time intervals, where the intervals include the lower bound but not the upper bound.") (license license:asl2.0))) + +(define-public python-pypairix + (package + (name "python-pypairix") + (version "0.3.6") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pypairix" version)) + (sha256 + (base32 + "0zs92b74s5v4xy2h16s15f3z6l4nnbw8x8zyif7xx5xpafjn0xss")))) + (build-system python-build-system) + ;; FIXME: the tests fail because test.support cannot be loaded: + ;; ImportError: cannot import name 'support' + (arguments '(#:tests? #f)) + (inputs + `(("zlib" ,zlib))) + (home-page "https://github.com/4dn-dcic/pairix") + (synopsis "Support for querying pairix-indexed bgzipped text files") + (description + "Pypairix is a Python module for fast querying on a pairix-indexed +bgzipped text file that contains a pair of genomic coordinates per line.") + (license license:expat))) -- cgit v1.2.3 From 80f4db91b17ff5d82260c9194ec09a408f854455 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 16:00:03 +0200 Subject: gnu: Add python-pyfaidx. * gnu/packages/bioinformatics.scm (python-pyfaidx): New variable. --- gnu/packages/bioinformatics.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9b047c21b8..d66d9ef40e 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13556,3 +13556,25 @@ bound.") "Pypairix is a Python module for fast querying on a pairix-indexed bgzipped text file that contains a pair of genomic coordinates per line.") (license license:expat))) + +(define-public python-pyfaidx + (package + (name "python-pyfaidx") + (version "0.5.4.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pyfaidx" version)) + (sha256 + (base32 + "0y5zyjksj1rdglj601xd2bbni5abhdh622y3ck76chyzxz9z4rx8")))) + (build-system python-build-system) + (propagated-inputs + `(("python-setuptools" ,python-setuptools) + ("python-six" ,python-six))) + (home-page "http://mattshirley.com") + (synopsis "Random access to fasta subsequences") + (description + "This package provides procedures for efficient pythonic random access to +fasta subsequences.") + (license license:bsd-3))) -- cgit v1.2.3 From 5bb9e0af8dce2d4a9e66c9f673daa3af8fbae99b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 16:00:04 +0200 Subject: gnu: Add python-cooler. * gnu/packages/bioinformatics.scm (python-cooler): New variable. --- gnu/packages/bioinformatics.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index d66d9ef40e..65da049c79 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13578,3 +13578,40 @@ bgzipped text file that contains a pair of genomic coordinates per line.") "This package provides procedures for efficient pythonic random access to fasta subsequences.") (license license:bsd-3))) + +(define-public python-cooler + (package + (name "python-cooler") + (version "0.7.11") + (source + (origin + (method url-fetch) + (uri (pypi-uri "cooler" version)) + (sha256 + (base32 + "08k5nxnxa6qsbk15z5z0q01n28042k87wi4905hh95rzqib15mhx")))) + (build-system python-build-system) + (propagated-inputs + `(("python-biopython" ,python-biopython) + ("python-click" ,python-click) + ("python-cytoolz" ,python-cytoolz) + ("python-dask" ,python-dask) + ("python-h5py" ,python-h5py) + ("python-multiprocess" ,python-multiprocess) + ("python-pandas" ,python-pandas) + ("python-pyfaidx" ,python-pyfaidx) + ("python-pypairix" ,python-pypairix) + ("python-pysam" ,python-pysam) + ("python-scipy" ,python-scipy))) + (native-inputs + `(("python-mock" ,python-mock) + ("python-nose" ,python-nose) + ("python-numpydoc" ,python-numpydoc) + ("python-sphinx" ,python-sphinx))) + (home-page "https://github.com/mirnylab/cooler") + (synopsis "Sparse binary format for genomic interaction matrices") + (description + "Cooler is a support library for a sparse, compressed, binary persistent +storage format, called @code{cool}, used to store genomic interaction data, +such as Hi-C contact matrices.") + (license license:bsd-3))) -- cgit v1.2.3 From 1189c7f1b050aa495b0ec6d9436c644ee308695f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 16:07:27 +0200 Subject: gnu: Add python-hicexplorer. * gnu/packages/bioinformatics.scm (python-hicexplorer): New variable. --- gnu/packages/bioinformatics.scm | 53 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 65da049c79..7e6d76e022 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13615,3 +13615,56 @@ fasta subsequences.") storage format, called @code{cool}, used to store genomic interaction data, such as Hi-C contact matrices.") (license license:bsd-3))) + +(define-public python-hicexplorer + (package + (name "python-hicexplorer") + (version "2.1.4") + (source + (origin + ;; The latest version is not available on Pypi. + (method git-fetch) + (uri (git-reference + (url "https://github.com/deeptools/HiCExplorer.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0q5gpbzmrkvygqgw524q36b4nrivcmyi5v194vsx0qw7b3gcmq08")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'loosen-up-requirements + (lambda _ + (substitute* "setup.py" + (("==") ">=")) + #t))))) + (propagated-inputs + `(("python-biopython" ,python-biopython) + ("python-configparser" ,python-configparser) + ("python-cooler" ,python-cooler) + ("python-future" ,python-future) + ("python-intervaltree" ,python-intervaltree) + ("python-jinja2" ,python-jinja2) + ("python-matplotlib" ,python-matplotlib) + ("python-numpy" ,python-numpy) + ("python-pandas" ,python-pandas) + ("python-pybigwig" ,python-pybigwig) + ("python-pysam" ,python-pysam) + ("python-scipy" ,python-scipy) + ("python-six" ,python-six) + ("python-tables" ,python-tables) + ("python-unidecode" ,python-unidecode))) + (home-page "http://hicexplorer.readthedocs.io") + (synopsis "Process, analyze and visualize Hi-C data") + (description + "HiCExplorer is a powerful and easy to use set of tools to process, +normalize and visualize Hi-C data. HiCExplorer facilitates the creation of +contact matrices, correction of contacts, TAD detection, A/B compartments, +merging, reordering or chromosomes, conversion from different formats +including cooler and detection of long-range contacts. Moreover, it allows +the visualization of multiple contact matrices along with other types of data +like genes, compartments, ChIP-seq coverage tracks (and in general any type of +genomic scores), long range contacts and the visualization of viewpoints.") + (license license:gpl3))) -- cgit v1.2.3 From 5bfa7510d144c3a35bc9022d79fdf4192d4aa1f8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 16:07:28 +0200 Subject: gnu: Add python-pygenometracks. * gnu/packages/bioinformatics.scm (python-pygenometracks): New variable. --- gnu/packages/bioinformatics.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 7e6d76e022..fc8be4d7db 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13668,3 +13668,34 @@ the visualization of multiple contact matrices along with other types of data like genes, compartments, ChIP-seq coverage tracks (and in general any type of genomic scores), long range contacts and the visualization of viewpoints.") (license license:gpl3))) + +(define-public python-pygenometracks + (package + (name "python-pygenometracks") + (version "2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pyGenomeTracks" version)) + (sha256 + (base32 + "1fws6bqsyy9kj3qiabhkqx4wd4i775gsxnhszqd3zg7w67sc1ic5")))) + (build-system python-build-system) + (propagated-inputs + `(("python-configparser" ,python-configparser) + ("python-future" ,python-future) + ("python-hicexplorer" ,python-hicexplorer) + ("python-intervaltree" ,python-intervaltree) + ("python-matplotlib" ,python-matplotlib) + ("python-numpy" ,python-numpy) + ("python-pybigwig" ,python-pybigwig))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://pygenometracks.readthedocs.io") + (synopsis "Program and library to plot beautiful genome browser tracks") + (description + "This package aims to produce high-quality genome browser tracks that +are highly customizable. Currently, it is possible to plot: bigwig, bed (many +options), bedgraph, links (represented as arcs), and Hi-C matrices. +pyGenomeTracks can make plots with or without Hi-C data.") + (license license:gpl3+))) -- cgit v1.2.3 From 5d78cf0b6cc271ca8269036f2aa2e57f858b5f00 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Sun, 9 Sep 2018 22:27:57 +0300 Subject: gnu: emacs-bui: Update to 1.2.0. * gnu/packages/emacs.scm (emacs-bui): Update to 1.2.0. Change source from github to notabug. --- gnu/packages/emacs.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 1f64a5e84a..f84588997e 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1635,20 +1635,20 @@ and stored in memory.") (define-public emacs-bui (package (name "emacs-bui") - (version "1.1.0") + (version "1.2.0") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/alezost/bui.el/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://notabug.org/alezost/emacs-bui.git") + (commit (string-append "v" version)))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "112k0mq6xpy0r47vk66miw7rxbkv3d06pv3pd0vcmrhcnhnnk486")))) + "0ixia5s41f2nbal3wsixacbhbc0mk9yb75ir1amqakip30sq4apv")))) (build-system emacs-build-system) (propagated-inputs `(("dash" ,emacs-dash))) - (home-page "https://github.com/alezost/bui.el") + (home-page "https://notabug.org/alezost/emacs-bui") (synopsis "Buffer interface library for Emacs") (description "BUI (Buffer User Interface) is a library for making @code{list} and -- cgit v1.2.3 From fdf68c232d94fa5d3d65561a1ee938307e2f83c0 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Sun, 9 Sep 2018 22:29:19 +0300 Subject: gnu: emacs-build-farm: Update to 0.2.1. * gnu/packages/emacs.scm (emacs-build-farm): Update to 0.2.1. Change source from gitlab to notabug. --- gnu/packages/emacs.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index f84588997e..98e7b1c6a4 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1729,21 +1729,21 @@ management tasks from Emacs. To begin with, run @code{M-x guix-about} or (define-public emacs-build-farm (package (name "emacs-build-farm") - (version "0.2") + (version "0.2.1") (source (origin (method git-fetch) (uri (git-reference - (url "https://gitlab.com/alezost-emacs/build-farm") - (commit "fa7fa54901416fc5c216a5014394cbd73a61efc6"))) + (url "https://notabug.org/alezost/emacs-build-farm.git") + (commit (string-append "v" version)))) (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1zw3pivma6cv9j7k7qm02jd6wnxmsc1v2mjcssd50im99zzrqflh")))) + "1a4ky0hca26p7f3i2c2s5517ygkyaaz52vs0vxy6f5q95rhlgdhd")))) (build-system emacs-build-system) (propagated-inputs `(("bui" ,emacs-bui) ("magit-popup" ,emacs-magit-popup))) - (home-page "https://gitlab.com/alezost-emacs/build-farm") + (home-page "https://notabug.org/alezost/emacs-build-farm") (synopsis "Emacs interface for Hydra and Cuirass build farms") (description "This Emacs package provides an interface for Hydra and -- cgit v1.2.3 From 8a8662d28693ec4085df7653bafb073ad1b6f8a3 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Mon, 10 Sep 2018 18:33:03 +0300 Subject: gnu: emacs-guix: Update to 0.5. * gnu/packages/emacs.scm (emacs-guix): Update to 0.5. [propagated-inputs]: Add 'guile-gcrypt'. [arguments]: Adjust #:configure-flags accordingly. --- gnu/packages/emacs.scm | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 98e7b1c6a4..bf163d8109 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1659,38 +1659,42 @@ type, for example: packages, buffers, files, etc.") (define-public emacs-guix (package (name "emacs-guix") - (version "0.4.1.1") + (version "0.5") (source (origin (method url-fetch) (uri (string-append "https://emacs-guix.gitlab.io/website/" "releases/emacs-guix-" version ".tar.gz")) (sha256 (base32 - "0jbnrcazbks7h50rngpw5l40a6vn2794kb53cpva3yzdjmrc1955")))) + "09zxd8x674vrpigmcx8l00ifhaxh35xwkwjb8dw9kydnhv9hyyi1")))) (build-system gnu-build-system) (arguments `(#:configure-flags (let ((guix (assoc-ref %build-inputs "guix")) + (gcrypt (assoc-ref %build-inputs "guile-gcrypt")) (geiser (assoc-ref %build-inputs "geiser")) (dash (assoc-ref %build-inputs "dash")) (bui (assoc-ref %build-inputs "bui")) (magit-popup (assoc-ref %build-inputs "magit-popup")) (edit-indirect (assoc-ref %build-inputs "edit-indirect")) - (site-lisp "/share/emacs/site-lisp")) + (site-lisp "/share/emacs/site-lisp") + (site-scm "/share/guile/site") + (site-go "/lib/guile") + (guile-dir (lambda (dir) + (car (find-files dir + (lambda (file stat) + (string-prefix? + "2." (basename file))) + #:directories? #t))))) (list (string-append "--with-guix-site-dir=" - (car (find-files (string-append guix - "/share/guile/site") - (lambda (file stat) - (string-prefix? - "2." - (basename file))) - #:directories? #t))) + (guile-dir (string-append guix site-scm))) (string-append "--with-guix-site-ccache-dir=" - (car (find-files (string-append guix "/lib/guile") - (lambda (file stat) - (string-prefix? - "2." (basename file))) - #:directories? #t)) + (guile-dir (string-append guix site-go)) + "/site-ccache") + (string-append "--with-guile-gcrypt-site-dir=" + (guile-dir (string-append gcrypt site-scm))) + (string-append "--with-guile-gcrypt-site-ccache-dir=" + (guile-dir (string-append gcrypt site-go)) "/site-ccache") (string-append "--with-geiser-lispdir=" geiser site-lisp) (string-append "--with-dash-lispdir=" @@ -1713,6 +1717,7 @@ type, for example: packages, buffers, files, etc.") ("guix" ,guix))) (propagated-inputs `(("geiser" ,geiser) + ("guile-gcrypt" ,guile-gcrypt) ("dash" ,emacs-dash) ("bui" ,emacs-bui) ("edit-indirect" ,emacs-edit-indirect) -- cgit v1.2.3 From f80d6ea251601c63580f63ad5df5ca5c0151dfa0 Mon Sep 17 00:00:00 2001 From: Benjamin Slade Date: Mon, 10 Sep 2018 15:21:25 +0200 Subject: gnu: Add hstr. * gnu/packages/shellutils.scm (hstr): New variable. --- gnu/packages/shellutils.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 650fe98ef3..425713a91f 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016 Christopher Baines ;;; Copyright © 2017 Stefan Reichör ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Benjamin Slade ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,6 +28,10 @@ #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) + #:use-module (gnu packages autotools) + #:use-module (gnu packages ncurses) + #:use-module (gnu packages readline) + #:use-module (gnu packages pkg-config) #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system python)) @@ -158,3 +163,45 @@ fzy is designed to be used both as an editor plugin and on the command line. Rather than clearing the screen, fzy displays its interface directly below the current cursor position, scrolling the screen if necessary.") (license expat))) + +(define-public hstr + (package + (name "hstr") + (version "2.0") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/dvorka/" name "/archive/" + version ".tar.gz")) + (sha256 + (base32 + "0yk2008bl48hv0v3c90ngq4y45h3nxif2ik6s3l7kag1zs5yv4wd")) + (file-name (string-append name "-" version ".tar.gz")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'adjust-ncurses-includes + (lambda* (#:key make-flags outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "src/include/hstr_curses.h" + (("ncursesw\\/curses.h") "ncurses.h")) + (substitute* "src/include/hstr.h" + (("ncursesw\\/curses.h") "ncurses.h"))) + #t))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config))) + (inputs + `(("ncurses" ,ncurses) + ("readline" ,readline))) + (synopsis "Navigate and search command history with shell history suggest box") + (description "HSTR (HiSToRy) is a command-line utility that brings +improved Bash and Zsh command completion from the history. It aims to make +completion easier and more efficient than with @kbd{Ctrl-R}. It allows you to +easily view, navigate, and search your command history with suggestion boxes. +HSTR can also manage your command history (for instance you can remove +commands that are obsolete or contain a piece of sensitive information) or +bookmark your favourite commands.") + (home-page "http://me.mindforger.com/projects/hh.html") + (license asl2.0))) -- cgit v1.2.3 From 633e8aab6990b9eff1f2f0e77d27dc17f163bbc4 Mon Sep 17 00:00:00 2001 From: Pjotr Prins Date: Sun, 9 Sep 2018 17:57:42 +0200 Subject: gnu: ldc: Update to 1.10.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ldc.scm (ldc): Update to 1.10.0. [native-inputs]: Switch to LLVM and CLANG. (ldc-bootstrap)[synopsis, description]: Tweak. * gnu/packages/patches/ldc-disable-phobos-tests.patch: New file. * gnu/packages/patches/ldc-1.7.0-disable-phobos-tests.patch: Remove. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 2 +- gnu/packages/ldc.scm | 26 ++++--- .../patches/ldc-1.7.0-disable-phobos-tests.patch | 88 ---------------------- .../patches/ldc-disable-phobos-tests.patch | 22 ++++++ 4 files changed, 37 insertions(+), 101 deletions(-) delete mode 100644 gnu/packages/patches/ldc-1.7.0-disable-phobos-tests.patch create mode 100644 gnu/packages/patches/ldc-disable-phobos-tests.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index bc01a3cd36..4123459aaa 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -852,7 +852,7 @@ dist_patch_DATA = \ %D%/packages/patches/kobodeluxe-graphics-window-signed-char.patch \ %D%/packages/patches/laby-make-install.patch \ %D%/packages/patches/ldc-bootstrap-disable-tests.patch \ - %D%/packages/patches/ldc-1.7.0-disable-phobos-tests.patch \ + %D%/packages/patches/ldc-disable-phobos-tests.patch \ %D%/packages/patches/ledger-fix-uninitialized.patch \ %D%/packages/patches/ledger-revert-boost-python-fix.patch \ %D%/packages/patches/liba52-enable-pic.patch \ diff --git a/gnu/packages/ldc.scm b/gnu/packages/ldc.scm index 2613db0abd..f35494284d 100644 --- a/gnu/packages/ldc.scm +++ b/gnu/packages/ldc.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016 Roel Janssen -;;; Copyright © 2015 Pjotr Prins +;;; Copyright © 2015, 2018 Pjotr Prins ;;; Copyright © 2017 Frederick Muriithi ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2017 Tobias Geerinckx-Rice @@ -172,9 +172,9 @@ and freshness without requiring additional information from the user.") (base32 "0z6ch930wjkg2vlnqkbliwxxxifad6ydsdpwdxwnajkb2kaxsjx4")))))) (home-page "http://wiki.dlang.org/LDC") - (synopsis "LLVM compiler for the D programming language") + (synopsis "LLVM-based compiler for the D programming language") (description - "LDC is a compiler for the D programming language. It is based on + "LDC is an LLVM compiler for the D programming language. It is based on the latest DMD compiler that was written in C and is used for bootstrapping more recent compilers written in D.") ;; Most of the code is released under BSD-3, except for code originally @@ -188,11 +188,11 @@ bootstrapping more recent compilers written in D.") ;; Phobos, druntime and dmd-testsuite library dependencies do ;; not always have a newer release than the compiler, hence we ;; retain this variable. - (let ((older-version "1.7.0")) + (let ((older-version "1.10.0")) ;; retain this because sometimes the libs are older (package (inherit ldc-bootstrap) (name "ldc") - (version "1.7.0") + (version "1.10.0") (source (origin (method url-fetch) (uri (string-append @@ -201,7 +201,7 @@ bootstrapping more recent compilers written in D.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0rqchmlbhz1pd8ksl1vfhfd5s3cp9h9pqi4k4w2np9sq0zr7abwn")))) + "16b1h9kwfggjw6ykc6sfs26ak6vypylsx9wmvp5m6x3cvi6g70yi")))) (arguments `(#:phases (modify-phases %standard-phases @@ -235,6 +235,8 @@ bootstrapping more recent compilers written in D.") (delete-file "tests/compilable/ctfe_math.d") (delete-file "tests/debuginfo/nested_gdb.d") (delete-file "tests/debuginfo/classtypes_gdb.d") + ;; the following tests plugins we don't have. + (delete-file "tests/plugins/addFuncEntryCall/testPlugin.d") ;; the following tests requires AVX instruction set in the CPU. (substitute* "tests/d2/dmd-testsuite/runnable/test_cdvecfill.d" (("^// DISABLED: ") "^// DISABLED: linux64 ")) @@ -246,8 +248,8 @@ bootstrapping more recent compilers written in D.") (setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc")) (invoke "make" "test" "-j" (number->string (parallel-job-count)))))))) (native-inputs - `(("llvm" ,llvm-3.8) - ("clang" ,clang-3.8) + `(("llvm" ,llvm) + ("clang" ,clang) ("ldc" ,ldc-bootstrap) ("python-lit" ,python-lit) ("python-wrapper" ,python-wrapper) @@ -261,7 +263,7 @@ bootstrapping more recent compilers written in D.") older-version ".tar.gz")) (sha256 (base32 - "042hn3v0zk353r0h6yclq56z86hi437y969bckyb2qsnv00h60hi")) + "0cpmrww00xf1qx38bcc22rr05qw41p00p45yb5fbwnfaccfwdn0s")) ;; This patch deactivates some tests that depend on network access ;; to pass. It also deactivates some tests that have some reliance ;; on timezone. @@ -271,7 +273,7 @@ bootstrapping more recent compilers written in D.") ;; that is being pursued at ;; . ;; It also deactivates a test that requires /root - (patches (search-patches "ldc-1.7.0-disable-phobos-tests.patch")))) + (patches (search-patches "ldc-disable-phobos-tests.patch")))) ("druntime-src" ,(origin (method url-fetch) @@ -280,7 +282,7 @@ bootstrapping more recent compilers written in D.") older-version ".tar.gz")) (sha256 (base32 - "0pvabk70zw8c1gbmvy2i486bg22bn0l5nbacjz0qwmhf0w9y9ylh")))) + "1akh2vdi98jih8642yjbvv2vavxzrmq24kz8i3kfidg5ndqyv222")))) ("dmd-testsuite-src" ,(origin (method url-fetch) @@ -289,7 +291,7 @@ bootstrapping more recent compilers written in D.") older-version ".tar.gz")) (sha256 (base32 - "1i8j1raah7b26bprwkdick443ivdsihgi1l14sn9rh4a95rnrpd9"))))))))) + "0z5x07qrbkpksshaymp11ir6jlmg9wjicxn6zhp8cya6i1ha9p99"))))))))) (define-public dub (package diff --git a/gnu/packages/patches/ldc-1.7.0-disable-phobos-tests.patch b/gnu/packages/patches/ldc-1.7.0-disable-phobos-tests.patch deleted file mode 100644 index ccc136cc76..0000000000 --- a/gnu/packages/patches/ldc-1.7.0-disable-phobos-tests.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff --git a/std/path.d b/std/path.d -index a9f0bd8..f47d103 100644 ---- a/std/path.d -+++ b/std/path.d -@@ -4041,7 +4041,7 @@ version(unittest) import std.process : environment; - else version (Android) - { - } -- else -+ else version (HasRoot) - { - assert(expandTilde("~root") == "/root", expandTilde("~root")); - assert(expandTilde("~root/") == "/root/", expandTilde("~root/")); - -diff --git a/std/process.d b/std/process.d -index df83296..d921cdb 100644 ---- a/std/process.d -+++ b/std/process.d -@@ -1171,7 +1171,7 @@ version (Posix) @system unittest - assert(exists(buildPath(directory, "bar"))); - } - --@system unittest // Specifying a bad working directory. -+@system version(skipunittest) unittest // Specifying a bad working directory. - { - import std.exception : assertThrown; - TestScript prog = "/bin/echo"; -diff --git a/std/socket.d b/std/socket.d -index 8a261d5..c1b87b6 100644 ---- a/std/socket.d -+++ b/std/socket.d -@@ -484,7 +484,7 @@ class Protocol - // Skip this test on Android because getprotobyname/number are - // unimplemented in bionic. - version(CRuntime_Bionic) {} else --@safe unittest -+@safe version(hasNetwork) unittest - { - softUnittest({ - Protocol proto = new Protocol; -@@ -804,7 +804,7 @@ class InternetHost - } - - /// --@safe unittest -+@safe version(hasNetwork) unittest - { - InternetHost ih = new InternetHost; - -@@ -959,7 +959,7 @@ AddressInfo[] getAddressInfo(T...)(in char[] node, T options) - return () @trusted { return getAddressInfoImpl(node, service, &hints); }(); - } - --@system unittest -+@system version(hasNetwork) unittest - { - struct Oops - { -@@ -1010,7 +1010,7 @@ private AddressInfo[] getAddressInfoImpl(in char[] node, in char[] service, addr - } - - --@safe unittest -+@safe version(hasNetwork) unittest - { - softUnittest({ - if (getaddrinfoPointer) -diff --git a/std/stdio.d b/std/stdio.d -index 10106a5..4b0590e 100644 ---- a/std/stdio.d -+++ b/std/stdio.d -@@ -1426,8 +1426,7 @@ Removes the lock over the specified file segment. - g.unlock(); - } - -- version(Posix) -- @system unittest -+ @system version(skip) unittest - { - static import std.file; - auto deleteme = testFilename(); -@@ -1483,7 +1482,6 @@ Removes the lock over the specified file segment. - f.unlock(); - } - -- - /** - Writes its arguments in text format to the file. diff --git a/gnu/packages/patches/ldc-disable-phobos-tests.patch b/gnu/packages/patches/ldc-disable-phobos-tests.patch new file mode 100644 index 0000000000..f8a9743d59 --- /dev/null +++ b/gnu/packages/patches/ldc-disable-phobos-tests.patch @@ -0,0 +1,22 @@ +diff --git a/std/socket.d b/std/socket.d +index 111cd17..6d23da9 100644 +--- a/std/socket.d ++++ b/std/socket.d +@@ -448,7 +448,7 @@ class Protocol + // Skip this test on Android because getprotobyname/number are + // unimplemented in bionic. + version(CRuntime_Bionic) {} else +-@safe unittest ++@safe version(hasNetwork) unittest + { + // import std.stdio : writefln; + softUnittest({ +@@ -770,7 +770,7 @@ class InternetHost + } + + /// +-@safe unittest ++@safe version(hasNetwork) unittest + { + InternetHost ih = new InternetHost; + -- cgit v1.2.3 From 98d6543f86d01486c2f6e808eedd97c601ba3e7a Mon Sep 17 00:00:00 2001 From: Pjotr Prins Date: Mon, 10 Sep 2018 17:46:58 +0200 Subject: gnu: Rename ldc.scm to dlang.scm. * gnu/packages/ldc.scm: Rename to... * gnu/packages/dlang.scm: ... this. * gnu/local.mk (GNU_SYSTEM_MODULES): Adjust accordingly. --- gnu/local.mk | 2 +- gnu/packages/dlang.scm | 338 +++++++++++++++++++++++++++++++++++++++++++++++++ gnu/packages/ldc.scm | 338 ------------------------------------------------- 3 files changed, 339 insertions(+), 339 deletions(-) create mode 100644 gnu/packages/dlang.scm delete mode 100644 gnu/packages/ldc.scm (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 4123459aaa..7317cc5a02 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -135,6 +135,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/display-managers.scm \ %D%/packages/django.scm \ %D%/packages/djvu.scm \ + %D%/packages/dlang.scm \ %D%/packages/dns.scm \ %D%/packages/docbook.scm \ %D%/packages/docker.scm \ @@ -245,7 +246,6 @@ GNU_SYSTEM_MODULES = \ %D%/packages/key-mon.scm \ %D%/packages/kodi.scm \ %D%/packages/language.scm \ - %D%/packages/ldc.scm \ %D%/packages/lego.scm \ %D%/packages/less.scm \ %D%/packages/lesstif.scm \ diff --git a/gnu/packages/dlang.scm b/gnu/packages/dlang.scm new file mode 100644 index 0000000000..76988b2dbf --- /dev/null +++ b/gnu/packages/dlang.scm @@ -0,0 +1,338 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2015, 2016 Roel Janssen +;;; Copyright © 2015, 2018 Pjotr Prins +;;; Copyright © 2017 Frederick Muriithi +;;; Copyright © 2017 Ricardo Wurmus +;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages dlang) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (guix build-system gnu) + #:use-module (guix build-system cmake) + #:use-module (gnu packages) + #:use-module (gnu packages base) + #:use-module (gnu packages check) + #:use-module (gnu packages compression) + #:use-module (gnu packages curl) + #:use-module (gnu packages gdb) + #:use-module (gnu packages libedit) + #:use-module (gnu packages llvm) + #:use-module (gnu packages python) + #:use-module (gnu packages textutils)) + +(define-public rdmd + (package + (name "rdmd") + (version "2.077.1") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/dlang/tools/archive/v" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0c8w373rv6iz3xfid94w40ncv2lr2ncxi662qsr4lda4aghczmq7")))) + (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'check) ; There is no Makefile, so there's no 'make check'. + (replace + 'build + (lambda _ + (invoke "ldc2" "rdmd.d"))) + (replace + 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) + (install-file "rdmd" bin))))))) + (native-inputs + `(("ldc" ,ldc))) + (home-page "https://github.com/D-Programming-Language/tools/") + (synopsis "Specialized equivalent to 'make' for the D language") + (description + "rdmd is a companion to the dmd compiler that simplifies the typical +edit-compile-link-run or edit-make-run cycle to a rapid edit-run cycle. Like +make and other tools, rdmd uses the relative dates of the files involved to +minimize the amount of work necessary. Unlike make, rdmd tracks dependencies +and freshness without requiring additional information from the user.") + (license license:boost1.0))) + +(define-public ldc-bootstrap + (package + (name "ldc") + (version "0.17.4") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/ldc-developers/ldc/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1kw0j378k6bh0k66dvx99bjq8ilp8bb24w3jrmibn8rhmqv0d5q8")))) + (build-system cmake-build-system) + (supported-systems '("x86_64-linux" "i686-linux" "armhf-linux")) + (properties + ;; Some of the tests take a very long time on ARMv7. See + ;; . + `((max-silent-time . ,(* 3600 3)))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'unpack-submodule-sources + (lambda* (#:key inputs #:allow-other-keys) + (let ((unpack (lambda (source target) + (with-directory-excursion target + (zero? (system* "tar" "xvf" + (assoc-ref inputs source) + "--strip-components=1")))))) + (and (unpack "phobos-src" "runtime/phobos") + (unpack "druntime-src" "runtime/druntime") + (unpack "dmd-testsuite-src" "tests/d2/dmd-testsuite"))))) + (add-after 'unpack-submodule-sources 'patch-dmd2 + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "dmd2/root/port.c" + ((" ::isnan") " isnan") + ((" ::isinf") " isinf") + (("#undef isnan") "") + (("#undef isinf") "")) + #t)) + (add-after 'unpack-submodule-sources 'patch-phobos + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "runtime/phobos/std/process.d" + (("/bin/sh") (which "sh")) + (("echo") (which "echo"))) + (substitute* "runtime/phobos/std/datetime.d" + (("/usr/share/zoneinfo/") + (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo")) + (("tzName == \"[+]VERSION\"") + "(tzName == \"+VERSION\" || std.algorithm.endsWith(tzName, \"/leapseconds\"))")) + (substitute* "tests/d2/dmd-testsuite/Makefile" + (("/bin/bash") (which "bash"))) + ;; FIXME: this test cannot be linked. + (delete-file "tests/d2/dmd-testsuite/runnable/cppa.d") + ;; the following two tests fail on i686 + (for-each delete-file '("tests/ir/attributes.d" "tests/ir/align.d"))))))) + (inputs + `(("libconfig" ,libconfig) + ("libedit" ,libedit) + ("tzdata" ,tzdata) + ("zlib" ,zlib))) + (native-inputs + `(("llvm" ,llvm-3.8) + ("clang" ,clang-3.8) + ("python-lit" ,python-lit) + ("python-wrapper" ,python-wrapper) + ("unzip" ,unzip) + ("phobos-src" + ,(origin + (method url-fetch) + (uri (string-append + "https://github.com/ldc-developers/phobos/archive/ldc-v" + version ".tar.gz")) + (sha256 + (base32 + "16x36kp46mqiihxx7jvr1d3mv3b96yfmhinb9lzinh2m4clr85wz")) + (patches (search-patches "ldc-bootstrap-disable-tests.patch")))) + ("druntime-src" + ,(origin + (method url-fetch) + (uri (string-append + "https://github.com/ldc-developers/druntime/archive/ldc-v" + version ".tar.gz")) + (sha256 + (base32 + "0iw2xxhcbsc5f1707dgdzhff528363l4faqdk513gaxs2dhfx8vx")))) + ("dmd-testsuite-src" + ,(origin + (method url-fetch) + (uri (string-append + "https://github.com/ldc-developers/dmd-testsuite/archive/ldc-v" + version ".tar.gz")) + (sha256 + (base32 + "0z6ch930wjkg2vlnqkbliwxxxifad6ydsdpwdxwnajkb2kaxsjx4")))))) + (home-page "http://wiki.dlang.org/LDC") + (synopsis "LLVM-based compiler for the D programming language") + (description + "LDC is an LLVM compiler for the D programming language. It is based on +the latest DMD compiler that was written in C and is used for +bootstrapping more recent compilers written in D.") + ;; Most of the code is released under BSD-3, except for code originally + ;; written for GDC, which is released under GPLv2+, and the DMD frontend, + ;; which is released under the "Boost Software License version 1.0". + (license (list license:bsd-3 + license:gpl2+ + license:boost1.0)))) + +(define-public ldc + ;; Phobos, druntime and dmd-testsuite library dependencies do + ;; not always have a newer release than the compiler, hence we + ;; retain this variable. + (let ((older-version "1.10.0")) ;; retain this because sometimes the libs are older + (package + (inherit ldc-bootstrap) + (name "ldc") + (version "1.10.0") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/ldc-developers/ldc/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "16b1h9kwfggjw6ykc6sfs26ak6vypylsx9wmvp5m6x3cvi6g70yi")))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'unpack-submodule-sources + (lambda* (#:key inputs #:allow-other-keys) + (let ((unpack (lambda (source target) + (with-directory-excursion target + (zero? (system* "tar" "xvf" + (assoc-ref inputs source) + "--strip-components=1")))))) + (and (unpack "phobos-src" "runtime/phobos") + (unpack "druntime-src" "runtime/druntime") + (unpack "dmd-testsuite-src" "tests/d2/dmd-testsuite"))))) + (add-after 'unpack-submodule-sources 'patch-phobos + (lambda* (#:key inputs #:allow-other-keys) + (substitute* '("runtime/phobos/std/process.d" + "tests/linking/linker_switches.d") + (("/bin/sh") (which "sh")) + (("echo") (which "echo"))) + (substitute* "tests/d2/dmd-testsuite/Makefile" + (("/bin/bash") (which "bash"))) + ;; disable unittests in the following files. We are discussing with + ;; upstream + (substitute* '("runtime/phobos/std/net/curl.d" + "runtime/phobos/std/datetime/systime.d" + "runtime/phobos/std/datetime/timezone.d" + ) + (("version(unittest)") "version(skipunittest)") + ((" unittest") " version(skipunittest) unittest")) + ;; the following tests require a more recent LLVM + (delete-file "tests/compilable/ctfe_math.d") + (delete-file "tests/debuginfo/nested_gdb.d") + (delete-file "tests/debuginfo/classtypes_gdb.d") + ;; the following tests plugins we don't have. + (delete-file "tests/plugins/addFuncEntryCall/testPlugin.d") + ;; the following tests requires AVX instruction set in the CPU. + (substitute* "tests/d2/dmd-testsuite/runnable/test_cdvecfill.d" + (("^// DISABLED: ") "^// DISABLED: linux64 ")) + #t)) + (replace 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; some tests call into gdb binary which needs SHELL and CC set + (setenv "SHELL" (which "sh")) + (setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc")) + (invoke "make" "test" "-j" (number->string (parallel-job-count)))))))) + (native-inputs + `(("llvm" ,llvm) + ("clang" ,clang) + ("ldc" ,ldc-bootstrap) + ("python-lit" ,python-lit) + ("python-wrapper" ,python-wrapper) + ("unzip" ,unzip) + ("gdb" ,gdb) + ("phobos-src" + ,(origin + (method url-fetch) + (uri (string-append + "https://github.com/ldc-developers/phobos/archive/ldc-v" + older-version ".tar.gz")) + (sha256 + (base32 + "0cpmrww00xf1qx38bcc22rr05qw41p00p45yb5fbwnfaccfwdn0s")) + ;; This patch deactivates some tests that depend on network access + ;; to pass. It also deactivates some tests that have some reliance + ;; on timezone. + ;; + ;; For the network tests, there's an effort to get a version flag + ;; added to deactivate these tests for distribution packagers + ;; that is being pursued at + ;; . + ;; It also deactivates a test that requires /root + (patches (search-patches "ldc-disable-phobos-tests.patch")))) + ("druntime-src" + ,(origin + (method url-fetch) + (uri (string-append + "https://github.com/ldc-developers/druntime/archive/ldc-v" + older-version ".tar.gz")) + (sha256 + (base32 + "1akh2vdi98jih8642yjbvv2vavxzrmq24kz8i3kfidg5ndqyv222")))) + ("dmd-testsuite-src" + ,(origin + (method url-fetch) + (uri (string-append + "https://github.com/ldc-developers/dmd-testsuite/archive/ldc-v" + older-version ".tar.gz")) + (sha256 + (base32 + "0z5x07qrbkpksshaymp11ir6jlmg9wjicxn6zhp8cya6i1ha9p99"))))))))) + +(define-public dub + (package + (name "dub") + (version "1.7.2") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/dlang/dub/archive/" + "v" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1jvr1mmq8j77wnsrsg7x2xv8yfljqd6x8gn6yy7dd6h6y3cf408q")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; it would have tested itself by installing some packages (vibe etc) + #:phases + (modify-phases %standard-phases + (delete 'configure) ; no configure script + (replace 'build + (lambda _ + (invoke "./build.sh"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (install-file "bin/dub" bin) + #t)))))) + (inputs + `(("curl" ,curl))) + (native-inputs + `(("ldc" ,ldc))) + (home-page "https://code.dlang.org/getting_started") + (synopsis "Package and build manager for D projects") + (description + "DUB is a package and build manager for applications and +libraries written in the D programming language. It can +automatically retrieve a project's dependencies and integrate +them in the build process. + +The design emphasis is on maximum simplicity for simple projects, +while providing the opportunity to customize things when +needed.") + (license license:expat))) diff --git a/gnu/packages/ldc.scm b/gnu/packages/ldc.scm deleted file mode 100644 index f35494284d..0000000000 --- a/gnu/packages/ldc.scm +++ /dev/null @@ -1,338 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016 Roel Janssen -;;; Copyright © 2015, 2018 Pjotr Prins -;;; Copyright © 2017 Frederick Muriithi -;;; Copyright © 2017 Ricardo Wurmus -;;; Copyright © 2017 Tobias Geerinckx-Rice -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (gnu packages ldc) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix git-download) - #:use-module (guix build-system gnu) - #:use-module (guix build-system cmake) - #:use-module (gnu packages) - #:use-module (gnu packages base) - #:use-module (gnu packages check) - #:use-module (gnu packages compression) - #:use-module (gnu packages curl) - #:use-module (gnu packages gdb) - #:use-module (gnu packages libedit) - #:use-module (gnu packages llvm) - #:use-module (gnu packages python) - #:use-module (gnu packages textutils)) - -(define-public rdmd - (package - (name "rdmd") - (version "2.077.1") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/dlang/tools/archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0c8w373rv6iz3xfid94w40ncv2lr2ncxi662qsr4lda4aghczmq7")))) - (build-system gnu-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (delete 'configure) - (delete 'check) ; There is no Makefile, so there's no 'make check'. - (replace - 'build - (lambda _ - (invoke "ldc2" "rdmd.d"))) - (replace - 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) - (install-file "rdmd" bin))))))) - (native-inputs - `(("ldc" ,ldc))) - (home-page "https://github.com/D-Programming-Language/tools/") - (synopsis "Specialized equivalent to 'make' for the D language") - (description - "rdmd is a companion to the dmd compiler that simplifies the typical -edit-compile-link-run or edit-make-run cycle to a rapid edit-run cycle. Like -make and other tools, rdmd uses the relative dates of the files involved to -minimize the amount of work necessary. Unlike make, rdmd tracks dependencies -and freshness without requiring additional information from the user.") - (license license:boost1.0))) - -(define-public ldc-bootstrap - (package - (name "ldc") - (version "0.17.4") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/ldc-developers/ldc/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1kw0j378k6bh0k66dvx99bjq8ilp8bb24w3jrmibn8rhmqv0d5q8")))) - (build-system cmake-build-system) - (supported-systems '("x86_64-linux" "i686-linux" "armhf-linux")) - (properties - ;; Some of the tests take a very long time on ARMv7. See - ;; . - `((max-silent-time . ,(* 3600 3)))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'unpack-submodule-sources - (lambda* (#:key inputs #:allow-other-keys) - (let ((unpack (lambda (source target) - (with-directory-excursion target - (zero? (system* "tar" "xvf" - (assoc-ref inputs source) - "--strip-components=1")))))) - (and (unpack "phobos-src" "runtime/phobos") - (unpack "druntime-src" "runtime/druntime") - (unpack "dmd-testsuite-src" "tests/d2/dmd-testsuite"))))) - (add-after 'unpack-submodule-sources 'patch-dmd2 - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "dmd2/root/port.c" - ((" ::isnan") " isnan") - ((" ::isinf") " isinf") - (("#undef isnan") "") - (("#undef isinf") "")) - #t)) - (add-after 'unpack-submodule-sources 'patch-phobos - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "runtime/phobos/std/process.d" - (("/bin/sh") (which "sh")) - (("echo") (which "echo"))) - (substitute* "runtime/phobos/std/datetime.d" - (("/usr/share/zoneinfo/") - (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo")) - (("tzName == \"[+]VERSION\"") - "(tzName == \"+VERSION\" || std.algorithm.endsWith(tzName, \"/leapseconds\"))")) - (substitute* "tests/d2/dmd-testsuite/Makefile" - (("/bin/bash") (which "bash"))) - ;; FIXME: this test cannot be linked. - (delete-file "tests/d2/dmd-testsuite/runnable/cppa.d") - ;; the following two tests fail on i686 - (for-each delete-file '("tests/ir/attributes.d" "tests/ir/align.d"))))))) - (inputs - `(("libconfig" ,libconfig) - ("libedit" ,libedit) - ("tzdata" ,tzdata) - ("zlib" ,zlib))) - (native-inputs - `(("llvm" ,llvm-3.8) - ("clang" ,clang-3.8) - ("python-lit" ,python-lit) - ("python-wrapper" ,python-wrapper) - ("unzip" ,unzip) - ("phobos-src" - ,(origin - (method url-fetch) - (uri (string-append - "https://github.com/ldc-developers/phobos/archive/ldc-v" - version ".tar.gz")) - (sha256 - (base32 - "16x36kp46mqiihxx7jvr1d3mv3b96yfmhinb9lzinh2m4clr85wz")) - (patches (search-patches "ldc-bootstrap-disable-tests.patch")))) - ("druntime-src" - ,(origin - (method url-fetch) - (uri (string-append - "https://github.com/ldc-developers/druntime/archive/ldc-v" - version ".tar.gz")) - (sha256 - (base32 - "0iw2xxhcbsc5f1707dgdzhff528363l4faqdk513gaxs2dhfx8vx")))) - ("dmd-testsuite-src" - ,(origin - (method url-fetch) - (uri (string-append - "https://github.com/ldc-developers/dmd-testsuite/archive/ldc-v" - version ".tar.gz")) - (sha256 - (base32 - "0z6ch930wjkg2vlnqkbliwxxxifad6ydsdpwdxwnajkb2kaxsjx4")))))) - (home-page "http://wiki.dlang.org/LDC") - (synopsis "LLVM-based compiler for the D programming language") - (description - "LDC is an LLVM compiler for the D programming language. It is based on -the latest DMD compiler that was written in C and is used for -bootstrapping more recent compilers written in D.") - ;; Most of the code is released under BSD-3, except for code originally - ;; written for GDC, which is released under GPLv2+, and the DMD frontend, - ;; which is released under the "Boost Software License version 1.0". - (license (list license:bsd-3 - license:gpl2+ - license:boost1.0)))) - -(define-public ldc - ;; Phobos, druntime and dmd-testsuite library dependencies do - ;; not always have a newer release than the compiler, hence we - ;; retain this variable. - (let ((older-version "1.10.0")) ;; retain this because sometimes the libs are older - (package - (inherit ldc-bootstrap) - (name "ldc") - (version "1.10.0") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/ldc-developers/ldc/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "16b1h9kwfggjw6ykc6sfs26ak6vypylsx9wmvp5m6x3cvi6g70yi")))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'unpack-submodule-sources - (lambda* (#:key inputs #:allow-other-keys) - (let ((unpack (lambda (source target) - (with-directory-excursion target - (zero? (system* "tar" "xvf" - (assoc-ref inputs source) - "--strip-components=1")))))) - (and (unpack "phobos-src" "runtime/phobos") - (unpack "druntime-src" "runtime/druntime") - (unpack "dmd-testsuite-src" "tests/d2/dmd-testsuite"))))) - (add-after 'unpack-submodule-sources 'patch-phobos - (lambda* (#:key inputs #:allow-other-keys) - (substitute* '("runtime/phobos/std/process.d" - "tests/linking/linker_switches.d") - (("/bin/sh") (which "sh")) - (("echo") (which "echo"))) - (substitute* "tests/d2/dmd-testsuite/Makefile" - (("/bin/bash") (which "bash"))) - ;; disable unittests in the following files. We are discussing with - ;; upstream - (substitute* '("runtime/phobos/std/net/curl.d" - "runtime/phobos/std/datetime/systime.d" - "runtime/phobos/std/datetime/timezone.d" - ) - (("version(unittest)") "version(skipunittest)") - ((" unittest") " version(skipunittest) unittest")) - ;; the following tests require a more recent LLVM - (delete-file "tests/compilable/ctfe_math.d") - (delete-file "tests/debuginfo/nested_gdb.d") - (delete-file "tests/debuginfo/classtypes_gdb.d") - ;; the following tests plugins we don't have. - (delete-file "tests/plugins/addFuncEntryCall/testPlugin.d") - ;; the following tests requires AVX instruction set in the CPU. - (substitute* "tests/d2/dmd-testsuite/runnable/test_cdvecfill.d" - (("^// DISABLED: ") "^// DISABLED: linux64 ")) - #t)) - (replace 'check - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; some tests call into gdb binary which needs SHELL and CC set - (setenv "SHELL" (which "sh")) - (setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc")) - (invoke "make" "test" "-j" (number->string (parallel-job-count)))))))) - (native-inputs - `(("llvm" ,llvm) - ("clang" ,clang) - ("ldc" ,ldc-bootstrap) - ("python-lit" ,python-lit) - ("python-wrapper" ,python-wrapper) - ("unzip" ,unzip) - ("gdb" ,gdb) - ("phobos-src" - ,(origin - (method url-fetch) - (uri (string-append - "https://github.com/ldc-developers/phobos/archive/ldc-v" - older-version ".tar.gz")) - (sha256 - (base32 - "0cpmrww00xf1qx38bcc22rr05qw41p00p45yb5fbwnfaccfwdn0s")) - ;; This patch deactivates some tests that depend on network access - ;; to pass. It also deactivates some tests that have some reliance - ;; on timezone. - ;; - ;; For the network tests, there's an effort to get a version flag - ;; added to deactivate these tests for distribution packagers - ;; that is being pursued at - ;; . - ;; It also deactivates a test that requires /root - (patches (search-patches "ldc-disable-phobos-tests.patch")))) - ("druntime-src" - ,(origin - (method url-fetch) - (uri (string-append - "https://github.com/ldc-developers/druntime/archive/ldc-v" - older-version ".tar.gz")) - (sha256 - (base32 - "1akh2vdi98jih8642yjbvv2vavxzrmq24kz8i3kfidg5ndqyv222")))) - ("dmd-testsuite-src" - ,(origin - (method url-fetch) - (uri (string-append - "https://github.com/ldc-developers/dmd-testsuite/archive/ldc-v" - older-version ".tar.gz")) - (sha256 - (base32 - "0z5x07qrbkpksshaymp11ir6jlmg9wjicxn6zhp8cya6i1ha9p99"))))))))) - -(define-public dub - (package - (name "dub") - (version "1.7.2") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/dlang/dub/archive/" - "v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1jvr1mmq8j77wnsrsg7x2xv8yfljqd6x8gn6yy7dd6h6y3cf408q")))) - (build-system gnu-build-system) - (arguments - `(#:tests? #f ; it would have tested itself by installing some packages (vibe etc) - #:phases - (modify-phases %standard-phases - (delete 'configure) ; no configure script - (replace 'build - (lambda _ - (invoke "./build.sh"))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (install-file "bin/dub" bin) - #t)))))) - (inputs - `(("curl" ,curl))) - (native-inputs - `(("ldc" ,ldc))) - (home-page "https://code.dlang.org/getting_started") - (synopsis "Package and build manager for D projects") - (description - "DUB is a package and build manager for applications and -libraries written in the D programming language. It can -automatically retrieve a project's dependencies and integrate -them in the build process. - -The design emphasis is on maximum simplicity for simple projects, -while providing the opportunity to customize things when -needed.") - (license license:expat))) -- cgit v1.2.3 From 1f7fe26f83e7d501a7231adf98ac81d58a5d724e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 10 Sep 2018 18:17:11 +0200 Subject: gnu: python-sockjs-tornado: Edit synopsis & description. * gnu/packages/python-web.scm (python-sockjs-tornado)[synopsis] [description]: Pick nits. --- gnu/packages/python-web.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index fd76c0c60c..85097289dc 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -194,12 +194,12 @@ other HTTP libraries.") `(("python-tornado" ,python-tornado))) (home-page "https://github.com/mrjoes/sockjs-tornado/") (synopsis - "SockJS python server implementation on top of Tornado framework") + "SockJS Python server implementation on top of the Tornado framework") (description - "SockJS-tornado provides the server side counterpart to a SockJS client + "SockJS-tornado provides the server-side counterpart to a SockJS client library, through the Tornado framework. -SockJS provides a low latency, full duplex, cross-domain communication channel +SockJS provides a low-latency, full-duplex, cross-domain communication channel between a web browser and web server.") (license license:expat))) -- cgit v1.2.3 From 83397e07862198cf3145112c8100fd8dd142fd21 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 10 Sep 2018 18:14:10 +0200 Subject: gnu: python-sockjs-tornado: Update to 1.0.5. * gnu/packages/python-web.scm (python-sockjs-tornado): Update to 1.0.5. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 85097289dc..9008ca5e72 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -177,14 +177,14 @@ other HTTP libraries.") (define-public python-sockjs-tornado (package (name "python-sockjs-tornado") - (version "1.0.3") + (version "1.0.5") (source (origin (method url-fetch) (uri (pypi-uri "sockjs-tornado" version)) (sha256 (base32 - "16cff40nniqsyvda1pb2j3b4zwmrw7y2g1vqq78lp20xpmhnwwkd")))) + "0zhq8wnnhkfbvdnsggqrc3pp97pqpilsf7fh6ymvnf52r0rwyjsc")))) (build-system python-build-system) (arguments `(;; There are no tests, and running the test phase requires missing -- cgit v1.2.3 From 7c8b1bf66448d072be67682ed3ce618da831f72f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 10 Sep 2018 18:01:51 +0200 Subject: gnu: python-genshi: Update to 0.7.1. * gnu/packages/python-web.scm (python-genshi): Update to 0.7.1. [source]: Use GIT-FETCH and GIT-FILE-NAME. Remove patches. * gnu/packages/patches/python-genshi-add-support-for-python-3.4-AST.patch, gnu/packages/patches/python-genshi-buildable-on-python-2.7.patch, gnu/packages/patches/python-genshi-disable-speedups-on-python-3.3.patch, gnu/packages/patches/python-genshi-fix-tests-on-python-3.5.patch, gnu/packages/patches/python-genshi-isstring-helper.patch, gnu/packages/patches/python-genshi-stripping-of-unsafe-script-tags.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Remove them. --- gnu/local.mk | 6 - ...hon-genshi-add-support-for-python-3.4-AST.patch | 151 --------------------- .../python-genshi-buildable-on-python-2.7.patch | 25 ---- ...hon-genshi-disable-speedups-on-python-3.3.patch | 32 ----- .../python-genshi-fix-tests-on-python-3.5.patch | 112 --------------- .../patches/python-genshi-isstring-helper.patch | 37 ----- ...on-genshi-stripping-of-unsafe-script-tags.patch | 51 ------- gnu/packages/python-web.scm | 31 ++--- 8 files changed, 8 insertions(+), 437 deletions(-) delete mode 100644 gnu/packages/patches/python-genshi-add-support-for-python-3.4-AST.patch delete mode 100644 gnu/packages/patches/python-genshi-buildable-on-python-2.7.patch delete mode 100644 gnu/packages/patches/python-genshi-disable-speedups-on-python-3.3.patch delete mode 100644 gnu/packages/patches/python-genshi-fix-tests-on-python-3.5.patch delete mode 100644 gnu/packages/patches/python-genshi-isstring-helper.patch delete mode 100644 gnu/packages/patches/python-genshi-stripping-of-unsafe-script-tags.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 7317cc5a02..9b417bff6d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1078,12 +1078,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-axolotl-AES-fix.patch \ %D%/packages/patches/python-cairocffi-dlopen-path.patch \ %D%/packages/patches/python-fix-tests.patch \ - %D%/packages/patches/python-genshi-add-support-for-python-3.4-AST.patch \ - %D%/packages/patches/python-genshi-buildable-on-python-2.7.patch \ - %D%/packages/patches/python-genshi-disable-speedups-on-python-3.3.patch \ - %D%/packages/patches/python-genshi-fix-tests-on-python-3.5.patch \ - %D%/packages/patches/python-genshi-isstring-helper.patch \ - %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 \ diff --git a/gnu/packages/patches/python-genshi-add-support-for-python-3.4-AST.patch b/gnu/packages/patches/python-genshi-add-support-for-python-3.4-AST.patch deleted file mode 100644 index 4e40c1daa1..0000000000 --- a/gnu/packages/patches/python-genshi-add-support-for-python-3.4-AST.patch +++ /dev/null @@ -1,151 +0,0 @@ -From 86b98a11559da7d1b21dc9b4c6b10511b9095bc4 Mon Sep 17 00:00:00 2001 -From: Simon Cross -Date: Sun, 16 Feb 2014 18:46:15 +0000 -Subject: [PATCH 05/16] Add support for Python 3.4 AST (support for - NameConstants and changes to existing to arguments node attributes). - ---- - genshi/template/astutil.py | 31 ++++++++++++++++++++++++++++--- - genshi/template/eval.py | 34 +++++++++++++++++++--------------- - 2 files changed, 47 insertions(+), 18 deletions(-) - -diff --git a/genshi/template/astutil.py b/genshi/template/astutil.py -index a4c21c8..a3946b4 100644 ---- a/genshi/template/astutil.py -+++ b/genshi/template/astutil.py -@@ -21,7 +21,7 @@ else: - def parse(source, mode): - return compile(source, '', mode, _ast.PyCF_ONLY_AST) - --from genshi.compat import IS_PYTHON2 -+from genshi.compat import IS_PYTHON2, isstring - - __docformat__ = 'restructuredtext en' - -@@ -103,8 +103,13 @@ class ASTCodeGenerator(object): - self._new_line() - return self.visit(node.body) - -+ # Python < 3.4 - # arguments = (expr* args, identifier? vararg, - # identifier? kwarg, expr* defaults) -+ # -+ # Python >= 3.4 -+ # arguments = (arg* args, arg? vararg, arg* kwonlyargs, expr* kw_defaults, -+ # arg? kwarg, expr* defaults) - def visit_arguments(self, node): - first = True - no_default_count = len(node.args) - len(node.defaults) -@@ -122,13 +127,21 @@ class ASTCodeGenerator(object): - self._write(', ') - else: - first = False -- self._write('*' + node.vararg) -+ self._write('*') -+ if isstring(node.vararg): -+ self._write(node.vararg) -+ else: -+ self.visit(node.vararg) - if getattr(node, 'kwarg', None): - if not first: - self._write(', ') - else: - first = False -- self._write('**' + node.kwarg) -+ self._write('**') -+ if isstring(node.kwarg): -+ self._write(node.kwarg) -+ else: -+ self.visit(node.kwarg) - - if not IS_PYTHON2: - # In Python 3 arguments get a special node -@@ -724,6 +737,17 @@ class ASTCodeGenerator(object): - def visit_Name(self, node): - self._write(node.id) - -+ # NameConstant(singleton value) -+ def visit_NameConstant(self, node): -+ if node.value is None: -+ self._write('None') -+ elif node.value is True: -+ self._write('True') -+ elif node.value is False: -+ self._write('False') -+ else: -+ raise Exception("Unknown NameConstant %r" % (node.value,)) -+ - # List(expr* elts, expr_context ctx) - def visit_List(self, node): - self._write('[') -@@ -829,6 +853,7 @@ class ASTTransformer(object): - visit_Attribute = _clone - visit_Subscript = _clone - visit_Name = _clone -+ visit_NameConstant = _clone - visit_List = _clone - visit_Tuple = _clone - -diff --git a/genshi/template/eval.py b/genshi/template/eval.py -index 89aec49..de4bc86 100644 ---- a/genshi/template/eval.py -+++ b/genshi/template/eval.py -@@ -24,7 +24,8 @@ from genshi.template.astutil import ASTTransformer, ASTCodeGenerator, \ - from genshi.template.base import TemplateRuntimeError - from genshi.util import flatten - --from genshi.compat import get_code_params, build_code_chunk, IS_PYTHON2 -+from genshi.compat import get_code_params, build_code_chunk, isstring, \ -+ IS_PYTHON2 - - __all__ = ['Code', 'Expression', 'Suite', 'LenientLookup', 'StrictLookup', - 'Undefined', 'UndefinedError'] -@@ -495,28 +496,31 @@ class TemplateASTTransformer(ASTTransformer): - def __init__(self): - self.locals = [CONSTANTS] - -+ def _process(self, names, node): -+ if not IS_PYTHON2 and isinstance(node, _ast.arg): -+ names.add(node.arg) -+ elif isstring(node): -+ names.add(node) -+ elif isinstance(node, _ast.Name): -+ names.add(node.id) -+ elif isinstance(node, _ast.alias): -+ names.add(node.asname or node.name) -+ elif isinstance(node, _ast.Tuple): -+ for elt in node.elts: -+ self._process(names, elt) -+ - def _extract_names(self, node): - names = set() -- def _process(node): -- if not IS_PYTHON2 and isinstance(node, _ast.arg): -- names.add(node.arg) -- if isinstance(node, _ast.Name): -- names.add(node.id) -- elif isinstance(node, _ast.alias): -- names.add(node.asname or node.name) -- elif isinstance(node, _ast.Tuple): -- for elt in node.elts: -- _process(elt) - if hasattr(node, 'args'): - for arg in node.args: -- _process(arg) -+ self._process(names, arg) - if hasattr(node, 'vararg'): -- names.add(node.vararg) -+ self._process(names, node.vararg) - if hasattr(node, 'kwarg'): -- names.add(node.kwarg) -+ self._process(names, node.kwarg) - elif hasattr(node, 'names'): - for elt in node.names: -- _process(elt) -+ self._process(names, elt) - return names - - def visit_Str(self, node): --- -2.12.0 - diff --git a/gnu/packages/patches/python-genshi-buildable-on-python-2.7.patch b/gnu/packages/patches/python-genshi-buildable-on-python-2.7.patch deleted file mode 100644 index 2bc516c697..0000000000 --- a/gnu/packages/patches/python-genshi-buildable-on-python-2.7.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 32bfaa7cc1c736fd62fcbb6414de9498dc20ed07 Mon Sep 17 00:00:00 2001 -From: Adriano Peluso -Date: Wed, 5 Apr 2017 15:13:06 +0200 -Subject: [PATCH 2/2] buildable on python27 too - ---- - genshi/template/directives.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/genshi/template/directives.py b/genshi/template/directives.py -index 6fd0f28..1f70ef6 100644 ---- a/genshi/template/directives.py -+++ b/genshi/template/directives.py -@@ -266,7 +266,7 @@ class DefDirective(Directive): - if isinstance(ast, _ast.Call): - self.name = ast.func.id - for arg in ast.args: -- if isinstance(arg, _ast.Starred): -+ if hasattr(_ast, 'Starred') and isinstance(arg, _ast.Starred): - # Python 3.5+ - self.star_args = arg.value.id - else: --- -2.12.0 - diff --git a/gnu/packages/patches/python-genshi-disable-speedups-on-python-3.3.patch b/gnu/packages/patches/python-genshi-disable-speedups-on-python-3.3.patch deleted file mode 100644 index c25c3bd7a9..0000000000 --- a/gnu/packages/patches/python-genshi-disable-speedups-on-python-3.3.patch +++ /dev/null @@ -1,32 +0,0 @@ -From cef2c8df44166195e1705638f9f17033a4943bb7 Mon Sep 17 00:00:00 2001 -From: Simon Cross -Date: Sun, 16 Feb 2014 18:32:21 +0000 -Subject: [PATCH 02/15] Disable the speedups C extension on CPython >= 3.3 - since Genshi doesn't support the new Unicode C API yet. - ---- - setup.py | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 123a2cb..a3d748c 100755 ---- a/setup.py -+++ b/setup.py -@@ -65,9 +65,13 @@ available.""") - - - if Feature: -+ # Optional C extension module for speeding up Genshi: -+ # Not activated by default on: -+ # - PyPy (where it harms performance) -+ # - CPython >= 3.3 (the new Unicode C API is not supported yet) - speedups = Feature( - "optional C speed-enhancements", -- standard = not is_pypy, -+ standard = not is_pypy and sys.version_info < (3, 3), - ext_modules = [ - Extension('genshi._speedups', ['genshi/_speedups.c']), - ], --- -2.12.0 - diff --git a/gnu/packages/patches/python-genshi-fix-tests-on-python-3.5.patch b/gnu/packages/patches/python-genshi-fix-tests-on-python-3.5.patch deleted file mode 100644 index 05be080cdf..0000000000 --- a/gnu/packages/patches/python-genshi-fix-tests-on-python-3.5.patch +++ /dev/null @@ -1,112 +0,0 @@ -From ce796ad4bae5c47011876778674ad036357febdf Mon Sep 17 00:00:00 2001 -From: Adriano Peluso -Date: Wed, 5 Apr 2017 15:10:06 +0200 -Subject: [PATCH 1/2] fixing the tests on python35 - ---- - genshi/filters/i18n.py | 6 ++++-- - genshi/template/astutil.py | 14 +++++++++++--- - genshi/template/directives.py | 20 ++++++++++++++------ - genshi/template/eval.py | 5 +++++ - 4 files changed, 34 insertions(+), 11 deletions(-) - -diff --git a/genshi/filters/i18n.py b/genshi/filters/i18n.py -index 526fda4..5387fcf 100644 ---- a/genshi/filters/i18n.py -+++ b/genshi/filters/i18n.py -@@ -1194,8 +1194,10 @@ def extract_from_code(code, gettext_functions): - elif arg: - strings.append(None) - [_add(arg) for arg in node.args] -- _add(node.starargs) -- _add(node.kwargs) -+ if hasattr(node, 'starargs'): -+ _add(node.starargs) -+ if hasattr(node, 'kwargs'): -+ _add(node.kwargs) - if len(strings) == 1: - strings = strings[0] - else: -diff --git a/genshi/template/astutil.py b/genshi/template/astutil.py -index f4e1edd..e561846 100644 ---- a/genshi/template/astutil.py -+++ b/genshi/template/astutil.py -@@ -151,6 +151,10 @@ class ASTCodeGenerator(object): - def visit_arg(self, node): - self._write(node.arg) - -+ def visit_Starred(self, node): -+ self._write('*') -+ self.visit(node.value) -+ - # FunctionDef(identifier name, arguments args, - # stmt* body, expr* decorator_list) - def visit_FunctionDef(self, node): -@@ -664,9 +668,13 @@ class ASTCodeGenerator(object): - if not first: - self._write(', ') - first = False -- # keyword = (identifier arg, expr value) -- self._write(keyword.arg) -- self._write('=') -+ if not keyword.arg: -+ # Python 3.5+ star-star args -+ self._write('**') -+ else: -+ # keyword = (identifier arg, expr value) -+ self._write(keyword.arg) -+ self._write('=') - self.visit(keyword.value) - if getattr(node, 'starargs', None): - if not first: -diff --git a/genshi/template/directives.py b/genshi/template/directives.py -index 7301c2d..6fd0f28 100644 ---- a/genshi/template/directives.py -+++ b/genshi/template/directives.py -@@ -266,13 +266,21 @@ class DefDirective(Directive): - if isinstance(ast, _ast.Call): - self.name = ast.func.id - for arg in ast.args: -- # only names -- self.args.append(arg.id) -+ if isinstance(arg, _ast.Starred): -+ # Python 3.5+ -+ self.star_args = arg.value.id -+ else: -+ # only names -+ self.args.append(arg.id) - for kwd in ast.keywords: -- self.args.append(kwd.arg) -- exp = Expression(kwd.value, template.filepath, -- lineno, lookup=template.lookup) -- self.defaults[kwd.arg] = exp -+ if kwd.arg is None: -+ # Python 3.5+ -+ self.dstar_args = kwd.value.id -+ else: -+ self.args.append(kwd.arg) -+ exp = Expression(kwd.value, template.filepath, -+ lineno, lookup=template.lookup) -+ self.defaults[kwd.arg] = exp - if getattr(ast, 'starargs', None): - self.star_args = ast.starargs.id - if getattr(ast, 'kwargs', None): -diff --git a/genshi/template/eval.py b/genshi/template/eval.py -index d378419..81644a7 100644 ---- a/genshi/template/eval.py -+++ b/genshi/template/eval.py -@@ -600,6 +600,11 @@ class TemplateASTTransformer(ASTTransformer): - finally: - self.locals.pop() - -+ # Only used in Python 3.5+ -+ def visit_Starred(self, node): -+ node.value = self.visit(node.value) -+ return node -+ - def visit_Name(self, node): - # If the name refers to a local inside a lambda, list comprehension, or - # generator expression, leave it alone --- -2.12.0 - diff --git a/gnu/packages/patches/python-genshi-isstring-helper.patch b/gnu/packages/patches/python-genshi-isstring-helper.patch deleted file mode 100644 index 4f6c19bba9..0000000000 --- a/gnu/packages/patches/python-genshi-isstring-helper.patch +++ /dev/null @@ -1,37 +0,0 @@ -From cc5e07284f44cdd9beec178c69070a53f55d1323 Mon Sep 17 00:00:00 2001 -From: Simon Cross -Date: Sun, 16 Feb 2014 18:43:20 +0000 -Subject: [PATCH 03/15] Add isstring helper. - ---- - genshi/compat.py | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/genshi/compat.py b/genshi/compat.py -index 9787325..6574e39 100644 ---- a/genshi/compat.py -+++ b/genshi/compat.py -@@ -35,6 +35,15 @@ else: - 'Python 2 compatibility function. Not usable in Python 3.') - - -+# We need to test if an object is an instance of a string type in places -+ -+if IS_PYTHON2: -+ def isstring(obj): -+ return isinstance(obj, basestring) -+else: -+ def isstring(obj): -+ return isinstance(obj, str) -+ - # We need to differentiate between StringIO and BytesIO in places - - if IS_PYTHON2: -@@ -112,4 +121,3 @@ except NameError: - if not x: - return False - return True -- --- -2.12.0 - diff --git a/gnu/packages/patches/python-genshi-stripping-of-unsafe-script-tags.patch b/gnu/packages/patches/python-genshi-stripping-of-unsafe-script-tags.patch deleted file mode 100644 index 29951a6149..0000000000 --- a/gnu/packages/patches/python-genshi-stripping-of-unsafe-script-tags.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 0769be04c3891ae5c724c6779ba13d1d0f53b4ae Mon Sep 17 00:00:00 2001 -From: Simon Cross -Date: Sun, 16 Feb 2014 18:25:17 +0000 -Subject: [PATCH 01/15] Also allow stripping of unsafe script tags (Python 3.4 - parses the second example as a tag whose name is script&xyz). - ---- - genshi/filters/tests/test_html.py | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git a/genshi/filters/tests/test_html.py b/genshi/filters/tests/test_html.py -index 0c6cfe1..45ec0da 100644 ---- a/genshi/filters/tests/test_html.py -+++ b/genshi/filters/tests/test_html.py -@@ -368,12 +368,16 @@ def StyleSanitizer(): - - class HTMLSanitizerTestCase(unittest.TestCase): - -- def assert_parse_error_or_equal(self, expected, exploit): -+ def assert_parse_error_or_equal(self, expected, exploit, -+ allow_strip=False): - try: - html = HTML(exploit) - except ParseError: - return -- self.assertEquals(expected, (html | HTMLSanitizer()).render()) -+ sanitized_html = (html | HTMLSanitizer()).render() -+ if not sanitized_html and allow_strip: -+ return -+ self.assertEquals(expected, sanitized_html) - - def test_sanitize_unchanged(self): - html = HTML(u'fo
o') -@@ -416,10 +420,12 @@ class HTMLSanitizerTestCase(unittest.TestCase): - html = HTML(u'') - self.assertEquals('', (html | HTMLSanitizer()).render()) - src = u'alert("foo")' -- self.assert_parse_error_or_equal('<SCR\x00IPT>alert("foo")', src) -+ self.assert_parse_error_or_equal('<SCR\x00IPT>alert("foo")', src, -+ allow_strip=True) - src = u'' - self.assert_parse_error_or_equal('<SCRIPT&XYZ; ' -- 'SRC="http://example.com/">', src) -+ 'SRC="http://example.com/">', src, -+ allow_strip=True) - - def test_sanitize_remove_onclick_attr(self): - html = HTML(u'
') --- -2.12.0 - diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 9008ca5e72..226b9b631b 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -45,6 +45,7 @@ (define-module (gnu packages python-web) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system python) #:use-module (guix utils) #:use-module (gnu packages) @@ -2248,29 +2249,16 @@ for Flask programs that are using @code{python-alembic}.") (define-public python-genshi (package (name "python-genshi") - (version "0.7") + (version "0.7.1") (source (origin - (method url-fetch) - (uri (string-append - "https://ftp.edgewall.org/pub/genshi/Genshi-" - version ".tar.gz")) - (patches - (search-patches - ;; The first 4 patches are in the master branch upstream. - ;; See this as a reference https://genshi.edgewall.org/ticket/582 - ;; The last 2 are NOT in any branch. - ;; They were sent as attachments to a ticket opened at - ;; https://genshi.edgewall.org/ticket/602#no1 - "python-genshi-stripping-of-unsafe-script-tags.patch" - "python-genshi-disable-speedups-on-python-3.3.patch" - "python-genshi-isstring-helper.patch" - "python-genshi-add-support-for-python-3.4-AST.patch" - "python-genshi-fix-tests-on-python-3.5.patch" - "python-genshi-buildable-on-python-2.7.patch")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/edgewall/genshi.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 - "0lkkbp6fbwzv0zda5iqc21rr7rdldkwh3hfabfjl9i4bwq14858x")))) + (base32 "01fx8fnpay5w048ppyjivg2dgfpp5rybn07y3pfsgj2knram3nhl")))) (build-system python-build-system) (home-page "https://genshi.edgewall.org/") (synopsis "Toolkit for generation of output for the web") @@ -2279,9 +2267,6 @@ of components for parsing, generating, and processing HTML, XML or other textual content for output generation on the web.") (license license:bsd-3))) -;; The linter here claims that patch file names should start with the package -;; name. But, in this case the patches are inherited from python-genshi with -;; the "python-genshi-" prefix instead of "python2-genshi-". (define-public python2-genshi (package-with-python2 python-genshi)) -- cgit v1.2.3 From 37a2ea118d7027551c5c53a329a231fef0a2bfe7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 10 Sep 2018 16:56:40 +0200 Subject: gnu: fortify-headers: Update to 1.0. * gnu/packages/suckless.scm (fortify-headers): Update to 1.0. --- gnu/packages/suckless.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index dbfaa29127..a5e02ce948 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -561,7 +561,7 @@ environment variable.") (define-public fortify-headers (package (name "fortify-headers") - (version "0.9") + (version "1.0") (source (origin (method url-fetch) @@ -569,15 +569,15 @@ environment variable.") name "-" version ".tar.gz")) (sha256 (base32 - "1z517ajy34l2k5lz2gvhbmia9xjgagffi4s22azqxnlmgb1g2xfg")))) + "0nvplfg4y4a10x2j12qwmxzlk2q4j6287j0v5f9bfsdayb04qvh2")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; No tests + `(#:tests? #f ; no tests #:make-flags (list "CC=gcc" (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases - (delete 'configure)))) ; No configure script + (delete 'configure)))) ; no configure script (home-page "https://git.2f30.org/fortify-headers/") (synopsis "Standalone fortify-source implementation") (description -- cgit v1.2.3 From 98184e566c004871c3c3510d66dc669cd2ea4462 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 10 Sep 2018 16:51:02 +0200 Subject: gnu: gnome-mpv: Update to 0.15. * gnu/packages/video.scm (gnome-mpv): Update to 0.15. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 900575b828..d18726b33b 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1203,7 +1203,7 @@ projects while introducing many more.") (define-public gnome-mpv (package (name "gnome-mpv") - (version "0.14") + (version "0.15") (source (origin (method url-fetch) @@ -1212,7 +1212,7 @@ projects while introducing many more.") ".tar.xz")) (sha256 (base32 - "03kjwd5jq0i5ajnvhjwf5019bjjaa16xkdrhdkiz1k58ipjvvj93")))) + "1y47abkidxh1il0bvq8r3dglwn3ggsy41x2n7ic3x23wvvcqmq74")))) (native-inputs `(("intltool" ,intltool) ("pkg-config" ,pkg-config))) -- cgit v1.2.3 From d7e9bd15faddb2a7902f8745d927fdd5d73a5296 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 10 Sep 2018 13:22:35 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.155. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.155. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7d5b3aed86..f510e02ab9 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -452,8 +452,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.154" - "08i9fvrmswkydj538wg6c7ggxmhll0ff0bjkw8rnyslqwilfwr1i" + (make-linux-libre "4.4.155" + "1gcnwrgv0xghr550lcl6dmxdl59drzbi02mwp78g8vjql6ihdfys" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From 176999f18ed37e8e494fd9fa5ef12e67d6275386 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 10 Sep 2018 13:23:20 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.126. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.126. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f510e02ab9..1be1b37ec2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -446,8 +446,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.125" - "1saihk61l1kk42jf8yfsfkm77zalq31f0bdlam3c1g7yw702wj9g" + (make-linux-libre "4.9.126" + "0qa9zxa7isn20b9sbjcyrqfynd00phddv3yindp5dmvsng1kwxj8" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From c727ed05ac52e94de800e5d9c8efda16deaf1719 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 10 Sep 2018 13:24:01 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.69. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.69. (%linux-libre-4.14-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1be1b37ec2..183bd88fc3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -436,8 +436,8 @@ It has been modified to remove all non-free binary blobs.") #:patches %linux-libre-4.18-patches #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.68") -(define %linux-libre-4.14-hash "05l5y0vbbl60jxdbqglqr9c99a8g8lfsp4mcqfpcx1pkh5br7i3l") +(define %linux-libre-4.14-version "4.14.69") +(define %linux-libre-4.14-hash "08pw5hywlx3rsavj74qa17fm9hmhaw2rb1d3ahaqmd1zzsddb3qf") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.2.3 From eb07a6f8980eb71ea03bbb5e304db5d30e2c59c3 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 10 Sep 2018 13:25:54 -0400 Subject: gnu: linux-libre: Update to 4.18.7. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.18.7. (%linux-libre-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 183bd88fc3..d4e9a5de95 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -405,8 +405,8 @@ It has been modified to remove all non-free binary blobs.") ;; supports qemu "virt" machine and possibly a large number of ARM boards. ;; See : https://wiki.debian.org/DebianKernel/ARMMP. -(define %linux-libre-version "4.18.6") -(define %linux-libre-hash "1l5caid77vbfb54zrfxkk7qj7lrf9ck9kpn96kr45spkwl51wm8m") +(define %linux-libre-version "4.18.7") +(define %linux-libre-hash "1gn3ip2blczfr5hl20x6c93z8v7h528kl423pzkcn22hin6717wd") (define %linux-libre-4.18-patches (list %boot-logo-patch -- cgit v1.2.3 From 254844f22d81356ee00977e95640245281257661 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 10 Sep 2018 13:53:21 -0400 Subject: gnu: nano: Update to 3.0. * gnu/packages/nano.scm (nano): Update to 3.0. --- gnu/packages/nano.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/nano.scm b/gnu/packages/nano.scm index a7adfcd5d5..9396588fc8 100644 --- a/gnu/packages/nano.scm +++ b/gnu/packages/nano.scm @@ -30,7 +30,7 @@ (define-public nano (package (name "nano") - (version "2.9.8") + (version "3.0") (source (origin (method url-fetch) @@ -38,7 +38,7 @@ version ".tar.xz")) (sha256 (base32 - "122lm0z97wk3mgnbn8m4d769d4j9rxyc9z7s89xd4gsdp8qsrpn2")))) + "1868hg9s584fwjrh0fzdrixmxc2qhw520z4q5iv68kjiajivr9g0")))) (build-system gnu-build-system) (inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From 2424d5e56ced7ba02877fc52fd3b3b470bde15d7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 10 Sep 2018 20:11:37 +0200 Subject: gnu: cloc: Update source hash. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The upstream tarball was modified in place. The only changes are: --- /gnu/store/5v39h6zjs33hj5dm2yggz5qk0mva00bs-cloc-1.78.tar.gz +++ /gnu/store/pm5ghks76vv6awv3969yvi7qxqfnfs1l-cloc-1.78.tar.gz ├── filetype from file(1) │ @@ -1 +1 @@ │ -gzip compressed data, last modified: Fri Sep 7 18:22:49 2018, from Unix │ +gzip compressed data, last modified: Sat Sep 8 14:09:43 2018, from Unix │ --- 5v39h6zjs33hj5dm2yggz5qk0mva00bs-cloc-1.78.tar ├── +++ pm5ghks76vv6awv3969yvi7qxqfnfs1l-cloc-1.78.tar │ ├── file list │ │ @@ -1,13 +1,13 @@ │ │ -rwxrwxr-x 0 al (1000) al (1000) 545021 2018-09-07 18:21:22 cloc-1.78/cloc │ │ -rwxrwxr-x 0 al (1000) al (1000) 1818 2018-09-07 18:21:22 cloc-1.78/sqlite_formatter │ │ -drwxrwxr-x 0 al (1000) al (1000) 0 2018-09-07 18:21:22 cloc-1.78/Unix/ │ │ --rwxrwxr-x 0 al (1000) al (1000) 498571 2018-09-07 18:21:22 cloc-1.78/Unix/cloc │ │ +drwxrwxr-x 0 al (1000) al (1000) 0 2018-09-08 14:09:23 cloc-1.78/Unix/ │ │ +-rwxrwxr-x 0 al (1000) al (1000) 498537 2018-09-08 14:09:22 cloc-1.78/Unix/cloc │ │ -rwxrwxr-x 0 al (1000) al (1000) 32382 2018-09-07 18:21:22 cloc-1.78/Unix/t/00_C.t │ │ -rwxrwxr-x 0 al (1000) al (1000) 12614 2018-09-07 18:21:22 cloc-1.78/Unix/t/01_opts.t │ │ -rw-rw-r-- 0 al (1000) al (1000) 862 2018-09-07 18:21:22 cloc-1.78/Unix/README │ ├── cloc-1.78/Unix/cloc │ │ @@ -1,8 +1,7 @@ │ │ -#!/usr/local/perl/5.28.0/bin/perl │ │ #!/usr/bin/env perl * gnu/packages/code.scm (cloc)[source]: Update sha256 hash. --- gnu/packages/code.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index b3fbea0b38..4264e292bd 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -220,7 +220,7 @@ COCOMO model or user-provided parameters.") "/cloc-" version ".tar.gz")) (sha256 (base32 - "176xklr2qsgxh9zdb565gib6pp4gsm585rz5fvyphgjy4i679wkv")))) + "1j9lwy9xf43kpv1csqdxzch6y1hnsv881ddqd357f8v58dhr4s68")))) (build-system gnu-build-system) (inputs `(("coreutils" ,coreutils) -- cgit v1.2.3 From 8fe059bf6cc98347f200eaf55681beb6ff36582b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 01:14:25 +0200 Subject: gnu: python-cryptography: Update to 2.3.1. * gnu/packages/python-crypto.scm (python-cryptography-vectors, python-cryptography): Update to 2.3.1. --- gnu/packages/python-crypto.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index f612b99d01..63dc1a54df 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -361,14 +361,14 @@ is used by the Requests library to verify HTTPS requests.") (define-public python-cryptography-vectors (package (name "python-cryptography-vectors") - (version "2.2.2") + (version "2.3.1") (source (origin (method url-fetch) (uri (pypi-uri "cryptography_vectors" version)) (sha256 (base32 - "122na0c6r24ch2ifyr4ccjyih0inpqy7bc5za77699g3pa22rd98")))) + "0ijdck30p7jv8a0zwv8b7d30ciqrmmps62lm63l4k776vihrnkdz")))) (build-system python-build-system) (home-page "https://github.com/pyca/cryptography") (synopsis "Test vectors for the cryptography package") @@ -383,14 +383,14 @@ is used by the Requests library to verify HTTPS requests.") (define-public python-cryptography (package (name "python-cryptography") - (version "2.2.2") + (version "2.3.1") (source (origin (method url-fetch) (uri (pypi-uri "cryptography" version)) (sha256 (base32 - "0qrgip8vgcpk7v1jwf67mg50np5iprxrv8qrg8p382hkd6zrbhlz")))) + "1mnzf168vlxirq7fw9dm9zbvma7z8phc9cl5bffw5916m0y1244d")))) (build-system python-build-system) (inputs `(("openssl" ,openssl))) -- cgit v1.2.3 From ba0052e8ae3c36bf016f539ced2d889a78ba13e5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 16:15:33 +0200 Subject: gnu: python-tlsh: Update to 3.4.5. * gnu/packages/python.scm (python-tlsh): Update to 3.4.5. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 1d4b069d09..ce5db2f0e2 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6555,7 +6555,7 @@ Python Package Index (PyPI).") (define-public python-tlsh (package (name "python-tlsh") - (version "3.4.4") + (version "3.4.5") (home-page "https://github.com/trendmicro/tlsh") (source (origin (method url-fetch) @@ -6563,7 +6563,7 @@ Python Package Index (PyPI).") version ".tar.gz")) (sha256 (base32 - "00bhzjqrlh7v538kbkbn8lgx976j1138al3sdhklaizqjvpwyk4r")) + "1x1vahd4zg5kpyr9h9hs3fvh460p25rjy4cclwdnbbw8x3vc30q3")) (file-name (string-append name "-" version ".tar.gz")))) (build-system cmake-build-system) (arguments -- cgit v1.2.3 From 418ec0adc9ee8096683064f1aa0c486a8788e1ca Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 16:32:39 +0200 Subject: gnu: python-libarchive-c: Update to 2.8. * gnu/packages/python.scm (python-libarchive-c): Update to 2.8. [arguments]: Replace 'check' phase. [native-inputs]: Add PYTHON-MOCK and PYTHON-PYTEST. --- gnu/packages/python.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ce5db2f0e2..a8378bf360 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6624,13 +6624,13 @@ a hash value.") (define-public python-libarchive-c (package (name "python-libarchive-c") - (version "2.2") + (version "2.8") (source (origin (method url-fetch) (uri (pypi-uri "libarchive-c" version)) (sha256 (base32 - "0z4r7v3dhd6b3120mav05ff08srih176r2rg5k8kn7mjd9pslm2x")))) + "0qg0v1s9c1xdk9philhnv8k6c6nicvnvfwlc0j9srg90jmdlvm06")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases @@ -6642,7 +6642,12 @@ a hash value.") (substitute* "libarchive/ffi.py" (("find_library\\('archive'\\)") (string-append "'" libarchive - "/lib/libarchive.so'"))))))))) + "/lib/libarchive.so'")))))) + (replace 'check + (lambda _ (invoke "pytest" "-vv")))))) + (native-inputs + `(("python-mock" ,python-mock) + ("python-pytest" ,python-pytest))) (inputs `(("libarchive" ,libarchive))) (home-page "https://github.com/Changaco/python-libarchive-c") -- cgit v1.2.3 From fc449407fea373444fee97c03ce66f96e376acef Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 16:38:28 +0200 Subject: gnu: python-debian: Update home page. * gnu/packages/python.scm (python-debian)[home-page]: Set to source repository. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a8378bf360..a70e0a2a40 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6694,6 +6694,7 @@ serve the same purpose: provide Python bindings for libmagic."))) (define-public python-debian (package (name "python-debian") + (home-page "https://salsa.debian.org/python-debian-team/python-debian") (version "0.1.28") (source (origin @@ -6705,7 +6706,6 @@ serve the same purpose: provide Python bindings for libmagic."))) (build-system python-build-system) (propagated-inputs `(("python-six" ,python-six))) - (home-page "http://packages.debian.org/sid/python-debian") (synopsis "Debian package related modules") (description ;; XXX: Use @enumerate instead of @itemize to work around -- cgit v1.2.3 From c5e4b4cc8f424a453f064b7c8e5d434e72885392 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 9 Sep 2018 11:22:29 +0200 Subject: gnu: Add libabigail. * gnu/packages/elf.scm (libabigail): New public variable. --- gnu/packages/elf.scm | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 71 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index 82af1f233d..d8d7546e3c 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017, 2018 Efraim Flashner ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,8 +29,13 @@ #:use-module (guix build-system gnu) #:use-module ((guix licenses) #:select (gpl3+ lgpl3+ lgpl2.0+)) #:use-module (gnu packages) + #:use-module (gnu packages compression) + #:use-module (gnu packages documentation) #:use-module (gnu packages m4) - #:use-module (gnu packages compression)) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) + #:use-module (gnu packages texinfo) + #:use-module (gnu packages xml)) (define-public elfutils (package @@ -85,6 +91,70 @@ Executable and Linkable Format (@dfn{ELF}). This includes @command{ld}, ;; Libraries are dual-licensed LGPLv3.0+ | GPLv2, and programs are GPLv3+. (license lgpl3+))) +(define-public libabigail + (package + (name "libabigail") + (home-page "https://sourceware.org/libabigail/") + (version "1.4") + (source (origin + (method url-fetch) + (uri (string-append "https://sourceware.org/pub/" name + "/" name "-" version ".tar.gz")) + (sha256 + (base32 + "17r8i60lxykvdd9pdidmnvkzgf9k8zman0c1czl3zbx0znhlx497")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--disable-static" + "--enable-bash-completion" + "--enable-manual") + #:make-flags '("V=1") + #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + (substitute* "build-aux/ltmain.sh" + ;; Don't add -specs=/usr/lib/rpm/redhat/redhat-hardened-ld + ;; to the GCC command line. + (("compiler_flags=\"-specs=.*") + "compiler_flags=\n")) + #t)) + (add-after 'build 'build-documentation + (lambda _ + (invoke "make" "-C" "doc/manuals" "html-doc" "man" "info"))) + (add-before 'check 'set-test-environment + (lambda _ + (setenv "XDG_CACHE_HOME" "/tmp") + #t)) + (add-after 'install 'install-documentation + (lambda _ + (invoke "make" "-C" "doc/manuals" + "install-man-and-info-doc"))) + (add-after 'install-documentation 'install-bash-completion + (lambda* (#:key outputs #:allow-other-keys) + (for-each (lambda (file) + (install-file + file (string-append (assoc-ref outputs "out") + "/share/bash-completion" + "/completions"))) + (find-files "bash-completion" ".*abi.*")) + #t))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("makeinfo" ,texinfo) + ("python-sphinx" ,python-sphinx) + ("python" ,python))) ;for tests + (propagated-inputs + `(("elfutils" ,elfutils) ;libabigail.la says -lelf + ("libxml2" ,libxml2))) ;in Requires.private of libabigail.pc + (synopsis "Analyze application binary interfaces (ABIs)") + (description + "@dfn{ABIGAIL} stands for the Application Binary Interface Generic +Analysis and Instrumentation Library. It is a framework which aims at +helping developers and software distributors to spot ABI-related issues +like interface incompatibility in ELF shared libraries by performing a +static analysis of the ELF binaries at hand.") + (license lgpl3+))) + (define-public libelf (package (name "libelf") -- cgit v1.2.3 From 9fc445b1a563b95347154523bcca489124141daf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 18:52:01 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From b8d165b18a310ddc8462cdbde41db273d5d2a27f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 19:02:17 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 242f2711bd3b3944eefc4065d685324b22369116 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 19:15:38 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 875d0681768408997cda108457aaf10116da3732 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 10 Sep 2018 15:42:07 -0400 Subject: Adjust all users of (gnu packages ldc) to use (gnu packages dlang). This is a followup to commit 98d6543f86d01486c2f6e808eedd97c601ba3e7a. * gnu/packages/bioinformatics.scm, guix/build-system/dub.scm: Adjust accordingly. --- gnu/packages/bioinformatics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index fc8be4d7db..f6410c3ca4 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -76,7 +76,7 @@ #:use-module (gnu packages imagemagick) #:use-module (gnu packages java) #:use-module (gnu packages jemalloc) - #:use-module (gnu packages ldc) + #:use-module (gnu packages dlang) #:use-module (gnu packages linux) #:use-module (gnu packages logging) #:use-module (gnu packages machine-learning) -- cgit v1.2.3 From d56eee862bbd8295351aecb049110e6b23a672c6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 10 Sep 2018 22:13:07 +0200 Subject: gnu: qtractor: Update to 0.9.2. * gnu/packages/music.scm (qtractor): Update to 0.9.2. [arguments]: Remove obsolete Qt 5.11 workaround. --- gnu/packages/music.scm | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index e39478e794..e563062018 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2198,28 +2198,17 @@ from the command line.") (define-public qtractor (package (name "qtractor") - (version "0.9.1") + (version "0.9.2") (source (origin (method url-fetch) (uri (string-append "http://downloads.sourceforge.net/qtractor/" "qtractor-" version ".tar.gz")) (sha256 (base32 - "07csbqr7q4m1j0pqg89kn7jdw0snd5lwna5rha0986s4plq4z1qb")))) + "1j3rpvdkw9rw48j4zyfn6rprp01csy4rl6zckcjyx0vh7vaycchr")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no "check" target - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-build-with-qt-5.11 - (lambda _ - (substitute* "src/qtractorMeter.h" - (("#include " m) - (string-append "#include \n" m))) - (substitute* "src/qtractorTrackButton.h" - (("#include " m) - (string-append "#include \n" m))) - #t))))) + `(#:tests? #f)) ; no "check" target (inputs `(("qt" ,qtbase) ("qtx11extras" ,qtx11extras) -- cgit v1.2.3 From 7a6eaf5ca9c12c2d844223080694b94953abf982 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 10 Sep 2018 21:47:32 +0200 Subject: gnu: python-parso: Update to 0.3.1. * gnu/packages/python.scm (python-parso): Update to 0.3.1. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a70e0a2a40..8d36883593 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -13519,14 +13519,14 @@ time-based (TOTP) passwords.") (define-public python-parso (package (name "python-parso") - (version "0.2.1") + (version "0.3.1") (source (origin (method url-fetch) (uri (pypi-uri "parso" version)) (sha256 (base32 - "0zvh4rdhv2wkglkgh0h9kn9ndpsw5p639wcwv47jn1kfp504lq7h")))) + "18p89iwcm8mnf380f92g9w0bhx5km8wxp392vvjcq4y1ld1llw1m")))) (native-inputs `(("python-pytest" ,python-pytest))) (build-system python-build-system) -- cgit v1.2.3 From cc12ac58a2cab7937e230db0db95c80919969f11 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 10 Sep 2018 21:48:05 +0200 Subject: gnu: python-jedi: Update to 0.12.1. * gnu/packages/python.scm (python-jedi): Update to 0.12.1. [synopsis, description]: Adjust to expanded functionality. --- gnu/packages/python.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 8d36883593..d1a912c15b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -9639,14 +9639,14 @@ characters, mouse support, and auto suggestions.") (define-public python-jedi (package (name "python-jedi") - (version "0.12.0") + (version "0.12.1") (source (origin (method url-fetch) (uri (pypi-uri "jedi" version)) (sha256 (base32 - "1bcr7csx4xil1iwmk03d79jis0bkmgi9k0kir3xa4rmwqsagcwhr")))) + "1h8ypnjisn57kiv1zqrkj1im6sbfnhxllqaa8znh39qkd47ys2dl")))) (build-system python-build-system) (arguments `(#:phases @@ -9658,11 +9658,14 @@ characters, mouse support, and auto suggestions.") ("python-parso" ,python-parso) ("python-docopt" ,python-docopt))) (home-page "https://github.com/davidhalter/jedi") - (synopsis - "Autocompletion for Python that can be used for text editors") + (synopsis "Autocompletion and static analysis library for Python") (description - "Jedi is an autocompletion tool for Python that can be used for text - editors.") + "Jedi is a static analysis tool for Python that can be used in Integrated +Development Environments (@dfn{IDE}s) and text editors. It understands Python +on a deeper level than many other static analysis frameworks for Python. + +Jedi understands docstrings and you can use Jedi autocompletion in your REPL as +well.") (license license:expat))) (define-public python2-jedi -- cgit v1.2.3 From c0ea7f5ff4e18a2e786529d47137ee6ec776434a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 10 Sep 2018 21:33:17 +0200 Subject: gnu: python-parse: Mark up description. * gnu/packages/python.scm (python-parse)[description]: Use @code{}. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index d1a912c15b..223a3c80e8 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1583,7 +1583,7 @@ backported for previous versions of Python from 2.4 to 3.3.") (home-page "https://github.com/r1chardj0n3s/parse") (synopsis "Parse strings") (description - "Parse strings using a specification based on the Python format() + "Parse strings using a specification based on the Python @code{format()} syntax.") (license license:x11))) -- cgit v1.2.3 From 86788cb0c9998e887b9e754ee43d36dced8f29db Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 10 Sep 2018 21:30:28 +0200 Subject: gnu: python-parse: Update to 1.8.4. * gnu/packages/python.scm (python-parse): Update to 1.8.4. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 223a3c80e8..3083cde08c 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1566,14 +1566,14 @@ backported for previous versions of Python from 2.4 to 3.3.") (define-public python-parse (package (name "python-parse") - (version "1.8.2") + (version "1.8.4") (source (origin (method url-fetch) (uri (pypi-uri "parse" version)) (sha256 (base32 - "1lj9v1q4imszyhvipb6drsm3xdl35nan011mqxxas1yaypixsj40")))) + "0f8997xr8nq2nq35iiviq8ningd1zvy59fg503xfpbi2dwhgdkf3")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 4b41568fa598f101b0a670f5882da88105218270 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 10 Sep 2018 21:00:20 +0200 Subject: gnu: python-binaryornot: Update to 0.4.4. * gnu/packages/python.scm (python-binaryornot): Update to 0.4.4. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 3083cde08c..a3eeb3c883 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -9844,13 +9844,13 @@ hardware-accelerated multitouch applications.") (define-public python-binaryornot (package (name "python-binaryornot") - (version "0.4.0") + (version "0.4.4") (source (origin (method url-fetch) (uri (pypi-uri "binaryornot" version)) (sha256 (base32 - "1j4f51dxic39mdwf6alj7gd769wy6mhk916v031wjali51xkh3xb")))) + "0qc006986rb6bcbmiymwgcl1mns2jphr1j7sr7nk41nlr7gh359m")))) (build-system python-build-system) (propagated-inputs `(("python-chardet" ,python-chardet) -- cgit v1.2.3 From 695775b138133db3c5a7a07916f45dc783fe9a11 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 10 Sep 2018 20:47:21 +0200 Subject: gnu: kakoune: Update to 2018.09.04. * gnu/packages/text-editors.scm (kakoune): Update to 2018.09.04. --- gnu/packages/text-editors.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 2536754eb7..d344ebdca0 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -102,7 +102,7 @@ based command language.") (define-public kakoune (package (name "kakoune") - (version "2018.04.13") + (version "2018.09.04") (source (origin (method url-fetch) @@ -111,7 +111,7 @@ based command language.") name "-" version ".tar.bz2")) (sha256 (base32 - "1kkzs5nrjxzd1jq7a4k7qfb5kg05871z0r3d9c0yhz9shf6wz36d")))) + "1qbj2hmcfs6pr5lc78z9ni5zxdyp3mr64dvms4l52716ikqcjcbs")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit v1.2.3 From 4105f13bb5e1ec946bfc9705498ed9aad2228bcf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 10 Sep 2018 22:53:28 +0200 Subject: gnu: tor: Update to 0.3.4.8. * gnu/packages/tor.scm (tor): Update to 0.3.4.8. --- gnu/packages/tor.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index e897dff639..7d46191c12 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -47,21 +47,21 @@ (define-public tor (package (name "tor") - (version "0.3.3.9") + (version "0.3.4.8") (source (origin (method url-fetch) (uri (string-append "https://dist.torproject.org/tor-" version ".tar.gz")) (sha256 (base32 - "0vyf5z0dn5jghp2qjp076aq62lsz9g32qv9jiqf08skf096nnd45")))) + "08qhzcmzxp5xr2l5721vagksqnnbrzzzy5hmz5y9r8lrq2r4qsl2")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list "--enable-gcc-hardening" "--enable-linker-hardening"))) (native-inputs `(("pkg-config" ,pkg-config) - ("python" ,python-2))) ; for tests + ("python" ,python-2))) ; for tests (inputs `(("zlib" ,zlib) ("openssl" ,openssl) -- cgit v1.2.3 From b38827096f6c3229ed6bfbfda3eaa28d78f3cbaa Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 10 Sep 2018 22:42:48 +0200 Subject: gnu: mcrl2: Use HTTPS home page. * gnu/packages/maths.scm (mcrl2)[home-page]: Use HTTPS. --- gnu/packages/maths.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 01bd03c600..4e1347e8fc 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3975,7 +3975,7 @@ toolset supports analysis and automatic verification, linearisation, simulation, state-space exploration and generation, and tools to optimise and analyse specifications. Also, state spaces can be manipulated, visualised and analysed.") - (home-page "http://mcrl2.org") + (home-page "https://mcrl2.org") (license license:boost1.0))) (define-public r-subplex -- cgit v1.2.3 From 2740549754f9d3d8ed1c3168d43ab820785cc5d7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 10 Sep 2018 20:47:05 +0200 Subject: gnu: kakoune: Use HTTPS home page. * gnu/packages/text-editors.scm (kakoune)[home-page]: Use HTTPS. --- gnu/packages/text-editors.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index d344ebdca0..0c60d202a3 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -147,7 +147,7 @@ commands are similar to Vi's ones, and it shares Vi's \"keystrokes as a text editing language\" model. Kakoune has a strong focus on interactivity, most commands provide immediate and incremental results, while still being competitive (as in keystroke count) with Vim.") - (home-page "http://kakoune.org/") + (home-page "https://kakoune.org/") (license license:unlicense))) (define-public joe -- cgit v1.2.3 From 029de52fe9f5f8aa2b2ef462c30118cbb9721f64 Mon Sep 17 00:00:00 2001 From: Thorsten Wilms Date: Mon, 10 Sep 2018 23:56:11 +0200 Subject: gnu: guitarix-lv2: Use correct configure flag. * gnu/packages/audio.scm (guitarix-lv2)[arguments]: Change configure flag. Signed-off-by: Ricardo Wurmus --- gnu/packages/audio.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 3b898c024a..7e6feec352 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1291,7 +1291,7 @@ auto-wah.") (arguments (substitute-keyword-arguments (package-arguments guitarix) ((#:configure-flags flags) - `(cons "--lv2-only" ,flags)))))) + `(cons "--no-standalone" ,flags)))))) (define-public rakarrack (package -- cgit v1.2.3 From d54145c38a5112cdb7af417600e13319df5d475c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 10 Sep 2018 23:57:41 +0200 Subject: gnu: guitarix: Update to 0.37.3. * gnu/packages/audio.scm (guitarix): Update to 0.37.3. [inputs]: Add curl. --- gnu/packages/audio.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 7e6feec352..8bce6fa2c2 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1231,7 +1231,7 @@ patches that can be used with softsynths such as Timidity and WildMidi.") (define-public guitarix (package (name "guitarix") - (version "0.37.1") + (version "0.37.3") (source (origin (method url-fetch) (uri (string-append @@ -1239,7 +1239,7 @@ patches that can be used with softsynths such as Timidity and WildMidi.") version ".tar.xz")) (sha256 (base32 - "064k0jzxqgx9gwf8za6jziansabzrwzjaim3qx1743ify5g3gaai")))) + "1wfm8wrwrnqpb4ihy75n7l9i6vml536jlq9pdx2pblbc4ba3paac")))) (build-system waf-build-system) (arguments `(#:tests? #f ; no "check" target @@ -1252,6 +1252,7 @@ patches that can be used with softsynths such as Timidity and WildMidi.") (inputs `(("libsndfile" ,libsndfile) ("boost" ,boost) + ("curl" ,curl) ("avahi" ,avahi) ("eigen" ,eigen) ("lv2" ,lv2) -- cgit v1.2.3 From 2f195b6f23865417284883bfebc3b697270130f5 Mon Sep 17 00:00:00 2001 From: pimi Date: Wed, 29 Aug 2018 10:28:15 +0200 Subject: gnu: Add r-mosaicdata. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cran.scm (r-mosaicdata): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/cran.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8144391729..11822e1aa5 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5564,3 +5564,22 @@ gf_density(), and so on, bring the formula interface to ggplot(). This captures and extends the excellent simplicity of the lattice-graphics formula interface, while providing the intuitive capabilities of @code{r-ggplot2}.") (license license:expat))) + +(define-public r-mosaicdata + (package + (name "r-mosaicdata") + (version "0.17.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "mosaicData" version)) + (sha256 + (base32 "04z0mdm52mykqsxsinhmsihn181zf6cw321gayk2rjp7lj7mwdq9")))) + (properties `((upstream-name . "mosaicData"))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/web/packages/mosaicData/") + (synopsis "Data sets for project Mosaic") + (description + "This package provides data sets from project Mosaic @url{http://mosaic-web.org} +used to teach mathematics, statistics, computation and modeling.") + (license license:gpl2+))) -- cgit v1.2.3 From 6c6ce2d08832ea4b854fe689ec1b3e4ac3ae60bc Mon Sep 17 00:00:00 2001 From: pimi Date: Wed, 29 Aug 2018 10:32:59 +0200 Subject: gnu: Add r-mosaic. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cran.scm (r-mosaic): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/cran.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 11822e1aa5..62d1d32669 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5583,3 +5583,43 @@ while providing the intuitive capabilities of @code{r-ggplot2}.") "This package provides data sets from project Mosaic @url{http://mosaic-web.org} used to teach mathematics, statistics, computation and modeling.") (license license:gpl2+))) + +(define-public r-mosaic + (package + (name "r-mosaic") + (version "1.4.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "mosaic" version)) + (sha256 + (base32 "10jbrg8kli00kfgbh2f67bymm5cnlancc9dplb1j7fl552yjddn2")))) + (build-system r-build-system) + (propagated-inputs + `(("r-broom" ,r-broom) + ("r-dplyr" ,r-dplyr) + ("r-ggdendro" ,r-ggdendro) + ("r-ggformula" ,r-ggformula) + ("r-ggplot2" ,r-ggplot2) + ("r-ggrepel" ,r-ggrepel) + ("r-glue" ,r-glue) + ("r-gridextra" ,r-gridextra) + ("r-lattice" ,r-lattice) + ("r-latticeextra" ,r-latticeextra) + ("r-lazyeval" ,r-lazyeval) + ("r-mass" ,r-mass) + ("r-matrix" ,r-matrix) + ("r-mosaiccore" ,r-mosaiccore) + ("r-mosaicdata" ,r-mosaicdata) + ("r-readr" ,r-readr) + ("r-tidyr" ,r-tidyr))) + (home-page "https://github.com/ProjectMOSAIC/mosaic/") + (synopsis "Mathematics, statistics, and computation teaching utilities") + (description + "This package contain data sets and utilities from +@url{http://mosaic-web.org, Project MOSAIC} used to teach mathematics, +statistics, computation and modeling. Project MOSAIC is a community of +educators working to tie together aspects of quantitative work that students +in science, technology, engineering and mathematics will need in their +professional lives, but which are usually taught in isolation, if at all.") + (license license:gpl2+))) -- cgit v1.2.3 From cbb0edd1be1f653d253258dfa90c8b45f288fb1b Mon Sep 17 00:00:00 2001 From: pimi Date: Wed, 29 Aug 2018 10:36:56 +0200 Subject: gnu: Add r-abd. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cran.scm (r-abd): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/cran.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 62d1d32669..5cd456914b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5623,3 +5623,25 @@ educators working to tie together aspects of quantitative work that students in science, technology, engineering and mathematics will need in their professional lives, but which are usually taught in isolation, if at all.") (license license:gpl2+))) + +(define-public r-abd + (package + (name "r-abd") + (version "0.2-8") + (source + (origin + (method url-fetch) + (uri (cran-uri "abd" version)) + (sha256 + (base32 "191gspqzdv573vaw624ri0f5cm6v4j524bjs74d4a1hn3kn6r9b7")))) + (build-system r-build-system) + (propagated-inputs + `(("r-lattice" ,r-lattice) + ("r-mosaic" ,r-mosaic) + ("r-nlme" ,r-nlme))) + (home-page "https://cran.r-project.org/web/packages/abd/") + (synopsis "Analysis of biological data") + (description + "The @code{r-abd} package contains data sets and sample code for the Analysis of +biological data by Michael Whitlock and Dolph Schluter.") + (license license:gpl2))) -- cgit v1.2.3 From 5d9c28f117fa6fa9d0b4439ac02e74a4656d25af Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 10 Sep 2018 18:39:28 -0400 Subject: gnu: git: Update to 2.19.0. * gnu/packages/version-control.scm (git): Update to 2.19.0. (cgit)[inputs]: Use the source of Git 2.18.0. --- gnu/packages/version-control.scm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 5e0b497ace..3774961786 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -146,14 +146,14 @@ as well as the classic centralized workflow.") (name "git") ;; XXX When updating Git, check if the special 'git-source' input to cgit ;; needs to be updated as well. - (version "2.18.0") + (version "2.19.0") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/scm/git/git-" version ".tar.xz")) (sha256 (base32 - "14hfwfkrci829a9316hnvkglnqqw1p03cw9k56p4fcb078wbwh4b")))) + "1x1y5z3awabmfg7hk6zb331jxngad4nal4507v96bnf0izsyy3qq")))) (build-system gnu-build-system) (native-inputs `(("native-perl" ,perl) @@ -166,7 +166,7 @@ as well as the classic centralized workflow.") version ".tar.xz")) (sha256 (base32 - "15k04s9pcc5wkmlfa8x99nbgczjbx0c91767ciqmjy9kwsavxqws")))))) + "1jvxiqvp9q4is3np063ny7rnmk5hm36d34bhi3cgv89njqdh8laf")))))) (inputs `(("curl" ,curl) ("expat" ,expat) @@ -642,7 +642,14 @@ collaboration using typical untrusted file hosts or services.") ("xz" ,xz))) (inputs `(;; Building cgit requires a Git source tree. - ("git-source" ,(package-source git)) + ("git-source" + ,(origin + (method url-fetch) + ;; XXX CGit is currently incompatible with Git > 2.18. + (uri "mirror://kernel.org/software/scm/git/git-2.18.0.tar.xz") + (sha256 + (base32 + "14hfwfkrci829a9316hnvkglnqqw1p03cw9k56p4fcb078wbwh4b")))) ("openssl" ,openssl) ("groff" ,groff) ("python" ,python) -- cgit v1.2.3 From 091ef8c97e714c136850e1751972e23fd420765c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 10 Sep 2018 19:24:31 -0400 Subject: gnu: VLC: Update to 3.0.4. * gnu/packages/video.scm (vlc): Update to 3.0.4. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index d18726b33b..aa2b4467fc 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -864,7 +864,7 @@ videoformats depend on the configuration flags of ffmpeg.") (define-public vlc (package (name "vlc") - (version "3.0.3-1") + (version "3.0.4") (source (origin (method url-fetch) (uri (string-append @@ -874,7 +874,7 @@ videoformats depend on the configuration flags of ffmpeg.") (patches (list %vlc-libx264-compat.patch)) (sha256 (base32 - "1p7qvdvg9w4lz8vckzhn6bswfkq3qw7fqkgvwjcskdgc266xx7dw")))) + "17jsq0zqpqyxw4ckvjba0hf6zk8ywc4wf8sy3z03hh3ij0vxpwq1")))) (build-system gnu-build-system) (native-inputs `(("flex" ,flex) -- cgit v1.2.3 From e76709f71fa4c6ccf1c428a024c25c25a29854e6 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 1 Sep 2018 21:10:36 -0400 Subject: gnu: go-github-com-syncthing-notify: Update to 0.0.0-2.b76b458. * gnu/packages/syncthing.scm (go-github-com-syncthing-notify): Update to 0.0.0-2.b76b458. --- gnu/packages/syncthing.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 6577955496..0a5136cad4 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -1063,8 +1063,8 @@ using sh's word-splitting rules.") (license expat)))) (define-public go-github-com-syncthing-notify - (let ((commit "cdf89c4039d13726e227d0a472053ea19de021b4") - (revision "1")) + (let ((commit "b76b45868a77e7800dd06cce61101af9c4274bcc") + (revision "2")) (package (name "go-github-com-syncthing-notify") (version (git-version "0.0.0" revision commit)) @@ -1076,7 +1076,7 @@ using sh's word-splitting rules.") (file-name (git-file-name name version)) (sha256 (base32 - "1ra1id9r06i4q8vhrrv1zpybhjxs3361rg35758dxglkyk4pzk6j")))) + "1xxkzaxygxxr51i2kdxsdaqb5i95hqpkw4kcr75wmsp914slw2q9")))) (build-system go-build-system) (arguments '(#:import-path "github.com/syncthing/notify")) -- cgit v1.2.3 From b4ff75b5072613beaa66b72d1da4a30679ac7600 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 7 Aug 2018 13:34:20 -0400 Subject: gnu: syncthing: Update to 0.14.50. * gnu/packages/syncthing.scm (syncthing): Update to 0.14.50. --- gnu/packages/syncthing.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 0a5136cad4..29caaaf02e 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -30,7 +30,7 @@ (define-public syncthing (package (name "syncthing") - (version "0.14.49") + (version "0.14.50") (source (origin (method url-fetch) (uri (string-append "https://github.com/syncthing/syncthing" @@ -38,7 +38,7 @@ "/syncthing-source-v" version ".tar.gz")) (sha256 (base32 - "06mzzj5iwgqw3yva7azrsqs9zpl84srbamza4gm03grp7v9gf3sj")) + "0yjj6zzivzw289bhwqjb4xcv8p39n5mcwwr5w6xf5ykzljc5pk55")) (modules '((guix build utils))) ;; Delete bundled ("vendored") free software source code. (snippet '(begin -- cgit v1.2.3 From f659e5e379dc3ec43be27a8e3169fe2ed197bb93 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 11 Sep 2018 13:19:47 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 36e8185667c41740786d9b2eb3672a0f8b902ed8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 11 Sep 2018 14:00:20 +0200 Subject: 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(+) (limited to 'gnu') 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 -- cgit v1.2.3 From 41a659d2ecb95c80cbf29f5b0c5d78381550fbca Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 11 Sep 2018 01:50:40 +0200 Subject: gnu: usbredir: Update to 0.8.0. * gnu/packages/spice.scm (usbredir): Update to 0.8.0. [source]: Use URL-FETCH. [native-inputs]: Remove AUTOCONF, AUTOMAKE and LIBTOOL. [arguments]: Remove. --- gnu/packages/spice.scm | 76 +++++++++++++++----------------------------------- 1 file changed, 22 insertions(+), 54 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index 69bc2b82cb..fc08a1dfdf 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -19,7 +19,6 @@ (define-module (gnu packages spice) #:use-module (gnu packages) - #:use-module (gnu packages autotools) ; remove after updating usbredir to 0.7.1+ #:use-module (gnu packages compression) #:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages gl) @@ -40,64 +39,33 @@ #:use-module (gnu packages xml) #:use-module (guix build-system gnu) #:use-module (guix download) - #:use-module (guix git-download) ; remove after updating usbredir to 0.7.1+ #:use-module (guix packages) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix utils)) (define-public usbredir - (let ((commit "ac80a5971c6318d73d5fba4b5f13d3a9389558c9") - (revision "1")) ;Guix package revision - (package - (name "usbredir") - (version (string-append "0.7.1-" revision "." - (string-take commit 7))) - ;(version "0.7.1") - ;(source (origin - ; (method url-fetch) - ; (uri (string-append - ; "http://spice-space.org/download/usbredir/" - ; "usbredir-" version ".tar.bz2")) - ; (sha256 - ; (base32 - ; "1wsnmk4wjpdhbn1zaxg6bmyxspcki2zgy0am9lk037rnl4krwzj0")))) - ; FIXME: usbredir 0.7.1 release doesn't build on 32 bit systems. - ; issue is fixed in HEAD - ; remove 'autogen phase and autoconf, automake, libtool inputs - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://anongit.freedesktop.org/git/spice/usbredir.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "052fywgi72j68dr5ybldncg4vk8iqfrh58la7iazyxxpph9aag1g")))) - (build-system gnu-build-system) - (propagated-inputs - `(("libusb" ,libusb))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'autogen - (lambda _ - ;; Build without '-Werror', in particular to avoid errors due - ;; to the use of the deprecated 'libusb_set_debug' function. - (substitute* "configure.ac" - (("-Werror") "")) - (zero? (system* "autoreconf" "-vfi"))))))) - (synopsis "Tools for sending USB device traffic over a network") - (description "Usbredir is a network protocol for sending USB device traffic - over a network connection. It can be used to redirect traffic from a USB device - to a different (virtual) machine than the one to which the USB device is - attached.") - (home-page "https://www.spice-space.org") - (license (list license:gpl2+ license:lgpl2.0+ license:lgpl2.1+))))) + (package + (name "usbredir") + (home-page "https://spice-space.org") + (version "0.8.0") + (source (origin + (method url-fetch) + (uri (string-append home-page "/download/" name "/" name "-" + version ".tar.bz2")) + (sha256 + (base32 + "002yik1x7kn0427xahvnhjby2np14a6xqw7c3dx530n9h5d9rg47")))) + (build-system gnu-build-system) + (propagated-inputs + `(("libusb" ,libusb))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (synopsis "Tools for sending USB device traffic over a network") + (description + "Usbredir is a network protocol for sending USB device traffic over a +network connection. It can be used to redirect traffic from a USB device to a +different (virtual) machine than the one to which the USB device is attached.") + (license (list license:gpl2+ license:lgpl2.0+ license:lgpl2.1+)))) (define-public virglrenderer (package -- cgit v1.2.3 From f6b7ccc9f9e72c6492c7be37ff7da769081dc2cc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 11 Sep 2018 01:58:06 +0200 Subject: gnu: spice: Update to 0.14.1 [fixes CVE-2018-10873]. * gnu/packages/spice.scm (spice): Update to 0.14.1. [source](uri): Update to new "spice-server" subdirectory. [native-inputs]: Add GLIB-NETWORKING and GSETTINGS-DESKTOP-SCHEMAS. [arguments]: Remove configure-flag which is now off even when celt is available. Add phase to set $SSL_CERT_FILE. --- gnu/packages/spice.scm | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index fc08a1dfdf..e708d726bb 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -177,15 +177,15 @@ which allows users to view a desktop computing environment.") (define-public spice (package (name "spice") - (version "0.14.0") + (version "0.14.1") (source (origin (method url-fetch) (uri (string-append "https://www.spice-space.org/download/releases/" - "spice-" version ".tar.bz2")) + "spice-server/spice-" version ".tar.bz2")) (sha256 (base32 - "0j5q7cp5p95jk8fp48gz76rz96lifimdsx1wnpmfal0nnnar9nrs")))) + "068mb9l7wzk4k4c65bzvpw5fyyzh81rb6z81skgdxvh67pk5vb8y")))) (build-system gnu-build-system) (propagated-inputs `(("openssl" ,openssl) @@ -202,12 +202,18 @@ which allows users to view a desktop computing environment.") (native-inputs `(("pkg-config" ,pkg-config) ("python" ,python) - ("spice-gtk" ,spice-gtk))) + ("spice-gtk" ,spice-gtk) + + ;; These are needed for the server listen tests. + ("glib-networking" ,glib-networking) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas))) (arguments `(#:configure-flags - '("--disable-celt051" ; Disable support for unpackaged audio codec - "--enable-lz4" - "--enable-automated-tests"))) + '("--enable-lz4" + "--enable-automated-tests") + #:phases (modify-phases %standard-phases + (add-before 'check 'use-empty-ssl-cert-file + (lambda _ (setenv "SSL_CERT_FILE" "/dev/null") #t))))) (synopsis "Server implementation of the SPICE protocol") (description "SPICE is a remote display system built for virtual environments which allows you to view a computing 'desktop' environment -- cgit v1.2.3 From 01af264dcbfb66aa3bc23f56335c6d64163cca8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C4=83d=C4=83lin=20Ionel=20Patra=C8=99cu?= Date: Sat, 8 Sep 2018 22:54:58 +0200 Subject: gnu: Add r-svgui. * gnu/packages/cran.scm (r-svgui): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 5cd456914b..ab989abfff 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -33,6 +33,8 @@ #:use-module (guix build-system r) #:use-module (gnu packages compression) #:use-module (gnu packages gcc) + #:use-module (gnu packages gnome) + #:use-module (gnu packages gtk) #:use-module (gnu packages machine-learning) #:use-module (gnu packages maths) #:use-module (gnu packages mpi) @@ -5645,3 +5647,24 @@ professional lives, but which are usually taught in isolation, if at all.") "The @code{r-abd} package contains data sets and sample code for the Analysis of biological data by Michael Whitlock and Dolph Schluter.") (license license:gpl2))) + +(define-public r-svgui + (package + (name "r-svgui") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "svGUI" version)) + (sha256 + (base32 "1r7ab0p4yr8q03gj02hmj7k1ghksgkg4nx750c0ajfs2q9y1dxfc")))) + (properties `((upstream-name . "svGUI"))) + (build-system r-build-system) + (home-page "https://github.com/SciViews/svGUI/") + (synopsis "Functions for managing GUI clients in R") + (description + "The SciViews @code{svGUI} package eases the management of Graphical User +Interfaces (GUI) in R. It is independent from any particular GUI widgets. It +centralizes info about GUI elements currently used, and it dispatches GUI +calls to the particular toolkits in use in function of the context.") + (license license:gpl2))) -- cgit v1.2.3 From 828fa94d7a234383fa479f769f220a7ec501bbdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 11 Sep 2018 12:00:26 +0200 Subject: gnu: guile-simple-zmq, jupyter-guile-kernel: Update to 5bb66a0 and a7db924. * gnu/packages/guile.scm (guile-simple-zmq): Update to 5bb66a0. (jupyter-guile-kernel): Update to a7db924. --- gnu/packages/guile.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 05d9315214..16db4ea5e4 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -2056,8 +2056,8 @@ convenient nested tree operations.") (license license:gpl3+))) (define-public guile-simple-zmq - (let ((commit "1f3b7c0b9b249c6fde8e8a632b252d8a1b794424") - (revision "1")) + (let ((commit "5bb66a0499f94006cfd18b58e80ad6623f911c31") + (revision "2")) (package (name "guile-simple-zmq") (version (git-version "0.0.0" revision commit)) @@ -2069,7 +2069,7 @@ convenient nested tree operations.") (commit commit))) (sha256 (base32 - "0nj2pd5bsmmgd3c54wh4sixfhmsv1arsq7yam2d7487h3n9q57r7")) + "0dj1brjqa7m4k71sf94aq26ca0la3nr894kfmjnqkpawqfp4dyaz")) (file-name (git-file-name name version)))) (build-system guile-build-system) (arguments @@ -2094,8 +2094,8 @@ messaging library.") (license license:gpl3+)))) (define-public jupyter-guile-kernel - (let ((commit "a5c5f3ea3215b65e770bcb62f71117b0ec4575ed") - (revision "0")) + (let ((commit "a7db9245a886e104138474df46c3e88b95cff629") + (revision "1")) (package (name "jupyter-guile-kernel") (version (git-version "0.0.0" revision commit)) @@ -2107,7 +2107,7 @@ messaging library.") (commit commit))) (sha256 (base32 - "0y5jr0f0dyskvsawqbf6n0bpg8jirw4mhqbarf2a6p9lxhqha9s9")))) + "0aj04853bqm47ivfcmrgpb7w3wkis847kc7qrwsa5zcn9h38qh2f")))) (build-system guile-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 8539eb5c464015cf3b4417d859b275f105991d77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 11 Sep 2018 15:10:46 +0200 Subject: gnu: jupyter-guile-kernel: Add dependencies to the search path. This allows: guix environment --ad-hoc jupyter jupyter-guile-kernel \ -- jupyter notebook to work out-of-the-box. * gnu/packages/guile.scm (jupyter-guile-kernel)[arguments]: In 'install-kernel' phase, add '-L' and '-C' flags to 'kernel.json'. [propagated-inputs]: Remove. [inputs]: Add GUILE-JSON and GUILE-SIMPLE-ZMQ. --- gnu/packages/guile.scm | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 16db4ea5e4..4ee887b749 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -2130,9 +2130,13 @@ messaging library.") (add-after 'install 'install-kernel (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (dir (string-append - out "/share/jupyter/kernels/guile"))) + (let* ((out (assoc-ref outputs "out")) + (json (assoc-ref inputs "guile-json")) + (zmq (assoc-ref inputs "guile-simple-zmq")) + (deps (list json zmq)) + (dir (string-append + out "/share/jupyter/kernels/guile")) + (effective (target-guile-effective-version))) ;; Install kernel. (install-file "src/kernel.json" dir) @@ -2146,13 +2150,30 @@ messaging library.") (string-append "\"" (assoc-ref inputs "guile") "/bin/guile\"")) (("-s") - (string-append "--no-auto-compile\", \"-s"))) + ;; Add '-L' and '-C' flags so that the kernel + ;; finds its dependencies. + (let ((-L (map (lambda (item) + (string-append "\"" item + "/share/guile/site/" + effective "\"")) + deps)) + (-C (map (lambda (item) + (string-append "\"" item + "/lib/guile/" + effective + "/site-ccache\"")) + deps))) + (string-append "--no-auto-compile\"" + (string-join -L ", \"-L\", " + 'prefix) + (string-join -C ", \"-C\", " + 'prefix) + ", \"-s")))) #t)))))) (inputs `(("openssl" ,openssl) - ("guile" ,guile-2.2))) - (propagated-inputs - `(("guile-json" ,guile-json) + ("guile" ,guile-2.2) + ("guile-json" ,guile-json) ("guile-simple-zmq" ,guile-simple-zmq))) (synopsis "Guile kernel for the Jupyter Notebook") (description -- cgit v1.2.3 From d2fe71b04d21d9f0374aa371e3229230e96dd97b Mon Sep 17 00:00:00 2001 From: Tim Gesthuizen Date: Thu, 30 Aug 2018 17:39:57 +0200 Subject: gnu: Add emacs-irony-mode. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs.scm (emacs-irony-mode): New variable. (emacs-irony-mode-server): New variable. Co-authored-by: Ludovic Courtès --- gnu/packages/emacs.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index bf163d8109..47c7685e9a 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -64,6 +64,7 @@ #:use-module (guix monads) #:use-module (guix store) #:use-module (guix build-system gnu) + #:use-module (guix build-system cmake) #:use-module (guix build-system emacs) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system trivial) @@ -85,6 +86,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages xorg) #:use-module (gnu packages lesstif) + #:use-module (gnu packages llvm) #:use-module (gnu packages image) #:use-module (gnu packages linux) #:use-module (gnu packages version-control) @@ -2730,6 +2732,49 @@ front-ends. Company comes with many back-ends, e.g. @code{company-elisp}. These are distributed in separate files and can be used individually.") (license license:gpl3+))) +(define-public emacs-irony-mode + (package + (name "emacs-irony-mode") + (version "1.2.0") + (home-page "https://github.com/Sarcasm/irony-mode") + (source (origin + (method url-fetch) + (uri (string-append home-page "/archive/v" version ".tar.gz")) + (sha256 + (base32 + "1f68zi0glkg2aly66s07rx3w0b0hdi1znxan02h6dbabaadylk99")) + (file-name (string-append name "-" version ".tar.gz")))) + (build-system emacs-build-system) + (arguments '()) + (propagated-inputs + `(("emacs-irony-mode-server" ,emacs-irony-mode-server))) + (synopsis "C/C++/ObjC Code completion and syntax checks for Emacs") + (description "Irony-mode provides Clang-assisted syntax checking and +completion for C, C++, and ObjC in GNU Emacs. Using @code{libclang} it can +provide syntax checking and autocompletion on compiler level which is very +resistent against false positives. It also integrates well with other +packages like @code{eldoc-mode} and especially @code{company-mode} as +described on the homepage.") + (license license:gpl3+))) + +(define-public emacs-irony-mode-server + (package (inherit emacs-irony-mode) + (name "emacs-irony-mode-server") + (inputs + `(("clang" ,clang))) + (propagated-inputs '()) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (invoke "cmake" + "server" + (string-append "-DCMAKE_INSTALL_PREFIX=" out)) #t)))))) + (build-system cmake-build-system) + (synopsis "Server for the Emacs @dfn{irony mode}"))) + (define-public emacs-company-quickhelp (package (name "emacs-company-quickhelp") -- cgit v1.2.3 From aa82260bc098c3a2142230c6b787c39c00843ce1 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Tue, 11 Sep 2018 09:38:39 +0100 Subject: gnu: arpack-ng-openmpi: Fix build. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (arpack-ng-openmpi)[arguments]: Add 'set-test-environment phase. Signed-off-by: Ludovic Courtès --- gnu/packages/maths.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 4e1347e8fc..d1db75e658 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -508,7 +508,17 @@ large scale eigenvalue problems.") (arguments (substitute-keyword-arguments (package-arguments arpack-ng) ((#:configure-flags _ '()) - ''("--enable-mpi")))) + ''("--enable-mpi")) + ((#:phases phases '%standard-phases) + `(modify-phases ,phases + (add-before 'check 'set-test-environment + (lambda _ + ;; By default, running the test suite would fail because 'ssh' + ;; could not be found in $PATH. Define this variable to + ;; placate Open MPI without adding a dependency on OpenSSH (the + ;; agent isn't used anyway.) + (setenv "OMPI_MCA_plm_rsh_agent" (which "cat")) + #t)))))) (synopsis "Fortran subroutines for solving eigenvalue problems with MPI"))) (define-public lapack -- cgit v1.2.3 From aeba7d4650f6d725f4751aa142cd1aae5ee3be97 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Tue, 11 Sep 2018 07:58:36 +0200 Subject: gnu: Add libnumbertext. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/libreoffice.scm (libnumbertext): New public variable. Signed-off-by: Ludovic Courtès --- gnu/packages/libreoffice.scm | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 3dc7a4bbf2..d81f8aa793 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2017, 2018 Marius Bakke ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2018 Ricardo Wurmus +;;; Copyright © 2018 Jonathan Brielmaier ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,7 +33,7 @@ #:use-module (guix download) #:use-module ((guix licenses) #:select (gpl2+ lgpl2.1+ lgpl3+ mpl1.1 mpl2.0 - non-copyleft x11-style)) + non-copyleft x11-style bsd-3)) #:use-module (guix packages) #:use-module (guix utils) #:use-module (ice-9 match) @@ -524,6 +525,35 @@ Aldus/Macromedia/Adobe FreeHand documents.") Microsoft Publisher documents of all versions.") (license mpl2.0))) +(define-public libnumbertext + (package + (name "libnumbertext") + (version "1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/numbertext/" name + "/archive/" version ".tar.gz")) + (sha256 + (base32 + "0wnsn4911fdd2na8jxkcvmk04a6xw6qlviic9w4qwg9fcym6866v")) + (file-name (string-append name "-" version ".tar.gz")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--disable-static"))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (home-page "https://github.com/Numbertext/libnumbertext") + (synopsis "Language-neutral @code{NUMBERTEXT} and @code{MONEYTEXT} functions") + (description + "The libnumbertext library provides language-neutral @code{NUMBERTEXT} +and @code{MONEYTEXT} functions for LibreOffice Calc, available for C++ and +Java.") + (license (list lgpl3+ bsd-3)))) + (define-public libpagemaker (package (name "libpagemaker") -- cgit v1.2.3 From 52b0a352c376eaed4ae7cf109f66538d6ac0a859 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Tue, 11 Sep 2018 07:59:11 +0200 Subject: gnu: libreoffice: Update to 6.1.0.3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/libreoffice.scm (libreoffice): Update to 6.1.0.3. [source]: Correct indenting. [inputs]: Add libnumbertext and python-lxml. Signed-off-by: Ludovic Courtès --- gnu/packages/libreoffice.scm | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index d81f8aa793..cf8082bcaa 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -926,19 +926,19 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") (define-public libreoffice (package (name "libreoffice") - (version "6.0.6.2") + (version "6.1.0.3") (source (origin - (method url-fetch) - (uri + (method url-fetch) + (uri (string-append - "https://download.documentfoundation.org/libreoffice/src/" - (version-prefix version 3) "/libreoffice-" version ".tar.xz")) - (sha256 - (base32 - "13kaikaz65xw9a3hxbh245cnydjpy58np22c7s0s65pnmcq68rpi")) - (patches (search-patches "libreoffice-icu.patch" - "libreoffice-glm.patch")))) + "https://download.documentfoundation.org/libreoffice/src/" + (version-prefix version 3) "/libreoffice-" version ".tar.xz")) + (sha256 + (base32 + "1n7b6abc0bp9x8lddx60w5br444wf62mdlkqmfk2zmkmiwkcvv2l")) + (patches (search-patches "libreoffice-icu.patch" + "libreoffice-glm.patch")))) (build-system gnu-build-system) (native-inputs `(("bison" ,bison) @@ -979,6 +979,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") ("libltdl" ,libltdl) ("libmspub" ,libmspub) ("libmwaw" ,libmwaw) + ("libnumbertext" ,libnumbertext) ("libodfgen" ,libodfgen) ("libpagemaker" ,libpagemaker) ("libqxp" ,libqxp) @@ -1005,6 +1006,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") ("poppler" ,poppler) ("postgresql" ,postgresql) ("python" ,python) + ("python-lxml" ,python-lxml) ("redland" ,redland) ("sane-backends" ,sane-backends) ("unixodbc" ,unixodbc) -- cgit v1.2.3 From 702a87f2d14809ef241cd2dbb947c70ec59b9f08 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 11 Sep 2018 18:31:55 +0200 Subject: gnu: perl-dbd-mysql: Update to 4.047. * gnu/packages/databases.scm (perl-dbd-mysql): Update to 4.047. [arguments]: Add 'skip-library-detection' phase. --- gnu/packages/databases.scm | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index ecc14c259a..9db892a0b7 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1458,7 +1458,7 @@ columns, primary keys, unique constraints and relationships.") (define-public perl-dbd-mysql (package (name "perl-dbd-mysql") - (version "4.046") + (version "4.047") (source (origin (method url-fetch) @@ -1466,10 +1466,24 @@ columns, primary keys, unique constraints and relationships.") "DBD-mysql-" version ".tar.gz")) (sha256 (base32 - "1xziv9w87cl3fbl1mqkdrx28mdqly3gs6gs1ynbmpl2rr4p6arb1")))) + "0idizgr0hr7sj92fbdlb3gv6cva15jkpaq28wrdw4j4p7awx2mls")))) (build-system perl-build-system) - ;; Tests require running MySQL server - (arguments `(#:tests? #f)) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'skip-library-detection + ;; Avoid depencies on perl-devel-checklib, openssl, and zlib. They + ;; are really only needed for the test suite; their absence does not + ;; affect the build or the end result. + (lambda _ + (substitute* "Makefile.PL" + (("use Devel::CheckLib;" match) + (string-append "# " match)) + (("assert_lib") + "print")) + #t))) + ;; Tests require running MySQL server. + #:tests? #f)) (propagated-inputs `(("perl-dbi" ,perl-dbi) ("mysql" ,mysql))) -- cgit v1.2.3 From cd1e138cc645bb7cd4e3613e7479e8f047bbf3c2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 11 Sep 2018 15:53:11 +0200 Subject: gnu: unbound: Update to 1.8.0. * gnu/packages/dns.scm (unbound): Update to 1.8.0. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 29c3d9b923..00135294be 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -292,7 +292,7 @@ asynchronous fashion.") (define-public unbound (package (name "unbound") - (version "1.7.3") + (version "1.8.0") (source (origin (method url-fetch) @@ -300,7 +300,7 @@ asynchronous fashion.") version ".tar.gz")) (sha256 (base32 - "0bb0p8nbda77ghx20yfl7hqxm9x709223q35465v99i8v4ay27f1")))) + "0gxqc4ynd2g1a5dwaazqh9n8injh49a7dz0l9bbxqgv47dnrvxvq")))) (build-system gnu-build-system) (outputs '("out" "python")) (native-inputs -- cgit v1.2.3 From a93de1ae9efbed3270967eda59b1dd1078c0213b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 20 Aug 2018 17:09:10 +0200 Subject: gnu: obnam: Add deprecation warning. * gnu/packages/backup.scm (obnam)[synopsis, description]: Note its retirement. --- gnu/packages/backup.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index bd4a177ecd..ea5bc8e398 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -740,12 +740,15 @@ NTFS volumes using @code{ntfs-3g}, preserving NTFS-specific attributes.") ("python2-pep8" ,python2-pep8) ("python2-pylint" ,python2-pylint))) (home-page "https://obnam.org/") - (synopsis "Easy and secure backup program") - (description "Obnam is an easy, secure backup program. Features -include snapshot backups, data de-duplication and encrypted backups -using GnuPG. Backups can be stored on local hard disks, or online via -the SSH SFTP protocol. The backup server, if used, does not require -any special software, on top of SSH.") + (synopsis "Retired backup program") + (description + "Warning: @uref{https://blog.liw.fi/posts/2017/08/13/retiring_obnam/, +the Obnam project is retired}. You should use another backup solution instead. + +Obnam was an easy, secure backup program. Features included snapshot backups, +data de-duplication and encrypted backups using GnuPG. Backups can be stored on +local hard disks, or online via the SSH SFTP protocol. The backup server, if +used, does not require any special software, on top of SSH.") (license license:gpl3+))) (define-public dirvish -- cgit v1.2.3 From 9b83c15afe65f9d5f6af4f2e2daad3fdf04c4f39 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 10 Sep 2018 20:57:30 +0200 Subject: gnu: snakemake: Update to 5.2.2. * gnu/packages/python.scm (snakemake): Update to 5.2.2. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a3eeb3c883..4efb23b51b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5160,13 +5160,13 @@ Python.") (define-public snakemake (package (name "snakemake") - (version "5.2.0") + (version "5.2.2") (source (origin (method url-fetch) (uri (pypi-uri "snakemake" version)) (sha256 - (base32 "0a1i5v5qxbmmpznp7my9nva8y7pxp8pjrwk2gxgisdskg35sq8s1")))) + (base32 "18x36n78ph5v1fxk54gvdbc3d8nfncha78phifg3lqaa9gifgzxd")))) (build-system python-build-system) (arguments ;; TODO: Package missing test dependencies. -- cgit v1.2.3 From a855117c592376df4d0b44d4c17304bbca5ef828 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 11 Sep 2018 21:11:36 +0200 Subject: gnu: snakemake: Update home page. * gnu/packages/python.scm (snakemake)[home-page]: Update. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 4efb23b51b..6367def203 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5195,7 +5195,7 @@ Python.") ("python-networkx" ,python-networkx) ("python-pyyaml" ,python-pyyaml) ("python-ratelimiter" ,python-ratelimiter))) - (home-page "https://bitbucket.org/snakemake/snakemake/wiki/Home") + (home-page "https://snakemake.readthedocs.io") (synopsis "Python-based execution environment for make-like workflows") (description "Snakemake aims to reduce the complexity of creating workflows by -- cgit v1.2.3 From 4a67079f71c264950aa7c43c5fdaa7611298a3c4 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 11 Sep 2018 22:29:39 +0200 Subject: gnu: mes: Oops, use mirror://gnu download url. * gnu/packages/mes.scm (mes): Oops, use mirror://gnu download url. --- gnu/packages/mes.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 63a8db449a..880e140b80 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -66,7 +66,7 @@ extensive examples, including parsers for the Javascript and C99 languages.") (version "0.17.1") (source (origin (method url-fetch) - (uri (string-append "http://alpha.gnu.org/gnu/mes/" + (uri (string-append "mirror://gnu/mes/" "mes-" version ".tar.gz")) (patches (search-patches "mes-nyacc-0.86.0.patch")) (sha256 -- cgit v1.2.3 From 475e16578f415485e018d0e77ed548cd29fb61d5 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 11 Sep 2018 23:34:12 +0200 Subject: gnu: emacs-helm-system-packages: Update to 1.10.1. * gnu/packages/emacs.scm (emacs-helm-system-packages): Update to 1.10.1. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 47c7685e9a..540915510f 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -5673,7 +5673,7 @@ Yasnippet.") (define-public emacs-helm-system-packages (package (name "emacs-helm-system-packages") - (version "1.10.0") + (version "1.10.1") (source (origin (method git-fetch) (uri (git-reference @@ -5682,7 +5682,7 @@ Yasnippet.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0y5wzvfycb1bvgdk782xyl744fih43vz14wmq6gcqjarw6xfniz5")))) + "01by0c4lqi2cw8xmbxkjw7m9x78zssm31sx4hdpw5j35s2951j0f")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-helm" ,emacs-helm))) -- cgit v1.2.3 From ac9e3077402dd1ff57ca2796e6313a6c26f9a769 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 11 Sep 2018 23:34:31 +0200 Subject: gnu: emacs-magit-todos: Update to 1.1. * gnu/packages/emacs.scm (emacs-magit-todos): Update to 1.1. --- gnu/packages/emacs.scm | 54 ++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 28 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 540915510f..9fab856035 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -11741,37 +11741,35 @@ buffers – other modes on the TODO list). (license license:gpl3)))) (define-public emacs-magit-todos - ;; TODO: <1.1 is broken with Guix. Switch to 1.1 when out. - (let ((commit "966642762788d335dc2d3667d230a36ede65972e")) - (package - (name "emacs-magit-todos") - (version (git-version "1.0.4" "1" commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/alphapapa/magit-todos") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0nxarip8sf0446xfgrcfsjm4vbsg50klxjbr4i6h09a3lri03gyp")))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-async" ,emacs-async) - ("emacs-dash" ,emacs-dash) - ("emacs-f" ,emacs-f) - ("emacs-hl-todo" ,emacs-hl-todo) - ("magit" ,magit) - ("emacs-pcre2el" ,emacs-pcre2el) - ("emacs-s" ,emacs-s))) - (home-page "https://github.com/alphapapa/magit-todos") - (synopsis "Show source files' TODOs (and FIXMEs, etc) in Magit status buffer") - (description "This package displays keyword entries from source code + (package + (name "emacs-magit-todos") + (version "1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alphapapa/magit-todos") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1mvzbxshr6zjdim3jd368ar1hy5l7n22i03cpvzdmrw83kkwdyhd")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-async" ,emacs-async) + ("emacs-dash" ,emacs-dash) + ("emacs-f" ,emacs-f) + ("emacs-hl-todo" ,emacs-hl-todo) + ("magit" ,magit) + ("emacs-pcre2el" ,emacs-pcre2el) + ("emacs-s" ,emacs-s))) + (home-page "https://github.com/alphapapa/magit-todos") + (synopsis "Show source files' TODOs (and FIXMEs, etc) in Magit status buffer") + (description "This package displays keyword entries from source code comments and Org files in the Magit status buffer. Activating an item jumps to it in its file. By default, it uses keywords from @code{hl-todo}, minus a few (like NOTE).") - (license license:gpl3)))) + (license license:gpl3))) (define-public emacs-git-annex ;; Unreleased version has a fontification fix. -- cgit v1.2.3 From bd8f74dfbe51308fbd9a61281d9a63ef09d5ab4f Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 11 Sep 2018 23:44:40 +0200 Subject: gnu: emacs-evil-collection: Update to 20180911. * gnu/packages/emacs.scm (emacs-evil-collection): Update to 20180911. --- gnu/packages/emacs.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 9fab856035..a84ef81859 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -4957,11 +4957,11 @@ extensions.") (license license:gpl3+)))) (define-public emacs-evil-collection - (let ((commit "5d739f58118a5a316c4fe25adb4e13ccea3fdc10") - (revision "2")) + (let ((commit "b55ae90f367e103e6568ae00779a8a51c68a0104") + (revision "3")) (package (name "emacs-evil-collection") - (version (git-version "20180721" revision commit)) + (version (git-version "20180911" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -4970,7 +4970,7 @@ extensions.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "05p612qncd0cp5q61hq2ag1k558vhb10049xrc88n9l6qwz9bpk3")))) + "0n7bzi5s7rqi78l1424sxvsk2g46z7ksq02xx5jrmqymnij90jml")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-evil" ,emacs-evil))) -- cgit v1.2.3 From ee0d184502cf893058ff250e9df159f6405d30ce Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 11 Sep 2018 23:45:06 +0200 Subject: gnu: Add emacs-hackernews. * gnu/packages/emacs.scm (emacs-hackernews): New variable. --- gnu/packages/emacs.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index a84ef81859..7b2929cadc 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -11797,3 +11797,27 @@ hiding the symbolic links and fontified based on whether content is present. Commands for performing some common operations (e.g., unlocking and adding files) are provided.") (license license:gpl2+)))) + +(define-public emacs-hackernews + (let ((commit "d8c450bbc76d6bb65ec5cdb6c3b888a23f3769e9")) + (package + (name "emacs-hackernews") + (version (git-version "0.4.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/clarete/hackernews.el") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "06mp4n6c300jv5lhwf50ircfjckzr2p1zd38s4mqnxxjlf1maim7")))) + (build-system emacs-build-system) + (home-page "https://github.com/clarete/hackernews.el") + (synopsis "Hacker News client for Emacs") + (description "The @command{hackernews} package is able to fetch stories +from six different Hacker News feeds, namely top, new, best, ask, show and job +stories. The default feed is top stories, which corresponds to the Hacker +News homepage.") + (license license:gpl3)))) -- cgit v1.2.3 From 2b0820bf0d27bf68479f76a45ad463018345fcd1 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 11 Sep 2018 23:47:57 +0200 Subject: gnu: emacs-helm: Update to 3.0. * gnu/packages/emacs.scm (emacs-helm): Update to 3.0. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 7b2929cadc..a67acc7033 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -4698,7 +4698,7 @@ ack, ag, helm and pt.") (define-public emacs-helm (package (name "emacs-helm") - (version "2.9.6") + (version "3.0") (source (origin (method url-fetch) (uri (string-append @@ -4707,7 +4707,7 @@ ack, ag, helm and pt.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1f7m09i8gr0gk5nw5dn7rpdz20dg3hl4p77dpygkhl82yhk9q2ql")))) + "0k2r0ccppaqfjvyszaxa16vf7g2qzj1clhfr6v646ncsy17laciw")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-async" ,emacs-async) -- cgit v1.2.3 From 5882078e8c999c7de16e38bc7f7a293ff2ec01a8 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Fri, 7 Sep 2018 22:09:32 -0500 Subject: font-fantasque-sans: Upgrade to 1.7.2. * gnu/packages/fonts.scm (font-fantasque-sans): Upgrade to 1.7.2. [native-inputs]: Add zip. [arguments]: Add 'xrange->range phase for python3 compatibility. Adjust install phase to work with newly generated font variants. --- gnu/packages/fonts.scm | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index ce07d3ad4c..218b04baa1 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -753,41 +753,51 @@ It contains the following fonts and styles: (define-public font-fantasque-sans (package (name "font-fantasque-sans") - (version "1.7.1") + (version "1.7.2") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/belluzj/fantasque-sans/" - "archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/belluzj/fantasque-sans.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "07fpy53k2x2nz5q61swkab6cfk9gw2kc4x4brsj6zjgbm16fap85")))) + "1gjranq7qf20rfxnpxsckv1hl35nzsal0rjs475nhfbpqy5wmly6")))) (build-system gnu-build-system) (native-inputs `(("ttfautohint" ,ttfautohint) ("woff-tools" ,woff-tools) ("fontforge" ,fontforge) ("woff2" ,woff2) - ("ttf2eot" ,ttf2eot))) + ("ttf2eot" ,ttf2eot) + ("zip" ,zip))) (arguments `(#:tests? #f ;test target intended for visual inspection #:phases (modify-phases %standard-phases (delete 'configure) ;no configuration + (add-before 'build 'xrange->range + ;; Rather than use a python2 fontforge, just replace the + ;; offending function. + (lambda _ + (substitute* "Scripts/fontbuilder.py" + (("xrange") "range")) + #t)) (replace 'install ;; 'make install' wants to install to ~/.fonts, install to - ;; output instead. + ;; output instead. Install only the "Normal" variant. (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (font-dir (string-append out "/share/fonts")) (truetype-dir (string-append font-dir "/truetype")) (opentype-dir (string-append font-dir "/opentype")) (webfonts-dir (string-append font-dir "/webfonts"))) - (copy-recursively "OTF" opentype-dir) - (for-each (lambda (f) (install-file f truetype-dir)) - (find-files "." "\\.ttf$")) - (copy-recursively "Webfonts" webfonts-dir) - #t)))))) + (with-directory-excursion "Variants/Normal" + (copy-recursively "OTF" opentype-dir) + (for-each (lambda (f) (install-file f truetype-dir)) + (find-files "." "\\.ttf$")) + (copy-recursively "Webfonts" webfonts-dir) + #t))))))) (synopsis "Font family with a monospaced variant for programmers") (description "Fantasque Sans Mono is a programming font designed with functionality in -- cgit v1.2.3 From bbe46a4af5972b3b5b434fe5d99ec9a0078b0ab8 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Thu, 16 Aug 2018 15:47:41 -0500 Subject: mpi: Factorize openmpi setup build phase. * gnu/packages/mpi.scm (%openmpi-setup): New variable. * gnu/packages/maths.scm (scalapack, slepc-openmpi, mumps-openmpi) (superlu-dist, p4est, petsc-openmpi, hypre-openmpi, elemental) (sundials-openmpi, arpack-ng-openmpi)[arguments]: Use it in #:phases. --- gnu/packages/maths.scm | 102 ++++++++++--------------------------------------- gnu/packages/mpi.scm | 14 ++++++- 2 files changed, 34 insertions(+), 82 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index d1db75e658..af41093fbb 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -511,14 +511,8 @@ large scale eigenvalue problems.") ''("--enable-mpi")) ((#:phases phases '%standard-phases) `(modify-phases ,phases - (add-before 'check 'set-test-environment - (lambda _ - ;; By default, running the test suite would fail because 'ssh' - ;; could not be found in $PATH. Define this variable to - ;; placate Open MPI without adding a dependency on OpenSSH (the - ;; agent isn't used anyway.) - (setenv "OMPI_MCA_plm_rsh_agent" (which "cat")) - #t)))))) + (add-before 'check 'mpi-setup + ,%openmpi-setup))))) (synopsis "Fortran subroutines for solving eigenvalue problems with MPI"))) (define-public lapack @@ -579,14 +573,8 @@ problems in numerical linear algebra.") (arguments `(#:configure-flags `("-DBUILD_SHARED_LIBS:BOOL=YES") #:phases (modify-phases %standard-phases - (add-before 'check 'set-test-environment - (lambda _ - ;; By default, running the test suite would fail because - ;; 'ssh' could not be found in $PATH. Define this - ;; variable to placate Open MPI without adding a - ;; dependency on OpenSSH (the agent isn't used anyway.) - (setenv "OMPI_MCA_plm_rsh_agent" (which "cat")) - #t))))) + (add-before 'check 'mpi-setup + ,%openmpi-setup)))) (home-page "http://www.netlib.org/scalapack/") (synopsis "Library for scalable numerical linear algebra") (description @@ -1717,14 +1705,8 @@ scientific applications modeled by partial differential equations.") ,@(delete "--with-mpi=0" ,cf))) ((#:phases phases) `(modify-phases ,phases - (add-before 'check 'set-test-environment - (lambda _ - ;; By default, running the test suite would fail because 'ssh' - ;; could not be found in $PATH. Define this variable to - ;; placate Open MPI without adding a dependency on OpenSSH (the - ;; agent isn't used anyway.) - (setenv "OMPI_MCA_plm_rsh_agent" (which "cat")) - #t)))))) + (add-before 'check 'mpi-setup + ,%openmpi-setup))))) (synopsis "Library to solve PDEs (with MPI support)"))) (define-public petsc-complex-openmpi @@ -1855,14 +1837,8 @@ arising after the discretization of partial differential equations.") (substitute-keyword-arguments (package-arguments slepc) ((#:phases phases '%standard-phases) `(modify-phases ,phases - (add-before 'check 'set-test-environment - (lambda _ - ;; By default, running the test suite would fail because 'ssh' - ;; could not be found in $PATH. Define this variable to - ;; placate Open MPI without adding a dependency on OpenSSH (the - ;; agent isn't used anyway.) - (setenv "OMPI_MCA_plm_rsh_agent" (which "cat")) - #t)))))) + (add-before 'check 'mpi-setup + ,%openmpi-setup))))) (inputs `(("mpi" ,openmpi) ("arpack" ,arpack-ng-openmpi) @@ -2032,14 +2008,8 @@ sparse system of linear equations A x = b using Guassian elimination.") (substitute-keyword-arguments (package-arguments mumps) ((#:phases phases) `(modify-phases ,phases - (add-before 'check 'set-test-environment - (lambda _ - ;; By default, running the test suite would fail because 'ssh' - ;; could not be found in $PATH. Define this variable to - ;; placate Open MPI without adding a dependency on OpenSSH (the - ;; agent isn't used anyway.) - (setenv "OMPI_MCA_plm_rsh_agent" (which "cat")) - #t)) + (add-before 'check 'mpi-setup + ,%openmpi-setup) (replace 'check (lambda _ ((assoc-ref ,phases 'check) @@ -2285,13 +2255,10 @@ CDEFS = -DAdd_" "/" dir))) '("lib" "include")) #t)) + (add-before 'check 'mpi-setup + ,%openmpi-setup) (replace 'check (lambda _ - ;; By default, running the test suite would fail because 'ssh' - ;; could not be found in $PATH. Define this variable to placate - ;; Open MPI without adding a dependency on OpenSSH (the agent - ;; isn't used anyway.) - (setenv "OMPI_MCA_plm_rsh_agent" (which "cat")) (with-directory-excursion "EXAMPLE" (invoke "mpirun" "-n" "2" "./pddrive" "-r" "1" "-c" "2" "g20.rua") @@ -2384,15 +2351,8 @@ YACC = bison -pscotchyy -y -b y ;; "SCOTCH_PTHREAD_NUMBER=2" "restrict=__restrict")))) #t)) - (add-after - 'build 'build-esmumps + (add-after 'build 'build-esmumps (lambda _ - ;; By default, running the test suite would fail because 'ssh' - ;; could not be found in $PATH. Define this variable to placate - ;; Open MPI without adding a dependency on OpenSSH (the agent - ;; isn't used anyway.) - (setenv "OMPI_MCA_plm_rsh_agent" (which "cat")) - (invoke "make" (format #f "-j~a" (parallel-job-count)) "esmumps"))) @@ -2575,14 +2535,8 @@ schemes.") (assoc-ref %build-inputs "lapack") " -llapack")) #:phases (modify-phases %standard-phases - (add-before 'check 'set-test-environment - (lambda _ - ;; By default, running the test suite would fail because - ;; 'ssh' could not be found in $PATH. Define this - ;; variable to placate Open MPI without adding a - ;; dependency on OpenSSH (the agent isn't used anyway.) - (setenv "OMPI_MCA_plm_rsh_agent" (which "cat")) - #t))))) + (add-before 'check 'mpi-setup + ,%openmpi-setup)))) (home-page "http://www.p4est.org") (synopsis "Adaptive mesh refinement on forests of octrees") (description @@ -3649,14 +3603,8 @@ problems.") ,@(delete "--without-MPI" ,flags))) ((#:phases phases) `(modify-phases ,phases - (add-before 'check 'set-test-environment - (lambda _ - ;; By default, running the test suite would fail because 'ssh' - ;; could not be found in $PATH. Define this variable to - ;; placate Open MPI without adding a dependency on OpenSSH (the - ;; agent isn't used anyway.) - (setenv "OMPI_MCA_plm_rsh_agent" (which "cat")) - #t)))))) + (add-before 'check 'mpi-setup + ,%openmpi-setup))))) (synopsis "Parallel solvers and preconditioners for linear equations") (description "HYPRE is a software library of high performance preconditioners and @@ -3939,6 +3887,8 @@ exclusion algorithms are typical examples of such systems.") "-DCMAKE_INSTALL_LIBDIR=lib" "-DGFORTRAN_LIB=gfortran") #:phases (modify-phases %standard-phases + (add-before 'check 'mpi-setup + ,%openmpi-setup) (add-before 'check 'setup-tests (lambda _ ;; Parallelism is done at the MPI layer. @@ -4123,16 +4073,6 @@ easily be incorporated into existing simulation codes.") ,flags)) ((#:phases phases '%standard-phases) `(modify-phases ,phases - (add-before 'check 'set-test-environment - (lambda _ - ;; By default, running the test suite would fail because 'ssh' - ;; could not be found in $PATH. Define this variable to - ;; placate Open MPI without adding a dependency on OpenSSH (the - ;; agent isn't used anyway.) - (setenv "OMPI_MCA_plm_rsh_agent" (which "cat")) - ;; Allow oversubscription in case there are less - ;; physical cores available in the build environment - ;; than SUNDIALS wants while testing. - (setenv "OMPI_MCA_rmaps_base_oversubscribe" "yes") - #t)))))) + (add-before 'check 'mpi-setup + ,%openmpi-setup))))) (synopsis "SUNDIALS with OpenMPI support"))) diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index f34b08e4ca..7dfec16fc7 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015 Eric Bavier +;;; Copyright © 2014, 2015, 2018 Eric Bavier ;;; Copyright © 2014, 2015, 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2014 Ian Denhardt ;;; Copyright © 2016 Andreas Enge @@ -250,3 +250,15 @@ software vendors, application developers and computer science researchers.") work correctly with all transports (such as @code{openib}), and the performance is generally worse than the vanilla @code{openmpi} package, which only provides @code{MPI_THREAD_FUNNELED}."))) + +;;; Build phase to be used for packages that execute MPI code. +(define-public %openmpi-setup + '(lambda _ + ;; By default, running the test suite would fail because 'ssh' could not + ;; be found in $PATH. Define this variable to placate Open MPI without + ;; adding a dependency on OpenSSH (the agent isn't used anyway.) + (setenv "OMPI_MCA_plm_rsh_agent" (which "false")) + ;; Allow oversubscription in case there are less physical cores available + ;; in the build environment than the package wants while testing. + (setenv "OMPI_MCA_rmaps_base_oversubscribe" "yes") + #t)) -- cgit v1.2.3 From 50b3b831430902224864dbd350179a564561f526 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 11 Sep 2018 15:56:57 -0500 Subject: netsurf: Register patch. Follow-up to f9e140a243b6d6b5d28bd0813b69604562a39653. * gnu/local.mk (dist_patch_DATA): Add netsurf-message-timestamp.patch. --- gnu/local.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 9b417bff6d..f15fb3339a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -980,6 +980,7 @@ dist_patch_DATA = \ %D%/packages/patches/net-tools-bitrot.patch \ %D%/packages/patches/netcdf-date-time.patch \ %D%/packages/patches/netcdf-tst_h_par.patch \ + %D%/packages/patches/netsurf-message-timestamp.patch \ %D%/packages/patches/netsurf-system-utf8proc.patch \ %D%/packages/patches/netsurf-y2038-tests.patch \ %D%/packages/patches/netsurf-longer-test-timeout.patch \ -- cgit v1.2.3 From b2c8d31ff673ca1714be16968c9ead9a99ae2b7b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 12 Sep 2018 09:53:55 +0300 Subject: gnu: perl-moosex-getopt: Update to 0.73. * gnu/packages/perl.scm (perl-moosex-getopt): Update to 0.73. [native-inputs]: Add perl-module-build-tiny, perl-path-tiny, perl-test-needs. --- gnu/packages/perl.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index c4c3b665db..85604008e2 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2015 Eric Dvorsak ;;; Copyright © 2016, 2018 Mark H Weaver ;;; Copyright © 2016 Jochem Raat -;;; Copyright © 2016, 2017 Efraim Flashner +;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2016 Nils Gillmann ;;; Copyright © 2016 Alex Sassmannshausen ;;; Copyright © 2016, 2018 Roel Janssen @@ -5521,7 +5521,7 @@ private methods are not.") (define-public perl-moosex-getopt (package (name "perl-moosex-getopt") - (version "0.71") + (version "0.73") (source (origin (method url-fetch) @@ -5529,12 +5529,15 @@ private methods are not.") "MooseX-Getopt-" version ".tar.gz")) (sha256 (base32 - "0nf2094qgir0irxjycwqavy53ygm530g9f7cxfywnl2n1bmgh66y")))) + "19zm8brf930p0ymqn3w1y0ix29kb74m8nvhrhjvrg8cgz6vc5fyz")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build) + ("perl-module-build-tiny" ,perl-module-build-tiny) + ("perl-path-tiny" ,perl-path-tiny) ("perl-test-deep" ,perl-test-deep) ("perl-test-fatal" ,perl-test-fatal) + ("perl-test-needs" ,perl-test-needs) ("perl-test-requires" ,perl-test-requires) ("perl-test-trap" ,perl-test-trap) ("perl-test-warnings" ,perl-test-warnings))) -- cgit v1.2.3 From c8749b02500ecf90119e47b4af1bf6bb0c870ec1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 11 Sep 2018 20:23:29 +0200 Subject: gnu: Add perl-mock-config. * gnu/packages/perl-check.scm (perl-mock-config): New public variable. --- gnu/packages/perl-check.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index 16010b441f..98b4e392c7 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -44,6 +44,27 @@ ;;; +(define-public perl-mock-config + (package + (name "perl-mock-config") + (version "0.03") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://cpan/authors/id/R/RU/RURBAN/Mock-Config-" + version ".tar.gz")) + (sha256 + (base32 "06q0xkg5cwdwafzmb9rkaa305ddv7vli9gpm6n9jnkyaaxbk9f55")))) + (build-system perl-build-system) + (home-page "https://metacpan.org/release/Mock-Config") + (synopsis "Temporarily set Config or XSConfig values") + (description + "The @code{Mock::Config} Perl module allows temporarily setting and +overriding @code{Config} values, even for the readonly @code{XSConfig} +implementation as used in cperl. It does not store the mocked overrides +lexically, just dynamically.") + (license artistic2.0))) + (define-public perl-test2-bundle-extended (package (name "perl-test2-bundle-extended") -- cgit v1.2.3 From 4dbef671029f6553b7c24bd3f7a831725c976b85 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 11 Sep 2018 21:59:38 +0200 Subject: gnu: zsh: Use HTTPS. * gnu/packages/shells.scm (zsh)[source, home-page]: Use HTTPS. --- gnu/packages/shells.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 900c8ec686..684d723959 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -296,10 +296,10 @@ history mechanism, job control and a C-like syntax.") (source (origin (method url-fetch) (uri (list (string-append - "http://www.zsh.org/pub/zsh-" version + "https://www.zsh.org/pub/zsh-" version ".tar.xz") (string-append - "http://www.zsh.org/pub/old/zsh-" version + "https://www.zsh.org/pub/old/zsh-" version ".tar.xz"))) (sha256 (base32 @@ -360,7 +360,7 @@ as an interactive login shell and as a powerful command interpreter for shell scripting. Zsh can be thought of as an extended Bourne shell with a large number of improvements, including some features of bash, ksh, and tcsh.") - (home-page "http://www.zsh.org/") + (home-page "https://www.zsh.org/") ;; The whole thing is under an MIT/X11-style license, but there's one ;; command, 'Completion/Unix/Command/_darcs', which is under GPLv2+. -- cgit v1.2.3 From 5a5d3e356311620df253d7c213c1bda79cd20128 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 11 Sep 2018 21:58:34 +0200 Subject: gnu: zsh: Update to 5.6.1. * gnu/packages/shells.scm (zsh): Update to 5.6.1. --- gnu/packages/shells.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 684d723959..73e51da1cd 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -292,7 +292,7 @@ history mechanism, job control and a C-like syntax.") (define-public zsh (package (name "zsh") - (version "5.6") + (version "5.6.1") (source (origin (method url-fetch) (uri (list (string-append @@ -303,7 +303,7 @@ history mechanism, job control and a C-like syntax.") ".tar.xz"))) (sha256 (base32 - "1mp6h2452z2029n12mxipjv4b0cc8i8sb72g8p8jklg8275iysvl")))) + "1s5kzfbfvixibb1sbzmmlrrx898zqwi5cfmnnq4bhcbx64zparlm")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-tcsetpgrp" "--enable-pcre") #:phases -- cgit v1.2.3 From 60d8db74c66a31af3da180d45ebb045622c469c8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 11 Sep 2018 22:06:42 +0200 Subject: gnu: syslinux: Use INVOKE. * gnu/packages/bootloaders.scm (syslinux)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/bootloaders.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index e9abf399ab..74e6890951 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -304,14 +304,14 @@ menu to select one of the installed operating systems.") (delete 'configure) (add-before 'build 'set-permissions (lambda _ - (zero? (system* "chmod" "a+w" "utils/isohybrid.in")))) + (invoke "chmod" "a+w" "utils/isohybrid.in"))) (replace 'check (lambda _ (setenv "CC" "gcc") (substitute* "tests/unittest/include/unittest/unittest.h" ;; Don't look up headers under /usr. (("/usr/include/") "")) - (zero? (system* "make" "unittest"))))))) + (invoke "make" "unittest")))))) (home-page "http://www.syslinux.org") (synopsis "Lightweight Linux bootloader") (description "Syslinux is a lightweight Linux bootloader.") -- cgit v1.2.3 From 0f304ba73e3a36af4d05be332fdc8dba3a3739b6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 11 Sep 2018 22:08:16 +0200 Subject: gnu: syslinux: Use HTTPS home page. * gnu/packages/bootloaders.scm (syslinux)[home-page]: Use HTTPS. --- gnu/packages/bootloaders.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 74e6890951..eee66b2c5f 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -312,7 +312,7 @@ menu to select one of the installed operating systems.") ;; Don't look up headers under /usr. (("/usr/include/") "")) (invoke "make" "unittest")))))) - (home-page "http://www.syslinux.org") + (home-page "https://www.syslinux.org") (synopsis "Lightweight Linux bootloader") (description "Syslinux is a lightweight Linux bootloader.") (license (list license:gpl2+ -- cgit v1.2.3 From bec13d872de23a0c33b2624d430d928a43c35e11 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 12 Sep 2018 16:08:34 +0200 Subject: gnu: sg3-utils: Update to 1.43. * gnu/packages/scsi.scm (sg3-utils): Update to 1.43. [license]: Add bsd-2. --- gnu/packages/scsi.scm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/scsi.scm b/gnu/packages/scsi.scm index 92e2d7af4c..2bb863cad9 100644 --- a/gnu/packages/scsi.scm +++ b/gnu/packages/scsi.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Chris Marusich +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -18,7 +19,7 @@ (define-module (gnu packages scsi) #:use-module ((guix licenses) - #:select (gpl2+ bsd-3)) + #:select (gpl2+ bsd-2 bsd-3)) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu)) @@ -26,14 +27,14 @@ (define-public sg3-utils (package (name "sg3-utils") - (version "1.42") + (version "1.43") (source (origin (method url-fetch) (uri (string-append "http://sg.danny.cz/sg/p/sg3_utils-" version ".tar.xz")) (sha256 (base32 - "1fg71rj0f1gdjmkj0z8wlv46cf9lryjdyjkbi7fjmssgi5jyvblp")))) + "04l58wvncqk6lfh4lashsl3ccsa1114hkd6vwi1h1cbmq2fw9c8v")))) (build-system gnu-build-system) (home-page "http://sg.danny.cz/sg/sg3_utils.html") (synopsis "SCSI device utilities") @@ -49,6 +50,9 @@ up and down disks (@code{sg_start}), do self tests (@code{sg_senddiag}), parse sense data (@code{sg_decode_sense}), and perform various other functions. In addition, this package includes a library, called libsgutils, which can be used in C and C++ programs to interact with SCSI devices.") - ;; The libsgutils library itself is licensed under bsd-3. Some tools are - ;; licensed under bsd-3, also. Some tools are licensed under gpl2+. - (license (list gpl2+ bsd-3)))) + ;; See README: "All utilities and libraries have either a "2 clause" BSD + ;; license or are "GPL-2ed". [...] That BSD license was updated from the + ;; "3 clause" to the newer "2 clause" version on 20180119. To save space + ;; various source code files refer to a file called "BSD_LICENSE" [...]." + ;; Some files (like sg_compare_and_write.c) retain their 3-clause headers! + (license (list gpl2+ bsd-2 bsd-3)))) -- cgit v1.2.3 From acd4da3f2983f839e65220700450a15fc5f3af20 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 12 Sep 2018 15:26:21 +0200 Subject: gnu: libfilezilla: Update to 0.13.1. * gnu/packages/ftp.scm (libfilezilla): Update to 0.13.1. --- gnu/packages/ftp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm index f687b9814d..d3f3ef711c 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm @@ -170,7 +170,7 @@ as required.") (define-public libfilezilla (package (name "libfilezilla") - (version "0.12.3") + (version "0.13.1") (source (origin (method url-fetch) @@ -178,7 +178,7 @@ as required.") name "/" name "-" version ".tar.bz2")) (sha256 (base32 - "1v606kcz2rdmmlwxrv3xvwh7ia1nh6jfc9bhjw2r4ai3rm16gch5")))) + "0347zkapp0wrhfm1yzw7wa1v3lww65ch176scifxn8f9068f1ixb")))) (build-system gnu-build-system) (native-inputs `(("cppunit" ,cppunit) -- cgit v1.2.3 From 9c208f38f22cfc710bb7a56b97ee1b2c388df7b9 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 12 Sep 2018 15:44:07 +0200 Subject: gnu: Add emacs-youtube-dl. * gnu/packages/emacs.scm (emacs-youtube-dl): New variable. --- gnu/packages/emacs.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index a67acc7033..f6da0e3830 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -116,6 +116,7 @@ #:use-module (gnu packages xdisorg) #:use-module (gnu packages shells) #:use-module (gnu packages gnupg) + #:use-module (gnu packages video) #:use-module (guix utils) #:use-module (srfi srfi-1) #:use-module (ice-9 match)) @@ -11821,3 +11822,43 @@ from six different Hacker News feeds, namely top, new, best, ask, show and job stories. The default feed is top stories, which corresponds to the Hacker News homepage.") (license license:gpl3)))) + +(define-public emacs-youtube-dl + (let ((commit "7c9d7a7d05b72a7d1b1257a36c5e2b2567b185dd")) + (package + (name "emacs-youtube-dl") + (version (git-version "1.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/skeeto/youtube-dl-emacs/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0mh4s089a4x8s380agzb2306kdp1hl204px1n5rrrrdcls7imnh6")))) + (build-system emacs-build-system) + (inputs + `(("youtube-dl" ,youtube-dl))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'configure + (lambda* (#:key inputs #:allow-other-keys) + (let ((youtube-dl (assoc-ref inputs "youtube-dl"))) + ;; .el is read-only in git. + (chmod "youtube-dl.el" #o644) + ;; Specify the absolute file names of the various + ;; programs so that everything works out-of-the-box. + (emacs-substitute-variables + "youtube-dl.el" + ("youtube-dl-program" + (string-append youtube-dl "/bin/youtube-dl"))))))))) + (home-page "https://github.com/skeeto/youtube-dl-emacs/") + (synopsis "Emacs youtube-dl download manager") + (description "This package manages a video download queue for +@command{youtube-dl}, which serves as the back end. It manages a single +@command{youtube-dl} subprocess, downloading one video at a time. New videos +can be queued at any time.") + (license license:unlicense)))) -- cgit v1.2.3 From 320105eadb7d9b26d818edfea5f17e53a19286a1 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 12 Sep 2018 15:44:33 +0200 Subject: gnu: Add emacs-org-web-tools. * gnu/packages/emacs.scm (emacs-org-web-tools): New variable. --- gnu/packages/emacs.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index f6da0e3830..10d0e63c84 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -117,6 +117,7 @@ #:use-module (gnu packages shells) #:use-module (gnu packages gnupg) #:use-module (gnu packages video) + #:use-module (gnu packages haskell) #:use-module (guix utils) #:use-module (srfi srfi-1) #:use-module (ice-9 match)) @@ -11862,3 +11863,45 @@ News homepage.") @command{youtube-dl} subprocess, downloading one video at a time. New videos can be queued at any time.") (license license:unlicense)))) + +(define-public emacs-org-web-tools + (package + (name "emacs-org-web-tools") + (version "1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alphapapa/org-web-tools") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0kak9h5ny00d39gnwspv53nadnag01brw2fq9zk5wpfc91h9bjng")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-dash" ,emacs-dash) + ("emacs-esxml" ,emacs-esxml) + ("emacs-s" ,emacs-s))) + (inputs + `(("pandoc" ,ghc-pandoc))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-exec-paths + (lambda* (#:key inputs #:allow-other-keys) + (let ((pandoc (assoc-ref inputs "pandoc"))) + (substitute* "org-web-tools.el" + (("\"pandoc\"") (string-append "\"" pandoc "/bin/pandoc\""))) + #t)))))) + (home-page "https://github.com/alphapapa/org-web-tools") + (synopsis "Display/Process web page as Org-mode content") + (description "This package contains library functions and commands useful +for retrieving web page content and processing it into Org-mode content. + +For example, you can copy a URL to the clipboard or kill-ring, then run a +command that downloads the page, isolates the “readable” content with +@command{eww-readable}, converts it to Org-mode content with Pandoc, and +displays it in an Org-mode buffer. Another command does all of that but +inserts it as an Org entry instead of displaying it in a new buffer.") + (license license:gpl3+))) -- cgit v1.2.3 From b002809f848d81dfc4640635d98d8bac3af62cee Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 12 Sep 2018 15:45:38 +0200 Subject: gnu: Add emacs-blimp. * gnu/packages/emacs.scm (emacs-blimp): New variable. --- gnu/packages/emacs.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 10d0e63c84..12e5823a9e 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -11905,3 +11905,29 @@ command that downloads the page, isolates the “readable” content with displays it in an Org-mode buffer. Another command does all of that but inserts it as an Org entry instead of displaying it in a new buffer.") (license license:gpl3+))) + +(define-public emacs-blimp + (let ((commit "e420763d6d18b5d1be552cdbc47f91418343db03")) + (package + (name "emacs-blimp") + (version (git-version "0.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/walseb/blimp") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "09wmhpym516b81dfq8smdmysh1fn610dzlyvyl2rkx8600f0fizd")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-eimp" ,emacs-eimp))) + (home-page "https://github.com/walseb/blimp") + (synopsis "Emacs wrapper around all Imagemagick commands") + (description "Blimp (Bustling Image Manipulation Package) is a complete +wrapper around all Imagemagick commands with descriptions, autocompletion (for +some commands) and hints displayed in prompt using @command{eimp.el} to +execute its commands and resize images.") + (license license:gpl3+)))) -- cgit v1.2.3 From 4a89bdd1965f9bf4a06590bb7fde806be3e784a6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 12 Sep 2018 19:04:02 +0200 Subject: gnu: python-scikit-learn: Update to 0.19.2. * gnu/packages/machine-learning.scm (python-scikit-learn): Update to 0.19.2. [source]: Fetch from git. [arguments]: Run tests before installation; replace "check" phase, add "build-ext" phase; delete "reset-gzip-timestamps" phase. [native-inputs]: Add python-pytest and python-pandas; remove python-nose. --- gnu/packages/machine-learning.scm | 49 ++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 24 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 7790e78779..9aa61bd8f8 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -703,40 +703,41 @@ computing environments.") (define-public python-scikit-learn (package (name "python-scikit-learn") - (version "0.19.1") + (version "0.19.2") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/scikit-learn/scikit-learn/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/scikit-learn/scikit-learn.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "18n8775kyfwbvcjjjzda9c5sqy4737c0hrmj6qj1ps2jmlqzair9")) + "1dk9hdj01c0bny4ps78b7869fjw9gr6qklxf6wyql8h6nh4k19xm")) (patches (search-patches - "python-scikit-learn-fix-test-non-determinism.patch")))) + "python-scikit-learn-fix-test-non-determinism.patch")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases - (delete 'check) - (add-after 'install 'check - ;; Running tests from the source directory requires - ;; an "inplace" build with paths relative to CWD. - ;; http://scikit-learn.org/stable/developers/advanced_installation.html#testing - ;; Use the installed version instead. - (lambda* (#:key inputs outputs #:allow-other-keys) - (add-installed-pythonpath inputs outputs) - ;; some tests require access to "$HOME" - (setenv "HOME" "/tmp") - ;; Step out of the source directory just to be sure. - (chdir "..") - (invoke "nosetests" "-v" "sklearn")))))) + (add-after 'build 'build-ext + (lambda _ (invoke "python" "setup.py" "build_ext" "--inplace") #t)) + (replace 'check + (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)) + ;; FIXME: This fails with permission denied + (delete 'reset-gzip-timestamps)))) (inputs `(("openblas" ,openblas))) (native-inputs - `(("python-nose" ,python-nose) + `(("python-pytest" ,python-pytest) + ("python-pandas" ,python-pandas) ;for tests ("python-cython" ,python-cython))) (propagated-inputs `(("python-numpy" ,python-numpy) @@ -744,8 +745,8 @@ computing environments.") (home-page "http://scikit-learn.org/") (synopsis "Machine Learning in Python") (description - "Scikit-learn provides simple and efficient tools for data -mining and data analysis.") + "Scikit-learn provides simple and efficient tools for data mining and +data analysis.") (license license:bsd-3))) (define-public python2-scikit-learn -- cgit v1.2.3 From 4fa7f29f2ad7867f348e39e465c29f466203126c Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 12 Sep 2018 19:50:41 +0200 Subject: gnu: emacs-hl-todo: Update to 1.9.0. * gnu/packages/emacs.scm (emacs-hl-todo): Update to 1.9.0. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 12e5823a9e..9898767085 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -3488,7 +3488,7 @@ regardless of @code{highlight-symbol-idle-delay}. (define-public emacs-hl-todo (package (name "emacs-hl-todo") - (version "1.8.0") + (version "1.9.0") (source (origin (method url-fetch) (uri (string-append @@ -3497,7 +3497,7 @@ regardless of @code{highlight-symbol-idle-delay}. (file-name (string-append "hl-todo-" version ".el")) (sha256 (base32 - "0g0h9v4572p7mcird8wsj1c41haf60krslm6mlpi4mdbh248kv6z")))) + "0728givzh7xv5i88ac9if8byj1p8bilrj1fnizca10s0rv100hdr")))) (build-system emacs-build-system) (home-page "https://github.com/tarsius/hl-todo") (synopsis "Emacs mode to highlight TODO and similar keywords") -- cgit v1.2.3 From ff9008d8debae7b32a8d27da7ab2fef7c9322196 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 12 Sep 2018 15:17:45 -0400 Subject: gnu: Zsh: Remove workaround required for Zsh 5.6. This is a followup to commit 5a5d3e356311620df253d7c213c1bda79cd20128. * gnu/packages/shells.scm (zsh)[arguments]: Remove substitutions in 'patch-test' phase. --- gnu/packages/shells.scm | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 73e51da1cd..c0f1c479ef 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -336,19 +336,6 @@ history mechanism, job control and a C-like syntax.") (("command -pv") "command -v") (("command -p") "command ") (("'command' -p") "'command' ")) - ;; This file is ISO-8859-1 encoded. - (with-fluids ((%default-port-encoding #f)) - (substitute* "Test/A05execution.ztst" - ;; Help it find `sh` - (("PATH=/bin:\\$\\{ZTST_testdir\\}/command.tmp/ tstcmd-slashless") - (string-append "PATH=/bin:" - (assoc-ref %build-inputs "bash") "/bin:" - "${ZTST_testdir}/command.tmp/ tstcmd-slashless")) - ;; Help it find `echo` - (("PATH=/bin:\\$\\{ZTST_testdir\\}/command.tmp tstcmd-arg") - (string-append "PATH=/bin:" - (assoc-ref %build-inputs "coreutils") "/bin:" - "PATH=/bin:${ZTST_testdir}/command.tmp tstcmd-arg")))) #t))))) (native-inputs `(("autoconf" ,autoconf))) (inputs `(("ncurses" ,ncurses) -- cgit v1.2.3 From f006237c545babed5151c943fe163ce9852bc9c2 Mon Sep 17 00:00:00 2001 From: Nils Gillmann Date: Wed, 12 Sep 2018 13:56:08 +0000 Subject: gnu: gnurl: Update to 7.61.1. * gnu/packages/gnunet.scm (gnurl): Update to 7.61.1. Signed-off-by: Leo Famulari --- gnu/packages/gnunet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index eb17b96492..b4c9c463f7 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -186,13 +186,13 @@ authentication and support for SSL3 and TLS.") (define-public gnurl (package (name "gnurl") - (version "7.61.0") + (version "7.61.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gnunet/" name "-" version ".tar.Z")) (sha256 (base32 - "1h03zkd9mp4xb5icirl3bfd64r5x8j9ka1hw9qd0n1ql1w0ilz23")))) + "0amnhhmlxaliz2rzp3zf1x6ixjqvgmiq7in0q14gd21rjlk9kvir")))) (build-system gnu-build-system) (outputs '("out" "doc")) ; 1.5 MiB of man3 pages -- cgit v1.2.3 From 0bcd1bc7780ad11c398def0717a24214e16bdc6a Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Wed, 12 Sep 2018 17:41:31 +0200 Subject: gnu: rust@1.19.0: Use match-lambda directly. Follow-up to 3159ef7c99c646b78b04cedb1bd3525c301ef978. * gnu/packages/rust.scm (rust-1.19)[arguments]<#:phases>[build]: Use match-lambda directly. --- gnu/packages/rust.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 631dcfd67c..e51d90328a 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -408,7 +408,7 @@ test = { path = \"../libtest\" } ;; but right now, Cargo has problems with libstd's circular ;; dependencies. (mkdir-p "output/target-libs") - (for-each ((@ (ice-9 match) match-lambda) + (for-each (match-lambda ((name . flags) (write name) (newline) -- cgit v1.2.3 From 5a3fcf5b4468524b07a81a9c6814239fd588c8c9 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Wed, 12 Sep 2018 22:52:08 +0200 Subject: gnu: rust@1.19.0: Install rustdoc. * gnu/packages/rust.scm (rust-1.19)[arguments]<#:phases>[install]: Install rustdoc. --- gnu/packages/rust.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index e51d90328a..3b3df91c92 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -454,6 +454,8 @@ test = { path = \"../libtest\" } (copy-recursively "output/target-libs" out-libs) (install-file "output/rustc-build/rustc" (string-append out "/bin")) + (install-file "output/rustc-build/rustdoc" + (string-append out "/bin")) (install-file "output/cargo-build/cargo" (string-append (assoc-ref outputs "cargo") "/bin"))) -- cgit v1.2.3 From 3763e7716cc319dadb3adfbcbbc668aea96fec09 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Wed, 12 Sep 2018 22:53:06 +0200 Subject: gnu: rust@1.19.0: Remove superfluous install-file call. * gnu/packages/rust.scm (rust-1.19)[arguments]<#:phases>[build]: Remove superfluous install-file call. --- gnu/packages/rust.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 3b3df91c92..d7565c0a15 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -387,7 +387,6 @@ test = { path = \"../libtest\" } "--output-dir" "output/rustc-build" "-L" (string-append rustc-bootstrap "/lib/mrust") "-j" "1") - (install-file "output/rustc-build/rustc" "output") ; FIXME: Remove? (setenv "CFG_COMPILER_HOST_TRIPLE" #f) (setenv "CFG_RELEASE" #f) (setenv "CFG_RELEASE_CHANNEL" #f) -- cgit v1.2.3 From 614cfd5c540c59cc45a0fbaaf08538b5646bfb2b Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Wed, 12 Sep 2018 23:15:27 +0200 Subject: gnu: Add rust@1.20.0. * gnu/packages/rust.scm (rust-1.20): New variable. --- gnu/packages/rust.scm | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index d7565c0a15..ba061885b7 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -499,6 +499,120 @@ safety and thread safety guarantees.") ;; Dual licensed. (license (list license:asl2.0 license:expat)))) +(define-public rust-1.20 + (let ((base-rust + (rust-bootstrapped-package rust-1.19 "1.20.0" + "0542y4rnzlsrricai130mqyxl8r6rd991frb4qsnwb27yigqg91a"))) + (package + (inherit base-rust) + (outputs '("out" "doc" "cargo")) + (arguments + (substitute-keyword-arguments (package-arguments rust-1.19) + ((#:phases phases) + `(modify-phases ,phases + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc")) + (gcc (assoc-ref inputs "gcc")) + (gdb (assoc-ref inputs "gdb")) + (binutils (assoc-ref inputs "binutils")) + (python (assoc-ref inputs "python-2")) + (rustc (assoc-ref inputs "rustc-bootstrap")) + (cargo (assoc-ref inputs "cargo-bootstrap")) + (llvm (assoc-ref inputs "llvm")) + (jemalloc (assoc-ref inputs "jemalloc"))) + (call-with-output-file "config.toml" + (lambda (port) + (display (string-append " +[llvm] +[build] +cargo = \"" cargo "/bin/cargo" "\" +rustc = \"" rustc "/bin/rustc" "\" +docs = true +python = \"" python "/bin/python2" "\" +gdb = \"" gdb "/bin/gdb" "\" +vendor = true +submodules = false +[install] +prefix = \"" out "\" +docdir = \"" doc "/share/doc/rust" "\" +sysconfdir = \"etc\" +localstatedir = \"var/lib\" +[rust] +default-linker = \"" gcc "/bin/gcc" "\" + +# The archiver that the finished compiler uses +default-ar = \"" binutils "/bin/ar" "\" +channel = \"stable\" +rpath = true +" ;; There are 2 failed codegen tests: +;; codegen/mainsubprogram.rs and codegen/mainsubprogramstart.rs +;; These tests require a patched LLVM +"codegen-tests = false +[target." ,(nix-system->gnu-triplet-for-rust) "] +llvm-config = \"" llvm "/bin/llvm-config" "\" +cc = \"" gcc "/bin/gcc" "\" +cxx = \"" gcc "/bin/g++" "\" +jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" +[dist] +") port))) + #t))) + (add-after 'configure 'provide-cc + (lambda* (#:key inputs #:allow-other-keys) + (symlink (string-append (assoc-ref inputs "gcc") "/bin/gcc") + "/tmp/cc") + (setenv "PATH" (string-append "/tmp:" (getenv "PATH"))) + #t)) + (add-after 'provide-cc 'configure-archiver + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/build_helper/lib.rs" + ;; Make sure "ar" is always used as the archiver. + (("\"musl\"") "\"\"") + ;; Then substitute "ar" by our name. + (("\"ar\"") (string-append "\"" + (assoc-ref inputs "binutils") + "/bin/ar\""))) + #t)) + (delete 'patch-cargo-tomls) + (add-before 'build 'reset-timestamps-after-changes + (lambda* _ + (define ref (stat "README.md")) + (for-each + (lambda (filename) + (set-file-time filename ref)) + (find-files "." #:directories? #t)) + #t)) + (replace 'build + (lambda* _ + (invoke "./x.py" "build") + (invoke "./x.py" "build" "src/tools/cargo"))) + (replace 'check + (lambda* _ + ;; Disable parallel execution to prevent EAGAIN errors when + ;; running tests. + (invoke "./x.py" "-j1" "test" "-vv") + (invoke "./x.py" "-j1" "test" "src/tools/cargo") + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (invoke "./x.py" "install") + (substitute* "config.toml" + ;; replace prefix to specific output + (("prefix = \"[^\"]*\"") + (string-append "prefix = \"" (assoc-ref outputs "cargo") "\""))) + (invoke "./x.py" "install" "cargo"))) + (add-after 'install 'wrap-rustc + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (libc (assoc-ref inputs "libc")) + (ld-wrapper (assoc-ref inputs "ld-wrapper"))) + ;; Let gcc find ld and libc startup files. + (wrap-program (string-append out "/bin/rustc") + `("PATH" ":" prefix (,(string-append ld-wrapper "/bin"))) + `("LIBRARY_PATH" ":" suffix (,(string-append libc "/lib")))) + #t)))))))))) + (define-public rust-1.23 (package (inherit rust-1.19) -- cgit v1.2.3 From 4bd8f4f3028fcabf90c5c262ac237c037e668939 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 26 Aug 2018 17:35:46 -0400 Subject: gnu: python-jedi: Update to 0.12.1. * gnu/packages/python.scm (python-jedi): Update to 0.12.1. [propagated-inputs]: Move python-parso here, as it is required at run time. --- gnu/packages/python.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 6367def203..88c971b328 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -9655,8 +9655,9 @@ characters, mouse support, and auto suggestions.") (invoke "py.test" "-vv")))))) (native-inputs `(("python-pytest" ,python-pytest) - ("python-parso" ,python-parso) ("python-docopt" ,python-docopt))) + (propagated-inputs + `(("python-parso" ,python-parso))) (home-page "https://github.com/davidhalter/jedi") (synopsis "Autocompletion and static analysis library for Python") (description -- cgit v1.2.3 From 7e846d07e83e5d63eee42c9361a2d1a933f79883 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 26 Aug 2018 23:56:15 -0400 Subject: gnu: Add python-toml. * gnu/packages/python.scm (python-toml): New variables. --- gnu/packages/python.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 88c971b328..793961d944 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -54,6 +54,7 @@ ;;; Copyright © 2018 Nicolas Goaziou ;;; Copyright © 2018 Oleg Pykhalov ;;; Copyright © 2018 Clément Lassieur +;;; Copyright © 2018 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -2721,6 +2722,27 @@ which can produce feeds in RSS 2.0, RSS 0.91, and Atom formats.") (define-public python2-feedgenerator (package-with-python2 python-feedgenerator)) +(define-public python-toml + (package + (name "python-toml") + (version "0.9.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "toml" version)) + (sha256 + (base32 + "0bdbpbip67wdm6c7xwc6mmbmskyradj4cdxn1iibj4fcx1nbv1lf")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) ;no tests suite in release + (home-page "https://github.com/uiri/toml") + (synopsis "Library for TOML") + (description + "@code{toml} is a library for parsing and creating Tom's Obvious, Minimal +Language (TOML) configuration files.") + (license license:expat))) + (define-public python-blinker (package (name "python-blinker") -- cgit v1.2.3 From 8795ce86731157577278d1510a79dec64e36d3ca Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 26 Aug 2018 23:58:26 -0400 Subject: gnu: Add python-black. * gnu/packages/python.scm (python-black): New variable. --- gnu/packages/python.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 793961d944..525ff3f027 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2743,6 +2743,41 @@ which can produce feeds in RSS 2.0, RSS 0.91, and Atom formats.") Language (TOML) configuration files.") (license license:expat))) +(define-public python-black + (package + (name "python-black") + (version "18.6b4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "black" version)) + (sha256 + (base32 + "0i4sfqgz6w15vd50kbhi7g7rifgqlf8yfr8y78rypd56q64qn592")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'patch-source-shebangs 'patch-extra-shebangs + (lambda _ + (let ((python3 (which "python3"))) + (substitute* '("tests/data/fmtonoff.py" + "tests/data/string_prefixes.py" + "tests/data/function.py") + (("#!/usr/bin/env python3(\\.[0-9]+)?" _ minor-version) + (string-append "#!" python3 (if (string? minor-version) + minor-version + "")))))))))) + (propagated-inputs + `(("python-click" ,python-click) + ("python-attrs" ,python-attrs) + ("python-appdirs" ,python-appdirs) + ("python-toml" ,python-toml))) + (home-page "https://github.com/ambv/black") + (synopsis "The uncompromising code formatter") + (description "Black is the uncompromising Python code formatter.") + (license license:expat))) + (define-public python-blinker (package (name "python-blinker") -- cgit v1.2.3 From aaf10fa7d8e74a81a891fcc02f1719ab4968c9a3 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 12 Feb 2018 22:08:03 -0500 Subject: gnu: Add emacs-el-x. * gnu/packages/emacs.scm (emacs-el-x): New variable. --- gnu/packages/emacs.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 9898767085..65056d3445 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -4467,6 +4467,39 @@ If you want to mark a folder manually as a project just create an empty and RSS, with a user interface inspired by notmuch.") (license license:gpl3+))) +(define-public emacs-el-x + (package + (name "emacs-el-x") + (version "0.3.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sigma/el-x.git") + (commit (string-append "v" version)))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1i6j44ssxm1xdg0mf91nh1lnprwsaxsx8vsrf720nan7mfr283h5")))) + (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Move the source files to the top level, which is included in + ;; the EMACSLOADPATH. + (add-after 'unpack 'move-source-files + (lambda _ + (let ((el-files (find-files "./lisp" ".*\\.el$"))) + (for-each (lambda (f) + (rename-file f (basename f))) + el-files)) + #t))))) + (home-page "https://github.com/sigma/el-x") + (synopsis "Emacs Lisp extensions") + (description "command@{emacs-el-x} defines the @code{dflet} macro to +provide the historic behavior of @code{flet}, as well as +@code{declare-function} stub for older Emacs.") + (license license:gpl2+))) + (define-public emacs-rainbow-delimiters (package (name "emacs-rainbow-delimiters") -- cgit v1.2.3 From 563f151bd42c51b56794bee307148beef7fada26 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 12 Feb 2018 22:08:37 -0500 Subject: gnu: Add emacs-mocker. * gnu/packages/emacs.scm (emacs-mocker): New variable. --- gnu/packages/emacs.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 65056d3445..741351f7f6 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -4500,6 +4500,34 @@ provide the historic behavior of @code{flet}, as well as @code{declare-function} stub for older Emacs.") (license license:gpl2+))) +(define-public emacs-mocker + (package + (name "emacs-mocker") + (version "0.3.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sigma/mocker.el.git") + (commit (string-append "v" version)))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1lav7am41v63xgavq8pr88y828jmd1cxd4prjq7jlbxm6nvrwxh2")))) + (build-system emacs-build-system) + (arguments + `(#:tests? #t + #:test-command '("ert-runner"))) + (native-inputs + `(("ert-runner" ,ert-runner))) + (propagated-inputs + `(("emacs-el-x" ,emacs-el-x))) + (home-page "https://github.com/sigma/mocker.el") + (synopsis "Mocking framework for Emacs Lisp") + (description "Mocker.el is a framework for writing tests in Emacs Lisp. +It uses regular Lisp rather than a domain specific language (DSL), which +maximizes flexibility (at the expense of conciseness).") + (license license:gpl2+))) + (define-public emacs-rainbow-delimiters (package (name "emacs-rainbow-delimiters") -- cgit v1.2.3 From 2c6ff3a2bc9846e6233013049bde28fafca3ee2b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 12 Feb 2018 22:09:12 -0500 Subject: gnu: Add emacs-find-file-in-project. * gnu/packages/emacs.scm (emacs-find-file-in-project): New variable. --- gnu/packages/emacs.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 741351f7f6..d8e83136d5 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -4528,6 +4528,39 @@ It uses regular Lisp rather than a domain specific language (DSL), which maximizes flexibility (at the expense of conciseness).") (license license:gpl2+))) +(define-public emacs-find-file-in-project + (package + (name "emacs-find-file-in-project") + (version "5.4.7") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/technomancy/find-file-in-project.git") + (commit version))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1sdnyqv69mipbgs9yax88m9b6crsa59rjhwrih197pifl4089awr")))) + (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'set-shell + ;; Otherwise Emacs shell-file-name is set to "/bin/sh", which doesn't + ;; work. + (lambda _ + (setenv "SHELL" (which "sh")) + #t))) + #:tests? #t + #:test-command '("./tests/test.sh"))) + (home-page "https://github.com/technomancy/find-file-in-project") + (synopsis "File/directory finder for Emacs") + (description "@code{find-file-in-project} allows to find files or +directories quickly in the current project. The project root is detected +automatically when Git, Subversion or Mercurial are used. It also provides +functions to assist in reviewing changes on files.") + (license license:gpl3+))) + (define-public emacs-rainbow-delimiters (package (name "emacs-rainbow-delimiters") -- cgit v1.2.3 From 87e9fb5753c1d77b9630982e7bae9b54f23caecb Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 12 Feb 2018 22:09:43 -0500 Subject: gnu: Add emacs-pyvenv. * gnu/packages/emacs.scm (emacs-pyvenv): New variable. --- gnu/packages/emacs.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index d8e83136d5..c6fcbde1ab 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -4561,6 +4561,37 @@ automatically when Git, Subversion or Mercurial are used. It also provides functions to assist in reviewing changes on files.") (license license:gpl3+))) +(define-public emacs-pyvenv + (package + (name "emacs-pyvenv") + (version "1.11") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jorgenschaefer/pyvenv.git") + (commit (string-append "v" version)))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1a346qdimr1dvj53q033aqnahwd2dhyn9jadrs019nm0bzgw7g63")))) + (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; This phase incorrectly attempts to substitute "activate" and fails + ;; doing so. + (delete 'patch-el-files)) + #:tests? #t + #:test-command '("ert-runner"))) + (native-inputs + `(("ert-runner" ,ert-runner) + ("emacs-mocker" ,emacs-mocker))) + (home-page "https://github.com/jorgenschaefer/pyvenv") + (synopsis "Virtualenv minor mode for Emacs") + (description "pyvenv.el is a minor mode to support using Python virtual +environments (virtualenv) inside Emacs.") + (license license:gpl3+))) + (define-public emacs-rainbow-delimiters (package (name "emacs-rainbow-delimiters") -- cgit v1.2.3 From dcc31d7f41f5368a94a8478f634f1c7bda1c9b41 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 12 Feb 2018 22:10:03 -0500 Subject: gnu: Add emacs-highlight-indentation. * gnu/packages/emacs.scm (emacs-highlight-indentation): New variable. --- gnu/packages/emacs.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index c6fcbde1ab..6df3aba4eb 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -4592,6 +4592,30 @@ functions to assist in reviewing changes on files.") environments (virtualenv) inside Emacs.") (license license:gpl3+))) +(define-public emacs-highlight-indentation + (package + (name "emacs-highlight-indentation") + (version "0.7.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/antonj/Highlight-Indentation-for-Emacs.git") + (commit (string-append "v" version)))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "00l54k75qk24a0znzl4ij3s3nrnr2wy9ha3za8apphzlm98m907k")))) + (build-system emacs-build-system) + (home-page "https://github.com/antonj/Highlight-Indentation-for-Emacs/") + (synopsis "Highlighting indentation for Emacs") + (description "Provides two minor modes to highlight indentation guides in Emacs: +@enumerate +@item @code{highlight-indentation-mode}, which displays guidelines +indentation (space indentation only). +@item @code{highlight-indentation-current-column-mode}, which displays guidelines for the current-point indentation (space indentation only). +@end enumerate") + (license license:gpl2+))) + (define-public emacs-rainbow-delimiters (package (name "emacs-rainbow-delimiters") -- cgit v1.2.3 From 82baeea2979b98a642dcfe63a87d08355a101f4c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 12 Feb 2018 22:10:31 -0500 Subject: gnu: Add emacs-elpy. * gnu/packages/emacs.scm (emacs-elpy): New variable. --- gnu/packages/emacs.scm | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 6df3aba4eb..1541626d76 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -4616,6 +4616,78 @@ indentation (space indentation only). @end enumerate") (license license:gpl2+))) +(define-public emacs-elpy + (package + (name "emacs-elpy") + (version "1.24.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jorgenschaefer/elpy.git") + (commit version))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "0rsg8a9nwqfkv0xcs11jzfp10ij7jm0v2ikx19zv2v7awqy0q5wf")))) + (build-system emacs-build-system) + (arguments + `(#:include (cons* "^elpy/[^/]+\\.py$" "^snippets\\/" %default-include) + #:phases + ;; TODO: Make `elpy-config' display Guix commands :) + (modify-phases %standard-phases + ;; One elpy test depends on being run inside a Python virtual + ;; environment to pass. We have nothing to gain from doing so here, + ;; so we just trick Elpy into thinking we are (see: + ;; https://github.com/jorgenschaefer/elpy/pull/1293). + (add-before 'check 'fake-virtualenv + (lambda _ + (setenv "VIRTUAL_ENV" "/tmp") + #t)) + (add-before 'check 'build-doc + (lambda _ + (with-directory-excursion "docs" + (invoke "make" "info" "man")) + ;; Move .info file at the root so that it can installed by the + ;; 'move-doc phase. + (rename-file "docs/_build/texinfo/Elpy.info" "Elpy.info") + #t)) + (add-after 'build-doc 'install-manpage + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (man1 (string-append out "/share/man/man1"))) + (mkdir-p man1) + (copy-file "docs/_build/man/elpy.1" + (string-append man1 "/elpy.1"))) + #t))) + #:tests? #t + #:test-command '("ert-runner"))) + (propagated-inputs + `(("emacs-company" ,emacs-company) + ("emacs-find-file-in-project" ,emacs-find-file-in-project) + ("emacs-highlight-indentation" ,emacs-highlight-indentation) + ("emacs-yasnippet" ,emacs-yasnippet) + ("pyvenv" ,emacs-pyvenv) + ("s" ,emacs-s))) + (native-inputs + `(("ert-runner" ,ert-runner) + ("emacs-f" ,emacs-f) + ("python" ,python-wrapper) + ("python-autopep8" ,python-autopep8) + ("python-black" ,python-black) + ("python-flake8" ,python-flake8) + ("python-jedi" ,python-jedi) + ("python-yapf" ,python-yapf) + ;; For documentation. + ("python-sphinx" ,python-sphinx) + ("texinfo" ,texinfo))) + (home-page "https://github.com/jorgenschaefer/elpy") + (synopsis "Python development environment for Emacs") + (description "Elpy brings powerful Python editing to Emacs. It combines +and configures a number of other packages written in Emacs Lisp as well as +Python, together offering features such as navigation, documentation, +completion, interactive development and more.") + (license license:gpl3+))) + (define-public emacs-rainbow-delimiters (package (name "emacs-rainbow-delimiters") -- cgit v1.2.3 From f309671c289373893096de367c779f3175f297da Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 6 Sep 2018 11:21:51 -0400 Subject: gnu: Add emacs-org-reveal. * gnu/packages/emacs.scm (emacs-org-reveal): New variable. --- gnu/packages/emacs.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 1541626d76..770ca3c496 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -9812,6 +9812,29 @@ The default setup uses helm-bibtex. You should really read org-ref.org in this package for details.") (license license:gpl3+)))) +(define-public emacs-org-reveal + (package + (name "emacs-org-reveal") + ;; There are no proper tag, so we use the latest commit of the stable + ;; branch, as does MELPA. + (version "20161027.926") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/yjwen/org-reveal.git") + (commit "001567cc12d50ba07612edd1718b86a12e8c2547"))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "18rma8smjrskbjyna076zhvx79zs5r5vinb537h8mw13pfxd6cm8")))) + (build-system emacs-build-system) + (home-page "https://github.com/yjwen/org-reveal") + (synopsis "Org and Reveal.js powered HTML presentation tool") + (description "Org-Reveal is a command@{org-mode} extension that allows to +create beautiful presentations (slides) with 3D effects from simple but +powerful Org contents.") + (license license:gpl3+))) + (define-public emacs-add-hooks (package (name "emacs-add-hooks") -- cgit v1.2.3 From 333c0ca9661b8285ac49eed881e75c523317d5df Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 13 Sep 2018 00:25:39 +0200 Subject: gnu: rust@1.23.0: Use rust@1.20.0 as template. * gnu/packages/rust.scm (rust-1.23)[inherit]: Use rust-1.20. [arguments]<#:phases>: Delete "patch-cargo-tomls" phase deletion. Add "provide-cc" phase deletion. Add "configure-archiver" phase deletion. [configure]: Inherit phase. [reset-timestamps-after-changes]: Inherit phase. [build]: Inherit phase. [check]: Inherit phase. [install]: Inherit phase. [wrap-rustc]: Inherit phase. --- gnu/packages/rust.scm | 93 +++------------------------------------------------ 1 file changed, 5 insertions(+), 88 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index ba061885b7..e84e58a30f 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -615,7 +615,7 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (define-public rust-1.23 (package - (inherit rust-1.19) + (inherit rust-1.20) (name "rust") (version "1.23.0") (source (rust-source version "14fb8vhjzsxlbi6yrn1r6fl5dlbdd1m92dn5zj5gmzfwf4w9ar3l")) @@ -633,17 +633,17 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" ("pkg-config" ,pkg-config) ; For "cargo" ("which" ,which))) (arguments - (substitute-keyword-arguments (package-arguments rust-1.19) + (substitute-keyword-arguments (package-arguments rust-1.20) ((#:phases phases) `(modify-phases ,phases + (delete 'provide-cc) + (delete 'configure-archiver) (add-after 'unpack 'dont-build-native (lambda _ ;; XXX: Revisit this when we use gcc 6. (substitute* "src/binaryen/CMakeLists.txt" (("ADD_COMPILE_FLAG\\(\\\"-march=native\\\"\\)") "")) #t)) - ;; TODO: Revisit this and find out whether that's needed after all. - (delete 'patch-cargo-tomls) (add-after 'patch-tests 'patch-cargo-tests (lambda _ (substitute* "src/tools/cargo/tests/build.rs" @@ -671,90 +671,7 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" ;; is 0, but in same time "src" have 0 mtime in guix build! (("let threshold = mtime\\(dst\\);") "if !dst.exists() {\nreturn false\n}\n let threshold = mtime(dst);")) - #t)) - (replace 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc")) - (gcc (assoc-ref inputs "gcc")) - (gdb (assoc-ref inputs "gdb")) - (binutils (assoc-ref inputs "binutils")) - (python (assoc-ref inputs "python-2")) - (rustc (assoc-ref inputs "rustc-bootstrap")) - (cargo (assoc-ref inputs "cargo-bootstrap")) - (llvm (assoc-ref inputs "llvm")) - (jemalloc (assoc-ref inputs "jemalloc"))) - (call-with-output-file "config.toml" - (lambda (port) - (display (string-append " -[llvm] -[build] -cargo = \"" cargo "/bin/cargo" "\" -rustc = \"" rustc "/bin/rustc" "\" -docs = true -python = \"" python "/bin/python2" "\" -gdb = \"" gdb "/bin/gdb" "\" -vendor = true -submodules = false -[install] -prefix = \"" out "\" -docdir = \"" doc "/share/doc/rust" "\" -sysconfdir = \"etc\" -localstatedir = \"var/lib\" -[rust] -default-linker = \"" gcc "/bin/gcc" "\" -channel = \"stable\" -rpath = true -" ;; There are 2 failed codegen tests: - ;; codegen/mainsubprogram.rs and codegen/mainsubprogramstart.rs - ;; These tests require a patched LLVM -"codegen-tests = false -[target." ,(nix-system->gnu-triplet-for-rust) "] -llvm-config = \"" llvm "/bin/llvm-config" "\" -cc = \"" gcc "/bin/gcc" "\" -cxx = \"" gcc "/bin/g++" "\" -ar = \"" binutils "/bin/ar" "\" -jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" -[dist] -") port))) - #t))) - (add-before 'build 'reset-timestamps-after-changes - (lambda* _ - (define ref (stat "README.md")) - (for-each - (lambda (filename) - (set-file-time filename ref)) - (find-files "." #:directories? #t)) - #t)) - (replace 'build - (lambda* _ - (invoke "./x.py" "build") - (invoke "./x.py" "build" "src/tools/cargo"))) - (replace 'check - (lambda* _ - ;; Disable parallel execution to prevent EAGAIN errors when - ;; running tests. - (invoke "./x.py" "-j1" "test") - (invoke "./x.py" "-j1" "test" "src/tools/cargo"))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (invoke "./x.py" "install") - (substitute* "config.toml" - ;; replace prefix to specific output - (("prefix = \"[^\"]*\"") - (string-append "prefix = \"" (assoc-ref outputs "cargo") "\""))) - (invoke "./x.py" "install" "cargo") - #t)) - (add-after 'install 'wrap-rustc - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (libc (assoc-ref inputs "libc")) - (ld-wrapper (assoc-ref inputs "ld-wrapper"))) - ;; Let gcc find ld and libc startup files. - (wrap-program (string-append out "/bin/rustc") - `("PATH" ":" prefix (,(string-append ld-wrapper "/bin"))) - `("LIBRARY_PATH" ":" suffix (,(string-append libc "/lib")))) - #t))))))))) + #t)))))))) (define-public rust-1.24 (let ((base-rust -- cgit v1.2.3 From bfdc0e4d456c51c812ac06a8008de5cc90073654 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 13 Sep 2018 00:37:15 +0200 Subject: gnu: rust: Move "cc" from rust-bootstrap to rust proper. * gnu/packages/rust.scm (rust-bootstrap)[arguments]<#:phases>[install]: Delete "cc". (rust-1.23)[arguments]<#:phases>: Delete "provide-cc" deletion. --- gnu/packages/rust.scm | 6 ------ 1 file changed, 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index e84e58a30f..634dbf8bde 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -143,11 +143,6 @@ (for-each (lambda (file) (invoke "patchelf" "--set-interpreter" ld-so file)) (list rustc rustdoc cargo)) - ;; Rust requires a C toolchain for linking. The prebuilt - ;; binaries expect a compiler called cc. Thus symlink gcc - ;; to cc. - (symlink (string-append gcc "/bin/gcc") - (string-append out "/bin/cc")) #t)))))) (home-page "https://www.rust-lang.org") (synopsis "Prebuilt rust compiler and cargo package manager") @@ -636,7 +631,6 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (substitute-keyword-arguments (package-arguments rust-1.20) ((#:phases phases) `(modify-phases ,phases - (delete 'provide-cc) (delete 'configure-archiver) (add-after 'unpack 'dont-build-native (lambda _ -- cgit v1.2.3 From e69b1a7c6ed0db26b195aa18e66b32bb8b384527 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 13 Sep 2018 00:39:39 +0200 Subject: gnu: rust-bootstrap: Clean up comments. * gnu/packages/rust.scm (rust-bootstrap): Clean up comments. --- gnu/packages/rust.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 634dbf8bde..fd0f365284 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -126,13 +126,13 @@ (rustdoc (string-append out "/bin/rustdoc")) (cargo (string-append cargo-out "/bin/cargo")) (gcc (assoc-ref inputs "gcc"))) - ;; Install rustc/rustdoc + ;; Install rustc/rustdoc. (invoke "bash" "install.sh" (string-append "--prefix=" out) (string-append "--components=rustc," "rust-std-" ,(nix-system->gnu-triplet-for-rust))) - ;; Instal cargo + ;; Install cargo. (invoke "bash" "install.sh" (string-append "--prefix=" cargo-out) (string-append "--components=cargo")) -- cgit v1.2.3 From 05ebff92bd84751953ce0f95a44cab134aae1346 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 13 Sep 2018 00:53:22 +0200 Subject: gnu: Add rust@1.21.0. * gnu/packages/rust.scm (rust-1.21): New variable. --- gnu/packages/rust.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index fd0f365284..2a84da0063 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -608,6 +608,10 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" `("LIBRARY_PATH" ":" suffix (,(string-append libc "/lib")))) #t)))))))))) +(define-public rust-1.21 + (rust-bootstrapped-package rust-1.20 "1.21.0" + "1yj8lnxybjrybp00fqhxw8fpr641dh8wcn9mk44xjnsb4i1c21qp")) + (define-public rust-1.23 (package (inherit rust-1.20) -- cgit v1.2.3 From 1ab3e1dd981aeb6b9fb3c19a564a27ab7db6461d Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 13 Sep 2018 00:55:33 +0200 Subject: gnu: Add rust@1.22.1. * gnu/packages/rust.scm (rust-1.22): New variable. --- gnu/packages/rust.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 2a84da0063..89630aa8a0 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -612,6 +612,10 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (rust-bootstrapped-package rust-1.20 "1.21.0" "1yj8lnxybjrybp00fqhxw8fpr641dh8wcn9mk44xjnsb4i1c21qp")) +(define-public rust-1.22 + (rust-bootstrapped-package rust-1.21 "1.22.1" + "1lrzzp0nh7s61wgfs2h6ilaqi6iq89f1pd1yaf65l87bssyl4ylb")) + (define-public rust-1.23 (package (inherit rust-1.20) -- cgit v1.2.3 From 73dc7834de77699dfba904445692362c435293b4 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 13 Sep 2018 01:05:55 +0200 Subject: gnu: rust@1.20.0: Replace "default-ar" by "ar". * gnu/packages/rust.scm (rust-1.20)[arguments]<#:phases>[configure]: Replace "default-ar" by "ar". --- gnu/packages/rust.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 89630aa8a0..f62c48499d 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -536,9 +536,6 @@ sysconfdir = \"etc\" localstatedir = \"var/lib\" [rust] default-linker = \"" gcc "/bin/gcc" "\" - -# The archiver that the finished compiler uses -default-ar = \"" binutils "/bin/ar" "\" channel = \"stable\" rpath = true " ;; There are 2 failed codegen tests: @@ -549,6 +546,7 @@ rpath = true llvm-config = \"" llvm "/bin/llvm-config" "\" cc = \"" gcc "/bin/gcc" "\" cxx = \"" gcc "/bin/g++" "\" +ar = \"" binutils "/bin/ar" "\" jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" [dist] ") port))) -- cgit v1.2.3 From 26700caed91b967bf365e29eb576cc23b84a502f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Thu, 13 Sep 2018 19:28:36 +0800 Subject: gnu: racket: Fix incompatibility with libedit. The former patching made racket detecting libedit as the old 2.11 version, which leads to failure: . * gnu/packages/scheme.scm (racket)[arguments]: Patch the 'ffi-lib' call of libedit using 'PLT_READLINE_LIB'. --- gnu/packages/scheme.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 926169ce18..2e46a8453f 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -460,6 +460,9 @@ implementation techniques and as an expository tool.") (substitute* "share/pkgs/math-lib/math/private/bigfloat/mpfr.rkt" (("ffi-lib libmpfr-so") (format #f "ffi-lib \"~a\"" (find-so "libmpfr")))) + (substitute* "share/pkgs/readline-lib/readline/rktrl.rkt" + (("\\(getenv \"PLT_READLINE_LIB\"\\)") + (format #f "\"~a\"" (find-so "libedit")))) (for-each (lambda (x) (apply patch-ffi-libs x)) '(("share/pkgs/draw-lib/racket/draw/unsafe/cairo-lib.rkt" @@ -487,9 +490,7 @@ implementation techniques and as an expository tool.") ("share/pkgs/gui-lib/mred/private/wx/gtk/gl-context.rkt" ("libGL")) ("share/pkgs/sgl/gl.rkt" - ("libGL" "libGLU")) - ("share/pkgs/readline-lib/readline/rktrl.rkt" - ("libedit"))))) + ("libGL" "libGLU"))))) (chdir "src") #t)) (add-after 'unpack 'patch-/bin/sh -- cgit v1.2.3 From d1ca3d7297f5d94dad6d9e2200d3d63738e45a2f Mon Sep 17 00:00:00 2001 From: pimi Date: Thu, 6 Sep 2018 17:14:50 +0200 Subject: gnu: Add r-svdialogs. gnu/packages/cran.scm (r-svdialogs): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ab989abfff..721f43503a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5668,3 +5668,30 @@ Interfaces (GUI) in R. It is independent from any particular GUI widgets. It centralizes info about GUI elements currently used, and it dispatches GUI calls to the particular toolkits in use in function of the context.") (license license:gpl2))) + +(define-public r-svdialogs + (package + (name "r-svdialogs") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "svDialogs" version)) + (sha256 + (base32 "0xqppydfawnwk84kb5qiybwbcmv38vn4imgz01mz2pnq4xb80p97")))) + (properties `((upstream-name . "svDialogs"))) + (build-system r-build-system) + (inputs + `(("yad" ,yad) + ("zenity" ,zenity))) + (propagated-inputs + `(("r-rstudioapi" ,r-rstudioapi) + ("r-svgui" ,r-svgui))) + (home-page "https://github.com/SciViews/svDialogs/") + (synopsis "Portable dialog boxes") + (description + "This package helps to construct standard dialog boxes for your GUI, including +message boxes, input boxes, list, file or directory selection, and others. In +case R cannot display GUI dialog boxes, a simpler command line version of these +interactive elements is also provided as a fallback solution.") + (license license:gpl2))) -- cgit v1.2.3 From 3cadd3ce93472987fec0bfb4fde9f6937775c7d8 Mon Sep 17 00:00:00 2001 From: pimi Date: Mon, 3 Sep 2018 14:27:58 +0200 Subject: gnu: Add r-abe. gnu/packages/cran.scm (r-abe): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 721f43503a..fd08f5f549 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5695,3 +5695,25 @@ message boxes, input boxes, list, file or directory selection, and others. In case R cannot display GUI dialog boxes, a simpler command line version of these interactive elements is also provided as a fallback solution.") (license license:gpl2))) + +(define-public r-abe + (package + (name "r-abe") + (version "3.0.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "abe" version)) + (sha256 + (base32 + "1f19h3xzzmjhvwc1rrb8z0rai3ip03y4gdi2gg9bfr5sg2nfklk6")))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/web/packages/abe/") + (synopsis "Augmented backward elimination") + (description + "This package performs augmented backward elimination and checks the +stability of the obtained model. Augmented backward elimination combines +significance or information based criteria with the change in estimate to +either select the optimal model for prediction purposes or to serve as a tool +to obtain a practically sound, highly interpretable model.") + (license license:gpl2+))) -- cgit v1.2.3 From 6fe73b487b46fa8c60e8aee7e2d2a642e5024077 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 13 Sep 2018 10:35:11 +0200 Subject: gnu: rust: Accept more detailed gdb responses. * gnu/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/rust.scm (rust-1.25): Use it. (rust-1.26): Use it. (rust): Use it. --- gnu/local.mk | 1 + .../rust-1.25-accept-more-detailed-gdb-lines.patch | 94 ++++++++++++++++++++++ gnu/packages/rust.scm | 11 ++- 3 files changed, 102 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index f15fb3339a..7b230cb6f5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1124,6 +1124,7 @@ dist_patch_DATA = \ %D%/packages/patches/ruby-rack-ignore-failing-test.patch \ %D%/packages/patches/ruby-tzinfo-data-ignore-broken-test.patch\ %D%/packages/patches/rust-1.19-mrustc.patch \ + %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/rxvt-unicode-escape-sequences.patch \ diff --git a/gnu/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch b/gnu/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch new file mode 100644 index 0000000000..6ffc897297 --- /dev/null +++ b/gnu/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch @@ -0,0 +1,94 @@ +GDB responds with some overly detailed lines - which makes the tests fail. +Patch rust to accept those instead. +diff -ur orig/rustc-1.25.0-src/src/test/debuginfo/generic-enum-with-different-disr-sizes.rs rustc-1.25.0-src/src/test/debuginfo/generic-enum-with-different-disr-sizes.rs +--- orig/rustc-1.25.0-src/src/test/debuginfo/generic-enum-with-different-disr-sizes.rs 2018-09-13 10:24:33.775565159 +0200 ++++ rustc-1.25.0-src/src/test/debuginfo/generic-enum-with-different-disr-sizes.rs 2018-09-13 10:25:56.322513658 +0200 +@@ -19,36 +19,36 @@ + + // gdb-command:print eight_bytes1 + // gdbg-check:$1 = {{RUST$ENUM$DISR = Variant1, __0 = 100}, {RUST$ENUM$DISR = Variant1, __0 = 100}} +-// gdbr-check:$1 = generic_enum_with_different_disr_sizes::Enum::Variant1(100) ++// gdbr-check:$1 = generic_enum_with_different_disr_sizes::Enum::Variant1(100) + + // gdb-command:print four_bytes1 + // gdbg-check:$2 = {{RUST$ENUM$DISR = Variant1, __0 = 101}, {RUST$ENUM$DISR = Variant1, __0 = 101}} +-// gdbr-check:$2 = generic_enum_with_different_disr_sizes::Enum::Variant1(101) ++// gdbr-check:$2 = generic_enum_with_different_disr_sizes::Enum::Variant1(101) + + // gdb-command:print two_bytes1 + // gdbg-check:$3 = {{RUST$ENUM$DISR = Variant1, __0 = 102}, {RUST$ENUM$DISR = Variant1, __0 = 102}} +-// gdbr-check:$3 = generic_enum_with_different_disr_sizes::Enum::Variant1(102) ++// gdbr-check:$3 = generic_enum_with_different_disr_sizes::Enum::Variant1(102) + + // gdb-command:print one_byte1 + // gdbg-check:$4 = {{RUST$ENUM$DISR = Variant1, __0 = 65 'A'}, {RUST$ENUM$DISR = Variant1, __0 = 65 'A'}} +-// gdbr-check:$4 = generic_enum_with_different_disr_sizes::Enum::Variant1(65) ++// gdbr-check:$4 = generic_enum_with_different_disr_sizes::Enum::Variant1(65) + + + // gdb-command:print eight_bytes2 + // gdbg-check:$5 = {{RUST$ENUM$DISR = Variant2, __0 = 100}, {RUST$ENUM$DISR = Variant2, __0 = 100}} +-// gdbr-check:$5 = generic_enum_with_different_disr_sizes::Enum::Variant2(100) ++// gdbr-check:$5 = generic_enum_with_different_disr_sizes::Enum::Variant2(100) + + // gdb-command:print four_bytes2 + // gdbg-check:$6 = {{RUST$ENUM$DISR = Variant2, __0 = 101}, {RUST$ENUM$DISR = Variant2, __0 = 101}} +-// gdbr-check:$6 = generic_enum_with_different_disr_sizes::Enum::Variant2(101) ++// gdbr-check:$6 = generic_enum_with_different_disr_sizes::Enum::Variant2(101) + + // gdb-command:print two_bytes2 + // gdbg-check:$7 = {{RUST$ENUM$DISR = Variant2, __0 = 102}, {RUST$ENUM$DISR = Variant2, __0 = 102}} +-// gdbr-check:$7 = generic_enum_with_different_disr_sizes::Enum::Variant2(102) ++// gdbr-check:$7 = generic_enum_with_different_disr_sizes::Enum::Variant2(102) + + // gdb-command:print one_byte2 + // gdbg-check:$8 = {{RUST$ENUM$DISR = Variant2, __0 = 65 'A'}, {RUST$ENUM$DISR = Variant2, __0 = 65 'A'}} +-// gdbr-check:$8 = generic_enum_with_different_disr_sizes::Enum::Variant2(65) ++// gdbr-check:$8 = generic_enum_with_different_disr_sizes::Enum::Variant2(65) + + // gdb-command:continue + +diff -ur orig/rustc-1.25.0-src/src/test/debuginfo/generic-struct-style-enum.rs rustc-1.25.0-src/src/test/debuginfo/generic-struct-style-enum.rs +--- orig/rustc-1.25.0-src/src/test/debuginfo/generic-struct-style-enum.rs 2018-09-13 10:24:33.775565159 +0200 ++++ rustc-1.25.0-src/src/test/debuginfo/generic-struct-style-enum.rs 2018-09-13 10:27:43.353108111 +0200 +@@ -19,15 +19,15 @@ + + // gdb-command:print case1 + // gdbg-check:$1 = {{RUST$ENUM$DISR = Case1, a = 0, b = 31868, c = 31868, d = 31868, e = 31868}, {RUST$ENUM$DISR = Case1, [...]}, {RUST$ENUM$DISR = Case1, [...]}} +-// gdbr-check:$1 = generic_struct_style_enum::Regular::Case1{a: 0, b: 31868, c: 31868, d: 31868, e: 31868} ++// gdbr-check:$1 = generic_struct_style_enum::Regular::Case1{a: 0, b: 31868, c: 31868, d: 31868, e: 31868} + + // gdb-command:print case2 + // gdbg-check:$2 = {{RUST$ENUM$DISR = Case2, [...]}, {RUST$ENUM$DISR = Case2, a = 0, b = 286331153, c = 286331153}, {RUST$ENUM$DISR = Case2, [...]}} +-// gdbr-check:$2 = generic_struct_style_enum::Regular::Case2{a: 0, b: 286331153, c: 286331153} ++// gdbr-check:$2 = generic_struct_style_enum::Regular::Case2{a: 0, b: 286331153, c: 286331153} + + // gdb-command:print case3 + // gdbg-check:$3 = {{RUST$ENUM$DISR = Case3, [...]}, {RUST$ENUM$DISR = Case3, [...]}, {RUST$ENUM$DISR = Case3, a = 0, b = 6438275382588823897}} +-// gdbr-check:$3 = generic_struct_style_enum::Regular::Case3{a: 0, b: 6438275382588823897} ++// gdbr-check:$3 = generic_struct_style_enum::Regular::Case3{a: 0, b: 6438275382588823897} + + // gdb-command:print univariant + // gdbg-check:$4 = {{a = -1}} +diff -ur orig/rustc-1.25.0-src/src/test/debuginfo/generic-tuple-style-enum.rs rustc-1.25.0-src/src/test/debuginfo/generic-tuple-style-enum.rs +--- orig/rustc-1.25.0-src/src/test/debuginfo/generic-tuple-style-enum.rs 2018-09-13 10:24:33.775565159 +0200 ++++ rustc-1.25.0-src/src/test/debuginfo/generic-tuple-style-enum.rs 2018-09-13 10:28:26.328546298 +0200 +@@ -21,15 +21,15 @@ + + // gdb-command:print case1 + // gdbg-check:$1 = {{RUST$ENUM$DISR = Case1, __0 = 0, __1 = 31868, __2 = 31868, __3 = 31868, __4 = 31868}, {RUST$ENUM$DISR = Case1, [...]}, {RUST$ENUM$DISR = Case1, [...]}} +-// gdbr-check:$1 = generic_tuple_style_enum::Regular::Case1(0, 31868, 31868, 31868, 31868) ++// gdbr-check:$1 = generic_tuple_style_enum::Regular::Case1(0, 31868, 31868, 31868, 31868) + + // gdb-command:print case2 + // gdbg-check:$2 = {{RUST$ENUM$DISR = Case2, [...]}, {RUST$ENUM$DISR = Case2, __0 = 0, __1 = 286331153, __2 = 286331153}, {RUST$ENUM$DISR = Case2, [...]}} +-// gdbr-check:$2 = generic_tuple_style_enum::Regular::Case2(0, 286331153, 286331153) ++// gdbr-check:$2 = generic_tuple_style_enum::Regular::Case2(0, 286331153, 286331153) + + // gdb-command:print case3 + // gdbg-check:$3 = {{RUST$ENUM$DISR = Case3, [...]}, {RUST$ENUM$DISR = Case3, [...]}, {RUST$ENUM$DISR = Case3, __0 = 0, __1 = 6438275382588823897}} +-// gdbr-check:$3 = generic_tuple_style_enum::Regular::Case3(0, 6438275382588823897) ++// gdbr-check:$3 = generic_tuple_style_enum::Regular::Case3(0, 6438275382588823897) + + // gdb-command:print univariant + // gdbg-check:$4 = {{__0 = -1}} diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index f62c48499d..448ce893d4 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -696,7 +696,8 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (define-public rust-1.25 (let ((base-rust (rust-bootstrapped-package rust-1.24 "1.25.0" - "0baxjr99311lvwdq0s38bipbnj72pn6fgbk6lcq7j555xq53mxpf"))) + "0baxjr99311lvwdq0s38bipbnj72pn6fgbk6lcq7j555xq53mxpf" + #:patches '("rust-1.25-accept-more-detailed-gdb-lines.patch")))) (package (inherit base-rust) (inputs @@ -735,8 +736,9 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (define-public rust-1.26 (let ((base-rust (rust-bootstrapped-package rust-1.25 "1.26.2" - "0047ais0fvmqvngqkdsxgrzhb0kljg8wy85b01kbbjc88hqcz7pv" - #:patches '("rust-coresimd-doctest.patch")))) + "0047ais0fvmqvngqkdsxgrzhb0kljg8wy85b01kbbjc88hqcz7pv" + #:patches '("rust-coresimd-doctest.patch" + "rust-1.25-accept-more-detailed-gdb-lines.patch")))) (package (inherit base-rust) (arguments @@ -786,7 +788,8 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" "089d7rhw55zpvnw71dj8vil6qrylvl4xjr4m8bywjj83d4zq1f9c" #:patches '("rust-coresimd-doctest.patch" - "rust-bootstrap-stage0-test.patch")))) + "rust-bootstrap-stage0-test.patch" + "rust-1.25-accept-more-detailed-gdb-lines.patch")))) (package (inherit base-rust) (arguments -- cgit v1.2.3 From b78fe27b317c34411ea3770fd7dbd61fc5af3411 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 13 Sep 2018 17:14:40 +0200 Subject: gnu: rust@1.25.0: Disable pedantic test. * gnu/packages/rust.scm (rust-1.25)[arguments]<#:phases> [disable-nil-enum-test]: New phase. --- gnu/packages/rust.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 448ce893d4..780c2830c6 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -719,6 +719,13 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (substitute* "config.toml" (("codegen-tests = false") "")) #t)) + ;; FIXME: Re-enable this test if it's indeed supposed to work. + ;; See . + (add-after 'enable-codegen-tests 'disable-nil-enum-test + (lambda _ + (substitute* "src/test/debuginfo/nil-enum.rs" + (("ignore-lldb") "ignore-gdb")) + #t)) (replace 'patch-aarch64-test (lambda _ (substitute* "src/librustc_metadata/dynamic_lib.rs" -- cgit v1.2.3 From 060366f6b311ee3e1a57290bb6a7785417e019b7 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 13 Sep 2018 11:52:10 +0200 Subject: gnu: rust@1.23.0: Inherit outputs. * gnu/packages/rust.scm (rust-1.23)[outputs]: Inherit. --- gnu/packages/rust.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 780c2830c6..b053bdce62 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -620,7 +620,6 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (name "rust") (version "1.23.0") (source (rust-source version "14fb8vhjzsxlbi6yrn1r6fl5dlbdd1m92dn5zj5gmzfwf4w9ar3l")) - (outputs '("out" "doc" "cargo")) (native-inputs `(("bison" ,bison) ; For the tests ("cmake" ,cmake) -- cgit v1.2.3 From fade67ab756602bdeba508fbffa0e35234b58b9c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 13 Sep 2018 18:39:22 +0300 Subject: gnu: retroarch: Use shared zlib. * gnu/packages/emulators.scm (retroarch)[arguments]: In custom 'configure phase, use our zlib instead of vendor's zlib. --- gnu/packages/emulators.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index e02339af62..f21c322814 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1079,6 +1079,11 @@ emulation community. It provides highly accurate emulation.") (("libvulkan.so") (string-append vulkan "/lib/libvulkan.so"))) (substitute* "qb/qb.libs.sh" (("/bin/true") (which "true"))) + ;; Use shared zlib. + (substitute* '("libretro-common/file/archive_file_zlib.c" + "libretro-common/streams/trans_stream_zlib.c" + "network/httpserver/httpserver.c") + (("") "")) ;; The configure script does not yet accept the extra arguments ;; (like ‘CONFIG_SHELL=’) passed by the default configure phase. (zero? (system* -- cgit v1.2.3 From f21967a44bbd948846bdd1bbc370d3d0e3b52185 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 13 Sep 2018 18:40:02 +0300 Subject: gnu: retroarch: Fix building on armhf-linux. * gnu/packages/emulators.scm (retroarch)[arguments]: Add custom flags when building for armhf-linux. --- gnu/packages/emulators.scm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index f21c322814..782bff5b18 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1066,7 +1066,7 @@ emulation community. It provides highly accurate emulation.") (base32 "0h6y2hpjg4b470jvn9ghwp0k3a527sbb6xhia17frlm9w9v5028w")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ; no tests + `(#:tests? #f ; no tests #:phases (modify-phases %standard-phases (replace 'configure @@ -1086,10 +1086,14 @@ emulation community. It provides highly accurate emulation.") (("") "")) ;; The configure script does not yet accept the extra arguments ;; (like ‘CONFIG_SHELL=’) passed by the default configure phase. - (zero? (system* - "./configure" - (string-append "--prefix=" out) - (string-append "--global-config-dir=" etc))))))))) + (invoke + "./configure" + ,@(if (string-prefix? "armhf" (or (%current-target-system) + (%current-system))) + '("--enable-neon" "--enable-floathard") + '()) + (string-append "--prefix=" out) + (string-append "--global-config-dir=" etc)))))))) (inputs `(("alsa-lib" ,alsa-lib) ("ffmpeg" ,ffmpeg) -- cgit v1.2.3 From ef26400b66354942ce784fd3a8ab8eb6c19dc4b7 Mon Sep 17 00:00:00 2001 From: pimi Date: Mon, 3 Sep 2018 15:28:14 +0200 Subject: gnu: Add r-abf2. gnu/packages/cran.scm (r-abf2): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index fd08f5f549..7d65dfbdc1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5717,3 +5717,22 @@ significance or information based criteria with the change in estimate to either select the optimal model for prediction purposes or to serve as a tool to obtain a practically sound, highly interpretable model.") (license license:gpl2+))) + +(define-public r-abf2 + (package + (name "r-abf2") + (version "0.7-1") + (source + (origin + (method url-fetch) + (uri (cran-uri "abf2" version)) + (sha256 + (base32 "0d65mc1w4pbiv7xaqzdlw1bfsxf25587rv597hh41vs0j0zlfpxx")))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/web/packages/abf2/") + (synopsis "Load gap-free axon @code{r-abf2} files") + (description + "This package loads electrophysiology data from ABF2 files, as created by +Axon Instruments/Molecular Devices software. Only files recorded in gap-free +mode are currently supported.") + (license license:artistic2.0))) -- cgit v1.2.3 From 38dc3d6f17bcf54ee3ff1614a392534d3a9e1ecc Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 11 Sep 2018 18:23:29 -0400 Subject: 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(-) (limited to 'gnu') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 626d883648..8811f9d9de 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"))) -- cgit v1.2.3 From ae72b8f55bba87eb87285eee9bdeaa95f213efd2 Mon Sep 17 00:00:00 2001 From: Manuel Graf Date: Fri, 31 Aug 2018 16:55:57 +0200 Subject: gnu: Add ClusterShell. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ssh.scm (clustershell): New variable. Co-authored-by: Ludovic Courtès --- gnu/packages/ssh.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 03c4e3cc0b..362d427a2e 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2017 Stefan Reichör ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2017 Nils Gillmann +;;; Copyright © 2018 Manuel Graf ;;; ;;; This file is part of GNU Guix. ;;; @@ -49,12 +50,14 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages popt) #:autoload (gnu packages protobuf) (protobuf) + #:use-module (gnu packages python) #:use-module (gnu packages readline) #:use-module (gnu packages texinfo) #:use-module (gnu packages tls) #:use-module (gnu packages xorg) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system python) #:use-module (guix download) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) @@ -695,3 +698,41 @@ which executes commands on multiple remote hosts in parallel. Pdsh implements dynamically loadable modules for extended functionality such as new remote shell services and remote host selection.") (license license:gpl2+))) + +(define-public clustershell + (package + (name "clustershell") + (version "1.8") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/cea-hpc/clustershell/archive/v" + version + ".tar.gz")) + (sha256 + (base32 "1qyf6zp5ikk8rk7zvx5ssbgr9si2bqv3a3415590kd07s7i16nmd")) + (file-name (string-append name "-" version ".tar.gz")))) + (build-system python-build-system) + (inputs `(("openssh" ,openssh))) + (propagated-inputs `(("python-pyyaml" ,python-pyyaml))) + (arguments + `(#:phases (modify-phases %standard-phases + (add-before 'build 'record-openssh-file-name + (lambda* (#:key inputs #:allow-other-keys) + (let ((ssh (assoc-ref inputs "openssh"))) + (substitute* "lib/ClusterShell/Worker/Ssh.py" + (("info\\(\"ssh_path\"\\) or \"ssh\"") + (string-append "info(\"ssh_path\") or \"" + ssh "/bin/ssh\""))) + #t)))))) + (home-page "https://cea-hpc.github.io/clustershell/") + (synopsis "Scalable event-driven Python framework for cluster administration") + (description + "ClusterShell is an event-driven Python framework, designed to run local +or distant commands in parallel on server farms or on large GNU/Linux +clusters. It will take care of common issues encountered on HPC clusters, +such as operating on groups of nodes, running distributed commands using +optimized execution algorithms, as well as gathering results and merging +identical outputs, or retrieving return codes. ClusterShell takes advantage +of existing remote shell facilities such as SSH.") + (license license:lgpl2.1+))) -- cgit v1.2.3 From 1efcd0f1ea980472659805d91a2bb486b4136f81 Mon Sep 17 00:00:00 2001 From: pimi Date: Mon, 3 Sep 2018 15:45:20 +0200 Subject: gnu: Add r-abhgenotyper. * gnu/packages/cran.scm (r-abhgenotyper): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 7d65dfbdc1..a05834d7ea 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5736,3 +5736,29 @@ to obtain a practically sound, highly interpretable model.") Axon Instruments/Molecular Devices software. Only files recorded in gap-free mode are currently supported.") (license license:artistic2.0))) + +(define-public r-abhgenotyper + (package + (name "r-abhgenotyper") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "ABHgenotypeR" version)) + (sha256 + (base32 "08cpmnaaxsm5c5bjifnfxdlvg5inrf13biqpcl2yq5zpqjmiki0l")))) + (properties `((upstream-name . "ABHgenotypeR"))) + (build-system r-build-system) + (propagated-inputs + `(("r-ggplot2" ,r-ggplot2) + ("r-reshape2" ,r-reshape2))) + (home-page "https://github.com/StefanReuscher/ABHgenotypeR/") + (synopsis "Visualize and manipulate ABH genotypes") + (description + "The @code{r-abhgenotyper} package provides simple imputation, +error-correction and plotting capacities for genotype data. The package is +supposed to serve as an intermediate but independent analysis tool between the +TASSEL GBS pipeline and the @code{r-qtl} package. It provides functionalities +not found in either TASSEL or @code{r-qtl} in addition to visualization of +genotypes as \"graphical genotypes\".") + (license license:gpl3))) -- cgit v1.2.3 From ebb3cdb1ea6540a5c2b81e43c63d095f426d524a Mon Sep 17 00:00:00 2001 From: pimi Date: Mon, 3 Sep 2018 16:16:38 +0200 Subject: gnu: Add r-abjutils. * gnu/packages/cran.scm (r-abjutils): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a05834d7ea..f8177da013 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5762,3 +5762,38 @@ TASSEL GBS pipeline and the @code{r-qtl} package. It provides functionalities not found in either TASSEL or @code{r-qtl} in addition to visualization of genotypes as \"graphical genotypes\".") (license license:gpl3))) + +(define-public r-abjutils + (package + (name "r-abjutils") + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "abjutils" version)) + (sha256 + (base32 "0qrsc4if7aif73qp95lw6b5986c2r0jn7m39123zij8k15vc935b")))) + (build-system r-build-system) + (propagated-inputs + `(("r-devtools" ,r-devtools) + ("r-dplyr" ,r-dplyr) + ("r-glue" ,r-glue) + ("r-httr" ,r-httr) + ("r-magrittr" ,r-magrittr) + ("r-plyr" ,r-plyr) + ("r-progress" ,r-progress) + ("r-purrr" ,r-purrr) + ("r-rstudioapi" ,r-rstudioapi) + ("r-scales" ,r-scales) + ("r-stringi" ,r-stringi) + ("r-stringr" ,r-stringr) + ("r-tibble" ,r-tibble) + ("r-tidyr" ,r-tidyr))) + (home-page "https://github.com/abjur/abjutils/") + (synopsis "Collection of tools for jurimetrical analysis") + (description + "This package implements general purpose tools, such as functions for +sampling and basic manipulation of Brazilian lawsuits identification number. +It also implements functions for text cleaning, such as accentuation +removal.") + (license license:expat))) -- cgit v1.2.3 From 7d1cc612938565d935c53bd7a429f41d1f048dae Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 13 Sep 2018 13:26:31 -0400 Subject: Revert "gnu: libinput: Update to 1.12.0." Libinput-minimal has a lot of dependent packages, and this isn't reported by `guix refresh --list-dependent`. We'll save this commit for another time. This reverts commit 38dc3d6f17bcf54ee3ff1614a392534d3a9e1ecc. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 8811f9d9de..626d883648 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.11.3") (source (origin (method url-fetch) (uri (string-append "https://freedesktop.org/software/libinput/" name "-" version ".tar.xz")) (sha256 (base32 - "1901wxh9k8kz3krfmvacf8xa8r4idfyisw8d80a2ql0bxiw2pb0m")))) + "01nb1shnl871d939wgfd7nc9svclcnfjfhlq64b4yns2dvcr24gk")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Ddocumentation=false"))) -- cgit v1.2.3 From ecd13016517f0113016fef090782b725fd5e80ce Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 11 Sep 2018 18:23:29 -0400 Subject: 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(-) (limited to 'gnu') 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"))) -- cgit v1.2.3 From 6be445785a4eb97cbecff391ae5b9fde89cb83de Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 13 Sep 2018 19:35:21 +0200 Subject: gnu: youtube-viewer: Don't use unstable tarball. * gnu/packages/video.scm (youtube-viewer)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/video.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index aa2b4467fc..067a1ddc03 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1429,14 +1429,14 @@ audio, images) from the Web. It can use either mpv or vlc for playback.") (name "youtube-viewer") (version "3.3.4") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/trizen/youtube-viewer/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/trizen/youtube-viewer.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1dqaxkz5svv0lmxds6lppcpzhkq6gar2raw9gx6imrd7yz02fpgn")))) + "1kpq3mk81hpjp5q4mi907ds0dbif40a4dzmv2h2lq5pcp757sw6i")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build))) -- cgit v1.2.3 From 0b0b43ed7a10c1dcb7d053e0ac93023fd138ea01 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 13 Sep 2018 19:39:05 +0200 Subject: gnu: youtube-viewer: Update to 3.4.1. * gnu/packages/video.scm (youtube-viewer): Update to 3.4.1. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 067a1ddc03..4882f0476a 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1427,7 +1427,7 @@ audio, images) from the Web. It can use either mpv or vlc for playback.") (define-public youtube-viewer (package (name "youtube-viewer") - (version "3.3.4") + (version "3.4.1") (source (origin (method git-fetch) (uri (git-reference @@ -1436,7 +1436,7 @@ audio, images) from the Web. It can use either mpv or vlc for playback.") (file-name (git-file-name name version)) (sha256 (base32 - "1kpq3mk81hpjp5q4mi907ds0dbif40a4dzmv2h2lq5pcp757sw6i")))) + "0axgb95lx81psgrb2a5rfdd8gl4mhsrzf41jas6l58d1xkaj54ri")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build))) -- cgit v1.2.3 From 581b6f5e969e57a0ac7068685641afa205cc8308 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 12 Sep 2018 22:15:38 +0200 Subject: gnu: sudo: Update to 1.8.25p1. * gnu/packages/admin.scm (sudo): Update to 1.8.25p1. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 8807ab18b5..c6e1044b2b 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -963,7 +963,7 @@ system administrator.") (define-public sudo (package (name "sudo") - (version "1.8.25") + (version "1.8.25p1") (source (origin (method url-fetch) (uri @@ -973,7 +973,7 @@ system administrator.") version ".tar.gz"))) (sha256 (base32 - "0hfw6pcwjvv1vvnhb4n1p210306jm4npz99p9cfhbd33yrhhzkwx")) + "0nqri46d4dpycj96zin2f2wszmhm7q9mr68hhj9sp81pgmx9rjcx")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 7ec4f648e5939e5dc10e1b28515dac8b03b63652 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 12 Sep 2018 17:16:37 +0200 Subject: gnu: sg3_utils: Mark up description. * gnu/packages/scsi.scm (sg3_utils)[description]: Use @dfn{}. Wrap commands in @command{} rather than @code{}, and @itemize them. --- gnu/packages/scsi.scm | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/scsi.scm b/gnu/packages/scsi.scm index 2bb863cad9..f011af84c4 100644 --- a/gnu/packages/scsi.scm +++ b/gnu/packages/scsi.scm @@ -40,15 +40,24 @@ (synopsis "SCSI device utilities") (description "sg3-utils is a collection of utilities for devices that use the Small -Computer System Interface (SCSI) command set. It includes utilities to read -data from, write data to, control, modify, and query the state of SCSI -devices. For example, this package provides command-line tools to copy data -based on @code{dd} syntax and semantics (called @code{sg_dd}, @code{sgp_dd} -and @code{sgm_dd}), check INQUIRY data and VPD pages (@code{sg_inq}), check -mode and log pages (@code{sginfo}, @code{sg_modes} and @code{sg_logs}), spin -up and down disks (@code{sg_start}), do self tests (@code{sg_senddiag}), parse -sense data (@code{sg_decode_sense}), and perform various other functions. In -addition, this package includes a library, called libsgutils, which can be +Computer System Interface (@dfn{SCSI}) command set. It includes utilities to +read data from, write data to, control, modify, and query the state of SCSI +devices. + +For example, this package provides command-line tools to: +@itemize +@item copy data based on @code{dd} syntax and semantics (called @command{sg_dd}, +@command{sgp_dd}, and @command{sgm_dd}) +@item check @code{INQUIRY} data and @code{VPD pages} (@command{sg_inq}) +@item check mode and log pages (@command{sginfo}, @command{sg_modes}, and +@command{sg_logs}) +@item spin up and down disks (@command{sg_start}) +@item do self-tests (@code{sg_senddiag}) +@item parse sense data (@code{sg_decode_sense}) +@item and perform various other functions. +@end itemize + +In addition, this package includes a library, called libsgutils, which can be used in C and C++ programs to interact with SCSI devices.") ;; See README: "All utilities and libraries have either a "2 clause" BSD ;; license or are "GPL-2ed". [...] That BSD license was updated from the -- cgit v1.2.3 From f0314f65dfe31299fd2ef42f42d9691814f7856d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 11 Sep 2018 20:23:50 +0200 Subject: gnu: Add perl-devel-checklib. * gnu/packages/perl.scm (perl-devel-checklib): New public variable. --- gnu/packages/perl.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 85604008e2..f556d19f3c 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -2626,6 +2626,30 @@ the appropriate objects.") particular command is available.") (license (package-license perl)))) +(define-public perl-devel-checklib + (package + (name "perl-devel-checklib") + (version "1.13") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://cpan/authors/id/M/MA/MATTN/Devel-CheckLib-" + version ".tar.gz")) + (sha256 + (base32 "1a19qkwxwz3wqb16cdabymfbf9kiydiifw90nd5srpq5hy8gvb94")))) + (build-system perl-build-system) + (native-inputs + `(("perl-io-captureoutput" ,perl-io-captureoutput) + ("perl-mock-config" ,perl-mock-config))) + (home-page "https://metacpan.org/release/Devel-CheckLib") + (synopsis "Check that a library is available") + (description + "@code{Devel::CheckLib} is a Perl module that checks whether a particular +C library and its headers are available. You can also check for the presence of +particular functions in a library, or even that those functions return +particular results.") + (license perl-license))) + (define-public perl-devel-checkcompiler (package (name "perl-devel-checkcompiler") -- cgit v1.2.3 From b6afe7b7f540c0effbf570d72d5a1efb45287f01 Mon Sep 17 00:00:00 2001 From: pimi Date: Mon, 3 Sep 2018 16:59:46 +0200 Subject: gnu: Add r-abnormality. * gnu/packages/cran.scm (r-abnormality): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f8177da013..439cfcb014 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5797,3 +5797,28 @@ sampling and basic manipulation of Brazilian lawsuits identification number. It also implements functions for text cleaning, such as accentuation removal.") (license license:expat))) + +(define-public r-abnormality + (package + (name "r-abnormality") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "abnormality" version)) + (sha256 + (base32 "1fzfskl9akl06nliy8hkv2a0pznpj8pwcypg3gj5r2nzvr3kan9v")))) + (build-system r-build-system) + (propagated-inputs + `(("r-mass" ,r-mass) + ("r-matrix" ,r-matrix))) + (home-page "https://cran.r-project.org/web/packages/abnormality/") + (synopsis "Measure a subject's abnormality with respect to a reference population") + (description + "This package contains functions to implement the methodology and +considerations laid out by Marks et al. in the article \"Measuring abnormality +in high dimensional spaces: applications in biomechanical gait analysis\". +Using high-dimensional datasets to measure a subject's overall level of +abnormality as compared to a reference population is often needed in outcomes +research.") + (license license:expat))) -- cgit v1.2.3 From 317b139c5dc7e4501d79cd0952444b4b068bee5c Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 13 Sep 2018 10:42:54 +0200 Subject: gnu: rust: Update to 1.27.2. * gnu/packages/rust.scm (rust): Update to 1.27.2. --- gnu/packages/rust.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index b053bdce62..c40a47c4d9 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -790,8 +790,8 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (define-public rust (let ((base-rust - (rust-bootstrapped-package rust-1.26 "1.27.0" - "089d7rhw55zpvnw71dj8vil6qrylvl4xjr4m8bywjj83d4zq1f9c" + (rust-bootstrapped-package rust-1.26 "1.27.2" + "0pg1s37bhx9zqbynxyydq5j6q7kij9vxkcv8maz0m25prm88r0cs" #:patches '("rust-coresimd-doctest.patch" "rust-bootstrap-stage0-test.patch" -- cgit v1.2.3 From 016cabf7bee007fb580d355113de8aa13d0f0a2b Mon Sep 17 00:00:00 2001 From: pimi Date: Mon, 10 Sep 2018 13:21:38 +0200 Subject: gnu: Add r-abodoutlier. * gnu/packages/cran.scm (r-abodoutlier): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 439cfcb014..0c6a4908e8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5822,3 +5822,32 @@ Using high-dimensional datasets to measure a subject's overall level of abnormality as compared to a reference population is often needed in outcomes research.") (license license:expat))) + +(define-public r-abodoutlier + (package + (name "r-abodoutlier") + (version "0.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "abodOutlier" version)) + (sha256 + (base32 "1pvhgxmh23br84r0fbmv7g53z2427birdja96a67vqgz18r3fdvj")))) + (properties `((upstream-name . "abodOutlier"))) + (build-system r-build-system) + (propagated-inputs + `(("r-cluster" ,r-cluster))) + (home-page "https://cran.r-project.org/web/packages/abodOutlier/") + (synopsis "Angle-based outlier detection") + (description + "This package performs angle-based outlier detection on a given data +frame. It offers three methods to process data: +@enumerate +@item full but slow implementation using all the data that has cubic + complexity; +@item a fully randomized method; +@item a method using k-nearest neighbours. +@end enumerate +These algorithms are well suited for high dimensional data outlier +detection.") + (license license:expat))) -- cgit v1.2.3 From 03c95f04147b8022983d39d49171db8eb08e8c59 Mon Sep 17 00:00:00 2001 From: pimi Date: Mon, 10 Sep 2018 14:50:07 +0200 Subject: gnu: Add r-abps. * gnu/packages/cran.scm (r-abps): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 0c6a4908e8..5519b85d0b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5851,3 +5851,27 @@ frame. It offers three methods to process data: These algorithms are well suited for high dimensional data outlier detection.") (license license:expat))) + +(define-public r-abps + (package + (name "r-abps") + (version "0.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "ABPS" version)) + (sha256 + (base32 "1k3f5i34f4w2khkszb4qhwwcpiy7gsfh82vjr6rypwg6rx5rjclq")))) + (properties `((upstream-name . "ABPS"))) + (build-system r-build-system) + (propagated-inputs `(("r-kernlab" ,r-kernlab))) + (home-page "https://cran.r-project.org/web/packages/ABPS/") + (synopsis "Abnormal blood profile score to detect blood doping") + (description + "This package offers an implementation of the @dfn{Abnormal blood profile score} (ABPS). +The ABPS is a part of the Athlete biological passport program of the World +anti-doping agency, which combines several blood parameters into a single +score in order to detect blood doping. The package also contains functions to +calculate other scores used in anti-doping programs, such as the ratio of +hemoglobin to reticulocytes (OFF-score), as well as example data.") + (license license:gpl2+))) -- cgit v1.2.3 From 1dd153b3aabcc05e2ed3863ea0571985c0cae307 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 14 Sep 2018 09:15:16 +0200 Subject: gnu: Add python-hic2cool. * gnu/packages/bioinformatics.scm (python-hic2cool): New variable. --- gnu/packages/bioinformatics.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index f6410c3ca4..67f24a6170 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13699,3 +13699,27 @@ are highly customizable. Currently, it is possible to plot: bigwig, bed (many options), bedgraph, links (represented as arcs), and Hi-C matrices. pyGenomeTracks can make plots with or without Hi-C data.") (license license:gpl3+))) + +(define-public python-hic2cool + (package + (name "python-hic2cool") + (version "0.4.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "hic2cool" version)) + (sha256 + (base32 + "0xy6mhfns2lzib1kcr6419jjp6pmh0qx8z8na55lmiwn0ds8q9cl")))) + (build-system python-build-system) + (arguments '(#:tests? #f)) ; no tests included + (propagated-inputs + `(("python-cooler" ,python-cooler))) + (home-page "https://github.com/4dn-dcic/hic2cool") + (synopsis "Converter for .hic and .cool files") + (description + "This package provides a converter between @code{.hic} files (from +juicer) and single-resolution or multi-resolution @code{.cool} files (for +cooler). Both @code{hic} and @code{cool} files describe Hi-C contact +matrices.") + (license license:expat))) -- cgit v1.2.3 From daa6036fda502460f626b7beb0afa93a0bac6d01 Mon Sep 17 00:00:00 2001 From: Eric Brown Date: Thu, 13 Sep 2018 08:54:36 -0500 Subject: gnu: Add openblas-ilp64. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (openblas-ilp64): New variable. Co-authored-by: Ludovic Courtès --- gnu/packages/maths.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index af41093fbb..d3e72128ca 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -27,6 +27,7 @@ ;;; Copyright © 2018 Nadya Voronova ;;; Copyright © 2018 Adam Massmann ;;; Copyright © 2018 Marius Bakke +;;; Copyright © 2018 Eric Brown ;;; ;;; This file is part of GNU Guix. ;;; @@ -2873,6 +2874,18 @@ parts of it.") "OpenBLAS is a BLAS library forked from the GotoBLAS2-1.13 BSD version.") (license license:bsd-3))) +(define-public openblas-ilp64 + (package (inherit openblas) + (name "openblas-ilp64") + (supported-systems '("x86_64-linux" "aarch64-linux" "mips64el-linux")) + (arguments + (substitute-keyword-arguments (package-arguments openblas) + ((#:make-flags flags '()) + `(append (list "INTERFACE64=1" "LIBNAMESUFFIX=ilp64") + ,flags)))) + (synopsis "Optimized BLAS library based on GotoBLAS (ILP64 version)") + (license license:bsd-3))) + (define* (make-blis implementation #:optional substitutable?) "Return a BLIS package with the given IMPLEMENTATION (see config/ in the source tree for a list of implementations.) -- cgit v1.2.3 From 7a20877a184b5a9794741cf49740b88d61e8a2a4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 14 Sep 2018 14:57:47 +0200 Subject: gnu: python-llvmlite: Remove obsolete patch. * gnu/packages/llvm.scm (python-llvmlite)[inputs]: Remove patch that is obsolete since the upgrade to LLVM 6.0.1. --- gnu/packages/llvm.scm | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index cd710bcb79..d0791d00cc 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -417,15 +417,7 @@ code analysis tools.") "twine_cfg_undefined_behavior.patch")) (sha256 (base32 - "07h71n2m1mn9zcfgw04zglffknplb233zqbcd6pckq0wygkrxflp"))) - (origin - (method url-fetch) - (uri (string-append "https://raw.githubusercontent.com/numba/" - "llvmlite/v" version "/conda-recipes/" - "0001-Transforms-Add-missing-header-for-InstructionCombini.patch")) - (sha256 - (base32 - "1pp0z9696l6j4dwz7ypjrm4vvkj0d3mlf1g8zmiyk08akw5lz0cb"))))))))))) + "07h71n2m1mn9zcfgw04zglffknplb233zqbcd6pckq0wygkrxflp"))))))))))) (home-page "http://llvmlite.pydata.org") (synopsis "Wrapper around basic LLVM functionality") (description -- cgit v1.2.3 From e830c9d0b0ff7622b8bb86348ee0c97a28e2f2d8 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Fri, 14 Sep 2018 21:31:24 +0200 Subject: gnu: Rename "banana-pi" to "bananapi". * gnu/bootloader/u-boot.scm (u-boot-banana-pi-m2-ultra-bootloader): Rename to... (u-boot-bananapi-m2-ultra-bootloader): ...this. * gnu/packages/bootloaders.scm (u-boot-banana-pi-m2-ultra): Rename to... (u-boot-bananapi-m2-ultra): ...this. * gnu/system/install.scm (banana-pi-m2-ultra-installation-os): Rename to... (bananapi-m2-ultra-installation-os): ...this. --- gnu/bootloader/u-boot.scm | 6 +++--- gnu/packages/bootloaders.scm | 2 +- gnu/system/install.scm | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm index 52b38dd1ab..0157fde3da 100644 --- a/gnu/bootloader/u-boot.scm +++ b/gnu/bootloader/u-boot.scm @@ -31,7 +31,7 @@ u-boot-a20-olinuxino-lime-bootloader u-boot-a20-olinuxino-lime2-bootloader u-boot-a20-olinuxino-micro-bootloader - u-boot-banana-pi-m2-ultra-bootloader + u-boot-bananapi-m2-ultra-bootloader u-boot-beaglebone-black-bootloader u-boot-mx6cuboxi-bootloader u-boot-nintendo-nes-classic-edition-bootloader @@ -148,10 +148,10 @@ (inherit u-boot-allwinner-bootloader) (package u-boot-a20-olinuxino-micro))) -(define u-boot-banana-pi-m2-ultra-bootloader +(define u-boot-bananapi-m2-ultra-bootloader (bootloader (inherit u-boot-allwinner-bootloader) - (package u-boot-banana-pi-m2-ultra))) + (package u-boot-bananapi-m2-ultra))) (define u-boot-mx6cuboxi-bootloader (bootloader diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index eee66b2c5f..0ba31d867d 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -570,7 +570,7 @@ board-independent tools."))) `(("firmware" ,arm-trusted-firmware-pine64-plus) ,@(package-native-inputs base)))))) -(define-public u-boot-banana-pi-m2-ultra +(define-public u-boot-bananapi-m2-ultra (make-u-boot-package "Bananapi_M2_Ultra" "arm-linux-gnueabihf")) (define-public u-boot-a20-olinuxino-lime diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 95661dc973..a648ddf95e 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -47,7 +47,7 @@ a20-olinuxino-lime-installation-os a20-olinuxino-lime2-emmc-installation-os a20-olinuxino-micro-installation-os - banana-pi-m2-ultra-installation-os + bananapi-m2-ultra-installation-os beaglebone-black-installation-os mx6cuboxi-installation-os nintendo-nes-classic-edition-installation-os @@ -448,8 +448,8 @@ The bootloader BOOTLOADER is installed to BOOTLOADER-TARGET." "/dev/mmcblk0" ; SD card storage "ttyS0")) -(define banana-pi-m2-ultra-installation-os - (embedded-installation-os u-boot-banana-pi-m2-ultra-bootloader +(define bananapi-m2-ultra-installation-os + (embedded-installation-os u-boot-bananapi-m2-ultra-bootloader "/dev/mmcblk1" ; eMMC storage "ttyS0")) -- cgit v1.2.3 From 9e9e5d5a269f32fab596c83451824a50dbc2b62d Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 11 Sep 2018 16:40:48 -0400 Subject: gnu: OpenSSL 1.1: Update to 1.1.1. * gnu/packages/tls.scm (openssl-next): Update to 1.1.1. [arguments]: Patch a `/usr/bin/env` invocation in the 'config' script. Adjust the documentation output. * gnu/packages/patches/openssl-1.1.0-c-rehash-in.patch: Rename and ... * gnu/packages/patches/openssl-1.1-c-rehash-in.patch: ... adjust patch. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 2 +- gnu/packages/patches/openssl-1.1-c-rehash-in.patch | 19 ++++++++++++++ .../patches/openssl-1.1.0-c-rehash-in.patch | 19 -------------- gnu/packages/tls.scm | 30 ++++++++++++++++++---- 4 files changed, 45 insertions(+), 25 deletions(-) create mode 100644 gnu/packages/patches/openssl-1.1-c-rehash-in.patch delete mode 100644 gnu/packages/patches/openssl-1.1.0-c-rehash-in.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 7b230cb6f5..d37a193adb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1011,7 +1011,7 @@ dist_patch_DATA = \ %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-1.1-c-rehash-in.patch \ %D%/packages/patches/openssl-c-rehash-in.patch \ %D%/packages/patches/orpheus-cast-errors-and-includes.patch \ %D%/packages/patches/osip-CVE-2017-7853.patch \ diff --git a/gnu/packages/patches/openssl-1.1-c-rehash-in.patch b/gnu/packages/patches/openssl-1.1-c-rehash-in.patch new file mode 100644 index 0000000000..c96493b584 --- /dev/null +++ b/gnu/packages/patches/openssl-1.1-c-rehash-in.patch @@ -0,0 +1,19 @@ +This patch removes the explicit reference to the 'perl' binary, +such that OpenSSL does not retain a reference to Perl. + +The 'c_rehash' program is seldom used, but it is used nonetheless +to create symbolic links to certificates, for instance in the 'nss-certs' +package. + +diff --git a/tools/c_rehash.in b/tools/c_rehash.in +index 421fd89208..93aca4e168 100644 +--- a/tools/c_rehash.in ++++ b/tools/c_rehash.in +@@ -1,4 +1,6 @@ +-#!{- $config{HASHBANGPERL} -} ++eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}' ++ & eval 'exec perl -wS "$0" $argv:q' ++ if 0; + + # {- join("\n# ", @autowarntext) -} + # Copyright 1999-2018 The OpenSSL Project Authors. All Rights Reserved. diff --git a/gnu/packages/patches/openssl-1.1.0-c-rehash-in.patch b/gnu/packages/patches/openssl-1.1.0-c-rehash-in.patch deleted file mode 100644 index e3a982b7a8..0000000000 --- a/gnu/packages/patches/openssl-1.1.0-c-rehash-in.patch +++ /dev/null @@ -1,19 +0,0 @@ -This patch removes the explicit reference to the 'perl' binary, -such that OpenSSL does not retain a reference to Perl. - -The 'c_rehash' program is seldom used, but it is used nonetheless -to create symbolic links to certificates, for instance in the 'nss-certs' -package. - -diff --git a/tools/c_rehash.in b/tools/c_rehash.in -index 2fef627..9d40eae 100644 ---- a/tools/c_rehash.in -+++ b/tools/c_rehash.in -@@ -1,4 +1,6 @@ --#!{- $config{hashbangperl} -} -+eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}' -+ & eval 'exec perl -wS "$0" $argv:q' -+ if 0; - - # {- join("\n# ", @autowarntext) -} - # Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved. diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 5e49509ddd..f7de901385 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -410,7 +410,7 @@ required structures.") (package (inherit openssl) (name "openssl") - (version "1.1.0i") + (version "1.1.1") (source (origin (method url-fetch) (uri (list (string-append "https://www.openssl.org/source/openssl-" @@ -420,13 +420,13 @@ required structures.") (string-append "ftp://ftp.openssl.org/source/old/" (string-trim-right version char-set:letter) "/" name "-" version ".tar.gz"))) - (patches (search-patches "openssl-1.1.0-c-rehash-in.patch")) + (patches (search-patches "openssl-1.1-c-rehash-in.patch")) (sha256 (base32 - "16fgaf113p6s5ixw227sycvihh3zx6f6rf0hvjjhxk68m12cigzb")))) + "0gbab2fjgms1kx5xjvqx8bxhr98k4r8l2fa8vw7kvh491xd8fdi8")))) (outputs '("out" - "doc" ; 1.3MiB of man3 pages - "static")) ; 5.5MiB of .a files + "doc" ; 6.7 MiB of man3 pages and full HTML documentation + "static")) ; 6.4 MiB of .a files (arguments (substitute-keyword-arguments (package-arguments openssl) ((#:phases phases) @@ -439,6 +439,11 @@ required structures.") (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (lib (string-append out "/lib"))) + ;; It's not a shebang so patch-source-shebangs misses it. + (substitute* "config" + (("/usr/bin/env") + (string-append (assoc-ref %build-inputs "coreutils") + "/bin/env"))) (invoke "./config" "shared" ;build shared libraries "--libdir=lib" @@ -460,6 +465,21 @@ required structures.") '("-mfpu=vfpv3") '()))))) + (delete 'move-man3-pages) + (add-after 'install 'move-extra-documentation + (lambda* (#:key outputs #:allow-other-keys) + ;; Move man3 pages and full HTML documentation to "doc". + (let* ((out (assoc-ref outputs "out")) + (man3 (string-append out "/share/man/man3")) + (html (string-append out "/share/doc/openssl")) + (doc (assoc-ref outputs "doc")) + (man-target (string-append doc "/share/man/man3")) + (html-target (string-append doc "/share/doc/openssl"))) + (copy-recursively man3 man-target) + (delete-file-recursively man3) + (copy-recursively html html-target) + (delete-file-recursively html) + #t))) ;; XXX: Duplicate this phase to make sure 'version' evaluates ;; in the current scope and not the inherited one. (replace 'remove-miscellany -- cgit v1.2.3 From 1d7cc6841e6a997a38acb6421e0592ab5b4749df Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 14 Sep 2018 03:32:47 +0200 Subject: gnu: coq: INVOKE. * gnu/packages/ocaml.scm (coq)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/ocaml.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f21c2b2610..9e73eab1ea 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -486,16 +486,16 @@ written in Objective Caml.") (let* ((out (assoc-ref outputs "out")) (mandir (string-append out "/share/man")) (browser "icecat -remote \"OpenURL(%s,new-tab)\"")) - (zero? (system* "./configure" - "-prefix" out - "-mandir" mandir - "-browser" browser - "-coqide" "opt"))))) + (invoke "./configure" + "-prefix" out + "-mandir" mandir + "-browser" browser + "-coqide" "opt")))) (replace 'build (lambda _ - (zero? (system* "make" "-j" (number->string - (parallel-job-count)) - "world")))) + (invoke "make" + "-j" (number->string (parallel-job-count)) + "world"))) (delete 'check) (add-after 'install 'check (lambda _ @@ -505,7 +505,7 @@ written in Objective Caml.") (delete-file-recursively "coq-makefile/timing") ;; This one fails because we didn't build coqtop.byte. (delete-file-recursively "coq-makefile/findlib-package") - (zero? (system* "make")))))))) + (invoke "make"))))))) (home-page "https://coq.inria.fr") (synopsis "Proof assistant for higher-order logic") (description -- cgit v1.2.3 From ed017a78beabb29a520be977b7e3f0bc07ae0e91 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 14 Sep 2018 20:34:29 +0200 Subject: gnu: coq: Update to 8.8.1. * gnu/packages/ocaml.scm (coq): Update to 8.8.1. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 9e73eab1ea..bcbcbb1404 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -457,7 +457,7 @@ written in Objective Caml.") (define-public coq (package (name "coq") - (version "8.8.0") + (version "8.8.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/coq/coq/archive/V" @@ -465,7 +465,7 @@ written in Objective Caml.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0g96k2x6lbddlmkmdaczvcpb2gwqi1ydbq9bv4gf9q38kv9w3xya")))) + "13cyvbg8cgqkg9wz0ax7jq03srj9k0lyvny97fcka4ai1zrzwln8")))) (native-search-paths (list (search-path-specification (variable "COQPATH") -- cgit v1.2.3 From 56f3b85bd3fc4c8e4a1ceb399d2f376bf4d2043b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 14 Sep 2018 00:01:49 +0200 Subject: gnu: python-iso8601: Update to 0.1.12. * gnu/packages/time.scm (python-iso8601): Update to 0.1.12. --- gnu/packages/time.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index fc831ab6cc..69aff5efaa 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -240,14 +240,14 @@ ISO 8601 dates, time and duration.") (define-public python-iso8601 (package (name "python-iso8601") - (version "0.1.11") + (version "0.1.12") (source (origin (method url-fetch) (uri (pypi-uri "iso8601" version)) (sha256 (base32 - "0c7gh3lsdjds262h0v1sqc66l7hqgfwbakn96qrhdbl0i3vm5yz8")))) + "10nyvvnrhw2w3p09v1ica4lgj6f4g9j3kkfx17qmraiq3w7b5i29")))) (build-system python-build-system) (native-inputs `(("python-pytest" ,python-pytest))) -- cgit v1.2.3 From c924fe38dc39cd195e21878800011e56765e8960 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 13 Sep 2018 19:26:13 +0200 Subject: gnu: umoci: Update to 0.4.2. * gnu/packages/virtualization.scm (umoci): Update to 0.4.2. --- gnu/packages/virtualization.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 7427465f57..e3b9925059 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -873,7 +873,7 @@ Open Container Initiative specification.") (define-public umoci (package (name "umoci") - (version "0.4.0") + (version "0.4.2") (source (origin (method url-fetch) (uri (string-append @@ -882,7 +882,7 @@ Open Container Initiative specification.") (file-name (string-append "umoci-" version ".tar.xz")) (sha256 (base32 - "0hg7hs4dagj2fgymm4b4s68k1v2k2093s3jg0d94j0ixhfmyg9nd")))) + "1rq5jxcss9cmy05x9b2kh9ld57ribi8hgnx2w67jpmf343b83m4q")))) (build-system go-build-system) (arguments '(#:import-path "github.com/openSUSE/umoci" -- cgit v1.2.3 From 002d73a01fa5c39930471b81bb8938ab22bf7d93 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 15 Sep 2018 02:38:15 +0200 Subject: gnu: libwps: Update to 0.4.10. * gnu/packages/libreoffice.scm (libwps): Update to 0.4.10. --- gnu/packages/libreoffice.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index cf8082bcaa..90be51cd59 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -695,19 +695,19 @@ from the old StarOffice (.sdc, .sdw, ...).") (define-public libwps (package (name "libwps") - (version "0.4.9") + (version "0.4.10") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/" name "/" name "/" name "-" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "08j9nxnrzxsnq35d9l824ad8w8az42fivaxn8ajl85dv6g3v1ghk")))) + "1ji9zd4wxmas03g8jyx0ih0amrqfazm5874a2v9rd7va50sf088l")))) (build-system gnu-build-system) (native-inputs `(("doxygen" ,doxygen) ("pkg-config" ,pkg-config))) - (propagated-inputs ; in Requires field of .pkg + (propagated-inputs ; in Requires field of .pkg `(("librevenge" ,librevenge))) (inputs `(("boost" ,boost) @@ -716,7 +716,7 @@ from the old StarOffice (.sdc, .sdw, ...).") (synopsis "Import library for Microsoft Works text documents") (description "Libwps is a library for importing files in the Microsoft Works word processor file format.") - (license (list mpl2.0 lgpl2.1+)))) ; dual license + (license (list mpl2.0 lgpl2.1+)))) ; dual license (define-public libzmf (package -- cgit v1.2.3 From 49c941b43b64c8d53cd73b0d7200309cffebcdaa Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 15 Sep 2018 02:53:40 +0200 Subject: gnu: libmwaw: Update to 0.3.14. * gnu/packages/libreoffice.scm (libmwaw): Update to 0.3.14. --- gnu/packages/libreoffice.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 90be51cd59..35d49b0216 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -645,19 +645,19 @@ text documents, vector drawings, presentations and spreadsheets.") (define-public libmwaw (package (name "libmwaw") - (version "0.3.12") + (version "0.3.14") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/" name "/" name "/" name "-" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "1ryi1v38lgy5kv84fzjqkawidrg30y4hlqrz1v262792wzkad4bn")))) + "1s9wyf8pyh3fbazq2d2b6fgi7s7bid60viw2xbdkmn2ywlfbza5c")))) (build-system gnu-build-system) (native-inputs `(("doxygen" ,doxygen) ("pkg-config" ,pkg-config))) - (propagated-inputs ; in Requires field of .pkg + (propagated-inputs ; in Requires field of .pkg `(("librevenge" ,librevenge))) (inputs `(("boost" ,boost) @@ -667,7 +667,7 @@ text documents, vector drawings, presentations and spreadsheets.") (description "Libmwaw contains some import filters for old Macintosh text documents (MacWrite, ClarisWorks, ... ) and for some graphics and spreadsheet documents.") - (license (list mpl2.0 lgpl2.1+)))) ; dual license + (license (list mpl2.0 lgpl2.1+)))) ; dual license (define-public libstaroffice (package -- cgit v1.2.3 From e1bf455cee4e45c8e420e5c011aa67f877b61aad Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 15 Sep 2018 00:27:31 +0200 Subject: gnu: emacs-magit-popup: Update to 2.12.4. * gnu/packages/emacs.scm (emacs-magit-popup): Update to 2.12.4. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 770ca3c496..8d9ce8b136 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -579,7 +579,7 @@ support for Git-SVN.") (define-public emacs-magit-popup (package (name "emacs-magit-popup") - (version "2.12.3") + (version "2.12.4") (source (origin (method url-fetch) (uri (string-append @@ -588,7 +588,7 @@ support for Git-SVN.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1kz6vj67awkwf9y2wj6m3l2him3znm08z6bkdvnmfr6rwd96dr39")))) + "0pkg95ssdp4biznmgc2bvf74y4ihws8902zz5437zsfhb8p6f3kb")))) (build-system emacs-build-system) (arguments `(#:phases -- cgit v1.2.3 From f9fe94c1f664141fbff85411e0f03dbbbc5c77a3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 15 Sep 2018 00:31:07 +0200 Subject: gnu: emacs-magit-popup: Don't use unstable tarball. * gnu/packages/emacs.scm (emacs-magit-popup)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/emacs.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 8d9ce8b136..a799aa9899 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -581,14 +581,14 @@ support for Git-SVN.") (name "emacs-magit-popup") (version "2.12.4") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/magit/magit-popup/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/magit/magit-popup.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0pkg95ssdp4biznmgc2bvf74y4ihws8902zz5437zsfhb8p6f3kb")))) + "08952nzn0cb6gxscqyiljk4fq2zxjvr3ism0lvgw0gs9hl5phiwx")))) (build-system emacs-build-system) (arguments `(#:phases -- cgit v1.2.3 From aae96f8fac4a9302b4adb2f80bd205a76b843b6c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 15 Sep 2018 03:05:01 +0200 Subject: gnu: libetpan: Don't use unstable tarball. * gnu/packages/mail.scm (libetpan)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/mail.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 024e75aaa1..38e2158cdc 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -949,12 +949,13 @@ useful features.") (name "libetpan") (version "1.8") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/dinhviethoa/" name - "/archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/dinhviethoa/libetpan.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "1sxnaglp5hb0z78sgnfzva4x8m4flqhicvm1dz0krkxdmfsafrsf")))) + (base32 "09xqy1n18qn63x7idfrpwm59lfkvb1p5vxkyksywvy4f6mn4pyxk")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf-wrapper) ("automake" ,automake) -- cgit v1.2.3 From 9f1b186afc5ce328cef90fa1d221a68d559b38fd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 15 Sep 2018 03:31:41 +0200 Subject: gnu: libetpan: Update to 1.9.1. * gnu/packages/mail.scm (libetpan): Update to 1.9.1. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 38e2158cdc..304d1d6444 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -947,7 +947,7 @@ useful features.") (define-public libetpan (package (name "libetpan") - (version "1.8") + (version "1.9.1") (source (origin (method git-fetch) (uri (git-reference @@ -955,7 +955,7 @@ useful features.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "09xqy1n18qn63x7idfrpwm59lfkvb1p5vxkyksywvy4f6mn4pyxk")))) + (base32 "1628lb1qvxixl64ifvjjr839hmirpx532klhv2mr7m6gmn7nlci5")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf-wrapper) ("automake" ,automake) -- cgit v1.2.3 From bbe2a947995879ac0580463a420050f3b429425e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 15 Sep 2018 00:19:56 +0200 Subject: gnu: libsigrokdecode: Update to 0.5.2. * gnu/packages/electronics.scm (libsigrokdecode): Update to 0.5.2. --- gnu/packages/electronics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index af3ebeb805..d13f220b84 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -60,7 +60,7 @@ to take care of the OS-specific details when writing software that uses serial p (define-public libsigrokdecode (package (name "libsigrokdecode") - (version "0.5.1") + (version "0.5.2") (source (origin (method url-fetch) (uri (string-append @@ -68,7 +68,7 @@ to take care of the OS-specific details when writing software that uses serial p version ".tar.gz")) (sha256 (base32 - "07mmb6s62ncqqgsc6szilj2yxixf6gg99ggbzsjlbhp4b9aqnga9")))) + "1w434nl1syjkvwl08lji3r9sr60lbxp1nqys8hqwzv2lgiwrx3g0")))) (outputs '("out" "doc")) (arguments `(#:phases -- cgit v1.2.3 From 25bc6370a47a3c3dfe5f752d3ee3141dac6bb750 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 11 Sep 2018 21:42:09 +0200 Subject: gnu: snakemake: Update to 5.2.4. * gnu/packages/python.scm (snakemake): Update to 5.2.4. [propagated-inputs]: Add python-gitpython. --- gnu/packages/python.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 525ff3f027..b6dd3ebace 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5217,13 +5217,13 @@ Python.") (define-public snakemake (package (name "snakemake") - (version "5.2.2") + (version "5.2.4") (source (origin (method url-fetch) (uri (pypi-uri "snakemake" version)) (sha256 - (base32 "18x36n78ph5v1fxk54gvdbc3d8nfncha78phifg3lqaa9gifgzxd")))) + (base32 "0gj0xxgiq3mp9qyyrbfzldiaq1giliqw0in64nqiz7vx49myqj7z")))) (build-system python-build-system) (arguments ;; TODO: Package missing test dependencies. @@ -5241,7 +5241,8 @@ Python.") "/bin/snakemake"))) #t))))) (propagated-inputs - `(("python-wrapt" ,python-wrapt) + `(("python-gitpython" ,python-gitpython) + ("python-wrapt" ,python-wrapt) ("python-requests" ,python-requests) ("python-appdirs" ,python-appdirs) ("python-configargparse" ,python-configargparse) -- cgit v1.2.3 From 61853b74473f0d191f1bcb43fcfcc1418093ac86 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 2 Sep 2018 17:49:51 -0400 Subject: gnu: libjpeg: Improve description. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/image.scm (libjpeg)[description]: Add the list of the programs it provides. Signed-off-by: 宋文武 --- gnu/packages/image.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 78fb30c279..24a83dd683 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -267,8 +267,16 @@ files. It can compress them as much as 40% losslessly.") "Libjpeg implements JPEG image encoding, decoding, and transcoding. JPEG is a standardized compression method for full-color and gray-scale images. -The included programs provide conversion between the JPEG format and -image files in PBMPLUS PPM/PGM, GIF, BMP, and Targa file formats.") +It also includes programs that provide conversion between the JPEG format and +image files in PBMPLUS PPM/PGM, GIF, BMP, and Targa file formats, as well as +lossless JPEG manipulations such as rotation, scaling or cropping: +@enumerate +@item cjpeg +@item djpeg +@item jpegtran +@item rdjpgcom +@item wrjpgcom +@end enumerate") (license license:ijg) (home-page "http://www.ijg.org/"))) -- cgit v1.2.3 From 5c34d97187f8378249bf6a340ccde9e721a5a22d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 15 Sep 2018 04:58:14 +0200 Subject: gnu: pybind11: Don't use unstable tarball. * gnu/packages/python.scm (pybind11)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/python.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b6dd3ebace..afb329654a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -13784,14 +13784,14 @@ under Python 2.7.") (name "pybind11") (version "2.2.3") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/pybind/pybind11/archive/v" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/pybind/pybind11.git") + (commit (string-append "v" version)))) (sha256 (base32 - "1sj0x4fwsbnwdai5sxpw1l1vh8m5hpbkfk3zanxcbcgs39jpnfrs")) - (file-name (string-append name "-" version ".tar.gz")))) + "111aagiy7lwf3gzf2hzg7sbgs2lxgj473bf75bqqfmhcbvf71vsq")) + (file-name (git-file-name name version)))) (build-system cmake-build-system) (native-inputs `(("python" ,python) -- cgit v1.2.3 From 33198171746558d0c956103f73a78d3ae3d676cf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 15 Sep 2018 05:07:14 +0200 Subject: gnu: pybind11: Update to 2.2.4. * gnu/packages/python.scm (pybind11): Update to 2.2.4. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index afb329654a..7a4f11b4b8 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -13782,7 +13782,7 @@ under Python 2.7.") (define-public pybind11 (package (name "pybind11") - (version "2.2.3") + (version "2.2.4") (source (origin (method git-fetch) (uri (git-reference @@ -13790,7 +13790,7 @@ under Python 2.7.") (commit (string-append "v" version)))) (sha256 (base32 - "111aagiy7lwf3gzf2hzg7sbgs2lxgj473bf75bqqfmhcbvf71vsq")) + "0pa79ymcasv8br5ifbx7878id5py2jpjac3i20cqxr6gs9l6ivlv")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (native-inputs -- cgit v1.2.3 From 483be9bda6898ab2eee1d69d58ddea42054bc5fe Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 15 Sep 2018 04:45:45 +0200 Subject: gnu: ocaml-ounit: Update to 2.0.8. * gnu/packages/ocaml.scm (ocaml-ounit): Update to 2.0.8. --- gnu/packages/ocaml.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index bcbcbb1404..7859696406 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -924,21 +924,20 @@ compilers that can directly deal with packages.") (define-public ocaml-ounit (package (name "ocaml-ounit") - (version "2.0.0") + (version "2.0.8") (source (origin (method url-fetch) - (uri (ocaml-forge-uri "ounit" version 1258)) + (uri (ocaml-forge-uri "ounit" version 1749)) (sha256 (base32 - "118xsadrx84pif9vaq13hv4yh22w9kmr0ypvhrs0viir1jr0ajjd")))) + "03ifp9hjcxg4m5j190iy373jcn4039d3vy10kmd8p4lfciwzwc1f")))) (build-system ocaml-build-system) (native-inputs - `(("libxml2" ,libxml2))) ; for xmllint + `(("libxml2" ,libxml2))) ; for xmllint (arguments `(#:phases (modify-phases %standard-phases - ;; Tests are done during build. - (delete 'check)))) + (delete 'check)))) ; tests are run during build (home-page "http://ounit.forge.ocamlcore.org") (synopsis "Unit testing framework for OCaml") (description "Unit testing framework for OCaml. It is similar to JUnit and -- cgit v1.2.3 From 81fb037f5ab51858fb7608d9ff836cf28c993f11 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 15 Sep 2018 03:33:20 +0200 Subject: gnu: libetpan: Use HTTPS home page. * gnu/packages/mail.scm (libetpan)[home-page]: Use HTTPS. --- gnu/packages/mail.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 304d1d6444..5435f89c42 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -979,7 +979,7 @@ useful features.") (invoke "sh" "autogen.sh")))) #:configure-flags '("--disable-static" "--disable-db"))) - (home-page "http://www.etpan.org/libetpan.html") + (home-page "https://www.etpan.org/libetpan.html") (synopsis "Portable middleware for email access") (description "The purpose of this mail library is to provide a portable, efficient -- cgit v1.2.3 From 021b42f5e7fd222299691e5d7f70e329b52c9b14 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 15 Sep 2018 05:14:24 +0200 Subject: gnu: zsh: Update to 5.6.2. * gnu/packages/shells.scm (zsh): Update to 5.6.2. --- gnu/packages/shells.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index c0f1c479ef..406766351c 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -292,7 +292,7 @@ history mechanism, job control and a C-like syntax.") (define-public zsh (package (name "zsh") - (version "5.6.1") + (version "5.6.2") (source (origin (method url-fetch) (uri (list (string-append @@ -303,7 +303,7 @@ history mechanism, job control and a C-like syntax.") ".tar.xz"))) (sha256 (base32 - "1s5kzfbfvixibb1sbzmmlrrx898zqwi5cfmnnq4bhcbx64zparlm")))) + "17iffliqcj4hv91g0bd2sxsyfcz51mfyh97sp2iyrs2p0mndc2x5")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-tcsetpgrp" "--enable-pcre") #:phases -- cgit v1.2.3 From 935d5ceb9bf6f8a759298521da2712db1ec12670 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 29 Aug 2018 00:53:34 -0400 Subject: gnu: Add python-pycountry. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python.scm (python-pycountry, python2-pycountry): New variables. Signed-off-by: 宋文武 --- gnu/packages/python.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 7a4f11b4b8..a5da46dfdb 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -10858,6 +10858,37 @@ cases.") (define-public python2-ddt (package-with-python2 python-ddt)) +(define-public python-pycountry + (package + (name "python-pycountry") + (version "18.5.26") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pycountry" version)) + (sha256 + (base32 + "15q9j047s3yc9cfcxq1ch8b71f81na44cr6dydd5gxk0ki9a4akz")))) + (build-system python-build-system) + (home-page "https://bitbucket.org/flyingcircus/pycountry") + (synopsis "ISO databases for languages, countries, currencies, etc.") + (description + "@code{pycountry} provides the ISO databases for the standards: +@enumerate +@item 639-3 (Languages) +@item 3166 (Countries) +@item 3166-3 (Deleted Countries) +@item 3166-2 (Subdivisions of countries) +@item 4217 (Currencies) +@item 15924 (Scripts) +@end enumerate +It includes a copy from Debian’s pkg-isocodes and makes the data accessible +through a Python API.") + (license license:lgpl2.1+))) + +(define-public python2-pycountry + (package-with-python2 python-pycountry)) + (define-public python-pycosat (package (name "python-pycosat") -- cgit v1.2.3 From 2ee67781ff3246c32e4dcdfb3a9adc65967b33dd Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 29 Aug 2018 01:27:04 -0400 Subject: gnu: Add python-ua-parser. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python.scm (python-ua-parser, python2-ua-parser): New variables. Signed-off-by: 宋文武 --- gnu/packages/python.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a5da46dfdb..3c8b68ee1e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5006,6 +5006,31 @@ toolkit. Use it to build trees of widgets.") (define-public python2-urwidtrees (package-with-python2 python-urwidtrees)) +(define-public python-ua-parser + (package + (name "python-ua-parser") + (version "0.8.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "ua-parser" version)) + (sha256 + (base32 + "1jwdf58rhchjzzrad405pviv0iq24xa2xmmmdgcm2c8s6b4wzfwp")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) ;no test suite in release + (native-inputs + `(("python-pyyaml" ,python-pyyaml))) + (home-page "https://github.com/ua-parser/uap-python") + (synopsis "User agent parser") + (description + "@code{ua-parser} is a Python port of Browserscope's user agent parser.") + (license license:asl2.0))) + +(define-public python2-ua-parser + (package-with-python2 python-ua-parser)) + (define-public python-dbus (package (name "python-dbus") -- cgit v1.2.3 From 511f3be695bb4a3c83218e3fea273063da378051 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 29 Aug 2018 09:16:30 -0400 Subject: gnu: Add python-user-agents. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python.scm (python-user-agents, python2-user-agents): New variables. Signed-off-by: 宋文武 --- gnu/packages/python.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 3c8b68ee1e..30b65f637b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5031,6 +5031,32 @@ toolkit. Use it to build trees of widgets.") (define-public python2-ua-parser (package-with-python2 python-ua-parser)) +(define-public python-user-agents + (package + (name "python-user-agents") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "user-agents" version)) + (sha256 + (base32 + "0fc00cd3j8dahq1zzn8pkgfgd7lq37bp2scmdma2n1c049vicgb4")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) ;missing devices.json test file in release + (propagated-inputs + `(("python-ua-parser" ,python-ua-parser))) + (home-page "https://github.com/selwin/python-user-agents") + (synopsis "User Agent strings parsing library") + (description + "A library to identify devices (phones, tablets) and their capabilities by +parsing (browser/HTTP) user agent strings.") + (license license:expat))) + +(define-public python2-user-agents + (package-with-python2 python-user-agents)) + (define-public python-dbus (package (name "python-dbus") -- cgit v1.2.3 From 4e9832dd3865978a3d70f4e596e45e7d3398204d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 15 Sep 2018 06:13:42 +0200 Subject: gnu: gambit-c: Update home page. * gnu/packages/scheme.scm (gambit-c)[home-page]: Update. --- gnu/packages/scheme.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 2e46a8453f..7f26d71aa6 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -560,7 +560,7 @@ of libraries.") ;; interaction channel to stdin/stdout. (("gsi -:tl") "gsi -:d-,tl")) #t))))) - (home-page "http://www.iro.umontreal.ca/~gambit/") + (home-page "http://gambitscheme.org") (synopsis "Efficient Scheme interpreter and compiler") (description "Gambit consists of two main programs: gsi, the Gambit Scheme -- cgit v1.2.3 From 4be83af4276328e04ab3c8a3c22ee8242adbbe71 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 15 Sep 2018 06:14:29 +0200 Subject: gnu: gambit-c: Update to 4.9.0. The tests makefile still contains the offending lines, but I was unable to reproduce the failure across 3 different machines. * gnu/packages/scheme.scm (gambit-c): Update to 4.9.0. [arguments]: Remove 'fix-tests' phase. --- gnu/packages/scheme.scm | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 7f26d71aa6..9654fe36f5 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -532,7 +532,7 @@ of libraries.") (define-public gambit-c (package (name "gambit-c") - (version "4.8.9") + (version "4.9.0") (source (origin (method url-fetch) @@ -542,24 +542,13 @@ of libraries.") (string-map (lambda (c) (if (char=? c #\.) #\_ c)) version) ".tgz")) (sha256 - (base32 "16sg1s8myzxqpimj5ry6lfza0qfs157zj28bvmxwwgy89jd9m5v7")))) + (base32 "19862w9ij0g5xrkskl4g89xbs17gp9cc6cfcdca6dlfkb3lk6xhp")))) (build-system gnu-build-system) (arguments '(#:configure-flags ;; According to the ./configure script, this makes the build slower and ;; use >= 1 GB memory, but makes Gambit much faster. - '("--enable-single-host") - #:phases - (modify-phases %standard-phases - (add-before 'check 'fix-tests - (lambda _ - (substitute* '("tests/makefile") - ;; '-:' is how run-time options are set. 'tl' sets some terminal - ;; option, which makes it fail in our build environment. It - ;; recommends using 'd-' as a solution, which sets the REPL - ;; interaction channel to stdin/stdout. - (("gsi -:tl") "gsi -:d-,tl")) - #t))))) + '("--enable-single-host"))) (home-page "http://gambitscheme.org") (synopsis "Efficient Scheme interpreter and compiler") (description -- cgit v1.2.3 From 85a349787b26e91dc7839c2748cdf71637821bcc Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Sat, 15 Sep 2018 14:23:06 +0200 Subject: gnu: wine: Update to 3.0.3. * gnu/packages/wine.scm (wine): Update to 3.0.3. --- gnu/packages/wine.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index b818a3ccb5..ac3295c42b 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -71,7 +71,7 @@ (define-public wine (package (name "wine") - (version "3.0.2") + (version "3.0.3") (source (origin (method url-fetch) (uri (string-append "https://dl.winehq.org/wine/source/" @@ -79,7 +79,7 @@ "/wine-" version ".tar.xz")) (sha256 (base32 - "1zv3nk31s758ghp4795ym3w8l5868c2dllmjx9245qh9ahvp3mya")))) + "18add8wqqz7y1aj8x0dcba7pqj9jkbhngwjv4yjmar3gxacmjr7b")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("gettext" ,gettext-minimal) -- cgit v1.2.3 From b947c614df00fbc5aac6f04ac55fb1abf48eed67 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Sat, 15 Sep 2018 14:23:50 +0200 Subject: gnu: wine-staging-patchset-data: Update to 3.16. * gnu/packages/wine.scm (wine-staging-patchset-data): Update to 3.16. --- gnu/packages/wine.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index ac3295c42b..bf702a5f16 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -225,7 +225,7 @@ integrate Windows applications into your desktop.") (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") - (version "3.15") + (version "3.16") (source (origin (method git-fetch) @@ -235,7 +235,7 @@ integrate Windows applications into your desktop.") (file-name (git-file-name name version)) (sha256 (base32 - "1rgbx4qnxaarkq5n8nvj57q0rhxcqbwm5897ws962fgxh6zymg9n")))) + "0c1bs9qpxlvld6jkwjri2v8jaixxn1r5b0m9r5hnkfrnpl7z7cfv")))) (build-system trivial-build-system) (native-inputs `(("bash" ,bash) -- cgit v1.2.3 From e8079dd9e413075b63dd5b35a39647303ca5e83b Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Sat, 15 Sep 2018 14:24:24 +0200 Subject: gnu: wine-staging: Update to 3.16. * gnu/packages/wine.scm (wine-staging): Update to 3.16. --- gnu/packages/wine.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index bf702a5f16..782776606d 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -281,7 +281,7 @@ integrate Windows applications into your desktop.") (file-name (string-append name "-" version ".tar.xz")) (sha256 (base32 - "07mmd8r70ciqrxzdg2m2mg34kcnb43dk9nw1ljm8jbcznsawv8ic")))) + "0g55l41apiwgblfk9ihzd96003gd32w5ng79f96hmiwhyzwbqhxd")))) (inputs `(("autoconf" ,autoconf) ; for autoreconf ("gtk+" ,gtk+) ("libva" ,libva) -- cgit v1.2.3 From 636579210f8098c86cc790837c459295f482cc38 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 15 Sep 2018 21:04:44 +0200 Subject: gnu: php: Update to 7.2.10. * gnu/packages/php.scm (php): Update to 7.2.10. --- gnu/packages/php.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index 4981c60554..c78902c97c 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -63,7 +63,7 @@ (define-public php (package (name "php") - (version "7.2.8") + (version "7.2.10") (home-page "https://secure.php.net/") (source (origin (method url-fetch) @@ -71,7 +71,7 @@ name "-" version ".tar.xz")) (sha256 (base32 - "03zv1y8ygzsir60617hinpji3f4irk79zbp3ar1b8zcapq40gfjk")) + "1w0432i5wjga9z8x3rhc72h2ij1jd2aimg5xmhc0hg4f7951bhh1")) (modules '((guix build utils))) (snippet '(with-directory-excursion "ext" @@ -237,6 +237,7 @@ ;; but with different error messages. ;; Expects "illegal character", instead gets "unknown error (84)". "ext/iconv/tests/bug52211.phpt" + "ext/iconv/tests/bug60494.phpt" ;; Expects "wrong charset", gets unknown error (22). "ext/iconv/tests/iconv_mime_decode_variation3.phpt" "ext/iconv/tests/iconv_strlen_error2.phpt" -- cgit v1.2.3 From cbb1b1686596d8d708293fe421ac02adde06060e Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Sat, 15 Sep 2018 11:03:31 +0200 Subject: admin: python-pyudev: Add dependency on python-six. * gnu/packages/admin.scm (python-pyudev): Add dependency on python-six. --- gnu/packages/admin.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index c6e1044b2b..6949f60197 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2779,6 +2779,8 @@ support forum. It runs with the @code{/exec} command in most IRC clients.") #t)))))) (inputs `(("eudev" ,eudev))) + (propagated-inputs + `(("python-six" ,python-six))) (native-inputs `(("python-docutils" ,python-docutils) ("python-hypothesis" ,python-hypothesis) -- cgit v1.2.3 From 2db0f9c82d1fe71adc46e03e0d9886291e1a7c05 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Mon, 5 Feb 2018 11:40:59 +0100 Subject: gnu: Add ruby-yajl-ruby. * gnu/packages/ruby.scm (ruby-yajl-ruby): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ruby.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 616b86934d..7184c8a9cd 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3658,6 +3658,42 @@ features such as filtering and fine grained logging.") (home-page "https://github.com/pjotrp/bioruby-logger-plugin") (license license:expat))) +(define-public ruby-yajl-ruby + (package + (name "ruby-yajl-ruby") + (version "1.4.1") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "yajl-ruby" version)) + (sha256 + (base32 + "16v0w5749qjp13xhjgr2gcsvjv6mf35br7iqwycix1n2h7kfcckf")))) + (build-system ruby-build-system) + (arguments + '(#:test-target "spec" + #:phases + (modify-phases %standard-phases + (add-before 'check 'patch-test-to-update-load-path + (lambda _ + (substitute* "spec/parsing/large_number_spec.rb" + (("require \"yajl\"") + "$LOAD_PATH << 'lib'; require 'yajl'")) + #t))))) + (native-inputs + `(("ruby-rake-compiler" ,ruby-rake-compiler) + ("ruby-rspec" ,ruby-rspec))) + (synopsis "Streaming JSON parsing and encoding library for Ruby") + (description + "Ruby C bindings to the Yajl JSON stream-based parser library. The API +is compatible with the JSON gem, so yajl-ruby can act as a drop in +replacement. + +A modified copy of yajl is used, and included in the package.") + (home-page "https://github.com/brianmario/yajl-ruby") + (license (list license:expat ; Ruby code, yajl_ext.c and yajl_ext.h + license:bsd-3)))) ; Included, modified copy of yajl + (define-public ruby-yard (package (name "ruby-yard") -- cgit v1.2.3 From ed4b6b1840f104aa7f1c57506d34764978492a98 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Mon, 5 Feb 2018 11:40:49 +0100 Subject: gnu: Add ruby-oj. * gnu/packages/ruby.scm (ruby-oj): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ruby.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 7184c8a9cd..0b68844985 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3193,6 +3193,43 @@ unacceptable HTML and/or CSS from a string.") (home-page "https://github.com/rgrove/sanitize/") (license license:expat))) +(define-public ruby-oj + (package + (name "ruby-oj") + (version "3.6.7") + (source + (origin + (method url-fetch) + ;; Version on rubygems.org does not contain Rakefile, so download from + ;; GitHub instead. + (uri (string-append "https://github.com/ohler55/oj/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1x28ga72jxlnmsd8g8c0fw81vlh54r0qgagw2lxsd3x3la091g2h")))) + (build-system ruby-build-system) + (arguments + '(#:test-target "test_all" + #:phases + (modify-phases %standard-phases + (add-before 'check 'disable-bundler + (lambda _ + (substitute* "Rakefile" + (("Bundler\\.with_clean_env") "1.times") + (("bundle exec ") ""))))))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rspec" ,ruby-rspec) + ("ruby-rake-compiler" ,ruby-rake-compiler))) + (synopsis "JSON parser for Ruby optimized for speed") + (description + "Oj is a JSON parser and generator for Ruby, where the encoding and +decoding of JSON is implemented as a C extension to Ruby.") + (home-page "http://www.ohler.com/oj") + (license (list license:expat ; Ruby code + license:bsd-3)))) ; extension code + (define-public ruby-ox (package (name "ruby-ox") -- cgit v1.2.3 From 1b6f5475a1e05797f096aca038f2a14b9feb5707 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Mon, 5 Feb 2018 11:40:40 +0100 Subject: gnu: Enable tests for ruby-multi-json. * gnu/packages/ruby.scm (ruby-multi-json)[version]: Update to 1.13.1. [source]: Switch to GitHub, so that the tests can be run. [arguments]: Enable running the tests, and add a patch to fix an issue running the tests. [native-inputs]: Add native-inputs required for running the tests. [home-page]: Use HTTPS. Signed-off-by: Christopher Baines --- gnu/packages/ruby.scm | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 0b68844985..b7bf6ca736 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2289,23 +2289,40 @@ net/http library.") (define-public ruby-multi-json (package (name "ruby-multi-json") - (version "1.12.2") + (version "1.13.1") (source (origin (method url-fetch) - (uri (rubygems-uri "multi_json" version)) + ;; Tests are not distributed at rubygems.org so download from GitHub + ;; instead. + (uri (string-append "https://github.com/intridea/multi_json/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1raim9ddjh672m32psaa9niw67ywzjbxbdb8iijx3wv9k5b0pk2x")))) + "1s64xqvrnrxmb59v6b2kchnisawg5ai9ky1w60dy6z6ws9la1xv4")))) (build-system ruby-build-system) (arguments - '(#:tests? #f)) ;; No testsuite included in the gem. + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-signing-key-reference + (lambda _ + (substitute* "multi_json.gemspec" + ((".*spec.signing_key.*") "")) + #t))))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rspec" ,ruby-rspec) + ("ruby-yard" ,ruby-yard) + ("ruby-json-pure" ,ruby-json-pure) + ("ruby-oj" ,ruby-oj) + ("ruby-yajl-ruby" ,ruby-yajl-ruby))) (synopsis "Common interface to multiple JSON libraries for Ruby") (description "This package provides a common interface to multiple JSON libraries, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, NSJSONSerialization, gson.rb, JrJackson, and OkJson.") - (home-page "http://github.com/intridea/multi_json") + (home-page "https://github.com/intridea/multi_json") (license license:expat))) (define-public ruby-arel -- cgit v1.2.3 From 5edef88b8873ad73ceb74c8801487fc16d64965c Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Mon, 5 Feb 2018 11:40:29 +0100 Subject: gnu: Add ruby-multi-test. * gnu/packages/ruby.scm (ruby-multi-test): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ruby.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index b7bf6ca736..76e3cee81e 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2325,6 +2325,32 @@ NSJSONSerialization, gson.rb, JrJackson, and OkJson.") (home-page "https://github.com/intridea/multi_json") (license license:expat))) +(define-public ruby-multi-test + (package + (name "ruby-multi-test") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "multi_test" version)) + (sha256 + (base32 + "1sx356q81plr67hg16jfwz9hcqvnk03bd9n75pmdw8pfxjfy1yxd")))) + (build-system ruby-build-system) + (arguments + '(;; Tests require different sets of specific gem versions to be available, + ;; and there is no gemfile that specifies the newest versions of + ;; dependencies to be tested. + #:tests? #f)) + (synopsis + "Interface to testing libraries loaded into a running Ruby process") + (description + "@code{multi_test} provides a uniform interface onto whatever testing +libraries that have been loaded into a running Ruby process to help control +rogue test/unit/autorun requires.") + (home-page "https://github.com/cucumber/multi_test") + (license license:expat))) + (define-public ruby-arel (package (name "ruby-arel") -- cgit v1.2.3 From 31fdfc0cdd31f4e7c371a2da7404ea8f616a77fc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Sep 2018 23:26:28 +0200 Subject: gnu: dmidecode: Update to 3.2. * gnu/packages/admin.scm (dmidecode): Update to 3.2. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 6949f60197..e7e34ab97f 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1236,7 +1236,7 @@ network, which causes enabled computers to power on.") (define-public dmidecode (package (name "dmidecode") - (version "3.1") + (version "3.2") (source (origin (method url-fetch) (uri (string-append @@ -1244,7 +1244,7 @@ network, which causes enabled computers to power on.") version ".tar.xz")) (sha256 (base32 - "1h0sg0lxa15nzf8s7884p6q7p6md9idm0c79wyqmk32l4ndwwrnp")))) + "1pcfhcgs2ifdjwp7amnsr3lq95pgxpr150bjhdinvl505px0cw07")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (delete 'configure)) -- cgit v1.2.3 From b55d75f133e782ef31fd20b8b454694198ef0c71 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 16 Sep 2018 19:11:33 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.156. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.156. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d4e9a5de95..9463d001a7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -452,8 +452,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.155" - "1gcnwrgv0xghr550lcl6dmxdl59drzbi02mwp78g8vjql6ihdfys" + (make-linux-libre "4.4.156" + "13j4jb4hifh3fah2ysy2425fakwqqdh2z23lf4i0frxa1xl974h2" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From bf9d141a6561acbfe2f84bf26cc1d907eaeb6baa Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 16 Sep 2018 19:12:10 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.127. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.127. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9463d001a7..822dd3ec5d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -446,8 +446,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.126" - "0qa9zxa7isn20b9sbjcyrqfynd00phddv3yindp5dmvsng1kwxj8" + (make-linux-libre "4.9.127" + "0q7h5gnl3ikic0pvwrxp78pz56yvijhz6s84gb92xywi1v3dd8mh" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From c333c8b6f19413d1545014cb0922cf78fa9d652a Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 16 Sep 2018 19:12:53 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.70. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.70. (%linux-libre-4.14-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 822dd3ec5d..f1cf542650 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -436,8 +436,8 @@ It has been modified to remove all non-free binary blobs.") #:patches %linux-libre-4.18-patches #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.69") -(define %linux-libre-4.14-hash "08pw5hywlx3rsavj74qa17fm9hmhaw2rb1d3ahaqmd1zzsddb3qf") +(define %linux-libre-4.14-version "4.14.70") +(define %linux-libre-4.14-hash "138v51m6k57wnvlf9c22dad0w819mfb8f95i6w99mlg69qpwdvag") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.2.3 From ad99df39904c6326a9d4a446b1e4e9184c797974 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 16 Sep 2018 19:13:42 -0400 Subject: gnu: linux-libre: Update to 4.18.8. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.18.8. (%linux-libre-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f1cf542650..e34c67cb0f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -405,8 +405,8 @@ It has been modified to remove all non-free binary blobs.") ;; supports qemu "virt" machine and possibly a large number of ARM boards. ;; See : https://wiki.debian.org/DebianKernel/ARMMP. -(define %linux-libre-version "4.18.7") -(define %linux-libre-hash "1gn3ip2blczfr5hl20x6c93z8v7h528kl423pzkcn22hin6717wd") +(define %linux-libre-version "4.18.8") +(define %linux-libre-hash "163awpba1yd0x33xzj5dczimk4y96xc28syc4w2ad0qafgapng8l") (define %linux-libre-4.18-patches (list %boot-logo-patch -- cgit v1.2.3 From 4fed15fba3b1a846b4e6c50a91f7ad2be856bbf7 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 17 Sep 2018 01:13:42 -0400 Subject: gnu: mbedtls-apache: Update to 2.7.6. * gnu/packages/tls.scm (mbedtls-apache): Update to 2.7.6. --- gnu/packages/tls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index f7de901385..0cdb02b0aa 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -842,7 +842,7 @@ then ported to the GNU / Linux environment.") (define-public mbedtls-apache (package (name "mbedtls-apache") - (version "2.7.5") + (version "2.7.6") (source (origin (method url-fetch) @@ -852,7 +852,7 @@ then ported to the GNU / Linux environment.") version "-apache.tgz")) (sha256 (base32 - "0h4vks2z68bkwzg093mn0a7aqsva8rxr4m971n4bkasa17cjlc51")))) + "0fl2nrxvlgx9ja7yy3kd1zadpr98fxbvn3f6fl2mj87gryhkfqlk")))) (build-system cmake-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 956bcc8ed2625e1eb4dbd29d4edbc229b7d3a8c4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Sep 2018 12:45:52 +0200 Subject: gnu: python-dirsync: Update to 2.2.3. * gnu/packages/python.scm (python-dirsync): Update to 2.2.3. [native-inputs]: Remove unzip. --- gnu/packages/python.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 30b65f637b..6927924a68 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -11607,17 +11607,15 @@ perform the operations required for synchronizing plain text.") (define-public python-dirsync (package (name "python-dirsync") - (version "2.2.2") + (version "2.2.3") (source (origin (method url-fetch) - (uri (pypi-uri "dirsync" version ".zip")) + (uri (pypi-uri "dirsync" version)) (sha256 (base32 - "1hcdvmkwd5512zbxpin0k7bx5bkgzy3swjx7d0kj1y45af6r75v2")))) + "1r40fkanksagcszf1ag85mdr8w7rgc7196n6s1qlsk2abw6i7v0z")))) (build-system python-build-system) - (native-inputs - `(("unzip" ,unzip))) (propagated-inputs `(("six" ,python-six))) (home-page "https://bitbucket.org/tkhyn/dirsync") -- cgit v1.2.3 From 36aff81aa3f683e3dd4b36ee0f008cf425af3c59 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Sep 2018 12:17:27 +0200 Subject: gnu: powwow: Use HTTPS home page. * gnu/packages/games.scm (powwow)[home-page]: Use HTTPS. --- gnu/packages/games.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 2015e3ce47..5a409ba690 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2707,7 +2707,7 @@ is attributed to Albert Einstein.") (inputs `(("ncurses" ,ncurses))) (build-system gnu-build-system) - (home-page "http://www.hoopajoo.net/projects/powwow.html") + (home-page "https://www.hoopajoo.net/projects/powwow.html") (synopsis "MUD and telnet client") (description "POWWOW is a client software which can be used for telnet as well as for -- cgit v1.2.3 From 99d386a71fb182c9e1d49d96e3d24dddf985c9c8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Sep 2018 12:18:05 +0200 Subject: gnu: powwow: Update to 1.2.18. * gnu/packages/games.scm (powwow): Update to 1.2.18. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 5a409ba690..8be87f6f55 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2694,7 +2694,7 @@ is attributed to Albert Einstein.") (define-public powwow (package (name "powwow") - (version "1.2.17") + (version "1.2.18") (source (origin (method url-fetch) (uri (string-append @@ -2703,7 +2703,7 @@ is attributed to Albert Einstein.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1xmsg2y7qcvj67i9ilnih0mvfxcpni7fzrz343x9rdfnkkzf3pp8")))) + "1gf0jc1vfv05lxij51n3c1dqn3aiiy2kj1v6q14an3wm7yl7cllp")))) (inputs `(("ncurses" ,ncurses))) (build-system gnu-build-system) -- cgit v1.2.3 From a09a21190fd39a86111e15998fa19b9cae361b61 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Sep 2018 12:25:56 +0200 Subject: gnu: libiptcdata: Mark up description. * gnu/packages/image.scm (libiptcdata)[description]: Use @dfn{}. --- gnu/packages/image.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 24a83dd683..c3eb48ad0d 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1379,8 +1379,9 @@ medical image data, e.g. magnetic resonance image (MRI) and functional MRI (build-system gnu-build-system) (home-page "http://libiptcdata.sourceforge.net/") (synopsis "IPTC metadata manipulation library") - (description "Libiptcdata is a C library for manipulating the International -Press Telecommunications Council (IPTC) metadata stored within multimedia files + (description + "Libiptcdata is a C library for manipulating the International Press +Telecommunications Council (@dfn{IPTC}) metadata stored within multimedia files such as images. This metadata can include captions and keywords, often used by popular photo management applications. The library provides routines for parsing, viewing, modifying, and saving this metadata.") -- cgit v1.2.3 From f6a4d57e06f6ee80159cdf1cc74896beffdc3b87 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Sep 2018 11:35:48 +0200 Subject: gnu: foo2zjs: Update to 20180910. * gnu/packages/cups.scm (foo2zjs): Update to 20180910. --- gnu/packages/cups.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 3150c25019..986280f4cb 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -588,14 +588,14 @@ printer/driver specific, but spooler-independent PPD file.") (define-public foo2zjs (package (name "foo2zjs") - (version "20171202") + (version "20180910") (source (origin (method url-fetch) ;; XXX: This is an unversioned URL! (uri "http://foo2zjs.rkkda.com/foo2zjs.tar.gz") (sha256 (base32 - "10m1ksbzqsrsl4faqyl73ahfnj2hv1y3zrmr366zvjg7w3l6ag5n")))) + "1clddqy4y4vvws0lllv1v90dfiihihdc23bn93c544yb3fvmwmr6")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From ee127549a371e72f217598f38a81f8b8d16206b4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Sep 2018 11:36:15 +0200 Subject: gnu: efl: Update to 1.21.1. * gnu/packages/enlightenment.scm (efl): Update to 1.21.1. --- gnu/packages/enlightenment.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 40a5ec1cf4..87c2f2e58e 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -62,7 +62,7 @@ (define-public efl (package (name "efl") - (version "1.21.0") + (version "1.21.1") (source (origin (method url-fetch) (uri (string-append @@ -70,7 +70,7 @@ version ".tar.xz")) (sha256 (base32 - "0jxfrcz2aq1synxzd6sh9nhxz7fg9qgz0idr8zj6gaiplmwbwrby")))) + "0a5907h896pvpix7a6idc2fspzy6d78xrzf84k8y9fyvnd14nxs4")))) (outputs '("out" ; 49 MB "include")) ; 17 MB (build-system gnu-build-system) -- cgit v1.2.3 From d68aa41573bff6614a73ea28249cfd88fe206d38 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Sep 2018 11:36:31 +0200 Subject: gnu: enlightenment: Update to 0.22.4. * gnu/packages/enlightenment.scm (enlightenment): Update to 0.22.4. --- gnu/packages/enlightenment.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 87c2f2e58e..45dc1dbbeb 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -251,7 +251,7 @@ Libraries with some extra bells and whistles.") (define-public enlightenment (package (name "enlightenment") - (version "0.22.3") + (version "0.22.4") (source (origin (method url-fetch) (uri @@ -259,7 +259,7 @@ Libraries with some extra bells and whistles.") name "/" name "-" version ".tar.xz")) (sha256 (base32 - "16zydv7z94aw3rywmb9gr8ya85k7b75h22wng95lfx1x0y1yb0ad")) + "0ygy891rrw5c7lhk539nhif77j88phvz2h0fhx172iaridy9kx2r")) (patches (search-patches "enlightenment-fix-setuid-path.patch")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 56c240ba8c8afa5945ec05acf3b32908d92fc45f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 17 Sep 2018 23:18:08 +0200 Subject: gnu: Add confusion-mdl. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lisp.scm (confusion-mdl): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/lisp.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 720ac070cc..f9e03b18b6 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2017, 2018 Efraim Flashner ;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2018 Benjamin Slade ;;; ;;; This file is part of GNU Guix. ;;; @@ -62,6 +63,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages version-control) #:use-module (gnu packages xorg) + #:use-module (gnu packages perl) #:use-module (ice-9 match) #:use-module (srfi srfi-1)) @@ -1442,3 +1444,47 @@ compressor. It works on data produced by @code{parse-js} to generate a `(("sbcl" ,sbcl) ("sbcl-cl-uglify-js" ,sbcl-cl-uglify-js))) (synopsis "JavaScript compressor"))) + +(define-public confusion-mdl + (let* ((commit "12a055581fc262225272df43287dae48281900f5")) + (package + (name "confusion-mdl") + (version "0.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url (string-append "https://gitlab.com/emacsomancer/" name)) + (commit commit))) + (sha256 + (base32 + "1zi8kflzvwqg97ha1sa5xjisbjs5z1mvbpa772vfxiv5ksnpxp0d")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; there are no tests + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda* (#:key (make-flags '()) #:allow-other-keys) + (apply invoke "make" "CC=gcc" make-flags))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (install-file "mdli" bin) + #t)))))) + (native-inputs + `(("perl" ,perl))) + (inputs + `(("libgc" ,libgc))) + (synopsis "Interpreter for the MIT Design Language (MDL)") + (description "MDL (the MIT Design Language) is a descendant of Lisp. It +was originally developed in 1971 on the PDP-10 computer under the Incompatible +Timesharing System (ITS) to provide high level language support for the +Dynamic Modeling Group at MIT's Project MAC. Infocom built the original +PDP-10 Zork in MDL and their later ZIL (Zork Implementation Language) was +based on a subset of MDL. Confusion is a MDL interpreter that works just well +enough to play the original mainframe Zork all the way through.") + (home-page "http://www.russotto.net/git/mrussotto/confusion/src/master/src/README") + (license license:gpl3+)))) -- cgit v1.2.3 From 0edc232be92d62cd67b38192ee6d959ee30f599f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Sep 2018 14:32:16 +0200 Subject: gnu: gourmet: Use INVOKE. * gnu/packages/nutrition.scm (gourmet)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/nutrition.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/nutrition.scm b/gnu/packages/nutrition.scm index 0e03253cf1..5006f99ffc 100644 --- a/gnu/packages/nutrition.scm +++ b/gnu/packages/nutrition.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2015 Mark H Weaver +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -62,8 +63,8 @@ (modify-phases %standard-phases (replace 'install (lambda* (#:key make-flags #:allow-other-keys) - (zero? (system* "python" "setup.py" "install" "--prefix" - (assoc-ref %outputs "out")))))))) + (invoke "python" "setup.py" "install" "--prefix" + (assoc-ref %outputs "out"))))))) (home-page "http://thinkle.github.io/gourmet/") (synopsis "Recipe organizer") (description -- cgit v1.2.3 From b22c44f1ea7a06fefdbe80b579f1c9a1bad2213f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Sep 2018 13:51:12 +0200 Subject: gnu: cinnamon-desktop: Use Guix's built-in bootstrap phase. * gnu/packages/cinnamon.scm (cinnamon-desktop)[arguments]: Remove 'autoconf' phase. Add 'skip-premature-configure' phase. --- gnu/packages/cinnamon.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cinnamon.scm b/gnu/packages/cinnamon.scm index 65aea47d5a..7cac863f92 100644 --- a/gnu/packages/cinnamon.scm +++ b/gnu/packages/cinnamon.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Nils Gillmann +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -50,13 +51,10 @@ (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'autoconf + (add-before 'bootstrap 'skip-premature-configure (lambda _ - (mkdir-p "m4") - (zero? - (and (system* "glib-gettextize" "--force" "--copy") - (system* "intltoolize" "--force" "--copy" "--automake") - (system* "autoreconf" "--verbose" "--force" "--install")))))))) + (setenv "NOCONFIGURE" "set") + #t))))) ;; TODO: package 'libgsystem'. (inputs `(("accountsservice" ,accountsservice) -- cgit v1.2.3 From 8ecd843df5652f63e9f270159936b504357ef2b4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Sep 2018 22:40:30 +0200 Subject: gnu: exfat-utils: Update to 1.3.0. * gnu/packages/mtools.scm (exfat-utils): Update to 1.3.0. --- gnu/packages/mtools.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mtools.scm b/gnu/packages/mtools.scm index 3bfc4e76cf..f49a035b41 100644 --- a/gnu/packages/mtools.scm +++ b/gnu/packages/mtools.scm @@ -49,7 +49,7 @@ FAT-specific file attributes.") (define-public exfat-utils (package (name "exfat-utils") - (version "1.2.8") + (version "1.3.0") (source (origin (method url-fetch) (uri (string-append @@ -57,7 +57,7 @@ FAT-specific file attributes.") version "/" name "-" version ".tar.gz")) (sha256 (base32 - "09yf41mgwp8wg0psq347d5razllilx1sd4ij9173nri47p9465jw")))) + "0da8f8mm1sbwqp7prh78qk33xm0b8kk2d5is7mh2szlhgdxd1syz")))) (build-system gnu-build-system) (home-page "https://github.com/relan/exfat") (synopsis "Utilities to manipulate exFAT file systems") -- cgit v1.2.3 From 7c0ed27a8bc49ff80ec7e52f1f0b145815e0abc1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 18 Sep 2018 10:54:38 +0200 Subject: gnu: ncmpc: Update to 0.30. * gnu/packages/mpd.scm (ncmpc): Update to 0.30. [arguments]: Add 'expand-C++-include-path' phase. [inputs]: Add gcc-8. --- gnu/packages/mpd.scm | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 5c82bf9ba1..c024152dda 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -33,6 +33,7 @@ #:use-module (guix build-system python) #:use-module (gnu packages avahi) #:use-module (gnu packages boost) + #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) @@ -185,7 +186,7 @@ player daemon.") (define-public ncmpc (package (name "ncmpc") - (version "0.29") + (version "0.30") (source (origin (method url-fetch) (uri @@ -194,12 +195,23 @@ player daemon.") "/ncmpc-" version ".tar.xz")) (sha256 (base32 - "04jzv1hfdvgbn391523jb2h3yhq9a40pjrg41sl3wf3jf6vajs7g")))) + "18qj3cgqczgfk334x0ywxwa1ckrk9fbjyp34n4zzcxwaifshrzp3")))) (build-system meson-build-system) (arguments `(#:configure-flags - (list "-Dcurses=ncurses"))) - (inputs `(("glib" ,glib) + (list "-Dcurses=ncurses") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'expand-C++-include-path + ;; Make /include/c++/ext/string_conversions.h find . + (lambda* (#:key inputs #:allow-other-keys) + (let* ((path "CPLUS_INCLUDE_PATH") + (gcc (assoc-ref inputs "gcc")) + (c++ (string-append gcc "/include/c++"))) + (setenv path (string-append c++ ":" (getenv path))) + #t)))))) + (inputs `(("gcc", gcc-8) ; for its C++14 support + ("glib" ,glib) ("libmpdclient" ,libmpdclient) ("ncurses" ,ncurses))) (native-inputs `(("gettext" ,gettext-minimal) ; for xgettext -- cgit v1.2.3 From 487cf5aaf620fa56ddc76c854a34289dfdf04e93 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Sep 2018 14:42:05 +0200 Subject: gnu: rc: Simplify. * gnu/packages/shells.scm (rc)[source]: Replace magic commit ID with the tagged release. Use GIT-FILE-NAME. [arguments]: Remove 'autoreconf' phase (relying on Guix's built-in 'bootstrap' phase instead) and adjust the ordering of 'patch-trip.rc' accordingly. --- gnu/packages/shells.scm | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 406766351c..245496aaaf 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -155,23 +155,18 @@ and syntax highlighting.") (method git-fetch) (uri (git-reference (url "https://github.com/rakitzis/rc.git") - ;; commit name 'release: rc-1.7.4' - (commit "c884da53a7c885d46ace2b92de78946855b18e92"))) + (commit (string-append "v" version)))) (sha256 (base32 - "00mgzvrrh9w96xa85g4gjbsvq02f08k4jwjcdnxq7kyh5xgiw95l")) - (file-name (string-append name "-" version "-checkout")))) + "0vj1h4pcg13vxsiydmmk87dr2sra9h4gwx0c4q6fjsiw4in78rrd")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-edit=gnu") #:phases (modify-phases %standard-phases - (add-after - 'unpack 'autoreconf - (lambda _ (zero? (system* "autoreconf" "-vfi")))) - (add-before - 'autoreconf 'patch-trip.rc + (add-before 'bootstrap 'patch-trip.rc (lambda _ (substitute* "trip.rc" (("/bin/pwd") (which "pwd")) -- cgit v1.2.3 From 4999f45ea962ac79a23d028e2b393055b3786fe7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 18 Sep 2018 13:21:15 +0200 Subject: gnu: libburn: Update to 1.5.0. * gnu/packages/cdrom.scm (libburn): Update to 1.5.0. --- gnu/packages/cdrom.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 4b051e22d4..425a785bcd 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -727,14 +727,14 @@ laid out on the image.") (define-public libburn (package (name "libburn") - (version "1.4.8") + (version "1.5.0") (source (origin (method url-fetch) (uri (string-append "http://files.libburnia-project.org/releases/" "libburn-" version ".tar.gz")) (sha256 (base32 - "19lxnzn8bz70glrrrn2hs43gf5g7gfbcka9rcbckhv1pb7is509y")))) + "1gg2kgnqvaa2fwghai62prxz6slpak1f6bvgjh8m4dn16v114asq")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 8190578fa0d18b1859f2c996a6fd78a4866718d2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 18 Sep 2018 13:21:23 +0200 Subject: gnu: libisofs: Update to 1.5.0. * gnu/packages/cdrom.scm (libisofs): Update to 1.5.0. --- gnu/packages/cdrom.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 425a785bcd..91a9310eae 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -749,14 +749,14 @@ DVD-RW, DVD-R, DVD-R/DL, BD-R, and BD-RE.") (define-public libisofs (package (name "libisofs") - (version "1.4.8") + (version "1.5.0") (source (origin (method url-fetch) (uri (string-append "http://files.libburnia-project.org/releases/" "libisofs-" version ".tar.gz")) (sha256 (base32 - "0scvqb72qq24wcg814p1iw1dknldl21hr1hxsc1wy9vc6vgyk7fw")))) + "001l3akf3wb6msl9man776w560iqyvsbwwzs7d7y7msx13irspys")))) (build-system gnu-build-system) (inputs `(("zlib" ,zlib) -- cgit v1.2.3 From d99051715abb0fd6968a06948fc77f32728a710b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 18 Sep 2018 13:21:31 +0200 Subject: gnu: xorriso: Update to 1.5.0. * gnu/packages/cdrom.scm (xorriso): Update to 1.5.0. --- gnu/packages/cdrom.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 91a9310eae..d8dc9ee6f9 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -152,14 +152,14 @@ libcdio.") (define-public xorriso (package (name "xorriso") - (version "1.4.8") + (version "1.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/xorriso/xorriso-" version ".tar.gz")) (sha256 (base32 - "10c44yr3dpmwxa7rf23mwfsy1bahny3jpcg9ig0xjv090jg0d0pc")))) + "0aq6lvlwlkxz56l5sbvgycr6j5c82ch2bv6zrnc2345ibfpafgx9")))) (build-system gnu-build-system) (inputs `(("acl" ,acl) -- cgit v1.2.3 From 56c180750c8b7aca5ae82d133caac7c398c688b7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 18 Sep 2018 13:20:48 +0200 Subject: gnu: busybox: Update to 1.29.3. * gnu/packages/busybox.scm (busybox): Update to 1.29.3. --- gnu/packages/busybox.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/busybox.scm b/gnu/packages/busybox.scm index 480b777574..5f1613bb4c 100644 --- a/gnu/packages/busybox.scm +++ b/gnu/packages/busybox.scm @@ -31,7 +31,7 @@ (define-public busybox (package (name "busybox") - (version "1.29.1") + (version "1.29.3") (source (origin (method url-fetch) (uri (string-append @@ -39,7 +39,7 @@ version ".tar.bz2")) (sha256 (base32 - "1hqlr5b3bsyb6avadz1z4za6pyl32r1krnpcpwwqilhnx8q0f9gw")))) + "1dzg45vgy2w1xcd3p6h8d76ykhabbvk1h0lf8yb24ikrwlv8cr4p")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 32b3611375b942051c1e35612f630a4879f1247a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 18 Sep 2018 15:24:05 -0400 Subject: gnu: Go 1.10: Update to 1.10.4. * gnu/packages/golang.scm (go-1.10): Update to 1.10.4. --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index b4a088a051..fd4c362d36 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -389,7 +389,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") (package (inherit go-1.9) (name "go") - (version "1.10.3") + (version "1.10.4") (source (origin (method url-fetch) @@ -397,7 +397,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") name version ".src.tar.gz")) (sha256 (base32 - "1wjmw65nfkkzz084695gdgn13sbjcaafy2y5370d214pdk31qysn")))) + "10ap5pan71y2hdwzv4cg8wx4sy8fkcz5520rm1ldjg25xmjlkr3g")))) (arguments (substitute-keyword-arguments (package-arguments go-1.9) ((#:phases phases) -- cgit v1.2.3 From 0058888c7efe4063f80180ff446513869420423f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 18 Sep 2018 23:07:18 +0200 Subject: gnu: Add guile-debbugs. * gnu/packages/guile.scm (guile-debbugs): New variable. --- gnu/packages/guile.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 4ee887b749..c66183b9db 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -2206,4 +2206,31 @@ endpoint. Additionally, it provides an interface to write SPARQL queries using S-expressions.") (license license:gpl3+))) +(define-public guile-debbugs + (package + (name "guile-debbugs") + (version "0.0.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/guile-debbugs/guile-debbugs-" + version ".tar.gz")) + (sha256 + (base32 + "16l8910p57im6s3j93xhdaqvgfy6ms5n97177mrch3y961z5hy0i")) + (modules '((guix build utils))) + (snippet + '(substitute* "Makefile.in" + (("^godir = (.*)/ccache" _ prefix) + (string-append "godir = " prefix "/site-ccache")))))) + (build-system gnu-build-system) + (native-inputs + `(("guile" ,guile-2.2) + ("pkg-config" ,pkg-config))) + (home-page "https://savannah.gnu.org/projects/guile-debbugs/") + (synopsis "Guile interface to the Debbugs bug tracking service") + (description + "This package provides a Guile library to communicate with a Debbugs bug +tracker's SOAP service, such as @url{https://bugs.gnu.org}.") + (license license:gpl3+))) + ;;; guile.scm ends here -- cgit v1.2.3 From 1cfcb841eddbe6b2bfed6dfaad6bcebff66e7a16 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 18 Sep 2018 12:18:23 +0200 Subject: gnu: git-credential-netrc: Add Git.pm to PERL5LIB. * gnu/packages/version-control.scm (git)[credential-netrc]: Add Git.pm to PERL5LIB. --- gnu/packages/version-control.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 3774961786..58c870df5a 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -309,6 +309,13 @@ as well as the classic centralized workflow.") (let* ((netrc (assoc-ref outputs "credential-netrc"))) (install-file "contrib/credential/netrc/git-credential-netrc" (string-append netrc "/bin")) + ;; Previously, Git.pm was automatically found by netrc. + ;; Perl 5.26 changed how it locates modules so that @INC no + ;; longer includes the current working directory (the Perl + ;; community calls this "dotless @INC"). + (wrap-program (string-append netrc "/bin/git-credential-netrc") + `("PERL5LIB" ":" prefix + (,(string-append (assoc-ref outputs "out") "/share/perl5")))) #t))) (add-after 'install 'split (lambda* (#:key inputs outputs #:allow-other-keys) -- cgit v1.2.3 From 4a90fcf9e7a71a1672d9aa86f367f07ad297f899 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Wed, 19 Sep 2018 12:18:26 +0200 Subject: gnu: mrustc: Enable tests. * gnu/packages/rust.scm (mrustc)[arguments]: Add #:test-target. <#:phases>[install]: Don't install test output. --- gnu/packages/rust.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index c40a47c4d9..e1c32dbe10 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -200,7 +200,7 @@ in turn be used to build the final Rust.") ("rustc" ,(rust-source "1.19.0" "0l8c14qsf42rmkqy92ahij4vf356dbyspxcips1aswpvad81y8qm")))) (arguments - `(#:tests? #f + `(#:test-target "local_tests" #:make-flags (list (string-append "LLVM_CONFIG=" (assoc-ref %build-inputs "llvm") "/bin/llvm-config")) @@ -250,6 +250,7 @@ in turn be used to build the final Rust.") (gcc (assoc-ref inputs "gcc"))) ;; These files are not reproducible. (for-each delete-file (find-files "output" "\\.txt$")) + (delete-file-recursively "output/local_tests") (mkdir-p lib) (copy-recursively "output" lib/rust) (mkdir-p bin) -- cgit v1.2.3 From 6c1a6584149b542321597741b3f1459743be2b3e Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Wed, 19 Sep 2018 14:38:10 +0200 Subject: gnu: rust@1.19.0: Install libtest. * gnu/packages/rust.scm (rust-1.19)[arguments]<#:phases>[build]: Build libtest. --- gnu/packages/rust.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index e1c32dbe10..74de6f3ae1 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -411,6 +411,8 @@ test = { path = \"../libtest\" } "output/rustc-build/rustc" "-C" (string-append "linker=" (getenv "CC")) + ;; Required for libterm. + "-Z" "force-unstable-if-unmarked" "-L" "output/target-libs" (string-append "src/" name "/lib.rs") "-o" @@ -430,7 +432,13 @@ test = { path = \"../libtest\" } ("libpanic_unwind") ;; Uses "cc" to link. ("libstd" "-l" "dl" "-l" "rt" "-l" "pthread") - ("libarena"))) + ("libarena") + + ;; Test dependencies: + + ("libgetopts") + ("libterm") + ("libtest"))) #t))) ;; This phase is overridden by newer versions. (replace 'check -- cgit v1.2.3 From c5c1e410cfc175df8b4b61c1a3d42850bb268bf3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 19 Sep 2018 14:20:03 +0200 Subject: gnu: Reinstate xf86-video-ast. * gnu/packages/patches/xf86-video-ast-remove-mibstore.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/xorg.scm (xf86-video-ast): New public variable. --- gnu/local.mk | 1 - .../patches/xf86-video-ast-remove-mibstore.patch | 90 ---------------------- gnu/packages/xorg.scm | 48 +++++------- 3 files changed, 21 insertions(+), 118 deletions(-) delete mode 100644 gnu/packages/patches/xf86-video-ast-remove-mibstore.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index d37a193adb..0ead43acd9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1229,7 +1229,6 @@ dist_patch_DATA = \ %D%/packages/patches/xapian-revert-5489fb2f8.patch \ %D%/packages/patches/xboing-CVE-2004-0149.patch \ %D%/packages/patches/xf86-video-ark-remove-mibstore.patch \ - %D%/packages/patches/xf86-video-ast-remove-mibstore.patch \ %D%/packages/patches/xf86-video-geode-glibc-2.20.patch \ %D%/packages/patches/xf86-video-i128-remove-mibstore.patch \ %D%/packages/patches/xf86-video-mach64-glibc-2.20.patch \ diff --git a/gnu/packages/patches/xf86-video-ast-remove-mibstore.patch b/gnu/packages/patches/xf86-video-ast-remove-mibstore.patch deleted file mode 100644 index 58a44ae260..0000000000 --- a/gnu/packages/patches/xf86-video-ast-remove-mibstore.patch +++ /dev/null @@ -1,90 +0,0 @@ -Removes references to mibstore.h and miInitializeBackingStore, which -have been removed from xorg-server. Zack Rusin -wrote: "It was a noop for at least 5 years and it has been removed." -See: http://patches.openembedded.org/patch/46133/ - -diff -ru xf86-video-ast-0.93.10.orig/src/ast_2dtool.c xf86-video-ast-0.93.10/src/ast_2dtool.c ---- xf86-video-ast-0.93.10.orig/src/ast_2dtool.c 2012-03-23 21:40:56.000000000 -0400 -+++ xf86-video-ast-0.93.10/src/ast_2dtool.c 2014-12-19 02:42:32.422383728 -0500 -@@ -27,7 +27,6 @@ - #include "xf86_OSproc.h" - #include "xf86cmap.h" - #include "compiler.h" --#include "mibstore.h" - #include "vgaHW.h" - #include "mipointer.h" - #include "micmap.h" -diff -ru xf86-video-ast-0.93.10.orig/src/ast_accel.c xf86-video-ast-0.93.10/src/ast_accel.c ---- xf86-video-ast-0.93.10.orig/src/ast_accel.c 2012-03-23 21:40:56.000000000 -0400 -+++ xf86-video-ast-0.93.10/src/ast_accel.c 2014-12-19 02:41:55.534200809 -0500 -@@ -27,7 +27,6 @@ - #include "xf86_OSproc.h" - #include "xf86cmap.h" - #include "compiler.h" --#include "mibstore.h" - #include "vgaHW.h" - #include "mipointer.h" - #include "micmap.h" -diff -ru xf86-video-ast-0.93.10.orig/src/ast_cursor.c xf86-video-ast-0.93.10/src/ast_cursor.c ---- xf86-video-ast-0.93.10.orig/src/ast_cursor.c 2012-03-23 21:40:56.000000000 -0400 -+++ xf86-video-ast-0.93.10/src/ast_cursor.c 2014-12-19 02:42:37.258407708 -0500 -@@ -27,7 +27,6 @@ - #include "xf86_OSproc.h" - #include "xf86cmap.h" - #include "compiler.h" --#include "mibstore.h" - #include "vgaHW.h" - #include "mipointer.h" - #include "micmap.h" -diff -ru xf86-video-ast-0.93.10.orig/src/ast_driver.c xf86-video-ast-0.93.10/src/ast_driver.c ---- xf86-video-ast-0.93.10.orig/src/ast_driver.c 2012-03-23 21:40:56.000000000 -0400 -+++ xf86-video-ast-0.93.10/src/ast_driver.c 2014-12-19 02:42:50.710474414 -0500 -@@ -31,7 +31,6 @@ - #endif - #include "xf86cmap.h" - #include "compiler.h" --#include "mibstore.h" - #include "vgaHW.h" - #include "mipointer.h" - #include "micmap.h" -@@ -865,7 +864,6 @@ - } - #endif /* end of Accel_2D */ - -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - xf86SetSilkenMouse(pScreen); - -diff -ru xf86-video-ast-0.93.10.orig/src/ast_mode.c xf86-video-ast-0.93.10/src/ast_mode.c ---- xf86-video-ast-0.93.10.orig/src/ast_mode.c 2012-03-23 21:40:56.000000000 -0400 -+++ xf86-video-ast-0.93.10/src/ast_mode.c 2014-12-19 02:42:24.894346398 -0500 -@@ -27,7 +27,6 @@ - #include "xf86_OSproc.h" - #include "xf86cmap.h" - #include "compiler.h" --#include "mibstore.h" - #include "vgaHW.h" - #include "mipointer.h" - #include "micmap.h" -diff -ru xf86-video-ast-0.93.10.orig/src/ast_tool.c xf86-video-ast-0.93.10/src/ast_tool.c ---- xf86-video-ast-0.93.10.orig/src/ast_tool.c 2012-03-23 21:40:56.000000000 -0400 -+++ xf86-video-ast-0.93.10/src/ast_tool.c 2014-12-19 02:42:03.930242443 -0500 -@@ -27,7 +27,6 @@ - #include "xf86_OSproc.h" - #include "xf86cmap.h" - #include "compiler.h" --#include "mibstore.h" - #include "vgaHW.h" - #include "mipointer.h" - #include "micmap.h" -diff -ru xf86-video-ast-0.93.10.orig/src/ast_vgatool.c xf86-video-ast-0.93.10/src/ast_vgatool.c ---- xf86-video-ast-0.93.10.orig/src/ast_vgatool.c 2012-03-23 21:40:56.000000000 -0400 -+++ xf86-video-ast-0.93.10/src/ast_vgatool.c 2014-12-19 02:42:18.406314226 -0500 -@@ -27,7 +27,6 @@ - #include "xf86_OSproc.h" - #include "xf86cmap.h" - #include "compiler.h" --#include "mibstore.h" - #include "vgaHW.h" - #include "mipointer.h" - #include "micmap.h" diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 30e46fac7c..90f4bf4f59 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2645,33 +2645,27 @@ as USB mice.") "xf86-video-ark is an Ark Logic video driver for the Xorg X server.") (license license:x11))) -;; This driver depends on XAA which has been removed from xorg-server. -;; -;; (define-public xf86-video-ast -;; (package -;; (name "xf86-video-ast") -;; (version "0.93.10") -;; (source -;; (origin -;; (method url-fetch) -;; (uri (string-append -;; "mirror://xorg/individual/driver/xf86-video-ast-" -;; version -;; ".tar.bz2")) -;; (sha256 -;; (base32 -;; "1q64z8qqa0ix3cymqiwk1s3sphd1fvvz30lvyxhgkgciygz6dm69")) -;; (patches (search-patches "xf86-video-ast-remove-mibstore.patch")))) -;; (build-system gnu-build-system) -;; (inputs `(("xorg-server" ,xorg-server))) -;; (native-inputs `(("pkg-config" ,pkg-config))) -;; (home-page "https://www.x.org/wiki/") -;; (synopsis "ASpeed Technologies video driver for X server") -;; (description -;; "xf86-video-ast is an ASpeed Technologies video driver for the Xorg -;; X server.") -;; (license license:x11))) - +(define-public xf86-video-ast + (package + (name "xf86-video-ast") + (version "1.1.5") + (home-page "https://cgit.freedesktop.org/xorg/driver/xf86-video-ast/") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/driver/xf86-video-ast-" + version ".tar.bz2")) + (sha256 + (base32 + "1pm2cy81ma7ldsw0yfk28b33h9z2hcj5rccrxhfxfgvxsiavrnqy")))) + (build-system gnu-build-system) + (inputs `(("xorg-server" ,xorg-server))) + (native-inputs `(("pkg-config" ,pkg-config))) + (synopsis "ASpeed Technologies video driver for X server") + (description + "xf86-video-ast is an ASpeed Technologies video driver for the Xorg +X server.") + (license license:x11))) (define-public xf86-video-ati (package -- cgit v1.2.3 From 622ef2b90aceeb20bddbd168ea4383ba9acbfca0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 19 Sep 2018 15:13:00 +0200 Subject: gnu: arpack-ng: Don't use unstable tarball. * gnu/packages/maths.scm (arpack-ng)[source]: Use GIT-FETCH. --- gnu/packages/maths.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index d3e72128ca..b9f36600d8 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -462,14 +462,13 @@ computing convex hulls.") (name "arpack-ng") (version "3.6.2") (home-page "https://github.com/opencollab/arpack-ng") - (source - (origin - (method url-fetch) - (uri (string-append home-page "/archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "16jrvdl0gh78rrfnvrcxwys4slwfh6qmwwjhfc9d6vwrvq184g37")))) + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "08yg5rbsnrni9v04x5a8frav6yp7x6lwvai5j93a37b1p59jsgsl")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From f03c4ec64987a339084cd1d43a0c1e402174355b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 19 Sep 2018 15:13:59 +0200 Subject: gnu: arpack-ng: Update to 3.6.3. * gnu/packages/maths.scm (arpack-ng): Update to 3.6.3. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index b9f36600d8..e51afb3bb9 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -460,7 +460,7 @@ computing convex hulls.") (define-public arpack-ng (package (name "arpack-ng") - (version "3.6.2") + (version "3.6.3") (home-page "https://github.com/opencollab/arpack-ng") (source (origin (method git-fetch) @@ -468,7 +468,7 @@ computing convex hulls.") (file-name (git-file-name name version)) (sha256 (base32 - "08yg5rbsnrni9v04x5a8frav6yp7x6lwvai5j93a37b1p59jsgsl")))) + "1wljl96yqxc9v8r49c37lscwkdp58kaacfb9p6s6nvpm31haax4y")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From f6ae59c2e04bc85a7e11c0574942335c6843bc65 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 19 Sep 2018 15:14:18 +0200 Subject: gnu: feh: Update to 2.28. * gnu/packages/image-viewers.scm (feh): Update to 2.28. --- gnu/packages/image-viewers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 87546045a6..512795ce89 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -60,7 +60,7 @@ (define-public feh (package (name "feh") - (version "2.27.1") + (version "2.28") (home-page "https://feh.finalrewind.org/") (source (origin (method url-fetch) @@ -68,7 +68,7 @@ name "-" version ".tar.bz2")) (sha256 (base32 - "10zk76l491s22qrv86rax6cvpgwyl3qq0izl2pbk0k1z1kw3ihvf")))) + "1nfka7w6pzj2bbwx8vydr2wwm7z8mrbqiy1xrq97c1g5bxy2vlhk")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (delete 'configure)) -- cgit v1.2.3 From 4d679255dad798da0bbac22412e4f3f4d09a771a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 19 Sep 2018 15:16:24 +0200 Subject: gnu: glm: Update to 0.9.9.2. * gnu/packages/maths.scm (glm): Update to 0.9.9.2. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index e51afb3bb9..704ae9781b 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3229,7 +3229,7 @@ Failure to do so will result in a library with poor performance.") (define-public glm (package (name "glm") - (version "0.9.9.1") + (version "0.9.9.2") (source (origin (method url-fetch) @@ -3237,7 +3237,7 @@ Failure to do so will result in a library with poor performance.") version "/glm-" version ".zip")) (sha256 (base32 - "042a23hmxfs429czkmlg5ixf28aikzfbw18780prj2gcd4flgw8h")))) + "1m2gws1d7l6h4mdn0ap74pfnm3vva3kk8rybdqd5x4lksd1mk6r0")))) (build-system cmake-build-system) (native-inputs `(("unzip" ,unzip))) -- cgit v1.2.3 From 7fd3082522e7007b47a6aa765d10a9cc3277b36d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 19 Sep 2018 10:54:46 +0200 Subject: services: udev: Simplify 'start' method. * gnu/services/base.scm (udev-shepherd-service)[start](find): Remove. (udev): Hardwire the eudev file name. Use 'fork+exec-command' instead of 'primitive-fork' and 'exec-command'. --- gnu/services/base.scm | 43 ++++++++++++++++--------------------------- 1 file changed, 16 insertions(+), 27 deletions(-) (limited to 'gnu') diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 921914ccdf..beb473151d 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -1846,16 +1846,9 @@ item of @var{packages}." (documentation "Populate the /dev directory, dynamically.") (start #~(lambda () - (define find - (@ (srfi srfi-1) find)) - (define udevd - ;; Choose the right 'udevd'. - (find file-exists? - (map (lambda (suffix) - (string-append #$udev suffix)) - '("/libexec/udev/udevd" ;udev - "/sbin/udevd")))) ;eudev + ;; 'udevd' from eudev. + #$(file-append udev "/sbin/udevd")) (define (wait-for-udevd) ;; Wait until someone's listening on udevd's control @@ -1891,24 +1884,20 @@ item of @var{packages}." (make-static-device-nodes directory) (umask old-umask)) - (let ((pid (primitive-fork))) - (case pid - ((0) - (exec-command (list udevd))) - (else - ;; Wait until udevd is up and running. This - ;; appears to be needed so that the events - ;; triggered below are actually handled. - (wait-for-udevd) - - ;; Trigger device node creation. - (system* #$(file-append udev "/bin/udevadm") - "trigger" "--action=add") - - ;; Wait for things to settle down. - (system* #$(file-append udev "/bin/udevadm") - "settle") - pid))))) + (let ((pid (fork+exec-command (list udevd)))) + ;; Wait until udevd is up and running. This appears to + ;; be needed so that the events triggered below are + ;; actually handled. + (wait-for-udevd) + + ;; Trigger device node creation. + (system* #$(file-append udev "/bin/udevadm") + "trigger" "--action=add") + + ;; Wait for things to settle down. + (system* #$(file-append udev "/bin/udevadm") + "settle") + pid))) (stop #~(make-kill-destructor)) ;; When halting the system, 'udev' is actually killed by -- cgit v1.2.3 From 241358dc94b3c2039a4aa05bcb18b4d1ef6f6d35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 19 Sep 2018 12:41:45 +0200 Subject: services: networking: Remove unbound variable reference in 'stop'. * gnu/services/base.scm (static-networking-shepherd-service): Remove spurious ":" in 'stop' method inadvertently introduced in commit c9436025a90b86047ba2203d58bbf238f8f9b2f9. --- gnu/services/base.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/services/base.scm b/gnu/services/base.scm index beb473151d..5ba2c6b86d 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -2122,7 +2122,7 @@ This service is not part of @var{%base-services}." AF_INET INADDR_ANY 0))) (set-network-interface-flags sock #$interface 0) (close-port sock) -: #f))) + #f))) (respawn? #f)))))) (define (static-networking-etc-files interfaces) -- cgit v1.2.3 From 1d98b44ea6618f602fb1f54eb07109a1fe92cefd Mon Sep 17 00:00:00 2001 From: Andy Patterson Date: Thu, 30 Aug 2018 01:36:32 -0400 Subject: gnu: sbcl-slynk: Fix the build. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lisp.scm (sbcl-slynk-boot0): Update to commit cbf84c36c4eca8b032e3fd16177a7bc02df3ec4c. [origin]: Replace slynk/util references with the built system name slynk-util. Remove compile-time invocations of slynk-require. (sbcl-slynk-util): Inherit from sbcl-slynk-boot0. [inputs]: Add sbcl-slynk-boot0. [arguments]: Set an appropriate asd-file and asd-system-name. (sbcl-slynk-arglists)[arguments]: Set an appropriate asdf-system-name. (sbcl-slynk-fancy-inspector)[arguments]: Likewise. (sbcl-slynk-package-fu)[arguments]: Likewise. (sbcl-slynk-mrepl)[arguments]: Likewise. (sbcl-slynk-trace-dialog)[arguments]: Likewise. (sbcl-slynk-profiler)[arguments]: Likewise. (sbcl-slynk-indentation)[arguments]: Likewise. (sbcl-slynk-retro)[arguments]: Likewise. Signed-off-by: Ludovic Courtès --- gnu/packages/lisp.scm | 68 ++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 51 insertions(+), 17 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index f9e03b18b6..82ba6eedf0 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1011,8 +1011,8 @@ productive, customizable lisp based systems.") ;; we expose the union of these as `sbcl-slynk'. The following variable ;; describes the base module. (define sbcl-slynk-boot0 - (let ((revision "1") - (commit "5706cd45d484a4f25795abe8e643509d31968aa2")) + (let ((revision "2") + (commit "cbf84c36c4eca8b032e3fd16177a7bc02df3ec4c")) (package (name "sbcl-slynk-boot0") (version (string-append "1.0.0-beta-" revision "." (string-take commit 7))) @@ -1024,7 +1024,7 @@ productive, customizable lisp based systems.") (url "https://github.com/joaotavora/sly.git") (commit commit))) (sha256 - (base32 "0h4gg3sndl2bf6jdnx9nrf14p9hhi43hagrl0f4v4l11hczl8w81")) + (base32 "13dyhsravn591p7g6is01mp2ynzjnnj7pwgi57r6xqmd4611y9vh")) (file-name (string-append "slynk-" version "-checkout")) (modules '((guix build utils) (ice-9 ftw))) @@ -1035,14 +1035,19 @@ productive, customizable lisp based systems.") (substitute* "slynk/slynk.asd" (("\\.\\./contrib") "contrib") - (("\\(defsystem :slynk-util") - "(defsystem :slynk-util :depends-on (:slynk)")) + (("\\(defsystem :slynk/util") + "(defsystem :slynk/util :depends-on (:slynk)") + ((":depends-on \\(:slynk :slynk/util\\)") + ":depends-on (:slynk :slynk-util)")) (substitute* "contrib/slynk-trace-dialog.lisp" (("\\(slynk::reset-inspector\\)") ; Causes problems on load "nil")) (substitute* "contrib/slynk-profiler.lisp" (("slynk:to-line") "slynk-pprint-to-line")) + (substitute* "contrib/slynk-fancy-inspector.lisp" + (("slynk/util") "slynk-util") + ((":compile-toplevel :load-toplevel") "")) (rename-file "contrib" "slynk/contrib") ;; Move slynk's contents into the base directory for easier ;; access @@ -1082,15 +1087,20 @@ multiple inspectors with independent history.") (arguments (substitute-keyword-arguments (package-arguments sbcl-slynk-boot0) ((#:asd-file _ "") "slynk.asd") - ((#:asd-system-name _ #f) #f))))) + ((#:asd-system-name _ #f) "slynk/arglists"))))) (define ecl-slynk-arglists (sbcl-package->ecl-package sbcl-slynk-arglists)) (define sbcl-slynk-util (package - (inherit sbcl-slynk-arglists) - (name "sbcl-slynk-util"))) + (inherit sbcl-slynk-boot0) + (name "sbcl-slynk-util") + (inputs `(("slynk" ,sbcl-slynk-boot0))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-slynk-boot0) + ((#:asd-file _ "") "slynk.asd") + ((#:asd-system-name _ #f) "slynk/util"))))) (define ecl-slynk-util (sbcl-package->ecl-package sbcl-slynk-util)) @@ -1100,7 +1110,10 @@ multiple inspectors with independent history.") (inherit sbcl-slynk-arglists) (name "sbcl-slynk-fancy-inspector") (inputs `(("slynk-util" ,sbcl-slynk-util) - ,@(package-inputs sbcl-slynk-arglists))))) + ,@(package-inputs sbcl-slynk-arglists))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-slynk-arglists) + ((#:asd-system-name _ #f) "slynk/fancy-inspector"))))) (define ecl-slynk-fancy-inspector (sbcl-package->ecl-package sbcl-slynk-fancy-inspector)) @@ -1108,15 +1121,21 @@ multiple inspectors with independent history.") (define sbcl-slynk-package-fu (package (inherit sbcl-slynk-arglists) - (name "sbcl-slynk-package-fu"))) + (name "sbcl-slynk-package-fu") + (arguments + (substitute-keyword-arguments (package-arguments sbcl-slynk-arglists) + ((#:asd-system-name _ #f) "slynk/package-fu"))))) (define ecl-slynk-package-fu (sbcl-package->ecl-package sbcl-slynk-package-fu)) (define sbcl-slynk-mrepl (package - (inherit sbcl-slynk-arglists) - (name "sbcl-slynk-mrepl"))) + (inherit sbcl-slynk-fancy-inspector) + (name "sbcl-slynk-mrepl") + (arguments + (substitute-keyword-arguments (package-arguments sbcl-slynk-arglists) + ((#:asd-system-name _ #f) "slynk/mrepl"))))) (define ecl-slynk-mrepl (sbcl-package->ecl-package sbcl-slynk-mrepl)) @@ -1124,7 +1143,10 @@ multiple inspectors with independent history.") (define sbcl-slynk-trace-dialog (package (inherit sbcl-slynk-arglists) - (name "sbcl-slynk-trace-dialog"))) + (name "sbcl-slynk-trace-dialog") + (arguments + (substitute-keyword-arguments (package-arguments sbcl-slynk-arglists) + ((#:asd-system-name _ #f) "slynk/trace-dialog"))))) (define ecl-slynk-trace-dialog (sbcl-package->ecl-package sbcl-slynk-trace-dialog)) @@ -1132,7 +1154,10 @@ multiple inspectors with independent history.") (define sbcl-slynk-profiler (package (inherit sbcl-slynk-arglists) - (name "sbcl-slynk-profiler"))) + (name "sbcl-slynk-profiler") + (arguments + (substitute-keyword-arguments (package-arguments sbcl-slynk-arglists) + ((#:asd-system-name _ #f) "slynk/profiler"))))) (define ecl-slynk-profiler (sbcl-package->ecl-package sbcl-slynk-profiler)) @@ -1140,7 +1165,10 @@ multiple inspectors with independent history.") (define sbcl-slynk-stickers (package (inherit sbcl-slynk-arglists) - (name "sbcl-slynk-stickers"))) + (name "sbcl-slynk-stickers") + (arguments + (substitute-keyword-arguments (package-arguments sbcl-slynk-arglists) + ((#:asd-system-name _ #f) "slynk/stickers"))))) (define ecl-slynk-stickers (sbcl-package->ecl-package sbcl-slynk-stickers)) @@ -1148,7 +1176,10 @@ multiple inspectors with independent history.") (define sbcl-slynk-indentation (package (inherit sbcl-slynk-arglists) - (name "sbcl-slynk-indentation"))) + (name "sbcl-slynk-indentation") + (arguments + (substitute-keyword-arguments (package-arguments sbcl-slynk-arglists) + ((#:asd-system-name _ #f) "slynk/indentation"))))) (define ecl-slynk-indentation (sbcl-package->ecl-package sbcl-slynk-indentation)) @@ -1156,7 +1187,10 @@ multiple inspectors with independent history.") (define sbcl-slynk-retro (package (inherit sbcl-slynk-arglists) - (name "sbcl-slynk-retro"))) + (name "sbcl-slynk-retro") + (arguments + (substitute-keyword-arguments (package-arguments sbcl-slynk-arglists) + ((#:asd-system-name _ #f) "slynk/retro"))))) (define ecl-slynk-retro (sbcl-package->ecl-package sbcl-slynk-retro)) -- cgit v1.2.3 From 508d5c5fa883a3cee53f8da358d853d4b245496c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 15 Sep 2018 23:35:17 -0400 Subject: gnu: OpenSC: Update to 0.19.0 [security fixes]. Fixes CVE-2018-{16391,16392,16393,16418,16419,16420,16421,16422,16423,16424, 16425,16426,16427}. * gnu/packages/security-token.scm (opensc): Update to 0.19.0. --- gnu/packages/security-token.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 4b748b6644..2ebf09cfe2 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -220,7 +220,7 @@ website for more information about Yubico and the YubiKey.") (define-public opensc (package (name "opensc") - (version "0.18.0") + (version "0.19.0") (source (origin (method url-fetch) (uri (string-append @@ -228,7 +228,7 @@ website for more information about Yubico and the YubiKey.") version "/opensc-" version ".tar.gz")) (sha256 (base32 - "0mrpik6ifzh27ws7h0viv8nwgcdj3fp5whaldmj0zhfi1l1zzh4v")))) + "09jqzl18z5qfrf4vf2nvbpdm3mphpgfkl3ww1clkaxh2z56hwnic")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From e266043e670f4318679664f3af4401dab7cce52b Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 19 Sep 2018 17:31:34 -0400 Subject: gnu: shotwell: Update to 0.28.4. * gnu/packages/gnome.scm (shotwell): Update to 0.28.4. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1a0cc9cc11..6a34e81f13 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4432,7 +4432,7 @@ metadata in photo and video files of various formats.") (define-public shotwell (package (name "shotwell") - (version "0.28.0") + (version "0.28.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4440,7 +4440,7 @@ metadata in photo and video files of various formats.") name "-" version ".tar.xz")) (sha256 (base32 - "1d797nmlz9gs6ri0h65b76s40ss6ma6h6405xqx03lhg5xni3kmg")))) + "03k7n2kmzqn11kf3733w7m6xjh2b5q9xr84za2hli11fjymzaxm9")))) (build-system glib-or-gtk-build-system) (propagated-inputs `(("dconf" ,dconf))) -- cgit v1.2.3 From 29a000b6028e69877c4697a37f5cdef256807129 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 19 Sep 2018 15:28:46 +0200 Subject: gnu: sg3-utils: Update to 1.44. * gnu/packages/scsi.scm (sg3-utils): Update to 1.44. --- gnu/packages/scsi.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/scsi.scm b/gnu/packages/scsi.scm index f011af84c4..f8c5d5ef60 100644 --- a/gnu/packages/scsi.scm +++ b/gnu/packages/scsi.scm @@ -27,14 +27,14 @@ (define-public sg3-utils (package (name "sg3-utils") - (version "1.43") + (version "1.44") (source (origin (method url-fetch) (uri (string-append "http://sg.danny.cz/sg/p/sg3_utils-" version ".tar.xz")) (sha256 (base32 - "04l58wvncqk6lfh4lashsl3ccsa1114hkd6vwi1h1cbmq2fw9c8v")))) + "01avlgrbxlij8spish4i69ji1m49biz4mbayzzc2qx0hcl8ar56a")))) (build-system gnu-build-system) (home-page "http://sg.danny.cz/sg/sg3_utils.html") (synopsis "SCSI device utilities") -- cgit v1.2.3 From e564d33ce8b7bda66c3e8ef0779cef03890838da Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Sep 2018 14:33:10 +0200 Subject: gnu: gourmet: Use HTTPS home page. * gnu/packages/nutrition.scm (gourmet)[home-page]: Use HTTPS. --- gnu/packages/nutrition.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/nutrition.scm b/gnu/packages/nutrition.scm index 5006f99ffc..9397630afd 100644 --- a/gnu/packages/nutrition.scm +++ b/gnu/packages/nutrition.scm @@ -65,7 +65,7 @@ (lambda* (#:key make-flags #:allow-other-keys) (invoke "python" "setup.py" "install" "--prefix" (assoc-ref %outputs "out"))))))) - (home-page "http://thinkle.github.io/gourmet/") + (home-page "https://thinkle.github.io/gourmet/") (synopsis "Recipe organizer") (description "Gourmet Recipe Manager is a recipe organizer that allows you to collect, -- cgit v1.2.3 From 7616d75fd68b3a0af3861c3f86e82d3ae7fb7677 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 20 Sep 2018 04:08:17 +0200 Subject: Use INVOKE in (gnu packages telephony). * gnu/packages/telephony.scm (libiax2, mumble)[arguments]: Use INVOKE. --- gnu/packages/telephony.scm | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 2055034117..05916cde5c 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016 Francesco Frassinelli ;;; Copyright © 2016, 2017 Nils Gillmann ;;; Copyright © 2017 Ricardo Wurmus -;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Jovany Leandro G.C ;;; ;;; This file is part of GNU Guix. @@ -314,7 +314,7 @@ protocol (RFC 3550).") `(#:phases (modify-phases %standard-phases (add-after 'unpack 'autoconf (lambda _ - (zero? (system* "autoreconf" "-vfi"))))))) + (invoke "autoreconf" "-vfi")))))) (home-page "https://gitlab.savoirfairelinux.com/sflphone/libiax2") (synopsis "Inter-Asterisk-Protocol library") (description "LibIAX2 implements the Inter-Asterisk-Protocol for relaying @@ -393,27 +393,27 @@ address of one of the participants.") (modify-phases %standard-phases (replace 'configure (lambda* (#:key outputs #:allow-other-keys) - (zero? (system* "qmake" "main.pro" "-recursive" - (string-append "CONFIG+=" - (string-join - (list "no-update" - "no-ice" - "no-embed-qt-translations" - "no-bundled-speex" - "pch" - "no-bundled-opus" - "no-celt" - "no-alsa" - "no-oss" - "no-portaudio" - "speechd" - "no-g15" - "no-bonjour" - "release"))) - (string-append "DEFINES+=" - "PLUGIN_PATH=" - (assoc-ref outputs "out") - "/lib/mumble"))))) + (invoke "qmake" "main.pro" "-recursive" + (string-append "CONFIG+=" + (string-join + (list "no-update" + "no-ice" + "no-embed-qt-translations" + "no-bundled-speex" + "pch" + "no-bundled-opus" + "no-celt" + "no-alsa" + "no-oss" + "no-portaudio" + "speechd" + "no-g15" + "no-bonjour" + "release"))) + (string-append "DEFINES+=" + "PLUGIN_PATH=" + (assoc-ref outputs "out") + "/lib/mumble")))) (add-before 'configure 'fix-libspeechd-include (lambda _ (substitute* "src/mumble/TextToSpeech_unix.cpp" -- cgit v1.2.3 From 4f66ae2899c3ba6cd49845e40641ba93b47e0a76 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 19 Sep 2018 23:15:10 +0200 Subject: gnu: ruby-heredoc-unindent: Fix typo in description. * gnu/packages/ruby.scm (ruby-heredoc-unindent)[description]: Fix typo. --- gnu/packages/ruby.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 76e3cee81e..99ad125e3c 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5873,7 +5873,7 @@ hashes more powerful.") (synopsis "Heredoc indentation cleaner") (description "This gem removes common margin from indented strings, such as the ones produced by indented heredocs. In other words, it strips out -leading whitespace chars at the beggining of each line, but only as much as +leading whitespace chars at the beginning of each line, but only as much as the line with the smallest margin. It is acknowledged that many strings defined by heredocs are just code and -- cgit v1.2.3 From 9923d5a40fa3e5950c2291d84b34961af497294e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 20 Sep 2018 03:23:37 +0200 Subject: gnu: Use INVOKE & return #t from Ruby package phases. * gnu/packages/maths.scm (ruby-asciimath)[arguments]: Return #t from all phases. * gnu/packages/rails.scm (ruby-debug-inspector)[arguments]: Substitute INVOKE for SYSTEM*. * gnu/packages/ruby.scm (ruby-permutation, ruby-blankslate) (ruby-minitest-pretty-diff, ruby-guard, ruby-rb-inotify, ruby-tins) (ruby-gem-hadar, ruby-term-ansicolor, ruby-json-pure) (ruby-activesupport, ruby-redcloth, ruby-netrc, ruby-unf-ext, ruby-yard) (ruby-turn, ruby-sqlite3, ruby-shoulda-context, ruby-shoulda-matchers) (ruby-shoulda, ruby-httpclient, ruby-ansi, ruby-bio-commandeer) (ruby-rubytest, ruby-brass, ruby-qed, ruby-ae, ruby-lemon, ruby-hashery) (ruby-rc4, ruby-concurrent)[arguments]: Likewise. --- gnu/packages/maths.scm | 3 ++- gnu/packages/rails.scm | 14 +++++----- gnu/packages/ruby.scm | 73 +++++++++++++++++++++++++------------------------- 3 files changed, 44 insertions(+), 46 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 704ae9781b..736bac163e 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2084,7 +2084,8 @@ porting.") (lambda _ (substitute* "spec/parser_spec.rb" (("\\\\\"") - "\""))))))) + "\"")) + #t))))) (native-inputs `(("bundler" ,bundler) ("ruby-rspec" ,ruby-rspec))) diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index 7f171eaa6e..5348d914cf 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Matthew Jordan +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -80,14 +81,11 @@ migration.") (modify-phases %standard-phases (replace 'check (lambda _ - (and - (zero? (system* "rake" "compile")) - (zero? - (system* - "ruby" "-Ilib" "-e" - (string-append - "require 'debug_inspector'; RubyVM::DebugInspector." - "open{|dc| p dc.backtrace_locations}"))))))))) + (invoke "rake" "compile") + (invoke "ruby" "-Ilib" "-e" + (string-append + "require 'debug_inspector'; RubyVM::DebugInspector." + "open{|dc| p dc.backtrace_locations}"))))))) (synopsis "Ruby wrapper for the MRI 2.0 debug_inspector API") (description "This package provides a Ruby wrapper for the MRI 2.0 debug_inspector diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 99ad125e3c..3673bf2346 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1114,7 +1114,7 @@ and inspect the environment.") #t)) (replace 'check (lambda _ - (zero? (system* "ruby" "-Ilib" "test/test.rb"))))))) + (invoke "ruby" "-Ilib" "test/test.rb")))))) (synopsis "Library to perform operations with sequence permutations") (description "This package provides a Ruby library to perform different operations with permutations of sequences, such as strings and arrays.") @@ -1618,7 +1618,7 @@ objects.") `(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ (zero? (system* "rspec" "spec/"))))))) + (lambda _ (invoke "rspec" "spec/")))))) (native-inputs `(("bundler" ,bundler) ("ruby-rspec" ,ruby-rspec))) @@ -2028,7 +2028,7 @@ is to be run.") (modify-phases %standard-phases (replace 'check (lambda _ - (zero? (system* "script/test"))))))) + (invoke "script/test")))))) (native-inputs `(("bundler" ,bundler) ("ruby-turn" ,ruby-turn))) @@ -2603,7 +2603,7 @@ invocation, and source and documentation browsing.") #t)) (replace 'build (lambda _ - (zero? (system* "gem" "build" "guard.gemspec"))))))) + (invoke "gem" "build" "guard.gemspec")))))) (propagated-inputs `(("ruby-formatador" ,ruby-formatador) ("ruby-listen" ,ruby-listen) @@ -2718,7 +2718,7 @@ IANA Time Zone database packaged as Ruby modules for use with @code{TZInfo}.") ;; list of files. (replace 'build (lambda _ - (zero? (system* "gem" "build" "rb-inotify.gemspec"))))))) + (invoke "gem" "build" "rb-inotify.gemspec")))))) (propagated-inputs `(("ruby-ffi" ,ruby-ffi))) (native-inputs @@ -2811,7 +2811,7 @@ documentation for Ruby code.") ;; causes an error. (substitute* "tins.gemspec" (("\"lib/spruz\", ") "")) - (zero? (system* "gem" "build" "tins.gemspec"))))))) + (invoke "gem" "build" "tins.gemspec")))))) (synopsis "Assorted tools for Ruby") (description "Tins is a Ruby library providing assorted tools.") (home-page "https://github.com/flori/tins") @@ -2836,7 +2836,7 @@ documentation for Ruby code.") (modify-phases %standard-phases (replace 'build (lambda _ - (zero? (system* "gem" "build" "gem_hadar.gemspec"))))))) + (invoke "gem" "build" "gem_hadar.gemspec")))))) (propagated-inputs `(("git" ,git) ("ruby-tins" ,ruby-tins) @@ -2913,7 +2913,7 @@ Ruby's large and slower test/unit.") (modify-phases %standard-phases (replace 'build (lambda _ - (zero? (system* "gem" "build" "term-ansicolor.gemspec"))))))) + (invoke "gem" "build" "term-ansicolor.gemspec")))))) (propagated-inputs `(("ruby-tins" ,ruby-tins))) (native-inputs @@ -3021,7 +3021,7 @@ a native C extension.") (lambda _ ;; Regenerate gemspec so loosened dependency constraints are ;; propagated. - (zero? (system* "rake" "gemspec"))))))) + (invoke "rake" "gemspec")))))) (native-inputs `(("bundler" ,bundler) ("ragel" ,ragel) @@ -3105,8 +3105,8 @@ you about the changes.") (modify-phases %standard-phases (replace 'check (lambda _ - ;; There is no tests, instead attempt to load the library. - (zero? (system* "ruby" "-Ilib" "-r" "active_support"))))))) + ;; There are no tests, instead attempt to load the library. + (invoke "ruby" "-Ilib" "-r" "active_support")))))) (propagated-inputs `(("ruby-concurrent" ,ruby-concurrent) ("ruby-i18n" ,ruby-i18n) @@ -3316,7 +3316,7 @@ alternative to Marshal for Object serialization. ") ;; existing gemspec. (replace 'build (lambda _ - (zero? (system* "gem" "build" "redcloth.gemspec"))))))) + (invoke "gem" "build" "redcloth.gemspec")))))) (native-inputs `(("bundler" ,bundler) ("ruby-diff-lcs" ,ruby-diff-lcs) @@ -3394,9 +3394,9 @@ other things and it comes with a command line interface.") ;; There is no Rakefile and minitest can only run one file at once, ;; so we have to iterate over all test files. (lambda _ - (and (map (lambda (file) - (zero? (system* "ruby" "-Itest" file))) - (find-files "./test" "test_.*\\.rb")))))))) + (map (lambda (file) + (invoke "ruby" "-Itest" file)) + (find-files "./test" "test_.*\\.rb"))))))) (native-inputs `(("ruby-minitest" ,ruby-minitest))) (synopsis "Library to read and update netrc files") @@ -3421,7 +3421,7 @@ including comments and whitespace.") `(#:phases (modify-phases %standard-phases (add-after 'build 'build-ext - (lambda _ (zero? (system* "rake" "compile:unf_ext"))))))) + (lambda _ (invoke "rake" "compile:unf_ext")))))) (native-inputs `(("bundler" ,bundler) ("ruby-rake-compiler" ,ruby-rake-compiler) @@ -3797,7 +3797,7 @@ A modified copy of yajl is used, and included in the package.") ;; $HOME needs to be set to somewhere writeable for tests to run (setenv "HOME" "/tmp") ;; Run tests without using 'rake' to avoid dependencies. - (zero? (system* "rspec"))))))) + (invoke "rspec")))))) (native-inputs `(("ruby-rspec" ,ruby-rspec) ("ruby-rack" ,ruby-rack))) @@ -3984,7 +3984,7 @@ name and provides query methods such as @{RubyEngine.mri?}.") ;; without issue. (replace 'check (lambda _ - (zero? (system* "ruby" "-Ilib" "bin/turn" "-h"))))))) + (invoke "ruby" "-Ilib" "bin/turn" "-h")))))) (propagated-inputs `(("ruby-ansi" ,ruby-ansi) ("ruby-minitest" ,ruby-minitest-4))) @@ -4124,7 +4124,7 @@ neither too verbose nor too minimal.") #t)) (add-before 'check 'add-gemtest-file ;; This file exists in the repository but is not distributed. - (lambda _ (zero? (system* "touch" ".gemtest"))))))) + (lambda _ (invoke "touch" ".gemtest")))))) (inputs `(("sqlite" ,sqlite))) (native-inputs @@ -4158,7 +4158,7 @@ engine.") (lambda _ ;; Do not run tests to avoid circular dependence with rails. ;; Instead just import the library to test. - (zero? (system* "ruby" "-Ilib" "-r" "shoulda-context"))))))) + (invoke "ruby" "-Ilib" "-r" "shoulda-context")))))) (synopsis "Test::Unit context framework extracted from Shoulda") (description "@code{shoulda-context} is the context framework extracted from Shoulda. @@ -4187,7 +4187,7 @@ names.") (lambda _ ;; Do not run tests to avoid circular dependence with rails. Instead ;; just import the library to test. - (zero? (system* "ruby" "-Ilib" "-r" "shoulda-matchers"))))))) + (invoke "ruby" "-Ilib" "-r" "shoulda-matchers")))))) (propagated-inputs `(("ruby-activesupport" ,ruby-activesupport))) (synopsis "Collection of testing matchers extracted from Shoulda") @@ -4227,7 +4227,7 @@ more complex, and error-prone.") (replace 'check ;; Don't run tests to avoid circular dependence with rails. Instead ;; just import the library to test. - (lambda _ (zero? (system* "ruby" "-Ilib" "-r" "shoulda"))))))) + (lambda _ (invoke "ruby" "-Ilib" "-r" "shoulda")))))) (propagated-inputs `(("ruby-shoulda-context" ,ruby-shoulda-context) ("ruby-shoulda-matchers" ,ruby-shoulda-matchers-2))) @@ -4380,10 +4380,9 @@ It has built-in support for the legacy @code{cookies.txt} and (replace 'check (lambda* (#:key tests? #:allow-other-keys) (if tests? - (zero? - (system* "ruby" - "-Ilib" - "test/runner.rb")) + (invoke "ruby" + "-Ilib" + "test/runner.rb") #t)))))) (native-inputs `(("ruby-rack" ,ruby-rack))) @@ -4422,7 +4421,7 @@ requests either using arguments or with an interactive prompt.") ;; be require'd. (replace 'check (lambda _ - (zero? (system* "ruby" "-Ilib" "-r" "ansi")))) + (invoke "ruby" "-Ilib" "-r" "ansi"))) (add-before 'validate-runpath 'replace-broken-symlink (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -4493,7 +4492,7 @@ subprocess.") ;; Run test without calling 'rake' so that jeweler is ;; not required as an input. (lambda _ - (zero? (system* "rspec" "spec/bio-commandeer_spec.rb"))))))) + (invoke "rspec" "spec/bio-commandeer_spec.rb")))))) (propagated-inputs `(("ruby-bio-logger" ,ruby-bio-logger) ("ruby-systemu" ,ruby-systemu))) @@ -4530,7 +4529,7 @@ detail to ease debugging.") (modify-phases %standard-phases (replace 'check (lambda _ - (zero? (system* "ruby" "-Ilib" "-r" "rubytest"))))))) + (invoke "ruby" "-Ilib" "-r" "rubytest")))))) (propagated-inputs `(("ruby-ansi" ,ruby-ansi))) (synopsis "Universal test harness for Ruby") @@ -4560,7 +4559,7 @@ single pass.") (modify-phases %standard-phases (replace 'check (lambda _ - (zero? (system* "ruby" "-Ilib" "-r" "brass"))))))) + (invoke "ruby" "-Ilib" "-r" "brass")))))) (synopsis "Basic foundational assertions framework") (description "BRASS (Bare-Metal Ruby Assertion System Standard) is a basic @@ -4588,7 +4587,7 @@ make use of.") (modify-phases %standard-phases (replace 'check (lambda _ - (zero? (system* "ruby" "-Ilib" "bin/qed" "--copyright"))))))) + (invoke "ruby" "-Ilib" "bin/qed" "--copyright")))))) (propagated-inputs `(("ruby-ansi" ,ruby-ansi) ("ruby-brass" ,ruby-brass))) @@ -4622,7 +4621,7 @@ requirement specifications systems like Cucumber.") `(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ (zero? (system* "qed")))) + (lambda _ (invoke "qed"))) (add-before 'validate-runpath 'replace-broken-symlink (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -4660,7 +4659,7 @@ for reuse by other test frameworks.") (arguments `(#:phases (modify-phases %standard-phases - (replace 'check (lambda _ (zero? (system* "qed"))))))) + (replace 'check (lambda _ (invoke "qed")))))) (propagated-inputs `(("ruby-ae" ,ruby-ae) ("ruby-ansi" ,ruby-ansi) @@ -4716,8 +4715,8 @@ Rubytest-based test frameworks. It provides the @code{rubytest} executable.") (modify-phases %standard-phases (replace 'check (lambda _ - (and (zero? (system* "qed")) - (zero? (system* "rubytest" "-Ilib" "-Itest" "test/")))))))) + (invoke "qed") + (invoke "rubytest" "-Ilib" "-Itest" "test/")))))) (native-inputs `(("ruby-rubytest-cli" ,ruby-rubytest-cli) ("ruby-qed" ,ruby-qed) @@ -4751,7 +4750,7 @@ specific use case.") (modify-phases %standard-phases (replace 'check (lambda _ - (zero? (system* "rspec" "spec/rc4_spec.rb"))))))) + (invoke "rspec" "spec/rc4_spec.rb")))))) (native-inputs `(("ruby-rspec" ,ruby-rspec-2))) (synopsis "Implementation of the RC4 algorithm") @@ -5005,7 +5004,7 @@ call.") (add-before 'check 'rake-compile ;; Fix the test error described at ;; https://github.com/ruby-concurrency/concurrent-ruby/pull/408 - (lambda _ (zero? (system* "rake" "compile")))) + (lambda _ (invoke "rake" "compile"))) (add-before 'check 'remove-timecop-dependency ;; Remove timecop-dependent tests as having timecop as a depedency ;; causes circular depedencies. -- cgit v1.2.3 From 2385ecb22450f7d6671013808df1398945b80264 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 20 Sep 2018 04:13:51 +0200 Subject: Use INVOKE in (gnu packages shells). * gnu/packages/shells.scm (mksh)[arguments]: Use INVOKE... (scsh)[arguments]: ...and also return #t from all phases. --- gnu/packages/shells.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 245496aaaf..8362d00f60 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -417,7 +417,7 @@ use of experts and novices alike.") #t)) (add-after 'unpack 'autoreconf (lambda _ - (zero? (system* "autoreconf"))))))) + (invoke "autoreconf")))))) (inputs `(("scheme48" ,scheme48) ("scheme48-rx" ,scheme48-rx))) @@ -623,7 +623,7 @@ interactive POSIX shell targeted at resource-constrained systems.") (replace 'build (lambda _ (setenv "CC" "gcc") - (zero? (system* (which "sh") "Build.sh")))) + (invoke (which "sh") "Build.sh"))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -632,7 +632,8 @@ interactive POSIX shell targeted at resource-constrained systems.") (install-file "mksh" bin) (with-directory-excursion bin (symlink "mksh" "ksh")) - (install-file "mksh.1" man))))))) + (install-file "mksh.1" man) + #t)))))) (home-page "https://www.mirbsd.org/mksh.htm") (synopsis "Korn Shell from MirBSD") (description "mksh is an actively developed free implementation of the -- cgit v1.2.3 From e61c2991e4d4dce4f3134c343fde5a2980622271 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 20 Sep 2018 04:04:01 +0200 Subject: Use INVOKE in (gnu packages xdisorg). * gnu/packages/xdisorg.scm (scrot, unclutter, xautolock, nxbelld) [arguments]: Use INVOKE. --- gnu/packages/xdisorg.scm | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 7c326eb8d0..c31680b246 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -476,9 +476,8 @@ move windows, switch between desktops, etc.).") (let* ((out (assoc-ref outputs "out")) (doc (string-append out "/share/doc/scrot"))) (mkdir-p doc) - (zero? - (system* "make" "install" - (string-append "docsdir=" doc))))))))) + (invoke "make" "install" + (string-append "docsdir=" doc)))))))) (inputs `(("libx11" ,libx11) ("giblib" ,giblib))) @@ -585,10 +584,9 @@ include cursor in the resulting image.") (man1 (string-append out "/share/man/man1"))) (mkdir-p bin) (mkdir-p man1) - (zero? - (system* "make" "install" "install.man" - (string-append "BINDIR=" bin) - (string-append "MANDIR=" man1))))))))) + (invoke "make" "install" "install.man" + (string-append "BINDIR=" bin) + (string-append "MANDIR=" man1)))))))) (inputs `(("libx11" ,libx11))) (home-page "http://ftp.x.org/contrib/utilities/") (synopsis "Hide idle mouse cursor") @@ -1344,7 +1342,7 @@ invert colors on a specific display/screen.") #:phases (modify-phases %standard-phases (add-before 'configure 'autoreconf (lambda _ - (zero? (system* "autoreconf" "-vfi"))))))) + (invoke "autoreconf" "-vfi")))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) ("pkg-config" ,pkg-config) @@ -1403,7 +1401,7 @@ or playing a PCM encoded WAVE file.") #t))) (add-after 'install 'install/man (lambda _ - (zero? (system* "make" "install.man"))))))) + (invoke "make" "install.man")))))) (home-page "http://ibiblio.org/pub/Linux/X11/screensavers/") (synopsis "Program launcher for idle X sessions") (description "Xautolock monitors input devices under the X Window -- cgit v1.2.3 From 4eb161962f9d3a4065d2dfe75bb4c19ac6f6c035 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 20 Sep 2018 04:34:07 +0200 Subject: gnu: opusfile: Update to 0.11. * gnu/packages/xiph.scm (opusfile): Update to 0.11. --- gnu/packages/xiph.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index a9f4a2ab87..7ecfa580ec 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -387,7 +387,7 @@ decoding .opus files.") (define opusfile (package (name "opusfile") - (version "0.10") + (version "0.11") (source (origin (method url-fetch) (uri (string-append @@ -395,7 +395,7 @@ decoding .opus files.") ".tar.gz")) (sha256 (base32 - "0bs1376sd131qdh7198jp64vv5d17az5wyy4y7srrvw7p8k3bq28")))) + "1gq3aszzl5glgbajw5p1f5a1kdyf23w5vjdmwwrk246syin9pkkl")))) (build-system gnu-build-system) (propagated-inputs `(("opus" ,opus))) -- cgit v1.2.3 From 84c7fbfd6d1c24c14ae9a719b5aa2a41853cf4a5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 20 Sep 2018 04:40:41 +0200 Subject: gnu: ccid: Update to 1.4.30. * gnu/packages/security-token.scm (ccid): Update to 1.4.30. --- gnu/packages/security-token.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 2ebf09cfe2..4495069c0d 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -56,7 +56,7 @@ (define-public ccid (package (name "ccid") - (version "1.4.29") + (version "1.4.30") (source (origin (method url-fetch) (uri (string-append @@ -64,7 +64,7 @@ name "-" version ".tar.bz2")) (sha256 (base32 - "0kdqmbma6sclsrbxy9w85h7cs0v11if4nc2r9v09613k8pl2lhx5")))) + "0z7zafdg75fr1adlv2x0zz34s07gljcjg2lsz76s1048w1xhh5xc")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list (string-append "--enable-usbdropdir=" %output @@ -77,7 +77,7 @@ (("/bin/echo") (which "echo"))) #t))))) (native-inputs - `(("pcsc-lite" ,pcsc-lite) ; only required for headers + `(("pcsc-lite" ,pcsc-lite) ; only required for headers ("perl" ,perl) ("pkg-config" ,pkg-config))) (inputs -- cgit v1.2.3 From 3e63a83c0fa5621a272f0a43dc2dfcb46081804e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 20 Sep 2018 04:48:41 +0200 Subject: gnu: u-boot: Use HTTPS home page. * gnu/packages/bootloaders.scm (u-boot)[home-page]: Use HTTPS. --- gnu/packages/bootloaders.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 0ba31d867d..4ba9d2e043 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -381,7 +381,7 @@ tree binary files. These are board description files used by Linux and BSD.") ("sdl" ,sdl) ("swig" ,swig))) (build-system gnu-build-system) - (home-page "http://www.denx.de/wiki/U-Boot/") + (home-page "https://www.denx.de/wiki/U-Boot/") (synopsis "ARM bootloader") (description "U-Boot is a bootloader used mostly for ARM boards. It also initializes the boards (RAM etc).") -- cgit v1.2.3 From 9926b8f8096a0198cc34585bf7424eba0c98aee2 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Fri, 17 Aug 2018 16:39:07 +0530 Subject: gnu: services: Add iptables service. * gnu/services/networking.scm (): New record type. (iptables-service-type): New variable. * gnu/tests/networking.scm (run-iptables-test): New procedure. (%test-iptables): New variable. * doc/guix.texi (Networking Services): Document it. --- gnu/services/networking.scm | 56 ++++++++++++++++++- gnu/tests/networking.scm | 129 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 183 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index b6b5ee3fec..bd1d5a2706 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Chris Marusich +;;; Copyright © 2018 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -103,7 +104,14 @@ wpa-supplicant-service-type openvswitch-service-type - openvswitch-configuration)) + openvswitch-configuration + + iptables-configuration + iptables-configuration? + iptables-configuration-iptables + iptables-configuration-ipv4-rules + iptables-configuration-ipv6-rules + iptables-service-type)) ;;; Commentary: ;;; @@ -1108,4 +1116,50 @@ networking.")))) switch designed to enable massive network automation through programmatic extension."))) +;;; +;;; iptables +;;; + +(define %iptables-accept-all-rules + (plain-file "iptables-accept-all.rules" + "*filter +:INPUT ACCEPT +:FORWARD ACCEPT +:OUTPUT ACCEPT +COMMIT +")) + +(define-record-type* + iptables-configuration make-iptables-configuration iptables-configuration? + (iptables iptables-configuration-iptables + (default iptables)) + (ipv4-rules iptables-configuration-ipv4-rules + (default %iptables-accept-all-rules)) + (ipv6-rules iptables-configuration-ipv6-rules + (default %iptables-accept-all-rules))) + +(define iptables-shepherd-service + (match-lambda + (($ iptables ipv4-rules ipv6-rules) + (let ((iptables-restore (file-append iptables "/sbin/iptables-restore")) + (ip6tables-restore (file-append iptables "/sbin/ip6tables-restore"))) + (shepherd-service + (documentation "Packet filtering framework") + (provision '(iptables)) + (start #~(lambda _ + (invoke #$iptables-restore #$ipv4-rules) + (invoke #$ip6tables-restore #$ipv6-rules))) + (stop #~(lambda _ + (invoke #$iptables-restore #$%iptables-accept-all-rules) + (invoke #$ip6tables-restore #$%iptables-accept-all-rules)))))))) + +(define iptables-service-type + (service-type + (name 'iptables) + (description + "Run @command{iptables-restore}, setting up the specified rules.") + (extensions + (list (service-extension shepherd-root-service-type + (compose list iptables-shepherd-service)))))) + ;;; networking.scm ends here diff --git a/gnu/tests/networking.scm b/gnu/tests/networking.scm index 381c5caf14..ceba7f7d5d 100644 --- a/gnu/tests/networking.scm +++ b/gnu/tests/networking.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2018 Chris Marusich +;;; Copyright © 2018 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,9 +30,11 @@ #:use-module (guix store) #:use-module (guix monads) #:use-module (gnu packages bash) + #:use-module (gnu packages linux) #:use-module (gnu packages networking) #:use-module (gnu services shepherd) - #:export (%test-inetd %test-openvswitch %test-dhcpd %test-tor)) + #:use-module (ice-9 match) + #:export (%test-inetd %test-openvswitch %test-dhcpd %test-tor %test-iptables)) (define %inetd-os ;; Operating system with 2 inetd services. @@ -434,3 +437,127 @@ subnet 192.168.1.0 netmask 255.255.255.0 { (name "tor") (description "Test a running Tor daemon configuration.") (value (run-tor-test)))) + +(define* (run-iptables-test) + "Run tests of 'iptables-service-type'." + (define iptables-rules + "*filter +:INPUT ACCEPT +:FORWARD ACCEPT +:OUTPUT ACCEPT +-A INPUT -p tcp -m tcp --dport 7 -j REJECT --reject-with icmp-port-unreachable +COMMIT +") + + (define ip6tables-rules + "*filter +:INPUT ACCEPT +:FORWARD ACCEPT +:OUTPUT ACCEPT +-A INPUT -p tcp -m tcp --dport 7 -j REJECT --reject-with icmp6-port-unreachable +COMMIT +") + + (define inetd-echo-port 7) + + (define os + (marionette-operating-system + (simple-operating-system + (dhcp-client-service) + (service inetd-service-type + (inetd-configuration + (entries (list + (inetd-entry + (name "echo") + (socket-type 'stream) + (protocol "tcp") + (wait? #f) + (user "root")))))) + (service iptables-service-type + (iptables-configuration + (ipv4-rules (plain-file "iptables.rules" iptables-rules)) + (ipv6-rules (plain-file "ip6tables.rules" ip6tables-rules))))) + #:imported-modules '((gnu services herd)) + #:requirements '(inetd iptables))) + + (define test + (with-imported-modules '((gnu build marionette)) + #~(begin + (use-modules (srfi srfi-64) + (gnu build marionette)) + (define marionette + (make-marionette (list #$(virtual-machine os)))) + + (define (dump-iptables iptables-save marionette) + (marionette-eval + `(begin + (use-modules (ice-9 popen) + (ice-9 rdelim) + (ice-9 regex)) + (call-with-output-string + (lambda (out) + (call-with-port + (open-pipe* OPEN_READ ,iptables-save) + (lambda (in) + (let loop ((line (read-line in))) + ;; iptables-save does not output rules in the exact + ;; same format we loaded using iptables-restore. It + ;; adds comments, packet counters, etc. We remove + ;; these additions. + (unless (eof-object? line) + (cond + ;; Remove comments + ((string-match "^#" line) #t) + ;; Remove packet counters + ((string-match "^:([A-Z]*) ([A-Z]*) .*" line) + => (lambda (match-record) + (format out ":~a ~a~%" + (match:substring match-record 1) + (match:substring match-record 2)))) + ;; Pass other lines without modification + (else (display line out) + (newline out))) + (loop (read-line in))))))))) + marionette)) + + (mkdir #$output) + (chdir #$output) + + (test-begin "iptables") + + (test-equal "iptables-save dumps the same rules that were loaded" + (dump-iptables #$(file-append iptables "/sbin/iptables-save") + marionette) + #$iptables-rules) + + (test-equal "ip6tables-save dumps the same rules that were loaded" + (dump-iptables #$(file-append iptables "/sbin/ip6tables-save") + marionette) + #$ip6tables-rules) + + (test-error "iptables firewall blocks access to inetd echo service" + 'misc-error + (wait-for-tcp-port inetd-echo-port marionette #:timeout 5)) + + ;; TODO: This test freezes up at the login prompt without any + ;; relevant messages on the console. Perhaps it is waiting for some + ;; timeout. Find and fix this issue. + ;; (test-assert "inetd echo service is accessible after iptables firewall is stopped" + ;; (begin + ;; (marionette-eval + ;; '(begin + ;; (use-modules (gnu services herd)) + ;; (stop-service 'iptables)) + ;; marionette) + ;; (wait-for-tcp-port inetd-echo-port marionette #:timeout 5))) + + (test-end) + (exit (= (test-runner-fail-count (test-runner-current)) 0))))) + + (gexp->derivation "iptables" test)) + +(define %test-iptables + (system-test + (name "iptables") + (description "Test a running iptables daemon.") + (value (run-iptables-test)))) -- cgit v1.2.3 From 166b2c970e7ae1533002f6e853d71678908f9b84 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 13 Sep 2018 01:49:16 +0200 Subject: gnu: eolie: Update home page. * gnu/packages/gnome.scm (eolie)[home-page]: Set to wiki.gnome.org/Apps/Eolie. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6a34e81f13..99f4c1271a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4150,7 +4150,7 @@ work and the interface is well tested.") ("gtkspell3" ,gtkspell3) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("webkitgtk" ,webkitgtk))) - (home-page "https://github.com/gnumdk/eolie/") + (home-page "https://wiki.gnome.org/Apps/Eolie") (synopsis "Web browser for GNOME") (description "Eolie is a new web browser for GNOME. It features Firefox sync support, -- cgit v1.2.3 From 3e12df7d71547b4eca718b6b0e1fc244722dcc39 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 17 Sep 2018 14:35:45 +0200 Subject: gnu: Add emacs-dired-sidebar. * gnu/packages/emacs.scm (emacs-dired-sidebar): New public variable. --- gnu/packages/emacs.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index a799aa9899..9b3a90bd33 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -7182,6 +7182,28 @@ the actual transformations.") @end itemize\n") (license license:gpl3+)))) +(define-public emacs-dired-sidebar + (let ((commit "06bd0d40bab812c61a668129daf29ba359424454") + (revision "0")) + (package + (name "emacs-dired-sidebar") + (home-page "https://github.com/jojojames/dired-sidebar") + (version (git-version "0.0.1" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) (commit commit))) + (sha256 + (base32 + "0lvwvq6sl80sha9fq5m4568sg534dhmifyjqw75bqddcbf3by84x")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-dired-subtree" ,emacs-dired-hacks))) + (synopsis "Sidebar for Emacs using Dired") + (description + "This package provides a sidebar for Emacs similar to @code{NeoTree} +or @code{treemacs}, but leveraging @code{Dired} to do the job of display.") + (license license:gpl3+)))) + (define-public emacs-which-key (package (name "emacs-which-key") -- cgit v1.2.3 From 985d542e028517b2888fa61831233a2b60dc7d48 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 20 Sep 2018 14:00:02 +0200 Subject: 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(-) (limited to 'gnu') 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. -- cgit v1.2.3 From 26358ac5ab612e3ba5cc965994853f4a6616220c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 20 Sep 2018 13:13:25 +0200 Subject: gnu: Add r-parmigene. * gnu/packages/cran.scm (r-parmigene): New variable. --- gnu/packages/cran.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 5519b85d0b..58e9ad09c7 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5875,3 +5875,23 @@ score in order to detect blood doping. The package also contains functions to calculate other scores used in anti-doping programs, such as the ratio of hemoglobin to reticulocytes (OFF-score), as well as example data.") (license license:gpl2+))) + +(define-public r-parmigene + (package + (name "r-parmigene") + (version "1.0.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "parmigene" version)) + (sha256 + (base32 + "1fsm6pkr17jcbzkj1hbn91jf890fviqk1lq6ls8pihsdgah1zb4d")))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/web/packages/parmigene/") + (synopsis "Mutual information estimation for gene network reconstruction") + (description + "This package provides a parallel estimation of the mutual information +based on entropy estimates from k-nearest neighbors distances and algorithms +for the reconstruction of gene regulatory networks.") + (license license:agpl3+))) -- cgit v1.2.3 From 391fc11f0e492b06fa6eb31535e1e34165040b7d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 20 Sep 2018 15:53:20 +0200 Subject: gnu: python2-scikit-learn: Fix check phase. * gnu/packages/machine-learning.scm (python2-scikit-learn)[arguments]: Override check phase to disable broken tests and pass environment variables. --- gnu/packages/machine-learning.scm | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 9aa61bd8f8..990a6c771a 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -750,7 +750,24 @@ data analysis.") (license license:bsd-3))) (define-public python2-scikit-learn - (package-with-python2 python-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))))))))) (define-public python-autograd (let* ((commit "442205dfefe407beffb33550846434baa90c4de7") -- cgit v1.2.3 From e30397dddb0c8ba130b9c77b3305f6da6508e766 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 20 Sep 2018 16:02:38 +0200 Subject: gnu: ghc-xml-conduit: Update to 1.8.0.1. * gnu/packages/haskell.scm (ghc-xml-conduit): Update to 1.8.0.1. [inputs]: Add ghc-doctest. --- gnu/packages/haskell.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index eb629cf138..0c6c30acd2 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -6729,7 +6729,7 @@ documents.") (define-public ghc-xml-conduit (package (name "ghc-xml-conduit") - (version "1.7.1.2") + (version "1.8.0.1") (source (origin (method url-fetch) @@ -6737,11 +6737,12 @@ documents.") "xml-conduit-" version ".tar.gz")) (sha256 (base32 - "0n4k0rq9j5cc9kdvj9xbx8gmiqlyk5x6pw8yxzw5wfsw7qkych2s")))) + "177gmyigxql1pn3ncz0r8annwv5cbxnihbgrrg1dhm4gmc9jy2wq")))) (build-system haskell-build-system) (inputs `(("ghc-conduit" ,ghc-conduit) ("ghc-conduit-extra" ,ghc-conduit-extra) + ("ghc-doctest" ,ghc-doctest) ("ghc-resourcet" ,ghc-resourcet) ("ghc-text" ,ghc-text) ("ghc-xml-types" ,ghc-xml-types) -- cgit v1.2.3 From a235ea4f30785e42cedf9a52d22c1e6650901fdd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 20 Sep 2018 16:03:06 +0200 Subject: gnu: ghc-pandoc-citeproc: Update to 0.14.3.1. * gnu/packages/haskell.scm (ghc-pandoc-citeproc): Update to 0.14.3.1. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 0c6c30acd2..6b774c358a 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -6763,7 +6763,7 @@ the @code{conduit} package.") (define-public ghc-pandoc-citeproc (package (name "ghc-pandoc-citeproc") - (version "0.12.2.5") + (version "0.14.3.1") (source (origin (method url-fetch) @@ -6772,7 +6772,7 @@ the @code{conduit} package.") version ".tar.gz")) (sha256 (base32 - "1l58nbflcnlznc93qimkk7ghk2gv8kipf45zf88piqa2zys41yyx")))) + "0yj6rckwsc9vig40cm15ry0j3d01xpk04qma9n4byhal6v4b5h22")))) (build-system haskell-build-system) (arguments `(#:phases -- cgit v1.2.3 From 89ee8a6edf7ceae66ff86e88778e07e80aa119fd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 20 Sep 2018 17:46:34 +0200 Subject: gnu: rsem: Update to 1.3.1. * gnu/packages/bioinformatics.scm (rsem): Update to 1.3.1. [source]: Fetch from git; remove patch; delete bundled samtools. [arguments]: Pass make flags; adjust phases. [inputs]: Remove ncurses and samtools-0.1; add htslib-1.3. * gnu/packages/patches/rsem-makefile.patch: Remove patch. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/bioinformatics.scm | 91 +++-- gnu/packages/patches/rsem-makefile.patch | 682 ------------------------------- 3 files changed, 52 insertions(+), 722 deletions(-) delete mode 100644 gnu/packages/patches/rsem-makefile.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 0ead43acd9..4bca986619 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1115,7 +1115,6 @@ dist_patch_DATA = \ %D%/packages/patches/reptyr-fix-gcc-7.patch \ %D%/packages/patches/ripperx-missing-file.patch \ %D%/packages/patches/rpcbind-CVE-2017-8779.patch \ - %D%/packages/patches/rsem-makefile.patch \ %D%/packages/patches/rtags-separate-rct.patch \ %D%/packages/patches/racket-store-checksum-override.patch \ %D%/packages/patches/ruby-rubygems-276-for-ruby24.patch \ diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 67f24a6170..10330cd8b2 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4800,66 +4800,79 @@ phylogenies.") (define-public rsem (package (name "rsem") - (version "1.2.20") + (version "1.3.1") (source (origin - (method url-fetch) - (uri - (string-append "http://deweylab.biostat.wisc.edu/rsem/src/rsem-" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/deweylab/RSEM.git") + (commit (string-append "v" version)))) (sha256 - (base32 "0nzdc0j0hjllhsd5f2xli95dafm3nawskigs140xzvjk67xh0r9q")) - (patches (search-patches "rsem-makefile.patch")) + (base32 "1jlq11d1p8qp64w75yj8cnbbd1a93viq10pzsbwal7vdn8fg13j1")) + (file-name (git-file-name name version)) (modules '((guix build utils))) (snippet '(begin - ;; remove bundled copy of boost + ;; remove bundled copy of boost and samtools (delete-file-recursively "boost") + (delete-file-recursively "samtools-1.3") #t)))) (build-system gnu-build-system) (arguments `(#:tests? #f ;no "check" target + #:make-flags + (list (string-append "BOOST=" + (assoc-ref %build-inputs "boost") + "/include/") + (string-append "SAMHEADERS=" + (assoc-ref %build-inputs "htslib") + "/include/htslib/sam.h") + (string-append "SAMLIBS=" + (assoc-ref %build-inputs "htslib") + "/lib/libhts.a")) #:phases (modify-phases %standard-phases ;; No "configure" script. ;; Do not build bundled samtools library. (replace 'configure - (lambda _ - (substitute* "Makefile" - (("^all : sam/libbam.a") "all : ")) - #t)) + (lambda _ + (substitute* "Makefile" + (("^all : \\$\\(PROGRAMS\\).*") "all: $(PROGRAMS)\n") + (("^\\$\\(SAMLIBS\\).*") "")) + #t)) (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (string-append (assoc-ref outputs "out"))) - (bin (string-append out "/bin/")) - (perl (string-append out "/lib/perl5/site_perl"))) - (mkdir-p bin) - (mkdir-p perl) - (for-each (lambda (file) - (install-file file bin)) - (find-files "." "rsem-.*")) - (install-file "rsem_perl_utils.pm" perl)) - #t)) - (add-after - 'install 'wrap-program - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (for-each (lambda (prog) - (wrap-program (string-append out "/bin/" prog) - `("PERL5LIB" ":" prefix - (,(string-append out "/lib/perl5/site_perl"))))) - '("rsem-plot-transcript-wiggles" - "rsem-calculate-expression" - "rsem-generate-ngvector" - "rsem-run-ebseq" - "rsem-prepare-reference"))) - #t))))) + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (string-append (assoc-ref outputs "out"))) + (bin (string-append out "/bin/")) + (perl (string-append out "/lib/perl5/site_perl"))) + (mkdir-p bin) + (mkdir-p perl) + (for-each (lambda (file) + (install-file file bin)) + (find-files "." "rsem-.*")) + (install-file "rsem_perl_utils.pm" perl)) + #t)) + (add-after 'install 'wrap-program + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (for-each (lambda (prog) + (wrap-program (string-append out "/bin/" prog) + `("PERL5LIB" ":" prefix + (,(string-append out "/lib/perl5/site_perl"))))) + '("rsem-calculate-expression" + "rsem-control-fdr" + "rsem-generate-data-matrix" + "rsem-generate-ngvector" + "rsem-plot-transcript-wiggles" + "rsem-prepare-reference" + "rsem-run-ebseq" + "rsem-run-prsem-testing-procedure"))) + #t))))) (inputs `(("boost" ,boost) - ("ncurses" ,ncurses) ("r-minimal" ,r-minimal) ("perl" ,perl) - ("samtools" ,samtools-0.1) + ("htslib" ,htslib-1.3) ("zlib" ,zlib))) (home-page "http://deweylab.biostat.wisc.edu/rsem/") (synopsis "Estimate gene expression levels from RNA-Seq data") diff --git a/gnu/packages/patches/rsem-makefile.patch b/gnu/packages/patches/rsem-makefile.patch deleted file mode 100644 index 5481dc685f..0000000000 --- a/gnu/packages/patches/rsem-makefile.patch +++ /dev/null @@ -1,682 +0,0 @@ -This patch simplifies the Makefile, making it much easier to build rsem -without the bundled version of samtools. It has already been submitted -upstream: https://github.com/bli25wisc/RSEM/pull/11 - -From 161894e91a16c7e15af57e4fcfe8cb613711c7fa Mon Sep 17 00:00:00 2001 -From: Ricardo Wurmus -Date: Wed, 22 Apr 2015 14:51:07 +0200 -Subject: [PATCH 1/7] remove all headers from Makefile - ---- - Makefile | 95 +++++++++++----------------------------------------------------- - 1 file changed, 16 insertions(+), 79 deletions(-) - -diff --git a/Makefile b/Makefile -index 54e2603..3a55ed8 100644 ---- a/Makefile -+++ b/Makefile -@@ -10,133 +10,70 @@ all : $(PROGRAMS) - sam/libbam.a : - cd sam ; ${MAKE} all - --Transcript.h : utils.h -- --Transcripts.h : utils.h my_assert.h Transcript.h -- --rsem-extract-reference-transcripts : utils.h my_assert.h GTFItem.h Transcript.h Transcripts.h extractRef.cpp -+rsem-extract-reference-transcripts : extractRef.cpp - $(CC) -Wall -O3 extractRef.cpp -o rsem-extract-reference-transcripts - --rsem-synthesis-reference-transcripts : utils.h my_assert.h Transcript.h Transcripts.h synthesisRef.cpp -+rsem-synthesis-reference-transcripts : synthesisRef.cpp - $(CC) -Wall -O3 synthesisRef.cpp -o rsem-synthesis-reference-transcripts - --BowtieRefSeqPolicy.h : RefSeqPolicy.h -- --RefSeq.h : utils.h -- --Refs.h : utils.h RefSeq.h RefSeqPolicy.h PolyARules.h -- -- - rsem-preref : preRef.o - $(CC) preRef.o -o rsem-preref - --preRef.o : utils.h RefSeq.h Refs.h PolyARules.h RefSeqPolicy.h AlignerRefSeqPolicy.h preRef.cpp -+preRef.o : preRef.cpp - $(CC) $(COFLAGS) preRef.cpp - -- --SingleRead.h : Read.h -- --SingleReadQ.h : Read.h -- --PairedEndRead.h : Read.h SingleRead.h -- --PairedEndReadQ.h : Read.h SingleReadQ.h -- -- --PairedEndHit.h : SingleHit.h -- --HitContainer.h : GroupInfo.h -- -- --SamParser.h : sam/sam.h sam/bam.h utils.h my_assert.h SingleRead.h SingleReadQ.h PairedEndRead.h PairedEndReadQ.h SingleHit.h PairedEndHit.h Transcripts.h -- -- - rsem-parse-alignments : parseIt.o sam/libbam.a - $(CC) -o rsem-parse-alignments parseIt.o sam/libbam.a -lz -lpthread - --parseIt.o : utils.h GroupInfo.h Read.h SingleRead.h SingleReadQ.h PairedEndRead.h PairedEndReadQ.h SingleHit.h PairedEndHit.h HitContainer.h SamParser.h Transcripts.h sam/sam.h sam/bam.h parseIt.cpp -+parseIt.o : parseIt.cpp - $(CC) -Wall -O2 -c -I. parseIt.cpp - -- --rsem-build-read-index : utils.h buildReadIndex.cpp -+rsem-build-read-index : buildReadIndex.cpp - $(CC) -O3 buildReadIndex.cpp -o rsem-build-read-index - -- --simul.h : boost/random.hpp -- --ReadReader.h : SingleRead.h SingleReadQ.h PairedEndRead.h PairedEndReadQ.h ReadIndex.h -- --SingleModel.h : utils.h my_assert.h Orientation.h LenDist.h RSPD.h Profile.h NoiseProfile.h ModelParams.h RefSeq.h Refs.h SingleRead.h SingleHit.h ReadReader.h simul.h -- --SingleQModel.h : utils.h my_assert.h Orientation.h LenDist.h RSPD.h QualDist.h QProfile.h NoiseQProfile.h ModelParams.h RefSeq.h Refs.h SingleReadQ.h SingleHit.h ReadReader.h simul.h -- --PairedEndModel.h : utils.h my_assert.h Orientation.h LenDist.h RSPD.h Profile.h NoiseProfile.h ModelParams.h RefSeq.h Refs.h SingleRead.h PairedEndRead.h PairedEndHit.h ReadReader.h simul.h -- --PairedEndQModel.h : utils.h my_assert.h Orientation.h LenDist.h RSPD.h QualDist.h QProfile.h NoiseQProfile.h ModelParams.h RefSeq.h Refs.h SingleReadQ.h PairedEndReadQ.h PairedEndHit.h ReadReader.h simul.h -- --HitWrapper.h : HitContainer.h -- --sam_rsem_aux.h : sam/bam.h -- --sam_rsem_cvt.h : sam/bam.h Transcript.h Transcripts.h -- --BamWriter.h : sam/sam.h sam/bam.h sam_rsem_aux.h sam_rsem_cvt.h SingleHit.h PairedEndHit.h HitWrapper.h Transcript.h Transcripts.h -- --sampling.h : boost/random.hpp -- --WriteResults.h : utils.h my_assert.h GroupInfo.h Transcript.h Transcripts.h RefSeq.h Refs.h Model.h SingleModel.h SingleQModel.h PairedEndModel.h PairedEndQModel.h -- - rsem-run-em : EM.o sam/libbam.a - $(CC) -o rsem-run-em EM.o sam/libbam.a -lz -lpthread - --EM.o : utils.h my_assert.h Read.h SingleRead.h SingleReadQ.h PairedEndRead.h PairedEndReadQ.h SingleHit.h PairedEndHit.h Model.h SingleModel.h SingleQModel.h PairedEndModel.h PairedEndQModel.h Refs.h GroupInfo.h HitContainer.h ReadIndex.h ReadReader.h Orientation.h LenDist.h RSPD.h QualDist.h QProfile.h NoiseQProfile.h ModelParams.h RefSeq.h RefSeqPolicy.h PolyARules.h Profile.h NoiseProfile.h Transcript.h Transcripts.h HitWrapper.h BamWriter.h sam/bam.h sam/sam.h simul.h sam_rsem_aux.h sampling.h boost/random.hpp WriteResults.h EM.cpp -+EM.o : EM.cpp - $(CC) $(COFLAGS) EM.cpp - --bc_aux.h : sam/bam.h -- --BamConverter.h : utils.h my_assert.h sam/sam.h sam/bam.h sam_rsem_aux.h sam_rsem_cvt.h bc_aux.h Transcript.h Transcripts.h -- --rsem-tbam2gbam : utils.h Transcripts.h Transcript.h bc_aux.h BamConverter.h sam/sam.h sam/bam.h sam/libbam.a sam_rsem_aux.h sam_rsem_cvt.h tbam2gbam.cpp sam/libbam.a -+rsem-tbam2gbam : tbam2gbam.cpp sam/libbam.a - $(CC) -O3 -Wall tbam2gbam.cpp sam/libbam.a -lz -lpthread -o $@ - --rsem-bam2wig : utils.h my_assert.h wiggle.h wiggle.o sam/libbam.a bam2wig.cpp -+rsem-bam2wig : wiggle.o sam/libbam.a bam2wig.cpp - $(CC) -O3 -Wall bam2wig.cpp wiggle.o sam/libbam.a -lz -lpthread -o $@ - --rsem-bam2readdepth : utils.h my_assert.h wiggle.h wiggle.o sam/libbam.a bam2readdepth.cpp -+rsem-bam2readdepth : wiggle.o sam/libbam.a bam2readdepth.cpp - $(CC) -O3 -Wall bam2readdepth.cpp wiggle.o sam/libbam.a -lz -lpthread -o $@ - --wiggle.o: sam/bam.h sam/sam.h wiggle.cpp wiggle.h -+wiggle.o: wiggle.cpp - $(CC) $(COFLAGS) wiggle.cpp - - rsem-simulate-reads : simulation.o - $(CC) -o rsem-simulate-reads simulation.o - --simulation.o : utils.h Read.h SingleRead.h SingleReadQ.h PairedEndRead.h PairedEndReadQ.h Model.h SingleModel.h SingleQModel.h PairedEndModel.h PairedEndQModel.h Refs.h RefSeq.h GroupInfo.h Transcript.h Transcripts.h Orientation.h LenDist.h RSPD.h QualDist.h QProfile.h NoiseQProfile.h Profile.h NoiseProfile.h simul.h boost/random.hpp WriteResults.h simulation.cpp -+simulation.o : simulation.cpp - $(CC) $(COFLAGS) simulation.cpp - - rsem-run-gibbs : Gibbs.o - $(CC) -o rsem-run-gibbs Gibbs.o -lpthread - --#some header files are omitted --Gibbs.o : utils.h my_assert.h boost/random.hpp sampling.h Model.h SingleModel.h SingleQModel.h PairedEndModel.h PairedEndQModel.h RefSeq.h RefSeqPolicy.h PolyARules.h Refs.h GroupInfo.h WriteResults.h Gibbs.cpp -+Gibbs.o : Gibbs.cpp - $(CC) $(COFLAGS) Gibbs.cpp - --Buffer.h : my_assert.h -- - rsem-calculate-credibility-intervals : calcCI.o - $(CC) -o rsem-calculate-credibility-intervals calcCI.o -lpthread - --#some header files are omitted --calcCI.o : utils.h my_assert.h boost/random.hpp sampling.h Model.h SingleModel.h SingleQModel.h PairedEndModel.h PairedEndQModel.h RefSeq.h RefSeqPolicy.h PolyARules.h Refs.h GroupInfo.h WriteResults.h Buffer.h calcCI.cpp -+calcCI.o : calcCI.cpp - $(CC) $(COFLAGS) calcCI.cpp - --rsem-get-unique : sam/bam.h sam/sam.h getUnique.cpp sam/libbam.a -+rsem-get-unique : getUnique.cpp sam/libbam.a - $(CC) -O3 -Wall getUnique.cpp sam/libbam.a -lz -lpthread -o $@ - --rsem-sam-validator : sam/bam.h sam/sam.h my_assert.h samValidator.cpp sam/libbam.a -+rsem-sam-validator : samValidator.cpp sam/libbam.a - $(CC) -O3 -Wall samValidator.cpp sam/libbam.a -lz -lpthread -o $@ - --rsem-scan-for-paired-end-reads : sam/bam.h sam/sam.h my_assert.h scanForPairedEndReads.cpp sam/libbam.a -+rsem-scan-for-paired-end-reads : scanForPairedEndReads.cpp sam/libbam.a - $(CC) -O3 -Wall scanForPairedEndReads.cpp sam/libbam.a -lz -lpthread -o $@ - - ebseq : - -From ec136638a727632e20abfaeb65c22c46d15ca8c4 Mon Sep 17 00:00:00 2001 -From: Ricardo Wurmus -Date: Wed, 22 Apr 2015 15:06:41 +0200 -Subject: [PATCH 2/7] include current dir, ./sam and ./boost by default - ---- - Makefile | 48 ++++++++++++++++++++++++------------------------ - 1 file changed, 24 insertions(+), 24 deletions(-) - -diff --git a/Makefile b/Makefile -index 3a55ed8..1dd97ca 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,6 +1,6 @@ - CC = g++ --CFLAGS = -Wall -c -I. --COFLAGS = -Wall -O3 -ffast-math -c -I. -+CFLAGS = -Wall -I. -I./sam -I./boost -+COFLAGS = -O3 -ffast-math -c - PROGRAMS = rsem-extract-reference-transcripts rsem-synthesis-reference-transcripts rsem-preref rsem-parse-alignments rsem-build-read-index rsem-run-em rsem-tbam2gbam rsem-run-gibbs rsem-calculate-credibility-intervals rsem-simulate-reads rsem-bam2wig rsem-get-unique rsem-bam2readdepth rsem-sam-validator rsem-scan-for-paired-end-reads - - .PHONY : all ebseq clean -@@ -11,70 +11,70 @@ sam/libbam.a : - cd sam ; ${MAKE} all - - rsem-extract-reference-transcripts : extractRef.cpp -- $(CC) -Wall -O3 extractRef.cpp -o rsem-extract-reference-transcripts -+ $(CC) $(CFLAGS) -O3 extractRef.cpp -o rsem-extract-reference-transcripts - - rsem-synthesis-reference-transcripts : synthesisRef.cpp -- $(CC) -Wall -O3 synthesisRef.cpp -o rsem-synthesis-reference-transcripts -+ $(CC) $(CFLAGS) -O3 synthesisRef.cpp -o rsem-synthesis-reference-transcripts - - rsem-preref : preRef.o -- $(CC) preRef.o -o rsem-preref -+ $(CC) $(CFLAGS) preRef.o -o rsem-preref - - preRef.o : preRef.cpp -- $(CC) $(COFLAGS) preRef.cpp -+ $(CC) $(CFLAGS) $(COFLAGS) preRef.cpp - - rsem-parse-alignments : parseIt.o sam/libbam.a -- $(CC) -o rsem-parse-alignments parseIt.o sam/libbam.a -lz -lpthread -+ $(CC) $(CFLAGS) -o rsem-parse-alignments parseIt.o sam/libbam.a -lz -lpthread - - parseIt.o : parseIt.cpp -- $(CC) -Wall -O2 -c -I. parseIt.cpp -+ $(CC) $(CFLAGS) -O2 -c parseIt.cpp - - rsem-build-read-index : buildReadIndex.cpp -- $(CC) -O3 buildReadIndex.cpp -o rsem-build-read-index -+ $(CC) $(CFLAGS) -O3 buildReadIndex.cpp -o rsem-build-read-index - - rsem-run-em : EM.o sam/libbam.a -- $(CC) -o rsem-run-em EM.o sam/libbam.a -lz -lpthread -+ $(CC) $(CFLAGS) -o rsem-run-em EM.o sam/libbam.a -lz -lpthread - - EM.o : EM.cpp -- $(CC) $(COFLAGS) EM.cpp -+ $(CC) $(CFLAGS) $(COFLAGS) EM.cpp - - rsem-tbam2gbam : tbam2gbam.cpp sam/libbam.a -- $(CC) -O3 -Wall tbam2gbam.cpp sam/libbam.a -lz -lpthread -o $@ -+ $(CC) $(CFLAGS) -O3 tbam2gbam.cpp sam/libbam.a -lz -lpthread -o $@ - - rsem-bam2wig : wiggle.o sam/libbam.a bam2wig.cpp -- $(CC) -O3 -Wall bam2wig.cpp wiggle.o sam/libbam.a -lz -lpthread -o $@ -+ $(CC) $(CFLAGS) -O3 bam2wig.cpp wiggle.o sam/libbam.a -lz -lpthread -o $@ - - rsem-bam2readdepth : wiggle.o sam/libbam.a bam2readdepth.cpp -- $(CC) -O3 -Wall bam2readdepth.cpp wiggle.o sam/libbam.a -lz -lpthread -o $@ -+ $(CC) $(CFLAGS) -O3 bam2readdepth.cpp wiggle.o sam/libbam.a -lz -lpthread -o $@ - - wiggle.o: wiggle.cpp -- $(CC) $(COFLAGS) wiggle.cpp -+ $(CC) $(CFLAGS) $(COFLAGS) wiggle.cpp - - rsem-simulate-reads : simulation.o -- $(CC) -o rsem-simulate-reads simulation.o -+ $(CC) $(CFLAGS) -o rsem-simulate-reads simulation.o - - simulation.o : simulation.cpp -- $(CC) $(COFLAGS) simulation.cpp -+ $(CC) $(CFLAGS) $(COFLAGS) simulation.cpp - - rsem-run-gibbs : Gibbs.o -- $(CC) -o rsem-run-gibbs Gibbs.o -lpthread -+ $(CC) $(CFLAGS) -o rsem-run-gibbs Gibbs.o -lpthread - - Gibbs.o : Gibbs.cpp -- $(CC) $(COFLAGS) Gibbs.cpp -+ $(CC) $(CFLAGS) $(COFLAGS) Gibbs.cpp - - rsem-calculate-credibility-intervals : calcCI.o -- $(CC) -o rsem-calculate-credibility-intervals calcCI.o -lpthread -+ $(CC) $(CFLAGS) -o rsem-calculate-credibility-intervals calcCI.o -lpthread - - calcCI.o : calcCI.cpp -- $(CC) $(COFLAGS) calcCI.cpp -+ $(CC) $(CFLAGS) $(COFLAGS) calcCI.cpp - - rsem-get-unique : getUnique.cpp sam/libbam.a -- $(CC) -O3 -Wall getUnique.cpp sam/libbam.a -lz -lpthread -o $@ -+ $(CC) $(CFLAGS) -O3 getUnique.cpp sam/libbam.a -lz -lpthread -o $@ - - rsem-sam-validator : samValidator.cpp sam/libbam.a -- $(CC) -O3 -Wall samValidator.cpp sam/libbam.a -lz -lpthread -o $@ -+ $(CC) $(CFLAGS) -O3 samValidator.cpp sam/libbam.a -lz -lpthread -o $@ - - rsem-scan-for-paired-end-reads : scanForPairedEndReads.cpp sam/libbam.a -- $(CC) -O3 -Wall scanForPairedEndReads.cpp sam/libbam.a -lz -lpthread -o $@ -+ $(CC) $(CFLAGS) -O3 scanForPairedEndReads.cpp sam/libbam.a -lz -lpthread -o $@ - - ebseq : - cd EBSeq ; ${MAKE} all - -From d366614ea50f79fdd93e3c76383ccb6fcdeaa8e0 Mon Sep 17 00:00:00 2001 -From: Ricardo Wurmus -Date: Wed, 22 Apr 2015 15:10:49 +0200 -Subject: [PATCH 3/7] separate object rules from rules for executables - ---- - Makefile | 50 ++++++++++++++++++++++++++------------------------ - 1 file changed, 26 insertions(+), 24 deletions(-) - -diff --git a/Makefile b/Makefile -index 1dd97ca..ae4de3b 100644 ---- a/Makefile -+++ b/Makefile -@@ -10,6 +10,32 @@ all : $(PROGRAMS) - sam/libbam.a : - cd sam ; ${MAKE} all - -+ebseq : -+ cd EBSeq ; ${MAKE} all -+ -+ -+calcCI.o : calcCI.cpp -+ $(CC) $(CFLAGS) $(COFLAGS) calcCI.cpp -+ -+EM.o : EM.cpp -+ $(CC) $(CFLAGS) $(COFLAGS) EM.cpp -+ -+Gibbs.o : Gibbs.cpp -+ $(CC) $(CFLAGS) $(COFLAGS) Gibbs.cpp -+ -+preRef.o : preRef.cpp -+ $(CC) $(CFLAGS) $(COFLAGS) preRef.cpp -+ -+parseIt.o : parseIt.cpp -+ $(CC) $(CFLAGS) -O2 -c parseIt.cpp -+ -+simulation.o : simulation.cpp -+ $(CC) $(CFLAGS) $(COFLAGS) simulation.cpp -+ -+wiggle.o: wiggle.cpp -+ $(CC) $(CFLAGS) $(COFLAGS) wiggle.cpp -+ -+ - rsem-extract-reference-transcripts : extractRef.cpp - $(CC) $(CFLAGS) -O3 extractRef.cpp -o rsem-extract-reference-transcripts - -@@ -19,24 +45,15 @@ rsem-synthesis-reference-transcripts : synthesisRef.cpp - rsem-preref : preRef.o - $(CC) $(CFLAGS) preRef.o -o rsem-preref - --preRef.o : preRef.cpp -- $(CC) $(CFLAGS) $(COFLAGS) preRef.cpp -- - rsem-parse-alignments : parseIt.o sam/libbam.a - $(CC) $(CFLAGS) -o rsem-parse-alignments parseIt.o sam/libbam.a -lz -lpthread - --parseIt.o : parseIt.cpp -- $(CC) $(CFLAGS) -O2 -c parseIt.cpp -- - rsem-build-read-index : buildReadIndex.cpp - $(CC) $(CFLAGS) -O3 buildReadIndex.cpp -o rsem-build-read-index - - rsem-run-em : EM.o sam/libbam.a - $(CC) $(CFLAGS) -o rsem-run-em EM.o sam/libbam.a -lz -lpthread - --EM.o : EM.cpp -- $(CC) $(CFLAGS) $(COFLAGS) EM.cpp -- - rsem-tbam2gbam : tbam2gbam.cpp sam/libbam.a - $(CC) $(CFLAGS) -O3 tbam2gbam.cpp sam/libbam.a -lz -lpthread -o $@ - -@@ -46,27 +63,15 @@ rsem-bam2wig : wiggle.o sam/libbam.a bam2wig.cpp - rsem-bam2readdepth : wiggle.o sam/libbam.a bam2readdepth.cpp - $(CC) $(CFLAGS) -O3 bam2readdepth.cpp wiggle.o sam/libbam.a -lz -lpthread -o $@ - --wiggle.o: wiggle.cpp -- $(CC) $(CFLAGS) $(COFLAGS) wiggle.cpp -- - rsem-simulate-reads : simulation.o - $(CC) $(CFLAGS) -o rsem-simulate-reads simulation.o - --simulation.o : simulation.cpp -- $(CC) $(CFLAGS) $(COFLAGS) simulation.cpp -- - rsem-run-gibbs : Gibbs.o - $(CC) $(CFLAGS) -o rsem-run-gibbs Gibbs.o -lpthread - --Gibbs.o : Gibbs.cpp -- $(CC) $(CFLAGS) $(COFLAGS) Gibbs.cpp -- - rsem-calculate-credibility-intervals : calcCI.o - $(CC) $(CFLAGS) -o rsem-calculate-credibility-intervals calcCI.o -lpthread - --calcCI.o : calcCI.cpp -- $(CC) $(CFLAGS) $(COFLAGS) calcCI.cpp -- - rsem-get-unique : getUnique.cpp sam/libbam.a - $(CC) $(CFLAGS) -O3 getUnique.cpp sam/libbam.a -lz -lpthread -o $@ - -@@ -76,9 +81,6 @@ rsem-sam-validator : samValidator.cpp sam/libbam.a - rsem-scan-for-paired-end-reads : scanForPairedEndReads.cpp sam/libbam.a - $(CC) $(CFLAGS) -O3 scanForPairedEndReads.cpp sam/libbam.a -lz -lpthread -o $@ - --ebseq : -- cd EBSeq ; ${MAKE} all -- - clean : - rm -f *.o *~ $(PROGRAMS) - cd sam ; ${MAKE} clean - -From 6ba1c33cccdf7c8e7df7a3189e7db204be3b1e8d Mon Sep 17 00:00:00 2001 -From: Ricardo Wurmus -Date: Wed, 22 Apr 2015 15:28:30 +0200 -Subject: [PATCH 4/7] add ./sam to library directories, link with -lbam - ---- - Makefile | 36 ++++++++++++++++++------------------ - 1 file changed, 18 insertions(+), 18 deletions(-) - -diff --git a/Makefile b/Makefile -index ae4de3b..a87cc4d 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,11 +1,11 @@ - CC = g++ --CFLAGS = -Wall -I. -I./sam -I./boost -+CFLAGS = -Wall -I. -I./sam -I./boost -L./sam - COFLAGS = -O3 -ffast-math -c - PROGRAMS = rsem-extract-reference-transcripts rsem-synthesis-reference-transcripts rsem-preref rsem-parse-alignments rsem-build-read-index rsem-run-em rsem-tbam2gbam rsem-run-gibbs rsem-calculate-credibility-intervals rsem-simulate-reads rsem-bam2wig rsem-get-unique rsem-bam2readdepth rsem-sam-validator rsem-scan-for-paired-end-reads - - .PHONY : all ebseq clean - --all : $(PROGRAMS) -+all : sam/libbam.a $(PROGRAMS) - - sam/libbam.a : - cd sam ; ${MAKE} all -@@ -45,23 +45,23 @@ rsem-synthesis-reference-transcripts : synthesisRef.cpp - rsem-preref : preRef.o - $(CC) $(CFLAGS) preRef.o -o rsem-preref - --rsem-parse-alignments : parseIt.o sam/libbam.a -- $(CC) $(CFLAGS) -o rsem-parse-alignments parseIt.o sam/libbam.a -lz -lpthread -+rsem-parse-alignments : parseIt.o -+ $(CC) $(CFLAGS) -o rsem-parse-alignments parseIt.o -lbam -lz -lpthread - - rsem-build-read-index : buildReadIndex.cpp - $(CC) $(CFLAGS) -O3 buildReadIndex.cpp -o rsem-build-read-index - --rsem-run-em : EM.o sam/libbam.a -- $(CC) $(CFLAGS) -o rsem-run-em EM.o sam/libbam.a -lz -lpthread -+rsem-run-em : EM.o -+ $(CC) $(CFLAGS) -o rsem-run-em EM.o -lbam -lz -lpthread - --rsem-tbam2gbam : tbam2gbam.cpp sam/libbam.a -- $(CC) $(CFLAGS) -O3 tbam2gbam.cpp sam/libbam.a -lz -lpthread -o $@ -+rsem-tbam2gbam : tbam2gbam.cpp -+ $(CC) $(CFLAGS) -O3 tbam2gbam.cpp -lbam -lz -lpthread -o $@ - --rsem-bam2wig : wiggle.o sam/libbam.a bam2wig.cpp -- $(CC) $(CFLAGS) -O3 bam2wig.cpp wiggle.o sam/libbam.a -lz -lpthread -o $@ -+rsem-bam2wig : wiggle.o bam2wig.cpp -+ $(CC) $(CFLAGS) -O3 bam2wig.cpp wiggle.o -lbam -lz -lpthread -o $@ - --rsem-bam2readdepth : wiggle.o sam/libbam.a bam2readdepth.cpp -- $(CC) $(CFLAGS) -O3 bam2readdepth.cpp wiggle.o sam/libbam.a -lz -lpthread -o $@ -+rsem-bam2readdepth : wiggle.o bam2readdepth.cpp -+ $(CC) $(CFLAGS) -O3 bam2readdepth.cpp wiggle.o -lbam -lz -lpthread -o $@ - - rsem-simulate-reads : simulation.o - $(CC) $(CFLAGS) -o rsem-simulate-reads simulation.o -@@ -72,14 +72,14 @@ rsem-run-gibbs : Gibbs.o - rsem-calculate-credibility-intervals : calcCI.o - $(CC) $(CFLAGS) -o rsem-calculate-credibility-intervals calcCI.o -lpthread - --rsem-get-unique : getUnique.cpp sam/libbam.a -- $(CC) $(CFLAGS) -O3 getUnique.cpp sam/libbam.a -lz -lpthread -o $@ -+rsem-get-unique : getUnique.cpp -+ $(CC) $(CFLAGS) -O3 getUnique.cpp -lbam -lz -lpthread -o $@ - --rsem-sam-validator : samValidator.cpp sam/libbam.a -- $(CC) $(CFLAGS) -O3 samValidator.cpp sam/libbam.a -lz -lpthread -o $@ -+rsem-sam-validator : samValidator.cpp -+ $(CC) $(CFLAGS) -O3 samValidator.cpp -lbam -lz -lpthread -o $@ - --rsem-scan-for-paired-end-reads : scanForPairedEndReads.cpp sam/libbam.a -- $(CC) $(CFLAGS) -O3 scanForPairedEndReads.cpp sam/libbam.a -lz -lpthread -o $@ -+rsem-scan-for-paired-end-reads : scanForPairedEndReads.cpp -+ $(CC) $(CFLAGS) -O3 scanForPairedEndReads.cpp -lbam -lz -lpthread -o $@ - - clean : - rm -f *.o *~ $(PROGRAMS) - -From 5402b88c269df79ee245c1c59e15f3c8282a0220 Mon Sep 17 00:00:00 2001 -From: Ricardo Wurmus -Date: Wed, 22 Apr 2015 15:33:02 +0200 -Subject: [PATCH 5/7] do not repeat target name, use $@ instead - ---- - Makefile | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - -diff --git a/Makefile b/Makefile -index a87cc4d..7ec90a3 100644 ---- a/Makefile -+++ b/Makefile -@@ -37,22 +37,22 @@ wiggle.o: wiggle.cpp - - - rsem-extract-reference-transcripts : extractRef.cpp -- $(CC) $(CFLAGS) -O3 extractRef.cpp -o rsem-extract-reference-transcripts -+ $(CC) $(CFLAGS) -O3 extractRef.cpp -o $@ - - rsem-synthesis-reference-transcripts : synthesisRef.cpp -- $(CC) $(CFLAGS) -O3 synthesisRef.cpp -o rsem-synthesis-reference-transcripts -+ $(CC) $(CFLAGS) -O3 synthesisRef.cpp -o $@ - - rsem-preref : preRef.o -- $(CC) $(CFLAGS) preRef.o -o rsem-preref -+ $(CC) $(CFLAGS) preRef.o -o $@ - - rsem-parse-alignments : parseIt.o -- $(CC) $(CFLAGS) -o rsem-parse-alignments parseIt.o -lbam -lz -lpthread -+ $(CC) $(CFLAGS) -o $@ parseIt.o -lbam -lz -lpthread - - rsem-build-read-index : buildReadIndex.cpp -- $(CC) $(CFLAGS) -O3 buildReadIndex.cpp -o rsem-build-read-index -+ $(CC) $(CFLAGS) -O3 buildReadIndex.cpp -o $@ - - rsem-run-em : EM.o -- $(CC) $(CFLAGS) -o rsem-run-em EM.o -lbam -lz -lpthread -+ $(CC) $(CFLAGS) -o $@ EM.o -lbam -lz -lpthread - - rsem-tbam2gbam : tbam2gbam.cpp - $(CC) $(CFLAGS) -O3 tbam2gbam.cpp -lbam -lz -lpthread -o $@ -@@ -64,13 +64,13 @@ rsem-bam2readdepth : wiggle.o bam2readdepth.cpp - $(CC) $(CFLAGS) -O3 bam2readdepth.cpp wiggle.o -lbam -lz -lpthread -o $@ - - rsem-simulate-reads : simulation.o -- $(CC) $(CFLAGS) -o rsem-simulate-reads simulation.o -+ $(CC) $(CFLAGS) -o $@ simulation.o - - rsem-run-gibbs : Gibbs.o -- $(CC) $(CFLAGS) -o rsem-run-gibbs Gibbs.o -lpthread -+ $(CC) $(CFLAGS) -o $@ Gibbs.o -lpthread - - rsem-calculate-credibility-intervals : calcCI.o -- $(CC) $(CFLAGS) -o rsem-calculate-credibility-intervals calcCI.o -lpthread -+ $(CC) $(CFLAGS) -o $@ calcCI.o -lpthread - - rsem-get-unique : getUnique.cpp - $(CC) $(CFLAGS) -O3 getUnique.cpp -lbam -lz -lpthread -o $@ - -From f60784bc7aa303cc825bd87dd3f5d7d26c51bded Mon Sep 17 00:00:00 2001 -From: Ricardo Wurmus -Date: Wed, 22 Apr 2015 15:44:53 +0200 -Subject: [PATCH 6/7] use automatic variables to refer to prerequisites - ---- - Makefile | 44 ++++++++++++++++++++++---------------------- - 1 file changed, 22 insertions(+), 22 deletions(-) - -diff --git a/Makefile b/Makefile -index 7ec90a3..6540d81 100644 ---- a/Makefile -+++ b/Makefile -@@ -15,71 +15,71 @@ ebseq : - - - calcCI.o : calcCI.cpp -- $(CC) $(CFLAGS) $(COFLAGS) calcCI.cpp -+ $(CC) $(CFLAGS) $(COFLAGS) $< - - EM.o : EM.cpp -- $(CC) $(CFLAGS) $(COFLAGS) EM.cpp -+ $(CC) $(CFLAGS) $(COFLAGS) $< - - Gibbs.o : Gibbs.cpp -- $(CC) $(CFLAGS) $(COFLAGS) Gibbs.cpp -+ $(CC) $(CFLAGS) $(COFLAGS) $< - - preRef.o : preRef.cpp -- $(CC) $(CFLAGS) $(COFLAGS) preRef.cpp -+ $(CC) $(CFLAGS) $(COFLAGS) $< - - parseIt.o : parseIt.cpp -- $(CC) $(CFLAGS) -O2 -c parseIt.cpp -+ $(CC) $(CFLAGS) -O2 -c $< - - simulation.o : simulation.cpp -- $(CC) $(CFLAGS) $(COFLAGS) simulation.cpp -+ $(CC) $(CFLAGS) $(COFLAGS) $< - - wiggle.o: wiggle.cpp -- $(CC) $(CFLAGS) $(COFLAGS) wiggle.cpp -+ $(CC) $(CFLAGS) $(COFLAGS) $< - - - rsem-extract-reference-transcripts : extractRef.cpp -- $(CC) $(CFLAGS) -O3 extractRef.cpp -o $@ -+ $(CC) $(CFLAGS) -O3 $< -o $@ - - rsem-synthesis-reference-transcripts : synthesisRef.cpp -- $(CC) $(CFLAGS) -O3 synthesisRef.cpp -o $@ -+ $(CC) $(CFLAGS) -O3 $< -o $@ - - rsem-preref : preRef.o -- $(CC) $(CFLAGS) preRef.o -o $@ -+ $(CC) $(CFLAGS) $< -o $@ - - rsem-parse-alignments : parseIt.o -- $(CC) $(CFLAGS) -o $@ parseIt.o -lbam -lz -lpthread -+ $(CC) $(CFLAGS) -o $@ $< -lbam -lz -lpthread - - rsem-build-read-index : buildReadIndex.cpp -- $(CC) $(CFLAGS) -O3 buildReadIndex.cpp -o $@ -+ $(CC) $(CFLAGS) -O3 $< -o $@ - - rsem-run-em : EM.o -- $(CC) $(CFLAGS) -o $@ EM.o -lbam -lz -lpthread -+ $(CC) $(CFLAGS) -o $@ $< -lbam -lz -lpthread - - rsem-tbam2gbam : tbam2gbam.cpp -- $(CC) $(CFLAGS) -O3 tbam2gbam.cpp -lbam -lz -lpthread -o $@ -+ $(CC) $(CFLAGS) -O3 $< -lbam -lz -lpthread -o $@ - - rsem-bam2wig : wiggle.o bam2wig.cpp -- $(CC) $(CFLAGS) -O3 bam2wig.cpp wiggle.o -lbam -lz -lpthread -o $@ -+ $(CC) $(CFLAGS) -O3 $^ -lbam -lz -lpthread -o $@ - - rsem-bam2readdepth : wiggle.o bam2readdepth.cpp -- $(CC) $(CFLAGS) -O3 bam2readdepth.cpp wiggle.o -lbam -lz -lpthread -o $@ -+ $(CC) $(CFLAGS) -O3 $^ -lbam -lz -lpthread -o $@ - - rsem-simulate-reads : simulation.o -- $(CC) $(CFLAGS) -o $@ simulation.o -+ $(CC) $(CFLAGS) -o $@ $< - - rsem-run-gibbs : Gibbs.o -- $(CC) $(CFLAGS) -o $@ Gibbs.o -lpthread -+ $(CC) $(CFLAGS) -o $@ $< -lpthread - - rsem-calculate-credibility-intervals : calcCI.o -- $(CC) $(CFLAGS) -o $@ calcCI.o -lpthread -+ $(CC) $(CFLAGS) -o $@ $< -lpthread - - rsem-get-unique : getUnique.cpp -- $(CC) $(CFLAGS) -O3 getUnique.cpp -lbam -lz -lpthread -o $@ -+ $(CC) $(CFLAGS) -O3 $< -lbam -lz -lpthread -o $@ - - rsem-sam-validator : samValidator.cpp -- $(CC) $(CFLAGS) -O3 samValidator.cpp -lbam -lz -lpthread -o $@ -+ $(CC) $(CFLAGS) -O3 $< -lbam -lz -lpthread -o $@ - - rsem-scan-for-paired-end-reads : scanForPairedEndReads.cpp -- $(CC) $(CFLAGS) -O3 scanForPairedEndReads.cpp -lbam -lz -lpthread -o $@ -+ $(CC) $(CFLAGS) -O3 $< -lbam -lz -lpthread -o $@ - - clean : - rm -f *.o *~ $(PROGRAMS) - -From 0cf9721077f67fb4ca15fdc59cbfbf24a944debd Mon Sep 17 00:00:00 2001 -From: Ricardo Wurmus -Date: Wed, 22 Apr 2015 15:49:19 +0200 -Subject: [PATCH 7/7] split long line - ---- - Makefile | 17 ++++++++++++++++- - 1 file changed, 16 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 6540d81..0ab04a5 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,7 +1,22 @@ - CC = g++ - CFLAGS = -Wall -I. -I./sam -I./boost -L./sam - COFLAGS = -O3 -ffast-math -c --PROGRAMS = rsem-extract-reference-transcripts rsem-synthesis-reference-transcripts rsem-preref rsem-parse-alignments rsem-build-read-index rsem-run-em rsem-tbam2gbam rsem-run-gibbs rsem-calculate-credibility-intervals rsem-simulate-reads rsem-bam2wig rsem-get-unique rsem-bam2readdepth rsem-sam-validator rsem-scan-for-paired-end-reads -+PROGRAMS = \ -+ rsem-extract-reference-transcripts \ -+ rsem-synthesis-reference-transcripts \ -+ rsem-preref \ -+ rsem-parse-alignments \ -+ rsem-build-read-index \ -+ rsem-run-em \ -+ rsem-tbam2gbam \ -+ rsem-run-gibbs \ -+ rsem-calculate-credibility-intervals \ -+ rsem-simulate-reads \ -+ rsem-bam2wig \ -+ rsem-get-unique \ -+ rsem-bam2readdepth \ -+ rsem-sam-validator \ -+ rsem-scan-for-paired-end-reads - - .PHONY : all ebseq clean - -- cgit v1.2.3 From f5c10a94eff314ed985089719e817cd036a746f1 Mon Sep 17 00:00:00 2001 From: fis trivial Date: Thu, 20 Sep 2018 13:37:26 +0000 Subject: gnu: gprolog: Update to 1.4.5. * gnu/packages/gprolog.scm (gprolog): Update to 1.4.5. [source]: Add an alternate source URL. Signed-off-by: Leo Famulari --- gnu/packages/gprolog.scm | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gprolog.scm b/gnu/packages/gprolog.scm index b27b080ca7..166bf33294 100644 --- a/gnu/packages/gprolog.scm +++ b/gnu/packages/gprolog.scm @@ -27,15 +27,18 @@ (define-public gprolog (package (name "gprolog") - (version "1.4.4") + (version "1.4.5") (source - (origin - (method url-fetch) - (uri (string-append "mirror://gnu/gprolog/gprolog-" version - ".tar.gz")) - (sha256 - (base32 - "13miyas47bmijmadm68cbvb21n4s156gjafz7kfx9brk9djfkh0q")))) + (origin + (method url-fetch) + ;; Recent versions are not hosted on the GNU mirrors. + (uri (list (string-append "http://gprolog.org/gprolog-" version + ".tar.gz") + (string-append "mirror://gnu/gprolog/gprolog-" version + ".tar.gz"))) + (sha256 + (base32 + "0z4cc42n3k6i35b8mr816iwsvrpxshw6d7dgz6s2h1hy0l7g1p5z")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From ea2364621a57f4797a512caa53cbf0d4475c1c90 Mon Sep 17 00:00:00 2001 From: fis trivial Date: Thu, 20 Sep 2018 13:29:15 +0000 Subject: gnu: qbittorrent: Update to 4.1.3. * gnu/packages/bittorrent.scm (qbittorrent): Update to 4.1.3. [inputs]: Use python-wrapper instead of python. Signed-off-by: Leo Famulari --- gnu/packages/bittorrent.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 3937fac745..59fbd6906b 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -409,7 +409,7 @@ desktops.") (define-public qbittorrent (package (name "qbittorrent") - (version "4.0.4") + (version "4.1.3") (source (origin (method url-fetch) (uri (string-append @@ -418,7 +418,7 @@ desktops.") (file-name (string-append name "-release-" version ".tar.gz")) (sha256 (base32 - "145r4lv7rqdhrm5znn3ndxsfdf579n46zvj7c53c422am8ir5xhp")))) + "00zrpnwanq9f7maky2z4wnzw08xy902s77scm2gcvxxxankr4j92")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -434,7 +434,7 @@ desktops.") `(("boost" ,boost) ("libtorrent-rasterbar" ,libtorrent-rasterbar) ("openssl" ,openssl) - ("python" ,python) + ("python" ,python-wrapper) ("qtbase" ,qtbase) ("qtsvg" ,qtsvg) ("zlib" ,zlib))) -- cgit v1.2.3 From c6ede267e64ea6b5e3546274fafd2afc84f8b140 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 20 Sep 2018 17:58:31 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.157. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.157. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e34c67cb0f..1657ebc71a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -452,8 +452,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.156" - "13j4jb4hifh3fah2ysy2425fakwqqdh2z23lf4i0frxa1xl974h2" + (make-linux-libre "4.4.157" + "00bnfqwkr0jfdabmwx5qk5bqxn5vwnnzwqbm5rfg7lggii74kk54" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From 41d6afb266a7bf2f0df95915a0fefc714e191199 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 20 Sep 2018 17:59:10 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.128. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.128. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1657ebc71a..7034291d02 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -446,8 +446,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.127" - "0q7h5gnl3ikic0pvwrxp78pz56yvijhz6s84gb92xywi1v3dd8mh" + (make-linux-libre "4.9.128" + "0lww23xcyyg0dwzrap5x9d700gy3lbxln55n6sqqkm7m89dkqwha" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From c57a2a12b17fb3595a1a2c85da7c796e2ee9815c Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 20 Sep 2018 18:00:47 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.71. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.71. (%linux-libre-4.14-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7034291d02..22cc7dff9b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -436,8 +436,8 @@ It has been modified to remove all non-free binary blobs.") #:patches %linux-libre-4.18-patches #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.70") -(define %linux-libre-4.14-hash "138v51m6k57wnvlf9c22dad0w819mfb8f95i6w99mlg69qpwdvag") +(define %linux-libre-4.14-version "4.14.71") +(define %linux-libre-4.14-hash "1akvykaccy7ikl8v04grwxvgs4z2rrs7drf2s85ysqwq79mdh3gq") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.2.3 From 83e8b1d7946d07d1c26dd7bd6e11e6e9396024ac Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 20 Sep 2018 18:01:38 -0400 Subject: gnu: linux-libre: Update to 4.18.9. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.18.9. (%linux-libre-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 22cc7dff9b..170c77374d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -405,8 +405,8 @@ It has been modified to remove all non-free binary blobs.") ;; supports qemu "virt" machine and possibly a large number of ARM boards. ;; See : https://wiki.debian.org/DebianKernel/ARMMP. -(define %linux-libre-version "4.18.8") -(define %linux-libre-hash "163awpba1yd0x33xzj5dczimk4y96xc28syc4w2ad0qafgapng8l") +(define %linux-libre-version "4.18.9") +(define %linux-libre-hash "0wwmhnfvcsdlqhzwwwyz1x5a3ldjky6l0xir1pi6pysr0lak402x") (define %linux-libre-4.18-patches (list %boot-logo-patch -- cgit v1.2.3 From 1bfaae25fab372c8ff86e34024adf20240699b55 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 20 Sep 2018 22:12:10 +0200 Subject: gnu: rust@1.20.0: Fix tests. * gnu/packages/rust.scm (rust-1.23)[arguments]<#:phases> [patch-cargo-tests, ignore-glibc-2.27-incompatible-test,fix-mtime-bug]: Move to... (rust-1.20): ... here. --- gnu/packages/rust.scm | 57 ++++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 28 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 74de6f3ae1..ec8b30d78f 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -514,6 +514,35 @@ safety and thread safety guarantees.") (substitute-keyword-arguments (package-arguments rust-1.19) ((#:phases phases) `(modify-phases ,phases + (add-after 'patch-tests 'patch-cargo-tests + (lambda _ + (substitute* "src/tools/cargo/tests/build.rs" + (("/usr/bin/env") (which "env")) + ;; Guix llvm is compiled without asmjs-unknown-emscripten. + (("fn wasm32_final_outputs") "#[ignore]\nfn wasm32_final_outputs")) + (substitute* "src/tools/cargo/tests/death.rs" + ;; This is stuck when built in container. + (("fn ctrl_c_kills_everyone") "#[ignore]\nfn ctrl_c_kills_everyone")) + ;; Prints test output in the wrong order when built on + ;; i686-linux. + (substitute* "src/tools/cargo/tests/test.rs" + (("fn cargo_test_env") "#[ignore]\nfn cargo_test_env")) + #t)) + (add-after 'patch-cargo-tests 'ignore-glibc-2.27-incompatible-test + ;; https://github.com/rust-lang/rust/issues/47863 + (lambda _ + (substitute* "src/test/run-pass/out-of-stack.rs" + (("// ignore-android") "// ignore-test\n// ignore-android")) + #t)) + (add-after 'ignore-glibc-2.27-incompatible-test 'fix-mtime-bug + (lambda* _ + (substitute* "src/build_helper/lib.rs" + ;; Bug in Rust code. + ;; Current implementation assume that if dst not exist then it's mtime + ;; is 0, but in same time "src" have 0 mtime in guix build! + (("let threshold = mtime\\(dst\\);") + "if !dst.exists() {\nreturn false\n}\n let threshold = mtime(dst);")) + #t)) (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -651,34 +680,6 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" ;; XXX: Revisit this when we use gcc 6. (substitute* "src/binaryen/CMakeLists.txt" (("ADD_COMPILE_FLAG\\(\\\"-march=native\\\"\\)") "")) - #t)) - (add-after 'patch-tests 'patch-cargo-tests - (lambda _ - (substitute* "src/tools/cargo/tests/build.rs" - (("/usr/bin/env") (which "env")) - ;; Guix llvm is compiled without asmjs-unknown-emscripten. - (("fn wasm32_final_outputs") "#[ignore]\nfn wasm32_final_outputs")) - (substitute* "src/tools/cargo/tests/death.rs" - ;; This is stuck when built in container. - (("fn ctrl_c_kills_everyone") "#[ignore]\nfn ctrl_c_kills_everyone")) - ;; Prints test output in the wrong order when built on - ;; i686-linux. - (substitute* "src/tools/cargo/tests/test.rs" - (("fn cargo_test_env") "#[ignore]\nfn cargo_test_env")) - #t)) - (add-after 'patch-cargo-tests 'ignore-glibc-2.27-incompatible-test - ;; https://github.com/rust-lang/rust/issues/47863 - (lambda _ - (substitute* "src/test/run-pass/out-of-stack.rs" - (("// ignore-android") "// ignore-test\n// ignore-android")))) - (add-after 'ignore-glibc-2.27-incompatible-test 'fix-mtime-bug - (lambda* _ - (substitute* "src/build_helper/lib.rs" - ;; Bug in Rust code. - ;; Current implementation assume that if dst not exist then it's mtime - ;; is 0, but in same time "src" have 0 mtime in guix build! - (("let threshold = mtime\\(dst\\);") - "if !dst.exists() {\nreturn false\n}\n let threshold = mtime(dst);")) #t)))))))) (define-public rust-1.24 -- cgit v1.2.3 From e0b07ccc1ab0b763f0e9da39f56f2a7aec6116d5 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 20 Sep 2018 22:16:45 +0200 Subject: gnu: rust: Work around mtime bug in rust build helpers. * gnu/packages/rust.scm (rust-1.20)[arguments]<#:phases>[fix-mtime-bug]: Delete. [reset-timestamps-after-changes]: Modify. (rust-1.24): Don't delete "fix-mtime-bug" since now it doesn't ever get created. --- gnu/packages/rust.scm | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index ec8b30d78f..e8eca80aa6 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -534,15 +534,6 @@ safety and thread safety guarantees.") (substitute* "src/test/run-pass/out-of-stack.rs" (("// ignore-android") "// ignore-test\n// ignore-android")) #t)) - (add-after 'ignore-glibc-2.27-incompatible-test 'fix-mtime-bug - (lambda* _ - (substitute* "src/build_helper/lib.rs" - ;; Bug in Rust code. - ;; Current implementation assume that if dst not exist then it's mtime - ;; is 0, but in same time "src" have 0 mtime in guix build! - (("let threshold = mtime\\(dst\\);") - "if !dst.exists() {\nreturn false\n}\n let threshold = mtime(dst);")) - #t)) (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -608,10 +599,11 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (delete 'patch-cargo-tomls) (add-before 'build 'reset-timestamps-after-changes (lambda* _ - (define ref (stat "README.md")) (for-each (lambda (filename) - (set-file-time filename ref)) + ;; Rust 1.20.0 treats timestamp 0 as "file doesn't exist". + ;; Therefore, use timestamp 1. + (utime filename 1 1 1 1)) (find-files "." #:directories? #t)) #t)) (replace 'build @@ -699,8 +691,7 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" ;; This test is known to fail on aarch64 and powerpc64le: ;; https://github.com/rust-lang/rust/issues/45410 (("fn test_loading_cosine") "#[ignore]\nfn test_loading_cosine")) - #t)) - (delete 'fix-mtime-bug)))))))) + #t))))))))) (define-public rust-1.25 (let ((base-rust -- cgit v1.2.3 From eeecbe09cc497b1ed9a2000283a5767903ba2fb4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 08:07:25 +0200 Subject: gnu: perl-dbd-mysql: Update to 4.048. * gnu/packages/databases.scm (perl-dbd-mysql): Update to 4.048. --- gnu/packages/databases.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 9db892a0b7..9e8c9d8f9e 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1458,15 +1458,15 @@ columns, primary keys, unique constraints and relationships.") (define-public perl-dbd-mysql (package (name "perl-dbd-mysql") - (version "4.047") + (version "4.048") (source (origin (method url-fetch) - (uri (string-append "mirror://cpan/authors/id/C/CA/CAPTTOFU/" + (uri (string-append "mirror://cpan/authors/id/M/MI/MICHIELB/" "DBD-mysql-" version ".tar.gz")) (sha256 (base32 - "0idizgr0hr7sj92fbdlb3gv6cva15jkpaq28wrdw4j4p7awx2mls")))) + "1zqmch6c9gq06z90mkmk1skajk2kaggriw19ym5w04l7wv5gydqp")))) (build-system perl-build-system) (arguments `(#:phases -- cgit v1.2.3 From 4aa64e3a819ca53629b1cbe58c079eefa7dd24b0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 08:09:35 +0200 Subject: gnu: ubuntu-keyring: Update to 2018.09.18.1. * gnu/packages/debian.scm (ubuntu-keyring): Update to 2018.09.18.1. --- gnu/packages/debian.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index 1974672fb6..185dacfe73 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -71,7 +71,7 @@ contains the archive keys used for that.") (define-public ubuntu-keyring (package (name "ubuntu-keyring") - (version "2018.02.28") + (version "2018.09.18.1") (source (origin (method url-fetch) @@ -79,7 +79,7 @@ contains the archive keys used for that.") "+files/" name "_" version ".tar.gz")) (sha256 (base32 - "1zj3012cz7rlx9pm39wnwa0lmi1h38n6bkgbz81vnmcsvqsc9a3a")))) + "0csx2n62rj9rxjv4y8qhby7l9rbybfwrb0406pc2cjr7f2yk91af")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) -- cgit v1.2.3 From 1779aaa09a576401e35bf4a0d1534ee546b5506e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 08:19:42 +0200 Subject: Add 'GNU Guix' comment to all (gnu packages) headers. * gnu/packages/debian.scm, gnu/packages/syndication.scm: Add comments. --- gnu/packages/debian.scm | 3 +++ gnu/packages/syndication.scm | 3 +++ 2 files changed, 6 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index 185dacfe73..5ea263149e 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -1,6 +1,9 @@ +;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; +;;; This file is part of GNU Guix. +;;; ;;; GNU Guix is free software; you can redistribute it and/or modify it ;;; under the terms of the GNU General Public License as published by ;;; the Free Software Foundation; either version 3 of the License, or (at diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index f37c0eaac5..6247d1f3b6 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -1,6 +1,9 @@ +;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; +;;; This file is part of GNU Guix. +;;; ;;; GNU Guix is free software; you can redistribute it and/or modify it ;;; under the terms of the GNU General Public License as published by ;;; the Free Software Foundation; either version 3 of the License, or (at -- cgit v1.2.3 From 29ddbc5607c8ad7bb0622e10716e60396817a42d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 08:46:11 +0200 Subject: gnu: python-pydot: Update to 1.2.4. * gnu/packages/graphviz.scm (python-pydot): Update to 1.2.4. [arguments]: Run the test suite. [native-inputs]: Add python-chardet. --- gnu/packages/graphviz.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index 09f46fab84..569923d4e0 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -220,17 +220,18 @@ be used either as a standalone application, or as a python library.") (define-public python-pydot (package (name "python-pydot") - (version "1.2.3") + (version "1.2.4") (source (origin (method url-fetch) (uri (pypi-uri "pydot" version)) (sha256 (base32 - "00imlz0033dygb9gdag1xr0cybn33gk5jsdi9ffbszzr97rd7dgd")))) + "1dhy4jpp646jslh2yks6klwwbaxcs905byyny880gl1iap8y5llj")))) (build-system python-build-system) - ;; FIXME: No tests in PyPi release tarball. - (arguments '(#:tests? #f)) + (native-inputs + ;; For tests. + `(("python-chardet" ,python-chardet))) (propagated-inputs `(("python-pyparsing" ,python-pyparsing))) (home-page "https://github.com/erocarrera/pydot") -- cgit v1.2.3 From 3752b683dc16e172f57f8397a542e562f564fc30 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 09:13:45 +0200 Subject: gnu: openscenegraph: Update to 3.6.3. * gnu/packages/graphics.scm (openscenegraph): Update to 3.6.3. [source]: Use GIT-FILE-NAME. [inputs]: Remove unused pth and qtbase. --- gnu/packages/graphics.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 9c2869c12b..58c742b825 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -406,7 +406,7 @@ visual effects work for film.") (define-public openscenegraph (package (name "openscenegraph") - (version "3.6.2") + (version "3.6.3") (source (origin (method git-fetch) @@ -415,8 +415,8 @@ visual effects work for film.") (commit (string-append "OpenSceneGraph-" version)))) (sha256 (base32 - "03jk6lclyd4biniaw04w7j0z1spkm69f1c19i37b8v9x3zv1p1id")) - (file-name (string-append name "-" version "-checkout")))) + "0h32z15sa8sbq276j0iib0n707m8bs4p5ji9z2ah411446paad9q")) + (file-name (git-file-name name version)))) (properties `((upstream-name . "OpenSceneGraph"))) (build-system cmake-build-system) @@ -437,8 +437,6 @@ visual effects work for film.") ("jasper" ,jasper) ("librsvg" ,librsvg) ("libxrandr" ,libxrandr) - ("pth" ,pth) - ("qtbase" ,qtbase) ("ffmpeg" ,ffmpeg) ("mesa" ,mesa))) (synopsis "High performance real-time graphics toolkit") -- cgit v1.2.3 From 1df40d3dbff82c2990271b406b32633fe216d143 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 21 Sep 2018 11:52:12 +0200 Subject: gnu: emacs-orgalist: Update to 1.9. * gnu/packages/emacs.scm (emacs-orgalist): Update to 1.9. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 9b3a90bd33..fc019cf241 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -5252,7 +5252,7 @@ distribution, primarily targeting Clojure users") (define-public emacs-orgalist (package (name "emacs-orgalist") - (version "1.8") + (version "1.9") (source (origin (method url-fetch) @@ -5260,7 +5260,7 @@ distribution, primarily targeting Clojure users") "orgalist-" version ".el")) (sha256 (base32 - "1wqwnmn08i0qkxm8b2iclvf6cydcn68h1p3h7r1kig2bdn5b8948")))) + "1rmmcyiiqkq54hn74nhzxzl4nvd902hv6gq341jwhrm7yiagffi6")))) (build-system emacs-build-system) (home-page "http://elpa.gnu.org/packages/orgalist.html") (synopsis "Manage Org-like lists in non-Org buffers") -- cgit v1.2.3 From 174988fa05fbda4a9cdaab77d59fe4ea187b0e6b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 12:18:55 +0200 Subject: gnu: perl-xml-compile: Update to 1.60. * gnu/packages/xml.scm (perl-xml-compile): Update to 1.60. [propagated-inputs]: Add perl-carp, perl-scalar-list-utils, and perl-types-serialiser. --- gnu/packages/xml.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 9c8e3cef08..aa1395286f 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -665,20 +665,23 @@ This module provide functions which simplify writing tests for (define-public perl-xml-compile (package (name "perl-xml-compile") - (version "1.54") + (version "1.60") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/M/MA/MARKOV/" "XML-Compile-" version ".tar.gz")) (sha256 (base32 - "1hp41960bpqxvv1samv9hc0ghhmvs3i16r4rfl9yp54lp6jhsr2c")))) + "04vv7wy5v1l38xsfdbacvyd90qircvnrs2f3ysljm1nhq8mycmwm")))) (build-system perl-build-system) (propagated-inputs - `(("perl-log-report" ,perl-log-report) + `(("perl-carp" ,perl-carp) + ("perl-log-report" ,perl-log-report) ("perl-xml-compile-tester" ,perl-xml-compile-tester) ("perl-xml-libxml" ,perl-xml-libxml) - ("perl-test-deep" ,perl-test-deep))) + ("perl-scalar-list-utils" ,perl-scalar-list-utils) + ("perl-test-deep" ,perl-test-deep) + ("perl-types-serialiser" ,perl-types-serialiser))) (home-page "https://metacpan.org/release/XML-Compile") (synopsis "Compilation-based XML processing") (description -- cgit v1.2.3 From 6f05556ba77def387d862ee44d6658d8d647ad3c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 12:21:38 +0200 Subject: gnu: s6: Update to 2.7.2.1. * gnu/packages/skarnet.scm (s6): Update to 2.7.2.1. --- gnu/packages/skarnet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm index 9a6733d8bc..6546d40597 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -105,7 +105,7 @@ complexity."))) (define-public s6 (package (name "s6") - (version "2.7.2.0") + (version "2.7.2.1") (source (origin (method url-fetch) @@ -113,7 +113,7 @@ complexity."))) version ".tar.gz")) (sha256 (base32 - "02canrzmhr66gi16ldyylk378jlmyfl73vn72ayr12h2wyxgqm5g")))) + "0vyl4wr2l4mp9ams0dyg224qxhl8ksxsv2shs6606lhhp9g1rb6b")))) (build-system gnu-build-system) (inputs `(("skalibs" ,skalibs) ("execline" ,execline))) -- cgit v1.2.3 From e36058634d1754ab6d69f01a448efd691c2a1637 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 12:47:38 +0200 Subject: gnu: python-hdf4: Use INVOKE. * gnu/packages/python.scm (python-hdf4)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 6927924a68..b8521fa0e4 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -767,8 +767,8 @@ and verifies that it matches the intended target hostname.") (setenv "PYTHONPATH" (string-append (getcwd) ":" (getenv "PYTHONPATH"))) - (and (zero? (system* "./runexamples.sh")) - (zero? (system* "nosetests" "-v")))))))) + (invoke "./runexamples.sh") + (invoke "nosetests" "-v")))))) (home-page "https://github.com/fhs/python-hdf4") (synopsis "Python interface to the NCSA HDF4 library") (description -- cgit v1.2.3 From a1d6610e84f4ff61913e1e861093b38c2beb9614 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 12:58:02 +0200 Subject: gnu: python-rencode: Update to 1.0.5. * gnu/packages/python.scm (python-rencode): Update to 1.0.5. [arguments]: Add a 'delete-bogus-test' phase. --- gnu/packages/python.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b8521fa0e4..64ee4e028e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -12456,15 +12456,24 @@ library.") (define-public python-rencode (package (name "python-rencode") - (version "1.0.3") + (version "1.0.5") (source (origin (method url-fetch) (uri (pypi-uri "rencode" version)) (sha256 (base32 - "08if5yax1xn5yfp8p3765ccjmfcv9di7i4m5jckgnwvdsgznwkbj")))) + "0mzwdq1is7kyyr32i5k4iz6g5xxdvmiyc132jnc60p9m6lnwjrpv")))) (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'delete-bogus-test + ;; This test requires /home/aresch/Downloads, which is not provided by + ;; the build environment. + (lambda _ + (delete-file "rencode/t.py") + #t))))) (native-inputs `(("pkg-config" ,pkg-config) ("python-cython" ,python-cython))) (home-page "https://github.com/aresch/rencode") -- cgit v1.2.3 From 101ad242be256d6a5953187be56d61f89e1317d7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 13:13:45 +0200 Subject: gnu: python-paramiko: Use HTTPS home page. * gnu/packages/python-crypto.scm (python-paramiko)[home-page]: Use HTTPS. --- gnu/packages/python-crypto.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 63dc1a54df..5dce8ffdda 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -220,7 +220,7 @@ This package provides a Python interface for BLAKE2.") ("python-pyasn1" ,python-pyasn1) ("python-pynacl" ,python-pynacl) ("python-cryptography" ,python-cryptography))) - (home-page "http://www.paramiko.org/") + (home-page "https://www.paramiko.org/") (synopsis "SSHv2 protocol library") (description "Paramiko is a python implementation of the SSHv2 protocol, providing both client and server functionality. While it leverages a Python C -- cgit v1.2.3 From 6569549dfa0c35e0f80869a630cd216d01c84590 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 13:15:55 +0200 Subject: gnu: python-paramiko: Update to 2.4.2 [security fixes]. * gnu/packages/python-crypto.scm (python-paramiko): Update to 2.4.2. --- gnu/packages/python-crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 5dce8ffdda..bda547417c 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -203,14 +203,14 @@ This package provides a Python interface for BLAKE2.") (define-public python-paramiko (package (name "python-paramiko") - (version "2.4.1") + (version "2.4.2") (source (origin (method url-fetch) (uri (pypi-uri "paramiko" version)) (sha256 (base32 - "1wx4s95i2cdh8hhi1c3jb8lzk71jifa3z9wjfsx905y7lrsngqrk")))) + "1jqgj2gl1pz7bi2aab1r2xq0ml0gskmm9p235cg9y32nydymm5x8")))) (build-system python-build-system) (arguments `(;; FIXME: Tests require many unpackaged libraries, see dev-requirements.txt. -- cgit v1.2.3 From c5327efb97208df569b4682ef5bfe4ac825d1c4f Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 21 Sep 2018 04:34:10 -0400 Subject: gnu: libvpx: Add upstream security fix. * gnu/packages/patches/libvpx-use-after-free-in-postproc.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/video.scm (libvpx)[source]: Add patch. --- gnu/local.mk | 1 + .../libvpx-use-after-free-in-postproc.patch | 34 ++++++++++++++++++++++ gnu/packages/video.scm | 3 +- 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/libvpx-use-after-free-in-postproc.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 4bca986619..9c69fd4f35 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -916,6 +916,7 @@ dist_patch_DATA = \ %D%/packages/patches/libutils-remove-damaging-includes.patch \ %D%/packages/patches/libvdpau-va-gl-unbundle.patch \ %D%/packages/patches/libvpx-CVE-2016-2818.patch \ + %D%/packages/patches/libvpx-use-after-free-in-postproc.patch \ %D%/packages/patches/libxslt-generated-ids.patch \ %D%/packages/patches/libxt-guix-search-paths.patch \ %D%/packages/patches/lierolibre-check-unaligned-access.patch \ diff --git a/gnu/packages/patches/libvpx-use-after-free-in-postproc.patch b/gnu/packages/patches/libvpx-use-after-free-in-postproc.patch new file mode 100644 index 0000000000..04f2a953b7 --- /dev/null +++ b/gnu/packages/patches/libvpx-use-after-free-in-postproc.patch @@ -0,0 +1,34 @@ +From 52add5896661d186dec284ed646a4b33b607d2c7 Mon Sep 17 00:00:00 2001 +From: Jerome Jiang +Date: Wed, 23 May 2018 15:43:00 -0700 +Subject: [PATCH] VP8: Fix use-after-free in postproc. + +The pointer in vp8 postproc refers to show_frame_mi which is only +updated on show frame. However, when there is a no-show frame which also +changes the size (thus new frame buffers allocated), show_frame_mi is +not updated with new frame buffer memory. + +Change the pointer in postproc to mi which is always updated. + +Bug: 842265 +Change-Id: I33874f2112b39f74562cba528432b5f239e6a7bd +--- + vp8/common/postproc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/vp8/common/postproc.c b/vp8/common/postproc.c +index d67ee8a57..8c292d616 100644 +--- a/vp8/common/postproc.c ++++ b/vp8/common/postproc.c +@@ -65,7 +65,7 @@ void vp8_deblock(VP8_COMMON *cm, YV12_BUFFER_CONFIG *source, + double level = 6.0e-05 * q * q * q - .0067 * q * q + .306 * q + .0065; + int ppl = (int)(level + .5); + +- const MODE_INFO *mode_info_context = cm->show_frame_mi; ++ const MODE_INFO *mode_info_context = cm->mi; + int mbr, mbc; + + /* The pixel thresholds are adjusted according to if or not the macroblock +-- +2.19.0 + diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 4882f0476a..448773e0d9 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1242,7 +1242,8 @@ access to mpv's powerful playback capabilities.") (sha256 (base32 "0vvh89hvp8qg9an9vcmwb7d9k3nixhxaz6zi65qdjnd0i56kkcz6")) - (patches (search-patches "libvpx-CVE-2016-2818.patch")))) + (patches (search-patches "libvpx-use-after-free-in-postproc.patch" + "libvpx-CVE-2016-2818.patch")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list "--enable-shared" -- cgit v1.2.3 From e67ad5532f76b53e955149da2f1e237696ff0893 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 21 Sep 2018 03:28:03 -0400 Subject: gnu: icecat: Update to 60.2.0-gnu1 (pre-release). * gnu/packages/gnuzilla.scm (icecat): Update to 60.2.0-gnu1. [source]: Download pre-release from alpha.gnu.org. Remove obsolete patches. Comment out the code to delete the bundled copies of libevent, cairo, harfbuzz, and graphite2. [inputs]: Use the latest ffmpeg. Comment out libevent, cairo, harfbuzz, and graphite2. [native-inputs]: Add rust and cargo. [arguments]: Remove --enable-gio and --disable-gnomeui. Add --disable-stylo. Comment out --with-system-{libevent,harfbuzz,graphite2}, --enable-system-cairo. Import %cargo-build-system-modules. Add 'patch-cargo-checksums' phase. * gnu/packages/patches/icecat-CVE-2018-5157-and-CVE-2018-5158.patch, gnu/packages/patches/icecat-bug-1413868-pt1.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Remove them. --- gnu/local.mk | 2 - gnu/packages/gnuzilla.scm | 160 ++--- .../icecat-CVE-2018-5157-and-CVE-2018-5158.patch | 441 -------------- gnu/packages/patches/icecat-bug-1413868-pt1.patch | 663 --------------------- 4 files changed, 49 insertions(+), 1217 deletions(-) delete mode 100644 gnu/packages/patches/icecat-CVE-2018-5157-and-CVE-2018-5158.patch delete mode 100644 gnu/packages/patches/icecat-bug-1413868-pt1.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 9c69fd4f35..4097ad5fcd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -811,8 +811,6 @@ dist_patch_DATA = \ %D%/packages/patches/hurd-fix-eth-multiplexer-dependency.patch \ %D%/packages/patches/hydra-disable-darcs-test.patch \ %D%/packages/patches/icecat-avoid-bundled-libraries.patch \ - %D%/packages/patches/icecat-bug-1413868-pt1.patch \ - %D%/packages/patches/icecat-CVE-2018-5157-and-CVE-2018-5158.patch \ %D%/packages/patches/icecat-use-system-graphite2.patch \ %D%/packages/patches/icecat-use-system-harfbuzz.patch \ %D%/packages/patches/icedtea-6-hotspot-gcc-segfault-workaround.patch \ diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 77a74a0ec4..db8f85cfb1 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -35,6 +35,7 @@ #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix build-system gnu) + #:use-module (guix build-system cargo) #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages databases) @@ -58,6 +59,7 @@ #:use-module (gnu packages xorg) #:use-module (gnu packages gl) #:use-module (gnu packages assembly) + #:use-module (gnu packages rust) #:use-module (gnu packages icu4c) #:use-module (gnu packages video) #:use-module (gnu packages xdisorg) @@ -478,112 +480,25 @@ security standards.") (define-public icecat (package (name "icecat") - (version "52.6.0-gnu1") + (version "60.2.0-gnu1") (source (origin (method url-fetch) + ;; Temporary URL pending official release: + (uri "https://alpha.gnu.org/gnu/gnuzilla/60.2.0/icecat-60.2.0-gnu1.tar.bz2") + #; (uri (string-append "mirror://gnu/gnuzilla/" (first (string-split version #\-)) "/" name "-" version ".tar.bz2")) (sha256 (base32 - "09fn54glqg1aa93hnz5zdcy07cps09dbni2b4200azh6nang630a")) + "0lqx7g79x15941rhjr3qsfwsny6vzc7d7abdmvjy6jjbqkqlc1zl")) (patches (list (search-patch "icecat-avoid-bundled-libraries.patch") - (search-patch "icecat-use-system-harfbuzz.patch") - (search-patch "icecat-use-system-graphite2.patch") - (mozilla-patch "icecat-bug-546387.patch" "d13e3fefb76e" "1b760r0bg2ydbl585wlmajljh1nlisrwxvjws5b28a3sgjy01i6k") - (mozilla-patch "icecat-bug-1350152.patch" "f822bda79c28" "1wf56169ca874shr6r7qx40s17h2gwj7ngmpyylrpmd1c6hipvsj") - (mozilla-patch "icecat-bug-1411708.patch" "34c968767eb7" "0l2jy201ikj3m3h66mvlsj4y0ki7cpm7x7nnfygbwnfxg42s1sip") - (mozilla-patch "icecat-bug-1375217.patch" "00fc630c9a46" "17pcprp452nslk6sac6sili0p74zh8w3g0v1wsdn0ikm9xmnphhv") - (mozilla-patch "icecat-CVE-2018-5145.patch" "f0ec180993d2" "0jiazxcwki83wr00fyh2g518ynsd33p7nk65zk4d1682gn22lc8v") - (mozilla-patch "icecat-CVE-2018-5130.patch" "a6a9e26688c1" "0cvizvilb4k422j2gzqcbakznvsffmk6n6xn1ayj5rgxfaizkkqk") - (mozilla-patch "icecat-CVE-2018-5125-pt1.patch" "198ad052621e" "1721zx8hifdlflrhvw6hmkdgjbvsmxl9n84iji5qywhlp2krdk9r") - (mozilla-patch "icecat-bug-1426087.patch" "391ea77ebfdb" "1fhkvd0z6mvdkj7m0d3jlj42rsdw5r4x122c1wb1i428228ifw6n") - (mozilla-patch "icecat-bug-1416307.patch" "54f2f7f93b30" "1ncjir16mqya37wgf6fy2rqki3vl433c4grjr3fypmlig6xfgg1l") - (mozilla-patch "icecat-CVE-2018-5127.patch" "2c4d7a59041b" "178c6gid89cvw52yqs43i6x6s5w0hslj0rfa2r8b4762ij3civ92") - (mozilla-patch "icecat-CVE-2018-5125-pt2.patch" "f87ef3774d5e" "0payf3az2w93nzl5qknqx290jbxk8v39rwhdgq7wyd5f245dywxk") - (mozilla-patch "icecat-CVE-2018-5125-pt3.patch" "ac743923f81d" "0msyr45xr1j5q4x6ah4r907pwjngyi0k6pp9y8ixk21cnwbzrdwx") - (mozilla-patch "icecat-CVE-2018-5129.patch" "456913d7e8b5" "0fx0s06kxxj7g4hllinaskgh41z3k48zml6yqqzxx485qk3hdh9x") - (mozilla-patch "icecat-bug-1334465-pt1.patch" "f95c5b881442" "0iaddhf65jd9cycj4bw0b207n2jiqkr4q84jifzyqn4ygs75wdqd") - (mozilla-patch "icecat-bug-1334465-pt2.patch" "8a4265c8fb41" "1d9zfdbrlw9wzr84b7pj7lxgy487lsx0kfd89287hjk0al8m6vrw") - (mozilla-patch "icecat-bug-1398021.patch" "28855df568d8" "1kmq836gniplxpjnvq8lhbcc1aqi56al628r1mzdy94b5yb0lis3") - (mozilla-patch "icecat-bug-1388020.patch" "e8ab2736499b" "0n28vcd65rxsyq3z22rfcfksryfndhm1i3g6ah3akg11jnagqf5v") - (mozilla-patch "icecat-CVE-2018-5125-pt4.patch" "014877bf17ea" "0hk90pnf7h7kvidji6ydvva1zpyraipn03pjhvprdqr7k2fqzmsz") - (mozilla-patch "icecat-CVE-2018-5125-pt5.patch" "5b3a5de48912" "1ifya05rcd34ryp9zawdacihhkkf2m0xn2q8m8c6v78bvxj0mgig") - (mozilla-patch "icecat-CVE-2018-5144.patch" "1df9b4404acd" "1sd59vsarfsbh3vlrzrqv6n1ni7vxdzm83j6s6g0fygl1h8kwijg") - (mozilla-patch "icecat-bug-1430173-pt1.patch" "9124c3972e2b" "13ns5yy39yzfx7lrkv4rgwdz6s6q0z4i09wkbxdvnkfsz17cd17i") - (mozilla-patch "icecat-bug-1430173-pt2.patch" "9f6dc031be51" "0bv2p98z5ahp3x9wxnhwxn87g21djvzzp7jy55ik90hqixsbhwdl") - (mozilla-patch "icecat-CVE-2018-5131.patch" "3102fbb97b32" "0kg0183v92gxjb9255xjwhxyd6gl77l9c0civx3040k975fybwlp") - (mozilla-patch "icecat-CVE-2018-5125-pt6.patch" "4904c0f4a645" "0lsq62ynksy1fbw0m87f1d741fyvrrp1vrznx5hx0l2p4g4frhv3") - (mozilla-patch "icecat-CVE-2018-5125-pt7.patch" "16b8073d5c30" "1dv94qqah1wjd3bxjvrkmjbb2f95d3d11zpm8mggdk52il575bwl") - (mozilla-patch "icecat-bug-1442127-pt1.patch" "f931f85b09da" "02s380w8a73g4w2wm810lbigh4z4rrlfy10ywwhv4lpkbk8xg7pr") - (mozilla-patch "icecat-bug-1442127-pt2.patch" "da5792b70f30" "116k9qja5ir9b3laazasp43f5jx59qq72nknmq5bn5v1ixya9r4l") - (mozilla-patch "icecat-CVE-2018-5125-pt8.patch" "62b831df8269" "109pn0hqn7s27580glv4z7qv1pmjzii9szvf3wkn97k5wybrzgkx") - (mozilla-patch "icecat-bug-1442504.patch" "8954ce68a364" "0bl65zw82bwqg0mmcri94pxqq6ibff7y5rclkzapb081p6yvf73q") - (mozilla-patch "icecat-CVE-2018-5125-pt9.patch" "8a16f439117c" "108iarql6z7h1r4rlzac6n6lrzs78x7kcdbfa0b5dbr5xc66jmgb") - (mozilla-patch "icecat-bug-1426603.patch" "ca0b92ecedee" "0dc3mdl4a3hrq4j384zjavf3splj6blv4masign710hk7svlgbhq") - (mozilla-patch "icecat-CVE-2018-5146.patch" "494e5d5278ba" "1yb4lxjw499ppwhk31vz0vzl0cfqvj9d4jwqag7ayj53ybwsqgjr") - (mozilla-patch "icecat-CVE-2018-5147.patch" "5cd5586a2f48" "10s774pwvj6xfk3kk6ivnhp2acc8x9sqq6na8z47nkhgwl2712i5") - (mozilla-patch "icecat-CVE-2018-5148.patch" "c3e447e07077" "0gmwy631f8ip4gr1mpbjk8bx1n1748wdls5zq4y8hpmpnq5g1wyx") - (mozilla-patch "icecat-CVE-2018-5178.patch" "17201199b18d" "1d0hcim1fwh0bklwpmnal1mv9d9kmyif1m15aj1nqkf1n3x4xc37") - (mozilla-patch "icecat-bug-1361699.patch" "a07d6c3ff262" "1z8mjg2487r8pxi0x951v6fwwr696q84f6hlzimc3r7bn5ds9r83") - (mozilla-patch "icecat-CVE-2018-5150-pt01.patch" "7127ccf8f88c" "0m4my7aflpp0wlqilr2m4axd7k2fyrs7jqdcz2rrz5pwivz1anvd") - (mozilla-patch "icecat-bug-1444231.patch" "57bd35fa8618" "0pl6x5amc5x6nhwl7qnmnff3jjjxmbs8r365bfzj58g7q5ihqwvf") - (mozilla-patch "icecat-CVE-2018-5150-pt02.patch" "2f3e1ccf1661" "0azl8g81kpc0w2xpjpgm1154ll12g0a8n6i7bl3s9nnrk2i26n74") - (mozilla-patch "icecat-CVE-2018-5159.patch" "8ff2c4d68e36" "0kz1rqhnz8ca4z20hnpcafidhsrwhnm0h2gmlgchni33h8pisr1f") - (mozilla-patch "icecat-CVE-2018-5154.patch" "b8c430253efd" "1arjcaps9axhxh5ff84n9bydhhzrihn7hbq7v69nvqwqrjp3lgg9") - (mozilla-patch "icecat-CVE-2018-5155.patch" "05cadfa3ac39" "0q0vh7vy7x0l8jp6376fn10qljfp4mnp4m9zfn90j4m19pfl86a0") - (mozilla-patch "icecat-CVE-2018-5168.patch" "48a678d7cb81" "1yfh7kxxxvqck2hpn98pwag4splyc6c9brc5haq28fp8x9r9qvlk") - (mozilla-patch "icecat-CVE-2018-5150-pt03.patch" "112032576872" "1x1hxyggbxlnlj0n9cbp03hjnfvm6cq8nqj0jizrd8cfyd5aig8p") - (mozilla-patch "icecat-CVE-2018-5150-pt04.patch" "ad9a885b0df4" "1hrk1q9mk59jww55g4lqmaflznk87x3vvjn2mxfgfbbjs8l1cyz4") - (mozilla-patch "icecat-bug-1452416.patch" "f89ab96a2532" "1dqchxdyznhgyxhfq0hm0vg1p597hjqflfzigc7j3s5vxf9rg2nv") - (mozilla-patch "icecat-CVE-2018-5150-pt05.patch" "af885a1bd293" "1wfpqhm2dp4fsx6zbrncngsqz7g2x09b625zcighixrbpvybyww3") - (mozilla-patch "icecat-CVE-2018-5150-pt06.patch" "666fc84ec72d" "0lml2wqd4yqidhi364x8r90f78397k2y0kq5z5bv8l8j4bhcnb9v") - (search-patch "icecat-CVE-2018-5157-and-CVE-2018-5158.patch") - (mozilla-patch "icecat-CVE-2018-5150-pt07.patch" "1ab40761a856" "1kgwypy7k5b33jwkni4025za4kcnv5m6klsx4wsswlixmljmkbc7") - (mozilla-patch "icecat-bug-1453339.patch" "0edb8dca7087" "0b30pipqryh311sc97rcmwnx9n8qdlbbz90b2hkybjnprmbhfxrm") - (mozilla-patch "icecat-CVE-2018-5150-pt08.patch" "134c728799c1" "16hbwx6fx1hrddsyjjbd3z954ql3pg348xs13h9riyblq8crzmam") - (mozilla-patch "icecat-CVE-2018-5150-pt09.patch" "14eab155eaa8" "0wr4xgblxzk4c2gvlnpl7ic1196mrhry1hgwdl1jivq0ji5cbvbd") - (mozilla-patch "icecat-bug-1452619.patch" "2b75d55ccf0e" "1g87aybw6ggv6hyk385bplv0lx63n020gwyq0d6d4pqld48hsm1i") - (mozilla-patch "icecat-CVE-2018-5156-pt1.patch" "89857f35df29" "0gzi47svrw5ajdlm3i12193psm702zx70x5h1rwp4gb7gxh4m4d9") - (mozilla-patch "icecat-CVE-2018-5150-pt10.patch" "3f2ec03c0405" "0w02952dlxd2gmwghck2nm4rjjmc5ylg62bw6m1rvi35kcr134lr") - (mozilla-patch "icecat-CVE-2018-5183.patch" "f729bf78fb3a" "0xkj6jwxwdqkvb5c7wi16b8cm8qrnlrd3s9jnd46jg03iykrx56f") - (mozilla-patch "icecat-CVE-2018-5188-pt01.patch" "eb896089db47" "10lppk4x2d3pim71a36ky1dmg08rs5ckfiljwvfnr1cw6934qxl4") - (mozilla-patch "icecat-CVE-2018-5188-pt02.patch" "2374dca97bde" "0y1g55wvj44nzb1qfkl271jcf8s1ik8lcl1785z0zim4qzn7qkpa") - (mozilla-patch "icecat-CVE-2018-5188-pt03.patch" "70b6298e0c9e" "0n5jfy6c421dkybk8m18vd61y95zz0r64g1p1zlya3fps5knfaqi") - (mozilla-patch "icecat-CVE-2018-12365-pt1.patch" "4ef79fe9b3b7" "1c32z1ki1i6xj1nbb0xlxwqnmz48ikmy8dmp37rkjz8ssn04wgfg") - (mozilla-patch "icecat-CVE-2018-12365-pt2.patch" "9ad16112044a" "0ayya67sx7avcb8bplfdxb92l9g4mjrb1s3hby283llhqv0ikg9b") - (mozilla-patch "icecat-CVE-2018-12359.patch" "11d8a87fb6d6" "1rkmdk18llw0x1jakix75hlhy0hpsmlminnflagbzrzjli81gwm1") - (mozilla-patch "icecat-CVE-2018-5188-pt04.patch" "407b10ad1273" "16qzsfirw045xag96f1qvpdlibm8lwdj9l1mlli4n1vz0db91v9q") - (mozilla-patch "icecat-CVE-2018-6126.patch" "e76e2e481b17" "0hnx13msjy28n3bpa2c24kpzalam4bdk5gnp0f9k671l48rs9yb3") - (mozilla-patch "icecat-CVE-2018-5188-pt05.patch" "2c75bfcd465c" "1pjinj8qypafqm2fk68s3hzcbzcijn09qzrpcxvzq6bl1yfc1xfd") - (mozilla-patch "icecat-CVE-2018-5188-pt06.patch" "042f80f3befd" "0av918kin4bkrq7gnjz0h9w8kkq8rk9l93250lfl5kqrinza1gsk") - (mozilla-patch "icecat-CVE-2018-5188-pt07+bugs-1455071+1433642+1456604+1458320.patch" - "bb0451c9c4a0" "1lhm1b2a7c6jwhzsg3c830hfhp17p8j9zbcmgchpb8c5jkc3vw0x") - (mozilla-patch "icecat-CVE-2018-5188-pt08.patch" "8189b262e3b9" "13rh86ddwmj1bhv3ibbil3sv5xbqq1c9v1czgbsna5hxxkzc1y3b") - (mozilla-patch "icecat-CVE-2018-5188-pt09.patch" "9f81ae3f6e1d" "05vfg8a8jrzd93n1wvncmvdmqgf9cgsl8ryxgjs3032gbbjkga7q") - (mozilla-patch "icecat-CVE-2018-12360.patch" "face7a3dd5d7" "0jclw30mf693w8lrmvn0iankggj21nh4j3zh51q5363rj5xncdzx") - (mozilla-patch "icecat-CVE-2018-5188-pt10.patch" "7afb58c046c8" "1r0569r76712x7x1sw6xr0x06ilv6iw3fncb0f8r8b9mp6wrpx34") - (mozilla-patch "icecat-CVE-2018-12362-pt1.patch" "f1a745f8c42d" "11q73pb7a8f09xjzil4rhg5nr49zrnz1vb0prni0kqvrnppf5s40") - (mozilla-patch "icecat-CVE-2018-12362-pt2.patch" "1f9a430881cc" "0f79rv7njliqxx33z07n60b50jg0a596d1km7ayz2hivbl2d0168") - (mozilla-patch "icecat-CVE-2018-5188-pt11.patch" "28f4fc0a5141" "1a8f9z6c80in8ccj82ysdrcr2lqypp29l4acs50kwncm0c0b01zl") - (mozilla-patch "icecat-CVE-2018-12363.patch" "ad5a53a1d2b1" "0rhl4r39ydb3lkfp5pkwvhhzqgfh33s9r7b7jccgkrx6f13xyq78") - (mozilla-patch "icecat-CVE-2018-5188-pt12.patch" "0ddfc03c0454" "1b0xw2kj9765lvpl8iwr3wwcz40bdfp3dp4y9f546a61qsi9q9d6") - (mozilla-patch "icecat-CVE-2018-5156-pt2.patch" "dbf36189a364" "1awbyhy0r79i03sns2p0m78f9hb6c7kp4hwia2khx4qszlsr4j95") - (mozilla-patch "icecat-CVE-2018-5188-pt13.patch" "32509dfde003" "0cc3c92dgf5qynk093prq610c9x815l2fa24ddrw9czdzbwblsdq") - (mozilla-patch "icecat-bug-1462912.patch" "f18535a212da" "0zkqz9il89f1s1yrp5c6hj6kysy2x02iy50vgwdj30lr56gkpzmk") - (mozilla-patch "icecat-CVE-2018-5188-pt14.patch" "e8e9e1ef79f2" "0dc8p6fsppq3bhbpmp41f8mjxbr31pvgpga0a73dqdaicq5ydgj4") - (search-patch "icecat-bug-1413868-pt1.patch") - (mozilla-patch "icecat-CVE-2018-5188-pt15.patch" "9d4d31b2630d" "1lcbmsyi09kp80h1jgxj5l45zl24xn22h1lq7drbyjxsn1kggq4g") - (mozilla-patch "icecat-CVE-2018-12366-pt1.patch" "edf2c7dff493" "06xmyk7nm54cm9m6qc59wz8cxxfa5r25mf2xzdzy74iq5hwa1ac8") - (mozilla-patch "icecat-CVE-2018-5188-pt16.patch" "05549a4d1b80" "10q68cllshmmhlrbirm9h4gyc3ffrcpsxihfpcbxh90nv2h16jci") - (mozilla-patch "icecat-CVE-2018-12364.patch" "67b2d8924841" "197riigbb6l30959pygr0zlv7vaims78dg1mh0pg33pa7cbna0ds") - (mozilla-patch "icecat-CVE-2018-12366-pt2.patch" "528d4d997bb3" "0f375i96a404dkn0fanmd9pgfj3wyrhjfc5dwslw2s44gwfjhljb") - (mozilla-patch "icecat-bug-1369771.patch" "fab16ad7f256" "0kd8qm04sjgfgfg8yw3ivcxazb1d7v430g86chw4n64qybsh9ka3") - (mozilla-patch "icecat-CVE-2018-5188-pt17.patch" "068e249d02b4" "1iy9by1mg5qhp8502h31m8zm99aq2hx0c5n3hadd5pk11lfnq6ll") - (mozilla-patch "icecat-bug-1413868-pt2.patch" "755067c14b06" "089dwqwzcdg1l6aimi0i65q4dgb2iny5h8yjx63h9zgv77n0700a"))) + ;; FIXME (search-patch "icecat-use-system-harfbuzz.patch") + ;; FIXME (search-patch "icecat-use-system-graphite2.patch") + )) (modules '((guix build utils))) (snippet '(begin @@ -613,13 +528,13 @@ security standards.") "modules/freetype2" "modules/zlib" "modules/libbz2" - "ipc/chromium/src/third_party/libevent" + ;; UNBUNDLE-ME "ipc/chromium/src/third_party/libevent" "media/libjpeg" "media/libvpx" "security/nss" - "gfx/cairo" - "gfx/harfbuzz" - "gfx/graphite2" + ;; UNBUNDLE-ME "gfx/cairo" + ;; UNBUNDLE-ME "gfx/harfbuzz" + ;; UNBUNDLE-ME "gfx/graphite2" "js/src/ctypes/libffi" "db/sqlite3")) ;; Delete .pyc files, typically present in icecat source tarballs @@ -633,29 +548,29 @@ security standards.") (inputs `(("alsa-lib" ,alsa-lib) ("bzip2" ,bzip2) - ("cairo" ,cairo) + ;; UNBUNDLE-ME ("cairo" ,cairo) ("cups" ,cups) ("dbus-glib" ,dbus-glib) ("gdk-pixbuf" ,gdk-pixbuf) ("glib" ,glib) ("gtk+" ,gtk+) ("gtk+-2" ,gtk+-2) - ("graphite2" ,graphite2) + ;; UNBUNDLE-ME ("graphite2" ,graphite2) ("pango" ,pango) ("freetype" ,freetype) - ("harfbuzz" ,harfbuzz) + ;; UNBUNDLE-ME ("harfbuzz" ,harfbuzz) ("hunspell" ,hunspell) ("libcanberra" ,libcanberra) ("libgnome" ,libgnome) ("libjpeg-turbo" ,libjpeg-turbo) ("libxft" ,libxft) - ("libevent" ,libevent-2.0) + ;; UNBUNDLE-ME ("libevent" ,libevent-2.0) ("libxinerama" ,libxinerama) ("libxscrnsaver" ,libxscrnsaver) ("libxcomposite" ,libxcomposite) ("libxt" ,libxt) ("libffi" ,libffi) - ("ffmpeg" ,ffmpeg-3.4) + ("ffmpeg" ,ffmpeg) ("libvpx" ,libvpx) ("icu4c" ,icu4c) ("pixman" ,pixman) @@ -670,7 +585,9 @@ security standards.") ("zip" ,zip) ("zlib" ,zlib))) (native-inputs - `(("perl" ,perl) + `(("rust" ,rust) + ("cargo" ,rust "cargo") + ("perl" ,perl) ("python" ,python-2) ; Python 3 not supported ("python2-pysqlite" ,python2-pysqlite) ("yasm" ,yasm) @@ -687,11 +604,12 @@ security standards.") ;; practice somehow. See . #:validate-runpath? #f + #:imported-modules ,%cargo-build-system-modules ;for `generate-checksums' + #:configure-flags '("--enable-default-toolkit=cairo-gtk3" "--with-distribution-id=org.gnu" - "--enable-gio" "--enable-startup-notification" "--enable-pulseaudio" @@ -701,7 +619,9 @@ security standards.") "--disable-maintenance-service" "--disable-eme" "--disable-gconf" - "--disable-gnomeui" + + ;; Stylo requires LLVM/clang. For now, disable it. + "--disable-stylo" ;; Building with debugging symbols takes ~5GiB, so ;; disable it. @@ -716,15 +636,15 @@ security standards.") "--with-system-zlib" "--with-system-bz2" "--with-system-jpeg" ; must be libjpeg-turbo - "--with-system-libevent" + ;; UNBUNDLE-ME "--with-system-libevent" "--with-system-libvpx" "--with-system-icu" "--with-system-nspr" "--with-system-nss" - "--with-system-harfbuzz" - "--with-system-graphite2" + ;; UNBUNDLE-ME "--with-system-harfbuzz" + ;; UNBUNDLE-ME "--with-system-graphite2" "--enable-system-pixman" - "--enable-system-cairo" + ;; UNBUNDLE-ME "--enable-system-cairo" "--enable-system-ffi" "--enable-system-hunspell" "--enable-system-sqlite" @@ -774,6 +694,24 @@ security standards.") 'avcodec', 'avutil', 'pulse' ]\n\n" all))) #t)) + (add-after 'patch-source-shebangs 'patch-cargo-checksums + (lambda* _ + (use-modules (guix build cargo-build-system)) + (let ((null-file "/dev/null") + (null-hash "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")) + (substitute* '("Cargo.lock" "servo/Cargo.lock") + (("(\"checksum .* = )\".*\"" all name) + (string-append name "\"" null-hash "\""))) + (for-each + (lambda (filename) + (delete-file filename) + (let ((dir (dirname filename))) + (display (string-append + "patch-cargo-checksums: generate-checksums for " + dir "\n")) + (generate-checksums dir null-file))) + (find-files "third_party/rust" ".cargo-checksum.json"))) + #t)) (replace 'configure ;; configure does not work followed by both "SHELL=..." and diff --git a/gnu/packages/patches/icecat-CVE-2018-5157-and-CVE-2018-5158.patch b/gnu/packages/patches/icecat-CVE-2018-5157-and-CVE-2018-5158.patch deleted file mode 100644 index b776640133..0000000000 --- a/gnu/packages/patches/icecat-CVE-2018-5157-and-CVE-2018-5158.patch +++ /dev/null @@ -1,441 +0,0 @@ -Based on -Adapted to apply cleanly to GNU IceCat. - -# HG changeset patch -# User Ryan VanderMeulen -# Date 1523630807 14400 -# Node ID 608e76ec5ba25cec2271d2b400c7bce2d4c5ef79 -# Parent 10b7f43b536f93151201d44d304c991aa9af5d0c -Bug 1452075 - Backport some upstream pdf.js fixes to ESR52. r=bdahl, r=yury, a=RyanVM - -diff --git a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm ---- a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm -+++ b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm -@@ -24,17 +24,18 @@ const Cc = Components.classes; - const Ci = Components.interfaces; - const Cr = Components.results; - const Cu = Components.utils; - // True only if this is the version of pdf.js that is included with icecat. - const MOZ_CENTRAL = JSON.parse('true'); - const PDFJS_EVENT_ID = 'pdf.js.message'; - const PDF_CONTENT_TYPE = 'application/pdf'; - const PREF_PREFIX = 'pdfjs'; --const PDF_VIEWER_WEB_PAGE = 'resource://pdf.js/web/viewer.html'; -+const PDF_VIEWER_ORIGIN = "resource://pdf.js"; -+const PDF_VIEWER_WEB_PAGE = "resource://pdf.js/web/viewer.html"; - const MAX_NUMBER_OF_PREFS = 50; - const MAX_STRING_PREF_LENGTH = 128; - - Cu.import('resource://gre/modules/XPCOMUtils.jsm'); - Cu.import('resource://gre/modules/Services.jsm'); - Cu.import('resource://gre/modules/NetUtil.jsm'); - - XPCOMUtils.defineLazyModuleGetter(this, 'NetworkManager', -@@ -105,21 +106,25 @@ function log(aMsg) { - if (!getBoolPref(PREF_PREFIX + '.pdfBugEnabled', false)) { - return; - } - var msg = 'PdfStreamConverter.js: ' + (aMsg.join ? aMsg.join('') : aMsg); - Services.console.logStringMessage(msg); - dump(msg + '\n'); - } - --function getDOMWindow(aChannel) { -+function getDOMWindow(aChannel, aPrincipal) { - var requestor = aChannel.notificationCallbacks ? - aChannel.notificationCallbacks : - aChannel.loadGroup.notificationCallbacks; - var win = requestor.getInterface(Components.interfaces.nsIDOMWindow); -+ // Ensure the window wasn't navigated to something that is not PDF.js. -+ if (!win.document.nodePrincipal.equals(aPrincipal)) { -+ return null; -+ } - return win; - } - - function getLocalizedStrings(path) { - var stringBundle = Cc['@mozilla.org/intl/stringbundle;1']. - getService(Ci.nsIStringBundleService). - createBundle('chrome://pdf.js/locale/' + path); - -@@ -627,31 +632,31 @@ var RangedChromeActions = (function Rang - data = this.dataListener.readData(); - - this.dataListener.onprogress = function (loaded, total) { - self.domWindow.postMessage({ - pdfjsLoadAction: 'progressiveRead', - loaded: loaded, - total: total, - chunk: self.dataListener.readData() -- }, '*'); -+ }, PDF_VIEWER_ORIGIN); - }; - this.dataListener.oncomplete = function () { - self.dataListener = null; - }; - } - - this.domWindow.postMessage({ - pdfjsLoadAction: 'supportsRangedLoading', - rangeEnabled: this.rangeEnabled, - streamingEnabled: this.streamingEnabled, - pdfUrl: this.pdfUrl, - length: this.contentLength, - data: data -- }, '*'); -+ }, PDF_VIEWER_ORIGIN); - - return true; - }; - - proto.requestDataRange = function RangedChromeActions_requestDataRange(args) { - if (!this.rangeEnabled) { - return; - } -@@ -663,23 +668,23 @@ var RangedChromeActions = (function Rang - // errors from chrome code for non-range requests, so this doesn't - // seem high-pri - this.networkManager.requestRange(begin, end, { - onDone: function RangedChromeActions_onDone(args) { - domWindow.postMessage({ - pdfjsLoadAction: 'range', - begin: args.begin, - chunk: args.chunk -- }, '*'); -+ }, PDF_VIEWER_ORIGIN); - }, - onProgress: function RangedChromeActions_onProgress(evt) { - domWindow.postMessage({ - pdfjsLoadAction: 'rangeProgress', - loaded: evt.loaded, -- }, '*'); -+ }, PDF_VIEWER_ORIGIN); - } - }); - }; - - proto.abortLoading = function RangedChromeActions_abortLoading() { - this.networkManager.abortAllRequests(); - if (this.originalRequest) { - this.originalRequest.cancel(Cr.NS_BINDING_ABORTED); -@@ -718,26 +723,26 @@ var StandardChromeActions = (function St - var self = this; - - this.dataListener.onprogress = function ChromeActions_dataListenerProgress( - loaded, total) { - self.domWindow.postMessage({ - pdfjsLoadAction: 'progress', - loaded: loaded, - total: total -- }, '*'); -+ }, PDF_VIEWER_ORIGIN); - }; - - this.dataListener.oncomplete = - function StandardChromeActions_dataListenerComplete(data, errorCode) { - self.domWindow.postMessage({ - pdfjsLoadAction: 'complete', - data: data, - errorCode: errorCode -- }, '*'); -+ }, PDF_VIEWER_ORIGIN); - - self.dataListener = null; - self.originalRequest = null; - }; - - return true; - }; - -@@ -972,31 +977,35 @@ PdfStreamConverter.prototype = { - var proxy = { - onStartRequest: function(request, context) { - listener.onStartRequest(aRequest, aContext); - }, - onDataAvailable: function(request, context, inputStream, offset, count) { - listener.onDataAvailable(aRequest, aContext, inputStream, - offset, count); - }, -- onStopRequest: function(request, context, statusCode) { -- // We get the DOM window here instead of before the request since it -- // may have changed during a redirect. -- var domWindow = getDOMWindow(channel); -+ onStopRequest(request, context, statusCode) { -+ var domWindow = getDOMWindow(channel, resourcePrincipal); -+ if (!Components.isSuccessCode(statusCode) || !domWindow) { -+ // The request may have been aborted and the document may have been -+ // replaced with something that is not PDF.js, abort attaching. -+ listener.onStopRequest(aRequest, context, statusCode); -+ return; -+ } - var actions; - if (rangeRequest || streamRequest) { - actions = new RangedChromeActions( - domWindow, contentDispositionFilename, aRequest, - rangeRequest, streamRequest, dataListener); - } else { - actions = new StandardChromeActions( - domWindow, contentDispositionFilename, aRequest, dataListener); - } - var requestListener = new RequestListener(actions); -- domWindow.addEventListener(PDFJS_EVENT_ID, function(event) { -+ domWindow.document.addEventListener(PDFJS_EVENT_ID, function(event) { - requestListener.receive(event); - }, false, true); - if (actions.supportsIntegratedFind()) { - var findEventManager = new FindEventManager(domWindow); - findEventManager.bind(); - } - listener.onStopRequest(aRequest, aContext, statusCode); - -diff --git a/browser/extensions/pdfjs/content/build/pdf.worker.js b/browser/extensions/pdfjs/content/build/pdf.worker.js ---- a/browser/extensions/pdfjs/content/build/pdf.worker.js -+++ b/browser/extensions/pdfjs/content/build/pdf.worker.js -@@ -41648,16 +41648,32 @@ - var error = sharedUtil.error; - var info = sharedUtil.info; - var isArray = sharedUtil.isArray; - var isBool = sharedUtil.isBool; - var isDict = corePrimitives.isDict; - var isStream = corePrimitives.isStream; - var PostScriptLexer = corePsParser.PostScriptLexer; - var PostScriptParser = corePsParser.PostScriptParser; -+ function toNumberArray(arr) { -+ if (!Array.isArray(arr)) { -+ return null; -+ } -+ var length = arr.length; -+ for (var i = 0; i < length; i++) { -+ if (typeof arr[i] !== 'number') { -+ var result = new Array(length); -+ for (var j = 0; j < length; j++) { -+ result[j] = +arr[j]; -+ } -+ return result; -+ } -+ } -+ return arr; -+ } - var PDFFunction = function PDFFunctionClosure() { - var CONSTRUCT_SAMPLED = 0; - var CONSTRUCT_INTERPOLATED = 2; - var CONSTRUCT_STICHED = 3; - var CONSTRUCT_POSTSCRIPT = 4; - return { - getSampleArray: function PDFFunction_getSampleArray(size, outputSize, bps, str) { - var i, ii; -@@ -41747,43 +41763,43 @@ - out[index] = [ - arr[i], - arr[i + 1] - ]; - ++index; - } - return out; - } -- var domain = dict.getArray('Domain'); -- var range = dict.getArray('Range'); -+ var domain = toNumberArray(dict.getArray('Domain')); -+ var range = toNumberArray(dict.getArray('Range')); - if (!domain || !range) { - error('No domain or range'); - } - var inputSize = domain.length / 2; - var outputSize = range.length / 2; - domain = toMultiArray(domain); - range = toMultiArray(range); -- var size = dict.get('Size'); -+ var size = toNumberArray(dict.get('Size')); - var bps = dict.get('BitsPerSample'); - var order = dict.get('Order') || 1; - if (order !== 1) { - // No description how cubic spline interpolation works in PDF32000:2008 - // As in poppler, ignoring order, linear interpolation may work as good - info('No support for cubic spline interpolation: ' + order); - } -- var encode = dict.getArray('Encode'); -+ var encode = toNumberArray(dict.getArray('Encode')); - if (!encode) { - encode = []; - for (var i = 0; i < inputSize; ++i) { -- encode.push(0); -- encode.push(size[i] - 1); -- } -- } -- encode = toMultiArray(encode); -- var decode = dict.getArray('Decode'); -+ encode.push([0, size[i] - 1]); -+ } -+ } else { -+ encode = toMultiArray(encode); -+ } -+ var decode = toNumberArray(dict.getArray('Decode')); - if (!decode) { - decode = range; - } else { - decode = toMultiArray(decode); - } - var samples = this.getSampleArray(size, outputSize, bps, str); - return [ - CONSTRUCT_SAMPLED, -@@ -41868,22 +41884,19 @@ - // Decode_2j, Decode_2j+1) - rj = interpolate(rj, 0, 1, decode[j][0], decode[j][1]); - // y_j = min(max(r_j, range_2j), range_2j+1) - dest[destOffset + j] = Math.min(Math.max(rj, range[j][0]), range[j][1]); - } - }; - }, - constructInterpolated: function PDFFunction_constructInterpolated(str, dict) { -- var c0 = dict.getArray('C0') || [0]; -- var c1 = dict.getArray('C1') || [1]; -+ var c0 = toNumberArray(dict.getArray('C0')) || [0]; -+ var c1 = toNumberArray(dict.getArray('C1')) || [1]; - var n = dict.get('N'); -- if (!isArray(c0) || !isArray(c1)) { -- error('Illegal dictionary for interpolated function'); -- } - var length = c0.length; - var diff = []; - for (var i = 0; i < length; ++i) { - diff.push(c1[i] - c0[i]); - } - return [ - CONSTRUCT_INTERPOLATED, - c0, -@@ -41899,49 +41912,45 @@ - return function constructInterpolatedFromIRResult(src, srcOffset, dest, destOffset) { - var x = n === 1 ? src[srcOffset] : Math.pow(src[srcOffset], n); - for (var j = 0; j < length; ++j) { - dest[destOffset + j] = c0[j] + x * diff[j]; - } - }; - }, - constructStiched: function PDFFunction_constructStiched(fn, dict, xref) { -- var domain = dict.getArray('Domain'); -+ var domain = toNumberArray(dict.getArray('Domain')); - if (!domain) { - error('No domain'); - } - var inputSize = domain.length / 2; - if (inputSize !== 1) { - error('Bad domain for stiched function'); - } - var fnRefs = dict.get('Functions'); - var fns = []; - for (var i = 0, ii = fnRefs.length; i < ii; ++i) { -- fns.push(PDFFunction.getIR(xref, xref.fetchIfRef(fnRefs[i]))); -- } -- var bounds = dict.getArray('Bounds'); -- var encode = dict.getArray('Encode'); -+ fns.push(PDFFunction.parse(xref, xref.fetchIfRef(fnRefs[i]))); -+ } -+ var bounds = toNumberArray(dict.getArray('Bounds')); -+ var encode = toNumberArray(dict.getArray('Encode')); - return [ - CONSTRUCT_STICHED, - domain, - bounds, - encode, - fns - ]; - }, - constructStichedFromIR: function PDFFunction_constructStichedFromIR(IR) { - var domain = IR[1]; - var bounds = IR[2]; - var encode = IR[3]; -- var fnsIR = IR[4]; -- var fns = []; -+ var fns = IR[4]; - var tmpBuf = new Float32Array(1); -- for (var i = 0, ii = fnsIR.length; i < ii; i++) { -- fns.push(PDFFunction.fromIR(fnsIR[i])); -- } - return function constructStichedFromIRResult(src, srcOffset, dest, destOffset) { - var clip = function constructStichedFromIRClip(v, min, max) { - if (v > max) { - v = max; - } else if (v < min) { - v = min; - } - return v; -@@ -41968,18 +41977,18 @@ - // Prevent the value from becoming NaN as a result - // of division by zero (fixes issue6113.pdf). - tmpBuf[0] = dmin === dmax ? rmin : rmin + (v - dmin) * (rmax - rmin) / (dmax - dmin); - // call the appropriate function - fns[i](tmpBuf, 0, dest, destOffset); - }; - }, - constructPostScript: function PDFFunction_constructPostScript(fn, dict, xref) { -- var domain = dict.getArray('Domain'); -- var range = dict.getArray('Range'); -+ var domain = toNumberArray(dict.getArray('Domain')); -+ var range = toNumberArray(dict.getArray('Range')); - if (!domain) { - error('No domain.'); - } - if (!range) { - error('No range.'); - } - var lexer = new PostScriptLexer(fn); - var parser = new PostScriptParser(lexer); -@@ -42928,18 +42937,18 @@ - case 'IndexedCS': - var baseIndexedCS = IR[1]; - var hiVal = IR[2]; - var lookup = IR[3]; - return new IndexedCS(ColorSpace.fromIR(baseIndexedCS), hiVal, lookup); - case 'AlternateCS': - var numComps = IR[1]; - var alt = IR[2]; -- var tintFnIR = IR[3]; -- return new AlternateCS(numComps, ColorSpace.fromIR(alt), PDFFunction.fromIR(tintFnIR)); -+ var tintFn = IR[3]; -+ return new AlternateCS(numComps, ColorSpace.fromIR(alt), tintFn); - case 'LabCS': - whitePoint = IR[1]; - blackPoint = IR[2]; - var range = IR[3]; - return new LabCS(whitePoint, blackPoint, range); - default: - error('Unknown name ' + name); - } -@@ -43067,22 +43076,22 @@ - var name = xref.fetchIfRef(cs[1]); - numComps = 1; - if (isName(name)) { - numComps = 1; - } else if (isArray(name)) { - numComps = name.length; - } - alt = ColorSpace.parseToIR(cs[2], xref, res); -- var tintFnIR = PDFFunction.getIR(xref, xref.fetchIfRef(cs[3])); -+ var tintFn = PDFFunction.parse(xref, xref.fetchIfRef(cs[3])); - return [ - 'AlternateCS', - numComps, - alt, -- tintFnIR -+ tintFn - ]; - case 'Lab': - params = xref.fetchIfRef(cs[1]); - whitePoint = params.getArray('WhitePoint'); - blackPoint = params.getArray('BlackPoint'); - var range = params.getArray('Range'); - return [ - 'LabCS', -@@ -52483,9 +52492,9 @@ - initializeWorker(); - } - exports.setPDFNetworkStreamClass = setPDFNetworkStreamClass; - exports.WorkerTask = WorkerTask; - exports.WorkerMessageHandler = WorkerMessageHandler; - })); - }.call(pdfjsLibs)); - exports.WorkerMessageHandler = pdfjsLibs.pdfjsCoreWorker.WorkerMessageHandler; --})); -\ No newline at end of file -+})); - diff --git a/gnu/packages/patches/icecat-bug-1413868-pt1.patch b/gnu/packages/patches/icecat-bug-1413868-pt1.patch deleted file mode 100644 index 18382dc33a..0000000000 --- a/gnu/packages/patches/icecat-bug-1413868-pt1.patch +++ /dev/null @@ -1,663 +0,0 @@ -Based on -Adapted to apply cleanly to GNU IceCat. - -# HG changeset patch -# User Honza Bambas -# Date 1528830658 14400 -# Node ID 431fa5dd4016bdab7e4bb0d3c4df85468fe337b0 -# Parent e8e9e1ef79f2a18c61ec1b87cfb214c8d4960f8e -Bug 1413868. r=valentin, a=RyanVM - -diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp ---- a/toolkit/xre/nsAppRunner.cpp -+++ b/toolkit/xre/nsAppRunner.cpp -@@ -4,16 +4,17 @@ - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - - #include "mozilla/dom/ContentParent.h" - #include "mozilla/dom/ContentChild.h" - #include "mozilla/ipc/GeckoChildProcessHost.h" - - #include "mozilla/ArrayUtils.h" - #include "mozilla/Attributes.h" -+#include "mozilla/FilePreferences.h" - #include "mozilla/ChaosMode.h" - #include "mozilla/IOInterposer.h" - #include "mozilla/Likely.h" - #include "mozilla/MemoryChecking.h" - #include "mozilla/Poison.h" - #include "mozilla/Preferences.h" - #include "mozilla/ScopeExit.h" - #include "mozilla/Services.h" -@@ -4304,16 +4305,20 @@ XREMain::XRE_mainRun() - // Need to write out the fact that the profile has been removed and potentially - // that the selected/default profile changed. - mProfileSvc->Flush(); - } - } - - mDirProvider.DoStartup(); - -+ // As FilePreferences need the profile directory, we must initialize right here. -+ mozilla::FilePreferences::InitDirectoriesWhitelist(); -+ mozilla::FilePreferences::InitPrefs(); -+ - OverrideDefaultLocaleIfNeeded(); - - #ifdef MOZ_CRASHREPORTER - nsCString userAgentLocale; - // Try a localized string first. This pref is always a localized string in - // IceCatMobile, and might be elsewhere, too. - if (NS_SUCCEEDED(Preferences::GetLocalizedCString("general.useragent.locale", &userAgentLocale))) { - CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("useragent_locale"), userAgentLocale); -diff --git a/toolkit/xre/nsEmbedFunctions.cpp b/toolkit/xre/nsEmbedFunctions.cpp ---- a/toolkit/xre/nsEmbedFunctions.cpp -+++ b/toolkit/xre/nsEmbedFunctions.cpp -@@ -46,16 +46,17 @@ - #include "nsX11ErrorHandler.h" - #include "nsGDKErrorHandler.h" - #include "base/at_exit.h" - #include "base/command_line.h" - #include "base/message_loop.h" - #include "base/process_util.h" - #include "chrome/common/child_process.h" - -+#include "mozilla/FilePreferences.h" - #include "mozilla/ipc/BrowserProcessSubThread.h" - #include "mozilla/ipc/GeckoChildProcessHost.h" - #include "mozilla/ipc/IOThreadChild.h" - #include "mozilla/ipc/ProcessChild.h" - #include "ScopedXREEmbed.h" - - #include "mozilla/plugins/PluginProcessChild.h" - #include "mozilla/dom/ContentProcess.h" -@@ -680,16 +681,18 @@ XRE_InitChildProcess(int aArgc, - ::SetProcessShutdownParameters(0x280 - 1, SHUTDOWN_NORETRY); - #endif - - #if defined(MOZ_SANDBOX) && defined(XP_WIN) - // We need to do this after the process has been initialised, as - // InitLoggingIfRequired may need access to prefs. - mozilla::sandboxing::InitLoggingIfRequired(aChildData->ProvideLogFunction); - #endif -+ mozilla::FilePreferences::InitDirectoriesWhitelist(); -+ mozilla::FilePreferences::InitPrefs(); - - OverrideDefaultLocaleIfNeeded(); - - #if defined(MOZ_CRASHREPORTER) - #if defined(MOZ_CONTENT_SANDBOX) && !defined(MOZ_WIDGET_GONK) - AddContentSandboxLevelAnnotation(); - #endif - #endif -diff --git a/xpcom/io/FilePreferences.cpp b/xpcom/io/FilePreferences.cpp -new file mode 100644 ---- /dev/null -+++ b/xpcom/io/FilePreferences.cpp -@@ -0,0 +1,271 @@ -+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -+/* vim: set ts=8 sts=2 et sw=2 tw=80: */ -+/* This Source Code Form is subject to the terms of the Mozilla Public -+* License, v. 2.0. If a copy of the MPL was not distributed with this -+* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+ -+#include "FilePreferences.h" -+ -+#include "mozilla/Preferences.h" -+#include "nsAppDirectoryServiceDefs.h" -+#include "nsDirectoryServiceDefs.h" -+#include "nsDirectoryServiceUtils.h" -+ -+namespace mozilla { -+namespace FilePreferences { -+ -+static bool sBlockUNCPaths = false; -+typedef nsTArray Paths; -+ -+static Paths& PathArray() -+{ -+ static Paths sPaths; -+ return sPaths; -+} -+ -+static void AllowDirectory(char const* directory) -+{ -+ nsCOMPtr file; -+ NS_GetSpecialDirectory(directory, getter_AddRefs(file)); -+ if (!file) { -+ return; -+ } -+ -+ nsString path; -+ if (NS_FAILED(file->GetTarget(path))) { -+ return; -+ } -+ -+ // The whitelist makes sense only for UNC paths, because this code is used -+ // to block only UNC paths, hence, no need to add non-UNC directories here -+ // as those would never pass the check. -+ if (!StringBeginsWith(path, NS_LITERAL_STRING("\\\\"))) { -+ return; -+ } -+ -+ if (!PathArray().Contains(path)) { -+ PathArray().AppendElement(path); -+ } -+} -+ -+void InitPrefs() -+{ -+ sBlockUNCPaths = Preferences::GetBool("network.file.disable_unc_paths", false); -+} -+ -+void InitDirectoriesWhitelist() -+{ -+ // NS_GRE_DIR is the installation path where the binary resides. -+ AllowDirectory(NS_GRE_DIR); -+ // NS_APP_USER_PROFILE_50_DIR and NS_APP_USER_PROFILE_LOCAL_50_DIR are the two -+ // parts of the profile we store permanent and local-specific data. -+ AllowDirectory(NS_APP_USER_PROFILE_50_DIR); -+ AllowDirectory(NS_APP_USER_PROFILE_LOCAL_50_DIR); -+} -+ -+namespace { // anon -+ -+class Normalizer -+{ -+public: -+ Normalizer(const nsAString& aFilePath, const char16_t aSeparator); -+ bool Get(nsAString& aNormalizedFilePath); -+ -+private: -+ bool ConsumeItem(); -+ bool ConsumeSeparator(); -+ bool IsEOF() { return mFilePathCursor == mFilePathEnd; } -+ -+ bool ConsumeName(); -+ bool CheckParentDir(); -+ bool CheckCurrentDir(); -+ -+ nsString::const_char_iterator mFilePathCursor; -+ nsString::const_char_iterator mFilePathEnd; -+ -+ nsDependentSubstring mItem; -+ char16_t const mSeparator; -+ nsTArray mStack; -+}; -+ -+Normalizer::Normalizer(const nsAString& aFilePath, const char16_t aSeparator) -+ : mFilePathCursor(aFilePath.BeginReading()) -+ , mFilePathEnd(aFilePath.EndReading()) -+ , mSeparator(aSeparator) -+{ -+} -+ -+bool Normalizer::ConsumeItem() -+{ -+ if (IsEOF()) { -+ return false; -+ } -+ -+ nsString::const_char_iterator nameBegin = mFilePathCursor; -+ while (mFilePathCursor != mFilePathEnd) { -+ if (*mFilePathCursor == mSeparator) { -+ break; // don't include the separator -+ } -+ ++mFilePathCursor; -+ } -+ -+ mItem.Rebind(nameBegin, mFilePathCursor); -+ return true; -+} -+ -+bool Normalizer::ConsumeSeparator() -+{ -+ if (IsEOF()) { -+ return false; -+ } -+ -+ if (*mFilePathCursor != mSeparator) { -+ return false; -+ } -+ -+ ++mFilePathCursor; -+ return true; -+} -+ -+bool Normalizer::Get(nsAString& aNormalizedFilePath) -+{ -+ aNormalizedFilePath.Truncate(); -+ -+ if (IsEOF()) { -+ return true; -+ } -+ if (ConsumeSeparator()) { -+ aNormalizedFilePath.Append(mSeparator); -+ } -+ -+ if (IsEOF()) { -+ return true; -+ } -+ if (ConsumeSeparator()) { -+ aNormalizedFilePath.Append(mSeparator); -+ } -+ -+ while (!IsEOF()) { -+ if (!ConsumeName()) { -+ return false; -+ } -+ } -+ -+ for (auto const& name : mStack) { -+ aNormalizedFilePath.Append(name); -+ } -+ -+ return true; -+} -+ -+bool Normalizer::ConsumeName() -+{ -+ if (!ConsumeItem()) { -+ return true; -+ } -+ -+ if (CheckCurrentDir()) { -+ return true; -+ } -+ -+ if (CheckParentDir()) { -+ if (!mStack.Length()) { -+ // This means there are more \.. than valid names -+ return false; -+ } -+ -+ mStack.RemoveElementAt(mStack.Length() - 1); -+ return true; -+ } -+ -+ if (mItem.IsEmpty()) { -+ // this means an empty name (a lone slash), which is illegal -+ return false; -+ } -+ -+ if (ConsumeSeparator()) { -+ mItem.Rebind(mItem.BeginReading(), mFilePathCursor); -+ } -+ mStack.AppendElement(mItem); -+ -+ return true; -+} -+ -+bool Normalizer::CheckCurrentDir() -+{ -+ if (mItem == NS_LITERAL_STRING(".")) { -+ ConsumeSeparator(); -+ // EOF is acceptable -+ return true; -+ } -+ -+ return false; -+} -+ -+bool Normalizer::CheckParentDir() -+{ -+ if (mItem == NS_LITERAL_STRING("..")) { -+ ConsumeSeparator(); -+ // EOF is acceptable -+ return true; -+ } -+ -+ return false; -+} -+ -+} // anon -+ -+bool IsBlockedUNCPath(const nsAString& aFilePath) -+{ -+ if (!sBlockUNCPaths) { -+ return false; -+ } -+ -+ if (!StringBeginsWith(aFilePath, NS_LITERAL_STRING("\\\\"))) { -+ return false; -+ } -+ -+ nsAutoString normalized; -+ if (!Normalizer(aFilePath, L'\\').Get(normalized)) { -+ // Broken paths are considered invalid and thus inaccessible -+ return true; -+ } -+ -+ for (const auto& allowedPrefix : PathArray()) { -+ if (StringBeginsWith(normalized, allowedPrefix)) { -+ if (normalized.Length() == allowedPrefix.Length()) { -+ return false; -+ } -+ if (normalized[allowedPrefix.Length()] == L'\\') { -+ return false; -+ } -+ -+ // When we are here, the path has a form "\\path\prefixevil" -+ // while we have an allowed prefix of "\\path\prefix". -+ // Note that we don't want to add a slash to the end of a prefix -+ // so that opening the directory (no slash at the end) still works. -+ break; -+ } -+ } -+ -+ return true; -+} -+ -+void testing::SetBlockUNCPaths(bool aBlock) -+{ -+ sBlockUNCPaths = aBlock; -+} -+ -+void testing::AddDirectoryToWhitelist(nsAString const & aPath) -+{ -+ PathArray().AppendElement(aPath); -+} -+ -+bool testing::NormalizePath(nsAString const & aPath, nsAString & aNormalized) -+{ -+ Normalizer normalizer(aPath, L'\\'); -+ return normalizer.Get(aNormalized); -+} -+ -+} // ::FilePreferences -+} // ::mozilla -diff --git a/xpcom/io/FilePreferences.h b/xpcom/io/FilePreferences.h -new file mode 100644 ---- /dev/null -+++ b/xpcom/io/FilePreferences.h -@@ -0,0 +1,25 @@ -+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -+/* vim: set ts=8 sts=2 et sw=2 tw=80: */ -+/* This Source Code Form is subject to the terms of the Mozilla Public -+* License, v. 2.0. If a copy of the MPL was not distributed with this -+* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+ -+#include "nsIObserver.h" -+ -+namespace mozilla { -+namespace FilePreferences { -+ -+void InitPrefs(); -+void InitDirectoriesWhitelist(); -+bool IsBlockedUNCPath(const nsAString& aFilePath); -+ -+namespace testing { -+ -+void SetBlockUNCPaths(bool aBlock); -+void AddDirectoryToWhitelist(nsAString const& aPath); -+bool NormalizePath(nsAString const & aPath, nsAString & aNormalized); -+ -+} -+ -+} // FilePreferences -+} // mozilla -diff --git a/xpcom/io/moz.build b/xpcom/io/moz.build ---- a/xpcom/io/moz.build -+++ b/xpcom/io/moz.build -@@ -79,24 +79,26 @@ EXPORTS += [ - 'nsUnicharInputStream.h', - 'nsWildCard.h', - 'SlicedInputStream.h', - 'SpecialSystemDirectory.h', - ] - - EXPORTS.mozilla += [ - 'Base64.h', -+ 'FilePreferences.h', - 'SnappyCompressOutputStream.h', - 'SnappyFrameUtils.h', - 'SnappyUncompressInputStream.h', - ] - - UNIFIED_SOURCES += [ - 'Base64.cpp', - 'crc32c.c', -+ 'FilePreferences.cpp', - 'nsAnonymousTemporaryFile.cpp', - 'nsAppFileLocationProvider.cpp', - 'nsBinaryStream.cpp', - 'nsDirectoryService.cpp', - 'nsEscape.cpp', - 'nsInputStreamTee.cpp', - 'nsIOUtil.cpp', - 'nsLinebreakConverter.cpp', -diff --git a/xpcom/io/nsLocalFileWin.cpp b/xpcom/io/nsLocalFileWin.cpp ---- a/xpcom/io/nsLocalFileWin.cpp -+++ b/xpcom/io/nsLocalFileWin.cpp -@@ -41,16 +41,17 @@ - #include - #include - #include - - #include "nsXPIDLString.h" - #include "prproces.h" - #include "prlink.h" - -+#include "mozilla/FilePreferences.h" - #include "mozilla/Mutex.h" - #include "SpecialSystemDirectory.h" - - #include "nsTraceRefcnt.h" - #include "nsXPCOMCIDInternal.h" - #include "nsThreadUtils.h" - #include "nsXULAppAPI.h" - -@@ -1162,16 +1163,20 @@ nsLocalFile::InitWithPath(const nsAStrin - char16_t secondChar = *(++begin); - - // just do a sanity check. if it has any forward slashes, it is not a Native path - // on windows. Also, it must have a colon at after the first char. - if (FindCharInReadable(L'/', begin, end)) { - return NS_ERROR_FILE_UNRECOGNIZED_PATH; - } - -+ if (FilePreferences::IsBlockedUNCPath(aFilePath)) { -+ return NS_ERROR_FILE_ACCESS_DENIED; -+ } -+ - if (secondChar != L':' && (secondChar != L'\\' || firstChar != L'\\')) { - return NS_ERROR_FILE_UNRECOGNIZED_PATH; - } - - if (secondChar == L':') { - // Make sure we have a valid drive, later code assumes the drive letter - // is a single char a-z or A-Z. - if (PathGetDriveNumberW(aFilePath.Data()) == -1) { -@@ -1974,16 +1979,20 @@ nsLocalFile::CopySingleFile(nsIFile* aSo - bool path1Remote, path2Remote; - if (!IsRemoteFilePath(filePath.get(), path1Remote) || - !IsRemoteFilePath(destPath.get(), path2Remote) || - path1Remote || path2Remote) { - dwCopyFlags |= COPY_FILE_NO_BUFFERING; - } - } - -+ if (FilePreferences::IsBlockedUNCPath(destPath)) { -+ return NS_ERROR_FILE_ACCESS_DENIED; -+ } -+ - if (!move) { - copyOK = ::CopyFileExW(filePath.get(), destPath.get(), nullptr, - nullptr, nullptr, dwCopyFlags); - } else { - copyOK = ::MoveFileExW(filePath.get(), destPath.get(), - MOVEFILE_REPLACE_EXISTING); - - // Check if copying the source file to a different volume, -diff --git a/xpcom/tests/gtest/TestFilePreferencesWin.cpp b/xpcom/tests/gtest/TestFilePreferencesWin.cpp -new file mode 100644 ---- /dev/null -+++ b/xpcom/tests/gtest/TestFilePreferencesWin.cpp -@@ -0,0 +1,141 @@ -+#include "gtest/gtest.h" -+ -+#include "mozilla/FilePreferences.h" -+#include "nsIFile.h" -+#include "nsXPCOMCID.h" -+ -+TEST(FilePreferencesWin, Normalization) -+{ -+ nsAutoString normalized; -+ -+ mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("foo"), normalized); -+ ASSERT_TRUE(normalized == NS_LITERAL_STRING("foo")); -+ -+ mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\foo"), normalized); -+ ASSERT_TRUE(normalized == NS_LITERAL_STRING("\\foo")); -+ -+ mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\foo"), normalized); -+ ASSERT_TRUE(normalized == NS_LITERAL_STRING("\\\\foo")); -+ -+ mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("foo\\some"), normalized); -+ ASSERT_TRUE(normalized == NS_LITERAL_STRING("foo\\some")); -+ -+ mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\.\\foo"), normalized); -+ ASSERT_TRUE(normalized == NS_LITERAL_STRING("\\\\foo")); -+ -+ mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\."), normalized); -+ ASSERT_TRUE(normalized == NS_LITERAL_STRING("\\\\")); -+ -+ mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\.\\"), normalized); -+ ASSERT_TRUE(normalized == NS_LITERAL_STRING("\\\\")); -+ -+ mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\.\\."), normalized); -+ ASSERT_TRUE(normalized == NS_LITERAL_STRING("\\\\")); -+ -+ mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\foo\\bar"), normalized); -+ ASSERT_TRUE(normalized == NS_LITERAL_STRING("\\\\foo\\bar")); -+ -+ mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\foo\\bar\\"), normalized); -+ ASSERT_TRUE(normalized == NS_LITERAL_STRING("\\\\foo\\bar\\")); -+ -+ mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\foo\\bar\\."), normalized); -+ ASSERT_TRUE(normalized == NS_LITERAL_STRING("\\\\foo\\bar\\")); -+ -+ mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\foo\\bar\\.\\"), normalized); -+ ASSERT_TRUE(normalized == NS_LITERAL_STRING("\\\\foo\\bar\\")); -+ -+ mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\foo\\bar\\..\\"), normalized); -+ ASSERT_TRUE(normalized == NS_LITERAL_STRING("\\\\foo\\")); -+ -+ mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\foo\\bar\\.."), normalized); -+ ASSERT_TRUE(normalized == NS_LITERAL_STRING("\\\\foo\\")); -+ -+ mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\foo\\..\\bar\\..\\"), normalized); -+ ASSERT_TRUE(normalized == NS_LITERAL_STRING("\\\\")); -+ -+ mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\foo\\..\\bar"), normalized); -+ ASSERT_TRUE(normalized == NS_LITERAL_STRING("\\\\bar")); -+ -+ mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\foo\\bar\\..\\..\\"), normalized); -+ ASSERT_TRUE(normalized == NS_LITERAL_STRING("\\\\")); -+ -+ mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\foo\\bar\\.\\..\\.\\..\\"), normalized); -+ ASSERT_TRUE(normalized == NS_LITERAL_STRING("\\\\")); -+ -+ bool result; -+ -+ result = mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\.."), normalized); -+ ASSERT_FALSE(result); -+ -+ result = mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\..\\"), normalized); -+ ASSERT_FALSE(result); -+ -+ result = mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\.\\..\\"), normalized); -+ ASSERT_FALSE(result); -+ -+ result = mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\foo\\\\bar"), normalized); -+ ASSERT_FALSE(result); -+ -+ result = mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\foo\\bar\\..\\..\\..\\..\\"), normalized); -+ ASSERT_FALSE(result); -+ -+ result = mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\\\"), normalized); -+ ASSERT_FALSE(result); -+ -+ result = mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\.\\\\"), normalized); -+ ASSERT_FALSE(result); -+ -+ result = mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\..\\\\"), normalized); -+ ASSERT_FALSE(result); -+} -+ -+TEST(FilePreferencesWin, AccessUNC) -+{ -+ nsCOMPtr lf = do_CreateInstance(NS_LOCAL_FILE_CONTRACTID); -+ -+ nsresult rv; -+ -+ mozilla::FilePreferences::testing::SetBlockUNCPaths(false); -+ -+ rv = lf->InitWithPath(NS_LITERAL_STRING("\\\\nice\\..\\evil\\share")); -+ ASSERT_EQ(rv, NS_OK); -+ -+ mozilla::FilePreferences::testing::SetBlockUNCPaths(true); -+ -+ rv = lf->InitWithPath(NS_LITERAL_STRING("\\\\nice\\..\\evil\\share")); -+ ASSERT_EQ(rv, NS_ERROR_FILE_ACCESS_DENIED); -+ -+ mozilla::FilePreferences::testing::AddDirectoryToWhitelist(NS_LITERAL_STRING("\\\\nice")); -+ -+ rv = lf->InitWithPath(NS_LITERAL_STRING("\\\\nice\\share")); -+ ASSERT_EQ(rv, NS_OK); -+ -+ rv = lf->InitWithPath(NS_LITERAL_STRING("\\\\nice\\..\\evil\\share")); -+ ASSERT_EQ(rv, NS_ERROR_FILE_ACCESS_DENIED); -+} -diff --git a/xpcom/tests/gtest/moz.build b/xpcom/tests/gtest/moz.build ---- a/xpcom/tests/gtest/moz.build -+++ b/xpcom/tests/gtest/moz.build -@@ -51,16 +51,21 @@ UNIFIED_SOURCES += [ - if CONFIG['MOZ_DEBUG'] and CONFIG['OS_ARCH'] not in ('WINNT') and CONFIG['OS_TARGET'] != 'Android': - # FIXME bug 523392: TestDeadlockDetector doesn't like Windows - # Bug 1054249: Doesn't work on Android - UNIFIED_SOURCES += [ - 'TestDeadlockDetector.cpp', - 'TestDeadlockDetectorScalability.cpp', - ] - -+if CONFIG['OS_TARGET'] == 'WINNT': -+ UNIFIED_SOURCES += [ -+ 'TestFilePreferencesWin.cpp', -+ ] -+ - if CONFIG['WRAP_STL_INCLUDES'] and not CONFIG['CLANG_CL']: - UNIFIED_SOURCES += [ - 'TestSTLWrappers.cpp', - ] - - # Compile TestAllocReplacement separately so Windows headers don't pollute - # the global namespace for other files. - SOURCES += [ - -- cgit v1.2.3 From 2aa137e261984b9762de5221459835eefb165fe7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 13:29:38 +0200 Subject: gnu: crossguid: Use INVOKE. * gnu/packages/kodi.scm (crossguid)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/kodi.scm | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index 62a971a0a8..2df5735dd0 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2015 David Thompson ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017 Oleg Pykhalov +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -92,22 +93,22 @@ (arguments '(#:phases (modify-phases %standard-phases - (delete 'configure) ; no configure script + (delete 'configure) ; no configure script ;; There's no build system here, so we have to do it ourselves. (replace 'build (lambda _ - (and (zero? (system* "g++" "-c" "guid.cpp" "-o" "guid.o" - "-std=c++11" "-DGUID_LIBUUID")) - (zero? (system* "ar" "rvs" "libcrossguid.a" "guid.o"))))) + (invoke "g++" "-c" "guid.cpp" "-o" "guid.o" + "-std=c++11" "-DGUID_LIBUUID") + (invoke "ar" "rvs" "libcrossguid.a" "guid.o"))) (replace 'check (lambda _ - (and (zero? (system* "g++" "-c" "test.cpp" "-o" "test.o" - "-std=c++11")) - (zero? (system* "g++" "-c" "testmain.cpp" "-o" "testmain.o" - "-std=c++11")) - (zero? (system* "g++" "test.o" "guid.o" "testmain.o" - "-o" "test" "-luuid")) - (zero? (system* (string-append (getcwd) "/test")))))) + (invoke "g++" "-c" "test.cpp" "-o" "test.o" + "-std=c++11") + (invoke "g++" "-c" "testmain.cpp" "-o" "testmain.o" + "-std=c++11") + (invoke "g++" "test.o" "guid.o" "testmain.o" + "-o" "test" "-luuid") + (invoke (string-append (getcwd) "/test")))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) -- cgit v1.2.3 From 93ab9a5d76b8b84afd6823e2cdd1f62c9e6284f2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 13:29:54 +0200 Subject: gnu: kodi: Use INVOKE. * gnu/packages/kodi.scm (kodi)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/kodi.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index 2df5735dd0..86ce914d53 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -295,7 +295,7 @@ generator library for C++.") "lib/cpluff"))) (every (lambda (third-party) (with-directory-excursion third-party - (zero? (system* "autoreconf" "-vif")))) + (invoke "autoreconf" "-vif"))) dirs)))) (add-after 'bootstrap-bundled-software 'patch-stuff (lambda* (#:key inputs #:allow-other-keys) @@ -336,7 +336,7 @@ generator library for C++.") #t)) (add-before 'check 'build-kodi-test (lambda _ - (zero? (system* "make" "kodi-test"))))))) + (invoke "make" "kodi-test")))))) ;; TODO: Add dependencies for: ;; - nfs ;; - cec -- cgit v1.2.3 From eacb5dc4871aadac965024aeab06f48362abba47 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 13:54:32 +0200 Subject: gnu: emacs-mu4e-conversation: Fix typo in description. * gnu/packages/emacs.scm (emacs-mu4e-conversation)[description]: Fix 'correspondant' typo. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index fc019cf241..977f0c99b8 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -11705,8 +11705,8 @@ file.") (synopsis "Show a complete thread in a single buffer") (description - "This package offers an alternate view to mu4e e-mail display. It -shows all e-mails of a thread in a single view, where each correspondant has + "This package offers an alternate view to mu4e's e-mail display. It +shows all e-mails of a thread in a single view, where each correspondent has their own face. Threads can be displayed linearly (in which case e-mails are displayed in chronological order) or as an Org document where the node tree maps the thread tree.") -- cgit v1.2.3 From 41e551b2d3ea24ffd96023d1b6c3648de3aac90d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 14:00:53 +0200 Subject: gnu: python-pyparsing: Update home page. * gnu/packages/python.scm (python-pyparsing)[home-page]: Update. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 64ee4e028e..a11c7e315e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3382,7 +3382,7 @@ library, libgit2 implements Git plumbing.") (list "docs" "htmldoc" "examples") (list doc html-doc examples)) #t)))))) - (home-page "http://pyparsing.wikispaces.com") + (home-page "https://github.com/pyparsing/pyparsing") (synopsis "Python parsing class library") (description "The pyparsing module is an alternative approach to creating and -- cgit v1.2.3 From 118a084531a546ccad0762b5ac7d564619183d6b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 14:55:20 +0200 Subject: gnu: libfilezilla: Update to 0.13.2. * gnu/packages/ftp.scm (libfilezilla): Update to 0.13.2. [source]: Use HTTPS. --- gnu/packages/ftp.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm index d3f3ef711c..335c975d12 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm @@ -170,15 +170,15 @@ as required.") (define-public libfilezilla (package (name "libfilezilla") - (version "0.13.1") + (version "0.13.2") (source (origin (method url-fetch) - (uri (string-append "http://download.filezilla-project.org/" + (uri (string-append "https://download.filezilla-project.org/" name "/" name "-" version ".tar.bz2")) (sha256 (base32 - "0347zkapp0wrhfm1yzw7wa1v3lww65ch176scifxn8f9068f1ixb")))) + "0z9cqscca4w94j9npgcknrrw8gfwn5ids903042fczlr977j0i19")))) (build-system gnu-build-system) (native-inputs `(("cppunit" ,cppunit) -- cgit v1.2.3 From 10e066f410d1ffb9505f4fd0b5cc73e8af2154b0 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Fri, 21 Sep 2018 15:21:24 +0200 Subject: gnu: rust: Remove unused "localstatedir" setting. * gnu/packages/rust.scm (rust-1.20)[arguments]<#:phases>[configure]: Remove unused "localstatedir" setting. --- gnu/packages/rust.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index e8eca80aa6..40633854ae 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -562,7 +562,6 @@ submodules = false prefix = \"" out "\" docdir = \"" doc "/share/doc/rust" "\" sysconfdir = \"etc\" -localstatedir = \"var/lib\" [rust] default-linker = \"" gcc "/bin/gcc" "\" channel = \"stable\" -- cgit v1.2.3 From b0d1e60fff023e405c92c45b3c78538c3cbb7e6b Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Thu, 20 Sep 2018 18:59:56 +0100 Subject: gnu: hdf5: Allow for absence of utility script. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (hdf5)[arguments]: Add condition to 'split' phase to check for existence of h5fc script. Signed-off-by: Ludovic Courtès --- gnu/packages/maths.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 736bac163e..30f1610c1d 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -814,8 +814,11 @@ incompatible with HDF5.") (mkdir-p flib) (mkdir-p finc) (mkdir-p fex) - (rename-file (string-append bin "/h5fc") - (string-append fbin "/h5fc")) + ;; Note: When built with --enable-parallel, the 'h5fc' file + ;; doesn't exist, hence this condition. + (when (file-exists? (string-append bin "/h5fc")) + (rename-file (string-append bin "/h5fc") + (string-append fbin "/h5fc"))) (for-each (lambda (file) (rename-file file (string-append flib "/" (basename file)))) -- cgit v1.2.3 From 45201bf245856954cb8368c328e54773a0a81156 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Thu, 20 Sep 2018 18:59:57 +0100 Subject: gnu: hdf5-parallel-openmpi: Really enable parallel build. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fix ensures that the H5_HAVE_PARALLEL identifier is correctly set in the file H5pubconf.h. * gnu/packages/maths.scm (hdf5-parallel-openmpi)[arguments]: Add the "--enable-parallel" flag to the list of configure flags. Remove the incompatible "--enable-cxx" flag. Add 'mpi-setup' phase. Signed-off-by: Ludovic Courtès --- gnu/packages/maths.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 30f1610c1d..636b485260 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1037,10 +1037,13 @@ Swath).") `(("mpi" ,openmpi) ,@(package-inputs hdf5))) (arguments - (substitute-keyword-arguments `(#:configure-flags '("--enable-parallel") - ,@(package-arguments hdf5)) + (substitute-keyword-arguments (package-arguments hdf5) + ((#:configure-flags flags) + ``("--enable-parallel" ,@(delete "--enable-cxx" ,flags))) ((#:phases phases) `(modify-phases ,phases + (add-after 'build 'mpi-setup + ,%openmpi-setup) (add-before 'check 'patch-tests (lambda _ ;; OpenMPI's mpirun will exit with non-zero status if it -- cgit v1.2.3 From 7e27393f82ff5e7237f870ded09652b89e457faa Mon Sep 17 00:00:00 2001 From: pimi Date: Tue, 11 Sep 2018 16:54:32 +0200 Subject: gnu: Add r-pore. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/bioinformatics.scm (r-pore): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/bioinformatics.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 10330cd8b2..9599e3096f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13736,3 +13736,32 @@ juicer) and single-resolution or multi-resolution @code{.cool} files (for cooler). Both @code{hic} and @code{cool} files describe Hi-C contact matrices.") (license license:expat))) + +(define-public r-pore + (package + (name "r-pore") + (version "0.24") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://sourceforge/rpore/" version + "/poRe_" version ".tar.gz")) + (sha256 + (base32 "0pih9nljbv8g4x8rkk29i7aqq681b782r5s5ynp4nw9yzqnmmksv")))) + (properties `((upstream-name . "poRe"))) + (build-system r-build-system) + (propagated-inputs + `(("r-bit64" ,r-bit64) + ("r-data-table" ,r-data-table) + ("r-rhdf5" ,r-rhdf5) + ("r-shiny" ,r-shiny) + ("r-svdialogs" ,r-svdialogs))) + (home-page "https://sourceforge.net/projects/rpore/") + (synopsis "Visualize Nanopore sequencing data") + (description + "This package provides graphical user interfaces to organize and visualize Nanopore +sequencing data.") + ;; This is free software but the license variant is unclear: + ;; . + (license license:bsd-3))) -- cgit v1.2.3 From ec944a1de97c8a523d6e1089b8c4430424297f93 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Fri, 21 Sep 2018 15:42:56 +0200 Subject: gnu: rust: Remove unused "ar" setting. * gnu/packages/rust.scm (rust-1.20)[arguments]<#:phases>[configure]: Remove unused "ar" setting. --- gnu/packages/rust.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 40633854ae..cc33a0d3b9 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -574,7 +574,6 @@ rpath = true llvm-config = \"" llvm "/bin/llvm-config" "\" cc = \"" gcc "/bin/gcc" "\" cxx = \"" gcc "/bin/g++" "\" -ar = \"" binutils "/bin/ar" "\" jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" [dist] ") port))) -- cgit v1.2.3 From 199d72e32759b0b0a0514d1bb667f0f1f2a6cbb4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 14:26:30 +0200 Subject: gnu: python-pyparsing: Update to 2.2.1. * gnu/packages/python.scm (python-pyparsing): Update to 2.2.1. [source]: Use PYPI-URI. --- gnu/packages/python.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a11c7e315e..26829f050e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3350,16 +3350,13 @@ library, libgit2 implements Git plumbing.") (define-public python-pyparsing (package (name "python-pyparsing") - (version "2.2.0") + (version "2.2.1") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/pyparsing/pyparsing" - "/pyparsing-" version - "/pyparsing-" version ".tar.gz")) + (uri (pypi-uri "pyparsing" version)) (sha256 - (base32 - "016b9gh606aa44sq92jslm89bg874ia0yyiyb643fa6dgbsbqch8")))) + (base32 "06dgd0iilvf8m0ssmfpcbh8l6jf0zkp8adbb84llksg17crfx4zl")))) (build-system python-build-system) (outputs '("out" "doc")) (arguments -- cgit v1.2.3 From 9a32bdf8a9b56eec84310a809820eadd1a33f45f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 17:12:36 +0200 Subject: gnu: wxwidgets: Update to 3.0.4. * gnu/packages/wxwidgets.scm (wxwidgets): Update to 3.0.4. --- gnu/packages/wxwidgets.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm index f1a61329e8..6cbfd76e10 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -49,7 +49,7 @@ (define-public wxwidgets (package (name "wxwidgets") - (version "3.0.3") + (version "3.0.4") (source (origin (method url-fetch) @@ -57,7 +57,7 @@ "releases/download/v" version "/wxWidgets-" version ".tar.bz2")) (sha256 - (base32 "0yrhp5cs2g33cpbdwdzicmm5m4mfnlvxwv031x9266zc90zh7j08")))) + (base32 "1w7pgfqjab7n84lc4aarydl3g55d1hdgl2ilwml766r6inc7y5cn")))) (build-system glib-or-gtk-build-system) (inputs `(("glu" ,glu) -- cgit v1.2.3 From 10fadd1e3d2e67ed8bc34a91a587d4862f6055e5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 17:13:13 +0200 Subject: gnu: filezilla: Update to 3.37.1. * gnu/packages/ftp.scm (filezilla): Update to 3.37.1. --- gnu/packages/ftp.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm index 335c975d12..faf9f5dd10 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm @@ -207,16 +207,14 @@ output. (define-public filezilla (package (name "filezilla") - (version "3.31.0") + (version "3.37.1") (source (origin (method url-fetch) - (uri (string-append "https://sourceforge.net/projects/" name - "/files/FileZilla_Client/" version - "/FileZilla_" version "_src" ".tar.bz2")) + (uri (string-append "https://download.filezilla-project.org/client/" + "FileZilla_" version "_src.tar.bz2")) (sha256 - (base32 - "1rfysb8dil35a7bzj2kw0mzzkys39d7yn6ipsbk8l6rkwfvnii8l")))) + (base32 "1bbxlm8gc0r5jing8xmkdbhj5a1qfbjn8varhny3mrk1am4m7s7l")))) (build-system gnu-build-system) (arguments ;; Don't let filezilla phone home to check for updates. -- cgit v1.2.3 From 43726c522f4b3802ce66c0f17160314569b1d673 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 20:13:14 +0200 Subject: gnu: emacs-password-store: Update to 1.7.3. * gnu/packages/emacs.scm (emacs-password-store): Update to 1.7.3. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 977f0c99b8..4662c11cff 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -8394,7 +8394,7 @@ close, copy, cut, paste, undo, redo.") (define-public emacs-password-store (package (name "emacs-password-store") - (version "1.7.2") + (version "1.7.3") (source (origin (method url-fetch) (uri @@ -8402,7 +8402,7 @@ close, copy, cut, paste, undo, redo.") "password-store-" version ".tar.xz")) (sha256 (base32 - "1sl0d7nc85c6c2bmmmyb8rpmn47vhkj831l153mjlkawjvhwas27")))) + "1x53k5dn3cdmvy8m4fqdld4hji5n676ksl0ql4armkmsds26av1b")))) (build-system emacs-build-system) (arguments `(#:phases -- cgit v1.2.3 From 1302837f6b9ba4364ed06cdbe55fb54e8fe7de0f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 20:22:51 +0200 Subject: gnu: workrave: Update to 1.10.21. * gnu/packages/gnome.scm (workrave): Update to 1.10.21. [source]: Use GIT-FILE-NAME. --- gnu/packages/gnome.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 99f4c1271a..65716ce413 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7224,7 +7224,7 @@ mp3, Ogg Vorbis and FLAC") (license license:gpl2+))) (define-public workrave - (let ((commit "v1_10_20")) + (let ((commit "v1_10_21")) (package (name "workrave") (version (string-map (match-lambda @@ -7236,10 +7236,10 @@ mp3, Ogg Vorbis and FLAC") (uri (git-reference (url "https://github.com/rcaelers/workrave.git") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 - "099a87zkrkmsgfz9isrfm89dh545x52891jh6qxmn19h6wwsi941")))) + "150qca8c552fakjlzkgarsxgp87l1xcwn19svqsa9d0cygqxjgia")))) (build-system glib-or-gtk-build-system) (arguments `(#:phases -- cgit v1.2.3 From a255142af3288ff76e37ac30b6b6f9acdcd2ca01 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 21 Sep 2018 21:55:28 +0200 Subject: gnu: emacs-org: Update to 9.1.14. * gnu/packages/emacs.scm (emacs-org): Update to 9.1.14. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 4662c11cff..28d97f82c1 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -5318,14 +5318,14 @@ passive voice.") (name "emacs-org") ;; emacs-org-contrib inherits from this package. Please update its sha256 ;; checksum as well. - (version "9.1.13") + (version "9.1.14") (source (origin (method url-fetch) (uri (string-append "http://elpa.gnu.org/packages/org-" version ".tar")) (sha256 (base32 - "1vx0n32gvrgy2bl2b4pvxf00cywxwm57gi46f2b2zlrnmd5n85pr")))) + "17vd9hig26rqv90l6y92hc2i0x29g44lsdsp0xd4m53s8r3zdikz")))) (build-system emacs-build-system) (home-page "https://orgmode.org/") (synopsis "Outline-based notes management and organizer") -- cgit v1.2.3 From 78b7b9dbe9098c9c47c7acba363223bb6c5bb1c8 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 21 Sep 2018 22:22:09 +0200 Subject: gnu: snap: Update to 4.2.1.4. * gnu/packages/education.scm (snap): Update to 4.2.1.4. --- gnu/packages/education.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 52dde26f44..8b02adc182 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -243,7 +243,7 @@ easy.") (define-public snap (package (name "snap") - (version "4.2.1.3") + (version "4.2.1.4") (source (origin (method git-fetch) @@ -253,7 +253,7 @@ easy.") (file-name (git-file-name name version)) (sha256 (base32 - "0n32hg8rx6alk5j58l76gzmicrg1bp7jagz5mh1zrg7591aicjal")))) + "0yc0w0cdhvi0nwqqrann2v3y0n7shxh7irgixqvlavp4k49d7aqj")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) -- cgit v1.2.3 From 05fb1e0017030f1c0cbc7e9a1adeccca57ef1d9d Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Sat, 22 Sep 2018 08:19:09 +1000 Subject: gnu: hmmer: Update to 3.2.1. * gnu/packages/bioinformatics.scm (hmmer): Update to 3.2.1. [origin]: Remove patch. [license]: Change to BSD-3. [supported-systems]: New field. * gnu/packages/patches/hmmer-remove-cpu-specificity.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/bioinformatics.scm | 19 +++++++------------ .../patches/hmmer-remove-cpu-specificity.patch | 22 ---------------------- 3 files changed, 7 insertions(+), 35 deletions(-) delete mode 100644 gnu/packages/patches/hmmer-remove-cpu-specificity.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 4097ad5fcd..daf96ea4b6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -805,7 +805,6 @@ dist_patch_DATA = \ %D%/packages/patches/hdf-eos5-remove-gctp.patch \ %D%/packages/patches/hdf-eos5-fix-szip.patch \ %D%/packages/patches/hdf-eos5-fortrantests.patch \ - %D%/packages/patches/hmmer-remove-cpu-specificity.patch \ %D%/packages/patches/higan-remove-march-native-flag.patch \ %D%/packages/patches/hubbub-sort-entities.patch \ %D%/packages/patches/hurd-fix-eth-multiplexer-dependency.patch \ diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9599e3096f..b619866ba3 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2936,18 +2936,15 @@ indexing scheme is called a @dfn{Hierarchical Graph FM index} (HGFM).") (define-public hmmer (package (name "hmmer") - (version "3.1b2") + (version "3.2.1") (source (origin (method url-fetch) (uri (string-append - "http://eddylab.org/software/hmmer" - (version-major version) "/" - version "/hmmer-" version ".tar.gz")) + "http://eddylab.org/software/hmmer/hmmer-" version ".tar.gz")) (sha256 (base32 - "0djmgc0pfli0jilfx8hql1axhwhqxqb8rxg2r5rg07aw73sfs5nx")) - (patches (search-patches "hmmer-remove-cpu-specificity.patch")))) + "171bivy6xhgjsz5nv53n81pc3frnwz29ylblawk2bv46szwjjqd5")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) (home-page "http://hmmer.org/") @@ -2957,12 +2954,10 @@ indexing scheme is called a @dfn{Hierarchical Graph FM index} (HGFM).") sequences, and for making protein sequence alignments. It implements methods using probabilistic models called profile hidden Markov models (profile HMMs).") - (license (list license:gpl3+ - ;; The bundled library 'easel' is distributed - ;; under The Janelia Farm Software License. - (license:non-copyleft - "file://easel/LICENSE" - "See easel/LICENSE in the distribution."))))) + ;; hmmer uses non-portable SSE intrinsics so building fails on other + ;; platforms. + (supported-systems '("x86_64-linux" "i686-linux")) + (license license:bsd-3))) (define-public htseq (package diff --git a/gnu/packages/patches/hmmer-remove-cpu-specificity.patch b/gnu/packages/patches/hmmer-remove-cpu-specificity.patch deleted file mode 100644 index ba98db4d0e..0000000000 --- a/gnu/packages/patches/hmmer-remove-cpu-specificity.patch +++ /dev/null @@ -1,22 +0,0 @@ -This patch removes compilation flags which make the build for the machine -where compilation takes place, rendering the build not reproducible. - -diff --git a/configure b/configure -index 8b6aaef..49a6afc 100755 ---- a/configure -+++ b/configure -@@ -6125,14 +6125,6 @@ fi # guess arch - - if test "x$ax_gcc_arch" != x -a "x$ax_gcc_arch" != xno; then - for arch in $ax_gcc_arch; do -- if test "x$acx_maxopt_portable" = xyes; then # if we require portable code -- flags="-mtune=$arch" -- # -mcpu=$arch and m$arch generate nonportable code on every arch except -- # x86. And some other arches (e.g. Alpha) don't accept -mtune. Grrr. -- case $host_cpu in i*86|x86_64*) flags="$flags -mcpu=$arch -m$arch";; esac -- else -- flags="-march=$arch -mcpu=$arch -m$arch" -- fi - for flag in $flags; do - as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$flag" | $as_tr_sh` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 -- cgit v1.2.3 From 91294b53619995712a6f8d497d650bfc02b4c952 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sat, 22 Sep 2018 10:07:50 +0200 Subject: Revert 'gnu: rust: Remove unused "ar" setting.'. Some versions of Rust do need it and others complain about it. For now, revert the removal entirely. This reverts commit ec944a1de97c8a523d6e1089b8c4430424297f93. --- gnu/packages/rust.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index cc33a0d3b9..40633854ae 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -574,6 +574,7 @@ rpath = true llvm-config = \"" llvm "/bin/llvm-config" "\" cc = \"" gcc "/bin/gcc" "\" cxx = \"" gcc "/bin/g++" "\" +ar = \"" binutils "/bin/ar" "\" jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" [dist] ") port))) -- cgit v1.2.3 From ae71cd8ac93245360ffe73d6ab260975ec0d742f Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 22 Sep 2018 04:47:54 -0400 Subject: gnu: icecat: Add fixes from upstream mozilla-esr60 [security fixes]. Includes fixes for CVE-2018-12383 and CVE-2018-12385. * gnu/packages/patches/icecat-CVE-2018-12383.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/patches/icecat-avoid-bundled-libraries.patch: Adapt to apply cleanly to IceCat 60. * gnu/packages/gnuzilla.scm (mozilla-patch): Update to fetch from mozilla-esr60. (icecat): Add selected changesets from upstream mozilla-esr60. --- gnu/local.mk | 1 + gnu/packages/gnuzilla.scm | 8 +- gnu/packages/patches/icecat-CVE-2018-12383.patch | 103 +++++++++++++++++++++ .../patches/icecat-avoid-bundled-libraries.patch | 20 ++-- 4 files changed, 119 insertions(+), 13 deletions(-) create mode 100644 gnu/packages/patches/icecat-CVE-2018-12383.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index daf96ea4b6..fe2b573dd5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -810,6 +810,7 @@ dist_patch_DATA = \ %D%/packages/patches/hurd-fix-eth-multiplexer-dependency.patch \ %D%/packages/patches/hydra-disable-darcs-test.patch \ %D%/packages/patches/icecat-avoid-bundled-libraries.patch \ + %D%/packages/patches/icecat-CVE-2018-12383.patch \ %D%/packages/patches/icecat-use-system-graphite2.patch \ %D%/packages/patches/icecat-use-system-harfbuzz.patch \ %D%/packages/patches/icedtea-6-hotspot-gcc-segfault-workaround.patch \ diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index db8f85cfb1..653cee93d5 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -469,10 +469,10 @@ security standards.") (license license:mpl2.0))) (define (mozilla-patch file-name changeset hash) - "Return an origin for CHANGESET from the mozilla-esr52 repository." + "Return an origin for CHANGESET from the mozilla-esr60 repository." (origin (method url-fetch) - (uri (string-append "https://hg.mozilla.org/releases/mozilla-esr52/raw-rev/" + (uri (string-append "https://hg.mozilla.org/releases/mozilla-esr60/raw-rev/" changeset)) (sha256 (base32 hash)) (file-name file-name))) @@ -498,7 +498,9 @@ security standards.") (search-patch "icecat-avoid-bundled-libraries.patch") ;; FIXME (search-patch "icecat-use-system-harfbuzz.patch") ;; FIXME (search-patch "icecat-use-system-graphite2.patch") - )) + (mozilla-patch "icecat-CVE-2018-12385.patch" "80a4a7ef2813" "1vgcbimpnfjqj934v0cryq1g13xac3wfmd4jyhcb5s60x8xyssf5") + (search-patch "icecat-CVE-2018-12383.patch") + (mozilla-patch "icecat-bug-1489744.patch" "6546ee839d30" "11mhvj77r789b428bfxqq5wdx8yr7lbrdjzr8qjj6fw197pldn51"))) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/icecat-CVE-2018-12383.patch b/gnu/packages/patches/icecat-CVE-2018-12383.patch new file mode 100644 index 0000000000..17ca0f3773 --- /dev/null +++ b/gnu/packages/patches/icecat-CVE-2018-12383.patch @@ -0,0 +1,103 @@ +Based on upstream changeset: + https://hg.mozilla.org/releases/mozilla-esr60/rev/300efdbc9fe1 +but with the git binary patch and related test changes omitted, +and adapted to apply cleanly to GNU IceCat. + +# HG changeset patch +# User David Keeler +# Date 1531860660 25200 +# Node ID 300efdbc9fe1f9165428c7934861033935b5abfa +# Parent 80a4a7ef281374dbb2afda8edac54665b14b9ef8 +Bug 1475775 - Clean up old NSS DB file after upgrade if necessary. r=franziskus, r=mattn, a=RyanVM + +Reviewers: franziskus, mattn + +Bug #: 1475775 + +Differential Revision: https://phabricator.services.mozilla.com/D2202 + +diff --git a/security/manager/ssl/nsNSSComponent.cpp b/security/manager/ssl/nsNSSComponent.cpp +--- a/security/manager/ssl/nsNSSComponent.cpp ++++ b/security/manager/ssl/nsNSSComponent.cpp +@@ -1935,16 +1935,61 @@ AttemptToRenameBothPKCS11ModuleDBVersion + NS_NAMED_LITERAL_CSTRING(sqlModuleDBFilename, "pkcs11.txt"); + nsresult rv = AttemptToRenamePKCS11ModuleDB(profilePath, + legacyModuleDBFilename); + if (NS_FAILED(rv)) { + return rv; + } + return AttemptToRenamePKCS11ModuleDB(profilePath, sqlModuleDBFilename); + } ++ ++// When we changed from the old dbm database format to the newer sqlite ++// implementation, the upgrade process left behind the existing files. Suppose a ++// user had not set a password for the old key3.db (which is about 99% of ++// users). After upgrading, both the old database and the new database are ++// unprotected. If the user then sets a password for the new database, the old ++// one will not be protected. In this scenario, we should probably just remove ++// the old database (it would only be relevant if the user downgraded to a ++// version of IceCat before 58, but we have to trade this off against the ++// user's old private keys being unexpectedly unprotected after setting a ++// password). ++// This was never an issue on Android because we always used the new ++// implementation. ++static void ++MaybeCleanUpOldNSSFiles(const nsACString& profilePath) ++{ ++ UniquePK11SlotInfo slot(PK11_GetInternalKeySlot()); ++ if (!slot) { ++ return; ++ } ++ // Unfortunately we can't now tell the difference between "there already was a ++ // password when the upgrade happened" and "there was not a password but then ++ // the user added one after upgrading". ++ bool hasPassword = PK11_NeedLogin(slot.get()) && ++ !PK11_NeedUserInit(slot.get()); ++ if (!hasPassword) { ++ return; ++ } ++ nsCOMPtr dbFile = do_CreateInstance("@mozilla.org/file/local;1"); ++ if (!dbFile) { ++ return; ++ } ++ nsresult rv = dbFile->InitWithNativePath(profilePath); ++ if (NS_FAILED(rv)) { ++ return; ++ } ++ NS_NAMED_LITERAL_CSTRING(keyDBFilename, "key3.db"); ++ rv = dbFile->AppendNative(keyDBFilename); ++ if (NS_FAILED(rv)) { ++ return; ++ } ++ // Since this isn't a directory, the `recursive` argument to `Remove` is ++ // irrelevant. ++ Unused << dbFile->Remove(false); ++} + #endif // ifndef ANDROID + + // Given a profile directory, attempt to initialize NSS. If nocertdb is true, + // (or if we don't have a profile directory) simply initialize NSS in no DB mode + // and return. Otherwise, first attempt to initialize in read/write mode, and + // then read-only mode if that fails. If both attempts fail, we may be failing + // to initialize an NSS DB collection that has FIPS mode enabled. Attempt to + // ascertain if this is the case, and if so, rename the offending PKCS#11 module +@@ -1966,16 +2011,19 @@ InitializeNSSWithFallbacks(const nsACStr + + // Try read/write mode. If we're in safeMode, we won't load PKCS#11 modules. + #ifndef ANDROID + PRErrorCode savedPRErrorCode1; + #endif // ifndef ANDROID + SECStatus srv = ::mozilla::psm::InitializeNSS(profilePath, false, !safeMode); + if (srv == SECSuccess) { + MOZ_LOG(gPIPNSSLog, LogLevel::Debug, ("initialized NSS in r/w mode")); ++#ifndef ANDROID ++ MaybeCleanUpOldNSSFiles(profilePath); ++#endif // ifndef ANDROID + return NS_OK; + } + #ifndef ANDROID + savedPRErrorCode1 = PR_GetError(); + PRErrorCode savedPRErrorCode2; + #endif // ifndef ANDROID + // That failed. Try read-only mode. + srv = ::mozilla::psm::InitializeNSS(profilePath, true, !safeMode); diff --git a/gnu/packages/patches/icecat-avoid-bundled-libraries.patch b/gnu/packages/patches/icecat-avoid-bundled-libraries.patch index 114631517a..b5e9fb887e 100644 --- a/gnu/packages/patches/icecat-avoid-bundled-libraries.patch +++ b/gnu/packages/patches/icecat-avoid-bundled-libraries.patch @@ -1,8 +1,8 @@ Fixes needed when avoiding bundled libraries. ---- icecat-52.0.2/xpcom/build/moz.build.orig -+++ icecat-52.0.2/xpcom/build/moz.build -@@ -93,10 +93,5 @@ +--- icecat-60.2.0/xpcom/build/moz.build.orig 2018-09-13 17:46:49.000000000 -0400 ++++ icecat-60.2.0/xpcom/build/moz.build 2018-09-22 04:26:50.659564554 -0400 +@@ -99,10 +99,5 @@ '/docshell/base', ] @@ -13,9 +13,9 @@ Fixes needed when avoiding bundled libraries. - if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': CXXFLAGS += CONFIG['TK_CFLAGS'] ---- icecat-52.0.2/storage/moz.build.orig -+++ icecat-52.0.2/storage/moz.build -@@ -114,7 +114,6 @@ +--- icecat-60.2.0/storage/moz.build.orig 2018-09-13 17:51:11.000000000 -0400 ++++ icecat-60.2.0/storage/moz.build 2018-09-22 04:26:50.659564554 -0400 +@@ -117,7 +117,6 @@ DEFINES['MOZ_MEMORY_TEMP_STORE_PRAGMA'] = True LOCAL_INCLUDES += [ @@ -23,13 +23,13 @@ Fixes needed when avoiding bundled libraries. '/dom/base', ] ---- icecat-52.0.2/dom/indexedDB/moz.build.orig -+++ icecat-52.0.2/dom/indexedDB/moz.build -@@ -101,7 +101,6 @@ +--- icecat-60.2.0/dom/indexedDB/moz.build.orig 2018-09-13 17:49:42.000000000 -0400 ++++ icecat-60.2.0/dom/indexedDB/moz.build 2018-09-22 04:26:50.663564574 -0400 +@@ -102,7 +102,6 @@ CXXFLAGS += ['-Wno-error=shadow'] LOCAL_INCLUDES += [ - '/db/sqlite3/src', '/dom/base', '/dom/storage', - '/dom/workers', + '/ipc/glue', -- cgit v1.2.3 From 21280a8cd805ace5f95cd2580b8a6ca1e25050d7 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 18 Sep 2018 21:52:58 -0500 Subject: gnu: Add Go 1.11. * gnu/packages/golang.scm (go-1.11): New variable. Signed-off-by: Leo Famulari --- gnu/packages/golang.scm | 119 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index fd4c362d36..bba03e77f2 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2018 Tomáš Čech ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2018 Pierre Neidhardt +;;; Copyright @ 2018 Katherine Cox-Buday ;;; ;;; This file is part of GNU Guix. ;;; @@ -499,6 +500,124 @@ in the style of communicating sequential processes (@dfn{CSP}).") (setenv "HOME" "/tmp") #t))))))))) +(define-public go-1.11 + (package + (inherit go-1.10) + (name "go") + (version "1.11") + (source + (origin + (method url-fetch) + (uri (string-append "https://storage.googleapis.com/golang/" + name version ".src.tar.gz")) + (sha256 + (base32 + "1ysj04jzds6xa8kdflkdsgyv3mg9fdn90zdf78g4g6p4bwpy3hdg")))) + (arguments + (substitute-keyword-arguments (package-arguments go-1.10) + ((#:phases phases) + `(modify-phases ,phases + (replace 'prebuild + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((gcclib (string-append (assoc-ref inputs "gcc:lib") "/lib")) + (ld (string-append (assoc-ref inputs "libc") "/lib")) + (loader (car (find-files ld "^ld-linux.+"))) + (net-base (assoc-ref inputs "net-base")) + (tzdata-path + (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo")) + (output (assoc-ref outputs "out"))) + + (for-each delete-file + ;; Removing net/ tests, which fail when attempting to access + ;; network resources not present in the build container. + '("net/listen_test.go" + "net/parse_test.go" + "net/cgo_unix_test.go" + ;; A side affect of these test scripts is testing + ;; cgo. Attempts at using cgo flags and + ;; directives with these scripts as specified + ;; here (https://golang.org/cmd/cgo/) have not + ;; worked. The tests continue to state that they + ;; can not find crt1.o despite being present. + "cmd/go/testdata/script/list_compiled_imports.txt" + "cmd/go/testdata/script/mod_case_cgo.txt" + ;; https://github.com/golang/go/issues/24884 + "os/user/user_test.go")) + + (substitute* "os/os_test.go" + (("/usr/bin") (getcwd)) + (("/bin/pwd") (which "pwd")) + (("/bin/sh") (which "sh"))) + + (substitute* "cmd/vendor/golang.org/x/sys/unix/syscall_unix_test.go" + (("/usr/bin") "/tmp")) + + ;; Add libgcc to runpath + (substitute* "cmd/link/internal/ld/lib.go" + (("!rpath.set") "true")) + (substitute* "cmd/go/internal/work/gccgo.go" + (("cgoldflags := \\[\\]string\\{\\}") + (string-append "cgoldflags := []string{" + "\"-rpath=" gcclib "\"" + "}")) + (("\"-lgcc_s\", ") + (string-append + "\"-Wl,-rpath=" gcclib "\", \"-lgcc_s\", "))) + (substitute* "cmd/go/internal/work/gc.go" + (("ldflags = setextld\\(ldflags, compiler\\)") + (string-append + "ldflags = setextld(ldflags, compiler)\n" + "ldflags = append(ldflags, \"-r\")\n" + "ldflags = append(ldflags, \"" gcclib "\")\n"))) + + ;; Disable failing tests: these tests attempt to access + ;; commands or network resources which are neither available + ;; nor necessary for the build to succeed. + (for-each + (match-lambda + ((file regex) + (substitute* file + ((regex all before test_name) + (string-append before "Disabled" test_name))))) + '(("net/net_test.go" "(.+)(TestShutdownUnix.+)") + ("net/dial_test.go" "(.+)(TestDialTimeout.+)") + ("os/os_test.go" "(.+)(TestHostname.+)") + ("time/format_test.go" "(.+)(TestParseInSydney.+)") + ("time/format_test.go" "(.+)(TestParseInLocation.+)") + ("os/exec/exec_test.go" "(.+)(TestEcho.+)") + ("os/exec/exec_test.go" "(.+)(TestCommandRelativeName.+)") + ("os/exec/exec_test.go" "(.+)(TestCatStdin.+)") + ("os/exec/exec_test.go" "(.+)(TestCatGoodAndBadFile.+)") + ("os/exec/exec_test.go" "(.+)(TestExitStatus.+)") + ("os/exec/exec_test.go" "(.+)(TestPipes.+)") + ("os/exec/exec_test.go" "(.+)(TestStdinClose.+)") + ("os/exec/exec_test.go" "(.+)(TestIgnorePipeErrorOnSuccess.+)") + ("syscall/syscall_unix_test.go" "(.+)(TestPassFD\\(.+)") + ("os/exec/exec_test.go" "(.+)(TestExtraFiles/areturn.+)") + ("cmd/go/go_test.go" "(.+)(TestCoverageWithCgo.+)") + ("cmd/go/go_test.go" "(.+)(TestTwoPkgConfigs.+)") + ("os/exec/exec_test.go" "(.+)(TestOutputStderrCapture.+)") + ("os/exec/exec_test.go" "(.+)(TestExtraFiles.+)") + ("os/exec/exec_test.go" "(.+)(TestExtraFilesRace.+)") + ("net/lookup_test.go" "(.+)(TestLookupPort.+)") + ("syscall/exec_linux_test.go" + "(.+)(TestCloneNEWUSERAndRemapNoRootDisableSetgroups.+)"))) + + ;; fix shebang for testar script + ;; note the target script is generated at build time. + (substitute* "../misc/cgo/testcarchive/carchive_test.go" + (("#!/usr/bin/env") (string-append "#!" (which "env")))) + + (substitute* "net/lookup_unix.go" + (("/etc/protocols") (string-append net-base "/etc/protocols"))) + (substitute* "net/port_unix.go" + (("/etc/services") (string-append net-base "/etc/services"))) + (substitute* "time/zoneinfo_unix.go" + (("/usr/share/zoneinfo/") tzdata-path)) + (substitute* (find-files "cmd" "\\.go") + (("/lib(64)?/ld-linux.*\\.so\\.[0-9]") loader)) + #t))))))))) + (define-public go go-1.9) (define-public go-github-com-alsm-ioprogress -- cgit v1.2.3 From 844cc6f876b8dcadf210398e68b3f3f824cb7144 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 22 Sep 2018 19:17:29 -0400 Subject: gnu: webkitgtk: Add version 2.22.2. * gnu/packages/webkit.scm (webkitgtk-2.22): New variable. --- gnu/packages/webkit.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index b671e44d18..976411dbbc 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -24,6 +24,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (gnu packages) @@ -32,6 +33,7 @@ #:use-module (gnu packages databases) #:use-module (gnu packages enchant) #:use-module (gnu packages flex) + #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages gl) #:use-module (gnu packages glib) @@ -149,3 +151,34 @@ HTML/CSS applications to full-fledged web browsers.") license:lgpl2.1+ license:bsd-2 license:bsd-3)))) + +;; This version of webkitgtk needs to be kept separate, because it requires a +;; newer version of GCC than our default compiler, and this causes problems +;; when linked with C++ libraries built using our default compiler. For now, +;; we use this newer webkitgtk only for selected packages, e.g. epiphany. +(define-public webkitgtk-2.22 + (package/inherit webkitgtk + (name "webkitgtk") + (version "2.22.2") + (source (origin + (method url-fetch) + (uri (string-append "https://www.webkitgtk.org/releases/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1flrbr8pzbrlwv09b4pmgh6vklw7jghd2lgrhcb72vl9s7a8fm1l")))) + (native-inputs + `(("gcc" ,gcc-7) ; webkitgtk-2.22 requires gcc-6 or newer + ,@(package-native-inputs webkitgtk))) + (arguments + (substitute-keyword-arguments (package-arguments webkitgtk) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'add-gst-plugins-base-include-path + 'work-around-gcc-7-include-path-issue + ;; FIXME: Work around a problem with gcc-7 includes (see + ;; ). + (lambda _ + (unsetenv "C_INCLUDE_PATH") + (unsetenv "CPLUS_INCLUDE_PATH") + #t)))))))) -- cgit v1.2.3 From 480d39a600701621e4d5938c8753b8487baa2c7f Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 22 Sep 2018 19:21:16 -0400 Subject: gnu: epiphany: Use webkitgtk-2.22. * gnu/packages/gnome.scm (epiphany)[native-inputs]: Add gcc-7. [inputs]: Replace webkitgtk with webkitgtk-2.22. --- gnu/packages/gnome.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 65716ce413..f9c9f1cf5c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4187,6 +4187,7 @@ a secret password store, an adblocker, and a modern UI.") `(("dconf" ,dconf))) (native-inputs `(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database + ("gcc" ,gcc-7) ; needed because webkitgtk-2.22 is compiled with gcc-7 ("glib:bin" ,glib "bin") ; for glib-mkenums ("gtk+:bin" ,gtk+ "bin") ; for gtk-update-icon-cache ("intltool" ,intltool) @@ -4207,7 +4208,7 @@ a secret password store, an adblocker, and a modern UI.") ("libxslt" ,libxslt) ("nettle" ,nettle) ; for hogweed ("sqlite" ,sqlite) - ("webkitgtk" ,webkitgtk))) + ("webkitgtk" ,webkitgtk-2.22))) (home-page "https://wiki.gnome.org/Apps/Web") (synopsis "GNOME web browser") (description -- cgit v1.2.3 From 84b334362ebb7fb2e8bc0ec4df1d8b28aabe2413 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 22 Sep 2018 19:25:36 -0400 Subject: gnu: eolie: Use webkitgtk-2.22. * gnu/packages/gnome.scm (eolie)[native-inputs]: Add gcc-7:lib. [inputs]: Replace webkitgtk with webkitgtk-2.22. [arguments]: Add "gcc:lib" to the list of libraries to add to LD_LIBRARY_PATH. Use invoke. --- gnu/packages/gnome.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f9c9f1cf5c..9f5ede8b07 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4104,19 +4104,20 @@ work and the interface is well tested.") (delete 'configure) (replace 'build (lambda* (#:key outputs #:allow-other-keys) - (zero? (system* "meson" "build" - "--prefix" (assoc-ref outputs "out"))))) + (invoke "meson" "build" + "--prefix" (assoc-ref outputs "out")))) (replace 'check - (lambda _ (zero? (system* "ninja" "-C" "build" "test")))) + (lambda _ (invoke "ninja" "-C" "build" "test"))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) - (zero? (system* "ninja" "-C" "build" "install")))) + (invoke "ninja" "-C" "build" "install"))) (add-after 'wrap 'wrap-more (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) ;; These libraries must be on LD_LIBRARY_PATH. (libs '("gtkspell3" "webkitgtk" "libsoup" "libsecret" "atk" "gtk+" "gsettings-desktop-schemas" + "gcc:lib" ; needed b/c webkitgtk is built with gcc-7 "gobject-introspection")) (path (string-join (map (lambda (lib) @@ -4129,7 +4130,8 @@ work and the interface is well tested.") `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))) #t))))) (native-inputs - `(("intltool" ,intltool) + `(("gcc:lib" ,gcc-7 "lib") ; needed because webkitgtk is built with gcc-7 + ("intltool" ,intltool) ("itstool" ,itstool) ("pkg-config" ,pkg-config) ("meson" ,meson-for-build) @@ -4149,7 +4151,7 @@ work and the interface is well tested.") ("libsecret" ,libsecret) ("gtkspell3" ,gtkspell3) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("webkitgtk" ,webkitgtk))) + ("webkitgtk" ,webkitgtk-2.22))) (home-page "https://wiki.gnome.org/Apps/Eolie") (synopsis "Web browser for GNOME") (description -- cgit v1.2.3 From 94676ded5f2a68b07b94d83d2cfb768038c9c6c1 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Sun, 23 Sep 2018 13:13:50 +0200 Subject: gnu: xpra: Update to 2.3.4. * gnu/packages/xorg.scm (xpra): Update to 2.3.4. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 90f4bf4f59..7c80e70dac 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5936,7 +5936,7 @@ basic eye-candy effects.") (define-public xpra (package (name "xpra") - (version "2.3.3") + (version "2.3.4") (source (origin (method url-fetch) @@ -5944,7 +5944,7 @@ basic eye-candy effects.") version ".tar.xz")) (sha256 (base32 - "1azvvddjfq7lb5kmbn0ilgq2nf7pmymsc3b9lhbjld6w156qdv01")))) + "0wa3kx54himy3i1b2801hlzfilh3cf4kjk40k1cjl0ds28m5hija")))) (build-system python-build-system) (inputs `(("ffmpeg" ,ffmpeg) ("flac" ,flac) -- cgit v1.2.3 From e10bf49668472dcfc17ad10a2b5704fce838570d Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 23 Sep 2018 17:19:56 +0200 Subject: gnu: Add emacs-synosaurus. * gnu/packages/emacs.scm (emacs-synosaurus): New variable. --- gnu/packages/emacs.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 28d97f82c1..cff1898d72 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -118,6 +118,7 @@ #:use-module (gnu packages gnupg) #:use-module (gnu packages video) #:use-module (gnu packages haskell) + #:use-module (gnu packages wordnet) #:use-module (guix utils) #:use-module (srfi srfi-1) #:use-module (ice-9 match)) @@ -12197,3 +12198,41 @@ wrapper around all Imagemagick commands with descriptions, autocompletion (for some commands) and hints displayed in prompt using @command{eimp.el} to execute its commands and resize images.") (license license:gpl3+)))) + +(define-public emacs-synosaurus + (let ((commit "8bf95b935976ec0a1964cf175ed57cc5f6f93bdb")) + (package + (name "emacs-synosaurus") + (version (git-version "0.1.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hpdeifel/synosaurus") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "15by9jccab6kyplxa6k0glzaivxkqdigl33gl2qi2cvy6f2q7gva")))) + (build-system emacs-build-system) + (propagated-inputs + `(("wordnet" ,wordnet))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((wn (assoc-ref inputs "wordnet"))) + ;; .el is read-only in git. + (chmod "synosaurus-wordnet.el" #o644) + ;; Specify the absolute file names of the various + ;; programs so that everything works out-of-the-box. + (emacs-substitute-variables + "synosaurus-wordnet.el" + ("wordnet-command" + (string-append wn "/bin/wn"))))))))) + (home-page "https://github.com/hpdeifel/synosaurus") + (synopsis "Extensible thesaurus mode for Emacs") + (description "Synosaurus is a thesaurus fontend for Emacs with pluggable +backends, including the @command{wordnet} offline backend.") + (license license:gpl3+)))) -- cgit v1.2.3 From 88600acc939365b4ffd45a8be74117a8cf8dc3dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 23 Sep 2018 22:10:50 +0200 Subject: system: Mention '--skip-checks' in initrd diagnostics. * gnu/system/mapped-devices.scm (check-device-initrd-modules): Add note about '--skip-checks'. --- gnu/system/mapped-devices.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/system/mapped-devices.scm b/gnu/system/mapped-devices.scm index af73dc608c..a874666463 100644 --- a/gnu/system/mapped-devices.scm +++ b/gnu/system/mapped-devices.scm @@ -157,7 +157,10 @@ these lines: ;; @dots{} (initrd-modules (append (list~{ ~s~}) %base-initrd-modules))) -@end example\n") +@end example + +If you think this diagnostic is inaccurate, use the @option{--skip-checks} +option of @command{guix system}.\n") missing))) (&error-location (location (source-properties->location location))))))))) -- cgit v1.2.3 From b5460d95e970608bee7a794590be1b051b57d3a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 23 Sep 2018 23:29:31 +0200 Subject: vm: Disable deduplication for 'guix system vm-image'. * gnu/system/vm.scm (qemu-image): Pass #:deduplicate? #f to 'root-partition-initializer'. --- gnu/system/vm.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 91e117b9f3..435501d726 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -390,7 +390,12 @@ the image." #:closures graphs #:copy-closures? #$copy-inputs? #:register-closures? #$register-closures? - #:system-directory #$os-drv)) + #:system-directory #$os-drv + + ;; Disable deduplication to speed things up, + ;; and because it doesn't help much for a + ;; single system generation. + #:deduplicate? #f)) (root-size #$(if (eq? 'guess disk-image-size) #~(max ;; Minimum 20 MiB root size -- cgit v1.2.3 From fce225471128c4a5246342b3aa1b7e53a8066211 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 23 Sep 2018 23:31:52 +0200 Subject: vm: Use "cache=loose" for all 9p mounts. This significantly improves read throughput when running things like "guix hash -r ...". * gnu/system/vm.scm (%linux-vm-file-systems): Add 'flags' for "store". Add "cache=loose" to every file system. --- gnu/system/vm.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 435501d726..a1b595d45d 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -99,21 +99,28 @@ (device "store") (type "9p") (needed-for-boot? #t) - (options "trans=virtio") + (flags '(read-only)) + (options "trans=virtio,cache=loose") (check? #f)) + + ;; The 9p documentation says that cache=loose is "intended for + ;; exclusive, read-only mounts", without additional details. In + ;; practice it seems to work well for these, and it's much faster than + ;; the default cache=none, especially when copying and registering + ;; store items. (file-system (mount-point "/xchg") (device "xchg") (type "9p") (needed-for-boot? #t) - (options "trans=virtio") + (options "trans=virtio,cache=loose") (check? #f)) (file-system (mount-point "/tmp") (device "tmp") (type "9p") (needed-for-boot? #t) - (options "trans=virtio") + (options "trans=virtio,cache=loose") (check? #f)))) (define not-config? -- cgit v1.2.3 From 8fa361ce63235335e266cb5ff21bf9da73f4d8dd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Sep 2018 00:23:19 +0200 Subject: gnu: fping: Update to 4.1. * gnu/packages/networking.scm (fping): Update to 4.1. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index abc616de3c..d1765cc46f 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -651,7 +651,7 @@ network frames.") (define-public fping (package (name "fping") - (version "4.0") + (version "4.1") (source (origin (method url-fetch) @@ -659,7 +659,7 @@ network frames.") version ".tar.gz")) (sha256 (base32 - "1kp81wchi79l8z8rrj602fpjrd8bi84y3i7fsaclzlwap5943sv7")))) + "0wxbvm480vij8dy4v1pi8f0c7010rx6bidg3qhsvkdf2ijhy4cr7")))) (build-system gnu-build-system) (home-page "http://fping.org/") (synopsis "Send ICMP ECHO_REQUEST packets to network hosts") -- cgit v1.2.3 From 25706b8fc9aa36085ecec085f08d5ad1808d4a96 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Sep 2018 00:23:58 +0200 Subject: gnu: fping: Use HTTPS home page. * gnu/packages/networking.scm (fping)[home-page]: Use HTTPS. --- gnu/packages/networking.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index d1765cc46f..84224374c6 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -661,7 +661,7 @@ network frames.") (base32 "0wxbvm480vij8dy4v1pi8f0c7010rx6bidg3qhsvkdf2ijhy4cr7")))) (build-system gnu-build-system) - (home-page "http://fping.org/") + (home-page "https://fping.org/") (synopsis "Send ICMP ECHO_REQUEST packets to network hosts") (description "fping is a ping like program which uses the Internet Control Message -- cgit v1.2.3 From 0604d3cfceea13fad33c6188fa54f5fd16c74406 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Sep 2018 00:29:46 +0200 Subject: gnu: nano: Update to 3.1. * gnu/packages/nano.scm (nano): Update to 3.1. --- gnu/packages/nano.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/nano.scm b/gnu/packages/nano.scm index 9396588fc8..8f96b605a6 100644 --- a/gnu/packages/nano.scm +++ b/gnu/packages/nano.scm @@ -30,7 +30,7 @@ (define-public nano (package (name "nano") - (version "3.0") + (version "3.1") (source (origin (method url-fetch) @@ -38,7 +38,7 @@ version ".tar.xz")) (sha256 (base32 - "1868hg9s584fwjrh0fzdrixmxc2qhw520z4q5iv68kjiajivr9g0")))) + "17kinzyv6vwgyx2d0ym1kp65qbf7kxzwpyg21ic1rijv1aj2rh0l")))) (build-system gnu-build-system) (inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From 899e1974a6f4a4ff041c035ff3494bd10a8069ac Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 21:31:52 +0200 Subject: gnu: python-gitdb: Update to 2.0.4. * gnu/packages/version-control.scm (python-gitdb): Update to 2.0.4. [arguments]: Replace AND with equivalent but more 'accurate' BEGIN. --- gnu/packages/version-control.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 58c870df5a..204ec403f6 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -712,13 +712,13 @@ default) of the repository.") (define-public python-gitdb (package (name "python-gitdb") - (version "2.0.3") + (version "2.0.4") (source (origin (method url-fetch) (uri (pypi-uri "gitdb2" version)) (sha256 (base32 - "02azg62mr99b7cllyjrly77np3vw32y8nrxpa2xjapiyaga2j3mn")))) + "0i608q9c47rdsmyac1cn6s0hzwwj7cb957y8fc9wacc5lnw8ak5v")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -733,7 +733,7 @@ default) of the repository.") "file" (number->string filecount)) (lambda (port) (format port "~a" filecount)))) - (and + (begin (invoke "git" "init") (invoke "git" "config" "user.name" "Total Git") (invoke "git" "config" "user.email" "git@localhost") -- cgit v1.2.3 From 2f7ad2a788fa190dbe97038020322ce1c772feec Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 20:24:51 +0200 Subject: gnu: workrave: Use Guix's built-in bootstrap phase. * gnu/packages/gnome.scm (workrave)[arguments]: Remove 'autoconf' phase. --- gnu/packages/gnome.scm | 7 ------- 1 file changed, 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9f5ede8b07..ac898fb294 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7244,13 +7244,6 @@ mp3, Ogg Vorbis and FLAC") (base32 "150qca8c552fakjlzkgarsxgp87l1xcwn19svqsa9d0cygqxjgia")))) (build-system glib-or-gtk-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'autogen - (lambda _ - (invoke "sh" "autogen.sh") - #t))))) (propagated-inputs `(("glib" ,glib) ("gtk+" ,gtk+) ("gdk-pixbuf" ,gdk-pixbuf) -- cgit v1.2.3 From 2c36baa56ffeaf451f42e5f5ff3b60705e17a30b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Sep 2018 14:58:06 +0200 Subject: gnu: parallel: Update to 20180922. * gnu/packages/parallel.scm (parallel): Update to 20180922. --- gnu/packages/parallel.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index ec1fae6470..3dba2b8c00 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -48,7 +48,7 @@ (define-public parallel (package (name "parallel") - (version "20180822") + (version "20180922") (source (origin (method url-fetch) @@ -56,7 +56,7 @@ version ".tar.bz2")) (sha256 (base32 - "0jjs7fpvdjjb5v0j39a6k7hq9h5ap3db1j7vg1r2dq4swk23h9bm")))) + "07q7lzway2qf8mx6fb4q45jmirsc8pw6rgv03ifrp32jw3q8w1za")))) (build-system gnu-build-system) (arguments `(#:phases @@ -66,7 +66,7 @@ (for-each (lambda (file) (substitute* file - ;; Patch hard coded '/bin/sh' in the lin ending in: + ;; Patch hard coded '/bin/sh' in the line ending in: ;; $Global::shell = $ENV{'PARALLEL_SHELL'} || ;; parent_shell($$) || $ENV{'SHELL'} || "/bin/sh"; (("/bin/sh\\\";\n$") (string-append (which "sh") "\";\n")))) -- cgit v1.2.3 From c30fd002c8fe568d7a22ec2939825e68c88f8e31 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Sep 2018 15:06:12 +0200 Subject: gnu: virtualgl: Update to 2.6. * gnu/packages/gl.scm (virtualgl): Update to 2.6. [inputs]: Add libxtst. --- gnu/packages/gl.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 28e283640d..b88fab4929 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -725,7 +725,7 @@ mixed vector/bitmap output.") (define-public virtualgl (package (name "virtualgl") - (version "2.5.2") + (version "2.6") (source (origin (method url-fetch) @@ -734,16 +734,17 @@ mixed vector/bitmap output.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0rnid3hwrry9d5d4m7sygq00xxx976rgk00a3557m9r5kxbmy476")))) + "1ck1d0w19cgyqvrb9mdlj6l5db90xf18yln71kdninlqxvpgj6h7")))) (arguments - `(#:tests? #f ;; no tests are available + `(#:tests? #f ; no tests are available #:configure-flags (list - (string-append "-DCMAKE_INSTALL_LIBDIR=" - (assoc-ref %outputs "out") "/lib") - "-DVGL_USESSL=1"))) ;; use OpenSSL + (string-append "-DCMAKE_INSTALL_LIBDIR=" + (assoc-ref %outputs "out") "/lib") + "-DVGL_USESSL=1"))) ; use OpenSSL (build-system cmake-build-system) (inputs `(("glu" ,glu) ("libjpeg-turbo" ,libjpeg-turbo) + ("libxtst" ,libxtst) ("mesa" ,mesa) ("openssl" ,openssl))) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From a42b68480b3e73b8486ce808f6451ca880860574 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Sep 2018 15:41:01 +0200 Subject: gnu: libiptcdata: Update to 1.0.5. * gnu/packages/image.scm (libiptcdata): Update to 1.0.5. [home-page]: Follow Debian's maintained upstream. --- gnu/packages/image.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index c3eb48ad0d..b367e0799c 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1368,16 +1368,18 @@ medical image data, e.g. magnetic resonance image (MRI) and functional MRI (define-public libiptcdata (package (name "libiptcdata") - (version "1.0.4") + (version "1.0.5") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/" name "/" name "/" - version "/" name "-" version ".tar.gz")) + (uri (string-append "https://github.com/ianw/libiptcdata" + "/releases/download/release_" + (string-join (string-split version #\.) "_") + "/" name "-" version ".tar.gz")) (sha256 (base32 - "03pfvkmmx762iydq0q207x2028d275pbdysfsgpmrr0ywy63pxkr")))) + "17m2bscc76r1bymjgb44fbbfrdsjfqyb2ivg9wchyllm8pgx1560")))) (build-system gnu-build-system) - (home-page "http://libiptcdata.sourceforge.net/") + (home-page "https://github.com/ianw/libiptcdata") (synopsis "IPTC metadata manipulation library") (description "Libiptcdata is a C library for manipulating the International Press -- cgit v1.2.3 From 3715e79ec8a310a0a957105b57d58b178f2f9d1a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Sep 2018 20:10:13 +0200 Subject: gnu: python-marshmallow: Update to 3.0.0b14. * gnu/packages/python.scm (python-marshmallow): Update to 3.0.0b14. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 26829f050e..30bde632fb 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -12179,14 +12179,14 @@ address is valid and really exists.") (define-public python-marshmallow (package (name "python-marshmallow") - (version "3.0.0b3") + (version "3.0.0b14") (source (origin (method url-fetch) (uri (pypi-uri "marshmallow" version)) (sha256 (base32 - "07mcrij1yvk85lvgx44wwr9pc80xryghvlgayb057g1cazcypysd")))) + "1digk3f5cfk7wmlka65mc7bzsd96pbsgcsvp6pimd5b4ff9zb5p3")))) (build-system python-build-system) (propagated-inputs `(("python-dateutil" ,python-dateutil) -- cgit v1.2.3 From 68cbec027e8e48f1047b7cb1bfdd9b0dd65937ac Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Sep 2018 23:58:51 +0200 Subject: gnu: python-decorator: Update to 4.3.0. * gnu/packages/python.scm (python-decorator): Update to 4.3.0. [arguments]: Run the test suite. --- gnu/packages/python.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 30bde632fb..0bd8086473 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4340,15 +4340,14 @@ PNG, PostScript, PDF, and SVG file output.") (define-public python-decorator (package (name "python-decorator") - (version "4.2.1") + (version "4.3.0") (source (origin (method url-fetch) (uri (pypi-uri "decorator" version)) (sha256 - (base32 "03iaf116rm3w8b4agb8hzf6z9331mrvi4khfxq35zkx17sgxsikx")))) + (base32 "0308djallnh00v112y5b7nadl657ysmkp6vc8xn51d6yzc9zm7n3")))) (build-system python-build-system) - (arguments '(#:tests? #f)) ; no test target (home-page "https://pypi.python.org/pypi/decorator/") (synopsis "Python module to simplify usage of decorators") (description -- cgit v1.2.3 From dd29bd4ebcbfcdcb4c62e2c6c5cf4fd54c74af3b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Sep 2018 00:12:59 +0200 Subject: gnu: python-networkx: Update to 2.2. * gnu/packages/python.scm (python-networkx): Update to 2.2. --- gnu/packages/python.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 0bd8086473..69d87c6e17 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5194,15 +5194,15 @@ interfaces in an easy and portable manner.") (define-public python-networkx (package (name "python-networkx") - (version "2.1") + (version "2.2") (source (origin (method url-fetch) (uri (pypi-uri "networkx" version ".zip")) (sha256 - (base32 "1ccb8mfz4m821k9y0cigkbq42q2sbb4dj5fbjshp0awp32j2q9v4")))) + (base32 "12swxb15299v9vqjsq4z8rgh5sdhvpx497xwnhpnb0gynrx6zra5")))) (build-system python-build-system) - ;; python-decorator is needed at runtime + ;; python-decorator is needed at runtime. (propagated-inputs `(("python-decorator" ,python-decorator))) (native-inputs -- cgit v1.2.3 From cd8aa06093f6491edc17b65608d1f528742f11a6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Sep 2018 00:15:18 +0200 Subject: gnu: python-networkx: Use HTTPS home page. * gnu/packages/python.scm (python-networkx)[home-page]: Use HTTPS. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 69d87c6e17..ea641b8213 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5208,7 +5208,7 @@ interfaces in an easy and portable manner.") (native-inputs `(("python-nose" ,python-nose) ("unzip" ,unzip))) - (home-page "http://networkx.github.io/") + (home-page "https://networkx.github.io/") (synopsis "Python module for creating and manipulating graphs and networks") (description "NetworkX is a Python package for the creation, manipulation, and study -- cgit v1.2.3 From 5c8031ff7382ec9079040d08ae5a05b4dd2352b7 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 17 Sep 2018 18:31:33 +0200 Subject: gnu: Prefix all Emacs packages with "emacs-". * gnu/packages/emacs.scm: Prefix all Emacs packages with "emacs-". This is to enforce consistency and so that `emacs-packages?' can reliably detect Emacs packages based on the "emacs-" prefix. --- gnu/packages/emacs.scm | 119 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 79 insertions(+), 40 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index cff1898d72..fbedd2f48d 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -335,9 +335,9 @@ editor (without an X toolkit)" ) ;;; Emacs hacking. ;;; -(define-public geiser +(define-public emacs-geiser (package - (name "geiser") + (name "emacs-geiser") (version "0.10") (source (origin (method url-fetch) @@ -370,7 +370,10 @@ implementation, Emacs and, ultimately, the schemer, giving them access to live metadata.") (license license:bsd-3))) -(define-public paredit +(define-public geiser + (deprecated-package "geiser" emacs-geiser)) + +(define-public emacs-paredit (package (name "emacs-paredit") (version "24") @@ -395,6 +398,9 @@ for those who may want transient periods of unbalanced parentheses, such as when typing parentheses directly or commenting out code line by line.") (license license:gpl3+))) +(define-public paredit + (deprecated-package "paredit" emacs-paredit)) + (define-public git-modes (package (name "emacs-git-modes") @@ -444,9 +450,9 @@ For remote processes a substitute is provided, which communicates with Emacs on stdout instead of using a socket as the Emacsclient does.") (license license:gpl3+))) -(define-public magit +(define-public emacs-magit (package - (name "magit") + (name "emacs-magit") (version "2.13.0") (source (origin (method url-fetch) @@ -512,9 +518,12 @@ cherry picking, reverting, merging, rebasing, and other common Git operations.") (license license:gpl3+))) -(define-public magit-svn +(define-public magit + (deprecated-package "magit" emacs-magit)) + +(define-public emacs-magit-svn (package - (name "magit-svn") + (name "emacs-magit-svn") (version "2.2.0") (source (origin (method url-fetch) @@ -531,7 +540,7 @@ operations.") ("gzip" ,gzip))) (propagated-inputs `(("dash" ,emacs-dash) ("with-editor" ,emacs-with-editor) - ("magit" ,magit))) + ("magit" ,emacs-magit))) (arguments `(#:modules ((guix build utils) (guix build emacs-utils)) @@ -577,6 +586,9 @@ operations.") support for Git-SVN.") (license license:gpl3+))) +(define-public magit-svn + (deprecated-package "magit-svn" emacs-magit-svn)) + (define-public emacs-magit-popup (package (name "emacs-magit-popup") @@ -641,9 +653,9 @@ Gitlab APIs from Emacs packages. It abstracts access to API resources using only a handful of functions that are not resource-specific.") (license license:gpl3+))) -(define-public haskell-mode +(define-public emacs-haskell-mode (package - (name "haskell-mode") + (name "emacs-haskell-mode") (version "16.1") (source (origin (method url-fetch) @@ -731,7 +743,10 @@ only a handful of functions that are not resource-specific.") programs.") (license license:gpl3+))) -(define-public flycheck +(define-public haskell-mode + (deprecated-package "haskell-mode" emacs-haskell-mode)) + +(define-public emacs-flycheck (package (name "emacs-flycheck") (version "31") @@ -767,6 +782,9 @@ different tools. It highlights errors and warnings inline in the buffer, and provides an optional IDE-like error list.") (license license:gpl3+))) ;+GFDLv1.3+ for the manual +(define-public flycheck + (deprecated-package "flycheck" emacs-flycheck)) + ;;; ;;; Web browsing. @@ -910,7 +928,7 @@ provides an optional IDE-like error list.") ;;; Multimedia. ;;; -(define-public emms +(define-public emacs-emms (package (name "emacs-emms") (version "5.0") @@ -1048,9 +1066,12 @@ light user interface.") (home-page "https://www.gnu.org/software/emms/") (license license:gpl3+))) +(define-public emms + (deprecated-package "emacs-emms" emacs-emms)) + (define-public emacs-emms-player-mpv ;; A new mpv backend is included in Emms from 5.0. - (deprecated-package "emacs-emms-player-mpv" emms)) + (deprecated-package "emacs-emms-player-mpv" emacs-emms)) (define-public emacs-emms-mode-line-cycle (package @@ -1080,9 +1101,9 @@ within a specified width. It is useful for displaying long track titles.") ;;; Miscellaneous. ;;; -(define-public bbdb +(define-public emacs-bbdb (package - (name "bbdb") + (name "emacs-bbdb") (version "3.1.2") (source (origin (method url-fetch) @@ -1121,6 +1142,9 @@ like. It can be linked with various Emacs mail clients (Message and Mail mode, Rmail, Gnus, MH-E, and VM). BBDB is fully customizable.") (license license:gpl3+))) +(define-public bbdb + (deprecated-package "bbdb" emacs-bbdb)) + (define-public emacs-aggressive-indent (package (name "emacs-aggressive-indent") @@ -1721,7 +1745,7 @@ type, for example: packages, buffers, files, etc.") `(("guile" ,guile-2.2) ("guix" ,guix))) (propagated-inputs - `(("geiser" ,geiser) + `(("geiser" ,emacs-geiser) ("guile-gcrypt" ,guile-gcrypt) ("dash" ,emacs-dash) ("bui" ,emacs-bui) @@ -2377,7 +2401,7 @@ in Lisp modes.") "1k0sm552iawi49v4zis6dbb81d1rzgky9v0dpv7nj31gnb7bmy7k")))) (build-system emacs-build-system) (native-inputs - `(("ert-runner" ,ert-runner))) + `(("ert-runner" ,emacs-ert-runner))) (arguments `(#:tests? #t #:test-command '("ert-runner"))) @@ -2663,7 +2687,7 @@ framework for Emacs Lisp to be used with @code{ert}.") (native-inputs `(("emacs-ert-expectations" ,emacs-ert-expectations) ("emacs-undercover" ,emacs-undercover) - ("ert-runner" ,ert-runner))) + ("ert-runner" ,emacs-ert-runner))) (synopsis "Simple asynchronous functions for Emacs Lisp") (description "The @code{deferred.el} library provides support for asynchronous tasks. @@ -2672,7 +2696,7 @@ The API is almost the same as that of for asynchronous tasks.") (license license:gpl3+))) -(define-public butler +(define-public emacs-butler (package (name "emacs-butler") (version "0.2.4") @@ -2698,6 +2722,9 @@ view the build status of those servers' build jobs, and possibly to trigger build jobs.") (license license:gpl3+))) +(define-public butler + (deprecated-package "emacs-butler" emacs-butler)) + (define-public emacs-company (package (name "emacs-company") @@ -2823,7 +2850,7 @@ completion candidate when using the Company text completion framework.") simultaneous cursors.") (license license:gpl3+))) -(define-public typo +(define-public emacs-typo (package (name "emacs-typo") (version "1.1") @@ -2847,6 +2874,9 @@ automatically inserts a Unicode opening or closing quotation mark, depending on context.") (license license:gpl3+))) +(define-public typo + (deprecated-package "emacs-typo" emacs-typo)) + (define-public emacs-scheme-complete (let ((commit "9b5cf224bf2a5994bc6d5b152ff487517f1a9bb5")) (package @@ -3982,7 +4012,7 @@ state and will work even without lispy being enabled.") (native-inputs `(("emacs-dash" ,emacs-dash) ("emacs-s" ,emacs-s) - ("ert-runner" ,ert-runner))) + ("ert-runner" ,emacs-ert-runner))) (arguments `(#:tests? #t #:test-command '("ert-runner"))) @@ -4354,7 +4384,7 @@ indentation and filling of comments and C preprocessor fontification.") (propagated-inputs `(("emacs-dash" ,emacs-dash) ("emacs-s" ,emacs-s) - ("emacs-flycheck" ,flycheck) + ("emacs-flycheck" ,emacs-flycheck) ("emacs-typescript-mode" ,emacs-typescript-mode))) (home-page "https://github.com/ananthakumaran/tide") (synopsis "Typescript IDE for Emacs") @@ -4519,7 +4549,7 @@ provide the historic behavior of @code{flet}, as well as `(#:tests? #t #:test-command '("ert-runner"))) (native-inputs - `(("ert-runner" ,ert-runner))) + `(("ert-runner" ,emacs-ert-runner))) (propagated-inputs `(("emacs-el-x" ,emacs-el-x))) (home-page "https://github.com/sigma/mocker.el") @@ -4585,7 +4615,7 @@ functions to assist in reviewing changes on files.") #:tests? #t #:test-command '("ert-runner"))) (native-inputs - `(("ert-runner" ,ert-runner) + `(("ert-runner" ,emacs-ert-runner) ("emacs-mocker" ,emacs-mocker))) (home-page "https://github.com/jorgenschaefer/pyvenv") (synopsis "Virtualenv minor mode for Emacs") @@ -4670,7 +4700,7 @@ indentation (space indentation only). ("pyvenv" ,emacs-pyvenv) ("s" ,emacs-s))) (native-inputs - `(("ert-runner" ,ert-runner) + `(("ert-runner" ,emacs-ert-runner) ("emacs-f" ,emacs-f) ("python" ,python-wrapper) ("python-autopep8" ,python-autopep8) @@ -6932,9 +6962,9 @@ Emacs.") ;; Tests for ert-runner have a circular dependency with ecukes, and therefore ;; cannot be run -(define-public ert-runner +(define-public emacs-ert-runner (package - (name "ert-runner") + (name "emacs-ert-runner") (version "0.7.0") (source (origin @@ -6977,6 +7007,9 @@ using ERT. It assumes a certain test structure setup and can therefore make running tests easier.") (license license:gpl3+))) +(define-public ert-runner + (deprecated-package "ert-runner" emacs-ert-runner)) + (define-public emacs-disable-mouse (package (name "emacs-disable-mouse") @@ -7020,7 +7053,7 @@ running a customisable handler command (@code{ignore} by default). ") (native-inputs `(("emacs-dash" ,emacs-dash) ("emacs-shut-up" ,emacs-shut-up) - ("ert-runner" ,ert-runner))) + ("ert-runner" ,emacs-ert-runner))) (arguments `(#:tests? #t #:test-command '("ert-runner"))) @@ -7251,7 +7284,7 @@ settings).") "1a4b0lsmwq84qfx51c5xy4fryhb1ysld4fhgw2vr37izf53379sb")))) (build-system emacs-build-system) (native-inputs - `(("ert-runner" ,ert-runner))) + `(("ert-runner" ,emacs-ert-runner))) (arguments `(#:tests? #t #:test-command '("ert-runner" "tests"))) @@ -7507,7 +7540,7 @@ Idris.") `(("emacs-f" ,emacs-f) ("emacs-s" ,emacs-s))) (native-inputs - `(("ert-runner" ,ert-runner))) + `(("ert-runner" ,emacs-ert-runner))) (arguments `(#:tests? #t #:test-command '("ert-runner"))) @@ -7977,9 +8010,9 @@ supports multiple backends such as @code{vlc}, @code{mpg123}, @code{afplay}.") (license license:gpl2+))) -(define-public groovy-emacs-modes +(define-public emacs-groovy-modes (package - (name "groovy-emacs-modes") + (name "emacs-groovy-modes") (version "2.0") (source (origin (method url-fetch) @@ -8001,7 +8034,10 @@ Groovy source files, REPL integration with run-groovy and Grails project navigation with the grails mode.") (license license:gpl3+))) -(define-public org-tree-slide +(define-public groovy-emacs-modes + (deprecated-package "groovy-emacs-modes" emacs-groovy-modes)) + +(define-public emacs-org-tree-slide (let ((commit "dff8f1a4a64c8dd0a1fde0b0131e2fe186747134") (revision "0")) (package @@ -8023,6 +8059,9 @@ navigation with the grails mode.") @kbd{C-<} to jump to the next and previous slide.") (license license:gpl3+)))) +(define-public org-tree-slide + (deprecated-package "emacs-org-tree-slide" emacs-org-tree-slide)) + (define-public emacs-scratch-el (let ((commit "2cdf2b841ce7a0987093f65b0cc431947549f897") (revision "1")) @@ -10095,7 +10134,7 @@ time is being spent during Emacs startup in order to optimize startup time.") (define-public emacs-emms-player-simple-mpv ;; A new mpv backend is included in Emms from 5.0. - (deprecated-package "emacs-emms-player-simple-mpv" emms)) + (deprecated-package "emacs-emms-player-simple-mpv" emacs-emms)) (define-public emacs-magit-org-todos-el (let ((commit "df206287737b9671f2e36ae7b1474ebbe9940d2a")) @@ -10113,7 +10152,7 @@ time is being spent during Emacs startup in order to optimize startup time.") (base32 "0kdp7k7jnnrkhsg0xh1c3h7iz0vgi120gf5xwl1hxy61avivnxrn")))) (propagated-inputs - `(("magit" ,magit))) + `(("magit" ,emacs-magit))) (build-system emacs-build-system) (home-page "https://github.com/danielma/magit-org-todos.el") (synopsis "Get todo.org into Emacs Magit status") @@ -10952,7 +10991,7 @@ through the symbol: @command{this-fn}.") `(("emacs-el-mock" ,emacs-el-mock) ("emacs-noflet" ,emacs-noflet) ("emacs-undercover" ,emacs-undercover) - ("ert-runner" ,ert-runner))) + ("ert-runner" ,emacs-ert-runner))) (propagated-inputs `(("emacs-f" ,emacs-f) ("emacs-popup" ,emacs-popup))) @@ -11139,7 +11178,7 @@ Org-mode file, and citations of Zotero items in Pandoc Markdown files.") (build-system emacs-build-system) (propagated-inputs `(("emacs-evil" ,emacs-evil) - ("magit" ,magit))) + ("magit" ,emacs-magit))) (home-page "https://github.com/emacs-evil/evil-magit") (synopsis "Evil-based key bindings for Magit") @@ -11412,7 +11451,7 @@ you searched for and execute it, or view its documentation.") (build-system emacs-build-system) (propagated-inputs `(("emacs-helm" ,emacs-helm) - ("emacs-emms" ,emms))) + ("emacs-emms" ,emacs-emms))) (home-page "https://github.com/emacs-helm/helm-emms") (synopsis "Emms for Helm") @@ -11467,7 +11506,7 @@ See @code{helm-exwm-switch-browser} for an example.") (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash) - ("emacs-flycheck" ,flycheck) + ("emacs-flycheck" ,emacs-flycheck) ("emacs-helm" ,emacs-helm))) (home-page "https://github.com/yasuyk/helm-flycheck") (synopsis "Show Flycheck errors with Helm") @@ -12029,7 +12068,7 @@ buffers – other modes on the TODO list). ("emacs-dash" ,emacs-dash) ("emacs-f" ,emacs-f) ("emacs-hl-todo" ,emacs-hl-todo) - ("magit" ,magit) + ("magit" ,emacs-magit) ("emacs-pcre2el" ,emacs-pcre2el) ("emacs-s" ,emacs-s))) (home-page "https://github.com/alphapapa/magit-todos") -- cgit v1.2.3 From a434730f2ebc39fcda7a8d0709c7f5adffa69299 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 24 Sep 2018 13:23:32 +0200 Subject: gnu: Add r-xbioc. * gnu/packages/bioinformatics.scm (r-xbioc): New variable. --- gnu/packages/bioinformatics.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b619866ba3..d92fbd7de9 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13760,3 +13760,36 @@ sequencing data.") ;; This is free software but the license variant is unclear: ;; . (license license:bsd-3))) + +(define-public r-xbioc + (let ((revision "1") + (commit "f798c187e376fd1ba27abd559f47bbae7e3e466b")) + (package + (name "r-xbioc") + (version (git-version "0.1.15" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/renozao/xbioc.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "03hffh2f6z71y6l6dqpa5cql3hdaw7zigdi8sm2dzgx379k9rgrr")))) + (build-system r-build-system) + (propagated-inputs + `(("r-annotationdbi" ,r-annotationdbi) + ("r-assertthat" ,r-assertthat) + ("r-biobase" ,r-biobase) + ("r-biocinstaller" ,r-biocinstaller) + ("r-digest" ,r-digest) + ("r-pkgmaker" ,r-pkgmaker) + ("r-plyr" ,r-plyr) + ("r-reshape2" ,r-reshape2) + ("r-stringr" ,r-stringr))) + (home-page "https://github.com/renozao/xbioc/") + (synopsis "Extra base functions for Bioconductor") + (description "This package provides extra utility functions to perform +common tasks in the analysis of omics data, leveraging and enhancing features +provided by Bioconductor packages.") + (license license:gpl3+)))) -- cgit v1.2.3 From 28829c040f92399c0705f968f232543e97e5f5f9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 24 Sep 2018 13:23:44 +0200 Subject: gnu: Add r-cssam. * gnu/packages/bioinformatics.scm (r-cssam): New variable. --- gnu/packages/bioinformatics.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index d92fbd7de9..2366843d87 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13793,3 +13793,34 @@ sequencing data.") common tasks in the analysis of omics data, leveraging and enhancing features provided by Bioconductor packages.") (license license:gpl3+)))) + +(define-public r-cssam + (let ((revision "1") + (commit "9ec58c982fa551af0d80b1a266890d92954833f2")) + (package + (name "r-cssam") + (version (git-version "1.4" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/shenorrLab/csSAM.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "128syf9v39gk0z3ip000qpsjbg6l1siyq6c8b0hz41dzg5achyb3")))) + (build-system r-build-system) + (propagated-inputs + `(("r-formula" ,r-formula) + ("r-ggplot2" ,r-ggplot2) + ("r-pkgmaker" ,r-pkgmaker) + ("r-plyr" ,r-plyr) + ("r-rngtools" ,r-rngtools) + ("r-scales" ,r-scales))) + (home-page "https://github.com/shenorrLab/csSAM/") + (synopsis "Cell type-specific statistical analysis of microarray") + (description "This package implements the method csSAM that computes +cell-specific differential expression from measured cell proportions using +SAM.") + ;; Any version + (license license:lgpl2.1+)))) -- cgit v1.2.3 From e72702475da2379e10ca09e724e10a9bceceef1b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 24 Sep 2018 13:24:13 +0200 Subject: gnu: Add r-bseqsc. * gnu/packages/bioinformatics.scm (r-bseqsc): New variable. --- gnu/packages/bioinformatics.scm | 45 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 2366843d87..e74abf005f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13824,3 +13824,48 @@ cell-specific differential expression from measured cell proportions using SAM.") ;; Any version (license license:lgpl2.1+)))) + +(define-public r-bseqsc + (let ((revision "1") + (commit "fef3f3e38dcf3df37103348b5780937982b43b98")) + (package + (name "r-bseqsc") + (version (git-version "1.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/shenorrLab/bseqsc.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1prw13wa20f7wlc3gkkls66n1kxz8d28qrb8icfqdwdnnv8w5qg8")))) + (build-system r-build-system) + (propagated-inputs + `(("r-abind" ,r-abind) + ("r-annotationdbi" ,r-annotationdbi) + ("r-biobase" ,r-biobase) + ("r-cssam" ,r-cssam) + ("r-dplyr" ,r-dplyr) + ("r-e1071" ,r-e1071) + ("r-edger" ,r-edger) + ("r-ggplot2" ,r-ggplot2) + ("r-nmf" ,r-nmf) + ("r-openxlsx" ,r-openxlsx) + ("r-pkgmaker" ,r-pkgmaker) + ("r-plyr" ,r-plyr) + ("r-preprocesscore" ,r-preprocesscore) + ("r-rngtools" ,r-rngtools) + ("r-scales" ,r-scales) + ("r-stringr" ,r-stringr) + ("r-xbioc" ,r-xbioc))) + (home-page "https://github.com/shenorrLab/bseqsc") + (synopsis "Deconvolution of bulk sequencing experiments using single cell data") + (description "BSeq-sc is a bioinformatics analysis pipeline that +leverages single-cell sequencing data to estimate cell type proportion and +cell type-specific gene expression differences from RNA-seq data from bulk +tissue samples. This is a companion package to the publication \"A +single-cell transcriptomic map of the human and mouse pancreas reveals inter- +and intra-cell population structure.\" Baron et al. Cell Systems (2016) +@url{https://www.ncbi.nlm.nih.gov/pubmed/27667365}.") + (license license:gpl2+)))) -- cgit v1.2.3 From 94282358fd5ca5be85dbf3ccadc7693259f7a72f Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Mon, 24 Sep 2018 17:46:18 +0530 Subject: gnu: m17n-db: Update to 1.8.0. * gnu/packages/emacs.scm (m17n-db): Update to 1.8.0. --- gnu/packages/emacs.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index fbedd2f48d..cc2560dffa 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -5538,14 +5538,15 @@ extensibility.") (define-public m17n-db (package (name "m17n-db") - (version "1.7.0") + (version "1.8.0") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/m17n/m17n-db-" version ".tar.gz")) (sha256 - (base32 "1w08hnsbknrcjlzp42c99bgwc9hzsnf5m4apdv0dacql2s09zfm2")))) + (base32 + "0vfw7z9i2s9np6nmx1d4dlsywm044rkaqarn7akffmb6bf1j6zv5")))) (build-system gnu-build-system) (inputs `(("gettext" ,gettext-minimal))) -- cgit v1.2.3 From 53c64d7c9303d52cbacdaca5d182175d472c53db Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Mon, 24 Sep 2018 17:46:47 +0530 Subject: gnu: m17n-lib: Update to 1.8.0. * gnu/packages/emacs.scm (m17n-lib): Update to 1.8.0. --- gnu/packages/emacs.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index cc2560dffa..f29040c372 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -5573,14 +5573,15 @@ This package contains the library database.") (define-public m17n-lib (package (name "m17n-lib") - (version "1.7.0") + (version "1.8.0") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/m17n/m17n-lib-" version ".tar.gz")) (sha256 - (base32 "10yv730i25g1rpzv6q49m6xn4p8fjm7jdwvik2h70sn8w3hm7f4f")))) + (base32 + "0jp61y09xqj10mclpip48qlfhniw8gwy8b28cbzxy8hq8pkwmfkq")))) (build-system gnu-build-system) (inputs `(("fribidi" ,fribidi) -- cgit v1.2.3 From d08b3258435254cc6ade95b84a6c53e59cc191e6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 24 Sep 2018 16:20:19 +0200 Subject: gnu: Add python-grequests. * gnu/packages/python-web.scm (python-grequests): New variable. --- gnu/packages/python-web.scm | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 226b9b631b..6ded2f75ab 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016, 2017 Danny Milosavljevic ;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge ;;; Copyright © 2016, 2017 Marius Bakke -;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus ;;; Copyright © 2017 Roel Janssen ;;; Copyright © 2016, 2017 Julien Lepiller ;;; Copyright © 2016, 2017 Nils Gillmann @@ -1592,6 +1592,29 @@ library.") (define-public python2-responses (package-with-python2 python-responses)) +(define-public python-grequests + (package + (name "python-grequests") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "grequests" version)) + (sha256 + (base32 + "1j9icncllbkv7x5719b20mx670c6q1jrdx1sakskkarvx3pc8h8g")))) + (build-system python-build-system) + (propagated-inputs + `(("python-gevent" ,python-gevent) + ("python-requests" ,python-requests))) + (native-inputs + `(("python-nose" ,python-nose))) + (home-page "https://github.com/kennethreitz/grequests") + (synopsis "Python library for asynchronous HTTP requests") + (description "GRequests is a Python library that allows you to use +@code{Requests} with @code{Gevent} to make asynchronous HTTP Requests easily") + (license license:bsd-2))) + (define-public python-geventhttpclient (package (name "python-geventhttpclient") -- cgit v1.2.3 From 0750f344eceb10e8ddd81ed146ae2e1aa897f2d4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 24 Sep 2018 16:20:32 +0200 Subject: gnu: Add python-hawkauthlib. * gnu/packages/python-web.scm (python-hawkauthlib): New variable. --- gnu/packages/python-web.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 6ded2f75ab..c38ccea216 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2649,3 +2649,25 @@ for URL parsing and changing.") (define-public python2-google-api-client (package-with-python2 python-google-api-client)) + +(define-public python-hawkauthlib + (package + (name "python-hawkauthlib") + (version "2.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "hawkauthlib" version)) + (sha256 + (base32 + "03ai47s4h8nfnrf25shbfvkm1b9n1ccd4nmmj280sg1fayi69zgg")))) + (build-system python-build-system) + (propagated-inputs + `(("python-requests" ,python-requests) + ("python-webob" ,python-webob))) + (home-page "https://github.com/mozilla-services/hawkauthlib") + (synopsis "Hawk Access Authentication protocol") + (description + "This is a low-level Python library for implementing Hawk Access Authentication, +a simple HTTP request-signing scheme.") + (license license:mpl2.0))) -- cgit v1.2.3 From 084e14cc37d893703b526d8f8f9220f7ee3aa0b3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 24 Sep 2018 16:20:42 +0200 Subject: gnu: Add python-pybrowserid. * gnu/packages/python-web.scm (python-pybrowserid): New variable. --- gnu/packages/python-web.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index c38ccea216..68a0d78db5 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2671,3 +2671,26 @@ for URL parsing and changing.") "This is a low-level Python library for implementing Hawk Access Authentication, a simple HTTP request-signing scheme.") (license license:mpl2.0))) + +(define-public python-pybrowserid + (package + (name "python-pybrowserid") + (version "0.14.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "PyBrowserID" version)) + (sha256 + (base32 + "1qvi79kfb8x9kxkm5lw2mp42hm82cpps1xknmsb5ghkwx1lpc8kc")))) + (build-system python-build-system) + (propagated-inputs + `(("python-requests" ,python-requests))) + (native-inputs + `(("python-mock" ,python-mock))) + (home-page "https://github.com/mozilla/PyBrowserID") + (synopsis "Python library for the BrowserID protocol") + (description + "This is a Python client library for the BrowserID protocol that +underlies Mozilla Persona.") + (license license:mpl2.0))) -- cgit v1.2.3 From f45bb3cc0fc4e687f966a8f2fabce73e0c6f31f7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 24 Sep 2018 16:20:51 +0200 Subject: gnu: Add python-pyfxa. * gnu/packages/python-web.scm (python-pyfxa): New variable. --- gnu/packages/python-web.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 68a0d78db5..6df33fe41d 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2694,3 +2694,34 @@ a simple HTTP request-signing scheme.") "This is a Python client library for the BrowserID protocol that underlies Mozilla Persona.") (license license:mpl2.0))) + +(define-public python-pyfxa + (package + (name "python-pyfxa") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "PyFxA" version)) + (sha256 + (base32 + "0axl16fyrz2r88gnw4b12mk7dpkqscv8c4wsc1y5hicl7bsbc4fm")))) + (build-system python-build-system) + (arguments '(#:tests? #f)) ; 17 tests require network access + (propagated-inputs + `(("python-cryptography" ,python-cryptography) + ("python-hawkauthlib" ,python-hawkauthlib) + ("python-pybrowserid" ,python-pybrowserid) + ("python-requests" ,python-requests) + ("python-six" ,python-six))) + (native-inputs + `(("python-grequests" ,python-grequests) + ("python-mock" ,python-mock) + ("python-responses" ,python-responses) + ("python-unittest2" ,python-unittest2))) + (home-page "https://github.com/mozilla/PyFxA") + (synopsis "Firefox Accounts client library for Python") + (description + "This is a Python library for interacting with the Firefox Accounts +ecosystem.") + (license license:mpl2.0))) -- cgit v1.2.3 From 000147811b15465cd0f67d2635ba7d807d865afd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 24 Sep 2018 16:21:11 +0200 Subject: gnu: eolie: Update to 0.9.37. * gnu/packages/gnome.scm (eolie): Update to 0.9.37. [source]: Fetch from gitlab. [build-system]: Use meson-build-system. [arguments]: Remove custom phases; set #:glib-or-gtk?. [native-inputs]: Remove meson-for-build and ninja; add glib:bin. [inputs]: Add python-pyfxa and python-pycrypto. --- gnu/packages/gnome.scm | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ac898fb294..1ca354a432 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -115,6 +115,8 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages python-crypto) + #:use-module (gnu packages python-web) #:use-module (gnu packages rdesktop) #:use-module (gnu packages scanner) #:use-module (gnu packages selinux) @@ -4088,29 +4090,20 @@ work and the interface is well tested.") (define-public eolie (package (name "eolie") - (version "0.9.15") + (version "0.9.37") (source (origin (method url-fetch) - (uri (string-append "https://github.com/gnumdk/eolie/" - "releases/download/" version - "/eolie-" version ".tar.xz")) + (uri (string-append "https://gitlab.gnome.org/World/eolie/" + "uploads/4341cb428b7a45670308ee3fb3fa07dd/" + "eolie-" version ".tar.xz")) (sha256 (base32 - "0glydxp1xh85gfidk1l9miqn6qxdbvvk5s3iy0pjlv8nrs3263jd")))) - (build-system glib-or-gtk-build-system) + "126m0nwwy3lqv7z8aj9hiwangih03b1nlkg3xja9p7wbf7zcvp2n")))) + (build-system meson-build-system) (arguments - `(#:phases + `(#:glib-or-gtk? #t + #:phases (modify-phases %standard-phases - (delete 'configure) - (replace 'build - (lambda* (#:key outputs #:allow-other-keys) - (invoke "meson" "build" - "--prefix" (assoc-ref outputs "out")))) - (replace 'check - (lambda _ (invoke "ninja" "-C" "build" "test"))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (invoke "ninja" "-C" "build" "install"))) (add-after 'wrap 'wrap-more (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -4134,9 +4127,8 @@ work and the interface is well tested.") ("intltool" ,intltool) ("itstool" ,itstool) ("pkg-config" ,pkg-config) - ("meson" ,meson-for-build) - ("ninja" ,ninja) ("python" ,python) + ("glib:bin" ,glib "bin") ("gtk+" ,gtk+ "bin"))) (inputs `(("gobject-introspection" ,gobject-introspection) @@ -4146,8 +4138,10 @@ work and the interface is well tested.") ("atk" ,atk) ; propagated by gtk+, but we need it in LD_LIBRARY_PATH ("python" ,python-wrapper) ("python-dateutil" ,python-dateutil) + ("python-pyfxa" ,python-pyfxa) ("python-pygobject" ,python-pygobject) ("python-pycairo" ,python-pycairo) + ("python-pycrypto" ,python-pycrypto) ("libsecret" ,libsecret) ("gtkspell3" ,gtkspell3) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) -- cgit v1.2.3 From 8ae540a2c024f9b1b8bce65dbe1dfbf4e926bc77 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Sep 2018 00:54:39 +0200 Subject: gnu: ocaml-ssl: Don't use unstable tarball. * gnu/packages/ocaml.scm (ocaml-ssl)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/ocaml.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7859696406..0756aecd6d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -65,6 +65,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system ocaml) #:use-module (guix download) + #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix svn-download) @@ -1650,12 +1651,13 @@ lets the client choose the concrete timeline.") (version "0.5.5") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/savonet/ocaml-ssl/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/savonet/ocaml-ssl.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "15p7652cvzdrlqxc1af11mg07wasxr1fsaj44gcmmh6bmav7wfzq")))) + "0fviq8xhp3qk7pmkl7knchywsipxgb7p0z489hj8qnf2sx8xzdmy")))) (build-system ocaml-build-system) (arguments `(#:tests? #f #:make-flags (list "OCAMLFIND_LDCONF=ignore") -- cgit v1.2.3 From c60d5a25280d77ae22061ac08677e07db38e8fbd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Sep 2018 01:08:09 +0200 Subject: gnu: libmesode: Don't use unstable tarball. * gnu/packages/messaging.scm (libmesode)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/messaging.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 42a0847b7a..3174b4ef4e 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1474,13 +1474,14 @@ is also scriptable and extensible via Guile.") (name "libmesode") (version "0.9.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/boothj5/libmesode/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/boothj5/libmesode.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0iaj56fkd5bjvqpvq3324ni895rmbj1akbfqipjydnghfwaym4z6")))) + "1zb1x422zkpnxrz9d2b7pmi8ms60lbw49yh78mydqfypsmj2iyfh")))) (build-system gnu-build-system) (inputs `(("expat" ,expat) -- cgit v1.2.3 From b44a18c8f26e66c2cbfff4740bff29949a9eb684 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Sep 2018 01:12:00 +0200 Subject: gnu: libmesode: Update to 0.9.2. * gnu/packages/messaging.scm (libmesode): Update to 0.9.2. --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 3174b4ef4e..33e9d2ffe3 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1472,7 +1472,7 @@ is also scriptable and extensible via Guile.") (define-public libmesode (package (name "libmesode") - (version "0.9.1") + (version "0.9.2") (source (origin (method git-fetch) (uri (git-reference @@ -1481,7 +1481,7 @@ is also scriptable and extensible via Guile.") (file-name (git-file-name name version)) (sha256 (base32 - "1zb1x422zkpnxrz9d2b7pmi8ms60lbw49yh78mydqfypsmj2iyfh")))) + "06f5nfaypvxrbsinxa1k2vrxrs7kqmg38g4wwwk5d63hpn1pj8ak")))) (build-system gnu-build-system) (inputs `(("expat" ,expat) -- cgit v1.2.3 From 25ab91c85c8901e6e9b36042fa126e24ceb57263 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Sep 2018 01:35:17 +0200 Subject: gnu: gloox: Update to 1.0.21. * gnu/packages/messaging.scm (gloox): Update to 1.0.21. --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 33e9d2ffe3..9b1aea788c 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1135,7 +1135,7 @@ with several different talk daemons at the same time.") (define-public gloox (package (name "gloox") - (version "1.0.17") + (version "1.0.21") (source (origin (method url-fetch) @@ -1143,7 +1143,7 @@ with several different talk daemons at the same time.") version ".tar.bz2")) (sha256 (base32 - "09c01jr5nrm7f1ly42wg0pqqscmp48pv8y2fjx1vwbavjxdq59ri")))) + "1k57qgif1yii515m6jaqaibkdysfab6394bpawd2l67321f1a4rw")))) (build-system gnu-build-system) (inputs `(("libidn" ,libidn) -- cgit v1.2.3 From 4cb4af797a08047b5ca894fcb7930519dd2ef466 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Sep 2018 01:37:35 +0200 Subject: gnu: lxterminal: Update to 0.3.2. * gnu/packages/lxde.scm (lxterminal): Update to 0.3.2. --- gnu/packages/lxde.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 19938fa93c..c45beb8bbb 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -164,7 +164,7 @@ toolkit. It allows users to monitor and control of running processes.") (define-public lxterminal (package (name "lxterminal") - (version "0.3.1") + (version "0.3.2") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/lxde/LXTerminal" @@ -172,7 +172,7 @@ toolkit. It allows users to monitor and control of running processes.") version "/" name "-" version ".tar.xz")) (sha256 (base32 - "0jrc3m0hbxcmcgahwjlm46s2350gh80ggb6a90xy0h6xqa3z73fd")))) + "1124pghrhnx6q4391ri8nvi6bsmvbj1dx81an08mird8jf2b2rii")))) (build-system gnu-build-system) (inputs `(("gtk+" ,gtk+-2) ("vte" ,vte/gtk+-2))) -- cgit v1.2.3 From e6dcf9ca5f386c98fc03093032d65559c03164e2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Sep 2018 13:11:24 +0200 Subject: gnu: rename: Update to 1.00. * gnu/packages/admin.scm (rename): Update to 1.00. [arguments]: Wrap executable to find its own library. --- gnu/packages/admin.scm | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index e7e34ab97f..8f504cafef 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -869,7 +869,7 @@ over ssh connections.") (define-public rename (package (name "rename") - (version "0.35") + (version "1.00") (source (origin (method url-fetch) (uri (string-append @@ -877,8 +877,24 @@ over ssh connections.") version ".tar.gz")) (sha256 (base32 - "052iqmn7ya3w1nadpiyavmr3rx566r0lbflx94y8b5wx9q5c16rq")))) + "03yhf8nmqsb0zyliv501fdvwlp589jqfn44yqkrflmpzrbik3zxl")))) (build-system perl-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'find-itself + ;; Fix run-time 'Can't locate File/Rename.pm in @INC' failure. + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (with-directory-excursion bin + (for-each + (lambda (program) + (wrap-program program + `("PERL5LIB" ":" prefix + (,(string-append out "/lib/perl5/site_perl"))))) + (find-files "." ".*"))) + #t)))))) (native-inputs `(("perl-module-build" ,perl-module-build) ("perl-test-pod" ,perl-test-pod) -- cgit v1.2.3 From a68b45142373dd75bc96f9c4f8151bcd4e972888 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 19 Sep 2018 22:23:59 +0200 Subject: gnu: Add gandi.cli. * gnu/packages/networking.scm (gandi.cli): New public variable. --- gnu/packages/networking.scm | 50 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 84224374c6..4800c2496b 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -87,6 +87,7 @@ #:use-module (gnu packages perl-check) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-web) #:use-module (gnu packages qt) #:use-module (gnu packages readline) #:use-module (gnu packages ssh) @@ -673,6 +674,55 @@ send out a ping packet and move on to the next target in a round-robin fashion.") (license license:expat))) +(define-public gandi.cli + (package + (name "gandi.cli") + (version "1.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri name version)) + (sha256 + (base32 "0vfzkw1avybjkf6fwqpf5m4kjz4c0qkkmj62f3jd0zx00vh5ly1d")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'embed-store-file-names + (lambda _ + (substitute* (list "gandi/cli/modules/cert.py" + "gandi/cli/tests/commands/test_certificate.py") + (("openssl") (which "openssl"))) + #t)) + (add-after 'install 'install-documentation + ;; The included man page may be outdated but we install it anyway, + ;; since it's mentioned in 'gandi --help' and better than nothing. + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (man1 (string-append out "/share/man/man1"))) + (mkdir-p man1) + (with-output-to-file (string-append man1 "/gandi.1") + (lambda _ + (invoke "rst2man.py" "gandicli.man.rst"))) + #t)))))) + (native-inputs + `(("python-docutils" ,python-docutils) ; for rst2man.py + ("python-pytest-cov" ,python-pytest-cov) + ("python-tox" ,python-tox))) + (inputs + `(("openssl" ,openssl) + ("python-click" ,python-click) + ("python-ipy" ,python-ipy) + ("python-pyyaml" ,python-pyyaml) + ("python-requests" ,python-requests))) + (home-page "https://cli.gandi.net") + (synopsis "Command-line interface to the Gandi.net Web API") + (description + "This package provides a command-line client (@command{gandi}) to buy, +manage, and delete Internet resources from Gandi.net such as domain names, +virtual machines, and certificates.") + (license license:gpl3+))) + (define-public httping (package (name "httping") -- cgit v1.2.3 From 116af86f14f7789831d79815d5b4532afa82058c Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sun, 16 Sep 2018 22:17:06 -0400 Subject: gnu: octave: Add a search path for CURLOPT_CAPATH. * gnu/packages/maths.scm (octave)[native-search-paths]: New field. --- gnu/packages/maths.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 636b485260..b7d669ccea 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1402,6 +1402,13 @@ can solve two kinds of problems: ("less" ,less) ("ghostscript" ,ghostscript) ("gnuplot" ,gnuplot))) + ;; Octave code uses this variable to detect directories holding multiple CA + ;; certificates to verify peers with. This is required for the networking + ;; functions that require encryption to work properly. + (native-search-paths + (list (search-path-specification + (variable "CURLOPT_CAPATH") + (files '("etc/ssl/certs"))))) (arguments `(#:configure-flags (list (string-append "--with-shell=" -- cgit v1.2.3 From f1ea0759f414084a62e29a0740f48d508f3dee73 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 25 Sep 2018 08:18:03 +0200 Subject: gnu: qjackctl: Update to 0.5.4. * gnu/packages/audio.scm (qjackctl): Update to 0.5.4. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 8bce6fa2c2..4465872732 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2013,14 +2013,14 @@ and ALSA.") (define-public qjackctl (package (name "qjackctl") - (version "0.5.3") + (version "0.5.4") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/qjackctl/qjackctl/" version "/qjackctl-" version ".tar.gz")) (sha256 (base32 - "0x08af8m5l8qy9av3dlldsg58ny9nc69h1s4i6hqkvj24jwy6fw1")))) + "0qr71nb93gkz5q53nfcl5g168z173wc6s8w1yjs3rfn3m4hg0bcq")))) (build-system gnu-build-system) (arguments '(#:tests? #f)) ; no check target -- cgit v1.2.3 From 932839ff124ff3b0dd3070914fb1c5beec69bf32 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 25 Sep 2018 11:20:32 +0200 Subject: gnu: ibus: Update to 1.5.19. * gnu/packages/ibus.scm (ibus): Update to 1.5.19. [arguments]: Add configure flags to disable Python 2 support while building Python 3 bindings; adjust make flags; add phase prepare-ucd-dir. [inputs]: Replace python2-pygobject with python-pygobject; replace python-2 with python. [native-inputs]: Add unicode files. --- gnu/packages/ibus.scm | 37 ++++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 9f7e1f88b4..08fce5f6fb 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -44,7 +44,7 @@ (define-public ibus (package (name "ibus") - (version "1.5.17") + (version "1.5.19") (source (origin (method url-fetch) (uri (string-append "https://github.com/ibus/ibus/" @@ -52,22 +52,29 @@ version "/ibus-" version ".tar.gz")) (sha256 (base32 - "06fj7lawww5d5w73pk249191lvmpz7shlxfxia74bjkpb42shiq3")))) + "0a94bnpm24581317hdnihwr4cniriml10p4ffgxg14xhvaccfrjb")))) (build-system glib-or-gtk-build-system) (arguments `(#:tests? #f ; tests fail because there's no connection to dbus - #:configure-flags '("--disable-emoji-dict" ; cannot find emoji.json path + #:configure-flags `("--disable-emoji-dict" ; cannot find emoji.json path + "--disable-python2" + "--enable-python-library" + ,(string-append "--with-ucd-dir=" + (getcwd) "/ucd") "--enable-wayland") #:make-flags (list "CC=gcc" (string-append "pyoverridesdir=" (assoc-ref %outputs "out") - "/lib/python2.7/site-packages/gi/overrides/") - (string-append "py2overridesdir=" - (assoc-ref %outputs "out") - "/lib/python2.7/site-packages/gi/overrides/")) + "/lib/python3.6/site-packages/gi/overrides/")) #:phases (modify-phases %standard-phases + (add-after 'unpack 'prepare-ucd-dir + (lambda* (#:key inputs #:allow-other-keys) + (mkdir-p "../ucd") + (symlink (assoc-ref inputs "unicode-blocks") "../ucd/Blocks.txt") + (symlink (assoc-ref inputs "unicode-nameslist") "../ucd/NamesList.txt") + #t)) (add-before 'configure 'disable-dconf-update (lambda _ (substitute* "data/dconf/Makefile.in" @@ -117,11 +124,23 @@ ("wayland" ,wayland) ("xmodmap" ,xmodmap) ("iso-codes" ,iso-codes) - ("pygobject2" ,python2-pygobject) - ("python2" ,python-2))) + ("pygobject2" ,python-pygobject) + ("python" ,python))) (native-inputs `(("glib" ,glib "bin") ; for glib-genmarshal ("gobject-introspection" ,gobject-introspection) ; for g-ir-compiler + ("unicode-nameslist" + ,(origin + (method url-fetch) + (uri "https://www.unicode.org/Public/UNIDATA/NamesList.txt") + (sha256 + (base32 "0yr2h0nfqhirfi3bxl33z6cc94qqshlpgi06c25xh9754irqsgv8")))) + ("unicode-blocks" + ,(origin + (method url-fetch) + (uri "https://www.unicode.org/Public/UNIDATA/Blocks.txt") + (sha256 + (base32 "0lnh9iazikpr548bd7nkaq9r3vfljfvz0rg2462prac8qxk7ni8b")))) ("vala" ,vala) ("pkg-config" ,pkg-config))) (native-search-paths -- cgit v1.2.3 From 79374801d08c8b3e0df264340fd7212a3dac10ab Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 25 Sep 2018 03:44:19 +0200 Subject: gnu: python-flask-login: Don't use unstable tarball. * gnu/packages/python-web.scm (python-flask-login)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/python-web.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 6df33fe41d..e3de0a0824 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2056,13 +2056,13 @@ It comes with safe defaults and easily configurable options.") (version "0.4.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/maxcountryman/flask-login/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/maxcountryman/flask-login.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 - "1pdqp7a2gyb7k06xda004x0fi2w66s6kn2i0ndkqndmg12d83f9w")))) + (base32 "0sjbmk8m4mmd9g99n6c6lx9nv2jwwqp6qsqhl945w2m0f1sknwdh")))) (arguments ;; Tests fail PEP8 compliance. See: ;; https://github.com/maxcountryman/flask-login/issues/340 -- cgit v1.2.3 From bbc69023d86f5bd4ffec994453e5bdfbf5c429f4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 25 Sep 2018 10:13:01 +0200 Subject: gnu: Add python-semantic-version. * gnu/packages/python.scm (python-semantic-version) (python2-semantic-version): New public variables. --- gnu/packages/python.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ea641b8213..86ce70254d 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -907,6 +907,34 @@ API for locking files.") (define-public python2-lockfile (package-with-python2 python-lockfile)) +(define-public python-semantic-version + (package + (name "python-semantic-version") + (version "2.6.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "semantic_version" version)) + (sha256 + (base32 + "1h2l9xyg1zzsda6kjcmfcgycbvrafwci283vcr1v5sbk01l2hhra")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) ; PyPI tarball lacks tests + (home-page "https://github.com/rbarrois/python-semanticversion") + (synopsis "Semantic versioning module for Python") + (description + "The @code{semantic_version} class is a small library for handling +@uref{https://semver.org/, semantic versioning} (@dfn{SemVer}) in Python. + +It can compare versions, generate a new version that represents a bump in one of +the version levels, and check whether any given string is a proper semantic +version identifier.") + (license license:bsd-3))) + +(define-public python2-semantic-version + (package-with-python2 python-semantic-version)) + (define-public python-setuptools (package (name "python-setuptools") -- cgit v1.2.3 From d6ab1d0ac3047931a4e4daf0d48f23d2468a7341 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 25 Sep 2018 10:19:13 +0200 Subject: gnu: python-flask-login: Update to 0.4.1. * gnu/packages/python-web.scm (python-flask-login): Update to 0.4.1. [arguments]: Run the test suite. [propagated-inputs]: Add python-flask. [native-inputs]: Add test dependencies. --- gnu/packages/python-web.scm | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index e3de0a0824..456134c1ce 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2053,7 +2053,7 @@ It comes with safe defaults and easily configurable options.") (define-public python-flask-login (package (name "python-flask-login") - (version "0.4.0") + (version "0.4.1") (source (origin (method git-fetch) @@ -2062,12 +2062,27 @@ It comes with safe defaults and easily configurable options.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0sjbmk8m4mmd9g99n6c6lx9nv2jwwqp6qsqhl945w2m0f1sknwdh")))) + (base32 "1rj0qwyxapxnp84fi4lhmvh3d91fdiwz7hibw77x3d5i72knqaa9")))) (arguments - ;; Tests fail PEP8 compliance. See: - ;; https://github.com/maxcountryman/flask-login/issues/340 - `(#:tests? #f)) + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'avoid-yanc + ;; Work around '.nosetests-real: error: no such option: --with-yanc'. + (lambda _ + (setenv "NOCOLOR" "set") + #t))))) (build-system python-build-system) + (propagated-inputs + `(("python-flask" ,python-flask))) + (native-inputs + ;; For tests. + `(("python-blinker" ,python-blinker) + ("python-mock" ,python-mock) + ("python-nose" ,python-nose) + ("python-pep8" ,python-pep8) + ("python-pyflakes" ,python-pyflakes) + ("python-semantic-version" ,python-semantic-version) + ("python-werkzeug" ,python-werkzeug))) (home-page "https://github.com/maxcountryman/flask-login") (synopsis "User session management for Flask") (description -- cgit v1.2.3 From 238d950b79b78365337e625d2a06247fe464d765 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Sep 2018 13:52:11 +0200 Subject: gnu: python-nose-timer: Update to 0.7.3. * gnu/packages/check.scm (python-nose-timer): Update to 0.7.3. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index f4596010ea..866fa801c0 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1926,14 +1926,14 @@ create data based on random numbers and yet remain repeatable.") (define-public python-nose-timer (package (name "python-nose-timer") - (version "0.7.2") + (version "0.7.3") (source (origin (method url-fetch) (uri (pypi-uri "nose-timer" version)) (sha256 (base32 - "0ywg223p528014z5s0vzck74r4xyw3kvcp2casfnc85dkvir1zj7")))) + "0hfz5aqnhf493i9kyb6prm4zm8vx7wmfsyg3nvsnh24lzh2kwx44")))) (build-system python-build-system) (propagated-inputs `(("python-nose" ,python-nose) -- cgit v1.2.3 From 6d7ca74ba60053ddd53636d5850d8ee97fb4ccf5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 25 Sep 2018 11:39:12 +0200 Subject: gnu: 389-ds-base: Fix build. * gnu/packages/openldap.scm (389-ds-base)[inputs]: Add openssl. --- gnu/packages/openldap.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm index 4b615b5d32..962a9c8cfe 100644 --- a/gnu/packages/openldap.scm +++ b/gnu/packages/openldap.scm @@ -295,6 +295,7 @@ servers from Python programs.") ("nspr" ,nspr) ("nss" ,nss) ("openldap" ,openldap) + ("openssl" ,openssl) ; #included by net-snmp ("pcre" ,pcre) ("perl" ,perl) ("python" ,python) -- cgit v1.2.3 From 06e6b17bd7ab0258536c62c3639fba38134d84ae Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 25 Sep 2018 10:14:58 +0200 Subject: gnu: python-pexpect: Use INVOKE. * gnu/packages/python.scm (python-pexpect)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 86ce70254d..5c6c79da88 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4550,7 +4550,7 @@ displayed.") ;; Why does it not work? Delete for now. (delete-file "tests/test_socket.py") #t)) - (replace 'check (lambda _ (zero? (system* "nosetests" "-v"))))))) + (replace 'check (lambda _ (invoke "nosetests" "-v")))))) (native-inputs `(("python-nose" ,python-nose) ("python-pytest" ,python-pytest) -- cgit v1.2.3 From 38e1095d8294e824444c8669765da2358c9b13bd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 25 Sep 2018 03:38:24 +0200 Subject: gnu: python-wsgiproxy2: Update to 0.4.5. * gnu/packages/python-web.scm (python-wsgiproxy2): Update to 0.4.5. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 456134c1ce..2a7487202a 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1351,14 +1351,14 @@ Amazon Web Services (AWS) API.") (define-public python-wsgiproxy2 (package (name "python-wsgiproxy2") - (version "0.4.4") + (version "0.4.5") (source (origin (method url-fetch) (uri (pypi-uri "WSGIProxy2" version ".tar.gz")) (sha256 (base32 - "16532rjc94h3w74x52jfckf3yzsp8h6z34522jk4xgjy82hpnd7r")))) + "19d9dva282vfjs784i0zkxp078lxfz4h3f621z30ij9wbf5rba6a")))) (build-system python-build-system) (native-inputs `(("python-webtest" ,python-webtest))) -- cgit v1.2.3 From 35f903778a658f9778e945acb8b26d47ca240163 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 24 Sep 2018 13:59:35 +0200 Subject: gnu: Add guile-next. * gnu/packages/guile.scm (guile-next): Rewrite to refer to Guile 3.0. --- gnu/packages/guile.scm | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index c66183b9db..6d8ab71c78 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -317,7 +317,45 @@ without requiring the source code to be rewritten.") "07p3g0v2ba2vlfbfidqzlgbhnzdx46wh2rgc5gszq1mjyx5bks6r")))))) (define-public guile-next - (deprecated-package "guile-next" guile-2.2)) + ;; This is the upcoming Guile 3.0, with JIT support. + (let ((commit "a74b4a45fab1a78e34954bce5f031e8a9765f827") + (revision "0")) + (package + (inherit guile-2.2) + (name "guile-next") + (version (git-version "2.99" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/guile.git") + (commit commit))) + (sha256 + (base32 + "0kq6mabv7j4gdlwmpz3iaddv98sc7awkl2358sg8j50sg10yw8nx")) + (file-name (git-file-name name version)))) + (native-inputs + `(("autoconf", autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("gettext" ,gnu-gettext) + ("texinfo" ,texinfo) + ("flex" ,flex) + ,@(package-native-inputs guile-2.2))) + (arguments + (substitute-keyword-arguments (package-arguments guile-2.2) + ((#:phases phases '%standard-phases) + ;; XXX: The default 'bootstrap' phase tries to execute the + ;; ./bootstrap directory. + `(modify-phases ,phases + (replace 'bootstrap + (lambda _ + (patch-shebang "build-aux/git-version-gen") + (invoke "autoreconf" "-vfi"))) + (add-before 'check 'skip-version-test + (lambda _ + ;; Remove this test that's bound to fail. + (delete-file "test-suite/tests/version.test") + #t))))))))) (define (make-guile-readline guile) (package -- cgit v1.2.3 From a7a887718ad0624940d782f9e9b25d275a8f40d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 24 Sep 2018 14:08:40 +0200 Subject: gnu: diffoscope: Update to 102. * gnu/packages/package-management.scm (diffoscope): Update to 102. --- gnu/packages/package-management.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 5edfb5dffb..3bc8ac6073 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -568,13 +568,13 @@ transactions from C or Python.") (define-public diffoscope (package (name "diffoscope") - (version "100") + (version "102") (source (origin (method url-fetch) (uri (pypi-uri name version)) (sha256 (base32 - "0sh7g26i5ndpa8l7xq6rnijbi3jz5izjn0b98zcnm6wpgghszw48")))) + "0v2z98xx7n4viw12yq83flpb9ir5ahy1gn44pic0i3dam18xhcm6")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 52b87855ea64f02a254f6b510346dfb0e20dd5a7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 28 Aug 2018 02:07:56 +0200 Subject: gnu: enchant: Update home page. * gnu/packages/enchant.scm (enchant)[home-page]: Set to URL mentioned on the legacy home page. --- gnu/packages/enchant.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/enchant.scm b/gnu/packages/enchant.scm index 8b2796d0e2..1c6506ebf1 100644 --- a/gnu/packages/enchant.scm +++ b/gnu/packages/enchant.scm @@ -57,5 +57,5 @@ Enchant steps in to provide uniformity and conformity on top of these libraries, and implement certain features that may be lacking in any individual provider library. Everything should \"just work\" for any and every definition of \"just working\".") - (home-page "http://www.abisource.com/projects/enchant") + (home-page "https://abiword.github.io/enchant/") (license lgpl2.1+))) -- cgit v1.2.3 From 18ef85b64a3433bccf8dc8b32d338de91fd85a8a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 28 Aug 2018 03:47:45 +0200 Subject: gnu: enchant: Don't build libenchant.a. * gnu/packages/enchant.scm (enchant)[arguments]: Add #:configure-flags. --- gnu/packages/enchant.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/enchant.scm b/gnu/packages/enchant.scm index 1c6506ebf1..b5e9084a42 100644 --- a/gnu/packages/enchant.scm +++ b/gnu/packages/enchant.scm @@ -40,6 +40,8 @@ (base32 "0zq9yw1xzk8k9s6x83n1f9srzcwdavzazn3haln4nhp9wxxrxb1g")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (inputs `(("aspell" ,aspell) ;; Currently, the only supported backend in Guix ("glib" ,glib))) ;; is aspell. (This information might be old) -- cgit v1.2.3 From 9a59b29411e2f007a6ba32b88d3b6f50bd6c1f45 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 28 Aug 2018 17:15:00 +0200 Subject: gnu: enchant: Propagate Glib. * gnu/packages/enchant.scm (enchant)[inputs]: Move GLIB ... [propagated-inputs]: ... here. New field. --- gnu/packages/enchant.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/enchant.scm b/gnu/packages/enchant.scm index b5e9084a42..c3f75ccf2e 100644 --- a/gnu/packages/enchant.scm +++ b/gnu/packages/enchant.scm @@ -43,8 +43,10 @@ (arguments '(#:configure-flags '("--disable-static"))) (inputs - `(("aspell" ,aspell) ;; Currently, the only supported backend in Guix - ("glib" ,glib))) ;; is aspell. (This information might be old) + `(("aspell" ,aspell))) ;; Currently, the only supported backend in Guix + (propagated-inputs ;; is aspell. (This information might be old) + ;; Required by enchant.pc. + `(("glib" ,glib))) (native-inputs `(("glib:bin" ,glib "bin") ("pkg-config" ,pkg-config))) -- cgit v1.2.3 From c1d59b3c2a88427aa268a405116a01958db84a5b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 28 Aug 2018 04:03:23 +0200 Subject: gnu: enchant: Update to 2.2.3. * gnu/packages/enchant.scm (enchant): Update to 2.2.3. [arguments]: Add "--enable-relocatable" to #:configure-flags. [native-inputs]: Add UNITTEST-CPP. (enchant-1.6): New public variable. * gnu/packages/fcitx.scm (fcitx)[inputs]: Change ENCHANT to ENCHANT-1.6. * gnu/packages/gnome.scm (gspell): Likewise. * gnu/packages/mate.scm (pluma): Likewise. * gnu/packages/gtk.scm (gtkspell3)[propagated-inputs]: Likewise. [inputs]: Remove duplicate ENCHANT. --- gnu/packages/enchant.scm | 50 ++++++++++++++++++++++++++++++++++-------------- gnu/packages/fcitx.scm | 2 +- gnu/packages/gnome.scm | 2 +- gnu/packages/gtk.scm | 5 ++--- gnu/packages/mate.scm | 2 +- 5 files changed, 41 insertions(+), 20 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/enchant.scm b/gnu/packages/enchant.scm index c3f75ccf2e..0392a709e2 100644 --- a/gnu/packages/enchant.scm +++ b/gnu/packages/enchant.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Marek Benc +;;; Copyright © 2018 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -19,29 +20,32 @@ (define-module (gnu packages enchant) #:use-module (gnu packages) #:use-module (gnu packages aspell) + #:use-module (gnu packages check) #:use-module (gnu packages glib) #:use-module (gnu packages pkg-config) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) - #:use-module (guix licenses)) + #:use-module (guix licenses) + #:use-module (srfi srfi-1)) (define-public enchant (package (name "enchant") - (version "1.6.0") - (source - (origin - (method url-fetch) - (uri - (string-append "http://www.abisource.com/downloads/" name "/" version - "/" name "-" version ".tar.gz")) - (sha256 - (base32 "0zq9yw1xzk8k9s6x83n1f9srzcwdavzazn3haln4nhp9wxxrxb1g")))) - + (version "2.2.3") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/AbiWord/enchant/releases" + "/download/v" version "/enchant-" + version ".tar.gz")) + (sha256 + (base32 + "0v87p1ls0gym95qirijpclk650sjbkcjjl6ssk059zswcwaykn5b")))) (build-system gnu-build-system) (arguments - '(#:configure-flags '("--disable-static"))) + '(#:configure-flags '("--disable-static" + ;; Tests require a relocatable build. + "--enable-relocatable"))) (inputs `(("aspell" ,aspell))) ;; Currently, the only supported backend in Guix (propagated-inputs ;; is aspell. (This information might be old) @@ -49,8 +53,8 @@ `(("glib" ,glib))) (native-inputs `(("glib:bin" ,glib "bin") - ("pkg-config" ,pkg-config))) - + ("pkg-config" ,pkg-config) + ("unittest-cpp" ,unittest-cpp))) (synopsis "Multi-backend spell-checking library wrapper") (description "On the surface, Enchant appears to be a generic spell checking library. @@ -63,3 +67,21 @@ library. Everything should \"just work\" for any and every definition of \"just working\".") (home-page "https://abiword.github.io/enchant/") (license lgpl2.1+))) + +;; Some packages are not ready for the 2.x API yet, so we keep this version +;; around. The library and executables of Enchant 2 have been designed not to +;; conflict with 1.x, so it's OK if both end up in the same profile. +(define-public enchant-1.6 + (package + (inherit enchant) + (version "1.6.0") + (arguments '(#:configure-flags '("--disable-static"))) + (native-inputs (alist-delete "unittest-cpp" + (package-native-inputs enchant))) + (source (origin + (method url-fetch) + (uri (string-append "http://www.abisource.com/downloads/enchant/" + version "/enchant-" version ".tar.gz")) + (sha256 + (base32 + "0zq9yw1xzk8k9s6x83n1f9srzcwdavzazn3haln4nhp9wxxrxb1g")))))) diff --git a/gnu/packages/fcitx.scm b/gnu/packages/fcitx.scm index bcd5f12dd1..b05d9b7146 100644 --- a/gnu/packages/fcitx.scm +++ b/gnu/packages/fcitx.scm @@ -75,7 +75,7 @@ ("pkg-config" ,pkg-config))) (inputs `(("dbus" ,dbus) - ("enchant" ,enchant) + ("enchant" ,enchant-1.6) ("gettext" ,gettext-minimal) ("gtk2" ,gtk+-2) ("gtk3" ,gtk+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1ca354a432..8d684cd36d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6969,7 +6969,7 @@ that support the Assistive Technology Service Provider Interface (AT-SPI).") ("aspell-dict-en" ,aspell-dict-en) ("xorg-server" ,xorg-server))) (propagated-inputs - `(("enchant" ,enchant))) ; enchant.pc is required by gspell-1.pc + `(("enchant" ,enchant-1.6))) ; enchant.pc is required by gspell-1.pc (home-page "https://wiki.gnome.org/Projects/gspell") (synopsis "GNOME's alternative spell checker") (description diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 0b85a1723f..76e64b36bc 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1582,12 +1582,11 @@ glass artworks done by Venicians glass blowers.") `(("intltool" ,intltool) ("pkg-config" ,pkg-config))) (inputs - `(("enchant" ,enchant) - ("gobject-introspection" ,gobject-introspection) + `(("gobject-introspection" ,gobject-introspection) ("gtk+" ,gtk+) ("pango" ,pango))) (propagated-inputs - `(("enchant" ,enchant))) ; gtkspell3-3.0.pc refers to it. + `(("enchant" ,enchant-1.6))) ;gtkspell3-3.0.pc refers to it (home-page "http://gtkspell.sourceforge.net") (synopsis "Spell-checking addon for GTK's TextView widget") (description diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 88f64fdb66..5919c714ee 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -1411,7 +1411,7 @@ can be used as backgrounds in the MATE Desktop environment.") (inputs `(("atk" ,atk) ("cairo" ,cairo) - ("enchant" ,enchant) + ("enchant" ,enchant-1.6) ("glib" ,glib) ("gtk+" ,gtk+) ("gtksourceview" ,gtksourceview) -- cgit v1.2.3 From 9b1bb75781118b1460563171aae503aa9ba702a8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 28 Aug 2018 05:49:30 +0200 Subject: gnu: gspell: Update to 1.8.1. * gnu/packages/gnome.scm (gspell): Update to 1.8.1. [propagated-inputs]: Change ENCHANT-1.6 to ENCHANT. --- gnu/packages/gnome.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8d684cd36d..1e8522c500 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6927,7 +6927,7 @@ that support the Assistive Technology Service Provider Interface (AT-SPI).") (define-public gspell (package (name "gspell") - (version "1.4.2") + (version "1.8.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -6935,7 +6935,7 @@ that support the Assistive Technology Service Provider Interface (AT-SPI).") name "-" version ".tar.xz")) (sha256 (base32 - "1683vyyfq3q0ph665jj6id8hnlyid4qxzmqiwpv97gmz8zksg6x5")) + "1rdv873ixhwr15jwgc2z6k6y0hj353fqnwsy7zkh0c30qwiiv6l1")) (patches (search-patches "gspell-dash-test.patch")))) (build-system glib-or-gtk-build-system) (arguments @@ -6969,7 +6969,7 @@ that support the Assistive Technology Service Provider Interface (AT-SPI).") ("aspell-dict-en" ,aspell-dict-en) ("xorg-server" ,xorg-server))) (propagated-inputs - `(("enchant" ,enchant-1.6))) ; enchant.pc is required by gspell-1.pc + `(("enchant" ,enchant))) ;enchant.pc is required by gspell-1.pc (home-page "https://wiki.gnome.org/Projects/gspell") (synopsis "GNOME's alternative spell checker") (description -- cgit v1.2.3 From a0c9ba1d64be641192a22de3284aee2acb69214e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 20 Sep 2018 16:56:15 +0200 Subject: gnu: webkitgtk: Remove obsolete phase. * gnu/packages/webkit.scm (webkitgtk)[arguments]: Remove #:phases. (webkitgtk-2.22)[arguments]: Don't reference removed phase. --- gnu/packages/webkit.scm | 38 ++++++++++---------------------------- 1 file changed, 10 insertions(+), 28 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 976411dbbc..c5238a8a65 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -87,23 +87,7 @@ ;; XXX Disable WOFF2 ‘web fonts’. These were never ;; supported in our previous builds. Enabling them ;; requires building libwoff2 and possibly woff2dec. - "-DUSE_WOFF2=OFF") - #:phases - (modify-phases %standard-phases - (add-after - 'set-paths 'add-gst-plugins-base-include-path - (lambda* (#:key inputs #:allow-other-keys) - ;; XXX Work around a problem in the build system, which neglects - ;; to add -I for gst-plugins-base when compiling - ;; Source/WebKit2/UIProcess/WebPageProxy.cpp, apparently assuming - ;; that it will be in the same directory as gstreamer's header - ;; files. - (setenv "CPATH" - (string-append (getenv "C_INCLUDE_PATH") - ":" - (assoc-ref inputs "gst-plugins-base") - "/include/gstreamer-1.0")) - #t))))) + "-DUSE_WOFF2=OFF"))) (native-inputs `(("bison" ,bison) ("gettext" ,gettext-minimal) @@ -171,14 +155,12 @@ HTML/CSS applications to full-fledged web browsers.") `(("gcc" ,gcc-7) ; webkitgtk-2.22 requires gcc-6 or newer ,@(package-native-inputs webkitgtk))) (arguments - (substitute-keyword-arguments (package-arguments webkitgtk) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'add-gst-plugins-base-include-path - 'work-around-gcc-7-include-path-issue - ;; FIXME: Work around a problem with gcc-7 includes (see - ;; ). - (lambda _ - (unsetenv "C_INCLUDE_PATH") - (unsetenv "CPLUS_INCLUDE_PATH") - #t)))))))) + `(#:phases (modify-phases %standard-phases + (add-before 'configure 'work-around-gcc-7-include-path-issue + ;; FIXME: Work around a problem with gcc-7 includes (see + ;; ). + (lambda _ + (unsetenv "C_INCLUDE_PATH") + (unsetenv "CPLUS_INCLUDE_PATH") + #t))) + ,@(package-arguments webkitgtk))))) -- cgit v1.2.3 From 020c4ef18e2a1ab877de803d697ca96acfa46624 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 24 Sep 2018 14:43:53 +0200 Subject: gnu: node: Delete expired tests. * gnu/packages/node.scm (node)[arguments]: Delete tests for which the TLS certificates have expired. --- gnu/packages/node.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index d1de7a536c..de7d59c6b5 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -125,6 +125,14 @@ "test/sequential/test-child-process-emfile.js" "test/sequential/test-benchmark-child-process.js" "test/sequential/test-http-regr-gh-2928.js")) + + ;; These tests have an expiry date: they depend on the validity of + ;; TLS certificates that are bundled with the source. We want this + ;; package to be reproducible forever, so remove those. + ;; TODO: Regenerate certs instead. + (for-each delete-file + '("test/parallel/test-tls-passphrase.js" + "test/parallel/test-tls-server-verify.js")) #t)) (replace 'configure ;; Node's configure script is actually a python script, so we can't -- cgit v1.2.3 From e789b85841aa013c4f6bd18f4dff99b30bf0b3a4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 23 Sep 2018 13:12:23 +0200 Subject: gnu: Add Node LTS. * gnu/packages/node.scm (node)[arguments]: Adjust 'patch-files' phase to ignore missing files. (node-lts): New public variable. --- gnu/packages/node.scm | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index de7d59c6b5..b525804bdb 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2016 Ludovic Courtès ;;; Copyright © 2017 Mike Gerwitz ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -86,6 +87,14 @@ (modify-phases %standard-phases (add-before 'configure 'patch-files (lambda* (#:key inputs #:allow-other-keys) + + ;; This phase is inherited by Node LTS, which does not have all + ;; the files listed here. Use this helper for convenience. + (define (delete-if-exists file) + (if (file-exists? file) + (delete-file file) + '())) + ;; Fix hardcoded /bin/sh references. (substitute* '("lib/child_process.js" "lib/internal/v8_prof_polyfill.js" @@ -103,7 +112,7 @@ ;; FIXME: These tests depend on being able to install eslint. ;; See https://github.com/nodejs/node/issues/17098. - (for-each delete-file + (for-each delete-if-exists '("test/parallel/test-eslint-alphabetize-errors.js" "test/parallel/test-eslint-buffer-constructor.js" "test/parallel/test-eslint-documented-errors.js" @@ -111,7 +120,7 @@ ;; FIXME: These tests fail in the build container, but they don't ;; seem to be indicative of real problems in practice. - (for-each delete-file + (for-each delete-if-exists '("test/async-hooks/test-ttywrap.readstream.js" "test/parallel/test-util-inspect.js" "test/parallel/test-v8-serdes.js" @@ -130,7 +139,7 @@ ;; TLS certificates that are bundled with the source. We want this ;; package to be reproducible forever, so remove those. ;; TODO: Regenerate certs instead. - (for-each delete-file + (for-each delete-if-exists '("test/parallel/test-tls-passphrase.js" "test/parallel/test-tls-server-verify.js")) #t)) @@ -188,3 +197,16 @@ devices.") (home-page "https://nodejs.org/") (license expat) (properties '((timeout . 3600))))) ; 1 h + +(define-public node-lts + (package + (inherit node) + (name "node-lts") + (version "8.12.0") + (source (origin + (inherit (package-source node)) + (uri (string-append "https://nodejs.org/dist/v" version + "/node-v" version ".tar.xz")) + (sha256 + (base32 + "16j1rrxkhmvpcw689ndw1raql1gz4jqn7n82z55zn63c05cgz7as")))))) -- cgit v1.2.3 From 5f33e9063b9b047801d0206e7a74eee8bf6fc52d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 26 Aug 2018 23:31:10 +0200 Subject: gnu: varnish: Use absolute file name of "rm". * gnu/packages/web.scm (varnish)[arguments]: Rename 'patch-bin-sh-phase to 'use-absolute-file-names and add substitution. --- gnu/packages/web.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index b6bee57f9f..26c2e9128a 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5019,12 +5019,14 @@ deployments.") "--localstatedir=/var") #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-/bin/sh + (add-after 'unpack 'use-absolute-file-names (lambda _ (substitute* '("bin/varnishtest/vtc_varnish.c" "bin/varnishtest/vtc_process.c" "bin/varnishd/mgt/mgt_vcc.c") (("/bin/sh") (which "sh"))) + (substitute* "bin/varnishd/mgt/mgt_shmem.c" + (("rm -rf") (string-append (which "rm") " -rf"))) #t)) (add-before 'install 'patch-Makefile (lambda _ -- cgit v1.2.3 From 3b97a1779f3b65d582b8edc8c154b6414314b946 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 26 Aug 2018 23:33:48 +0200 Subject: services: Add Varnish service. * gnu/services/web.scm (): New record type. (%varnish-accounts, %varnish-service-type): New variables. (varnish-shepherd-service): New procedure. * gnu/tests/web.scm (%varnish-vcl, %varnish-os): New variables. (%test-varnish): New test. * doc/guix.texi (Web Services): Document it. --- gnu/services/web.scm | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++- gnu/tests/web.scm | 41 ++++++++++++++++++++++ 2 files changed, 136 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 1c38e7d8d3..1edb1f4d34 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2017, 2018 Clément Lassieur ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2017 Christopher Baines +;;; Copyright © 2018 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -190,7 +191,21 @@ tailon-configuration-config-file tailon-configuration-package - tailon-service-type)) + tailon-service-type + + + varnish-configuration + varnish-configuration? + varnish-configuration-package + varnish-configuration-name + varnish-configuration-backend + varnish-configuration-vcl + varnish-configuration-listen + varnish-configuration-storage + varnish-configuration-parameters + varnish-configuration-extra-options + + varnish-service-type)) ;;; Commentary: ;;; @@ -1162,3 +1177,82 @@ files.") (files (append (tailon-configuration-file-files old-config-file) files)))))))) (default-value (tailon-configuration)))) + + +;;; +;;; Varnish +;;; + +(define-record-type* + varnish-configuration make-varnish-configuration + varnish-configuration? + (package varnish-configuration-package ; + (default varnish)) + (name varnish-configuration-name ;string + (default "default")) + (backend varnish-configuration-backend ;string + (default "localhost:8080")) + (vcl varnish-configuration-vcl ;#f | + (default #f)) + (listen varnish-configuration-listen ;list of strings + (default '("localhost:80"))) + (storage varnish-configuration-storage ;list of strings + (default '("malloc,128m"))) + (parameters varnish-configuration-parameters ;list of string pairs + (default '())) + (extra-options varnish-configuration-extra-options ;list of strings + (default '()))) + +(define %varnish-accounts + (list (user-group + (name "varnish") + (system? #t)) + (user-account + (name "varnish") + (group "varnish") + (system? #t) + (comment "Varnish Cache User") + (home-directory "/var/varnish") + (shell (file-append shadow "/sbin/nologin"))))) + +(define varnish-shepherd-service + (match-lambda + (($ package name backend vcl listen storage + parameters extra-options) + (list (shepherd-service + (provision (list (symbol-append 'varnish- (string->symbol name)))) + (documentation (string-append "The Varnish Web Accelerator" + " (" name ")")) + (requirement '(networking)) + (start #~(make-forkexec-constructor + (list #$(file-append package "/sbin/varnishd") + "-n" #$name + #$@(if vcl + #~("-f" #$vcl) + #~("-b" #$backend)) + #$@(append-map (lambda (a) (list "-a" a)) listen) + #$@(append-map (lambda (s) (list "-s" s)) storage) + #$@(append-map (lambda (p) + (list "-p" (format #f "~a=~a" + (car p) (cdr p)))) + parameters) + #$@extra-options) + ;; Varnish will drop privileges to the "varnish" user when + ;; it exists. Not passing #:user here allows the service + ;; to bind to ports < 1024. + #:pid-file (if (string-prefix? "/" #$name) + (string-append #$name "/_.pid") + (string-append "/var/varnish/" #$name "/_.pid")))) + (stop #~(make-kill-destructor))))))) + +(define varnish-service-type + (service-type + (name 'varnish) + (description "Run the Varnish cache server.") + (extensions + (list (service-extension account-service-type + (const %varnish-accounts)) + (service-extension shepherd-root-service-type + varnish-shepherd-service))) + (default-value + (varnish-configuration)))) diff --git a/gnu/tests/web.scm b/gnu/tests/web.scm index 45fcb668fb..bcc919137b 100644 --- a/gnu/tests/web.scm +++ b/gnu/tests/web.scm @@ -32,6 +32,7 @@ #:use-module (guix store) #:export (%test-httpd %test-nginx + %test-varnish %test-php-fpm %test-hpcguix-web %test-tailon)) @@ -167,6 +168,46 @@ HTTP-PORT." (value (run-webserver-test name %nginx-os #:log-file "/var/log/nginx/access.log")))) + +;;; +;;; Varnish +;;; + +(define %varnish-vcl + (mixed-text-file + "varnish-test.vcl" + "vcl 4.0; +backend dummy { .host = \"127.1.1.1\"; } +sub vcl_recv { return(synth(200, \"OK\")); } +sub vcl_synth { + synthetic(\"" %index.html-contents "\"); + set resp.http.Content-Type = \"text/plain\"; + return(deliver); +}")) + +(define %varnish-os + (simple-operating-system + (dhcp-client-service) + ;; Pretend to be a web server that serves %index.html-contents. + (service varnish-service-type + (varnish-configuration + (name "/tmp/server") + ;; Use a small VSL buffer to fit in the test VM. + (parameters '(("vsl_space" . "4M"))) + (vcl %varnish-vcl))) + ;; Proxy the "server" using the builtin configuration. + (service varnish-service-type + (varnish-configuration + (parameters '(("vsl_space" . "4M"))) + (backend "localhost:80") + (listen '(":8080")))))) + +(define %test-varnish + (system-test + (name "varnish") + (description "Test the Varnish Cache server.") + (value (run-webserver-test "varnish-default" %varnish-os)))) + ;;; ;;; PHP-FPM -- cgit v1.2.3 From ffec356a29a58d97ec34e1152aa3136e78471dc6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 23 Sep 2018 14:45:34 +0200 Subject: 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(-) (limited to 'gnu') 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))) -- cgit v1.2.3 From 257e3247910610fe24ae1b86f38e85552d53e48c Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 23 Sep 2018 04:46:59 -0400 Subject: gnu: icecat: Unbundle graphite2 and harfbuzz. * gnu/packages/patches/icecat-use-system-graphite2+harfbuzz.patch: New file. * gnu/packages/patches/icecat-use-system-graphite2.patch, gnu/packages/patches/icecat-use-system-harfbuzz.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Update accordingly. * gnu/packages/gnuzilla.scm (icecat)[source]: Add new patch. Delete bundled graphite2 and harfbuzz in snippet. [inputs]: Add graphite2 and harfbuzz. [arguments]: Add --with-system-{graphite2,harfbuzz} to configure flags. --- gnu/local.mk | 3 +- gnu/packages/gnuzilla.scm | 19 +- .../icecat-use-system-graphite2+harfbuzz.patch | 226 +++++++++++++++++ .../patches/icecat-use-system-graphite2.patch | 248 ------------------ .../patches/icecat-use-system-harfbuzz.patch | 279 --------------------- 5 files changed, 236 insertions(+), 539 deletions(-) create mode 100644 gnu/packages/patches/icecat-use-system-graphite2+harfbuzz.patch delete mode 100644 gnu/packages/patches/icecat-use-system-graphite2.patch delete mode 100644 gnu/packages/patches/icecat-use-system-harfbuzz.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index fe2b573dd5..35e78e7816 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -811,8 +811,7 @@ dist_patch_DATA = \ %D%/packages/patches/hydra-disable-darcs-test.patch \ %D%/packages/patches/icecat-avoid-bundled-libraries.patch \ %D%/packages/patches/icecat-CVE-2018-12383.patch \ - %D%/packages/patches/icecat-use-system-graphite2.patch \ - %D%/packages/patches/icecat-use-system-harfbuzz.patch \ + %D%/packages/patches/icecat-use-system-graphite2+harfbuzz.patch \ %D%/packages/patches/icedtea-6-hotspot-gcc-segfault-workaround.patch \ %D%/packages/patches/icedtea-7-hotspot-gcc-segfault-workaround.patch \ %D%/packages/patches/id3lib-CVE-2007-4460.patch \ diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 653cee93d5..ad83444e3c 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -495,9 +495,8 @@ security standards.") "0lqx7g79x15941rhjr3qsfwsny6vzc7d7abdmvjy6jjbqkqlc1zl")) (patches (list - (search-patch "icecat-avoid-bundled-libraries.patch") - ;; FIXME (search-patch "icecat-use-system-harfbuzz.patch") - ;; FIXME (search-patch "icecat-use-system-graphite2.patch") + (search-patch "icecat-avoid-bundled-libraries.patch") + (search-patch "icecat-use-system-graphite2+harfbuzz.patch") (mozilla-patch "icecat-CVE-2018-12385.patch" "80a4a7ef2813" "1vgcbimpnfjqj934v0cryq1g13xac3wfmd4jyhcb5s60x8xyssf5") (search-patch "icecat-CVE-2018-12383.patch") (mozilla-patch "icecat-bug-1489744.patch" "6546ee839d30" "11mhvj77r789b428bfxqq5wdx8yr7lbrdjzr8qjj6fw197pldn51"))) @@ -535,8 +534,8 @@ security standards.") "media/libvpx" "security/nss" ;; UNBUNDLE-ME "gfx/cairo" - ;; UNBUNDLE-ME "gfx/harfbuzz" - ;; UNBUNDLE-ME "gfx/graphite2" + "gfx/harfbuzz" + "gfx/graphite2" "js/src/ctypes/libffi" "db/sqlite3")) ;; Delete .pyc files, typically present in icecat source tarballs @@ -557,10 +556,10 @@ security standards.") ("glib" ,glib) ("gtk+" ,gtk+) ("gtk+-2" ,gtk+-2) - ;; UNBUNDLE-ME ("graphite2" ,graphite2) + ("graphite2" ,graphite2) ("pango" ,pango) ("freetype" ,freetype) - ;; UNBUNDLE-ME ("harfbuzz" ,harfbuzz) + ("harfbuzz" ,harfbuzz) ("hunspell" ,hunspell) ("libcanberra" ,libcanberra) ("libgnome" ,libgnome) @@ -643,8 +642,8 @@ security standards.") "--with-system-icu" "--with-system-nspr" "--with-system-nss" - ;; UNBUNDLE-ME "--with-system-harfbuzz" - ;; UNBUNDLE-ME "--with-system-graphite2" + "--with-system-harfbuzz" + "--with-system-graphite2" "--enable-system-pixman" ;; UNBUNDLE-ME "--enable-system-cairo" "--enable-system-ffi" @@ -697,7 +696,7 @@ security standards.") all))) #t)) (add-after 'patch-source-shebangs 'patch-cargo-checksums - (lambda* _ + (lambda _ (use-modules (guix build cargo-build-system)) (let ((null-file "/dev/null") (null-hash "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")) diff --git a/gnu/packages/patches/icecat-use-system-graphite2+harfbuzz.patch b/gnu/packages/patches/icecat-use-system-graphite2+harfbuzz.patch new file mode 100644 index 0000000000..94c211b797 --- /dev/null +++ b/gnu/packages/patches/icecat-use-system-graphite2+harfbuzz.patch @@ -0,0 +1,226 @@ +Allow building against system-wide graphite2/harfbuzz. +See +Based on: + https://svnweb.freebsd.org/ports/head/www/firefox-esr/files/patch-bug847568?revision=472833&view=co +Modified for use with patch -p1, and to apply cleanly to GNU IceCat. + +--- icecat-60.2.0/config/system-headers.mozbuild ++++ icecat-60.2.0/config/system-headers.mozbuild +@@ -1311,6 +1311,19 @@ + 'pixman.h', + ] + ++if CONFIG['MOZ_SYSTEM_GRAPHITE2']: ++ system_headers += [ ++ 'graphite2/Font.h', ++ 'graphite2/Segment.h', ++ ] ++ ++if CONFIG['MOZ_SYSTEM_HARFBUZZ']: ++ system_headers += [ ++ 'harfbuzz/hb-glib.h', ++ 'harfbuzz/hb-ot.h', ++ 'harfbuzz/hb.h', ++ ] ++ + if CONFIG['MOZ_SYSTEM_LIBVPX']: + system_headers += [ + 'vpx_mem/vpx_mem.h', +--- icecat-60.2.0/dom/base/moz.build ++++ icecat-60.2.0/dom/base/moz.build +@@ -474,6 +474,9 @@ + if CONFIG['MOZ_X11']: + CXXFLAGS += CONFIG['TK_CFLAGS'] + ++if CONFIG['MOZ_SYSTEM_HARFBUZZ']: ++ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] ++ + GENERATED_FILES += [ + 'PropertyUseCounterMap.inc', + 'UseCounterList.h', +--- icecat-60.2.0/gfx/graphite2/moz-gr-update.sh ++++ icecat-60.2.0/gfx/graphite2/moz-gr-update.sh +@@ -1,6 +1,7 @@ + #!/bin/bash + + # Script used to update the Graphite2 library in the mozilla source tree ++# and bump version for --with-system-graphite2 + + # This script lives in gfx/graphite2, along with the library source, + # but must be run from the top level of the mozilla-central tree. +@@ -37,12 +38,16 @@ echo "See" $0 "for update procedure." >> gfx/graphite2/README.mozilla + #find gfx/graphite2/ -name "*.cpp" -exec perl -p -i -e "s///;s/Windows.h/windows.h/;" {} \; + #find gfx/graphite2/ -name "*.h" -exec perl -p -i -e "s///;s/Windows.h/windows.h/;" {} \; + ++# chase version for --with-system-graphite2 ++perl -p -i -e "s/[0-9]+\,[0-9]+\,[0-9]+/$RELEASE/ and tr/./,/ \ ++ if /GR2_VERSION_REQUIRE/" old-configure.in ++ + # summarize what's been touched + echo Updated to $RELEASE. + echo Here is what changed in the gfx/graphite2 directory: + echo + +-hg stat gfx/graphite2 ++hg stat old-configure.in gfx/graphite2 + + echo + echo If gfx/graphite2/src/files.mk has changed, please make corresponding +--- icecat-60.2.0/gfx/moz.build ++++ icecat-60.2.0/gfx/moz.build +@@ -10,6 +10,12 @@ with Files('**'): + if CONFIG['MOZ_TREE_CAIRO']: + DIRS += ['cairo'] + ++if not CONFIG['MOZ_SYSTEM_GRAPHITE2']: ++ DIRS += ['graphite2/src' ] ++ ++if not CONFIG['MOZ_SYSTEM_HARFBUZZ']: ++ DIRS += ['harfbuzz/src'] ++ + DIRS += [ + '2d', + 'ycbcr', +@@ -18,8 +24,6 @@ DIRS += [ + 'qcms', + 'gl', + 'layers', +- 'graphite2/src', +- 'harfbuzz/src', + 'ots/src', + 'thebes', + 'ipc', +--- icecat-60.2.0/gfx/skia/generate_mozbuild.py ++++ icecat-60.2.0/gfx/skia/generate_mozbuild.py +@@ -148,6 +148,9 @@ + '-Wno-unused-private-field', + ] + ++if CONFIG['MOZ_SYSTEM_HARFBUZZ']: ++ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] ++ + if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk3', 'android'): + CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] + CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] +--- icecat-60.2.0/gfx/skia/moz.build ++++ icecat-60.2.0/gfx/skia/moz.build +@@ -822,6 +822,9 @@ + '-Wno-unused-private-field', + ] + ++if CONFIG['MOZ_SYSTEM_HARFBUZZ']: ++ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] ++ + if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk3', 'android'): + CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] + CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] +--- icecat-60.2.0/gfx/thebes/moz.build ++++ icecat-60.2.0/gfx/thebes/moz.build +@@ -272,7 +272,13 @@ + + LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES'] + +-DEFINES['GRAPHITE2_STATIC'] = True ++if CONFIG['MOZ_SYSTEM_GRAPHITE2']: ++ CXXFLAGS += CONFIG['MOZ_GRAPHITE2_CFLAGS'] ++else: ++ DEFINES['GRAPHITE2_STATIC'] = True ++ ++if CONFIG['MOZ_SYSTEM_HARFBUZZ']: ++ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] + + if CONFIG['CC_TYPE'] == 'clang': + # Suppress warnings from Skia header files. +--- icecat-60.2.0/intl/unicharutil/util/moz.build ++++ icecat-60.2.0/intl/unicharutil/util/moz.build +@@ -25,4 +25,7 @@ UNIFIED_SOURCES += [ + 'nsUnicodeProperties.cpp', + ] + ++if CONFIG['MOZ_SYSTEM_HARFBUZZ']: ++ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] ++ + FINAL_LIBRARY = 'xul' +--- icecat-60.2.0/netwerk/dns/moz.build ++++ icecat-60.2.0/netwerk/dns/moz.build +@@ -76,3 +76,6 @@ + + if CONFIG['CC_TYPE'] in ('clang', 'gcc'): + CXXFLAGS += ['-Wno-error=shadow'] ++ ++if CONFIG['MOZ_SYSTEM_HARFBUZZ']: ++ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] +--- icecat-60.2.0/old-configure.in ++++ icecat-60.2.0/old-configure.in +@@ -3995,6 +3995,27 @@ + AC_SUBST(MOZ_LINUX_32_SSE2_STARTUP_ERROR) + + dnl ======================================================== ++dnl Check for graphite2 ++dnl ======================================================== ++if test -n "$MOZ_SYSTEM_GRAPHITE2"; then ++ dnl graphite2.pc has bogus version, check manually ++ _SAVE_CFLAGS=$CFLAGS ++ CFLAGS="$CFLAGS $MOZ_GRAPHITE2_CFLAGS" ++ AC_TRY_COMPILE([ #include ++ #define GR2_VERSION_REQUIRE(major,minor,bugfix) \ ++ ( GR2_VERSION_MAJOR * 10000 + GR2_VERSION_MINOR \ ++ * 100 + GR2_VERSION_BUGFIX >= \ ++ (major) * 10000 + (minor) * 100 + (bugfix) ) ++ ], [ ++ #if !GR2_VERSION_REQUIRE(1,3,10) ++ #error "Insufficient graphite2 version." ++ #endif ++ ], [], ++ [AC_MSG_ERROR([--with-system-graphite2 requested but no working libgraphite2 found])]) ++ CFLAGS=$_SAVE_CFLAGS ++fi ++ ++dnl ======================================================== + dnl Check for pixman and cairo + dnl ======================================================== + +--- icecat-60.2.0/toolkit/library/moz.build ++++ icecat-60.2.0/toolkit/library/moz.build +@@ -235,6 +235,12 @@ + if CONFIG['MOZ_SYSTEM_PNG']: + OS_LIBS += CONFIG['MOZ_PNG_LIBS'] + ++if CONFIG['MOZ_SYSTEM_GRAPHITE2']: ++ OS_LIBS += CONFIG['MOZ_GRAPHITE2_LIBS'] ++ ++if CONFIG['MOZ_SYSTEM_HARFBUZZ']: ++ OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS'] ++ + if CONFIG['MOZ_SYSTEM_HUNSPELL']: + OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS'] + +--- icecat-60.2.0/toolkit/moz.configure ++++ icecat-60.2.0/toolkit/moz.configure +@@ -1051,6 +1051,26 @@ + add_old_configure_assignment('FT2_CFLAGS', + ft2_info.cflags) + ++# Graphite2 ++# ============================================================== ++option('--with-system-graphite2', ++ help="Use system graphite2 (located with pkgconfig)") ++ ++system_graphite2 = pkg_check_modules('MOZ_GRAPHITE2', 'graphite2', ++ when='--with-system-graphite2') ++ ++set_config('MOZ_SYSTEM_GRAPHITE2', depends_if(system_graphite2)(lambda _: True)) ++ ++# HarfBuzz ++# ============================================================== ++option('--with-system-harfbuzz', ++ help="Use system harfbuzz (located with pkgconfig)") ++ ++system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.7.4', ++ when='--with-system-harfbuzz') ++ ++set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True)) ++ + # Mortar + # ============================================================== + option('--enable-mortar', help='Enable mortar extension') diff --git a/gnu/packages/patches/icecat-use-system-graphite2.patch b/gnu/packages/patches/icecat-use-system-graphite2.patch deleted file mode 100644 index 188fba2bc9..0000000000 --- a/gnu/packages/patches/icecat-use-system-graphite2.patch +++ /dev/null @@ -1,248 +0,0 @@ -Copied from -See - -diff --git a/config/Makefile.in b/config/Makefile.in ---- a/config/Makefile.in -+++ b/config/Makefile.in -@@ -36,16 +36,17 @@ ifdef WRAP_SYSTEM_INCLUDES - export-preqs = \ - $(call mkdir_deps,system_wrappers) \ - $(NULL) - - export:: $(export-preqs) - $(PYTHON) -m mozbuild.action.preprocessor $(DEFINES) $(ACDEFINES) \ - -DMOZ_TREE_CAIRO=$(MOZ_TREE_CAIRO) \ - -DMOZ_TREE_PIXMAN=$(MOZ_TREE_PIXMAN) \ -+ -DMOZ_SYSTEM_GRAPHITE2=$(MOZ_SYSTEM_GRAPHITE2) \ - -DMOZ_SYSTEM_HARFBUZZ=$(MOZ_SYSTEM_HARFBUZZ) \ - -DMOZ_SYSTEM_HUNSPELL=$(MOZ_SYSTEM_HUNSPELL) \ - -DMOZ_SYSTEM_BZ2=$(MOZ_SYSTEM_BZ2) \ - -DMOZ_SYSTEM_ZLIB=$(MOZ_SYSTEM_ZLIB) \ - -DMOZ_SYSTEM_PNG=$(MOZ_SYSTEM_PNG) \ - -DMOZ_SYSTEM_JPEG=$(MOZ_SYSTEM_JPEG) \ - -DMOZ_SYSTEM_LIBEVENT=$(MOZ_SYSTEM_LIBEVENT) \ - -DMOZ_SYSTEM_LIBVPX=$(MOZ_SYSTEM_LIBVPX) \ -diff --git a/config/system-headers b/config/system-headers ---- a/config/system-headers -+++ b/config/system-headers -@@ -1260,16 +1260,20 @@ zlib.h - #ifdef MOZ_ENABLE_STARTUP_NOTIFICATION - libsn/sn.h - libsn/sn-common.h - libsn/sn-launchee.h - libsn/sn-launcher.h - libsn/sn-monitor.h - libsn/sn-util.h - #endif -+#if MOZ_SYSTEM_GRAPHITE2==1 -+graphite2/Font.h -+graphite2/Segment.h -+#endif - #if MOZ_SYSTEM_HARFBUZZ==1 - harfbuzz/hb-glib.h - harfbuzz/hb-ot.h - harfbuzz/hb.h - #endif - #if MOZ_SYSTEM_HUNSPELL==1 - hunspell.hxx - #endif -diff --git a/gfx/graphite2/moz-gr-update.sh b/gfx/graphite2/moz-gr-update.sh ---- a/gfx/graphite2/moz-gr-update.sh -+++ b/gfx/graphite2/moz-gr-update.sh -@@ -1,11 +1,12 @@ - #!/bin/bash - - # Script used to update the Graphite2 library in the mozilla source tree -+# and bump version for --with-system-graphite2 - - # This script lives in gfx/graphite2, along with the library source, - # but must be run from the top level of the mozilla-central tree. - - # Run as - # - # ./gfx/graphite2/moz-gr-update.sh RELEASE - # -@@ -32,22 +33,26 @@ echo "This directory contains the Graphi - echo "$TARBALL" >> gfx/graphite2/README.mozilla - echo "" - echo "See" $0 "for update procedure." >> gfx/graphite2/README.mozilla - - # fix up includes because of bug 721839 (cstdio) and bug 803066 (Windows.h) - #find gfx/graphite2/ -name "*.cpp" -exec perl -p -i -e "s///;s/Windows.h/windows.h/;" {} \; - #find gfx/graphite2/ -name "*.h" -exec perl -p -i -e "s///;s/Windows.h/windows.h/;" {} \; - -+# chase version for --with-system-graphite2 -+perl -p -i -e "s/[0-9]+\,[0-9]+\,[0-9]+/$RELEASE/ and tr/./,/ \ -+ if /GR2_VERSION_REQUIRE/" old-configure.in -+ - # summarize what's been touched - echo Updated to $RELEASE. - echo Here is what changed in the gfx/graphite2 directory: - echo - --hg stat gfx/graphite2 -+hg stat old-configure.in gfx/graphite2 - - echo - echo If gfx/graphite2/src/files.mk has changed, please make corresponding - echo changes to gfx/graphite2/src/moz.build - echo - - echo - echo Now use hg commands to create a patch for the mozilla tree. -diff --git a/gfx/moz.build b/gfx/moz.build ---- a/gfx/moz.build -+++ b/gfx/moz.build -@@ -2,28 +2,30 @@ - # vim: set filetype=python: - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - - if CONFIG['MOZ_TREE_CAIRO']: - DIRS += ['cairo'] - -+if not CONFIG['MOZ_SYSTEM_GRAPHITE2']: -+ DIRS += ['graphite2/src' ] -+ - if not CONFIG['MOZ_SYSTEM_HARFBUZZ']: - DIRS += ['harfbuzz/src'] - - DIRS += [ - '2d', - 'ycbcr', - 'angle', - 'src', - 'qcms', - 'gl', - 'layers', -- 'graphite2/src', - 'ots/src', - 'thebes', - 'ipc', - 'vr', - 'config', - ] - - if CONFIG['MOZ_ENABLE_SKIA']: -diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build ---- a/gfx/thebes/moz.build -+++ b/gfx/thebes/moz.build -@@ -261,16 +261,19 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('and - CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] - - if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'): - CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS'] - - LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES'] - LOCAL_INCLUDES += ['/media/libyuv/include'] - --DEFINES['GRAPHITE2_STATIC'] = True -+if CONFIG['MOZ_SYSTEM_GRAPHITE2']: -+ CXXFLAGS += CONFIG['MOZ_GRAPHITE2_CFLAGS'] -+else: -+ DEFINES['GRAPHITE2_STATIC'] = True - - if CONFIG['MOZ_SYSTEM_HARFBUZZ']: - CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] - - if CONFIG['CLANG_CXX']: - # Suppress warnings from Skia header files. - SOURCES['gfxPlatform.cpp'].flags += ['-Wno-implicit-fallthrough'] -diff --git a/moz.configure b/moz.configure ---- a/moz.configure -+++ b/moz.configure -@@ -260,16 +260,28 @@ def extra_programs(target): - - check_prog('DSYMUTIL', delayed_getattr(extra_programs, 'DSYMUTIL'), - allow_missing=True) - check_prog('GENISOIMAGE', delayed_getattr(extra_programs, 'GENISOIMAGE'), - allow_missing=True) - check_prog('RPMBUILD', delayed_getattr(extra_programs, 'RPMBUILD'), - allow_missing=True) - -+option('--with-system-graphite2', -+ help="Use system graphite2 (located with pkgconfig)") -+ -+@depends('--with-system-graphite2', compile_environment) -+def check_for_graphite2(value, compile_env): -+ return value and compile_env -+ -+system_graphite2 = pkg_check_modules('MOZ_GRAPHITE2', 'graphite2', -+ check_for_graphite2) -+ -+set_config('MOZ_SYSTEM_GRAPHITE2', depends_if(system_graphite2)(lambda _: True)) -+ - option('--with-system-harfbuzz', - help="Use system harfbuzz (located with pkgconfig)") - - @depends('--with-system-harfbuzz', compile_environment) - def check_for_harfbuzz(value, compile_env): - return value and compile_env - - system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.3.3', -diff --git a/old-configure.in b/old-configure.in ---- a/old-configure.in -+++ b/old-configure.in -@@ -5060,16 +5060,37 @@ if test "$USE_FC_FREETYPE"; then - CPPFLAGS="$CPPFLAGS $FT2_CFLAGS $XCFLAGS" - MOZ_CHECK_HEADERS([fontconfig/fcfreetype.h], , - [AC_MSG_ERROR(Can't find header fontconfig/fcfreetype.h.)], [#include ]) - CPPFLAGS="$_SAVE_CPPFLAGS" - fi - fi - - dnl ======================================================== -+dnl Check for graphite2 -+dnl ======================================================== -+if test -n "$MOZ_SYSTEM_GRAPHITE2"; then -+ dnl graphite2.pc has bogus version, check manually -+ _SAVE_CFLAGS=$CFLAGS -+ CFLAGS="$CFLAGS $MOZ_GRAPHITE2_CFLAGS" -+ AC_TRY_COMPILE([ #include -+ #define GR2_VERSION_REQUIRE(major,minor,bugfix) \ -+ ( GR2_VERSION_MAJOR * 10000 + GR2_VERSION_MINOR \ -+ * 100 + GR2_VERSION_BUGFIX >= \ -+ (major) * 10000 + (minor) * 100 + (bugfix) ) -+ ], [ -+ #if !GR2_VERSION_REQUIRE(1,3,8) -+ #error "Insufficient graphite2 version." -+ #endif -+ ], [], -+ [AC_MSG_ERROR([--with-system-graphite2 requested but no working libgraphite2 found])]) -+ CFLAGS=$_SAVE_CFLAGS -+fi -+ -+dnl ======================================================== - dnl Check for pixman and cairo - dnl ======================================================== - - MOZ_TREE_CAIRO=1 - MOZ_ARG_ENABLE_BOOL(system-cairo, - [ --enable-system-cairo Use system cairo (located with pkgconfig)], - MOZ_TREE_CAIRO=, - MOZ_TREE_CAIRO=1 ) -diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build ---- a/toolkit/library/moz.build -+++ b/toolkit/library/moz.build -@@ -221,16 +221,19 @@ if CONFIG['SERVO_TARGET_DIR']: - OS_LIBS += ['-L%s' % CONFIG['SERVO_TARGET_DIR'], '-lgeckoservo'] - - if CONFIG['MOZ_SYSTEM_JPEG']: - OS_LIBS += CONFIG['MOZ_JPEG_LIBS'] - - if CONFIG['MOZ_SYSTEM_PNG']: - OS_LIBS += CONFIG['MOZ_PNG_LIBS'] - -+if CONFIG['MOZ_SYSTEM_GRAPHITE2']: -+ OS_LIBS += CONFIG['MOZ_GRAPHITE2_LIBS'] -+ - if CONFIG['MOZ_SYSTEM_HARFBUZZ']: - OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS'] - - if CONFIG['MOZ_SYSTEM_HUNSPELL']: - OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS'] - - if CONFIG['MOZ_SYSTEM_LIBEVENT']: - OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS'] - diff --git a/gnu/packages/patches/icecat-use-system-harfbuzz.patch b/gnu/packages/patches/icecat-use-system-harfbuzz.patch deleted file mode 100644 index 083d404c13..0000000000 --- a/gnu/packages/patches/icecat-use-system-harfbuzz.patch +++ /dev/null @@ -1,279 +0,0 @@ -Copied from -See - -diff --git a/config/Makefile.in b/config/Makefile.in ---- a/config/Makefile.in -+++ b/config/Makefile.in -@@ -36,16 +36,17 @@ ifdef WRAP_SYSTEM_INCLUDES - export-preqs = \ - $(call mkdir_deps,system_wrappers) \ - $(NULL) - - export:: $(export-preqs) - $(PYTHON) -m mozbuild.action.preprocessor $(DEFINES) $(ACDEFINES) \ - -DMOZ_TREE_CAIRO=$(MOZ_TREE_CAIRO) \ - -DMOZ_TREE_PIXMAN=$(MOZ_TREE_PIXMAN) \ -+ -DMOZ_SYSTEM_HARFBUZZ=$(MOZ_SYSTEM_HARFBUZZ) \ - -DMOZ_SYSTEM_HUNSPELL=$(MOZ_SYSTEM_HUNSPELL) \ - -DMOZ_SYSTEM_BZ2=$(MOZ_SYSTEM_BZ2) \ - -DMOZ_SYSTEM_ZLIB=$(MOZ_SYSTEM_ZLIB) \ - -DMOZ_SYSTEM_PNG=$(MOZ_SYSTEM_PNG) \ - -DMOZ_SYSTEM_JPEG=$(MOZ_SYSTEM_JPEG) \ - -DMOZ_SYSTEM_LIBEVENT=$(MOZ_SYSTEM_LIBEVENT) \ - -DMOZ_SYSTEM_LIBVPX=$(MOZ_SYSTEM_LIBVPX) \ - -DMOZ_SYSTEM_ICU=$(MOZ_SYSTEM_ICU) \ -diff --git a/config/system-headers b/config/system-headers ---- a/config/system-headers -+++ b/config/system-headers -@@ -1260,16 +1260,21 @@ zlib.h - #ifdef MOZ_ENABLE_STARTUP_NOTIFICATION - libsn/sn.h - libsn/sn-common.h - libsn/sn-launchee.h - libsn/sn-launcher.h - libsn/sn-monitor.h - libsn/sn-util.h - #endif -+#if MOZ_SYSTEM_HARFBUZZ==1 -+harfbuzz/hb-glib.h -+harfbuzz/hb-ot.h -+harfbuzz/hb.h -+#endif - #if MOZ_SYSTEM_HUNSPELL==1 - hunspell.hxx - #endif - #if MOZ_SYSTEM_BZ2==1 - bzlib.h - #endif - #ifdef MOZ_ENABLE_GIO - gio/gio.h -diff --git a/dom/base/moz.build b/dom/base/moz.build ---- a/dom/base/moz.build -+++ b/dom/base/moz.build -@@ -474,16 +474,19 @@ for var in ('MOZ_B2G_RIL'): - DEFINES[var] = True - - if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']: - DEFINES['HAVE_SIDEBAR'] = True - - if CONFIG['MOZ_X11']: - CXXFLAGS += CONFIG['TK_CFLAGS'] - -+if CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] -+ - GENERATED_FILES += [ - 'PropertyUseCounterMap.inc', - 'UseCounterList.h', - ] - - countermap = GENERATED_FILES['PropertyUseCounterMap.inc'] - countermap.script = 'gen-usecounters.py:property_map' - countermap.inputs = ['UseCounters.conf'] -diff --git a/gfx/harfbuzz/README-mozilla b/gfx/harfbuzz/README-mozilla ---- a/gfx/harfbuzz/README-mozilla -+++ b/gfx/harfbuzz/README-mozilla -@@ -14,8 +14,13 @@ this file when updating harfbuzz, and ch - - The normal approach to updating harfbuzz, therefore, is to pull the latest HB - source into a scratch directory and do a local build; then copy the original - sources AND the generated header mentioned above from the build directory into - the mozilla tree. - - If the collection of source files changes, manual updates to moz.build may be - needed, as we don't use the upstream makefiles. -+ -+The in-tree copy may be omitted during build by --with-system-harfbuzz. -+Make sure to keep pkg-config version check within old-configure.in in sync -+with checkout version or increment latest tag by one if it's not based -+on upstream release. -diff --git a/gfx/moz.build b/gfx/moz.build ---- a/gfx/moz.build -+++ b/gfx/moz.build -@@ -2,26 +2,28 @@ - # vim: set filetype=python: - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - - if CONFIG['MOZ_TREE_CAIRO']: - DIRS += ['cairo'] - -+if not CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ DIRS += ['harfbuzz/src'] -+ - DIRS += [ - '2d', - 'ycbcr', - 'angle', - 'src', - 'qcms', - 'gl', - 'layers', - 'graphite2/src', -- 'harfbuzz/src', - 'ots/src', - 'thebes', - 'ipc', - 'vr', - 'config', - ] - - if CONFIG['MOZ_ENABLE_SKIA']: -diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py ---- a/gfx/skia/generate_mozbuild.py -+++ b/gfx/skia/generate_mozbuild.py -@@ -138,16 +138,19 @@ if CONFIG['GNU_CXX'] and not CONFIG['CLA - if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']: - CXXFLAGS += [ - '-Wno-implicit-fallthrough', - '-Wno-inconsistent-missing-override', - '-Wno-macro-redefined', - '-Wno-unused-private-field', - ] - -+if CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] -+ - if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android'): - CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] - CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] - - if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'): - CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS'] - """ - -diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build ---- a/gfx/skia/moz.build -+++ b/gfx/skia/moz.build -@@ -748,14 +748,17 @@ if CONFIG['GNU_CXX'] and not CONFIG['CLA - if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']: - CXXFLAGS += [ - '-Wno-implicit-fallthrough', - '-Wno-inconsistent-missing-override', - '-Wno-macro-redefined', - '-Wno-unused-private-field', - ] - -+if CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] -+ - if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android'): - CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] - CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] - - if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'): - CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS'] -diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build ---- a/gfx/thebes/moz.build -+++ b/gfx/thebes/moz.build -@@ -263,11 +263,14 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('and - if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'): - CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS'] - - LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES'] - LOCAL_INCLUDES += ['/media/libyuv/include'] - - DEFINES['GRAPHITE2_STATIC'] = True - -+if CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] -+ - if CONFIG['CLANG_CXX']: - # Suppress warnings from Skia header files. - SOURCES['gfxPlatform.cpp'].flags += ['-Wno-implicit-fallthrough'] -diff --git a/intl/unicharutil/util/moz.build b/intl/unicharutil/util/moz.build ---- a/intl/unicharutil/util/moz.build -+++ b/intl/unicharutil/util/moz.build -@@ -37,9 +37,12 @@ if CONFIG['_MSC_VER']: - DEFINES['_USE_ANSI_CPP'] = True - # Don't include directives about which CRT to use - CFLAGS += ['-Zl'] - CXXFLAGS += ['-Zl'] - - if CONFIG['ENABLE_INTL_API']: - USE_LIBS += ['icu'] - -+if CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] -+ - DIST_INSTALL = True -diff --git a/moz.configure b/moz.configure ---- a/moz.configure -+++ b/moz.configure -@@ -260,16 +260,28 @@ def extra_programs(target): - - check_prog('DSYMUTIL', delayed_getattr(extra_programs, 'DSYMUTIL'), - allow_missing=True) - check_prog('GENISOIMAGE', delayed_getattr(extra_programs, 'GENISOIMAGE'), - allow_missing=True) - check_prog('RPMBUILD', delayed_getattr(extra_programs, 'RPMBUILD'), - allow_missing=True) - -+option('--with-system-harfbuzz', -+ help="Use system harfbuzz (located with pkgconfig)") -+ -+@depends('--with-system-harfbuzz', compile_environment) -+def check_for_harfbuzz(value, compile_env): -+ return value and compile_env -+ -+system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.3.3', -+ check_for_harfbuzz) -+ -+set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True)) -+ - option('--enable-system-hunspell', - help="Use system hunspell (located with pkgconfig)") - - @depends('--enable-system-hunspell', compile_environment) - def check_for_hunspell(value, compile_env): - return value and compile_env - - system_hunspell = pkg_check_modules('MOZ_HUNSPELL', 'hunspell', -diff --git a/netwerk/dns/moz.build b/netwerk/dns/moz.build ---- a/netwerk/dns/moz.build -+++ b/netwerk/dns/moz.build -@@ -61,16 +61,19 @@ etld_data = GENERATED_FILES['etld_data.i - etld_data.script = 'prepare_tlds.py' - etld_data.inputs = ['effective_tld_names.dat'] - - # need to include etld_data.inc - LOCAL_INCLUDES += [ - '/netwerk/base', - ] - -+if CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] -+ - if CONFIG['ENABLE_INTL_API']: - DEFINES['IDNA2008'] = True - USE_LIBS += ['icu'] - else: - UNIFIED_SOURCES += [ - 'nameprep.c', - ] - -diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build ---- a/toolkit/library/moz.build -+++ b/toolkit/library/moz.build -@@ -221,16 +221,19 @@ if CONFIG['SERVO_TARGET_DIR']: - OS_LIBS += ['-L%s' % CONFIG['SERVO_TARGET_DIR'], '-lgeckoservo'] - - if CONFIG['MOZ_SYSTEM_JPEG']: - OS_LIBS += CONFIG['MOZ_JPEG_LIBS'] - - if CONFIG['MOZ_SYSTEM_PNG']: - OS_LIBS += CONFIG['MOZ_PNG_LIBS'] - -+if CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS'] -+ - if CONFIG['MOZ_SYSTEM_HUNSPELL']: - OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS'] - - if CONFIG['MOZ_SYSTEM_LIBEVENT']: - OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS'] - - if CONFIG['MOZ_SYSTEM_LIBVPX']: - OS_LIBS += CONFIG['MOZ_LIBVPX_LIBS'] - -- cgit v1.2.3 From 94e96f7f68c3b9053fdb5dee5b0ab614163aaa08 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 24 Sep 2018 00:10:37 -0400 Subject: gnu: icecat: Unbundle libevent, libogg, and libvorbis. * gnu/packages/patches/icecat-use-system-media-libs.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/patches/icecat-avoid-bundled-libraries.patch: Add another hunk to enable removal of libevent. * gnu/packages/gnuzilla.scm (icecat)[source]: Add patch. In the snippet, add libevent, libogg, libvorbis, and libtremor to the list of bundled libraries to remove. Add a comment regarding theora. Remove comments regarding unbundling cairo, which is no longer supported. [inputs]: Add libevent, libogg, and libvorbis. [arguments]: Add --with-system-{libevent,ogg,vorbis} to configure flags. Add custom bootstrap phase. Add comments. --- gnu/local.mk | 1 + gnu/packages/gnuzilla.scm | 39 ++- .../patches/icecat-avoid-bundled-libraries.patch | 14 + .../patches/icecat-use-system-media-libs.patch | 381 +++++++++++++++++++++ 4 files changed, 423 insertions(+), 12 deletions(-) create mode 100644 gnu/packages/patches/icecat-use-system-media-libs.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 35e78e7816..244c79d221 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -812,6 +812,7 @@ dist_patch_DATA = \ %D%/packages/patches/icecat-avoid-bundled-libraries.patch \ %D%/packages/patches/icecat-CVE-2018-12383.patch \ %D%/packages/patches/icecat-use-system-graphite2+harfbuzz.patch \ + %D%/packages/patches/icecat-use-system-media-libs.patch \ %D%/packages/patches/icedtea-6-hotspot-gcc-segfault-workaround.patch \ %D%/packages/patches/icedtea-7-hotspot-gcc-segfault-workaround.patch \ %D%/packages/patches/id3lib-CVE-2007-4460.patch \ diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index ad83444e3c..6834d82426 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -36,6 +36,7 @@ #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system cargo) + #:use-module (gnu packages audio) #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages databases) @@ -62,6 +63,7 @@ #:use-module (gnu packages rust) #:use-module (gnu packages icu4c) #:use-module (gnu packages video) + #:use-module (gnu packages xiph) #:use-module (gnu packages xdisorg) #:use-module (gnu packages readline)) @@ -497,6 +499,7 @@ security standards.") (list (search-patch "icecat-avoid-bundled-libraries.patch") (search-patch "icecat-use-system-graphite2+harfbuzz.patch") + (search-patch "icecat-use-system-media-libs.patch") (mozilla-patch "icecat-CVE-2018-12385.patch" "80a4a7ef2813" "1vgcbimpnfjqj934v0cryq1g13xac3wfmd4jyhcb5s60x8xyssf5") (search-patch "icecat-CVE-2018-12383.patch") (mozilla-patch "icecat-bug-1489744.patch" "6546ee839d30" "11mhvj77r789b428bfxqq5wdx8yr7lbrdjzr8qjj6fw197pldn51"))) @@ -516,24 +519,29 @@ security standards.") ;; FIXME: A script from the bundled nspr is used. ;;"nsprpub" ;; - ;; TODO: Use system media libraries. Waiting for: + ;; TODO: Use more system media libraries. See: ;; - ;; * libogg - ;; * libtheora - ;; * libvorbis - ;; * libtremor (not yet in guix) + ;; * libtheora: esr60 wants v1.2, not yet released. + ;; * soundtouch: avoiding the bundled library would + ;; result in some loss of functionality. There's + ;; also an issue with exception handling + ;; configuration. It seems that this is needed in + ;; some moz.build: + ;; DEFINES['ST_NO_EXCEPTION_HANDLING'] = 1 ;; * libopus ;; * speex - ;; * soundtouch (not yet in guix) ;; "modules/freetype2" "modules/zlib" "modules/libbz2" - ;; UNBUNDLE-ME "ipc/chromium/src/third_party/libevent" + "ipc/chromium/src/third_party/libevent" "media/libjpeg" "media/libvpx" + "media/libogg" + "media/libvorbis" + ;; "media/libtheora" ; wants theora-1.2, not yet released + "media/libtremor" "security/nss" - ;; UNBUNDLE-ME "gfx/cairo" "gfx/harfbuzz" "gfx/graphite2" "js/src/ctypes/libffi" @@ -549,7 +557,6 @@ security standards.") (inputs `(("alsa-lib" ,alsa-lib) ("bzip2" ,bzip2) - ;; UNBUNDLE-ME ("cairo" ,cairo) ("cups" ,cups) ("dbus-glib" ,dbus-glib) ("gdk-pixbuf" ,gdk-pixbuf) @@ -564,8 +571,11 @@ security standards.") ("libcanberra" ,libcanberra) ("libgnome" ,libgnome) ("libjpeg-turbo" ,libjpeg-turbo) + ("libogg" ,libogg) + ;; ("libtheora" ,libtheora) ; wants theora-1.2, not yet released + ("libvorbis" ,libvorbis) ("libxft" ,libxft) - ;; UNBUNDLE-ME ("libevent" ,libevent-2.0) + ("libevent" ,libevent) ("libxinerama" ,libxinerama) ("libxscrnsaver" ,libxscrnsaver) ("libxcomposite" ,libxcomposite) @@ -637,7 +647,10 @@ security standards.") "--with-system-zlib" "--with-system-bz2" "--with-system-jpeg" ; must be libjpeg-turbo - ;; UNBUNDLE-ME "--with-system-libevent" + "--with-system-libevent" + "--with-system-ogg" + "--with-system-vorbis" + ;; "--with-system-theora" ; wants theora-1.2, not yet released "--with-system-libvpx" "--with-system-icu" "--with-system-nspr" @@ -645,7 +658,6 @@ security standards.") "--with-system-harfbuzz" "--with-system-graphite2" "--enable-system-pixman" - ;; UNBUNDLE-ME "--enable-system-cairo" "--enable-system-ffi" "--enable-system-hunspell" "--enable-system-sqlite" @@ -695,6 +707,9 @@ security standards.") 'avcodec', 'avutil', 'pulse' ]\n\n" all))) #t)) + (replace 'bootstrap + (lambda _ + (invoke "sh" "-c" "autoconf old-configure.in > old-configure"))) (add-after 'patch-source-shebangs 'patch-cargo-checksums (lambda _ (use-modules (guix build cargo-build-system)) diff --git a/gnu/packages/patches/icecat-avoid-bundled-libraries.patch b/gnu/packages/patches/icecat-avoid-bundled-libraries.patch index b5e9fb887e..33203b1a33 100644 --- a/gnu/packages/patches/icecat-avoid-bundled-libraries.patch +++ b/gnu/packages/patches/icecat-avoid-bundled-libraries.patch @@ -33,3 +33,17 @@ Fixes needed when avoiding bundled libraries. '/dom/base', '/dom/storage', '/ipc/glue', +--- icecat-60.2.0/media/webrtc/trunk/webrtc/base/rtc_task_queue_gn/moz.build.orig 2018-09-13 17:40:54.000000000 -0400 ++++ icecat-60.2.0/media/webrtc/trunk/webrtc/base/rtc_task_queue_gn/moz.build 2018-09-23 21:33:12.319975105 -0400 +@@ -130,11 +130,6 @@ + DEFINES["WEBRTC_POSIX"] = True + DEFINES["_FILE_OFFSET_BITS"] = "64" + +- LOCAL_INCLUDES += [ +- "/ipc/chromium/src/third_party/libevent/include/", +- "/ipc/chromium/src/third_party/libevent/linux/" +- ] +- + UNIFIED_SOURCES += [ + "/media/webrtc/trunk/webrtc/base/task_queue_libevent.cc", + "/media/webrtc/trunk/webrtc/base/task_queue_posix.cc" diff --git a/gnu/packages/patches/icecat-use-system-media-libs.patch b/gnu/packages/patches/icecat-use-system-media-libs.patch new file mode 100644 index 0000000000..648585a6f0 --- /dev/null +++ b/gnu/packages/patches/icecat-use-system-media-libs.patch @@ -0,0 +1,381 @@ +Support building with system media libraries. +See + +Based on: + https://svnweb.freebsd.org/ports/head/www/firefox-esr/files/patch-z-bug517422?revision=472833&view=markup + +Changes to files within the bundled libraries are omitted, since those files +are removed from Guix sources. Modified for use with patch -p1, and to apply +cleanly to GNU IceCat. + +--- icecat-60.2.0/build/moz.configure/old.configure ++++ icecat-60.2.0/build/moz.configure/old.configure +@@ -273,7 +273,12 @@ + '--with-system-libvpx', + '--with-system-nspr', + '--with-system-nss', ++ '--with-system-ogg', + '--with-system-png', ++ '--with-system-soundtouch', ++ '--with-system-theora', ++ '--with-system-tremor', ++ '--with-system-vorbis', + '--with-system-zlib', + '--with-thumb', + '--with-thumb-interwork', +--- icecat-60.2.0/config/external/moz.build ++++ icecat-60.2.0/config/external/moz.build +@@ -23,12 +23,21 @@ + + external_dirs += ['modules/xz-embedded'] + +-if CONFIG['MOZ_VORBIS']: ++if not CONFIG['MOZ_SYSTEM_OGG']: ++ external_dirs += ['media/libogg'] ++ ++if CONFIG['MOZ_VORBIS'] and not CONFIG['MOZ_SYSTEM_VORBIS']: + external_dirs += ['media/libvorbis'] + +-if CONFIG['MOZ_TREMOR']: ++if CONFIG['MOZ_TREMOR'] and not CONFIG['MOZ_SYSTEM_TREMOR']: + external_dirs += ['media/libtremor'] + ++if not CONFIG['MOZ_SYSTEM_THEORA']: ++ external_dirs += ['media/libtheora'] ++ ++if not CONFIG['MOZ_SYSTEM_SOUNDTOUCH']: ++ external_dirs += ['media/libsoundtouch'] ++ + if CONFIG['MOZ_WEBM_ENCODER']: + external_dirs += ['media/libmkv'] + +@@ -51,11 +60,8 @@ + 'media/kiss_fft', + 'media/libcubeb', + 'media/libnestegg', +- 'media/libogg', + 'media/libopus', +- 'media/libtheora', + 'media/libspeex_resampler', +- 'media/libsoundtouch', + 'media/mp4parse-rust', + 'media/psshparser' + ] +--- icecat-60.2.0/config/system-headers.mozbuild ++++ icecat-60.2.0/config/system-headers.mozbuild +@@ -1324,6 +1324,28 @@ + 'harfbuzz/hb.h', + ] + ++if CONFIG['MOZ_SYSTEM_OGG']: ++ system_headers += [ ++ 'ogg/ogg.h', ++ 'ogg/os_types.h', ++ ] ++ ++if CONFIG['MOZ_SYSTEM_THEORA']: ++ system_headers += [ ++ 'theora/theoradec.h', ++ ] ++ ++if CONFIG['MOZ_SYSTEM_VORBIS']: ++ system_headers += [ ++ 'vorbis/codec.h', ++ 'vorbis/vorbisenc.h', ++ ] ++ ++if CONFIG['MOZ_SYSTEM_TREMOR']: ++ system_headers += [ ++ 'tremor/ivorbiscodec.h', ++ ] ++ + if CONFIG['MOZ_SYSTEM_LIBVPX']: + system_headers += [ + 'vpx_mem/vpx_mem.h', +--- icecat-60.2.0/dom/media/AudioStream.cpp ++++ icecat-60.2.0/dom/media/AudioStream.cpp +@@ -121,7 +121,9 @@ + : mMonitor("AudioStream") + , mChannels(0) + , mOutChannels(0) ++#ifndef MOZ_SYSTEM_SOUNDTOUCH + , mTimeStretcher(nullptr) ++#endif + , mDumpFile(nullptr) + , mState(INITIALIZED) + , mDataSource(aSource) +@@ -142,9 +144,11 @@ + if (mDumpFile) { + fclose(mDumpFile); + } ++#ifndef MOZ_SYSTEM_SOUNDTOUCH + if (mTimeStretcher) { + soundtouch::destroySoundTouchObj(mTimeStretcher); + } ++#endif + #if defined(XP_WIN) + if (XRE_IsContentProcess()) { + audio::AudioNotificationReceiver::Unregister(this); +@@ -168,7 +172,11 @@ + { + mMonitor.AssertCurrentThreadOwns(); + if (!mTimeStretcher) { ++#ifdef MOZ_SYSTEM_SOUNDTOUCH ++ mTimeStretcher = new soundtouch::SoundTouch(); ++#else + mTimeStretcher = soundtouch::createSoundTouchObj(); ++#endif + mTimeStretcher->setSampleRate(mAudioClock.GetInputRate()); + mTimeStretcher->setChannels(mOutChannels); + mTimeStretcher->setPitch(1.0); +--- icecat-60.2.0/dom/media/AudioStream.h ++++ icecat-60.2.0/dom/media/AudioStream.h +@@ -15,7 +15,11 @@ + #include "mozilla/TimeStamp.h" + #include "mozilla/UniquePtr.h" + #include "CubebUtils.h" ++#ifdef MOZ_SYSTEM_SOUNDTOUCH ++#include "soundtouch/SoundTouch.h" ++#else + #include "soundtouch/SoundTouchFactory.h" ++#endif + + #if defined(XP_WIN) + #include "mozilla/audio/AudioNotificationReceiver.h" +@@ -297,7 +301,11 @@ + uint32_t mChannels; + uint32_t mOutChannels; + AudioClock mAudioClock; ++#ifdef MOZ_SYSTEM_SOUNDTOUCH ++ nsAutoPtr mTimeStretcher; ++#else + soundtouch::SoundTouch* mTimeStretcher; ++#endif + + // Output file for dumping audio + FILE* mDumpFile; +--- icecat-60.2.0/dom/media/moz.build ++++ icecat-60.2.0/dom/media/moz.build +@@ -327,6 +327,21 @@ + + DEFINES['MOZILLA_INTERNAL_API'] = True + ++if CONFIG['MOZ_SYSTEM_OGG']: ++ CXXFLAGS += CONFIG['MOZ_OGG_CFLAGS'] ++ ++if CONFIG['MOZ_SYSTEM_THEORA']: ++ CXXFLAGS += CONFIG['MOZ_THEORA_CFLAGS'] ++ ++if CONFIG['MOZ_SYSTEM_VORBIS']: ++ CXXFLAGS += CONFIG['MOZ_VORBIS_CFLAGS'] ++ ++if CONFIG['MOZ_SYSTEM_TREMOR']: ++ CXXFLAGS += CONFIG['MOZ_TREMOR_CFLAGS'] ++ ++if CONFIG['MOZ_SYSTEM_SOUNDTOUCH']: ++ CXXFLAGS += CONFIG['MOZ_SOUNDTOUCH_CFLAGS'] ++ + if CONFIG['MOZ_ANDROID_HLS_SUPPORT']: + DEFINES['MOZ_ANDROID_HLS_SUPPORT'] = True + +--- icecat-60.2.0/dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp ++++ icecat-60.2.0/dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp +@@ -15,9 +15,13 @@ + #include + #endif + ++#ifdef MOZ_SYSTEM_SOUNDTOUCH ++#include "nsXPCOMPrivate.h" // for XUL_DLL ++#else + // We use a known symbol located in lgpllibs to determine its location. + // soundtouch happens to be always included in lgpllibs + #include "soundtouch/SoundTouch.h" ++#endif + + namespace mozilla { + +@@ -64,6 +68,12 @@ + + sLinkStatus = LinkStatus_FAILED; + ++#ifdef MOZ_SYSTEM_SOUNDTOUCH ++ // We retrieve the path of the XUL library as this is where mozavcodec and ++ // mozavutil libs are located. ++ char* path = ++ PR_GetLibraryFilePathname(XUL_DLL, (PRFuncPtr)&FFVPXRuntimeLinker::Init); ++#else + // We retrieve the path of the lgpllibs library as this is where mozavcodec + // and mozavutil libs are located. + PathString lgpllibsname = GetLibraryName(nullptr, "lgpllibs"); +@@ -73,6 +83,7 @@ + PathString path = + GetLibraryFilePathname(lgpllibsname.get(), + (PRFuncPtr)&soundtouch::SoundTouch::getVersionId); ++#endif + if (path.IsEmpty()) { + return false; + } +--- icecat-60.2.0/old-configure.in ++++ icecat-60.2.0/old-configure.in +@@ -2451,6 +2451,111 @@ + fi + fi # COMPILE_ENVIRONMENT + ++dnl ======================================================== ++dnl Check for libogg ++dnl ======================================================== ++ ++MOZ_ARG_WITH_BOOL(system-ogg, ++[ --with-system-ogg Use system libogg (located with pkgconfig)], ++MOZ_SYSTEM_OGG=1, ++MOZ_SYSTEM_OGG=) ++ ++if test -n "$MOZ_SYSTEM_OGG"; then ++ PKG_CHECK_MODULES(MOZ_OGG, ogg >= 1.3.3) ++ ++ _SAVE_LIBS=$LIBS ++ LIBS="$LIBS $MOZ_OGG_LIBS" ++ AC_CHECK_FUNC(ogg_set_mem_functions, [], ++ [AC_DEFINE(MOZ_OGG_NO_MEM_REPORTING)]) ++ LIBS=$_SAVE_LIBS ++fi ++ ++AC_SUBST(MOZ_SYSTEM_OGG) ++ ++dnl ======================================================== ++dnl Check for libvorbis ++dnl ======================================================== ++ ++MOZ_ARG_WITH_BOOL(system-vorbis, ++[ --with-system-vorbis Use system libvorbis (located with pkgconfig)], ++MOZ_SYSTEM_VORBIS=1, ++MOZ_SYSTEM_VORBIS=) ++ ++if test -n "$MOZ_SYSTEM_VORBIS"; then ++ PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.6) ++fi ++ ++AC_SUBST(MOZ_SYSTEM_VORBIS) ++ ++dnl ======================================================== ++dnl Check for integer-only libvorbis aka tremor ++dnl ======================================================== ++ ++MOZ_ARG_WITH_BOOL(system-tremor, ++[ --with-system-tremor Use system libtremor (located with pkgconfig)], ++MOZ_SYSTEM_TREMOR=1, ++MOZ_SYSTEM_TREMOR=) ++ ++if test -n "$MOZ_SYSTEM_TREMOR"; then ++ PKG_CHECK_MODULES(MOZ_TREMOR, vorbisidec >= 1.2.1) ++fi ++ ++AC_SUBST(MOZ_SYSTEM_TREMOR) ++ ++dnl ======================================================== ++dnl Check for libtheora ++dnl ======================================================== ++ ++MOZ_ARG_WITH_BOOL(system-theora, ++[ --with-system-theora Use system libtheora (located with pkgconfig)], ++MOZ_SYSTEM_THEORA=1, ++MOZ_SYSTEM_THEORA=) ++ ++if test -n "$MOZ_SYSTEM_THEORA"; then ++ PKG_CHECK_MODULES(MOZ_THEORA, theora >= 1.2) ++fi ++ ++AC_SUBST(MOZ_SYSTEM_THEORA) ++ ++dnl ======================================================== ++dnl Check for libSoundTouch ++dnl ======================================================== ++ ++MOZ_ARG_WITH_BOOL(system-soundtouch, ++[ --with-system-soundtouch Use system libSoundTouch (located with pkgconfig)], ++MOZ_SYSTEM_SOUNDTOUCH=1, ++MOZ_SYSTEM_SOUNDTOUCH=) ++ ++if test -n "$MOZ_SYSTEM_SOUNDTOUCH"; then ++ PKG_CHECK_MODULES(MOZ_SOUNDTOUCH, soundtouch >= 1.9.0) ++ ++ AC_LANG_SAVE ++ AC_LANG_CPLUSPLUS ++ _SAVE_CXXFLAGS=$CXXFLAGS ++ CXXFLAGS="$CXXFLAGS $MOZ_SOUNDTOUCH_CFLAGS" ++ AC_CACHE_CHECK(for soundtouch sample type, ++ ac_cv_soundtouch_sample_type, ++ [AC_TRY_COMPILE([#include ++ #ifndef SOUNDTOUCH_INTEGER_SAMPLES ++ #error soundtouch expects float samples ++ #endif], ++ [], ++ [ac_cv_soundtouch_sample_type=short], ++ [ac_cv_soundtouch_sample_type=float])]) ++ CXXFLAGS=$_SAVE_CXXFLAGS ++ AC_LANG_RESTORE ++ ++ if test \( -n "$MOZ_SAMPLE_TYPE_S16" -a "$ac_cv_soundtouch_sample_type" != short \) \ ++ -o \( -n "$MOZ_SAMPLE_TYPE_FLOAT32" -a "$ac_cv_soundtouch_sample_type" != float \) ; then ++ AC_MSG_ERROR([SoundTouch library is built with incompatible sample type. Either rebuild the library with/without --enable-integer-samples, chase default Mozilla sample type or remove --with-system-soundtouch.]) ++ fi ++fi ++ ++if test -n "$MOZ_SYSTEM_SOUNDTOUCH"; then ++ AC_DEFINE(MOZ_SYSTEM_SOUNDTOUCH) ++fi ++AC_SUBST(MOZ_SYSTEM_SOUNDTOUCH) ++ + dnl system libvpx Support + dnl ======================================================== + MOZ_ARG_WITH_BOOL(system-libvpx, +--- icecat-60.2.0/toolkit/library/moz.build ++++ icecat-60.2.0/toolkit/library/moz.build +@@ -244,6 +244,21 @@ + if CONFIG['MOZ_SYSTEM_HUNSPELL']: + OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS'] + ++if CONFIG['MOZ_SYSTEM_OGG']: ++ OS_LIBS += CONFIG['MOZ_OGG_LIBS'] ++ ++if CONFIG['MOZ_SYSTEM_THEORA']: ++ OS_LIBS += CONFIG['MOZ_THEORA_LIBS'] ++ ++if CONFIG['MOZ_SYSTEM_VORBIS']: ++ OS_LIBS += CONFIG['MOZ_VORBIS_LIBS'] ++ ++if CONFIG['MOZ_SYSTEM_TREMOR']: ++ OS_LIBS += CONFIG['MOZ_TREMOR_LIBS'] ++ ++if CONFIG['MOZ_SYSTEM_SOUNDTOUCH']: ++ OS_LIBS += CONFIG['MOZ_SOUNDTOUCH_LIBS'] ++ + if CONFIG['MOZ_SYSTEM_LIBEVENT']: + OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS'] + +--- icecat-60.2.0/xpcom/build/XPCOMInit.cpp ++++ icecat-60.2.0/xpcom/build/XPCOMInit.cpp +@@ -138,7 +138,9 @@ + + #include "mozilla/ipc/GeckoChildProcessHost.h" + ++#ifndef MOZ_OGG_NO_MEM_REPORTING + #include "ogg/ogg.h" ++#endif + #if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING) + #if defined(HAVE_STDINT_H) + // mozilla-config.h defines HAVE_STDINT_H, and then it's defined *again* in +@@ -639,11 +641,13 @@ + // this oddness. + mozilla::SetICUMemoryFunctions(); + ++#ifndef MOZ_OGG_NO_MEM_REPORTING + // Do the same for libogg. + ogg_set_mem_functions(OggReporter::CountingMalloc, + OggReporter::CountingCalloc, + OggReporter::CountingRealloc, + OggReporter::CountingFree); ++#endif + + #if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING) + // And for VPX. -- cgit v1.2.3 From 6d328879378fac95240005233331f596fb5c68ed Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 25 Sep 2018 17:13:59 -0400 Subject: gnu: icecat: Rebundle NSPR and NSS [security fix]. Works around . * gnu/packages/gnuzilla.scm (icecat)[source]: In snippet, don't remove NSS. [inputs]: Remove 'nspr' and 'nss'. [arguments]: Remove --with-system-{nspr,nss} from configure flags. --- gnu/packages/gnuzilla.scm | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 6834d82426..ea3b61c231 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -519,6 +519,13 @@ security standards.") ;; FIXME: A script from the bundled nspr is used. ;;"nsprpub" ;; + ;; FIXME: With the update to IceCat 60, using system NSS + ;; broke certificate validation. See + ;; . For now, we use + ;; the bundled NSPR and NSS. TODO: Investigate, + ;; and try to unbundle these libraries again. + ;; UNBUNDLE-ME! "security/nss" + ;; ;; TODO: Use more system media libraries. See: ;; ;; * libtheora: esr60 wants v1.2, not yet released. @@ -541,7 +548,6 @@ security standards.") "media/libvorbis" ;; "media/libtheora" ; wants theora-1.2, not yet released "media/libtremor" - "security/nss" "gfx/harfbuzz" "gfx/graphite2" "js/src/ctypes/libffi" @@ -588,8 +594,10 @@ security standards.") ("pulseaudio" ,pulseaudio) ("mesa" ,mesa) ("mit-krb5" ,mit-krb5) - ("nspr" ,nspr) - ("nss" ,nss) + ;; See + ;; and related comments in the 'snippet' above. + ;; UNBUNDLE-ME! ("nspr" ,nspr) + ;; UNBUNDLE-ME! ("nss" ,nss) ("sqlite" ,sqlite) ("startup-notification" ,startup-notification) ("unzip" ,unzip) @@ -653,8 +661,12 @@ security standards.") ;; "--with-system-theora" ; wants theora-1.2, not yet released "--with-system-libvpx" "--with-system-icu" - "--with-system-nspr" - "--with-system-nss" + + ;; See + ;; and related comments in the 'snippet' above. + ;; UNBUNDLE-ME! "--with-system-nspr" + ;; UNBUNDLE-ME! "--with-system-nss" + "--with-system-harfbuzz" "--with-system-graphite2" "--enable-system-pixman" -- cgit v1.2.3 From fe73352e8073ea0a0e6f6b5591f24395671998ab Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 25 Sep 2018 19:31:50 -0400 Subject: gnu: linux-libre: Enable SHPC PCI Hotplug driver, now built-in only. Fixes . * gnu/packages/aux-files/linux-libre/4.18-x86_64.conf, gnu/packages/aux-files/linux-libre/4.18-i686.conf: Add CONFIG_HOTPLUG_PCI_SHPC=y, plus updates made by 'make oldconfig'. --- gnu/packages/aux-files/linux-libre/4.18-i686.conf | 6 ++++-- gnu/packages/aux-files/linux-libre/4.18-x86_64.conf | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/aux-files/linux-libre/4.18-i686.conf b/gnu/packages/aux-files/linux-libre/4.18-i686.conf index 606616b9fa..859b8b10b6 100644 --- a/gnu/packages/aux-files/linux-libre/4.18-i686.conf +++ b/gnu/packages/aux-files/linux-libre/4.18-i686.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.18.0-gnu Kernel Configuration +# Linux/x86 4.18.9-gnu Kernel Configuration # # @@ -255,6 +255,7 @@ CONFIG_PROFILING=y CONFIG_TRACEPOINTS=y CONFIG_CRASH_CORE=y CONFIG_KEXEC_CORE=y +CONFIG_HOTPLUG_SMT=y CONFIG_OPROFILE=m # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set CONFIG_HAVE_OPROFILE=y @@ -294,6 +295,7 @@ CONFIG_HAVE_PERF_REGS=y CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_HAVE_RCU_TABLE_FREE=y +CONFIG_HAVE_RCU_TABLE_INVALIDATE=y CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y CONFIG_HAVE_CMPXCHG_LOCAL=y @@ -853,7 +855,7 @@ CONFIG_HOTPLUG_PCI_ACPI_IBM=m CONFIG_HOTPLUG_PCI_CPCI=y CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m -# CONFIG_HOTPLUG_PCI_SHPC is not set +CONFIG_HOTPLUG_PCI_SHPC=y # # PCI controller drivers diff --git a/gnu/packages/aux-files/linux-libre/4.18-x86_64.conf b/gnu/packages/aux-files/linux-libre/4.18-x86_64.conf index 81fd822756..2a66c483d6 100644 --- a/gnu/packages/aux-files/linux-libre/4.18-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/4.18-x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.18.0-gnu Kernel Configuration +# Linux/x86 4.18.9-gnu Kernel Configuration # # @@ -265,6 +265,7 @@ CONFIG_PROFILING=y CONFIG_TRACEPOINTS=y CONFIG_CRASH_CORE=y CONFIG_KEXEC_CORE=y +CONFIG_HOTPLUG_SMT=y CONFIG_OPROFILE=m # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set CONFIG_HAVE_OPROFILE=y @@ -304,6 +305,7 @@ CONFIG_HAVE_PERF_REGS=y CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_HAVE_RCU_TABLE_FREE=y +CONFIG_HAVE_RCU_TABLE_INVALIDATE=y CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y CONFIG_HAVE_CMPXCHG_LOCAL=y @@ -869,7 +871,7 @@ CONFIG_HOTPLUG_PCI_ACPI_IBM=m CONFIG_HOTPLUG_PCI_CPCI=y CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m -# CONFIG_HOTPLUG_PCI_SHPC is not set +CONFIG_HOTPLUG_PCI_SHPC=y # # PCI controller drivers -- cgit v1.2.3 From 06619128274c0f7e3ebfefab03db337e886fec51 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 25 Sep 2018 17:57:59 +0200 Subject: Fix URL in emacs-magit and emacs-groovy-modes. * gnu/packages/emacs.scm (emacs-magit)[source]: Fix URL. * gnu/packages/emacs.scm (emacs-groovy-modes)[source]: Fix URL. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index f29040c372..c541c51483 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -458,7 +458,7 @@ on stdout instead of using a socket as the Emacsclient does.") (method url-fetch) (uri (string-append "https://github.com/magit/magit/releases/download/" - version "/" name "-" version ".tar.gz")) + version "/magit-" version ".tar.gz")) (sha256 (base32 "1ygaah3dd3nxpyd17297xgvdcgr7pgzzwlmpnmchki0kiwgg3sbc")))) @@ -8019,7 +8019,7 @@ supports multiple backends such as @code{vlc}, @code{mpg123}, (source (origin (method url-fetch) (uri (string-append - "https://github.com/Groovy-Emacs-Modes/" name + "https://github.com/Groovy-Emacs-Modes/groovy-emacs-modes" "/archive/" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 -- cgit v1.2.3 From 9bd85a785f47d039b027de854b78b9ded0892e02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 26 Sep 2018 15:42:15 +0200 Subject: gnu: shepherd: Update to 0.5.0. * gnu/packages/admin.scm (shepherd): Update to 0.5.0. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 8f504cafef..ded7ce3b97 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -173,14 +173,14 @@ and provides a \"top-like\" mode (monitoring).") (define-public shepherd (package (name "shepherd") - (version "0.4.0") + (version "0.5.0") (source (origin (method url-fetch) (uri (string-append "https://alpha.gnu.org/gnu/shepherd/shepherd-" version ".tar.gz")) (sha256 (base32 - "1lgmsbxn8i8xdasxzkdp2cml75n128pplw6icvmspl6s0n9xmw8n")))) + "1wmciqml9yplnx1s4ynn00giqyk06rbrcsgvpjj2df47sawk2jp8")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--localstatedir=/var"))) -- cgit v1.2.3 From 4245ddcbc9f935804c17c97872b90ec1050c2d75 Mon Sep 17 00:00:00 2001 From: Carlo Zancanaro Date: Sun, 26 Aug 2018 21:54:14 +1000 Subject: guix system: Load all services on reconfigure, not just stopped ones. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This uses the 'replacement' service slot introduced in the Shepherd version 0.5.0. * gnu/services/shepherd.scm (shepherd-service-upgrade): Return a list of services that need to be restarted to complete their upgrade. * guix/scripts/system.scm (call-with-service-upgrade-info): Rename an internal variable to reflect the change to shepherd-service-upgrade. (upgrade-shepherd-services): Call 'load-services/safe' instead of 'load-services'. Print a message about services that need to be manually restarted. * gnu/services/herd.scm (load-services/safe): New procedure. * doc/guix.texi (Invoking guix system): Document the new behaviour. Co-authored-by: Ludovic Courtès --- gnu/services/herd.scm | 20 ++++++++++++++++++++ gnu/services/shepherd.scm | 23 ++++++++--------------- 2 files changed, 28 insertions(+), 15 deletions(-) (limited to 'gnu') diff --git a/gnu/services/herd.scm b/gnu/services/herd.scm index 8c96b70731..8ff817759d 100644 --- a/gnu/services/herd.scm +++ b/gnu/services/herd.scm @@ -50,6 +50,7 @@ unload-services unload-service load-services + load-services/safe start-service stop-service)) @@ -232,6 +233,25 @@ returns a shepherd object." `(primitive-load ,file)) files)))) +(define (load-services/safe files) + "This is like 'load-services', but make sure only the subset of FILES that +can be safely reloaded is actually reloaded. + +This is done to accommodate the Shepherd < 0.15.0 where services lacked the +'replacement' slot, and where 'register-services' would throw an exception +when passed a service with an already-registered name." + (eval-there `(let* ((services (map primitive-load ',files)) + (slots (map slot-definition-name + (class-slots ))) + (can-replace? (memq 'replacement slots))) + (define (registered? service) + (not (null? (lookup-services (canonical-name service))))) + + (apply register-services + (if can-replace? + services + (remove registered? services)))))) + (define (start-service name) (with-shepherd-action name ('start) result result)) diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm index 4cd2249841..4c7e72049f 100644 --- a/gnu/services/shepherd.scm +++ b/gnu/services/shepherd.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2016, 2018 Ludovic Courtès ;;; Copyright © 2017 Clément Lassieur +;;; Copyright © 2018 Carlo Zancanaro ;;; ;;; This file is part of GNU Guix. ;;; @@ -329,7 +330,7 @@ symbols provided/required by a service." (define (shepherd-service-upgrade live target) "Return two values: the subset of LIVE (a list of ) that needs to be unloaded, and the subset of TARGET (a list of ) that -needs to be loaded." +need to be restarted to complete their upgrade." (define (essential? service) (memq (first (live-service-provision service)) '(root shepherd))) @@ -346,12 +347,6 @@ needs to be loaded." (and=> (lookup-live (shepherd-service-canonical-name service)) live-service-running)) - (define (stopped service) - (match (lookup-live (shepherd-service-canonical-name service)) - (#f #f) - (service (and (not (live-service-running service)) - service)))) - (define live-service-dependents (shepherd-service-back-edges live #:provision live-service-provision @@ -362,16 +357,14 @@ needs to be loaded." (#f (every obsolete? (live-service-dependents service))) (_ #f))) - (define to-load - ;; Only load services that are either new or currently stopped. - (remove running? target)) + (define to-restart + ;; Restart services that are currently running. + (filter running? target)) (define to-unload - ;; Unload services that are (1) no longer required, or (2) are in TO-LOAD. - (remove essential? - (append (filter obsolete? live) - (filter-map stopped to-load)))) + ;; Unload services that are no longer required. + (remove essential? (filter obsolete? live))) - (values to-unload to-load)) + (values to-unload to-restart)) ;;; shepherd.scm ends here -- cgit v1.2.3 From 2a5f2b1f7550db701172a338e98179e1cac55a1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 26 Sep 2018 16:35:37 +0200 Subject: gnu: Remove incorrect Emacs package deprecations. This is a followup to 5c8031ff7382ec9079040d08ae5a05b4dd2352b7. An upgrade would wrongfully report things like: guix package: package 'emacs-typo' has been superseded by 'emacs-typo' guix package: package 'emacs-org-tree-slide' has been superseded by 'emacs-org-tree-slide' guix package: package 'emacs-emms' has been superseded by 'emacs-emms' * gnu/packages/emacs.scm (flycheck, emms, typo, org-tree-slide) (butler): Remove. (emacs-emms-mode-line-cycle)[propagated-inputs]: Use EMACS-EMMS instead of EMMS. --- gnu/packages/emacs.scm | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index c541c51483..9dc11c59fc 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -782,9 +782,6 @@ different tools. It highlights errors and warnings inline in the buffer, and provides an optional IDE-like error list.") (license license:gpl3+))) ;+GFDLv1.3+ for the manual -(define-public flycheck - (deprecated-package "flycheck" emacs-flycheck)) - ;;; ;;; Web browsing. @@ -1066,9 +1063,6 @@ light user interface.") (home-page "https://www.gnu.org/software/emms/") (license license:gpl3+))) -(define-public emms - (deprecated-package "emacs-emms" emacs-emms)) - (define-public emacs-emms-player-mpv ;; A new mpv backend is included in Emms from 5.0. (deprecated-package "emacs-emms-player-mpv" emacs-emms)) @@ -1088,7 +1082,7 @@ light user interface.") "0ifszi930pnaxk1x8pcydmvnp06868gc7nfx14q17zbajbx735k6")))) (build-system emacs-build-system) (propagated-inputs - `(("emms" ,emms))) + `(("emms" ,emacs-emms))) (home-page "https://github.com/momomo5717/emms-mode-line-cycle") (synopsis "Display the EMMS mode line as a ticker") (description @@ -2722,9 +2716,6 @@ view the build status of those servers' build jobs, and possibly to trigger build jobs.") (license license:gpl3+))) -(define-public butler - (deprecated-package "emacs-butler" emacs-butler)) - (define-public emacs-company (package (name "emacs-company") @@ -2874,9 +2865,6 @@ automatically inserts a Unicode opening or closing quotation mark, depending on context.") (license license:gpl3+))) -(define-public typo - (deprecated-package "emacs-typo" emacs-typo)) - (define-public emacs-scheme-complete (let ((commit "9b5cf224bf2a5994bc6d5b152ff487517f1a9bb5")) (package @@ -8061,9 +8049,6 @@ navigation with the grails mode.") @kbd{C-<} to jump to the next and previous slide.") (license license:gpl3+)))) -(define-public org-tree-slide - (deprecated-package "emacs-org-tree-slide" emacs-org-tree-slide)) - (define-public emacs-scratch-el (let ((commit "2cdf2b841ce7a0987093f65b0cc431947549f897") (revision "1")) -- cgit v1.2.3 From 6f03b08089167ec863361352ab200830bffeb0b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 26 Sep 2018 22:30:16 +0200 Subject: services: dhcp-client: Use 'read-pid-file'. * gnu/services/networking.scm (dhcp-client-service-type)[start]: Use 'read-pid-file' instead of the custom and possibly infinite loop. --- gnu/services/networking.scm | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'gnu') diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index bd1d5a2706..3fdb2bb9f7 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.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 © 2015 Mark H Weaver ;;; Copyright © 2016, 2018 Efraim Flashner ;;; Copyright © 2016 John Darrington @@ -191,19 +191,7 @@ fe80::1%lo0 apps.facebook.com\n") (cons* #$dhclient "-nw" "-pf" #$pid-file ifaces)))) (and (zero? (cdr (waitpid pid))) - (let loop () - (catch 'system-error - (lambda () - (call-with-input-file #$pid-file read)) - (lambda args - ;; 'dhclient' returned before PID-FILE was created, - ;; so try again. - (let ((errno (system-error-errno args))) - (if (= ENOENT errno) - (begin - (sleep 1) - (loop)) - (apply throw args)))))))))) + (read-pid-file #$pid-file))))) (stop #~(make-kill-destructor)))))) (define* (dhcp-client-service #:key (dhcp isc-dhcp)) -- cgit v1.2.3 From a56c4eb8f43ae5555985d8a84308d150c0763c5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 26 Sep 2018 22:52:38 +0200 Subject: services: shepherd: Add workaround for 0.5.0 in containers. * gnu/services/shepherd.scm (%containerized-shepherd-service): New service. * gnu/system.scm (essential-services): Use it when CONTAINER? is true. --- gnu/services/shepherd.scm | 16 ++++++++++++++++ gnu/system.scm | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm index 4c7e72049f..49d08cc30f 100644 --- a/gnu/services/shepherd.scm +++ b/gnu/services/shepherd.scm @@ -59,6 +59,7 @@ %default-modules shepherd-service-file + %containerized-shepherd-service shepherd-service-lookup-procedure shepherd-service-back-edges @@ -327,6 +328,21 @@ symbols provided/required by a service." (lambda (service) (vhash-foldq* cons '() service edges))) +(define %containerized-shepherd-service + ;; XXX: This service works around a bug in the Shepherd 0.5.0: shepherd + ;; calls reboot(2) (via 'disable-reboot-on-ctrl-alt-del') when it starts, + ;; but in a container that fails with EINVAL. This was fixed in Shepherd + ;; commit 92e806bac1abaeeaf5d60f0ab50d1ae85ba6a62f. + (simple-service 'containerized-shepherd + shepherd-root-service-type + (list (shepherd-service + (provision '(containerized-shepherd)) + (start #~(lambda () + (set! (@@ (shepherd) + disable-reboot-on-ctrl-alt-del) + (const #t)) + #t)))))) + (define (shepherd-service-upgrade live target) "Return two values: the subset of LIVE (a list of ) that needs to be unloaded, and the subset of TARGET (a list of ) that diff --git a/gnu/system.scm b/gnu/system.scm index e4a57475a9..99bc09873d 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -501,7 +501,7 @@ a container or that of a \"bare metal\" system." ;; Add the firmware service, unless we are building for a ;; container. (if container? - '() + (list %containerized-shepherd-service) (list %linux-bare-metal-service (service firmware-service-type (operating-system-firmware os)))))))) -- cgit v1.2.3 From 23784f0c3342a0fab5bf2a1c15c300b9f0856872 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 26 Sep 2018 22:58:23 +0200 Subject: services: udev: Don't attempt to read "modules.devname" from a container. Fixes . Reported by Julien Lepiller . * gnu/services/base.scm (udev-shepherd-service)[start]: Check whether DIRECTORY exists and skip 'make-static-device-nodes' call if it doesn't. --- gnu/services/base.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 5ba2c6b86d..9dfabd9807 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -1881,7 +1881,12 @@ item of @var{packages}." (string-append linux-module-directory "/" kernel-release)) (old-umask (umask #o022))) - (make-static-device-nodes directory) + ;; If we're in a container, DIRECTORY might not exist, + ;; for instance because the host runs a different + ;; kernel. In that case, skip it; we'll just miss a few + ;; nodes like /dev/fuse. + (when (file-exists? directory) + (make-static-device-nodes directory)) (umask old-umask)) (let ((pid (fork+exec-command (list udevd)))) -- cgit v1.2.3 From 09b7300c01a8e7100467c6caae9b2c8d8e673971 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 26 Sep 2018 23:01:33 +0200 Subject: services: virtual-terminal: Write to "default_utf8" only if necessary. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes a bug in containers whereby 'virtual-terminal' would always fail to start because writing to /sys/…/default_utf8 would fail with EROFS. * gnu/services/base.scm (virtual-terminal-service-type): Read from "default_utf8" before attempting to write to it. --- gnu/services/base.scm | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 9dfabd9807..47c7d8bb27 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -685,17 +685,20 @@ to add @var{device} to the kernel's entropy pool. The service will fail if (shepherd-service-type 'virtual-terminal (lambda (utf8?) - (shepherd-service - (documentation "Set virtual terminals in UTF-8 module.") - (provision '(virtual-terminal)) - (requirement '(root-file-system)) - (start #~(lambda _ - (call-with-output-file - "/sys/module/vt/parameters/default_utf8" - (lambda (port) - (display 1 port))) - #t)) - (stop #~(const #f)))) + (let ((knob "/sys/module/vt/parameters/default_utf8")) + (shepherd-service + (documentation "Set virtual terminals in UTF-8 module.") + (provision '(virtual-terminal)) + (requirement '(root-file-system)) + (start #~(lambda _ + ;; In containers /sys is read-only so don't insist on + ;; writing to this file. + (unless (= 1 (call-with-input-file #$knob read)) + (call-with-output-file #$knob + (lambda (port) + (display 1 port)))) + #t)) + (stop #~(const #f))))) #t)) ;default to UTF-8 (define console-keymap-service-type -- cgit v1.2.3 From e15ede6e28cfaf5fe951faf88d7c1e3213a476a4 Mon Sep 17 00:00:00 2001 From: Timo Eisenmann Date: Wed, 26 Sep 2018 17:01:33 +0200 Subject: gnu: enlightenment: Fix initial locale and keyboard selection. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/enlightenment.scm (enlightenment)[arguments]: In 'set-system-actions', set absolute file name to 'locale' and 'xorg.lst'. Signed-off-by: Ludovic Courtès --- gnu/packages/enlightenment.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 45dc1dbbeb..c7812e8874 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2017 Nils Gillmann ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Timo Eisenmann ;;; ;;; This file is part of GNU Guix. ;;; @@ -268,13 +269,19 @@ Libraries with some extra bells and whistles.") (add-before 'configure 'set-system-actions (lambda* (#:key inputs #:allow-other-keys) (let ((xkeyboard (assoc-ref inputs "xkeyboard-config")) - (utils (assoc-ref inputs "util-linux"))) + (utils (assoc-ref inputs "util-linux")) + (libc (assoc-ref inputs "libc"))) ;; We need to patch the path to 'base.lst' to be able ;; to switch the keyboard layout in E. - (substitute* "src/modules/xkbswitch/e_mod_parse.c" + (substitute* (list "src/modules/xkbswitch/e_mod_parse.c" + "src/modules/wizard/page_011.c") (("/usr/share/X11/xkb/rules/xorg.lst") (string-append xkeyboard "/share/X11/xkb/rules/base.lst"))) + (substitute* (list "src/bin/e_intl.c" + "src/modules/conf_intl/e_int_config_intl.c" + "src/modules/wizard/page_010.c") + (("locale -a") (string-append libc "/bin/locale -a"))) (substitute* "src/modules/everything/evry_plug_apps.c" (("/usr/bin/") "")) (substitute* "configure" -- cgit v1.2.3 From a9994b273585914a273f5c50bf2d39af1f657fd0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 25 Sep 2018 20:58:07 +0200 Subject: gnu: perl-crypt-openssl-rsa: Update to 0.31. * gnu/packages/tls.scm (perl-crypt-openssl-rsa): Update to 0.31. --- gnu/packages/tls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 0cdb02b0aa..bdb63c0dbf 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -681,7 +681,7 @@ servers or clients for more complicated applications.") (define-public perl-crypt-openssl-rsa (package (name "perl-crypt-openssl-rsa") - (version "0.30") + (version "0.31") (source (origin (method url-fetch) @@ -691,7 +691,7 @@ servers or clients for more complicated applications.") ".tar.gz")) (sha256 (base32 - "1b19kaaw4wda8dy6kjiwqa2prpbs2dqcyjyj9zdh5wbs74qkbq93")))) + "0djl5i6kibl7862b6ih29q8dhg5zpwzq77q9j8hp6xngshx40ws1")))) (build-system perl-build-system) (native-inputs `(("perl-crypt-openssl-guess" ,perl-crypt-openssl-guess))) -- cgit v1.2.3 From 6f52db245564b5732577e4e40e0f3127d37fcaf0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 25 Sep 2018 23:27:44 +0200 Subject: gnu: perl-catalyst-runtime: Update to 5.90119. * gnu/packages/web.scm (perl-catalyst-runtime): Update to 5.90119. --- gnu/packages/web.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 26c2e9128a..2251daabf7 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1862,15 +1862,15 @@ MIME type directly to the browser, without being processed through Catalyst.") (define-public perl-catalyst-runtime (package (name "perl-catalyst-runtime") - (version "5.90118") + (version "5.90119") (source (origin (method url-fetch) - (uri (string-append "mirror://cpan/authors/id/H/HA/HAARG/" + (uri (string-append "mirror://cpan/authors/id/E/ET/ETHER/" "Catalyst-Runtime-" version ".tar.gz")) (sha256 (base32 - "0cws3szx3vvh0372qdx8fypgv6qphcc3v81rbq30sl1ghby7ksd3")))) + "1iw7x9rqk3sz2hm1bw01blz5vwm7zlljdf4xj3r8vz54f1yggzqr")))) (build-system perl-build-system) (native-inputs `(("perl-test-fatal" ,perl-test-fatal))) -- cgit v1.2.3 From af44f05af78e3187589c2c628c3d3436df7ceed0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Sep 2018 12:38:47 +0200 Subject: gnu: perl-net-dns: Update to 1.18. * gnu/packages/networking.scm (perl-net-dns): Update to 1.18. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 4800c2496b..0d6de040e5 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -902,7 +902,7 @@ private (reserved).") (define-public perl-net-dns (package (name "perl-net-dns") - (version "1.17") + (version "1.18") (source (origin (method url-fetch) @@ -914,7 +914,7 @@ private (reserved).") version ".tar.gz"))) (sha256 (base32 - "1q62w9rf2w8kjzqagzr0rdn20ybl8gj3l6cdq4k8fw0sxa7zsycs")))) + "1lx902cbvlfl63bqfdrnyavmfwbjvrfdnwgdc1dgs1wpzja19kjj")))) (build-system perl-build-system) (inputs `(("perl-digest-hmac" ,perl-digest-hmac))) -- cgit v1.2.3 From 3d190d6a219d03dc94c8d33614766df0fed1473f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 27 Sep 2018 03:47:24 +0200 Subject: gnu: dico: Update to 2.7. * gnu/packages/dico.scm (dico): Update to 2.7. [arguments]: Work around dodgy test in 'check' phase. --- gnu/packages/dico.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/dico.scm b/gnu/packages/dico.scm index a85987d9b1..d96dbb86d9 100644 --- a/gnu/packages/dico.scm +++ b/gnu/packages/dico.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016, 2018 Ludovic Courtès ;;; Copyright © 2016, 2018 Efraim Flashner +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -37,14 +38,14 @@ (define-public dico (package (name "dico") - (version "2.6") + (version "2.7") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/dico/dico-" version ".tar.xz")) (sha256 (base32 - "0zmi041gv5nd5fmyzgdrgrsy2pvjaq9p8dvvhxwi842hiyng5b7i")))) + "0dg4aacnmlf3ljssd7dwh8z5644xzq8k1501mbsx8nz8p8a9mbsq")))) (build-system gnu-build-system) (arguments '(#:configure-flags (list (string-append "--with-guile-site-dir=" %output @@ -57,7 +58,11 @@ ;; infrastructure. Gag it. (setenv "GUILE_AUTO_COMPILE" "0") (setenv "GUILE_WARN_DEPRECATED" "no") - #t))))) + #t)) + (replace 'check + (lambda _ + ;; Test '71: append + dooffs + env' fails if $V is not 2. + (invoke "make" "check" "V=2")))))) (inputs `(("m4" ,m4) ;used at run time ("pcre" ,pcre) -- cgit v1.2.3 From b733dbc0fb5bd1648f1fdce6471f048886e69e73 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 25 Sep 2018 10:15:37 +0200 Subject: gnu: python-setproctitle: Use INVOKE. * gnu/packages/python.scm (python-setproctitle)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 5c6c79da88..4703d95a2d 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -10482,7 +10482,7 @@ theme for the Sphinx documentation system. It's the default theme of Sphinx.") (setenv "CC" "gcc") ;; No need to extend PYTHONPATH to find the built package, since ;; the Makefile will build anyway - (zero? (system* "make" "check"))))))) + (invoke "make" "check")))))) (native-inputs `(("procps" ,procps))) ; required for tests (home-page -- cgit v1.2.3 From 428d2ca2ecc57780fb4be90ca6009ea1d00eeade Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Sep 2018 20:33:00 +0200 Subject: gnu: youtube-dl: Update to 2018.09.18. * gnu/packages/video.scm (youtube-dl): Update to 2018.09.18. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 448773e0d9..54ffef86de 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1271,7 +1271,7 @@ access to mpv's powerful playback capabilities.") (define-public youtube-dl (package (name "youtube-dl") - (version "2018.09.08") + (version "2018.09.18") (source (origin (method url-fetch) (uri (string-append "https://yt-dl.org/downloads/" @@ -1279,7 +1279,7 @@ access to mpv's powerful playback capabilities.") version ".tar.gz")) (sha256 (base32 - "0vwc4faqdddrb3nm4fzmkr60n5rc2zwyy8jwrrjad60kcp8isf05")))) + "0mlsdmddmyy3xaqy366k48xds14g17l81al3kglndjkbrrji63sb")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion -- cgit v1.2.3 From c4a3ea38850e97cdc12252440c7fa9cdefd5790f Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Thu, 27 Sep 2018 09:50:01 +0200 Subject: gnu: mame: Update to 0.202. * gnu/packages/emulators.scm (mame): Update to 0.202. --- gnu/packages/emulators.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 782bff5b18..443137f141 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1184,7 +1184,7 @@ play them on systems for which they were never designed!") (define-public mame (package (name "mame") - (version "0.201") + (version "0.202") (source (origin (method git-fetch) @@ -1194,7 +1194,7 @@ play them on systems for which they were never designed!") (file-name (git-file-name name version)) (sha256 (base32 - "00whiig4ld3d4fkl34q48vlf28ygvvp5g7fp0rb5n31ymhl4kajk")) + "1v9gm124p65nbj678gfkcvwphp9qc15ky2p12ca6g3rllma94di5")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. -- cgit v1.2.3 From e07cb04d40eaea8aa792e2375f7f127ef54a79f3 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 27 Sep 2018 05:51:20 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.158. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.158. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 170c77374d..95a5234c76 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -452,8 +452,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.157" - "00bnfqwkr0jfdabmwx5qk5bqxn5vwnnzwqbm5rfg7lggii74kk54" + (make-linux-libre "4.4.158" + "1l3blfaw50a8l9bp735vzsmk1naq4l40qidza10dwkkrd2ip3n41" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From 202190ec392d3284b0dae753b356cb74f4962682 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 27 Sep 2018 05:52:00 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.129. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.129. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 95a5234c76..b3ccaef89f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -446,8 +446,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.128" - "0lww23xcyyg0dwzrap5x9d700gy3lbxln55n6sqqkm7m89dkqwha" + (make-linux-libre "4.9.129" + "0y7p1xgbpn4nmr5pmqb58shr54lvryr5rxwm9m66knwzj332f3rh" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From e0b6085a7f69a8b2a8ff4fe90d8ef28f9ef50769 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 27 Sep 2018 05:52:52 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.72. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.72. (%linux-libre-4.14-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b3ccaef89f..93005e16da 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -436,8 +436,8 @@ It has been modified to remove all non-free binary blobs.") #:patches %linux-libre-4.18-patches #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.71") -(define %linux-libre-4.14-hash "1akvykaccy7ikl8v04grwxvgs4z2rrs7drf2s85ysqwq79mdh3gq") +(define %linux-libre-4.14-version "4.14.72") +(define %linux-libre-4.14-hash "1ngz5p8mvga45y1n6hbw6niy0ji5mfl4vc3bxlckjg42dcp5qf64") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.2.3 From 1d1e4f8f9c46b13ed2c4a61bc4c5f25c6748649b Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 27 Sep 2018 05:53:46 -0400 Subject: gnu: linux-libre: Update to 4.18.10. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.18.10. (%linux-libre-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 93005e16da..2503676396 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -405,8 +405,8 @@ It has been modified to remove all non-free binary blobs.") ;; supports qemu "virt" machine and possibly a large number of ARM boards. ;; See : https://wiki.debian.org/DebianKernel/ARMMP. -(define %linux-libre-version "4.18.9") -(define %linux-libre-hash "0wwmhnfvcsdlqhzwwwyz1x5a3ldjky6l0xir1pi6pysr0lak402x") +(define %linux-libre-version "4.18.10") +(define %linux-libre-hash "1znc6kh3j8plmxail6hn2ss0r0fvbcp50s3xv5gxys7jc7k42znj") (define %linux-libre-4.18-patches (list %boot-logo-patch -- cgit v1.2.3 From de1158d53fd106103214e79f8523a91b9cfa89d7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 27 Sep 2018 19:55:49 +0200 Subject: gnu: eolie: Update to 0.9.38. * gnu/packages/gnome.scm (eolie): Update to 0.9.38. --- gnu/packages/gnome.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1e8522c500..de938e4b14 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4090,15 +4090,15 @@ work and the interface is well tested.") (define-public eolie (package (name "eolie") - (version "0.9.37") + (version "0.9.38") (source (origin (method url-fetch) (uri (string-append "https://gitlab.gnome.org/World/eolie/" - "uploads/4341cb428b7a45670308ee3fb3fa07dd/" + "uploads/9814c06a1bc83ea09c3da8719a9ed11b/" "eolie-" version ".tar.xz")) (sha256 (base32 - "126m0nwwy3lqv7z8aj9hiwangih03b1nlkg3xja9p7wbf7zcvp2n")))) + "10vrh91rapgfmqwc6jkcybpmlvn4q0y8bnklw3rddzigf9kvqsff")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t -- cgit v1.2.3 From ea1a3601999887a0762a942460317145f3f53b30 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 27 Sep 2018 20:02:55 +0200 Subject: gnu: emacs-ert-runner: Do not use package name in directory. * gnu/packages/emacs.scm (emacs-ert-runner)[arguments]: Use the upstream name instead of the Guix package name in the "install-executable" phase. This is a follow-up to commit 5c8031ff7382ec9079040d08ae5a05b4dd2352b7. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 9dc11c59fc..8da5add886 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -6982,8 +6982,8 @@ Emacs.") (substitute* "bin/ert-runner" (("ERT_RUNNER=\"\\$\\(dirname \\$\\(dirname \\$0\\)\\)") (string-append "ERT_RUNNER=\"" out - "/share/emacs/site-lisp/guix.d/" - ,name "-" ,version))) + "/share/emacs/site-lisp/guix.d/ert-runner-" + ,version))) (install-file "bin/ert-runner" (string-append out "/bin")) (wrap-program (string-append out "/bin/ert-runner") (list "EMACSLOADPATH" ":" 'prefix -- cgit v1.2.3 From 363d7d6608d599776f78525e50a920b1d641805b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 27 Sep 2018 21:52:07 +0200 Subject: gnu: yoshimi: Update to 1.5.9. * gnu/packages/music.scm (yoshimi): Update to 1.5.9. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index e563062018..2d834d8c1f 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1996,7 +1996,7 @@ capabilities, custom envelopes, effects, etc.") (define-public yoshimi (package (name "yoshimi") - (version "1.5.8.2") + (version "1.5.9") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/yoshimi/" @@ -2004,7 +2004,7 @@ capabilities, custom envelopes, effects, etc.") "/yoshimi-" version ".tar.bz2")) (sha256 (base32 - "1kg7d6mnzdwzsqhrf7pmrf1hzgfpbpm5lv8xkaz32wiv391qrnxc")))) + "1nqwxwq6814m860zrh33r85vdyi2bgkvjg5372h3ngcdmxnb7wr0")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; there are no tests -- cgit v1.2.3 From c32863e094d3489d2e08ccb3188988d7c6410976 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 27 Sep 2018 23:38:36 +0200 Subject: gnu: sshuttle: Patch FHS assumptions. Reported-By: Nam Nguyen * gnu/packages/vpn.scm (sshuttle)[arguments]: Set correct paths to 'env' and 'sh'. --- gnu/packages/vpn.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 85bbe7e9c6..de5df5039d 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -347,6 +347,17 @@ private network between hosts on the internet.") (base32 "0pqk43kd7crqhg6qgnl8kapncwgw1xgaf02zarzypcw64kvdih9h")))) (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-FHS-file-names + (lambda _ + (substitute* "sshuttle/client.py" + (("/usr/bin/env") (which "env"))) + (substitute* "sshuttle/ssh.py" + ;; Perhaps this is unreachable, but don't let's take risks. + (("/bin/sh") (which "sh"))) + #t))))) (native-inputs `(("python-setuptools-scm" ,python-setuptools-scm) ;; For tests only. -- cgit v1.2.3 From 697c5846651cbee20538d96446cc48adb8e2462a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Sep 2018 01:41:39 +0200 Subject: gnu: mbpfan: Update to 2.1.0. * gnu/packages/linux.scm (mbpfan): Update to 2.1.0. --- gnu/packages/linux.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2503676396..ba0022a8a6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4827,7 +4827,7 @@ interface to this kernel feature.") (define-public mbpfan (package (name "mbpfan") - (version "2.0.2") + (version "2.1.0") (source (origin (method url-fetch) @@ -4836,10 +4836,10 @@ interface to this kernel feature.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0wifsws9icki95hhfh4zw1hmk07ddmkcz9mg5a9jr7q2kkrk01cx")))) + "1j44bpwv2zszih3cia9h7i7gb2gbfhzqh0s4kscbl7nplvyk3rlp")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ; no tests + '(#:tests? #f ; tests ask to be run as root #:make-flags (let ((out (assoc-ref %outputs "out"))) (list (string-append "DESTDIR=" out) "CC=gcc")) @@ -4850,7 +4850,7 @@ interface to this kernel feature.") (substitute* "Makefile" (("/usr") "")) #t)) - (delete 'configure)))) ; There's no configure phase. + (delete 'configure)))) ; there's no configure phase (home-page "https://github.com/dgraziotin/mbpfan") (synopsis "Control fan speed on Macbooks") (description -- cgit v1.2.3 From 5478ab1ecea15b506c1c286af1aa8ec89f26aa10 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Sep 2018 01:44:50 +0200 Subject: gnu: mbpfan: Don't use unstable tarball. * gnu/packages/linux.scm (mbpfan)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/linux.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ba0022a8a6..9e279b91e8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4830,13 +4830,14 @@ interface to this kernel feature.") (version "2.1.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/dgraziotin/mbpfan/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/dgraziotin/mbpfan.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1j44bpwv2zszih3cia9h7i7gb2gbfhzqh0s4kscbl7nplvyk3rlp")))) + "1gysq778rkl6dvvj9a1swxcl15wvz0bng5bn4nwq118cl8p8pask")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; tests ask to be run as root -- cgit v1.2.3 From a4764ff00afff0840fb7e92c73d5137281fbc4b9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 25 Sep 2018 10:55:40 +0200 Subject: gnu: python-fakeredis: Edit description. * gnu/packages/databases.scm (python-fakeredis)[description]: Fix (upstream) typo. Get carried away. --- gnu/packages/databases.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 9e8c9d8f9e..9c966494ad 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2673,12 +2673,14 @@ parsing code in hiredis. It primarily speeds up parsing of multi bulk replies." `(#:tests? #f)) (home-page "https://github.com/jamesls/fakeredis") (synopsis "Fake implementation of redis API for testing purposes") - (description "Fakeredis is a pure python implementation of the redis-py -python client that simulates talking to a redis server. This was created for a -single purpose: to write unittests. Setting up redis is not hard, but many time - you want to write unittests that do not talk to an external server (such as -redis). This module now allows tests to simply use this module as a reasonable -substitute for redis.") + (description + "Fakeredis is a pure-Python implementation of the redis-py Python client +that simulates talking to a redis server. It was created for a single purpose: +to write unit tests. + +Setting up redis is not hard, but one often wants to write unit tests that don't +talk to an external server such as redis. This module can be used as a +reasonable substitute.") (license license:bsd-3))) (define-public python2-fakeredis -- cgit v1.2.3 From 5abcb1b0e6fe849d206b3683444c76d91f21a3d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 28 Sep 2018 00:29:25 +0200 Subject: gnu: guix: Update to 7fed935. * gnu/packages/package-management.scm (guix): Update to 7fed935. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 3bc8ac6073..69788c9463 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -101,8 +101,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "0.15.0") - (commit "3d43017026f9995ad128915db8ca5eafe061bf75") - (revision 3)) + (commit "7fed9353ece5974ff431fa666a530da237a12085") + (revision 4)) (package (name "guix") @@ -118,7 +118,7 @@ (commit commit))) (sha256 (base32 - "167rzz2h33xmmchkplwzfq94s5jwdn5nabsq2lb84s54ps0sm89m")) + "11j13xszjcrf3barf38bixx3hbrfj5w81fskjp8gn6m42knx1yal")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 7edfcd61a1d42f8e1f21c8e7b46d5d61aaeb4598 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 28 Sep 2018 14:22:11 +0200 Subject: gnu: httpd: Update to 2.4.35. * gnu/packages/web.scm (httpd): Update to 2.4.35. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 2251daabf7..8e776258b3 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -124,14 +124,14 @@ (define-public httpd (package (name "httpd") - (version "2.4.34") + (version "2.4.35") (source (origin (method url-fetch) (uri (string-append "mirror://apache/httpd/httpd-" version ".tar.bz2")) (sha256 (base32 - "1w1q2smdgf6ln0x741lk5pv5r0gzrxj2iza1vslhifzy65bcjlzs")))) + "0mlvwsm7hmpc7db6lfc2nx3v4cll3qljjxhjhgsw6aniskywc1r6")))) (build-system gnu-build-system) (native-inputs `(("pcre" ,pcre "bin"))) ;for 'pcre-config' (inputs `(("apr" ,apr) -- cgit v1.2.3 From 29bdfe1367af34a0b9cf33f7ab021a23206c4bd7 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 28 Sep 2018 10:06:32 -0400 Subject: gnu: Krita: Update to 4.1.3. * gnu/packages/kde.scm (krita): Update to 4.1.3. --- gnu/packages/kde.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index aa5be6b515..a835f42749 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -236,7 +236,7 @@ plugins, as well as code to create plugins, or complete applications.") (define-public krita (package (name "krita") - (version "4.1.1") + (version "4.1.3") (source (origin (method url-fetch) (uri (string-append @@ -245,7 +245,7 @@ plugins, as well as code to create plugins, or complete applications.") "/" name "-" version ".tar.gz")) (sha256 (base32 - "1qz9bjvnwa5gc2b0063i2p72jq6y1b6kgqdj39599acp7ws11asw")))) + "0d546dxs552z0pxnaka1jm7ksravw17f777wf593z0pl4ds8dgdx")))) (build-system cmake-build-system) (arguments `(#:tests? #f -- cgit v1.2.3 From 4353981eb095459c47a9e12950745ac0304162ae Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 26 Sep 2018 01:45:05 +0200 Subject: tests: Add missing copyright statement. This is a follow-up to commit 3b97a1779f3b65d582b8edc8c154b6414314b946. * gnu/tests/web.scm: Update copyright header. --- gnu/tests/web.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/tests/web.scm b/gnu/tests/web.scm index bcc919137b..2e209fee97 100644 --- a/gnu/tests/web.scm +++ b/gnu/tests/web.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2017 Christopher Baines ;;; Copyright © 2017, 2018 Clément Lassieur ;;; Copyright © 2018 Pierre-Antoine Rouby +;;; Copyright © 2018 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; -- cgit v1.2.3 From 87c39618719374f7f3cb0dc81c8ab587773c4c66 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 26 Sep 2018 19:06:38 +0200 Subject: gnu: newsboat: Update to 2.13. * gnu/packages/syndication.scm (newsboat): Update to 2.13. --- gnu/packages/syndication.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index 6247d1f3b6..a7c685fdc1 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -35,7 +35,7 @@ (define-public newsboat (package (name "newsboat") - (version "2.12") + (version "2.13") (source (origin (method url-fetch) @@ -43,7 +43,7 @@ "/newsboat-" version ".tar.xz")) (sha256 (base32 - "1x23zlgljaqf46v7sp8wnkyf6wighvirvn48ankpa34yr8mvrgcv")))) + "0pik1d98ydzqi6055vdbkjg5krwifbk2hy2f5jp5p1wcy2s16dn7")))) (build-system gnu-build-system) (native-inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From c6b772a059da1f47a0561ca915f43c1399ee8c65 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 26 Sep 2018 19:09:45 +0200 Subject: gnu: rng-tools: Update home page. * gnu/packages/linux.scm (rng-tools)[home-page]: Set to URL mentioned in legacy wiki. --- gnu/packages/linux.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9e279b91e8..a6efded72d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3668,6 +3668,7 @@ The collection contains a set of bandwidth and latency benchmark such as: (define-public rng-tools (package (name "rng-tools") + (home-page "https://github.com/nhorman/rng-tools") (version "6.4") (source (origin (method url-fetch) @@ -3691,7 +3692,6 @@ The collection contains a set of bandwidth and latency benchmark such as: (description "Monitor a hardware random number generator, and supply entropy from that to the system kernel's @file{/dev/random} machinery.") - (home-page "https://sourceforge.net/projects/gkernel") ;; The source package is offered under the GPL2+, but the files ;; 'rngd_rdrand.c' and 'rdrand_asm.S' are only available under the GPL2. (license (list license:gpl2 license:gpl2+)))) -- cgit v1.2.3 From f289820c31f0d493caaa6d1d9fac7750176ba492 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 26 Sep 2018 19:13:07 +0200 Subject: gnu: rng-tools: Don't use unstable tarball. * gnu/packages/linux.scm (rng-tools)[source]: Use GIT-FETCH. --- gnu/packages/linux.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a6efded72d..a3c2c4c946 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3671,13 +3671,13 @@ The collection contains a set of bandwidth and latency benchmark such as: (home-page "https://github.com/nhorman/rng-tools") (version "6.4") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/nhorman/rng-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 - "005krksl8iz37l5p1nx8apl1yg7q78yrsb6inby31d2g5ck8nnwa")))) + "10r8vy240q04xx6j48qm063w0ssp0dkxchvq6x3fwd9bwp8m3sj7")))) (build-system gnu-build-system) (arguments `(;; Avoid using OpenSSL, curl, and libxml2, reducing the closure by 166 MiB. -- cgit v1.2.3 From 31f0fc612fe0baf949c647138cba7217b60cae26 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 26 Sep 2018 19:13:53 +0200 Subject: gnu: rng-tools: Update to 6.5. * gnu/packages/linux.scm (rng-tools): Update to 6.5. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a3c2c4c946..cb8203da0b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3669,7 +3669,7 @@ The collection contains a set of bandwidth and latency benchmark such as: (package (name "rng-tools") (home-page "https://github.com/nhorman/rng-tools") - (version "6.4") + (version "6.5") (source (origin (method git-fetch) (uri (git-reference (url home-page) @@ -3677,7 +3677,7 @@ The collection contains a set of bandwidth and latency benchmark such as: (file-name (git-file-name name version)) (sha256 (base32 - "10r8vy240q04xx6j48qm063w0ssp0dkxchvq6x3fwd9bwp8m3sj7")))) + "11kw1rcgzmgzwk7g1w2g0nzjraqb0pf24gxpy50k4ls2qxslw3rk")))) (build-system gnu-build-system) (arguments `(;; Avoid using OpenSSL, curl, and libxml2, reducing the closure by 166 MiB. -- cgit v1.2.3 From 02817df07e965c3413e6986966b3e607de47709c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 27 Sep 2018 20:38:18 +0200 Subject: gnu: libreoffice: Update to 6.1.2.1. * gnu/packages/libreoffice.scm (libreoffice): Update to 6.1.2.1. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 35d49b0216..68b4e265f3 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -926,7 +926,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") (define-public libreoffice (package (name "libreoffice") - (version "6.1.0.3") + (version "6.1.2.1") (source (origin (method url-fetch) @@ -936,7 +936,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") (version-prefix version 3) "/libreoffice-" version ".tar.xz")) (sha256 (base32 - "1n7b6abc0bp9x8lddx60w5br444wf62mdlkqmfk2zmkmiwkcvv2l")) + "149ziasibplihfxlzafzcm4737ns30hg9175967b43c81yv5f335")) (patches (search-patches "libreoffice-icu.patch" "libreoffice-glm.patch")))) (build-system gnu-build-system) -- cgit v1.2.3 From 595af457aedb887c5fb4409f2fbaf4d23c059024 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 13 Jul 2018 20:39:34 +0100 Subject: gnu: Modify the gitolite package to support the Guix service. Previously the gitolite package worked, but there were problems using it for the service where you might have a minimal PATH. This commit patches the source and scripts where possible to use store paths, and also wraps the gitolite script to handle the harder dependencies. * gnu/packages/version-control.scm (gitolite)[arguments]: Add more patching to the patch-scripts phase, and add two new phases (patch-source and wrap-scripts). [inputs]: Add coreutils, findutils and inetutils. --- gnu/packages/version-control.scm | 53 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 204ec403f6..d06055de45 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1031,12 +1031,48 @@ also walk each side of a merge and test those changes individually.") ((" perl -") (string-append " " perl " -"))) + (substitute* (find-files "src/triggers" ".*") + ((" sed ") + (string-append " " (which "sed") " "))) + + (substitute* + '("src/triggers/post-compile/update-gitweb-access-list" + "src/triggers/post-compile/ssh-authkeys-split" + "src/triggers/upstream") + ((" grep ") + (string-append " " (which "grep") " "))) + ;; Avoid references to the store in authorized_keys. ;; This works because gitolite-shell is in the PATH. (substitute* "src/triggers/post-compile/ssh-authkeys" (("\\$glshell \\$user") "gitolite-shell $user")) #t))) + (add-before 'install 'patch-source + (lambda* (#:key inputs #:allow-other-keys) + ;; Gitolite uses cat to test the readability of the + ;; pubkey + (substitute* "src/lib/Gitolite/Setup.pm" + (("\"cat ") + (string-append "\"" (which "cat") " ")) + (("\"ssh-keygen") + (string-append "\"" (which "ssh-keygen")))) + + (substitute* '("src/lib/Gitolite/Hooks/PostUpdate.pm" + "src/lib/Gitolite/Hooks/Update.pm") + (("/usr/bin/perl") + (string-append (assoc-ref inputs "perl") + "/bin/perl"))) + + (substitute* "src/lib/Gitolite/Common.pm" + (("\"ssh-keygen") + (string-append "\"" (which "ssh-keygen"))) + (("\"logger\"") + (string-append "\"" + (assoc-ref inputs "inetutils") + "/bin/logger\""))) + + #t)) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((output (assoc-ref outputs "out")) @@ -1050,9 +1086,24 @@ also walk each side of a merge and test those changes individually.") (symlink (string-append sharedir "/" script) (string-append bindir "/" script))) '("gitolite" "gitolite-shell")) + #t))) + (add-after 'install 'wrap-scripts + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (coreutils (assoc-ref inputs "coreutils")) + (findutils (assoc-ref inputs "findutils")) + (git (assoc-ref inputs "git"))) + (wrap-program (string-append out "/bin/gitolite") + `("PATH" ":" prefix + ,(map (lambda (dir) + (string-append dir "/bin")) + (list out coreutils findutils git)))) #t)))))) (inputs - `(("perl" ,perl))) + `(("perl" ,perl) + ("coreutils" ,coreutils) + ("findutils" ,findutils) + ("inetutils" ,inetutils))) ;; git and openssh are propagated because trying to patch the source via ;; regexp matching is too brittle and prone to false positives. (propagated-inputs -- cgit v1.2.3 From 258a6d944ed891fa92fa87a16731e5dfe0bac477 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 13 Jul 2018 20:39:46 +0100 Subject: services: Add Gitolite. * gnu/services/version-control.scm (, ): New record types. (gitolite-accounts, gitolite-activation): New procedures. (gitolite-service-type): New variables. * gnu/tests/version-control.scm (%gitolite-test-admin-keypair, %gitolite-os, %test-gitolite): New variables. (run-gitolite-test): New procedure. * doc/guix.texi (Version Control): Document the gitolite service. --- gnu/services/version-control.scm | 179 ++++++++++++++++++++++++++++++++++++++- gnu/tests/version-control.scm | 114 ++++++++++++++++++++++++- 2 files changed, 291 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index 58274c8bee..cc8cd22021 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016 Sou Bunnbu ;;; Copyright © 2017 Oleg Pykhalov ;;; Copyright © 2017 Clément Lassieur +;;; Copyright © 2018 Christopher Baines ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,7 +41,23 @@ git-http-configuration git-http-configuration? - git-http-nginx-location-configuration)) + git-http-nginx-location-configuration + + + gitolite-configuration + gitolite-configuration-package + gitolite-configuration-user + gitolite-configuration-rc-file + gitolite-configuration-admin-pubkey + + + gitolite-rc-file + gitolite-rc-file-umask + gitolite-rc-file-git-config-keys + gitolite-rc-file-roles + gitolite-rc-file-enable + + gitolite-service-type)) ;;; Commentary: ;;; @@ -197,3 +214,163 @@ access to exported repositories under @file{/srv/git}." "") (list "fastcgi_param GIT_PROJECT_ROOT " git-root ";") "fastcgi_param PATH_INFO $1;")))))) + + +;;; +;;; Gitolite +;;; + +(define-record-type* + gitolite-rc-file make-gitolite-rc-file + gitolite-rc-file? + (umask gitolite-rc-file-umask + (default #o0077)) + (git-config-keys gitolite-rc-file-git-config-keys + (default "")) + (roles gitolite-rc-file-roles + (default '(("READERS" . 1) + ("WRITERS" . 1)))) + (enable gitolite-rc-file-enable + (default '("help" + "desc" + "info" + "perms" + "writable" + "ssh-authkeys" + "git-config" + "daemon" + "gitweb")))) + +(define-gexp-compiler (gitolite-rc-file-compiler + (file ) system target) + (match file + (($ umask git-config-keys roles enable) + (apply text-file* "gitolite.rc" + `("%RC = (\n" + " UMASK => " ,(format #f "~4,'0o" umask) ",\n" + " GIT_CONFIG_KEYS => '" ,git-config-keys "',\n" + " ROLES => {\n" + ,@(map (match-lambda + ((role . value) + (simple-format #f " ~A => ~A,\n" role value))) + roles) + " },\n" + "\n" + " ENABLE => [\n" + ,@(map (lambda (value) + (simple-format #f " '~A',\n" value)) + enable) + " ],\n" + ");\n" + "\n" + "1;\n"))))) + +(define-record-type* + gitolite-configuration make-gitolite-configuration + gitolite-configuration? + (package gitolite-configuration-package + (default gitolite)) + (user gitolite-configuration-user + (default "git")) + (group gitolite-configuration-group + (default "git")) + (home-directory gitolite-configuration-home-directory + (default "/var/lib/gitolite")) + (rc-file gitolite-configuration-rc-file + (default (gitolite-rc-file))) + (admin-pubkey gitolite-configuration-admin-pubkey)) + +(define gitolite-accounts + (match-lambda + (($ package user group home-directory + rc-file admin-pubkey) + ;; User group and account to run Gitolite. + (list (user-group (name user) (system? #t)) + (user-account + (name user) + (group group) + (system? #t) + (comment "Gitolite user") + (home-directory home-directory)))))) + +(define gitolite-activation + (match-lambda + (($ package user group home + rc-file admin-pubkey) + #~(begin + (use-modules (ice-9 match) + (guix build utils)) + + (let* ((user-info (getpwnam #$user)) + (admin-pubkey #$admin-pubkey) + (pubkey-file (string-append + #$home "/" + (basename + (strip-store-file-name admin-pubkey))))) + + (simple-format #t "guix: gitolite: installing ~A\n" #$rc-file) + (copy-file #$rc-file #$(string-append home "/.gitolite.rc")) + + ;; The key must be writable, so copy it from the store + (copy-file admin-pubkey pubkey-file) + + (chmod pubkey-file #o500) + (chown pubkey-file + (passwd:uid user-info) + (passwd:gid user-info)) + + ;; Set the git configuration, to avoid gitolite trying to use + ;; the hostname command, as the network might not be up yet + (with-output-to-file #$(string-append home "/.gitconfig") + (lambda () + (display "[user] + name = GNU Guix + email = guix@localhost +"))) + ;; Run Gitolite setup, as this updates the hooks and include the + ;; admin pubkey if specified. The admin pubkey is required for + ;; initial setup, and will replace the previous key if run after + ;; initial setup + (match (primitive-fork) + (0 + ;; Exit with a non-zero status code if an exception is thrown. + (dynamic-wind + (const #t) + (lambda () + (setenv "HOME" (passwd:dir user-info)) + (setenv "USER" #$user) + (setgid (passwd:gid user-info)) + (setuid (passwd:uid user-info)) + (primitive-exit + (system* #$(file-append package "/bin/gitolite") + "setup" + "-m" "gitolite setup by GNU Guix" + "-pk" pubkey-file))) + (lambda () + (primitive-exit 1)))) + (pid (waitpid pid))) + + (when (file-exists? pubkey-file) + (delete-file pubkey-file))))))) + +(define gitolite-service-type + (service-type + (name 'gitolite) + (extensions + (list (service-extension activation-service-type + gitolite-activation) + (service-extension account-service-type + gitolite-accounts) + (service-extension profile-service-type + ;; The Gitolite package in Guix uses + ;; gitolite-shell in the authorized_keys file, so + ;; gitolite-shell needs to be on the PATH for + ;; gitolite to work. + (lambda (config) + (list + (gitolite-configuration-package config)))))) + (description + "Setup @command{gitolite}, a Git hosting tool providing access over SSH.. +By default, the @code{git} user is used, but this is configurable. +Additionally, Gitolite can integrate with with tools like gitweb or cgit to +provide a web interface to view selected repositories."))) diff --git a/gnu/tests/version-control.scm b/gnu/tests/version-control.scm index 3b935a1b48..4409b8a12b 100644 --- a/gnu/tests/version-control.scm +++ b/gnu/tests/version-control.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2017, 2018 Oleg Pykhalov ;;; Copyright © 2017, 2018 Ludovic Courtès ;;; Copyright © 2017, 2018 Clément Lassieur +;;; Copyright © 2018 Christopher Baines ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,14 +28,17 @@ #:use-module (gnu services) #:use-module (gnu services version-control) #:use-module (gnu services cgit) + #:use-module (gnu services ssh) #:use-module (gnu services web) #:use-module (gnu services networking) #:use-module (gnu packages version-control) + #:use-module (gnu packages ssh) #:use-module (guix gexp) #:use-module (guix store) #:use-module (guix modules) #:export (%test-cgit - %test-git-http)) + %test-git-http + %test-gitolite)) (define README-contents "Hello! This is what goes inside the 'README' file.") @@ -300,3 +304,111 @@ HTTP-PORT." (name "git-http") (description "Connect to a running Git HTTP server.") (value (run-git-http-test)))) + + +;;; +;;; Gitolite. +;;; + +(define %gitolite-test-admin-keypair + (computed-file + "gitolite-test-admin-keypair" + (with-imported-modules (source-module-closure + '((guix build utils))) + #~(begin + (use-modules (ice-9 match) (srfi srfi-26) + (guix build utils)) + + (mkdir #$output) + (invoke #$(file-append openssh "/bin/ssh-keygen") + "-f" (string-append #$output "/test-admin") + "-t" "rsa" + "-q" + "-N" ""))))) + +(define %gitolite-os + (simple-operating-system + (dhcp-client-service) + (service openssh-service-type) + (service gitolite-service-type + (gitolite-configuration + (admin-pubkey + (file-append %gitolite-test-admin-keypair "/test-admin.pub")))))) + +(define (run-gitolite-test) + (define os + (marionette-operating-system + %gitolite-os + #:imported-modules '((gnu services herd) + (guix combinators)))) + + (define vm + (virtual-machine + (operating-system os) + (port-forwardings `((2222 . 22))))) + + (define test + (with-imported-modules '((gnu build marionette) + (guix build utils)) + #~(begin + (use-modules (srfi srfi-64) + (rnrs io ports) + (gnu build marionette) + (guix build utils)) + + (define marionette + (make-marionette (list #$vm))) + + (mkdir #$output) + (chdir #$output) + + (test-begin "gitolite") + + ;; Wait for sshd to be up and running. + (test-assert "service running" + (marionette-eval + '(begin + (use-modules (gnu services herd)) + (start-service 'ssh-daemon)) + marionette)) + + (display #$%gitolite-test-admin-keypair) + + (setenv "GIT_SSH_VARIANT" "ssh") + (setenv "GIT_SSH_COMMAND" + (string-join + '(#$(file-append openssh "/bin/ssh") + "-i" #$(file-append %gitolite-test-admin-keypair + "/test-admin") + "-o" "UserKnownHostsFile=/dev/null" + "-o" "StrictHostKeyChecking=no"))) + + (test-assert "cloning the admin repository" + (invoke #$(file-append git "/bin/git") + "clone" "-v" + "ssh://git@localhost:2222/gitolite-admin" + "/tmp/clone")) + + (test-assert "admin key exists" + (file-exists? "/tmp/clone/keydir/test-admin.pub")) + + (with-directory-excursion "/tmp/clone" + (invoke #$(file-append git "/bin/git") + "-c" "user.name=Guix" "-c" "user.email=guix" + "commit" + "-m" "Test commit" + "--allow-empty") + + (test-assert "pushing, and the associated hooks" + (invoke #$(file-append git "/bin/git") "push"))) + + (test-end) + (exit (= (test-runner-fail-count (test-runner-current)) 0))))) + + (gexp->derivation "gitolite" test)) + +(define %test-gitolite + (system-test + (name "gitolite") + (description "Clone the Gitolite admin repository.") + (value (run-gitolite-test)))) -- cgit v1.2.3 From ccccb467fb5dec58023717c7ec2699f2955f0d62 Mon Sep 17 00:00:00 2001 From: Jack Hill Date: Fri, 28 Sep 2018 11:18:01 -0400 Subject: gnu: mcabber: Update to 1.1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/messaging.scm (mcabber): Update to 1.1.0 Signed-off-by: Ludovic Courtès --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 9b1aea788c..af67c922b4 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1385,7 +1385,7 @@ protocol allows.") (define-public mcabber (package (name "mcabber") - (version "1.0.5") + (version "1.1.0") (source (origin (method url-fetch) @@ -1393,7 +1393,7 @@ protocol allows.") name "-" version ".tar.bz2")) (sha256 (base32 - "0ixdzk5b3s31a4bdfqgqrsiq7vbgdzhqr49p9pz9cq9bgn0h1wm0")))) + "1ggh865p1rf10ffsnf4g6qv9i8bls36dxdb1nzs5r9vdqci2rz04")))) (build-system gnu-build-system) (arguments '(#:configure-flags (list "--enable-otr" -- cgit v1.2.3 From be7c64ba2d82f6d800ad6577ff8e9e6306071977 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 23 Sep 2018 22:36:15 +0200 Subject: gnu: Add tegola. * gnu/packages/geo.scm (tegola): New variable. --- gnu/packages/geo.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index ae6ba024e0..5641c742b4 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -26,6 +26,7 @@ (define-module (gnu packages geo) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) + #:use-module (guix build-system go) #:use-module (guix build-system python) #:use-module (guix build-system scons) #:use-module (guix build-system r) @@ -760,3 +761,48 @@ location queries to be run in SQL.") license:bsd-3 ; files only say "BSD" ;; doc license:cc-by-sa3.0)))) + +(define-public tegola + (package + (name "tegola") + (version "0.7.0") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/go-spatial/tegola/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "09vnzxfn0r70kmd776kcdfqxhzdj11syxa0b27z4ci1k367v7viw")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/go-spatial/tegola/cmd/tegola" + #:unpack-path "github.com/go-spatial" + #:phases + (modify-phases %standard-phases + (add-before 'build 'set-version + (lambda _ + (with-directory-excursion + (string-append "src/github.com/go-spatial/tegola-" ,version) + (substitute* '("cmd/tegola/cmd/root.go" + "cmd/tegola_lambda/main.go") + (("version not set") ,version))) + #t)) + (add-before 'build 'rename-import + (lambda _ + (rename-file (string-append "src/github.com/go-spatial/tegola-" ,version) + "src/github.com/go-spatial/tegola") + #t))))) + (home-page "http://tegola.io") + (synopsis "Vector tile server for maps") + (description "Tegola is a free vector tile server written in Go. Tegola +takes geospatial data and slices it into vector tiles that can be efficiently +delivered to any client.") + (license (list + license:expat + ;; Some packages in vendor have other licenses + license:asl2.0 + license:bsd-2 + license:bsd-3 + license:wtfpl2)))) -- cgit v1.2.3 From 3bd7611e4acbffc501f8cabdbf581ffc442ee72a Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 23 Sep 2018 22:36:45 +0200 Subject: gnu: Add imposm3. * gnu/packages/geo.scm (imposm3): New variable. --- gnu/packages/geo.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 5641c742b4..c5b5dbcfd0 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -806,3 +806,47 @@ delivered to any client.") license:bsd-2 license:bsd-3 license:wtfpl2)))) + +(define-public imposm3 + (package + (name "imposm3") + (version "0.6.0-alpha.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/omniscale/imposm3/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "06f0kwmv52yd5m9jlckqxqmkf0cnqy3hamakrvg9lspplyqrds80")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/omniscale/imposm3/cmd/imposm" + #:unpack-path "github.com/omniscale" + #:phases + (modify-phases %standard-phases + (add-before 'build 'rename-import + (lambda _ + (rename-file (string-append "src/github.com/omniscale/imposm3-" ,version) + "src/github.com/omniscale/imposm3") + #t)) + (add-before 'build 'set-version + (lambda _ + (substitute* "src/github.com/omniscale/imposm3/version.go" + (("0.0.0-dev") ,version)) + #t))))) + (inputs + `(("geos" ,geos) + ("leveldb" ,leveldb))) + (home-page "https://imposm.org/") + (synopsis "OpenStreetMap importer for PostGIS") + (description "Imposm is an importer for OpenStreetMap data. It reads PBF +files and imports the data into PostgreSQL/PostGIS databases. It is designed +to create databases that are optimized for rendering/tile/map-services.") + (license (list + license:asl2.0 + ;; Some dependencies in vendor have different licenses + license:expat + license:bsd-2 + license:bsd-3)))) -- cgit v1.2.3 From 8fa3451c6fd56373555e2ada00f3978e1eed32a0 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Thu, 27 Sep 2018 22:16:31 +0200 Subject: gnu: Add protozero. * gnu/packages/geo.scm (protozero): New variable. --- gnu/packages/geo.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index c5b5dbcfd0..dda981c90a 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -24,6 +24,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages geo) + #:use-module (guix build-system cmake) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system go) @@ -850,3 +851,26 @@ to create databases that are optimized for rendering/tile/map-services.") license:expat license:bsd-2 license:bsd-3)))) + +(define-public protozero + (package + (name "protozero") + (version "1.6.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/mapbox/protozero/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1xaj4phz1r7xn0vgdfvfkz8b0bizgb6mavjky1zqcvdmbwgwgly5")))) + (build-system cmake-build-system) + (home-page "https://github.com/mapbox/protozero") + (synopsis "Minimalistic protocol buffer decoder and encoder in C++") + (description "Protozero is a minimalistic protocol buffer decored and +encoder in C++. The developer using protozero has to manually translate the +@file{.proto} description into code.") + (license (list + license:asl2.0; for folly + license:bsd-2)))) -- cgit v1.2.3 From 889e94e343b0784598134b333cc328ed41f387ba Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Thu, 27 Sep 2018 22:38:32 +0200 Subject: gnu: Add libosmium. * gnu/packages/geo.scm (libosmium): New variable. --- gnu/packages/geo.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index dda981c90a..990c2a6b02 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -39,6 +39,8 @@ #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages databases) + #:use-module (gnu packages datastructures) + #:use-module (gnu packages documentation) #:use-module (gnu packages fontutils) #:use-module (gnu packages cran) #:use-module (gnu packages glib) @@ -874,3 +876,34 @@ encoder in C++. The developer using protozero has to manually translate the (license (list license:asl2.0; for folly license:bsd-2)))) + +(define-public libosmium + (package + (name "libosmium") + (version "2.14.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/osmcode/libosmium/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0d9b46qiw7zkw1h9lygjdwqxnbhm3c7v8kydzw9f9f778cyagc94")))) + (build-system cmake-build-system) + (propagated-inputs + `(("boost" ,boost) + ("expat" ,expat) + ("gdal" ,gdal) + ("geos" ,geos) + ("proj.4" ,proj.4) + ("protozero" ,protozero) + ("sparsehash" ,sparsehash) + ("zlib" ,zlib))) + (native-inputs + `(("doxygen" ,doxygen))) + (home-page "https://osmcode.org/libosmium/") + (synopsis "C++ library for working with OpenStreetMap data") + (description "Libosmium is a fast and flexible C++ library for working with +OpenStreetMap data.") + (license license:boost1.0))) -- cgit v1.2.3 From b0e2299ad8164b986ae0f9081dad30f3332c91e5 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 23 Sep 2018 22:37:17 +0200 Subject: gnu: Add osm2pgsql. * gnu/packages/geo.scm (osm2pgsql): New variable. --- gnu/packages/geo.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 990c2a6b02..9644bf9d9e 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -48,6 +48,7 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages image) #:use-module (gnu packages icu4c) + #:use-module (gnu packages lua) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -907,3 +908,50 @@ encoder in C++. The developer using protozero has to manually translate the (description "Libosmium is a fast and flexible C++ library for working with OpenStreetMap data.") (license license:boost1.0))) + +(define-public osm2pgsql + (package + (name "osm2pgsql") + (version "0.96.0") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/openstreetmap/osm2pgsql/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "08y7776r4l9v9177a4q6cfdri0lpirky96m6g699hwl7v1vhw0mn")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "contrib/protozero") + (delete-file-recursively "contrib/libosmium") + #t)))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f; tests fail because we need to setup a database + #:configure-flags + (list (string-append "-DOSMIUM_INCLUDE_DIR=" + (assoc-ref %build-inputs "libosmium") + "/include") + (string-append "-DPROTOZERO_INCLUDE_DIR=" + (assoc-ref %build-inputs "protozero") + "/include")))) + (inputs + `(("boost" ,boost) + ("expat" ,expat) + ("libosmium" ,libosmium) + ("lua" ,lua) + ("postgresql" ,postgresql) + ("proj.4" ,proj.4) + ("protozero" ,protozero) + ("zlib" ,zlib))) + (native-inputs + `(("python-2" ,python-2) + ("python2-psycopg2" ,python2-psycopg2))) + (home-page "https://github.com/openstreetmap/osm2pgsql") + (synopsis "OSM data importer to postgresql") + (description "Osm2pgsql is a tool for loading OpenStreetMap data into a +PostgreSQL / PostGIS database suitable for applications like rendering into a +map, geocoding with Nominatim, or general analysis.") + (license license:gpl2+))) -- cgit v1.2.3 From 6f91223fd4889301a099f75ecc855031a300fcfe Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Thu, 27 Sep 2018 22:12:46 +0200 Subject: gnu: Add tippecanoe. * gnu/packages/geo.scm (tippecanoe): New variable. --- gnu/packages/geo.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 9644bf9d9e..4275476e34 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -955,3 +955,34 @@ OpenStreetMap data.") PostgreSQL / PostGIS database suitable for applications like rendering into a map, geocoding with Nominatim, or general analysis.") (license license:gpl2+))) + +(define-public tippecanoe + (package + (name "tippecanoe") + (version "1.31.5") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/mapbox/tippecanoe/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1057na1dkgjaryr7jr15lqkxpam111d3l5zdpdkqzzzpxmdjxqcf")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases (delete 'configure)) + #:test-target "test" + #:make-flags + (list "CC=gcc" + (string-append "PREFIX=" (assoc-ref %outputs "out"))))) + (inputs + `(("perl" ,perl) + ("sqlite" ,sqlite) + ("zlib" ,zlib))) + (home-page "https://github.com/mapbox/tippecanoe") + (synopsis "Vector tile server for maps") + (description "Tippecanoe creates scale-independent view of data, so that +the texture and density of features is visible at every zoom level, instead of +dropping features at lower levels.") + (license license:bsd-2))) -- cgit v1.2.3 From bfb22078fd3a184f60968938851ada97d7dead58 Mon Sep 17 00:00:00 2001 From: fis trivial Date: Sat, 29 Sep 2018 04:05:15 +0000 Subject: gnu: pocl: Update to 1.2. * gnu/packages/opencl.scm (pocl): Update to 1.2. Signed-off-by: Leo Famulari --- gnu/packages/opencl.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/opencl.scm b/gnu/packages/opencl.scm index d32e696438..da979253b0 100644 --- a/gnu/packages/opencl.scm +++ b/gnu/packages/opencl.scm @@ -294,23 +294,23 @@ back-end for the LLVM compiler framework.") (define-public pocl (package (name "pocl") - (version "1.1") + (version "1.2") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/pocl/pocl.git") (commit (string-append "v" version)))) - (file-name (git-file-name name version)) (sha256 - (base32 "1z3sqn20ddv1030adchpzs65qng436gc2mb99p213mkh95jkh1l5")))) + (base32 "0fyiwd9nrqhl0jsac0bx17p9acpfzhyxp50mmp28mzn7psb9qidg")) + (file-name (git-file-name name version)))) (build-system cmake-build-system) (native-inputs `(("libltdl" ,libltdl) ("pkg-config" ,pkg-config))) (inputs `(("clang" ,clang) - ("hwloc" ,hwloc "lib") + ("hwloc" ,hwloc-2.0 "lib") ("llvm" ,llvm) ("ocl-icd" ,ocl-icd))) (arguments -- cgit v1.2.3 From 81e69ba85d6f613b4ff900f6aa50a8a2386ee271 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 29 Sep 2018 11:57:53 -0400 Subject: gnu: BIND: Update to 9.12.2-P2. * gnu/packages/dns.scm (isc-bind): Update to 9.12.2-P2. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 00135294be..4fc1c25229 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -104,7 +104,7 @@ and BOOTP/TFTP for network booting of diskless machines.") (define-public isc-bind (package (name "bind") - (version "9.12.2-P1") + (version "9.12.2-P2") (source (origin (method url-fetch) (uri (string-append @@ -112,7 +112,7 @@ and BOOTP/TFTP for network booting of diskless machines.") version ".tar.gz")) (sha256 (base32 - "192ld6w8f4n46hvdmmzzrfkd28apf4dwmbpbi3j2q1d2p315ajww")))) + "0gk9vwqlbdmn10m21f2awvmiccfbadvcwi8zsgm91awbx4k7h0l7")))) (build-system gnu-build-system) (outputs `("out" "utils")) (inputs -- cgit v1.2.3 From 2a1267d3d7dbce9bf2c16ea5972eb7ee4717cf67 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 29 Sep 2018 11:58:59 -0400 Subject: gnu: isc-dhcp: Update bundled BIND to 9.11.4-P2. * gnu/packages/admin.scm (isc-dhcp)[inputs]: Update bundled BIND to 9.11.4-P2. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index ded7ce3b97..a0ab431ddd 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -613,7 +613,7 @@ connection alive.") (bind-minor-version "11") (bind-patch-version "4") (bind-release-type "-P") ; for patch release, use "-P" - (bind-release-version "1") ; for patch release, e.g. "6" + (bind-release-version "2") ; for patch release, e.g. "6" (bind-version (string-append bind-major-version "." bind-minor-version @@ -730,7 +730,7 @@ connection alive.") "/bind-" bind-version ".tar.gz")) (sha256 (base32 - "08zyy13b8ydfbg26b3y6mw299qs89ba90gymraqqjsgjicydrq5h")))) + "04fq17zksd2b3w6w6padps5n7b6s2lasxpksbhl4378h56vgfnm8")))) ;; When cross-compiling, we need the cross Coreutils and sed. ;; Otherwise just use those from %FINAL-INPUTS. -- cgit v1.2.3 From 44fa365e7774a31bc98adff4e87430a3d1e19e26 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 29 Sep 2018 15:55:23 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.159. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.159. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index cb8203da0b..dbe00b567f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -452,8 +452,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.158" - "1l3blfaw50a8l9bp735vzsmk1naq4l40qidza10dwkkrd2ip3n41" + (make-linux-libre "4.4.159" + "12wrhni1ikmakwv55cgzsznx9llzp82irsisbjjs7bc8z2hzwr6l" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From 63e98a4c416957e08bf3d267f52c780f4c6b84f2 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 29 Sep 2018 15:56:16 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.130. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.130. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index dbe00b567f..de13a36a36 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -446,8 +446,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.129" - "0y7p1xgbpn4nmr5pmqb58shr54lvryr5rxwm9m66knwzj332f3rh" + (make-linux-libre "4.9.130" + "1l3ra1pbgz0wbpp1ci90sj9x9iamvagx1vdbdfbmpjsgh1cfnpmq" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From 92011cbf7eb73469cae4478701ef3a1171841d52 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 29 Sep 2018 15:56:49 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.73. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.73. (%linux-libre-4.14-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index de13a36a36..042e7fd280 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -436,8 +436,8 @@ It has been modified to remove all non-free binary blobs.") #:patches %linux-libre-4.18-patches #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.72") -(define %linux-libre-4.14-hash "1ngz5p8mvga45y1n6hbw6niy0ji5mfl4vc3bxlckjg42dcp5qf64") +(define %linux-libre-4.14-version "4.14.73") +(define %linux-libre-4.14-hash "0s2aphqgasx0lnprb2hzaqgbcd5i9774gfyhz5a6sqj6dygr00xy") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.2.3 From e72ca4111fce4b05bf2a685e451f26e06680e36c Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 29 Sep 2018 15:58:27 -0400 Subject: gnu: linux-libre: Update to 4.18.11. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.18.11. (%linux-libre-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 042e7fd280..ec2520cdff 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -405,8 +405,8 @@ It has been modified to remove all non-free binary blobs.") ;; supports qemu "virt" machine and possibly a large number of ARM boards. ;; See : https://wiki.debian.org/DebianKernel/ARMMP. -(define %linux-libre-version "4.18.10") -(define %linux-libre-hash "1znc6kh3j8plmxail6hn2ss0r0fvbcp50s3xv5gxys7jc7k42znj") +(define %linux-libre-version "4.18.11") +(define %linux-libre-hash "1r4yf7gr7rf8igkg5jv781wa8vn6ii7fsdnffyshin1slnxbd79k") (define %linux-libre-4.18-patches (list %boot-logo-patch -- cgit v1.2.3 From 17bea1803cf706d8db053d8d73302a4455684d29 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 29 Sep 2018 21:18:45 -0400 Subject: Revert "services: Add Gitolite." This reverts commit 258a6d944ed891fa92fa87a16731e5dfe0bac477. --- gnu/services/version-control.scm | 179 +-------------------------------------- gnu/tests/version-control.scm | 114 +------------------------ 2 files changed, 2 insertions(+), 291 deletions(-) (limited to 'gnu') diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index cc8cd22021..58274c8bee 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -3,7 +3,6 @@ ;;; Copyright © 2016 Sou Bunnbu ;;; Copyright © 2017 Oleg Pykhalov ;;; Copyright © 2017 Clément Lassieur -;;; Copyright © 2018 Christopher Baines ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,23 +40,7 @@ git-http-configuration git-http-configuration? - git-http-nginx-location-configuration - - - gitolite-configuration - gitolite-configuration-package - gitolite-configuration-user - gitolite-configuration-rc-file - gitolite-configuration-admin-pubkey - - - gitolite-rc-file - gitolite-rc-file-umask - gitolite-rc-file-git-config-keys - gitolite-rc-file-roles - gitolite-rc-file-enable - - gitolite-service-type)) + git-http-nginx-location-configuration)) ;;; Commentary: ;;; @@ -214,163 +197,3 @@ access to exported repositories under @file{/srv/git}." "") (list "fastcgi_param GIT_PROJECT_ROOT " git-root ";") "fastcgi_param PATH_INFO $1;")))))) - - -;;; -;;; Gitolite -;;; - -(define-record-type* - gitolite-rc-file make-gitolite-rc-file - gitolite-rc-file? - (umask gitolite-rc-file-umask - (default #o0077)) - (git-config-keys gitolite-rc-file-git-config-keys - (default "")) - (roles gitolite-rc-file-roles - (default '(("READERS" . 1) - ("WRITERS" . 1)))) - (enable gitolite-rc-file-enable - (default '("help" - "desc" - "info" - "perms" - "writable" - "ssh-authkeys" - "git-config" - "daemon" - "gitweb")))) - -(define-gexp-compiler (gitolite-rc-file-compiler - (file ) system target) - (match file - (($ umask git-config-keys roles enable) - (apply text-file* "gitolite.rc" - `("%RC = (\n" - " UMASK => " ,(format #f "~4,'0o" umask) ",\n" - " GIT_CONFIG_KEYS => '" ,git-config-keys "',\n" - " ROLES => {\n" - ,@(map (match-lambda - ((role . value) - (simple-format #f " ~A => ~A,\n" role value))) - roles) - " },\n" - "\n" - " ENABLE => [\n" - ,@(map (lambda (value) - (simple-format #f " '~A',\n" value)) - enable) - " ],\n" - ");\n" - "\n" - "1;\n"))))) - -(define-record-type* - gitolite-configuration make-gitolite-configuration - gitolite-configuration? - (package gitolite-configuration-package - (default gitolite)) - (user gitolite-configuration-user - (default "git")) - (group gitolite-configuration-group - (default "git")) - (home-directory gitolite-configuration-home-directory - (default "/var/lib/gitolite")) - (rc-file gitolite-configuration-rc-file - (default (gitolite-rc-file))) - (admin-pubkey gitolite-configuration-admin-pubkey)) - -(define gitolite-accounts - (match-lambda - (($ package user group home-directory - rc-file admin-pubkey) - ;; User group and account to run Gitolite. - (list (user-group (name user) (system? #t)) - (user-account - (name user) - (group group) - (system? #t) - (comment "Gitolite user") - (home-directory home-directory)))))) - -(define gitolite-activation - (match-lambda - (($ package user group home - rc-file admin-pubkey) - #~(begin - (use-modules (ice-9 match) - (guix build utils)) - - (let* ((user-info (getpwnam #$user)) - (admin-pubkey #$admin-pubkey) - (pubkey-file (string-append - #$home "/" - (basename - (strip-store-file-name admin-pubkey))))) - - (simple-format #t "guix: gitolite: installing ~A\n" #$rc-file) - (copy-file #$rc-file #$(string-append home "/.gitolite.rc")) - - ;; The key must be writable, so copy it from the store - (copy-file admin-pubkey pubkey-file) - - (chmod pubkey-file #o500) - (chown pubkey-file - (passwd:uid user-info) - (passwd:gid user-info)) - - ;; Set the git configuration, to avoid gitolite trying to use - ;; the hostname command, as the network might not be up yet - (with-output-to-file #$(string-append home "/.gitconfig") - (lambda () - (display "[user] - name = GNU Guix - email = guix@localhost -"))) - ;; Run Gitolite setup, as this updates the hooks and include the - ;; admin pubkey if specified. The admin pubkey is required for - ;; initial setup, and will replace the previous key if run after - ;; initial setup - (match (primitive-fork) - (0 - ;; Exit with a non-zero status code if an exception is thrown. - (dynamic-wind - (const #t) - (lambda () - (setenv "HOME" (passwd:dir user-info)) - (setenv "USER" #$user) - (setgid (passwd:gid user-info)) - (setuid (passwd:uid user-info)) - (primitive-exit - (system* #$(file-append package "/bin/gitolite") - "setup" - "-m" "gitolite setup by GNU Guix" - "-pk" pubkey-file))) - (lambda () - (primitive-exit 1)))) - (pid (waitpid pid))) - - (when (file-exists? pubkey-file) - (delete-file pubkey-file))))))) - -(define gitolite-service-type - (service-type - (name 'gitolite) - (extensions - (list (service-extension activation-service-type - gitolite-activation) - (service-extension account-service-type - gitolite-accounts) - (service-extension profile-service-type - ;; The Gitolite package in Guix uses - ;; gitolite-shell in the authorized_keys file, so - ;; gitolite-shell needs to be on the PATH for - ;; gitolite to work. - (lambda (config) - (list - (gitolite-configuration-package config)))))) - (description - "Setup @command{gitolite}, a Git hosting tool providing access over SSH.. -By default, the @code{git} user is used, but this is configurable. -Additionally, Gitolite can integrate with with tools like gitweb or cgit to -provide a web interface to view selected repositories."))) diff --git a/gnu/tests/version-control.scm b/gnu/tests/version-control.scm index 4409b8a12b..3b935a1b48 100644 --- a/gnu/tests/version-control.scm +++ b/gnu/tests/version-control.scm @@ -2,7 +2,6 @@ ;;; Copyright © 2017, 2018 Oleg Pykhalov ;;; Copyright © 2017, 2018 Ludovic Courtès ;;; Copyright © 2017, 2018 Clément Lassieur -;;; Copyright © 2018 Christopher Baines ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,17 +27,14 @@ #:use-module (gnu services) #:use-module (gnu services version-control) #:use-module (gnu services cgit) - #:use-module (gnu services ssh) #:use-module (gnu services web) #:use-module (gnu services networking) #:use-module (gnu packages version-control) - #:use-module (gnu packages ssh) #:use-module (guix gexp) #:use-module (guix store) #:use-module (guix modules) #:export (%test-cgit - %test-git-http - %test-gitolite)) + %test-git-http)) (define README-contents "Hello! This is what goes inside the 'README' file.") @@ -304,111 +300,3 @@ HTTP-PORT." (name "git-http") (description "Connect to a running Git HTTP server.") (value (run-git-http-test)))) - - -;;; -;;; Gitolite. -;;; - -(define %gitolite-test-admin-keypair - (computed-file - "gitolite-test-admin-keypair" - (with-imported-modules (source-module-closure - '((guix build utils))) - #~(begin - (use-modules (ice-9 match) (srfi srfi-26) - (guix build utils)) - - (mkdir #$output) - (invoke #$(file-append openssh "/bin/ssh-keygen") - "-f" (string-append #$output "/test-admin") - "-t" "rsa" - "-q" - "-N" ""))))) - -(define %gitolite-os - (simple-operating-system - (dhcp-client-service) - (service openssh-service-type) - (service gitolite-service-type - (gitolite-configuration - (admin-pubkey - (file-append %gitolite-test-admin-keypair "/test-admin.pub")))))) - -(define (run-gitolite-test) - (define os - (marionette-operating-system - %gitolite-os - #:imported-modules '((gnu services herd) - (guix combinators)))) - - (define vm - (virtual-machine - (operating-system os) - (port-forwardings `((2222 . 22))))) - - (define test - (with-imported-modules '((gnu build marionette) - (guix build utils)) - #~(begin - (use-modules (srfi srfi-64) - (rnrs io ports) - (gnu build marionette) - (guix build utils)) - - (define marionette - (make-marionette (list #$vm))) - - (mkdir #$output) - (chdir #$output) - - (test-begin "gitolite") - - ;; Wait for sshd to be up and running. - (test-assert "service running" - (marionette-eval - '(begin - (use-modules (gnu services herd)) - (start-service 'ssh-daemon)) - marionette)) - - (display #$%gitolite-test-admin-keypair) - - (setenv "GIT_SSH_VARIANT" "ssh") - (setenv "GIT_SSH_COMMAND" - (string-join - '(#$(file-append openssh "/bin/ssh") - "-i" #$(file-append %gitolite-test-admin-keypair - "/test-admin") - "-o" "UserKnownHostsFile=/dev/null" - "-o" "StrictHostKeyChecking=no"))) - - (test-assert "cloning the admin repository" - (invoke #$(file-append git "/bin/git") - "clone" "-v" - "ssh://git@localhost:2222/gitolite-admin" - "/tmp/clone")) - - (test-assert "admin key exists" - (file-exists? "/tmp/clone/keydir/test-admin.pub")) - - (with-directory-excursion "/tmp/clone" - (invoke #$(file-append git "/bin/git") - "-c" "user.name=Guix" "-c" "user.email=guix" - "commit" - "-m" "Test commit" - "--allow-empty") - - (test-assert "pushing, and the associated hooks" - (invoke #$(file-append git "/bin/git") "push"))) - - (test-end) - (exit (= (test-runner-fail-count (test-runner-current)) 0))))) - - (gexp->derivation "gitolite" test)) - -(define %test-gitolite - (system-test - (name "gitolite") - (description "Clone the Gitolite admin repository.") - (value (run-gitolite-test)))) -- cgit v1.2.3 From 3b362c8a8366b55a172817d7c347098accd3d56b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 30 Sep 2018 13:37:06 +0300 Subject: gnu: mtools: Update to 4.0.19. * gnu/packages/mtools.scm (mtools): Update to 4.0.19. --- gnu/packages/mtools.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mtools.scm b/gnu/packages/mtools.scm index f49a035b41..e4750f579f 100644 --- a/gnu/packages/mtools.scm +++ b/gnu/packages/mtools.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2013 John Darrington ;;; Copyright © 2015 Ludovic Courtès ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,7 +28,7 @@ (define-public mtools (package (name "mtools") - (version "4.0.18") + (version "4.0.19") (source (origin (method url-fetch) @@ -35,7 +36,7 @@ version ".tar.gz")) (sha256 (base32 - "1hxciksv7av5ilnkvwbidyxxr1gzn24lr0mz9z8drkml7780im1h")))) + "003qnj4rs22v2sih3is55scvav8xq9p1dp5b7gnyl67a60ky516r")))) (build-system gnu-build-system) (home-page "https://www.gnu.org/software/mtools/") (synopsis "Access MS-DOS disks without mounting") -- cgit v1.2.3 From cebec8bd1ca3871dead210c2e8404e3f5cec8ab7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 30 Sep 2018 15:46:46 +0300 Subject: gnu: font-culmus: Update to 0.133. * gnu/packages/fonts.scm (font-culmus): Update to 0.133. --- gnu/packages/fonts.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 218b04baa1..6d4abc637b 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1210,7 +1210,7 @@ ExtraLight, Light, Book, Medium, Semibold, Bold & ExtraBold") (define-public font-culmus (package (name "font-culmus") - (version "0.132") + (version "0.133") (source (origin (method url-fetch) @@ -1219,7 +1219,7 @@ ExtraLight, Light, Book, Medium, Semibold, Bold & ExtraBold") version ".tar.gz")) (sha256 (base32 - "1djxalm26r7bcq33ckmfa15xfs6pmqzvcl64d5lqa1dl01bl4j4z")))) + "02akysgsqhi15cck54xcacm16q5raf4l7shgb8fnj7xr3c1pbfyp")))) (build-system font-build-system) (arguments `(#:phases -- cgit v1.2.3 From f2bc53af70eea7b7147b9e7e40280941866ed128 Mon Sep 17 00:00:00 2001 From: pimi Date: Sun, 30 Sep 2018 14:08:42 -0400 Subject: gnu: Add porechop. * gnu/packages/bioinformatics.scm (porechop): New variable. --- gnu/packages/bioinformatics.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index e74abf005f..b84498d042 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13869,3 +13869,33 @@ single-cell transcriptomic map of the human and mouse pancreas reveals inter- and intra-cell population structure.\" Baron et al. Cell Systems (2016) @url{https://www.ncbi.nlm.nih.gov/pubmed/27667365}.") (license license:gpl2+)))) + +(define-public porechop + ;; The recommended way to install is to clone the git repository + ;; https://github.com/rrwick/Porechop#installation + (let ((commit "289d5dca4a5fc327f97b3f8cecb68ecaf1014861") + (revision "1")) + (package + (name "porechop") + (version (git-version "0.2.3" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rrwick/Porechop.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "05ps43gig0d3ia9x5lj84lb00hbsl6ba9n7y7jz927npxbr2ym23")))) + (build-system python-build-system) + (home-page "https://github.com/rrwick/porechop") + (synopsis "Finding, trimming or splitting adapters, in Oxford Nanopore reads") + (description + "The porechop package is a tool for finding and removing adapters from Oxford +Nanopore reads. Adapters on the ends of reads are trimmed off, and when a read +has an adapter in its middle, it is treated as chimeric and chopped into +separate reads. Porechop performs thorough alignments to effectively find +adapters, even at low sequence identity. Porechop also supports demultiplexing +of Nanopore reads that were barcoded with the Native Barcoding Kit, PCR +Barcoding Kit or Rapid Barcoding Kit.") + (license license:gpl3+)))) -- cgit v1.2.3 From 0e2d3ce20e7bd71aaad5baa6b977b9684216b66e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 30 Sep 2018 21:12:06 +0200 Subject: gnu: sshuttle: Rely on $PATH to find a POSIX sh. This fixes a regression introduced in commit c32863e094d3489d2e08ccb3188988d7c6410976, where the sshuttle client will try to invoke its own /gnu/store/.../bin/sh on the server. Rely on $PATH instead of regressing to upstream's hard-coded /bin/sh. * gnu/packages/vpn.scm (sshuttle)[arguments]: SUBSTITUTE* "sh" for "/bin/sh". --- gnu/packages/vpn.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index de5df5039d..9b1f26aa7d 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -355,8 +355,7 @@ private network between hosts on the internet.") (substitute* "sshuttle/client.py" (("/usr/bin/env") (which "env"))) (substitute* "sshuttle/ssh.py" - ;; Perhaps this is unreachable, but don't let's take risks. - (("/bin/sh") (which "sh"))) + (("/bin/sh") "sh")) #t))))) (native-inputs `(("python-setuptools-scm" ,python-setuptools-scm) -- cgit v1.2.3 From dde15fea25b86c75512f204de91bb0c82a152967 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sat, 1 Sep 2018 14:10:20 -0400 Subject: gnu: ghc: Use GHC 8.4.3 as the default GHC. * gnu/packages/haskell.scm (ghc): Switch to ghc-8. --- gnu/packages/haskell.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 6b774c358a..1e7a502d8f 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -559,7 +559,7 @@ interactive environment for the functional language Haskell.") (file-pattern ".*\\.conf\\.d$") (file-type 'directory)))))) -(define-public ghc ghc-8.0) +(define-public ghc ghc-8) (define-public ghc-hostname (package -- cgit v1.2.3 From f54f04756f6d90c9fb3b5e45f3947329287f9b05 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 17:08:08 -0400 Subject: gnu: ghc-mtl: Remove built-in Haskell package. * gnu/packages/agda.scm (agda)[inputs]: Remove ghc-mtl. * gnu/packages/games.scm (raincat)[inputs]: Remove ghc-mtl. * gnu/packages/haskell-check.scm (ghc-tasty-ant-xml, ghc-tasty-golden, ghc-tasty, ghc-tasty-kat, ghc-tasty-rerun, ghc-crypto-cipher-tests)[inputs]: Remove ghc-mtl. * gnu/packages/haskell-crypto.scm (ghc-asn1-encoding, ghc-pem, ghc-x509, ghc-x509-store, ghc-x509-validation, ghc-x509-system)[inputs]: Remove ghc-mtl. * gnu/packages/haskell-web.scm (ghc-http, ghc-http-conduit, ghc-yesod-core)[inputs]: Remove ghc-mtl. * gnu/packages/haskell.scm (ghc-convertible, ghc-libxml, ghc-cgi, ghc-happy, ghc-haskell-src-exts, ghc-resourcet, cabal-install, ghc-indents, ghc-regex-base, ghc-regex-tdfa-rc, ghc-trifecta, ghc-zip-archive, ghc-logict, ghc-exceptions, ghc-smallcheck, ghc-syb, ghc-fgl, ghc-chasingbottoms, ghc-parsec, ghc-megaparsec, ghc-edisonapi, ghc-edisoncore, ghc-mmorph, ghc-ifelse, ghc-kan-extensions, ghc-lens, ghc-cheapskate, ghc-free, ghc-adjunctions, ghc-equivalence, ghc-texmath, ghc-texmath-for-pandoc-1, ghc-highlighting-kate, ghc-th-reify-many, ghc-th-orphans, ghc-geniplate-mirror, ghc-conduit, ghc-filemanip, ghc-juicypixels, ghc-hslua, ghc-hourglass, ghc-skylighting, ghc-skylighting-for-pandoc-1, ghc-pandoc, ghc-pandoc-1, ghc-pandoc-citeproc, ghc-regex-tdfa, ghc-stmonadtrans, ghc-constraints, ghc-lifted-async, ghc-shelly, ghc-hslogger, ghc-json, shellcheck, ghc-vector-algorithms, ghc-monad-par-extras, ghc-monad-par, ghc-monadrandom, ghc-either, ghc-rebase, ghc-aws, ghc-monad-logger, ghc-persistent, ghc-bytes, ghc-missingh, ghc-operational, ghc-chart)[inputs]: Remove ghc-mtl. (ghc-conduit-combinators)[native-inputs]: Remove ghc-mtl. (ghc-mtl): Remove variable. * gnu/packages/idris.scm (idris)[inputs]: Remove ghc-mtl. * gnu/packages/tls.scm (ghc-tls)[inputs]: Remove ghc-mtl. * gnu/packages/version-control.scm (darcs, git-annex)[inputs]: Remove ghc-mtl. * gnu/packages/wm.scm (xmonad, ghc-xmonad-contrib)[inputs]: Remove ghc-mtl. * gnu/packages/xml.scm (ghc-hxt)[inputs]: Remove ghc-mtl. --- gnu/packages/agda.scm | 1 - gnu/packages/games.scm | 1 - gnu/packages/haskell-check.scm | 8 +- gnu/packages/haskell-crypto.scm | 14 +--- gnu/packages/haskell-web.scm | 3 - gnu/packages/haskell.scm | 154 +++++++-------------------------------- gnu/packages/idris.scm | 1 - gnu/packages/tls.scm | 3 +- gnu/packages/version-control.scm | 2 - gnu/packages/wm.scm | 4 +- gnu/packages/xml.scm | 1 - 11 files changed, 33 insertions(+), 159 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/agda.scm b/gnu/packages/agda.scm index df4968c445..572de5bbeb 100644 --- a/gnu/packages/agda.scm +++ b/gnu/packages/agda.scm @@ -58,7 +58,6 @@ ("ghc-hashtables" ,ghc-hashtables) ("ghc-ieee754" ,ghc-ieee754) ("ghc-monadplus" ,ghc-monadplus) - ("ghc-mtl" ,ghc-mtl) ("ghc-murmur-hash" ,ghc-murmur-hash) ("ghc-uri-encode" ,ghc-uri-encode) ("ghc-parallel" ,ghc-parallel) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 8be87f6f55..8155876313 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2136,7 +2136,6 @@ on the screen and keyboard to display letters.") (build-system haskell-build-system) (inputs `(("ghc-extensible-exceptions" ,ghc-extensible-exceptions) - ("ghc-mtl" ,ghc-mtl) ("ghc-random" ,ghc-random) ("ghc-glut" ,ghc-glut) ("freeglut" ,freeglut) diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 31407ca259..4324c9c44d 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -54,7 +54,6 @@ (inputs `(("ghc-generic-deriving" ,ghc-generic-deriving) ("ghc-xml" ,ghc-xml) - ("ghc-mtl" ,ghc-mtl) ("ghc-stm" ,ghc-stm) ("ghc-tagged" ,ghc-tagged) ("ghc-tasty" ,ghc-tasty))) @@ -140,7 +139,6 @@ Haskell test framework.") (inputs `(("ghc-temporary" ,ghc-temporary) ("ghc-tasty" ,ghc-tasty) - ("ghc-mtl" ,ghc-mtl) ("ghc-optparse-applicative" ,ghc-optparse-applicative) ("ghc-tagged" ,ghc-tagged) ("ghc-async" ,ghc-async) @@ -197,7 +195,6 @@ timer functions of different operating systems via a unified API.") (build-system haskell-build-system) (inputs `(("ghc-stm" ,ghc-stm) - ("ghc-mtl" ,ghc-mtl) ("ghc-tagged" ,ghc-tagged) ("ghc-regex-tdfa" ,ghc-regex-tdfa) ("ghc-regex-tdfa-rc" ,ghc-regex-tdfa-rc) @@ -250,7 +247,6 @@ test framework.") (build-system haskell-build-system) (inputs `(("ghc-tasty" ,ghc-tasty) - ("ghc-mtl" ,ghc-mtl) ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) ("ghc-tasty-hunit" ,ghc-tasty-hunit))) (home-page "https://github.com/vincenthz/tasty-kat") @@ -299,8 +295,7 @@ test-framework.") "0yg8cicfn3qaazvp4rbanzy3dyk95k3y1kkd4bykvkl9v4076788")))) (build-system haskell-build-system) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-optparse-applicative" ,ghc-optparse-applicative) + `(("ghc-optparse-applicative" ,ghc-optparse-applicative) ("ghc-reducers" ,ghc-reducers) ("ghc-split" ,ghc-split) ("ghc-stm" ,ghc-stm) @@ -827,7 +822,6 @@ minimal dependencies.") "19wqignlq90qwpam01hnmmrxaxh5lkax9l1l6rlbi4a07nvp1dnz")))) (build-system haskell-build-system) (inputs `(("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-mtl" ,ghc-mtl) ("ghc-hunit" ,ghc-hunit) ("ghc-test-framework" ,ghc-test-framework) ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2) diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index b0be30cb6b..1326de0923 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -70,8 +70,7 @@ format.") (inputs `(("ghc-hourglass" ,ghc-hourglass) ("ghc-asn1-types" ,ghc-asn1-types) - ("ghc-text" ,ghc-text) - ("ghc-mtl" ,ghc-mtl))) + ("ghc-text" ,ghc-text))) (native-inputs `(("ghc-tasty" ,ghc-tasty) ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) @@ -345,8 +344,7 @@ to obtain cryptographically strong entropy.") "162sk5sg22w21wqz5qv8kx6ibxp99v5p20g3nknhm1kddk3hha1p")))) (build-system haskell-build-system) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-base64-bytestring" ,ghc-base64-bytestring))) + `(("ghc-base64-bytestring" ,ghc-base64-bytestring))) (native-inputs `(("ghc-test-framework" ,ghc-test-framework) ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2) @@ -431,7 +429,6 @@ libraries, like OpenSSL.") (build-system haskell-build-system) (inputs `(("ghc-memory" ,ghc-memory) - ("ghc-mtl" ,ghc-mtl) ("ghc-hourglass" ,ghc-hourglass) ("ghc-pem" ,ghc-pem) ("ghc-asn1-types" ,ghc-asn1-types) @@ -461,8 +458,7 @@ libraries, like OpenSSL.") "0yw09nwkvr324qz4sc27c0p28bz2h6gns6lkaz9mz92mgqf2dza9")))) (build-system haskell-build-system) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-pem" ,ghc-pem) + `(("ghc-pem" ,ghc-pem) ("ghc-asn1-types" ,ghc-asn1-types) ("ghc-asn1-encoding" ,ghc-asn1-encoding) ("ghc-cryptonite" ,ghc-cryptonite) @@ -490,7 +486,6 @@ collections, certificates, revocation lists, and exception lists.") (inputs `(("ghc-memory" ,ghc-memory) ("ghc-byteable" ,ghc-byteable) - ("ghc-mtl" ,ghc-mtl) ("ghc-hourglass" ,ghc-hourglass) ("ghc-data-default-class" ,ghc-data-default-class) ("ghc-pem" ,ghc-pem) @@ -520,8 +515,7 @@ list validation.") "0k7zc0xp7r6kqmi39rpiicvq78xb0pr2cq6q5s3kmmsshllg13nr")))) (build-system haskell-build-system) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-pem" ,ghc-pem) + `(("ghc-pem" ,ghc-pem) ("ghc-x509" ,ghc-x509) ("ghc-x509-store" ,ghc-x509-store))) (home-page "https://github.com/vincenthz/hs-certificate") diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index a043ffcc0d..9ef9486b3f 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -171,7 +171,6 @@ both client and server code).") ("ghc-old-time" ,ghc-old-time) ("ghc-parsec" ,ghc-parsec) ("ghc-puremd5" ,ghc-puremd5) - ("ghc-mtl" ,ghc-mtl) ("ghc-network" ,ghc-network) ("ghc-network-uri" ,ghc-network-uri) ("ghc-split" ,ghc-split))) @@ -350,7 +349,6 @@ and HPACK. Currently HTTP/2 16 framing and HPACK 10 is supported.") ("ghc-http-client" ,ghc-http-client) ("ghc-http-client-tls" ,ghc-http-client-tls) ("ghc-monad-control" ,ghc-monad-control) - ("ghc-mtl" ,ghc-mtl) ("ghc-exceptions" ,ghc-exceptions) ("ghc-unliftio" ,ghc-unliftio))) (native-inputs @@ -1039,7 +1037,6 @@ avoid any issues with characters.") ("ghc-text" ,ghc-text) ("ghc-shakespeare" ,ghc-shakespeare) ("ghc-blaze-builder" ,ghc-blaze-builder) - ("ghc-mtl" ,ghc-mtl) ("ghc-clientsession" ,ghc-clientsession) ("ghc-random" ,ghc-random) ("ghc-cereal" ,ghc-cereal) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 1e7a502d8f..95e89a3b06 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -596,7 +596,6 @@ determine the hostname.") (inputs `(("ghc-old-time" ,ghc-old-time) ("ghc-old-locale" ,ghc-old-locale) - ("ghc-mtl" ,ghc-mtl) ("ghc-text" ,ghc-text))) (home-page "https://hackage.haskell.org/package/convertible") (synopsis "Typeclasses and instances for converting between types") @@ -649,8 +648,7 @@ between double precision floating point and text.") "01zvk86kg726lf2vnlr7dxiz7g3xwi5a4ak9gcfbwyhynkzjmsfi")))) (build-system haskell-build-system) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("libxml2" ,libxml2))) + `(("libxml2" ,libxml2))) (arguments `(#:configure-flags `(,(string-append "--extra-include-dirs=" @@ -1041,8 +1039,7 @@ tool lex or flex for C/C++.") ("ghc-exceptions" ,ghc-exceptions) ("ghc-multipart" ,ghc-multipart) ("ghc-network-uri" ,ghc-network-uri) - ("ghc-network" ,ghc-network) - ("ghc-mtl" ,ghc-mtl))) + ("ghc-network" ,ghc-network))) (native-inputs `(("ghc-doctest" ,ghc-doctest) ("ghc-quickcheck" ,ghc-quickcheck))) @@ -1111,8 +1108,6 @@ postfix notation. For more information on stack based languages, see (base32 "186ky3bly0i3cc56qk3r7j7pxh2108aackq4n2lli7jmbnb3kxsd")))) (build-system haskell-build-system) - (inputs - `(("ghc-mtl" ,ghc-mtl))) (home-page "https://hackage.haskell.org/package/happy") (synopsis "Parser generator for Haskell") (description "Happy is a parser generator for Haskell. Given a grammar @@ -1199,7 +1194,6 @@ examination.") (inputs `(("cpphs" ,cpphs) ("ghc-happy" ,ghc-happy) - ("ghc-mtl" ,ghc-mtl) ("ghc-pretty-show" ,ghc-pretty-show-for-haskell-src-exts))) (native-inputs `(("ghc-smallcheck" ,ghc-smallcheck) @@ -1317,7 +1311,6 @@ unwanted suggestions, and to add your own custom suggestions.") `(("ghc-transformers-base" ,ghc-transformers-base) ("ghc-monad-control" ,ghc-monad-control) ("ghc-transformers-compat" ,ghc-transformers-compat) - ("ghc-mtl" ,ghc-mtl) ("ghc-mmorph" ,ghc-mmorph) ("ghc-exceptions" ,ghc-exceptions) ("ghc-unliftio-core" ,ghc-unliftio-core))) @@ -1812,7 +1805,6 @@ versions of GHC (i.e., < 6.10).") (build-system haskell-build-system) (inputs `(("ghc-http" ,ghc-http) - ("ghc-mtl" ,ghc-mtl) ("ghc-network-uri" ,ghc-network-uri) ("ghc-network" ,ghc-network) ("ghc-random" ,ghc-random) @@ -1848,37 +1840,6 @@ configuration. This library provides the common bits for writing custom @file{Setup.hs} files.") (license license:bsd-3))) -(define-public ghc-mtl - (package - (name "ghc-mtl") - (version "2.2.1") - (outputs '("out" "doc")) - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/mtl/mtl-" - version - ".tar.gz")) - (sha256 - (base32 - "1icdbj2rshzn0m1zz5wa7v3xvkf6qw811p4s7jgqwvx1ydwrvrfa")))) - (build-system haskell-build-system) - ;; This is an official revision, relaxing the requirement transformers == - ;; 0.4 to transformers >= 0.4 && < 0.6; see - ;; https://hackage.haskell.org/package/mtl-2.2.1/revision/1.cabal - (arguments - `(#:configure-flags (list "--allow-newer=transformers"))) - (home-page "https://github.com/ekmett/mtl") - (synopsis - "Monad classes, using functional dependencies") - (description "Monad classes using functional dependencies, with instances -for various monad transformers, inspired by the paper 'Functional Programming -with Overloading and Higher-Order Polymorphism', by Mark P Jones, in 'Advanced -School of Functional Programming', 1995. See -@uref{https://web.cecs.pdx.edu/~mpj/pubs/springschool.html, the paper}.") - (license license:bsd-3))) - (define-public ghc-parsec-numbers (package (name "ghc-parsec-numbers") @@ -2535,8 +2496,7 @@ isn't available, portable implementations are used.") (build-system haskell-build-system) (inputs `(("ghc-parsec" ,ghc-parsec) - ("ghc-concatenative" ,ghc-concatenative) - ("ghc-mtl" ,ghc-mtl))) + ("ghc-concatenative" ,ghc-concatenative))) (home-page "http://patch-tag.com/r/salazar/indents") (synopsis "Indentation sensitive parser-combinators for parsec") (description @@ -2611,8 +2571,6 @@ supported systems.") (base32 "0y1j4h2pg12c853nzmczs263di7xkkmlnsq5dlp5wgbgl49mgp10")))) (build-system haskell-build-system) - (inputs - `(("ghc-mtl" ,ghc-mtl))) (home-page "https://sourceforge.net/projects/lazy-regex") (synopsis "Replaces/Enhances Text.Regex") @@ -2684,8 +2642,7 @@ Haskell library @code{regex-base}.") (build-system haskell-build-system) (inputs `(("ghc-regex-base" ,ghc-regex-base) - ("ghc-parsec" ,ghc-parsec) - ("ghc-mtl" ,ghc-mtl))) + ("ghc-parsec" ,ghc-parsec))) (home-page "https://hackage.haskell.org/package/regex-tdfa") (synopsis "Tagged DFA regex engine for Haskell") @@ -2815,7 +2772,6 @@ the parsers provided by @code{parsec}, @code{attoparsec} and @code{base}'s ("ghc-fingertree" ,ghc-fingertree) ("ghc-hashable" ,ghc-hashable) ("ghc-lens" ,ghc-lens) - ("ghc-mtl" ,ghc-mtl) ("ghc-parsers" ,ghc-parsers) ("ghc-profunctors" ,ghc-profunctors) ("ghc-quickcheck" ,ghc-quickcheck) @@ -2904,7 +2860,6 @@ complicated text/binary file formats.") `(("ghc-old-time" ,ghc-old-time) ("ghc-digest" ,ghc-digest) ("zip" ,zip) - ("ghc-mtl" ,ghc-mtl) ("ghc-temporary" ,ghc-temporary) ("ghc-text" ,ghc-text) ("ghc-zlib" ,ghc-zlib))) @@ -3249,7 +3204,6 @@ syntax and semantics as Perl 5.") (base32 "07hnirv6snnym2r7iijlfz00b60jpy2856zvqxh989q0in7bd0hi")))) (build-system haskell-build-system) - (inputs `(("ghc-mtl" ,ghc-mtl))) (home-page "http://code.haskell.org/~dolio/") (synopsis "Backtracking logic-programming monad") (description "This library provides a continuation-based, backtracking, @@ -3332,7 +3286,6 @@ consuming feeds in both RSS (Really Simple Syndication) and Atom format.") ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) (inputs `(("ghc-stm" ,ghc-stm) - ("ghc-mtl" ,ghc-mtl) ("ghc-transformers-compat" ,ghc-transformers-compat))) (home-page "https://github.com/ekmett/exceptions/") (synopsis "Extensible optionally-pure exceptions") @@ -3410,8 +3363,7 @@ This is a better maintained fork of the \"temporary\" package.") "195fj7w3v03d1y1nm2ylavzrwxjcdbq0lb6zsw1dwyx5jmwfc84h")))) (build-system haskell-build-system) (inputs - `(("ghc-logict" ,ghc-logict) - ("ghc-mtl" ,ghc-mtl))) + `(("ghc-logict" ,ghc-logict))) (home-page "https://github.com/feuerbach/smallcheck") (synopsis "Property-based testing library") @@ -3495,8 +3447,7 @@ to cases.") "1p3cnqjm13677r4a966zffzhi9b3a321aln8zs8ckqj0d9z1z3d3")))) (build-system haskell-build-system) (inputs - `(("ghc-hunit" ,ghc-hunit) - ("ghc-mtl" ,ghc-mtl))) + `(("ghc-hunit" ,ghc-hunit))) (home-page "http://www.cs.uu.nl/wiki/GenericProgramming/SYB") (synopsis "Scrap Your Boilerplate") @@ -3528,8 +3479,7 @@ variety of traversals.") `(#:configure-flags (list "--allow-newer=QuickCheck" "--allow-newer=hspec"))) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-hspec" ,ghc-hspec) + `(("ghc-hspec" ,ghc-hspec) ("ghc-quickcheck" ,ghc-quickcheck))) (home-page "https://web.engr.oregonstate.edu/~erwig/fgl/haskell") (synopsis @@ -3554,8 +3504,7 @@ encourages inductive, recursive definitions of graph algorithms.") "04jwwjs22mqc4hvpp4c3gpb79inrrq5sapks5khknspv2hslm61q")))) (build-system haskell-build-system) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-quickcheck" ,ghc-quickcheck) + `(("ghc-quickcheck" ,ghc-quickcheck) ("ghc-random" ,ghc-random) ("ghc-syb" ,ghc-syb))) (home-page "https://hackage.haskell.org/package/ChasingBottoms") @@ -3764,8 +3713,7 @@ mainstream languages.") (native-inputs `(("ghc-hunit" ,ghc-hunit))) (inputs - `(("ghc-text" ,ghc-text) - ("ghc-mtl" ,ghc-mtl))) + `(("ghc-text" ,ghc-text))) (arguments `(#:tests? #f)) ; FIXME: currently missing libraries used for tests. (home-page @@ -3814,7 +3762,6 @@ combinators.") (build-system haskell-build-system) (inputs `(("ghc-case-insensitive" ,ghc-case-insensitive) - ("ghc-mtl" ,ghc-mtl) ("ghc-parser-combinators" ,ghc-parser-combinators) ("ghc-scientific" ,ghc-scientific) ("ghc-text" ,ghc-text))) @@ -4043,7 +3990,6 @@ representing a store for a single element.") (sha256 (base32 "0vmmlsj8ggbpwx6fkf5fvb6jp0zpx6iba6b28m80lllr2p8bi8wm")))) (build-system haskell-build-system) - (inputs `(("ghc-mtl" ,ghc-mtl))) (home-page "http://rwd.rdockins.name/edison/home/") (synopsis "Library of efficient, purely-functional data structures (API)") (description @@ -4069,8 +4015,7 @@ finite maps and priority queues where the priority and element are distinct.") (base32 "06shxmcqxcahcn6zgl64vlqix4fnq53d97drcgsh94qp7gp201ry")))) (build-system haskell-build-system) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-quickcheck" ,ghc-quickcheck) + `(("ghc-quickcheck" ,ghc-quickcheck) ("ghc-edisonapi" ,ghc-edisonapi))) (home-page "http://rwd.rdockins.name/edison/home/") (synopsis "Library of efficient, purely-functional data structures") @@ -4096,8 +4041,7 @@ with various performance characteristics.") "1i8dzrc5qi3ryc9vrrmpn3sihmramsbhhd592w4w2k5g26qr3hql")))) (build-system haskell-build-system) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-transformers-compat" ,ghc-transformers-compat))) + `(("ghc-transformers-compat" ,ghc-transformers-compat))) (home-page "https://hackage.haskell.org/package/mmorph") (synopsis "Monad morphisms") (description @@ -4118,7 +4062,6 @@ manipulating monad transformer stacks.") (base32 "1kfx1bwfjczj93a8yqz1n8snqiq5655qgzwv1lrycry8wb1vzlwa")))) (build-system haskell-build-system) - (inputs `(("ghc-mtl" ,ghc-mtl))) (home-page "http://hackage.haskell.org/package/IfElse") (synopsis "Monadic control flow with anaphoric variants") (description "This library provides functions for control flow inside of @@ -4638,7 +4581,6 @@ given term should not exist.") ("ghc-contravariant" ,ghc-contravariant) ("ghc-distributive" ,ghc-distributive) ("ghc-free" ,ghc-free) - ("ghc-mtl" ,ghc-mtl) ("ghc-semigroupoids" ,ghc-semigroupoids) ("ghc-tagged" ,ghc-tagged))) (home-page "https://github.com/ekmett/kan-extensions/") @@ -4728,7 +4670,6 @@ in the @code{IO} monad, like @code{IORef}s or parts of the OpenGL state.") ("ghc-comonad" ,ghc-comonad) ("ghc-contravariant" ,ghc-contravariant) ("ghc-hashable" ,ghc-hashable) - ("ghc-mtl" ,ghc-mtl) ("ghc-profunctors" ,ghc-profunctors) ("ghc-semigroups" ,ghc-semigroups) ("ghc-tagged" ,ghc-tagged) @@ -4772,8 +4713,7 @@ indexed variants.") "1hiqi7h76shjzs2zj0j8g6wnq2hbiq1hmfafdazr97fba2zl2432")))) (build-system haskell-build-system) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-text" ,ghc-text) + `(("ghc-text" ,ghc-text) ("ghc-blaze-html" ,ghc-blaze-html) ("ghc-xss-sanitize" ,ghc-xss-sanitize) ("ghc-data-default" ,ghc-data-default) @@ -4936,7 +4876,6 @@ semigroup.") ("ghc-bifunctors" ,ghc-bifunctors) ("ghc-comonad" ,ghc-comonad) ("ghc-distributive" ,ghc-distributive) - ("ghc-mtl" ,ghc-mtl) ("ghc-semigroupoids" ,ghc-semigroupoids) ("ghc-semigroups" ,ghc-semigroups))) (home-page "https://github.com/ekmett/free/") @@ -4971,7 +4910,6 @@ definition of @code{Monad}.") ("ghc-contravariant" ,ghc-contravariant) ("ghc-distributive" ,ghc-distributive) ("ghc-free" ,ghc-free) - ("ghc-mtl" ,ghc-mtl) ("ghc-tagged" ,ghc-tagged) ("ghc-semigroupoids" ,ghc-semigroupoids) ("ghc-semigroups" ,ghc-semigroups) @@ -4995,8 +4933,7 @@ for Haskell.") (base32 "0a85bdyyvjqs5z4kfhhf758210k9gi9dv42ik66a3jl0z7aix8kx")))) (build-system haskell-build-system) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-stmonadtrans" ,ghc-stmonadtrans) + `(("ghc-stmonadtrans" ,ghc-stmonadtrans) ("ghc-transformers-compat" ,ghc-transformers-compat) ("ghc-quickcheck" ,ghc-quickcheck) ("ghc-test-framework" ,ghc-test-framework) @@ -5393,7 +5330,6 @@ building up, manipulating and serialising @code{Pandoc} structures.") ("ghc-utf8-string" ,ghc-utf8-string) ("ghc-xml" ,ghc-xml) ("ghc-parsec" ,ghc-parsec) - ("ghc-mtl" ,ghc-mtl) ("ghc-pandoc-types" ,ghc-pandoc-types))) (home-page "https://github.com/jgm/texmath") (synopsis "Conversion between formats used to represent mathematics") @@ -5417,8 +5353,7 @@ it can parse and apply LaTeX macros.") (base32 "129q33m56diiv35kdwfb07838wrg0mm88kxdqxfyl1zvf9nzkqkd")))) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-network-uri" ,ghc-network-uri) + `(("ghc-network-uri" ,ghc-network-uri) ("ghc-pandoc-types" ,ghc-pandoc-types-for-pandoc-1) ("ghc-parsec" ,ghc-parsec) ("ghc-split" ,ghc-split) @@ -5492,8 +5427,7 @@ and utilities for pretty printing.") (native-inputs `(("ghc-parsec" ,ghc-parsec) ("ghc-blaze-html" ,ghc-blaze-html) - ("ghc-utf8-string" ,ghc-utf8-string) - ("ghc-mtl" ,ghc-mtl))) + ("ghc-utf8-string" ,ghc-utf8-string))) (home-page "https://github.com/jgm/highlighting-kate") (synopsis "Syntax highlighting library") (description @@ -5747,8 +5681,7 @@ instances. This package provides orphan instances for @code{containers}, "1b76zjxkj0v0n8zj9l0nwav2irm0c43rx6qjihfw8klmmxvx59df")))) (build-system haskell-build-system) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-safe" ,ghc-safe) + `(("ghc-safe" ,ghc-safe) ("ghc-th-expand-syns" ,ghc-th-expand-syns))) (home-page "https://github.com/mgsloan/th-reify-many") (synopsis "Recurseively reify template haskell datatype info") @@ -5775,7 +5708,6 @@ function which generates instances.") `(("ghc-th-lift" ,ghc-th-lift) ("ghc-th-lift-instances" ,ghc-th-lift-instances) ("ghc-th-reify-many" ,ghc-th-reify-many) - ("ghc-mtl" ,ghc-mtl) ("ghc-generic-deriving" ,ghc-generic-deriving))) (native-inputs `(("ghc-hspec" ,ghc-hspec))) @@ -5801,7 +5733,6 @@ package, and that's where the version number started.") (sha256 (base32 "17vjps2118s5z3k39ij00lkmkxv3mqf8h59wv6qdamlgmhyr36si")))) (build-system haskell-build-system) - (inputs `(("ghc-mtl" ,ghc-mtl))) (home-page "https://github.com/danr/geniplate") (synopsis "Use Template Haskell to generate Uniplate-like functions") (description @@ -5877,7 +5808,6 @@ template-haskell abstract syntax.") ("ghc-lifted-base" ,ghc-lifted-base) ("ghc-mono-traversable" ,ghc-mono-traversable) ("ghc-mmorph" ,ghc-mmorph) - ("ghc-mtl" ,ghc-mtl) ("ghc-resourcet" ,ghc-resourcet) ("ghc-silently" ,ghc-silently) ("ghc-transformers-base" ,ghc-transformers-base) @@ -6003,8 +5933,7 @@ back-ends.") "0ilqr8jv41zxcj5qyicg29m8s30b9v70x6f9h2h2rw5ap8bxldl8")))) (build-system haskell-build-system) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-unix-compat" ,ghc-unix-compat))) + `(("ghc-unix-compat" ,ghc-unix-compat))) (home-page "https://github.com/bos/filemanip") (synopsis "File and directory manipulation for Haskell") (description @@ -6048,8 +5977,7 @@ do on-demand loading.") "14s57fgf6kd5n5al2kcvk1aaxbq1ph0r5h8blflrjkx83yl6r8yn")))) (build-system haskell-build-system) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-zlib" ,ghc-zlib) + `(("ghc-zlib" ,ghc-zlib) ("ghc-vector" ,ghc-vector) ("ghc-primitive" ,ghc-primitive) ("ghc-mmap" ,ghc-mmap))) @@ -6078,7 +6006,6 @@ TIFF and GIF formats.") `(("lua" ,lua) ("ghc-exceptions" ,ghc-exceptions) ("ghc-fail" ,ghc-fail) - ("ghc-mtl" ,ghc-mtl) ("ghc-text" ,ghc-text))) (native-inputs `(("ghc-tasty" ,ghc-tasty) @@ -6176,8 +6103,7 @@ wrapping a bytestring with stronger and more meaniful name.") "104d1yd84hclprg740nkz60vx589mnm094zriw6zczbgg8nkclym")))) (build-system haskell-build-system) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-old-locale" ,ghc-old-locale))) + `(("ghc-old-locale" ,ghc-old-locale))) (native-inputs `(("ghc-tasty" ,ghc-tasty) ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) @@ -6322,7 +6248,6 @@ the choice of SSL/TLS, and SOCKS.") ("ghc-colour" ,ghc-colour) ("ghc-diff" ,ghc-diff) ("ghc-hxt" ,ghc-hxt) - ("ghc-mtl" ,ghc-mtl) ("ghc-pretty-show" ,ghc-pretty-show) ("ghc-regex-pcre-builtin" ,ghc-regex-pcre-builtin) ("ghc-safe" ,ghc-safe) @@ -6388,7 +6313,6 @@ provided. Skylighting is intended to be the successor to highlighting-kate.") ("ghc-case-insensitive" ,ghc-case-insensitive) ("ghc-diff" ,ghc-diff) ("ghc-hxt" ,ghc-hxt) - ("ghc-mtl" ,ghc-mtl) ("ghc-pretty-show" ,ghc-pretty-show) ("ghc-regex-pcre-builtin" ,ghc-regex-pcre-builtin) ("ghc-safe" ,ghc-safe) @@ -6483,7 +6407,6 @@ provided. Skylighting is intended to be the successor to highlighting-kate.") ("ghc-http-client-tls" ,ghc-http-client-tls) ("ghc-http-types" ,ghc-http-types) ("ghc-juicypixels" ,ghc-juicypixels) - ("ghc-mtl" ,ghc-mtl) ("ghc-network" ,ghc-network) ("ghc-network-uri" ,ghc-network-uri) ("ghc-old-locale" ,ghc-old-locale) @@ -6560,7 +6483,6 @@ provided for those who need a drop-in replacement for Markdown.pl.") ("ghc-http-client-tls" ,ghc-http-client-tls) ("ghc-http-types" ,ghc-http-types) ("ghc-juicypixels" ,ghc-juicypixels) - ("ghc-mtl" ,ghc-mtl) ("ghc-network" ,ghc-network) ("ghc-network-uri" ,ghc-network-uri) ("ghc-old-time" ,ghc-old-time) @@ -6782,8 +6704,7 @@ the @code{conduit} package.") (add-after 'install 'post-install-check (assoc-ref %standard-phases 'check))))) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-pandoc-types" ,ghc-pandoc-types) + `(("ghc-pandoc-types" ,ghc-pandoc-types) ("ghc-pandoc" ,ghc-pandoc) ("ghc-tagsoup" ,ghc-tagsoup) ("ghc-aeson" ,ghc-aeson) @@ -6935,8 +6856,7 @@ regular expressions. Parsers can be built using Applicative interface.") "0f8x8wyr6m21g8dnxvnvalz5bsq37l125l6qhs0fscbvprsxc4nb")))) (build-system haskell-build-system) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-parsec" ,ghc-parsec) + `(("ghc-parsec" ,ghc-parsec) ("ghc-regex-base" ,ghc-regex-base))) (home-page "https://github.com/ChrisKuklewicz/regex-tdfa") (synopsis "POSIX extended regular expressions in Haskell.") @@ -7070,8 +6990,6 @@ an index.") (sha256 (base32 "1nr26fnmi5fdjc6d00w13kjhmfyvb5b837d0006w4dj0yxndaksp")))) (build-system haskell-build-system) - (inputs - `(("ghc-mtl" ,ghc-mtl))) (home-page "https://hackage.haskell.org/package/STMonadTrans") (synopsis "Monad transformer version of the ST monad") (description @@ -7288,7 +7206,6 @@ and edge labels with positional information, etc. (build-system haskell-build-system) (inputs `(("ghc-hashable" ,ghc-hashable) - ("ghc-mtl" ,ghc-mtl) ("ghc-transformers-compat" ,ghc-transformers-compat))) (home-page "https://github.com/ekmett/constraints/") (synopsis "Constraint manipulation") @@ -7319,7 +7236,6 @@ a vocabulary for working with them.") ("ghc-monad-control" ,ghc-monad-control) ("ghc-constraints" ,ghc-constraints) ("ghc-hunit" ,ghc-hunit) - ("ghc-mtl" ,ghc-mtl) ("ghc-tasty" ,ghc-tasty) ("ghc-tasty-hunit" ,ghc-tasty-hunit) ("ghc-tasty-th" ,ghc-tasty-th))) @@ -7408,8 +7324,7 @@ which can't be decoded in the current locale encoding.") "023fbvbqs5gdwm30j5517gbdcc7fvz0md70dgwgpypkskj3i926y")))) (build-system haskell-build-system) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-unix-compat" ,ghc-unix-compat) + `(("ghc-unix-compat" ,ghc-unix-compat) ("ghc-system-filepath-bootstrap" ,ghc-system-filepath-bootstrap) ("ghc-system-fileio-bootstrap" ,ghc-system-fileio-bootstrap) ("ghc-monad-control" ,ghc-monad-control) @@ -8102,8 +8017,7 @@ files in Haskell.") "0as5gvlh6pi2gflakp695qnlizyyp059dqrhvjl4gjxalja6xjnp")))) (build-system haskell-build-system) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-network" ,ghc-network) + `(("ghc-network" ,ghc-network) ("ghc-old-locale" ,ghc-old-locale))) (native-inputs `(("ghc-hunit" ,ghc-hunit))) @@ -8148,7 +8062,6 @@ handled safely, this is what you're left with.") (build-system haskell-build-system) (inputs `(("ghc-syb" ,ghc-syb) - ("ghc-mtl" ,ghc-mtl) ("ghc-text" ,ghc-text) ("ghc-parsec" ,ghc-parsec))) (home-page "https://hackage.haskell.org/package/json") @@ -8213,7 +8126,6 @@ generated SQL and optimize it for your backend.") (inputs `(("ghc-quickcheck" ,ghc-quickcheck) ("ghc-json" ,ghc-json) - ("ghc-mtl" ,ghc-mtl) ("ghc-parsec" ,ghc-parsec) ("ghc-regex-tdfa" ,ghc-regex-tdfa))) (home-page "https://github.com/koalaman/shellcheck") @@ -8546,7 +8458,6 @@ between 2 and 3 times faster than the Mersenne Twister.") #t))))) (inputs `(("ghc-vector" ,ghc-vector) - ("ghc-mtl" ,ghc-mtl) ("ghc-mwc-random" ,ghc-mwc-random))) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck))) @@ -8622,8 +8533,7 @@ module for more details.") (build-system haskell-build-system) (inputs `(("ghc-abstract-par" ,ghc-abstract-par) ("ghc-cereal" ,ghc-cereal) - ("ghc-random" ,ghc-random) - ("ghc-mtl" ,ghc-mtl))) + ("ghc-random" ,ghc-random))) (home-page "https://github.com/simonmar/monad-par") (synopsis "Combinators and extra features for Par monads for Haskell") (description "This Haskell package provides additional data structures, @@ -8685,8 +8595,7 @@ This package also includes a simple reference implementation based on ("ghc-abstract-deque" ,ghc-abstract-deque) ("ghc-monad-par-extras" ,ghc-monad-par-extras) ("ghc-mwc-random" ,ghc-mwc-random) - ("ghc-parallel" ,ghc-parallel) - ("ghc-mtl" ,ghc-mtl))) + ("ghc-parallel" ,ghc-parallel))) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck) ("ghc-hunit" ,ghc-hunit) ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) @@ -8879,7 +8788,6 @@ statically known size.") "1h1nhswrcmhy3mq6vd530p0df51fcnnf4csbwnljar7cf0mb2h6y")))) (build-system haskell-build-system) (inputs `(("ghc-transformers-compat" ,ghc-transformers-compat) - ("ghc-mtl" ,ghc-mtl) ("ghc-primitive" ,ghc-primitive) ("ghc-fail" ,ghc-fail) ("ghc-random" ,ghc-random))) @@ -8908,7 +8816,6 @@ which consume random values.") ("ghc-free" ,ghc-free) ("ghc-monad-control" ,ghc-monad-control) ("ghc-manodrandom" ,ghc-monadrandom) - ("ghc-mtl" ,ghc-mtl) ("ghc-mmorph" ,ghc-mmorph) ("ghc-profunctors" ,ghc-profunctors) ("ghc-semigroups" ,ghc-semigroups) @@ -9057,7 +8964,6 @@ parsing and printing @dfn{Universally Unique Identifiers} or UUIDs.") ("ghc-contravariant" ,ghc-contravariant) ("ghc-contravariant-extras" ,ghc-contravariant-extras) ("ghc-semigroups" ,ghc-semigroups) - ("ghc-mtl" ,ghc-mtl) ("ghc-either" ,ghc-either) ("ghc-fail" ,ghc-fail) ("ghc-base-prelude" ,ghc-base-prelude))) @@ -9219,7 +9125,6 @@ data structures as non-empty.") ("ghc-mono-traversable" ,ghc-mono-traversable))) (native-inputs `(("ghc-hspec" ,ghc-hspec) ("ghc-silently" ,ghc-silently) - ("ghc-mtl" ,ghc-mtl) ("ghc-safe" ,ghc-safe) ("ghc-quickcheck" ,ghc-quickcheck))) (home-page "https://github.com/snoyberg/mono-traversable") @@ -9258,7 +9163,6 @@ as well as a convenient Conduit module.") ("ghc-http-conduit" ,ghc-http-conduit) ("ghc-http-types" ,ghc-http-types) ("ghc-monad-control" ,ghc-monad-control) - ("ghc-mtl" ,ghc-mtl) ("ghc-network" ,ghc-network) ("ghc-old-locale" ,ghc-old-locale) ("ghc-safe" ,ghc-safe) @@ -9411,7 +9315,6 @@ operators for looping.") ("ghc-transformers-base" ,ghc-transformers-base) ("ghc-monad-control" ,ghc-monad-control) ("ghc-monad-loops" ,ghc-monad-loops) - ("ghc-mtl" ,ghc-mtl) ("ghc-blaze-builder" ,ghc-blaze-builder) ("ghc-exceptions" ,ghc-exceptions))) (home-page "https://github.com/kazu-yamamoto/logger") @@ -9652,7 +9555,6 @@ Haskell data types to and from HTTP API data.") ("ghc-blaze-html" ,ghc-blaze-html) ("ghc-blaze-markup" ,ghc-blaze-markup) ("ghc-silently" ,ghc-silently) - ("ghc-mtl" ,ghc-mtl) ("ghc-fast-logger" ,ghc-fast-logger) ("ghc-scientific" ,ghc-scientific) ("ghc-tagged" ,ghc-tagged))) @@ -9932,7 +9834,6 @@ address string against RFC 5322.") (inputs `(("ghc-cereal" ,ghc-cereal) ("cabal-doctest" ,cabal-doctest) ("ghc-doctest" ,ghc-doctest-0.13) - ("ghc-mtl" ,ghc-mtl) ("ghc-scientific" ,ghc-scientific) ("ghc-text" ,ghc-text) ("ghc-transformers-compat" ,ghc-transformers-compat) @@ -10032,7 +9933,6 @@ This package provides an orphan instance.") (inputs `(("ghc-network" ,ghc-network) ("ghc-parsec" ,ghc-parsec) - ("ghc-mtl" ,ghc-mtl) ("ghc-hunit" ,ghc-hunit) ("ghc-regex-compat" ,ghc-regex-compat) ("ghc-hslogger" ,ghc-hslogger) @@ -10088,8 +9988,7 @@ example code on the home page for a quick introduction.") "1x2abg2q9d26h1vzj40r6k7k3gqgappbs4g9d853vvg77837km4i")))) (build-system haskell-build-system) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-random" ,ghc-random))) + `(("ghc-random" ,ghc-random))) (home-page "http://wiki.haskell.org/Operational") (synopsis "Implementation of difficult monads made easy with operational semantics") (description @@ -10146,7 +10045,6 @@ tools are not needed to actually run Gtk2Hs programs.") (build-system haskell-build-system) (inputs `(("ghc-old-locale" ,ghc-old-locale) - ("ghc-mtl" ,ghc-mtl) ("ghc-lens" ,ghc-lens) ("ghc-colour" ,ghc-colour) ("ghc-data-default-class" ,ghc-data-default-class) diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm index 79f89d6f54..7f1af62c1f 100644 --- a/gnu/packages/idris.scm +++ b/gnu/packages/idris.scm @@ -106,7 +106,6 @@ ("ghc-fingertree" ,ghc-fingertree) ("ghc-fsnotify" ,ghc-fsnotify) ("ghc-ieee754" ,ghc-ieee754) - ("ghc-mtl" ,ghc-mtl) ("ghc-network" ,ghc-network) ("ghc-optparse-applicative" ,ghc-optparse-applicative) ("ghc-regex-tdfa" ,ghc-regex-tdfa) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index bdb63c0dbf..6c4c64e507 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -881,8 +881,7 @@ coding footprint.") "1rdidf18i781c0vdvy9yn79yh08hmcacf6fp3sgghyiy3h0wyh5l")))) (build-system haskell-build-system) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-cereal" ,ghc-cereal) + `(("ghc-cereal" ,ghc-cereal) ("ghc-data-default-class" ,ghc-data-default-class) ("ghc-memory" ,ghc-memory) ("ghc-cryptonite" ,ghc-cryptonite) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index d06055de45..c8ad067ff1 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1895,7 +1895,6 @@ be served with a HTTP file server of your choice.") ("ghc-hashable" ,ghc-hashable) ("ghc-html" ,ghc-html) ("ghc-mmap" ,ghc-mmap) - ("ghc-mtl" ,ghc-mtl) ("ghc-old-time" ,ghc-old-time) ("ghc-parsec" ,ghc-parsec) ("ghc-random" ,ghc-random) @@ -2188,7 +2187,6 @@ directory full of HOWTOs.") ("ghc-memory" ,ghc-memory) ("ghc-monad-control" ,ghc-monad-control) ("ghc-monad-logger" ,ghc-monad-logger) - ("ghc-mtl" ,ghc-mtl) ("ghc-network" ,ghc-network) ("ghc-old-locale" ,ghc-old-locale) ("ghc-optparse-applicative" ,ghc-optparse-applicative) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 08f82ba2d2..163281ac67 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -467,7 +467,6 @@ desktop environment.") (build-system haskell-build-system) (inputs `(("ghc-extensible-exceptions" ,ghc-extensible-exceptions) - ("ghc-mtl" ,ghc-mtl) ("ghc-quickcheck" ,ghc-quickcheck) ("ghc-semigroups" ,ghc-semigroups) ("ghc-setlocale" ,ghc-setlocale) @@ -560,8 +559,7 @@ Haskell, no knowledge of the language is required to install and use it.") "1660w3xhbfrlq8b8s1rviq2mcn1vyqpypli4023gqxwry52brk6y")))) (build-system haskell-build-system) (propagated-inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-old-time" ,ghc-old-time) + `(("ghc-old-time" ,ghc-old-time) ("ghc-random" ,ghc-random) ("ghc-utf8-string" ,ghc-utf8-string) ("ghc-extensible-exceptions" ,ghc-extensible-exceptions) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index aa1395286f..2bf5ea3569 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -2078,7 +2078,6 @@ derivations of regular expressions.") (build-system haskell-build-system) (inputs `(("ghc-parsec" ,ghc-parsec) - ("ghc-mtl" ,ghc-mtl) ("ghc-hxt-charproperties" ,ghc-hxt-charproperties) ("ghc-hxt-unicode" ,ghc-hxt-unicode) ("ghc-hxt-regex-xmlschema" ,ghc-hxt-regex-xmlschema) -- cgit v1.2.3 From 988dee48d048af6bf324c07a6d7f615b4c768fcc Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 31 Aug 2018 15:12:05 -0400 Subject: gnu: cabal-doctest: Update Cabal file to r1. * gnu/packages/haskell.scm (cabal-doctest): Update Cabal file to r1. --- gnu/packages/haskell.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 95e89a3b06..7fa63eb116 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1832,6 +1832,9 @@ installation of Haskell libraries and programs.") (base32 "0bgd4jdmzxq5y465r4sf4jv2ix73yvblnr4c9wyazazafddamjny")))) (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("1" "1bk85avgc93yvcggwbk01fy8nvg6753wgmaanhkry0hz55h7mpld"))) (home-page "https://github.com/phadej/cabal-doctest") (synopsis "Setup.hs helper for running doctests") (description -- cgit v1.2.3 From 6bacde7cd7c47dd8f83265f53a4098dace9569f1 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 20:22:20 -0400 Subject: gnu: ghc-basement: Update to 0.0.8. * gnu/packages/haskell.scm (ghc-basement): Update to 0.0.8. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 7fa63eb116..e6a88f295d 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9197,7 +9197,7 @@ Web Services.") (define-public ghc-basement (package (name "ghc-basement") - (version "0.0.7") + (version "0.0.8") (source (origin (method url-fetch) @@ -9205,7 +9205,7 @@ Web Services.") "basement/basement-" version ".tar.gz")) (sha256 (base32 - "0w2g4k9bs2ph00p0fgrmcrng8ypdz6xis0r10g380nzkg2rvj0dm")))) + "194jw567di4q2758943q9rrwkbf9gl261my7qc21i9xhyabipx67")))) (build-system haskell-build-system) (home-page "https://github.com/haskell-foundation/foundation") (synopsis "Basic primitives for Foundation starter pack") -- cgit v1.2.3 From d3cc0eb2f35df66262402c2432adeff4694f202d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 20:22:43 -0400 Subject: gnu: ghc-base-prelude: Update to 1.3. * gnu/packages/haskell.scm (ghc-base-prelude): Update to 1.3. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index e6a88f295d..9c79eb654d 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8701,7 +8701,7 @@ classy-prelude.") (define-public ghc-base-prelude (package (name "ghc-base-prelude") - (version "1.2.0.1") + (version "1.3") (source (origin (method url-fetch) @@ -8710,7 +8710,7 @@ classy-prelude.") "base-prelude-" version ".tar.gz")) (sha256 (base32 - "17hivs7lmsglagdlzxd9q9zsddmgqin2788mpq911zwnb57lj6l1")))) + "1zk728sd09hh2r4xwz4lazsrrgg5cshydn64932sm0vckplndk73")))) (build-system haskell-build-system) (home-page "https://github.com/nikita-volkov/base-prelude") (synopsis "The most complete prelude formed solely from the Haskell's base -- cgit v1.2.3 From 0ff8558a4d337a89d4d6bb43bf70a0dc3a008f67 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 20:23:41 -0400 Subject: gnu: ghc-cmdargs: Update to 0.10.20. * gnu/packages/haskell.scm (ghc-cmdargs): Update to 0.10.20. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 9c79eb654d..f5a5299379 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1053,7 +1053,7 @@ tool lex or flex for C/C++.") (define-public ghc-cmdargs (package (name "ghc-cmdargs") - (version "0.10.18") + (version "0.10.20") (source (origin (method url-fetch) @@ -1062,7 +1062,7 @@ tool lex or flex for C/C++.") version ".tar.gz")) (sha256 (base32 - "1lnmcsf6p9yrwwz1zvrw5lbc32xpff7b70yz4ylawaflnlz6wrlh")))) + "0cbkmgrcnwgigg6z88y3c09gm7g6dwm7gzbgr53h8k1xik29s9hf")))) (build-system haskell-build-system) (home-page "http://community.haskell.org/~ndm/cmdargs/") -- cgit v1.2.3 From d05d03dda05588cd31e1d5d05c1583c8d17dfa6e Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 20:28:08 -0400 Subject: gnu: ghc-colour: Update to 2.3.4. * gnu/packages/haskell.scm (ghc-colour): Update to 2.3.4. [arguments]: Disable tests. --- gnu/packages/haskell.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index f5a5299379..e1dfb9b1f0 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7073,7 +7073,7 @@ the @code{mtl-tf} package.") (define-public ghc-colour (package (name "ghc-colour") - (version "2.3.3") + (version "2.3.4") (source (origin (method url-fetch) @@ -7082,7 +7082,11 @@ the @code{mtl-tf} package.") version ".tar.gz")) (sha256 (base32 - "1qmn1778xzg07jg9nx4k1spdz2llivpblf6wwrps1qpqjhsac5cd")))) + "1sy51nz096sv91nxqk6yk7b92b5a40axv9183xakvki2nc09yhqg")))) + (arguments + ;; The tests for this package have the following dependency cycle: + ;; ghc-test-framework -> ghc-ansi-terminal -> ghc-colour. + `(#:tests? #f)) (build-system haskell-build-system) (home-page "https://www.haskell.org/haskellwiki/Colour") (synopsis "Model for human colour perception") -- cgit v1.2.3 From 7d887a2ceccdbec2abb6eaf5ae97c12849a7cbc6 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 20:33:08 -0400 Subject: gnu: ghc-easy-file: Update to 0.2.2. * gnu/packages/haskell.scm (ghc-easy-file): Update to 0.2.2. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index e1dfb9b1f0..9df5e030a0 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4253,7 +4253,7 @@ library for Haskell.") (define-public ghc-easy-file (package (name "ghc-easy-file") - (version "0.2.1") + (version "0.2.2") (source (origin (method url-fetch) @@ -4263,7 +4263,7 @@ library for Haskell.") ".tar.gz")) (sha256 (base32 - "0v75081bx4qzlqy29hh639nzlr7dncwza3qxbzm9njc4jarf31pz")))) + "0zmlcz723051qpn8l8vi51c5rx1blwrw4094jcshkmj8p9r2xxaj")))) (build-system haskell-build-system) (home-page "https://github.com/kazu-yamamoto/easy-file") -- cgit v1.2.3 From a7427ff7780bc7907b7e7fe1446d21625ceeddb1 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 20:33:58 -0400 Subject: gnu: ghc-entropy: Update to 0.4.1.1. * gnu/packages/haskell-crypto.scm (ghc-entropy): Update to 0.4.1.1. --- gnu/packages/haskell-crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index 1326de0923..6a1eff6821 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -314,7 +314,7 @@ are implemented as FFI bindings to efficient code from zlib.") (define-public ghc-entropy (package (name "ghc-entropy") - (version "0.3.8") + (version "0.4.1.1") (source (origin (method url-fetch) @@ -323,7 +323,7 @@ are implemented as FFI bindings to efficient code from zlib.") "entropy-" version ".tar.gz")) (sha256 (base32 - "1l3lfigqvdlmxkz1wl7zdkmc0i2r5p6z4xzhiw8xdsbsw7aljfkl")))) + "1ahz5g148l6sax3dy505na2513i99c7bxix68jja5kbx4f271zcf")))) (build-system haskell-build-system) (home-page "https://github.com/TomMD/entropy") (synopsis "Provides platform independent entropy source for Haskell") -- cgit v1.2.3 From 6b850af42d20016c8a33d575b6388acdfb6a0a88 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:28:57 -0400 Subject: gnu: ghc-geniplate-mirror: Update to 0.7.6. * gnu/packages/haskell.scm (ghc-geniplate-mirror): Update to 0.7.6. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 9df5e030a0..98cd790865 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5726,7 +5726,7 @@ package, and that's where the version number started.") (define-public ghc-geniplate-mirror (package (name "ghc-geniplate-mirror") - (version "0.7.5") + (version "0.7.6") (source (origin (method url-fetch) @@ -5734,7 +5734,7 @@ package, and that's where the version number started.") "/geniplate-mirror" "/geniplate-mirror-" version ".tar.gz")) (sha256 - (base32 "17vjps2118s5z3k39ij00lkmkxv3mqf8h59wv6qdamlgmhyr36si")))) + (base32 "1y0m0bw5zpm1y1y6d9qmxj3swl8j8hlw1shxbr5awycf6k884ssb")))) (build-system haskell-build-system) (home-page "https://github.com/danr/geniplate") (synopsis "Use Template Haskell to generate Uniplate-like functions") -- cgit v1.2.3 From a3aaf87a99316f694d2c220c5e578eaad55accbf Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:29:30 -0400 Subject: gnu: ghc-happy: Update to 1.19.9. * gnu/packages/haskell.scm (ghc-happy): Update to 1.19.9. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 98cd790865..98c2c3f67e 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1096,7 +1096,7 @@ postfix notation. For more information on stack based languages, see (define-public ghc-happy (package (name "ghc-happy") - (version "1.19.8") + (version "1.19.9") (source (origin (method url-fetch) @@ -1106,7 +1106,7 @@ postfix notation. For more information on stack based languages, see ".tar.gz")) (sha256 (base32 - "186ky3bly0i3cc56qk3r7j7pxh2108aackq4n2lli7jmbnb3kxsd")))) + "138xpxdb7x62lpmgmb6b3v3vgdqqvqn4273jaap3mjmc2gla709y")))) (build-system haskell-build-system) (home-page "https://hackage.haskell.org/package/happy") (synopsis "Parser generator for Haskell") -- cgit v1.2.3 From 9959625056ad70b45632799535a350da3aac73b0 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 20:45:49 -0400 Subject: gnu: ghc-ieee754: Update to 0.8.0. * gnu/packages/haskell.scm (ghc-ieee754): Update to 0.8.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 98c2c3f67e..f1e26bb69c 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7862,7 +7862,7 @@ specific Windows, Mac, and Linux file system event notification.") (define-public ghc-ieee754 (package (name "ghc-ieee754") - (version "0.7.8") + (version "0.8.0") (source (origin (method url-fetch) (uri (string-append @@ -7870,7 +7870,7 @@ specific Windows, Mac, and Linux file system event notification.") "ieee754-" version ".tar.gz")) (sha256 (base32 - "1zvfnnd5nm5kgr60214cdyks0kqdqyzpwk5sdh0s60yr8b7fyjny")))) + "1lcs521g9lzy9d7337vg4w7q7s8500rfqy7rcifcz6pm6yfgyb8f")))) (build-system haskell-build-system) (home-page "https://github.com/patperry/hs-ieee754") (synopsis "Utilities for dealing with IEEE floating point numbers") -- cgit v1.2.3 From f06b5f23c0f6677e3692928250dbde68ec5d6bd7 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 20:47:51 -0400 Subject: gnu: ghc-microlens: Update to 0.4.9.1. * gnu/packages/haskell.scm (ghc-microlens): Update to 0.4.9.1. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index f1e26bb69c..c674c970b6 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9665,7 +9665,7 @@ functions.") (define-public ghc-microlens (package (name "ghc-microlens") - (version "0.4.8.3") + (version "0.4.9.1") (source (origin (method url-fetch) @@ -9674,7 +9674,7 @@ functions.") "microlens-" version ".tar.gz")) (sha256 (base32 - "17qx2mbqdrlnkc3gxq8njbp7qw8nh51drmz6fc8khgj9bls5ni2k")))) + "0j2nzf0vpx2anvsrg2w0vy2z4jn3kkcs2n6glkzblhn1j9piqh51")))) (build-system haskell-build-system) (home-page "https://github.com/aelve/microlens") -- cgit v1.2.3 From e433898d8cb407479b700132cd800114d4bb3768 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 20:50:11 -0400 Subject: gnu: ghc-network-info: Update to 0.2.0.10. * gnu/packages/haskell.scm (ghc-network-info): Update to 0.2.0.10. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index c674c970b6..9452555540 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8856,7 +8856,7 @@ ByteStrings in the style of other common *nix hex dump tools.") (define-public ghc-network-info (package (name "ghc-network-info") - (version "0.2.0.8") + (version "0.2.0.10") (source (origin (method url-fetch) @@ -8865,7 +8865,7 @@ ByteStrings in the style of other common *nix hex dump tools.") "network-info-" version ".tar.gz")) (sha256 (base32 - "0xndvg776241fgjmynxfpy81f1csjmh8dg33yf0c8m71ychz3pzc")))) + "0anmgzcpnz7nw3n6vq0r25m1s9l2svpwi83wza0lzkrlbnbzd02n")))) (build-system haskell-build-system) (home-page "https://github.com/jystic/network-info") (synopsis "Access the local computer's basic network configuration") -- cgit v1.2.3 From 12eb67dcc94cfd6c110576d50cb6cd28c7fc2e74 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 15:12:07 -0400 Subject: gnu: ghc-old-locale: Update Cabal file to r2. * gnu/packages/haskell.scm (ghc-old-locale): Update Cabal file to r2. [arguments]: Remove unneeded "--allow-newer" configure flag. --- gnu/packages/haskell.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 9452555540..e0ebe09dd3 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1686,7 +1686,8 @@ configurations to coexist without resorting to mutable global variables or (base32 "0l3viphiszvz5wqzg7a45zp40grwlab941q5ay29iyw8p3v8pbyv")))) (build-system haskell-build-system) (arguments - `(#:configure-flags (list "--allow-newer=base"))) + `(#:cabal-revision + ("2" "04b9vn007hlvsrx4ksd3r8r3kbyaj2kvwxchdrmd4370qzi8p6gs"))) (home-page "https://hackage.haskell.org/package/old-locale") (synopsis "Adapt to locale conventions") (description -- cgit v1.2.3 From 62f97b121725689a3ba81285ff857749b44603f9 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 20:51:30 -0400 Subject: gnu: ghc-parallel: Update to 3.2.2.0. * gnu/packages/haskell.scm (ghc-parallel): Update to 3.2.2.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index e0ebe09dd3..aa471fa0ad 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2093,7 +2093,7 @@ case with other forms of concurrent communication, such as locks or (define-public ghc-parallel (package (name "ghc-parallel") - (version "3.2.1.0") + (version "3.2.2.0") (outputs '("out" "doc")) (source (origin @@ -2104,7 +2104,7 @@ case with other forms of concurrent communication, such as locks or ".tar.gz")) (sha256 (base32 - "09l52k1gsn667lmv0pp052cbwkzkbhfivp51f2xkrlfzf6xwvqsd")))) + "1xkfi96w6yfpppd0nw1rnszdxmvifwzm699ilv6332ra3akm610p")))) (build-system haskell-build-system) (home-page "https://hackage.haskell.org/package/parallel") (synopsis "Parallel programming library") -- cgit v1.2.3 From e21822026672b8348b8ec1582609e8931a087634 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 20:57:19 -0400 Subject: gnu: ghc-parser-combinators: Update to 1.0.0. * gnu/packages/haskell.scm (ghc-parser-combinators): Update to 1.0.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index aa471fa0ad..7de08a7d2d 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3732,7 +3732,7 @@ is also parametric in the input stream type.") (define-public ghc-parser-combinators (package (name "ghc-parser-combinators") - (version "0.4.0") + (version "1.0.0") (source (origin (method url-fetch) @@ -3741,7 +3741,7 @@ is also parametric in the input stream type.") version ".tar.gz")) (sha256 (base32 - "1azkz0a6ikym02s8wydjcklp7rz8k512bs4s9lp9g1g03m0yj95i")))) + "1pwfdsklqwvaynwpdzmx1bs35mp6dpsyaqdnzxnqcrxwf5h8sk75")))) (build-system haskell-build-system) (home-page "https://github.com/mrkkrp/parser-combinators") (synopsis "Commonly useful parser combinators") -- cgit v1.2.3 From 30a8c0d81e5b0195e566b3c8e11afd7ba75b3eba Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:02:11 -0400 Subject: gnu: ghc-sdl: Update to 0.6.7.0. * gnu/packages/haskell.scm (ghc-sdl): Update to 0.6.7.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 7de08a7d2d..51170adbfb 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1349,7 +1349,7 @@ OpenAL.") (define-public ghc-sdl (package (name "ghc-sdl") - (version "0.6.5.1") + (version "0.6.7.0") (source (origin (method url-fetch) @@ -1359,7 +1359,7 @@ OpenAL.") ".tar.gz")) (sha256 (base32 - "1sa3zx3vrs1gbinxx33zwq0x2bsf3i964bff7419p7vzidn36k46")))) + "00y67v80a8l09i3k76z09lg25kw72ivl09nag8ckdlk4a0cfnzfq")))) (build-system haskell-build-system) (inputs `(("sdl" ,sdl))) -- cgit v1.2.3 From 42f2732e13c0d36f7e70b2131a629a54c59987f7 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:03:30 -0400 Subject: gnu: ghc-setlocale: Update to 1.0.0.8. * gnu/packages/haskell.scm (ghc-setlocale): Update to 1.0.0.8. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 51170adbfb..fa588b8dbe 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1936,7 +1936,7 @@ environment variables.") (define-public ghc-setlocale (package (name "ghc-setlocale") - (version "1.0.0.6") + (version "1.0.0.8") (source (origin (method url-fetch) (uri (string-append @@ -1944,7 +1944,7 @@ environment variables.") version "/setlocale-" version ".tar.gz")) (sha256 (base32 - "1rl8qb8vzv8fdbczy2dxwgn4cb68lfrjdxf2w8nn9wy1acqzcyjq")))) + "0sdrsmkhw08483d73ysgm2926fdbhii61br03lqpqw0lfzj4ilbd")))) (build-system haskell-build-system) (home-page "https://hackage.haskell.org/package/setlocale") (synopsis "Haskell bindings to setlocale") -- cgit v1.2.3 From c2e393cccb3280e0a5ff517999f468e37fe2b54c Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:03:55 -0400 Subject: gnu: ghc-simple-reflect: Update to 0.3.3. * gnu/packages/haskell.scm (ghc-simple-reflect): Update to 0.3.3. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index fa588b8dbe..e711d46bd8 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -938,7 +938,7 @@ documentation-generation tool for Haskell libraries.") (define-public ghc-simple-reflect (package (name "ghc-simple-reflect") - (version "0.3.2") + (version "0.3.3") (source (origin (method url-fetch) @@ -948,7 +948,7 @@ documentation-generation tool for Haskell libraries.") ".tar.gz")) (sha256 (base32 - "1dpcf6w3cf1sfl9bnlsx04x7aghw029glj5d05qzrsnms2rlw8iq")))) + "0ayvrx5cm8n6db21jiyjmk5h93pw7cz1707hih09hlhk9jh5x0h7")))) (build-system haskell-build-system) (home-page "https://twanvl.nl/blog/haskell/simple-reflection-of-expressions") -- cgit v1.2.3 From 4112a2e7c44c999cb65270e020fbe8f241874829 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:07:18 -0400 Subject: gnu: ghc-stringbuilder: Update to 0.5.1. * gnu/packages/haskell.scm (ghc-stringbuilder): Update to 0.5.1. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index e711d46bd8..ddbd9098d0 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2007,7 +2007,7 @@ parts.") (define-public ghc-stringbuilder (package (name "ghc-stringbuilder") - (version "0.5.0") + (version "0.5.1") (source (origin (method url-fetch) @@ -2017,7 +2017,7 @@ parts.") ".tar.gz")) (sha256 (base32 - "1ap95xphqnrhv64c2a137wqslkdmb2jjd9ldb17gs1pw48k8hrl9")))) + "1fh3csx1wcssn8xyvl4ip4aprh9l4qyz2kk8mgjvqvc0vb2bsy6q")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: circular dependencies with tests ; enabled -- cgit v1.2.3 From 5fe52835d926d8fa79495dbd0d6e3e47d07e9bc8 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:12:22 -0400 Subject: gnu: ghc-th-abstraction: Update to 0.2.8.0. * gnu/packages/haskell.scm (ghc-th-abstraction): Update to 0.2.8.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index ddbd9098d0..ad84eeeff5 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5584,7 +5584,7 @@ asynchronous exceptions.") (define-public ghc-th-abstraction (package (name "ghc-th-abstraction") - (version "0.2.6.0") + (version "0.2.8.0") (source (origin (method url-fetch) @@ -5593,7 +5593,7 @@ asynchronous exceptions.") version ".tar.gz")) (sha256 (base32 - "0g42h6wnj2awc5ryhbvx009wd8w75pn66bjzsq1z4s3xajd2hbp5")))) + "0n17w4q2ykd0nica4sck2wng6md56rfad8x0icl0l8vnzb9nn4ya")))) (build-system haskell-build-system) (home-page "https://github.com/glguy/th-abstraction") (synopsis "Nicer interface for reified information about data types") -- cgit v1.2.3 From d7f14885bbb12edd86ae66782a06e32046bc469e Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:12:56 -0400 Subject: gnu: ghc-transformers-compat: Update to 0.6.2. * gnu/packages/haskell.scm (ghc-transformers-compat): Update to 0.6.2. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index ad84eeeff5..4183c9c49d 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2415,7 +2415,7 @@ compatibility to run on old versions of the platform.") (define-public ghc-transformers-compat (package (name "ghc-transformers-compat") - (version "0.5.1.4") + (version "0.6.2") (source (origin (method url-fetch) @@ -2424,7 +2424,7 @@ compatibility to run on old versions of the platform.") "/transformers-compat-" version ".tar.gz")) (sha256 (base32 - "17yam0199fh9ndsn9n69jx9nvbsmymzzwbi23dck3dk4q57fz0fq")))) + "1gp4a8kvniwgm8947ghb4iwv4b7wd6ry4kvv4nfnym4agf5j41nw")))) (build-system haskell-build-system) (home-page "https://github.com/ekmett/transformers-compat/") (synopsis "Small compatibility shim between transformers 0.3 and 0.4") -- cgit v1.2.3 From 58c102e08d28d69851fa779fdb4ee0701b23eb24 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:14:42 -0400 Subject: gnu: ghc-unbounded-delays: Update to 0.1.1.0. * gnu/packages/haskell.scm (ghc-unbounded-delays): Update to 0.1.1.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 4183c9c49d..0d4501328a 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4426,7 +4426,7 @@ having to unsafely pass dummy arguments.") (define-public ghc-unbounded-delays (package (name "ghc-unbounded-delays") - (version "0.1.0.9") + (version "0.1.1.0") (source (origin (method url-fetch) @@ -4436,7 +4436,7 @@ having to unsafely pass dummy arguments.") ".tar.gz")) (sha256 (base32 - "1f4h87503m3smhip432q027wj3zih18pmz2rnafh60589ifcl420")))) + "1ir9fghbrc214c97bwafk5ck6cacxz1pdnq4i18p604d1b8zg9wa")))) (build-system haskell-build-system) (home-page "https://github.com/basvandijk/unbounded-delays") (synopsis "Unbounded thread delays and timeouts") -- cgit v1.2.3 From 06dae8ffe92100d7f5818f68a24642a032fc2593 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:17:26 -0400 Subject: gnu: ghc-unexceptionalio: Update to 0.4.0. * gnu/packages/haskell.scm (ghc-unexceptionalio): Update to 0.4.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 0d4501328a..63564b23b5 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8040,14 +8040,14 @@ handler built in.") (define-public ghc-unexceptionalio (package (name "ghc-unexceptionalio") - (version "0.3.0") + (version "0.4.0") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "unexceptionalio-" version "/" "unexceptionalio-" version ".tar.gz")) - (sha256 (base32 "1f7h7zwky4scdcyjspg4ksfh7x6yra0wjybxq70p7vcwpgk2nzlj")))) + (sha256 (base32 "09gynk472l7nn5l2w320n4dwigwp0wh0shfp6dyw6r5h2jdxz18p")))) (build-system haskell-build-system) (home-page "https://github.com/singpolyma/unexceptionalio") (synopsis "IO without any non-error, synchronous exceptions") -- cgit v1.2.3 From 32a9a3808711feac2ee30379256c1ac95d29857b Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:18:01 -0400 Subject: gnu: ghc-unix-compat: Update to 0.5.1. * gnu/packages/haskell.scm (ghc-unix-compat): Update to 0.5.1. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 63564b23b5..3ebefeea3a 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2464,7 +2464,7 @@ for Unix time in Haskell.") (define-public ghc-unix-compat (package (name "ghc-unix-compat") - (version "0.4.2.0") + (version "0.5.1") (source (origin (method url-fetch) @@ -2474,7 +2474,7 @@ for Unix time in Haskell.") ".tar.gz")) (sha256 (base32 - "036nv05w0yjxc3rfpar60ddjrlzc40mdgr5k6ihvwlvqfmq1gw9m")))) + "0llwl7rp63fy2ychwdclz1afj45pbin5pfl01dvn6rwhvmwhr7d3")))) (build-system haskell-build-system) (home-page "https://github.com/jystic/unix-compat") -- cgit v1.2.3 From f871a555026b94e2f3a34ae9410388a1ce0368ac Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 31 Aug 2018 15:20:28 -0400 Subject: gnu: ghc-unliftio-core: Update Cabal file to r1. * gnu/packages/haskell.scm (ghc-unliftio-core): Update Cabal file to r1. --- gnu/packages/haskell.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 3ebefeea3a..32a530853e 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9655,6 +9655,9 @@ functions for the ghc-persistent package.") (base32 "1193fplsjm1lcr05xwvkj1rsyzx74i755f6kw3ikmxbsv0bv0l3m")))) (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("1" "16bjwcsaghqqmyi69rq65dn3ydifyfaabq3ns37apdm00mwqbcj2"))) (home-page "https://github.com/fpco/unliftio/tree/master/unliftio-core#readme") (synopsis "The MonadUnliftIO typeclass for unlifting monads to IO") -- cgit v1.2.3 From c325dde2702540332d30b5525be1dc1441dd0281 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 30 Aug 2018 10:53:19 -0400 Subject: gnu: ghc-utf8-string: Update Cabal file to r3. * gnu/packages/haskell.scm (ghc-utf8-string): Update Cabal file to r3. [arguments]: Remove unneeded "--allow-newer" configure flag. --- gnu/packages/haskell.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 32a530853e..d8cb73c83a 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1903,7 +1903,8 @@ configuration. This library provides the common bits for writing custom (base32 "0h7imvxkahiy8pzr8cpsimifdfvv18lizrb33k6mnq70rcx9w2zv")))) (build-system haskell-build-system) (arguments - `(#:configure-flags (list "--allow-newer=base"))) + `(#:cabal-revision + ("3" "02vhj5gykkqa2dyn7s6gn8is1b5fdn9xcqqvlls268g7cpv6rk38"))) (home-page "https://github.com/glguy/utf8-string/") (synopsis "Support for reading and writing UTF8 Strings") (description -- cgit v1.2.3 From 061832f1f96dbe60b5e0961650e37017a0116675 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:21:00 -0400 Subject: gnu: ghc-wl-pprint: Update to 1.2.1. * gnu/packages/haskell.scm (ghc-wl-pprint): Update to 1.2.1. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index d8cb73c83a..696f42118d 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3634,7 +3634,7 @@ a variety of ways.") (define-public ghc-wl-pprint (package (name "ghc-wl-pprint") - (version "1.2") + (version "1.2.1") (source (origin (method url-fetch) (uri (string-append @@ -3642,7 +3642,7 @@ a variety of ways.") version ".tar.gz")) (sha256 (base32 - "166zvk4zwn2zaa9kx66m1av38m34qp6h4i65bri2sfnxgvx0700r")))) + "0kn7y8pdrv8f87zhd5mifcl8fy3b2zvnzmzwhdqhxxlyzwiq6z0c")))) (build-system haskell-build-system) (home-page "https://hackage.haskell.org/package/wl-pprint") (synopsis "Wadler/Leijen pretty printer") -- cgit v1.2.3 From 6c76f51f96737d5e0fc2148343b4f5605a6e95a4 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:21:29 -0400 Subject: gnu: ghc-xhtml: Update to 3000.2.2.1. * gnu/packages/haskell-web.scm (ghc-xhtml): Update to 3000.2.2.1. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 9ef9486b3f..0a53136f97 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -708,7 +708,7 @@ documents.") (define-public ghc-xhtml (package (name "ghc-xhtml") - (version "3000.2.1") + (version "3000.2.2.1") (source (origin (method url-fetch) @@ -718,7 +718,7 @@ documents.") ".tar.gz")) (sha256 (base32 - "1n6wgzxbj8xf0wf1il827qidphnffb5vzhwzqlxhh70c2y10f0ik")))) + "0939kwpinq6l4n3nyvd1gzyl7f83gymw0wzqndlgy1yc7q0nkj2w")))) (build-system haskell-build-system) (home-page "https://github.com/haskell/xhtml") (synopsis "XHTML combinator library") -- cgit v1.2.3 From e09ef4fccaddfeb74ecab8cc7ab9a24be9b019f9 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 6 Sep 2018 14:08:08 -0400 Subject: gnu: ghc-zlib: Relax test framework dependency constraints. * gnu/packages/haskell.scm (ghc-zlib)[arguments]: Remove "--allow-newer" configure flag and add a phase that removes dependency version constraints from some of the test frameworks. --- gnu/packages/haskell.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 696f42118d..9ed7554bb0 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2044,7 +2044,15 @@ literals.") (base32 "1vbzf0awb6zb456xf48za1kl22018646cfzq4frvxgb9ay97vk0d")))) (build-system haskell-build-system) - (arguments `(#:configure-flags (list "--allow-newer=tasty"))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'strip-test-framework-constraints + (lambda _ + (substitute* "zlib.cabal" + (("tasty >= 0\\.8 && < 0\\.12") "tasty") + (("tasty-hunit >= 0\\.8 && < 0\\.10") "tasty-hunit") + (("tasty-quickcheck == 0\\.8\\.\\*") "tasty-quickcheck"))))))) (inputs `(("zlib" ,zlib))) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck) -- cgit v1.2.3 From 8642b86a0080343d000aafc54b518f0cb4d2d286 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:22:01 -0400 Subject: gnu: hscolour: Update to 1.24.4. * gnu/packages/haskell.scm (hscolour): Update to 1.24.4. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 9ed7554bb0..93d855dd12 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2974,7 +2974,7 @@ parser isolation, and labeled blocks for better error messages.") (define-public hscolour (package (name "hscolour") - (version "1.24.1") + (version "1.24.4") (source (origin (method url-fetch) @@ -2984,7 +2984,7 @@ parser isolation, and labeled blocks for better error messages.") ".tar.gz")) (sha256 (base32 - "1j3rpzjygh3igvnd1n2xn63bq68rs047cjxr2qi6xyfnivgf6vz4")))) + "079jwph4bwllfp03yfr26s5zc6m6kw3nhb1cggrifh99haq34cr4")))) (build-system haskell-build-system) (home-page "https://hackage.haskell.org/package/hscolour") (synopsis "Script to colourise Haskell code") -- cgit v1.2.3 From ecefe4ce870e69009117d8e14382ad9c2e69720d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 20:20:26 -0400 Subject: gnu: ghc-ansi-terminal: Update to 0.8.0.4. * gnu/packages/haskell.scm (ghc-ansi-terminal): Update to 0.8.0.4. [inputs]: Add ghc-colour. --- gnu/packages/haskell.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 93d855dd12..cc5dc152f6 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3943,7 +3943,7 @@ package into this package.") (define-public ghc-ansi-terminal (package (name "ghc-ansi-terminal") - (version "0.6.2.3") + (version "0.8.0.4") (source (origin (method url-fetch) @@ -3953,8 +3953,10 @@ package into this package.") ".tar.gz")) (sha256 (base32 - "0hpfw0k025y681m9ml1c712skrb1p4vh7z5x1f0ci9ww7ssjrh2d")))) + "0428gq8m3fdnb7ldcsyk97qcch76hcxbgh2666p6f76fs2qbhg7b")))) (build-system haskell-build-system) + (inputs + `(("ghc-colour" ,ghc-colour))) (home-page "https://github.com/feuerbach/ansi-terminal") (synopsis "ANSI terminal support for Haskell") (description "This package provides ANSI terminal support for Haskell. It -- cgit v1.2.3 From e95cc1087a13ab4c26244c31b7e6512c37042a5b Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Mon, 3 Sep 2018 09:53:24 -0400 Subject: gnu: Add ghc-bsb-http-chunked. * gnu/packages/haskell-web.scm (ghc-bsb-http-chunked): New variable. --- gnu/packages/haskell-web.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 0a53136f97..190bec8dd2 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -524,6 +524,30 @@ functionality.") Haskell's Web Application Interface (WAI).") (license license:expat))) +(define-public ghc-bsb-http-chunked + (package + (name "ghc-bsb-http-chunked") + (version "0.0.0.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/" + "bsb-http-chunked/bsb-http-chunked-" + version ".tar.gz")) + (sha256 + (base32 + "1x6m6xkrcw6jiaig1bb2wb5pqyw31x8xr9k9pxgq2g3ng44pbjr8")))) + (build-system haskell-build-system) + (inputs + `(("ghc-bytestring-builder" ,ghc-bytestring-builder))) + (home-page "http://github.com/sjakobi/bsb-http-chunked") + (synopsis "Chunked HTTP transfer encoding for bytestring builders") + (description "This Haskell library contains functions for encoding +bytestring builders for chunked Hypertext Transfer Protocol (HTTP) 1.1 +transfers.") + (license license:bsd-3))) + (define-public ghc-warp (package (name "ghc-warp") -- cgit v1.2.3 From 95415545ab5b33e7e4d813b97d101c810b1ae338 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:28:17 -0400 Subject: gnu: ghc-foundation: Update to 0.0.21. * gnu/packages/haskell.scm (ghc-foundation): Update to 0.0.21. [arguments]: Add a phase to create missing "Setup.hs" file. --- gnu/packages/haskell.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index cc5dc152f6..860834d795 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9233,7 +9233,7 @@ packages.") (define-public ghc-foundation (package (name "ghc-foundation") - (version "0.0.20") + (version "0.0.21") (source (origin (method url-fetch) @@ -9241,8 +9241,18 @@ packages.") "foundation/foundation-" version ".tar.gz")) (sha256 (base32 - "0bg4g0xf4pb2vmahnfp8c4f0a3v0av73lb5g8bwnp170khxfcsms")))) + "1q43y8wfj0wf9gdq2kzphwjwq6m5pvryy1lqgk954aq5z3ks1lsf")))) (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'add-setup-script + (lambda _ + ;; The usual "Setup.hs" script is missing from the source. + (with-output-to-file "Setup.hs" + (lambda () + (format #t "import Distribution.Simple~%") + (format #t "main = defaultMain~%")))))))) (inputs `(("ghc-basement" ,ghc-basement))) (home-page "https://github.com/haskell-foundation/foundation") (synopsis "Alternative prelude with batteries and no dependencies") -- cgit v1.2.3 From acf13271302ae531b577b42502d790bd7e5a46d5 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:28:37 -0400 Subject: gnu: ghc-generics-sop: Update to 0.3.2.0. * gnu/packages/haskell.scm (ghc-generics-sop): Update to 0.3.2.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 860834d795..567bf75b5d 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9464,7 +9464,7 @@ from aeson.") (define-public ghc-generics-sop (package (name "ghc-generics-sop") - (version "0.3.1.0") + (version "0.3.2.0") (source (origin (method url-fetch) @@ -9473,7 +9473,7 @@ from aeson.") "generics-sop-" version ".tar.gz")) (sha256 (base32 - "1bazlhgmxcwv7vd44jhdx74cnhmaz6yy47jxfycapjj4mjrnp0x7")))) + "168v62i845jh9jbfaz3ldz8svz4wmzq9mf2vhb7pxlnbkk8fqq1h")))) (build-system haskell-build-system) (inputs `(("ghc-transformers-compat" ,ghc-transformers-compat))) (home-page "https://github.com/well-typed/generics-sop") -- cgit v1.2.3 From c18122265e45419df9cbc6a8db9ec1fb5a450e5f Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:32:26 -0400 Subject: gnu: ghc-microlens-th: Update to 0.4.2.2. * gnu/packages/haskell.scm (ghc-microlens-th): Update to 0.4.2.2. [inputs]: Add ghc-th-abstraction. --- gnu/packages/haskell.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 567bf75b5d..4bfde42b2b 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9715,7 +9715,7 @@ stripped. As the result, this package has no dependencies.") (define-public ghc-microlens-th (package (name "ghc-microlens-th") - (version "0.4.1.3") + (version "0.4.2.2") (source (origin (method url-fetch) @@ -9724,9 +9724,10 @@ stripped. As the result, this package has no dependencies.") "microlens-th-" version ".tar.gz")) (sha256 (base32 - "15a12cqxlgbcn1n73zwrxnp2vfm8b0ma0a0sdd8zmjbs8zy3np4f")))) + "02nj7lnl61yffi3c6wn341arxhld5r0vj6nzcb5zmqjhnqsv8c05")))) (build-system haskell-build-system) - (inputs `(("ghc-microlens" ,ghc-microlens))) + (inputs `(("ghc-microlens" ,ghc-microlens) + ("ghc-th-abstraction" ,ghc-th-abstraction))) (home-page "https://github.com/aelve/microlens") (synopsis "Automatic generation of record lenses for -- cgit v1.2.3 From 8b5d1142c28ba51442c1190aa9b2dc54d151d6c5 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:32:51 -0400 Subject: gnu: ghc-mmorph: Update to 1.1.2. * gnu/packages/haskell.scm (ghc-mmorph): Update to 1.1.2. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 4bfde42b2b..a7e7404932 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4043,7 +4043,7 @@ with various performance characteristics.") (define-public ghc-mmorph (package (name "ghc-mmorph") - (version "1.0.6") + (version "1.1.2") (source (origin (method url-fetch) @@ -4053,7 +4053,7 @@ with various performance characteristics.") ".tar.gz")) (sha256 (base32 - "1i8dzrc5qi3ryc9vrrmpn3sihmramsbhhd592w4w2k5g26qr3hql")))) + "1gjz1ib968lqybma7my1n19qq6cdj6a7nskrlnwy4jy9jrwzs2n9")))) (build-system haskell-build-system) (inputs `(("ghc-transformers-compat" ,ghc-transformers-compat))) -- cgit v1.2.3 From d58fda7d65f28a25e514aef45f09188b934a4ea5 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:33:22 -0400 Subject: gnu: ghc-monadrandom: Update to 0.5.1.1. * gnu/packages/haskell.scm (ghc-monadrandom): Update to 0.5.1.1. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index a7e7404932..4798636c65 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8795,7 +8795,7 @@ statically known size.") (define-public ghc-monadrandom (package (name "ghc-monadrandom") - (version "0.4.2.3") + (version "0.5.1.1") (source (origin (method url-fetch) @@ -8804,7 +8804,7 @@ statically known size.") "MonadRandom-" version ".tar.gz")) (sha256 (base32 - "1h1nhswrcmhy3mq6vd530p0df51fcnnf4csbwnljar7cf0mb2h6y")))) + "0w44jl1n3kqvqaflh82l1wj3xxbhzfs3kf4m8rk7w6fgg8llmnmb")))) (build-system haskell-build-system) (inputs `(("ghc-transformers-compat" ,ghc-transformers-compat) ("ghc-primitive" ,ghc-primitive) -- cgit v1.2.3 From e37775110e8909665ddb10889759567474fb2d7f Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 31 Aug 2018 15:09:36 -0400 Subject: gnu: ghc-old-time: Update Cabal file to r2. * gnu/packages/haskell.scm (ghc-old-time): Update Cabal file to r2. [arguments]: Remove unneeded "--allow-newer" configure flag. --- gnu/packages/haskell.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 4798636c65..8228d8b480 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1711,7 +1711,8 @@ date and time formats.") "1h9b26s3kfh2k0ih4383w90ibji6n0iwamxp6rfp2lbq1y5ibjqw")))) (build-system haskell-build-system) (arguments - `(#:configure-flags (list "--allow-newer=base"))) + `(#:cabal-revision + ("2" "1j6ln1dkvhdvnwl33bp0xf9lhc4sybqk0aw42p8cq81xwwzbn7y9"))) (inputs `(("ghc-old-locale" ,ghc-old-locale))) (home-page "https://hackage.haskell.org/package/old-time") -- cgit v1.2.3 From 6b19c5a477c08b0f168519d730ff9edb1357005c Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:15:15 -0400 Subject: gnu: ghc-pretty-show: Update to 1.7. * gnu/packages/haskell.scm (ghc-pretty-show): Update to 1.7. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 8228d8b480..4a5a7a9f5b 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1138,7 +1138,7 @@ Happy works in a similar way to the yacc tool for C.") (define-public ghc-pretty-show (package (name "ghc-pretty-show") - (version "1.6.12") + (version "1.7") (source (origin (method url-fetch) @@ -1146,7 +1146,7 @@ Happy works in a similar way to the yacc tool for C.") "pretty-show-" version ".tar.gz")) (sha256 (base32 - "1fblcxw4z4ry14brin1mvwccs6hqqlhi7xhwv1f23szjq25cjacn")))) + "0br7pkxqqqhby2j2v1g847lgqsrasx56g1jw3dhmjh4flzs6warq")))) (build-system haskell-build-system) (inputs `(("ghc-haskell-lexer" ,ghc-haskell-lexer) -- cgit v1.2.3 From cfd1a7d0663402d6c180db22e932567add683a4c Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:37:02 -0400 Subject: gnu: ghc-sdl-image: Update to 0.6.2.0. * gnu/packages/haskell.scm (ghc-sdl-image): Update to 0.6.2.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 4a5a7a9f5b..59fbb514c1 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1406,7 +1406,7 @@ MIDI, Ogg Vorbis, and SMPEG MP3 libraries.") (define-public ghc-sdl-image (package (name "ghc-sdl-image") - (version "0.6.1.2") + (version "0.6.2.0") (source (origin (method url-fetch) @@ -1416,7 +1416,7 @@ MIDI, Ogg Vorbis, and SMPEG MP3 libraries.") ".tar.gz")) (sha256 (base32 - "1ybdwlqi5nqzpsbh2md5mxhwmjn910iqysf6nykwjxlmvhcjk281")))) + "1gxwrvswgwjw6g7ym52gik22l9l3ljy592phv97jdmcf3gi6qcg1")))) (build-system haskell-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 214fae871ba3a6a19c43993d98c40514b1880045 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:39:10 -0400 Subject: gnu: ghc-sdl-mixer: Update to 0.6.3.0. * gnu/packages/haskell.scm (ghc-sdl-mixer): Update to 0.6.3.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 59fbb514c1..99d056e62f 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1375,7 +1375,7 @@ award winning Linux port of \"Civilization: Call To Power.\"") (define-public ghc-sdl-mixer (package (name "ghc-sdl-mixer") - (version "0.6.2.0") + (version "0.6.3.0") (source (origin (method url-fetch) @@ -1385,7 +1385,7 @@ award winning Linux port of \"Civilization: Call To Power.\"") ".tar.gz")) (sha256 (base32 - "1fhray79d80dk2aj9mx3ks05mm48sd832g8zgxli226jx471fs8r")))) + "0k26hqgdh789ka3mv4dsk6rin6x6vwcs6hjmnsqq7j3mnrh1342r")))) (build-system haskell-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From c9fa2a286ceff8495e2c9bdfcce94c15468677ef Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:39:29 -0400 Subject: gnu: ghc-statevar: Update to 1.1.1.1. * gnu/packages/haskell.scm (ghc-statevar): Update to 1.1.1.1. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 99d056e62f..b70df5bf2e 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4637,7 +4637,7 @@ call stacks with different versions of the compiler.") (define-public ghc-statevar (package (name "ghc-statevar") - (version "1.1.0.4") + (version "1.1.1.1") (source (origin (method url-fetch) @@ -4647,7 +4647,7 @@ call stacks with different versions of the compiler.") ".tar.gz")) (sha256 (base32 - "1dzz9l0haswgag9x56q7n57kw18v7nhmzkjyr61nz9y9npn8vmks")))) + "08r2iw0gdmfs4f6wraaq19vfmkjdbics3dbhw39y7mdjd98kcr7b")))) (build-system haskell-build-system) (inputs `(("ghc-stm" ,ghc-stm))) -- cgit v1.2.3 From 70ee3228bb4125814c7812c4a36352031040e9a3 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 16:40:07 -0400 Subject: gnu: ghc-tagged: Update Cabal file to r2. * gnu/packages/haskell.scm (ghc-tagged): Update Cabal file to r2. --- gnu/packages/haskell.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index b70df5bf2e..881936efb5 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4427,6 +4427,9 @@ periodic, on-demand actions in Haskell.") (base32 "16cdzh0bw16nvjnyyy5j9s60malhz4nnazw96vxb0xzdap4m2z74")))) (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("2" "0r2knfcq0b4s652vlvlnfwxlc2mkc2ra9kl8bp4zdn1awmfy0ia5"))) (inputs `(("ghc-transformers-compat" ,ghc-transformers-compat))) (home-page "https://hackage.haskell.org/package/tagged") -- cgit v1.2.3 From 44f717efff4b2d789597ee00b94f0d12dd4df1bc Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:08:57 -0400 Subject: gnu: ghc-text: Update to 1.2.3.0. * gnu/packages/haskell.scm (ghc-text): Update to 1.2.3.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 881936efb5..7d59b5ada5 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2149,7 +2149,7 @@ are not exception safe and can be broken by @code{killThread}.") (define-public ghc-text (package (name "ghc-text") - (version "1.2.2.2") + (version "1.2.3.0") (outputs '("out" "doc")) (source (origin @@ -2160,7 +2160,7 @@ are not exception safe and can be broken by @code{killThread}.") ".tar.gz")) (sha256 (base32 - "1y9d0zjs2ls0c574mr5xw7y3y49s62sd3wcn9lhpwz8a6q352iii")))) + "06iir7q99rnffzxi8gagn8w1k9m49368sbidgz634fv1gxib3q10")))) (build-system haskell-build-system) ;; The test dependencies depend on ghc-text: ghc-test-framework -> ghc-xml -> ghc-text (arguments `(#:tests? #f)) -- cgit v1.2.3 From 08c3993f4f4cdb323aa79bc7de6dce6a6324050d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:12:41 -0400 Subject: gnu: ghc-th-lift: Update to 0.7.11. * gnu/packages/haskell.scm (ghc-th-lift): Update to 0.7.11. [inputs]: Add ghc-th-abstraction. --- gnu/packages/haskell.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 7d59b5ada5..63a7825ed4 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5622,15 +5622,17 @@ Template Haskell.") (define-public ghc-th-lift (package (name "ghc-th-lift") - (version "0.7.8") + (version "0.7.11") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "th-lift/th-lift-" version ".tar.gz")) (sha256 (base32 - "0ay10b78x3969rpqqrgzy8srkl6iby2cljbf3mm17na8x22k7y1c")))) + "131360zxb0hazbqwbkk6ab2p77jkxr79bwwm618mrwrwkm3x2g6m")))) (build-system haskell-build-system) + (inputs + `(("ghc-th-abstraction" ,ghc-th-abstraction))) (home-page "https://github.com/mboes/th-lift") (synopsis "Derive Template Haskell's Lift class for datatypes") (description -- cgit v1.2.3 From 9b6d49e84ab6e3f30753d247437f659c66a8bcd7 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:09:31 -0400 Subject: gnu: ghc-time-locale-compat: Update to 0.1.1.5. * gnu/packages/haskell.scm (ghc-time-locale-compat): Update to 0.1.1.5. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 63a7825ed4..7d63ec7596 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2802,7 +2802,7 @@ with slicing and Clang-style colored diagnostics.") (define-public ghc-time-locale-compat (package (name "ghc-time-locale-compat") - (version "0.1.1.3") + (version "0.1.1.5") (source (origin (method url-fetch) @@ -2811,7 +2811,7 @@ with slicing and Clang-style colored diagnostics.") version ".tar.gz")) (sha256 (base32 - "1vdcfr2hp9qh3ag90x6ikbdf42wiqpdylnplffna54bpnilbyi4i")))) + "0b2hmj8wwrfkndwzgm11qr496ca2ahwdxcj3m0ii91bxvrk1bzq7")))) (build-system haskell-build-system) (inputs `(("ghc-old-locale" ,ghc-old-locale))) (home-page "https://github.com/khibino/haskell-time-locale-compat") -- cgit v1.2.3 From f46cbe1ec4312f3b2e234f1806612b5a60cd74d4 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:09:48 -0400 Subject: gnu: ghc-transformers-base: Update to 0.4.5.2. * gnu/packages/haskell.scm (ghc-transformers-base): Update to 0.4.5.2. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 7d63ec7596..b778e603c8 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2397,7 +2397,7 @@ Hashing\" by Claessen, Pałka for details and the rationale of the design.") (define-public ghc-transformers-base (package (name "ghc-transformers-base") - (version "0.4.4") + (version "0.4.5.2") (source (origin (method url-fetch) @@ -2407,7 +2407,7 @@ Hashing\" by Claessen, Pałka for details and the rationale of the design.") ".tar.gz")) (sha256 (base32 - "11r3slgpgpra6zi2kjg3g60gvv17b1fh6qxipcpk8n86qx7lk8va")))) + "1s256bi0yh0x2hp2gwd30f3mg1cv53zz397dv1yhfsnfzmihrj6h")))) (build-system haskell-build-system) (inputs `(("ghc-stm" ,ghc-stm) -- cgit v1.2.3 From 2a7c296a5df83c42537ea6fc09ef4c96d443a405 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:10:12 -0400 Subject: gnu: ghc-blaze-builder: Update to 0.4.1.0. * gnu/packages/haskell.scm (ghc-blaze-builder): Update to 0.4.1.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index b778e603c8..2d6b9ebd25 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4209,7 +4209,7 @@ pragmas in your code.") (define-public ghc-blaze-builder (package (name "ghc-blaze-builder") - (version "0.4.0.2") + (version "0.4.1.0") (source (origin (method url-fetch) @@ -4219,7 +4219,7 @@ pragmas in your code.") ".tar.gz")) (sha256 (base32 - "1m33y6p5xldni8p4fzg8fmsyqvkfmnimdamr1xjnsmgm3dkf9lws")))) + "05681dih2d8s96an945wkbwl05w8ddbcfx8n3r3ck79ydyb8pz4i")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: Missing test libraries. (inputs -- cgit v1.2.3 From 343c23988ad70f3760691ef1cade25a6a20215bd Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Mon, 3 Sep 2018 22:53:34 -0400 Subject: gnu: ghc-system-filepath-bootstrap: Update to 0.4.14. * gnu/packages/haskell.scm (ghc-system-filepath-bootstrap): Update to 0.4.14. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 2d6b9ebd25..16638af2c5 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7278,7 +7278,7 @@ instance of @code{MonadBase} or @code{MonadBaseControl}.") (define ghc-system-filepath-bootstrap (package (name "ghc-system-filepath-bootstrap") - (version "0.4.13.4") + (version "0.4.14") (source (origin (method url-fetch) @@ -7287,7 +7287,7 @@ instance of @code{MonadBase} or @code{MonadBaseControl}.") version ".tar.gz")) (sha256 (base32 - "1yy5zsmmimhg6iaw9fmpwrxvxrgi5s6bfyqfihdsnx4bjvn7sp9l")))) + "14yras4pz2dh55xpwmazcgxijvi8913pjgzb9iw50mjq1lycwmhn")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) -- cgit v1.2.3 From 6a9730a0c41b7033a600593b2c2720d610919126 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:11:55 -0400 Subject: gnu: ghc-chell: Update to 0.4.0.2. * gnu/packages/haskell.scm (ghc-chell): Update to 0.4.0.2. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 16638af2c5..8ef95a4800 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7399,7 +7399,7 @@ easily work with command-line options.") (define-public ghc-chell (package (name "ghc-chell") - (version "0.4.0.1") + (version "0.4.0.2") (source (origin (method url-fetch) @@ -7408,7 +7408,7 @@ easily work with command-line options.") version ".tar.gz")) (sha256 (base32 - "0lb95abzxl4a87nfqxsxpb3a39pd52cci43hcvj8615hyhqvs2jz")))) + "10ingy9qnbmc8cqh4i9pskcw43l0mzk8f3d76b3qz3fig5ary3j9")))) (build-system haskell-build-system) (inputs `(("ghc-options-bootstrap" ,ghc-options-bootstrap) -- cgit v1.2.3 From 0ceaff6f2fb463cf96b461fc78062128cda20be0 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:12:56 -0400 Subject: gnu: ghc-cmark-gfm: Update to 0.1.5. * gnu/packages/haskell.scm (ghc-cmark-gfm): Update to 0.1.5. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 8ef95a4800..be26a146d7 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5488,7 +5488,7 @@ sources, and does not require prior installation of the C library.") (define-public ghc-cmark-gfm (package (name "ghc-cmark-gfm") - (version "0.1.3") + (version "0.1.5") (source (origin (method url-fetch) @@ -5497,7 +5497,7 @@ sources, and does not require prior installation of the C library.") version ".tar.gz")) (sha256 (base32 - "1fkisbrydmdx5h8yad09fzk8h1b1j53r02g7vb81izgdwj9b673k")))) + "13b0mqks5c1q989slgsa3ixr5vvkfyic4ynzgv00kgl5qrs7hqk7")))) (build-system haskell-build-system) (inputs `(("ghc-text" ,ghc-text))) -- cgit v1.2.3 From 8d75edc01055712004598d66d6d5875e31ff61a8 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:13:30 -0400 Subject: gnu: ghc-mime-types: Update to 0.1.0.8. * gnu/packages/haskell-web.scm (ghc-mime-types): Update to 0.1.0.8. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 190bec8dd2..54eedf5044 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -688,7 +688,7 @@ Haskell.") (define-public ghc-mime-types (package (name "ghc-mime-types") - (version "0.1.0.7") + (version "0.1.0.8") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -696,7 +696,7 @@ Haskell.") version ".tar.gz")) (sha256 (base32 - "1fg9cqpp5lswk8ajlq4f41n12c2v2naz179l8dsz6zisjqj4l5l3")))) + "14ccl2842ya17zyj0bpc7vzklbyqvvydpbypn69h2fmhgji192x8")))) (build-system haskell-build-system) (inputs `(("ghc-text" ,ghc-text))) -- cgit v1.2.3 From d9c620bab0e84ddb882a608027b4d0a537a66c4d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:13:59 -0400 Subject: gnu: ghc-monad-control: Update to 1.0.2.3. * gnu/packages/haskell.scm (ghc-monad-control): Update to 1.0.2.3. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index be26a146d7..1050777b43 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4088,7 +4088,7 @@ monads with anaphoric variants on @code{if} and @code{when} and a C-like (define-public ghc-monad-control (package (name "ghc-monad-control") - (version "1.0.1.0") + (version "1.0.2.3") (source (origin (method url-fetch) @@ -4097,7 +4097,7 @@ monads with anaphoric variants on @code{if} and @code{when} and a C-like "/monad-control-" version ".tar.gz")) (sha256 (base32 - "1x018gi5irznx5rgzmkr2nrgh26r8cvqwkcfc6n6y05pdjf21c6l")))) + "1c92833gr6cadidjdp8mlznkpp8lyxl0w3y7d19y8yi3klc3843c")))) (build-system haskell-build-system) (inputs `(("ghc-stm" ,ghc-stm) -- cgit v1.2.3 From 8ebdab0dc4fa389f5238203eb785a1d17cb1d478 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:14:39 -0400 Subject: gnu: ghc-parsec: Update to 3.1.13.0. * gnu/packages/haskell.scm (ghc-parsec): Update to 3.1.13.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 1050777b43..7994b6c33c 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3712,7 +3712,7 @@ mainstream languages.") (define-public ghc-parsec (package (name "ghc-parsec") - (version "3.1.11") + (version "3.1.13.0") (outputs '("out" "doc")) (source (origin @@ -3722,7 +3722,7 @@ mainstream languages.") version ".tar.gz")) (sha256 - (base32 "0vk7q9j2128q191zf1sg0ylj9s9djwayqk9747k0a5fin4f2b1vg")))) + (base32 "1wc09pyn70p8z6llink10c8pqbh6ikyk554911yfwxv1g91swqbq")))) (build-system haskell-build-system) (native-inputs `(("ghc-hunit" ,ghc-hunit))) -- cgit v1.2.3 From 09b52698babe9a09a4f0aba2f34e1732094b88a1 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 13:20:13 -0400 Subject: gnu: ghc-quickcheck: Update to 2.11.3. This commit also removes extra versions of ghc-quickcheck that have no dependents. * gnu/packages/haskell-check.scm (ghc-quickcheck): Update to 2.11.3. [arguments]: Remove "-f base4" configure flag. (ghc-quickcheck-latest): Delete variable. (ghc-quickcheck-2.9): Delete variable. --- gnu/packages/haskell-check.scm | 34 +++------------------------------- 1 file changed, 3 insertions(+), 31 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 4324c9c44d..57e7f0edc1 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -421,7 +421,7 @@ use HUnit assertions as QuickCheck properties.") (define-public ghc-quickcheck (package (name "ghc-quickcheck") - (version "2.10.1") + (version "2.11.3") (outputs '("out" "doc")) (source (origin @@ -432,11 +432,10 @@ use HUnit assertions as QuickCheck properties.") ".tar.gz")) (sha256 (base32 - "1rfmns3lj3hl93k1jws85ajkkw7z9ll8cw292n9m7zald1w5dfqx")))) + "0xhqk35fkzlbjcqbabg6962jkv8d688nzmz7ng4bm84x2d95d328")))) (build-system haskell-build-system) (arguments - `(#:tests? #f ; FIXME: currently missing libraries used for tests. - #:configure-flags '("-f base4"))) + `(#:tests? #f)) ; FIXME: currently missing libraries used for tests. (inputs `(("ghc-random" ,ghc-random) ("ghc-tf-random" ,ghc-tf-random))) @@ -450,33 +449,6 @@ hold in a large number of randomly generated cases. Specifications are expressed in Haskell, using combinators defined in the QuickCheck library.") (license license:bsd-3))) -(define-public ghc-quickcheck-2.9 - (package - (inherit ghc-quickcheck) - (name "ghc-quickcheck") - (version "2.9.2") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/QuickCheck-2.9.2/QuickCheck-" - version ".tar.gz")) - (sha256 - (base32 - "119np67qvx8hyp9vkg4gr2wv3lj3j6ay2vl4hxspkg43ymb1cp0m")))))) - -(define-public ghc-quickcheck-latest - (package (inherit ghc-quickcheck) - (version "2.11.3") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/QuickCheck/QuickCheck-" - version - ".tar.gz")) - (sha256 - (base32 - "0xhqk35fkzlbjcqbabg6962jkv8d688nzmz7ng4bm84x2d95d328")))))) - (define-public ghc-test-framework (package (name "ghc-test-framework") -- cgit v1.2.3 From e7e74518221a97496d8e1e4b0de61ccf25135ae9 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:17:08 -0400 Subject: gnu: ghc-reflection: Update to 2.1.4. * gnu/packages/haskell.scm (ghc-reflection): Update to 2.1.4. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 7994b6c33c..5df71e87e7 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1649,7 +1649,7 @@ unlit literate code files; and an option to turn off macro-expansion.") (define-public ghc-reflection (package (name "ghc-reflection") - (version "2.1.2") + (version "2.1.4") (source (origin (method url-fetch) @@ -1659,7 +1659,7 @@ unlit literate code files; and an option to turn off macro-expansion.") ".tar.gz")) (sha256 (base32 - "0f9w0akbm6p8h7kzgcd2f6nnpw1wy84pqn45vfz1ch5j0hn8h2d9")))) + "0kf4a5ijw6jfnfibjcrpdy9vzh1n6v2pxia8dhyyqdissiwc8bzj")))) (build-system haskell-build-system) (inputs `(("ghc-tagged" ,ghc-tagged))) (home-page "https://github.com/ekmett/reflection") -- cgit v1.2.3 From 80d06b8d98094a1f0661264e9b6cedae7ebe7cfe Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:17:57 -0400 Subject: gnu: ghc-syb: Update to 0.7. * gnu/packages/haskell.scm (ghc-syb): Update to 0.7. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 5df71e87e7..ae708bd94b 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3447,7 +3447,7 @@ to cases.") (define-public ghc-syb (package (name "ghc-syb") - (version "0.6") + (version "0.7") (outputs '("out" "doc")) (source (origin @@ -3458,7 +3458,7 @@ to cases.") ".tar.gz")) (sha256 (base32 - "1p3cnqjm13677r4a966zffzhi9b3a321aln8zs8ckqj0d9z1z3d3")))) + "1da2zz7gqm4xbkx5vpd74dayx1svaxyl145fl14mq15lbb77sxdq")))) (build-system haskell-build-system) (inputs `(("ghc-hunit" ,ghc-hunit))) -- cgit v1.2.3 From 0588525b0612b394fb1ce18571206c27e4c8f8be Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:18:23 -0400 Subject: gnu: ghc-unix-time: Update to 0.3.8. * gnu/packages/haskell.scm (ghc-unix-time): Update to 0.3.8. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index ae708bd94b..b3441650be 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2447,7 +2447,7 @@ but also need those types.") (define-public ghc-unix-time (package (name "ghc-unix-time") - (version "0.3.7") + (version "0.3.8") (source (origin (method url-fetch) @@ -2457,7 +2457,7 @@ but also need those types.") ".tar.gz")) (sha256 (base32 - "1qdlc9raih8s0m3x8x3n7q3ngh4faw2alv9l78sp6gnx648k0c8i")))) + "051slgpid5cxiaw203ky0ql3823h28fcjs08axkzd4265wrvv8fw")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: Test fails with "System.Time not found". This -- cgit v1.2.3 From 7de7ec7d45e46232771be423b8e575383f154642 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:19:15 -0400 Subject: gnu: ghc-alex: Update to 3.2.4. * gnu/packages/haskell.scm (ghc-alex): Update to 3.2.4. [arguments]: Add a phase to set environment variables for tests. [native-inputs]: Add which. --- gnu/packages/haskell.scm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index b3441650be..f1c358065b 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -994,7 +994,7 @@ package are to parse or generate Haskell 98 code.") (define-public ghc-alex (package (name "ghc-alex") - (version "3.2.3") + (version "3.2.4") (source (origin (method url-fetch) @@ -1004,9 +1004,20 @@ package are to parse or generate Haskell 98 code.") ".tar.gz")) (sha256 (base32 - "0bi1cs9b8ir33h1fl6x2xw4ymygapqbr713ridpf7rmk2wa7jqqs")))) + "0cpjixgsr0b2x4s6hz4aa6gnmjw9i7xd9nlfi8m37zqlidq4v3nm")))) (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'set-check-variables + (lambda _ + (setenv "PATH" (string-append (getcwd) "/dist/build/alex:" + (getenv "PATH"))) + (setenv "alex_datadir" (string-append (getcwd) "/data")) + #t))))) (inputs `(("ghc-quickcheck" ,ghc-quickcheck))) + (native-inputs + `(("which" ,which))) (home-page "https://www.haskell.org/alex/") (synopsis "Tool for generating lexical analysers in Haskell") -- cgit v1.2.3 From fa9c33dc8e012316f3dc3d4d6d0aa7e6cd7df70d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:19:48 -0400 Subject: gnu: ghc-chasingbottoms: Update to 1.3.1.4. * gnu/packages/haskell.scm (ghc-chasingbottoms): Update to 1.3.1.4. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index f1c358065b..c4eee42a6a 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3518,7 +3518,7 @@ encourages inductive, recursive definitions of graph algorithms.") (define-public ghc-chasingbottoms (package (name "ghc-chasingbottoms") - (version "1.3.1.3") + (version "1.3.1.4") (source (origin (method url-fetch) @@ -3526,7 +3526,7 @@ encourages inductive, recursive definitions of graph algorithms.") "ChasingBottoms-" version ".tar.gz")) (sha256 (base32 - "04jwwjs22mqc4hvpp4c3gpb79inrrq5sapks5khknspv2hslm61q")))) + "06cynx6hcbfpky7qq3b3mjjgwbnaxkwin3znbwq4b9ikiw0ng633")))) (build-system haskell-build-system) (inputs `(("ghc-quickcheck" ,ghc-quickcheck) -- cgit v1.2.3 From 4a3f50e36c09e18e10be894141ea996fcae1aa52 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Mon, 3 Sep 2018 22:42:54 -0400 Subject: gnu: ghc-chell-quickcheck: Allow newer QuickCheck. * gnu/packages/haskell.scm (ghc-chell-quickcheck)[arguments]: Add a phase that patches the Cabal file to allow newer versions of QuickCheck. (ghc-chell-quickcheck-bootstrap)[arguments]: Ditto. --- gnu/packages/haskell.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index c4eee42a6a..1294671e76 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7455,7 +7455,14 @@ testing strategies.") ("ghc-random" ,ghc-random) ("ghc-quickcheck" ,ghc-quickcheck))) (arguments - `(#:tests? #f)) + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "chell-quickcheck.cabal" + (("QuickCheck >= 2\\.3 && < 2\\.11") + "QuickCheck >= 2.3 && < 2.12"))))))) (home-page "https://john-millikin.com/software/chell/") (synopsis "QuickCheck support for the Chell testing library") (description "More complex tests for @code{chell}.") @@ -7475,6 +7482,14 @@ testing strategies.") (base32 "1iicsys9igx7m7n4l2b8djardmjy2ah5ibzp7kzs758h460fq53a")))) (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "chell-quickcheck.cabal" + (("QuickCheck >= 2\\.3 && < 2\\.11") + "QuickCheck >= 2.3 && < 2.12"))))))) (inputs `(("ghc-chell" ,ghc-chell) ("ghc-chell-quickcheck-bootstrap" ,ghc-chell-quickcheck-bootstrap) -- cgit v1.2.3 From 38922e49ca4f62e8e10fad8c0a3ee58a4e49d45d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:22:21 -0400 Subject: gnu: ghc-edisoncore: Update to 1.3.2.1. * gnu/packages/haskell.scm (ghc-edisoncore): Update to 1.3.2.1. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 1294671e76..86ec0b2cd5 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4032,14 +4032,14 @@ finite maps and priority queues where the priority and element are distinct.") (define-public ghc-edisoncore (package (name "ghc-edisoncore") - (version "1.3.1.1") + (version "1.3.2.1") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/EdisonCore" "/EdisonCore-" version ".tar.gz")) (sha256 - (base32 "06shxmcqxcahcn6zgl64vlqix4fnq53d97drcgsh94qp7gp201ry")))) + (base32 "0fgj5iwiv3v2gdgx7kjcr15dcs4x1kvmjspp3p99wyhh0x6h3ikk")))) (build-system haskell-build-system) (inputs `(("ghc-quickcheck" ,ghc-quickcheck) -- cgit v1.2.3 From 3ea018c7428d3a08a143dcf917bea0e89bf8f704 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:24:24 -0400 Subject: gnu: ghc-haskell-src: Update to 1.0.3.0. * gnu/packages/haskell.scm (ghc-haskell-src): Update to 1.0.3.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 86ec0b2cd5..44e8960b5e 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -965,7 +965,7 @@ them.") (define-public ghc-haskell-src (package (name "ghc-haskell-src") - (version "1.0.2.0") + (version "1.0.3.0") (source (origin (method url-fetch) @@ -975,7 +975,7 @@ them.") ".tar.gz")) (sha256 (base32 - "19lilhpwnjb7cks9fq1ipnc8f7dwxy0ri3dgjkdxs3i355byw99a")))) + "1g4dj1f0j68bhn4ixfac63wjzy6gsp6kwgxryb1k5nl3i0g99d5l")))) (build-system haskell-build-system) (inputs `(("ghc-happy" ,ghc-happy) -- cgit v1.2.3 From 568cafd56a341266dd3926e54136610728e7ba28 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:27:11 -0400 Subject: gnu: ghc-hs-bibutils: Update to 6.6.0.0. * gnu/packages/haskell.scm (ghc-hs-bibutils): Update to 6.6.0.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 44e8960b5e..101fca3a0e 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -6543,7 +6543,7 @@ provided for those who need a drop-in replacement for Markdown.pl.") (define-public ghc-hs-bibutils (package (name "ghc-hs-bibutils") - (version "6.2.0.1") + (version "6.6.0.0") (source (origin (method url-fetch) @@ -6552,7 +6552,7 @@ provided for those who need a drop-in replacement for Markdown.pl.") version ".tar.gz")) (sha256 (base32 - "0c56sjgg82kjcg5rrplnyn7vf02ccsj3kkcbgc87zxlv0j880rjb")))) + "0n2sz2zl4naspryd49ii858qkjp2lapns5a2gr8zm6vvn5sh1f0l")))) (build-system haskell-build-system) (inputs `(("ghc-syb" ,ghc-syb))) (home-page "https://hackage.haskell.org/package/hs-bibutils") -- cgit v1.2.3 From ddfb799e5d3dda9c773ec752f5638433c0a65185 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:31:17 -0400 Subject: gnu: ghc-indents: Update to 0.5.0.0. * gnu/packages/haskell.scm (ghc-indents): Update to 0.5.0.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 101fca3a0e..fa00f68b83 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2509,7 +2509,7 @@ isn't available, portable implementations are used.") (define-public ghc-indents (package (name "ghc-indents") - (version "0.3.3") + (version "0.5.0.0") (source (origin (method url-fetch) (uri (string-append @@ -2517,7 +2517,7 @@ isn't available, portable implementations are used.") version ".tar.gz")) (sha256 (base32 - "16lz21bp9j14xilnq8yym22p3saxvc9fsgfcf5awn2a6i6n527xn")))) + "1ly3v41jacc6lrsvg4j3m5a6zs90gr8dyif5m6bf34hj1k5cgg0n")))) (build-system haskell-build-system) (inputs `(("ghc-parsec" ,ghc-parsec) -- cgit v1.2.3 From 1a8f5eb2e1b4e0bfe36010ca6bfb568618ecc588 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:32:04 -0400 Subject: gnu: ghc-json: Update to 0.9.2. * gnu/packages/haskell.scm (ghc-json): Update to 0.9.2. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index fa00f68b83..c8dcefeb12 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8101,7 +8101,7 @@ handled safely, this is what you're left with.") (define-public ghc-json (package (name "ghc-json") - (version "0.9.1") + (version "0.9.2") (source (origin (method url-fetch) @@ -8109,7 +8109,7 @@ handled safely, this is what you're left with.") "json-" version ".tar.gz")) (sha256 (base32 - "18l5027vc68hnnxrxlnyl59vkkg95a92m1zzms0dqiby2r6pxdcn")))) + "13kkfgx58z18jphbg56jn08jn72wi3kvfndlwwx87hqwg7x1dfz6")))) (build-system haskell-build-system) (inputs `(("ghc-syb" ,ghc-syb) -- cgit v1.2.3 From 4a2100b8ae3dd3297f2748f312da3586795776bd Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:32:40 -0400 Subject: gnu: ghc-lifted-base: Update to 0.2.3.12. * gnu/packages/haskell.scm (ghc-lifted-base): Update to 0.2.3.12. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index c8dcefeb12..f195563516 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5074,7 +5074,7 @@ It is modeled after doctest for Python, see (define-public ghc-lifted-base (package (name "ghc-lifted-base") - (version "0.2.3.8") + (version "0.2.3.12") (source (origin (method url-fetch) @@ -5084,7 +5084,7 @@ It is modeled after doctest for Python, see ".tar.gz")) (sha256 (base32 - "17yz4n7q96x4cp8vxai8csn2vmpigxvipkfh48arahf91f0xy18n")))) + "1i8p8d3rkdh21bhgjjh32vd7qqjr7jq7p59qds0aw2kmargsjd61")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: Missing testing libraries. (inputs -- cgit v1.2.3 From 4729cfacebe95de6283a4e9efca319f3af400991 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:33:13 -0400 Subject: gnu: ghc-multipart: Update to 0.1.3. * gnu/packages/haskell-web.scm (ghc-multipart): Update to 0.1.3. [inputs]: Add ghc-stringsearch. --- gnu/packages/haskell-web.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 54eedf5044..bb4f419e66 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -911,7 +911,7 @@ of a JSON value into a @code{Data.Aeson.Value}.") (define-public ghc-multipart (package (name "ghc-multipart") - (version "0.1.2") + (version "0.1.3") (source (origin (method url-fetch) @@ -921,9 +921,11 @@ of a JSON value into a @code{Data.Aeson.Value}.") ".tar.gz")) (sha256 (base32 - "0g04jhyw1ib1s7c9bcldyyn4n90qd9x7dmvic4vgq57bgcqgnhz5")))) + "1x4n4yyva22dhfr1pg5ki112qvvzb4hyd7bwpm189iq4gcp52q4z")))) (build-system haskell-build-system) - (inputs `(("ghc-parsec" ,ghc-parsec))) + (inputs + `(("ghc-parsec" ,ghc-parsec) + ("ghc-stringsearch" ,ghc-stringsearch))) (home-page "http://www.github.com/silkapp/multipart") (synopsis -- cgit v1.2.3 From 3e6fe51f9a332315e9d90c3b0e6cd8299b7df3b8 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:35:41 -0400 Subject: gnu: ghc-regex-tdfa: Update to 1.2.3.1. * gnu/packages/haskell.scm (ghc-regex-tdfa): Update to 1.2.3.1. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index f195563516..f44eadbbe8 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -6876,7 +6876,7 @@ regular expressions. Parsers can be built using Applicative interface.") (define-public ghc-regex-tdfa (package (name "ghc-regex-tdfa") - (version "1.2.2") + (version "1.2.3.1") (source (origin (method url-fetch) @@ -6885,7 +6885,7 @@ regular expressions. Parsers can be built using Applicative interface.") version ".tar.gz")) (sha256 (base32 - "0f8x8wyr6m21g8dnxvnvalz5bsq37l125l6qhs0fscbvprsxc4nb")))) + "0l7ajnh4hpgggf2a1r9dg0hx2fy679vd2kada5y7r02hy3nfxala")))) (build-system haskell-build-system) (inputs `(("ghc-parsec" ,ghc-parsec) -- cgit v1.2.3 From 17539a7ed1abba1f69045baf505581d0b5f2ccd2 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 20:59:40 -0400 Subject: gnu: ghc-safe: Update to 0.3.17. * gnu/packages/haskell.scm (ghc-safe): Update to 0.3.17. [native-inputs]: Add ghc-quickcheck. --- gnu/packages/haskell.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index f44eadbbe8..a4bb28eecd 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3144,7 +3144,7 @@ style.") (define-public ghc-safe (package (name "ghc-safe") - (version "0.3.9") + (version "0.3.17") (source (origin (method url-fetch) @@ -3154,8 +3154,10 @@ style.") ".tar.gz")) (sha256 (base32 - "1jdnp5zhvalf1xy8i872n29nljfjz6lnl9ghj80ffisrnnkrwcfh")))) + "0p3yaf5slvyz1cyy51jq64c5rlp8yzwim8iy2dlnk42if4gc9ibr")))) (build-system haskell-build-system) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck))) (home-page "https://github.com/ndmitchell/safe#readme") (synopsis "Library of safe (exception free) functions") (description "This library provides wrappers around @code{Prelude} and -- cgit v1.2.3 From 5285d61490f1c4fbdbdc82ad6e6daaab863e1a46 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:36:52 -0400 Subject: gnu: ghc-split: Update to 0.2.3.3. * gnu/packages/haskell.scm (ghc-split): Update to 0.2.3.3. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index a4bb28eecd..a555cea5e9 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3700,7 +3700,7 @@ colored output using the ansi-terminal package.") (define-public ghc-split (package (name "ghc-split") - (version "0.2.3.1") + (version "0.2.3.3") (outputs '("out" "doc")) (source (origin @@ -3711,7 +3711,7 @@ colored output using the ansi-terminal package.") ".tar.gz")) (sha256 (base32 - "12660m16c6sib3laaxn6w9s453pyx1b49myrmzfij372vq5bc5bn")))) + "04qlmkcyklznl03gsjg95b4nzb6i96gdapqg60rny9szgi7ngk8x")))) (build-system haskell-build-system) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck))) -- cgit v1.2.3 From 46f8898118ae2b27d42c005a520064d5c53c0ab9 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:37:49 -0400 Subject: gnu: ghc-th-expand-syns: Update to 0.4.4.0. * gnu/packages/haskell.scm (ghc-th-expand-syns): Update to 0.4.4.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index a555cea5e9..2601db0a99 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5682,7 +5682,7 @@ instances. This package provides orphan instances for @code{containers}, (define-public ghc-th-expand-syns (package (name "ghc-th-expand-syns") - (version "0.4.0.0") + (version "0.4.4.0") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -5690,7 +5690,7 @@ instances. This package provides orphan instances for @code{containers}, version ".tar.gz")) (sha256 (base32 - "1sjy7a17zwyvlbkc8gklii67sy78wpnw35fyb00lsbnpk4cryd2r")))) + "01prlvh3py5hq5ccjidfyp9ixq2zd88dkbsidyjrpkja6v8m43yc")))) (build-system haskell-build-system) (inputs `(("ghc-syb" ,ghc-syb))) -- cgit v1.2.3 From 9e3e6ee026c95deafef7f4532a1333863f3e5d81 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:39:54 -0400 Subject: gnu: ghc-utility-ht: Update to 0.0.14. * gnu/packages/haskell.scm (ghc-utility-ht): Update to 0.0.14. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 2601db0a99..575a7be4a8 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7808,14 +7808,14 @@ Accessor to access state in transformers State monad.") (define-public ghc-utility-ht (package (name "ghc-utility-ht") - (version "0.0.12") + (version "0.0.14") (home-page "https://hackage.haskell.org/package/utility-ht") (source (origin (method url-fetch) (uri (string-append home-page "/utility-ht-" version ".tar.gz")) (sha256 - (base32 "1vq5bd51rl9l5lgfmaqxgiggddk38hzgngcj7qgrqnalcd1myi54")))) + (base32 "1a7bgk7wv7sqbxbiv7kankiimr3wij7zdm7s83zwsf886ghyxhk9")))) (build-system haskell-build-system) (inputs `(("ghc-quickcheck" ,ghc-quickcheck))) (synopsis "Haskell helper functions for Lists, Maybes, Tuples, Functions") -- cgit v1.2.3 From 57203a15cb2d1c6164b20d16cbb60c02b63dc305 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 30 Aug 2018 10:57:38 -0400 Subject: gnu: ghc-vector: Update Cabal file to r3. * gnu/packages/haskell.scm (ghc-vector): Update Cabal file to r3. --- gnu/packages/haskell.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 575a7be4a8..caa8c681cc 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3823,7 +3823,10 @@ speed, flexibility, and quality of parse errors.") (build-system haskell-build-system) ;; FIXME: To simplify upgrading all Haskell packages, we leave the tests ;; disabled for now. - (arguments `(#:tests? #f)) + (arguments + `(#:cabal-revision + ("3" "0y5rh8k710i2a3p1h2rghvr5cfg78p5h0kbfi7ifxqqf6pzlyr1x") + #:tests? #f)) (inputs `(("ghc-primitive" ,ghc-primitive) ("ghc-random" ,ghc-random) -- cgit v1.2.3 From 50eff0d5ff2d50038f652a44f12410160651c389 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:41:35 -0400 Subject: gnu: ghc-boxes: Update to 0.1.5. * gnu/packages/haskell.scm (ghc-boxes): Update to 0.1.5. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index caa8c681cc..481502857b 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5226,14 +5226,14 @@ notation}.") (define-public ghc-boxes (package (name "ghc-boxes") - (version "0.1.4") + (version "0.1.5") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/boxes/boxes-" version ".tar.gz")) (sha256 - (base32 "1n7xiplzd3s1a39nizwjcgsh3wi2348mp21c3fk19v98ialfjgjf")))) + (base32 "1hsnmw95i58d4bkpxby3ddsj1cawypw4mdyb18m393s5i8p7iq9q")))) (build-system haskell-build-system) (inputs `(("ghc-split" ,ghc-split) -- cgit v1.2.3 From 38f0d04e5971d4228824300f278cd7d6930d8893 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:43:08 -0400 Subject: gnu: ghc-juicypixels: Update to 3.2.9.5. * gnu/packages/haskell.scm (ghc-juicypixels): Update to 3.2.9.5. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 481502857b..e1c81f28b2 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -6003,7 +6003,7 @@ do on-demand loading.") (define-public ghc-juicypixels (package (name "ghc-juicypixels") - (version "3.2.9.3") + (version "3.2.9.5") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -6011,7 +6011,7 @@ do on-demand loading.") version ".tar.gz")) (sha256 (base32 - "14s57fgf6kd5n5al2kcvk1aaxbq1ph0r5h8blflrjkx83yl6r8yn")))) + "0mf3ihr0xy2wc2wzb9a17g0n3p60x7pvm8akwpvhdy8klvs6r744")))) (build-system haskell-build-system) (inputs `(("ghc-zlib" ,ghc-zlib) -- cgit v1.2.3 From 19b29882878a6558e5f16d587265eb3a0c0cdec6 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:43:52 -0400 Subject: gnu: ghc-language-c: Update to 0.8.1. * gnu/packages/haskell.scm (ghc-language-c): Update to 0.8.1. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index e1c81f28b2..aaf9f6c6a2 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7950,7 +7950,7 @@ dependency.") (define-public ghc-language-c (package (name "ghc-language-c") - (version "0.5.0") + (version "0.8.1") (source (origin (method url-fetch) @@ -7958,7 +7958,7 @@ dependency.") "language-c/language-c-" version ".tar.gz")) (sha256 (base32 - "08i2bl7jmmymn2sldzlbz6ig7lx3wfwhlpadzibs3fx72z08pmc6")))) + "0sdkjj0hq8p69fcdm6ljbjkjvrsrb8a6rl5dq6dj6byj32ajrm3d")))) (build-system haskell-build-system) (inputs `(("ghc-syb" ,ghc-syb))) (native-inputs -- cgit v1.2.3 From 5209fc22e1fe1c24f154b0eeecc2b5587aa64a1f Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:46:48 -0400 Subject: gnu: ghc-th-reify-many: Update to 0.1.8. * gnu/packages/haskell.scm (ghc-th-reify-many): Update to 0.1.8. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index aaf9f6c6a2..fce0c81c3e 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5707,7 +5707,7 @@ instances. This package provides orphan instances for @code{containers}, (define-public ghc-th-reify-many (package (name "ghc-th-reify-many") - (version "0.1.6") + (version "0.1.8") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -5715,7 +5715,7 @@ instances. This package provides orphan instances for @code{containers}, version ".tar.gz")) (sha256 (base32 - "1b76zjxkj0v0n8zj9l0nwav2irm0c43rx6qjihfw8klmmxvx59df")))) + "0hzy6hvhvcd6i60vx5cp2b7ggmnnjh9rx4h8bm8xw4grglcaxjnf")))) (build-system haskell-build-system) (inputs `(("ghc-safe" ,ghc-safe) -- cgit v1.2.3 From d9404fc122530b21e00ec3d150742d9c20dee66a Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:36:42 -0400 Subject: gnu: ghc-vector-algorithms: Update to 0.7.0.4. * gnu/packages/haskell.scm (ghc-vector-algorithms): Update to 0.7.0.4. [arguments]: Remove unneeded "--allow-newer=vector" configure flag; remove test-patching phase. [inputs]: Remove ghc-mwc-random. --- gnu/packages/haskell.scm | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index fce0c81c3e..6036a12ee1 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8490,7 +8490,7 @@ between 2 and 3 times faster than the Mersenne Twister.") (define-public ghc-vector-algorithms (package (name "ghc-vector-algorithms") - (version "0.7.0.1") + (version "0.7.0.4") (source (origin (method url-fetch) @@ -8499,22 +8499,10 @@ between 2 and 3 times faster than the Mersenne Twister.") "vector-algorithms-" version ".tar.gz")) (sha256 (base32 - "0w4hf598lpxfg58rnimcqxrbnpqq2jmpjx82qa5md3q6r90hlipd")))) + "0mfa8ig9v69l41p2vb5jl4qmaln5y1rlzarr2mlgm8g1nvq8qqdg")))) (build-system haskell-build-system) - ;; The limits have been adjusted in a revision of the cabal file. - (arguments - '(#:configure-flags (list "--allow-newer=vector") - #:phases - (modify-phases %standard-phases - ;; The tests cannot be built due to type errors. - (add-after 'unpack 'do-not-build-quickcheck-tests - (lambda _ - (substitute* "vector-algorithms.cabal" - (("\\!flag\\(properties\\)") "True")) - #t))))) (inputs - `(("ghc-vector" ,ghc-vector) - ("ghc-mwc-random" ,ghc-mwc-random))) + `(("ghc-vector" ,ghc-vector))) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck))) (home-page "https://github.com/bos/math-functions") -- cgit v1.2.3 From bc8bda501cb8d9156afe001a440589b893d7b110 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:37:21 -0400 Subject: gnu: ghc-test-framework: Update to 0.8.2.0. * gnu/packages/haskell.scm (ghc-semigroups-bootstrap, ghc-hashable-bootstrap, ghc-nats-bootstrap, ghc-unordered-containers-bootstrap): New variables for breaking a dependency cycle with ghc-test-framework. * gnu/packages/haskell-check.scm (ghc-test-framework): Update to 0.8.2.0. [arguments]: Add a phase to patch the Cabal file to allow a newer QuickCheck. [inputs]: Add ghc-semigroups-bootstrap. --- gnu/packages/haskell-check.scm | 16 ++++++++++++---- gnu/packages/haskell.scm | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 57e7f0edc1..a9ff6af041 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -452,7 +452,7 @@ expressed in Haskell, using combinators defined in the QuickCheck library.") (define-public ghc-test-framework (package (name "ghc-test-framework") - (version "0.8.1.1") + (version "0.8.2.0") (source (origin (method url-fetch) @@ -460,10 +460,17 @@ expressed in Haskell, using combinators defined in the QuickCheck library.") "test-framework-" version ".tar.gz")) (sha256 (base32 - "0wxjgdvb1c4ykazw774zlx86550848wbsvgjgcrdzcgbb9m650vq")))) + "1hhacrzam6b8f10hyldmjw8pb7frdxh04rfg3farxcxwbnhwgbpm")))) (build-system haskell-build-system) (arguments - `(#:configure-flags (list "--allow-newer=time"))) + `(#:tests? #f ; FIXME: Tests do not build. + #:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "test-framework.cabal" + (("QuickCheck >= 2\\.3 && < 2\\.10") + "QuickCheck >= 2.3 && < 2.12"))))))) (native-inputs `(("ghc-hunit" ,ghc-hunit) ("ghc-quickcheck" ,ghc-quickcheck))) @@ -475,7 +482,8 @@ expressed in Haskell, using combinators defined in the QuickCheck library.") ("ghc-random" ,ghc-random) ("ghc-regex-posix" ,ghc-regex-posix) ("ghc-xml" ,ghc-xml) - ("ghc-libxml" ,ghc-libxml))) + ("ghc-libxml" ,ghc-libxml) + ("ghc-semigroups" ,ghc-semigroups-bootstrap))) (home-page "https://batterseapower.github.io/test-framework/") (synopsis "Framework for running and organising tests") (description diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 6036a12ee1..a12e7e894b 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2266,6 +2266,14 @@ data structures. The package provides instances for basic types and a way to combine hash values.") (license license:bsd-3))) +(define-public ghc-hashable-bootstrap + (package + (inherit ghc-hashable) + (name "ghc-hashable-bootstrap") + (arguments `(#:tests? #f)) + (native-inputs '()) + (properties '((hidden? #t))))) + (define-public ghc-hashable-time (package (name "ghc-hashable-time") @@ -3580,6 +3588,15 @@ optimized for performance critical use, both in terms of large data quantities and high speed.") (license license:bsd-3))) +(define-public ghc-unordered-containers-bootstrap + (package + (inherit ghc-unordered-containers) + (name "ghc-unordered-containers-bootstrap") + (arguments `(#:tests? #f)) + (inputs + `(("ghc-hashable" ,ghc-hashable-bootstrap))) + (properties '(hidden? #t)))) + (define-public ghc-uniplate (package (name "ghc-uniplate") @@ -4569,6 +4586,14 @@ Compatibility package for older packages.") (description "This library provides the natural numbers for Haskell.") (license license:bsd-3))) +(define-public ghc-nats-bootstrap + (package + (inherit ghc-nats) + (name "ghc-nats-bootstrap") + (inputs + `(("ghc-hashable" ,ghc-hashable-bootstrap))) + (properties '((hidden? #t))))) + (define-public ghc-void (package (name "ghc-void") @@ -4889,6 +4914,18 @@ where every element did not have to have an inverse, thus the name semigroup.") (license license:bsd-3))) +(define-public ghc-semigroups-bootstrap + (package + (inherit ghc-semigroups) + (name "ghc-semigroups-bootstrap") + (inputs + `(("ghc-nats" ,ghc-nats-bootstrap) + ("ghc-tagged" ,ghc-tagged) + ("ghc-unordered-containers" ,ghc-unordered-containers-bootstrap) + ("ghc-text" ,ghc-text) + ("ghc-hashable" ,ghc-hashable-bootstrap))) + (properties '(hidden? #t)))) + (define-public ghc-free (package (name "ghc-free") -- cgit v1.2.3 From aeb1c6abd5b0f6e02ad569bb50e1fb740165f094 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 30 Aug 2018 11:12:46 -0400 Subject: gnu: ghc-test-framework-hunit: Update Cabal file to r3. * gnu/packages/haskell-check.scm (ghc-test-framework-hunit): Update Cabal file to r3. [arguments]: Remove unneeded "--allow-newer" configure flag. --- gnu/packages/haskell-check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index a9ff6af041..3bef4e5802 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -508,9 +508,9 @@ reporting and test statistics output.") (base32 "1y0b6vg8nfm43v90lxxcydhi6qlxhfy4vpxbzm5ic2w55bh8xjwm")))) (build-system haskell-build-system) - ;; The official revision of the cabal file allows for HUnit lower than 1.7 (arguments - `(#:configure-flags (list "--allow-newer=HUnit"))) + `(#:cabal-revision + ("3" "0i9mlalv7cl1iq43ld5myrnpszq5rxmd79hk495dcb08rglhgl3z"))) (inputs `(("ghc-extensible-exceptions" ,ghc-extensible-exceptions) ("ghc-hunit" ,ghc-hunit) -- cgit v1.2.3 From c2d2f27537367ac9248cc0162a86e258bcb4a673 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 30 Aug 2018 11:16:01 -0400 Subject: gnu: ghc-test-framework-quickcheck2: Update Cabal file to r1. * gnu/packages/haskell-check.scm (ghc-test-framework-quickcheck2): Update Cabal file to r1. --- gnu/packages/haskell-check.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 3bef4e5802..ef19645346 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -535,6 +535,9 @@ reporting and test statistics output.") (base32 "0vj834337r6jzr3258cv68ly2sv5999mklpsrfngyk51kywsyqyp")))) (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("1" "147ngmfdkskyg7mwsp5w73a4dbx3rp5s38bci3z03kn1m093lxff"))) (inputs `(("ghc-extensible-exceptions" ,ghc-extensible-exceptions) ("ghc-quickcheck" ,ghc-quickcheck) -- cgit v1.2.3 From d09b2ad42801e974eb433593891b51f9894147d9 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:07:16 -0400 Subject: gnu: ghc-x11: Update to 1.9. * gnu/packages/haskell.scm (ghc-x11): Update to 1.9. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index a12e7e894b..1b66d88faa 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1968,14 +1968,14 @@ environment variables.") (define-public ghc-x11 (package (name "ghc-x11") - (version "1.8") + (version "1.9") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/X11/" "X11-" version ".tar.gz")) (sha256 - (base32 "13lxq36856fzp61y4api78vssykyh8fm2aplr0nsj18ymdm1c6sl")))) + (base32 "1f8dy6ckkyvpcv7zlniyv01cqjb9lgqscm8pml58cvwc7n38w4qh")))) (build-system haskell-build-system) (inputs `(("libx11" ,libx11) -- cgit v1.2.3 From 5e4058ad85416bc256bc414df4985bbfd4e5eeac Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Mon, 3 Sep 2018 21:19:12 -0400 Subject: gnu: ghc-bytestring-handle: Allow newer base and QuickCheck. * gnu/packages/haskell.scm (ghc-bytestring-handle)[arguments]: Add a phase that patches the Cabal file to allow newer versions of base and QuickCheck. --- gnu/packages/haskell.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 1b66d88faa..d8cd4cbba5 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7008,6 +7008,16 @@ this problem.") (base32 "18f17aja1ivhr3zyg2cccn2m03hdn5jf5410dndkhf12gvgiqs7y")))) (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "bytestring-handle.cabal" + (("QuickCheck >= 2\\.1\\.2 && < 2\\.11") + "QuickCheck >= 2.1.2 && < 2.12") + (("base >= 4\\.2 && < 4\\.11") + "base >= 4.2 && < 4.12"))))))) (inputs `(("ghc-hunit" ,ghc-hunit) ("ghc-quickcheck" ,ghc-quickcheck) -- cgit v1.2.3 From 91ffeed70a451620dcd4f87d29bb4c40e5057f47 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:52:17 -0400 Subject: gnu: ghc-cereal: Update to 0.5.7.0. * gnu/packages/haskell.scm (ghc-cereal): Update to 0.5.7.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index d8cd4cbba5..eb1c34c1fe 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2939,7 +2939,7 @@ Dual to @code{Traversable}.") (define-public ghc-cereal (package (name "ghc-cereal") - (version "0.5.3.0") + (version "0.5.7.0") (source (origin (method url-fetch) @@ -2949,7 +2949,7 @@ Dual to @code{Traversable}.") ".tar.gz")) (sha256 (base32 - "1x4aib7nnaf4x2b9zlndq5n5zsqniw78jifkf55nhnbmvryf05n3")))) + "1j7imh2mzqcljld7sx0av69699955rpy3hzivi5723i6a9nszgbs")))) (build-system haskell-build-system) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck) -- cgit v1.2.3 From 5f4327df7fb03363f6cc0be9a97886aff6f76953 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 31 Aug 2018 15:16:24 -0400 Subject: gnu: ghc-deepseq-generics: Update Cabal file to r2. * gnu/packages/haskell.scm (ghc-deepseq-generics): Update Cabal file to r2. --- gnu/packages/haskell.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index eb1c34c1fe..b6657f115f 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5295,6 +5295,9 @@ using a simple box model.") (base32 "17bwghc15mc9pchfd1w46jh2p3wzc86aj6a537wqwxn08rayzcxh")))) (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("2" "1pnidf8w8x0w5fsqgv8hhrw07slmhxwy5x4fikgk0bd6k76aqicb"))) (native-inputs `(("ghc-hunit" ,ghc-hunit) ("ghc-test-framework" ,ghc-test-framework) -- cgit v1.2.3 From d340ee858f82c9e34da87deb2a62d27b22415959 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Mon, 3 Sep 2018 23:35:30 -0400 Subject: gnu: ghc-edit-distance: Replace "--allow-newer" flag. * gnu/packages/haskell.scm (ghc-edit-distance)[arguments]: Replace "--allow-newer" configure flag with a phase that patches the Cabal file. --- gnu/packages/haskell.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index b6657f115f..ec262f143f 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -6208,7 +6208,13 @@ representations of current time.") (base32 "0jkca97zyv23yyilp3jydcrzxqhyk27swhzh82llvban5zp8b21y")))) (build-system haskell-build-system) (arguments - `(#:configure-flags (list "--allow-newer=QuickCheck"))) + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "edit-distance.cabal" + (("QuickCheck >= 2\\.4 && <2\\.9") + "QuickCheck >= 2.4 && < 2.12"))))))) (inputs `(("ghc-random" ,ghc-random) ("ghc-test-framework" ,ghc-test-framework) -- cgit v1.2.3 From 5f192d52a31d58e25c809e18cb4361f2df611532 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:53:55 -0400 Subject: gnu: ghc-exceptions: Update to 0.10.0. * gnu/packages/haskell.scm (ghc-exceptions): Update to 0.10.0. [arguments]: Remove unneeded "--allow-newer=QuickCheck" configure flag. [native-inputs]: Add ghc-quickcheck, ghc-test-framework, and ghc-test-framework-hunit. --- gnu/packages/haskell.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index ec262f143f..ee88b89c9a 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3302,7 +3302,7 @@ consuming feeds in both RSS (Really Simple Syndication) and Atom format.") (define-public ghc-exceptions (package (name "ghc-exceptions") - (version "0.8.3") + (version "0.10.0") (source (origin (method url-fetch) @@ -3312,12 +3312,12 @@ consuming feeds in both RSS (Really Simple Syndication) and Atom format.") ".tar.gz")) (sha256 (base32 - "1gl7xzffsqmigam6zg0jsglncgzxqafld2p6kb7ccp9xirzdjsjd")))) + "1ms9zansv0pwzwdjncvx4kf18lnkjy2p61hvjhvxmjx5bqp93p8y")))) (build-system haskell-build-system) - (arguments - `(#:configure-flags (list "--allow-newer=QuickCheck"))) (native-inputs - `(("ghc-test-framework" ,ghc-test-framework) + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) (inputs `(("ghc-stm" ,ghc-stm) -- cgit v1.2.3 From 9c072f820e05736e4e6536192d0af213e0277408 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:54:47 -0400 Subject: gnu: ghc-fingertree: Update to 0.1.4.1. * gnu/packages/haskell.scm (ghc-fingertree): Update to 0.1.4.1. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index ee88b89c9a..e23ebb6afe 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4348,7 +4348,7 @@ will eventually deliver a value of type @code{a}.") (define-public ghc-fingertree (package (name "ghc-fingertree") - (version "0.1.3.0") + (version "0.1.4.1") (source (origin (method url-fetch) @@ -4357,7 +4357,7 @@ will eventually deliver a value of type @code{a}.") version ".tar.gz")) (sha256 (base32 - "1ryjj7qrx70ckcjlr02x9zh86kfp76azbxq05r7hawqkaqg44sfs")))) + "192fyzv0pn1437wdpqg1l80rswkk4rw3w61r4bq7dhv354bdqy4p")))) (build-system haskell-build-system) (native-inputs `(("ghc-hunit" ,ghc-hunit) -- cgit v1.2.3 From c496fb987316251a5ff8d491d83bd76b13fa9d25 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:58:23 -0400 Subject: gnu: ghc-hashable: Update to 1.2.7.0. * gnu/packages/haskell.scm (ghc-hashable): Update to 1.2.7.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index e23ebb6afe..85889b20dc 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2235,7 +2235,7 @@ IO operations.") (define-public ghc-hashable (package (name "ghc-hashable") - (version "1.2.6.1") + (version "1.2.7.0") (outputs '("out" "doc")) (source (origin @@ -2246,7 +2246,7 @@ IO operations.") ".tar.gz")) (sha256 (base32 - "0ymv2mcrrgbdc2w39rib171fwnhg7fgp0sy4h8amrh1vw64qgjll")))) + "1gra8gq3kb7b2sd845h55yxlrfqx3ii004c6vjhga8v0b30fzdgc")))) (build-system haskell-build-system) (inputs `(("ghc-text" ,ghc-text) -- cgit v1.2.3 From c1c35c3b0e853b2a422cd40ddef35ec741d23481 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:59:41 -0400 Subject: gnu: ghc-sha: Update to 1.6.4.4. * gnu/packages/haskell-crypto.scm (ghc-sha): Update to 1.6.4.4. --- gnu/packages/haskell-crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index 6a1eff6821..c675564a77 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -391,14 +391,14 @@ interface.") (define-public ghc-sha (package (name "ghc-sha") - (version "1.6.4.2") + (version "1.6.4.4") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "SHA/SHA-" version ".tar.gz")) (sha256 (base32 - "134ajm87fm4lpsw86m9q8apv20dw4bpk46raa389zr6bcdpifw64")))) + "0i4b2wjisivdy72synal711ywhx05mfqfba5n65rk8qidggm1nbb")))) (build-system haskell-build-system) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck) -- cgit v1.2.3 From b925e1f537c37f46c324b737888ce8290deb1ea8 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:49:09 -0400 Subject: gnu: ghc-async: Update to 2.2.1. * gnu/packages/haskell.scm (ghc-async): Update to 2.2.1. [inputs]: Add ghc-hashable. --- gnu/packages/haskell.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 85889b20dc..3bd1757f80 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4320,7 +4320,7 @@ library for Haskell.") (define-public ghc-async (package (name "ghc-async") - (version "2.1.1.1") + (version "2.2.1") (source (origin (method url-fetch) @@ -4330,10 +4330,11 @@ library for Haskell.") ".tar.gz")) (sha256 (base32 - "1qj4fp1ynwg0l453gmm27vgkzb5k5m2hzdlg5rdqi9kf8rqy90yd")))) + "09whscli1q5z7lzyq9rfk0bq1ydplh6pjmc6qv0x668k5818c2wg")))) (build-system haskell-build-system) (inputs `(("ghc-stm" ,ghc-stm) + ("ghc-hashable" ,ghc-hashable) ("ghc-hunit" ,ghc-hunit) ("ghc-test-framework" ,ghc-test-framework) ("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) -- cgit v1.2.3 From f5aa584541f076773e5b226e09ae3fcc8d8142c2 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:00:05 -0400 Subject: gnu: ghc-case-insensitive: Update to 1.2.0.11. * gnu/packages/haskell.scm (ghc-case-insensitive): Update to 1.2.0.11. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 3bd1757f80..c82fd2aafe 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3434,7 +3434,7 @@ writing to stdout and other handles.") (define-public ghc-case-insensitive (package (name "ghc-case-insensitive") - (version "1.2.0.7") + (version "1.2.0.11") (outputs '("out" "doc")) (source (origin @@ -3445,7 +3445,7 @@ writing to stdout and other handles.") ".tar.gz")) (sha256 (base32 - "1j6ahvrz1g5q89y2difyk838yhwjc8z67zr0v2z512qdznc3h38n")))) + "1qrpxfirsxckg7jv28f5ah2qc8lh95hp7rnqkbqs1ahcwlbnvkm7")))) (build-system haskell-build-system) (inputs `(("ghc-hunit" ,ghc-hunit))) -- cgit v1.2.3 From 0f108b33a727f338a8a71757a132d5b599c7237c Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:01:17 -0400 Subject: gnu: ghc-crypto-api: Update to 0.13.3. * gnu/packages/haskell-crypto.scm (ghc-crypto-api): Update to 0.13.3. --- gnu/packages/haskell-crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index c675564a77..f27d7dc23a 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -107,7 +107,7 @@ when ASN1 pattern matching is not convenient.") (define-public ghc-crypto-api (package (name "ghc-crypto-api") - (version "0.13.2") + (version "0.13.3") (source (origin (method url-fetch) @@ -116,7 +116,7 @@ when ASN1 pattern matching is not convenient.") "crypto-api-" version ".tar.gz")) (sha256 (base32 - "1vc27qcgbg7hf50rkqhlrs58zn1888ilh4b6wrrm07bnm48xacak")))) + "19bsmkqkpnvh01b77pmyarx00fic15j4hvg4pzscrj4prskrx2i9")))) (build-system haskell-build-system) (inputs `(("ghc-cereal" ,ghc-cereal) ("ghc-tagged" ,ghc-tagged) -- cgit v1.2.3 From 24e18bf937f80aa28f2f9d3d1b587b2cc1ae9c9e Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:01:33 -0400 Subject: gnu: ghc-errors: Update to 2.3.0. * gnu/packages/haskell.scm (ghc-errors): Update to 2.3.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index c82fd2aafe..c81b37a7c3 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8405,7 +8405,7 @@ matching patterns against file paths.") (define-public ghc-errors (package (name "ghc-errors") - (version "2.2.2") + (version "2.3.0") (source (origin (method url-fetch) @@ -8414,7 +8414,7 @@ matching patterns against file paths.") "errors-" version ".tar.gz")) (sha256 (base32 - "13sflhglcm5skwrxb48fw96skdcx7ydiy4zg22200733pxhjncpn")))) + "0x8znwn31qcx6kqx99wp7bc86kckfb39ncz3zxvj1s07kxlfawk7")))) (build-system haskell-build-system) (inputs `(("ghc-exceptions" ,ghc-exceptions) -- cgit v1.2.3 From 75c07ef5199179cba554a733048d21649f6c0d15 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 31 Aug 2018 15:13:10 -0400 Subject: gnu: ghc-hashable-time: Update Cabal file to r1. * gnu/packages/haskell.scm (ghc-hashable-time): Update Cabal file to r1. --- gnu/packages/haskell.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index c81b37a7c3..bfc061c107 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2289,6 +2289,9 @@ combine hash values.") (base32 "0k932nyd08l3xxbh2g3n76py2f4kd9yw4s5a065vjz0xp6wjnxdm")))) (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("1" "0rv40xkg3gj8jnqsry1gq3f5s5la6d5arg8fzkirnwdpcgha1as6"))) (inputs `(("ghc-hashable" ,ghc-hashable))) (home-page "http://hackage.haskell.org/package/hashable-time") (synopsis "Hashable instances for Data.Time") -- cgit v1.2.3 From fef71dbc9d28cccda627922d036ebf70844dbc84 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 6 Sep 2018 14:13:09 -0400 Subject: gnu: ghc-hashtables: Update to 1.2.3.1. * gnu/packages/haskell.scm (ghc-hashtables): Update to 1.2.3.1. [arguments]: Remove unneeded "--allow-newer" configure flag. --- gnu/packages/haskell.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index bfc061c107..c4dbbc7d75 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7804,7 +7804,7 @@ Haskell, using gnuplot for rendering.") (define-public ghc-hashtables (package (name "ghc-hashtables") - (version "1.2.1.0") + (version "1.2.3.1") (source (origin (method url-fetch) @@ -7812,10 +7812,8 @@ Haskell, using gnuplot for rendering.") "https://hackage.haskell.org/package/hashtables/hashtables-" version ".tar.gz")) (sha256 - (base32 "1b6w9xznk42732vpd8ili60k12yq190xnajgga0iwbdpyg424lgg")))) + (base32 "1giw9caajr07slf09j7zry9b0kvm4yj9q78zy1mawzi6gk3wglcg")))) (build-system haskell-build-system) - (arguments - `(#:configure-flags (list "--allow-newer=vector"))) (inputs `(("ghc-hashable" ,ghc-hashable) ("ghc-primitive" ,ghc-primitive) -- cgit v1.2.3 From d62f695119ff036762c93c5b8464c9ca5448e2c5 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:04:02 -0400 Subject: gnu: ghc-nats: Update to 1.1.2. * gnu/packages/haskell.scm (ghc-nats): Update to 1.1.2. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index c4dbbc7d75..6230270f30 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4570,7 +4570,7 @@ Compatibility package for older packages.") (define-public ghc-nats (package (name "ghc-nats") - (version "1.1.1") + (version "1.1.2") (source (origin (method url-fetch) @@ -4580,7 +4580,7 @@ Compatibility package for older packages.") ".tar.gz")) (sha256 (base32 - "1kfl2yy97nb7q0j17v96rl73xvi3z4db9bk0xychc76dax41n78k")))) + "1v40drmhixck3pz3mdfghamh73l4rp71mzcviipv1y8jhrfxilmr")))) (build-system haskell-build-system) (arguments `(#:haddock? #f)) (inputs -- cgit v1.2.3 From 6062c4610ebab3b4ba5dcd954972ff1a0ee09eb5 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:04:41 -0400 Subject: gnu: ghc-psqueues: Update to 0.2.7.0. * gnu/packages/haskell.scm (ghc-psqueues): Update to 0.2.7.0. [arguments]: Remove unneeded "--allow-newer=QuickCheck" configure flag. --- gnu/packages/haskell.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 6230270f30..b9f40fe90f 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8309,7 +8309,7 @@ bytestrings and their hexademical representation.") (define-public ghc-psqueues (package (name "ghc-psqueues") - (version "0.2.6.0") + (version "0.2.7.0") (source (origin (method url-fetch) @@ -8318,10 +8318,8 @@ bytestrings and their hexademical representation.") "psqueues-" version ".tar.gz")) (sha256 (base32 - "0n39s1i88j6s7vvsdhpbhcr3gpbwlzabwcc3nbd7nqb4kb4i0sls")))) + "1sjgc9bxh63kkdp59nbirx3xazr02ia5yhp4f4a0jnq1hj465wsc")))) (build-system haskell-build-system) - (arguments - `(#:configure-flags (list "--allow-newer=QuickCheck"))) (inputs `(("ghc-hashable" ,ghc-hashable))) (native-inputs -- cgit v1.2.3 From e0b8cc34a483beb19a6651a3fac8ad2eeb89cd46 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:06:16 -0400 Subject: gnu: ghc-unordered-containers: Update to 0.2.9.0. * gnu/packages/haskell.scm (ghc-unordered-containers): Update to 0.2.9.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index b9f40fe90f..4cec8d0ba7 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3561,7 +3561,7 @@ Partial and Infinite Values\"}.") (define-public ghc-unordered-containers (package (name "ghc-unordered-containers") - (version "0.2.7.1") + (version "0.2.9.0") (outputs '("out" "doc")) (source (origin @@ -3571,7 +3571,7 @@ Partial and Infinite Values\"}.") "/unordered-containers-" version ".tar.gz")) (sha256 (base32 - "00npqiphivjp2d7ryqsdavfn4m5v3w1lq2azhdsrfh0wsvqpg4ig")))) + "0l4264p0av12cc6i8gls13q8y27x12z2ar4x34n3x59y99fcnc37")))) (build-system haskell-build-system) (inputs `(("ghc-chasingbottoms" ,ghc-chasingbottoms) -- cgit v1.2.3 From e59983ece567b9131b45113777a317394ed68e25 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 20:36:17 -0400 Subject: gnu: ghc-hinotify: Update to 0.3.10. * gnu/packages/haskell.scm (ghc-hinotify): Update to 0.3.10. [inputs]: Add ghc-async. --- gnu/packages/haskell.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 4cec8d0ba7..6e9185cb3f 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7921,7 +7921,7 @@ helper functions for Lists, Maybes, Tuples, Functions.") (define-public ghc-hinotify (package (name "ghc-hinotify") - (version "0.3.8.1") + (version "0.3.10") (source (origin (method url-fetch) (uri (string-append @@ -7929,8 +7929,10 @@ helper functions for Lists, Maybes, Tuples, Functions.") "hinotify-" version ".tar.gz")) (sha256 (base32 - "03c1f4d7x805zdiq2w26kl09xrfjw19saycdkhnixzv2qcr6xm1p")))) + "17ax3n68a5c2ddazp86aciliskrh6znd3bnry0wcllmb6dbpsaxg")))) (build-system haskell-build-system) + (inputs + `(("ghc-async" ,ghc-async))) (home-page "https://github.com/kolmodin/hinotify.git") (synopsis "Haskell binding to inotify") (description "This library provides a wrapper to the Linux kernel's inotify -- cgit v1.2.3 From 42c000dcf568f98208b3fe7390ac89decc170912 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:15:13 -0400 Subject: gnu: ghc-semigroups: Update to 0.18.5. * gnu/packages/haskell.scm (ghc-semigroups): Update to 0.18.5. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 6e9185cb3f..762df9b6fd 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4889,7 +4889,7 @@ just a @code{Semigroup} are added.") (define-public ghc-semigroups (package (name "ghc-semigroups") - (version "0.18.2") + (version "0.18.5") (source (origin (method url-fetch) @@ -4899,7 +4899,7 @@ just a @code{Semigroup} are added.") ".tar.gz")) (sha256 (base32 - "1r6hsn3am3dpf4rprrj4m04d9318v9iq02bin0pl29dg4a3gzjax")))) + "17g29h62g1k51ghhvzkw72zksjgi6vs6bfipkj81pqw1dsprcamb")))) (build-system haskell-build-system) (inputs `(("ghc-nats" ,ghc-nats) -- cgit v1.2.3 From 48f8ba91ca948154f3b75a50aa014c72aff3ffff Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:22:09 -0400 Subject: gnu: ghc-chunked-data: Update to 0.3.1. * gnu/packages/haskell.scm (ghc-chunked-data): Update to 0.3.1. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 762df9b6fd..ad27832f1f 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8776,7 +8776,7 @@ and regression and autocorrelation analysis. (define-public ghc-chunked-data (package (name "ghc-chunked-data") - (version "0.3.0") + (version "0.3.1") (source (origin (method url-fetch) @@ -8785,7 +8785,7 @@ and regression and autocorrelation analysis. "chunked-data-" version ".tar.gz")) (sha256 (base32 - "0bszq6fijnr4pmadzz89smj7kfmzx0ca3wd9ga8gv0in9jk9vgp1")))) + "16m7y7fwrirbjbqqcsfmr4yxa9qvfax6r7pw0zl9ky71ms0wa47p")))) (build-system haskell-build-system) (inputs `(("ghc-vector" ,ghc-vector) ("ghc-semigroups" ,ghc-semigroups) -- cgit v1.2.3 From 2927343183efdcdd6bbd732bb1211540ba6ece51 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:22:58 -0400 Subject: gnu: ghc-glob: Update to 0.9.2. * gnu/packages/haskell.scm (ghc-glob): Update to 0.9.2. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index ad27832f1f..df1746b1a2 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8376,7 +8376,7 @@ Typical applications of Priority Search Queues include: (define-public ghc-glob (package (name "ghc-glob") - (version "0.9.1") + (version "0.9.2") (source (origin (method url-fetch) @@ -8385,7 +8385,7 @@ Typical applications of Priority Search Queues include: "Glob-" version ".tar.gz")) (sha256 (base32 - "0rzmsknl02p332dxmm36fyrz3dpma7bchn0ymyjipxvqil20pjw0")))) + "1rbwcq9w9951qsnp13vqcm9r01yax2yh1wk8s4zxa3ckk9717iwg")))) (build-system haskell-build-system) (inputs `(("ghc-dlist" ,ghc-dlist) -- cgit v1.2.3 From c839da85129858fb7b374c5f903f1d32ae676abc Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:42:16 -0400 Subject: gnu: ghc-hmatrix: Update to 0.19.0.0. * gnu/packages/haskell.scm (ghc-hmatrix): Update to 0.19.0.0. [inputs]: Add ghc-semigroups. --- gnu/packages/haskell.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index df1746b1a2..76feb10a12 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7675,7 +7675,7 @@ and Fortran complex data types.") (define-public ghc-hmatrix (package (name "ghc-hmatrix") - (version "0.18.1.0") + (version "0.19.0.0") (source (origin (method url-fetch) @@ -7683,12 +7683,13 @@ and Fortran complex data types.") "https://hackage.haskell.org/package/hmatrix/hmatrix-" version ".tar.gz")) (sha256 - (base32 "07zkwvg872hfk6jyn4s54ws8mvclynazaxf7fsbqi16dmf9dn61c")))) + (base32 "10jd69nby29dggghcyjk6ykyr5wrn97nrv1dkpyrp0y5xm12xssj")))) (build-system haskell-build-system) (inputs `(("ghc-random" ,ghc-random) ("ghc-split" ,ghc-split) ("ghc-storable-complex" ,ghc-storable-complex) + ("ghc-semigroups" ,ghc-semigroups) ("ghc-vector" ,ghc-vector) ;;("openblas" ,openblas) ("lapack" ,lapack))) -- cgit v1.2.3 From e99625b5aeed7d000de947afc57454444894d8c5 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:26:23 -0400 Subject: gnu: ghc-void: Update to 0.7.2. * gnu/packages/haskell.scm (ghc-void): Update to 0.7.2. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 76feb10a12..38bdd7c05b 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4601,7 +4601,7 @@ Compatibility package for older packages.") (define-public ghc-void (package (name "ghc-void") - (version "0.7.1") + (version "0.7.2") (source (origin (method url-fetch) @@ -4611,7 +4611,7 @@ Compatibility package for older packages.") ".tar.gz")) (sha256 (base32 - "1x15x2axz84ndw2bf60vjqljhrb0w95lddaljsxrl0hcd29zvw69")))) + "0aygw0yb1h3yhmfl3bkwh5d3h0l4mmsxz7j53vdm6jryl1kgxzyk")))) (build-system haskell-build-system) (inputs `(("ghc-semigroups" ,ghc-semigroups) -- cgit v1.2.3 From c64e832f1008bec9a11481b4f48b5f619ce0319d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:29:18 -0400 Subject: gnu: xmonad: Update to 0.14.2. * gnu/packages/wm.scm (xmonad): Update to 0.14.2. --- gnu/packages/wm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 163281ac67..db345cd2fd 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -455,7 +455,7 @@ desktop environment.") (define-public xmonad (package (name "xmonad") - (version "0.14") + (version "0.14.2") (synopsis "Tiling window manager") (source (origin (method url-fetch) @@ -463,7 +463,7 @@ desktop environment.") name "-" version ".tar.gz")) (sha256 (base32 - "0lq3k0ap7jxrrswpd954mqa6h8diccbif5srcgbmr39y6y8x0mm4")))) + "0gqyivpw8z1x73p1l1fpyq1wc013a1c07r6xn1a82liijs91b949")))) (build-system haskell-build-system) (inputs `(("ghc-extensible-exceptions" ,ghc-extensible-exceptions) -- cgit v1.2.3 From 0b0e45d829df59ee8cb4973f674e44ebf7c60843 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:32:09 -0400 Subject: gnu: ghc-contravariant: Update to 1.4.1. * gnu/packages/haskell.scm (ghc-contravariant): Update to 1.4.1. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 38bdd7c05b..d826f5d8a7 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4863,7 +4863,7 @@ just a @code{Semigroup} are added.") (define-public ghc-contravariant (package (name "ghc-contravariant") - (version "1.4") + (version "1.4.1") (source (origin (method url-fetch) @@ -4873,7 +4873,7 @@ just a @code{Semigroup} are added.") ".tar.gz")) (sha256 (base32 - "117fff8kkrvlmr8cb2jpj71z7lf2pdiyks6ilyx89mry6zqnsrp1")))) + "1vfhk8c5cxmmakx7rflap1ipkx5q0j5vnlrcz7yz6y53kxhksgf9")))) (build-system haskell-build-system) (inputs `(("ghc-void" ,ghc-void) -- cgit v1.2.3 From 3c00bc13a5b78f0cfb240d60b4e283b1873b7ed9 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:58:48 -0400 Subject: gnu: ghc-hmatrix-gsl: Update to 0.19.0.1. * gnu/packages/haskell.scm (ghc-hmatrix-gsl): Update to 0.19.0.1. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index d826f5d8a7..5ea7ed8831 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7706,7 +7706,7 @@ numerical computations based on BLAS and LAPACK.") (define-public ghc-hmatrix-gsl (package (name "ghc-hmatrix-gsl") - (version "0.18.0.1") + (version "0.19.0.1") (source (origin (method url-fetch) @@ -7714,7 +7714,7 @@ numerical computations based on BLAS and LAPACK.") "https://hackage.haskell.org/package/hmatrix-gsl/hmatrix-gsl-" version ".tar.gz")) (sha256 - (base32 "0mflm7zg6c6a5vy092pa429rzpyv5drc1589r3x4fbmvcyqc79gx")))) + (base32 "0v6dla426x4ywaq59jm89ql1i42n39iw6z0j378xwb676v9kfxhm")))) (build-system haskell-build-system) (inputs `(("ghc-hmatrix" ,ghc-hmatrix) -- cgit v1.2.3 From 9d1944a4939ae006b6f53c4203c49bc727c55dfd Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 5 Sep 2018 14:22:28 -0400 Subject: gnu: ghc-tasty: Update to 1.1.0.3. * gnu/packages/haskell.scm (ghc-integer-logarithms-bootstrap, ghc-scientific-bootstrap, ghc-attoparsec-bootstrap, ghc-wcwidth-bootstrap): New variables to break a dependency cycle from ghc-tasty. * gnu/packages/haskell-check.scm (ghc-tasty): Update to 1.1.0.3. [inputs]: Add ghc-wcwidth-bootstrap; remove ghc-regex-tdfa-rc. --- gnu/packages/haskell-check.scm | 8 ++++---- gnu/packages/haskell.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index ef19645346..913835a807 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -181,7 +181,7 @@ timer functions of different operating systems via a unified API.") (define-public ghc-tasty (package (name "ghc-tasty") - (version "0.11.0.4") + (version "1.1.0.3") (source (origin (method url-fetch) @@ -191,18 +191,18 @@ timer functions of different operating systems via a unified API.") ".tar.gz")) (sha256 (base32 - "05pxjzgbgjdn7477xry0ssjrnmnsydqiq6nm6ck8n2da1baliqp0")))) + "14riid753hjqr6lca1kgxpnvq0wykf0k3qc5jpag42hh8bszav22")))) (build-system haskell-build-system) (inputs `(("ghc-stm" ,ghc-stm) ("ghc-tagged" ,ghc-tagged) ("ghc-regex-tdfa" ,ghc-regex-tdfa) - ("ghc-regex-tdfa-rc" ,ghc-regex-tdfa-rc) ("ghc-optparse-applicative" ,ghc-optparse-applicative) ("ghc-unbounded-delays" ,ghc-unbounded-delays) ("ghc-async" ,ghc-async) ("ghc-ansi-terminal" ,ghc-ansi-terminal) - ("ghc-clock-bootstrap" ,ghc-clock-bootstrap))) + ("ghc-clock-bootstrap" ,ghc-clock-bootstrap) + ("ghc-wcwidth" ,ghc-wcwidth-bootstrap))) (home-page "http://documentup.com/feuerbach/tasty") (synopsis "Modern and extensible testing framework") (description "Tasty is a modern testing framework for Haskell. It lets diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 5ea7ed8831..b50bf3d5d4 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2877,6 +2877,17 @@ aimed particularly at dealing efficiently with network protocols and complicated text/binary file formats.") (license license:bsd-3))) +(define-public ghc-attoparsec-bootstrap + (package + (inherit ghc-attoparsec) + (name "ghc-attoparsec-bootstrap") + (arguments `(#:tests? #f)) + (inputs + `(("ghc-scientific" ,ghc-scientific-bootstrap) + ("ghc-text" ,ghc-text))) + (native-inputs '()) + (properties '(hidden? #t)))) + (define-public ghc-zip-archive (package (name "ghc-zip-archive") @@ -5227,6 +5238,14 @@ occurrences of a substring (the first in case of overlaps) with another.") in migrated modules.") (license license:expat))) +(define-public ghc-integer-logarithms-bootstrap + (package + (inherit ghc-integer-logarithms) + (name "ghc-integer-logarithms-bootstrap") + (arguments `(#:tests? #f)) + (native-inputs '()) + (properties '(hidden? #t)))) + (define-public ghc-scientific (package (name "ghc-scientific") @@ -5264,6 +5283,19 @@ and space efficient. They are represented using notation}.") (license license:bsd-3))) +(define-public ghc-scientific-bootstrap + (package + (inherit ghc-scientific) + (name "ghc-scientific-bootstrap") + (arguments `(#:tests? #f)) + (inputs + `(("ghc-integer-logarithms" ,ghc-integer-logarithms-bootstrap) + ("ghc-text" ,ghc-text) + ("ghc-hashable" ,ghc-hashable) + ("ghc-primitive" ,ghc-primitive))) + (native-inputs '()) + (properties '(hidden? #t)))) + (define-public ghc-boxes (package (name "ghc-boxes") @@ -10199,4 +10231,14 @@ The command line tool can compile a width table to Haskell code that assigns widths to the Char type.") (license license:bsd-3))) +(define-public ghc-wcwidth-bootstrap + (package + (inherit ghc-wcwidth) + (name "ghc-wcwidth-bootstrap") + (inputs + `(("ghc-setlocale" ,ghc-setlocale) + ("ghc-utf8-string" ,ghc-utf8-string) + ("ghc-attoparsec" ,ghc-attoparsec-bootstrap))) + (properties '(hidden? #t)))) + ;;; haskell.scm ends here -- cgit v1.2.3 From c1cf4c70f2828c86febb3c5eb2efd5e2e4173afa Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:39:34 -0400 Subject: gnu: ghc-contravariant-extras: Update to 0.3.4. * gnu/packages/haskell.scm (ghc-contravariant-extras): Update to 0.3.4. [inputs]: Add ghc-semigroups. --- gnu/packages/haskell.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index b50bf3d5d4..a8a90f919d 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8888,7 +8888,7 @@ statically known size.") (define-public ghc-contravariant-extras (package (name "ghc-contravariant-extras") - (version "0.3.3.1") + (version "0.3.4") (source (origin (method url-fetch) @@ -8897,11 +8897,13 @@ statically known size.") "contravariant-extras-" version ".tar.gz")) (sha256 (base32 - "1mbrgjybdx8fjdck4ldwi8955w4qnmm0ql56zix7dyn0s7s9spgk")))) + "0gg62ccl94kvh7mnvdq09pifqxjx2kgs189si90nmg44bafj7a9n")))) (build-system haskell-build-system) - (inputs `(("ghc-tuple-th" ,ghc-tuple-th) - ("ghc-contravariant" ,ghc-contravariant) - ("ghc-base-prelude" ,ghc-base-prelude))) + (inputs + `(("ghc-tuple-th" ,ghc-tuple-th) + ("ghc-contravariant" ,ghc-contravariant) + ("ghc-base-prelude" ,ghc-base-prelude) + ("ghc-semigroups" ,ghc-semigroups))) (home-page "https://github.com/nikita-volkov/contravariant-extras") (synopsis "Extras for the @code{ghc-contravariant} Haskell package") (description "This Haskell package provides extras for the -- cgit v1.2.3 From 722d3bd80b3c740e4b3244b61ced62dc33eb1e81 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:03:10 -0400 Subject: gnu: ghc-hmatrix-special: Update to 0.19.0.0. * gnu/packages/haskell.scm (ghc-hmatrix-special): Update to 0.19.0.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index a8a90f919d..d621c00840 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7764,7 +7764,7 @@ using GSL.") (define-public ghc-hmatrix-special (package (name "ghc-hmatrix-special") - (version "0.4.0.1") + (version "0.19.0.0") (source (origin (method url-fetch) @@ -7773,7 +7773,7 @@ using GSL.") "https://hackage.haskell.org/package/hmatrix-special/hmatrix-special-" version ".tar.gz")) (sha256 - (base32 "0kpcqdchi7ikzhqacy4rh4dxz3v37paxyb84wqa66sysb72wkabj")))) + (base32 "1mywr61kr852sbff26n9x95kswx9l4ycbv6s68qsbkh02xzqq7qz")))) (build-system haskell-build-system) (inputs `(("ghc-hmatrix" ,ghc-hmatrix) -- cgit v1.2.3 From 665615e93beb0c1825b7e37bfbd265ca32d5f8a4 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:16:12 -0400 Subject: gnu: ghc-tasty-expected-failure: Update to 0.11.1.1. * gnu/packages/haskell-check.scm (ghc-tasty-expected-failure): Update to 0.11.1.1. --- gnu/packages/haskell-check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 913835a807..561cf0402f 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -312,7 +312,7 @@ been added since previous test run.") (define-public ghc-tasty-expected-failure (package (name "ghc-tasty-expected-failure") - (version "0.11.0.4") + (version "0.11.1.1") (source (origin (method url-fetch) @@ -321,7 +321,7 @@ been added since previous test run.") version ".tar.gz")) (sha256 (base32 - "0r555f18d2gj96pjyc13chn1nxaxl81am4xgip3mvvjhw8s5mva1")))) + "1i2s809m644b7hgiblqay9j364r3fjj1rwbrahsn1pgr5q6mr6ji")))) (build-system haskell-build-system) (inputs `(("ghc-tagged" ,ghc-tagged) -- cgit v1.2.3 From 58182daa3f284922893c7b5574b74e9cd40b0831 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:16:30 -0400 Subject: gnu: ghc-tasty-hunit: Update to 0.10.0.1. * gnu/packages/haskell-check.scm (ghc-tasty-hunit): Update to 0.10.0.1. [inputs]: Add ghc-call-stack. --- gnu/packages/haskell-check.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 561cf0402f..232975e6b4 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -213,7 +213,7 @@ and any other types of tests into a single test suite.") (define-public ghc-tasty-hunit (package (name "ghc-tasty-hunit") - (version "0.9.2") + (version "0.10.0.1") (source (origin (method url-fetch) @@ -223,10 +223,11 @@ and any other types of tests into a single test suite.") ".tar.gz")) (sha256 (base32 - "08qnxaw34wfnzi9irs1jd4d0zczqm3k5ffkd4zwhkz0dflmgq7mf")))) + "0j3hgga6c3s8h5snzivb8a75h96207ia2rlbxzj07xbf4zpkp44g")))) (build-system haskell-build-system) (inputs - `(("ghc-tasty" ,ghc-tasty))) + `(("ghc-call-stack" ,ghc-call-stack-boot) + ("ghc-tasty" ,ghc-tasty))) (home-page "http://documentup.com/feuerbach/tasty") (synopsis "HUnit support for the Tasty test framework") (description "This package provides HUnit support for the Tasty Haskell -- cgit v1.2.3 From 59a50276043d2054eb7f74a64a4e5cc8b8f1157e Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:25:50 -0400 Subject: gnu: ghc-tasty-quickcheck: Update to 0.10. * gnu/packages/haskell-check.scm (ghc-tasty-quickcheck): Update to 0.10. --- gnu/packages/haskell-check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 232975e6b4..0ab0b9a61d 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -96,7 +96,7 @@ Haskell test framework.") (define-public ghc-tasty-quickcheck (package (name "ghc-tasty-quickcheck") - (version "0.8.4") + (version "0.10") (source (origin (method url-fetch) @@ -105,7 +105,7 @@ Haskell test framework.") "tasty-quickcheck-" version ".tar.gz")) (sha256 (base32 - "15rjxib5jmjq0hzj47x15kgp3awc73va4cy1pmpf7k3hvfv4qprn")))) + "0vr6szbbz3s5461i0zr8zpq347zfvidfzv5gf3xwxhm0yk731z8h")))) (build-system haskell-build-system) (inputs `(("ghc-quickcheck" ,ghc-quickcheck) -- cgit v1.2.3 From c70f00e203e913226c08c5bba4bc2b9c57571117 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:31:40 -0400 Subject: gnu: ghc-blaze-markup: Update to 0.8.2.1. * gnu/packages/haskell.scm (ghc-blaze-markup): Update to 0.8.2.1. [arguments]: Add a phase that patches the Cabal file to allow newer versions of tasty. --- gnu/packages/haskell.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index d621c00840..92703ee668 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4284,7 +4284,7 @@ interoperate with code that uses the new implementation.") (define-public ghc-blaze-markup (package (name "ghc-blaze-markup") - (version "0.8.2.0") + (version "0.8.2.1") (source (origin (method url-fetch) @@ -4293,8 +4293,16 @@ interoperate with code that uses the new implementation.") version ".tar.gz")) (sha256 (base32 - "0m3h3ryxj5r74mv5g5dnfq5jbbwmvkl7ray18vi20d5vd93sydj4")))) + "0ih1c3qahkdgzbqihdhny5s313l2m66fbb88w8jbx7yz56y7rawh")))) (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "blaze-markup.cabal" + (("tasty >= 1\\.0 && < 1\\.1") + "tasty >= 1.0 && < 1.2"))))))) (inputs `(("ghc-blaze-builder" ,ghc-blaze-builder) ("ghc-text" ,ghc-text))) -- cgit v1.2.3 From 083c9c73757c97afc1e3cdbeb200c2ab1dc33547 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:32:33 -0400 Subject: gnu: ghc-cookie: Update to 0.4.4. * gnu/packages/haskell-web.scm (ghc-cookie): Update to 0.4.4. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index bb4f419e66..72defb3446 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -64,7 +64,7 @@ for screen-scraping.") (define-public ghc-cookie (package (name "ghc-cookie") - (version "0.4.3") + (version "0.4.4") (source (origin (method url-fetch) @@ -74,7 +74,7 @@ for screen-scraping.") ".tar.gz")) (sha256 (base32 - "0qpdydhb9gw590ffabqg70x7xvjpg8l74idqnrfbhv5yrr7hryzv")))) + "1qy09i0jh2z9i9avy2khf8a8afq4fqgnv0fyrszgfg4kmq2fsi9j")))) (build-system haskell-build-system) (inputs `(("ghc-old-locale" ,ghc-old-locale) -- cgit v1.2.3 From 6ef7c05c8d9bb9f77cd1d4145d85c938899e114f Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 31 Aug 2018 15:06:10 -0400 Subject: gnu: ghc-cryptohash-md5: Update Cabal file to r2. * gnu/packages/haskell-crypto.scm (ghc-cryptohash-md5): Update Cabal file to r2. --- gnu/packages/haskell-crypto.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index f27d7dc23a..b1db19bdeb 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -210,7 +210,9 @@ that hides the C implementation.") "1y8q7s2bn4gdknw1wjikdnar2b5pgz3nv3220lxrlgpsf23x82vi")))) (build-system haskell-build-system) (arguments - `(#:tests? #f)) ; tests require old version of ghc-hunit (0.9) + `(#:cabal-revision + ("2" "0vyb9cfvpfxpslxvvhd48gw37i9g8ry5x63xwxd9q7xfiqhs7p3a") + #:tests? #f)) ; tests require old version of ghc-hunit (0.9) (native-inputs `(("ghc-base16-bytestring" ,ghc-base16-bytestring) ("ghc-puremd5" ,ghc-puremd5) ("ghc-tasty" ,ghc-tasty) -- cgit v1.2.3 From f89bf67491d62755a9777c71c453e3b308ab8220 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 31 Aug 2018 15:07:32 -0400 Subject: gnu: ghc-cryptohash-sha1: Update Cabal file to r2. * gnu/packages/haskell-crypto.scm (ghc-cryptohash-sha1): Update Cabal file to r2. --- gnu/packages/haskell-crypto.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index b1db19bdeb..87e6cd3c15 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -238,7 +238,9 @@ that hides the C implementation.") "1aqdxdhxhl9jldh951djpwxx8z7gzaqspxl7iwpl84i5ahrsyy9w")))) (build-system haskell-build-system) (arguments - `(#:tests? #f)) ; tests require old version of ghc-hunit (0.9) + `(#:cabal-revision + ("2" "0xas0nbq9bfdzlj6k565ibizv1cqvzfzsdj6q9pdiiwyxqblqc3m") + #:tests? #f)) ; tests require old version of ghc-hunit (0.9) (native-inputs `(("ghc-base16-bytestring" ,ghc-base16-bytestring) ("ghc-sha" ,ghc-sha) ("ghc-tasty" ,ghc-tasty) -- cgit v1.2.3 From bef2ee1c588ad6f207f84e1a43e2ade2c4839bce Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:34:20 -0400 Subject: gnu: ghc-hourglass: Update to 0.2.12. * gnu/packages/haskell.scm (ghc-hourglass): Update to 0.2.12. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 92703ee668..5875e9b02e 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -6214,14 +6214,14 @@ wrapping a bytestring with stronger and more meaniful name.") (define-public ghc-hourglass (package (name "ghc-hourglass") - (version "0.2.10") + (version "0.2.12") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "hourglass/hourglass-" version ".tar.gz")) (sha256 (base32 - "104d1yd84hclprg740nkz60vx589mnm094zriw6zczbgg8nkclym")))) + "0jnay5j13vpz6i1rkaj3j0d9v8jfpri499xn3l7wd01f81f5ncs4")))) (build-system haskell-build-system) (inputs `(("ghc-old-locale" ,ghc-old-locale))) -- cgit v1.2.3 From 6b05cfb4e47c28d3432d01d58ae4157d816d9d67 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 5 Sep 2018 14:55:56 -0400 Subject: gnu: ghc-integer-logarithms: Replace "--allow-newer" flag. * gnu/packages/haskell.scm (ghc-integer-logarithms)[arguments]: Replace "--allow-newer" configure flag with a phase that patches the Cabal file. --- gnu/packages/haskell.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 5875e9b02e..9dbeae194c 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5227,7 +5227,13 @@ occurrences of a substring (the first in case of overlaps) with another.") "1wj8kgjg5bn2yrs4zh9qfjv85cx6w998j9pi39yrbv305944mb9j")))) (build-system haskell-build-system) (arguments - `(#:configure-flags (list "--allow-newer=tasty"))) + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "integer-logarithms.cabal" + (("tasty >= 0\\.10 && < 1\\.1") + "tasty >= 0.10 && < 1.2"))))))) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck) ("ghc-smallcheck" ,ghc-smallcheck) -- cgit v1.2.3 From 221c3563162926a44be20ba3899d4f8b7601b3c9 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:34:59 -0400 Subject: gnu: ghc-tar: Update to 0.5.1.0. * gnu/packages/haskell.scm (ghc-tar): Update to 0.5.1.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 9dbeae194c..fdc77c3d95 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7091,7 +7091,7 @@ this problem.") (define-public ghc-tar (package (name "ghc-tar") - (version "0.5.0.3") + (version "0.5.1.0") (source (origin (method url-fetch) @@ -7100,7 +7100,7 @@ this problem.") version ".tar.gz")) (sha256 (base32 - "18qq94j9bm91iswnxq2dm5dws5c7wm4k01q2rpf8py35cf3svnfq")))) + "0s2brvaxg5fki2jdkccmnpssiy6a3wjh24p6a3dkkdvjcixnk7f8")))) (build-system haskell-build-system) ;; FIXME: 2/24 tests fail. (arguments `(#:tests? #f)) -- cgit v1.2.3 From fe3ecc307f87d3f2d12dbeecbd180c68ab16d483 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 31 Aug 2018 15:18:15 -0400 Subject: gnu: ghc-uuid-types: Relax test framework dependency constraints. * gnu/packages/haskell.scm (ghc-uuid-types)[arguments]: Remove "--allow-newer" configure flags and add a phase that removes dependency version constraints from all of the test frameworks. --- gnu/packages/haskell.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index fdc77c3d95..a5f1628854 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9034,8 +9034,16 @@ IPv4, IPv6 and MAC addresses.") "1zdka5jnm1h6k36w3nr647yf3b5lqb336g3fkprhd6san9x52xlj")))) (build-system haskell-build-system) (arguments - `(#:configure-flags (list "--allow-newer=QuickCheck" - "--allow-newer=HUnit"))) + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'strip-test-framework-constraints + (lambda _ + (substitute* "uuid-types.cabal" + (("HUnit >=1\\.2 && < 1\\.4") "HUnit") + (("QuickCheck >=2\\.4 && < 2\\.9") "QuickCheck") + (("tasty >= 0\\.10 && < 0\\.12") "tasty") + (("tasty-hunit == 0\\.9\\.\\*") "tasty-hunit") + (("tasty-quickcheck == 0\\.8\\.\\*") "tasty-quickcheck"))))))) (inputs `(("ghc-hashable" ,ghc-hashable) ("ghc-random" ,ghc-random) ("ghc-text" ,ghc-text))) -- cgit v1.2.3 From 4f2f0eb02f1e5435846e8437e47d754af79b6b6c Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Mon, 3 Sep 2018 20:51:46 -0400 Subject: gnu: ghc-vector-binary-instances: Update Cabal file to r1. * gnu/packages/haskell.scm (ghc-vector-binary-instances): Update Cabal file to r1. --- gnu/packages/haskell.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index a5f1628854..9a5632c47d 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3889,6 +3889,9 @@ optimisation framework.") (base32 "1y236jb72iab9ska1mc48z6yb0xgwmj45laaqdyjxksd84z7hbrb")))) (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("1" "196frl4akhfk7xf1nxzn8lmq99dxhzhsimanswn9yy7ym8zhki4i"))) (inputs `(("ghc-vector" ,ghc-vector))) (native-inputs -- cgit v1.2.3 From b8afa2da58bb04ea5ac021547601e956341f814e Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:39:02 -0400 Subject: gnu: ghc-blaze-html: Update to 0.9.1.1. * gnu/packages/haskell-web.scm (ghc-blaze-html): Update to 0.9.1.1. [arguments]: Remove unneeded "--allow-newer" configure flags. --- gnu/packages/haskell-web.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 72defb3446..a60bf007af 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -754,7 +754,7 @@ Strict, Transitional and Frameset variants.") (define-public ghc-blaze-html (package (name "ghc-blaze-html") - (version "0.9.0.1") + (version "0.9.1.1") (source (origin (method url-fetch) @@ -763,11 +763,8 @@ Strict, Transitional and Frameset variants.") version ".tar.gz")) (sha256 (base32 - "0r0acv47nh75bmf7kjyfvhcwz8f02rn9x0a1l80pzgyczfrsmkmf")))) + "06xv8fqhclfjj61z74cgggn4lmx1s7diakxg84mnkgfvk11983pa")))) (build-system haskell-build-system) - (arguments - `(#:configure-flags (list "--allow-newer=QuickCheck" - "--allow-newer=HUnit"))) (inputs `(("ghc-blaze-builder" ,ghc-blaze-builder) ("ghc-text" ,ghc-text) -- cgit v1.2.3 From 3a066eb5ee852338d7de1d37ddc524df92efe2a2 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:40:01 -0400 Subject: gnu: ghc-extra: Update to 1.6.9. * gnu/packages/haskell.scm (ghc-extra): Update to 1.6.9. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 9a5632c47d..9f2b6f2bef 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3062,7 +3062,7 @@ Strings.") (define-public ghc-extra (package (name "ghc-extra") - (version "1.6.3") + (version "1.6.9") (source (origin (method url-fetch) @@ -3072,7 +3072,7 @@ Strings.") ".tar.gz")) (sha256 (base32 - "06ds0jlx6sljwdf63l154qbzia9mnsri79i9qm3xikky3nj9ia1m")))) + "0xxcpb00pgwi9cmy6a7ghh6rblxry42p8pz5ssfgj20fs1xwzj1b")))) (build-system haskell-build-system) (inputs `(("ghc-clock" ,ghc-clock) -- cgit v1.2.3 From 9720cca2e53e1c3310d91a465084269c84e90f7c Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:59:18 -0400 Subject: gnu: ghc-pem: Update to 0.2.4. * gnu/packages/haskell-crypto.scm (ghc-pem): Update to 0.2.4. [inputs]: Remove ghc-base64-bytestring; add ghc-basement and ghc-memory. --- gnu/packages/haskell-crypto.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index 87e6cd3c15..bb0ee074c2 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -338,17 +338,18 @@ to obtain cryptographically strong entropy.") (define-public ghc-pem (package (name "ghc-pem") - (version "0.2.2") + (version "0.2.4") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "pem/pem-" version ".tar.gz")) (sha256 (base32 - "162sk5sg22w21wqz5qv8kx6ibxp99v5p20g3nknhm1kddk3hha1p")))) + "1m7qjsxrd8m88cvkqmr8kscril500j2a9y0iynvksjyjkhdlq33p")))) (build-system haskell-build-system) (inputs - `(("ghc-base64-bytestring" ,ghc-base64-bytestring))) + `(("ghc-basement" ,ghc-basement) + ("ghc-memory" ,ghc-memory))) (native-inputs `(("ghc-test-framework" ,ghc-test-framework) ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2) -- cgit v1.2.3 From 4828f040df32b2fef214034d3eddce94052f760e Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:41:46 -0400 Subject: gnu: ghc-securemem: Update to 0.1.10. * gnu/packages/haskell.scm (ghc-securemem): Update to 0.1.10. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 9f2b6f2bef..5d5815a8d4 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9535,7 +9535,7 @@ interpolates variables according to the type being inserted.") (define-public ghc-securemem (package (name "ghc-securemem") - (version "0.1.9") + (version "0.1.10") (source (origin (method url-fetch) @@ -9544,7 +9544,7 @@ interpolates variables according to the type being inserted.") "securemem-" version ".tar.gz")) (sha256 (base32 - "0dkhhjxa7njc3qbgvd5a23rkvr39vj2kn2a9nk6yjg7a8b2hvdpy")))) + "19hnw2cfbsfjynxq1bq9f6djbxhsc1k751ml0y1ab3ah913mm29j")))) (build-system haskell-build-system) (inputs `(("ghc-byteable" ,ghc-byteable) ("ghc-memory" ,ghc-memory))) -- cgit v1.2.3 From a11ce10666aa19f6be3c4d261812866163ed97f2 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 31 Aug 2018 16:07:50 -0400 Subject: gnu: ghc-uuid: Update Cabal file to r2 and relax dependencies. * gnu/packages/haskell.scm (ghc-uuid): Update Cabal file to r2. [arguments]: Add a phase to remove test framework dependency version constraints. --- gnu/packages/haskell.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 5d5815a8d4..da29e156ec 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9078,8 +9078,18 @@ functions.") "09xhk42yhxvqmka0iqrv3338asncz8cap3j0ic0ps896f2581b6z")))) (build-system haskell-build-system) (arguments - `(#:configure-flags (list "--allow-newer=QuickCheck" - "--allow-newer=HUnit"))) + `(#:cabal-revision + ("2" "0m185q62jkfb5jsv358nxbnrkv8y8hd0qqvgvh22wvc5g9ipz0r9") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'strip-test-framework-constraints + (lambda _ + (substitute* "uuid.cabal" + (("HUnit >= 1\\.2 && < 1\\.4") "HUnit") + (("QuickCheck >= 2\\.4 && < 2\\.10") "QuickCheck") + (("tasty >= 0\\.10 && < 0\\.12") "tasty") + (("tasty-hunit == 0\\.9\\.\\*") "tasty-hunit") + (("tasty-quickcheck == 0\\.8\\.\\*") "tasty-quickcheck"))))))) (inputs `(("ghc-cryptohash-sha1" ,ghc-cryptohash-sha1) ("ghc-cryptohash-md5" ,ghc-cryptohash-md5) ("ghc-entropy" ,ghc-entropy) -- cgit v1.2.3 From a98973651ed8bafdeadfacf376b9a71254e0ea8e Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:45:22 -0400 Subject: gnu: ghc-highlighting-kate: Update to 0.6.4. * gnu/packages/haskell.scm (ghc-highlighting-kate): Update to 0.6.4. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index da29e156ec..007bcf0836 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5539,7 +5539,7 @@ and utilities for pretty printing.") (define-public ghc-highlighting-kate (package (name "ghc-highlighting-kate") - (version "0.6.3") + (version "0.6.4") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -5547,7 +5547,7 @@ and utilities for pretty printing.") version ".tar.gz")) (sha256 (base32 - "03c4flh4h1jd48bx0qmplax3q8w6wj1dhbh6j0xhaf5h95fbinki")))) + "1bqv00gfmrsf0jjr4qf3lhshvfkyzmhbi3pjb6mafbnsyn2k7f6q")))) (build-system haskell-build-system) (inputs `(("ghc-diff" ,ghc-diff) -- cgit v1.2.3 From 19533b321695356cf892e79afde4c428306426a2 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:46:25 -0400 Subject: gnu: ghc-base-orphans: Update to 0.7. * gnu/packages/haskell.scm (ghc-base-orphans): Update to 0.7. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 007bcf0836..0b59d3c071 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4428,7 +4428,7 @@ command line options in Haskell.") (define-public ghc-base-orphans (package (name "ghc-base-orphans") - (version "0.6") + (version "0.7") (source (origin (method url-fetch) @@ -4438,7 +4438,7 @@ command line options in Haskell.") ".tar.gz")) (sha256 (base32 - "03mdww5j0gwai7aqlx3m71ldmjcr99jzpkcclzjfclk6a6kjla67")))) + "057f9npnqk71ccfh95djfkpd54dzazphj06grwxa3fyhwcwxrb8a")))) (build-system haskell-build-system) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck) -- cgit v1.2.3 From 3ff7232ae724a82a774680fa05598685181dec97 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:00:35 -0400 Subject: gnu: ghc-constraints: Update to 0.10.1. * gnu/packages/haskell.scm (ghc-constraints): Update to 0.10.1. [inputs]: Add ghc-semigroups. [native-inputs]: Add ghc-hspec and ghc-hspec-discover. --- gnu/packages/haskell.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 0b59d3c071..9bb81cda6d 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7343,7 +7343,7 @@ and edge labels with positional information, etc. (define-public ghc-constraints (package (name "ghc-constraints") - (version "0.8") + (version "0.10.1") (source (origin (method url-fetch) @@ -7352,11 +7352,15 @@ and edge labels with positional information, etc. version ".tar.gz")) (sha256 (base32 - "120mmv9rwbahslisc1z8zx9lw7v6hl5fzid4l0hiy5as6ijqgl2c")))) + "1xy3vv78jxc17hm0z7qqspxjwv7l2jbcbj670yrl2f053qkfr02q")))) (build-system haskell-build-system) (inputs `(("ghc-hashable" ,ghc-hashable) + ("ghc-semigroups" ,ghc-semigroups) ("ghc-transformers-compat" ,ghc-transformers-compat))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("hspec-discover" ,hspec-discover))) (home-page "https://github.com/ekmett/constraints/") (synopsis "Constraint manipulation") (description -- cgit v1.2.3 From 98993f605b3562f4b9df5061da37df4e75a1c4fe Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Mon, 3 Sep 2018 21:03:38 -0400 Subject: gnu: ghc-fgl: Replace "--allow-newer" flags. * gnu/packages/haskell.scm (ghc-fgl)[arguments]: Replace "--allow-newer" configure flags with a phase that patches the Cabal file. --- gnu/packages/haskell.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 9bb81cda6d..4ddd6dc47c 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3525,8 +3525,15 @@ variety of traversals.") "1i6cp4b3w7sjk7y1dq3fh6bci2sm5h3lnbbaw9ln19nwncg2wwll")))) (build-system haskell-build-system) (arguments - `(#:configure-flags (list "--allow-newer=QuickCheck" - "--allow-newer=hspec"))) + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "fgl.cabal" + (("QuickCheck >= 2\\.8 && < 2\\.10") + "QuickCheck >= 2.8 && < 2.12") + (("hspec >= 2\\.1 && < 2\\.5") + "hspec >= 2.1 && < 2.6"))))))) (inputs `(("ghc-hspec" ,ghc-hspec) ("ghc-quickcheck" ,ghc-quickcheck))) -- cgit v1.2.3 From b408c5a768345907f69772e42a75d7e4ecaa97c0 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:49:02 -0400 Subject: gnu: ghc-generic-deriving: Update to 1.12.2. * gnu/packages/haskell.scm (ghc-generic-deriving): Update to 1.12.2. [inputs]: Add ghc-th-abstraction. --- gnu/packages/haskell.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 4ddd6dc47c..b942d2d4ce 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3190,7 +3190,7 @@ exceptions.") (define-public ghc-generic-deriving (package (name "ghc-generic-deriving") - (version "1.11.1") + (version "1.12.2") (source (origin (method url-fetch) @@ -3200,8 +3200,10 @@ exceptions.") ".tar.gz")) (sha256 (base32 - "1sdh5hpcwvh3b6zvgfk3pr3hla8p88l82njnih880c0gk5zl53dk")))) + "1i7d6cpj9yhaqb79zays3nqchhaacacjz9bkc0zlwj73y5gvi22n")))) (build-system haskell-build-system) + (inputs + `(("ghc-th-abstraction" ,ghc-th-abstraction))) (native-inputs `(("ghc-hspec" ,ghc-hspec) ("hspec-discover" ,hspec-discover))) -- cgit v1.2.3 From 16b4b6d1b93cefc565500ff35cac434a9dda21bb Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 20:35:11 -0400 Subject: gnu: ghc-half: Update to 0.3. * gnu/packages/haskell.scm (ghc-half): Update to 0.3. [native-inputs]: Add ghc-hspec and ghc-quickcheck. --- gnu/packages/haskell.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index b942d2d4ce..6327b4fe84 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1447,7 +1447,7 @@ PNG, PNM, TGA, TIFF, XCF, XPM, XV.") (define-public ghc-half (package (name "ghc-half") - (version "0.2.2.3") + (version "0.3") (source (origin (method url-fetch) @@ -1456,8 +1456,11 @@ PNG, PNM, TGA, TIFF, XCF, XPM, XV.") version ".tar.gz")) (sha256 (base32 - "0p4sb7vv9cljv48wlx65wgdnkryrk5d6yfh7g4yrm20w1p449hl5")))) + "14r0nx8hm5fic9gz0ybjjw4kyc758zfgvhhwvzsshpx5caq6zch6")))) (build-system haskell-build-system) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("ghc-quickcheck" ,ghc-quickcheck))) (home-page "https://github.com/ekmett/half") (synopsis "Half-precision floating-point computations") (description "This library provides a half-precision floating-point -- cgit v1.2.3 From 1cf4f2729f05872eb3d7a2eade1bde5120e502f8 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:49:28 -0400 Subject: gnu: ghc-logging-facade: Update to 0.3.0. * gnu/packages/haskell.scm (ghc-logging-facade): Update to 0.3.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 6327b4fe84..3a607bfb4e 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5975,7 +5975,7 @@ space as enumerator/iteratee and pipes.") (define-public ghc-logging-facade (package (name "ghc-logging-facade") - (version "0.1.1") + (version "0.3.0") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -5983,7 +5983,7 @@ space as enumerator/iteratee and pipes.") version ".tar.gz")) (sha256 (base32 - "18ldv6rsff480rqpbs3iabjpvn1fhw0i2a0g80jnhxg9ajfz5yb0")))) + "0d0lwxxgd16is9aw6v3ps4r9prv3dj8xscmm45fvzq3nicjiawcf")))) (build-system haskell-build-system) (native-inputs `(("ghc-hspec" ,ghc-hspec) -- cgit v1.2.3 From 073f5ae1fe78de76c46659e4c938f1b8ef84652a Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sat, 1 Sep 2018 00:00:06 -0400 Subject: gnu: Add ghc-newtype-generics. * gnu/packages/haskell.scm (ghc-newtype-generics): New variable. --- gnu/packages/haskell.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 3a607bfb4e..5c49e9074a 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -823,6 +823,32 @@ code pages on Windows. On all other operating systems, the library does nothing.") (license license:bsd-3))) +(define-public ghc-newtype-generics + (package + (name "ghc-newtype-generics") + (version "0.5.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "newtype-generics/newtype-generics-" + version ".tar.gz")) + (sha256 + (base32 + "0igyisw2djg19v9vkna1rwf47k97mvkvk4bbkmswznvbm00z15gj")))) + (build-system haskell-build-system) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("hspec-discover" ,hspec-discover))) + (home-page "http://github.com/sjakobi/newtype-generics") + (synopsis "Typeclass and set of functions for working with newtypes") + (description "The @code{Newtype} typeclass represents the packing and +unpacking of a newtype, and allows you to operate under that newtype with +functions such as @code{ala}. Generics support was added in version 0.4, +making this package a full replacement for the original newtype package, +and an alternative to newtype-th.") + (license license:bsd-3))) + (define-public ghc-haddock-library (package (name "ghc-haddock-library") -- cgit v1.2.3 From 96d214a6d9d0585589432de4e2a77523c4590743 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:50:33 -0400 Subject: gnu: ghc-unliftio: Update to 0.2.7.0. * gnu/packages/haskell.scm (ghc-unliftio): Update to 0.2.7.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 5c49e9074a..7b187899ac 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9936,7 +9936,7 @@ used both from lens and microlens).") (define-public ghc-unliftio (package (name "ghc-unliftio") - (version "0.2.4.0") + (version "0.2.7.0") (source (origin (method url-fetch) @@ -9946,7 +9946,7 @@ used both from lens and microlens).") ".tar.gz")) (sha256 (base32 - "0vpncmwaq5zb6bziqfns4qdgxmq8ky0rlxna2yngxp170s5zxx9z")))) + "0qql93lq5w7qghl454cc3s1i8v1jb4h08n82fqkw0kli4g3g9njs")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: hspec-discover not in PATH (inputs -- cgit v1.2.3 From f9a97fb553fc26f2ea443f7e425b39fea51e47cd Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:00:43 -0400 Subject: gnu: ghc-doctest: Update to 0.16.0. * gnu/packages/haskell.scm (ghc-doctest): Update to 0.16.0. [inputs]: Add ghc-code-page. --- gnu/packages/haskell.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 7b187899ac..75ba7f7993 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5115,7 +5115,7 @@ monad transformer (instead of the IO monad).") (define-public ghc-doctest (package (name "ghc-doctest") - (version "0.11.0") + (version "0.16.0") (source (origin (method url-fetch) @@ -5125,13 +5125,14 @@ monad transformer (instead of the IO monad).") ".tar.gz")) (sha256 (base32 - "0xv4vx1r3mk7cmiwywzrq25545cx3i7imhcx33mk47r88j5c49fj")))) + "0hkccch65s3kp0b36h7bqhilnpi4bx8kngncm7ma9vbd3dwacjdv")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: missing test framework (inputs `(("ghc-syb" ,ghc-syb) ("ghc-paths" ,ghc-paths) ("ghc-base-compat" ,ghc-base-compat) + ("ghc-code-page" ,ghc-code-page) ("ghc-hunit" ,ghc-hunit) ("ghc-hspec" ,ghc-hspec) ("ghc-quickcheck" ,ghc-quickcheck) -- cgit v1.2.3 From 11afd13d70389abeadb274639ddfe1166c8ff4b6 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Mon, 3 Sep 2018 22:40:43 -0400 Subject: gnu: ghc-fgl-arbitrary: Replace "--allow-newer" flags. * gnu/packages/haskell.scm (ghc-fgl-arbitrary)[arguments]: Replace "--allow-newer" configure flags with a phase that patches the Cabal file. --- gnu/packages/haskell.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 75ba7f7993..76e2d22001 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7316,8 +7316,15 @@ supported. A module of colour names (\"Data.Colour.Names\") is provided.") "0ln1szgfy8fa78l3issq4fx3aqnnd54w3cb4wssrfi48vd5rkfjm")))) (build-system haskell-build-system) (arguments - `(#:configure-flags (list "--allow-newer=QuickCheck" - "--allow-newer=hspec"))) + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "fgl-arbitrary.cabal" + (("QuickCheck >= 2\\.3 && < 2\\.10") + "QuickCheck >= 2.3 && < 2.12") + (("hspec >= 2\\.1 && < 2\\.5") + "hspec >= 2.1 && < 2.6"))))))) (inputs `(("ghc-fgl" ,ghc-fgl) ("ghc-quickcheck" ,ghc-quickcheck) -- cgit v1.2.3 From cd40c4d6c360ce52aaf006cb1b0f9190cb5e4d14 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sat, 1 Sep 2018 14:20:06 -0400 Subject: gnu: Add ghc-memotrie. * gnu/packages/haskell.scm (ghc-memotrie): New variable. --- gnu/packages/haskell.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 76e2d22001..1ae8eb993a 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -849,6 +849,29 @@ making this package a full replacement for the original newtype package, and an alternative to newtype-th.") (license license:bsd-3))) +(define-public ghc-memotrie + (package + (name "ghc-memotrie") + (version "0.6.9") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/MemoTrie/MemoTrie-" + version + ".tar.gz")) + (sha256 + (base32 + "157p0pi6rrq74a35mq6zkkycv4ah7xhkbrcmnkb9xf7pznw4aq0x")))) + (build-system haskell-build-system) + (inputs + `(("ghc-newtype-generics" ,ghc-newtype-generics))) + (home-page "https://github.com/conal/MemoTrie") + (synopsis "Trie-based memo functions") + (description "This package provides a functional library for creating +efficient memo functions using tries.") + (license license:bsd-3))) + (define-public ghc-haddock-library (package (name "ghc-haddock-library") -- cgit v1.2.3 From 1aacec9e3d4294d3dadd153170878a9a4748ca24 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:14:17 -0400 Subject: gnu: ghc-openglraw: Update to 3.3.1.0. * gnu/packages/haskell.scm (ghc-openglraw): Update to 3.3.1.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 1ae8eb993a..70847aec1f 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1539,7 +1539,7 @@ arithmetic.") (define-public ghc-openglraw (package (name "ghc-openglraw") - (version "3.2.7.0") + (version "3.3.1.0") (source (origin (method url-fetch) @@ -1549,7 +1549,7 @@ arithmetic.") ".tar.gz")) (sha256 (base32 - "024aln102d1mmsdalq9jd5mmwjbnrb8gxcak73lybrc7q87kswk2")))) + "1x8w3x308jldj2c1xqcq3a3sc2jc06pdpgqkgjsmixi1skv4a1vb")))) (build-system haskell-build-system) (inputs `(("ghc-half" ,ghc-half) -- cgit v1.2.3 From ded4ac387173cedbaf917479bdf763cffbb22e73 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:05:45 -0400 Subject: gnu: ghc-temporary: Update to 1.3. * gnu/packages/haskell.scm (ghc-temporary): Update to 1.3. [inputs]: Add ghc-random. [native-inputs]: Add ghc-base-compat, ghc-tasty, and ghc-tasty-hunit. --- gnu/packages/haskell.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 70847aec1f..dfe3756649 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3399,7 +3399,7 @@ for Haskell.") (define-public ghc-temporary (package (name "ghc-temporary") - (version "1.2.0.4") + (version "1.3") (source (origin (method url-fetch) @@ -3409,9 +3409,15 @@ for Haskell.") ".tar.gz")) (sha256 (base32 - "0qk741yqnpd69sksgks2vb7zi50rglp9m498lzw4sh268a017rsi")))) + "144qhwfwg37l3k313raf4ssiz16jbgwlm1nf4flgqpsbd69jji4c")))) (build-system haskell-build-system) - (inputs `(("ghc-exceptions" ,ghc-exceptions))) + (inputs + `(("ghc-exceptions" ,ghc-exceptions) + ("ghc-random" ,ghc-random))) + (native-inputs + `(("ghc-base-compat" ,ghc-base-compat) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit))) (home-page "https://www.github.com/batterseapower/temporary") (synopsis "Temporary file and directory support") (description "The functions for creating temporary files and directories -- cgit v1.2.3 From 7307a2f8a41fa11a56baa88ae22934572b1900f2 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:21:12 -0400 Subject: gnu: ghc-th-orphans: Update to 0.13.6. * gnu/packages/haskell.scm (ghc-th-orphans): Update to 0.13.6. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index dfe3756649..8676948aa3 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5893,14 +5893,14 @@ function which generates instances.") (define-public ghc-th-orphans (package (name "ghc-th-orphans") - (version "0.13.2") + (version "0.13.6") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "th-orphans/th-orphans-" version ".tar.gz")) (sha256 (base32 - "0102vkyzpgnp2fys8pvw4khrhrh2y1b8dp1slgvn020vg4s351mc")))) + "0sfl3pn9kq9da3ji3lsgzgzy82vz6yvsg80dmakc1jvk7awycibp")))) (build-system haskell-build-system) (inputs `(("ghc-th-lift" ,ghc-th-lift) -- cgit v1.2.3 From bb7d443d85a3dfc8577ae14fc5d38315c61b233b Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:21:43 -0400 Subject: gnu: ghc-x509: Update to 1.7.3. * gnu/packages/haskell-crypto.scm (ghc-x509): Update to 1.7.3. --- gnu/packages/haskell-crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index bb0ee074c2..cff678d724 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -423,14 +423,14 @@ libraries, like OpenSSL.") (define-public ghc-x509 (package (name "ghc-x509") - (version "1.6.4") + (version "1.7.3") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "x509/x509-" version ".tar.gz")) (sha256 (base32 - "0hixx76wpb4qxida017ka5zr6lrsycahrqyw8z90q9mxvndpy3my")))) + "0mkk29g32fs70bqkikg83v45h9jig9c8aail3mrdqwxpkfa0yx21")))) (build-system haskell-build-system) (inputs `(("ghc-memory" ,ghc-memory) -- cgit v1.2.3 From 68dc0c294a6090db2bac109c61b2308eeffb797e Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 31 Aug 2018 23:56:01 -0400 Subject: gnu: ghc-distributive: Update Cabal file to r6. * gnu/packages/haskell.scm (ghc-distributive): Update Cabal file to r6. [native-inputs]: Replace ghc-doctest-0.12 with ghc-doctest. --- gnu/packages/haskell.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 8676948aa3..cac1fcddc3 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2985,6 +2985,9 @@ modifying, and extracting files from zip archives in Haskell.") (base32 "0y566r97sfyvhsmd4yxiz4ns2mqgwf5bdbp56wgxl6wlkidq0wwi")))) (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("6" "06bd38rf31yrvvy989r44pm0id3dsxwcp6nxg7wk6ccj3n2b8rzk"))) (inputs `(("ghc-tagged" ,ghc-tagged) ("ghc-base-orphans" ,ghc-base-orphans) @@ -2993,7 +2996,7 @@ modifying, and extracting files from zip archives in Haskell.") ("ghc-generic-deriving" ,ghc-generic-deriving))) (native-inputs `(("cabal-doctest" ,cabal-doctest) - ("ghc-doctest" ,ghc-doctest-0.12) + ("ghc-doctest" ,ghc-doctest) ("ghc-hspec" ,ghc-hspec) ("hspec-discover" ,hspec-discover))) (home-page "https://github.com/ekmett/distributive/") -- cgit v1.2.3 From 211b213367c7bafb0701e03c777c31902b9a8415 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:22:40 -0400 Subject: gnu: ghc-gluraw: Update to 2.0.0.4. * gnu/packages/haskell.scm (ghc-gluraw): Update to 2.0.0.4. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index cac1fcddc3..911cdccfc0 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1599,7 +1599,7 @@ programs.") (define-public ghc-gluraw (package (name "ghc-gluraw") - (version "2.0.0.2") + (version "2.0.0.4") (source (origin (method url-fetch) @@ -1609,7 +1609,7 @@ programs.") ".tar.gz")) (sha256 (base32 - "1phmvxr0kkxq89ykmr8rj77inj8dvcxd6h72z1ncdgdazfz3sjw8")))) + "1i2xi35n5z0d372px9mh6cyhgg1m0cfaiy3fnspkf6kbn9fgsqxq")))) (build-system haskell-build-system) (inputs `(("ghc-openglraw" ,ghc-openglraw))) -- cgit v1.2.3 From f9f2877d54fdf72e0579bce6cfca87b8712144be Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:14:14 -0400 Subject: gnu: ghc-gnuplot: Update to 0.5.5.2. * gnu/packages/haskell.scm (ghc-gnuplot): Update to 0.5.5.2. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 911cdccfc0..df4ba82a30 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8019,7 +8019,7 @@ helper functions for Lists, Maybes, Tuples, Functions.") (define-public ghc-gnuplot (package (name "ghc-gnuplot") - (version "0.5.4.1") + (version "0.5.5.2") (source (origin (method url-fetch) @@ -8027,7 +8027,7 @@ helper functions for Lists, Maybes, Tuples, Functions.") "mirror://hackage/package/gnuplot/gnuplot-" version ".tar.gz")) (sha256 - (base32 "1xz8prw9xjk0rsyrkp9bsmxykzrbhpv9qhhkdapy75mdbmgwjm7s")))) + (base32 "1mlppnc13ygjzmf6ldydys4wvy35yb3xjwwfgf9rbi7nfcqjr6mn")))) (build-system haskell-build-system) (inputs `(("ghc-temporary" ,ghc-temporary) -- cgit v1.2.3 From ad91386a277f7b084ce59c6e7f1c9f57ec5501e4 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Mon, 3 Sep 2018 22:30:50 -0400 Subject: gnu: ghc-graphviz: Remove unneeded configure flag. * gnu/packages/haskell.scm (ghc-graphviz)[arguments]: Remove unneeded "--allow-newer=QuickCheck" configure flag. --- gnu/packages/haskell.scm | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index df4ba82a30..6198180194 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7382,8 +7382,6 @@ for generating graph-like data structures.") (base32 "0kj7ap0gnliviq2p8lscw1m06capnsa90vpvcys24nqy5nw2wrp7")))) (build-system haskell-build-system) - (arguments - `(#:configure-flags (list "--allow-newer=QuickCheck"))) (inputs `(("ghc-quickcheck" ,ghc-quickcheck) ("ghc-colour" ,ghc-colour) -- cgit v1.2.3 From a15411176342ba58914d9119296ad6da7f7aa35b Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:08:39 -0400 Subject: gnu: ghc-markdown-unlit: Update to 0.5.0. * gnu/packages/haskell.scm (ghc-markdown-unlit): Update to 0.5.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 6198180194..d754ecdc1b 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8165,7 +8165,7 @@ and a large set of GNU extensions.") (define-public ghc-markdown-unlit (package (name "ghc-markdown-unlit") - (version "0.4.0") + (version "0.5.0") (source (origin (method url-fetch) (uri (string-append @@ -8173,7 +8173,7 @@ and a large set of GNU extensions.") "markdown-unlit-" version ".tar.gz")) (sha256 (base32 - "1kj2bffl7ndd8ygwwa3r1mbpwbxbfhyfgnbla8k8g9i6ffp0qrbw")))) + "1gy79vr85vcp13rdjh0hz7zv6daqqffww4j0cqn2lpjjh9xhsbg7")))) (build-system haskell-build-system) (inputs `(("ghc-base-compat" ,ghc-base-compat) -- cgit v1.2.3 From b3cd1712a8acc59b1d7302627bb997912aad9a28 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:14:19 -0400 Subject: gnu: ghc-mockery: Update to 0.3.5. * gnu/packages/haskell.scm (ghc-mockery): Update to 0.3.5. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index d754ecdc1b..9b906e1524 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -6057,14 +6057,14 @@ back-ends.") (define-public ghc-mockery (package (name "ghc-mockery") - (version "0.3.3") + (version "0.3.5") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "mockery/mockery-" version ".tar.gz")) (sha256 (base32 - "1m7sq2vclgir3qbpngzl3g87ks4034blwwf7p3h02c0jlcwpl5b1")))) + "09ypgm3z69gq8mj6y66ss58kbjnk15r8frwcwbqcfbfksfnfv8dp")))) (build-system haskell-build-system) (inputs `(("ghc-temporary" ,ghc-temporary) -- cgit v1.2.3 From 5a92fb411c0cac4032c885d977192f212daaa493 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:26:03 -0400 Subject: gnu: ghc-network: Update to 2.6.3.6. * gnu/packages/haskell.scm (ghc-network): Update to 2.6.3.6. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 9b906e1524..935b126077 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4004,7 +4004,7 @@ interface.") (define-public ghc-network (package (name "ghc-network") - (version "2.6.3.1") + (version "2.6.3.6") (outputs '("out" "doc")) (source (origin @@ -4015,7 +4015,7 @@ interface.") ".tar.gz")) (sha256 (base32 - "1rl2gl37cf4k0ddsq93q15fwdz1l25nhl4w205krbh7d5dg5y12p")))) + "198mam7ahny48p9fajznbqq16a8ya2gw0xm3gnm1si1rmc4hdplv")))) (build-system haskell-build-system) ;; The regression tests depend on an unpublished module. (arguments `(#:tests? #f)) -- cgit v1.2.3 From 10ae734585c9f11fd0bd5353120d026d058e1950 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:50:16 -0400 Subject: gnu: ghc-typed-process: Update to 0.2.3.0. * gnu/packages/haskell.scm (ghc-typed-process): Update to 0.2.3.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 935b126077..d7b09065dd 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -6764,7 +6764,7 @@ better for some purposes.") (define-public ghc-typed-process (package (name "ghc-typed-process") - (version "0.2.2.0") + (version "0.2.3.0") (source (origin (method url-fetch) @@ -6773,7 +6773,7 @@ better for some purposes.") version ".tar.gz")) (sha256 (base32 - "0c6gvgvjyncbni9a5bvpbglknd4yclr3d3hfg9bhgahmkj40dva2")))) + "0j36vrc9w841m5qbwqra1lwiznx31xfnhin1sm8x2c2739csbpn0")))) (build-system haskell-build-system) (inputs `(("ghc-async" ,ghc-async) -- cgit v1.2.3 From 0618a71b1e5d0e5d79b440509791c49740a43f38 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:50:55 -0400 Subject: gnu: ghc-wave: Update to 0.1.5. * gnu/packages/haskell.scm (ghc-wave): Update to 0.1.5. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index d7b09065dd..b804117d84 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8223,7 +8223,7 @@ Rust syntax. It is intended to be useful for two different purposes: (define-public ghc-wave (package (name "ghc-wave") - (version "0.1.4") + (version "0.1.5") (source (origin (method url-fetch) (uri (string-append @@ -8232,7 +8232,7 @@ Rust syntax. It is intended to be useful for two different purposes: ".tar.gz")) (sha256 (base32 - "1g5nmqfk6p25v9ismwz4i66ay91bd1qh39xwj0hm4z6a5mw8frk8")))) + "03zycmwrchhqvi37fdvlzz2d1vl4hy0i8xyys1zznw38qfq0h2i5")))) (build-system haskell-build-system) (inputs `(("ghc-cereal" ,ghc-cereal) -- cgit v1.2.3 From 245a2555bcdd551cc6e0fe8fde6ccffa1248f741 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:26:37 -0400 Subject: gnu: ghc-x509-store: Update to 1.6.6. * gnu/packages/haskell-crypto.scm (ghc-x509-store): Update to 1.6.6. [native-inputs]: Add ghc-tasty and ghc-tasty-hunit. --- gnu/packages/haskell-crypto.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index cff678d724..9903555e6b 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -452,7 +452,7 @@ libraries, like OpenSSL.") (define-public ghc-x509-store (package (name "ghc-x509-store") - (version "1.6.2") + (version "1.6.6") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -460,7 +460,7 @@ libraries, like OpenSSL.") version ".tar.gz")) (sha256 (base32 - "0yw09nwkvr324qz4sc27c0p28bz2h6gns6lkaz9mz92mgqf2dza9")))) + "0dbndqmnmyixxc7308nyq3zlkhz9dff4rbcw2a49c77rbicny9va")))) (build-system haskell-build-system) (inputs `(("ghc-pem" ,ghc-pem) @@ -468,6 +468,9 @@ libraries, like OpenSSL.") ("ghc-asn1-encoding" ,ghc-asn1-encoding) ("ghc-cryptonite" ,ghc-cryptonite) ("ghc-x509" ,ghc-x509))) + (native-inputs + `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit))) (home-page "https://github.com/vincenthz/hs-certificate") (synopsis "X.509 collection accessing and storing methods") (description -- cgit v1.2.3 From 74f490ec0b1fab0d5df54a5b5b79b9f511197aa5 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:21:18 -0400 Subject: gnu: ghc-zip-archive: Update to 0.3.3. * gnu/packages/haskell.scm (ghc-zip-archive): Update to 0.3.3. [inputs]: Remove ghc-old-time and zip. [native-inputs]: Add unzip. --- gnu/packages/haskell.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index b804117d84..7c5fef6c9b 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2943,7 +2943,7 @@ complicated text/binary file formats.") (define-public ghc-zip-archive (package (name "ghc-zip-archive") - (version "0.3.0.5") + (version "0.3.3") (source (origin (method url-fetch) @@ -2953,17 +2953,16 @@ complicated text/binary file formats.") ".tar.gz")) (sha256 (base32 - "1iwpzjck4jg9bz1yqky051i2wljsqc14q5zbi10dydfp8ip3d0yw")))) + "0kf8xyac168bng8a0za2jwrbss7a4ralvci9g54hnvl0gkkxx2lq")))) (build-system haskell-build-system) (inputs - `(("ghc-old-time" ,ghc-old-time) - ("ghc-digest" ,ghc-digest) - ("zip" ,zip) + `(("ghc-digest" ,ghc-digest) ("ghc-temporary" ,ghc-temporary) ("ghc-text" ,ghc-text) ("ghc-zlib" ,ghc-zlib))) (native-inputs - `(("ghc-hunit" ,ghc-hunit))) + `(("ghc-hunit" ,ghc-hunit) + ("unzip" ,unzip))) (home-page "https://hackage.haskell.org/package/zip-archive") (synopsis "Zip archive library for Haskell") (description "The zip-archive library provides functions for creating, -- cgit v1.2.3 From 0f9e74e9f7bef9157c7869cd9cb6ed50a8364e2d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 30 Aug 2018 11:39:41 -0400 Subject: gnu: ghc-attoparsec: Enable tests and allow newer QuickCheck. * gnu/packages/haskell.scm (ghc-attoparsec)[arguments]: Enable tests and add a phase that patches the Cabal file to allow a newer QuickCheck and removes a failing test. --- gnu/packages/haskell.scm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 7c5fef6c9b..5c1bb6f309 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2909,10 +2909,19 @@ with slicing and Clang-style colored diagnostics.") (base32 "0j6qcwd146yzlkc9mcvzvnixsyl65n2a68l28322q5v9p4g4g4yx")))) (build-system haskell-build-system) - ;; FIXME: at least on test fails with QuickCheck > 2.9.2. Once upstream - ;; has updated the tests to work with a later version of QuickCheck we can - ;; re-enable them. - (arguments `(#:tests? #f)) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-for-newer-quickcheck + (lambda _ + (substitute* "attoparsec.cabal" + (("QuickCheck >= 2\\.7 && < 2\\.10") + "QuickCheck >= 2.7 && < 2.12")) + ;; This test fails because of the newer QuickCheck: + ;; . + (substitute* "tests/QC/ByteString.hs" + ((", testProperty \"satisfyWith\" satisfyWith") + ""))))))) (inputs `(("ghc-scientific" ,ghc-scientific) ("ghc-text" ,ghc-text))) -- cgit v1.2.3 From 40a8d0762f7f872696cf23d5111fbecb28dbdd5f Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:27:32 -0400 Subject: gnu: ghc-bytes: Update to 0.15.5. * gnu/packages/haskell.scm (ghc-bytes): Update to 0.15.5. [inputs]: Replace ghc-doctest-0.13 with ghc-doctest. --- gnu/packages/haskell.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 5c1bb6f309..d2db25c019 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -10092,7 +10092,7 @@ address string against RFC 5322.") (define-public ghc-bytes (package (name "ghc-bytes") - (version "0.15.4") + (version "0.15.5") (source (origin (method url-fetch) @@ -10103,11 +10103,11 @@ address string against RFC 5322.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "121x3iqlm8pghw8cd9g30cnqbl7jrdpfjxdanmqdqllajw6xivrm")))) + "063il2vrn0p88r9gzndh4ijs0mxj37khkc9ym9bqdsv7ngk3b683")))) (build-system haskell-build-system) (inputs `(("ghc-cereal" ,ghc-cereal) ("cabal-doctest" ,cabal-doctest) - ("ghc-doctest" ,ghc-doctest-0.13) + ("ghc-doctest" ,ghc-doctest) ("ghc-scientific" ,ghc-scientific) ("ghc-text" ,ghc-text) ("ghc-transformers-compat" ,ghc-transformers-compat) -- cgit v1.2.3 From c2828c8149ee06577c861f21acfcf4418bd711f8 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:29:10 -0400 Subject: gnu: ghc-comonad: Update to 5.0.4. * gnu/packages/haskell.scm (ghc-comonad): Update to 5.0.4. [native-inputs]: Add cabal-doctest and ghc-doctest. --- gnu/packages/haskell.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index d2db25c019..0e883d1ff3 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3043,7 +3043,7 @@ parser isolation, and labeled blocks for better error messages.") (define-public ghc-comonad (package (name "ghc-comonad") - (version "5") + (version "5.0.4") (source (origin (method url-fetch) @@ -3053,10 +3053,11 @@ parser isolation, and labeled blocks for better error messages.") ".tar.gz")) (sha256 (base32 - "0anb36m9z52y9xsipxzj9w1b41b2rj8r389cxd6d20dplnfv3rbq")))) + "09g870c4flp4k3fgbibsd0mmfjani1qcpbcl685v8x89kxzrva3q")))) (build-system haskell-build-system) (native-inputs - `(("ghc-doctest" ,ghc-doctest))) + `(("cabal-doctest" ,cabal-doctest) + ("ghc-doctest" ,ghc-doctest))) (inputs `(("ghc-contravariant" ,ghc-contravariant) ("ghc-distributive" ,ghc-distributive) -- cgit v1.2.3 From 14b0ade66fac4d8f9945f14c2031bd41352139b5 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:33:24 -0400 Subject: gnu: ghc-haskell-src-exts: Update to 1.20.2. * gnu/packages/haskell.scm (ghc-haskell-src-exts): Update to 1.20.2. [inputs]: Replace ghc-pretty-show-for-haskell-src-exts with ghc-pretty-show. (ghc-pretty-show-for-haskell-src-exts): Remove. --- gnu/packages/haskell.scm | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 0e883d1ff3..5772e6a4a4 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1223,23 +1223,10 @@ complex generic values into an interactive Html page, for easier examination.") (license license:expat))) -(define-public ghc-pretty-show-for-haskell-src-exts - (package (inherit ghc-pretty-show) - (name "ghc-pretty-show") - (version "1.6.10") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/pretty-show/" - "pretty-show-" version ".tar.gz")) - (sha256 - (base32 - "133s4l1gk46saf6ycm785rswycy8g3j0qqrv93b5wp8cp50kd0ww")))))) - (define-public ghc-haskell-src-exts (package (name "ghc-haskell-src-exts") - (version "1.20.1") + (version "1.20.2") (source (origin (method url-fetch) @@ -1249,12 +1236,12 @@ examination.") ".tar.gz")) (sha256 (base32 - "1jsjl9hja2dpcfq4mzlfpwyr6axwnwgacfb7aa070kz4lbygzaa8")))) + "1sm3z4v1p5yffg01ldgavz71s3bvfhjfa13k428rk14bpkl8crlz")))) (build-system haskell-build-system) (inputs `(("cpphs" ,cpphs) ("ghc-happy" ,ghc-happy) - ("ghc-pretty-show" ,ghc-pretty-show-for-haskell-src-exts))) + ("ghc-pretty-show" ,ghc-pretty-show))) (native-inputs `(("ghc-smallcheck" ,ghc-smallcheck) ("ghc-tasty" ,ghc-tasty) -- cgit v1.2.3 From b9a6398692b78db8ce6038ffcba534c0d4b77e97 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:31:42 -0400 Subject: gnu: ghc-iproute: Update to 1.7.5. * gnu/packages/haskell.scm (ghc-iproute): Update to 1.7.5. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 5772e6a4a4..fa57aebe66 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2583,7 +2583,7 @@ lines continued at an indented level below.") (define-public ghc-iproute (package (name "ghc-iproute") - (version "1.7.1") + (version "1.7.5") (source (origin (method url-fetch) @@ -2593,7 +2593,7 @@ lines continued at an indented level below.") ".tar.gz")) (sha256 (base32 - "1viyxq3m1aifl05w0hxwrhhhcfpmvwz4ymil2gngi4nfm0yd1f2p")))) + "1vw1nm3s8vz1hqnjnqd3wh5rr4q3m2r4izn5ynhf93h9185qwqzd")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: Tests cannot find System.ByteOrder, ; exported by ghc-byteorder. Doctest issue. -- cgit v1.2.3 From 81caf9488546f438c7d6397959e827f6af9273cb Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:32:07 -0400 Subject: gnu: ghc-megaparsec: Update to 6.5.0. * gnu/packages/haskell.scm (ghc-megaparsec): Update to 6.5.0. [arguments]: Update Cabal file to r4. --- gnu/packages/haskell.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index fa57aebe66..142c96f63c 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3873,7 +3873,7 @@ combinators.") (define-public ghc-megaparsec (package (name "ghc-megaparsec") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) @@ -3882,8 +3882,11 @@ combinators.") version ".tar.gz")) (sha256 (base32 - "0h9azhs0dfrc359vrbd1jljrg3yfdbwd4p62cxqkn7mnh8913jpd")))) + "12iggy7qpf8x93jm64zf0g215xwy779bqyfyjk2bhmxqqr1yzgdy")))) (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("4" "0ij3asi5vwlhbgwsy6nhli9a0qb7926mg809fsgyl1rnhs9fvpx1"))) (inputs `(("ghc-case-insensitive" ,ghc-case-insensitive) ("ghc-parser-combinators" ,ghc-parser-combinators) -- cgit v1.2.3 From ce88eae9a30d23d10cc771fb06659da293d1ae9b Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:44:29 -0400 Subject: gnu: ghc-opengl: Update to 3.0.2.2. * gnu/packages/haskell.scm (ghc-opengl): Update to 3.0.2.2. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 142c96f63c..d1046a81bf 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1610,7 +1610,7 @@ basis for a nicer interface.") (define-public ghc-opengl (package (name "ghc-opengl") - (version "3.0.1.0") + (version "3.0.2.2") (source (origin (method url-fetch) @@ -1620,7 +1620,7 @@ basis for a nicer interface.") ".tar.gz")) (sha256 (base32 - "1nm2mzrn1h2nnfs9vl5p088hqpll7rdvcsyqsn8q641im9jhqp7l")))) + "19vxwvx2n8zq2klj176l25n2b64ybp0b8mhm4p46gvpcivz41fjc")))) (build-system haskell-build-system) (inputs `(("ghc-text" ,ghc-text) -- cgit v1.2.3 From fc0424875f4f7c39ed1b5f88192ae4b77445ac3d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 31 Aug 2018 22:47:48 -0400 Subject: gnu: ghc-quickcheck-instances: Update Cabal file to r1. * gnu/packages/haskell-check.scm (ghc-quickcheck-instances) Update Cabal file to r1. [arguments]: Remove unneeded "--allow-newer" configure flag. --- gnu/packages/haskell-check.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 0ab0b9a61d..d8c2e47dbe 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -352,7 +352,8 @@ development.") "1bh1pzz5fdcqvzdcirqxna6fnjms02min5md716299g5niz46w55")))) (build-system haskell-build-system) (arguments - `(#:configure-flags (list "--allow-newer=base-compat"))) + `(#:cabal-revision + ("1" "1sngfq3v71bvgjsl8cj5kh65m3fziwy8dkvwjzs0kxfrzr87faly"))) (inputs `(("ghc-quickcheck" ,ghc-quickcheck) ("ghc-base-compat" ,ghc-base-compat) -- cgit v1.2.3 From fd358b34c356b9caaa73ea4df84efeeb67b88dce Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:32:48 -0400 Subject: gnu: ghc-socks: Update to 0.5.6. * gnu/packages/haskell.scm (ghc-socks): Update to 0.5.6. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index d1046a81bf..689a24a12f 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -6383,14 +6383,14 @@ set, memory copy, ..) and more") (define-public ghc-socks (package (name "ghc-socks") - (version "0.5.5") + (version "0.5.6") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "socks/socks-" version ".tar.gz")) (sha256 (base32 - "0s689w1hh9g8ifl75xhzbv96ir07hwn04b4lgvbxzl8swa9ylir6")))) + "0f44qy74i0n6ll3jym0a2ipafkpw1h67amcpqmj8iq95h21wsqzs")))) (build-system haskell-build-system) (inputs `(("ghc-cereal" ,ghc-cereal) -- cgit v1.2.3 From ddbe020756f65176d7a693b02f54e71bdd1b0685 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:33:57 -0400 Subject: gnu: ghc-x509-system: Update to 1.6.6. * gnu/packages/haskell-crypto.scm (ghc-x509-system): Update to 1.6.6. --- gnu/packages/haskell-crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index 9903555e6b..a4e0a22faf 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -512,7 +512,7 @@ list validation.") (define-public ghc-x509-system (package (name "ghc-x509-system") - (version "1.6.4") + (version "1.6.6") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -520,7 +520,7 @@ list validation.") version ".tar.gz")) (sha256 (base32 - "0k7zc0xp7r6kqmi39rpiicvq78xb0pr2cq6q5s3kmmsshllg13nr")))) + "06a4m9c7vlr9nhp9gmqbb46arf0yj1dkdm4nip03hzy67spdmp20")))) (build-system haskell-build-system) (inputs `(("ghc-pem" ,ghc-pem) -- cgit v1.2.3 From bb84b01d51c3293fdd56e0907be87ac94f593197 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:34:16 -0400 Subject: gnu: ghc-x509-validation: Update to 1.6.10. * gnu/packages/haskell-crypto.scm (ghc-x509-validation): Update to 1.6.10. [native-inputs]: Add ghc-tasty and ghc-tasty-hunit. --- gnu/packages/haskell-crypto.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index a4e0a22faf..ff44970be0 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -481,7 +481,7 @@ collections, certificates, revocation lists, and exception lists.") (define-public ghc-x509-validation (package (name "ghc-x509-validation") - (version "1.6.5") + (version "1.6.10") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -489,7 +489,7 @@ collections, certificates, revocation lists, and exception lists.") version ".tar.gz")) (sha256 (base32 - "190w1sr3w6w49v3yvqz4grb0v09ym4gll3n8bxwijvbvcybk3xyi")))) + "1ms51scawldgyfcim5a2qlgyn3rnrclyh205d6djaa1569vrs73n")))) (build-system haskell-build-system) (inputs `(("ghc-memory" ,ghc-memory) @@ -502,6 +502,9 @@ collections, certificates, revocation lists, and exception lists.") ("ghc-x509" ,ghc-x509) ("ghc-x509-store" ,ghc-x509-store) ("ghc-cryptonite" ,ghc-cryptonite))) + (native-inputs + `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit))) (home-page "https://github.com/vincenthz/hs-certificate") (synopsis "X.509 certificate and revocation list validation") (description -- cgit v1.2.3 From 2dbecb3a7515eb50e54c431d9830ca7a30d42af1 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:38:09 -0400 Subject: gnu: ghc-aeson: Update to 1.3.1.1. * gnu/packages/haskell-web.scm (ghc-aeson): Update to 1.3.1.1. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index a60bf007af..2e863965ae 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -783,7 +783,7 @@ Strict, Transitional and Frameset variants.") (define-public ghc-aeson (package (name "ghc-aeson") - (version "1.2.4.0") + (version "1.3.1.1") (source (origin (method url-fetch) @@ -793,7 +793,7 @@ Strict, Transitional and Frameset variants.") ".tar.gz")) (sha256 (base32 - "16zwpd07cmhs58wwsqbhxy3b58gqw8w5nr7nf6lwi4nvznjdn09l")))) + "1i1ig840fvsb1lnklcv32zsc0zscirc301lw1mpfxhc6h4pk0gw4")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: testing libraries are missing. (inputs -- cgit v1.2.3 From 8e4394a571ac8a25cc08a5a42f401011c5aa37a1 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sat, 1 Sep 2018 14:01:22 -0400 Subject: gnu: ghc-attoparsec-iso8601: Update Cabal file to r1. * gnu/packages/haskell.scm (ghc-attoparsec-iso8601): Update Cabal file to r1. --- gnu/packages/haskell.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 689a24a12f..397132d4dd 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9684,6 +9684,9 @@ connections.") (base32 "12l55b76bhya9q89mfmqmy6sl5v39b6gzrw5rf3f70vkb23nsv5a")))) (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("1" "06f7pgmmc8456p3hc1y23kz1y127gfczy7s00wz1rls9g2sm2vi4"))) (inputs `(("ghc-attoparsec" ,ghc-attoparsec) ("ghc-base-compat" ,ghc-base-compat) ("ghc-text" ,ghc-text))) -- cgit v1.2.3 From 8574e6c704f3e89e243b36793fedbfa0ea3bade0 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:38:44 -0400 Subject: gnu: ghc-bifunctors: Update to 5.5.3. * gnu/packages/haskell.scm (ghc-bifunctors): Update to 5.5.3. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 397132d4dd..45a43d6272 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4886,7 +4886,7 @@ cross-site scripting (@dfn{XSS}) attacks.") (define-public ghc-bifunctors (package (name "ghc-bifunctors") - (version "5.5.2") + (version "5.5.3") (source (origin (method url-fetch) @@ -4896,7 +4896,7 @@ cross-site scripting (@dfn{XSS}) attacks.") ".tar.gz")) (sha256 (base32 - "04fbsysm6zl8kmvqgffmrqa9bxl9dl2gibrd51asqzg737mb4ark")))) + "1jn9rxg643xnlhrknmjz88nblcpsr45xwjkwwnn5nxpasa7m4d6l")))) (build-system haskell-build-system) (inputs `(("ghc-base-orphans" ,ghc-base-orphans) -- cgit v1.2.3 From 892d5546472e214849fced1a5ab23a7afab53e94 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 6 Sep 2018 13:55:55 -0400 Subject: gnu: ghc-cgi: Adjust dependency constraints. * gnu/packages/haskell.scm (ghc-cgi)[arguments]: Remove "--allow-newer" configure flag; add a phase that patches the Cabal file to allow newer versions of exceptions, time, doctest, and QuickCheck. --- gnu/packages/haskell.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 45a43d6272..ba8491429b 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1093,7 +1093,19 @@ tool lex or flex for C/C++.") "1hbpplss1m4rdpm4ibip6fpimlhssqa14fl338kl2jbc463i64cj")))) (build-system haskell-build-system) (arguments - `(#:configure-flags (list "--allow-newer=QuickCheck"))) + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "cgi.cabal" + (("exceptions < 0\\.9") + "exceptions < 0.11") + (("time >= 1\\.5 && < 1\\.7") + "time >= 1.5 && < 1.9") + (("doctest >= 0\\.8 && < 0\\.12") + "doctest >= 0.8 && < 0.17") + (("QuickCheck >= 2\\.8\\.1 && < 2\\.10") + "QuickCheck >= 2.8.1 && < 2.12"))))))) (inputs `(("ghc-parsec" ,ghc-parsec) ("ghc-exceptions" ,ghc-exceptions) -- cgit v1.2.3 From 146198f89890035f5ffe32cebdf026cc38740fa2 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:39:51 -0400 Subject: gnu: ghc-email-validate: Update to 2.3.2.6. * gnu/packages/haskell.scm (ghc-email-validate): Update to 2.3.2.6. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index ba8491429b..c65bff34c4 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -10053,7 +10053,7 @@ system dependencies.") (define-public ghc-email-validate (package (name "ghc-email-validate") - (version "2.3.2.1") + (version "2.3.2.6") (source (origin (method url-fetch) @@ -10064,7 +10064,7 @@ system dependencies.") ".tar.gz")) (sha256 (base32 - "0qvxysiap3r4mi3xff5nsk9qv6diqxfgwj186bypbamzvzlz0lav")))) + "0chgylvc8xmhp933rdbmpg5sv4y7yg2h6kbf0ip1dzmbd5p55pa5")))) (build-system haskell-build-system) (inputs `(("ghc-attoparsec" ,ghc-attoparsec) -- cgit v1.2.3 From 2dee63943b3b9c215264c926e27a7af9e93ec886 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:55:11 -0400 Subject: gnu: ghc-glut: Update to 2.7.0.14. * gnu/packages/haskell.scm (ghc-glut): Update to 2.7.0.14. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index c65bff34c4..4fd8e69ee9 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1571,7 +1571,7 @@ found at runtime, a userError is thrown.") (define-public ghc-glut (package (name "ghc-glut") - (version "2.7.0.10") + (version "2.7.0.14") (source (origin (method url-fetch) @@ -1581,7 +1581,7 @@ found at runtime, a userError is thrown.") ".tar.gz")) (sha256 (base32 - "0sbm943bg896nf3qjmlnsg3zzrr3pl330rzh9g0hwv47nzwwn4ab")))) + "01i162fly4q1751fp60lgkzlb8kr0qqbvmxj74zc6skb19qggy2w")))) (build-system haskell-build-system) (inputs `(("ghc-statevar" ,ghc-statevar) -- cgit v1.2.3 From 255a31f8413073c5c5e78d85adb9d466b09c18df Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:40:23 -0400 Subject: gnu: ghc-haskell-src-exts-util: Update to 0.2.3. * gnu/packages/haskell.scm (ghc-haskell-src-exts-util): Update to 0.2.3. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 4fd8e69ee9..f545e5ee93 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1271,7 +1271,7 @@ patterns as per the HaRP extension as well as HSX-style embedded XML syntax.") (define-public ghc-haskell-src-exts-util (package (name "ghc-haskell-src-exts-util") - (version "0.2.2") + (version "0.2.3") (source (origin (method url-fetch) @@ -1280,7 +1280,7 @@ patterns as per the HaRP extension as well as HSX-style embedded XML syntax.") version ".tar.gz")) (sha256 (base32 - "14rhwcrdz3kfb69c64qn8kybl7wnpajrjlfz5p95ca4bva4mwclg")))) + "1803718paq89f8pdck4mb88hv2k1ah9lxzq0lgjgwi9n88ryycz8")))) (build-system haskell-build-system) (inputs `(("ghc-data-default" ,ghc-data-default) -- cgit v1.2.3 From dcfee7b6d56b4308433c2d23b8ae1700460f62f3 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:25:38 -0400 Subject: gnu: ghc-haskell-src-meta: Update to 0.8.0.3. * gnu/packages/haskell.scm (ghc-haskell-src-meta): Update to 0.8.0.3. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index f545e5ee93..aad8649170 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5978,7 +5978,7 @@ info for more informative bug reports.") (define-public ghc-haskell-src-meta (package (name "ghc-haskell-src-meta") - (version "0.8.0.2") + (version "0.8.0.3") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -5986,7 +5986,7 @@ info for more informative bug reports.") version ".tar.gz")) (sha256 (base32 - "12rc4v5dbbbcwdp7j8isvnm9vqpazv124j5kdfwlgwgwjhxi8ysb")))) + "08jq156zv4m0fjq6712n99c1jwxnpa6kj6sq8ch0r1l0a1ay6ww4")))) (build-system haskell-build-system) (inputs `(("ghc-haskell-src-exts" ,ghc-haskell-src-exts) -- cgit v1.2.3 From 867ac7fe58f6defe202e040803e41fc3f8e3d646 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:40:25 -0400 Subject: gnu: ghc-hslua: Update to 0.9.5.2. * gnu/packages/haskell.scm (ghc-hslua): Update to 0.9.5.2. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index aad8649170..b43844fb7f 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -6203,14 +6203,14 @@ TIFF and GIF formats.") (define-public ghc-hslua (package (name "ghc-hslua") - (version "0.9.5") + (version "0.9.5.2") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "hslua/hslua-" version ".tar.gz")) (sha256 (base32 - "1j2zk7f7nyywg2b0n6kb2yf6ljc7cn2sk9jz0h76g3ag2b70l12n")))) + "1rdvv01p214zfjh6fcqjjgqwi8y42wad6cqzhlcv5gvclzw2ck8f")))) (build-system haskell-build-system) (arguments `(#:configure-flags '("-fsystem-lua"))) -- cgit v1.2.3 From 40e1af35bee20984563a4bf48810777d4b7c488b Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:41:19 -0400 Subject: gnu: ghc-http-date: Update to 0.0.8. * gnu/packages/haskell-web.scm (ghc-http-date): Update to 0.0.8. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 2e863965ae..742d3abcba 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -261,7 +261,7 @@ libraries, such as http-conduit.") (define-public ghc-http-date (package (name "ghc-http-date") - (version "0.0.6.1") + (version "0.0.8") (source (origin (method url-fetch) @@ -270,7 +270,7 @@ libraries, such as http-conduit.") "http-date-" version ".tar.gz")) (sha256 (base32 - "0dknh28kyarnzqrsc80ssalxjrq0qbv7ir49247p2grb7rh0dqgj")))) + "09slbzqayjnqqz9zybk7slgzvizgplikqgg4b2flzgks91466k0g")))) (build-system haskell-build-system) (inputs `(("ghc-attoparsec" ,ghc-attoparsec))) -- cgit v1.2.3 From 774f3984146dffb33573ff119dee056580bacff6 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:42:31 -0400 Subject: gnu: ghc-parsers: Update to 0.12.9. * gnu/packages/haskell.scm (ghc-parsers): Update to 0.12.9. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index b43844fb7f..bdb1205082 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2800,7 +2800,7 @@ copious examples.") (define-public ghc-parsers (package (name "ghc-parsers") - (version "0.12.4") + (version "0.12.9") (source (origin (method url-fetch) @@ -2810,7 +2810,7 @@ copious examples.") ".tar.gz")) (sha256 (base32 - "07najh7f9y3ahh42z96sw4hnd0kc4x3wm0xlf739y0gh81ys5097")))) + "1r05sc1mcglk8w596kq9a1brfn9c2vll8lq16j07ln0vsz4jzrc1")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: Test fails with "cannot satisfy ; -package attoparsec-0.13.0.1" -- cgit v1.2.3 From 310d782eaf1f8db59f6e8746132ffe93341db67e Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:17:42 -0400 Subject: gnu: ghc-tasty-th: Update to 0.1.7. * gnu/packages/haskell-check.scm (ghc-tasty-th): Update to 0.1.7. [inputs]: Add ghc-haskell-src-exts and ghc-tasty-hunit. --- gnu/packages/haskell-check.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index d8c2e47dbe..ce1030eef1 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -260,7 +260,7 @@ tasty.") (define-public ghc-tasty-th (package (name "ghc-tasty-th") - (version "0.1.4") + (version "0.1.7") (source (origin (method url-fetch) @@ -269,10 +269,12 @@ tasty.") version ".tar.gz")) (sha256 (base32 - "0dff9si8i1qp0s7p4hlk0l29vq7wxfglw6mvlgmld43h7rllv88q")))) + "0b2ivrw2257m4cy4rjnkwqlarh83j1y3zywnmaqqqbvy667sqnj3")))) (build-system haskell-build-system) (inputs - `(("ghc-tasty" ,ghc-tasty))) + `(("ghc-haskell-src-exts" ,ghc-haskell-src-exts) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit))) (home-page "https://github.com/bennofs/tasty-th") (synopsis "Automatically generate tasty TestTrees") (description -- cgit v1.2.3 From 66c5de39485fe543f1dd6a0df86dffa1dd33ade7 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:42:50 -0400 Subject: gnu: ghc-tls: Update to 1.4.1. * gnu/packages/tls.scm (ghc-tls): Update to 1.4.1. --- gnu/packages/tls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 6c4c64e507..bf462981ee 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -871,14 +871,14 @@ coding footprint.") (define-public ghc-tls (package (name "ghc-tls") - (version "1.3.8") + (version "1.4.1") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "tls/tls-" version ".tar.gz")) (sha256 (base32 - "1rdidf18i781c0vdvy9yn79yh08hmcacf6fp3sgghyiy3h0wyh5l")))) + "1y083724mym28n6xfaz7pcc7zqxdhjpaxpbvzxfbs25qq2px3smv")))) (build-system haskell-build-system) (inputs `(("ghc-cereal" ,ghc-cereal) -- cgit v1.2.3 From bad349d8a620a055bcec4293a27e60bb20f3ce0e Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:43:13 -0400 Subject: gnu: ghc-uri-bytestring: Update to 0.3.2.0. * gnu/packages/haskell.scm (ghc-uri-bytestring): Update to 0.3.2.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index bdb1205082..40c77c9439 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9734,7 +9734,7 @@ each constructor are represented using an n-ary product.") (define-public ghc-uri-bytestring (package (name "ghc-uri-bytestring") - (version "0.3.1.0") + (version "0.3.2.0") (source (origin (method url-fetch) @@ -9743,7 +9743,7 @@ each constructor are represented using an n-ary product.") "uri-bytestring-" version ".tar.gz")) (sha256 (base32 - "04qjv1sgyrdg538290p9hqnvyxnahvr5cjwl8vm1rn9j0fv3ymq9")))) + "1q04j5ybvk37zk2m0bkjwyhblz0ymdj0cn4rvsvdca1ikn5xdv5c")))) (build-system haskell-build-system) (inputs `(("ghc-attoparsec" ,ghc-attoparsec) ("ghc-fail" ,ghc-fail) -- cgit v1.2.3 From 5ebadb584bc642d58bf6c8dbb54468e4b7f266bd Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:44:15 -0400 Subject: gnu: agda: Update to 2.5.4.1. * gnu/packages/agda.scm (agda): Update to 2.5.4.1. --- gnu/packages/agda.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/agda.scm b/gnu/packages/agda.scm index 572de5bbeb..418025bc37 100644 --- a/gnu/packages/agda.scm +++ b/gnu/packages/agda.scm @@ -30,7 +30,7 @@ (define-public agda (package (name "agda") - (version "2.5.3") + (version "2.5.4.1") (source (origin (method url-fetch) @@ -39,7 +39,7 @@ version ".tar.gz")) (sha256 (base32 - "0r80vw7vnvbgq47y50v050malv7zvv2p2kg6f47i04r0b2ix855a")))) + "0bxpibsk98n9xp42d92ma5vj2fam8rsnl61fbhr3askfjdvalnbp")))) (build-system haskell-build-system) (inputs `(("cpphs" ,cpphs) -- cgit v1.2.3 From 22b5a1a47719f57fd6cfe391e517f1e7a3def7fe Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:44:40 -0400 Subject: gnu: ghc-aeson-compat: Update to 0.3.8. * gnu/packages/haskell.scm (ghc-aeson-compat): Update to 0.3.8. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 40c77c9439..94ebae2629 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9845,7 +9845,7 @@ way.") (define-public ghc-aeson-compat (package (name "ghc-aeson-compat") - (version "0.3.7.1") + (version "0.3.8") (source (origin (method url-fetch) @@ -9854,7 +9854,7 @@ way.") "aeson-compat-" version ".tar.gz")) (sha256 (base32 - "1jya3lm9imclhb8qqihv39hhb62vvs3qpws7pc5fc23vwg0hsx2r")))) + "0j4v13pgk21zy8hqkbx8hw0n05jdl17qphxz9rj4h333pr547r3i")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: Tests require QuickCheck >= 2.10 (inputs `(("ghc-base-compat" ,ghc-base-compat) -- cgit v1.2.3 From d1d27a67bbb9d8e790cc411067daba7a737fe8fe Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:45:20 -0400 Subject: gnu: ghc-aeson-pretty: Update to 0.8.7. * gnu/packages/haskell-web.scm (ghc-aeson-pretty): Update to 0.8.7. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 742d3abcba..4c29964e67 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -842,7 +842,7 @@ naming: in Greek mythology, Aeson was the father of Jason.)") (define-public ghc-aeson-pretty (package (name "ghc-aeson-pretty") - (version "0.8.5") + (version "0.8.7") (source (origin (method url-fetch) (uri (string-append @@ -850,7 +850,7 @@ naming: in Greek mythology, Aeson was the father of Jason.)") version ".tar.gz")) (sha256 (base32 - "1yd98972srlbkn0f2jhrb3f443j9wnq2fnw5gbxjxzmkcinfh5yx")))) + "1m977gs0s9gf3lwzlbs5y7bl6ansc5pywmn2qjk09l5bwg2yrhf1")))) (build-system haskell-build-system) (inputs `(("ghc-aeson" ,ghc-aeson) -- cgit v1.2.3 From f4585fd1fda9912801b02490aaa02e7eac1ba00a Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:48:11 -0400 Subject: gnu: ghc-connection: Update to 0.2.8. * gnu/packages/haskell.scm (ghc-connection): Update to 0.2.8. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 94ebae2629..c158a1be59 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -6416,7 +6416,7 @@ set, memory copy, ..) and more") (define-public ghc-connection (package (name "ghc-connection") - (version "0.2.6") + (version "0.2.8") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -6424,7 +6424,7 @@ set, memory copy, ..) and more") version ".tar.gz")) (sha256 (base32 - "1c1prsgad669cmf6qrqlb5hmh0dnam2imijqzpwcr4ja14l6rh83")))) + "1swkb9w5vx9ph7x55y51dc0srj2z27nd9ibgn8c0qcl6hx7g9cbh")))) (build-system haskell-build-system) (inputs `(("ghc-byteable" ,ghc-byteable) -- cgit v1.2.3 From dfe5f60f2d1790bf931d5519814225570d37f755 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:48:34 -0400 Subject: gnu: ghc-doctemplates: Update to 0.2.2.1. * gnu/packages/haskell.scm (ghc-doctemplates): Update to 0.2.2.1. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index c158a1be59..b72fa27423 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -6540,7 +6540,7 @@ provided. Skylighting is intended to be the successor to highlighting-kate.") (define-public ghc-doctemplates (package (name "ghc-doctemplates") - (version "0.2.1") + (version "0.2.2.1") (source (origin (method url-fetch) @@ -6549,7 +6549,7 @@ provided. Skylighting is intended to be the successor to highlighting-kate.") version ".tar.gz")) (sha256 (base32 - "1bfs2kl5j5al2w2y4qpbn68p0xsnb65r7h51l356kpkzc326646p")))) + "1gyckfg3kgvzhxw14i7iwrw0crygvsp86sy53bbr1yn7bxbgn33b")))) (build-system haskell-build-system) (inputs `(("ghc-aeson" ,ghc-aeson) -- cgit v1.2.3 From 085f26d1e12b077950f1262b24f7f8c15c8cb033 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sat, 1 Sep 2018 09:25:40 -0400 Subject: gnu: ghc-hslua-module-text: Update Cabal file to r1. * gnu/packages/haskell.scm (ghc-hslua-module-text): Update Cabal file to r1. --- gnu/packages/haskell.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index b72fa27423..d604526cdd 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -6268,6 +6268,9 @@ described in @url{https://www.lua.org/}.") (base32 "0bcfpb1dhnxp0gr376ai4w7vczr9zrjl1r3r6w7kcxivfkwq9cxf")))) (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("1" "0vajlsd7y6pwa08635q0cx8z5c1c55bk7fvavw7g2vmyvxqjzx6n"))) (inputs `(("ghc-hslua" ,ghc-hslua) ("ghc-text" ,ghc-text))) -- cgit v1.2.3 From de02e56bcb6ac6baef80a015d587208fd97319f7 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:49:42 -0400 Subject: gnu: ghc-http-api-data: Update to 0.3.8.1. * gnu/packages/haskell.scm (ghc-http-api-data): Update to 0.3.8.1. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index d604526cdd..521f02c2f0 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9771,7 +9771,7 @@ parser that uses ByteStrings for parsing and representing the URI data.") (define-public ghc-http-api-data (package (name "ghc-http-api-data") - (version "0.3.7.1") + (version "0.3.8.1") (source (origin (method url-fetch) @@ -9780,7 +9780,7 @@ parser that uses ByteStrings for parsing and representing the URI data.") "http-api-data-" version ".tar.gz")) (sha256 (base32 - "1zbmf0kkfsw7pfznisi205gh7jd284gfarxsyiavd2iw26akwqwc")))) + "1cq6459b8wz6nvkvpi89dg189n5q2xdq4rdq435hf150555vmskf")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: Tests require QuickCheck >= 2.9 (inputs `(("ghc-attoparsec" ,ghc-attoparsec) -- cgit v1.2.3 From a57c91a192d34d3ad1d80e3d40d2495b96eaa7b0 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:23:33 -0400 Subject: gnu: ghc-lifted-async: Update to 0.10.0.2. * gnu/packages/haskell.scm (ghc-lifted-async): Update to 0.10.0.2. [inputs]: Add ghc-tasty-expected-failure. --- gnu/packages/haskell.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 521f02c2f0..d50aef9170 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7462,7 +7462,7 @@ a vocabulary for working with them.") (define-public ghc-lifted-async (package (name "ghc-lifted-async") - (version "0.9.0") + (version "0.10.0.2") (source (origin (method url-fetch) @@ -7471,7 +7471,7 @@ a vocabulary for working with them.") version ".tar.gz")) (sha256 (base32 - "00fnwfcnc6niq9jbbb9rap9rkdgv5qhcglwanzc5fi8834j94c1r")))) + "1073r512c1x2m1v0jar9bwqg656slg7jd1jhsyj6m8awgx1l1mwf")))) (build-system haskell-build-system) (inputs `(("ghc-async" ,ghc-async) @@ -7481,6 +7481,7 @@ a vocabulary for working with them.") ("ghc-constraints" ,ghc-constraints) ("ghc-hunit" ,ghc-hunit) ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-expected-failure" ,ghc-tasty-expected-failure) ("ghc-tasty-hunit" ,ghc-tasty-hunit) ("ghc-tasty-th" ,ghc-tasty-th))) (home-page "https://github.com/maoe/lifted-async") -- cgit v1.2.3 From 4979dcd195366faa70534ced47982613eee9eb0f Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sat, 1 Sep 2018 09:28:53 -0400 Subject: gnu: ghc-pandoc-types: Remove unneeded "--allow-newer" flag. * gnu/packages/haskell.scm (ghc-pandoc-types)[arguments]: Remove the unneeded "--allow-newer=QuickCheck" confingure flag. --- gnu/packages/haskell.scm | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index d50aef9170..d359ce4a70 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5481,8 +5481,6 @@ and bytestrings.") (base32 "1q6v2bynij724fv347mhqxdscwifzrx5jb9mq80608qf638fn717")))) (build-system haskell-build-system) - (arguments - `(#:configure-flags (list "--allow-newer=QuickCheck"))) (inputs `(("ghc-syb" ,ghc-syb) ("ghc-aeson" ,ghc-aeson) -- cgit v1.2.3 From bf73366886e5c8c1b37e35f23b9cf21b011521e8 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 31 Aug 2018 21:56:59 -0400 Subject: gnu: ghc-profunctors: Update Cabal file to r2. * gnu/packages/haskell.scm (ghc-profunctors): Update Cabal file to r2. --- gnu/packages/haskell.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index d359ce4a70..5a6fbb2d95 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3163,6 +3163,9 @@ this package makes them available back to GHC 7.2.") (base32 "0s1pwjidbn761xk43pmzyvn99hm3psdifjd78ylki7f97aiyd0g9")))) (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("2" "1ywlg9z8nlhd2avgb8c6gbkv8zyk7hvc25926bafyg0m0k8y1amq"))) (inputs `(("ghc-base-orphans" ,ghc-base-orphans) ("ghc-bifunctors" ,ghc-bifunctors) -- cgit v1.2.3 From 07f38c6a2685fff4bfaf996ed14adc04188cc159 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 31 Aug 2018 22:08:31 -0400 Subject: gnu: ghc-semigroupoids: Update to 5.2.2. * gnu/packages/haskell.scm (ghc-semigroupoids): Update to 5.2.2. [arguments]: Enable tests and update Cabal file to r4. [inputs]: Add ghc-hashable and ghc-unordered-containers. [native-inputs]: Add cabal-doctests and ghc-doctests. (ghc-semigroupoids-5.2.2): Remove variable. --- gnu/packages/haskell.scm | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 5a6fbb2d95..87adbb1aab 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4932,7 +4932,7 @@ cross-site scripting (@dfn{XSS}) attacks.") (define-public ghc-semigroupoids (package (name "ghc-semigroupoids") - (version "5.1") + (version "5.2.2") (source (origin (method url-fetch) @@ -4942,9 +4942,11 @@ cross-site scripting (@dfn{XSS}) attacks.") ".tar.gz")) (sha256 (base32 - "0dgqc59p4xx5cl8qkpm6sn4wd3n59rq7l6din76hf10bnklqrb0n")))) + "17i96y4iqj8clcs090lf6k0ij3j16nj14vsfwz0mm9nd6i4gbpp4")))) (build-system haskell-build-system) - (arguments `(#:tests? #f)) ; FIXME: doctest packagedb propagation problem. + (arguments + `(#:cabal-revision + ("4" "0pqfrxzypjq6z8lgdkzq4vhcyqkpk5326hny0r6snpc3gm78r4ij"))) (inputs `(("ghc-base-orphans" ,ghc-base-orphans) ("ghc-transformers-compat" ,ghc-transformers-compat) @@ -4952,8 +4954,13 @@ cross-site scripting (@dfn{XSS}) attacks.") ("ghc-comonad" ,ghc-comonad) ("ghc-contravariant" ,ghc-contravariant) ("ghc-distributive" ,ghc-distributive) + ("ghc-hashable" ,ghc-hashable) ("ghc-semigroups" ,ghc-semigroups) - ("ghc-tagged" ,ghc-tagged))) + ("ghc-tagged" ,ghc-tagged) + ("ghc-unordered-containers" ,ghc-unordered-containers))) + (native-inputs + `(("cabal-doctest" ,cabal-doctest) + ("ghc-doctest" ,ghc-doctest))) (home-page "https://github.com/ekmett/semigroupoids") (synopsis "Semigroupoids operations for Haskell") (description "This library provides a wide array of (semi)groupoids and @@ -10084,22 +10091,6 @@ system dependencies.") address string against RFC 5322.") (license license:bsd-3))) -(define-public ghc-semigroupoids-5.2.2 - (package - (inherit ghc-semigroupoids) - (name "ghc-semigroupoids") - (version "5.2.2") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "semigroupoids-" version "/semigroupoids-" - version ".tar.gz")) - (sha256 - (base32 - "17i96y4iqj8clcs090lf6k0ij3j16nj14vsfwz0mm9nd6i4gbpp4")))) - (inputs `(("ghc-unordered-containers" ,ghc-unordered-containers) - ,@(package-inputs ghc-semigroupoids))))) - (define-public ghc-bytes (package (name "ghc-bytes") -- cgit v1.2.3 From 01a67f89d1ec6bd981b8c99ef24186ff5c1527c1 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:51:09 -0400 Subject: gnu: ghc-shakespeare: Update to 2.0.15. * gnu/packages/haskell.scm (ghc-shakespeare): Update to 2.0.15. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 87adbb1aab..bb08f3f096 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9614,7 +9614,7 @@ code locations of messages.") (define-public ghc-shakespeare (package (name "ghc-shakespeare") - (version "2.0.14") + (version "2.0.15") (source (origin (method url-fetch) @@ -9623,7 +9623,7 @@ code locations of messages.") "shakespeare-" version ".tar.gz")) (sha256 (base32 - "0j5zx8ka7d7scvb9shm7k3376qzl3k4kpim9aqqfs6n86901zpl4")))) + "1vk4b19zvwy4mpwaq9z3l3kfmz75gfyf7alhh0y112gspgpccm23")))) (build-system haskell-build-system) (inputs `(("ghc-parsec" ,ghc-parsec) ("ghc-text" ,ghc-text) -- cgit v1.2.3 From aac78f6be3ae6dc3531ce198021fe58ff86f8528 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 4 Sep 2018 00:09:27 -0400 Subject: gnu: Add ghc-tls-session-manager. * gnu/packages/haskell-web.scm (ghc-tls-session-manager): New variable. --- gnu/packages/haskell-web.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 4c29964e67..5278cb9259 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -600,6 +600,32 @@ transfers.") based WAI (Web Application Interface in Haskell).") (license license:expat))) +(define-public ghc-tls-session-manager + (package + (name "ghc-tls-session-manager") + (version "0.0.0.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/" + "tls-session-manager/tls-session-manager-" + version ".tar.gz")) + (sha256 + (base32 + "0rvmln545vghsx8zhxp44f0f6pzma8cylarmfhhysy55ipywr1n5")))) + (build-system haskell-build-system) + (inputs + `(("ghc-auto-update" ,ghc-auto-update) + ("ghc-clock" ,ghc-clock) + ("ghc-psqueues" ,ghc-psqueues) + ("ghc-tls" ,ghc-tls))) + (home-page "http://hackage.haskell.org/package/tls-session-manager") + (synopsis "In-memory TLS session manager") + (description "This Haskell library provides a TLS session manager with +limitation, automatic pruning, energy saving and replay resistance.") + (license license:bsd-3))) + (define-public ghc-warp-tls (package (name "ghc-warp-tls") -- cgit v1.2.3 From 3f135acc357871fabde46ea9eedcf2153b3f4244 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:54:11 -0400 Subject: gnu: ghc-xss-sanitize: Update to 0.3.6. * gnu/packages/haskell-web.scm (ghc-xss-sanitize): Update to 0.3.6. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 5278cb9259..ac7420c981 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -657,7 +657,7 @@ a WAI handler, via the native Haskell TLS implementation.") (define-public ghc-xss-sanitize (package (name "ghc-xss-sanitize") - (version "0.3.5.7") + (version "0.3.6") (source (origin (method url-fetch) @@ -666,7 +666,7 @@ a WAI handler, via the native Haskell TLS implementation.") version ".tar.gz")) (sha256 (base32 - "005cmhaw9xbzkcn42jmhvcvk63bzmg4lml368xwmqdvh7r0mcn4m")))) + "1d72s3a6520iwwc1wbn9v2znqgbw6a5wwzb23iq8ny9ccnjyx1dk")))) (build-system haskell-build-system) (inputs `(("ghc-tagsoup" ,ghc-tagsoup) -- cgit v1.2.3 From 2d67fe8936f6f71493d97f40654d7931ef3621c0 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:10:02 -0400 Subject: gnu: raincat: Update to 1.2. * gnu/packages/games.scm (raincat): Update to 1.2. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 8155876313..1fab9fe34a 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2122,7 +2122,7 @@ on the screen and keyboard to display letters.") (define-public raincat (package (name "raincat") - (version "1.1.1.3") + (version "1.2") (source (origin (method url-fetch) @@ -2132,7 +2132,7 @@ on the screen and keyboard to display letters.") ".tar.gz")) (sha256 (base32 - "1aalh68h6799mv4vyg30zpskl5jkn6x2j1jza7p4lrflyifxzar8")))) + "1zyxkvjxkadwakg03xnjii1hx0gs45ap9rfkpi4kxipzxppq1klk")))) (build-system haskell-build-system) (inputs `(("ghc-extensible-exceptions" ,ghc-extensible-exceptions) -- cgit v1.2.3 From 955738723bd55b470feb33633da58fc76bada068 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:54:58 -0400 Subject: gnu: ghc-free: Update to 5.0.2. * gnu/packages/haskell.scm (ghc-free): Update to 5.0.2. [inputs]: Add ghc-transformers-base and ghc-transformers-compat. --- gnu/packages/haskell.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index bb08f3f096..e9dac65588 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5046,7 +5046,7 @@ semigroup.") (define-public ghc-free (package (name "ghc-free") - (version "4.12.4") + (version "5.0.2") (source (origin (method url-fetch) @@ -5056,7 +5056,7 @@ semigroup.") ".tar.gz")) (sha256 (base32 - "1147s393442xf4gkpbq0rd1p286vmykgx85mxhk5d1c7wfm4bzn9")))) + "15m3n9vhz7z3kzv1w3wlfa3x8jp4cbrkwmrcjr7jlx39iqffn1gg")))) (build-system haskell-build-system) (inputs `(("ghc-prelude-extras" ,ghc-prelude-extras) @@ -5066,7 +5066,9 @@ semigroup.") ("ghc-comonad" ,ghc-comonad) ("ghc-distributive" ,ghc-distributive) ("ghc-semigroupoids" ,ghc-semigroupoids) - ("ghc-semigroups" ,ghc-semigroups))) + ("ghc-semigroups" ,ghc-semigroups) + ("ghc-transformers-base" ,ghc-transformers-base) + ("ghc-transformers-compat" ,ghc-transformers-compat))) (home-page "https://github.com/ekmett/free/") (synopsis "Unrestricted monads for Haskell") (description "This library provides free monads, which are useful for many -- cgit v1.2.3 From 89d44801696f6d0b5458d30e77412f72a637e61d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:55:31 -0400 Subject: gnu: ghc-http-client-tls: Update to 0.3.5.3. * gnu/packages/haskell-web.scm (ghc-http-client-tls): Update to 0.3.5.3. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index ac7420c981..ac8df3921c 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -229,7 +229,7 @@ for more user-friendly packages.") (define-public ghc-http-client-tls (package (name "ghc-http-client-tls") - (version "0.3.5.1") + (version "0.3.5.3") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -237,7 +237,7 @@ for more user-friendly packages.") version ".tar.gz")) (sha256 (base32 - "0n4mi8z77qaggfyq17z79cl304nf1f4h6gag60v4wjwghvmj7yn1")))) + "0qj3pcpgbsfsc4m52dz35khhl4hf1i0nmcpa445z82d9567vy6j7")))) (build-system haskell-build-system) ;; Tests require Internet access (arguments `(#:tests? #f)) -- cgit v1.2.3 From 8e06e15b7d5d890b2811a60973ce9e51fc80e606 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 31 Aug 2018 22:41:31 -0400 Subject: gnu: Add ghc-invariant. * gnu/packages/haskell.scm (ghc-invariant): New variable. --- gnu/packages/haskell.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index e9dac65588..32b3384c60 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4730,6 +4730,43 @@ Compatibility package for older packages.") given term should not exist.") (license license:bsd-3))) +(define-public ghc-invariant + (package + (name "ghc-invariant") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/invariant/invariant-" + version ".tar.gz")) + (sha256 + (base32 + "0aqj7z55632qdg45074kgn9qfdxzb0a2f8lgjzr0l0i4mm2rr37b")))) + (build-system haskell-build-system) + (inputs + `(("ghc-bifunctors" ,ghc-bifunctors) + ("ghc-comonad" ,ghc-comonad) + ("ghc-contravariant" ,ghc-contravariant) + ("ghc-profunctors" ,ghc-profunctors) + ("ghc-semigroups" ,ghc-semigroups) + ("ghc-statevar" ,ghc-statevar) + ("ghc-stm" ,ghc-stm) + ("ghc-tagged" ,ghc-tagged) + ("ghc-th-abstraction" ,ghc-th-abstraction) + ("ghc-transformers-compat" ,ghc-transformers-compat) + ("ghc-unordered-containers" ,ghc-unordered-containers))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("ghc-quickcheck" ,ghc-quickcheck) + ("hspec-discover" ,hspec-discover))) + (home-page "https://github.com/nfrisby/invariant-functors") + (synopsis "Haskell98 invariant functors") + (description "Haskell98 invariant functors (also known as exponential +functors). For more information, see Edward Kmett's article +@uref{http://comonad.com/reader/2008/rotten-bananas/, Rotten Bananas}.") + (license license:bsd-2))) + (define-public ghc-kan-extensions (package (name "ghc-kan-extensions") -- cgit v1.2.3 From d8717c89b434ad887b8c4b66f9d6e229d547ebe2 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:55:51 -0400 Subject: gnu: ghc-reducers: Update to 3.12.3. * gnu/packages/haskell.scm (ghc-reducers): Update to 3.12.3. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 32b3384c60..12fb9121b9 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3182,7 +3182,7 @@ this package makes them available back to GHC 7.2.") (define-public ghc-reducers (package (name "ghc-reducers") - (version "3.12.2") + (version "3.12.3") (source (origin (method url-fetch) @@ -3192,7 +3192,7 @@ this package makes them available back to GHC 7.2.") ".tar.gz")) (sha256 (base32 - "1gbaa5x4zbvnbklcb0d4q4m8hk6w0gz4s0c4m288czi1nw43dl65")))) + "09wf8pl9ycglcv6qj5ba26gkg2s5iy81hsx9xp0q8na0cwvp71ki")))) (build-system haskell-build-system) (inputs `(("ghc-fingertree" ,ghc-fingertree) -- cgit v1.2.3 From 61849d425f9b5351f06553419b23cfffaba7ee29 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 5 Sep 2018 14:28:18 -0400 Subject: gnu: ghc-skylighting: Update to 0.7.2. * gnu/packages/haskell.scm (ghc-skylighting-core): New variable. (ghc-skylighting): Simplify by inheriting from ghc-skylighting-core. --- gnu/packages/haskell.scm | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 12fb9121b9..d8ceb0a755 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -6494,17 +6494,18 @@ needs. It provides a very simple API to create sockets to a destination with the choice of SSL/TLS, and SOCKS.") (license license:bsd-3))) -(define-public ghc-skylighting +(define-public ghc-skylighting-core (package - (name "ghc-skylighting") - (version "0.5.1") + (name "ghc-skylighting-core") + (version "0.7.2") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/skylighting-" - version "/skylighting-" version ".tar.gz")) + (uri (string-append "https://hackage.haskell.org/package/" + "skylighting-core/skylighting-core-" + version ".tar.gz")) (sha256 (base32 - "0l5lhhqqlfaq1fs7pn3n3b25kmazk8p4ahwvhagbrhcbm5hsigdg")))) + "066fwmwsd7xcvwlinfk2izlzq0xp8697i6lnbgsbl71jdybyackq")))) (build-system haskell-build-system) (inputs `(("ghc-aeson" ,ghc-aeson) @@ -6514,21 +6515,21 @@ the choice of SSL/TLS, and SOCKS.") ("ghc-blaze-html" ,ghc-blaze-html) ("ghc-case-insensitive" ,ghc-case-insensitive) ("ghc-colour" ,ghc-colour) - ("ghc-diff" ,ghc-diff) ("ghc-hxt" ,ghc-hxt) - ("ghc-pretty-show" ,ghc-pretty-show) ("ghc-regex-pcre-builtin" ,ghc-regex-pcre-builtin) ("ghc-safe" ,ghc-safe) ("ghc-text" ,ghc-text) ("ghc-utf8-string" ,ghc-utf8-string))) (native-inputs - `(("ghc-hunit" ,ghc-hunit) + `(("ghc-diff" ,ghc-diff) + ("ghc-hunit" ,ghc-hunit) + ("ghc-pretty-show" ,ghc-pretty-show) ("ghc-quickcheck" ,ghc-quickcheck) ("ghc-tasty" ,ghc-tasty) ("ghc-tasty-golden" ,ghc-tasty-golden) ("ghc-tasty-hunit" ,ghc-tasty-hunit) ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) - (home-page "https://hackage.haskell.org/package/skylighting") + (home-page "https://github.com/jgm/skylighting") (synopsis "Syntax highlighting library") (description "Skylighting is a syntax highlighting library with support for over one hundred languages. It derives its tokenizers from XML syntax @@ -6537,6 +6538,22 @@ supported by that framework can be added. An optional command-line program is provided. Skylighting is intended to be the successor to highlighting-kate.") (license license:gpl2))) +(define-public ghc-skylighting + (package + (inherit ghc-skylighting-core) + (name "ghc-skylighting") + (version "0.7.2") + (source (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/skylighting-" + version "/skylighting-" version ".tar.gz")) + (sha256 + (base32 + "1rh3z1a7a4clvksdw1qlpmhxqkfahwypi70k91whgfamzsqpxdch")))) + (inputs + `(("ghc-skylighting-core" ,ghc-skylighting-core) + ,@(package-inputs ghc-skylighting-core))))) + (define-public ghc-skylighting-for-pandoc-1 (package (inherit ghc-skylighting) (version "0.1.1.5") -- cgit v1.2.3 From 128c4c40e48db02e313d782d7aeb705418bde035 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:18:28 -0400 Subject: gnu: ghc-vault: Update to 0.3.1.2. * gnu/packages/haskell.scm (ghc-vault): Update to 0.3.1.2. [inputs]: Add ghc-semigroupoids. --- gnu/packages/haskell.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index d8ceb0a755..da48a64b0a 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4102,7 +4102,7 @@ cursor, and changing the title.") (define-public ghc-vault (package (name "ghc-vault") - (version "0.3.0.6") + (version "0.3.1.2") (source (origin (method url-fetch) @@ -4112,11 +4112,12 @@ cursor, and changing the title.") ".tar.gz")) (sha256 (base32 - "0j7gcs440q7qlgzi2hn36crgp2c0w69k40g6vj9hxlm31zk3shqb")))) + "072mbrihsdsb8c6xvg6lvk0rqjgvxvi8qkg4n6wwym5hq0pfa04y")))) (build-system haskell-build-system) (inputs `(("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-hashable" ,ghc-hashable))) + ("ghc-hashable" ,ghc-hashable) + ("ghc-semigroupoids" ,ghc-semigroupoids))) (home-page "https://github.com/HeinrichApfelmus/vault") (synopsis "Persistent store for arbitrary values") -- cgit v1.2.3 From 38563d9140bdd35215d36cffae890d7db891d597 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:57:06 -0400 Subject: gnu: ghc-adjunctions: Update to 4.4. * gnu/packages/haskell.scm (ghc-adjunctions): Update to 4.4. [inputs] Add ghc-transformers-compat. [native-inputs]: Add ghc-generic-deriving, ghc-hspec, and hspec-discover. --- gnu/packages/haskell.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index da48a64b0a..394c541693 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5121,7 +5121,7 @@ definition of @code{Monad}.") (define-public ghc-adjunctions (package (name "ghc-adjunctions") - (version "4.3") + (version "4.4") (source (origin (method url-fetch) @@ -5131,7 +5131,7 @@ definition of @code{Monad}.") ".tar.gz")) (sha256 (base32 - "1k1ykisf96i4g2zm47c45md7p42c4vsp9r73392pz1g8mx7s2j5r")))) + "1sbal7cbhm12crfnfhkk322jnzgx7lhw3jzq0p463bipagsjwz2h")))) (build-system haskell-build-system) (inputs `(("ghc-profunctors" ,ghc-profunctors) @@ -5142,7 +5142,12 @@ definition of @code{Monad}.") ("ghc-tagged" ,ghc-tagged) ("ghc-semigroupoids" ,ghc-semigroupoids) ("ghc-semigroups" ,ghc-semigroups) + ("ghc-transformers-compat" ,ghc-transformers-compat) ("ghc-void" ,ghc-void))) + (native-inputs + `(("ghc-generic-deriving" ,ghc-generic-deriving) + ("ghc-hspec" ,ghc-hspec) + ("hspec-discover" ,hspec-discover))) (home-page "https://github.com/ekmett/adjunctions/") (synopsis "Adjunctions and representable functors") (description "This library provides adjunctions and representable functors -- cgit v1.2.3 From 751a8c0b43268aa5b33bae9fe5615c9dcf5abcfb Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:57:23 -0400 Subject: gnu: ghc-either: Update to 5.0.1. * gnu/packages/haskell.scm (ghc-either): Update to 5.0.1. [native-inputs]: Add ghc-quickcheck, ghc-test-framework, and ghc-test-framework-quickcheck2. --- gnu/packages/haskell.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 394c541693..734dc2c2ca 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9119,7 +9119,7 @@ which consume random values.") (define-public ghc-either (package (name "ghc-either") - (version "4.4.1.1") + (version "5.0.1") (source (origin (method url-fetch) @@ -9128,7 +9128,7 @@ which consume random values.") "either-" version ".tar.gz")) (sha256 (base32 - "1lrlwqqnm6ibfcydlv5qvvssw7bm0c6yypy0rayjzv1znq7wp1xh")))) + "064hjfld7dkzs78sy30k5qkiva3hx24rax6dvzz5ygr2c0zypdkc")))) (build-system haskell-build-system) (inputs `(("ghc-bifunctors" ,ghc-bifunctors) ("ghc-exceptions" ,ghc-exceptions) @@ -9140,6 +9140,10 @@ which consume random values.") ("ghc-semigroups" ,ghc-semigroups) ("ghc-semigroupoids" ,ghc-semigroupoids) ("ghc-transformers-base" ,ghc-transformers-base))) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) (home-page "https://github.com/ekmett/either") (synopsis "Provides an either monad transformer for Haskell") (description "This Haskell package provides an either monad transformer.") -- cgit v1.2.3 From b587518960e560309ec69d480eef7fc6aa8abcd2 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:22:32 -0400 Subject: gnu: ghc-fsnotify: Update to 0.3.0.1. * gnu/packages/haskell.scm (ghc-fsnotify): Update to 0.3.0.1. [inputs]: Remove ghc-temporary-rc; add ghc-temporary, ghc-random, and ghc-shelly. --- gnu/packages/haskell.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 734dc2c2ca..d1e7145d0b 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8158,7 +8158,7 @@ accessed or modified.") (define-public ghc-fsnotify (package (name "ghc-fsnotify") - (version "0.2.1") + (version "0.3.0.1") (source (origin (method url-fetch) (uri (string-append @@ -8166,7 +8166,7 @@ accessed or modified.") "fsnotify-" version ".tar.gz")) (sha256 (base32 - "0asl313a52qx2w6dw25g845683xsl840bwjh118nkwi5v1xipkzb")))) + "19bdbz9wb9jvln6yg6qm0hz0w84bypvkxf0wjhgrgd52f9gidlny")))) (build-system haskell-build-system) (inputs `(("ghc-text" ,ghc-text) @@ -8175,7 +8175,9 @@ accessed or modified.") ("ghc-hinotify" ,ghc-hinotify) ("ghc-tasty" ,ghc-tasty) ("ghc-tasty-hunit" ,ghc-tasty-hunit) - ("ghc-temporary-rc" ,ghc-temporary-rc))) + ("ghc-random" ,ghc-random) + ("ghc-shelly" ,ghc-shelly) + ("ghc-temporary" ,ghc-temporary))) (home-page "https://github.com/haskell-fswatch/hfsnotify") (synopsis "Cross platform library for file change notification.") (description "Cross platform library for file creation, modification, and -- cgit v1.2.3 From f752336c80fb221800d719001ea268039b5fcb29 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:59:18 -0400 Subject: gnu: ghc-tasty-rerun: Update to 1.1.12. * gnu/packages/haskell-check.scm (ghc-tasty-rerun): Update to 1.1.12. --- gnu/packages/haskell-check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index ce1030eef1..42b7fd167b 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -287,7 +287,7 @@ test-framework.") (define-public ghc-tasty-rerun (package (name "ghc-tasty-rerun") - (version "1.1.8") + (version "1.1.12") (source (origin (method url-fetch) (uri (string-append @@ -295,7 +295,7 @@ test-framework.") "tasty-rerun-" version ".tar.gz")) (sha256 (base32 - "0yg8cicfn3qaazvp4rbanzy3dyk95k3y1kkd4bykvkl9v4076788")))) + "05lp4zy6lwd916snq6hs43848n62j9vdfl3s8sfivqydrax0vvd8")))) (build-system haskell-build-system) (inputs `(("ghc-optparse-applicative" ,ghc-optparse-applicative) -- cgit v1.2.3 From 19da4c3cd99b338333e0d13a05795cf9597393c7 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:53:50 -0400 Subject: gnu: ghc-wai: Update to 3.2.1.2. * gnu/packages/haskell-web.scm (ghc-wai): Update to 3.2.1.2. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index ac8df3921c..a6df96fc46 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -385,7 +385,7 @@ which allow you to avoid direct usage of conduits.") (define-public ghc-wai (package (name "ghc-wai") - (version "3.2.1.1") + (version "3.2.1.2") (source (origin (method url-fetch) @@ -395,7 +395,7 @@ which allow you to avoid direct usage of conduits.") ".tar.gz")) (sha256 (base32 - "08afasnirja21vr0bmzcywz4w29x736dmdv7h8nnh1l8bn7sd02x")))) + "0jr3b2789wa4m6mxkz12ynz4lfsqmgbrcy0am8karyqr3x3528r8")))) (build-system haskell-build-system) (inputs `(("ghc-bytestring-builder" ,ghc-bytestring-builder) -- cgit v1.2.3 From 8b1573b1e41452d2ddea503dd61bf6b84e542af9 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:00:11 -0400 Subject: gnu: ghc-kan-extensions: Update to 5.2. * gnu/packages/haskell.scm (ghc-kan-extensions): Update to 5.2. [inputs]: Add ghc-invariant and ghc-transformers-compat. --- gnu/packages/haskell.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index d1e7145d0b..6bc3e49823 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4771,7 +4771,7 @@ functors). For more information, see Edward Kmett's article (define-public ghc-kan-extensions (package (name "ghc-kan-extensions") - (version "5.0.1") + (version "5.2") (source (origin (method url-fetch) @@ -4781,7 +4781,7 @@ functors). For more information, see Edward Kmett's article ".tar.gz")) (sha256 (base32 - "1qm0kf4krmyjbjynn96ab0h3q117vwcia5nin7n2b8b4f3jrzph1")))) + "1lyvyiwwh962j2nnnsqzlvp5zq6z8p3spvhmji99cjvldxc7wwkb")))) (build-system haskell-build-system) (inputs `(("ghc-adjunctions" ,ghc-adjunctions) @@ -4789,8 +4789,10 @@ functors). For more information, see Edward Kmett's article ("ghc-contravariant" ,ghc-contravariant) ("ghc-distributive" ,ghc-distributive) ("ghc-free" ,ghc-free) + ("ghc-invariant" ,ghc-invariant) ("ghc-semigroupoids" ,ghc-semigroupoids) - ("ghc-tagged" ,ghc-tagged))) + ("ghc-tagged" ,ghc-tagged) + ("ghc-transformers-compat" ,ghc-transformers-compat))) (home-page "https://github.com/ekmett/kan-extensions/") (synopsis "Kan extensions library") (description "This library provides Kan extensions, Kan lifts, various -- cgit v1.2.3 From 6d2fd200f472d0f23d751991eb6093a1b3f816da Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:00:28 -0400 Subject: gnu: ghc-rebase: Update to 1.2.4. * gnu/packages/haskell.scm (ghc-rebase): Update to 1.2.4. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 6bc3e49823..0bd4c9de20 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9284,7 +9284,7 @@ parsing and printing @dfn{Universally Unique Identifiers} or UUIDs.") (define-public ghc-rebase (package (name "ghc-rebase") - (version "1.1") + (version "1.2.4") (source (origin (method url-fetch) @@ -9293,7 +9293,7 @@ parsing and printing @dfn{Universally Unique Identifiers} or UUIDs.") "rebase-" version ".tar.gz")) (sha256 (base32 - "1qkhnpcc4g2vd6jmbf3b6psqkan6hyawqzrwzqdd931hsb02l6ia")))) + "1gah2qwfpzwamnikbc5h4nv6dgvv9h16di9ka7946za3nibyasya")))) (build-system haskell-build-system) (inputs `(("ghc-stm" ,ghc-stm) ("ghc-hashable" ,ghc-hashable) -- cgit v1.2.3 From 7b19f0a8030b9f7d9606a9908bb59284aabeca3b Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:56:47 -0400 Subject: gnu: ghc-wai-logger: Update to 2.3.2. * gnu/packages/haskell-web.scm (ghc-wai-logger): Update to 2.3.2. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index a6df96fc46..5300a5701a 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -420,7 +420,7 @@ communication between web applications and web servers.") (define-public ghc-wai-logger (package (name "ghc-wai-logger") - (version "2.3.0") + (version "2.3.2") (source (origin (method url-fetch) @@ -430,7 +430,7 @@ communication between web applications and web servers.") ".tar.gz")) (sha256 (base32 - "1w0b0vinsyqr37wciljkz8g5dcmfi2r210lq194a0wkycly9kkch")))) + "0w5ldq4gplc16zzk5ikmbbjw79imaqvw8p6lylaw3hlsbn3zzm4d")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: Tests cannot find libraries exported ; by propagated-inputs. -- cgit v1.2.3 From 53812aa77f5c8a490191c069a13a927d365618c7 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:36:30 -0400 Subject: gnu: idris: Update to 1.3.0. * gnu/packages/idris.scm (idris): Update to 1.3.0. [inputs]: Remove ghc-aeson-1.1.2.0, ghc-cheapskate-0.1.0.5, and ghc-trifecta-1.6.2.1; add ghc-aeson, ghc-cheapskate, and ghc-megaparsec. [arguments]: Add a phase that patches the Cabal file to allow newer versions of aeson. (ghc-aeson-1.1.2.0, ghc-cheapskate-0.1.0.5, ghc-trifecta-1.6.2.1): Remove. --- gnu/packages/idris.scm | 61 +++++++++----------------------------------------- 1 file changed, 10 insertions(+), 51 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm index 7f1af62c1f..f80d6b3894 100644 --- a/gnu/packages/idris.scm +++ b/gnu/packages/idris.scm @@ -31,56 +31,10 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages)) -(define ghc-aeson-1.1.2.0 - (package (inherit ghc-aeson) - (version "1.1.2.0") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/aeson/aeson-" - version - ".tar.gz")) - (sha256 - (base32 - "1zy5z8pzvh53qkjm0nm3f4rwqfqg3867ck8ncd6mrxpcyvxqqj1p")))))) - -(define ghc-trifecta-1.6.2.1 - (package (inherit ghc-trifecta) - (version "1.6.2.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/trifecta/" - "trifecta-" version ".tar.gz")) - (sha256 - (base32 - "1rgv62dlmm4vkdymx5rw5jg3w8ifpzg1745rvs1m4kzdx16p5cxs")))))) - -;; ghc-cheapskate appeared too new. This follows LTS Haskell. -(define ghc-cheapskate-0.1.0.5 - (package - (inherit ghc-cheapskate) - (version "0.1.0.5") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/cheapskate/cheapskate-" - version - ".tar.gz")) - (sha256 - (base32 - "0cpsmfx5z2xykg71sv8j7pl8ga6pzyjnjdb9bxn00vcpqkzvfqvs")))) - (arguments - ;; LTS Haskell says data-default >=0.5 && <0.8 - `(#:configure-flags (list "--allow-newer=data-default"))))) - (define-public idris (package (name "idris") - (version "1.0") + (version "1.3.0") (source (origin (method url-fetch) (uri (string-append @@ -88,12 +42,12 @@ "idris-" version "/idris-" version ".tar.gz")) (sha256 (base32 - "1srbz0cyvd0k1yqgbrwnfj94yg5y3z533q1kzac96z1h7v454s5h")))) + "1w5i2z88li4niykwc6yrgxgfp25ll6ih95cip0ri7d8i7ik03c48")))) (build-system haskell-build-system) (inputs `(("gmp" ,gmp) ("ncurses" ,ncurses) - ("ghc-aeson" ,ghc-aeson-1.1.2.0) + ("ghc-aeson" ,ghc-aeson) ("ghc-annotated-wl-pprint" ,ghc-annotated-wl-pprint) ("ghc-ansi-terminal" ,ghc-ansi-terminal) ("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint) @@ -101,11 +55,12 @@ ("ghc-base64-bytestring" ,ghc-base64-bytestring) ("ghc-blaze-html" ,ghc-blaze-html) ("ghc-blaze-markup" ,ghc-blaze-markup) - ("ghc-cheapskate" ,ghc-cheapskate-0.1.0.5) + ("ghc-cheapskate" ,ghc-cheapskate) ("ghc-code-page" ,ghc-code-page) ("ghc-fingertree" ,ghc-fingertree) ("ghc-fsnotify" ,ghc-fsnotify) ("ghc-ieee754" ,ghc-ieee754) + ("ghc-megaparsec" ,ghc-megaparsec) ("ghc-network" ,ghc-network) ("ghc-optparse-applicative" ,ghc-optparse-applicative) ("ghc-regex-tdfa" ,ghc-regex-tdfa) @@ -113,7 +68,6 @@ ("ghc-split" ,ghc-split) ("ghc-terminal-size" ,ghc-terminal-size) ("ghc-text" ,ghc-text) - ("ghc-trifecta" ,ghc-trifecta-1.6.2.1) ("ghc-uniplate" ,ghc-uniplate) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-utf8-string" ,ghc-utf8-string) @@ -131,6 +85,11 @@ (lambda _ (setenv "CC" "gcc") #t)) + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "idris.cabal" + (("aeson >= 0\\.6 && < 1\\.3") + "aeson >= 0.6 && < 1.4")))) (add-after 'install 'fix-libs-install-location (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From 9516ef4f934e21fb059cff55d3e5047245178430 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 31 Aug 2018 23:04:23 -0400 Subject: gnu: Add ghc-rerebase. * gnu/packages/haskell.scm (ghc-rerebase): New variable. --- gnu/packages/haskell.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 0bd4c9de20..3423164dc1 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9338,6 +9338,29 @@ The package is intended to rapidly evolve with the contribution from the community, with the missing features being added with pull-requests.") (license license:expat))) +(define-public ghc-rerebase + (package + (name "ghc-rerebase") + (version "1.2.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/rerebase/rerebase-" + version ".tar.gz")) + (sha256 + (base32 + "11v6rmz7ql2rdx6mhb3lsal952lwihclfhh0m7fcnii5br0906ks")))) + (build-system haskell-build-system) + (inputs + `(("ghc-rebase" ,ghc-rebase))) + (home-page "https://github.com/nikita-volkov/rerebase") + (synopsis "Reexports from ``base'' with many other standard libraries") + (description "A rich drop-in replacement for ``base''. For details and +documentation please visit @uref{https://github.com/nikita-volkov/rerebase, +the project's home page}.") + (license license:expat))) + (define-public ghc-vector-builder (package (name "ghc-vector-builder") -- cgit v1.2.3 From 6369346e5427ea506be15d1b3fa2fed4ac27659d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:59:53 -0400 Subject: gnu: ghc-wai-extra: Update to 3.0.24.2. * gnu/packages/haskell-web.scm (ghc-wai-extra): Update to 3.0.24.2. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 5300a5701a..10bcbd2899 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -453,7 +453,7 @@ communication between web applications and web servers.") (define-public ghc-wai-extra (package (name "ghc-wai-extra") - (version "3.0.18") + (version "3.0.24.2") (source (origin (method url-fetch) @@ -463,7 +463,7 @@ communication between web applications and web servers.") ".tar.gz")) (sha256 (base32 - "0r079mqqdv14fp97w0rigdpwk6b88grpjlqsjc5y8bbc0skf5za2")))) + "07gcgq59dki5drkjci9ka34xjsy3bqilbsx0lsc4905w9jlyfbci")))) (build-system haskell-build-system) (inputs `(("ghc-ansi-terminal" ,ghc-ansi-terminal) -- cgit v1.2.3 From c237721ea5491dfd115151cad06dfb9faee71d36 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:00:52 -0400 Subject: gnu: ghc-vector-builder: Update to 0.3.6. * gnu/packages/haskell.scm (ghc-vector-builder): Update to 0.3.6. [native-inputs]: Add ghc-attoparsec and ghc-rerebase; remove ghc-rebase. --- gnu/packages/haskell.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 3423164dc1..2272fd4d51 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9364,7 +9364,7 @@ the project's home page}.") (define-public ghc-vector-builder (package (name "ghc-vector-builder") - (version "0.3.1") + (version "0.3.6") (source (origin (method url-fetch) @@ -9373,17 +9373,18 @@ the project's home page}.") "vector-builder-" version ".tar.gz")) (sha256 (base32 - "1l6sfgd2s107zkp1qd1w6jdjcbznp31769qf99pxar087f697wvp")))) + "06d2pa1fb3ydrl7l6rjazqyxv5i73v65x2f5fp0ypjxfbm6jsmn8")))) (build-system haskell-build-system) (inputs `(("ghc-vector" ,ghc-vector) ("ghc-semigroups" ,ghc-semigroups) ("ghc-base-prelude" ,ghc-base-prelude))) - (native-inputs `(("ghc-tasty" ,ghc-tasty) + (native-inputs `(("ghc-attoparsec" ,ghc-attoparsec) + ("ghc-tasty" ,ghc-tasty) ("ghc-tasty-hunit" ,ghc-tasty-hunit) ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) ("ghc-hunit" ,ghc-hunit) ("ghc-quickcheck-instances" ,ghc-quickcheck-instances) - ("ghc-rebase" ,ghc-rebase))) + ("ghc-rerebase" ,ghc-rerebase))) (home-page "https://github.com/nikita-volkov/vector-builder") (synopsis "Vector builder for Haskell") (description "This Haskell package provides an API for constructing vectors. -- cgit v1.2.3 From ca96ba99aecd825945590c35365cf6920e3f5e89 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:01:10 -0400 Subject: gnu: ghc-foldl: Update to 1.4.3. * gnu/packages/haskell.scm (ghc-foldl): Update to 1.4.3. [inputs]: Add ghc-semigroups and ghc-semigroupoids. --- gnu/packages/haskell.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 2272fd4d51..ecd465d4da 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9399,7 +9399,7 @@ vector. ") (define-public ghc-foldl (package (name "ghc-foldl") - (version "1.3.5") + (version "1.4.3") (source (origin (method url-fetch) @@ -9408,7 +9408,7 @@ vector. ") "foldl-" version ".tar.gz")) (sha256 (base32 - "10qsp7dj2xsq4q2xm6x6b12y5pq32qf7my41hnkmdwwbccvhdxb2")))) + "13n0ca3hw5jzqf6rxsdbhbwkn61a9zlm13f0f205s60j3sc72jzk")))) (build-system haskell-build-system) (inputs `(("ghc-mwc-randam" ,ghc-mwc-random) ("ghc-primitive" ,ghc-primitive) @@ -9417,7 +9417,9 @@ vector. ") ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-hashable" ,ghc-hashable) ("ghc-contravariant" ,ghc-contravariant) + ("ghc-semigroups" ,ghc-semigroups) ("ghc-profunctors" ,ghc-profunctors) + ("ghc-semigroupoids" ,ghc-semigroupoids) ("ghc-comonad" ,ghc-comonad) ("ghc-vector-builder" ,ghc-vector-builder))) (home-page "https://github.com/Gabriel439/Haskell-Foldl-Library") -- cgit v1.2.3 From 24d919ffbdfed549b02f765e5854f54ada5bc5f7 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:02:44 -0400 Subject: gnu: ghc-wai-conduit: Update to 3.0.0.4. * gnu/packages/haskell-web.scm (ghc-wai-conduit): Update to 3.0.0.4. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 10bcbd2899..ed1e02f4aa 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -502,7 +502,7 @@ functionality.") (define-public ghc-wai-conduit (package (name "ghc-wai-conduit") - (version "3.0.0.3") + (version "3.0.0.4") (source (origin (method url-fetch) @@ -511,7 +511,7 @@ functionality.") "wai-conduit-" version ".tar.gz")) (sha256 (base32 - "1zvsiwjq2mvkb9sjgp3ly9m968m7a2jjzr4id6jpi3mmqykj15z4")))) + "07yn41rn2skd5p3wqqa09wa761vj7ibl8l19gh4bi4i8slxhk417")))) (build-system haskell-build-system) (inputs `(("ghc-conduit" ,ghc-conduit) -- cgit v1.2.3 From 1613ee19f60e22d793f2f93fe070ce6e17d78d2d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:05:02 -0400 Subject: gnu: ghc-yaml: Update to 0.8.32. * gnu/packages/haskell.scm (ghc-yaml): Update to 0.8.32. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index ecd465d4da..e2666e132c 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -6148,14 +6148,14 @@ back-ends.") (define-public ghc-yaml (package (name "ghc-yaml") - (version "0.8.28") + (version "0.8.32") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "yaml/yaml-" version ".tar.gz")) (sha256 (base32 - "0swgkzkfrwj0ac7lssn8rnrdfmh3lcsdn5fbq2iwv55di6jbc0pp")))) + "0cbsyh4ilvjzq1q7pxls43k6pdqxg1l85xzibcwpbvmlvrizh86w")))) (build-system haskell-build-system) (inputs `(("ghc-conduit" ,ghc-conduit) -- cgit v1.2.3 From 6f7280b09083e1a174101804faff6576eb0dd422 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:10:55 -0400 Subject: gnu: ghc-monad-logger: Update to 0.3.29. * gnu/packages/haskell.scm (ghc-monad-logger): Update to 0.3.29. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index e2666e132c..a109a5d19c 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9673,7 +9673,7 @@ operators for looping.") (define-public ghc-monad-logger (package (name "ghc-monad-logger") - (version "0.3.25.1") + (version "0.3.29") (source (origin (method url-fetch) @@ -9682,7 +9682,7 @@ operators for looping.") "monad-logger-" version ".tar.gz")) (sha256 (base32 - "0yv4fsi566zrn30j2g5l901lyqgmflhvzy4hji7ikcbh5d45m920")))) + "1z516s4pa9n94zf0l45mylssg07xr1d1m6zrz900p0iv3vfd07mv")))) (build-system haskell-build-system) (inputs `(("ghc-transformers-compat" ,ghc-transformers-compat) ("ghc-text" ,ghc-text) -- cgit v1.2.3 From 23aa12fc092c69228c6a636897f17c535605b35e Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:11:24 -0400 Subject: gnu: ghc-simple-sendfile: Update to 0.2.27. * gnu/packages/haskell.scm (ghc-simple-sendfile): Update to 0.2.27. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index a109a5d19c..d3eae809e9 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8482,7 +8482,7 @@ advanced user's otherwise working script to fail under future circumstances. (define-public ghc-simple-sendfile (package (name "ghc-simple-sendfile") - (version "0.2.25") + (version "0.2.27") (source (origin (method url-fetch) @@ -8491,7 +8491,7 @@ advanced user's otherwise working script to fail under future circumstances. "simple-sendfile-" version ".tar.gz")) (sha256 (base32 - "0k99j9xfcf83c55jmn202hdinhjaa4yn3dal4rvjk2w2rlhqirha")))) + "1bwwqzcm56m2w4ymsa054sxmpbj76h9pvb0jf8zxp8lr41cp51gn")))) (build-system haskell-build-system) (inputs `(("ghc-conduit" ,ghc-conduit) -- cgit v1.2.3 From 478365e36a59355001d46ee136dc550fccfb9c16 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:12:16 -0400 Subject: gnu: hlint: Update to 2.1.10. * gnu/packages/haskell.scm (hlint): Update to 2.1.10. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index d3eae809e9..85692c4689 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1319,7 +1319,7 @@ specify refactorings without depending on GHC.") (define-public hlint (package (name "hlint") - (version "2.1.1") + (version "2.1.10") (source (origin (method url-fetch) @@ -1328,7 +1328,7 @@ specify refactorings without depending on GHC.") "/" name "-" version ".tar.gz")) (sha256 (base32 - "0mmfavd158l5ig5wb1b1zbhbraj8hhqvbk4mg85n6c8ndpr4grd4")))) + "19as2m9g75cr6n1agzvsij0cvqhb0wbjlk31w4y5d5mns87dki0w")))) (build-system haskell-build-system) (inputs `(("cpphs" ,cpphs) -- cgit v1.2.3 From c4a68deaad5e32894f881035613c2cdaedf9f61a Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sat, 22 Sep 2018 09:47:49 -0400 Subject: gnu: Add ghc-echo. * gnu/packages/haskell.scm (ghc-echo): New variable. --- gnu/packages/haskell.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 85692c4689..079d8561ce 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1852,6 +1852,32 @@ Writer monad), where list append quickly becomes too expensive.") versions of GHC (i.e., < 6.10).") (license license:bsd-3))) +(define-public ghc-echo + (package + (name "ghc-echo") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/echo/echo-" + version ".tar.gz")) + (sha256 + (base32 + "1vw5ykpwhr39wc0hhcgq3r8dh59zq6ib4zxbz1qd2wl21wqhfkvh")))) + (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("1" "0br8wfiybcw5hand4imiw0i5hacdmrax1dv8g95f35gazffbx42l"))) + (home-page "https://github.com/RyanGlScott/echo") + (synopsis "Echo terminal input portably") + (description "The @code{base} library exposes the @code{hGetEcho} and +@code{hSetEcho} functions for querying and setting echo status, but +unfortunately, neither function works with MinTTY consoles on Windows. +This library provides an alternative interface which works with both +MinTTY and other consoles.") + (license license:bsd-3))) + (define-public cabal-install (package (name "cabal-install") -- cgit v1.2.3 From bf7e5884321ee4f4c4f3c83a647b92817b511453 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sat, 22 Sep 2018 09:43:20 -0400 Subject: gnu: Add ghc-cryptohash-sha256. * gnu/packages/haskell-crypto.scm (ghc-cryptohash-sha256): New variable. --- gnu/packages/haskell-crypto.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index ff44970be0..0d9617e03d 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -253,6 +253,42 @@ pure API to the @uref{https://en.wikipedia.org/wiki/SHA-1, SHA-1 hash algorithm} including @uref{https://en.wikipedia.org/wiki/HMAC, HMAC support}, with performance close to the fastest implementations available in other languages. +The implementation is made in C with a haskell FFI wrapper that hides +the C implementation.") + (license license:bsd-3))) + +(define-public ghc-cryptohash-sha256 + (package + (name "ghc-cryptohash-sha256") + (version "0.11.101.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "cryptohash-sha256-" version "/" + "cryptohash-sha256-" version ".tar.gz")) + (sha256 + (base32 + "1p85vajcgw9hmq8zsz9krzx0vxh7aggwbg5w9ws8w97avcsn8xaj")))) + (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("1" "19birnmwga1yh82l4jqc3fygqkqcf5y8dlldnxfswngkzc3rvwp3") + #:tests? #f)) ; tests require old version of ghc-hunit (0.9) + (inputs + `(("ghc-base16-bytestring" ,ghc-base16-bytestring))) + (native-inputs + `(("ghc-sha" ,ghc-sha) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) + ("ghc-hunit" ,ghc-hunit))) + (home-page "https://github.com/hvr/cryptohash-sha1") + (synopsis "SHA-256 implementation for Haskell") + (description "This Haskell package provides an incremental and +one-pass, pure API to the @uref{https://en.wikipedia.org/wiki/SHA-2, +SHA-256 cryptographic hash algorithm}, with performance close to the +fastest implementations available in other languages. + The implementation is made in C with a haskell FFI wrapper that hides the C implementation.") (license license:bsd-3))) -- cgit v1.2.3 From 5a88cff239c238ba04b7ec45fae66aae077a0958 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sat, 22 Sep 2018 09:46:06 -0400 Subject: ghc: Add ghc-ed25519. * gnu/packages/haskell-crypto.scm (ghc-ed25519): New variable. --- gnu/packages/haskell-crypto.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index 0d9617e03d..9bdcdb2f9e 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -701,3 +701,33 @@ percent. @item Monte Carlo value for Pi is 3.132465868 (error 0.29 percent). @end itemize") (license license:bsd-3))) + +(define-public ghc-ed25519 + (package + (name "ghc-ed25519") + (version "0.0.5.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/ed25519/ed25519-" + version ".tar.gz")) + (sha256 + (base32 + "0v8msqvgzimhs7p5ri25hrb1ni2wvisl5rmdxy89fc59py79b9fq")))) + (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("2" "1cq6h3jqkb1kvd9fjfhsllg5gq78sdiyf2gy9862xhlbv6wil19f") + ;; We omit these test suites because they require old versions of + ;; packages and packages we do not have. + #:configure-flags + '("--flags=-test-hlint -test-doctests -test-properties"))) + (home-page "http://thoughtpolice.github.com/hs-ed25519") + (synopsis "Ed25519 cryptographic signatures") + (description "This package provides a simple, fast, self-contained +copy of the Ed25519 public-key signature system with a clean interface. +It also includes support for detached signatures, and thorough +documentation on the design and implementation, including usage +guidelines.") + (license license:expat))) -- cgit v1.2.3 From 45e421ff219caa89ed3ad13981e5cb7886ac9326 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sat, 22 Sep 2018 09:49:02 -0400 Subject: gnu: Add ghc-hackage-security. * gnu/packages/haskell.scm (ghc-hackage-security): New variable. --- gnu/packages/haskell.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 079d8561ce..2b256a0f5d 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1878,6 +1878,52 @@ This library provides an alternative interface which works with both MinTTY and other consoles.") (license license:bsd-3))) +(define-public ghc-hackage-security + (package + (name "ghc-hackage-security") + (version "0.5.3.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "hackage-security/hackage-security-" + version ".tar.gz")) + (sha256 + (base32 + "08bwawc7ramgdh54vcly2m9pvfchp0ahhs8117jajni6x4bnx66v")))) + (build-system haskell-build-system) + (arguments + `(#:tests? #f)) ; Tests fail because of framework updates. + (inputs + `(("ghc-base16-bytestring" ,ghc-base16-bytestring) + ("ghc-base64-bytestring" ,ghc-base64-bytestring) + ("ghc-cryptohash-sha256" ,ghc-cryptohash-sha256) + ("ghc-ed25519" ,ghc-ed25519) + ("ghc-network" ,ghc-network) + ("ghc-network-uri" ,ghc-network-uri) + ("ghc-parsec" ,ghc-parsec) + ("ghc-tar" ,ghc-tar) + ("ghc-zlib" ,ghc-zlib))) + (native-inputs + `(("ghc-network-uri" ,ghc-network-uri) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-tar" ,ghc-tar) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) + ("ghc-temporary" ,ghc-temporary) + ("ghc-zlib" ,ghc-zlib))) + (home-page "https://github.com/haskell/hackage-security") + (synopsis "Hackage security library") + (description "This Hackage security library provides both server and +client utilities for securing @uref{http://hackage.haskell.org/, the +Hackage package server}. It is based on +@uref{http://theupdateframework.com/, The Update Framework}, a set of +recommendations developed by security researchers at various universities +in the US as well as developers on the @uref{https://www.torproject.org/, +Tor project}.") + (license license:bsd-3))) + (define-public cabal-install (package (name "cabal-install") -- cgit v1.2.3 From 246cdfac2f551ef010ac98495c5ead1a688f37bb Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sat, 22 Sep 2018 09:50:32 -0400 Subject: gnu: Add ghc-resolv. * gnu/packages/haskell.scm (ghc-resolv): New variable. --- gnu/packages/haskell.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 2b256a0f5d..a1047abd86 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1924,6 +1924,35 @@ in the US as well as developers on the @uref{https://www.torproject.org/, Tor project}.") (license license:bsd-3))) +(define-public ghc-resolv + (package + (name "ghc-resolv") + (version "0.1.1.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/resolv/resolv-" + version ".tar.gz")) + (sha256 + (base32 + "0wh7wj56l3f2bylz563g5g04a4nydj8acv60hpwa7k3mn792xca9")))) + (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("1" "15ay4n3x8c09cb3h4z1nan84yd3n9zpgvi6h114hk98bq10k8mma") + #:tests? #f)) ; The required test frameworks are too old. + (inputs + `(("ghc-base16-bytestring" ,ghc-base16-bytestring))) + (home-page "https://github.com/haskell/hackage-security") + (synopsis "Domain Name Service (DNS) lookup via @code{libresolv}") + (description "This package implements an API for accessing the +@uref{https://tools.ietf.org/html/rfc1035, Domain Name Service (DNS)} +resolver service via the standard @code{libresolv} system library (whose +API is often available directly via the standard @code{libc} C library) on +Unix systems.") + (license license:gpl3))) + (define-public cabal-install (package (name "cabal-install") -- cgit v1.2.3 From f707db294ae088e297b3eef22632e26571320be4 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:12:40 -0400 Subject: gnu: cabal-install: Update to 2.2.0.0. * gnu/packages/haskell.scm (cabal-install): Update to 2.2.0.0. [inputs] Add ghc-async, ghc-base16-bytestring, ghc-cryptohash-sha256, ghc-echo, ghc-edit-distance, ghc-hackage-security, ghc-hashable, ghc-resolv, and ghc-tar. --- gnu/packages/haskell.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index a1047abd86..b23a61961c 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1956,7 +1956,7 @@ Unix systems.") (define-public cabal-install (package (name "cabal-install") - (version "1.22.6.0") + (version "2.2.0.0") (source (origin (method url-fetch) @@ -1965,15 +1965,24 @@ Unix systems.") version ".tar.gz")) (sha256 - (base32 "1d5h7h2wjwc2s3dvsvzjgmmfrfl2312ym2h6kyjgm9wnaqw9w8wx")))) + (base32 "1nd3ch7qr4dpfxhgkcq2lnhvszx2kjgnn1kwb44vk9y5jgfs4mn8")))) (arguments `(#:tests? #f)) ; FIXME: testing libraries are missing. (build-system haskell-build-system) (inputs - `(("ghc-http" ,ghc-http) + `(("ghc-async" ,ghc-async) + ("ghc-base16-bytestring" ,ghc-base16-bytestring) + ("ghc-cryptohash-sha256" ,ghc-cryptohash-sha256) + ("ghc-echo" ,ghc-echo) + ("ghc-edit-distance" ,ghc-edit-distance) + ("ghc-hackage-security" ,ghc-hackage-security) + ("ghc-hashable" ,ghc-hashable) + ("ghc-http" ,ghc-http) ("ghc-network-uri" ,ghc-network-uri) ("ghc-network" ,ghc-network) ("ghc-random" ,ghc-random) + ("ghc-resolv" ,ghc-resolv) ("ghc-stm" ,ghc-stm) + ("ghc-tar" ,ghc-tar) ("ghc-zlib" ,ghc-zlib))) (home-page "https://www.haskell.org/cabal/") (synopsis "Command-line interface for Cabal and Hackage") -- cgit v1.2.3 From fbdf4031891fa1f0c5a82b9c7c773bcb64ea40b2 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:54:31 -0400 Subject: gnu: ghc-feed: Update to 1.0.0.0. * gnu/packages/haskell.scm (ghc-feed): Update to 1.0.0.0. [arguments]: Update Cabal file to r4. [inputs]: Add ghc-base-compat, ghc-safe, ghc-text, ghc-xml-conduit, and ghc-xml-types; remove ghc-xml. --- gnu/packages/haskell.scm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index b23a61961c..2347a4deb1 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3465,7 +3465,7 @@ online}.") (define-public ghc-feed (package (name "ghc-feed") - (version "0.3.12.0") + (version "1.0.0.0") (source (origin (method url-fetch) @@ -3473,14 +3473,21 @@ online}.") "feed/feed-" version ".tar.gz")) (sha256 (base32 - "0hkrsinspg70bbm3hwqdrvivws6zya1hyk0a3awpaz82j4xnlbfc")))) + "05rgg7x1984mgfhkmz792xj8lhwjgznixhygzr8blf517lns2nck")))) (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("4" "0baavcavm3ywykcr9cm07aqr7sna98jba2n68lyn3kany8ri214d"))) (inputs - `(("ghc-old-locale" ,ghc-old-locale) + `(("ghc-base-compat" ,ghc-base-compat) + ("ghc-old-locale" ,ghc-old-locale) ("ghc-old-time" ,ghc-old-time) + ("ghc-safe" ,ghc-safe) + ("ghc-text" ,ghc-text) ("ghc-time-locale-compat" ,ghc-time-locale-compat) ("ghc-utf8-string" ,ghc-utf8-string) - ("ghc-xml" ,ghc-xml))) + ("ghc-xml-conduit" ,ghc-xml-conduit) + ("ghc-xml-types" ,ghc-xml-types))) (native-inputs `(("ghc-hunit" ,ghc-hunit) ("ghc-test-framework" ,ghc-test-framework) -- cgit v1.2.3 From b9f67d10bcbd969884e3f579d1dd9ff585b2016a Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:14:08 -0400 Subject: gnu: ghc-lens: Update to 4.16.1. * gnu/packages/haskell.scm (ghc-lens): Update to 4.16.1. [arguments]: Update Cabal file to r2. [inputs]: Remove ghc-doctest-0.13. [native-inputs]: Add ghc-doctest. --- gnu/packages/haskell.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 2347a4deb1..351420c108 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4971,7 +4971,7 @@ in the @code{IO} monad, like @code{IORef}s or parts of the OpenGL state.") (define-public ghc-lens (package (name "ghc-lens") - (version "4.15.4") + (version "4.16.1") (source (origin (method url-fetch) @@ -4979,12 +4979,14 @@ in the @code{IO} monad, like @code{IORef}s or parts of the OpenGL state.") version ".tar.gz")) (sha256 (base32 - "1lkwlnhgpgnsz046mw4qs0fa7h4l012gilrr3nf3spllsy3pnbkl")))) + "1im4drhbydbawd6i0jsrzpqihnmx4ywpkg7yg94ddwsw3mxwkgpm")))) (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("2" "11h83lj5mba4grhz1qx3irz10ysm9c3k7k6i6xv2cr60q8xin3ri"))) (inputs `(("ghc-base-orphans" ,ghc-base-orphans) ("ghc-bifunctors" ,ghc-bifunctors) - ("ghc-doctest" ,ghc-doctest-0.13) ("ghc-distributive" ,ghc-distributive) ("ghc-exceptions" ,ghc-exceptions) ("ghc-free" ,ghc-free) @@ -5010,6 +5012,7 @@ in the @code{IO} monad, like @code{IORef}s or parts of the OpenGL state.") ("hlint" ,hlint))) (native-inputs `(("cabal-doctest" ,cabal-doctest) + ("ghc-doctest" ,ghc-doctest) ("ghc-hunit" ,ghc-hunit) ("ghc-test-framework" ,ghc-test-framework) ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) -- cgit v1.2.3 From bc368781b6b3d81442a1dda44d93361b18eb987a Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:14:48 -0400 Subject: gnu: ghc-persistent: Update to 2.8.2. * gnu/packages/haskell.scm (ghc-persistent): Update to 2.8.2. [inputs]: Add ghc-void. --- gnu/packages/haskell.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 351420c108..e07b3423fd 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -10027,7 +10027,7 @@ Haskell data types to and from HTTP API data.") (define-public ghc-persistent (package (name "ghc-persistent") - (version "2.7.3.1") + (version "2.8.2") (source (origin (method url-fetch) @@ -10036,7 +10036,7 @@ Haskell data types to and from HTTP API data.") "persistent-" version ".tar.gz")) (sha256 (base32 - "1jbvavdvr9qz5ld7vf6l1jgiadhmxx6zc4vqsdk9ivfq6d5wlg1p")))) + "1h0yijbf1yiwl50klyafy4ln99j8bib4kgbzviw7fc4y4mwv4sv9")))) (build-system haskell-build-system) (inputs `(("ghc-old-locale" ,ghc-old-locale) ("ghc-text" ,ghc-text) @@ -10061,7 +10061,8 @@ Haskell data types to and from HTTP API data.") ("ghc-silently" ,ghc-silently) ("ghc-fast-logger" ,ghc-fast-logger) ("ghc-scientific" ,ghc-scientific) - ("ghc-tagged" ,ghc-tagged))) + ("ghc-tagged" ,ghc-tagged) + ("ghc-void" ,ghc-void))) (native-inputs `(("ghc-hspec" ,ghc-hspec))) (home-page "https://www.yesodweb.com/book/persistent") (synopsis "Type-safe, multi-backend data serialization for Haskell") -- cgit v1.2.3 From 47334ea099f3ed71cf0f9613d3f3e21d85834575 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:16:59 -0400 Subject: gnu: ghc-warp: Update to 3.2.23. * gnu/packages/haskell-web.scm (ghc-warp): Update to 3.2.23. [arguments]: Enable tests. [inputs]: Remove ghc-blaze-builder, ghc-bytestring-builder, and ghc-lifted-base; add ghc-bsb-http-chunked. [native-inputs]: Remove ghc-auto-update and ghc-http; add curl, ghc-lifted-base, and ghc-http-client. --- gnu/packages/haskell-web.scm | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index ed1e02f4aa..cf57e8fd96 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -23,6 +23,7 @@ (define-module (gnu packages haskell-web) #:use-module (gnu packages) + #:use-module (gnu packages curl) #:use-module (gnu packages haskell) #:use-module (gnu packages haskell-check) #:use-module (gnu packages haskell-crypto) @@ -551,7 +552,7 @@ transfers.") (define-public ghc-warp (package (name "ghc-warp") - (version "3.2.11.1") + (version "3.2.23") (source (origin (method url-fetch) @@ -560,15 +561,12 @@ transfers.") ".tar.gz")) (sha256 (base32 - "1zp5cy0bbj508vdvms1n5z80z37m253kwsqc5a83cfc990n6fgw5")))) + "12v9qhi4hyp0sb90yddsax16jj7x47nmqwn53sv7b5nszcxgzam0")))) (build-system haskell-build-system) - (arguments - `(#:tests? #f)) ; FIXME: Test-Suite `spec` fails. (inputs `(("ghc-async" ,ghc-async) ("ghc-auto-update" ,ghc-auto-update) - ("ghc-blaze-builder" ,ghc-blaze-builder) - ("ghc-bytestring-builder" ,ghc-bytestring-builder) + ("ghc-bsb-http-chunked" ,ghc-bsb-http-chunked) ("ghc-case-insensitive" ,ghc-case-insensitive) ("ghc-hashable" ,ghc-hashable) ("ghc-http-types" ,ghc-http-types) @@ -581,18 +579,18 @@ transfers.") ("ghc-vault" ,ghc-vault) ("ghc-wai" ,ghc-wai) ("ghc-word8" ,ghc-word8) - ("ghc-lifted-base" ,ghc-lifted-base) ("ghc-http-date" ,ghc-http-date) ("ghc-simple-sendfile" ,ghc-simple-sendfile) ("ghc-http2" ,ghc-http2))) (native-inputs - `(("ghc-silently" ,ghc-silently) + `(("curl" ,curl) + ("ghc-silently" ,ghc-silently) ("ghc-hspec" ,ghc-hspec) - ("ghc-auto-update" ,ghc-auto-update) ("ghc-doctest" ,ghc-doctest) + ("ghc-lifted-base" ,ghc-lifted-base) ("ghc-quickcheck" ,ghc-quickcheck) ("ghc-hunit" ,ghc-hunit) - ("ghc-http" ,ghc-http) + ("ghc-http-client" ,ghc-http-client) ("hspec-discover" ,hspec-discover))) (home-page "http://github.com/yesodweb/wai") (synopsis "HTTP server library for Haskell's WAI") -- cgit v1.2.3 From ccd4fd3f2a614996bff5436cc22e4715a7eb1f31 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:19:05 -0400 Subject: gnu: xmobar: Update to 0.28. * gnu/packages/wm.scm (xmobar): Update to 0.28. --- gnu/packages/wm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index db345cd2fd..4ec465f875 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -504,14 +504,14 @@ tiled on several screens.") (define-public xmobar (package (name "xmobar") - (version "0.27") + (version "0.28") (source (origin (method url-fetch) (uri (string-append "mirror://hackage/package/xmobar/" name "-" version ".tar.gz")) (sha256 (base32 - "0agx490q6sbmv3vfq33ys8dsrgwizj3bmha4i1pkxz5wp5q8cx3l")))) + "1xh87asg8y35srvp7d3gyyy4bkxsw122liihxgzgm8pqv2z3h4zd")))) (build-system haskell-build-system) (native-inputs `(("ghc-hspec" ,ghc-hspec) -- cgit v1.2.3 From 6dde5b8f974b306b7f60871877152224d82e3c2d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:20:38 -0400 Subject: gnu: ghc-chart: Update to 1.9. * gnu/packages/haskell.scm (ghc-chart): Update to 1.9. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index e07b3423fd..50956f43ed 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -10526,7 +10526,7 @@ tools are not needed to actually run Gtk2Hs programs.") (define-public ghc-chart (package (name "ghc-chart") - (version "1.8.3") + (version "1.9") (source (origin (method url-fetch) @@ -10534,7 +10534,7 @@ tools are not needed to actually run Gtk2Hs programs.") "Chart-" version ".tar.gz")) (sha256 (base32 - "13s64fhb2pmkdmx5bkgbgcn25qjihs364fvr47a1dw25f804kiy1")))) + "1f5azj17y8xsb3gjhf7gg1gnnlq12rxkmfjmgcly314d7vghs05z")))) (build-system haskell-build-system) (inputs `(("ghc-old-locale" ,ghc-old-locale) -- cgit v1.2.3 From e4bc57c85bb3ec8bc8eef35f3ff0fd3d1cb4b267 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:23:48 -0400 Subject: gnu: ghc-persistent-template: Update to 2.5.4. * gnu/packages/haskell.scm (ghc-persistent-template): Update to 2.5.4. [arguments]: Update Cabal file to r2. --- gnu/packages/haskell.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 50956f43ed..7c1c4af8f2 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -10109,7 +10109,7 @@ ghc-aeson.") (define-public ghc-persistent-template (package (name "ghc-persistent-template") - (version "2.5.3.1") + (version "2.5.4") (source (origin (method url-fetch) @@ -10118,8 +10118,11 @@ ghc-aeson.") "persistent-template-" version ".tar.gz")) (sha256 (base32 - "0449piw3n02q7dag7k1pakfmzmf3ms4wk1qmnagczpm1ckajinwd")))) + "008afcy7zbw7bzp9jww8gdldb51kfm0fg4p0x4xcp61gx4679bjc")))) (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("2" "03qgwk32krldph3blw5agiqcpccr3649hajyn8wm9k71zz82dpn6"))) (inputs `(("ghc-persistent" ,ghc-persistent) ("ghc-monad-control" ,ghc-monad-control) ("ghc-text" ,ghc-text) -- cgit v1.2.3 From dc676afb8cf4b0a9b44d630c917dfdb996e597ee Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:24:07 -0400 Subject: gnu: ghc-trifecta: Update to 2. * gnu/packages/haskell.scm (ghc-trifecta): Update to 2. [inputs]: Remove ghc-doctest-0.13, ghc-doctest, and ghc-quickcheck. [native-inputs]: Add ghc-doctest and ghc-quickcheck. --- gnu/packages/haskell.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 7c1c4af8f2..aebe223193 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2944,7 +2944,7 @@ the parsers provided by @code{parsec}, @code{attoparsec} and @code{base}'s (define-public ghc-trifecta (package (name "ghc-trifecta") - (version "1.7.1.1") + (version "2") (source (origin (method url-fetch) (uri (string-append @@ -2952,11 +2952,10 @@ the parsers provided by @code{parsec}, @code{attoparsec} and @code{base}'s "trifecta-" version ".tar.gz")) (sha256 (base32 - "13n6a3fdxngnzsjnhfrzigv1c2g0xm6lqkjcnirpc37sd0rpby31")))) + "0hznd8i65s81xy13i2qc7cvipw3lfb2yhkv53apbdsh6sbljz5sk")))) (build-system haskell-build-system) (inputs - `(("ghc-doctest" ,ghc-doctest-0.13) - ("ghc-reducers" ,ghc-reducers) + `(("ghc-reducers" ,ghc-reducers) ("ghc-semigroups" ,ghc-semigroups) ("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint) ("ghc-ansi-terminal" ,ghc-ansi-terminal) @@ -2965,17 +2964,17 @@ the parsers provided by @code{parsec}, @code{attoparsec} and @code{base}'s ("ghc-blaze-markup" ,ghc-blaze-markup) ("ghc-charset" ,ghc-charset) ("ghc-comonad" ,ghc-comonad) - ("ghc-doctest" ,ghc-doctest) ("ghc-fingertree" ,ghc-fingertree) ("ghc-hashable" ,ghc-hashable) ("ghc-lens" ,ghc-lens) ("ghc-parsers" ,ghc-parsers) ("ghc-profunctors" ,ghc-profunctors) - ("ghc-quickcheck" ,ghc-quickcheck) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-utf8-string" ,ghc-utf8-string))) (native-inputs - `(("cabal-doctest" ,cabal-doctest))) + `(("cabal-doctest" ,cabal-doctest) + ("ghc-doctest" ,ghc-doctest) + ("ghc-quickcheck" ,ghc-quickcheck))) (home-page "https://github.com/ekmett/trifecta/") (synopsis "Parser combinator library with convenient diagnostics") (description "Trifecta is a modern parser combinator library for Haskell, -- cgit v1.2.3 From 8401d3aad04d4ed256c92e5c525f7c4130930b6f Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 31 Aug 2018 23:58:50 -0400 Subject: gnu: Remove old versions of ghc-doctest. * gnu/packages/haskell.scm (ghc-doctest-0.12, ghc-doctest-0.13): Remove. --- gnu/packages/haskell.scm | 31 ------------------------------- 1 file changed, 31 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index aebe223193..30f764339e 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5366,37 +5366,6 @@ It is modeled after doctest for Python, see @uref{https://docs.python.org/library/doctest.html, the Doctest website}.") (license license:expat))) -(define-public ghc-doctest-0.12 - (package (inherit ghc-doctest) - (name "ghc-doctest") - (version "0.12.0") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/doctest/doctest-" - version - ".tar.gz")) - (sha256 - (base32 - "13h549cpgcvb7c54c7wif28g5wak84dxc3ais0hlqhzk1q6la91a")))) - (inputs - `(("ghc-code-page" ,ghc-code-page) - ,@(package-inputs ghc-doctest))))) - -(define-public ghc-doctest-0.13 - (package (inherit ghc-doctest-0.12) - (name "ghc-doctest") - (version "0.13.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "doctest/doctest-" version ".tar.gz")) - (sha256 - (base32 - "08g3nmpqbnbkxc95d65hkhfabwax10qrq51vlynr342npn40mn2b")))))) - (define-public ghc-lifted-base (package (name "ghc-lifted-base") -- cgit v1.2.3 From 6ef07930743b1c2d81c9b3a026b5f66ce1b4f74b Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:24:28 -0400 Subject: gnu: ghc-warp-tls: Update to 3.2.4.3. * gnu/packages/haskell-web.scm (ghc-warp-tls): Update to 3.2.4.3. [inputs]: Add ghc-tls-session-manager. --- gnu/packages/haskell-web.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index cf57e8fd96..9f96727a86 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -627,7 +627,7 @@ limitation, automatic pruning, energy saving and replay resistance.") (define-public ghc-warp-tls (package (name "ghc-warp-tls") - (version "3.2.3") + (version "3.2.4.3") (source (origin (method url-fetch) @@ -636,7 +636,7 @@ limitation, automatic pruning, energy saving and replay resistance.") "warp-tls-" version ".tar.gz")) (sha256 (base32 - "14m2bzk5ivz9gdpxlcj6qnh46f2lycm1ybdjnfkj2876zrqwii7m")))) + "17gj295fr98l7mkz2gdz6kahdnmja0sql3kvy2zab6q168g53kc4")))) (build-system haskell-build-system) (inputs `(("ghc-cryptonite" ,ghc-cryptonite) @@ -644,6 +644,7 @@ limitation, automatic pruning, energy saving and replay resistance.") ("ghc-network" ,ghc-network) ("ghc-streaming-commons" ,ghc-streaming-commons) ("ghc-tls" ,ghc-tls) + ("ghc-tls-session-manager" ,ghc-tls-session-manager) ("ghc-wai" ,ghc-wai) ("ghc-warp" ,ghc-warp))) (home-page "http://github.com/yesodweb/wai") -- cgit v1.2.3 From 12ce5d31d19bd40f71b1f7b865fe32dbf5f0848f Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sat, 22 Sep 2018 11:08:31 -0400 Subject: gnu: Add ghc-rio. * gnu/packages/haskell.scm (ghc-rio): New variable. --- gnu/packages/haskell.scm | 52 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 30f764339e..a0ca08720f 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -10556,4 +10556,56 @@ widths to the Char type.") ("ghc-attoparsec" ,ghc-attoparsec-bootstrap))) (properties '(hidden? #t)))) +(define-public ghc-rio + (package + (name "ghc-rio") + (version "0.1.5.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/rio/rio-" + version ".tar.gz")) + (sha256 + (base32 + "064h8a4hp53a479d3ak0vmqbx8hi0cpg7zn4wp23rjy26dka8p7g")))) + (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'add-setup-script + (lambda _ + ;; The usual "Setup.hs" script is missing from the source. + (with-output-to-file "Setup.hs" + (lambda () + (format #t "import Distribution.Simple~%") + (format #t "main = defaultMain~%")))))))) + (inputs + `(("ghc-exceptions" ,ghc-exceptions) + ("ghc-hashable" ,ghc-hashable) + ("ghc-microlens" ,ghc-microlens) + ("ghc-primitive" ,ghc-primitive) + ("ghc-text" ,ghc-text) + ("ghc-typed-process" ,ghc-typed-process) + ("ghc-unliftio" ,ghc-unliftio) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-vector" ,ghc-vector))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("hspec-discover" ,hspec-discover))) + (home-page "https://github.com/commercialhaskell/rio#readme") + (synopsis "A standard library for Haskell") + (description "This package works as a prelude replacement for Haskell, +providing more functionality and types out of the box than the standard +prelude (such as common data types like @code{ByteString} and +@code{Text}), as well as removing common ``gotchas'', like partial +functions and lazy I/O. The guiding principle here is: +@itemize +@item If something is safe to use in general and has no expected naming +conflicts, expose it. +@item If something should not always be used, or has naming conflicts, +expose it from another module in the hierarchy. +@end itemize") + (license license:expat))) + ;;; haskell.scm ends here -- cgit v1.2.3 From 0ea695f67754c18a85d384dd32602f0a998549e0 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:24:48 -0400 Subject: gnu: ghc-yesod-core: Update to 1.6.6. * gnu/packages/haskell-web.scm (ghc-yesod-core): Update to 1.6.6. [inputs]: Add ghc-unliftio and ghc-rio. --- gnu/packages/haskell-web.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 9f96727a86..2271e1e982 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -1069,7 +1069,7 @@ avoid any issues with characters.") (define-public ghc-yesod-core (package (name "ghc-yesod-core") - (version "1.4.37") + (version "1.6.6") (source (origin (method url-fetch) @@ -1078,7 +1078,7 @@ avoid any issues with characters.") "yesod-core-" version ".tar.gz")) (sha256 (base32 - "0ww8hl0cx2g58zrdx3j6d5m2xwhssbajdqws1xk6rzl7rpfm1b9j")))) + "0xahf6m5c7mkl74p0gimy4wb5w4s3lh92wwxmk517fbq666c92kb")))) (build-system haskell-build-system) (inputs `(("ghc-wai" ,ghc-wai) ("ghc-extra" ,ghc-extra) @@ -1089,6 +1089,7 @@ avoid any issues with characters.") ("ghc-random" ,ghc-random) ("ghc-cereal" ,ghc-cereal) ("ghc-old-locale" ,ghc-old-locale) + ("ghc-unliftio" ,ghc-unliftio) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-monad-control" ,ghc-monad-control) ("ghc-transformers-base" ,ghc-transformers-base) @@ -1103,6 +1104,7 @@ avoid any issues with characters.") ("ghc-monad-logger" ,ghc-monad-logger) ("ghc-conduit" ,ghc-conduit) ("ghc-resourcet" ,ghc-resourcet) + ("ghc-rio" ,ghc-rio) ("ghc-lifted-base" ,ghc-lifted-base) ("ghc-blaze-html" ,ghc-blaze-html) ("ghc-blaze-markup" ,ghc-blaze-markup) -- cgit v1.2.3 From 7eee87e65d9e2da183887ade425a29de1a1f024d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:27:50 -0400 Subject: gnu: ghc-persistent-sqlite: Update to 2.8.2. * gnu/packages/haskell.scm (ghc-persistent-sqlite): Update to 2.8.2. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index a0ca08720f..a373de8ea4 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -10217,7 +10217,7 @@ working with it.") (define-public ghc-persistent-sqlite (package (name "ghc-persistent-sqlite") - (version "2.6.4") + (version "2.8.2") (source (origin (method url-fetch) @@ -10226,7 +10226,7 @@ working with it.") "persistent-sqlite-" version ".tar.gz")) (sha256 (base32 - "16mc2ra0hbyyc8ckjlxxc11bpskdymbr8c3g6ih6wzik639xprbm")))) + "1chbmvjz46smhgnzhha3bbkhys3fys6dip1jr4v7xp1jf78zbyp6")))) (build-system haskell-build-system) (inputs `(("ghc-persistent" ,ghc-persistent) ("ghc-unliftio-core" ,ghc-unliftio-core) -- cgit v1.2.3 From c6cf0eb5fb7bd1a77164293b727d1bc0d678d64c Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sat, 1 Sep 2018 00:18:38 -0400 Subject: gnu: Add ghc-tree-diff. * gnu/packages/haskell.scm (ghc-tree-diff): New variable. --- gnu/packages/haskell.scm | 60 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index a373de8ea4..ed83ece155 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -872,6 +872,66 @@ and an alternative to newtype-th.") efficient memo functions using tries.") (license license:bsd-3))) +(define-public ghc-tree-diff + (package + (name "ghc-tree-diff") + (version "0.0.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/tree-diff/tree-diff-" + version + ".tar.gz")) + (sha256 + (base32 + "049v44c520jy3icxlnrvbdblh3mjmvd7m6qmkzxbzkf02x63xqmz")))) + (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("4" "1rqxxyj6hqllahs11693g855cxz8mgnb490s7j1ksd300i5xgjsp") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "tree-diff.cabal" + (("trifecta >=1\\.7\\.1\\.1 && <1\\.8") + "trifecta >=1.7.1.1 && <=2"))))))) + (inputs + `(("ghc-aeson" ,ghc-aeson) + ("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint) + ("ghc-ansi-terminal" ,ghc-ansi-terminal) + ("ghc-base-compat" ,ghc-base-compat) + ("ghc-generics-sop" ,ghc-generics-sop) + ("ghc-hashable" ,ghc-hashable) + ("ghc-memotrie" ,ghc-memotrie) + ("ghc-parsec" ,ghc-parsec) + ("ghc-parsers" ,ghc-parsers) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-scientific" ,ghc-scientific) + ("ghc-tagged" ,ghc-tagged) + ("ghc-text" ,ghc-text) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-uuid-types" ,ghc-uuid-types) + ("ghc-vector" ,ghc-vector))) + (native-inputs + `(("ghc-base-compat" ,ghc-base-compat) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-ansi-terminal" ,ghc-ansi-terminal) + ("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint) + ("ghc-parsec" ,ghc-parsec) + ("ghc-trifecta" ,ghc-trifecta) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-golden" ,ghc-tasty-golden) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) + (home-page "https://github.com/phadej/tree-diff") + (synopsis "Compute difference between (expression) trees") + (description "This Haskell library provides a function for computing +the difference bewteen (expression) trees. It also provides a way to +compute the difference between arbitrary abstract datatypes (ADTs) using +@code{Generics}-derivable helpers.") + (license license:bsd-3))) + (define-public ghc-haddock-library (package (name "ghc-haddock-library") -- cgit v1.2.3 From 99daa2948810d6f738c8e133fec28f414c3e5db8 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:30:54 -0400 Subject: gnu: ghc-aws: Update to 0.20. * gnu/packages/haskell.scm (ghc-aws): Update to 0.20. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index ed83ece155..94fa666b86 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9656,14 +9656,14 @@ as well as a convenient Conduit module.") (define-public ghc-aws (package (name "ghc-aws") - (version "0.18") + (version "0.20") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "aws-" version "/aws-" version ".tar.gz")) (sha256 (base32 - "0h7473wkvc5xjzx5fd5k5fp70rjq5gqmn1cpy95mswvvfsq3irxj")))) + "0pwpabmypi1w8rni9qfwabgn95jks4h8dyw6889mn8xzsrhdhyf0")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; Tests require AWS credentials. (inputs -- cgit v1.2.3 From 3b72e7e2d4bbdf024d3e6f5a083a0bfe54b65f37 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 23 Aug 2018 23:09:32 -0400 Subject: gnu: ghc-esqueleto: Update to commit b81e0d9. * gnu/packages/haskell.scm (ghc-esqueleto): Update to commit b81e0d9. [source]: Use git-fetch. [arguments]: Disable Haddock and add phase to remove MySQL and PostgreSQL test-suites. [inputs]: Add ghc-unliftio. [native-inputs]: Remove ghc-hunit, ghc-monad-control, and ghc-quickcheck. --- gnu/packages/haskell.scm | 91 +++++++++++++++++++++++++++++++----------------- 1 file changed, 59 insertions(+), 32 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 94fa666b86..5f9c2a4b6e 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8555,42 +8555,69 @@ JSON (JavaScript Object Notation) is a lightweight data-interchange format.") (license license:bsd-3))) (define-public ghc-esqueleto - (package - (name "ghc-esqueleto") - (version "2.5.3") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "esqueleto/esqueleto-" version ".tar.gz")) - (sha256 - (base32 - "10n49rzqmblky7pwjnysalyy6nacmxfms8dqbsdv6hlyzr8pb69x")))) - (build-system haskell-build-system) - (inputs - `(("ghc-blaze-html" ,ghc-blaze-html) - ("ghc-conduit" ,ghc-conduit) - ("ghc-monad-logger" ,ghc-monad-logger) - ("ghc-persistent" ,ghc-persistent) - ("ghc-resourcet" ,ghc-resourcet) - ("ghc-tagged" ,ghc-tagged) - ("ghc-text" ,ghc-text) - ("ghc-unordered-containers" ,ghc-unordered-containers))) - (native-inputs - `(("ghc-hspec" ,ghc-hspec) - ("ghc-hunit" ,ghc-hunit) - ("ghc-monad-control" ,ghc-monad-control) - ("ghc-persistent-sqlite" ,ghc-persistent-sqlite) - ("ghc-persistent-template" ,ghc-persistent-template) - ("ghc-quickcheck" ,ghc-quickcheck))) - (home-page "https://github.com/bitemyapp/esqueleto") - (synopsis "Type-safe embedded domain specific language for SQL queries") - (description "This library provides a type-safe embedded domain specific + (let ((version "2.5.3") + (revision "1") + (commit "b81e0d951e510ebffca03c5a58658ad884cc6fbd")) + (package + (name "ghc-esqueleto") + (version (git-version version revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/bitemyapp/esqueleto") + (commit commit))) + (sha256 + (base32 + "0lz1qxms7cfg5p3j37inlych0r2fwhm8xbarcys3df9m7jy9nixa")))) + (build-system haskell-build-system) + (arguments + `(#:haddock? #f ; Haddock reports an internal error. + #:phases + (modify-phases %standard-phases + ;; This package normally runs tests for the MySQL, PostgreSQL, and + ;; SQLite backends. Since we only have Haskell packages for + ;; SQLite, we remove the other two test suites. FIXME: Add the + ;; other backends and run all three test suites. + (add-before 'configure 'remove-non-sqlite-test-suites + (lambda _ + (use-modules (ice-9 rdelim)) + (with-atomic-file-replacement "esqueleto.cabal" + (lambda (in out) + (let loop ((line (read-line in 'concat)) (deleting? #f)) + (cond + ((eof-object? line) #t) + ((string-every char-set:whitespace line) + (unless deleting? (display line out)) + (loop (read-line in 'concat) #f)) + ((member line '("test-suite mysql\n" + "test-suite postgresql\n")) + (loop (read-line in 'concat) #t)) + (else + (unless deleting? (display line out)) + (loop (read-line in 'concat) deleting?))))))))))) + (inputs + `(("ghc-blaze-html" ,ghc-blaze-html) + ("ghc-conduit" ,ghc-conduit) + ("ghc-monad-logger" ,ghc-monad-logger) + ("ghc-persistent" ,ghc-persistent) + ("ghc-resourcet" ,ghc-resourcet) + ("ghc-tagged" ,ghc-tagged) + ("ghc-text" ,ghc-text) + ("ghc-unliftio" ,ghc-unliftio) + ("ghc-unordered-containers" ,ghc-unordered-containers))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("ghc-persistent-sqlite" ,ghc-persistent-sqlite) + ("ghc-persistent-template" ,ghc-persistent-template))) + (home-page "https://github.com/bitemyapp/esqueleto") + (synopsis "Type-safe embedded domain specific language for SQL queries") + (description "This library provides a type-safe embedded domain specific language (EDSL) for SQL queries that works with SQL backends as provided by @code{ghc-persistent}. Its language closely resembles SQL, so you don't have to learn new concepts, just new syntax, and it's fairly easy to predict the generated SQL and optimize it for your backend.") - (license license:bsd-3))) + (license license:bsd-3)))) (define-public shellcheck (package -- cgit v1.2.3 From 082d9383d1475b772f104f1a6b363e4c80d91cf9 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:06:20 -0400 Subject: gnu: ghc-haddock-library: Update to 1.5.0.1. * gnu/packages/patches/ghc-haddock-library-unbundle.patch: New file. * gnu/packages/haskell.scm (ghc-haddock-library): Update to 1.5.0.1. [source]: Add the patch; add a snippet to remove the bundled library. [arguments]: Add a phase to relax test suite dependency constraints and another to add a missing directory required for tests. [native-inputs]: Add ghc-base-compat, ghc-optparse-applicative, and ghc-tree-diff. --- gnu/packages/haskell.scm | 35 +++++++-- .../patches/ghc-haddock-library-unbundle.patch | 86 ++++++++++++++++++++++ 2 files changed, 115 insertions(+), 6 deletions(-) create mode 100644 gnu/packages/patches/ghc-haddock-library-unbundle.patch (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 5f9c2a4b6e..0e061a6b40 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -935,7 +935,7 @@ compute the difference between arbitrary abstract datatypes (ADTs) using (define-public ghc-haddock-library (package (name "ghc-haddock-library") - (version "1.4.3") + (version "1.5.0.1") (source (origin (method url-fetch) @@ -945,14 +945,37 @@ compute the difference between arbitrary abstract datatypes (ADTs) using ".tar.gz")) (sha256 (base32 - "0ns4bpf6whmcfl0cm2gx2c73if416x4q3ac4l4qm8w84h0zpcr7p")))) + "1cmbg8l5xrwpliclwy3l057raypjqy0hsg1h1743ahaj8gq10b7z")) + (patches (search-patches + "ghc-haddock-library-unbundle.patch")) + (modules '((guix build utils))) + (snippet '(begin + (delete-file-recursively "vendor") + #t)))) (build-system haskell-build-system) - (inputs - `(("ghc-base-compat" ,ghc-base-compat))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'relax-test-suite-dependencies + (lambda _ + (substitute* "haddock-library.cabal" + (("base-compat\\s*\\^>= 0\\.9\\.3") "base-compat") + (("hspec\\s*\\^>= 2\\.4\\.4") "hspec")))) + ;; The release tarball does not contain the "fixtures/examples" + ;; directory, which is required for testing. In the upstream + ;; repository, the directory exists and is populated. Here, we + ;; create an empty directory to placate the tests. + (add-before 'check 'add-examples-directory + (lambda _ + (mkdir "fixtures/examples") + #t))))) (native-inputs - `(("hspec-discover" ,hspec-discover) + `(("ghc-base-compat" ,ghc-base-compat) ("ghc-hspec" ,ghc-hspec) - ("ghc-quickcheck" ,ghc-quickcheck))) + ("ghc-optparse-applicative" ,ghc-optparse-applicative) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-tree-diff" ,ghc-tree-diff) + ("hspec-discover" ,hspec-discover))) (home-page "https://www.haskell.org/haddock/") (synopsis "Library exposing some functionality of Haddock") (description diff --git a/gnu/packages/patches/ghc-haddock-library-unbundle.patch b/gnu/packages/patches/ghc-haddock-library-unbundle.patch new file mode 100644 index 0000000000..0e8b548956 --- /dev/null +++ b/gnu/packages/patches/ghc-haddock-library-unbundle.patch @@ -0,0 +1,86 @@ +This patch (inspired by Debian) allows ghc-haddock-library to use our +ghc-attoparsec package instead of using a bundled version. + +--- a/haddock-library.cabal 2018-09-01 01:22:18.676855884 -0400 ++++ b/haddock-library.cabal 2018-09-01 01:25:10.501150260 -0400 +@@ -10,7 +10,6 @@ + itself, see the ‘haddock’ package. + license: BSD3 + license-files: LICENSE +- vendor/attoparsec-0.13.1.0/LICENSE + maintainer: Alex Biehl , Simon Hengel , Mateusz Kowalczyk + homepage: http://www.haskell.org/haddock/ + bug-reports: https://github.com/haskell/haddock/issues +@@ -28,7 +27,6 @@ + , containers >= 0.4.2.1 && < 0.6 + , transformers >= 0.3.0 && < 0.6 + +- -- internal sub-lib + build-depends: attoparsec + + hs-source-dirs: src +@@ -49,42 +47,6 @@ + if impl(ghc >= 8.0) + ghc-options: -Wcompat -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances + +-library attoparsec +- default-language: Haskell2010 +- +- build-depends: +- base >= 4.5 && < 4.12 +- , bytestring >= 0.9.2.1 && < 0.11 +- , deepseq >= 1.3 && < 1.5 +- +- hs-source-dirs: vendor/attoparsec-0.13.1.0 +- +- -- NB: haddock-library needs only small part of lib:attoparsec +- -- internally, so we only bundle that subset here +- exposed-modules: +- Data.Attoparsec.ByteString +- Data.Attoparsec.ByteString.Char8 +- Data.Attoparsec.Combinator +- +- other-modules: +- Data.Attoparsec +- Data.Attoparsec.ByteString.Buffer +- Data.Attoparsec.ByteString.FastSet +- Data.Attoparsec.ByteString.Internal +- Data.Attoparsec.Internal +- Data.Attoparsec.Internal.Fhthagn +- Data.Attoparsec.Internal.Types +- Data.Attoparsec.Number +- +- ghc-options: -funbox-strict-fields -Wall -fwarn-tabs -O2 +- +- ghc-options: -Wall +- if impl(ghc >= 8.0) +- ghc-options: -Wcompat -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances +- else +- build-depends: semigroups ^>= 0.18.3, fail ^>= 4.9.0.0 +- +- + test-suite spec + type: exitcode-stdio-1.0 + default-language: Haskell2010 +@@ -115,11 +77,10 @@ + , hspec ^>= 2.4.4 + , QuickCheck ^>= 2.11 + +- -- internal sub-lib + build-depends: attoparsec + + -- Versions for the dependencies below are transitively pinned by +- -- dependency on haddock-library:lib:attoparsec ++ -- dependency on attoparsec + build-depends: + base + , bytestring +@@ -146,7 +107,7 @@ + haddock-library + + -- Versions for the dependencies below are transitively pinned by +- -- dependency on haddock-library:lib:attoparsec ++ -- dependency on attoparsec + build-depends: + base + -- cgit v1.2.3 From 1689d39cd264c7794189eea243ed0b147896610f Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:32:05 -0400 Subject: gnu: ghc-yesod-persistent: Update to 1.6.0. * gnu/packages/haskell-web.scm (ghc-yesod-persistent): Update to 1.6.0. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 2271e1e982..0b8f287024 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -1140,7 +1140,7 @@ functions, widgets, etc.") (define-public ghc-yesod-persistent (package (name "ghc-yesod-persistent") - (version "1.4.3") + (version "1.6.0") (source (origin (method url-fetch) @@ -1149,7 +1149,7 @@ functions, widgets, etc.") "yesod-persistent-" version ".tar.gz")) (sha256 (base32 - "0kiksw46c8ww9yiwl28pkrppx8d6fhsasr0hvmsliqbrp16likj8")))) + "1gd59xf7b6v3cald58mzwnfbdzjr49cz60rm4wc5w9pvfx12pgj2")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: hspec-discover not available in PATH. (inputs `(("ghc-yesod-core" ,ghc-yesod-core) -- cgit v1.2.3 From f548cd7254b696249a185972a55ff18dd0616b34 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:25:11 -0400 Subject: gnu: ghc-haddock-api: Update to 2.19.0.1. * gnu/packages/haskell.scm (ghc-haddock-api): Update to 2.19.0.1. [arguments]: Add a phase that patches the Cabal file to allow newer versions of Cabal and hspec. --- gnu/packages/haskell.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 0e061a6b40..bcdb6fb609 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -989,8 +989,7 @@ the ‘haddock’ package.") (define-public ghc-haddock-api (package (name "ghc-haddock-api") - ;; This is the last version to be supported by Cabal < 2.0 - (version "2.17.4") + (version "2.19.0.1") (source (origin (method url-fetch) @@ -1000,8 +999,18 @@ the ‘haddock’ package.") ".tar.gz")) (sha256 (base32 - "00fn6pzgg8xjbaw12d76jdqh2dbc5xy7miyz0x6kidvvar7i35ss")))) + "0c6i7sljp7myz25d90gyw68a90i5jcrkajkxcciikp2hjirfaas3")))) (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "haddock-api.cabal" + (("Cabal \\^>= 2\\.0\\.0") + "Cabal ^>= 2.2.0") + (("hspec \\^>= 2\\.4\\.4") + "hspec >= 2.4.4 && < 2.6"))))))) (inputs `(("ghc-paths" ,ghc-paths) ("ghc-haddock-library" ,ghc-haddock-library))) -- cgit v1.2.3 From 6a006a11fde6be270b2d35a9570544c9c70bb967 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sat, 1 Sep 2018 10:55:48 -0400 Subject: gnu: ghc-pandoc: Adjust tests and test dependency constraints. * gnu/packages/haskell.scm (ghc-pandoc)[arguments]: Add a phase to relax a test suite dependency constraint and another to skip some failing tests. --- gnu/packages/haskell.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index bcdb6fb609..8b2c157a71 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -6859,6 +6859,20 @@ provided. Skylighting is intended to be the successor to highlighting-kate.") (base32 "1dqin92w513l7whg5wdgrngnxsj5mb8gppfvn7kjgyv2pdgpy0zy")))) (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "pandoc.cabal" + (("tasty >= 0\\.11 && < 1\\.1") + "tasty >= 0.11 && < 1.1.1")))) + (add-before 'configure 'patch-tests + (lambda _ + ;; These tests fail benignly and have been adjusted upstream: + ;; . + (substitute* "test/Tests/Old.hs" + (("lhsWriterTests \"html\"") "[]"))))))) (inputs `(("ghc-aeson" ,ghc-aeson) ("ghc-aeson-pretty" ,ghc-aeson-pretty) -- cgit v1.2.3 From 69054c92854075ffc2027ef9a6459540571ef1f2 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:33:31 -0400 Subject: gnu: ghc-yesod-form: Update to 1.6.2. * gnu/packages/haskell-web.scm (ghc-yesod-form): Update to 1.6.2. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 0b8f287024..85b88aa72e 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -1173,7 +1173,7 @@ from Yesod.") (define-public ghc-yesod-form (package (name "ghc-yesod-form") - (version "1.4.16") + (version "1.6.2") (source (origin (method url-fetch) @@ -1183,7 +1183,7 @@ from Yesod.") ".tar.gz")) (sha256 (base32 - "0lij3m5vn8nvh6y88r1dhk03xmmjwmjzazm307nc2wvc5fmx9p2j")))) + "1p1x1hffvarplc82ykdk7rm6p5isqgqf78bvxzpfhncxs4kwx057")))) (build-system haskell-build-system) (inputs `(("ghc-yesod-core" ,ghc-yesod-core) -- cgit v1.2.3 From 1b29af3d16ef9f8636031c8136e50be8abeef5f0 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:31:02 -0400 Subject: gnu: ghc-haddock: Update to 2.19.0.1. * gnu/packages/haskell.scm (ghc-haddock): Update to 2.19.0.1. [arguments]: Add a phase that deletes four test suites to avoid a dependency on haddock-test. [native-inputs]: Remove ghc-haddock-test. --- gnu/packages/haskell.scm | 37 +++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 8b2c157a71..f153b48034 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1049,7 +1049,7 @@ documentation-generation tool for Haskell libraries.") (define-public ghc-haddock (package (name "ghc-haddock") - (version "2.17.4") + (version "2.19.0.1") (source (origin (method url-fetch) @@ -1059,16 +1059,37 @@ documentation-generation tool for Haskell libraries.") ".tar.gz")) (sha256 (base32 - "1z3h3v7w84dzsm47iavdppc2w899mr4c1agq9fzghgz902i0a655")))) + "1g1j9j0hf2yhyyh0gwz6bzbvfvliqz9x8a8hnkmwghm7w3xa6sb7")))) (build-system haskell-build-system) - ;; FIXME: Tests fail with this error: - ;; driver-test/Main.hs:4:1: error: - ;; Failed to load interface for ‘ResponseFileSpec’ - (arguments `(#:tests? #f)) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; There are four test suites that require the ghc-haddock-test + ;; package, which no longer builds with GHC 8.4.3. This phase + ;; removes these four test suites from the Cabal file, so that we + ;; do not need ghc-haddock-test as an input. + (add-before 'configure 'remove-haddock-test-test-suites + (lambda _ + (use-modules (ice-9 rdelim)) + (with-atomic-file-replacement "haddock.cabal" + (lambda (in out) + (let loop ((line (read-line in 'concat)) (deleting? #f)) + (cond + ((eof-object? line) #t) + ((string-every char-set:whitespace line) + (unless deleting? (display line out)) + (loop (read-line in 'concat) #f)) + ((member line '("test-suite html-test\n" + "test-suite hypsrc-test\n" + "test-suite latex-test\n" + "test-suite hoogle-test\n")) + (loop (read-line in 'concat) #t)) + (else + (unless deleting? (display line out)) + (loop (read-line in 'concat) deleting?))))))))))) (inputs `(("ghc-haddock-api" ,ghc-haddock-api))) (native-inputs - `(("ghc-hspec" ,ghc-hspec) - ("ghc-haddock-test" ,ghc-haddock-test))) + `(("ghc-hspec" ,ghc-hspec))) (home-page "https://www.haskell.org/haddock/") (synopsis "Documentation-generation tool for Haskell libraries") -- cgit v1.2.3 From 003ec2c8f08265b9e605268981e331e4b4fff6b2 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:23:22 -0400 Subject: gnu: ghc-pandoc-citeproc: Update to 0.14.3.1. * gnu/packages/haskell.scm (ghc-pandoc-citeproc): Update to 0.14.3.1. [arguments]: Add a phase to disable some failing YAML tests. --- gnu/packages/haskell.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index f153b48034..170d3bdc5d 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7207,6 +7207,13 @@ the @code{conduit} package.") (arguments `(#:phases (modify-phases %standard-phases + ;; Many YAML tests (44) are failing do to changes in ghc-yaml: + ;; . + (add-before 'configure 'patch-tests + (lambda _ + (substitute* "tests/test-pandoc-citeproc.hs" + (("let allTests = citeprocTests \\+\\+ biblio2yamlTests") + "let allTests = citeprocTests")))) ;; Tests need to be run after installation. (delete 'check) (add-after 'install 'post-install-check -- cgit v1.2.3 From 662fd1a868ef11479030a00f5e485308c707da91 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:35:00 -0400 Subject: gnu: ghc-yesod: Update to 1.6.0. * gnu/packages/haskell-web.scm (ghc-yesod): Update to 1.6.0. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 85b88aa72e..68dcd9e4b1 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -1216,7 +1216,7 @@ providing richtext field using Nic editor. ") (define-public ghc-yesod (package (name "ghc-yesod") - (version "1.4.5") + (version "1.6.0") (source (origin (method url-fetch) @@ -1225,7 +1225,7 @@ providing richtext field using Nic editor. ") version ".tar.gz")) (sha256 (base32 - "1sg66nq8yaas2m5nqsdrxricvcizd1ik02zqk60sxh3wna08fz16")))) + "0wx77nbpzdh40p1bm527kimfj48vs9d2avpvvz2w42zi3pz2y94a")))) (build-system haskell-build-system) (inputs `(("ghc-yesod-core" ,ghc-yesod-core) -- cgit v1.2.3 From 8fe9ab95793c85f391613c789ee71515663f1b79 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 4 Sep 2018 23:52:09 -0400 Subject: gnu: Remove ghc-pandoc@1. This old version of Pandoc no longer builds with GHC 8.4.3. * gnu/packages/haskell-web.scm (ghc-aeson-for-pandoc-1): Remove variable. * gnu/packages/haskell.scm (ghc-pandoc-types-for-pandoc-1, ghc-texmath-for-pandoc-1, ghc-yaml-for-pandoc-1, ghc-hslua-for-pandoc-1, ghc-skylighting-for-pandoc-1, ghc-doctemplates-for-pandoc-1, ghc-pandoc-1, ghc-pandoc-citeproc-with-pandoc-1): Remove variables. --- gnu/packages/haskell-web.scm | 12 --- gnu/packages/haskell.scm | 212 ------------------------------------------- 2 files changed, 224 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 68dcd9e4b1..eaa7e6a9ec 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -852,18 +852,6 @@ for Haskell, optimized for ease of use and high performance. (A note on naming: in Greek mythology, Aeson was the father of Jason.)") (license license:bsd-3))) -(define-public ghc-aeson-for-pandoc-1 - (package (inherit ghc-aeson) - (version "1.1.2.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/aeson/aeson-" - version ".tar.gz")) - (sha256 - (base32 - "1zy5z8pzvh53qkjm0nm3f4rwqfqg3867ck8ncd6mrxpcyvxqqj1p")))))) - (define-public ghc-aeson-pretty (package (name "ghc-aeson-pretty") diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 170d3bdc5d..e39c5e0b81 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5757,25 +5757,6 @@ pandoc to represent structured documents. It also provides functions for building up, manipulating and serialising @code{Pandoc} structures.") (license license:bsd-3))) -(define-public ghc-pandoc-types-for-pandoc-1 - (package (inherit ghc-pandoc-types) - (version "1.17.0.5") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "pandoc-types/pandoc-types-" - version ".tar.gz")) - (sha256 - (base32 - "1csipjdq00iiq77k2wlrg4i7afrzlh8nl585q785xzw7nn45b0n8")))) - (arguments - `(#:configure-flags (list "--allow-newer=QuickCheck" - "--allow-newer=HUnit"))) - (inputs - `(("ghc-syb" ,ghc-syb) - ("ghc-aeson" ,ghc-aeson-for-pandoc-1) - ("ghc-string-qq" ,ghc-string-qq))))) - (define-public ghc-texmath (package (name "ghc-texmath") @@ -5808,26 +5789,6 @@ markup formats). The TeX reader supports basic LaTeX and AMS extensions, and it can parse and apply LaTeX macros.") (license license:gpl2+))) -(define-public ghc-texmath-for-pandoc-1 - (package (inherit ghc-texmath) - (version "0.9.4.4") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "texmath/texmath-" version ".tar.gz")) - (sha256 - (base32 - "129q33m56diiv35kdwfb07838wrg0mm88kxdqxfyl1zvf9nzkqkd")))) - (inputs - `(("ghc-network-uri" ,ghc-network-uri) - ("ghc-pandoc-types" ,ghc-pandoc-types-for-pandoc-1) - ("ghc-parsec" ,ghc-parsec) - ("ghc-split" ,ghc-split) - ("ghc-syb" ,ghc-syb) - ("ghc-temporary" ,ghc-temporary) - ("ghc-utf8-string" ,ghc-utf8-string) - ("ghc-xml" ,ghc-xml))))) - (define-public ghc-regex-pcre-builtin (package (name "ghc-regex-pcre-builtin") @@ -6382,12 +6343,6 @@ back-ends.") "This package provides a library to parse and render YAML documents.") (license license:bsd-3))) -(define-public ghc-yaml-for-pandoc-1 - (package (inherit ghc-yaml) - (inputs - `(("ghc-aeson" ,ghc-aeson-for-pandoc-1) - ,@(alist-delete "ghc-aeson" (package-inputs ghc-yaml)))))) - (define-public ghc-filemanip (package (name "ghc-filemanip") @@ -6489,27 +6444,6 @@ TIFF and GIF formats.") described in @url{https://www.lua.org/}.") (license license:expat))) -(define-public ghc-hslua-for-pandoc-1 - (package (inherit ghc-hslua) - (version "0.4.1") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "hslua/hslua-" version ".tar.gz")) - (sha256 - (base32 - "0gqp6qhp4v24kzv2j49kgk7bxqzw0w10x0zr0r2j9wkfavqb9wid")))) - (inputs - `(("lua" ,lua-5.1) - ("ghc-text" ,ghc-text))) - (native-inputs - `(("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-quickcheck-instances" ,ghc-quickcheck-instances) - ("ghc-hspec" ,ghc-hspec) - ("ghc-hspec-contrib" ,ghc-hspec-contrib) - ("ghc-hunit" ,ghc-hunit) - ("hspec-discover" ,hspec-discover))))) - (define-public ghc-hslua-module-text (package (name "ghc-hslua-module-text") @@ -6763,56 +6697,6 @@ provided. Skylighting is intended to be the successor to highlighting-kate.") `(("ghc-skylighting-core" ,ghc-skylighting-core) ,@(package-inputs ghc-skylighting-core))))) -(define-public ghc-skylighting-for-pandoc-1 - (package (inherit ghc-skylighting) - (version "0.1.1.5") - (source (origin - (method git-fetch) - ;; We take the sources from Github, because the tarball on - ;; hackage does not include the XML files. - (uri (git-reference - (url "https://github.com/jgm/skylighting.git") - (commit version))) - (file-name (string-append "ghc-skylighting-" version "-checkout")) - (sha256 - (base32 - "0z3yv8v2fqqgv6lsf0ff3ld0h2vkg97b2jiry9wn2f1rizwdqmzl")))) - (arguments - `(#:configure-flags '("-fbootstrap") - #:phases - (modify-phases %standard-phases - ;; After building the skylighting-extract tool we use it to generate - ;; syntax source files from the included XML files. These are then - ;; added to the skylighting.cabal file. - (add-after 'build 'extract-xml - (lambda _ - (make-file-writable "skylighting.cabal") - (apply invoke "./dist/build/skylighting-extract/skylighting-extract" - (find-files "xml" "\\.xml$")) - #t)) - ;; Reconfigure without bootstrap flag - (add-after 'extract-xml 'configure-again - (lambda* (#:key outputs inputs tests? #:allow-other-keys) - ((assoc-ref %standard-phases 'configure) - #:outputs outputs - #:inputs inputs - #:tests? tests? - #:configure-flags '("-f-bootstrap")))) - (add-after 'configure-again 'build-again - (assoc-ref %standard-phases 'build))))) - (inputs - `(("ghc-aeson" ,ghc-aeson-for-pandoc-1) - ("ghc-ansi-terminal" ,ghc-ansi-terminal) - ("ghc-blaze-html" ,ghc-blaze-html) - ("ghc-case-insensitive" ,ghc-case-insensitive) - ("ghc-diff" ,ghc-diff) - ("ghc-hxt" ,ghc-hxt) - ("ghc-pretty-show" ,ghc-pretty-show) - ("ghc-regex-pcre-builtin" ,ghc-regex-pcre-builtin) - ("ghc-safe" ,ghc-safe) - ("ghc-text" ,ghc-text) - ("ghc-utf8-string" ,ghc-utf8-string))))) - (define-public ghc-doctemplates (package (name "ghc-doctemplates") @@ -6844,29 +6728,6 @@ provided. Skylighting is intended to be the successor to highlighting-kate.") "This package provides a simple text templating system used by pandoc.") (license license:bsd-3))) -(define-public ghc-doctemplates-for-pandoc-1 - (package (inherit ghc-doctemplates) - (version "0.1.0.2") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "doctemplates/doctemplates-" - version ".tar.gz")) - (sha256 - (base32 - "0swal6rjya1293mwvl63jch5fx9ghpsil7qs4v7rpansa0izalmp")))) - (build-system haskell-build-system) - (inputs - `(("ghc-aeson" ,ghc-aeson-for-pandoc-1) - ("ghc-blaze-markup" ,ghc-blaze-markup) - ("ghc-blaze-html" ,ghc-blaze-html) - ("ghc-text" ,ghc-text) - ("ghc-vector" ,ghc-vector) - ("ghc-parsec" ,ghc-parsec) - ("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-scientific" ,ghc-scientific))))) - (define-public ghc-pandoc (package (name "ghc-pandoc") @@ -6956,66 +6817,6 @@ definition lists, tables, and other features. A compatibility mode is provided for those who need a drop-in replacement for Markdown.pl.") (license license:gpl2+))) -;; This is the last version of Pandoc 1.x, which is preferred for Rmarkdown. -(define-public ghc-pandoc-1 - (package (inherit ghc-pandoc) - (version "1.19.2.4") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/pandoc/pandoc-" - version ".tar.gz")) - (sha256 - (base32 - "0mim429mpakrcnm50csxyqk3ljcx2l26r5grk6w9isnggwgqrq5v")))) - (arguments - `(#:configure-flags (list "--allow-newer=skylighting"))) - (inputs - `(("ghc-aeson" ,ghc-aeson-for-pandoc-1) - ("ghc-ansi-terminal" ,ghc-ansi-terminal) - ("ghc-base64-bytestring" ,ghc-base64-bytestring) - ("ghc-blaze-html" ,ghc-blaze-html) - ("ghc-blaze-markup" ,ghc-blaze-markup) - ("ghc-cmark" ,ghc-cmark) - ("ghc-data-default" ,ghc-data-default) - ("ghc-deepseq-generics" ,ghc-deepseq-generics) - ("ghc-diff" ,ghc-diff) - ("ghc-doctemplates" ,ghc-doctemplates-for-pandoc-1) - ("ghc-executable-path" ,ghc-executable-path) - ("ghc-extensible-exceptions" ,ghc-extensible-exceptions) - ("ghc-filemanip" ,ghc-filemanip) - ("ghc-haddock-library" ,ghc-haddock-library) - ("ghc-hslua" ,ghc-hslua-for-pandoc-1) - ("ghc-http" ,ghc-http) - ("ghc-http-client" ,ghc-http-client) - ("ghc-http-client-tls" ,ghc-http-client-tls) - ("ghc-http-types" ,ghc-http-types) - ("ghc-juicypixels" ,ghc-juicypixels) - ("ghc-network" ,ghc-network) - ("ghc-network-uri" ,ghc-network-uri) - ("ghc-old-time" ,ghc-old-time) - ("ghc-pandoc-types" ,ghc-pandoc-types-for-pandoc-1) - ("ghc-parsec" ,ghc-parsec) - ("ghc-random" ,ghc-random) - ("ghc-scientific" ,ghc-scientific) - ("ghc-sha" ,ghc-sha) - ("ghc-skylighting" ,ghc-skylighting-for-pandoc-1) - ("ghc-syb" ,ghc-syb) - ("ghc-tagsoup" ,ghc-tagsoup) - ("ghc-temporary" ,ghc-temporary) - ("ghc-texmath" ,ghc-texmath-for-pandoc-1) - ("ghc-text" ,ghc-text) - ("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-vector" ,ghc-vector) - ("ghc-xml" ,ghc-xml) - ("ghc-yaml" ,ghc-yaml-for-pandoc-1) - ("ghc-zip-archive" ,ghc-zip-archive) - ("ghc-zlib" ,ghc-zlib))) - (native-inputs - `(("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) - ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))))) - (define-public ghc-hs-bibutils (package (name "ghc-hs-bibutils") @@ -7251,19 +7052,6 @@ and also has a mode for converting bibliographic databases a YAML format suitable for inclusion in pandoc YAML metadata.") (license license:bsd-3))) -(define-public ghc-pandoc-citeproc-with-pandoc-1 - (let ((for-pandoc-1 - (package-input-rewriting - `((,ghc-aeson . ,ghc-aeson-for-pandoc-1) - (,ghc-yaml . ,ghc-yaml-for-pandoc-1) - (,ghc-texmath . ,ghc-texmath-for-pandoc-1) - (,ghc-pandoc-types . ,ghc-pandoc-types-for-pandoc-1) - (,ghc-hslua . ,ghc-hslua-for-pandoc-1) - (,ghc-skylighting . ,ghc-skylighting-for-pandoc-1) - (,ghc-doctemplates . ,ghc-doctemplates-for-pandoc-1) - (,ghc-pandoc . ,ghc-pandoc-1))))) - (for-pandoc-1 ghc-pandoc-citeproc))) - (define-public ghc-union-find (package (name "ghc-union-find") -- cgit v1.2.3 From 88c337177fbe99e8422a91e633713b4453279fe6 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 6 Sep 2018 23:58:30 -0400 Subject: gnu: ghc-base-compat: Update to 0.10.4. * gnu/packages/haskell.scm (ghc-base-compat): Update to 0.10.4. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index e39c5e0b81..bcf0b83a04 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4547,7 +4547,7 @@ system.") (define-public ghc-base-compat (package (name "ghc-base-compat") - (version "0.9.3") + (version "0.10.4") (source (origin (method url-fetch) @@ -4557,7 +4557,7 @@ system.") ".tar.gz")) (sha256 (base32 - "0452l6zf6fjhy4kxqwv6i6hhg6yfx4wcg450k3axpyj30l7jnq3x")))) + "0ksp990gxs731mq19rzbxrbs43nazfljjc8krlx5bjqblw3kfs8d")))) (build-system haskell-build-system) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck) -- cgit v1.2.3 From 576b7dd5083827dd83b45749a6e9b983a20512c9 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 6 Sep 2018 23:59:34 -0400 Subject: gnu: ghc-tasty-golden: Update to 2.3.2. * gnu/packages/haskell-check.scm (ghc-tasty-golden): Update to 2.3.2. --- gnu/packages/haskell-check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 42b7fd167b..0d4501df86 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -124,7 +124,7 @@ Haskell test framework.") (define-public ghc-tasty-golden (package (name "ghc-tasty-golden") - (version "2.3.1.1") + (version "2.3.2") (source (origin (method url-fetch) @@ -134,7 +134,7 @@ Haskell test framework.") ".tar.gz")) (sha256 (base32 - "0pcf5hsyp5mmbqn7krdm49jxpkjm6rb4j83j28f76h7q55dzm1wy")))) + "0k3ibjhjc9vcwzrjnl4rnwvfm8l81q347nb7dgvcib6n5wm3s404")))) (build-system haskell-build-system) (inputs `(("ghc-temporary" ,ghc-temporary) -- cgit v1.2.3 From 1d13003aa9ea35f506546e66fd26383aef3211bf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 28 Sep 2018 08:30:19 +0200 Subject: gnu: Add ghc-weigh. * gnu/packages/haskell.scm (ghc-weigh): New variable. --- gnu/packages/haskell.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index bcf0b83a04..4be0290825 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -10557,4 +10557,26 @@ expose it from another module in the hierarchy. @end itemize") (license license:expat))) +(define-public ghc-weigh + (package + (name "ghc-weigh") + (version "0.0.12") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/weigh/" + "weigh-" version ".tar.gz")) + (sha256 + (base32 + "0zw2a997gxgdzqmd7j730kxgynzmjvvlkw84dajmfzf1v9pbij7x")))) + (build-system haskell-build-system) + (inputs + `(("ghc-split" ,ghc-split) + ("ghc-temporary" ,ghc-temporary))) + (home-page "https://github.com/fpco/weigh#readme") + (synopsis "Measure allocations of a Haskell functions/values") + (description "This package provides tools to measure the memory usage of a +Haskell value or function.") + (license license:bsd-3))) + ;;; haskell.scm ends here -- cgit v1.2.3 From d459e043c885811495088fb9d73b45b68db154de Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 28 Sep 2018 08:30:42 +0200 Subject: gnu: Add ghc-linear. * gnu/packages/haskell.scm (ghc-linear): New variable. --- gnu/packages/haskell.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 4be0290825..8076838309 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -10579,4 +10579,47 @@ expose it from another module in the hierarchy. Haskell value or function.") (license license:bsd-3))) +(define-public ghc-linear + (package + (name "ghc-linear") + (version "1.20.8") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/linear/" + "linear-" version ".tar.gz")) + (sha256 + (base32 + "046vkvxlb0s286qr55s0c6db0rlwbm1cmlmwhrrkqbkzhfcipgay")))) + (build-system haskell-build-system) + (inputs + `(("ghc-adjunctions" ,ghc-adjunctions) + ("ghc-base-orphans" ,ghc-base-orphans) + ("ghc-bytes" ,ghc-bytes) + ("ghc-cereal" ,ghc-cereal) + ("ghc-distributive" ,ghc-distributive) + ("ghc-hashable" ,ghc-hashable) + ("ghc-lens" ,ghc-lens) + ("ghc-reflection" ,ghc-reflection) + ("ghc-semigroups" ,ghc-semigroups) + ("ghc-semigroupoids" ,ghc-semigroupoids) + ("ghc-tagged" ,ghc-tagged) + ("ghc-transformers-compat" ,ghc-transformers-compat) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-vector" ,ghc-vector) + ("ghc-void" ,ghc-void))) + (native-inputs + `(("cabal-doctest" ,cabal-doctest) + ("ghc-doctest" ,ghc-doctest) + ("ghc-simple-reflect" ,ghc-simple-reflect) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) + ("ghc-hunit" ,ghc-hunit))) + (home-page "http://github.com/ekmett/linear/") + (synopsis "Linear algebra library for Haskell") + (description + "This package provides types and combinators for linear algebra on free +vector spaces.") + (license license:bsd-3))) + ;;; haskell.scm ends here -- cgit v1.2.3 From 62dd7171d3fa3df964f34ebb1627704ea447cc21 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 28 Sep 2018 08:31:11 +0200 Subject: gnu: Add ghc-sdl2. * gnu/packages/sdl.scm (ghc-sdl2): New variable. --- gnu/packages/sdl.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 55ce45ce78..a50ed8cbcb 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -33,6 +33,7 @@ #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system gnu) + #:use-module (guix build-system haskell) #:use-module (guix build-system trivial) #:use-module (gnu packages audio) #:use-module (gnu packages fcitx) @@ -40,6 +41,7 @@ #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) #:use-module (gnu packages guile) + #:use-module (gnu packages haskell) #:use-module (gnu packages ibus) #:use-module (gnu packages image) #:use-module (gnu packages linux) @@ -520,3 +522,40 @@ sound and device input (keyboards, joysticks, mice, etc.).") The bindings are written in pure Scheme using Guile's foreign function interface.") (license lgpl3+))) + +(define-public ghc-sdl2 + (package + (name "ghc-sdl2") + (version "2.4.1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "sdl2/sdl2-" version ".tar.gz")) + (sha256 + (base32 + "0p4b12fmxps0sbnkqdfy0qw19s355yrkw7fgw6xz53wzq706k991")))) + (build-system haskell-build-system) + (arguments '(#:tests? #f)) ; tests require graphical environment + (inputs + `(("ghc-exceptions" ,ghc-exceptions) + ("ghc-linear" ,ghc-linear) + ("ghc-statevar" ,ghc-statevar) + ("ghc-text" ,ghc-text) + ("ghc-vector" ,ghc-vector) + ("sdl2" ,sdl2))) + (native-inputs + `(("ghc-weigh" ,ghc-weigh) + ("pkg-config" ,pkg-config))) + (home-page "http://hackage.haskell.org/package/sdl2") + (synopsis "High- and low-level bindings to the SDL library") + (description + "This package contains bindings to the SDL 2 library, in both high- and +low-level forms. The @code{SDL} namespace contains high-level bindings, where +enumerations are split into sum types, and we perform automatic +error-checking. The @code{SDL.Raw} namespace contains an almost 1-1 +translation of the C API into Haskell FFI calls. As such, this does not +contain sum types nor error checking. Thus this namespace is suitable for +building your own abstraction over SDL, but is not recommended for day-to-day +programming.") + (license bsd-3))) -- cgit v1.2.3 From d975534e856dc6c8426d9f28af3b5d30ead31ac3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 28 Sep 2018 08:31:25 +0200 Subject: gnu: Add ghc-sdl2-mixer. * gnu/packages/sdl.scm (ghc-sdl2-mixer): New variable. --- gnu/packages/sdl.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index a50ed8cbcb..06f419f900 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -559,3 +559,31 @@ contain sum types nor error checking. Thus this namespace is suitable for building your own abstraction over SDL, but is not recommended for day-to-day programming.") (license bsd-3))) + +(define-public ghc-sdl2-mixer + (package + (name "ghc-sdl2-mixer") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/sdl2-mixer/" + "sdl2-mixer-" version ".tar.gz")) + (sha256 + (base32 + "1k8avyccq5l9z7bwxigim312yaancxl1sr3q6a96bcm7pnhiak0g")))) + (build-system haskell-build-system) + (inputs + `(("ghc-data-default-class" ,ghc-data-default-class) + ("ghc-lifted-base" ,ghc-lifted-base) + ("ghc-monad-control" ,ghc-monad-control) + ("ghc-sdl2" ,ghc-sdl2) + ("ghc-vector" ,ghc-vector) + ("sdl2-mixer" ,sdl2-mixer))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "http://hackage.haskell.org/package/sdl2-mixer") + (synopsis "Bindings to SDL2 mixer") + (description "This package provides Haskell bindings to +@code{SDL2_mixer}.") + (license bsd-3))) -- cgit v1.2.3 From 21be24b74f1a0cac185637620d59a3764c539875 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 28 Sep 2018 08:31:36 +0200 Subject: gnu: Add ghc-sdl2-image. * gnu/packages/sdl.scm (ghc-sdl2-image): New variable. --- gnu/packages/sdl.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 06f419f900..caa1d6d1c1 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -587,3 +587,28 @@ programming.") (description "This package provides Haskell bindings to @code{SDL2_mixer}.") (license bsd-3))) + +(define-public ghc-sdl2-image + (package + (name "ghc-sdl2-image") + (version "2.0.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/sdl2-image/" + "sdl2-image-" version ".tar.gz")) + (sha256 + (base32 + "1pr6dkg73cy9z0w54lrkj9c5bhxj56nl92lxikjy8kz6nyr455rr")))) + (build-system haskell-build-system) + (inputs + `(("ghc-sdl2" ,ghc-sdl2) + ("ghc-text" ,ghc-text) + ("sdl2-image" ,sdl2-image))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "http://hackage.haskell.org/package/sdl2-image") + (synopsis "Bindings to SDL2_image") + (description "This package provides Haskell bindings to +@code{SDL2_image}.") + (license expat))) -- cgit v1.2.3 From 86eec9cf5c564f8782d78c0b992dbca07d5d5c8d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 28 Sep 2018 11:30:55 +0200 Subject: gnu: raincat: Update to 1.2.1. * gnu/packages/games.scm (raincat): Update to 1.2.1. [arguments]: Ensure raincat can find freeglut libraries at runtime. [inputs]: Replace ghc-sdl, ghc-sdl-image, and ghc-sdl-mixer with ghc-sdl2, ghc-sdl2-image, and ghc-sdl2-mixer, respectively. --- gnu/packages/games.scm | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 1fab9fe34a..86d6973a9a 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2122,27 +2122,36 @@ on the screen and keyboard to display letters.") (define-public raincat (package (name "raincat") - (version "1.2") + (version "1.2.1") (source (origin (method url-fetch) - (uri (string-append - "http://hackage.haskell.org/package/Raincat/Raincat-" - version - ".tar.gz")) + (uri (string-append "http://hackage.haskell.org/package/Raincat/" + "Raincat-" version ".tar.gz")) (sha256 (base32 - "1zyxkvjxkadwakg03xnjii1hx0gs45ap9rfkpi4kxipzxppq1klk")))) + "10y9zi22m6hf13c9h8zd9vg7mljpwbw0r3djb6r80bna701fdf6c")))) (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-executable + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/raincat") + `("LD_LIBRARY_PATH" ":" = + (,(string-append (assoc-ref inputs "freeglut") + "/lib")))) + #t)))))) (inputs `(("ghc-extensible-exceptions" ,ghc-extensible-exceptions) ("ghc-random" ,ghc-random) ("ghc-glut" ,ghc-glut) ("freeglut" ,freeglut) ("ghc-opengl" ,ghc-opengl) - ("ghc-sdl" ,ghc-sdl) - ("ghc-sdl-image" ,ghc-sdl-image) - ("ghc-sdl-mixer" ,ghc-sdl-mixer))) + ("ghc-sdl2" ,ghc-sdl2) + ("ghc-sdl2-image" ,ghc-sdl2-image) + ("ghc-sdl2-mixer" ,ghc-sdl2-mixer))) (home-page "http://www.bysusanlin.com/raincat/") (synopsis "Puzzle game with a cat in lead role") (description "Project Raincat is a game developed by Carnegie Mellon -- cgit v1.2.3 From 6306ce727186d2f8d2be5632a9b5d92982841e95 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 30 Sep 2018 10:49:00 +0200 Subject: gnu: git-annex: Update to 6.20180926. * gnu/packages/version-control.scm (git-annex): Update to 6.20180926. --- gnu/packages/version-control.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index c8ad067ff1..cc892b9c62 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2014, 2016 Eric Bavier ;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2015 Kyle Meyer -;;; Copyright © 2015, 2017 Ricardo Wurmus +;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2016, 2017, 2018 Nils Gillmann ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice @@ -2103,7 +2103,7 @@ directory full of HOWTOs.") (define-public git-annex (package (name "git-annex") - (version "6.20180807") + (version "6.20180926") (source (origin (method url-fetch) @@ -2111,7 +2111,7 @@ directory full of HOWTOs.") "git-annex/git-annex-" version ".tar.gz")) (sha256 (base32 - "1wkqh1y58m0z1mf2j33qhndpxcjwv8mbv384kdk17vn0lp9zas1s")))) + "1251rj8h63y30sfqk0zh670yhz14p256y59n3590pg015pf3575d")))) (build-system haskell-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 787231e9570779892b2eb2e79563be4cfacc9b9d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 30 Sep 2018 12:23:59 +0200 Subject: gnu: agda: Fix build. * gnu/packages/agda.scm (agda)[inputs]: Remove ghc-monadplus; add ghc-filemanip. [arguments]: Replace configure phase. --- gnu/packages/agda.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/agda.scm b/gnu/packages/agda.scm index 418025bc37..6bb38aac4d 100644 --- a/gnu/packages/agda.scm +++ b/gnu/packages/agda.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Alex ter Weele +;;; Copyright © 2018 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -51,13 +52,13 @@ ("ghc-edisoncore" ,ghc-edisoncore) ("ghc-edit-distance" ,ghc-edit-distance) ("ghc-equivalence" ,ghc-equivalence) + ("ghc-filemanip" ,ghc-filemanip) ("ghc-geniplate-mirror" ,ghc-geniplate-mirror) ("ghc-gitrev" ,ghc-gitrev) ("ghc-happy" ,ghc-happy) ("ghc-hashable" ,ghc-hashable) ("ghc-hashtables" ,ghc-hashtables) ("ghc-ieee754" ,ghc-ieee754) - ("ghc-monadplus" ,ghc-monadplus) ("ghc-murmur-hash" ,ghc-murmur-hash) ("ghc-uri-encode" ,ghc-uri-encode) ("ghc-parallel" ,ghc-parallel) @@ -70,9 +71,50 @@ (arguments `(#:modules ((guix build haskell-build-system) (guix build utils) - (srfi srfi-26)) + (srfi srfi-26) + (ice-9 match)) #:phases (modify-phases %standard-phases + ;; FIXME: This is a copy of the standard configure phase with a tiny + ;; difference: this package needs the -package-db flag to be passed + ;; to "runhaskell" in addition to the "configure" action, because + ;; Setup.hs depends on filemanip. Without this option the Setup.hs + ;; file cannot be evaluated. The haskell-build-system should be + ;; changed to pass "-package-db" to "runhaskell" in any case. + (replace 'configure + (lambda* (#:key outputs inputs tests? (configure-flags '()) + #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (input-dirs (match inputs + (((_ . dir) ...) + dir) + (_ '()))) + (ghc-path (getenv "GHC_PACKAGE_PATH")) + (params (append `(,(string-append "--prefix=" out)) + `(,(string-append "--libdir=" out "/lib")) + `(,(string-append "--bindir=" out "/bin")) + `(,(string-append + "--docdir=" out + "/share/doc/" ((@@ (guix build haskell-build-system) + package-name-version) out))) + '("--libsubdir=$compiler/$pkg-$version") + '("--package-db=../package.conf.d") + '("--global") + `(,@(map + (cut string-append "--extra-include-dirs=" <>) + (search-path-as-list '("include") input-dirs))) + `(,@(map + (cut string-append "--extra-lib-dirs=" <>) + (search-path-as-list '("lib") input-dirs))) + (if tests? + '("--enable-tests") + '()) + configure-flags))) + (unsetenv "GHC_PACKAGE_PATH") + (apply invoke "runhaskell" "-package-db=../package.conf.d" + "Setup.hs" "configure" params) + (setenv "GHC_PACKAGE_PATH" ghc-path) + #t))) (add-after 'compile 'agda-compile (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From c95908bb030bd80de47a0ef9fc7f1dde0b68d3a8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 30 Sep 2018 13:14:39 +0200 Subject: gnu: ghc-indents: Fix build. * gnu/packages/haskell.scm (ghc-indents)[arguments]: Disable tests. [native-inputs]: Add ghc-tasty and ghc-tasty-hunit. --- gnu/packages/haskell.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 8076838309..0e2dfd8817 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2804,9 +2804,14 @@ isn't available, portable implementations are used.") (base32 "1ly3v41jacc6lrsvg4j3m5a6zs90gr8dyif5m6bf34hj1k5cgg0n")))) (build-system haskell-build-system) + ;; This package needs an older version of tasty. + (arguments '(#:tests? #f)) (inputs `(("ghc-parsec" ,ghc-parsec) ("ghc-concatenative" ,ghc-concatenative))) + (native-inputs + `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit))) (home-page "http://patch-tag.com/r/salazar/indents") (synopsis "Indentation sensitive parser-combinators for parsec") (description -- cgit v1.2.3 From f0bce3a758a6cc66552f326e570b571e0155814a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sun, 30 Sep 2018 19:44:25 +0800 Subject: gnu: ghc-xmonad-contrib: Fix build. * gnu/packages/wm.scm (ghc-xmonad-contrib)[inputs]: Add ghc-semigroups. --- gnu/packages/wm.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 4ec465f875..7c58770de7 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -563,6 +563,7 @@ Haskell, no knowledge of the language is required to install and use it.") ("ghc-random" ,ghc-random) ("ghc-utf8-string" ,ghc-utf8-string) ("ghc-extensible-exceptions" ,ghc-extensible-exceptions) + ("ghc-semigroups", ghc-semigroups) ("ghc-x11" ,ghc-x11) ("ghc-x11-xft" ,ghc-x11-xft) ("xmonad" ,xmonad))) -- cgit v1.2.3 From eaa1f873e69c64e5d7f7535e95f6ae0be75c3ac9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sun, 30 Sep 2018 20:05:55 +0800 Subject: gnu: shellcheck: Update to 0.5.0. * gnu/packages/haskell.scm (shellcheck): Update to 0.5.0. [source]: Use tarball from hackage. [inputs]: Add ghc-aeson. Remove ghc-json. --- gnu/packages/haskell.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 0e2dfd8817..df0190d591 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8489,20 +8489,21 @@ generated SQL and optimize it for your backend.") (define-public shellcheck (package (name "shellcheck") - (version "0.4.6") + (version "0.5.0") (source (origin (method url-fetch) - (uri (string-append "https://github.com/koalaman/shellcheck/archive/" - "v" version ".tar.gz")) + (uri (string-append + "https://hackage.haskell.org/package/ShellCheck/ShellCheck-" + version ".tar.gz")) (sha256 (base32 - "1qkd69lc34n3l23ss9rq1azvx49bfq4hi4bmaj76rgxybscxhg0w")) + "0z1hscbr11hwkq8k1v0vaa947hb9m6k4cm831jk1gpj8dxrk151b")) (file-name (string-append name "-" version ".tar.gz")))) (build-system haskell-build-system) (inputs - `(("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-json" ,ghc-json) + `(("ghc-aeson" ,ghc-aeson) + ("ghc-quickcheck" ,ghc-quickcheck) ("ghc-parsec" ,ghc-parsec) ("ghc-regex-tdfa" ,ghc-regex-tdfa))) (home-page "https://github.com/koalaman/shellcheck") -- cgit v1.2.3 From 70fa5899af8a2270c29e40035e6258865a4f4461 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sun, 30 Sep 2018 20:33:46 +0800 Subject: gnu: ghc-wave: Fix build. * gnu/packages/haskell.scm (ghc-wave)[arguments]: Add a phase to relax dependency constraints. --- gnu/packages/haskell.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index df0190d591..4a915142c1 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8338,6 +8338,14 @@ Rust syntax. It is intended to be useful for two different purposes: (base32 "03zycmwrchhqvi37fdvlzz2d1vl4hy0i8xyys1zznw38qfq0h2i5")))) (build-system haskell-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "wave.cabal" + (("temporary.* < 1\\.3") + "temporary >= 1.1 && < 1.4"))))))) (inputs `(("ghc-cereal" ,ghc-cereal) ("ghc-data-default-class" -- cgit v1.2.3 From 1abdefe573d4928ce495d0dbd877d68df776df9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sun, 30 Sep 2018 20:52:07 +0800 Subject: gnu: ghc-gnuplot: Fix build. * gnu/packages/haskell.scm (ghc-gnuplot)[inputs]: Add ghc-semigroups. --- gnu/packages/haskell.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 4a915142c1..2dff323fce 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8134,6 +8134,7 @@ helper functions for Lists, Maybes, Tuples, Functions.") ("ghc-utility-ht" ,ghc-utility-ht) ("ghc-data-accessor-transformers" ,ghc-data-accessor-transformers) ("ghc-data-accessor" ,ghc-data-accessor) + ("ghc-semigroups" ,ghc-semigroups) ("gnuplot" ,gnuplot))) (arguments `(#:phases -- cgit v1.2.3 From 456d76eaf6583e2439ff6df19427779a2d62848c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 30 Sep 2018 23:10:27 +0200 Subject: gnu: ghc-aws: Fix build. * gnu/packages/haskell.scm (ghc-aws)[inputs]: Add ghc-lifted-base. --- gnu/packages/haskell.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 2dff323fce..205d2348d4 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9585,6 +9585,7 @@ as well as a convenient Conduit module.") ("ghc-data-default" ,ghc-data-default) ("ghc-http-conduit" ,ghc-http-conduit) ("ghc-http-types" ,ghc-http-types) + ("ghc-lifted-base" ,ghc-lifted-base) ("ghc-monad-control" ,ghc-monad-control) ("ghc-network" ,ghc-network) ("ghc-old-locale" ,ghc-old-locale) -- cgit v1.2.3 From 52891580e1c83235c2bf3a8297b05662c3bc14e9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 30 Sep 2018 23:18:09 +0200 Subject: gnu: ghc-statistics: Fix build. * gnu/packages/haskell.scm (ghc-statistics)[arguments]: Add cabal revision. --- gnu/packages/haskell.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 205d2348d4..a140985eba 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8999,6 +8999,11 @@ that are much lighter weight than IO-threads.") (base32 "0y27gafkib0x0fn39qfn2rkgsfrm09ng35sbb5dwr7rclhnxz59l")))) (build-system haskell-build-system) + (arguments + '(#:cabal-revision + ("2" "1bx70yqkn62ii17fjv3pig4hklrzkqd09zj67zzjiyjzmn04fir3") + ;; Two tests fail: "Discrete CDF is OK" and "Quantile is CDF inverse". + #:tests? #f)) (inputs `(("ghc-aeson" ,ghc-aeson) ("ghc-base-orphans" ,ghc-base-orphans) @@ -9018,8 +9023,6 @@ that are much lighter weight than IO-threads.") ("ghc-test-framework" ,ghc-test-framework) ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) - (arguments - `(#:tests? #f)) ; FIXME: Test-Suite `spec` fails. (home-page "https://github.com/bos/mwc-random") (synopsis "Haskell library of statistical types, data, and functions") (description "This library provides a number of common functions -- cgit v1.2.3 From b2bf43b22aad83c3d64391339f7c5f66c6d58789 Mon Sep 17 00:00:00 2001 From: pimi Date: Mon, 1 Oct 2018 08:30:14 -0400 Subject: gnu: Add r-pscl. * gnu/packages/cran.scm (r-pscl): New variable. --- gnu/packages/cran.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 58e9ad09c7..deb81f2430 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5895,3 +5895,29 @@ hemoglobin to reticulocytes (OFF-score), as well as example data.") based on entropy estimates from k-nearest neighbors distances and algorithms for the reconstruction of gene regulatory networks.") (license license:agpl3+))) + +(define-public r-pscl + (package + (name "r-pscl") + (version "1.5.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "pscl" version)) + (sha256 + (base32 "1phf3awsfr4ncqfqzin5m1pz0g7y1zhbcm2sz7358ssw914fd7rc")))) + (build-system r-build-system) + (propagated-inputs + `(("r-mass" ,r-mass))) + (home-page "https://github.com/atahk/pscl/") + (synopsis "Political science computational laboratory") + (description + "The @code{pscl} is an R package providing classes and methods for: +@enumerate +@item Bayesian analysis of roll call data (item-response models); +@item elementary Bayesian statistics; +@item maximum likelihood estimation of zero-inflated and hurdle models for count +data; +@item utility functions. +@end enumerate") + (license license:gpl2))) -- cgit v1.2.3 From e710d1a4ffe0131d9a59eba1d1ad615f8448f50d Mon Sep 17 00:00:00 2001 From: pimi Date: Mon, 1 Oct 2018 08:30:37 -0400 Subject: gnu: Add r-accelmissing. * gnu/packages/cran.scm (r-accelmissing): New variable. --- gnu/packages/cran.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index deb81f2430..a38c907cd5 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5921,3 +5921,28 @@ data; @item utility functions. @end enumerate") (license license:gpl2))) + +(define-public r-accelmissing + (package + (name "r-accelmissing") + (version "1.4") + (source + (origin + (method url-fetch) + (uri (cran-uri "accelmissing" version)) + (sha256 + (base32 "1nql9inx6azdzi3z4sfm2vdml2mms6krl8wzlf1dn1c97ahn57fy")))) + (build-system r-build-system) + (propagated-inputs + `(("r-mice" ,r-mice) + ("r-pscl" ,r-pscl))) + (home-page "https://cran.r-project.org/web/packages/accelmissing/") + (synopsis "Missing value imputation for accelerometer data") + (description + "This package provides a statistical method to impute the missing values in +accelerometer data. The methodology includes both parametric and +semi-parametric multiple imputations under the zero-inflated Poisson lognormal +model. It also provides multiple functions to preprocess the accelerometer data +previous to the missing data imputation. These include detecting the wearing +and the non-wearing time, selecting valid days and subjects, and creating plots.") + (license license:gpl2+))) -- cgit v1.2.3 From 5ec20676d75a25c9163c6067d2e3eece84d08c2b Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 1 Oct 2018 14:54:46 +0200 Subject: gnu: wine-staging: Update to 3.17. * gnu/packages/wine.scm (wine-staging-patchset-data): Update to 3.17. * gnu/packages/wine.scm (wine-staging): Update to 3.17. --- gnu/packages/wine.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 782776606d..68839038b7 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -225,7 +225,7 @@ integrate Windows applications into your desktop.") (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") - (version "3.16") + (version "3.17") (source (origin (method git-fetch) @@ -235,7 +235,7 @@ integrate Windows applications into your desktop.") (file-name (git-file-name name version)) (sha256 (base32 - "0c1bs9qpxlvld6jkwjri2v8jaixxn1r5b0m9r5hnkfrnpl7z7cfv")))) + "1ds9q90xjg59ikic98kqkhmijnqx4yplvwsm6rav4mx72yci7d4w")))) (build-system trivial-build-system) (native-inputs `(("bash" ,bash) @@ -281,7 +281,7 @@ integrate Windows applications into your desktop.") (file-name (string-append name "-" version ".tar.xz")) (sha256 (base32 - "0g55l41apiwgblfk9ihzd96003gd32w5ng79f96hmiwhyzwbqhxd")))) + "08fcziadw40153a9rv630m7iz6ipfzylms5y191z4sj2vvhy5vac")))) (inputs `(("autoconf" ,autoconf) ; for autoreconf ("gtk+" ,gtk+) ("libva" ,libva) -- cgit v1.2.3 From f359b115c74c9c5fdf482528a0480ed40f5a2446 Mon Sep 17 00:00:00 2001 From: pimi Date: Mon, 1 Oct 2018 08:49:21 -0400 Subject: gnu: Add r-mhsmm. * gnu/packages/cran.scm (r-mhsmm): New variable. --- gnu/packages/cran.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a38c907cd5..82984548a2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5946,3 +5946,26 @@ model. It also provides multiple functions to preprocess the accelerometer data previous to the missing data imputation. These include detecting the wearing and the non-wearing time, selecting valid days and subjects, and creating plots.") (license license:gpl2+))) + +(define-public r-mhsmm + (package + (name "r-mhsmm") + (version "0.4.16") + (source + (origin + (method url-fetch) + (uri (cran-uri "mhsmm" version)) + (sha256 + (base32 "009dj0zkj1zry7jr9hf4cknb686z50a2l967if64xm0dvjmp7dgs")))) + (build-system r-build-system) + (propagated-inputs `(("r-mvtnorm" ,r-mvtnorm))) + (home-page "https://github.com/jaredo/mhsmm/") + (synopsis "Inference for hidden Markov and semi-Markov models") + (description + "The @code{r-mhsmm} package implements estimation and prediction methods for +hidden Markov and semi-Markov models for multiple observation sequences. Such +techniques are of interest when observed data is thought to be dependent on some +unobserved (or hidden) state. Also, this package is suitable for equidistant +time series data, with multivariate and/or missing data. Allows user defined +emission distributions.") + (license license:gpl2+))) -- cgit v1.2.3 From 16c5285af40f66614cccfe3f916cfe78e49bae16 Mon Sep 17 00:00:00 2001 From: pimi Date: Mon, 1 Oct 2018 08:52:01 -0400 Subject: gnu: Add r-nleqslv. * gnu/packages/cran.scm (r-nleqslv): New variable. --- gnu/packages/cran.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 82984548a2..b06d22bd51 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5969,3 +5969,25 @@ unobserved (or hidden) state. Also, this package is suitable for equidistant time series data, with multivariate and/or missing data. Allows user defined emission distributions.") (license license:gpl2+))) + +(define-public r-nleqslv + (package + (name "r-nleqslv") + (version "3.3.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "nleqslv" version)) + (sha256 + (base32 "1v9znvncyigw9r25wx2ma0b7ib179b488dl0qsrhp5zrcz7mcjgm")))) + (build-system r-build-system) + (native-inputs `(("gfortran" ,gfortran))) + (home-page "https://cran.r-project.org/web/packages/nleqslv/") + (synopsis "Solve systems of nonlinear equations") + (description + "The @code{r-nleqslv} package solves a system of nonlinear equations using a +Broyden or a Newton method with a choice of global strategies such as line +search and trust region. There are options for using a numerical or user +supplied Jacobian, for specifying a banded numerical Jacobian and for allowing a +singular or ill-conditioned Jacobian.") + (license license:gpl2+))) -- cgit v1.2.3 From 63ec2c505a29ee8c7c6a7633b054edc41dbc95fa Mon Sep 17 00:00:00 2001 From: pimi Date: Mon, 1 Oct 2018 08:52:34 -0400 Subject: gnu: Add r-physicalactivity. * gnu/packages/cran.scm (r-physicalactivity): New variable. --- gnu/packages/cran.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b06d22bd51..932d7cb414 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5991,3 +5991,36 @@ search and trust region. There are options for using a numerical or user supplied Jacobian, for specifying a banded numerical Jacobian and for allowing a singular or ill-conditioned Jacobian.") (license license:gpl2+))) + +(define-public r-physicalactivity + (package + (name "r-physicalactivity") + (version "0.2-2") + (source + (origin + (method url-fetch) + (uri (cran-uri "PhysicalActivity" version)) + (sha256 + (base32 "14z6plgwyr46vs9m997rvlz8sdglfs9g087an8668zqkzzs2w4ln")))) + (properties + `((upstream-name . "PhysicalActivity"))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/web/packages/PhysicalActivity/") + (synopsis "Procesing accelerometer data for physical activity measurement") + (description + "This @code{r-physicalactivity} package provides a function @code{wearingMarking} +for classification of monitor wear and nonwear time intervals in accelerometer +data collected to assess physical activity. The package also contains functions +for making plots of accelerometer data and obtaining the summary of various +information including daily monitor wear time and the mean monitor wear time +during valid days. The revised package version 0.2-1 improved the functions +regarding speed, robustness and add better support for time zones and daylight +saving. In addition, several functions were added: +@enumerate +@item the @code{markDelivery} can classify days for ActiGraph delivery by mail; +@item the @code{markPAI} can categorize physical activity intensity level based +on user-defined cut-points of accelerometer counts. +@end enumerate + It also supports importing ActiGraph (AGD) files with @code{readActigraph} and +@code{queryActigraph} functions.") + (license license:gpl3+))) -- cgit v1.2.3 From f95d45425152bda85950d2b8f9ead50bdce2e2cc Mon Sep 17 00:00:00 2001 From: pimi Date: Mon, 1 Oct 2018 08:53:00 -0400 Subject: gnu: Add r-acc. * gnu/packages/cran.scm (r-acc): New variable. --- gnu/packages/cran.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 932d7cb414..186a52a1f1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6024,3 +6024,36 @@ on user-defined cut-points of accelerometer counts. It also supports importing ActiGraph (AGD) files with @code{readActigraph} and @code{queryActigraph} functions.") (license license:gpl3+))) + +(define-public r-acc + (package + (name "r-acc") + (version "1.3.3") + (source + (origin + (method url-fetch) + (uri (cran-uri "acc" version)) + (sha256 + (base32 "1ii2vm47djxbixa75h690q1s2f9m9x6i8nkygik93j6dayr6kr1m")))) + (build-system r-build-system) + (propagated-inputs + `(("r-circlize" ,r-circlize) + ("r-dbi" ,r-dbi) + ("r-ggplot2" ,r-ggplot2) + ("r-iterators" ,r-iterators) + ("r-mhsmm" ,r-mhsmm) + ("r-nleqslv" ,r-nleqslv) + ("r-physicalactivity" ,r-physicalactivity) + ("r-plyr" ,r-plyr) + ("r-r-utils" ,r-r-utils) + ("r-rcpp" ,r-rcpp) + ("r-rcpparmadillo" ,r-rcpparmadillo) + ("r-rsqlite" ,r-rsqlite) + ("r-zoo" ,r-zoo))) + (home-page "https://cran.r-project.org/web/packages/acc/") + (synopsis "Exploring accelerometer data") + (description + "This package processes accelerometer data from uni-axial and tri-axial devices +and generates data summaries. Also, includes functions to plot, analyze, and +simulate accelerometer data.") + (license license:gpl2+))) -- cgit v1.2.3 From 08cbd4f3b9ce0bc6aa052b22795a3a9b9f09b04c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 1 Oct 2018 22:58:19 +0200 Subject: gnu: recode: Update to 3.7.1. * gnu/packages/textutils.scm (recode): Update to 3.7.1. --- gnu/packages/textutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index ce34423713..7e26bdcf63 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -84,7 +84,7 @@ to DOS format and vice versa.") (define-public recode (package (name "recode") - (version "3.7") + (version "3.7.1") (source (origin (method url-fetch) @@ -92,7 +92,7 @@ to DOS format and vice versa.") "download/v" version "/" name "-" version ".tar.gz")) (sha256 (base32 - "0r4yhf7i7zp2nl2apyzz7r3i2in12n385hmr8zcfr18ly0ly530q")) + "0215hfj0rhlh0grg91qfx75pp6z09bpv8211qdxqihniw7y9a4fs")) (modules '((guix build utils))) (snippet '(begin (delete-file "tests/Recode.c") -- cgit v1.2.3 From 538b71a967ed056e39318839f5c36ff201bd9320 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 1 Oct 2018 22:12:45 +0200 Subject: gnu: perl-socket6: Update to 0.29. * gnu/packages/networking.scm (perl-socket6): Update to 0.29. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 0d6de040e5..e3486ffadc 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -927,7 +927,7 @@ private (reserved).") (define-public perl-socket6 (package (name "perl-socket6") - (version "0.28") + (version "0.29") (source (origin (method url-fetch) @@ -937,7 +937,7 @@ private (reserved).") ".tar.gz")) (sha256 (base32 - "11j5jzqbzmwlws9zals43ry2f1nw9qy6im7yhn9ck5rikywrmm5z")))) + "054izici8klfxs8hr5rljib28plijpsfymy99xbzdp047bx1b2a6")))) (build-system perl-build-system) (arguments `(#:phases -- cgit v1.2.3 From 6c6c03fa00db33703002fa8845716f50f649d201 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 1 Oct 2018 22:08:46 +0200 Subject: gnu: re2c: Update to 1.1.1. * gnu/packages/re2c.scm (re2c): Update to 1.1.1. --- gnu/packages/re2c.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/re2c.scm b/gnu/packages/re2c.scm index 2a35aa0cdb..e9668cba26 100644 --- a/gnu/packages/re2c.scm +++ b/gnu/packages/re2c.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Sergei Trofimovich +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,7 +26,7 @@ (define-public re2c (package (name "re2c") - (version "1.0.3") + (version "1.1.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/skvadrik/" name @@ -33,7 +34,7 @@ name "-" version ".tar.gz")) (sha256 (base32 - "0lnbj15hhgi3r40ipskmg178m18d8n5nph78sci6lprk7zgf0mng")))) + "1ksifjn18v6nra935dpqllmvkqgcdsggfjgmj77282x0gqrrfrc5")))) (build-system gnu-build-system) (home-page "http://re2c.org/") (synopsis "Lexer generator for C/C++") -- cgit v1.2.3 From f8e710684e5c3f866413dff825ba17bdffceac5d Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 13 Jul 2018 20:39:46 +0100 Subject: services: Add Gitolite. * gnu/services/version-control.scm (, ): New record types. (gitolite-accounts, gitolite-activation): New procedures. (gitolite-service-type): New variables. * gnu/tests/version-control.scm (%gitolite-test-admin-keypair, %gitolite-os, %test-gitolite): New variables. (run-gitolite-test): New procedure. * doc/guix.texi (Version Control): Document the gitolite service. --- gnu/services/version-control.scm | 180 ++++++++++++++++++++++++++++++++++++++- gnu/tests/version-control.scm | 114 ++++++++++++++++++++++++- 2 files changed, 292 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index 58274c8bee..13669925ab 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016 Sou Bunnbu ;;; Copyright © 2017 Oleg Pykhalov ;;; Copyright © 2017 Clément Lassieur +;;; Copyright © 2018 Christopher Baines ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,6 +33,7 @@ #:use-module (guix store) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) + #:use-module (ice-9 format) #:use-module (ice-9 match) #:export (git-daemon-service git-daemon-service-type @@ -40,7 +42,23 @@ git-http-configuration git-http-configuration? - git-http-nginx-location-configuration)) + git-http-nginx-location-configuration + + + gitolite-configuration + gitolite-configuration-package + gitolite-configuration-user + gitolite-configuration-rc-file + gitolite-configuration-admin-pubkey + + + gitolite-rc-file + gitolite-rc-file-umask + gitolite-rc-file-git-config-keys + gitolite-rc-file-roles + gitolite-rc-file-enable + + gitolite-service-type)) ;;; Commentary: ;;; @@ -197,3 +215,163 @@ access to exported repositories under @file{/srv/git}." "") (list "fastcgi_param GIT_PROJECT_ROOT " git-root ";") "fastcgi_param PATH_INFO $1;")))))) + + +;;; +;;; Gitolite +;;; + +(define-record-type* + gitolite-rc-file make-gitolite-rc-file + gitolite-rc-file? + (umask gitolite-rc-file-umask + (default #o0077)) + (git-config-keys gitolite-rc-file-git-config-keys + (default "")) + (roles gitolite-rc-file-roles + (default '(("READERS" . 1) + ("WRITERS" . 1)))) + (enable gitolite-rc-file-enable + (default '("help" + "desc" + "info" + "perms" + "writable" + "ssh-authkeys" + "git-config" + "daemon" + "gitweb")))) + +(define-gexp-compiler (gitolite-rc-file-compiler + (file ) system target) + (match file + (($ umask git-config-keys roles enable) + (apply text-file* "gitolite.rc" + `("%RC = (\n" + " UMASK => " ,(format #f "~4,'0o" umask) ",\n" + " GIT_CONFIG_KEYS => '" ,git-config-keys "',\n" + " ROLES => {\n" + ,@(map (match-lambda + ((role . value) + (simple-format #f " ~A => ~A,\n" role value))) + roles) + " },\n" + "\n" + " ENABLE => [\n" + ,@(map (lambda (value) + (simple-format #f " '~A',\n" value)) + enable) + " ],\n" + ");\n" + "\n" + "1;\n"))))) + +(define-record-type* + gitolite-configuration make-gitolite-configuration + gitolite-configuration? + (package gitolite-configuration-package + (default gitolite)) + (user gitolite-configuration-user + (default "git")) + (group gitolite-configuration-group + (default "git")) + (home-directory gitolite-configuration-home-directory + (default "/var/lib/gitolite")) + (rc-file gitolite-configuration-rc-file + (default (gitolite-rc-file))) + (admin-pubkey gitolite-configuration-admin-pubkey)) + +(define gitolite-accounts + (match-lambda + (($ package user group home-directory + rc-file admin-pubkey) + ;; User group and account to run Gitolite. + (list (user-group (name user) (system? #t)) + (user-account + (name user) + (group group) + (system? #t) + (comment "Gitolite user") + (home-directory home-directory)))))) + +(define gitolite-activation + (match-lambda + (($ package user group home + rc-file admin-pubkey) + #~(begin + (use-modules (ice-9 match) + (guix build utils)) + + (let* ((user-info (getpwnam #$user)) + (admin-pubkey #$admin-pubkey) + (pubkey-file (string-append + #$home "/" + (basename + (strip-store-file-name admin-pubkey))))) + + (simple-format #t "guix: gitolite: installing ~A\n" #$rc-file) + (copy-file #$rc-file #$(string-append home "/.gitolite.rc")) + + ;; The key must be writable, so copy it from the store + (copy-file admin-pubkey pubkey-file) + + (chmod pubkey-file #o500) + (chown pubkey-file + (passwd:uid user-info) + (passwd:gid user-info)) + + ;; Set the git configuration, to avoid gitolite trying to use + ;; the hostname command, as the network might not be up yet + (with-output-to-file #$(string-append home "/.gitconfig") + (lambda () + (display "[user] + name = GNU Guix + email = guix@localhost +"))) + ;; Run Gitolite setup, as this updates the hooks and include the + ;; admin pubkey if specified. The admin pubkey is required for + ;; initial setup, and will replace the previous key if run after + ;; initial setup + (match (primitive-fork) + (0 + ;; Exit with a non-zero status code if an exception is thrown. + (dynamic-wind + (const #t) + (lambda () + (setenv "HOME" (passwd:dir user-info)) + (setenv "USER" #$user) + (setgid (passwd:gid user-info)) + (setuid (passwd:uid user-info)) + (primitive-exit + (system* #$(file-append package "/bin/gitolite") + "setup" + "-m" "gitolite setup by GNU Guix" + "-pk" pubkey-file))) + (lambda () + (primitive-exit 1)))) + (pid (waitpid pid))) + + (when (file-exists? pubkey-file) + (delete-file pubkey-file))))))) + +(define gitolite-service-type + (service-type + (name 'gitolite) + (extensions + (list (service-extension activation-service-type + gitolite-activation) + (service-extension account-service-type + gitolite-accounts) + (service-extension profile-service-type + ;; The Gitolite package in Guix uses + ;; gitolite-shell in the authorized_keys file, so + ;; gitolite-shell needs to be on the PATH for + ;; gitolite to work. + (lambda (config) + (list + (gitolite-configuration-package config)))))) + (description + "Setup @command{gitolite}, a Git hosting tool providing access over SSH.. +By default, the @code{git} user is used, but this is configurable. +Additionally, Gitolite can integrate with with tools like gitweb or cgit to +provide a web interface to view selected repositories."))) diff --git a/gnu/tests/version-control.scm b/gnu/tests/version-control.scm index 3b935a1b48..4409b8a12b 100644 --- a/gnu/tests/version-control.scm +++ b/gnu/tests/version-control.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2017, 2018 Oleg Pykhalov ;;; Copyright © 2017, 2018 Ludovic Courtès ;;; Copyright © 2017, 2018 Clément Lassieur +;;; Copyright © 2018 Christopher Baines ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,14 +28,17 @@ #:use-module (gnu services) #:use-module (gnu services version-control) #:use-module (gnu services cgit) + #:use-module (gnu services ssh) #:use-module (gnu services web) #:use-module (gnu services networking) #:use-module (gnu packages version-control) + #:use-module (gnu packages ssh) #:use-module (guix gexp) #:use-module (guix store) #:use-module (guix modules) #:export (%test-cgit - %test-git-http)) + %test-git-http + %test-gitolite)) (define README-contents "Hello! This is what goes inside the 'README' file.") @@ -300,3 +304,111 @@ HTTP-PORT." (name "git-http") (description "Connect to a running Git HTTP server.") (value (run-git-http-test)))) + + +;;; +;;; Gitolite. +;;; + +(define %gitolite-test-admin-keypair + (computed-file + "gitolite-test-admin-keypair" + (with-imported-modules (source-module-closure + '((guix build utils))) + #~(begin + (use-modules (ice-9 match) (srfi srfi-26) + (guix build utils)) + + (mkdir #$output) + (invoke #$(file-append openssh "/bin/ssh-keygen") + "-f" (string-append #$output "/test-admin") + "-t" "rsa" + "-q" + "-N" ""))))) + +(define %gitolite-os + (simple-operating-system + (dhcp-client-service) + (service openssh-service-type) + (service gitolite-service-type + (gitolite-configuration + (admin-pubkey + (file-append %gitolite-test-admin-keypair "/test-admin.pub")))))) + +(define (run-gitolite-test) + (define os + (marionette-operating-system + %gitolite-os + #:imported-modules '((gnu services herd) + (guix combinators)))) + + (define vm + (virtual-machine + (operating-system os) + (port-forwardings `((2222 . 22))))) + + (define test + (with-imported-modules '((gnu build marionette) + (guix build utils)) + #~(begin + (use-modules (srfi srfi-64) + (rnrs io ports) + (gnu build marionette) + (guix build utils)) + + (define marionette + (make-marionette (list #$vm))) + + (mkdir #$output) + (chdir #$output) + + (test-begin "gitolite") + + ;; Wait for sshd to be up and running. + (test-assert "service running" + (marionette-eval + '(begin + (use-modules (gnu services herd)) + (start-service 'ssh-daemon)) + marionette)) + + (display #$%gitolite-test-admin-keypair) + + (setenv "GIT_SSH_VARIANT" "ssh") + (setenv "GIT_SSH_COMMAND" + (string-join + '(#$(file-append openssh "/bin/ssh") + "-i" #$(file-append %gitolite-test-admin-keypair + "/test-admin") + "-o" "UserKnownHostsFile=/dev/null" + "-o" "StrictHostKeyChecking=no"))) + + (test-assert "cloning the admin repository" + (invoke #$(file-append git "/bin/git") + "clone" "-v" + "ssh://git@localhost:2222/gitolite-admin" + "/tmp/clone")) + + (test-assert "admin key exists" + (file-exists? "/tmp/clone/keydir/test-admin.pub")) + + (with-directory-excursion "/tmp/clone" + (invoke #$(file-append git "/bin/git") + "-c" "user.name=Guix" "-c" "user.email=guix" + "commit" + "-m" "Test commit" + "--allow-empty") + + (test-assert "pushing, and the associated hooks" + (invoke #$(file-append git "/bin/git") "push"))) + + (test-end) + (exit (= (test-runner-fail-count (test-runner-current)) 0))))) + + (gexp->derivation "gitolite" test)) + +(define %test-gitolite + (system-test + (name "gitolite") + (description "Clone the Gitolite admin repository.") + (value (run-gitolite-test)))) -- cgit v1.2.3 From 75bb6e46eac90c95e910986ad8ae32927e879052 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Lassieur?= Date: Tue, 2 Oct 2018 13:19:44 +0200 Subject: gnu: cuirass: Update to fe2b73c. * gnu/packages/ci.scm (cuirass): Update to fe2b73c. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 067a288004..1cac8b9fb4 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -186,8 +186,8 @@ their dependencies.") (license l:gpl3+)))) (define-public cuirass - (let ((commit "8d40c49170971ad7bbf8b97336934dbb3d949fc1") - (revision "19")) + (let ((commit "fe2b73c2353d106431ed0659345391f14ed64600") + (revision "20")) (package (name "cuirass") (version (string-append "0.0.1-" revision "." (string-take commit 7))) @@ -199,7 +199,7 @@ their dependencies.") (file-name (string-append name "-" version)) (sha256 (base32 - "0xxcapf9ag3zx6131v128vhin5m2j3w2gjbjbpdwr0qkaysh0gvf")))) + "00ldbig2p14qpwrl2i2hnhb9idgbbf0kqnlh4n79rmz96blm7463")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From 1df4abc7dcf03f0655fc2fa26de7a6c91bac8b4e Mon Sep 17 00:00:00 2001 From: Timo Eisenmann Date: Mon, 1 Oct 2018 18:10:35 +0200 Subject: gnu: enlightenment: Fix keyboard switching MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/enlightenment.scm (enlightenment)[inputs]: Add 'setxkbmap' [arguments]: Set absolute file name to 'setxkbmap' Signed-off-by: Ludovic Courtès --- gnu/packages/enlightenment.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index c7812e8874..c0335016f8 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -269,6 +269,7 @@ Libraries with some extra bells and whistles.") (add-before 'configure 'set-system-actions (lambda* (#:key inputs #:allow-other-keys) (let ((xkeyboard (assoc-ref inputs "xkeyboard-config")) + (setxkbmap (assoc-ref inputs "setxkbmap")) (utils (assoc-ref inputs "util-linux")) (libc (assoc-ref inputs "libc"))) ;; We need to patch the path to 'base.lst' to be able @@ -278,6 +279,9 @@ Libraries with some extra bells and whistles.") (("/usr/share/X11/xkb/rules/xorg.lst") (string-append xkeyboard "/share/X11/xkb/rules/base.lst"))) + (substitute* "src/bin/e_xkb.c" + (("\"setxkbmap \"") + (string-append "\"" setxkbmap "/bin/setxkbmap \""))) (substitute* (list "src/bin/e_intl.c" "src/modules/conf_intl/e_int_config_intl.c" "src/modules/wizard/page_010.c") @@ -305,6 +309,7 @@ Libraries with some extra bells and whistles.") ("libxcb" ,libxcb) ("libxext" ,libxext) ("linux-pam" ,linux-pam) + ("setxkbmap" ,setxkbmap) ("xcb-util-keysyms" ,xcb-util-keysyms) ("xkeyboard-config" ,xkeyboard-config))) (home-page "https://www.enlightenment.org/about-enlightenment") -- cgit v1.2.3 From b0f43001195c69f730b49b0bf9de516edd53baed Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 30 Sep 2018 12:59:01 -0400 Subject: gnu: Audacity: Use glib-or-gtk-build-system instead of a wrapper. * gnu/packages/audio.scm (audacity)[build-system]: Use glib-or-gtk-build-system. [arguments]: Remove the 'wrap-program' phase. Set #:out-of-source #f. --- gnu/packages/audio.scm | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 4465872732..8f100ce7a3 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -321,7 +321,7 @@ engineers, musicians, soundtrack editors and composers.") ;; "sbsms" )) #t)))) - (build-system gnu-build-system) + (build-system glib-or-gtk-build-system) (inputs `(("wxwidgets" ,wxwidgets) ("gtk+" ,gtk+) @@ -410,16 +410,12 @@ engineers, musicians, soundtrack editors and composers.") (("../lib-src/portmidi/porttime/porttime.h") "porttime.h")) (substitute* "src/prefs/MidiIOPrefs.cpp" (("../../lib-src/portmidi/pm_common/portmidi.h") "portmidi.h")) - #t)) - (add-after 'install 'wrap-program - (lambda* (#:key inputs outputs #:allow-other-keys) - (wrap-program (string-append (assoc-ref outputs "out") - "/bin/audacity") - ;; For GtkFileChooserDialog. - `("GSETTINGS_SCHEMA_DIR" = - (,(string-append (assoc-ref inputs "gtk+") - "/share/glib-2.0/schemas")))) #t))) + ;; The translation Makefile generation is performed improperly for + ;; out-of-tree builds. + ;; XXX This can be removed if the glib-or-gkt-build-system + ;; switches to #:out-of-source? #t. See . + #:out-of-source? #f ;; The test suite is not "well exercised" according to the developers, ;; and fails with various errors. See ;; . -- cgit v1.2.3 From 994bccd9443032141accede0e403cbfb62f6c63e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 28 Sep 2018 23:30:55 -0400 Subject: gnu: LibreOffice: Fix "File > Open" crash on foreign distros. Fixes . * gnu/packages/libreoffice.scm (libreoffice)[build-system]: Use glib-or-gtk-build-system. [arguments]: Set '#:out-of-source #f'. --- gnu/packages/libreoffice.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 68b4e265f3..881cf2008d 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -28,6 +28,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages libreoffice) + #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (guix download) @@ -939,7 +940,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") "149ziasibplihfxlzafzcm4737ns30hg9175967b43c81yv5f335")) (patches (search-patches "libreoffice-icu.patch" "libreoffice-glm.patch")))) - (build-system gnu-build-system) + (build-system glib-or-gtk-build-system) (native-inputs `(("bison" ,bison) ("cppunit" ,cppunit-1.14) @@ -1017,6 +1018,9 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") (arguments `(#:tests? #f ; Building the tests already fails. #:make-flags '("build-nocheck") ; Do not build unit tests, which fails. + ;; XXX Remove this if glib-or-gtk-build-system changes to in-source-tree + ;; builds by default. + #:out-of-source? #f #:phases (modify-phases %standard-phases (add-before 'configure 'prepare-src -- cgit v1.2.3 From 712d01bbe9de285bb3007511c94957b13b74118e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 29 Sep 2018 17:19:26 -0400 Subject: gnu: Add gopkg.in/asn1-ber.v1. * gnu/packages/syncthing.scm (go-gopkg.in-asn1-ber.v1): New variable. --- gnu/packages/syncthing.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 29caaaf02e..61b45e111f 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -1366,3 +1366,25 @@ Prometheus HTTP API.") (description "This is a union of Go Prometheus libraries") (home-page (package-home-page go-github-com-client-golang-prometheus)) (license (package-license go-github-com-client-golang-prometheus)))) + +(define-public go-gopkg.in-asn1-ber.v1 + (package + (name "go-gopkg.in-asn1-ber.v1") + (version "1.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gopkg.in/asn1-ber.v1") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1y8bvzbxpw0lfnn7pbcdwzqj4l90qj6xf88dvv9pxd9yl5g6cskx")))) + (build-system go-build-system) + (arguments + '(#:import-path "gopkg.in/asn1-ber.v1")) + (synopsis "ASN.1 BER encoding and decoding in Go") + (description "This package provides ASN.1 BER encoding and decoding in the +Go language.") + (home-page "https://gopkg.in/asn1-ber.v1") + (license expat))) -- cgit v1.2.3 From 4cb2112d8f4aac799c756241bf27aaa99ff5a714 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 29 Sep 2018 17:19:58 -0400 Subject: gnu: Add gopkg.in/ldap.v2. * gnu/packages/syncthing.scm (go-gopkg.in-ldap.v2): New variable. --- gnu/packages/syncthing.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 61b45e111f..cfcfb74aae 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -1388,3 +1388,28 @@ Prometheus HTTP API.") Go language.") (home-page "https://gopkg.in/asn1-ber.v1") (license expat))) + +(define-public go-gopkg.in-ldap.v2 + (package + (name "go-gopkg.in-ldap.v2") + (version "2.5.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gopkg.in/ldap.v2") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1wf81wy04nhkqs0dg5zkivr4sh37r83bxrfwjz9vr4jq6vmljr3h")))) + (build-system go-build-system) + (arguments + '(#:import-path "gopkg.in/ldap.v2" + #:tests? #f)) ; the test suite requires network access + (propagated-inputs + `(("go-gopkg.in-asn1-ber.v1" ,go-gopkg.in-asn1-ber.v1))) + (synopsis "LDAP v3 functionality for Go") + (description "This package provides basic LDAP v3 functionality in the Go +language.") + (home-page "https://gopkg.in/ldap.v2") + (license expat))) -- cgit v1.2.3 From 5149857651299be32ee8dedd813b184ff1964099 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 29 Sep 2018 17:20:31 -0400 Subject: gnu: go-github-com-thejerf-suture: Update to 3.0.0-0.bf6ee6a. * gnu/packages/syncthing.scm (go-github-com-thejerf-suture): Update to 3.0.0-0.bf6ee6a. --- gnu/packages/syncthing.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index cfcfb74aae..bd7ff74b43 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -678,11 +678,11 @@ database in Go.") (license bsd-2)))) (define-public go-github-com-thejerf-suture - (let ((commit "3f1fb62fe0a3cc6429122d7dc45588a8b59c5bb6") + (let ((commit "bf6ee6a0b047ebbe9ae07d847f750dd18c6a9276") (revision "0")) (package (name "go-github-com-thejerf-suture") - (version (git-version "2.0.3" revision commit)) + (version (git-version "3.0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -691,7 +691,7 @@ database in Go.") (file-name (git-file-name name version)) (sha256 (base32 - "0mp7gz6bp6xhggkgmbl33vpmrq3a6n2dkgcxbkb7csnpv4r4d59k")))) + "0rzx9k408vaglwnnpgpcs6y7ff7p65915nbg33rvbaz13hxwkz3y")))) (build-system go-build-system) (arguments `(#:import-path "github.com/thejerf/suture")) -- cgit v1.2.3 From 7d15490cd247c35aeac170e2cf002d1fd93b775a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 29 Sep 2018 17:21:20 -0400 Subject: gnu: Syncthing: Update to 0.14.51. * gnu/packages/syncthing.scm (syncthing): Update to 0.14.51. [arguments]: Adjust the 'increase-test-timeout' phase. [inputs]: Add go-gopkg.in-ldap.v2. --- gnu/packages/syncthing.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index bd7ff74b43..2e936eef7d 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -30,7 +30,7 @@ (define-public syncthing (package (name "syncthing") - (version "0.14.50") + (version "0.14.51") (source (origin (method url-fetch) (uri (string-append "https://github.com/syncthing/syncthing" @@ -38,7 +38,7 @@ "/syncthing-source-v" version ".tar.gz")) (sha256 (base32 - "0yjj6zzivzw289bhwqjb4xcv8p39n5mcwwr5w6xf5ykzljc5pk55")) + "17phn8l2afhgzh0q9ambi28awj2m905sr1bicq2wc7ghypk5vgqh")) (modules '((guix build utils))) ;; Delete bundled ("vendored") free software source code. (snippet '(begin @@ -59,7 +59,7 @@ (add-before 'build 'increase-test-timeout (lambda _ (substitute* "src/github.com/syncthing/syncthing/build.go" - (("60s") "999s")) + (("120s") "999s")) #t)) (replace 'build @@ -138,6 +138,7 @@ ("go-github-com-pkg-errors" ,go-github-com-pkg-errors) ("go-github-com-rcrowley-go-metrics" ,go-github-com-rcrowley-go-metrics) ("go-github-com-sasha-s-go-deadlock" ,go-github-com-sasha-s-go-deadlock) + ("go-github-com-syncthing-notify" ,go-github-com-syncthing-notify) ("go-github-com-syndtr-goleveldb" ,go-github-com-syndtr-goleveldb) ("go-github-com-thejerf-suture" ,go-github-com-thejerf-suture) ("go-github-com-vitrun-qart" ,(go-github-com-vitrun-qart-union)) @@ -145,7 +146,7 @@ ("go-golang-org-x-net-union" ,(go-golang-org-x-net-union)) ("go-golang-org-x-text" ,(go-golang-org-x-text-union)) ("go-golang-org-x-time-rate" ,go-golang-org-x-time-rate) - ("go-github-com-syncthing-notify" ,go-github-com-syncthing-notify) + ("go-gopkg.in-ldap.v2" ,go-gopkg.in-ldap.v2) ;; For tests ("go-github-com-d4l3k-messagediff" ,go-github-com-d4l3k-messagediff))) (synopsis "Decentralized continuous file system synchronization") -- cgit v1.2.3 From f6890c08912c7b2a2b7f6c1cdeda412ff73e0b1d Mon Sep 17 00:00:00 2001 From: pimi Date: Tue, 11 Sep 2018 15:18:25 +0200 Subject: gnu: Add r-rbenchmark. gnu/packages/cran.scm (r-rbenchmark): New variable. Signed-off-by: Leo Famulari --- gnu/packages/cran.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 186a52a1f1..76c9c734f2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6057,3 +6057,28 @@ on user-defined cut-points of accelerometer counts. and generates data summaries. Also, includes functions to plot, analyze, and simulate accelerometer data.") (license license:gpl2+))) + +(define-public r-rbenchmark + (package + (name "r-rbenchmark") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "rbenchmark" version)) + (sha256 + (base32 "010fn3qwnk2k411cbqyvra1d12c3bhhl3spzm8kxffmirj4p2al9")))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/web/packages/rbenchmark/") + (synopsis "Benchmarking routine for R") + (description + "This @code{r-rbenchmark} package is inspired by the Perl module Benchmark, +and is intended to facilitate benchmarking of arbitrary R code. The library +consists of just one function, benchmark, which is a simple wrapper around +system.time. Given a specification of the benchmarking process (counts of +replications, evaluation environment) and an arbitrary number of expressions, +benchmark evaluates each of the expressions in the specified environment, +replicating the evaluation as many times as specified, and returning the results +conveniently wrapped into a data frame.") + (license license:gpl2+))) + -- cgit v1.2.3 From 7af2dd38268e8d043352a6f5845cce1ee8f2fe4f Mon Sep 17 00:00:00 2001 From: pimi Date: Tue, 11 Sep 2018 15:18:26 +0200 Subject: gnu: Add r-dvmisc. gnu/packages/cran.scm (r-dvmisc): New variable. Signed-off-by: Leo Famulari --- gnu/packages/cran.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 76c9c734f2..2db310b636 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6082,3 +6082,28 @@ replicating the evaluation as many times as specified, and returning the results conveniently wrapped into a data frame.") (license license:gpl2+))) +(define-public r-dvmisc + (package + (name "r-dvmisc") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "dvmisc" version)) + (sha256 + (base32 "1dy0yykskwhkql19bhzmbwsgv028afc8jh9yqwbczj6f3vpv31zh")))) + (build-system r-build-system) + (propagated-inputs + `(("r-mass" ,r-mass) + ("r-rbenchmark" ,r-rbenchmark) + ("r-rcpp" ,r-rcpp))) + (home-page "https://cran.r-project.org/web/packages/dvmisc/") + (synopsis "Faster computation of common statistics and miscellaneous functions") + (description + "This package implements faster versions of base R functions (e.g. mean, standard +deviation, covariance, weighted mean), mostly written in C++, along with +miscellaneous functions for various purposes (e.g. create the histogram with +fitted probability density function or probability mass function curve, create +the body mass index groups, assess the linearity assumption in logistic +regression).") + (license license:gpl2))) -- cgit v1.2.3 From d8d8844ec12c017480e83cd541e98b55e18a17f4 Mon Sep 17 00:00:00 2001 From: pimi Date: Tue, 11 Sep 2018 15:18:27 +0200 Subject: gnu: Add r-accelerometry. gnu/packages/cran.scm (r-accelerometry): New variable. Signed-off-by: Leo Famulari --- gnu/packages/cran.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2db310b636..b567fdc0ce 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6107,3 +6107,27 @@ fitted probability density function or probability mass function curve, create the body mass index groups, assess the linearity assumption in logistic regression).") (license license:gpl2))) + +(define-public r-accelerometry + (package + (name "r-accelerometry") + (version "3.1.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "accelerometry" version)) + (sha256 + (base32 "13xzrwhr4i1nj9c8vrmfdg2rmrc8n446iihcyxmy99sm99hpzyip")))) + (build-system r-build-system) + (propagated-inputs + `(("r-dvmisc" ,r-dvmisc) + ("r-rcpp" ,r-rcpp))) + (home-page "https://cran.r-project.org/web/packages/accelerometry/") + (synopsis "Functions for processing accelerometer data") + (description + "This package provides a collection of functions that perform operations on +time-series accelerometer data, such as identify the non-wear time, flag minutes +that are part of an activity bout, and find the maximum 10-minute average count +value. The functions are generally very flexible, allowing for a variety of +algorithms to be implemented.") + (license license:gpl3))) -- cgit v1.2.3 From 3f0f49d70877df6c829b443830de99e0e1e1f6bc Mon Sep 17 00:00:00 2001 From: pimi Date: Tue, 2 Oct 2018 16:03:59 -0400 Subject: gnu: Add poretools. * gnu/packages/bioinformatics.scm (poretools): New variable. --- gnu/packages/bioinformatics.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b84498d042..172832d148 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13899,3 +13899,42 @@ adapters, even at low sequence identity. Porechop also supports demultiplexing of Nanopore reads that were barcoded with the Native Barcoding Kit, PCR Barcoding Kit or Rapid Barcoding Kit.") (license license:gpl3+)))) + +(define-public poretools + ;; The latest release was in 2016 and the latest commit is from 2017 + ;; the recommended way to install is to clone the git repository + ;; https://poretools.readthedocs.io/en/latest/content/installation.html + (let ((commit "e426b1f09e86ac259a00c261c79df91510777407") + (revision "1")) + (package + (name "poretools") + (version (git-version "0.6.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/arq5x/poretools.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0bglj833wxpp3cq430p1d3xp085ls221js2y90w7ir2x5ay8l7am")))) + (build-system python-build-system) + ;; requires python >=2.7, <3.0, and the same for python dependencies + (arguments `(#:python ,python-2)) + (inputs + `(("hdf5" ,hdf5))) + (propagated-inputs + `(("python-dateutil" ,python2-dateutil) + ("python-h5py" ,python2-h5py) + ("python-matplotlib" ,python2-matplotlib) + ("python-pandas" ,python2-pandas) + ("python-seaborn" ,python2-seaborn))) + (home-page "https://poretools.readthedocs.io") + (synopsis "Toolkit for working with nanopore sequencing data") + (description + "The MinION from Oxford Nanopore Technologies is a nanopore sequencer. +This @code{poretools} package is a flexible toolkit for exploring datasets +generated by nanopore sequencing devices for the purposes of quality control and +downstream analysis. Poretools operates directly on the native FAST5, a variant +of the Hierarchical Data Format (HDF5) standard.") + (license license:expat)))) -- cgit v1.2.3 From 1ddb2b5c1ca1e18924cbb969c974a0e8d8e54010 Mon Sep 17 00:00:00 2001 From: pimi Date: Tue, 2 Oct 2018 16:16:45 -0400 Subject: gnu: Add r-absim. * gnu/packages/cran.scm (r-absim): New variable. --- gnu/packages/cran.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b567fdc0ce..4da1664c67 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6131,3 +6131,31 @@ that are part of an activity bout, and find the maximum 10-minute average count value. The functions are generally very flexible, allowing for a variety of algorithms to be implemented.") (license license:gpl3))) + +(define-public r-absim + (package + (name "r-absim") + (version "0.2.6") + (source + (origin + (method url-fetch) + (uri (cran-uri "AbSim" version)) + (sha256 + (base32 "16ddjk8b6xw80ch4jis1y751i9561wdxh0gifbf15qiz3vjckq8m")))) + (properties `((upstream-name . "AbSim"))) + (build-system r-build-system) + (propagated-inputs + `(("r-ape" ,r-ape) + ("r-powerlaw" ,r-powerlaw))) + (home-page "https://cran.r-project.org/web/packages/AbSim/") + (synopsis "Time resolved simulations of antibody repertoires") + (description + "This package provides simulation methods for the evolution of antibody repertoires. + The heavy and light chain variable region of both human and C57BL/6 mice can +be simulated in a time-dependent fashion. Both single lineages using one set of +V-, D-, and J-genes or full repertoires can be simulated. The algorithm begins +with an initial V-D-J recombination event, starting the first phylogenetic tree. + Upon completion, the main loop of the algorithm begins, with each iteration +representing one simulated time step. Various mutation events are possible at +each time step, contributing to a diverse final repertoire.") + (license license:gpl2))) -- cgit v1.2.3 From 0f1622220a39a620854b0a268793e262746d460a Mon Sep 17 00:00:00 2001 From: pimi Date: Tue, 2 Oct 2018 16:23:12 -0400 Subject: gnu: Add r-absfiltergsea. * gnu/packages/bioinformatics.scm (r-absfiltergsea): New variable. --- gnu/packages/bioinformatics.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 172832d148..b657bf6771 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13938,3 +13938,30 @@ generated by nanopore sequencing devices for the purposes of quality control and downstream analysis. Poretools operates directly on the native FAST5, a variant of the Hierarchical Data Format (HDF5) standard.") (license license:expat)))) + +(define-public r-absfiltergsea + (package + (name "r-absfiltergsea") + (version "1.5.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "AbsFilterGSEA" version)) + (sha256 + (base32 "15srxkxsvn38kd5frdrwfdf0ad8gskrd0h01wmdf9hglq8fjrp7w")))) + (properties `((upstream-name . "AbsFilterGSEA"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biobase" ,r-biobase) + ("r-deseq" ,r-deseq) + ("r-limma" ,r-limma) + ("r-rcpp" ,r-rcpp) + ("r-rcpparmadillo" ,r-rcpparmadillo))) + (home-page "https://cran.r-project.org/web/packages/AbsFilterGSEA/") + (synopsis "Improved false positive control of gene-permuting with absolute filtering") + (description + "This package provides a function that performs gene-permuting of a gene-set +enrichment analysis (GSEA) calculation with or without the absolute filtering. + Without filtering, users can perform (original) two-tailed or one-tailed +absolute GSEA.") + (license license:gpl2))) -- cgit v1.2.3 From c2ffc4fb53a23c4db975a52f85686ed4b194cfcf Mon Sep 17 00:00:00 2001 From: pimi Date: Tue, 2 Oct 2018 16:26:10 -0400 Subject: gnu: Add r-ac3net. * gnu/packages/cran.scm (r-ac3net): New variable. --- gnu/packages/cran.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4da1664c67..2486a48673 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6159,3 +6159,24 @@ with an initial V-D-J recombination event, starting the first phylogenetic tree. representing one simulated time step. Various mutation events are possible at each time step, contributing to a diverse final repertoire.") (license license:gpl2))) + +(define-public r-ac3net + (package + (name "r-ac3net") + (version "1.2.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "Ac3net" version)) + (sha256 + (base32 "1ns4n0xxz6p34c11bj0k7nzgmyqr9mis2b0g5nfz37dbikndyqyz")))) + (properties `((upstream-name . "Ac3net"))) + (build-system r-build-system) + (propagated-inputs + `(("r-data-table" ,r-data-table))) + (home-page "https://cran.r-project.org/web/packages/Ac3net/") + (synopsis "Inferring directional conservative causal core gene networks") + (description "This package infers directional Conservative causal core +(gene) networks (C3NET). This is a version of the algorithm C3NET with +directional network.") + (license license:gpl3+))) -- cgit v1.2.3 From da33385959502a3f897a2a6a1bf92dc5f02b3b9a Mon Sep 17 00:00:00 2001 From: pimi Date: Tue, 2 Oct 2018 16:27:12 -0400 Subject: gnu: Add r-aca. * gnu/packages/cran.scm (r-aca): New variable. --- gnu/packages/cran.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2486a48673..26b3b0377b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6180,3 +6180,23 @@ each time step, contributing to a diverse final repertoire.") (gene) networks (C3NET). This is a version of the algorithm C3NET with directional network.") (license license:gpl3+))) + +(define-public r-aca + (package + (name "r-aca") + (version "1.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "ACA" version)) + (sha256 + (base32 "1i3hm27nvnkvc39xlh0d1blq8q0q02czmvgi3cazmjx3jvxay0vq")))) + (properties `((upstream-name . "ACA"))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/web/packages/ACA/") + (synopsis "Abrupt change-point or aberration detection in point series") + (description + "This package offers an interactive function for the detection of breakpoints in +series.") + ;; Any version of the GPL + (license (list license:gpl2+ license:gpl3+)))) -- cgit v1.2.3 From 9c1c2108a5523015fd83e599b263dfb1ad348324 Mon Sep 17 00:00:00 2001 From: pimi Date: Tue, 2 Oct 2018 16:28:42 -0400 Subject: gnu: Add r-acceptancesampling. * gnu/packages/cran.scm (r-acceptancesampling): New variable. --- gnu/packages/cran.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 26b3b0377b..52b3d52bac 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6200,3 +6200,31 @@ directional network.") series.") ;; Any version of the GPL (license (list license:gpl2+ license:gpl3+)))) + +(define-public r-acceptancesampling + (package + (name "r-acceptancesampling") + (version "1.0-5") + (source + (origin + (method url-fetch) + (uri (cran-uri "AcceptanceSampling" version)) + (sha256 + (base32 "18krmmyn8pn11aqd81kbvka68lnd36mnpdh7p3pz9r4m4vjj007x")))) + (properties + `((upstream-name . "AcceptanceSampling"))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/web/packages/AcceptanceSampling/") + (synopsis "Creation and evaluation of acceptance sampling plans") + (description + "This @code{r-acceptancesampling} provides functionality for creating and evaluating +acceptance sampling plans. Acceptance sampling is a methodology commonly used +in quality control and improvement. International standards of acceptance +sampling provide sampling plans for specific circumstances. The aim of this +package is to provide an easy-to-use interface to visualize single, double or +multiple sampling plans. In addition, methods have been provided to enable the +user to assess sampling plans against pre-specified levels of performance, as +measured by the probability of acceptance for a given level of quality in the +lot.") + (license license:gpl3+))) + -- cgit v1.2.3 From 63781c5748b108db5ceab02ce2d201e901ff10a4 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 2 Oct 2018 16:29:25 -0400 Subject: gnu: Add r-acclma. * gnu/packages/cran.scm (r-acclma): New variable. --- gnu/packages/cran.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 52b3d52bac..a1bf750da6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6228,3 +6228,31 @@ measured by the probability of acceptance for a given level of quality in the lot.") (license license:gpl3+))) +(define-public r-acclma + (package + (name "r-acclma") + (version "1.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "ACCLMA" version)) + (sha256 + (base32 "1na27sp18fq12gp6vxgqw1ffsz2yi1d8xvrxbrzx5g1kqxrayy0v")))) + (properties `((upstream-name . "ACCLMA"))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/web/packages/ACCLMA/") + (synopsis "ACC & LMA graph plotting") + (description + "This package contains a function that imports data from a @acronym{Comma-Separated +Values, @acronym{CSV}} file, or uses manually entered data from the format (x, +y, weight) and plots the appropriate @acronym{Absolute Concentration Curve, +@acronym{ACC}} vs @acronym{Line of Independence, @acronym{LOI}} graph and +@acronym{@acronym{LOI} Minus @acronym{ACC}, @acronym{LMA}} graph. The main +function is plotLMA (source file, header) that takes a data set and plots the +appropriate @acronym{LMA} and @acronym{ACC} graphs. If no source file (a +string) was passed, a manual data entry window is opened. The header parameter +indicates by TRUE/FALSE (false by default) if the source @acronym{CSV} file has +a header row or not. The dataset should contain only one independent variable +(x) and one dependent variable (y) and can contain a weight for each +observation.") + (license license:gpl2))) -- cgit v1.2.3 From 2bc8b2af8947502d147fb3b67a0a40a5565c3707 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 2 Oct 2018 16:18:30 +0200 Subject: gnu: guile-cairo: Update to 1.10.0. * gnu/packages/gtk.scm (guile-cairo): Update to 1.10.0. [source]: Add 'snippet'. [arguments]: Remove. --- gnu/packages/gtk.scm | 58 ++++++++++++++-------------------------------------- 1 file changed, 15 insertions(+), 43 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 76e64b36bc..8c25922c9e 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -777,54 +777,26 @@ application suites.") (define-public guile-cairo (package (name "guile-cairo") - (version "1.4.1") + (version "1.10.0") (source (origin (method url-fetch) - (uri (string-append - "http://download.gna.org/guile-cairo/guile-cairo-" - version - ".tar.gz")) + (uri (string-append "mirror://savannah/guile-cairo/guile-cairo-" + version ".tar.gz")) (sha256 (base32 - "1f5nd9n46n6cwfl1byjml02q3y2hgn7nkx98km1czgwarxl7ws3x")))) + "0p6xrhf2k6n5dybn88050za7h90gnd7534n62l53vsca187pwgdf")) + (modules '((guix build utils))) + (snippet + (begin + '(begin + ;; Install Scheme files in …/guile/site/X.Y. + (substitute* (find-files "." "^Makefile\\.in$") + (("^(.*)dir = (.*)/guile/site(.*)" _ name prefix suffix) + (string-append name "dir = " prefix + "/guile/site/@GUILE_EFFECTIVE_VERSION@" + suffix))) + #t))))) (build-system gnu-build-system) - (arguments - '(#:modules ((guix build utils) - (guix build gnu-build-system) - (ice-9 popen) - (ice-9 rdelim)) - - #:phases (modify-phases %standard-phases - (add-before 'configure 'set-module-directory - (lambda* (#:key outputs #:allow-other-keys) - ;; Install modules under $out/share/guile/site/2.0. - (let ((out (assoc-ref outputs "out")) - (effective - (read-line - (open-pipe* OPEN_READ "guile" "-c" - "(display (effective-version))")))) - (substitute* "Makefile.in" - (("scmdir = ([[:graph:]]+).*" _ value) - (string-append "scmdir = " value "/" effective "\n"))) - (substitute* "cairo/Makefile.in" - (("moduledir = ([[:graph:]]+).*" _ value) - (string-append "moduledir = " - "$(prefix)/share/guile/site/" - effective "/cairo\n'"))) - #t))) - (add-after 'install 'install-missing-file - (lambda* (#:key outputs #:allow-other-keys) - ;; By default 'vector-types.scm' is not installed, so do - ;; it here. - (let ((out (assoc-ref outputs "out")) - (effective - (read-line - (open-pipe* OPEN_READ "guile" "-c" - "(display (effective-version))")))) - (install-file "cairo/vector-types.scm" - (string-append out "/share/guile/site/" - effective "/cairo")) - #t)))))) (inputs `(("guile-lib" ,guile-lib) ("expat" ,expat) -- cgit v1.2.3 From 000b540791f082b8a8398dc2ed51fd1526d8357d Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Rouby Date: Thu, 27 Sep 2018 21:01:25 +0200 Subject: gnu: grammalecte: Update source hash. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The zip file was modified in-place by the maintainers to push fixes to the "server-side code", as discussed at . * gnu/packages/dictionaries.scm (grammalecte): Update source hash. Signed-off-by: Ludovic Courtès --- gnu/packages/dictionaries.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index 9f63223453..ce7ef1cf75 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016 Sou Bunnbu ;;; Copyright © 2017, 2018 Nicolas Goaziou ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Pierre-Antoine Rouby ;;; ;;; This file is part of GNU Guix. ;;; @@ -219,7 +220,7 @@ It comes with a German-English dictionary with approximately 270,000 entries.") "Grammalecte-fr-v" version ".zip")) (sha256 (base32 - "1flsahqw2r0cmg0bixpl5w0acricmdh2cf4lf9zr66ydgmjnmv2s")))) + "11byjs3ggdhia5f4vyfqfvbbczsfqimll98h98g7hlsrm7vrifb0")))) (build-system python-build-system) (home-page "https://www.dicollecte.org") (synopsis "French spelling and grammar checker") -- cgit v1.2.3 From 68faa20e2d4511b43062f8279cc407aee735b275 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 2 Oct 2018 13:53:13 -0500 Subject: quilt: Upgrade to 0.65. * gnu/packages/patches/quilt-test-fix-regex.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/patchutils.scm (quilt)[version]: Upgrade to 0.65. [source]: Use patch. [arguments]: Adjust 'patch-tests' phase for new tests. Re-enable "mail" test. --- gnu/local.mk | 1 + gnu/packages/patches/quilt-test-fix-regex.patch | 41 +++++++++++++++++++++++++ gnu/packages/patchutils.scm | 19 +++++++++--- 3 files changed, 56 insertions(+), 5 deletions(-) create mode 100644 gnu/packages/patches/quilt-test-fix-regex.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 244c79d221..b2fda4ac69 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1101,6 +1101,7 @@ dist_patch_DATA = \ %D%/packages/patches/qtscript-disable-tests.patch \ %D%/packages/patches/quagga-reproducible-build.patch \ %D%/packages/patches/quickswitch-fix-dmenu-check.patch \ + %D%/packages/patches/quilt-test-fix-regex.patch \ %D%/packages/patches/qtwebkit-pbutils-include.patch \ %D%/packages/patches/rapicorn-isnan.patch \ %D%/packages/patches/raptor2-heap-overflow.patch \ diff --git a/gnu/packages/patches/quilt-test-fix-regex.patch b/gnu/packages/patches/quilt-test-fix-regex.patch new file mode 100644 index 0000000000..2e249ac55b --- /dev/null +++ b/gnu/packages/patches/quilt-test-fix-regex.patch @@ -0,0 +1,41 @@ +From 5193b137b5a9034ce79946edd40760df2f63a82a Mon Sep 17 00:00:00 2001 +From: Jean Delvare +Date: Tue, 25 Apr 2017 15:17:53 +0200 +Subject: test: Escape curly braces in regex + +Curly braces in perl regex are supposed to be escaped, recent +versions of perl complain when they aren't: + +Unescaped left brace in regex is deprecated, passed through in regex; marked by <-- HERE in m/%{ <-- HERE (\w+)}/ at ./run line 114. +Unescaped left brace in regex is deprecated, passed through in regex; marked by <-- HERE in m/%{ <-- HERE \?}/ at ./run line 290. + +Signed-off-by: Jean Delvare +--- + test/run | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/test/run b/test/run +index 942014e..03afc7a 100755 +--- a/test/run ++++ b/test/run +@@ -112,7 +112,7 @@ sub flush_output() + sub substitute_vars($) + { + my ($line) = @_; +- $line =~ s[%{(\w+)}][defined $ENV{$1} ? $ENV{$1} : ""]eg; ++ $line =~ s[%\{(\w+)\}][defined $ENV{$1} ? $ENV{$1} : ""]eg; + return $line; + } + +@@ -288,7 +288,7 @@ while (defined(my $line = )) { + # Parse the next command + if ($line =~ s/^\s*\$ ?//) { + # Substitute %{?} with the last command's status +- $line =~ s[%{\?}][$last_status]eg; ++ $line =~ s[%\{\?\}][$last_status]eg; + + chomp($prog = substitute_vars($line)); + $prog_line = $lineno; +-- +cgit v1.0-41-gc330 + diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index a68e369912..0cf111ac47 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014 Eric Bavier +;;; Copyright © 2014, 2018 Eric Bavier ;;; Copyright © 2015, 2018 Leo Famulari ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; @@ -92,7 +92,7 @@ listing the files modified by a patch.") (define-public quilt (package (name "quilt") - (version "0.61") + (version "0.65") (source (origin (method url-fetch) @@ -100,7 +100,8 @@ listing the files modified by a patch.") name "-" version ".tar.gz")) (sha256 (base32 - "1hwz58djkq9cv46sjwxbp2v5m8yjr41kd0nm1zm1xm6418khmv0y")))) + "06b816m2gz9jfif7k9v2hrm7fz76zjg5pavf7hd3ifybwn4cgjzn")) + (patches (search-patches "quilt-test-fix-regex.patch")))) (build-system gnu-build-system) (inputs `(("perl" ,perl) ("less" ,less) @@ -116,8 +117,16 @@ listing the files modified by a patch.") '("test/run" "test/edit.test") (("/bin/sh") (which "sh"))) - ;; TODO: Run the mail tests once the mail feature can be supported. - (delete-file "test/mail.test") + (substitute* "test/create-delete.test" + ;; We'd rather use quilt's compat/getopt than declare a + ;; dependency on util-linux, but this test fails because of + ;; compat/getopt's handling of "---" in this test, so remove it + ;; for now. + ((" ---") "")) + (substitute* '("test/empty-files.test" "test/faildiff.test") + ;; compat/getopt seems not to handle splitting of short opts + ;; from its arguments. + (("-pab") "-p ab")) #t)) (add-after 'install 'wrap-program ;; quilt's configure checks for the absolute path to the utilities it -- cgit v1.2.3 From 24a80064ca7faf504563af33217e07372285fb2f Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 2 Oct 2018 14:01:55 -0500 Subject: quilt: Install translations. * gnu/packages/patchutils.scm (quilt)[native-inputs]: New field. --- gnu/packages/patchutils.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index 0cf111ac47..767799768c 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -31,6 +31,7 @@ #:use-module (gnu packages bash) #:use-module (gnu packages file) #:use-module (gnu packages gawk) + #:use-module (gnu packages gettext) #:use-module (gnu packages less) #:use-module (gnu packages mail) #:use-module (gnu packages ncurses) @@ -103,6 +104,8 @@ listing the files modified by a patch.") "06b816m2gz9jfif7k9v2hrm7fz76zjg5pavf7hd3ifybwn4cgjzn")) (patches (search-patches "quilt-test-fix-regex.patch")))) (build-system gnu-build-system) + (native-inputs + `(("gettext" ,gnu-gettext))) (inputs `(("perl" ,perl) ("less" ,less) ("file" ,file) -- cgit v1.2.3 From d7d1fc821091de98d66dac71ceed390d82434e40 Mon Sep 17 00:00:00 2001 From: Eric Bavier <<bavier@cray.com>> Date: Tue, 2 Oct 2018 14:50:45 -0500 Subject: quilt: Add diffstat input. * gnu/packages/patchutils.scm (quilt)[inputs]: Add diffstat. [arguments]: Add it to wrapper. --- gnu/packages/patchutils.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index 767799768c..da20ae1c3f 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -37,6 +37,7 @@ #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (gnu packages python) + #:use-module (gnu packages version-control) #:use-module (gnu packages xml)) (define-public patchutils @@ -109,7 +110,8 @@ listing the files modified by a patch.") (inputs `(("perl" ,perl) ("less" ,less) ("file" ,file) - ("ed" ,ed))) + ("ed" ,ed) + ("diffstat" ,diffstat))) (arguments '(#:parallel-tests? #f #:phases @@ -140,6 +142,7 @@ listing the files modified by a patch.") (coreutils (assoc-ref inputs "coreutils")) (diffutils (assoc-ref inputs "diffutils")) (findutils (assoc-ref inputs "findutils")) + (diffstat (assoc-ref inputs "diffstat")) (less (assoc-ref inputs "less")) (file (assoc-ref inputs "file")) (ed (assoc-ref inputs "ed")) @@ -151,7 +154,8 @@ listing the files modified by a patch.") ,(map (lambda (dir) (string-append dir "/bin")) (list coreutils diffutils findutils - less file ed sed bash grep))))) + less file ed sed bash grep + diffstat))))) #t))))) (home-page "https://savannah.nongnu.org/projects/quilt/") (synopsis "Script for managing patches to software") -- cgit v1.2.3 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: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From d1022d68c25ab95ba789e02164326af47fd18a80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Wed, 3 Oct 2018 21:32:49 +0800 Subject: gnu: guile-chickadee: Update to 0.3.0. * gnu/packages/game-development.scm (guile-chickadee): Update to 0.3.0. [arguments]: Add 'patch-godir' phase. --- gnu/packages/game-development.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 86f2877f82..6bd72879c2 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1256,17 +1256,24 @@ a 2D editor view.") (define-public guile-chickadee (package (name "guile-chickadee") - (version "0.2.0") + (version "0.3.0") (source (origin (method url-fetch) (uri (string-append "https://files.dthompson.us/chickadee/" "chickadee-" version ".tar.gz")) (sha256 (base32 - "10qx0ha5gsayybd186r1my7vc7rf5fbzp9jvmc4xg9a8wz8rqhah")))) + "0jl223dybsj5gvs7z4q60gnafj1b7kgi5mx0kj58m5knrp8qwg5h")))) (build-system gnu-build-system) (arguments - '(#:make-flags '("GUILE_AUTO_COMPILE=0"))) + '(#:make-flags '("GUILE_AUTO_COMPILE=0") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'patch-godir + (lambda _ + ;; Install compiled '.go' files into the site directory. + (substitute* "Makefile.in" + (("/ccache") "/site-ccache"))))))) (propagated-inputs `(("guile-opengl" ,guile-opengl) ("guile-sdl2" ,guile-sdl2))) -- cgit v1.2.3 From 477dde6192bc795732be8643d66c98f89458fd68 Mon Sep 17 00:00:00 2001 From: Christopher Lemmer Webber Date: Tue, 25 Sep 2018 21:09:32 -0400 Subject: gnu: emacs-racket-mode: Update to commit b977873. * gnu/packages/emacs.scm (emacs-racket-mode): Update to commit b977873. --- gnu/packages/emacs.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 8da5add886..c10a80258e 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -10410,8 +10410,8 @@ perform regression test for packages that provide font-lock rules.") (license license:gpl3+)))) (define-public emacs-racket-mode - (let ((commit "92c33487f6c707880ac3f6169e7ea65ddffd1463") - (revision "1")) + (let ((commit "b977873e6128f8399432dcd60cc39f6a6f803d9c") + (revision "2")) (package (name "emacs-racket-mode") (version (string-append "0.0.2" "-" revision "." @@ -10425,7 +10425,7 @@ perform regression test for packages that provide font-lock rules.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "19q6ym10gj2xdzzcgh3wdbq1xv8cv7nlrhv2b0bjvvdjzhiki472")))) + "0vp4bbbplqvmnhjpl6ajrlydmrhqzil56cfbs18m5c5fddx0zlh7")))) (build-system emacs-build-system) (arguments `(#:include '("\\.el$" "\\.rkt$"))) -- cgit v1.2.3 From 227ce488d7b899636e8e8635cbd2d08fb21c56a2 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 2 Oct 2018 16:38:52 -0500 Subject: gnu: Go 1.11: Update to 1.11.1 * gnu/packages/golang.scm (go-1.11): Update to 1.11.1. Signed-off-by: Leo Famulari --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index bba03e77f2..7a049e39e1 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -504,7 +504,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") (package (inherit go-1.10) (name "go") - (version "1.11") + (version "1.11.1") (source (origin (method url-fetch) @@ -512,7 +512,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") name version ".src.tar.gz")) (sha256 (base32 - "1ysj04jzds6xa8kdflkdsgyv3mg9fdn90zdf78g4g6p4bwpy3hdg")))) + "05qivf2f59pv4bfrmdr4m0xvswkmvvl9c5a2h5dy45g2k8b8r3sm")))) (arguments (substitute-keyword-arguments (package-arguments go-1.10) ((#:phases phases) -- cgit v1.2.3 From 43eb42ef017aa4752503fb2913781bb446716c1e Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 3 Oct 2018 10:23:51 -0500 Subject: quilt: Remove test workarounds. * gnu/packages/patches/quilt-compat-getopt-fix-second-separator.patch, gnu/packages/patches/quilt-compat-getopt-fix-option-with-nondigit-param.patch: New files. * gnu/local.mk (dist_patch_DATA): Add them. * gnu/packages/patchutils.scm (quilt)[source]: Use them. [arguments]: Remove workarounds in 'patch-tests' phase. --- gnu/local.mk | 2 + ...pat-getopt-fix-option-with-nondigit-param.patch | 45 +++++++++++++++++ .../quilt-compat-getopt-fix-second-separator.patch | 58 ++++++++++++++++++++++ gnu/packages/patchutils.scm | 14 ++---- 4 files changed, 108 insertions(+), 11 deletions(-) create mode 100644 gnu/packages/patches/quilt-compat-getopt-fix-option-with-nondigit-param.patch create mode 100644 gnu/packages/patches/quilt-compat-getopt-fix-second-separator.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index b2fda4ac69..61e5913a01 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1102,6 +1102,8 @@ dist_patch_DATA = \ %D%/packages/patches/quagga-reproducible-build.patch \ %D%/packages/patches/quickswitch-fix-dmenu-check.patch \ %D%/packages/patches/quilt-test-fix-regex.patch \ + %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/rapicorn-isnan.patch \ %D%/packages/patches/raptor2-heap-overflow.patch \ diff --git a/gnu/packages/patches/quilt-compat-getopt-fix-option-with-nondigit-param.patch b/gnu/packages/patches/quilt-compat-getopt-fix-option-with-nondigit-param.patch new file mode 100644 index 0000000000..6bbec67e75 --- /dev/null +++ b/gnu/packages/patches/quilt-compat-getopt-fix-option-with-nondigit-param.patch @@ -0,0 +1,45 @@ +From: Jean Delvare +Subject: compat/getopt: Allow non-digit parameter embedded in short option + +The compatibility getopt script allows only digit parameters to be +embedded in short options. Util-linux's getopt implementation does +not have such a restriction and allows any parameter to be embedded +in short options. As a consequence, using the compatibility getopt +script would choke for example on "-pab", which is a legal option +of the "quilt refresh" command. + +Remove the limitation on digits so that the compatibility getopt +script allows what util-linux allows. This fixes the second half +of bug #54772: +https://savannah.nongnu.org/bugs/index.php?54772 + +As a side note, this feature of the compatibility script was broken +anyway, as it would output the digits in reverse order. + +Signed-off-by: Jean Delvare +--- + compat/getopt.in | 13 ++++--------- + 1 file changed, 4 insertions(+), 9 deletions(-) + +--- quilt.orig/compat/getopt.in 2018-10-03 16:05:56.818667040 +0200 ++++ quilt/compat/getopt.in 2018-10-03 16:12:17.624841732 +0200 +@@ -108,15 +108,10 @@ foreach my $word (@words) { + if (scalar(@letters) == 0) { + $need_param = $letter; + } else { +- # short options can have numerical args +- # embedded in the short option list: -UO +- die "unexpected character after option $letter" +- if ($letters[$#letters] !~ /[0-9]/); +- my @digits; +- while (scalar(@letters) && ($letters[$#letters] =~ /[0-9]/)) { +- push @digits, pop @letters; +- } +- push @options, quote_word(join('', reverse @digits)); ++ # short options can have args ++ # embedded in the short option list ++ push @options, quote_word(join('', reverse @letters)); ++ @letters = (); + } + } + } diff --git a/gnu/packages/patches/quilt-compat-getopt-fix-second-separator.patch b/gnu/packages/patches/quilt-compat-getopt-fix-second-separator.patch new file mode 100644 index 0000000000..cde2c8d41c --- /dev/null +++ b/gnu/packages/patches/quilt-compat-getopt-fix-second-separator.patch @@ -0,0 +1,58 @@ +From: Jean Delvare +Subject: compat/getopt: Handle a second separator + +getopt can be passed 2 '--' separators. The first one tells that +getopt options are over and target program options start. The second +one tells that the target program's options are over and following +arguments should be treated as non-options even if they look like +options. + +This second separator was not handled, causing the compatibility +getopt script to treat the following arguments as options, eventually +failing one way or another. + +Properly detect and handle the second separator. This fixes the first +half of bug #54772: +https://savannah.nongnu.org/bugs/index.php?54772 + +Signed-off-by: Jean Delvare +--- + compat/getopt.in | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +--- quilt.orig/compat/getopt.in 2018-10-03 15:23:21.147620172 +0200 ++++ quilt/compat/getopt.in 2018-10-03 16:05:56.818667040 +0200 +@@ -8,12 +8,12 @@ + + use strict; + +-my $opts; ++my $opts = ''; + my @words; + my $found_sep = 0; + + foreach my $arg (@ARGV) { +- if ($arg eq '--') { ++ if (!$found_sep && $arg eq '--') { + $found_sep = 1; + } + else { +@@ -62,10 +62,17 @@ sub quote_word + return "'$word'"; + } + ++# there can be a second separator, to inhibit processing following arguments ++# as options ++$found_sep = 0; + foreach my $word (@words) { ++ if ($word eq '--') { ++ $found_sep = 1; ++ next; ++ } + + # allow '-' to be an option value +- if (!$need_param && $word !~ /^-./) { ++ if ($found_sep || (!$need_param && $word !~ /^-./)) { + push @barewords, quote_word($word); + next; + } diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index da20ae1c3f..688e62cdc8 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -103,7 +103,9 @@ listing the files modified by a patch.") (sha256 (base32 "06b816m2gz9jfif7k9v2hrm7fz76zjg5pavf7hd3ifybwn4cgjzn")) - (patches (search-patches "quilt-test-fix-regex.patch")))) + (patches (search-patches "quilt-test-fix-regex.patch" + "quilt-compat-getopt-fix-second-separator.patch" + "quilt-compat-getopt-fix-option-with-nondigit-param.patch")))) (build-system gnu-build-system) (native-inputs `(("gettext" ,gnu-gettext))) @@ -122,16 +124,6 @@ listing the files modified by a patch.") '("test/run" "test/edit.test") (("/bin/sh") (which "sh"))) - (substitute* "test/create-delete.test" - ;; We'd rather use quilt's compat/getopt than declare a - ;; dependency on util-linux, but this test fails because of - ;; compat/getopt's handling of "---" in this test, so remove it - ;; for now. - ((" ---") "")) - (substitute* '("test/empty-files.test" "test/faildiff.test") - ;; compat/getopt seems not to handle splitting of short opts - ;; from its arguments. - (("-pab") "-p ab")) #t)) (add-after 'install 'wrap-program ;; quilt's configure checks for the absolute path to the utilities it -- cgit v1.2.3 From 6f2a2bd66d5f7e5e8d7d2fd6f6cfdf3e5006b567 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 26 Sep 2018 23:15:59 +0200 Subject: gnu: Add emacs-all-the-icons. * gnu/packages/emacs.scm (emacs-all-the-icons): New variable. --- gnu/packages/emacs.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index c10a80258e..b25358718c 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -12262,3 +12262,42 @@ execute its commands and resize images.") (description "Synosaurus is a thesaurus fontend for Emacs with pluggable backends, including the @command{wordnet} offline backend.") (license license:gpl3+)))) + +(define-public emacs-all-the-icons + (package + (name "emacs-all-the-icons") + (version "3.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/domtronn/all-the-icons.el.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1sdl33117lccznj38021lwcdnpi9nxmym295q6y460y4dm4lx0jn")))) + (build-system emacs-build-system) + (arguments + `(#:include '("\\.el$" "^data/" "^fonts/") + ;; Compiling "test/" fails with "Symbol’s value as variable is void: + ;; all-the-icons--root-code". Ignoring tests. + #:exclude '("^test/") + #:tests? #f)) + (propagated-inputs + `(("f" ,emacs-f) + ("memoize" ,emacs-memoize))) + (home-page "https://github.com/domtronn/all-the-icons.el") + (synopsis "Collect icon fonts and propertize them within Emacs") + (description "All-the-icons is a utility package to collect various icon +fonts and propertize them within Emacs. Icon fonts allow you to propertize +and format icons the same way you would normal text. This enables things such +as better scaling of and anti aliasing of the icons.") + ;; Package is released under Expat license. Elisp files are licensed + ;; under GPL3+. Fonts come with various licenses: Expat for + ;; "all-the-icons.ttf" and "file-icons.ttf", Apache License 2.0 for + ;; "material-design-icons.ttf", and SIL OFL 1.1 for "fontawesome.ttf", + ;; "ocitcons.ttf" and "weathericons.ttf". + (license + (list license:expat license:gpl3+ license:silofl1.1 license:asl2.0)))) + -- cgit v1.2.3 From d406dcc046b140de616d3ea83a7591865c7eb5be Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 26 Sep 2018 23:25:24 +0200 Subject: gnu: Add emacs-powerline. * gnu/packages/emacs.scm (emacs-powerline): New variable. --- gnu/packages/emacs.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index b25358718c..b9f3d678e0 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -12301,3 +12301,25 @@ as better scaling of and anti aliasing of the icons.") (license (list license:expat license:gpl3+ license:silofl1.1 license:asl2.0)))) +(define-public emacs-powerline + (package + (name "emacs-powerline") + (version "2.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/milkypostman/powerline.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1hp3xp18943n0rlggz55150020ivw8gvi1vyxkr4z8xhpwq4gaar")))) + (build-system emacs-build-system) + (home-page "https://github.com/milkypostman/powerline/") + (synopsis "Mode-line plugin for Emacs") + (description "Powerline is a utility plugin which allows you to create +a better-looking, more functional Emacs mode-line. A collection of predefined +themes comes with the package.") + (license license:gpl3+))) + -- cgit v1.2.3 From 0c1fd6f8ade5c30e12985f7bd29ea4bf49559741 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 26 Sep 2018 23:27:06 +0200 Subject: gnu: Add emacs-spaceline. * gnu/packages/emacs.scm (emacs-spaceline): New variable. --- gnu/packages/emacs.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index b9f3d678e0..1df3456e4a 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -12323,3 +12323,35 @@ a better-looking, more functional Emacs mode-line. A collection of predefined themes comes with the package.") (license license:gpl3+))) +(define-public emacs-spaceline + (package + (name "emacs-spaceline") + (version "2.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/TheBB/spaceline.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1q8r95zfrh0vxna5ml2pq9b9f66clfqcl4d2qy2aizkvzyxg6skl")))) + (build-system emacs-build-system) + (propagated-inputs + `(("dash" ,emacs-dash) + ("powerline" ,emacs-powerline) + ("s" ,emacs-s))) + (home-page "https://github.com/TheBB/spaceline") + (synopsis "Powerline theme from Spacemacs") + (description "Spaceline provides Spacemacs' mode-line theme. +This package provides features for three kinds of users. + +@itemize +@item You just want to use the Spacemacs mode-line theme and forget about it. +@item You want to use something similar to the Spacemacs mode-line theme, but +with a handful of easy tweaks. +@item You want an easy-to-use library for building your own mode-line from +scratch, and you think the Spacemacs theme looks good. +@end itemize") + (license license:gpl3+))) -- cgit v1.2.3 From 7d99f015acb2611bca9f42f2d04cae68ef52aba3 Mon Sep 17 00:00:00 2001 From: David Thompson Date: Wed, 3 Oct 2018 14:28:11 -0400 Subject: gnu: tiled: Update to 1.2.0. * gnu/packages/game-development.scm (tiled): Update to 1.2.0. --- gnu/packages/game-development.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 6bd72879c2..bfebcc433e 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -397,7 +397,7 @@ support.") (define-public tiled (package (name "tiled") - (version "1.1.6") + (version "1.2.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/bjorn/tiled/archive/v" @@ -405,7 +405,7 @@ support.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "194ciw8688mikndvxivzb8ql5vm405pkwnn4srzm7ymwfc4xygb0")))) + "13dlf5kzvhhjkhy19118x3diakmraz4m9kxrsdam8dms6xivb6lp")))) (build-system gnu-build-system) (inputs `(("qtbase" ,qtbase) -- cgit v1.2.3 From ef1f9acf470e1871395daf18ce5d1c58d87f2ab0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 3 Oct 2018 23:04:32 +0200 Subject: gnu: azr3: Fix build. Fixes . * gnu/packages/audio.scm (azr3)[arguments]: Add build phase to reset timestamp of man page source. --- gnu/packages/audio.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 8f100ce7a3..95cc2ed68c 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -449,7 +449,14 @@ tools.") "CXXFLAGS=-std=gnu++11" "CFLAGS=-std=gnu++11" (string-append "prefix=" %output) - (string-append "pkgdatadir=" %output "/share/azr3-jack")))) + (string-append "pkgdatadir=" %output "/share/azr3-jack")) + #:phases + (modify-phases %standard-phases + (add-before 'install 'fix-timestamp + (lambda _ + (let ((early-1980 315619200)) ; 1980-01-02 UTC + (utime "azr3.1" early-1980 early-1980)) + #t))))) (inputs `(("gtkmm" ,gtkmm-2) ("lvtk" ,lvtk) -- cgit v1.2.3 From 46f9022c9919e647e62a39e0dacf51e31457e6f8 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Wed, 3 Oct 2018 23:56:44 +0200 Subject: gnu: Add java-commons-exec. * gnu/packages/java.scm (java-commons-exec-1.1): New variable. (java-commons-exec): New variable. --- gnu/packages/java.scm | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index d2f4c9d05b..5207c6cc64 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4288,6 +4288,85 @@ setter and getter method.") file filters and endian classes.") (license license:asl2.0))) +(define-public java-commons-exec-1.1 + (package + (name "java-commons-exec") + (version "1.1") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://apache/commons/exec/source/" + "commons-exec-" version "-src.tar.gz")) + (sha256 + (base32 + "025dk8xgj10lxwwwqp0hng2rn7fr4vcirxzydqzx9k4dim667alk")))) + (build-system ant-build-system) + (arguments + `(#:test-target "test" + #:make-flags + (list (string-append "-Dmaven.junit.jar=" + (assoc-ref %build-inputs "java-junit") + "/share/java/junit.jar")) + #:phases + (modify-phases %standard-phases + (add-before 'build 'delete-network-tests + (lambda _ + (delete-file "src/test/java/org/apache/commons/exec/DefaultExecutorTest.java") + (substitute* "src/test/java/org/apache/commons/exec/TestRunner.java" + (("suite\\.addTestSuite\\(DefaultExecutorTest\\.class\\);") "")) + #t)) + ;; The "build" phase automatically tests. + (delete 'check) + (replace 'install (install-jars "target"))))) + (native-inputs + `(("java-junit" ,java-junit))) + (home-page "http://commons.apache.org/proper/commons-exec/") + (synopsis "Common program execution related classes") + (description "Commons-Exec simplifies executing external processes.") + (license license:asl2.0))) + +(define-public java-commons-exec + (package + (inherit java-commons-exec-1.1) + (version "1.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://apache/commons/exec/source/" + "commons-exec-" version "-src.tar.gz")) + (sha256 + (base32 + "17yb4h6f8l49c5iyyvda4z2nmw0bxrx857nrwmsr7mmpb7x441yv")))) + (arguments + `(#:test-target "test" + #:make-flags + (list (string-append "-Dmaven.junit.jar=" + (assoc-ref %build-inputs "java-junit") + "/share/java/junit.jar") + "-Dmaven.compiler.source=1.7" + "-Dmaven.compiler.target=1.7") + #:phases + (modify-phases %standard-phases + (add-before 'build 'delete-network-tests + (lambda* (#:key inputs #:allow-other-keys) + ;; This test hangs indefinitely. + (delete-file "src/test/java/org/apache/commons/exec/issues/Exec60Test.java") + (substitute* "src/test/java/org/apache/commons/exec/issues/Exec41Test.java" + (("ping -c 10 127.0.0.1") "sleep 10")) + (substitute* "src/test/java/org/apache/commons/exec/issues/Exec49Test.java" + (("/bin/ls") "ls")) + (call-with-output-file "src/test/scripts/ping.sh" + (lambda (port) + (format port "#!~a/bin/sh\nsleep $1\n" + (assoc-ref inputs "bash")))) + #t)) + ;; The "build" phase automatically tests. + (delete 'check) + (replace 'install (install-jars "target"))))) + (native-inputs + `(("java-junit" ,java-junit) + ("java-hamcrest-core" ,java-hamcrest-core))))) + (define-public java-commons-lang (package (name "java-commons-lang") -- cgit v1.2.3 From 615a7eec567f313e1e421ee081c502201932fcd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Lassieur?= Date: Tue, 2 Oct 2018 16:32:03 +0200 Subject: gnu: Add stlink. * gnu/packages/embedded.scm (stlink): New variable. --- gnu/packages/embedded.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 0174224616..38c76cd737 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016 David Craven ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Clément Lassieur ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,6 +28,7 @@ #:use-module (guix svn-download) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (guix build utils) @@ -1104,3 +1106,40 @@ and displaying decoded target responses. @end enumerate") (home-page "https://www.freecalypso.org/") (license license:public-domain))) + +(define-public stlink + (package + (name "stlink") + (version "1.5.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/texane/stlink/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "01z1cz1a5xbbhd163qrqcgp4bi1k145pb80jmwdz50g7sfzmy570")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ;no tests + #:configure-flags + (let* ((out (assoc-ref %outputs "out")) + (etc (in-vicinity out "etc")) + (modprobe (in-vicinity etc "modprobe.d")) + (udev-rules (in-vicinity etc "udev/rules.d"))) + (list (string-append "-DSTLINK_UDEV_RULES_DIR=" udev-rules) + (string-append "-DSTLINK_MODPROBED_DIR=" modprobe))))) + (inputs + `(("libusb" ,libusb))) + (synopsis "Programmer for STM32 Discovery boards") + (description "This package provides a firmware programmer for the STM32 +Discovery boards. It supports two versions of the chip: ST-LINK/V1 (on +STM32VL discovery kits) and ST-LINK/V2 (on STM32L discovery and later kits). +Two different transport layers are used: ST-LINK/V1 uses SCSI passthru +commands over USB, and ST-LINK/V2 and ST-LINK/V2-1 (seen on Nucleo boards) use +raw USB commands.") + (home-page "https://github.com/texane/stlink") + ;; The flashloaders/stm32l0x.s and flashloaders/stm32lx.s source files are + ;; licensed under the GPLv2+. + (license (list license:bsd-3 license:gpl2+)))) -- cgit v1.2.3 From 5165fb40f4a730b36cddeab6ae894d360e727639 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 4 Oct 2018 03:02:30 +0200 Subject: gnu: Add java-fasterxml-jackson-modules-base-mrbean. * gnu/packages/java.scm (java-fasterxml-jackson-modules-base-mrbean): New variable. --- gnu/packages/java.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 5207c6cc64..96da495c29 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -7664,6 +7664,55 @@ configuration.") (description "This package is the jaxb annotations module for jackson.") (license license:asl2.0))); found on wiki.fasterxml.com/JacksonLicensing +(define-public java-fasterxml-jackson-modules-base-mrbean + (package + (name "java-fasterxml-jackson-modules-base-mrbean") + (version "2.9.4") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/FasterXML/" + "jackson-modules-base/archive/" + "jackson-modules-base-" version ".tar.gz")) + (sha256 + (base32 + "1wws95xi8sppp6b0k2vvjdjyynl20r1a4dwrhai08lzlria6blp5")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "jackson-modules-base-mrbean.jar" + #:source-dir "mrbean/src/main/java" + #:test-dir "mrbean/src/test" + #:test-exclude + ;; Base class for tests + (list "**/BaseTest.java") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'generate-PackageVersion.java + (lambda _ + (let* ((out (string-append "mrbean/src/main/java/com/fasterxml/" + "jackson/module/mrbean/PackageVersion.java")) + (in (string-append out ".in"))) + (copy-file in out) + (substitute* out + (("@package@") "com.fasterxml.jackson.module.mrbean") + (("@projectversion@") ,version) + (("@projectgroupid@") "com.fasterxml.jackson.module.mrbean") + (("@projectartifactid@") "jackson-module-mrbean"))) + #t))))) + (inputs + `(("java-asm" ,java-asm) + ("java-fasterxml-jackson-annotations" + ,java-fasterxml-jackson-annotations) + ("java-fasterxml-jackson-core" ,java-fasterxml-jackson-core) + ("java-fasterxml-jackson-databind" ,java-fasterxml-jackson-databind))) + (native-inputs + `(("java-junit" ,java-junit))) + (home-page "https://github.com/FasterXML/jackson-modules-base") + (synopsis "POJO type materialization for Java") + (description "This package implements POJO type materialization. +Databinders can construct implementation classes for Java interfaces as part +of deserialization.") + (license license:asl2.0))) + (define-public java-snakeyaml (package (name "java-snakeyaml") -- cgit v1.2.3 From 84ae0e29fd4fea418db450aa42b611b6d90d962e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Oct 2018 22:31:03 +0200 Subject: gnu: rtags: Don't use unstable tarball. * gnu/packages/code.scm (rtags)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/code.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 4264e292bd..98a86b763f 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -403,13 +403,13 @@ functionality such as HTML output.") (package (name "rtags") (version "2.18") - (home-page "https://github.com/Andersbakken/rtags") (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 "https://github.com/Andersbakken/rtags.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (patches (search-patches "rtags-separate-rct.patch")) (modules '((guix build utils))) (snippet @@ -424,7 +424,7 @@ functionality such as HTML output.") #t))) (sha256 (base32 - "0scjbp1z201q8njvrxqz7lk2m9b6k2rxd5q1shrng6532r7ndif2")))) + "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0")))) (build-system cmake-build-system) (arguments '(#:build-type "RelWithDebInfo" @@ -442,6 +442,7 @@ functionality such as HTML output.") ("lua" ,lua) ("rct" ,rct) ("selene" ,selene))) + (home-page "https://github.com/Andersbakken/rtags") (synopsis "Indexer for the C language family with Emacs integration") (description "RTags is a client/server application that indexes C/C++ code and keeps a -- cgit v1.2.3 From 5eff43804eaed5744967f83edbaeb7ffdb77aec1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 1 Oct 2018 12:36:50 +0200 Subject: gnu: Add memtest86+. * gnu/packages/hardware.scm (memtest86+): New public variable. --- gnu/packages/hardware.scm | 61 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index f77336e504..62f6316bca 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -18,6 +18,7 @@ (define-module (gnu packages hardware) #:use-module (gnu packages compression) + #:use-module (gnu packages gcc) #:use-module (gnu packages glib) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) @@ -74,6 +75,66 @@ calibrated, and restored when the calibration is applied.") (license (list license:bsd-3 ; FindDDCUtil.cmake license:gpl2+)))) ; everything else +;; Distinct from memtest86, which is obsolete. +(define-public memtest86+ + (package + (name "memtest86+") + ;; Update the description when/if UEFI support is released. + (version "5.01") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.memtest.org/download/5.01/memtest86+-" + version ".tar.gz")) + (sha256 + (base32 "0fch1l55753y6jkk0hj8f6vw4h1kinkn9ysp22dq5g9zjnvjf88l")))) + (build-system gnu-build-system) + (arguments + `(#:system "i686-linux" ; the result runs outside of any OS + #:tests? #f ; no way to test this + #:phases + (modify-phases %standard-phases + (delete 'configure) ; no configure script + (replace 'build + ;; The default 'make all' does wonderful things, like scp(1) a file to + ;; 192.168.0.12. Build the bootable images and nothing more. + (lambda _ + (invoke "make" + "memtest" ; ELF executable + "memtest.bin"))) ; DOS/MBR boot sector + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib/memtest86+")) + (doc (string-append out "/share/doc/memtest86+-" ,version))) + (for-each + (lambda (file) + (install-file file lib)) + (list "memtest" + "memtest.bin")) + (for-each + (lambda (file) + (install-file file doc)) + (list "FAQ" + "README")))))))) + (native-inputs + ;; Newer GCCs fail with a deluge of "multiple definition of `__foo'" errors. + `(("gcc" ,gcc-4.9))) + (supported-systems (list "i686-linux" "x86_64-linux")) + (home-page "https://www.memtest.org/") + (synopsis "Thorough real-mode memory tester") + (description + "Memtest86+ is a thorough, stand-alone memory test for x86 systems. It +repeatedly writes different patterns to all memory locations, reads them back +again, and verifies whether the result is the same as what was written. This +can help debug even intermittent and non-deterministic errors. + +It runs independently of any operating system, at computer boot-up, so that it +can scan as much of your RAM as possible for hardware defects. + +Memtest86+ cannot currently be used on computers booted with UEFI.") + (license license:gpl2))) + (define-public msr-tools (package (name "msr-tools") -- cgit v1.2.3 From fb5412511479c19b3e4c884e9cc65e652ea923e2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 1 Oct 2018 16:11:22 +0200 Subject: gnu: Add memtester. * gnu/packages/hardware.scm (memtester): New public variable. --- gnu/packages/hardware.scm | 51 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 62f6316bca..02ab9e2e00 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -116,7 +116,8 @@ calibrated, and restored when the calibration is applied.") (lambda (file) (install-file file doc)) (list "FAQ" - "README")))))))) + "README")) + #t)))))) (native-inputs ;; Newer GCCs fail with a deluge of "multiple definition of `__foo'" errors. `(("gcc" ,gcc-4.9))) @@ -135,6 +136,54 @@ can scan as much of your RAM as possible for hardware defects. Memtest86+ cannot currently be used on computers booted with UEFI.") (license license:gpl2))) +(define-public memtester + (package + (name "memtester") + (version "4.3.0") + (source + (origin + (method url-fetch) + ;; Even the latest release is available under 'old-versions/'. + (uri (string-append "http://pyropus.ca/software/memtester/old-versions/" + "memtester-" version ".tar.gz")) + (sha256 + (base32 "127xymmyzb9r6dxqrwd69v7gf8csv8kv7fjvagbglf3wfgyy5pzr")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags + (list "CC=gcc") + #:phases + (modify-phases %standard-phases + (replace 'configure + ;; This is a home-brewed configuration system where the cc/ld command + ;; lines are stored in one-line files. + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (substitute* (list "conf-cc" "conf-ld") + (("^cc") "gcc")) + (substitute* "Makefile" + (("(INSTALLPATH.*=).*" _ assignment) + (string-append assignment out))) + #t))) + (replace 'check + ;; There is no test suite. Test some RAM for a single iteration. + (lambda _ + (invoke "./memtester" "64K" "1")))))) + (home-page "http://pyropus.ca/software/memtester/") + (synopsis "User-space memory subsystem tester") + (description + "Memtester stress-tests the memory subsystem of your operating system and +computer. It repeatedly writes different patterns to all memory locations, +reads them back again, and verifies whether the result is the same as what was +written. This can help debug even intermittent and non-deterministic errors. + +Memtester runs entirely in user space. This means that you don't need to reboot +to test your memory, but also that it's not possible to test all of the RAM +installed in the system. + +It can also be told to test memory starting at a particular physical address.") + (license license:gpl2))) + (define-public msr-tools (package (name "msr-tools") -- cgit v1.2.3 From 20377e4a99d7855685f29433059d53fca2761ce9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Oct 2018 02:48:01 +0200 Subject: gnu: rubberband: Use HTTPS home page. * gnu/packages/audio.scm (rubberband)[home-page]: Use HTTPS. --- gnu/packages/audio.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 95cc2ed68c..c92b5056d1 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2245,7 +2245,7 @@ aimed at audio/musical applications.") ("vamp" ,vamp))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://breakfastquay.com/rubberband/") + (home-page "https://breakfastquay.com/rubberband/") (synopsis "Audio time-stretching and pitch-shifting library") (description "Rubber Band is a library and utility program that permits changing the -- cgit v1.2.3 From 8d54e7ff221f2679cd2677bf483bdfb057b0a35e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Oct 2018 00:14:21 +0200 Subject: gnu: wpa-supplicant-gui: Remove redundant code. * gnu/packages/admin.scm (wpa-supplicant-gui)[arguments]: Remove substitution already handled by the build system. --- gnu/packages/admin.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index a0ab431ddd..fa60cadd01 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1194,9 +1194,6 @@ This package provides the 'wpa_supplicant' daemon and the 'wpa_cli' command.") (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) (qt '("qtbase" "qtsvg"))) - (substitute* "wpa_gui.desktop" - (("Exec=wpa_gui") - (string-append "Exec=" out "/bin/wpa_gui"))) (install-file "wpa_gui" (string-append out "/bin")) (install-file "wpa_gui.desktop" (string-append out "/share/applications")) -- cgit v1.2.3 From 18995af2cdb8101af099ff8e62c185425096ec7a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Sep 2018 20:32:07 +0200 Subject: gnu: Add freedroidrpg. * gnu/packages/games.scm (freedroidrpg): New public variable. --- gnu/packages/games.scm | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 86d6973a9a..ec92f508bc 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -364,6 +364,59 @@ played. Freedoom complements the Doom engine with free levels, artwork, sound effects and music to make a completely free game.") (license license:bsd-3))) +(define-public freedroidrpg + (package + (name "freedroidrpg") + (version "0.16.1") + (source + (origin + (method url-fetch) + (uri (string-append "http://ftp.osuosl.org/pub/freedroid/" + "freedroidRPG-" (version-major+minor version) "/" + "freedroidRPG-" version ".tar.gz")) + (sha256 + (base32 "0n4kn38ncmcy3lrxmq8fjry6c1z50z4q1zcqfig0j4jb0dsz2va2")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list + (string-append "CFLAGS=" + "-I" (assoc-ref %build-inputs "sdl-gfx") "/include/SDL " + "-I" (assoc-ref %build-inputs "sdl-image") "/include/SDL " + "-I" (assoc-ref %build-inputs "sdl-mixer") "/include/SDL") + "--enable-opengl") + ;; FIXME: the test suite fails with the following error output: + ;; 4586 Segmentation fault env SDL_VIDEODRIVER=dummy \ + ;; SDL_AUDIODRIVER=dummy ./src/freedroidRPG -nb text + #:tests? #f)) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("glu" ,glu) + ("libjpeg" ,libjpeg) + ("libogg" ,libogg) + ("libpng" ,libpng) + ("libvorbis" ,libvorbis) + ("mesa" ,mesa) + ("python" ,python-wrapper) + ("sdl" ,sdl) + ("sdl-gfx" ,sdl-gfx) + ("sdl-image" ,sdl-image) + ("sdl-mixer" ,sdl-mixer) + ("zlib" ,zlib))) + (home-page "http://www.freedroid.org/") + (synopsis "Isometric role-playing game against killer robots") + (description + "Freedroid RPG is an @dfn{RPG} (Role-Playing Game) with isometric graphics. +The game tells the story of a world destroyed by a conflict between robots and +their human masters. To restore peace to humankind, the player must complete +numerous quests while fighting off rebelling robots---either by taking control +of them, or by simply blasting them to pieces with melee and ranged weapons in +real-time combat.") + (license (list license:expat ; lua/ + license:gpl3 ; src/gen_savestruct.py + license:gpl2+)))) ; the rest + (define-public golly (package (name "golly") -- cgit v1.2.3 From 99f97a775244d932e55e0546ee90d43a8110c4b7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 1 Oct 2018 23:19:45 +0200 Subject: gnu: packagekit: Update to 1.1.11. * gnu/packages/freedesktop.scm (packagekit): Update to 1.1.11. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 626d883648..5cc2699ad8 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -349,7 +349,7 @@ of a the system to know what users are logged in, and where.") (define-public packagekit (package (name "packagekit") - (version "1.1.10") + (version "1.1.11") (source (origin (method url-fetch) (uri (string-append @@ -358,7 +358,7 @@ of a the system to know what users are logged in, and where.") "PackageKit-" version ".tar.xz")) (sha256 (base32 - "1msfmb22cm4s3l6vsbr86b8s0v897sy6gcga3qg87z7640a0di2b")))) + "0fi6wn54y03zh5sn92nmmxkh4cd8yn44cyk0l8phw60ivfwmkh1q")))) (build-system gnu-build-system) (arguments `(#:tests? #f -- cgit v1.2.3 From 7f12d8134e43eda122d47e11ef9c5d6879ebb32d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 1 Oct 2018 23:22:11 +0200 Subject: gnu: disorderfs: Update to 0.5.4. * gnu/packages/file-systems.scm (disorderfs): Update to 0.5.4. --- gnu/packages/file-systems.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 3c9d7d49c1..b195019866 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -107,7 +107,7 @@ single file can be mounted.") (define-public disorderfs (package (name "disorderfs") - (version "0.5.3") + (version "0.5.4") (source (origin (method git-fetch) @@ -117,7 +117,7 @@ single file can be mounted.") (file-name (git-file-name name version)) (sha256 (base32 - "1nmhfvxpvz3xsfxl9wqnh6r2l5m7hjq6n0vpblsl5xdcvwaqcf50")))) + "1mw4ix9h17ikki8p2rxdvzp87rcm1c7by5lvfn5gxlxr7hlj9f8g")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From a926109d623b0faa0f09855e7647a629a45f979a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 1 Oct 2018 23:29:04 +0200 Subject: gnu: ndctl: Return #t from phases. * gnu/packages/disk (ndctl)[arguments]: Rename inaccurately named 'autogen' phase to 'patch-FHS-file-names'. Explicitly return #t. --- gnu/packages/disk.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 58c867d765..fa3a0431a5 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -630,14 +630,15 @@ passphrases.") (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'autogen + (add-after 'unpack 'patch-FHS-file-names (lambda _ (substitute* "autogen.sh" (("/bin/sh") (which "sh"))) (substitute* "git-version-gen" (("/bin/sh") (which "sh"))) (substitute* "git-version" - (("/bin/bash") (which "bash")))))) + (("/bin/bash") (which "bash"))) + #t))) #:make-flags (let ((out (assoc-ref %outputs "out"))) (list (string-append "BASH_COMPLETION_DIR=" out -- cgit v1.2.3 From 9e783d0bf22a7ff965105eb45f6c179a832bbabf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 1 Oct 2018 23:11:08 +0200 Subject: gnu: ddcutil: Update to 0.9.2. * gnu/packages/hardware.scm (ddcutil): Update to 0.9.2. --- gnu/packages/hardware.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 02ab9e2e00..52bc3d0527 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -36,14 +36,14 @@ (define-public ddcutil (package (name "ddcutil") - (version "0.9.1") + (version "0.9.2") (source (origin (method url-fetch) (uri (string-append "https://www.ddcutil.com/tarballs/" name "-" version ".tar.gz")) (sha256 - (base32 "1b4bm3zhk5vnad6fxf0mn8nrlj3fngifl7nzxgxw0n56hlv7ccv0")))) + (base32 "0nhi261vf2n3jpi0a0n6659911kxi3lj7a4h7cmv0ip6sbb8rk88")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 1f2cf5d9db2d9991822064cf1a3c3a7082bab5da Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Oct 2018 06:12:18 +0200 Subject: gnu: nickle: Update to 2.82. * gnu/packages/nickle.scm (nickle): Update to 2.82. --- gnu/packages/nickle.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/nickle.scm b/gnu/packages/nickle.scm index 860c111f43..c8179419bb 100644 --- a/gnu/packages/nickle.scm +++ b/gnu/packages/nickle.scm @@ -28,14 +28,14 @@ (define-public nickle (package (name "nickle") - (version "2.81") + (version "2.82") (source (origin (method url-fetch) (uri (string-append "https://nickle.org/release/nickle-" version ".tar.gz")) (sha256 (base32 - "1daqsflnqqgfkq6w6dknbm42avz70f5qxn7qidvgp472i4a37acr")))) + "0jy96z01qbrnmsrywn5mfa14615qdix6b8520qd65c6yjyrk8gs0")))) (build-system gnu-build-system) (native-inputs `(("readline" ,readline))) -- cgit v1.2.3 From b1d30f46c10123fc5e38ac6aff8a1b2b3773b72a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Oct 2018 06:04:02 +0200 Subject: gnu: imapfilter: Don't use unstable tarball. * gnu/packages/mail.scm (imapfilter)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/mail.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 5435f89c42..048218cc57 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2559,14 +2559,13 @@ PGP handling, multiple servers, and secure connections.") (version "2.6.11") (source (origin - (method url-fetch) - (uri - (string-append "https://github.com/lefcha/imapfilter/archive/" - "v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/lefcha/imapfilter.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 - "1yslvwr3w5fnl06gfrp0lim8zdlasx3cvgd2fsqi0695xnb9bsms")))) + (base32 "0cjnp7vqmgqym2zswabkmwlbj21r063vw7wkwxglj08z5qyjl5ps")))) (build-system gnu-build-system) (arguments `(#:tests? #f -- cgit v1.2.3 From 88abd73eeb81a6b77069345252a7138583a1fda4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Oct 2018 06:05:31 +0200 Subject: gnu: imapfilter: Update to 2.6.12. * gnu/packages/mail.scm (imapfilter): Update to 2.6.12. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 048218cc57..7348719ede 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2556,7 +2556,7 @@ PGP handling, multiple servers, and secure connections.") (define-public imapfilter (package (name "imapfilter") - (version "2.6.11") + (version "2.6.12") (source (origin (method git-fetch) @@ -2565,7 +2565,7 @@ PGP handling, multiple servers, and secure connections.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0cjnp7vqmgqym2zswabkmwlbj21r063vw7wkwxglj08z5qyjl5ps")))) + (base32 "0vzpc54fjf5vb5vx5w0fl20xvx1k9cg6a3hbl86mm8kwsqf3wrab")))) (build-system gnu-build-system) (arguments `(#:tests? #f -- cgit v1.2.3 From 91a3c8005d5d28afa7821db2f942fede9b9cf99e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Oct 2018 06:25:53 +0200 Subject: gnu: rpm: Update to 4.14.2. * gnu/packages/package-management.scm (rpm): Update to 4.14.2. [arguments]: Rename 'set-nspr-search-path' phase to 'set-nss-library-path' and remove CPATH work-around. Remove obsolete 'fix-rpm-symlinks' phase. [home-page]: Drop www. --- gnu/packages/package-management.scm | 32 ++++++-------------------------- 1 file changed, 6 insertions(+), 26 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 69788c9463..42172d8242 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -495,7 +495,7 @@ symlinks to the files in a common directory such as /usr/local.") (define-public rpm (package (name "rpm") - (version "4.13.0.2") + (version "4.14.2") (source (origin (method url-fetch) (uri (string-append "http://ftp.rpm.org/releases/rpm-" @@ -503,40 +503,20 @@ symlinks to the files in a common directory such as /usr/local.") version ".tar.bz2")) (sha256 (base32 - "1521y4ghjns449kzpwkjn9cksh686383xnfx0linzlalqc3jqgig")))) + "0armd7dqr8bl0isx8l4xlylm7dikasmxhhcbz336fkp2x30w5jw0")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--with-external-db" ;use the system's bdb "--enable-python" "--without-lua") #:phases (modify-phases %standard-phases - (add-before 'configure 'set-nspr-search-path + (add-before 'configure 'set-nss-library-path (lambda* (#:key inputs #:allow-other-keys) - ;; nspr.pc contains the right -I flag pointing to - ;; 'include/nspr', but unfortunately 'configure' doesn't - ;; use 'pkg-config'. Thus, augment CPATH. - ;; Likewise for NSS. - (let ((nspr (assoc-ref inputs "nspr")) - (nss (assoc-ref inputs "nss"))) - (setenv "CPATH" - (string-append (getenv "C_INCLUDE_PATH") ":" - nspr "/include/nspr:" - nss "/include/nss")) + (let ((nss (assoc-ref inputs "nss"))) (setenv "LIBRARY_PATH" (string-append (getenv "LIBRARY_PATH") ":" nss "/lib/nss")) - #t))) - (add-after 'install 'fix-rpm-symlinks - (lambda* (#:key outputs #:allow-other-keys) - ;; 'make install' gets these symlinks wrong. Fix them. - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (with-directory-excursion bin - (for-each (lambda (file) - (delete-file file) - (symlink "rpm" file)) - '("rpmquery" "rpmverify")) - #t))))))) + #t)))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs @@ -552,7 +532,7 @@ symlinks to the files in a common directory such as /usr/local.") ("bzip2" ,bzip2) ("zlib" ,zlib) ("cpio" ,cpio))) - (home-page "http://www.rpm.org/") + (home-page "http://rpm.org/") (synopsis "The RPM Package Manager") (description "The RPM Package Manager (RPM) is a command-line driven package -- cgit v1.2.3 From 104f475f9b95953a67640a82127ade689931a6e7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Oct 2018 05:58:52 +0200 Subject: gnu: perl-string-copyright: Update to 0.003006. * gnu/packages/license.scm (perl-string-copyright): Update to 0.003006. --- gnu/packages/license.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/license.scm b/gnu/packages/license.scm index 44c7a1bb2a..e50ce831b1 100644 --- a/gnu/packages/license.scm +++ b/gnu/packages/license.scm @@ -61,7 +61,7 @@ Regexp::Pattern is a convention for organizing reusable regex patterns.") (define-public perl-string-copyright (package (name "perl-string-copyright") - (version "0.003005") + (version "0.003006") (source (origin (method url-fetch) @@ -70,7 +70,7 @@ Regexp::Pattern is a convention for organizing reusable regex patterns.") version ".tar.gz")) (sha256 (base32 - "12c6x4c10gr46ryc3dpwgfi6wggmgy4a1ls2hwhcpdm3wvzy5619")))) + "0fzymv065nn3glwnw34nkyadzw2dh4rcz8avmki4zrnk4k45m01a")))) (build-system perl-build-system) (native-inputs `(("perl-number-range" ,perl-number-range))) -- cgit v1.2.3 From fe30eb6d24dd750a124cb0c1f6300fc3d5518d7f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Oct 2018 05:50:49 +0200 Subject: gnu: ephoto: Fix typos in description. * gnu/packages/enlightenment.scm (ephoto)[description]: Fix typos. Wrap at 80 columns. --- gnu/packages/enlightenment.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index c0335016f8..1a0ebba304 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -464,19 +464,22 @@ and in creating applications based on the Enlightenment Foundation Library suite (home-page "http://smhouston.us/ephoto/") (synopsis "EFL image viewer/editor/manipulator/slideshow creator") (description "Ephoto is an image viewer and editor written using the -@dfn{Enlightenment Foundation Libraries} (EFL). It focuses on simplicity and ease -of use, while taking advantage of the speed and small footprint the EFL provide. +@dfn{Enlightenment Foundation Libraries} (EFL). It focuses on simplicity and +ease of use, while taking advantage of the speed and small footprint the EFL +provide. Ephoto’s features include: @enumerate -@item Browsing the filesystem and displaying images in an easy to use grid view. +@item Browsing the file system and displaying images in an easy-to-use grid view. @item Browsing images in a single image view format. @item Viewing images in a slideshow. @item Editing your image with features such as cropping, auto enhance, blurring, sharpening, brightness/contrast/gamma adjustments, hue/saturation/value adjustments, and color level adjustment. -@item Applying artistic filters to your image such as black and white and old photo. -@item Drag And Drop along with file operations to easy maintain your photo directories. +@item Applying artistic filters to your image such as black and white and old +photo. +@item Drag And Drop along with file operations to easily maintain your photo +directories. @end enumerate\n") (license (list license:bsd-2 ; Ephoto's thumbnailing code -- cgit v1.2.3 From 1fc346de4eb6881c087eae2c603a761b510e28f2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Oct 2018 05:45:02 +0200 Subject: gnu: retroarch: Don't use unstable tarball. * gnu/packages/emulators.scm (retroarch)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/emulators.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 443137f141..a07ce29243 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1058,12 +1058,13 @@ emulation community. It provides highly accurate emulation.") (version "1.7.4") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/libretro/RetroArch/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/libretro/RetroArch.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "0h6y2hpjg4b470jvn9ghwp0k3a527sbb6xhia17frlm9w9v5028w")))) + (base32 "1gagdwydj6kl3gzi9z1rjgrbjvi325f8159fdaryzf5gjj8avp8m")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests -- cgit v1.2.3 From 689ca9ba23e8c5003cba5163235e9c5fb1206f16 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Oct 2018 05:56:12 +0200 Subject: gnu: retroarch: Update to 1.7.5. * gnu/packages/emulators.scm (retroarch): Update to 1.7.5. --- gnu/packages/emulators.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index a07ce29243..438e9df1fc 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1055,7 +1055,7 @@ emulation community. It provides highly accurate emulation.") (define-public retroarch (package (name "retroarch") - (version "1.7.4") + (version "1.7.5") (source (origin (method git-fetch) @@ -1064,7 +1064,7 @@ emulation community. It provides highly accurate emulation.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1gagdwydj6kl3gzi9z1rjgrbjvi325f8159fdaryzf5gjj8avp8m")))) + (base32 "1jfpgl34jjxn3dvxd1kd564swkw7v98hnn562v998b7vllz3dxdm")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests -- cgit v1.2.3 From cd81c9e2a76f825534b1c48e722926d5c70fca8f Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Thu, 4 Oct 2018 08:12:39 +0200 Subject: gnu: mpv: Update to 0.29.1. * gnu/packages/video.scm (mpv): Update to 0.29.1. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 54ffef86de..2f6a89e14d 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1121,7 +1121,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") (define-public mpv (package (name "mpv") - (version "0.29.0") + (version "0.29.1") (source (origin (method url-fetch) (uri (string-append @@ -1129,7 +1129,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") ".tar.gz")) (sha256 (base32 - "06bk8836brzik1qmq8kycwg5n35r438sd2176k6msjg5rrwghakp")) + "08x63hlpj6s8xixmdbx6raff5p5mih7cnk0bcql9f3wrs5hx9ygr")) (file-name (string-append name "-" version ".tar.gz")))) (build-system waf-build-system) (native-inputs -- cgit v1.2.3 From 89fdd9ee0cc8817283449b33a8c1a2604c575c7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 3 Oct 2018 22:44:11 +0200 Subject: services: rottlog: Use command strings in the mcron jobs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/services/admin.scm (default-jobs): Remove the lambda around "/…/bin/rottlog" to make "herd schedule mcron" more transparent (otherwise it just says "Lambda function"). --- gnu/services/admin.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/services/admin.scm b/gnu/services/admin.scm index f08c896334..d7bda61ed7 100644 --- a/gnu/services/admin.scm +++ b/gnu/services/admin.scm @@ -125,11 +125,9 @@ for ROTATION." (define (default-jobs rottlog) (list #~(job '(next-hour '(0)) ;midnight - (lambda () - (system* #$(file-append rottlog "/sbin/rottlog")))) + #$(file-append rottlog "/sbin/rottlog")) #~(job '(next-hour '(12)) ;noon - (lambda () - (system* #$(file-append rottlog "/sbin/rottlog")))))) + #$(file-append rottlog "/sbin/rottlog")))) (define-record-type* rottlog-configuration make-rottlog-configuration -- cgit v1.2.3 From 666fb2884ab487ae69ed3541c4adaf0b4fb6ef41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 4 Oct 2018 09:46:43 +0200 Subject: gnu: r-acclma: Fix uses of @acronym in description. * gnu/packages/cran.scm (r-acclma)[description]: Fix order of arguments to @acronym. The wrong order was causing 'stexi->shtml' to fail (match error). --- gnu/packages/cran.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a1bf750da6..efcc2dccb5 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6243,12 +6243,12 @@ lot.") (home-page "https://cran.r-project.org/web/packages/ACCLMA/") (synopsis "ACC & LMA graph plotting") (description - "This package contains a function that imports data from a @acronym{Comma-Separated -Values, @acronym{CSV}} file, or uses manually entered data from the format (x, -y, weight) and plots the appropriate @acronym{Absolute Concentration Curve, -@acronym{ACC}} vs @acronym{Line of Independence, @acronym{LOI}} graph and -@acronym{@acronym{LOI} Minus @acronym{ACC}, @acronym{LMA}} graph. The main -function is plotLMA (source file, header) that takes a data set and plots the + "This package contains a function that imports data from a @acronym{CSV, +Comma-Separated Values} file, or uses manually entered data from the format (x, +y, weight) and plots the appropriate @acronym{ACC, Absolute Concentration +Curve} vs @acronym{LOI, Line of Independence} graph and +@acronym{LMA, @acronym{LOI} Minus @acronym{ACC}} graph. The main +function is @code{plotLMA} (source file, header) that takes a data set and plots the appropriate @acronym{LMA} and @acronym{ACC} graphs. If no source file (a string) was passed, a manual data entry window is opened. The header parameter indicates by TRUE/FALSE (false by default) if the source @acronym{CSV} file has -- cgit v1.2.3 From 63856931dbe1e72311b472347331ce1c16b0de0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Wed, 3 Oct 2018 22:28:19 +0200 Subject: gnu: opencv: Update to 3.4.3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [[PGP Signed Part:Good signature from BF286CB6593E5FFD Björn Höfling (trust undefined) created at 2018-10-03T22:28:20+0200 using DSA]] * gnu/packages/image-processing.scm (opencv): Update to 3.4.3. Signed-off-by: Ludovic Courtès --- gnu/packages/image-processing.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 8f80b75af4..0901dc429f 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -200,7 +200,7 @@ integrates with various databases on GUI toolkits such as Qt and Tk.") (define-public opencv (package (name "opencv") - (version "3.4.1") + (version "3.4.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/opencv/opencv/archive/" @@ -208,7 +208,7 @@ integrates with various databases on GUI toolkits such as Qt and Tk.") (file-name (string-append name "-" version ".zip")) (sha256 (base32 - "1g8pvnlkzzp50amd89149hqsbvsc2hq3vk1d6a9fksdcx8ra9g94")) + "0pycx1pz8lj794q32mlalyc3ijqxwsyin65r26nh4yc0p71xiirp")) (modules '((guix build utils))) (snippet '(begin @@ -345,7 +345,7 @@ integrates with various databases on GUI toolkits such as Qt and Tk.") "opencv/opencv_extra/zip/" version)) (file-name (string-append "opencv-extra-" version ".zip")) (sha256 - (base32 "0wfh3pvfxqydf7hsccp50npcsg37sf6fqi6cd3zkc4qil9zhpbps")))) + (base32 "0yd1vidzbg6himxyh4yzivywijg8548kfmcn421khabnipm7l74y")))) ("opencv-contrib" ,(origin (method url-fetch) @@ -353,7 +353,7 @@ integrates with various databases on GUI toolkits such as Qt and Tk.") "opencv/opencv_contrib/zip/" version)) (file-name (string-append "opencv-contrib-" version ".zip")) (sha256 - (base32 "18zm0qmjcdvg90c33gzv0ws0xdaid1xpqzz2xa9l2x12qkr6zj3p")))))) + (base32 "0j0ci6ia1qwklp9hq07ypl0vkngj1wrgh6n98n657m5d0pyp4m0g")))))) (inputs `(("libjpeg" ,libjpeg) ("libpng" ,libpng) ("jasper" ,jasper) -- cgit v1.2.3 From ff30bb010bdce50f92eea0ad64280c9701a2687d Mon Sep 17 00:00:00 2001 From: Diego Nicola Barbato Date: Wed, 3 Oct 2018 22:39:34 +0200 Subject: gnu: escpr: Update to 1.6.30. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cups.scm (escpr): Update to 1.6.30. Signed-off-by: Ludovic Courtès --- gnu/packages/cups.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 986280f4cb..81e442eef1 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -656,7 +656,7 @@ HP@tie{}LaserJet, and possibly other printers. See @file{README} for details.") (define-public escpr (package (name "escpr") - (version "1.6.20") + (version "1.6.30") ;; XXX: This currently works. But it will break as soon as a newer ;; version is available since the URLs for older versions are not ;; preserved. An alternative source will be added as soon as @@ -664,12 +664,12 @@ HP@tie{}LaserJet, and possibly other printers. See @file{README} for details.") (source (origin (method url-fetch) ;; The uri has to be chopped up in order to satisfy guix lint. - (uri (string-append "https://download3.ebz.epson.net/dsc/f/03/00/07/16/23/" - "804253d188a31ae6a0f2722648248ef952afedfb/" - "epson-inkjet-printer-escpr-1.6.20-1lsb3.2.tar.gz")) + (uri (string-append "https://download3.ebz.epson.net/dsc/f/03/00/08/18/20/" + "e94de600e28e510c1cfa158929d8b2c0aadc8aa0/" + "epson-inkjet-printer-escpr-1.6.30-1lsb3.2.tar.gz")) (sha256 (base32 - "19800pl7kbbgdzbsy9ijmd7dm3ly4kr2h1dxypqpd075g6n0i770")))) + "0m8pyfkixisp0vclwxj340isn15zzisal0v2xvv66kxfd68dzf12")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From ca91d3522540851a327f0be22dc33cce1749e8d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 4 Oct 2018 11:21:37 +0200 Subject: gnu: guix: Update to 1d0be47. * gnu/packages/package-management.scm (guix): Update to 1d0be47. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 42172d8242..500abd5125 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -101,8 +101,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "0.15.0") - (commit "7fed9353ece5974ff431fa666a530da237a12085") - (revision 4)) + (commit "1d0be47ab680db938ac8da1ee65e1de91e198f67") + (revision 5)) (package (name "guix") @@ -118,7 +118,7 @@ (commit commit))) (sha256 (base32 - "11j13xszjcrf3barf38bixx3hbrfj5w81fskjp8gn6m42knx1yal")) + "19cn4ndmr9cqd7qh6w3nchbmdpaawdl9kc6g0v6g680vzcja417k")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From ddf72f505939e34dc2a287170174e7e4cfe4f829 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Oct 2018 15:54:57 +0200 Subject: gnu: perl-xml-feed: Update to 0.54. * gnu/packages/xml.scm (perl-xml-feed): Update to 0.54. --- gnu/packages/xml.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 2bf5ea3569..b5f44a4258 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -770,17 +770,17 @@ server, collect the answer, and finally decoding the XML to Perl.") (define-public perl-xml-feed (package (name "perl-xml-feed") - (version "0.53") + (version "0.54") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/D/DA/DAVECROSS/" "XML-Feed-" version ".tar.gz")) (sha256 (base32 - "07b165g6wk8kqwpl49r3n0kag6p2nrkyp3ch0h8qyxb6nrnkkq7c")))) + "0ydyi7wdhv8325h7j27vrlwiqxll56sn8zy5nbzhpma3nrf61bci")))) (build-system perl-build-system) (arguments - `(#:tests? #f)) ; Tests require internet connection + `(#:tests? #f)) ; tests require internet connection (native-inputs `(("perl-module-build" ,perl-module-build) ("perl-uri" ,perl-uri) -- cgit v1.2.3 From 4fab0da09651344959803015edf01adc2473354e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Oct 2018 15:46:01 +0200 Subject: gnu: html-xml-utils: Update to 7.7. * gnu/packages/xml.scm (html-xml-utils): Update to 7.7. --- gnu/packages/xml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index b5f44a4258..e14524a684 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -1120,7 +1120,7 @@ XSLT and EXSLT.") (define-public html-xml-utils (package (name "html-xml-utils") - (version "7.6") + (version "7.7") (source (origin (method url-fetch) @@ -1129,7 +1129,7 @@ XSLT and EXSLT.") version ".tar.gz")) (sha256 (base32 - "0l97ps089byy62838wf2jwvvc465iw29z9r5kwmwcq7f3bn11y3m")))) + "1vwqp5q276j8di9zql3kygf31z2frp2c59yjqlrvvwcvccvkcdwr")))) (build-system gnu-build-system) (home-page "https://www.w3.org/Tools/HTML-XML-utils/") (synopsis "Command line utilities to manipulate HTML and XML files") -- cgit v1.2.3 From 0136fbd167c38ef476baf1fea9354da5248c4a69 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Oct 2018 15:42:03 +0200 Subject: gnu: hexedit: Update to 1.4.2. * gnu/packages/hexedit.scm (hexedit): Update to 1.4.2. [source]: Use the author's more up-to-date git repository. [native-inputs]: Add autoconf and automake. --- gnu/packages/hexedit.scm | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/hexedit.scm b/gnu/packages/hexedit.scm index 88dbfb234d..9aea8e8700 100644 --- a/gnu/packages/hexedit.scm +++ b/gnu/packages/hexedit.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Kei Kebreau ;;; Copyright © 2017 Gábor Boskovits +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,25 +22,33 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (gnu packages) + #:use-module (gnu packages autotools) #:use-module (gnu packages compression) #:use-module (gnu packages ncurses) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system gnu)) (define-public hexedit (package (name "hexedit") - (version "1.2.13") + (version "1.4.2") (source (origin - (method url-fetch) - (uri (string-append "http://rigaux.org/" - name "-" version ".src.tgz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/pixel/hexedit.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1mwdp1ikk64cqmagnrrps5jkn3li3n47maiqh2qc1xbp1ains4ka")))) + "1xsxa5mip892jkvz9jshj73y6c7j3mgp8y393ciihqlyf2nmfs67")))) (build-system gnu-build-system) - (arguments '(#:tests? #f)) ; no check target - (inputs `(("ncurses" ,ncurses))) + (arguments '(#:tests? #f)) ; no check target + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake))) + (inputs + `(("ncurses" ,ncurses))) (synopsis "View and edit files or devices in hexadecimal or ASCII") (description "hexedit shows a file both in ASCII and in hexadecimal. The file can be a device as the file is read a piece at a time. You can modify -- cgit v1.2.3 From 68c0a6260fde80a5b11e286e1c964fe8eccb1d41 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Thu, 4 Oct 2018 19:59:35 +0530 Subject: gnu: geos: Update to 3.7.0. * gnu/packages/geo.scm (geos): Update to 3.7.0. --- gnu/packages/geo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 4275476e34..4481e21ddf 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -62,7 +62,7 @@ (define-public geos (package (name "geos") - (version "3.6.2") + (version "3.7.0") (source (origin (method url-fetch) (uri (string-append "http://download.osgeo.org/geos/geos-" @@ -70,7 +70,7 @@ ".tar.bz2")) (sha256 (base32 - "0ak5szby29l9l0vy43dm5z2g92xzdky20q1gc1kah1fnhkgi6nh4")))) + "1mrz778m6bd1x9k6sha5kld43kalhq79h2lynlx2jx7xjakl3gsg")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 38a9bf805d7ea476dce2a271bd93c36afb6ba3ae Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Oct 2018 16:09:53 +0200 Subject: gnu: mbedtls-apache: Update to 2.13.0 [security fixes]. * gnu/packages/tls.scm (mbedtls-apache): Update to 2.13.0. [native-inputs]: Add python. --- gnu/packages/tls.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index bf462981ee..f92a36b6e2 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -842,7 +842,7 @@ then ported to the GNU / Linux environment.") (define-public mbedtls-apache (package (name "mbedtls-apache") - (version "2.7.6") + (version "2.13.0") (source (origin (method url-fetch) @@ -852,13 +852,14 @@ then ported to the GNU / Linux environment.") version "-apache.tgz")) (sha256 (base32 - "0fl2nrxvlgx9ja7yy3kd1zadpr98fxbvn3f6fl2mj87gryhkfqlk")))) + "1nh6xfyxs3mnnpgc6pancvdhv6ihz9lhsxdlg90gqa8n5r6lwfsr")))) (build-system cmake-build-system) (arguments `(#:configure-flags (list "-DUSE_SHARED_MBEDTLS_LIBRARY=ON"))) (native-inputs - `(("perl" ,perl))) + `(("perl" ,perl) + ("python" ,python))) (synopsis "Small TLS library") (description "@code{mbed TLS}, formerly known as PolarSSL, makes it trivially easy -- cgit v1.2.3 From 8e87aa04979dae66a1e45b54c0f92da07745e1e6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Oct 2018 17:26:57 +0200 Subject: gnu: hiawatha: Update to 10.8.3. * gnu/packages/web.scm (hiawatha): Update to 10.8.3. [source]: Also delete bundled copy of nghttp2. [inputs]: Use mbedtls-for-hiawatha instead of vanilla mbedtls-apache. * gnu/packages/tls.scm (mbedtls-for-hiawatha): New public variable. --- gnu/packages/tls.scm | 18 ++++++++++++++++++ gnu/packages/web.scm | 15 ++++++++------- 2 files changed, 26 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index f92a36b6e2..715148c432 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -869,6 +869,24 @@ coding footprint.") (home-page "https://tls.mbed.org") (license license:asl2.0))) +;; The Hiawatha Web server requires some specific features to be enabled. +(define-public mbedtls-for-hiawatha + (hidden-package + (package + (inherit mbedtls-apache) + (arguments + (substitute-keyword-arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'configure 'configure-extra-features + (lambda _ + (for-each (lambda (feature) + (invoke "scripts/config.pl" "set" feature)) + (list "MBEDTLS_THREADING_C" + "MBEDTLS_THREADING_PTHREAD")) + #t))) + ,@(package-arguments mbedtls-apache))))))) + (define-public ghc-tls (package (name "ghc-tls") diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 8e776258b3..401711928d 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5173,7 +5173,7 @@ functions of Tidy.") (define-public hiawatha (package (name "hiawatha") - (version "10.7") + (version "10.8.3") (source (origin (method url-fetch) @@ -5181,15 +5181,16 @@ functions of Tidy.") "hiawatha-" version ".tar.gz")) (modules '((guix build utils))) (snippet '(begin - ;; We use our packaged mbedtls, so delete the included copy. - (delete-file-recursively "mbedtls") + ;; We use packaged libraries, so delete the bundled copies. + (for-each delete-file-recursively + (list "nghttp2" "mbedtls")) #t)) (sha256 (base32 - "0x2zfc8kc6c7rl4gwymwmg13w1c60biv6c6c9fvzpnl59bc9jgin")))) + "0w7047pwijhsbvvv1qjynp7gvn0nil56w82f7ax0gabrg7ddzk6s")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; No tests included + `(#:tests? #f ; no tests included #:configure-flags (list (string-append "-DUSE_SYSTEM_MBEDTLS=on") (string-append "-DENABLE_TOMAHAWK=on") (string-append "-DWEBROOT_DIR=" @@ -5212,8 +5213,8 @@ functions of Tidy.") (wrap-program (string-append sbin "/hiawatha") `("PATH" ":" prefix (,mbed))))))))) (inputs - ;; TODO: package "hiawatha-monitor", an optional dependency of "hiawatha" - `(("mbedtls-apache" ,mbedtls-apache) ;Hiawatha includes this version. + ;; TODO: package "hiawatha-monitor", an optional dependency of "hiawatha". + `(("mbedtls-apache" ,mbedtls-for-hiawatha) ("zlib" ,zlib) ("libxslt" ,libxslt) ("libxml2" ,libxml2))) -- cgit v1.2.3 From aff91b0d0bc4c4459625558dc547af3567b6e5f3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Oct 2018 19:04:37 +0200 Subject: gnu: hiawatha: Support HTTP/2. * gnu/packages/web.sck (hiawatha)[arguments]: USE_SYSTEM_NGHTTP2 to ENABLE_HTTP2. [inputs]: Add nghttp2:lib. --- gnu/packages/web.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 401711928d..01db03e79d 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5192,6 +5192,8 @@ functions of Tidy.") (arguments `(#:tests? #f ; no tests included #:configure-flags (list (string-append "-DUSE_SYSTEM_MBEDTLS=on") + (string-append "-DENABLE_HTTP2=on") + (string-append "-DUSE_SYSTEM_NGHTTP2=on") (string-append "-DENABLE_TOMAHAWK=on") (string-append "-DWEBROOT_DIR=" (assoc-ref %outputs "out") @@ -5214,10 +5216,11 @@ functions of Tidy.") `("PATH" ":" prefix (,mbed))))))))) (inputs ;; TODO: package "hiawatha-monitor", an optional dependency of "hiawatha". - `(("mbedtls-apache" ,mbedtls-for-hiawatha) - ("zlib" ,zlib) - ("libxslt" ,libxslt) - ("libxml2" ,libxml2))) + `(("libxslt" ,libxslt) + ("libxml2" ,libxml2) + ("mbedtls-apache" ,mbedtls-for-hiawatha) + ("nghttp2" ,nghttp2 "lib") + ("zlib" ,zlib))) (home-page "https://www.hiawatha-webserver.org") (synopsis "Webserver with focus on security") (description -- cgit v1.2.3 From e14b3067e324f05a852d216aec5432cc285dfcec Mon Sep 17 00:00:00 2001 From: David Thompson Date: Thu, 4 Oct 2018 11:05:06 -0400 Subject: gnu: guile-next: Add the correct native search paths. * gnu/packages/guile.scm (guile-next): Add native search paths for version 3.0. --- gnu/packages/guile.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 6d8ab71c78..04625827c5 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -355,7 +355,15 @@ without requiring the source code to be rewritten.") (lambda _ ;; Remove this test that's bound to fail. (delete-file "test-suite/tests/version.test") - #t))))))))) + #t)))))) + (native-search-paths + (list (search-path-specification + (variable "GUILE_LOAD_PATH") + (files '("share/guile/site/3.0"))) + (search-path-specification + (variable "GUILE_LOAD_COMPILED_PATH") + (files '("lib/guile/3.0/site-ccache" + "share/guile/site/3.0")))))))) (define (make-guile-readline guile) (package -- cgit v1.2.3 From 55b616fd15769c0d2f90eb8b1d0a1af6a9474a48 Mon Sep 17 00:00:00 2001 From: David Thompson Date: Thu, 4 Oct 2018 12:09:55 -0400 Subject: gnu: guile-next: Update to commit 6f3357b0df64c4be17e72079864c09a542f1c779. * gnu/packages/guile.scm (guile-next): Update to commit 6f3357b0df64c4be17e72079864c09a542f1c779. --- gnu/packages/guile.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 04625827c5..1d330668a7 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -318,8 +318,8 @@ without requiring the source code to be rewritten.") (define-public guile-next ;; This is the upcoming Guile 3.0, with JIT support. - (let ((commit "a74b4a45fab1a78e34954bce5f031e8a9765f827") - (revision "0")) + (let ((commit "6f3357b0df64c4be17e72079864c09a542f1c779") + (revision "1")) (package (inherit guile-2.2) (name "guile-next") @@ -331,7 +331,7 @@ without requiring the source code to be rewritten.") (commit commit))) (sha256 (base32 - "0kq6mabv7j4gdlwmpz3iaddv98sc7awkl2358sg8j50sg10yw8nx")) + "1c2xy5cflg0hws48914rz3z8mdmf8w3lblfic0kxnymcmdv9cbhv")) (file-name (git-file-name name version)))) (native-inputs `(("autoconf", autoconf) -- cgit v1.2.3 From 7382ecd81859de878b22a6510b8262abe69d38bf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 7 Mar 2018 16:54:43 +0100 Subject: gnu: Add nsd. * gnu/packages/dns.scm (nsd): New public variable. --- gnu/packages/dns.scm | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 4fc1c25229..ad1a8638bc 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -289,6 +289,77 @@ asynchronous fashion.") (license:non-copyleft "file://LICENSE") ; includes.h license:openssl)))) +(define-public nsd + (package + (name "nsd") + (version "4.1.25") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.nlnetlabs.nl/downloads/nsd/nsd-" + version ".tar.gz")) + (sha256 + (base32 + "0zyzjd3wmq258jiry62ci1z23qfd0rc5ggnpmybc60xvpddgynwg")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list "--enable-pie" ; fully benefit from ASLR + "--enable-ratelimit" + "--enable-recvmmsg" + "--enable-relro-now" ; protect GOT and .dtor areas + "--disable-radix-tree" + (string-append "--with-libevent=" + (assoc-ref %build-inputs "libevent")) + (string-append "--with-ssl=" + (assoc-ref %build-inputs "openssl")) + "--with-configdir=/etc" + "--with-nsd_conf_file=/etc/nsd/nsd.conf" + "--with-logfile=/var/log/nsd.log" + "--with-pidfile=/var/db/nsd/nsd.pid" + "--with-dbfile=/var/db/nsd/nsd.db" + "--with-zonesdir=/etc/nsd" + "--with-xfrdfile=/var/db/nsd/xfrd.state" + "--with-zonelistfile=/var/db/nsd/zone.list") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'patch-installation-paths + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/" ,name "-" ,version))) + ;; The ‘make install’ target tries to create the parent + ;; directories of run-time things like ‘pidfile’ above, and + ;; useless empty directories like 'configdir'. Remove such + ;; '$(INSTALL)' lines and install the example configuration file + ;; in an appropriate location. + (substitute* "Makefile.in" + ((".*INSTALL.*\\$\\((config|pid|xfr|db)dir" command) + (string-append "#" command)) + (("\\$\\(nsdconfigfile\\)\\.sample" file-name) + (string-append doc "/examples/" file-name))) + #t)))) + #:tests? #f)) ; no tests + (inputs + `(("libevent" ,libevent) + ("openssl" ,openssl))) + (home-page "https://www.nlnetlabs.nl/projects/nsd/about/") + (synopsis "Authoritative DNS name server") + (description "@dfn{NSD}, short for Name Server Daemon, is an authoritative +name server for the Domain Name System (@dfn{DNS}). It aims to be a fast and +RFC-compliant nameserver. + +NSD uses zone information compiled via @command{zonec} into a binary database +file (@file{nsd.db}). This allows fast startup of the name service daemon and +allows syntax-structural errors in zone files to be flagged at compile time, +before being made available to NSD service itself. However, most traditional +BIND-style zone files can be directly imported into NSD without modification. + +The collection of programs and processes that make up NSD are designed so that +the daemon itself runs as a non-privileged user and can be easily configured to +run in a @code{chroot} jail, thus making any security flaws in NSD less likely +to result in system-wide compromise.") + (license (list license:bsd-3)))) + (define-public unbound (package (name "unbound") -- cgit v1.2.3 From b9b53fb4ffa188a2dad2b3062a552877f1124750 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Oct 2018 21:26:38 +0200 Subject: gnu: hwloc: Update to 2.0.2. * gnu/packages/mpi.scm (hwloc): Update to 2.0.2. --- gnu/packages/mpi.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 7dfec16fc7..fc8aadef29 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2016 Andreas Enge ;;; Copyright © 2017 Dave Love ;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -125,7 +126,7 @@ bind processes, and much more.") ;; Note: 2.0 isn't the default yet, see above. (package (inherit hwloc) - (version "2.0.1") + (version "2.0.2") (source (origin (method url-fetch) (uri (string-append "https://www.open-mpi.org/software/hwloc/v" @@ -133,7 +134,7 @@ bind processes, and much more.") "/downloads/hwloc-" version ".tar.bz2")) (sha256 (base32 - "0jf0krj1h95flmb784ifv9vnkdnajjz00p4zbhmja7vm4v67axdr")))) + "1phc863d5b2fvwpyyq4mlh4rkjdslh6h0h197zmyk3prwrq7si8l")))) ;; libnuma is no longer needed. (inputs (alist-delete "numactl" (package-inputs hwloc))) -- cgit v1.2.3 From d8b042326dda505c8e65789572e3dd65311ba8e3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Oct 2018 19:52:03 +0200 Subject: gnu: hiawatha: Set sane run-time directory defaults. * gnu/packages/web.scm (hiawatha)[arguments]: Set sane default directories. Replace the 'remove-empty-dirs' phase with a 'install-no-empty-directories' one. --- gnu/packages/web.scm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 01db03e79d..c3b06b05bc 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5195,17 +5195,20 @@ functions of Tidy.") (string-append "-DENABLE_HTTP2=on") (string-append "-DUSE_SYSTEM_NGHTTP2=on") (string-append "-DENABLE_TOMAHAWK=on") + (string-append "-DLOG_DIR=/var/log/hiawatha") + (string-append "-DPID_DIR=/run") (string-append "-DWEBROOT_DIR=" (assoc-ref %outputs "out") - "/share/hiawatha/html")) + "/share/hiawatha/html") + (string-append "-DWORK_DIR=/var/lib/hiawatha")) #:phases (modify-phases %standard-phases - (add-after 'install 'remove-empty-dirs - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out"))) - ;; The directories in "var" are empty, remove them. - (delete-file-recursively (string-append out "/var")) - #t))) + (add-after 'unpack 'install-no-empty-directories + (lambda _ + (substitute* "CMakeLists.txt" + (("install\\(DIRECTORY DESTINATION" match) + (string-append "#" match))) + #t)) (add-after 'install 'wrap (lambda* (#:key inputs outputs #:allow-other-keys) ;; Make sure 'hiawatha' finds 'mbedtls'. -- cgit v1.2.3 From 9e2aa70bad8c06cdf9a44065a31f12b3205e92e0 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Wed, 26 Sep 2018 12:59:54 +0100 Subject: gnu: petsc-openmpi: Configure with support for MUMPS solver. * gnu/packages/maths.scm (petsc-openmpi)[inputs]: Add metis, mumps-openmpi, scalapack and pt-scotch. [arguments]: Add "--with-PACKAGENAME=1" flags. Move 'mpi-setup' phase ahead of 'configure' phase. Signed-off-by: Leo Famulari --- gnu/packages/maths.scm | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index b7d669ccea..766c6e920f 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1702,13 +1702,21 @@ scientific applications modeled by partial differential equations.") (package (inherit petsc) (name "petsc-openmpi") (inputs - `(("openmpi" ,openmpi) - ("hdf5" ,hdf5-parallel-openmpi) + `(("hdf5" ,hdf5-parallel-openmpi) + ("metis" ,metis) + ("mumps" ,mumps-openmpi) + ("openmpi" ,openmpi) + ("scalapack" ,scalapack) + ("scotch" ,pt-scotch) ,@(package-inputs petsc))) (arguments (substitute-keyword-arguments (package-arguments petsc) ((#:configure-flags cf) ``("--with-mpiexec=mpirun" + "--with-metis=1" + "--with-mumps=1" + "--with-scalapack=1" + "--with-ptscotch=1" ,(string-append "--with-mpi-dir=" (assoc-ref %build-inputs "openmpi")) ,(string-append "--with-hdf5-include=" @@ -1718,9 +1726,9 @@ scientific applications modeled by partial differential equations.") ,@(delete "--with-mpi=0" ,cf))) ((#:phases phases) `(modify-phases ,phases - (add-before 'check 'mpi-setup + (add-before 'configure 'mpi-setup ,%openmpi-setup))))) - (synopsis "Library to solve PDEs (with MPI support)"))) + (synopsis "Library to solve PDEs (with MUMPS and MPI support)"))) (define-public petsc-complex-openmpi (package (inherit petsc-complex) @@ -1737,7 +1745,6 @@ scientific applications modeled by partial differential equations.") ,@(delete "--with-mpi=0" ,cf))))) (synopsis "Library to solve PDEs (with complex scalars and MPI support)"))) - (define-public python-kiwisolver (package (name "python-kiwisolver") -- cgit v1.2.3 From 45f4ddd7c017ebfc8096f702c72a1fdac67787ed Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 4 Oct 2018 20:34:08 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.131. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.131. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ec2520cdff..2b36d8b93c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -446,8 +446,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.130" - "1l3ra1pbgz0wbpp1ci90sj9x9iamvagx1vdbdfbmpjsgh1cfnpmq" + (make-linux-libre "4.9.131" + "11pxwl7dmisbf2szg9qzkvhlpk68clh5l478n7b62q7hd8j3hxlv" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From 2195636cc185b38aa66abc5a4de2b7965c18fa02 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 4 Oct 2018 20:34:50 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.74. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.74. (%linux-libre-4.14-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2b36d8b93c..2a7e1d846f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -436,8 +436,8 @@ It has been modified to remove all non-free binary blobs.") #:patches %linux-libre-4.18-patches #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.73") -(define %linux-libre-4.14-hash "0s2aphqgasx0lnprb2hzaqgbcd5i9774gfyhz5a6sqj6dygr00xy") +(define %linux-libre-4.14-version "4.14.74") +(define %linux-libre-4.14-hash "0cxyx2yinnc8q0hmhb0swjgdz3s0ry7wxzyqss9f2i74xjjz4rm0") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.2.3 From 2e073dc23c27e9fc2e255ee47d2025d044df7c8e Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 4 Oct 2018 20:35:38 -0400 Subject: gnu: linux-libre: Update to 4.18.12. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.18.12. (%linux-libre-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2a7e1d846f..d52e8d7d19 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -405,8 +405,8 @@ It has been modified to remove all non-free binary blobs.") ;; supports qemu "virt" machine and possibly a large number of ARM boards. ;; See : https://wiki.debian.org/DebianKernel/ARMMP. -(define %linux-libre-version "4.18.11") -(define %linux-libre-hash "1r4yf7gr7rf8igkg5jv781wa8vn6ii7fsdnffyshin1slnxbd79k") +(define %linux-libre-version "4.18.12") +(define %linux-libre-hash "1mcnb1mm7m6i9s591c3kx0f1vbzhbl3w92w137swcm9zifqpci5r") (define %linux-libre-4.18-patches (list %boot-logo-patch -- cgit v1.2.3 From 4a5e2a90d8595885ecda1e577df4a6a0d294d643 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 4 Oct 2018 19:24:39 -0400 Subject: gnu: icecat: Add fixes from mozilla-esr60 [security fixes]. Includes fixes for CVE-2018-12386 and CVE-2018-12387. * gnu/packages/gnuzilla.scm (icecat)[source]: Add selected fixes from the upstream mozilla-esr60 repository. --- gnu/packages/gnuzilla.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index ea3b61c231..d2110f3290 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -502,7 +502,23 @@ security standards.") (search-patch "icecat-use-system-media-libs.patch") (mozilla-patch "icecat-CVE-2018-12385.patch" "80a4a7ef2813" "1vgcbimpnfjqj934v0cryq1g13xac3wfmd4jyhcb5s60x8xyssf5") (search-patch "icecat-CVE-2018-12383.patch") - (mozilla-patch "icecat-bug-1489744.patch" "6546ee839d30" "11mhvj77r789b428bfxqq5wdx8yr7lbrdjzr8qjj6fw197pldn51"))) + (mozilla-patch "icecat-bug-1489744.patch" "6546ee839d30" "11mhvj77r789b428bfxqq5wdx8yr7lbrdjzr8qjj6fw197pldn51") + (mozilla-patch "icecat-CVE-2018-12386.patch" "4808fcb2e6ca" "05sc881l7sh8bag8whd2ggdn198lskqcxq8f41scfpqscw6xs5d5") + (mozilla-patch "icecat-CVE-2018-12387.patch" "b8f5c37486e1" "0lvmbh126m695kgdbasy1y5xh9n1j08cwdhn071mgvj6yn8cns5z") + (mozilla-patch "icecat-bug-1464751.patch" "d5d00faf0465" "1mj7dbb06brwrk0mvap0z4lfl2hwz1cj6dwjvdrisxm046pdw98i") + (mozilla-patch "icecat-bug-1472538.patch" "11462f2b98f2" "1nxgh0plzilylx8r73r7d74pv66qwjqxmd7nqii33p0snl2jjfzs") + (mozilla-patch "icecat-bug-1478685.patch" "098585dc86fc" "1b0x4qdh6isvffmibvc8ad8z62m3iky9q6jq0z6gyvn8q252cqal") + (mozilla-patch "icecat-bug-1486080.patch" "3f8d57d936ea" "0pz2c18wcgj44v0j8my9xbm90m4bsjcvzmavj569fi8bh6s6zz8p") + (mozilla-patch "icecat-bug-1423278.patch" "878ceaee5634" "0i47s5nvrx9vqbnj6s9y9f4ffww20p8nviqa6frg676y1188xlyl") + (mozilla-patch "icecat-bug-1442010.patch" "87be1b98ec9a" "15f4l18c7hz9aqn89gg3dwmdidfwgn10dywgpzydm8mps45amx7j") + (mozilla-patch "icecat-bug-1484559.patch" "99e58b5307ce" "02fdgbliwzi2r2376wg6k1rky1isfka0smac4ii2cll01jhpfrn6") + (mozilla-patch "icecat-bug-1487098.patch" "f25ce451a492" "18nzg39iyxza1686180qk9cc88l5j2hf1h35d62lrqmdgd9vcj33") + (mozilla-patch "icecat-bug-1484905.patch" "35c26bc231df" "0qh8d4z6y03h5xh7djci26a01l6zq667lg2k11f6zzg7z2j0h67x") + (mozilla-patch "icecat-bug-1488061.patch" "050d0cfa8e3d" "05ql798ynbyz5pvyri4b95j4ixmgnny3zl7sd2ckfrrbm9mxh627") + (mozilla-patch "icecat-bug-1434963-pt1.patch" "1e6dad87efed" "1v00a6cmgswjk54041jyv1ib129fxshpzwk6mn6lr0v5hylk3bx9") + (mozilla-patch "icecat-bug-1434963-pt2.patch" "6558c46df9ea" "0vdy9dm9w5k1flhcfxwvvff0aa415b5mgmmq5r37i83686768xfb") + (mozilla-patch "icecat-bug-1434963-pt3.patch" "686fcfa8abd6" "0ihqr11aq4b0y7mx7bwn8yzn25mv3k2gdphm951mj1g85qg35ann") + (mozilla-patch "icecat-bug-1491132.patch" "14120e0c74d6" "188c5fbhqqhmlk88p70l6d97skh7xy4jhqdby1ri3h9ix967515j"))) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From bd5f5eece9fc208de01190cd25dce9c281acddd6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 4 Oct 2018 21:14:43 +0200 Subject: gnu: htslib: Update to 1.9. * gnu/packages/bioinformatics.scm (htslib): Update to 1.9. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b657bf6771..64d7e1c869 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -3512,7 +3512,7 @@ performance.") (define-public htslib (package (name "htslib") - (version "1.8") + (version "1.9") (source (origin (method url-fetch) (uri (string-append @@ -3520,7 +3520,7 @@ performance.") version "/htslib-" version ".tar.bz2")) (sha256 (base32 - "18bw0mn9pj5wgarnlaxmf1bb8pdqgl1zd6czirqcr62ajpn1xvy0")))) + "16ljv43sc3fxmv63w7b2ff8m1s7h89xhazwmbm1bicz8axq8fjz0")))) (build-system gnu-build-system) (inputs `(("openssl" ,openssl) -- cgit v1.2.3 From 4ae4a15232bff0e93cbfc5d48e49a29a23a73cd6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 4 Oct 2018 21:15:47 +0200 Subject: gnu: samtools: Update to 1.9. * gnu/packages/bioinformatics.scm (samtools): Update to 1.9. [origin]: Remove bundled htslib sources. [arguments]: Remove obsolete make-flags. --- gnu/packages/bioinformatics.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 64d7e1c869..996e3731f3 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4997,7 +4997,7 @@ to the user's query of interest.") (define-public samtools (package (name "samtools") - (version "1.8") + (version "1.9") (source (origin (method url-fetch) @@ -5006,15 +5006,19 @@ to the user's query of interest.") version "/samtools-" version ".tar.bz2")) (sha256 (base32 - "05myg7bs90i68qbqab9cdg9rqj2xh39azibrx82ipzc5kcfvqhn9")))) + "10ilqbmm7ri8z431sn90lvbjwizd0hhkf9rcqw8j823hf26nhgq8")) + (modules '((guix build utils))) + (snippet '(begin + ;; Delete bundled htslib. + (delete-file-recursively "htslib-1.9") + #t)))) (build-system gnu-build-system) (arguments `(#:modules ((ice-9 ftw) (ice-9 regex) (guix build gnu-build-system) (guix build utils)) - #:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out"))) - #:configure-flags (list "--with-ncurses" "--with-htslib=system") + #:configure-flags (list "--with-ncurses") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-tests -- cgit v1.2.3 From f79b59e3114af8fcd598427655f3ab9512d58164 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 4 Oct 2018 21:18:34 +0200 Subject: gnu: bcftools: Update to 1.9. * gnu/packages/bioinformatics.scm (bcftools): Update to 1.9. [arguments]: Remove obsolete make flags. --- gnu/packages/bioinformatics.scm | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 996e3731f3..8a79f66823 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -288,34 +288,25 @@ BAM files.") (define-public bcftools (package (name "bcftools") - (version "1.8") + (version "1.9") (source (origin (method url-fetch) - (uri (string-append - "https://github.com/samtools/bcftools/releases/download/" - version "/bcftools-" version ".tar.bz2")) + (uri (string-append "https://github.com/samtools/bcftools/" + "releases/download/" + version "/bcftools-" version ".tar.bz2")) (sha256 (base32 - "1vgw2mwngq20c530zim52zvgmw1lci8rzl33pvh44xqk3xlzvjsa")) + "1j3h638i8kgihzyrlnpj82xg1b23sijibys9hvwari3fy7kd0dkg")) (modules '((guix build utils))) (snippet '(begin ;; Delete bundled htslib. - (delete-file-recursively "htslib-1.8") + (delete-file-recursively "htslib-1.9") #t)))) (build-system gnu-build-system) (arguments - `(#:test-target "test" - #:configure-flags (list "--with-htslib=system") - #:make-flags - (list - "USE_GPL=1" - "LIBS=-lgsl -lgslcblas" - (string-append "prefix=" (assoc-ref %outputs "out")) - (string-append "HTSDIR=" (assoc-ref %build-inputs "htslib") "/include") - (string-append "HTSLIB=" (assoc-ref %build-inputs "htslib") "/lib/libhts.so") - (string-append "BGZIP=" (assoc-ref %build-inputs "htslib") "/bin/bgzip") - (string-append "TABIX=" (assoc-ref %build-inputs "htslib") "/bin/tabix") - (string-append "PACKAGE_VERSION=" ,version)) + `(#:configure-flags + (list "--enable-libgsl") + #:test-target "test" #:phases (modify-phases %standard-phases (add-before 'check 'patch-tests -- cgit v1.2.3 From 1a28b9ab55b36f420ed24acd4c957b7fc0fe33b2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 4 Oct 2018 21:31:24 +0200 Subject: gnu: python-plotly: Add python-pandas to inputs. * gnu/packages/graph.scm (python-plotly)[propagated-inputs]: Add python-pandas. --- gnu/packages/graph.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index 245ee8f956..cb314719b7 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -224,6 +224,7 @@ lines.") (propagated-inputs `(("python-decorator" ,python-decorator) ("python-nbformat" ,python-nbformat) + ("python-pandas" ,python-pandas) ("python-pytz" ,python-pytz) ("python-requests" ,python-requests) ("python-six" ,python-six))) -- cgit v1.2.3 From 939882f73430ae7644b3c7913cb389cf00c234e0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 4 Oct 2018 21:32:06 +0200 Subject: gnu: python-pysam: Update to 0.15.1. * gnu/packages/bioinformatics.scm (python-pysam): Update to 0.15.1. [source]: Fetch from git. [arguments]: Delete tests requiring internet access; use "invoke". [inputs]: Add curl. --- gnu/packages/bioinformatics.scm | 55 ++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 26 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 8a79f66823..4c1739f1b1 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1436,17 +1436,17 @@ multiple sequence alignments.") (define-public python-pysam (package (name "python-pysam") - (version "0.13.0") + (version "0.15.1") (source (origin - (method url-fetch) + (method git-fetch) ;; Test data is missing on PyPi. - (uri (string-append - "https://github.com/pysam-developers/pysam/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (uri (git-reference + (url "https://github.com/pysam-developers/pysam.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0dzap2axin9cbbl0d825w294bpn00zagfm1sigamm4v2pm5bj9lp")) + "1vj367w6xbn9bpmksm162l1aipf7cj97h1q83y7jcpm33ihwpf7x")) (modules '((guix build utils))) (snippet '(begin ;; Drop bundled htslib. TODO: Also remove samtools @@ -1473,6 +1473,11 @@ multiple sequence alignments.") #t)) (replace 'check (lambda* (#:key inputs outputs #:allow-other-keys) + ;; This file contains tests that require a connection to the + ;; internet. + (delete-file "tests/tabix_test.py") + ;; FIXME: This test fails + (delete-file "tests/AlignmentFile_test.py") ;; Add first subdirectory of "build" directory to PYTHONPATH. (setenv "PYTHONPATH" (string-append @@ -1483,28 +1488,26 @@ multiple sequence alignments.") ;; Step out of source dir so python does not import from CWD. (with-directory-excursion "tests" (setenv "HOME" "/tmp") - (and (zero? (system* "make" "-C" "pysam_data")) - (zero? (system* "make" "-C" "cbcf_data")) - ;; Running nosetests without explicitly asking for a - ;; single process leads to a crash. Running with multiple - ;; processes fails because the tests are not designed to - ;; run in parallel. - - ;; FIXME: tests keep timing out on some systems. - ;; (zero? (system* "nosetests" "-v" - ;; "--processes" "1")) - ))))))) - (propagated-inputs - `(("htslib" ,htslib))) ; Included from installed header files. + (invoke "make" "-C" "pysam_data") + (invoke "make" "-C" "cbcf_data") + ;; Running nosetests without explicitly asking for a single + ;; process leads to a crash. Running with multiple processes + ;; fails because the tests are not designed to run in parallel. + + ;; FIXME: tests keep timing out on some systems. + (invoke "nosetests" "-v" "--processes" "1"))))))) + (propagated-inputs + `(("htslib" ,htslib))) ; Included from installed header files. (inputs - `(("ncurses" ,ncurses) - ("zlib" ,zlib))) + `(("ncurses" ,ncurses) + ("curl" ,curl) + ("zlib" ,zlib))) (native-inputs - `(("python-cython" ,python-cython) + `(("python-cython" ,python-cython) ;; Dependencies below are are for tests only. - ("samtools" ,samtools) - ("bcftools" ,bcftools) - ("python-nose" ,python-nose))) + ("samtools" ,samtools) + ("bcftools" ,bcftools) + ("python-nose" ,python-nose))) (home-page "https://github.com/pysam-developers/pysam") (synopsis "Python bindings to the SAMtools C API") (description -- cgit v1.2.3 From 8e72f0f3190443935c03264037c83099ed68445f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 4 Oct 2018 21:34:16 +0200 Subject: gnu: deeptools: Update to 3.1.2. * gnu/packages/bioinformatics.scm (deeptools): Update to 3.1.2. [source]: Fetch from git. [arguments]: Delete reset-gzip-timestamps phase. [inputs]: Add python-plotly. --- gnu/packages/bioinformatics.scm | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 4c1739f1b1..39c84bf4c8 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2006,18 +2006,25 @@ with Python.") (define-public deeptools (package (name "deeptools") - (version "2.5.1") + (version "3.1.2") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/deeptools/deepTools/" - "archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/deeptools/deepTools.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1q8i12l2gvk4n2s8lhyzwhh9g4qbc8lrk5l7maz00yvd5g6z5540")))) + "06fdpp6cg3xiwryxjhixvfysl4z0ps1crjgia587qa9ikqpsa7fd")))) (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; This phase fails, but it's not needed. + (delete 'reset-gzip-timestamps)))) (inputs - `(("python-scipy" ,python-scipy) + `(("python-plotly" ,python-plotly) + ("python-scipy" ,python-scipy) ("python-numpy" ,python-numpy) ("python-numpydoc" ,python-numpydoc) ("python-matplotlib" ,python-matplotlib) -- cgit v1.2.3 From a6798218bea0d6b2df598042d1ced29f74bb4250 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 4 Oct 2018 22:49:49 +0200 Subject: gnu: samtools-0.1: Adjust to match changes in samtools. * gnu/packages/bioinformatics.scm (samtools-0.1)[arguments]: Override make flags. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 39c84bf4c8..d48f484e03 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5073,9 +5073,9 @@ viewer.") (base32 "1m33xsfwz0s8qi45lylagfllqg7fphf4dr0780rsvw75av9wk06h")))) (arguments `(#:tests? #f ;no "check" target + #:make-flags + (list "LIBCURSES=-lncurses") ,@(substitute-keyword-arguments (package-arguments samtools) - ((#:make-flags flags) - `(cons "LIBCURSES=-lncurses" ,flags)) ((#:phases phases) `(modify-phases ,phases (replace 'install -- cgit v1.2.3 From e65b2181e8b436278e3dd0b405602a400fbd0a75 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 5 Oct 2018 19:05:39 +0200 Subject: 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(+) (limited to 'gnu') 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 -- cgit v1.2.3 From 38aca674c3bcd2ace1c6ec79c8b58343c8eea403 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 5 Oct 2018 15:22:55 +0200 Subject: gnu: libfilezilla: Update to 0.14.0. * gnu/packages/ftp.scm (libfilezilla): Update to 0.14.0. --- gnu/packages/ftp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm index faf9f5dd10..6d89626fe0 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm @@ -170,7 +170,7 @@ as required.") (define-public libfilezilla (package (name "libfilezilla") - (version "0.13.2") + (version "0.14.0") (source (origin (method url-fetch) @@ -178,7 +178,7 @@ as required.") name "/" name "-" version ".tar.bz2")) (sha256 (base32 - "0z9cqscca4w94j9npgcknrrw8gfwn5ids903042fczlr977j0i19")))) + "15cfz98asypf9rfybv4c6kx8nk3wak7qlm1azldc0gd1nqm4xqvz")))) (build-system gnu-build-system) (native-inputs `(("cppunit" ,cppunit) -- cgit v1.2.3 From 3f904456923d6ba658ccf5f164511478f430afa5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 5 Oct 2018 19:11:28 +0200 Subject: gnu: filezilla: Update to 3.37.4. * gnu/packages/ftp.scm (filezilla): Update to 3.37.4. --- gnu/packages/ftp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm index 6d89626fe0..b9c6d209b8 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm @@ -207,14 +207,14 @@ output. (define-public filezilla (package (name "filezilla") - (version "3.37.1") + (version "3.37.4") (source (origin (method url-fetch) (uri (string-append "https://download.filezilla-project.org/client/" "FileZilla_" version "_src.tar.bz2")) (sha256 - (base32 "1bbxlm8gc0r5jing8xmkdbhj5a1qfbjn8varhny3mrk1am4m7s7l")))) + (base32 "169wy7ilsh518mcinkjmr6m0kzxbzchmc9mivf5c9b4zp1w4gg3i")))) (build-system gnu-build-system) (arguments ;; Don't let filezilla phone home to check for updates. -- cgit v1.2.3 From 8713c03e557114c576c796400300d0dbab4f06c8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Oct 2018 22:16:36 +0200 Subject: gnu: audacity: Don't use unstable tarball. * gnu/packages/audio.scm (audacity)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/audio.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index c92b5056d1..434efab953 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -291,12 +291,14 @@ engineers, musicians, soundtrack editors and composers.") (version "2.2.2") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/audacity/audacity/archive" - "/Audacity-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/audacity/audacity.git") + (commit (string-append "Audacity-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "18q7i77ynihx7xp45lz2lv0k0wrh6736pcrivlpwrxjgbvyqx7km")) + "10maxmjxbmjybj7n4m7a9bbm7g8xxw8f8vbsf7c9ih5j2gr15ihs")) (patches (search-patches "audacity-build-with-system-portaudio.patch")) (modules '((guix build utils))) (snippet -- cgit v1.2.3 From b008a12ae78b533c14dd7e88f29df091eca3c0d7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Oct 2018 21:59:55 +0200 Subject: gnu: fdroidserver: Update to 1.0.10. * gnu/packages/android.scm (fdroidserver): Update to 1.0.10. --- gnu/packages/android.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index 53d7d8d441..9f8d850ff5 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -863,14 +863,14 @@ useful for reverse engineering, analysis of Android applications and more.") (define-public fdroidserver (package (name "fdroidserver") - (version "1.0.9") + (version "1.0.10") (source (origin (method url-fetch) (uri (pypi-uri "fdroidserver" version)) (sha256 (base32 - "0cwb1fmindw6v9jkiim9yn3496rk1pvnk94s1r0vz2hxgz16xp7n")))) + "0n6kkby65qzqdx1jn72grfffvr1w1j1rby5pwm9z8rymmsh8s0pm")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From fc4738149f5cbaffc8e0b37bfb61e25fac0ecd67 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Oct 2018 00:30:53 +0200 Subject: gnu: Add bastet. * gnu/packages/games.scm (bastet): New public variable. * gnu/packages/patches/bastet-change-source-of-unordered_set.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/games.scm | 64 ++++++++++++++++++++++ .../bastet-change-source-of-unordered_set.patch | 40 ++++++++++++++ 3 files changed, 105 insertions(+) create mode 100644 gnu/packages/patches/bastet-change-source-of-unordered_set.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 61e5913a01..8c6579b03f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -591,6 +591,7 @@ dist_patch_DATA = \ %D%/packages/patches/awesome-reproducible-png.patch \ %D%/packages/patches/azr3.patch \ %D%/packages/patches/bash-completion-directories.patch \ + %D%/packages/patches/bastet-change-source-of-unordered_set.patch \ %D%/packages/patches/bazaar-CVE-2017-14176.patch \ %D%/packages/patches/beignet-correct-file-names.patch \ %D%/packages/patches/binutils-aarch64-symbol-relocation.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index ec92f508bc..7365a7f5d8 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -181,6 +181,70 @@ more advanced player there are new game modes and a wide variety of physics settings to tweak as well.") (license license:gpl2+))) +(define-public bastet + (package + (name "bastet") + (version "0.43.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fph/bastet.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "09kamxapm9jw9przpsgjfg33n9k94bccv65w95dakj0br33a75wn")) + (patches + (search-patches "bastet-change-source-of-unordered_set.patch")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags + (list (string-append "CXXFLAGS=-I" + (assoc-ref %build-inputs "boost") "/include")) + #:phases + (modify-phases %standard-phases + (delete 'configure) ; no configure script + (replace 'check + ;; The 'Test' target builds the tests, but doesn't actually run them. + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "Test" make-flags) + (setenv "HOME" ".") + (invoke "./Test"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share")) + (hicolor (string-append share "/icons/hicolor"))) + (install-file "bastet" + (string-append out "/bin")) + + (install-file "bastet.desktop" + (string-append share "/applications")) + (install-file "bastet.svg" + (string-append hicolor "/scalable/apps")) + + (install-file "bastet.appdata.xml" + (string-append share "/appdata")) + + (install-file "bastet.6" + (string-append out "/share/man/man6")) + #t)))))) + (native-inputs + `(("hicolor-icon-theme" ,hicolor-icon-theme))) + (inputs + `(("boost" ,boost) + ("ncurses" ,ncurses))) + (home-page "http://fph.altervista.org/prog/bastet.html") + (synopsis "Antagonistic Tetris-style falling brick game for text terminals") + (description + "Bastet (short for Bastard Tetris) is a simple ncurses-based falling brick +game. Unlike normal Tetris, Bastet does not choose the next brick at random. +Instead, it uses a special algorithm to choose the worst brick possible. + +Playing bastet can be a painful experience, especially if you usually make +canyons and wait for the long I-shaped block to clear four rows at a time.") + (license license:gpl3+))) + (define-public cataclysm-dda (let ((commit "ad3b0c3d521292d119f97a83390e7acfe9e9e7f7") (revision "1")) diff --git a/gnu/packages/patches/bastet-change-source-of-unordered_set.patch b/gnu/packages/patches/bastet-change-source-of-unordered_set.patch new file mode 100644 index 0000000000..ef3970a3e2 --- /dev/null +++ b/gnu/packages/patches/bastet-change-source-of-unordered_set.patch @@ -0,0 +1,40 @@ +From: Tobias Geerinckx-Rice +Date: Wed, 3 Oct 2018 23:30:42 +0200 +Subject: [PATCH] bastet: Change source of unordered_set. + +This allows building bastet 0.43.2 with boost >=1.66. +It was backported verbatim from the upstream master branch. + +From 0e03f8d4d6bc6949cf1c447e632ce0d1b98c4be1 Mon Sep 17 00:00:00 2001 +From: Federico Poloni +Date: Wed, 4 Oct 2017 19:35:01 +0200 +Subject: [PATCH] Changed source of unordered_set (should hopefully fix #6 + without reopening #1) + +--- + BastetBlockChooser.hpp | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/BastetBlockChooser.hpp b/BastetBlockChooser.hpp +index 992e556..7ee3b7c 100644 +--- a/BastetBlockChooser.hpp ++++ b/BastetBlockChooser.hpp +@@ -23,8 +23,7 @@ + + #include "Well.hpp" + +-#include +-#include ++#include + #include + + namespace Bastet{ +@@ -75,7 +74,7 @@ namespace Bastet{ + public: + Searcher(BlockType b, const Well *well, Vertex v, WellVisitor *visitor); + private: +- std::tr1::unordered_set _visited; ++ boost::unordered_set _visited; + //std::set _visited; ^^ the above is more efficient, we need to do many inserts + BlockType _block; + const Well *_well; -- cgit v1.2.3 From 73ca145a7eee5a4613469956d214880850e63a40 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sun, 16 Sep 2018 22:13:41 -0400 Subject: gnu: gnucash: Update to 3.3. * gnu/packages/patches/gnucash-disable-failing-tests.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/gnucash.scm (gnucash): Update to 3.3. [source]: Add patch. [arguments]: Add 'set-env-vars', 'glib-or-gtk-compile-schemas', and 'glib-or-gtk-wrap' phases. --- gnu/local.mk | 1 + gnu/packages/gnucash.scm | 49 +++++++++++++++++----- .../patches/gnucash-disable-failing-tests.patch | 39 +++++++++++++++++ .../patches/gnucash-price-quotes-perl.patch | 5 ++- 4 files changed, 81 insertions(+), 13 deletions(-) create mode 100644 gnu/packages/patches/gnucash-disable-failing-tests.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 8c6579b03f..8f854e98b5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -762,6 +762,7 @@ dist_patch_DATA = \ %D%/packages/patches/gnome-todo-libical-compat.patch \ %D%/packages/patches/gnome-tweak-tool-search-paths.patch \ %D%/packages/patches/gnucash-price-quotes-perl.patch \ + %D%/packages/patches/gnucash-disable-failing-tests.patch \ %D%/packages/patches/gnutls-skip-trust-store-test.patch \ %D%/packages/patches/gnutls-skip-pkgconfig-test.patch \ %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \ diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm index fc8a9b6bfc..45720df9a4 100644 --- a/gnu/packages/gnucash.scm +++ b/gnu/packages/gnucash.scm @@ -28,6 +28,7 @@ #:use-module (guix build-system cmake) #:use-module (gnu packages) #:use-module (gnu packages autotools) + #:use-module (gnu packages base) #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages cmake) @@ -50,7 +51,7 @@ (define-public gnucash (package (name "gnucash") - (version "3.0") + (version "3.3") (source (origin (method url-fetch) @@ -58,11 +59,9 @@ version "/gnucash-" version ".tar.bz2")) (sha256 (base32 - "1ffvf1rryg5yin86fnf1zvy6hnpwzrjarbdfmjmrf2mqlmv48xac")) - - ;; TODO: rebase this patch -; (patches (search-patches "gnucash-price-quotes-perl.patch")) - )) + "0grr5qi5rn1xvr7qx5d7mcxa2mcgycy2b325ry73bb485a6yv5l3")) + (patches (search-patches "gnucash-price-quotes-perl.patch" + "gnucash-disable-failing-tests.patch")))) (build-system cmake-build-system) (inputs `(("guile" ,guile-2.2) @@ -76,7 +75,8 @@ ("webkitgtk" ,webkitgtk) ("aqbanking" ,aqbanking) ("perl-date-manip" ,perl-date-manip) - ("perl-finance-quote" ,perl-finance-quote))) + ("perl-finance-quote" ,perl-finance-quote) + ("tzdata" ,tzdata-for-tests))) (native-inputs `(("glib" ,glib "bin") ; glib-compile-schemas, etc. ("intltool" ,intltool) @@ -90,6 +90,13 @@ #:configure-flags (list "-DWITH_OFX=OFF" ; libofx is not available yet "-DWITH_SQL=OFF") ; without dbi.h + #:make-flags '("GUILE_AUTO_COMPILE=0") + #:modules ((guix build cmake-build-system) + ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) + (guix build utils)) + #:imported-modules (,@%gnu-build-system-modules + (guix build cmake-build-system) + (guix build glib-or-gtk-build-system)) #:phases (modify-phases %standard-phases (add-after 'unpack 'unpack-gmock @@ -99,14 +106,28 @@ "-C" "gmock" "--strip-components=1") (setenv "GMOCK_ROOT" (string-append (getcwd) "/gmock/googlemock")) #t)) + (add-after 'unpack 'set-env-vars + (lambda* (#:key inputs #:allow-other-keys) + (let ((tzdata (assoc-ref inputs "tzdata"))) + ;; At least one test is time-related and requires this + ;; environment variable. + (setenv "TZDIR" + (string-append tzdata + "/share/zoneinfo")) + (substitute* "CMakeLists.txt" + (("set\\(SHELL /bin/bash\\)") + (string-append "set(SHELL " (which "bash") ")"))) + #t))) ;; There are about 100 megabytes of documentation. (add-after 'install 'install-docs (lambda* (#:key inputs outputs #:allow-other-keys) (let ((docs (assoc-ref inputs "gnucash-docs")) (doc-output (assoc-ref outputs "doc"))) + (mkdir-p (string-append doc-output "/share")) (symlink (string-append docs "/share/gnome") - (string-append doc-output "/share/gnome"))))) + (string-append doc-output "/share/gnome")) + #t))) (add-after 'install-docs 'wrap-programs (lambda* (#:key inputs outputs #:allow-other-keys) @@ -134,7 +155,11 @@ '("gnucash" "gnc-fq-check" "gnc-fq-helper" - "gnc-fq-dump"))))))) + "gnc-fq-dump")))) + (add-after 'install 'glib-or-gtk-compile-schemas + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) + (add-after 'install 'glib-or-gtk-wrap + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (home-page "https://www.gnucash.org/") (synopsis "Personal and small business financial accounting software") (description @@ -150,7 +175,9 @@ financial calculations or scheduled transactions.") (define gnucash-docs (package (name "gnucash-docs") - (version (package-version gnucash)) + ;;(version (package-version gnucash)) + ;; The current version of gnucash-docs is not available at the moment. + (version "3.2") (source (origin (method url-fetch) @@ -158,7 +185,7 @@ financial calculations or scheduled transactions.") version "/gnucash-docs-" version ".tar.gz")) (sha256 (base32 - "0yq65s3z3dwdwdf2nq1d1w9ckdjdyjwkfpmvhzyib54b66q65xh5")))) + "1763m6d8gkhllwb9rnr9ifch39brmh7kr2m6icqfbc53a91m56j6")))) (build-system gnu-build-system) ;; These are native-inputs because they are only required for building the ;; documentation. diff --git a/gnu/packages/patches/gnucash-disable-failing-tests.patch b/gnu/packages/patches/gnucash-disable-failing-tests.patch new file mode 100644 index 0000000000..e0fdd86b5d --- /dev/null +++ b/gnu/packages/patches/gnucash-disable-failing-tests.patch @@ -0,0 +1,39 @@ +test-stress-options.scm does not exist, and test-qof passes when run in the +build directory after the gnucash build. + +diff -ur gnucash-3.3.old/gnucash/report/standard-reports/test/CMakeLists.txt gnucash-3.3/gnucash/report/standard-reports/test/CMakeLists.txt +--- gnucash-3.3.old/gnucash/report/standard-reports/test/CMakeLists.txt 2018-10-04 09:29:00.916641417 -0400 ++++ gnucash-3.3/gnucash/report/standard-reports/test/CMakeLists.txt 2018-10-04 09:30:52.962504860 -0400 +@@ -13,10 +13,6 @@ + test-income-gst.scm + ) + +-set(scm_test_with_textual_ports_SOURCES +- test-stress-options.scm +-) +- + set(GUILE_DEPENDS + scm-gnc-module + scm-app-utils +@@ -31,9 +27,6 @@ + + if (HAVE_SRFI64) + gnc_add_scheme_tests("${scm_test_with_srfi64_SOURCES}") +- if (HAVE_TEXT_PORTS) +- gnc_add_scheme_tests("${scm_test_with_textual_ports_SOURCES}") +- endif (HAVE_TEXT_PORTS) + endif (HAVE_SRFI64) + + gnc_add_scheme_tests("${scm_test_standard_reports_SOURCES}") +diff -ur gnucash-3.3.old/libgnucash/engine/test/CMakeLists.txt gnucash-3.3/libgnucash/engine/test/CMakeLists.txt +--- gnucash-3.3.old/libgnucash/engine/test/CMakeLists.txt 2018-10-04 09:29:00.876640751 -0400 ++++ gnucash-3.3/libgnucash/engine/test/CMakeLists.txt 2018-10-05 10:46:22.542962546 -0400 +@@ -54,8 +54,6 @@ + # This test does not run on Win32 + if (NOT WIN32) + set(SOURCES ${test_qof_SOURCES} ${CMAKE_SOURCE_DIR}/common/test-core/unittest-support.c) +- add_engine_test(test-qof "${SOURCES}") +- target_compile_definitions(test-qof PRIVATE TESTPROG=test_qof) + + set(SOURCES ${test_engine_SOURCES} ${CMAKE_SOURCE_DIR}/common/test-core/unittest-support.c) + add_engine_test(test-engine "${SOURCES}") diff --git a/gnu/packages/patches/gnucash-price-quotes-perl.patch b/gnu/packages/patches/gnucash-price-quotes-perl.patch index 982763f0ec..3101ddb007 100644 --- a/gnu/packages/patches/gnucash-price-quotes-perl.patch +++ b/gnu/packages/patches/gnucash-price-quotes-perl.patch @@ -1,8 +1,9 @@ After wrapping gnc-fq-check and gnc-fq-helper we can no longer execute them with perl, so execute them directly instead. ---- gnucash-2.6.6/src/scm/price-quotes.scm.orig 2014-04-27 17:42:28.000000000 -0500 -+++ gnucash-2.6.6/src/scm/price-quotes.scm 2015-07-09 16:12:11.196218472 -0500 +diff -ur gnucash-3.2.old/libgnucash/scm/price-quotes.scm gnucash-3.2/libgnucash/scm/price-quotes.scm +--- gnucash-3.2.old/libgnucash/scm/price-quotes.scm 2018-09-15 00:48:33.718389646 -0400 ++++ gnucash-3.2/libgnucash/scm/price-quotes.scm 2018-09-15 13:51:49.249862724 -0400 @@ -74,7 +74,7 @@ (define (start-program) (if (not (string-null? gnc:*finance-quote-check*)) -- cgit v1.2.3 From b0e829c632c8b0d0d9173c8b0fa457bbc2f92a0f Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Oct 2018 13:55:21 -0400 Subject: gnu: gnucash-docs: Update to 3.3. The documentation on SourceForge is now located in the same directory as the source code. * gnu/packages/gnucash.scm (gnucash-docs): Update to 3.3. --- gnu/packages/gnucash.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm index 45720df9a4..4e68f20866 100644 --- a/gnu/packages/gnucash.scm +++ b/gnu/packages/gnucash.scm @@ -175,17 +175,15 @@ financial calculations or scheduled transactions.") (define gnucash-docs (package (name "gnucash-docs") - ;;(version (package-version gnucash)) - ;; The current version of gnucash-docs is not available at the moment. - (version "3.2") + (version (package-version gnucash)) (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/gnucash/gnucash-docs/" + (uri (string-append "mirror://sourceforge/gnucash/gnucash%20%28stable%29/" version "/gnucash-docs-" version ".tar.gz")) (sha256 (base32 - "1763m6d8gkhllwb9rnr9ifch39brmh7kr2m6icqfbc53a91m56j6")))) + "10v4hw4lh888r8yv473pqrvzfjg8dwamk62sghs93rn88ndwm16c")))) (build-system gnu-build-system) ;; These are native-inputs because they are only required for building the ;; documentation. -- cgit v1.2.3 From 357450dca0933a36a59a23c0e2be5d646f123706 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 29 Sep 2018 11:14:51 +0100 Subject: gnu: bioruby: Update to 1.5.2. This works with Ruby 2.5. * gnu/packages/bioinformatics.scm (bioruby): Update to 1.5.2. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index d48f484e03..43220d22fe 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6863,14 +6863,14 @@ generate FASTA, JSON, YAML, RDF, JSON-LD, HTML, CSV, tabular output etc.") (define-public bioruby (package (name "bioruby") - (version "1.5.1") + (version "1.5.2") (source (origin (method url-fetch) (uri (rubygems-uri "bio" version)) (sha256 (base32 - "0hdl0789c9n4mprnx5pgd46bfwl8d000rqpamj5h6kkjgspijv49")))) + "1d56amdsjv1mag7m6gv2w0xij8hqx1v5xbdjsix8sp3yp36m7938")))) (build-system ruby-build-system) (propagated-inputs `(("ruby-libxml" ,ruby-libxml))) -- cgit v1.2.3 From 0b060e3486afdefdf5a5f474518b2a6bfae405d9 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 29 Sep 2018 11:15:36 +0100 Subject: gnu: ruby-shindo: Remove -rubygems flags. These have been removed in Ruby 2.5. * gnu/packages/ruby.scm (ruby-shindo)[arguments]: Change fix-tests phase to also remove the -rubygems flags. --- gnu/packages/ruby.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 3673bf2346..b216f3f48b 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1211,12 +1211,15 @@ standard output stream.") #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-tests - (lambda _ - (substitute* "Rakefile" - (("system \"shindo") "system \"./bin/shindo") - ;; This test doesn't work, so we disable it. - (("fail \"The build_error test should fail") "#")) - #t))))) + (lambda _ + (substitute* "tests/tests_helper.rb" + (("-rubygems") "")) + (substitute* "Rakefile" + (("system \"shindo") "system \"./bin/shindo") + ;; This test doesn't work, so we disable it. + (("fail \"The build_error test should fail") "#") + ((" -rubygems") "")) + #t))))) (propagated-inputs `(("ruby-formatador" ,ruby-formatador))) (synopsis "Simple depth first Ruby testing") -- cgit v1.2.3 From 39ecb977d3e097ffe9c46390090bd197581ac072 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 29 Sep 2018 11:17:02 +0100 Subject: gnu: ruby-term-ansicolor: Fix test for Ruby 2.5. * gnu/packages/ruby.scm (ruby-term-ansicolor)[arguments]: Add new fix-test phase to fix a test that fails under Ruby 2.5. --- gnu/packages/ruby.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index b216f3f48b..c039df1559 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2914,6 +2914,11 @@ Ruby's large and slower test/unit.") (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-test + (lambda - + (substitute* "tests/hsl_triple_test.rb" + (("0\\\\\\.0%") + "0\\.?0?%")))) (replace 'build (lambda _ (invoke "gem" "build" "term-ansicolor.gemspec")))))) -- cgit v1.2.3 From 2c7cb711e938ff9e358ffb274ea2f96ae84fc1e9 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 29 Sep 2018 11:18:54 +0100 Subject: gnu: ruby-sass-spec: Fix spec expectation. This fixes building ruby-sass with Ruby 2.5. * gnu/packages/ruby.scm (ruby-sass-spec)[arguments]: Add patch-test phase to fix the expectation of one of the tests. Also change the comment regarding the tests not being run. --- gnu/packages/ruby.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index c039df1559..a0fe0c2e98 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5456,8 +5456,16 @@ strings or files.") ("ruby-diffy" ,ruby-diffy) ("ruby-terminfo" ,ruby-terminfo))) (arguments - ;; No Rakefile - `(#:tests? #f)) + `(;; This package contains tests for a sass implementation, and the to + ;; avoid any circular dependencies, the tests are not run here + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-test + (lambda _ + (delete-file "spec/values/colors/alpha_hex-3.5/error") + (substitute* "spec/values/colors/alpha_hex-3.5/expected_output.css" + (("string") "color"))))))) (home-page "https://github.com/sass/sass-spec") (synopsis "Test suite for Sass") (description "Sass Spec is a test suite for Sass. Test cases are all in -- cgit v1.2.3 From 4d372cb9a27b57664112b76e6a209b713abd1d10 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 29 Sep 2018 11:28:28 +0100 Subject: gnu: Add ruby-mathn. * gnu/packages/ruby.scm (ruby-mathn): New variable. --- gnu/packages/ruby.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index a0fe0c2e98..e54b1a0f69 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5108,6 +5108,29 @@ are doing, you can fiddle with every last bit of your email directly.") (home-page "https://github.com/mikel/mail") (license license:expat))) +(define-public ruby-mathn + (package + (name "ruby-mathn") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "mathn" version)) + (sha256 + (base32 + "1wn812llln9jzgybz2d7536q39z3gi99i6fi0j1dapcpzvhgrr0p")))) + (build-system ruby-build-system) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rake-compiler" ,ruby-rake-compiler))) + (synopsis "Extends math operations for increased precision") + (description + "This gem makes mathematical operations more precise in Ruby and +integrates other mathematical standard libraries. Prior to Ruby 2.5, +@code{mathn} was part of the Ruby standard library.") + (home-page "https://github.com/ruby/mathn") + (license license:bsd-2))) + (define-public ruby-code-statistics (package (name "ruby-code-statistics") -- cgit v1.2.3 From 11ff2adc74f3c168cadb6cc5bf7f4be08442b9ea Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 29 Sep 2018 11:29:30 +0100 Subject: gnu: ruby-sass: Update to 3.6.0. * gnu/packages/ruby.scm (ruby-sass)[version]: Update to 3.6.0. [source]: Update sha256. [native-inputs]: Add ruby-mathn, as this is needed when using Ruby 2.5. --- gnu/packages/ruby.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index e54b1a0f69..2080944cae 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5498,18 +5498,19 @@ the @file{spec} directory.") (define-public ruby-sass (package (name "ruby-sass") - (version "3.5.7") + (version "3.6.0") (source (origin (method url-fetch) (uri (rubygems-uri "sass" version)) (sha256 (base32 - "1sy7xsbgpcy90j5ynbq967yplffp74pvph3r8ivn2sv2b44q6i61")))) + "18c6prbw9wl8bqhb2435pd9s0lzarl3g7xf8pmyla28zblvwxmyh")))) (build-system ruby-build-system) (propagated-inputs `(("ruby-sass-listen" ,ruby-sass-listen))) (native-inputs - `(("ruby-sass-spec" ,ruby-sass-spec))) + `(("ruby-sass-spec" ,ruby-sass-spec) + ("ruby-mathn" ,ruby-mathn))) (home-page "http://sass-lang.com/") (synopsis "CSS extension language") (description "Sass is a CSS extension language. It extends CSS with -- cgit v1.2.3 From a45c64701b5599bb527fd8cf2070174f9e866d3d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Oct 2018 18:28:49 +0200 Subject: gnu: ghc-http-conduit: Remove ghc-http-client from native-inputs. * gnu/packages/haskell-web.scm (ghc-http-conduit)[native-inputs]: Remove ghc-http-client. --- gnu/packages/haskell-web.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index eaa7e6a9ec..2e404e2fcf 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -369,7 +369,6 @@ and HPACK. Currently HTTP/2 16 framing and HPACK 10 is supported.") ("ghc-warp" ,ghc-warp) ("ghc-wai-conduit" ,ghc-wai-conduit) ("ghc-http-types" ,ghc-http-types) - ("ghc-http-client" ,ghc-http-client) ("ghc-cookie" ,ghc-cookie) ("ghc-conduit-extra" ,ghc-conduit-extra) ("ghc-streaming-commons" ,ghc-streaming-commons) -- cgit v1.2.3 From 279c97dba8ceecab9d1c7a5c8b5503d1c2e605a3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Oct 2018 18:28:50 +0200 Subject: gnu: ghc-regex: Fix build. * gnu/packages/haskell.scm (ghc-regex)[arguments]: Add build phase to relax version checks. --- gnu/packages/haskell.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index a140985eba..c8e4523ebd 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3003,6 +3003,17 @@ Haskell library @code{regex-base}.") (base32 "1sjkpkgv4phy5b5v2lr89x4vx4dh44pj0sbvlsp6n86w9v6v4jwb")))) (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'relax-dependencies + (lambda _ + (substitute* "regex.cabal" + (("base-compat.*>=.*0.6.*") + "base-compat >= 0.6\n") + (("template-haskell.*>=.*2.7.*") + "template-haskell >= 2.7\n")) + #t))))) (inputs `(("ghc-base-compat" ,ghc-base-compat) ("ghc-hashable" ,ghc-hashable) -- cgit v1.2.3 From 7df25c77c5d57d127e556b6527b69abce82ef814 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Oct 2018 18:28:51 +0200 Subject: gnu: Add ghc-cairo. * gnu/packages/haskell.scm (ghc-cairo): New variable. --- gnu/packages/haskell.scm | 77 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index c8e4523ebd..964b14749f 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -43,6 +43,7 @@ #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) #:use-module (gnu packages graphviz) + #:use-module (gnu packages gtk) #:use-module (gnu packages haskell-check) #:use-module (gnu packages haskell-crypto) #:use-module (gnu packages haskell-web) @@ -10587,6 +10588,82 @@ expose it from another module in the hierarchy. @end itemize") (license license:expat))) +(define-public ghc-cairo + (package + (name "ghc-cairo") + (version "0.13.5.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/cairo/" + "cairo-" version ".tar.gz")) + (sha256 + (base32 + "1wxylv4d8120ri0vgar168ikqa9m6533ipdwi38qlmxmw20ws2j2")))) + (build-system haskell-build-system) + (arguments + `(#:modules ((guix build haskell-build-system) + (guix build utils) + (ice-9 match) + (srfi srfi-26)) + #:phases + (modify-phases %standard-phases + ;; FIXME: This is a copy of the standard configure phase with a tiny + ;; difference: this package needs the -package-db flag to be passed + ;; to "runhaskell" in addition to the "configure" action, because it + ;; depends on gtk2hs-buildtools, which provide setup hooks. Without + ;; this option the Setup.hs file cannot be evaluated. The + ;; haskell-build-system should be changed to pass "-package-db" to + ;; "runhaskell" in any case. + (replace 'configure + (lambda* (#:key outputs inputs tests? (configure-flags '()) + #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (input-dirs (match inputs + (((_ . dir) ...) + dir) + (_ '()))) + (ghc-path (getenv "GHC_PACKAGE_PATH")) + (params (append `(,(string-append "--prefix=" out)) + `(,(string-append "--libdir=" out "/lib")) + `(,(string-append "--bindir=" out "/bin")) + `(,(string-append + "--docdir=" out + "/share/doc/" ((@@ (guix build haskell-build-system) + package-name-version) out))) + '("--libsubdir=$compiler/$pkg-$version") + '("--package-db=../package.conf.d") + '("--global") + `(,@(map + (cut string-append "--extra-include-dirs=" <>) + (search-path-as-list '("include") input-dirs))) + `(,@(map + (cut string-append "--extra-lib-dirs=" <>) + (search-path-as-list '("lib") input-dirs))) + (if tests? + '("--enable-tests") + '()) + configure-flags))) + (unsetenv "GHC_PACKAGE_PATH") + (apply invoke "runhaskell" "-package-db=../package.conf.d" + "Setup.hs" "configure" params) + (setenv "GHC_PACKAGE_PATH" ghc-path) + #t)))))) + (inputs + `(("ghc-utf8-string" ,ghc-utf8-string) + ("ghc-text" ,ghc-text) + ("cairo" ,cairo))) + (native-inputs + `(("ghc-gtk2hs-buildtools" ,ghc-gtk2hs-buildtools) + ("pkg-config" ,pkg-config))) + (home-page "http://projects.haskell.org/gtk2hs/") + (synopsis "Haskell bindings to the Cairo vector graphics library") + (description + "Cairo is a library to render high quality vector graphics. There exist +various backends that allows rendering to Gtk windows, PDF, PS, PNG and SVG +documents, amongst others.") + (license license:bsd-3))) + (define-public ghc-weigh (package (name "ghc-weigh") -- cgit v1.2.3 From 562cfae330e2b8382ab106478514d833187c7d15 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Oct 2018 18:28:52 +0200 Subject: gnu: Add ghc-chart-cairo. * gnu/packages/haskell.scm (ghc-chart-cairo): New variable. --- gnu/packages/haskell.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 964b14749f..c040965e92 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -10664,6 +10664,33 @@ various backends that allows rendering to Gtk windows, PDF, PS, PNG and SVG documents, amongst others.") (license license:bsd-3))) +(define-public ghc-chart-cairo + (package + (name "ghc-chart-cairo") + (version "1.9") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/Chart-cairo/" + "Chart-cairo-" version ".tar.gz")) + (sha256 + (base32 + "0iany6lfyfb1cw0pxfs5aw5k0a6x41m6ql9ad9w59biwdckbsyqr")))) + (build-system haskell-build-system) + (inputs + `(("ghc-old-locale" ,ghc-old-locale) + ("ghc-cairo" ,ghc-cairo) + ("ghc-colour" ,ghc-colour) + ("ghc-data-default-class" ,ghc-data-default-class) + ("ghc-operational" ,ghc-operational) + ("ghc-lens" ,ghc-lens) + ("ghc-chart" ,ghc-chart))) + (home-page "https://github.com/timbod7/haskell-chart/wiki") + (synopsis "Cairo backend for Charts") + (description "This package provides a Cairo vector graphics rendering +backend for the Charts library.") + (license license:bsd-3))) + (define-public ghc-weigh (package (name "ghc-weigh") -- cgit v1.2.3 From 6c8197783dca26159a669202a0635af0338d4992 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Oct 2018 18:10:15 +0200 Subject: gnu: Add ghc-atomic-write. * gnu/packages/haskell.scm (ghc-atomic-write): New variable. --- gnu/packages/haskell.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index c040965e92..c1815c60da 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -10691,6 +10691,41 @@ documents, amongst others.") backend for the Charts library.") (license license:bsd-3))) +(define-public ghc-atomic-write + (package + (name "ghc-atomic-write") + (version "0.2.0.5") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/atomic-write/atomic-write-" + version + ".tar.gz")) + (sha256 + (base32 + "1iaq0hprxcv0sl1sgwcgmm87zraf738va1bciwnx2jkk3k1v9iyv")))) + (build-system haskell-build-system) + (inputs + `(("ghc-temporary" ,ghc-temporary) + ("ghc-unix-compat" ,ghc-unix-compat) + ("ghc-text" ,ghc-text))) + (native-inputs + `(("ghc-temporary" ,ghc-temporary) + ("ghc-unix-compat" ,ghc-unix-compat) + ("ghc-text" ,ghc-text) + ("ghc-hspec" ,ghc-hspec) + ("hspec-discover" ,hspec-discover))) + (home-page "https://github.com/stackbuilders/atomic-write") + (synopsis "Atomically write to a file") + (description + "Atomically write to a file on POSIX-compliant systems while preserving +permissions. @code{mv} is an atomic operation. This makes it simple to write +to a file atomically just by using the @code{mv} operation. However, this +will destroy the permissions on the original file. This library preserves +permissions while atomically writing to a file.") + (license license:expat))) + (define-public ghc-weigh (package (name "ghc-weigh") -- cgit v1.2.3 From d05ed20ef12e5c9520252f2da230c54f46de703d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Oct 2018 18:32:38 +0200 Subject: gnu: Add ghc-cereal-conduit. * gnu/packages/haskell.scm (ghc-cereal-conduit): New variable. --- gnu/packages/haskell.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index c1815c60da..a8d22a682a 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -10726,6 +10726,33 @@ will destroy the permissions on the original file. This library preserves permissions while atomically writing to a file.") (license license:expat))) +(define-public ghc-cereal-conduit + (package + (name "ghc-cereal-conduit") + (version "0.8.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "cereal-conduit/cereal-conduit-" + version ".tar.gz")) + (sha256 + (base32 + "1srr7agvgfw78q5s1npjq5sgynvhjgllpihiv37ylkwqm4c4ap6r")))) + (build-system haskell-build-system) + (inputs + `(("ghc-conduit" ,ghc-conduit) + ("ghc-resourcet" ,ghc-resourcet) + ("ghc-cereal" ,ghc-cereal))) + (native-inputs + `(("ghc-hunit" ,ghc-hunit))) + (home-page "https://github.com/snoyberg/conduit") + (synopsis "Turn Data.Serialize Gets and Puts into Sources, Sinks, and Conduits") + (description + "This package turn @code{Data.Serialize} @code{Gets} and @code{Puts} into +@code{Sources}, @code{Sinks}, and @code{Conduits}.") + (license license:bsd-3))) + (define-public ghc-weigh (package (name "ghc-weigh") -- cgit v1.2.3 From 36ec599e785ba3563ede377e05e8172c4323a2aa Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Oct 2018 18:32:40 +0200 Subject: gnu: Add ghc-lzma. * gnu/packages/haskell.scm (ghc-lzma): New variable. --- gnu/packages/haskell.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index a8d22a682a..3e10398966 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -10753,6 +10753,37 @@ permissions while atomically writing to a file.") @code{Sources}, @code{Sinks}, and @code{Conduits}.") (license license:bsd-3))) +(define-public ghc-lzma + (package + (name "ghc-lzma") + (version "0.0.0.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/lzma/" + "lzma-" version ".tar.gz")) + (sha256 + (base32 + "0i416gqi8j55nd1pqbkxvf3f6hn6fjys6gq98lkkxphva71j30xg")))) + (build-system haskell-build-system) + (arguments + '(#:tests? #f ; requires older versions of QuickCheck and tasty. + #:cabal-revision + ("3" "1sify6gnsalyp6dakfzi0mdy5jcz2kcp9jsdsgkmxd40nfzgd44m"))) + (native-inputs + `(("ghc-hunit" ,ghc-hunit) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) + (home-page "https://github.com/hvr/lzma") + (synopsis "LZMA/XZ compression and decompression") + (description + "This package provides a pure interface for compressing and +decompressing LZMA streams of data represented as lazy @code{ByteString}s. A +monadic incremental interface is provided as well.") + (license license:bsd-3))) + (define-public ghc-weigh (package (name "ghc-weigh") -- cgit v1.2.3 From 80588cfccfd193d70491bb2a386667bf538dbb5d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Oct 2018 18:32:42 +0200 Subject: gnu: Add ghc-stm-conduit. * gnu/packages/haskell.scm (ghc-stm-conduit): New variable. --- gnu/packages/haskell.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 3e10398966..d2f6a8b237 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -10784,6 +10784,45 @@ decompressing LZMA streams of data represented as lazy @code{ByteString}s. A monadic incremental interface is provided as well.") (license license:bsd-3))) +(define-public ghc-stm-conduit + (package + (name "ghc-stm-conduit") + (version "4.0.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/stm-conduit/" + "stm-conduit-" version ".tar.gz")) + (sha256 + (base32 + "0paapljn7nqfzrx889y0n8sszci38mdiaxkgr0bb00ph9246rr7z")))) + (build-system haskell-build-system) + (inputs + `(("ghc-stm" ,ghc-stm) + ("ghc-stm-chans" ,ghc-stm-chans) + ("ghc-cereal" ,ghc-cereal) + ("ghc-cereal-conduit" ,ghc-cereal-conduit) + ("ghc-conduit" ,ghc-conduit) + ("ghc-conduit-extra" ,ghc-conduit-extra) + ("ghc-exceptions" ,ghc-exceptions) + ("ghc-resourcet" ,ghc-resourcet) + ("ghc-async" ,ghc-async) + ("ghc-monad-loops" ,ghc-monad-loops) + ("ghc-unliftio" ,ghc-unliftio))) + (native-inputs + `(("ghc-doctest" ,ghc-doctest) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-hunit" ,ghc-hunit) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) + ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) + (home-page "https://github.com/cgaebel/stm-conduit") + (synopsis "Introduces conduits to channels and promotes using conduits concurrently") + (description + "This package provides two simple conduit wrappers around STM channels: a +source and a sink.") + (license license:bsd-3))) + (define-public ghc-weigh (package (name "ghc-weigh") -- cgit v1.2.3 From 38757d610eedad4dfa4030841132c028460b6c84 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Oct 2018 18:32:44 +0200 Subject: gnu: Add ghc-bindings-dsl. * gnu/packages/haskell.scm (ghc-bindings-dsl): New variable. --- gnu/packages/haskell.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index d2f6a8b237..41b1146040 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -10823,6 +10823,31 @@ monadic incremental interface is provided as well.") source and a sink.") (license license:bsd-3))) +(define-public ghc-bindings-dsl + (package + (name "ghc-bindings-dsl") + (version "1.0.25") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/bindings-DSL/" + "bindings-DSL-" version ".tar.gz")) + (sha256 + (base32 + "0kqrd78nspl3lk4a0fqn47d8dirjg3b24dkvkigcrlb81hw35pk3")))) + (build-system haskell-build-system) + (home-page "https://github.com/jwiegley/bindings-dsl/wiki") + (synopsis "FFI domain specific language, on top of hsc2hs") + (description + "This is a set of macros to be used when writing Haskell FFI. They were +designed to be able to fully describe C interfaces, so that @code{hsc2hs} can +extract from them all Haskell code needed to mimic such interfaces. All +Haskell names used are automatically derived from C names, structures are +mapped to Haskell instances of @code{Storable}, and there are also macros you +can use with C code to help write bindings to inline functions or macro +functions.") + (license license:bsd-3))) + (define-public ghc-weigh (package (name "ghc-weigh") -- cgit v1.2.3 From 44c6180b3fc76f5e015a1b7097eb7a3196210be8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Oct 2018 18:32:46 +0200 Subject: gnu: Add ghc-lzma-conduit. * gnu/packages/haskell.scm (ghc-lzma-conduit): New variable. --- gnu/packages/haskell.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 41b1146040..4ebaecbd86 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -10848,6 +10848,37 @@ can use with C code to help write bindings to inline functions or macro functions.") (license license:bsd-3))) +(define-public ghc-lzma-conduit + (package + (name "ghc-lzma-conduit") + (version "1.2.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/lzma-conduit/" + "lzma-conduit-" version ".tar.gz")) + (sha256 + (base32 + "0hm72da7xk9l3zxjh274yg444vf405djxqbkf3q3p2qhicmxlmg9")))) + (build-system haskell-build-system) + (inputs + `(("ghc-conduit" ,ghc-conduit) + ("ghc-lzma" ,ghc-lzma) + ("ghc-resourcet" ,ghc-resourcet))) + (native-inputs + `(("ghc-base-compat" ,ghc-base-compat) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) + ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2) + ("ghc-hunit" ,ghc-hunit) + ("ghc-quickcheck" ,ghc-quickcheck))) + (home-page "https://github.com/alphaHeavy/lzma-conduit") + (synopsis "Conduit interface for lzma/xz compression") + (description + "This package provides a @code{Conduit} interface for the LZMA +compression algorithm used in the @code{.xz} file format.") + (license license:bsd-3))) + (define-public ghc-weigh (package (name "ghc-weigh") -- cgit v1.2.3 From 4fc161b9c60163f8353648a8e6e00d8229362ff4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Oct 2018 18:32:48 +0200 Subject: gnu: Add ghc-bzlib-conduit. * gnu/packages/haskell.scm (ghc-bzlib-conduit): New variable. --- gnu/packages/haskell.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 4ebaecbd86..d79329f686 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -10879,6 +10879,34 @@ functions.") compression algorithm used in the @code{.xz} file format.") (license license:bsd-3))) +(define-public ghc-bzlib-conduit + (package + (name "ghc-bzlib-conduit") + (version "0.3.0.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/bzlib-conduit/" + "bzlib-conduit-" version ".tar.gz")) + (sha256 + (base32 + "0fd2hnr782s7qgipazg2yxwia9qqhkvm9bcm90773c3zkxa13n23")))) + (build-system haskell-build-system) + (inputs + `(("ghc-bindings-dsl" ,ghc-bindings-dsl) + ("ghc-conduit" ,ghc-conduit) + ("ghc-data-default-class" ,ghc-data-default-class) + ("ghc-resourcet" ,ghc-resourcet))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("ghc-random" ,ghc-random))) + (home-page "https://github.com/snoyberg/bzlib-conduit") + (synopsis "Streaming compression/decompression via conduits") + (description + "This package provides Haskell bindings to bzlib and Conduit support for +streaming compression and decompression.") + (license license:bsd-3))) + (define-public ghc-weigh (package (name "ghc-weigh") -- cgit v1.2.3 From 71c2e3e1a1a0416e6d09eee2691cf4c0decd9be5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Oct 2018 18:32:50 +0200 Subject: gnu: Add ghc-pqueue. * gnu/packages/haskell.scm (ghc-pqueue): New variable. --- gnu/packages/haskell.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index d79329f686..80d331c466 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -10907,6 +10907,28 @@ compression algorithm used in the @code{.xz} file format.") streaming compression and decompression.") (license license:bsd-3))) +(define-public ghc-pqueue + (package + (name "ghc-pqueue") + (version "1.4.1.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "pqueue/pqueue-" version ".tar.gz")) + (sha256 + (base32 + "1zvwm1zcqqq5n101s1brjhgbay8rf9fviq6gxbplf40i63m57p1x")))) + (build-system haskell-build-system) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck))) + (home-page "https://hackage.haskell.org/package/pqueue") + (synopsis "Reliable, persistent, fast priority queues") + (description + "This package provides a fast, reliable priority queue implementation +based on a binomial heap.") + (license license:bsd-3))) + (define-public ghc-weigh (package (name "ghc-weigh") -- cgit v1.2.3 From a933cbfb617d84d37e270b4dd89f2de92013834d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Oct 2018 18:32:52 +0200 Subject: gnu: Add ghc-conduit-algorithms. * gnu/packages/haskell.scm (ghc-conduit-algorithms): New variable. --- gnu/packages/haskell.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 80d331c466..befb1baae5 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -10929,6 +10929,48 @@ streaming compression and decompression.") based on a binomial heap.") (license license:bsd-3))) +(define-public ghc-conduit-algorithms + (package + (name "ghc-conduit-algorithms") + (version "0.0.8.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "conduit-algorithms/conduit-algorithms-" + version ".tar.gz")) + (sha256 + (base32 + "07gx2q3d1bbfw14q41rmqg0i4m018pci10lswc0k1ij6lw7sb9fd")))) + (build-system haskell-build-system) + (inputs + `(("ghc-async" ,ghc-async) + ("ghc-bzlib-conduit" ,ghc-bzlib-conduit) + ("ghc-conduit" ,ghc-conduit) + ("ghc-conduit-combinators" ,ghc-conduit-combinators) + ("ghc-conduit-extra" ,ghc-conduit-extra) + ("ghc-exceptions" ,ghc-exceptions) + ("ghc-lzma-conduit" ,ghc-lzma-conduit) + ("ghc-monad-control" ,ghc-monad-control) + ("ghc-pqueue" ,ghc-pqueue) + ("ghc-resourcet" ,ghc-resourcet) + ("ghc-stm" ,ghc-stm) + ("ghc-stm-conduit" ,ghc-stm-conduit) + ("ghc-streaming-commons" ,ghc-streaming-commons) + ("ghc-unliftio-core" ,ghc-unliftio-core) + ("ghc-vector" ,ghc-vector))) + (native-inputs + `(("ghc-hunit" ,ghc-hunit) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) + ("ghc-test-framework-th" ,ghc-test-framework-th))) + (home-page "https://github.com/luispedro/conduit-algorithms#readme") + (synopsis "Conduit-based algorithms") + (description + "This package provides algorithms on @code{Conduits}, including higher +level asynchronous processing and some other utilities.") + (license license:expat))) + (define-public ghc-weigh (package (name "ghc-weigh") -- cgit v1.2.3 From 320323141f697483277918f411ecc62a8a7ab85d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Oct 2018 18:32:54 +0200 Subject: gnu: Add ghc-interpolate. * gnu/packages/haskell.scm (ghc-interpolate): New variable. --- gnu/packages/haskell.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index befb1baae5..8a33cbd6b2 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -10971,6 +10971,34 @@ based on a binomial heap.") level asynchronous processing and some other utilities.") (license license:expat))) +(define-public ghc-interpolate + (package + (name "ghc-interpolate") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/interpolate/" + "interpolate-" version ".tar.gz")) + (sha256 + (base32 + "1gkaj98yz363v38fv78sqby236mp8yqwqcilx7kr2b9z0w3204bf")))) + (build-system haskell-build-system) + (inputs + `(("ghc-haskell-src-meta" ,ghc-haskell-src-meta))) + (native-inputs + `(("ghc-base-compat" ,ghc-base-compat) + ("ghc-hspec" ,ghc-hspec) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-quickcheck-instances" ,ghc-quickcheck-instances) + ("ghc-text" ,ghc-text) + ("hspec-discover" ,hspec-discover))) + (home-page "https://github.com/sol/interpolate") + (synopsis "String interpolation library") + (description "This package provides a string interpolation library for +Haskell.") + (license license:expat))) + (define-public ghc-weigh (package (name "ghc-weigh") -- cgit v1.2.3 From 5e6bf3e2da6934daeadc36afeb8e09f105754efe Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Oct 2018 18:15:04 +0200 Subject: gnu: Add ghc-hpack. * gnu/packages/haskell.scm (ghc-hpack): New variable. --- gnu/packages/haskell.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 8a33cbd6b2..9a5f7c9746 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -10999,6 +10999,51 @@ level asynchronous processing and some other utilities.") Haskell.") (license license:expat))) +(define-public ghc-hpack + (package + (name "ghc-hpack") + (version "0.28.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/hpack/" + "hpack-" version ".tar.gz")) + (sha256 + (base32 + "18w0h76jdp3mk9vin8da9iz3cwhcxmw787xy8wlh8bxcpcr16q5r")))) + (build-system haskell-build-system) + (inputs + `(("ghc-aeson" ,ghc-aeson) + ("ghc-bifunctors" ,ghc-bifunctors) + ("ghc-cryptonite" ,ghc-cryptonite) + ("ghc-glob" ,ghc-glob) + ("ghc-http-client" ,ghc-http-client) + ("ghc-http-client-tls" ,ghc-http-client-tls) + ("ghc-http-types" ,ghc-http-types) + ("ghc-scientific" ,ghc-scientific) + ("ghc-text" ,ghc-text) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-vector" ,ghc-vector) + ("ghc-yaml" ,ghc-yaml))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("ghc-hunit" ,ghc-hunit) + ("ghc-interpolate" ,ghc-interpolate) + ("ghc-mockery" ,ghc-mockery) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-temporary" ,ghc-temporary) + ("hspec-discover" ,hspec-discover))) + (home-page "https://github.com/sol/hpack") + (synopsis "Tools for an alternative Haskell package format") + (description + "Hpack is a format for Haskell packages. It is an alternative to the +Cabal package format and follows different design principles. Hpack packages +are described in a file named @code{package.yaml}. Both @code{cabal2nix} and +@code{stack} support @code{package.yaml} natively. For other build tools the +@code{hpack} executable can be used to generate a @code{.cabal} file from +@code{package.yaml}.") + (license license:expat))) + (define-public ghc-weigh (package (name "ghc-weigh") -- cgit v1.2.3 From 52f5114d016688fb143079056a64b8abfb319507 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Oct 2018 18:37:58 +0200 Subject: gnu: Add ghc-raw-string-qq. * gnu/packages/haskell.scm (ghc-raw-string-qq): New variable. --- gnu/packages/haskell.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 9a5f7c9746..6b8a4ee3fc 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -11044,6 +11044,31 @@ are described in a file named @code{package.yaml}. Both @code{cabal2nix} and @code{package.yaml}.") (license license:expat))) +(define-public ghc-raw-strings-qq + (package + (name "ghc-raw-strings-qq") + (version "1.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "raw-strings-qq/raw-strings-qq-" + version ".tar.gz")) + (sha256 + (base32 + "1lxy1wy3awf52968iy5y9r5z4qgnn2sxkdrh7js3m9gadb11w09f")))) + (build-system haskell-build-system) + (native-inputs `(("ghc-hunit" ,ghc-hunit))) + (home-page "https://github.com/23Skidoo/raw-strings-qq") + (synopsis "Raw string literals for Haskell") + (description + "This package provides a quasiquoter for raw string literals, i.e. string +literals that don't recognise the standard escape sequences. Basically, they +make your code more readable by freeing you from the responsibility to escape +backslashes. They are useful when working with regular expressions, +DOS/Windows paths and markup languages (such as XML).") + (license license:bsd-3))) + (define-public ghc-weigh (package (name "ghc-weigh") -- cgit v1.2.3 From 88189099dff99ecb4912c9c01adb920868049bec Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Oct 2018 18:38:00 +0200 Subject: gnu: Add ghc-inline-c. * gnu/packages/haskell.scm (ghc-inline-c): New variable. --- gnu/packages/haskell.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 6b8a4ee3fc..9bc86bfbd3 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -11069,6 +11069,52 @@ backslashes. They are useful when working with regular expressions, DOS/Windows paths and markup languages (such as XML).") (license license:bsd-3))) +(define-public ghc-inline-c + (package + (name "ghc-inline-c") + (version "0.6.1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/inline-c/" + "inline-c-" version ".tar.gz")) + (sha256 + (base32 + "0vbfrsqsi7mdziqsnj68bsqlwbqxxhvrmy9rv6w8z18d1m8w3n6h")))) + (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'create-Setup.hs + (lambda _ + (with-output-to-file "Setup.hs" + (lambda _ + (display "\ +import Distribution.Simple +main = defaultMain"))) + #t))))) + (inputs + `(("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint) + ("ghc-cryptohash" ,ghc-cryptohash) + ("ghc-hashable" ,ghc-hashable) + ("ghc-parsec" ,ghc-parsec) + ("ghc-parsers" ,ghc-parsers) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-vector" ,ghc-vector))) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-hspec" ,ghc-hspec) + ("ghc-raw-strings-qq" ,ghc-raw-strings-qq) + ("ghc-regex-posix" ,ghc-regex-posix))) + (home-page "http://hackage.haskell.org/package/inline-c") + (synopsis "Write Haskell source files including C code inline") + (description + "inline-c lets you seamlessly call C libraries and embed high-performance +inline C code in Haskell modules. Haskell and C can be freely intermixed in +the same source file, and data passed to and from code in either language with +minimal overhead. No FFI required.") + (license license:expat))) + (define-public ghc-weigh (package (name "ghc-weigh") -- cgit v1.2.3 From 9ef95a196f5144506eb92e3870de96a180454643 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Oct 2018 18:38:02 +0200 Subject: gnu: Add ghc-safe-exceptions. * gnu/packages/haskell.scm (ghc-safe-exceptions): New variable. --- gnu/packages/haskell.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 9bc86bfbd3..5d68ddcada 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -11180,4 +11180,37 @@ Haskell value or function.") vector spaces.") (license license:bsd-3))) +(define-public ghc-safe-exceptions + (package + (name "ghc-safe-exceptions") + (version "0.1.7.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "safe-exceptions/safe-exceptions-" + version ".tar.gz")) + (sha256 + (base32 + "0sd0zfsm9pcll5bzzj523rbn45adjrnavdkz52hgmdjjgdcdrk8q")))) + (build-system haskell-build-system) + (arguments + '(#:cabal-revision + ("4" "0fid41gishzsyb47wzxhd5falandfirqcp760hcja81qjpfmqd32"))) + (inputs `(("ghc-exceptions" ,ghc-exceptions))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("ghc-void" ,ghc-void) + ("hspec-discover" ,hspec-discover))) + (home-page "https://github.com/fpco/safe-exceptions") + (synopsis "Safe, consistent, and easy exception handling") + (description "Runtime exceptions - as exposed in @code{base} by the +@code{Control.Exception} module - have long been an intimidating part of the +Haskell ecosystem. This package is intended to overcome this. It provides a +safe and simple API on top of the existing exception handling machinery. The +API is equivalent to the underlying implementation in terms of power but +encourages best practices to minimize the chances of getting the exception +handling wrong.") + (license license:expat))) + ;;; haskell.scm ends here -- cgit v1.2.3 From d9ee3e375ca54bb6f4fd6bbc5b3646e27a0c25d0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Oct 2018 18:38:04 +0200 Subject: gnu: Add ghc-inline-c-cpp. * gnu/packages/haskell.scm (ghc-inline-c-cpp): New variable. --- gnu/packages/haskell.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 5d68ddcada..9e47c4cbfc 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -11213,4 +11213,40 @@ encourages best practices to minimize the chances of getting the exception handling wrong.") (license license:expat))) +(define-public ghc-inline-c-cpp + (package + (name "ghc-inline-c-cpp") + (version "0.2.2.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/inline-c-cpp/" + "inline-c-cpp-" version ".tar.gz")) + (sha256 + (base32 + "1rk7fmpkmxw9hhwr8df29kadnf0ybnwj64ggdbnsdrpfyhnkisci")))) + (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'create-Setup.hs + (lambda _ + (with-output-to-file "Setup.hs" + (lambda _ + (display "\ +import Distribution.Simple +main = defaultMain"))) + #t))))) + (inputs + `(("ghc-inline-c" ,ghc-inline-c) + ("ghc-safe-exceptions" ,ghc-safe-exceptions))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec))) + (home-page "https://hackage.haskell.org/package/inline-c-cpp") + (synopsis "Lets you embed C++ code into Haskell") + (description + "This package provides utilities to inline C++ code into Haskell using +@code{inline-c}.") + (license license:expat))) + ;;; haskell.scm ends here -- cgit v1.2.3 From d453b899448bd1dc909e7ef279d52940a95031e0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Oct 2018 18:38:06 +0200 Subject: gnu: Add ghc-bytestring-lexing. * gnu/packages/haskell.scm (ghc-bytestring-lexing): New variable. --- gnu/packages/haskell.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 9e47c4cbfc..33354e883b 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -11249,4 +11249,25 @@ main = defaultMain"))) @code{inline-c}.") (license license:expat))) +(define-public ghc-bytestring-lexing + (package + (name "ghc-bytestring-lexing") + (version "0.5.0.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "bytestring-lexing/bytestring-lexing-" + version ".tar.gz")) + (sha256 + (base32 + "0wrzniawhgpphc6yx1v972gyqxdbv0pizaz9bafahrshyb9svy81")))) + (build-system haskell-build-system) + (home-page "http://code.haskell.org/~wren/") + (synopsis "Parse and produce literals from strict or lazy bytestrings") + (description + "This package provides tools to parse and produce literals efficiently +from strict or lazy bytestrings.") + (license license:bsd-2))) + ;;; haskell.scm ends here -- cgit v1.2.3 From c7e400b1eefd627e634a9624f4f68f217d55715d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Oct 2018 18:38:08 +0200 Subject: gnu: Add ghc-configurator. * gnu/packages/haskell.scm (ghc-configurator): New variable. --- gnu/packages/haskell.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 33354e883b..af44232cee 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -11270,4 +11270,47 @@ main = defaultMain"))) from strict or lazy bytestrings.") (license license:bsd-2))) +(define-public ghc-configurator + (package + (name "ghc-configurator") + (version "0.3.0.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "configurator/configurator-" + version ".tar.gz")) + (sha256 + (base32 + "1d1iq1knwiq6ia5g64rw5hqm6dakz912qj13r89737rfcxmrkfbf")))) + (build-system haskell-build-system) + (inputs + `(("ghc-attoparsec" ,ghc-attoparsec) + ("ghc-hashable" ,ghc-hashable) + ("ghc-text" ,ghc-text) + ("ghc-unix-compat" ,ghc-unix-compat) + ("ghc-unordered-containers" ,ghc-unordered-containers))) + (native-inputs + `(("ghc-hunit" ,ghc-hunit) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) + (home-page "http://github.com/bos/configurator") + (synopsis "Configuration management") + (description + "This package provides a configuration management library for programs +and daemons. The features include: + +@enumerate +@item Automatic, dynamic reloading in response to modifications to + configuration files. +@item A simple, but flexible, configuration language, supporting several of + the most commonly needed types of data, along with interpolation of strings + from the configuration or the system environment (e.g. @code{$(HOME)}). +@item Subscription-based notification of changes to configuration properties. +@item An @code{import} directive allows the configuration of a complex + application to be split across several smaller files, or common configuration + data to be shared across several applications. +@end enumerate\n") + (license license:bsd-3))) + ;;; haskell.scm ends here -- cgit v1.2.3 From ea202046fa66028463df9cf23399d4adc39f5c36 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Oct 2018 18:38:10 +0200 Subject: gnu: Add ghc-file-embed. * gnu/packages/haskell.scm (ghc-file-embed): New variable. --- gnu/packages/haskell.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index af44232cee..28f5bdffe6 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -11313,4 +11313,25 @@ and daemons. The features include: @end enumerate\n") (license license:bsd-3))) +(define-public ghc-file-embed + (package + (name "ghc-file-embed") + (version "0.0.10.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/file-embed/" + "file-embed-" version ".tar.gz")) + (sha256 + (base32 + "0lj164cnzqyd487mli91nnr7137a4h4qsasfwsnsh77sx12fpk9k")))) + (build-system haskell-build-system) + (home-page "https://github.com/snoyberg/file-embed") + (synopsis "Use Template Haskell to embed file contents directly") + (description + "This package allows you to use Template Haskell to read a file or all +the files in a directory, and turn them into @code{(path, bytestring)} pairs +embedded in your Haskell code.") + (license license:bsd-3))) + ;;; haskell.scm ends here -- cgit v1.2.3 From b1f9cc88c4e371e39aae4a6dee8fcc775c2ac9a5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Oct 2018 18:38:12 +0200 Subject: gnu: Add ghc-safeio. * gnu/packages/haskell.scm (ghc-safeio): New variable. --- gnu/packages/haskell.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 28f5bdffe6..0a90ac523c 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -11334,4 +11334,34 @@ the files in a directory, and turn them into @code{(path, bytestring)} pairs embedded in your Haskell code.") (license license:bsd-3))) +(define-public ghc-safeio + (package + (name "ghc-safeio") + (version "0.0.5.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/safeio/" + "safeio-" version ".tar.gz")) + (sha256 + (base32 + "04g3070cbjdqj0h9l9ii6470xcbn40xfv4fr89a8yvnkdim9nyfm")))) + (build-system haskell-build-system) + (inputs + `(("ghc-conduit" ,ghc-conduit) + ("ghc-conduit-combinators" ,ghc-conduit-combinators) + ("ghc-exceptions" ,ghc-exceptions) + ("ghc-resourcet" ,ghc-resourcet))) + (native-inputs + `(("ghc-hunit" ,ghc-hunit) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) + ("ghc-test-framework-th" ,ghc-test-framework-th))) + (home-page "https://github.com/luispedro/safeio") + (synopsis "Write output to disk atomically") + (description + "This package implements utilities to perform atomic output so as to +avoid the problem of partial intermediate files.") + (license license:expat))) + ;;; haskell.scm ends here -- cgit v1.2.3 From d71078bc75d149c70dc573a259986f1731145693 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Oct 2018 18:38:14 +0200 Subject: gnu: Add ngless. * gnu/packages/bioinformatics.scm (ngless): New variable. --- gnu/packages/bioinformatics.scm | 87 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 43220d22fe..ab9dc185a3 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -38,6 +38,7 @@ #:use-module (guix build-system ant) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) + #:use-module (guix build-system haskell) #:use-module (guix build-system ocaml) #:use-module (guix build-system perl) #:use-module (guix build-system python) @@ -72,6 +73,8 @@ #:use-module (gnu packages groff) #:use-module (gnu packages guile) #:use-module (gnu packages haskell) + #:use-module (gnu packages haskell-check) + #:use-module (gnu packages haskell-web) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) #:use-module (gnu packages java) @@ -13970,3 +13973,87 @@ enrichment analysis (GSEA) calculation with or without the absolute filtering. Without filtering, users can perform (original) two-tailed or one-tailed absolute GSEA.") (license license:gpl2))) + +(define-public ngless + (package + (name "ngless") + (version "0.9.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/ngless/ngless.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0mc2gi7h4lx74zylvyp76mvc0w6706j858ii9vlgzqsw6acpr117")))) + (build-system haskell-build-system) + (arguments + `(#:haddock? #f ; The haddock phase fails with: NGLess/CmdArgs.hs:20:1: + ; error: parse error on input import + ; import Options.Applicative + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'create-cabal-file + (lambda _ (invoke "hpack") #t))))) + (inputs + `(("ghc-aeson" ,ghc-aeson) + ("ghc-ansi-terminal" ,ghc-ansi-terminal) + ("ghc-async" ,ghc-async) + ("ghc-atomic-write" ,ghc-atomic-write) + ("ghc-bytestring-lexing" ,ghc-bytestring-lexing) + ("ghc-chart" ,ghc-chart) + ("ghc-chart-cairo" ,ghc-chart-cairo) + ("ghc-conduit" ,ghc-conduit) + ("ghc-conduit-algorithms" ,ghc-conduit-algorithms) + ("ghc-conduit-combinators" ,ghc-conduit-combinators) + ("ghc-conduit-extra" ,ghc-conduit-extra) + ("ghc-configurator" ,ghc-configurator) + ("ghc-convertible" ,ghc-convertible) + ("ghc-data-default" ,ghc-data-default) + ("ghc-double-conversion" ,ghc-double-conversion) + ("ghc-edit-distance" ,ghc-edit-distance) + ("ghc-either" ,ghc-either) + ("ghc-errors" ,ghc-errors) + ("ghc-extra" ,ghc-extra) + ("ghc-filemanip" ,ghc-filemanip) + ("ghc-file-embed" ,ghc-file-embed) + ("ghc-gitrev" ,ghc-gitrev) + ("ghc-hashtables" ,ghc-hashtables) + ("ghc-http-conduit" ,ghc-http-conduit) + ("ghc-inline-c" ,ghc-inline-c) + ("ghc-inline-c-cpp" ,ghc-inline-c-cpp) + ("ghc-intervalmap" ,ghc-intervalmap) + ("ghc-missingh" ,ghc-missingh) + ("ghc-optparse-applicative" ,ghc-optparse-applicative) + ("ghc-parsec" ,ghc-parsec) + ("ghc-regex" ,ghc-regex) + ("ghc-safe" ,ghc-safe) + ("ghc-safeio" ,ghc-safeio) + ("ghc-strict" ,ghc-strict) + ("ghc-tar" ,ghc-tar) + ("ghc-text" ,ghc-text) + ("ghc-unliftio" ,ghc-unliftio) + ("ghc-unliftio-core" ,ghc-unliftio-core) + ("ghc-vector" ,ghc-vector) + ("ghc-yaml" ,ghc-yaml) + ("ghc-zlib" ,ghc-zlib))) + (propagated-inputs + `(("r-r6" ,r-r6) + ("r-hdf5r" ,r-hdf5r) + ("r-iterators" ,r-iterators) + ("r-itertools" ,r-itertools) + ("r-matrix" ,r-matrix))) + (native-inputs + `(("ghc-hpack" ,ghc-hpack) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit",ghc-test-framework-hunit) + ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2) + ("ghc-test-framework-th" ,ghc-test-framework-th))) + (home-page "https://gitlab.com/ngless/ngless") + (synopsis "DSL for processing next-generation sequencing data") + (description "Ngless is a domain-specific language for +@dfn{next-generation sequencing} (NGS) data processing.") + (license license:expat))) -- cgit v1.2.3 From e90ce1157794bfecfe93f7c31dc4bd631dd710fb Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 6 Oct 2018 03:32:12 -0400 Subject: gnu: git: Update to 2.19.1 [fixes CVE-2018-17456]. * gnu/packages/version-control.scm (git): Update to 2.19.1. --- gnu/packages/version-control.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index cc892b9c62..00d7e1f189 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -146,14 +146,14 @@ as well as the classic centralized workflow.") (name "git") ;; XXX When updating Git, check if the special 'git-source' input to cgit ;; needs to be updated as well. - (version "2.19.0") + (version "2.19.1") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/scm/git/git-" version ".tar.xz")) (sha256 (base32 - "1x1y5z3awabmfg7hk6zb331jxngad4nal4507v96bnf0izsyy3qq")))) + "1dfv43lmdnxz42504jc89sihbv1d4d6kgqcz3c5ji140kfm5cl1l")))) (build-system gnu-build-system) (native-inputs `(("native-perl" ,perl) @@ -166,7 +166,7 @@ as well as the classic centralized workflow.") version ".tar.xz")) (sha256 (base32 - "1jvxiqvp9q4is3np063ny7rnmk5hm36d34bhi3cgv89njqdh8laf")))))) + "1vn6pi9yvw7rnb9dvi1yjrvv39fqd1m9mwbaffqwizs3gaf91br7")))))) (inputs `(("curl" ,curl) ("expat" ,expat) -- cgit v1.2.3 From ccfac015bfb9eb3fa50590517f01fdb20c810750 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Oct 2018 18:18:22 +0200 Subject: gnu: wcslib: Update to 5.20. * gnu/packages/astronomy.scm (wcslib): Update to 5.20. [arguments]: Build parallelly. --- gnu/packages/astronomy.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 88e3723a1f..3c8b9cc8df 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -68,7 +68,7 @@ in FITS files.") (define-public wcslib (package (name "wcslib") - (version "5.18") + (version "5.20") (source (origin (method url-fetch) @@ -76,7 +76,7 @@ in FITS files.") "ftp://ftp.atnf.csiro.au/pub/software/wcslib/" name "-" version ".tar.bz2")) (sha256 - (base32 "16jh568k99c9p0y3qzcgps2rii933x9wlay7q1xm0lr59zqzp4xn")))) + (base32 "1c8g9kv4dxrnawnqi4spi2p10s2xs7x75pdfxhbqxgcc97dkgh0b")))) (inputs `(("cfitsio" ,cfitsio))) (build-system gnu-build-system) @@ -89,8 +89,7 @@ in FITS files.") (("/bin/sh") "sh")) #t)) (delete 'install-license-files)) ; installed by ‘make install’ - ;; Both the build and tests fail randomly when run in parallel. - #:parallel-build? #f + ;; Parallel execution of the test suite is not supported. #:parallel-tests? #f)) (home-page "https://www.atnf.csiro.au/people/mcalabre/WCS") (synopsis "Library which implements the FITS WCS standard") -- cgit v1.2.3 From 96808b39e76aae65a0ed3149780f23d91326b6c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sun, 7 Oct 2018 14:55:55 +0800 Subject: gnu: pd: Update to 0.49-0. * gnu/packages/music.scm (pd): Update to 0.49-0. --- gnu/packages/music.scm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 2d834d8c1f..3163e6a8f6 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1726,7 +1726,7 @@ export.") (define-public pd (package (name "pd") - (version "0.47-1") + (version "0.49-0") (source (origin (method url-fetch) (uri @@ -1734,16 +1734,20 @@ export.") version ".src.tar.gz")) (sha256 (base32 - "0k5s949kqd7yw97h3m8z81bjz32bis9m4ih8df1z0ymipnafca67")))) + "18rzqbpgnnvyslap7k0ly87aw1bbxkb0rk5agpr423ibs9slxq6j")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no "check" target + #:configure-flags + (list + "--enable-jack" + (string-append "--with-wish=" (string-append + (assoc-ref %build-inputs "tk") + "/bin/wish8.6"))) #:phases (modify-phases %standard-phases - (add-before 'configure 'fix-wish-path + (add-before 'configure 'fix-with-path (lambda _ - (substitute* "src/s_inter.c" - ((" wish ") (string-append " " (which "wish8.6") " "))) (substitute* "tcl/pd-gui.tcl" (("exec wish ") (string-append "exec " (which "wish8.6") " "))) #t)) -- cgit v1.2.3 From c8a99ab9112b6a671b15766301f03e428108c4eb Mon Sep 17 00:00:00 2001 From: fis trivial Date: Sun, 7 Oct 2018 09:03:40 +0000 Subject: gnu: mercurial: Update to 4.6.2. * gnu/packages/version-control.scm (mercurial): Update to 4.6.2. --- gnu/packages/version-control.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 00d7e1f189..528d117e29 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1119,14 +1119,14 @@ control to Git repositories.") (define-public mercurial (package (name "mercurial") - (version "4.4.1") + (version "4.6.2") (source (origin (method url-fetch) (uri (string-append "https://www.mercurial-scm.org/" "release/mercurial-" version ".tar.gz")) (sha256 (base32 - "0ik2ypzxjr6vpcghxvn39a73gw52629n7vwak04gnbycsq95aalg")))) + "1bv6wgcdx8glihjjfg22khhc52mclsn4kwfqvzbzlg0b42h4xl0w")))) (build-system python-build-system) (arguments `(;; Restrict to Python 2, as Python 3 would require -- cgit v1.2.3 From 2c4be1add077bf30f949282edcc2ea507ba44497 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sun, 7 Oct 2018 14:14:13 +0200 Subject: gnu: Add java-w3c-smil. * gnu/packages/batik.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. --- gnu/local.mk | 1 + gnu/packages/batik.scm | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+) create mode 100644 gnu/packages/batik.scm (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 8f854e98b5..f1ce800dd5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -77,6 +77,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/backup.scm \ %D%/packages/base.scm \ %D%/packages/bash.scm \ + %D%/packages/batik.scm \ %D%/packages/bdw-gc.scm \ %D%/packages/benchmark.scm \ %D%/packages/bioconductor.scm \ diff --git a/gnu/packages/batik.scm b/gnu/packages/batik.scm new file mode 100644 index 0000000000..91eb8f01d5 --- /dev/null +++ b/gnu/packages/batik.scm @@ -0,0 +1,90 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2018 Danny Milosavljevic +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages batik) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix utils) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (guix packages) + #:use-module (guix build-system ant) + #:use-module (gnu packages) + #:use-module (gnu packages compression) + #:use-module (gnu packages java) + #:use-module (gnu packages textutils)) + +(define-public java-w3c-smil-3.0 + (package + (name "java-w3c-smil") + (version "3.0") + (source #f) + (build-system ant-build-system) + (arguments + `(#:jar-name "w3c-smil.jar" + #:source-dir "." + #:tests? #f ; No tests exist. + #:phases + (modify-phases %standard-phases + (replace 'unpack + (lambda* (#:key source #:allow-other-keys) + ;; https://www.w3.org/TR/SMIL3/smil-timing.html#q142 + (mkdir-p "org/w3c/dom/smil") + (call-with-output-file "org/w3c/dom/smil/ElementTimeControl.java" + (lambda (port) + (format port " +package org.w3c.dom.smil; + +import org.w3c.dom.DOMException; + +public interface ElementTimeControl { + public boolean beginElement(); + + public boolean beginElementAt(float offset); + + public boolean endElement(); + + public boolean endElementAt(float offset); +} +"))) + (call-with-output-file "org/w3c/dom/smil/TimeEvent.java" + (lambda (port) + (format port " +package org.w3c.dom.smil; + +import org.w3c.dom.events.Event; +import org.w3c.dom.views.AbstractView; + +public interface TimeEvent extends Event { + public AbstractView getView(); + + public int getDetail(); + + public void initTimeEvent(String typeArg, + AbstractView viewArg, + int detailArg); + +} +"))) + #t))))) + (native-inputs + `(("unzip" ,unzip))) + (home-page "https://www.w3.org/Style/CSS/SAC/") + (synopsis "W3C SAC interface for CSS parsers in Java") + (description "This package provides a SAC interface by the W3C. +SAC is an interface for CSS parsers.") + (license license:w3c))) -- cgit v1.2.3 From da99c46f63d13cd42b871f3e180be830061cc8b3 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sun, 7 Oct 2018 14:15:21 +0200 Subject: gnu: Add java-w3c-svg. * gnu/packages/batik.scm (java-w3c-svg-1.0, java-w3c-svg): New variables. --- gnu/packages/batik.scm | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/batik.scm b/gnu/packages/batik.scm index 91eb8f01d5..b3361d9092 100644 --- a/gnu/packages/batik.scm +++ b/gnu/packages/batik.scm @@ -88,3 +88,71 @@ public interface TimeEvent extends Event { (description "This package provides a SAC interface by the W3C. SAC is an interface for CSS parsers.") (license license:w3c))) + +(define-public java-w3c-svg-1.0 + (package + (name "java-w3c-svg") + (version "20010904") + (source + (origin + (method url-fetch) + (uri (string-append "http://www.w3.org/TR/2001/REC-SVG-" version + "/java-binding.zip")) + (sha256 + (base32 + "0gnxvx51bg6ijplf6l2q0i1m07101f7fickawshfygnsdjqfdnbp")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "w3c-svg.jar" + #:source-dir "." + #:tests? #f ; No tests exist. + #:phases + (modify-phases %standard-phases + (replace 'unpack + (lambda* (#:key source #:allow-other-keys) + (invoke "unzip" source))) + (add-after 'unpack 'patch-interface + (lambda _ + ;; Make it compatible with batik. + ;; This is equivalent to usingxml commons externals' + ;; "externals" part from https://xerces.apache.org/mirrors.cgi + (substitute* "SVGFEConvolveMatrixElement.java" + (("public SVGAnimatedLength[ ]*getKernelUnitLength") + "public SVGAnimatedNumber getKernelUnitLength")) + (substitute* "SVGFEMorphologyElement.java" + (("public SVGAnimatedLength[ ]*getRadius") + "public SVGAnimatedNumber getRadius")) + (call-with-output-file "EventListenerInitializer.java" + (lambda (port) + (format port " +// License: http://www.apache.org/licenses/LICENSE-2.0 +package org.w3c.dom.svg; +public interface EventListenerInitializer { + public void initializeEventListeners(SVGDocument doc); +} + +"))) + #t))))) + (propagated-inputs + `(("java-w3c-smil" ,java-w3c-smil-3.0))) + (native-inputs + `(("unzip" ,unzip))) + (home-page "https://www.w3.org/Style/CSS/SAC/") + (synopsis "W3C SVG interface") + (description "This package provides a SVG interface.") + (license license:w3c))) + +(define-public java-w3c-svg + (package + (inherit java-w3c-svg-1.0) + (version "20110816") + (source + (origin + (method url-fetch) + (uri (string-append "http://www.w3.org/TR/2011/REC-SVG11-" version + "/java-binding.zip")) + (sha256 + (base32 + "0jicqcrxav8ggs37amgvvwgc2f0qp1c5wns4rb2i3si83s2m09ns")))) + (propagated-inputs + `()))) -- cgit v1.2.3 From 283f57d8fa3dc2a9a6798dbea6b6b87319fda1ad Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sun, 7 Oct 2018 14:16:01 +0200 Subject: gnu: Add java-w3c-sac. * gnu/packages/batik.scm (java-w3c-sac): New variable. --- gnu/packages/batik.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/batik.scm b/gnu/packages/batik.scm index b3361d9092..cf946e570e 100644 --- a/gnu/packages/batik.scm +++ b/gnu/packages/batik.scm @@ -156,3 +156,33 @@ public interface EventListenerInitializer { "0jicqcrxav8ggs37amgvvwgc2f0qp1c5wns4rb2i3si83s2m09ns")))) (propagated-inputs `()))) + +(define-public java-w3c-sac + (package + (name "java-w3c-sac") + (version "1.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.w3.org/2002/06/sacjava-" version + ".zip")) + (sha256 + (base32 + "1djp2nnzf8jchnwz1ij9i5jfx4cg1ryf3lbw133yzjy0wkhcla52")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "w3c-sac.jar" + #:source-dir "sac-1.3" + #:tests? #f ; No tests exist. + #:phases + (modify-phases %standard-phases + (replace 'unpack + (lambda* (#:key source #:allow-other-keys) + (invoke "unzip" source)))))) + (native-inputs + `(("unzip" ,unzip))) + (home-page "https://www.w3.org/Style/CSS/SAC/") + (synopsis "W3C SAC interface for CSS parsers in Java") + (description "This package provides a SAC interface by the W3C. +SAC is an interface for CSS parsers.") + (license license:w3c))) -- cgit v1.2.3 From 52d2725ab126a98f170482d483ef4ddd71ba8edf Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sun, 7 Oct 2018 14:32:05 +0200 Subject: gnu: Add java-xmlgraphics-commons. * gnu/packages/batik.scm (java-xmlgraphics-commons): New variable. --- gnu/packages/batik.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/batik.scm b/gnu/packages/batik.scm index cf946e570e..d45600f7b9 100644 --- a/gnu/packages/batik.scm +++ b/gnu/packages/batik.scm @@ -186,3 +186,48 @@ public interface EventListenerInitializer { (description "This package provides a SAC interface by the W3C. SAC is an interface for CSS parsers.") (license license:w3c))) + +(define-public java-xmlgraphics-commons + (package + (name "java-xmlgraphics-commons") + (version "2.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://apache/xmlgraphics/commons/source/xmlgraphics-commons-" + version "-src.tar.gz")) + (sha256 + (base32 + "0a432a4ca3vgnbada5cy9mlmfzmq6hi4i176drfxrp17q2d43w23")))) + (build-system ant-build-system) + (arguments + `(#:build-target "jar-main" + ;; TODO: More detailed tests are available--but they need + ;; commons-xml-resolver. + ;; TODO: Provide commons-xml-resolver. + #:test-target "junit-basic" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'make-reproducible + (lambda _ + (substitute* "build.xml" + ((" Date: Sun, 7 Oct 2018 14:42:15 +0200 Subject: gnu: java-xmlgraphics-commons: Remove bundled dependencies. * gnu/packages/batik.scm (java-xmlgraphics-commons): Remove bundled dependencies. --- gnu/packages/batik.scm | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/batik.scm b/gnu/packages/batik.scm index d45600f7b9..9449e565f1 100644 --- a/gnu/packages/batik.scm +++ b/gnu/packages/batik.scm @@ -26,7 +26,8 @@ #:use-module (gnu packages) #:use-module (gnu packages compression) #:use-module (gnu packages java) - #:use-module (gnu packages textutils)) + #:use-module (gnu packages textutils) + #:use-module (gnu packages xml)) (define-public java-w3c-smil-3.0 (package @@ -199,13 +200,16 @@ SAC is an interface for CSS parsers.") version "-src.tar.gz")) (sha256 (base32 - "0a432a4ca3vgnbada5cy9mlmfzmq6hi4i176drfxrp17q2d43w23")))) + "0a432a4ca3vgnbada5cy9mlmfzmq6hi4i176drfxrp17q2d43w23")) + (modules '((guix build utils))) + (snippet + `(begin + (delete-file-recursively "lib") + #t)))) (build-system ant-build-system) (arguments `(#:build-target "jar-main" - ;; TODO: More detailed tests are available--but they need - ;; commons-xml-resolver. - ;; TODO: Provide commons-xml-resolver. + ;; TODO: More detailed tests are available. #:test-target "junit-basic" #:phases (modify-phases %standard-phases @@ -215,6 +219,11 @@ SAC is an interface for CSS parsers.") ((" Date: Sun, 7 Oct 2018 14:43:47 +0200 Subject: gnu: java-xmlgraphics-commons: Make error in tests fail the "check" phase. * gnu/packages/batik.scm (java-xmlgraphics-commons)[arguments]<#:test-target>: Use "junit" test target. --- gnu/packages/batik.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/batik.scm b/gnu/packages/batik.scm index 9449e565f1..5bba859370 100644 --- a/gnu/packages/batik.scm +++ b/gnu/packages/batik.scm @@ -209,8 +209,7 @@ SAC is an interface for CSS parsers.") (build-system ant-build-system) (arguments `(#:build-target "jar-main" - ;; TODO: More detailed tests are available. - #:test-target "junit-basic" + #:test-target "junit" #:phases (modify-phases %standard-phases (add-after 'unpack 'make-reproducible -- cgit v1.2.3 From 3158425eb85419bc8bf787fe1b00af30133bdaa3 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sun, 7 Oct 2018 14:46:26 +0200 Subject: gnu: java-xmlgraphics-commons: Add dependency to java-cglib. * gnu/packages/batik.scm (java-xmlgraphics-commons)[native-inputs]: Add java-cglib. --- gnu/packages/batik.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/batik.scm b/gnu/packages/batik.scm index 5bba859370..5a74d7cc35 100644 --- a/gnu/packages/batik.scm +++ b/gnu/packages/batik.scm @@ -234,6 +234,7 @@ SAC is an interface for CSS parsers.") #t)))))) (native-inputs `(("java-apache-xml-commons-resolver" ,java-apache-xml-commons-resolver) + ("java-cglib" ,java-cglib) ("java-hamcrest" ,java-hamcrest-core) ("java-junit" ,java-junit) ("java-mockito" ,java-mockito-1) -- cgit v1.2.3 From 12a0b38ce6f93913ead590bb7ebc35db66a6e7b2 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sun, 7 Oct 2018 14:47:36 +0200 Subject: gnu: java-xmlgraphics-commons: Add dependency to java-asm. * gnu/packages/batik.scm (java-xmlgraphics-commons)[native-inputs]: Add java-asm. --- gnu/packages/batik.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/batik.scm b/gnu/packages/batik.scm index 5a74d7cc35..cdd1e44713 100644 --- a/gnu/packages/batik.scm +++ b/gnu/packages/batik.scm @@ -234,6 +234,7 @@ SAC is an interface for CSS parsers.") #t)))))) (native-inputs `(("java-apache-xml-commons-resolver" ,java-apache-xml-commons-resolver) + ("java-asm" ,java-asm) ("java-cglib" ,java-cglib) ("java-hamcrest" ,java-hamcrest-core) ("java-junit" ,java-junit) -- cgit v1.2.3 From ae6922ed148b6bde06e37a2c244c67a4f5e6dc00 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sun, 7 Oct 2018 15:28:37 +0200 Subject: gnu: Add java-jakarta-regexp. * gnu/packages/java.scm (java-jakarta-regexp): New variable. --- gnu/packages/java.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 96da495c29..93f5bb6aff 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -9634,6 +9634,39 @@ Candidate Recommendation, and will correctly serialize XML 1.1 documents if the DOM level 3 load/save API's are in use.") (license license:asl2.0))) +(define-public java-jakarta-regexp + (package + (name "java-jakarta-regexp") + (version "1.5") + (source + (origin + (method url-fetch) + (uri (string-append + "https://archive.apache.org/dist/jakarta/regexp/jakarta-regexp-" + version ".tar.gz")) + (sha256 + (base32 + "0zg9rmyif48dck0cv6ynpxv23mmcsx265am1fnnxss7brgw0ms3r")))) + (build-system ant-build-system) + (arguments + `(#:test-target "test" + #:phases + (modify-phases %standard-phases + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (out-share (string-append out "/share/java"))) + (mkdir-p out-share) + (for-each (lambda (name) + (install-file name out-share)) + (find-files "build" "^jakarta-regexp-.*\\.jar$")) + #t)))))) + (home-page "https://attic.apache.org/projects/jakarta-regexp.html") + (synopsis "Regular expression parser generator for Java.") + (description "@code{jakarta-regexp} is an old regular expression parser +generator for Java.") + (license license:asl2.0))) + (define-public java-jline (package (name "java-jline") -- cgit v1.2.3 From 236fadf52868d3ced233b144f9d560b51dcecec1 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 7 Oct 2018 00:35:23 +0200 Subject: gnu: mes: Update to 0.18. * gnu/packages/patches/mes-nyacc-0.86.0.patch: Removef file. * gnu/local.mk (dist_patch_DATA): Remove entry. * gnu/packages/mes.scm (mes): Update to 0.18. --- gnu/local.mk | 1 - gnu/packages/mes.scm | 5 +- gnu/packages/patches/mes-nyacc-0.86.0.patch | 197 ---------------------------- 3 files changed, 2 insertions(+), 201 deletions(-) delete mode 100644 gnu/packages/patches/mes-nyacc-0.86.0.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index f1ce800dd5..8be91c3708 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -956,7 +956,6 @@ dist_patch_DATA = \ %D%/packages/patches/mcrypt-CVE-2012-4409.patch \ %D%/packages/patches/mcrypt-CVE-2012-4426.patch \ %D%/packages/patches/mcrypt-CVE-2012-4527.patch \ - %D%/packages/patches/mes-nyacc-0.86.0.patch \ %D%/packages/patches/mesa-skip-disk-cache-test.patch \ %D%/packages/patches/meson-for-build-rpath.patch \ %D%/packages/patches/metabat-fix-compilation.patch \ diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 880e140b80..6dc6dfb4cb 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -63,15 +63,14 @@ extensive examples, including parsers for the Javascript and C99 languages.") (let ((triplet "i686-unknown-linux-gnu")) (package (name "mes") - (version "0.17.1") + (version "0.18") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/mes/" "mes-" version ".tar.gz")) - (patches (search-patches "mes-nyacc-0.86.0.patch")) (sha256 (base32 - "02g8zig53ffd0ai8kqhv2zj7bj2366a8hr6ydkwakmi2d1amyrna")))) + "1dsaaqyanzsq9m5wrcd2bjhb3qd6928c9q97rg5r730pyqjwxyxf")))) (build-system gnu-build-system) (supported-systems '("i686-linux" "x86_64-linux")) (propagated-inputs diff --git a/gnu/packages/patches/mes-nyacc-0.86.0.patch b/gnu/packages/patches/mes-nyacc-0.86.0.patch deleted file mode 100644 index 58dfc5a46b..0000000000 --- a/gnu/packages/patches/mes-nyacc-0.86.0.patch +++ /dev/null @@ -1,197 +0,0 @@ -From 9e610736bf779f3295c1192e748cd19cbbe3be28 Mon Sep 17 00:00:00 2001 -From: Jan Nieuwenhuizen -Date: Wed, 5 Sep 2018 20:28:06 +0200 -Subject: [PATCH 1/2] mes: Support Nyacc 0.85.3: Add char-set-copy. - -* mes/module/srfi/srfi-14.mes (char-set-copy): New function> ---- - mes/module/srfi/srfi-14.mes | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/mes/module/srfi/srfi-14.mes b/mes/module/srfi/srfi-14.mes -index 0be39b1e..a16d16ce 100644 ---- a/mes/module/srfi/srfi-14.mes -+++ b/mes/module/srfi/srfi-14.mes -@@ -52,3 +52,6 @@ - - (define (char-whitespace? c) - (char-set-contains? char-set:whitespace c)) -+ -+(define (char-set-copy cs) -+ (map identity cs)) --- -2.18.0 - -From b952bdf44f11edbfc277600dc35236aae1769b54 Mon Sep 17 00:00:00 2001 -From: Jan Nieuwenhuizen -Date: Wed, 5 Sep 2018 22:14:34 +0200 -Subject: [PATCH 2/2] mes: Support Nyacc 0.85.3: Integrate progress. - -* mes/module/nyacc/lang/sx-util.mes: New file. -* mes/module/nyacc/version.mes: New file. -* mes/module/nyacc/lang/c99/cpp.mes (nyacc): Include them. -* mes/module/nyacc/lang/c99/parser.mes (nyacc): Include them. -* module/mescc/preprocess.scm (need-progress): New function. -(progress): New function. -(insert-progress-monitors): Use them to Integrate progress. ---- - mes/module/mescc/preprocess.mes | 1 + - mes/module/nyacc/lang/c99/cpp.mes | 1 + - mes/module/nyacc/lang/c99/parser.mes | 1 + - mes/module/nyacc/lang/sx-util.mes | 27 +++++++++++++++++++++ - mes/module/nyacc/version.mes | 26 +++++++++++++++++++++ - module/mescc/preprocess.scm | 35 ++++++++++++++++++++++++++++ - 6 files changed, 91 insertions(+) - create mode 100644 mes/module/nyacc/lang/sx-util.mes - create mode 100644 mes/module/nyacc/version.mes - -diff --git a/mes/module/mescc/preprocess.mes b/mes/module/mescc/preprocess.mes -index c7c5fcaa..022a372c 100644 ---- a/mes/module/mescc/preprocess.mes -+++ b/mes/module/mescc/preprocess.mes -@@ -24,4 +24,5 @@ - (mes-use-module (srfi srfi-13)) - (mes-use-module (srfi srfi-26)) - (mes-use-module (nyacc lang c99 parser)) -+(mes-use-module (nyacc version)) - (include-from-path "mescc/preprocess.scm") -diff --git a/mes/module/nyacc/lang/c99/cpp.mes b/mes/module/nyacc/lang/c99/cpp.mes -index fad1dc55..b25c4a93 100644 ---- a/mes/module/nyacc/lang/c99/cpp.mes -+++ b/mes/module/nyacc/lang/c99/cpp.mes -@@ -28,5 +28,6 @@ - - (mes-use-module (nyacc parse)) - (mes-use-module (nyacc lex)) -+(mes-use-module (nyacc lang sx-util)) - (mes-use-module (nyacc lang util)) - (include-from-path "nyacc/lang/c99/cpp.scm") -diff --git a/mes/module/nyacc/lang/c99/parser.mes b/mes/module/nyacc/lang/c99/parser.mes -index c51552d6..1a9aaf73 100644 ---- a/mes/module/nyacc/lang/c99/parser.mes -+++ b/mes/module/nyacc/lang/c99/parser.mes -@@ -32,6 +32,7 @@ - - (mes-use-module (nyacc lex)) - (mes-use-module (nyacc parse)) -+(mes-use-module (nyacc lang sx-util)) - (mes-use-module (nyacc lang util)) - (mes-use-module (nyacc lang c99 cpp)) - -diff --git a/mes/module/nyacc/lang/sx-util.mes b/mes/module/nyacc/lang/sx-util.mes -new file mode 100644 -index 00000000..41ac5b4a ---- /dev/null -+++ b/mes/module/nyacc/lang/sx-util.mes -@@ -0,0 +1,27 @@ -+;;; -*-scheme-*- -+ -+;;; GNU Mes --- Maxwell Equations of Software -+;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen -+;;; -+;;; This file is part of GNU Mes. -+;;; -+;;; GNU Mes is free software; you can redistribute it and/or modify it -+;;; under the terms of the GNU General Public License as published by -+;;; the Free Software Foundation; either version 3 of the License, or (at -+;;; your option) any later version. -+;;; -+;;; GNU Mes is distributed in the hope that it will be useful, but -+;;; WITHOUT ANY WARRANTY; without even the implied warranty of -+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+;;; GNU General Public License for more details. -+;;; -+;;; You should have received a copy of the GNU General Public License -+;;; along with GNU Mes. If not, see . -+ -+;;; Commentary: -+ -+;;; Code: -+ -+(mes-use-module (srfi srfi-1)) -+(mes-use-module (srfi srfi-16)) -+(include-from-path "nyacc/lang/sx-util.scm") -diff --git a/mes/module/nyacc/version.mes b/mes/module/nyacc/version.mes -new file mode 100644 -index 00000000..b9db628e ---- /dev/null -+++ b/mes/module/nyacc/version.mes -@@ -0,0 +1,26 @@ -+;;; -*-scheme-*- -+ -+;;; GNU Mes --- Maxwell Equations of Software -+;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen -+;;; -+;;; This file is part of GNU Mes. -+;;; -+;;; GNU Mes is free software; you can redistribute it and/or modify it -+;;; under the terms of the GNU General Public License as published by -+;;; the Free Software Foundation; either version 3 of the License, or (at -+;;; your option) any later version. -+;;; -+;;; GNU Mes is distributed in the hope that it will be useful, but -+;;; WITHOUT ANY WARRANTY; without even the implied warranty of -+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+;;; GNU General Public License for more details. -+;;; -+;;; You should have received a copy of the GNU General Public License -+;;; along with GNU Mes. If not, see . -+ -+;;; Commentary: -+ -+;;; Code: -+ -+(include-from-path "nyacc/version.scm") -+(display "nyacc version\n") -diff --git a/module/mescc/preprocess.scm b/module/mescc/preprocess.scm -index 9e341cba..c2efb32c 100644 ---- a/module/mescc/preprocess.scm -+++ b/module/mescc/preprocess.scm -@@ -26,9 +26,44 @@ - #:use-module (srfi srfi-1) - #:use-module (srfi srfi-26) - #:use-module (nyacc lang c99 parser) -+ #:use-module (nyacc lang c99 parser) -+ #:use-module (nyacc version) - #:use-module (mes guile) - #:export (c99-input->ast)) - -+(format (current-error-port) "*nyacc-version*=~a\n" *nyacc-version*) -+;; list of which rules you want progress reported -+(define need-progress -+ (assoc-ref -+ '(("0.85.3" (1 2 3)) -+ ("0.86.0" (1 2 3))) -+ *nyacc-version*)) -+ -+(define (progress o) -+ (when (and o (getenv "NYACC_DEBUG")) -+ (display " :" (current-error-port)) -+ (display o (current-error-port)) -+ (display "\n" (current-error-port)))) -+ -+(define (insert-progress-monitors act-v len-v) -+ (let ((n (vector-length act-v))) -+ (let loop ((ix 0)) -+ (when (< ix n) -+ (if (memq ix need-progress) -+ (vector-set -+ act-v ix -+ (lambda args -+ (progress (list-ref args (1- (vector-ref len-v ix)))) -+ (apply (vector-ref act-v ix) args)))) -+ (loop (1+ ix)))))) -+ -+(cond-expand -+ (guile -+ (insert-progress-monitors (@@ (nyacc lang c99 parser) c99-act-v) -+ (@@ (nyacc lang c99 parser) c99-len-v))) -+ (mes -+ (insert-progress-monitors c99-act-v c99-len-v))) -+ - (define (logf port string . rest) - (apply format (cons* port string rest)) - (force-output port) --- -2.18.0 - -- cgit v1.2.3 From 247537da81095d3bc03dc210954910d1008bafd3 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 6 Oct 2018 22:43:35 -0400 Subject: gnu: borg: The backup client cannot override the server-side storage quota. * gnu/packages/patches/borg-respect-storage-quota.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/backup.scm (borg)[source]: Use it. --- gnu/local.mk | 1 + gnu/packages/backup.scm | 1 + .../patches/borg-respect-storage-quota.patch | 32 ++++++++++++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 gnu/packages/patches/borg-respect-storage-quota.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 8be91c3708..ea2d650e28 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -599,6 +599,7 @@ dist_patch_DATA = \ %D%/packages/patches/binutils-loongson-workaround.patch \ %D%/packages/patches/blast+-fix-makefile.patch \ %D%/packages/patches/boost-fix-icu-build.patch \ + %D%/packages/patches/borg-respect-storage-quota.patch \ %D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/cairo-CVE-2016-9082.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index ea5bc8e398..408b64b48d 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -498,6 +498,7 @@ detection, and lossless compression.") (origin (method url-fetch) (uri (pypi-uri "borgbackup" version)) + (patches (search-patches "borg-respect-storage-quota.patch")) (sha256 (base32 "1p3zia62vyg9vadkdjzzkzbj4dmgijr7ix5lmhfbxpwy5q9imdgp")) diff --git a/gnu/packages/patches/borg-respect-storage-quota.patch b/gnu/packages/patches/borg-respect-storage-quota.patch new file mode 100644 index 0000000000..d23d1ffc01 --- /dev/null +++ b/gnu/packages/patches/borg-respect-storage-quota.patch @@ -0,0 +1,32 @@ +Make sure the client respects the storage quota set by the server: + +https://github.com/borgbackup/borg/issues/4093 + +Patch copied from upstream source repository: + +https://github.com/borgbackup/borg/commit/975cc33206e0e3644626fb7204c34d2157715b61 + +From 975cc33206e0e3644626fb7204c34d2157715b61 Mon Sep 17 00:00:00 2001 +From: Manu +Date: Wed, 3 Oct 2018 23:47:36 +0800 +Subject: [PATCH] Add storage_quota for forced_result if set by serve command. + +--- + src/borg/archiver.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/borg/archiver.py b/src/borg/archiver.py +index 916725e7..279194c1 100644 +--- a/src/borg/archiver.py ++++ b/src/borg/archiver.py +@@ -4276,6 +4276,7 @@ def get_args(self, argv, cmd): + result.restrict_to_paths = forced_result.restrict_to_paths + result.restrict_to_repositories = forced_result.restrict_to_repositories + result.append_only = forced_result.append_only ++ result.storage_quota = forced_result.storage_quota + return result + + def parse_args(self, args=None): +-- +2.19.1 + -- cgit v1.2.3 From cd220e60da3add3884aef7cc0ab8f4b9e8fb2e3c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 7 Oct 2018 15:08:46 -0400 Subject: gnu: ncmpc: Update to 0.32. * gnu/packages/mpd.scm (ncmpc): Update to 0.32. [inputs]: Add boost, pcre, and python-sphinx. Remove glib. [arguments]: Install the man pages correctly. Remove unnecessary configure flag. --- gnu/packages/mpd.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index c024152dda..3e69ddba69 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -47,6 +47,7 @@ #:use-module (gnu packages linux) #:use-module (gnu packages mp3) #:use-module (gnu packages ncurses) + #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages pulseaudio) @@ -186,7 +187,7 @@ player daemon.") (define-public ncmpc (package (name "ncmpc") - (version "0.30") + (version "0.32") (source (origin (method url-fetch) (uri @@ -195,11 +196,14 @@ player daemon.") "/ncmpc-" version ".tar.xz")) (sha256 (base32 - "18qj3cgqczgfk334x0ywxwa1ckrk9fbjyp34n4zzcxwaifshrzp3")))) + "1b01q1pcaw5yyhvmlffc3h0r3w8qy7rhn55a7xj4qkcfqvs8ap08")))) (build-system meson-build-system) (arguments `(#:configure-flags - (list "-Dcurses=ncurses") + ;; Otherwise, they are installed incorrectly, in + ;; '$out/share/man/man/man1'. + (list (string-append "-Dmandir=" (assoc-ref %outputs "out") + "/share")) #:phases (modify-phases %standard-phases (add-before 'configure 'expand-C++-include-path @@ -211,11 +215,13 @@ player daemon.") (setenv path (string-append c++ ":" (getenv path))) #t)))))) (inputs `(("gcc", gcc-8) ; for its C++14 support - ("glib" ,glib) + ("boost" ,boost) + ("pcre" ,pcre) ("libmpdclient" ,libmpdclient) ("ncurses" ,ncurses))) (native-inputs `(("gettext" ,gettext-minimal) ; for xgettext - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("python-sphinx" ,python-sphinx))) (synopsis "Curses Music Player Daemon client") (description "ncmpc is a fully featured MPD client, which runs in a terminal using ncurses.") -- cgit v1.2.3 From 68afb9dccf91cc1a58b6db405befa176b191d809 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 4 Oct 2018 11:30:23 -0400 Subject: build-system/glib-or-gtk: Build 'in-source' by default. * guix/build-system/glib-or-gtk.scm (glib-or-gtk-build): Change to 'out-of-source? #f'. * gnu/packages/audio.scm (audacity)[arguments]: Use the default 'out-of-source?' setting. * gnu/packages/libreoffice.scm (libreoffice): Likewise. --- gnu/packages/audio.scm | 5 ----- gnu/packages/libreoffice.scm | 3 --- 2 files changed, 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 434efab953..17b6363f7c 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -413,11 +413,6 @@ engineers, musicians, soundtrack editors and composers.") (substitute* "src/prefs/MidiIOPrefs.cpp" (("../../lib-src/portmidi/pm_common/portmidi.h") "portmidi.h")) #t))) - ;; The translation Makefile generation is performed improperly for - ;; out-of-tree builds. - ;; XXX This can be removed if the glib-or-gkt-build-system - ;; switches to #:out-of-source? #t. See . - #:out-of-source? #f ;; The test suite is not "well exercised" according to the developers, ;; and fails with various errors. See ;; . diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 881cf2008d..e5ab5c5071 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -1018,9 +1018,6 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") (arguments `(#:tests? #f ; Building the tests already fails. #:make-flags '("build-nocheck") ; Do not build unit tests, which fails. - ;; XXX Remove this if glib-or-gtk-build-system changes to in-source-tree - ;; builds by default. - #:out-of-source? #f #:phases (modify-phases %standard-phases (add-before 'configure 'prepare-src -- cgit v1.2.3 From a18accba468beecf0200383f56d02894caf6f41a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 7 Oct 2018 20:15:31 -0400 Subject: gnu: Remove Go 1.10. * gnu/packages/golang.scm (go-1.10): Remove variable. (go-1.11)[arguments]: Remove unnecessary environment variable from 'set-bootstrap-variables' phase. --- gnu/packages/golang.scm | 128 ++++-------------------------------------------- 1 file changed, 10 insertions(+), 118 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 7a049e39e1..7f26fbdab6 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -386,123 +386,9 @@ in the style of communicating sequential processes (@dfn{CSP}).") ,@(package-native-inputs go-1.4))) (supported-systems %supported-systems))) -(define-public go-1.10 - (package - (inherit go-1.9) - (name "go") - (version "1.10.4") - (source - (origin - (method url-fetch) - (uri (string-append "https://storage.googleapis.com/golang/" - name version ".src.tar.gz")) - (sha256 - (base32 - "10ap5pan71y2hdwzv4cg8wx4sy8fkcz5520rm1ldjg25xmjlkr3g")))) - (arguments - (substitute-keyword-arguments (package-arguments go-1.9) - ((#:phases phases) - `(modify-phases ,phases - (replace 'prebuild - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((gcclib (string-append (assoc-ref inputs "gcc:lib") "/lib")) - (ld (string-append (assoc-ref inputs "libc") "/lib")) - (loader (car (find-files ld "^ld-linux.+"))) - (net-base (assoc-ref inputs "net-base")) - (tzdata-path - (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo")) - (output (assoc-ref outputs "out"))) - - ;; Removing net/ tests, which fail when attempting to access - ;; network resources not present in the build container. - (for-each delete-file - '("net/listen_test.go" - "net/parse_test.go" - "net/cgo_unix_test.go")) - - (substitute* "os/os_test.go" - (("/usr/bin") (getcwd)) - (("/bin/pwd") (which "pwd")) - (("/bin/sh") (which "sh"))) - - ;; Add libgcc to runpath - (substitute* "cmd/link/internal/ld/lib.go" - (("!rpath.set") "true")) - (substitute* "cmd/go/internal/work/gccgo.go" - (("cgoldflags := \\[\\]string\\{\\}") - (string-append "cgoldflags := []string{" - "\"-rpath=" gcclib "\"" - "}")) - (("\"-lgcc_s\", ") - (string-append - "\"-Wl,-rpath=" gcclib "\", \"-lgcc_s\", "))) - (substitute* "cmd/go/internal/work/gc.go" - (("ldflags = setextld\\(ldflags, compiler\\)") - (string-append - "ldflags = setextld(ldflags, compiler)\n" - "ldflags = append(ldflags, \"-r\")\n" - "ldflags = append(ldflags, \"" gcclib "\")\n"))) - - ;; Disable failing tests: these tests attempt to access - ;; commands or network resources which are neither available - ;; nor necessary for the build to succeed. - (for-each - (match-lambda - ((file regex) - (substitute* file - ((regex all before test_name) - (string-append before "Disabled" test_name))))) - '(("net/net_test.go" "(.+)(TestShutdownUnix.+)") - ("net/dial_test.go" "(.+)(TestDialTimeout.+)") - ("os/os_test.go" "(.+)(TestHostname.+)") - ("time/format_test.go" "(.+)(TestParseInSydney.+)") - ("time/format_test.go" "(.+)(TestParseInLocation.+)") - ("os/exec/exec_test.go" "(.+)(TestEcho.+)") - ("os/exec/exec_test.go" "(.+)(TestCommandRelativeName.+)") - ("os/exec/exec_test.go" "(.+)(TestCatStdin.+)") - ("os/exec/exec_test.go" "(.+)(TestCatGoodAndBadFile.+)") - ("os/exec/exec_test.go" "(.+)(TestExitStatus.+)") - ("os/exec/exec_test.go" "(.+)(TestPipes.+)") - ("os/exec/exec_test.go" "(.+)(TestStdinClose.+)") - ("os/exec/exec_test.go" "(.+)(TestIgnorePipeErrorOnSuccess.+)") - ("syscall/syscall_unix_test.go" "(.+)(TestPassFD\\(.+)") - ("os/exec/exec_test.go" "(.+)(TestExtraFiles/areturn.+)") - ("cmd/go/go_test.go" "(.+)(TestCoverageWithCgo.+)") - ("cmd/go/go_test.go" "(.+)(TestTwoPkgConfigs.+)") - ("os/exec/exec_test.go" "(.+)(TestOutputStderrCapture.+)") - ("os/exec/exec_test.go" "(.+)(TestExtraFiles.+)") - ("os/exec/exec_test.go" "(.+)(TestExtraFilesRace.+)") - ("net/lookup_test.go" "(.+)(TestLookupPort.+)") - ("syscall/exec_linux_test.go" - "(.+)(TestCloneNEWUSERAndRemapNoRootDisableSetgroups.+)"))) - - ;; fix shebang for testar script - ;; note the target script is generated at build time. - (substitute* "../misc/cgo/testcarchive/carchive_test.go" - (("#!/usr/bin/env") (string-append "#!" (which "env")))) - - (substitute* "net/lookup_unix.go" - (("/etc/protocols") (string-append net-base "/etc/protocols"))) - (substitute* "net/port_unix.go" - (("/etc/services") (string-append net-base "/etc/services"))) - (substitute* "time/zoneinfo_unix.go" - (("/usr/share/zoneinfo/") tzdata-path)) - (substitute* (find-files "cmd" "\\.go") - (("/lib(64)?/ld-linux.*\\.so\\.[0-9]") loader)) - #t))) - (replace 'set-bootstrap-variables - (lambda* (#:key outputs inputs #:allow-other-keys) - ;; Tell the build system where to find the bootstrap Go. - (let ((go (assoc-ref inputs "go"))) - (setenv "GOROOT_BOOTSTRAP" go) - (setenv "GOGC" "400") - ;; Go 1.10 tries to write to $HOME in a test - (setenv "HOME" "/tmp") - #t))))))))) - (define-public go-1.11 (package - (inherit go-1.10) + (inherit go-1.9) (name "go") (version "1.11.1") (source @@ -514,7 +400,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") (base32 "05qivf2f59pv4bfrmdr4m0xvswkmvvl9c5a2h5dy45g2k8b8r3sm")))) (arguments - (substitute-keyword-arguments (package-arguments go-1.10) + (substitute-keyword-arguments (package-arguments go-1.9) ((#:phases phases) `(modify-phases ,phases (replace 'prebuild @@ -533,7 +419,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") '("net/listen_test.go" "net/parse_test.go" "net/cgo_unix_test.go" - ;; A side affect of these test scripts is testing + ;; A side effect of these test scripts is testing ;; cgo. Attempts at using cgo flags and ;; directives with these scripts as specified ;; here (https://golang.org/cmd/cgo/) have not @@ -616,7 +502,13 @@ in the style of communicating sequential processes (@dfn{CSP}).") (("/usr/share/zoneinfo/") tzdata-path)) (substitute* (find-files "cmd" "\\.go") (("/lib(64)?/ld-linux.*\\.so\\.[0-9]") loader)) - #t))))))))) + #t))) + (replace 'set-bootstrap-variables + (lambda* (#:key outputs inputs #:allow-other-keys) + ;; Tell the build system where to find the bootstrap Go. + (let ((go (assoc-ref inputs "go"))) + (setenv "GOROOT_BOOTSTRAP" go) + (setenv "GOGC" "400")))))))))) (define-public go go-1.9) -- cgit v1.2.3 From 0a3e9bf62171b051656f24b81094064b479ebf2e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 7 Oct 2018 21:08:38 -0400 Subject: 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(+) (limited to 'gnu') 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. -- cgit v1.2.3 From a0410663743eaa3bdbf3727baaa9fbc615db2549 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sun, 7 Oct 2018 20:14:02 -0400 Subject: gnu: crawl, crawl-tiles: Update to 0.22.1. * gnu/packages/games.scm (crawl, crawl-tiles): Update to 0.22.1. * gnu/packages/patches/crawl-upgrade-saves.patch: Update accordingly. --- gnu/packages/games.scm | 4 ++-- gnu/packages/patches/crawl-upgrade-saves.patch | 25 +++++++++++++------------ 2 files changed, 15 insertions(+), 14 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 7365a7f5d8..2547c72c23 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4397,7 +4397,7 @@ fish. The whole game is accompanied by quiet, comforting music.") (define-public crawl (package (name "crawl") - (version "0.21.0") + (version "0.22.1") (source (origin (method url-fetch) @@ -4411,7 +4411,7 @@ fish. The whole game is accompanied by quiet, comforting music.") version "-nodeps.tar.xz"))) (sha256 (base32 - "0mmnkch8s9l7dh136yjvcyjr0vmyzv7z370rlcyir91qz6gg82n1")) + "1qc90wwbxvjzqq66n8kfr0a2ny7sfvv2n84si67jiv2887d0ws6k")) (patches (search-patches "crawl-upgrade-saves.patch")))) (build-system gnu-build-system) (inputs diff --git a/gnu/packages/patches/crawl-upgrade-saves.patch b/gnu/packages/patches/crawl-upgrade-saves.patch index 301942dc30..4c0b3a427b 100644 --- a/gnu/packages/patches/crawl-upgrade-saves.patch +++ b/gnu/packages/patches/crawl-upgrade-saves.patch @@ -5,8 +5,9 @@ By default crawl checks for a mtime difference on files in DATADIR to see if an upgrade is required, but guix nulls all file dates, and crawl would never upgrade saves. ---- a/source/database.cc 2016-05-31 09:56:08.000000000 +0200 -+++ a/source/database.cc 2017-06-05 03:00:19.270632107 +0200 +diff -ur a/source/database.cc b/source/database.cc +--- a/source/database.cc 2018-08-09 21:49:26.000000000 -0400 ++++ b/source/database.cc 2018-10-07 18:06:41.022445789 -0400 @@ -25,6 +25,7 @@ #include "syscalls.h" #include "threads.h" @@ -23,16 +24,16 @@ and crawl would never upgrade saves. TextDB *_parent; const char* lang() { return _parent ? Options.lang_name : 0; } public: -@@ -165,7 +167,7 @@ +@@ -163,7 +165,7 @@ - TextDB::TextDB(const char* db_name, const char* dir, ...) - : _db_name(db_name), _directory(dir), + TextDB::TextDB(const char* db_name, const char* dir, vector files) + : _db_name(db_name), _directory(dir), _input_files(files), - _db(nullptr), timestamp(""), _parent(0), translation(0) + _db(nullptr), timestamp(""), version(""), _parent(0), translation(0) { - va_list args; - va_start(args, dir); -@@ -187,7 +189,7 @@ + } + +@@ -171,7 +173,7 @@ : _db_name(parent->_db_name), _directory(parent->_directory + Options.lang_name + "/"), _input_files(parent->_input_files), // FIXME: pointless copy @@ -41,7 +42,7 @@ and crawl would never upgrade saves. { } -@@ -202,6 +204,9 @@ +@@ -186,6 +188,9 @@ return false; timestamp = _query_database(*this, "TIMESTAMP", false, false, true); @@ -51,7 +52,7 @@ and crawl would never upgrade saves. if (timestamp.empty()) return false; -@@ -245,6 +250,9 @@ +@@ -229,6 +234,9 @@ string ts; bool no_files = true; @@ -61,7 +62,7 @@ and crawl would never upgrade saves. for (const string &file : _input_files) { string full_input_path = _directory + file; -@@ -261,7 +269,7 @@ +@@ -245,7 +253,7 @@ ts += buf; } @@ -70,7 +71,7 @@ and crawl would never upgrade saves. { // No point in empty databases, although for simplicity keep ones // for disappeared translations for now. -@@ -321,7 +329,10 @@ +@@ -313,7 +321,10 @@ _store_text_db(full_input_path, _db); } } -- cgit v1.2.3 From 5103c98f68490d32e71fe7208161450de4fb6f43 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 8 Oct 2018 08:23:10 +0200 Subject: gnu: c-toxcore: Update to 0.2.8. * gnu/packages/messaging.scm (c-toxcore): Update to 0.2.8. --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index af67c922b4..8ac86a852f 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -873,7 +873,7 @@ protocols.") (define-public c-toxcore (package (name "c-toxcore") - (version "0.2.7") + (version "0.2.8") (source (origin (method url-fetch) @@ -882,7 +882,7 @@ protocols.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1lcw979zakyb5kzy8yfk87js3bzfz3k2jxidda6ga6ljdnqdpxmy")))) + "0qlkimlvbd24nlj7w9b5rpz1r807magqxmfylc1mlxsqhmfi5zj7")))) (arguments `(#:tests? #f)) ; FIXME: Testsuite seems to stay stuck on test 3. Disable ; for now. -- cgit v1.2.3 From 402561ccefd5367ec878461cc088b533993ba0b7 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Thu, 4 Oct 2018 15:48:04 +1000 Subject: gnu: python2-backports-functools-lru-cache: Update to 1.5. * gnu/packages/python.scm (python2-backports-functools-lru-cache): Update to 1.5. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 4703d95a2d..6a2bd6e8f5 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -11418,7 +11418,7 @@ editors.") (define-public python2-backports-functools-lru-cache (package (name "python2-backports-functools-lru-cache") - (version "1.3") + (version "1.5") (source (origin (method url-fetch) @@ -11426,7 +11426,7 @@ editors.") (uri (pypi-uri "backports.functools_lru_cache" version)) (sha256 (base32 - "158ysf2hb0q4p4695abfiym9x1ywg0dgh8a3apd7gqaaxjy22jj4")))) + "06jgv8gib4fhky0p5cmxdghvsgjyzcdgk48k8pxb1ccf11znk64x")))) (build-system python-build-system) (native-inputs `(("python2-setuptools-scm" ,python2-setuptools-scm))) -- cgit v1.2.3 From 1deab8cbf6d93fec3b119de71374488087427ba8 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 7 Oct 2018 16:32:27 +0100 Subject: gnu: Add picard. * gnu/packages/music.scm (picard): New variable. --- gnu/packages/music.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 3163e6a8f6..e1bac6f51e 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2429,6 +2429,47 @@ and managing stations, can be controlled remotely via fifo, and can run event-based scripts for scrobbling, notifications, etc.") (license license:expat))) +(define-public picard + (package + (name "picard") + (version "2.0.4") + (source (origin + (method url-fetch) + (uri (string-append + "https://musicbrainz.osuosl.org/pub/musicbrainz/" + "picard/picard-" version ".tar.gz")) + (sha256 + (base32 + "0ds3ylpqn717fnzcjrfn05v5xram01bj6n3hwn9igmkd1jgf8vhc")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "picard/const/__init__.py" + (("pyfpcalc") + (string-append + "pyfpcalc', '" + (assoc-ref inputs "chromaprint") "/bin/fpcalc"))))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (invoke "python" "setup.py" "install" + (string-append "--prefix=" (assoc-ref outputs "out")) + "--root=/")))))) + (native-inputs + `(("gettext" ,gettext-minimal))) + (inputs + `(("chromaprint" ,chromaprint) + ("python-pyqt" ,python-pyqt) + ("python-mutagen" ,python-mutagen))) + (home-page "https://picard.musicbrainz.org/") + (synopsis "Graphical music tagging application") + (description + "MusicBrainz Picard is a music tagging application, supporting multiple +formats, looking up tracks through metadata and audio fingerprints.") + (license license:gpl2+))) + (define-public python-mutagen (package (name "python-mutagen") -- cgit v1.2.3 From f6e9976393c80d12b5f3235bf7fe593077cbc9d1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 8 Oct 2018 14:18:48 +0200 Subject: gnu: Add r-dnabarcodes. * gnu/packages/bioconductor.scm (r-dnabarcodes): New variable. --- gnu/packages/bioconductor.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 108f3c398f..1b779855b2 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -886,3 +886,30 @@ Time-Course experiments) analyses 4sU-seq and RNA-seq time-course data in order to evaluate synthesis, processing and degradation rates and assess via modeling the rates that determines changes in mature mRNA levels.") (license license:gpl2))) + +(define-public r-dnabarcodes + (package + (name "r-dnabarcodes") + (version "1.10.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "DNABarcodes" version)) + (sha256 + (base32 + "0xhna7f0kr7pp2hqwara5i57m9mdr65shflfxiyw6yy3g90pgb5x")))) + (properties `((upstream-name . "DNABarcodes"))) + (build-system r-build-system) + (propagated-inputs + `(("r-bh" ,r-bh) + ("r-matrix" ,r-matrix) + ("r-rcpp" ,r-rcpp))) + (home-page "https://bioconductor.org/packages/DNABarcodes") + (synopsis "Create and analyze DNA barcodes") + (description + "This package offers tools to create DNA barcode sets capable of +correcting insertion, deletion, and substitution errors. Existing barcodes +can be analyzed regarding their minimal, maximal and average distances between +barcodes. Finally, reads that start with a (possibly mutated) barcode can be +demultiplexed, i.e. assigned to their original reference barcode.") + (license license:gpl2))) -- cgit v1.2.3 From 1d6417340d6c6a80e24b9cd7e9c357b87c8da309 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 8 Oct 2018 17:29:34 +0200 Subject: gnu: Add font-sil-gentium. * gnu/packages/fonts.scm (font-sil-gentium): New variable. --- gnu/packages/fonts.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 6d4abc637b..7fdcda4eee 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1302,3 +1302,29 @@ Kannada, Malayalam, Manipuri, Oriya, Punjabi, Tamil and Telugu scripts.") "Inria Sans and Inria Serif are the two members of a type family designed for Inria, a public research institute in computer science and mathematics.") (license license:silofl1.1))) + +(define-public font-sil-gentium + (package + (name "font-sil-gentium") + (version "5.000") + (source (origin + (method url-fetch) + (uri (string-append + "https://software.sil.org/downloads/r/gentium/GentiumPlus-" + version ".zip")) + (sha256 + (base32 + "0m7189870hha217n1vgpmf89mwggrxkh679ffi1lxpnjggqi2n9k")))) + ;; Note: The zip file provides TTF files only, but the developer release, + ;; which contains additional files, has a 'SOURCES.txt' file that says + ;; that "the primary source files for the fonts are the fonts themselves". + ;; Thus it looks like the TTF can be considered source. + (build-system font-build-system) + (synopsis "Serif font for the Cyrillic, Greek, and Latin alphabets") + (description + "Gentium is a typeface family designed to enable the diverse ethnic +groups around the world who use the Latin, Cyrillic and Greek scripts to +produce readable, high-quality publications. The font comes with regular and +italics shapes. This package provides only TrueType files (TTF).") + (home-page "https://software.sil.org/gentium/") + (license license:silofl1.1))) -- cgit v1.2.3 From 46e78707a3d72d1fd08432cba8886415c79ebacc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 8 Oct 2018 17:35:22 +0200 Subject: gnu: Add font-sil-charis. * gnu/packages/fonts.scm (font-sil-charis): New variable. --- gnu/packages/fonts.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 7fdcda4eee..1195695d7a 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1328,3 +1328,27 @@ produce readable, high-quality publications. The font comes with regular and italics shapes. This package provides only TrueType files (TTF).") (home-page "https://software.sil.org/gentium/") (license license:silofl1.1))) + +(define-public font-sil-charis + (package + (name "font-sil-charis") + (version "5.000") + (source (origin + (method url-fetch) + (uri (string-append + "https://software.sil.org/downloads/r/charis/CharisSIL-" + version ".zip")) + (sha256 + (base32 + "1zcvw37f1a7gkml3yfm6hxh93844llm7xj4w52600qq3ndrm8gjy")))) + ;; As for Gentium (see above), the TTF files are considered source. + (build-system font-build-system) + (synopsis "Serif font for the Cyrillic and Latin alphabets") + (description + "Charis SIL is a Unicode-based font family that supports the wide range +of languages that use the Latin and Cyrillic scripts. It is specially +designed to make long texts pleasant and easy to read, even in less than ideal +reproduction and display environments. This package provides only TrueType +files (TTF).") + (home-page "https://software.sil.org/charis/") + (license license:silofl1.1))) -- cgit v1.2.3 From f8e0d27c5c2f338012f00cd3c4620ca76751495c Mon Sep 17 00:00:00 2001 From: Mathieu Lirzin Date: Sun, 7 Oct 2018 17:53:04 +0200 Subject: gnu: emacs-google-translate: Update to 0.11.15. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs.scm (emacs-google-translate): Update to 0.11.15. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs.scm | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 1df3456e4a..aad698da0e 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -11344,27 +11344,25 @@ the GIF result.") (license license:gpl3+)))) (define-public emacs-google-translate - (let ((commit "d8b84a8359fcc697114d1298840e9a45b111c974")) - (package - (name "emacs-google-translate") - (version (git-version "0.11.14" "1" commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/atykhonov/google-translate") - (commit commit))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "1qs4hcg1i2m487z50nnwgs0sa2xj4lpgizbrvi2yda0mf3m75fgc")))) - (build-system emacs-build-system) - (home-page "https://github.com/atykhonov/google-translate") - (synopsis "Emacs interface to Google Translate") - (description - "This packages provides an Emacs interface to the Google Translate + (package + (name "emacs-google-translate") + (version "0.11.15") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/atykhonov/google-translate/" + "archive/v" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1zxvfagbaf5mxi528mz33c8vxdk86wj0xx5y2jfy97wi8dzrwn3g")))) + (build-system emacs-build-system) + (home-page "https://github.com/atykhonov/google-translate") + (synopsis "Emacs interface to Google Translate") + (description + "This packages provides an Emacs interface to the Google Translate on-line service.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-helm-company (let ((commit "acc9c7901e094c1591327a0db1ec7a439f67a84d")) -- cgit v1.2.3 From b6bd8b108a4ad53e89d6b83edc57df18935f131c Mon Sep 17 00:00:00 2001 From: pimi Date: Mon, 8 Oct 2018 11:17:41 +0200 Subject: gnu: Add filtlong. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/bioinformatics.scm (filtlong): New variable. Co-authored-by: Ludovic Courtès --- gnu/packages/bioinformatics.scm | 60 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index ab9dc185a3..ed713cd144 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -14057,3 +14057,63 @@ absolute GSEA.") (description "Ngless is a domain-specific language for @dfn{next-generation sequencing} (NGS) data processing.") (license license:expat))) + +(define-public filtlong + ;; The recommended way to install is to clone the git repository + ;; https://github.com/rrwick/Filtlong#installation + ;; and the lastest release is more than nine months old + (let ((commit "d1bb46dfe8bc7efe6257b5ce222c04bfe8aedaab") + (revision "1")) + (package + (name "filtlong") + (version (git-version "0.2.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rrwick/Filtlong.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1xr92r820x8qlkcr3b57iw223yq8vjgyi42jr79w2xgw47qzr575")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no check target + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (scripts (string-append out "/share/filtlong/scripts"))) + (install-file "bin/filtlong" bin) + (install-file "scripts/histogram.py" scripts) + (install-file "scripts/read_info_histograms.sh" scripts)) + #t)) + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (path (getenv "PYTHONPATH"))) + (wrap-program (string-append out + "/share/filtlong/scripts/histogram.py") + `("PYTHONPATH" ":" prefix (,path)))) + #t)) + (add-before 'check 'patch-tests + (lambda _ + (substitute* "scripts/read_info_histograms.sh" + (("awk") (which "gawk"))) + #t))))) + (inputs + `(("gawk" ,gawk) ;for read_info_histograms.sh + ("python" ,python-2) ;required for histogram.py + ("zlib" ,zlib))) + (home-page "https://github.com/rrwick/Filtlong/") + (synopsis "Tool for quality filtering of Nanopore and PacBio data") + (description + "The Filtlong package is a tool for filtering long reads by quality. +It can take a set of long reads and produce a smaller, better subset. It uses +both read length (longer is better) and read identity (higher is better) when +choosing which reads pass the filter.") + (license (list license:gpl3 ;filtlong + license:asl2.0))))) ;histogram.py -- cgit v1.2.3 From df2d77c45ff357a25fee5f96478b1b65dc93f507 Mon Sep 17 00:00:00 2001 From: Thorsten Wilms Date: Mon, 8 Oct 2018 21:12:54 +0200 Subject: gnu: Add emacs-colum-marker. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs.scm (emacs-colum-marker): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index aad698da0e..c9493dabd4 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -39,6 +39,7 @@ ;;; Copyright © 2018 Jack Hill ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2018 Alex Branham +;;; Copyright © 2018 Thorsten Wilms ;;; ;;; This file is part of GNU Guix. ;;; @@ -12353,3 +12354,24 @@ with a handful of easy tweaks. scratch, and you think the Spacemacs theme looks good. @end itemize") (license license:gpl3+))) + +(define-public emacs-column-marker + (package + (name "emacs-column-marker") + (version "9") + (source + (origin + (method url-fetch) + (uri "https://www.emacswiki.org/emacs/download/column-marker.el") + (sha256 (base32 "05bv198zhqw5hqq6cr11mhz02dpca74hhp1ycwq369m0yb2naxy9")))) + (build-system emacs-build-system) + (home-page "https://www.emacswiki.org/emacs/ColumnMarker") + (synopsis "Emacs mode for highlighting columns") + (description + "With @code{column-marker.el} you can highlight any number of text columns. +Three such highlight column markers are provided by default. This is +especially useful for languages like COBOL or Fortran where certain columns +have special meaning. It is also handy for aligning text across long vertical +distances. Multi-column characters, such as @kbd{TAB} are treated +correctly.") + (license license:gpl2+))) -- cgit v1.2.3 From 65b8d610739065671af288836d74e5ffbf382c8f Mon Sep 17 00:00:00 2001 From: Thorsten Wilms Date: Mon, 8 Oct 2018 21:11:10 +0200 Subject: gnu: Add gimp-resynthesizer. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gimp.scm (gimp-resynthesizer): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/gimp.scm | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index df8f242c7a..cd0deac158 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Leo Famulari +;;; Copyright © 2018 Thorsten Wilms ;;; ;;; This file is part of GNU Guix. ;;; @@ -305,3 +306,67 @@ brushstrokes which is used by MyPaint and GIMP.") MyPaint.") (home-page "https://github.com/Jehan/mypaint-brushes") (license license:cc0))) + +(define-public gimp-resynthesizer + ;; GIMP does not respect any plugin search path environment variable, so after + ;; installation users have to edit their GIMP settings to include + ;; "$HOME/.guix-profile/lib/gimp/2.0/plug-ins/" in + ;; “Edit->Preferences->Folders->Plug Ins”. + (package + (name "gimp-resynthesizer") + (version "2.0.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/bootchk/resynthesizer/archive/v" + version ".tar.gz")) + (sha256 + (base32 + "0l3404w6rqny7h3djskxf149gzx6x4qhndgbh3403c9lbh4pi1kr")) + (file-name (string-append name "-" version ".tar.gz")))) + (build-system gnu-build-system) + (arguments + `( ;; Turn off tests to avoid: + ;; make[1]: *** No rule to make target '../src/resynth-gui.c', needed by 'resynthesizer.pot'. Stop. + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-env + (lambda _ + (setenv "CONFIG_SHELL" (which "sh")) + #t)) + (add-after 'configure 'set-prefix + ;; Install plugin under $prefix, not under GIMP's libdir. + (lambda* (#:key outputs #:allow-other-keys) + (let ((target (string-append (assoc-ref outputs "out") + "/lib/gimp/" + ,(version-major + (package-version gimp)) + ".0"))) + (substitute* (list "src/resynthesizer/Makefile" + "src/resynthesizer-gui/Makefile") + (("GIMP_LIBDIR = .*") + (string-append "GIMP_LIBDIR = " target "\n"))) + (mkdir-p target) + #t)))))) + (native-inputs + `(("autoconf" ,autoconf-wrapper) + ("automake" ,automake) + ("glib" ,glib "bin") ; glib-gettextize + ("intltool" ,intltool) + ("pkg-config" ,pkg-config))) + (inputs + `(("gimp" ,gimp) + ("gdk-pixbuf" ,gdk-pixbuf) ; needed by gimp-2.0.pc + ("cairo" ,cairo) + ("gegl" ,gegl) + ("gtk+" ,gtk+-2) ; needed by gimpui-2.0.pc + ("glib" ,glib))) + (home-page "https://github.com/bootchk/resynthesizer") + (synopsis "GIMP plugins for texture synthesis") + (description + "This package provides resynthesizer plugins for GIMP, which encompasses +tools for healing selections (content-aware fill), enlarging the canvas and +healing the border, increasing the resolution while adding detail, and +transfering the style of an image.") + (license license:gpl3+))) -- cgit v1.2.3 From de68ad095db7cdd06c45c53c47e7cbcb3fdf8bf6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Oct 2018 05:32:35 +0200 Subject: gnu: zstd: Update to 1.3.6. * gnu/packages/compression.scm (zstd): Update to 1.3.6. [source]: Remove merged patches. * gnu/packages/patches/zstd-fix-stdin-list-test.patch, gnu/packages/patches/zstd-fix-stdin-list-without-tty.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Remove them. --- gnu/local.mk | 4 +- gnu/packages/compression.scm | 8 +-- .../patches/zstd-fix-stdin-list-test.patch | 30 ---------- .../patches/zstd-fix-stdin-list-without-tty.patch | 67 ---------------------- 4 files changed, 3 insertions(+), 106 deletions(-) delete mode 100644 gnu/packages/patches/zstd-fix-stdin-list-test.patch delete mode 100644 gnu/packages/patches/zstd-fix-stdin-list-without-tty.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index ea2d650e28..821e83a675 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1247,9 +1247,7 @@ dist_patch_DATA = \ %D%/packages/patches/xinetd-CVE-2013-4342.patch \ %D%/packages/patches/xmodmap-asprintf.patch \ %D%/packages/patches/zathura-pdf-mupdf-link-to-jpeg-libraries.patch \ - %D%/packages/patches/zathura-plugindir-environment-variable.patch \ - %D%/packages/patches/zstd-fix-stdin-list-without-tty.patch \ - %D%/packages/patches/zstd-fix-stdin-list-test.patch + %D%/packages/patches/zathura-plugindir-environment-variable.patch MISC_DISTRO_FILES = \ %D%/packages/ld-wrapper.in diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 666c9bfc3e..38d72f1386 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1694,7 +1694,7 @@ or junctions, and always follows hard links.") (define-public zstd (package (name "zstd") - (version "1.3.5") + (version "1.3.6") (source (origin (method url-fetch) (uri (string-append "https://github.com/facebook/zstd/archive/v" @@ -1702,11 +1702,7 @@ or junctions, and always follows hard links.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1sifbq18p0hc978g0pq8fymrlpzz1fcxqkbxfqk44z6v9jg5bqfn")) - ;; Fix a regression that causes the tests to fail. Both patches - ;; have been merged upstream and will be part of the next release. - (patches (search-patches "zstd-fix-stdin-list-without-tty.patch" - "zstd-fix-stdin-list-test.patch")))) + "1iwxcpxg51yskiwfw5nhsflvcm3pk4184kkfpm61hsxniwa1cmbz")))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/patches/zstd-fix-stdin-list-test.patch b/gnu/packages/patches/zstd-fix-stdin-list-test.patch deleted file mode 100644 index a10355448c..0000000000 --- a/gnu/packages/patches/zstd-fix-stdin-list-test.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 8e7bdc18d62632adcee029b2f8f5013d11549dd7 Mon Sep 17 00:00:00 2001 -From: "W. Felix Handte" -Date: Fri, 29 Jun 2018 16:31:22 -0400 -Subject: [PATCH] Fix Tests of `--list` Behavior with `stdin` - ---- - tests/playTests.sh | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/tests/playTests.sh b/tests/playTests.sh -index 09a7377f2..aa5535d59 100755 ---- a/tests/playTests.sh -+++ b/tests/playTests.sh -@@ -731,8 +731,14 @@ $ECHO "\n===> zstd --list/-l error detection tests " - ! $ZSTD -lv tmp1* - ! $ZSTD --list -v tmp2 tmp12.zst - --$ECHO "\n===> zstd --list/-l exits 1 when stdin is piped in" --! echo "piped STDIN" | $ZSTD --list -+$ECHO "\n===> zstd --list/-l errors when presented with stdin / no files" -+! $ZSTD -l -+! $ZSTD -l - -+! $ZSTD -l < tmp1.zst -+! $ZSTD -l - < tmp1.zst -+! $ZSTD -l - tmp1.zst -+! $ZSTD -l - tmp1.zst < tmp1.zst -+$ZSTD -l tmp1.zst < tmp1.zst # but doesn't error just because stdin is not a tty - - $ECHO "\n===> zstd --list/-l test with null files " - ./datagen -g0 > tmp5 diff --git a/gnu/packages/patches/zstd-fix-stdin-list-without-tty.patch b/gnu/packages/patches/zstd-fix-stdin-list-without-tty.patch deleted file mode 100644 index 47fa3e59a7..0000000000 --- a/gnu/packages/patches/zstd-fix-stdin-list-without-tty.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 712a9fd9721c314f4b0238577d803b012845f6d2 Mon Sep 17 00:00:00 2001 -From: "W. Felix Handte" -Date: Fri, 29 Jun 2018 15:33:44 -0400 -Subject: [PATCH] Allow Invoking `zstd --list` When `stdin` is not a `tty` - -Also now returns an error when no inputs are given. - -New proposed behavior: - -``` -felix@odin:~/prog/zstd (list-stdin-check)$ ./zstd -l; echo $? -No files given -1 -felix@odin:~/prog/zstd (list-stdin-check)$ ./zstd -l Makefile.zst; echo $? -Frames Skips Compressed Uncompressed Ratio Check Filename - 1 0 3.08 KB 10.92 KB 3.544 XXH64 Makefile.zst -0 -felix@odin:~/prog/zstd (list-stdin-check)$ ./zstd -l Date: Mon, 8 Oct 2018 16:20:19 +0200 Subject: gnu: docx2txt: End phases with #t. * gnu/packages/textutils.scm (docx2txt)[arguments]: End 'fix-install' phase with #t. --- gnu/packages/textutils.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 7e26bdcf63..8780bb2829 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -735,7 +735,8 @@ measuring and checking the width of strings, with support east asian text.") unzip "/bin/unzip',"))) ;; Makefile is wrong. - (chmod config #o644))))))) + (chmod config #o644) + #t)))))) (synopsis "Recover text from @file{.docx} files, with good formatting") (description "@command{docx2txt} is a Perl based command line utility to convert -- cgit v1.2.3 From 317e80cead5d8f78ed021069a3ef108d44824f76 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 8 Oct 2018 16:38:27 +0200 Subject: gnu: unison: End all phases with #t. * gnu/packages/ocaml.scm (unison)[arguments]: End all phases with #t. --- gnu/packages/ocaml.scm | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 0756aecd6d..6b55e84fed 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -820,7 +820,8 @@ libpanel, librsvg and quartz.") (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin"))) ;; 'unison-fsmonitor' is used in "unison -repeat watch" mode. - (install-file "src/unison-fsmonitor" bin)))) + (install-file "src/unison-fsmonitor" bin) + #t))) (add-after 'install 'install-doc (lambda* (#:key outputs #:allow-other-keys) (let ((doc (string-append (assoc-ref outputs "doc") @@ -829,21 +830,19 @@ libpanel, librsvg and quartz.") ;; This file needs write-permissions, because it's ;; overwritten by 'docs' during documentation generation. (chmod "src/strings.ml" #o600) - (and (zero? (system* "make" "docs" - "TEXDIRECTIVES=\\\\draftfalse")) - (begin - (for-each (lambda (f) - (install-file f doc)) - (map (lambda (ext) - (string-append - "doc/unison-manual." ext)) - ;; Install only html documentation, - ;; since the build is currently - ;; non-reproducible with the ps, pdf, - ;; and dvi docs. - '(;;"ps" "pdf" "dvi" - "html"))) - #t)))))))) + (invoke "make" "docs" + "TEXDIRECTIVES=\\\\draftfalse") + (for-each (lambda (f) + (install-file f doc)) + (map (lambda (ext) + (string-append "doc/unison-manual." ext)) + ;; Install only html documentation, + ;; since the build is currently + ;; non-reproducible with the ps, pdf, + ;; and dvi docs. + '(;; "ps" "pdf" "dvi" + "html"))) + #t)))))) (home-page "https://www.cis.upenn.edu/~bcpierce/unison/") (synopsis "File synchronizer") (description -- cgit v1.2.3 From 3880537c7403c3677ec46e991da9d25ca542c64b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Oct 2018 05:46:00 +0200 Subject: gnu: zstd: Don't use unstable tarball. * gnu/packages/compression.scm (zstd)[source]: Use release archive. --- gnu/packages/compression.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 38d72f1386..8c940f3036 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1695,14 +1695,13 @@ or junctions, and always follows hard links.") (package (name "zstd") (version "1.3.6") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/facebook/zstd/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1iwxcpxg51yskiwfw5nhsflvcm3pk4184kkfpm61hsxniwa1cmbz")))) + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/facebook/zstd/releases/download/" + "v" version "/zstd-" version ".tar.gz")) + (sha256 + (base32 "1525b31jmbiczjj1n58nckdzky4cdnbwcsil3zgy4cx03v0a0cp8")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 07b0662754014f7ac8ab81ce6a8878d0cc206b19 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 9 Oct 2018 09:56:02 +0300 Subject: gnu: abiword: Remove wmf support. * gnu/packages/abiword.scm (abiword)[arguments]: Remove 'wmf' from the list of enabled plugins. --- gnu/packages/abiword.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/abiword.scm b/gnu/packages/abiword.scm index cf906c6ea4..02f132f6f0 100644 --- a/gnu/packages/abiword.scm +++ b/gnu/packages/abiword.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Marek Benc -;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016, 2018 Efraim Flashner ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2017 Leo Famulari ;;; @@ -62,7 +62,7 @@ (build-system glib-or-gtk-build-system) (arguments ;; NOTE: rsvg is disabled, since Abiword `(#:configure-flags ;; supports it directly, and its BS is broken. - (list + (list ;; wmf was removed from Guix for security. "--enable-clipart" ;; TODO: The following plugins have unresolved "--enable-templates" ;; dependencies: aiksaurus, grammar, wpg, gda, (string-append ;; wordperfect, psion, mathview. @@ -73,7 +73,7 @@ "latex " "loadbindings " "mht " "mif " "mswrite " "opendocument " "openwriter " "openxml " "opml " "ots " "paint " "passepartout " "pdb " "pdf " "presentation " "s5 " "sdw " "t602 " "urldict " - "wikipedia " "wmf " "wml " "xslfo")) + "wikipedia " "wml " "xslfo")) ;; tests fail with: Gtk-CRITICAL **: gtk_settings_get_for_screen: ;; assertion 'GDK_IS_SCREEN (screen)' failed ;; GLib-GObject-CRITICAL **: g_object_get_qdata: -- cgit v1.2.3 From 31f45cf7be18d1cfc46a0ae785a3057227c4b185 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 9 Oct 2018 10:31:02 +0300 Subject: gnu: agg: Don't build examples. * gnu/packages/graphics.scm (agg)[arguments]: Disable building the examples. --- gnu/packages/graphics.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 58c742b825..79fd134bbe 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -705,7 +705,8 @@ and understanding different BRDFs (and other component functions).") (list (string-append "--x-includes=" (assoc-ref %build-inputs "libx11") "/include") (string-append "--x-libraries=" (assoc-ref %build-inputs "libx11") - "/lib")) + "/lib") + "--disable-examples") #:phases (modify-phases %standard-phases (add-after 'unpack 'autoreconf -- cgit v1.2.3 From 8d18edde755f4bf5b4723fc9ce89e1cd831d2b7b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 9 Oct 2018 10:32:16 +0300 Subject: * gnu: agg: Replace bootstrap phase. * gnu/packages/graphics.scm (agg)[arguments]: Remove custom 'autoreconf phase and replace default 'bootstrap phase. Use INVOKE. [native-inputs]: Remove bash. --- gnu/packages/graphics.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 79fd134bbe..c3c1a4a580 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -709,17 +709,16 @@ and understanding different BRDFs (and other component functions).") "--disable-examples") #:phases (modify-phases %standard-phases - (add-after 'unpack 'autoreconf + (replace 'bootstrap (lambda _ ;; let's call configure from configure phase and not now (substitute* "autogen.sh" (("./configure") "# ./configure")) - (zero? (system* "sh" "autogen.sh"))))))) + (invoke "sh" "autogen.sh")))))) (native-inputs `(("pkg-config" ,pkg-config) ("libtool" ,libtool) ("autoconf" ,autoconf) - ("automake" ,automake) - ("bash" ,bash))) + ("automake" ,automake))) (inputs `(("libx11" ,libx11) ("freetype" ,freetype) -- cgit v1.2.3 From 8658b81b1acb2d84171914236f63f5b9038f76ea Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 9 Oct 2018 11:01:39 +0300 Subject: gnu: augeas: Update to 1.11.0. * gnu/packages/augeas.scm (augeas): Update to 1.11.0. [source]: Remove snippet. --- gnu/packages/augeas.scm | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/augeas.scm b/gnu/packages/augeas.scm index 9495d4a0a4..fcba5bae7b 100644 --- a/gnu/packages/augeas.scm +++ b/gnu/packages/augeas.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017, 2018 Ricardo Wurmus -;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2017, 2018 Efraim Flashner ;;; Copyright © 2017 Eric Bavier ;;; ;;; This file is part of GNU Guix. @@ -32,24 +32,14 @@ (define-public augeas (package (name "augeas") - (version "1.10.1") + (version "1.11.0") (source (origin (method url-fetch) (uri (string-append "http://download.augeas.net/augeas-" version ".tar.gz")) (sha256 (base32 - "0k9nssn7lk58cl5zv3c8kv2zx9cm2yks3sj7q4fd6qdjz9m2bnsj")) - (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* "gnulib/tests/Makefile.in" - (("test-lock\\$\\(EXEEXT\\) ") "")) - #t)))) + "1c507qj6dfn2dnsl27w94zs9r45xrgm07y8bqba9ry2s0psfhg1r")))) (build-system gnu-build-system) ;; Marked as "required" in augeas.pc (propagated-inputs -- cgit v1.2.3 From 1fe57b3746de17c523a01e6c3e5a29bde5843018 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 9 Oct 2018 12:04:13 +0300 Subject: gnu: bs1770gain: Update to 0.5.0. * gnu/packages/audio.scm (bs1770gain): Update to 0.5.0. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 17b6363f7c..b858a35359 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3087,7 +3087,7 @@ with support for HD extensions.") (define-public bs1770gain (package (name "bs1770gain") - (version "0.4.12") + (version "0.5.0") (source (origin (method url-fetch) @@ -3095,7 +3095,7 @@ with support for HD extensions.") version "/bs1770gain-" version ".tar.gz")) (sha256 (base32 - "0n9skdap1vnl6w52fx0gsrjlk7w3xgdwi62ycyf96h29rx059z6a")))) + "0vd7320k7s2zcn2vganclxbr1vav18ghld27rcwskvcc3dm8prii")))) (build-system gnu-build-system) (inputs `(("ffmpeg" ,ffmpeg) ("sox" ,sox))) -- cgit v1.2.3 From 64965a068d82d1730097e61f6443a8812051934b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 9 Oct 2018 15:21:54 +0200 Subject: gnu: Add ttf2pt1. * gnu/packages/fontutils.scm (ttf2pt1): New variable. --- gnu/packages/fontutils.scm | 53 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 30143eba34..09ba9b7e4a 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, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -190,6 +191,58 @@ TTF (TrueType/OpenType Font) files.") (license license:bsd-2) (home-page "https://github.com/wget/ttf2eot"))) +(define-public ttf2pt1 + (package + (name "ttf2pt1") + (version "3.4.4") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/ttf2pt1/ttf2pt1/" + version "/ttf2pt1-" version ".tgz")) + (sha256 + (base32 + "1l718n4k4widx49xz7qrj4mybzb8q67kp2jw7f47604ips4654mf")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove trailing backslashes in the sed expression of the + ;; 'install' rule since sed would otherwise fail. + (substitute* "Makefile" + (("\\|;\\\\[[:space:]]*$") "|; ")) + #t)))) + (build-system gnu-build-system) + (arguments + '(#:tests? #f ;no tests + #:phases (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "Makefile" + (("INSTDIR =.*") + (string-append "INSTDIR = " out "\n")) + (("OWNER = .*") + "OWNER = `id -un`\n") + (("GROUP = .*") + "GROUP = `id -g`\n")) + #t))) + (replace 'build + (lambda _ + (invoke "make" "-j" + (number->string (parallel-job-count)) + "all" "CC=gcc")))))) + (inputs `(("perl" ,perl))) + (synopsis "Convert TrueType fonts to Postscript Type 1") + (description + "TTF2PT1 provides tools to convert most TrueType fonts (or other formats +supported by the FreeType library) to an Adobe Type 1 @file{.pfa} or +@file{.pfb} file. Another use is as a hinting engine: feed it an unhinted or +poorly hinted Adobe Type 1 font through the FreeType library and get it back +with freshly generated hints. The files produced by default are in +human-readable form, which further needs to be encoded with t1utilities to +work with most software requiring Type 1 fonts.") + (home-page "http://ttf2pt1.sourceforge.net/") + (license license:bsd-3))) + (define-public woff2 (let ((commit "4e698b8c6c5e070d53c340db9ddf160e21070ede") (revision "1")) -- cgit v1.2.3 From b2eda4a55e4ccf61a493fc76aa6a96ac589ed8da Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 9 Oct 2018 17:38:17 +0200 Subject: gnu: java-w3c-svg: Fix build. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reported-by: Björn Höfling * gnu/packages/batik.scm (java-w3c-svg)[arguments]<#:phases>: Delete "patch-interface" phase. --- gnu/packages/batik.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/batik.scm b/gnu/packages/batik.scm index cdd1e44713..180d7e7676 100644 --- a/gnu/packages/batik.scm +++ b/gnu/packages/batik.scm @@ -23,6 +23,7 @@ #:use-module (guix git-download) #:use-module (guix packages) #:use-module (guix build-system ant) + #:use-module (guix build utils) #:use-module (gnu packages) #:use-module (gnu packages compression) #:use-module (gnu packages java) @@ -155,6 +156,11 @@ public interface EventListenerInitializer { (sha256 (base32 "0jicqcrxav8ggs37amgvvwgc2f0qp1c5wns4rb2i3si83s2m09ns")))) + (arguments + (substitute-keyword-arguments (package-arguments java-w3c-svg-1.0) + ((#:phases phases) + `(modify-phases ,phases + (delete 'patch-interface))))) (propagated-inputs `()))) -- cgit v1.2.3 From 9096c00629f2582c218d0f081aa78ef43560570c Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 9 Oct 2018 17:39:10 +0200 Subject: gnu: java-w3c-svg: Update synopsis and description. * gnu/packages/batik.scm (java-w3c-svg-1.0)[synopsis]: Modify. [description]: Modify. (java-w3c-svg)[synopsis]: Modify. [description]: Modify. --- gnu/packages/batik.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/batik.scm b/gnu/packages/batik.scm index 180d7e7676..8296c0fbd6 100644 --- a/gnu/packages/batik.scm +++ b/gnu/packages/batik.scm @@ -140,8 +140,8 @@ public interface EventListenerInitializer { (native-inputs `(("unzip" ,unzip))) (home-page "https://www.w3.org/Style/CSS/SAC/") - (synopsis "W3C SVG interface") - (description "This package provides a SVG interface.") + (synopsis "W3C SVG 1.0 interface") + (description "This package provides a SVG 1.0 interface.") (license license:w3c))) (define-public java-w3c-svg @@ -162,7 +162,9 @@ public interface EventListenerInitializer { `(modify-phases ,phases (delete 'patch-interface))))) (propagated-inputs - `()))) + `()) + (synopsis "W3C SVG interface") + (description "This package provides a SVG interface."))) (define-public java-w3c-sac (package -- cgit v1.2.3 From 006a1d59ba66ac260a3f3e027db403a7d46eb3a5 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 10 Oct 2018 09:32:48 +0200 Subject: gnu: vkd3d: Update to 1.1. * gnu/packages/vulkan.scm (vkd3d): Update to 1.1. --- gnu/packages/vulkan.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index f256e21187..2474d640d7 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -346,11 +346,10 @@ shader compilation.") (license license:asl2.0)))) (define-public vkd3d - (let ((commit "020c119e2da0786d8be0615cff961c190b00d62d") ; Release 1.0. - (revision "0")) + (let ((commit "ecda316ef54d70bf1b3e860755241bb75873e53f")) ; Release 1.1. (package (name "vkd3d") - (version "1.0") + (version "1.1") (source (origin (method git-fetch) @@ -359,7 +358,7 @@ shader compilation.") (commit commit))) (sha256 (base32 - "084svxhigs8r0725jv6gs7wwrxb9x4igyg5bgvgpcfw4aq0k69gn")) + "05a28kspy8gzng181w28zjqdb3pj2ss83b0lwnppxbcdzsz7rvrf")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From e4c399fe155b2d268e41656edc0a55f718cb1100 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 9 Oct 2018 20:27:37 +0300 Subject: gnu: clisp: Update to 2.49.92. * gnu/packages/lisp.scm (clisp): Update to 2.49.92. [source]: Switch to git-fetch. Remove unneeded patch. [arguments]: Remove '--enable-portability' flag, add CFLAGS for armhf-linux. Update list of files needing substitutions in custom 'patch-sh-and-pwd phase. [home-page]: Update to new home-page. * gnu/packages/patches/clisp-glibc-2.26.patch: Remove file. & gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/lisp.scm | 36 +++++++++++++++++------------ gnu/packages/patches/clisp-glibc-2.26.patch | 20 ---------------- 3 files changed, 21 insertions(+), 36 deletions(-) delete mode 100644 gnu/packages/patches/clisp-glibc-2.26.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 821e83a675..af3773c893 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -621,7 +621,6 @@ dist_patch_DATA = \ %D%/packages/patches/clementine-fix-sqlite.patch \ %D%/packages/patches/clementine-remove-crypto++-dependency.patch \ %D%/packages/patches/clementine-use-openssl.patch \ - %D%/packages/patches/clisp-glibc-2.26.patch \ %D%/packages/patches/clisp-remove-failing-test.patch \ %D%/packages/patches/clucene-pkgconfig.patch \ %D%/packages/patches/clx-remove-demo.patch \ diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 82ba6eedf0..ef98de057a 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -35,7 +35,6 @@ #:use-module (gnu packages m4) #:use-module (guix download) #:use-module (guix git-download) - #:use-module (guix hg-download) #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system asdf) @@ -256,28 +255,31 @@ supporting ASDF, Sockets, Gray streams, MOP, and other useful components.") (define-public clisp (package (name "clisp") - (version "2.49-60") + (version "2.49-92") (source (origin - (method hg-fetch) - (uri (hg-reference - (url "http://hg.code.sf.net/p/clisp/clisp") - (changeset "clisp_2_49_60-2017-06-25"))) - (file-name (string-append name "-" version "-checkout")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/gnu-clisp/clisp") + (commit "clisp-2.49.92-2018-02-18"))) + (file-name (git-file-name name version)) (sha256 - (base32 "0qjv3z274rbdmb941hy03hl63f4z7bmci234f8dyz4skgfr82d3i")) - (patches (search-patches "clisp-glibc-2.26.patch" - "clisp-remove-failing-test.patch")))) + (base32 "0k2dmgl0miz3767iks4p0mvp6xw0ysyxhjpklyh11j010rmh6hqb")) + (patches (search-patches "clisp-remove-failing-test.patch")))) (build-system gnu-build-system) (inputs `(("libffcall" ,libffcall) ("ncurses" ,ncurses) ("readline" ,readline) ("libsigsegv" ,libsigsegv))) (arguments - '(#:configure-flags '("--enable-portability" - "--with-dynamic-ffi" - "--with-dynamic-modules" - "--with-module=rawsock") + `(#:configure-flags '(,@(if (string-prefix? "armhf-linux" + (or (%current-system) + (%current-target-system))) + '("CFLAGS=-falign-functions=4") + '()) + "--with-dynamic-ffi" + "--with-dynamic-modules" + "--with-module=rawsock") #:build #f #:phases (modify-phases %standard-phases @@ -288,6 +290,10 @@ supporting ASDF, Sockets, Gray streams, MOP, and other useful components.") ;; many places where our automatic patching misses them. Therefore ;; we do the following, in this early (post-unpack) phase, to solve ;; the problem from its root. + (substitute* '("src/clisp-link.in" + "src/unix.d" + "src/makemake.in") + (("/bin/sh") (which "sh"))) (substitute* (find-files "." "configure|Makefile") (("/bin/sh") "sh")) (substitute* '("src/clisp-link.in") @@ -295,7 +301,7 @@ supporting ASDF, Sockets, Gray streams, MOP, and other useful components.") #t))) ;; Makefiles seem to have race conditions. #:parallel-build? #f)) - (home-page "http://www.clisp.org/") + (home-page "https://clisp.sourceforge.io/") (synopsis "A Common Lisp implementation") (description "GNU CLISP is an implementation of ANSI Common Lisp. Common Lisp is a diff --git a/gnu/packages/patches/clisp-glibc-2.26.patch b/gnu/packages/patches/clisp-glibc-2.26.patch deleted file mode 100644 index c8920ceccc..0000000000 --- a/gnu/packages/patches/clisp-glibc-2.26.patch +++ /dev/null @@ -1,20 +0,0 @@ -This patch comes from Debian. - -Description: cfree is not present in glibc-2.26, stop wrapping it -Author: Adam Conrad -Bug: https://sourceforge.net/p/clisp/bugs/717/ -Bug-Debian: https://bugs.debian.org/880686 -Applied-Upstream: https://sourceforge.net/p/clisp/clisp/ci/3bc928712d150ff1e5f6b2bfb7838655f3ff52fa/ -Reviewed-By: Sébastien Villemot -Last-Update: 2017-11-27 - ---- clisp-2.49.20170913.orig/modules/bindings/glibc/linux.lisp -+++ clisp-2.49.20170913/modules/bindings/glibc/linux.lisp -@@ -649,7 +649,6 @@ - (def-call-out calloc (:arguments (nmemb size_t) (size size_t)) - (:return-type c-pointer)) - (def-call-out free (:arguments (ptr c-pointer)) (:return-type nil)) --(def-call-out cfree (:arguments (ptr c-pointer)) (:return-type nil)) - (def-call-out valloc (:arguments (size size_t)) (:return-type c-pointer)) - - (def-call-out abort (:arguments) (:return-type nil)) -- cgit v1.2.3 From 5ff15b86fcd2eae7d9f16f45597db0dce5ee5943 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 9 Oct 2018 20:30:35 +0300 Subject: gnu: lisp.scm: Arrange imported modules alphabetically. * gnu/packages/lisp.scm: Arrange imported modules alphabetically. --- gnu/packages/lisp.scm | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index ef98de057a..8b8b9229b5 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -29,40 +29,38 @@ #:use-module (gnu packages) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) - #:use-module (gnu packages readline) - #:use-module (gnu packages texinfo) - #:use-module (gnu packages tex) - #:use-module (gnu packages m4) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system asdf) #:use-module (guix build-system trivial) + #:use-module (gnu packages admin) #:use-module (gnu packages base) + #:use-module (gnu packages bdw-gc) #:use-module (gnu packages compression) + #:use-module (gnu packages ed) #:use-module (gnu packages fontutils) + #:use-module (gnu packages gcc) + #:use-module (gnu packages gettext) + #:use-module (gnu packages gl) + #:use-module (gnu packages glib) + #:use-module (gnu packages m4) #:use-module (gnu packages maths) #:use-module (gnu packages multiprecision) #:use-module (gnu packages ncurses) - #:use-module (gnu packages bdw-gc) - #:use-module (gnu packages libffi) #:use-module (gnu packages libffcall) - #:use-module (gnu packages readline) - #:use-module (gnu packages sdl) + #:use-module (gnu packages libffi) #:use-module (gnu packages libsigsegv) #:use-module (gnu packages linux) - #:use-module (gnu packages admin) - #:use-module (gnu packages ed) - #:use-module (gnu packages gl) - #:use-module (gnu packages gcc) - #:use-module (gnu packages glib) - #:use-module (gnu packages gettext) - #:use-module (gnu packages m4) + #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages readline) + #:use-module (gnu packages sdl) + #:use-module (gnu packages tex) + #:use-module (gnu packages texinfo) #:use-module (gnu packages version-control) #:use-module (gnu packages xorg) - #:use-module (gnu packages perl) #:use-module (ice-9 match) #:use-module (srfi srfi-1)) -- cgit v1.2.3 From e7cdd311ae2696713da59a4f27614a246ca0f58a Mon Sep 17 00:00:00 2001 From: Mark Meyer Date: Fri, 14 Sep 2018 22:58:29 +0200 Subject: gnu: mlt: Prepare for kdenlive. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/video.scm (mlt): Update to 6.10.0. [inputs]: Add frei0r-plugins, gdk-pixbuf, gtk+-2, qtbase,qtsvg. [make-flags]: Add "CXX=g++ -std=gnu++11". Co-authored-by: Gábor Boskovits Signed-off-by: Gábor Boskovits --- gnu/packages/video.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 2f6a89e14d..3e191ef6da 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -29,6 +29,8 @@ ;;; Copyright © 2018 Brendan Tildesley ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2018 Björn Höfling +;;; Copyright © 2018 Mark Meyer +;;; Copyright © 2018 Gábor Boskovit ;;; ;;; This file is part of GNU Guix. ;;; @@ -1942,7 +1944,7 @@ from sites like Twitch.tv and pipes them into a video player of choice.") (define-public mlt (package (name "mlt") - (version "6.4.1") + (version "6.10.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/mltframework/mlt/" @@ -1950,7 +1952,7 @@ from sites like Twitch.tv and pipes them into a video player of choice.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "10m3ry0b2pvqx3bk34qh5dq337nn8pkc2gzfyhsj4nv9abskln47")) + "1zzdj1g3g24q6v8hd0v34lv0pkh37a13fhjpl44h1ffi00mz3577")) (modules '((guix build utils))) (snippet '(begin ;; As of glibc 2.26, no longer is. @@ -1960,7 +1962,7 @@ from sites like Twitch.tv and pipes them into a video player of choice.") (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests - #:make-flags '("CC=gcc") + #:make-flags '("CC=gcc" "CXX=g++ -std=gnu++11") #:configure-flags (list "--enable-gpl3" "--enable-gpl") @@ -1979,11 +1981,16 @@ from sites like Twitch.tv and pipes them into a video player of choice.") `(("alsa-lib" ,alsa-lib) ("ffmpeg" ,ffmpeg-3.4) ("fftw" ,fftw) + ("frei0r-plugins" ,frei0r-plugins) + ("gdk-pixbuf" ,gdk-pixbuf) + ("gtk+" ,gtk+-2) ("libxml2" ,libxml2) ("jack" ,jack-1) ("ladspa" ,ladspa) ("libsamplerate" ,libsamplerate) ("pulseaudio" ,pulseaudio) + ("qtbase" ,qtbase) + ("qtsvg" ,qtsvg) ("sdl" ,sdl) ("sox" ,sox))) (native-inputs -- cgit v1.2.3 From a50f5258c785929a5f77a80e1805b502dd0c78c8 Mon Sep 17 00:00:00 2001 From: Mark Meyer Date: Sat, 22 Sep 2018 21:28:25 +0200 Subject: gnu: Add kdenlive. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/kde.scm (kdenlive): New variable. Co-authored-by: Gábor Boskovits Signed-off-by: Gábor Boskovits --- gnu/packages/kde.scm | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 82 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index a835f42749..3dfba6d383 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -1,8 +1,9 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016, 2017 Thomas Danckaert -;;; Copyright © 2017 Mark Meyer +;;; Copyright © 2017, 2018 Mark Meyer ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Gábor Boskovits ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,6 +23,7 @@ (define-module (gnu packages kde) #:use-module (guix build-system cmake) #:use-module (guix download) + #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) @@ -47,8 +49,87 @@ #:use-module (gnu packages tls) #:use-module (gnu packages qt) #:use-module (gnu packages version-control) + #:use-module (gnu packages video) #:use-module (gnu packages xorg)) +(define-public kdenlive + (let ((version "18.08.1")) + (package + (name "kdenlive") + (version version) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "git://anongit.kde.org/kdenlive.git") + (commit (string-append "v" version)))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "0ifnaclsz7w08mc485i3j1kkcpd1m8q5qamckrfwc375ac13xf4g")))) + (build-system cmake-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("qttools" ,qttools))) + (propagated-inputs + `(("mlt" ,mlt))) + (inputs + `(("shared-mime-info" ,shared-mime-info) + ("frei0r-plugins" ,frei0r-plugins) + ("qtbase" ,qtbase) + ("qtscript" ,qtscript) + ("qtsvg" ,qtsvg) + ("kparts" ,kparts) + ("knotifications" ,knotifications) + ("karchive" ,karchive) + ("kdbusaddons" ,kdbusaddons) + ("kcrash" ,kcrash) + ("kguiaddons" ,kguiaddons) + ("knewstuff" ,knewstuff) + ("knotifyconfig" ,knotifyconfig) + ("kfilemetadata" ,kfilemetadata) + ("kdoctools" ,kdoctools) + ("kdeclarative", kdeclarative) + ("qtdeclarative", qtdeclarative) + ("qtquickcontrols", qtquickcontrols) + ("kiconthemes", kiconthemes) + ("qtgraphicaleffects" ,qtgraphicaleffects) + ("kplotting", kplotting))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-executable + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (qtquickcontrols (assoc-ref inputs "qtquickcontrols")) + (qtbase (assoc-ref inputs "qtbase")) + (qtdeclarative (assoc-ref inputs "qtdeclarative")) + (frei0r (assoc-ref inputs "frei0r-plugins")) + (qml "/lib/qt5/qml")) + (wrap-program (string-append out "/bin/kdenlive") + `("QT_PLUGIN_PATH" ":" prefix + ,(map (lambda (label) + (string-append (assoc-ref inputs label) + "/lib/qt5/plugins/")) + '("qtbase", "qtsvg"))) + `("FREI0R_PATH" ":" = + (,(string-append frei0r "/lib/frei0r-1/"))) + `("QT_QPA_PLATFORM_PLUGIN_PATH" ":" = + (,(string-append qtbase "/lib/qt5/plugins/platforms"))) + `("QML2_IMPORT_PATH" ":" prefix + (,(string-append qtquickcontrols qml) + ,(string-append qtdeclarative qml))))) + #t))))) + (home-page "https://kdenlive.org") + (synopsis "Non-linear video editor") + (description "Kdenlive is an acronym for KDE Non-Linear Video Editor. + +Non-linear video editing is much more powerful than beginner's (linear) +editors, hence it requires a bit more organization before starting. However, +it is not reserved to specialists and can be used for small personal +projects.") + (license license:gpl2+)))) + (define-public kdevelop (package (name "kdevelop") -- cgit v1.2.3 From 296ad592166841c3b6762bc4e9114d12451498cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 10 Oct 2018 11:49:47 +0200 Subject: gnu: haunt: Make sure Guile-CommonMark and Guile-Reader are always visible. * gnu/packages/guile.scm (haunt)[arguments]: In 'wrap-haunt' phase, add Guile-Reader and Guile-CommonMark to the search paths. --- gnu/packages/guile.scm | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 1d330668a7..f7baff4718 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -1192,13 +1192,15 @@ Guile's foreign function interface.") #:tests? #f ; test suite is non-deterministic :( #:phases (modify-phases %standard-phases (add-after 'install 'wrap-haunt - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) ;; Wrap the 'haunt' command to refer to the right ;; modules. (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin")) (site (string-append - out "/share/guile/site"))) + out "/share/guile/site")) + (deps (list (assoc-ref inputs "guile-reader") + (assoc-ref inputs "guile-commonmark")))) (match (scandir site) (("." ".." version) (let ((modules (string-append site "/" version)) @@ -1207,9 +1209,19 @@ Guile's foreign function interface.") "/site-ccache"))) (wrap-program (string-append bin "/haunt") `("GUILE_LOAD_PATH" ":" prefix - (,modules)) + (,modules + ,@(map (lambda (dep) + (string-append dep + "/share/guile/site/" + version)) + deps))) `("GUILE_LOAD_COMPILED_PATH" ":" prefix - (,compiled-modules))) + (,compiled-modules + ,@(map (lambda (dep) + (string-append dep "/lib/guile/" + version + "/site-ccache")) + deps)))) #t))))))))) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 6b009dbfea3e44a66533a5ea41879df669923cff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 10 Oct 2018 14:30:39 +0200 Subject: gnu: openal: Update source and home page URLs. Fixes . Reported by Nam Nguyen . * gnu/packages/audio.scm (openal)[source, home-page]: Update URLs. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index b858a35359..d233940f23 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1913,7 +1913,7 @@ lv2-c++-tools.") (source (origin (method url-fetch) (uri (string-append - "http://kcat.strangesoft.net/openal-releases/openal-soft-" + "http://openal-soft.org/openal-releases/openal-soft-" version ".tar.bz2")) (sha256 (base32 @@ -1950,7 +1950,7 @@ emitters are among the features handled by the API. More advanced effects, including air absorption, occlusion, and environmental reverb, are available through the EFX extension. It also facilitates streaming audio, multi-channel buffers, and audio capture.") - (home-page "http://kcat.strangesoft.net/openal.html") + (home-page "http://openal-soft.org/") (license license:lgpl2.0+))) (define-public freealut -- cgit v1.2.3 From 121f32a104de6d88774c4a819eb40334a618199c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 10 Oct 2018 14:48:46 +0200 Subject: gnu: guile-next: Update to 2.9.1. * gnu/packages/guile.scm (guile-next): Update to 2.9.1. [native-inputs, arguments]: Remove. [properties]: New field. --- gnu/packages/guile.scm | 39 ++++++++------------------------------- 1 file changed, 8 insertions(+), 31 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index f7baff4718..e223edb9fc 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -323,39 +323,14 @@ without requiring the source code to be rewritten.") (package (inherit guile-2.2) (name "guile-next") - (version (git-version "2.99" revision commit)) + (version "2.9.1") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://git.savannah.gnu.org/git/guile.git") - (commit commit))) + (inherit (package-source guile-2.2)) + (uri (string-append "https://alpha.gnu.org/gnu/guile/guile-" + version ".tar.xz")) (sha256 (base32 - "1c2xy5cflg0hws48914rz3z8mdmf8w3lblfic0kxnymcmdv9cbhv")) - (file-name (git-file-name name version)))) - (native-inputs - `(("autoconf", autoconf) - ("automake" ,automake) - ("libtool" ,libtool) - ("gettext" ,gnu-gettext) - ("texinfo" ,texinfo) - ("flex" ,flex) - ,@(package-native-inputs guile-2.2))) - (arguments - (substitute-keyword-arguments (package-arguments guile-2.2) - ((#:phases phases '%standard-phases) - ;; XXX: The default 'bootstrap' phase tries to execute the - ;; ./bootstrap directory. - `(modify-phases ,phases - (replace 'bootstrap - (lambda _ - (patch-shebang "build-aux/git-version-gen") - (invoke "autoreconf" "-vfi"))) - (add-before 'check 'skip-version-test - (lambda _ - ;; Remove this test that's bound to fail. - (delete-file "test-suite/tests/version.test") - #t)))))) + "0iba93yqn6mvgid0rfsrg4amym36pg9m8cqdplxsy222blrj9gh1")))) (native-search-paths (list (search-path-specification (variable "GUILE_LOAD_PATH") @@ -363,7 +338,9 @@ without requiring the source code to be rewritten.") (search-path-specification (variable "GUILE_LOAD_COMPILED_PATH") (files '("lib/guile/3.0/site-ccache" - "share/guile/site/3.0")))))))) + "share/guile/site/3.0"))))) + (properties '((ftp-server . "alpha.gnu.org") + (upstream-name . "guile")))))) (define (make-guile-readline guile) (package -- cgit v1.2.3 From 903378910e32a6981199a1669e67c46ca9be2187 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 10 Oct 2018 17:32:53 +0200 Subject: gnu: Add numlockx. * gnu/packages/xdisorg.scm (numlockx): New variable. --- gnu/packages/xdisorg.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index c31680b246..c92dbd1784 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1497,3 +1497,27 @@ before the system goes to sleep.") "Pyperclip is a clipboard module for Python, handling copy/pasting from the X11 clipboard") (license license:bsd-3))) + +(define-public numlockx + (package + (name "numlockx") + (version "1.2") + (source (origin + (method git-fetch) + (uri (git-reference + ;; It seems that upstream is gone. + (url "https://github.com/rg3/numlockx") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1w49fayhwzn5rx0z1q2lrvm7z8jrd34lgb89p853a024bixc3cf2")))) + (build-system gnu-build-system) + (inputs + `(("xorg-server" ,xorg-server))) + (home-page "https://github.com/rg3/numlockx") + (synopsis "Turns on the numlock key in X11") + (description "@command{numlockx} is a tiny program that lets you turn on +the numlock key in X11. It can be called from the user's initialization files +to automatically turn it on on login.") + (license license:expat))) -- cgit v1.2.3 From 3e70c3a06ed7cc93e8d25c2c7e69c1bc7d7cb57b Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 10 Oct 2018 17:43:51 +0200 Subject: gnu: emacs-evil-collection: Update to 0.0.1. * gnu/packages/emacs.scm (emacs-evil-collection): Update to 0.0.1. --- gnu/packages/emacs.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index c9493dabd4..8945fcd5df 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -5200,11 +5200,11 @@ extensions.") (license license:gpl3+)))) (define-public emacs-evil-collection - (let ((commit "b55ae90f367e103e6568ae00779a8a51c68a0104") - (revision "3")) + (let ((commit "abc9dd60f71ccc1f24803a12d853f84b4a8b258c") + (revision "4")) (package (name "emacs-evil-collection") - (version (git-version "20180911" revision commit)) + (version (git-version "0.0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -5213,7 +5213,7 @@ extensions.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0n7bzi5s7rqi78l1424sxvsk2g46z7ksq02xx5jrmqymnij90jml")))) + "0c9l93vrsl6kzx8gg305dq8qkb2dr3s10fww7lh382911pdmsh7v")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-evil" ,emacs-evil))) -- cgit v1.2.3 From 8f3dc810b18280052fed56090a1f8034f7b5b008 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 10 Oct 2018 17:45:07 +0200 Subject: gnu: emacs-slime: Update to 2.22. * gnu/packages/emacs.scm (emacs-slime): Update to 2.22. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 8945fcd5df..4b013eb292 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -3034,7 +3034,7 @@ in @code{html-mode}.") (define-public emacs-slime (package (name "emacs-slime") - (version "2.20") + (version "2.22") (source (origin (file-name (string-append name "-" version ".tar.gz")) @@ -3044,7 +3044,7 @@ in @code{html-mode}.") version ".tar.gz")) (sha256 (base32 - "086lq5y4pvj9wihy0si02xxvyzpzz8mcg3hz1cvy9zxlyjwzr1gk")))) + "07vaib1n4zyh5yy30gdpq0bc5cv6w84piml5b3mfc9ibjhaykkms")))) (build-system emacs-build-system) (native-inputs `(("texinfo" ,texinfo))) -- cgit v1.2.3 From 8984dbd0deb380f6706d36bc9f1aaa061c0e751a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Oct 2018 19:45:27 +0200 Subject: gnu: volume-key: Update to 0.3.12. * gnu/packages/disk.scm (volume-key): Update to 0.3.12. --- gnu/packages/disk.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index fa3a0431a5..a9c355e412 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -559,28 +559,28 @@ automatically finding out which program to use for what file type.") (define-public volume-key (package (name "volume-key") - (version "0.3.11") + (version "0.3.12") (source (origin (method url-fetch) (uri (string-append "https://releases.pagure.org/volume_key/volume_key-" version ".tar.xz")) (sha256 (base32 - "0vaz15rcgdkh5z4yxc22x76wi44gh50jxnrqz5avaxz4bb17kcp6")))) + "16rhfz6sjwxlmss1plb2wv2i3jq6wza02rmz1d2jrlnsq67p98vc")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("util-linux" ,util-linux) ("swig" ,swig) - ("python" ,python-3))) ; Used to generate the Python bindings. + ("python" ,python-3))) ; used to generate the Python bindings (inputs `(("cryptsetup" ,cryptsetup) ("nss" ,nss) - ("lvm2" ,lvm2) ; For "-ldevmapper". + ("lvm2" ,lvm2) ; for "-ldevmapper" ("glib" ,glib) ("gpgme" ,gpgme))) (arguments - `(#:tests? #f ; Not sure how tests are supposed to pass, even when run manually. + `(#:tests? #f ; not sure how tests are supposed to pass, even when run manually #:phases (modify-phases %standard-phases (add-before 'configure 'patch-python.h-path -- cgit v1.2.3 From 4273a7ef65ce3b89b592093e2a07ecb5a9081d7a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Oct 2018 20:05:18 +0200 Subject: gnu: libblockdev: Update to 2.20. * gnu/packages/disk.scm (libblockdev): Update to 2.20. [license]: Update to match fixed licence headers. --- gnu/packages/disk.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index a9c355e412..338678b8d1 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -698,14 +698,15 @@ to create devices with respective mappings for the ATARAID sets discovered.") (define-public libblockdev (package (name "libblockdev") - (version "2.18") + (version "2.20") (source (origin (method url-fetch) - (uri (string-append "https://github.com/storaged-project/libblockdev/releases/download/" + (uri (string-append "https://github.com/storaged-project/" + "libblockdev/releases/download/" version "-1/libblockdev-" version ".tar.gz")) (sha256 (base32 - "1a3kpdr9s6g7nfibazi92i27wbv692b5gm2r24gimis6l6jq4pbh")))) + "092snk5jyv48na4d46v1ckiy859zwpb3r0ivnxv3km5vzsp76y7q")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -738,6 +739,4 @@ manipulation of block devices. It has a plugin-based architecture where each technology (like LVM, Btrfs, MD RAID, Swap...) is implemented in a separate plugin, possibly with multiple implementations (e.g. using LVM CLI or the new LVM D-Bus API).") - ;; XXX: Copying says LGPL2.1, but the source files with license - ;; information are GPL2+. - (license license:gpl2+))) + (license license:lgpl2.1+))) -- cgit v1.2.3 From 1f033795e25f177bb52efe8e98aee7001ba8ccd0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Oct 2018 21:10:23 +0200 Subject: gnu: ndctl: Update to 63. * gnu/packages/disk.scm (ndctl): Update to 63. [source]: Use GIT-FILE-NAME. [native-inputs]: Add bash-completion. [arguments]: Add '--disable-asciidoctor' and '--without-systemd' #:configure-flags. Don't bother patching unused ./autogen.sh in 'patch-FHS-file-names' phase. --- gnu/packages/disk.scm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 338678b8d1..04fe3deb38 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -600,27 +600,28 @@ passphrases.") (define-public ndctl (package (name "ndctl") - (version "61.2") + (version "63") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/pmem/ndctl") + (url "https://github.com/pmem/ndctl.git") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 - "0vid78jzhmzh505bpwn8mvlamfhcvl6rlfjc29y4yn7zslpydxl7")))) + "060nsza8xic769bxj3pvl70a9885bwrc0myw16l095i3z6w7yzwq")))) (build-system gnu-build-system) (native-inputs `(("asciidoc" ,asciidoc) ("automake" ,automake) ("autoconf" ,autoconf) + ("bash-completion" ,bash-completion) ("docbook-xsl" ,docbook-xsl) ("libtool" ,libtool) ("libxml2" ,libxml2) ("pkg-config" ,pkg-config) ("xmlto" ,xmlto) - ;; Required for offline docbook generation: + ;; Required for offline docbook generation. ("which" ,which))) (inputs `(("eudev" ,eudev) @@ -628,12 +629,13 @@ passphrases.") ("kmod" ,kmod) ("util-linux" ,util-linux))) (arguments - `(#:phases + `(#:configure-flags + (list "--disable-asciidoctor" ; use docbook-xsl instead + "--without-systemd") + #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-FHS-file-names (lambda _ - (substitute* "autogen.sh" - (("/bin/sh") (which "sh"))) (substitute* "git-version-gen" (("/bin/sh") (which "sh"))) (substitute* "git-version" -- cgit v1.2.3 From 3820d51bec3997bb336d6f7c5eff7c97958b13ae Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Oct 2018 22:10:52 +0200 Subject: Order (gnu packages disk) module imports alphabetically. * gnu/packages/disk.scm (define-module): Order module imports alphabetically. --- gnu/packages/disk.scm | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 04fe3deb38..8b843a7417 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -30,22 +30,24 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages disk) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix git-download) - #:use-module (guix build-system gnu) - #:use-module (guix build-system trivial) - #:use-module (guix build-system python) #:use-module (gnu packages) + #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages bash) + #:use-module (gnu packages c) #:use-module (gnu packages check) + #:use-module (gnu packages compression) + #:use-module (gnu packages cryptsetup) #:use-module (gnu packages databases) #:use-module (gnu packages docbook) + #:use-module (gnu packages documentation) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) - #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) + #:use-module (gnu packages gnupg) + #:use-module (gnu packages gnuzilla) + #:use-module (gnu packages gtk) + #:use-module (gnu packages guile) #:use-module (gnu packages linux) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) @@ -53,20 +55,18 @@ #:use-module (gnu packages popt) #:use-module (gnu packages python) #:use-module (gnu packages readline) - #:use-module (gnu packages guile) - #:use-module (gnu packages compression) + #:use-module (gnu packages swig) #:use-module (gnu packages vim) #:use-module (gnu packages w3m) - #:use-module (gnu packages xml) - #:use-module (gnu packages cryptsetup) - #:use-module (gnu packages gnuzilla) - #:use-module (gnu packages gnupg) - #:use-module (gnu packages swig) - #:use-module (gnu packages autotools) #:use-module (gnu packages web) - #:use-module (gnu packages documentation) - #:use-module (gnu packages bash) - #:use-module (gnu packages c)) + #:use-module (gnu packages xml) + #:use-module (guix build-system gnu) + #:use-module (guix build-system python) + #:use-module (guix build-system trivial) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages)) (define-public parted (package -- cgit v1.2.3 From 3d0fdb34a24dda76130aae3e60743e2191fe3e3d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Oct 2018 22:05:37 +0200 Subject: gnu: ranger: Update to 1.9.2. * gnu/packages/disk.scm (ranger): Update to 1.9.2. [native-inputs]: Order alphabetically. [arguments]: Actually run tests and remove useless #:test-target. --- gnu/packages/disk.scm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 8b843a7417..d88dbc8921 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -517,25 +517,24 @@ Duperemove can also take input from the @command{fdupes} program.") (define-public ranger (package (name "ranger") - (version "1.9.1") + (version "1.9.2") (source (origin (method url-fetch) (uri (string-append "https://ranger.github.io/" "ranger-" version ".tar.gz")) (sha256 (base32 - "1lnzkrxcnlwnyi3z0v8ybyp8d5rm26qm35rr68kbs2lbs06inha0")))) + "12kbsqakbxs09y0x8hy66mmaf72rk0p850x7ryk2ghkq7wfin78f")))) (build-system python-build-system) (inputs `(("w3m" ,w3m))) (native-inputs ;for tests - `(("python-pytest" ,python-pytest) + `(("python-flake8" ,python-flake8) ("python-pylint" ,python-pylint) - ("python-flake8" ,python-flake8) + ("python-pytest" ,python-pytest) ("which" ,which))) (arguments - '(#:test-target "test" - #:phases + '(#:phases (modify-phases %standard-phases (add-after 'configure 'wrap-program ;; Tell 'ranger' where 'w3mimgdisplay' is. @@ -547,7 +546,11 @@ Duperemove can also take input from the @command{fdupes} program.") "/libexec/w3m/w3mimgdisplay"))) (wrap-program ranger `("W3MIMGDISPLAY_PATH" ":" prefix (,w3mimgdisplay))) - #t)))))) + #t))) + (replace 'check + ;; Running 'make test' simply prints 'Ran 0 tests in 0.000s'. + (lambda _ + (invoke "py.test" "tests")))))) (home-page "https://ranger.github.io/") (synopsis "Console file manager") (description "ranger is a console file manager with Vi key bindings. It -- cgit v1.2.3 From 47f9fb18a3b40a702368cc2dd70e3db1c95679f7 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Wed, 10 Oct 2018 12:16:51 +0200 Subject: gnu: Add kicad-symbols. * gnu/packages/engineering.scm (kicad-symbols): New variable. --- gnu/packages/engineering.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index ee524ec78e..0080356494 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -823,6 +823,30 @@ electrical diagrams), gerbview (viewing Gerber files) and others.") render model libraries.") (license license:lgpl2.0+)))) +(define-public kicad-symbols + (package + (name "kicad-symbols") + (version "5.0.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/KiCad/kicad-symbols.git") + (commit version))) + (file-name (string-append "kicad-symbols-" version "-checkout")) + (sha256 + (base32 + "18z5vpdq7hy2mpvm5vz1dz3ra3a5iybavvlzi8q2bmmdb6gsvf64")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f)) ; No tests exist + (home-page "http://kicad-pcb.org/") + (synopsis "Official KiCad schematic symbol libraries for KiCad 5") + (description "This package contains the official KiCad schematic symbol +libraries for KiCad 5.") + ;; TODO: Exception: "To the extent that the creation of electronic designs that use 'Licensed Material' can be considered to be 'Adapted Material', then the copyright holder waives article 3 of the license with respect to these designs and any generated files which use data provided as part of the 'Licensed Material'." + ;; See . + (license license:cc-by-sa4.0))) + (define-public linsmith (package (name "linsmith") -- cgit v1.2.3 From 43c97cceae055fc59ca14ddc5b3475d66f98de37 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Oct 2018 22:28:40 +0200 Subject: gnu: ranger: More test tweaks. There's no functional difference between 'make test_pytest' and running 'py.test' directly, but there may be in future. This follows up on commit 14173b3c6765bd8fcb2b12ea28fc27226645c7e1. * gnu/packages/disk.scm (ranger)[arguments]: Use #:test-target to run the (same) tests through 'make'. [native-inputs]: Remove left-over python-flake8 and python-pylint. --- gnu/packages/disk.scm | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index d88dbc8921..2158da6a81 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -528,13 +528,15 @@ Duperemove can also take input from the @command{fdupes} program.") (build-system python-build-system) (inputs `(("w3m" ,w3m))) - (native-inputs ;for tests - `(("python-flake8" ,python-flake8) - ("python-pylint" ,python-pylint) - ("python-pytest" ,python-pytest) - ("which" ,which))) + (native-inputs + `(("which" ,which) + + ;; For tests. + ("python-pytest" ,python-pytest))) (arguments - '(#:phases + '( ;; The 'test' target runs developer tools like pylint, which fail. + #:test-target "test_pytest" + #:phases (modify-phases %standard-phases (add-after 'configure 'wrap-program ;; Tell 'ranger' where 'w3mimgdisplay' is. @@ -548,9 +550,9 @@ Duperemove can also take input from the @command{fdupes} program.") `("W3MIMGDISPLAY_PATH" ":" prefix (,w3mimgdisplay))) #t))) (replace 'check - ;; Running 'make test' simply prints 'Ran 0 tests in 0.000s'. - (lambda _ - (invoke "py.test" "tests")))))) + ;; The default check phase simply prints 'Ran 0 tests in 0.000s'. + (lambda* (#:key test-target #:allow-other-keys) + (invoke "make" test-target)))))) (home-page "https://ranger.github.io/") (synopsis "Console file manager") (description "ranger is a console file manager with Vi key bindings. It -- cgit v1.2.3 From f825faa502b0c149c430a08268bc972ff5e8c1cd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Oct 2018 22:44:16 +0200 Subject: gnu: python-pickleshare: Update to 0.7.5. * gnu/packages/databases.scm (python-pickleshare): Update to 0.7.5. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 9c966494ad..73026c5e66 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2420,13 +2420,13 @@ SQLAlchemy Database Toolkit for Python.") (define-public python-pickleshare (package (name "python-pickleshare") - (version "0.7.4") + (version "0.7.5") (source (origin (method url-fetch) (uri (pypi-uri "pickleshare" version)) (sha256 - (base32 "0yvk14dzxk7g6qpr7iw23vzqbsr0dh4ij4xynkhnzpfz4xr2bac4")))) + (base32 "1jmghg3c53yp1i8cm6pcrm280ayi8621rwyav9fac7awjr3kss47")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 893c340c3af3fb1426d11f7a9f613f9837054ac5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Oct 2018 22:59:13 +0200 Subject: gnu: haveged: Update to 1.9.4. * gnu/packages/linux.scm (haveged): Update to 1.9.4. [source]: Use GIT-FETCH and GIT-FILE-NAME from new (development) home. --- gnu/packages/linux.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d52e8d7d19..c6c5a585e1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3737,15 +3737,16 @@ such as frequency and voltage scaling.") (define-public haveged (package (name "haveged") - (version "1.9.2") + (version "1.9.4") (source (origin - (method url-fetch) - (uri (string-append "http://www.issihosts.com/haveged/haveged-" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/jirka-h/haveged.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 - "0w5ypz6451msckivjriwyw8djydlwffam7x23xh626s2vzdrlzgp")))) + (base32 "1hrwzjd4byq4fdrg8svww3d8x449k80jxxrjy9v6jvzhfv19rvxr")))) (build-system gnu-build-system) (home-page "http://www.issihosts.com/haveged") (synopsis "Entropy source for the Linux random number generator") -- cgit v1.2.3 From b71a34887bc21d84e0f6d44d3bb765f3ad50eeb9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Oct 2018 23:00:38 +0200 Subject: gnu: haveged: Mark up description. * gnu/packages/linux.scm (haveged)[description]: Use @dfn{} and split into two paragraphs. --- gnu/packages/linux.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index c6c5a585e1..b7457a4687 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3755,11 +3755,12 @@ such as frequency and voltage scaling.") Linux's @file{/dev/random} and @file{/dev/urandom} devices. The kernel's standard mechanisms for filling the entropy pool may not be sufficient for systems with high needs or limited user interaction, such as headless servers. + @command{haveged} runs as a privileged daemon, harvesting randomness from the indirect effects of hardware events on hidden processor state using the HArdware -Volatile Entropy Gathering and Expansion (HAVEGE) algorithm. It tunes itself to -its environment and provides the same built-in test suite for the output stream -as used on certified hardware security devices.") +Volatile Entropy Gathering and Expansion (@dfn{HAVEGE}) algorithm. It tunes +itself to its environment and provides the same built-in test suite for the +output stream as used on certified hardware security devices.") (license (list (license:non-copyleft "file://nist/mconf.h") (license:non-copyleft "file://nist/packtest.c") license:public-domain ; nist/dfft.c -- cgit v1.2.3 From 50298d4a8139f188d2bc4882e9808ccb8b16a387 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Oct 2018 23:43:23 +0200 Subject: gnu: perftest: Update to 4.4-0.4. * gnu/packages/linux.scm (perftest): Update to 4.4-0.4. --- gnu/packages/linux.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b7457a4687..b65bf9ba09 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3626,14 +3626,14 @@ The following service daemons are also provided: (define-public perftest (package (name "perftest") - (version "4.2-0.8") + (version "4.4-0.4") (source (origin (method url-fetch) - (uri (string-append "https://github.com/linux-rdma/perftest/releases/download/V" - version "/perftest-" version ".g0e24e67.tar.gz")) + (uri (string-append "https://github.com/linux-rdma/perftest/releases/download/v" + version "/perftest-" version ".g0927198.tar.gz")) (sha256 - (base32 "1r3pxn7cx3grb8myb4q1b0pk447pc06cifd0v7ym13xw00372dlx")))) + (base32 "11ix4h0rrmqqyi84y55a9xnkvwsmwq0sywr46hvxzm4rqz4ma8vq")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 43abffa1a3f216aa7cffaa748d3453e30f3e8839 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Oct 2018 23:45:55 +0200 Subject: gnu: hdparm: Update to 9.56. * gnu/packages/linux.scm (hdparm): Update to 9.56. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b65bf9ba09..9b16083eab 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2668,14 +2668,14 @@ isolation or root privileges.") (define-public hdparm (package (name "hdparm") - (version "9.55") + (version "9.56") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/" name "/" name "/" name "-" version ".tar.gz")) (sha256 (base32 - "1ivdvrzimaayiq03by8mcq0mhmdljndj06h012zkdpw34irnpixm")))) + "1np42qyhb503khvacnjcl3hb1dqly68gj0a1xip3j5qhbxlyvybg")))) (build-system gnu-build-system) (arguments `(#:make-flags (let ((out (assoc-ref %outputs "out"))) -- cgit v1.2.3 From 272fc9dca35c06d431e59e68a2a05ed8c2c3ce96 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Oct 2018 23:54:17 +0200 Subject: gnu: tlp: Return #t from phases. * gnu/packages/linux.scm (tlp)[argument]: Return #t all from phases. --- gnu/packages/linux.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9b16083eab..344f3ea397 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4250,12 +4250,14 @@ Light is the successor of lightscript.") (setenv "TLP_SHCPL" (string-append out "/share/bash-completion/completions")) (setenv "TLP_MAN" (string-append out "/share/man")) - (setenv "TLP_META" (string-append out "/share/metainfo"))))) + (setenv "TLP_META" (string-append out "/share/metainfo")) + #t))) (delete 'check) ; no tests (add-before 'install 'fix-installation (lambda _ ;; Stop the Makefile from trying to create system directories. - (substitute* "Makefile" (("\\[ -f \\$\\(_CONF\\) \\]") "#")))) + (substitute* "Makefile" (("\\[ -f \\$\\(_CONF\\) \\]") "#")) + #t)) (replace 'install (lambda _ (invoke "make" "install-tlp" "install-man") @@ -4289,7 +4291,8 @@ Light is the successor of lightscript.") "pciutils" "rfkill" "wireless-tools")))))) - bin-files))))))) + bin-files) + #t)))))) (home-page "http://linrunner.de/en/tlp/tlp.html") (synopsis "Power management tool for Linux") (description "TLP is a power management tool for Linux. It comes with -- cgit v1.2.3 From dc5282f9ea1142230b8361c788b30c9355af575b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Oct 2018 23:57:29 +0200 Subject: gnu: hexchat: Update to 2.14.2. * gnu/packages/messaging.scm (hexchat): Update to 2.14.2. --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 8ac86a852f..d2b61b9ec5 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -249,14 +249,14 @@ access to servers running the Discord protocol.") (define-public hexchat (package (name "hexchat") - (version "2.14.1") + (version "2.14.2") (source (origin (method url-fetch) (uri (string-append "https://dl.hexchat.net/hexchat/hexchat-" version ".tar.xz")) (sha256 (base32 - "18h3l34zmazjlfx3irg7k7swppa62ad9ffbl0j3ry8p2xfyf8cmh")))) + "064nq151nzsljv97dmkifyl162d2738vbgvm1phx7yv04pjvk4kp")))) (build-system meson-build-system) (native-inputs `(("gettext" ,gettext-minimal) ("perl" ,perl) -- cgit v1.2.3 From e05fe1f91701c28e1a05ae13057601cef7aacf3c Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 10 Oct 2018 23:17:14 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.160. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.160. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 344f3ea397..6020330cd3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -452,8 +452,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.159" - "12wrhni1ikmakwv55cgzsznx9llzp82irsisbjjs7bc8z2hzwr6l" + (make-linux-libre "4.4.160" + "1337p94j1hyc2gaw51wvlv622wwj2af1y8rafyfgp1403cs7ghp4" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From 0e8f0803b5b2abd1c99408c508e8b36db32df9c5 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 10 Oct 2018 23:17:53 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.132. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.132. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 6020330cd3..261a8e28fa 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -446,8 +446,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.131" - "11pxwl7dmisbf2szg9qzkvhlpk68clh5l478n7b62q7hd8j3hxlv" + (make-linux-libre "4.9.132" + "1s4zsv04bdafqqn8i6ab3lxjbh45v20dbm31mb52hfyzlfp4sjp5" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From 4f1d7e386b8ff6f83f109e06ca3ccbaa0f9f617f Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 10 Oct 2018 23:18:28 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.75. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.75. (%linux-libre-4.14-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 261a8e28fa..367ee4da29 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -436,8 +436,8 @@ It has been modified to remove all non-free binary blobs.") #:patches %linux-libre-4.18-patches #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.74") -(define %linux-libre-4.14-hash "0cxyx2yinnc8q0hmhb0swjgdz3s0ry7wxzyqss9f2i74xjjz4rm0") +(define %linux-libre-4.14-version "4.14.75") +(define %linux-libre-4.14-hash "0ljcjsc6lxq4q5dxy9kgnngasyqmv6rhl9yyqxrfzm41qbqfn64l") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.2.3 From 2faf2edf5880a47d70b716b1780465eb1671c855 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 10 Oct 2018 23:19:36 -0400 Subject: gnu: linux-libre: Update to 4.18.13. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.18.13. (%linux-libre-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 367ee4da29..8983ed35e4 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -405,8 +405,8 @@ It has been modified to remove all non-free binary blobs.") ;; supports qemu "virt" machine and possibly a large number of ARM boards. ;; See : https://wiki.debian.org/DebianKernel/ARMMP. -(define %linux-libre-version "4.18.12") -(define %linux-libre-hash "1mcnb1mm7m6i9s591c3kx0f1vbzhbl3w92w137swcm9zifqpci5r") +(define %linux-libre-version "4.18.13") +(define %linux-libre-hash "0jqlmzml67dp5708d4giga48vv4npgs3mbnzdrigaxgca5c69qck") (define %linux-libre-4.18-patches (list %boot-logo-patch -- cgit v1.2.3 From a8fa86c47781e3e5f6cb58468446ede59b3ba3f4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Oct 2018 10:30:00 +0200 Subject: gnu: Add python-cvxopt. * gnu/packages/maths.scm (python-cvxopt, python2-cvxopt): New variables. --- gnu/packages/maths.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 766c6e920f..d4128f55c4 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -239,6 +239,50 @@ triangulations.") (license (license:non-copyleft "file://COPYING.txt" "See COPYING in the distribution.")))) +(define-public python-cvxopt + (package + (name "python-cvxopt") + (version "1.2.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cvxopt/cvxopt.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "05mnjil9palaa48xafdfh4f5pr4z7aqjr995rwl08qfyxs8y0crf")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'find-libraries + (lambda* (#:key inputs #:allow-other-keys) + (setenv "CVXOPT_BLAS_LIB" "openblas") + (setenv "CVXOPT_BUILD_FFTW" "1") + (setenv "CVXOPT_BUILD_GLPK" "1") + (setenv "CVXOPT_BUILD_GSL" "1") + #t))))) + (inputs + `(("fftw" ,fftw) + ("glpk" ,glpk) + ("gsl" ,gsl) + ("lapack" ,lapack) + ("openblas" ,openblas) + ("suitesparse" ,suitesparse))) + (home-page "https://www.cvxopt.org") + (synopsis "Python library for convex optimization") + (description + "CVXOPT is a package for convex optimization based on the Python +programming language. Its main purpose is to make the development of software +for convex optimization applications straightforward by building on Python’s +extensive standard library and on the strengths of Python as a high-level +programming language.") + (license license:gpl3+))) + +(define-public python2-cvxopt + (package-with-python2 python-cvxopt)) + (define-public units (package (name "units") -- cgit v1.2.3 From e8a7eab169b84ef66c0fb39b3f20ec8af047d5c0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Oct 2018 16:12:11 +0200 Subject: gnu: kallisto: Update to 0.44.0. * gnu/packages/bioinformatics.scm (kallisto): Update to 0.44.0. [source]: Fetch from git. [arguments]: Add build phase to use htslib from Guix. [inputs]: Add htslib. --- gnu/packages/bioinformatics.scm | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index ed713cd144..91bb94c549 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11735,19 +11735,39 @@ using nucleotide or amino-acid sequence data.") (define-public kallisto (package (name "kallisto") - (version "0.43.1") + (version "0.44.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/pachterlab/" - "kallisto/archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/pachterlab/kallisto.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "03j3iqhvq7ya3c91gidly3k3jvgm97vjq4scihrlxh315j696r11")))) + "0nj382jiywqnpgvyhichajpkkh5r0bapn43f4dx40zdaq5v4m40m")))) (build-system cmake-build-system) - (arguments `(#:tests? #f)) ; no "check" target + (arguments + `(#:tests? #f ; no "check" target + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'do-not-use-bundled-htslib + (lambda _ + (substitute* "CMakeLists.txt" + (("^ExternalProject_Add" m) + (string-append "if (NEVER)\n" m)) + (("^\\)") + (string-append ")\nendif(NEVER)")) + (("include_directories\\(\\$\\{htslib_PREFIX.*" m) + (string-append "# " m))) + (substitute* "src/CMakeLists.txt" + (("target_link_libraries\\(kallisto kallisto_core pthread \ +\\$\\{CMAKE_CURRENT_SOURCE_DIR\\}/../ext/htslib/libhts.a\\)") + "target_link_libraries(kallisto kallisto_core pthread hts)") + (("include_directories\\(\\.\\./ext/htslib\\)") "")) + #t))))) (inputs `(("hdf5" ,hdf5) + ("htslib" ,htslib) ("zlib" ,zlib))) (home-page "http://pachterlab.github.io/kallisto/") (synopsis "Near-optimal RNA-Seq quantification") -- cgit v1.2.3 From ed9d7cb4d95f8f4776e6fee2778ab52bc2852969 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 11 Oct 2018 18:27:21 +0200 Subject: gnu: guix-daemon: Run 'guix' from /var/guix/profiles/per-user/root. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . Reported by Pjotr Prins and Konrad Hinsen . * gnu/packages/package-management.scm (guix-daemon)[arguments]: Execute /var/guix/profiles/per-user/root/current-guix/bin/guix instead of ~root/…. --- gnu/packages/package-management.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 500abd5125..9a0023233f 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -347,12 +347,14 @@ the Nix package manager.") "install-nodist_pkglibexecSCRIPTS") ;; We need to tell 'guix-daemon' which 'guix' command to use. - ;; Here we use a questionable hack where we hard-code - ;; "~root/.config", which could be wrong (XXX). + ;; Here we use a questionable hack where we hard-code root's + ;; current guix, which could be wrong (XXX). Note that scripts + ;; like 'guix perform-download' do not run as root so we assume + ;; that they have access to /var/guix/profiles/per-user/root. (let ((out (assoc-ref outputs "out"))) (substitute* (find-files (string-append out "/libexec")) (("exec \".*/bin/guix\"") - "exec ~root/.config/guix/current/bin/guix")) + "exec /var/guix/profiles/per-user/root/current-guix/bin/guix")) #t))) (delete 'wrap-program))))))) -- cgit v1.2.3 From 3bee949b032186cca4dbb5173f4f4fecd34da368 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 11 Oct 2018 13:03:58 -0400 Subject: gnu: Krita: Update to 4.1.5. * gnu/packages/kde.scm (krita): Update to 4.1.5. --- gnu/packages/kde.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 3dfba6d383..c2164250e9 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -317,7 +317,7 @@ plugins, as well as code to create plugins, or complete applications.") (define-public krita (package (name "krita") - (version "4.1.3") + (version "4.1.5") (source (origin (method url-fetch) (uri (string-append @@ -326,7 +326,7 @@ plugins, as well as code to create plugins, or complete applications.") "/" name "-" version ".tar.gz")) (sha256 (base32 - "0d546dxs552z0pxnaka1jm7ksravw17f777wf593z0pl4ds8dgdx")))) + "1by8p8ifdp03f05bhg8ygdd1j036anfpjjnzbx63l2fbmy9k6q10")))) (build-system cmake-build-system) (arguments `(#:tests? #f -- cgit v1.2.3 From fd15eb286e9b2effaf19a65e17e9e0e6d19b2111 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 11 Oct 2018 20:44:56 +0300 Subject: 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(-) (limited to 'gnu') 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") -- cgit v1.2.3 From 0ea6af996b06ba453b803f2d4b014ffa709db4b7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 11 Oct 2018 22:33:59 +0300 Subject: 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 (limited to 'gnu') 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"))), + ] -- cgit v1.2.3 From fc346e30a0e266ee7e2edcc057a22fdac3c98124 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Thu, 11 Oct 2018 16:31:08 -0400 Subject: gnu: godot: Update to 3.0.6. * gnu/packages/game-development.scm (godot): Update to 3.0.6. --- gnu/packages/game-development.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index bfebcc433e..6b7e71f6c0 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1080,7 +1080,7 @@ games.") (define-public godot (package (name "godot") - (version "3.0.4") + (version "3.0.6") (source (origin (method git-fetch) (uri (git-reference @@ -1089,7 +1089,7 @@ games.") (file-name (git-file-name name version)) (sha256 (base32 - "0i4ssfb6igga9zwvsmahrnasx9cyqrsd6mlmssjgc482fy9q2kz4")) + "0g64h0x8dlv6aa9ggfcidk2mknkfl5li7z1phcav8aqp9srj8avf")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From e1d1ec143569d35eb3e222e6f49d1db0e5423be9 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 7 Oct 2018 20:16:47 -0700 Subject: gnu: u-boot: Update to 2018.09. * gnu/packages/bootloaders.scm (u-boot): Update to 2018.09. (u-boot-tools)[arguments]: Substitute "coverage" for "python-coverage". Update workaround for only 99% test coverage. Signed-off-by: Leo Famulari --- gnu/packages/bootloaders.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 4ba9d2e043..bce12d324d 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -360,7 +360,7 @@ tree binary files. These are board description files used by Linux and BSD.") (define u-boot (package (name "u-boot") - (version "2018.07") + (version "2018.09") (source (origin (method url-fetch) (uri (string-append @@ -368,7 +368,7 @@ tree binary files. These are board description files used by Linux and BSD.") "u-boot-" version ".tar.bz2")) (sha256 (base32 - "1m7nw64mxflpc6sqvnz2kb5fxfkb4mrpy8b1wi15dcwipj4dy44z")))) + "0s122kyz1svvs2yjzj4j9qravl3ra4vn0fjqgski7rlczqyg56w3")))) (native-inputs `(("bc" ,bc) ("bison" ,bison) @@ -403,6 +403,12 @@ also initializes the boards (RAM etc).") (("/bin/false") (which "false"))) (substitute* "tools/dtoc/fdt_util.py" (("'cc'") "'gcc'")) + (substitute* "tools/patman/test_util.py" + ;; python-coverage is simply called coverage in guix. + (("python-coverage") "coverage") + ;; XXX Allow for only 99% test coverage. + ;; TODO: Find out why that is needed. + (("if coverage != '100%':") "if not int(coverage.rstrip('%')) >= 99:")) (substitute* "test/run" ;; Make it easier to find test failures. (("#!/bin/bash") "#!/bin/bash -x") @@ -417,8 +423,6 @@ also initializes the boards (RAM etc).") (("def test_ctrl_c") "@pytest.mark.skip(reason='Guix has problems with SIGINT') def test_ctrl_c")) - (substitute* "tools/binman/binman.py" - (("100%") "99%")) ; TODO: Find out why that is needed. #t)) (replace 'configure (lambda* (#:key make-flags #:allow-other-keys) -- cgit v1.2.3 From e9ab649e1e6400cdbf5147144903c1212cba798a Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 7 Oct 2018 10:37:40 +0100 Subject: gnu: Remove duplicate ruby-concurrent package definition. * gnu/packages/ruby.scm (ruby-concurrent): Remove one of the two definitions for this variable. --- gnu/packages/ruby.scm | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 2080944cae..2c5777fdf8 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -194,25 +194,6 @@ a focus on simplicity and productivity.") (("/bin/sh") (which "sh"))) #t))))))) -(define-public ruby-concurrent - (package - (name "ruby-concurrent") - (version "1.0.5") - (source (origin - (method url-fetch) - (uri (rubygems-uri "concurrent-ruby" version)) - (sha256 - (base32 - "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf")))) - (build-system ruby-build-system) - (arguments `(#:tests? #f)); No rakefile - (home-page "https://github.com/ruby-concurrency/concurrent-ruby") - (synopsis "Concurrency tools for Ruby") - (description "This gem provides concurrency tools for Ruby. It provides -a library of common thread-safe types and data-structures as well as abstractions -for concurrency and communication between threads.") - (license license:expat))) - (define-public ruby-highline (package (name "ruby-highline") -- cgit v1.2.3 From 50135ff896441f6b9e10fbfc9bfd35bf06ff1c13 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 7 Oct 2018 10:38:26 +0100 Subject: gnu: Remove duplicate ruby-yard package definition. * gnu/packages/ruby.scm (ruby-yard): Remove one of the two package definitions, and update the other to the latest release. --- gnu/packages/ruby.scm | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 2c5777fdf8..7e8c8be290 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3766,7 +3766,7 @@ A modified copy of yajl is used, and included in the package.") (define-public ruby-yard (package (name "ruby-yard") - (version "0.9.6") + (version "0.9.16") (source (origin (method url-fetch) @@ -3776,7 +3776,7 @@ A modified copy of yajl is used, and included in the package.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0rsz4bghgx7fryzyhlz8wlnd2m9xgyvf1xhrq58mnzfrrfm41bdg")))) + "0sqpbayy9sb406jh0zqg6qha1xds863qz9531dh6vp58hc00clfq")))) (build-system ruby-build-system) (arguments `(#:phases @@ -5673,27 +5673,6 @@ support the tests found in Prawn, a pure Ruby PDF generation library.") functionality from Prawn.") (license license:gpl3+))) -(define-public ruby-yard - (package - (name "ruby-yard") - (version "0.9.16") - (source (origin - (method url-fetch) - (uri (rubygems-uri "yard" version)) - (sha256 - (base32 - "0lmmr1839qgbb3zxfa7jf5mzy17yjl1yirwlgzdhws4452gqhn67")))) - (build-system ruby-build-system) - (arguments `(#:test-target "spec")) - (home-page "https://yardoc.org/") - (synopsis "Ruby documentation tool") - (description "YARD is a documentation generation tool for the Ruby -programming language. It enables the user to generate consistent, usable -documentation that can be exported to a number of formats very easily, and -also supports extending for custom Ruby constructs such as custom class level -definitions.") - (license license:expat))) - (define-public ruby-prawn (package (name "ruby-prawn") -- cgit v1.2.3 From 6826f1e1ede0526dd1247546aa5ec195bacd5cc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Mon, 8 Oct 2018 21:42:28 +0800 Subject: gnu: Add libpd. * gnu/packages/music.scm (libpd): New variable. --- gnu/packages/music.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index e1bac6f51e..13a6ecc36f 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1777,6 +1777,42 @@ programming methods as well as for realizing complex systems for large-scale projects.") (license license:bsd-3))) +(define-public libpd + (package + (name "libpd") + (version "0.11.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libpd/libpd.git") + (commit version) + (recursive? #t))) ; for the 'pure-data' submodule + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1bcg1d9iyf9n37hwwphmih0c8rd1xcqykil5z1cax6xfs76552nk")))) + (build-system gnu-build-system) + (arguments + '(#:tests? #f ; no tests + #:make-flags '("CC=gcc") + #:phases + (modify-phases %standard-phases + (delete 'configure) ; no configure script + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (invoke "make" "install" + (string-append "prefix=" out) + ;; XXX: Fix the last 2 lines of 'install' target. + "LIBPD_IMPLIB=NO" + "LIBPD_DEF=NO"))))))) + (home-page "http://libpd.cc/") + (synopsis "Pure Data as an embeddable audio synthesis library") + (description + "Libpd provides Pure Data as an embeddable audio synthesis library. Its +main purpose is to liberate raw audio rendering from audio and MIDI drivers.") + (license license:bsd-3))) + (define-public portmidi (package (name "portmidi") -- cgit v1.2.3 From a60e868629cbc471a2d511aa8f1bcbbd18caea8f Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 12 Oct 2018 22:16:54 -0400 Subject: gnu: Wireshark: Update to 2.6.4 [fixes CVE-2018-{12086,18225,18226,18227}]. * gnu/packages/networking.scm (wireshark): Update to 2.6.4. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index e3486ffadc..5a0c464252 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -581,7 +581,7 @@ of the same name.") (define-public wireshark (package (name "wireshark") - (version "2.6.3") + (version "2.6.4") (source (origin (method url-fetch) @@ -589,7 +589,7 @@ of the same name.") version ".tar.xz")) (sha256 (base32 - "1v538h02y8avwy3cr11xz6wkyf9xd8qva4ng4sl9f2fw4skahn6i")))) + "0qf81dk726sdsmjqa9nd251j1cwvzkyb4hrlp6w4iwa3cdz00sx0")))) (build-system gnu-build-system) (inputs `(("c-ares" ,c-ares) ("glib" ,glib) -- cgit v1.2.3 From 3584eeb9a17e873778c9b36ca7a691d45e364856 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 12 Oct 2018 22:42:21 -0400 Subject: gnu: ImageMagick: Update to 6.9.10-12. * gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.10-12. --- gnu/packages/imagemagick.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index ec2ac08909..e29ec6255b 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -47,14 +47,14 @@ ;; The 7 release series has an incompatible API, while the 6 series is still ;; maintained. Don't update to 7 until we've made sure that the ImageMagick ;; users are ready for the 7-series API. - (version "6.9.10-10") + (version "6.9.10-12") (source (origin (method url-fetch) (uri (string-append "mirror://imagemagick/ImageMagick-" version ".tar.xz")) (sha256 (base32 - "0b0wwxm6mgaxq0i0hazxcpbk7xd5j1329r1vk9h07iz4v3k8i57h")))) + "0ri96yqihdk921k5qx23y2sbhraxbp2avdccxiy6m3srjkirym2l")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch") -- cgit v1.2.3 From 3c4d307e8697c36ebb9df939a5d2f0d905cc5474 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 12 Oct 2018 23:19:20 -0400 Subject: gnu: python-icalendar: Update to 4.0.2. * gnu/packages/python.scm (python-icalendar: Update to 4.0.2. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 6a2bd6e8f5..35262a2c77 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7576,13 +7576,13 @@ minimal and fast API targeting the following uses: (define-public python-icalendar (package (name "python-icalendar") - (version "4.0.1") + (version "4.0.2") (source (origin (method url-fetch) (uri (pypi-uri "icalendar" version)) (sha256 (base32 - "139y79y6ijl39m5bj771r43vpah9s4ly7d1k76la6hrx7l144ak8")))) + "13003kw2vbas1ha146vv3x2rdg9k7w38rdzxj63vi1i67jgjldl0")))) (build-system python-build-system) (propagated-inputs `(("python-dateutil" ,python-dateutil) -- cgit v1.2.3 From f1be3735db479157f3c83922a4e60608ebd7165a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 12 Oct 2018 23:19:42 -0400 Subject: gnu: khal: Update to 0.9.10. * gnu/packages/calendar.scm (khal): Update to 0.9.10. --- gnu/packages/calendar.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 79cef99826..c2bbf139c1 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -96,13 +96,13 @@ data units.") (define-public khal (package (name "khal") - (version "0.9.9") + (version "0.9.10") (source (origin (method url-fetch) (uri (pypi-uri "khal" version)) (sha256 (base32 - "0dq9aqb9pqjfqrnfg43mhpb7m0szmychxy1ydb3lwzf3500c9rsh")))) + "03h0j0d3xyqh98x5v2gv63wv3g91hip3vsaxvybsn5iz331d23h4")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From d7814696b884a7c5e4a58f539ece53f4998689a3 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 12 Oct 2018 23:38:01 -0400 Subject: gnu: python-configargparse: Use pypi-uri. * gnu/packages/python.scm (python-configargparse, python2-configargparse)[source]: Use pypi-uri. --- gnu/packages/python.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 35262a2c77..29371d0494 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7353,9 +7353,7 @@ config files.") (version "0.12.0") (source (origin (method url-fetch) - (uri (string-append - "https://pypi.io/packages/source/C/ConfigArgParse/" - "ConfigArgParse-" version ".tar.gz")) + (uri (pypi-uri "ConfigArgParse" version)) (sha256 (base32 "0fgkiqh6r3rbkdq3k8c48m85g52k96686rw3a6jg4lcncrkpvk98")))) -- cgit v1.2.3 From 40f856fae80ee8a274067fba0837cccb74d9642d Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Sun, 14 Oct 2018 09:37:34 +0800 Subject: gnu: csound: Update to 6.11.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/audio.scm (csound): Update to 6.11.0. [home-page]: Change to "https://csound.com/". Signed-off-by: 宋文武 --- gnu/packages/audio.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index d233940f23..6197f549dd 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2018 okapi ;;; Copyright © 2018 Maxim Cournoyer ;;; Copyright © 2018 Clément Lassieur +;;; Copyright © 2018 Brett Gilio ;;; ;;; This file is part of GNU Guix. ;;; @@ -650,7 +651,7 @@ emulation (valve, tape), bit fiddling (decimator, pointer-cast), etc.") (define-public csound (package (name "csound") - (version "6.09.1") + (version "6.11.0") (source (origin (method url-fetch) (uri (string-append @@ -659,7 +660,7 @@ emulation (valve, tape), bit fiddling (decimator, pointer-cast), etc.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0xqpqws4jsv7fyawcjzwaw544qbfh29xq164kdf30a9v1n3yklp4")))) + "072pk5h9w0vhw0ncc9dn90haw1yv18v04iwwjn8nsp6930w7dvxd")))) (build-system cmake-build-system) (inputs `(("alsa-lib" ,alsa-lib) @@ -674,7 +675,7 @@ emulation (valve, tape), bit fiddling (decimator, pointer-cast), etc.") `(("bison" ,bison) ("flex" ,flex) ("zlib" ,zlib))) - (home-page "http://csound.github.io/") + (home-page "https://csound.com/") (synopsis "Sound and music computing system") (description "Csound is a user-programmable and user-extensible sound processing -- cgit v1.2.3 From 89f9df6cfd75d5180bd135c2b14fbfdc0eb6171b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 25 Sep 2018 07:45:18 +0300 Subject: gnu: icecat: Build with rust-1.24. * gnu/packages/gnuzilla.scm (icecat)[native-inputs]: Use the oldest compatable rust over newer releases when building icecat. --- gnu/packages/gnuzilla.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index d2110f3290..39281b59e5 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2014, 2015, 2016, 2017, 2018 Mark H Weaver ;;; Copyright © 2015 Sou Bunnbu -;;; Copyright © 2016, 2017 Efraim Flashner +;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017 Nils Gillmann @@ -620,8 +620,9 @@ security standards.") ("zip" ,zip) ("zlib" ,zlib))) (native-inputs - `(("rust" ,rust) - ("cargo" ,rust "cargo") + ;; Icecat 60 checkes for rust>=1.24 + `(("rust" ,rust-1.24) + ("cargo" ,rust-1.24 "cargo") ("perl" ,perl) ("python" ,python-2) ; Python 3 not supported ("python2-pysqlite" ,python2-pysqlite) -- cgit v1.2.3 From c2397a869549b6786b801ab816acdba68555494a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 14 Oct 2018 11:04:13 +0300 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From 2dd1bfcb5800aad8f360c113cbd769019b5c9d84 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 14 Oct 2018 19:07:35 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.161. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.161. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8983ed35e4..08d1a813ca 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -452,8 +452,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.160" - "1337p94j1hyc2gaw51wvlv622wwj2af1y8rafyfgp1403cs7ghp4" + (make-linux-libre "4.4.161" + "1q6bsndpjgw72mybhl5l8vrxs4mimg6821bjgi1pjkxbc7nd921b" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From f266e82ad21eb7be963e7d70beaa2f503cfa4e78 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 14 Oct 2018 19:09:24 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.133. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.133. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 08d1a813ca..c1bd01055e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -446,8 +446,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.132" - "1s4zsv04bdafqqn8i6ab3lxjbh45v20dbm31mb52hfyzlfp4sjp5" + (make-linux-libre "4.9.133" + "1vr94czdv5alzsgm2k1r6wqm01r2zafrayjn10l6kdr4g7aga488" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From b0fe6b5785472895259c6d60f06024042450679b Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 14 Oct 2018 19:13:56 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.76. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.76. (%linux-libre-4.14-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index c1bd01055e..812da7ca3c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -436,8 +436,8 @@ It has been modified to remove all non-free binary blobs.") #:patches %linux-libre-4.18-patches #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.75") -(define %linux-libre-4.14-hash "0ljcjsc6lxq4q5dxy9kgnngasyqmv6rhl9yyqxrfzm41qbqfn64l") +(define %linux-libre-4.14-version "4.14.76") +(define %linux-libre-4.14-hash "1y5zqf84ngb6f5f85xpd4bdy6mlxr52x19bx3mdrp82awc9fvr7q") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.2.3 From 614f49c49aa751718978a3b9da8719609ec36922 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 14 Oct 2018 19:27:46 -0400 Subject: gnu: linux-libre: Update to 4.18.14. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.18.14. (%linux-libre-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 812da7ca3c..7aaa7fb644 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -405,8 +405,8 @@ It has been modified to remove all non-free binary blobs.") ;; supports qemu "virt" machine and possibly a large number of ARM boards. ;; See : https://wiki.debian.org/DebianKernel/ARMMP. -(define %linux-libre-version "4.18.13") -(define %linux-libre-hash "0jqlmzml67dp5708d4giga48vv4npgs3mbnzdrigaxgca5c69qck") +(define %linux-libre-version "4.18.14") +(define %linux-libre-hash "1gwwx8l283w8v1zylw2haqahvjns5dzqxx9li2586nnl8cfmfnwc") (define %linux-libre-4.18-patches (list %boot-logo-patch -- cgit v1.2.3 From 0731fc1ce7f397724708f4956e6bdeb9c01c6762 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 29 Aug 2018 00:05:07 -0400 Subject: gnu: python-mimeparse: Update to 1.6.0. * gnu/packages/python.scm (python-mimeparse): Update to 1.6.0. [phases]: Enable tests with a custom check phase. --- gnu/packages/python.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 29371d0494..8261fefd93 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1699,7 +1699,7 @@ software.") (define-public python-mimeparse (package (name "python-mimeparse") - (version "0.1.4") + (version "1.6.0") (source (origin (method url-fetch) @@ -1708,10 +1708,14 @@ software.") version ".tar.gz")) (sha256 (base32 - "1hyxg09kaj02ri0rmwjqi86wk4nd1akvv7n0dx77azz76wga4s9w")))) + "0y2g6cl660bpz11srgqyvvm8gmywpgyx8g0xfvbiyr0af0yv1r3n")))) (build-system python-build-system) (arguments - '(#:tests? #f)) ; no setup.py test command + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "./mimeparse_test.py")))))) (home-page "https://github.com/dbtsai/python-mimeparse") (synopsis "Python library for parsing MIME types") -- cgit v1.2.3 From bb840999c8592b0077c78170e135b59bc79638ed Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 29 Aug 2018 00:06:28 -0400 Subject: gnu: Add python-falcon. * gnu/packages/python-web.scm (python-falcon): New variable. --- gnu/packages/python-web.scm | 54 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 2a7487202a..77fb99dc56 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -26,6 +26,7 @@ ;;; Copyright © 2018 Tomáš Čech ;;; Copyright © 2018 Nicolas Goaziou ;;; Copyright © 2018 Mathieu Othacehe +;;; Copyright © 2018 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -127,6 +128,59 @@ asynchronous DNS resolutions with a synchronous looking interface by using @url{https://github.com/saghul/pycares,pycares}.") (license license:expat))) +(define-public python-falcon + (package + (name "python-falcon") + (version "1.4.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "falcon" version)) + (sha256 + (base32 + "1i0vmqsk24z4biirqhpvas9h28wy7nmpy3jvnb6rz2imq04zd09r")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "pytest")))))) + (propagated-inputs + `(("python-mimeparse" ,python-mimeparse) + ("python-six" ,python-six))) + (native-inputs + `(("python-cython" ,python-cython) ;for faster binaries + ("python-pytest" ,python-pytest) + ("python-pyyaml" ,python-pyyaml) + ("python-requests" ,python-requests) + ("python-testtools" ,python-testtools) + ("python-jsonschema" ,python-jsonschema) + ("python-msgpack" ,python-msgpack))) + (home-page "https://falconframework.org") + (synopsis + "Web framework for building APIs and application backends") + (description + "Falcon is a web API framework for building microservices, application +backends and higher-level frameworks. Among its features are: +@itemize +@item Optimized and extensible code base +@item Routing via URI templates and REST-inspired resource +classes +@item Access to headers and bodies through request and response +classes +@item Request processing via middleware components and hooks +@item Idiomatic HTTP error responses +@item Straightforward exception handling +@item Unit testing support through WSGI helpers and mocks +@item Compatible with both CPython and PyPy +@item Cython support for better performance when used with CPython +@end itemize") + (license license:asl2.0))) + +(define-public python2-falcon + (package-with-python2 python-falcon)) + (define-public python-furl (package (name "python-furl") -- cgit v1.2.3 From 66a9f08bb9c9ba2d7cd4ee3c2d48ea9a8e41c2c4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 29 Aug 2018 00:33:17 -0400 Subject: gnu: Add python-falcon-cors. * gnu/packages/python-web.scm (python-falcon-cors): New variable. --- gnu/packages/python-web.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 77fb99dc56..f8052458a1 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -181,6 +181,32 @@ classes (define-public python2-falcon (package-with-python2 python-falcon)) +(define-public python-falcon-cors + (package + (name "python-falcon-cors") + (version "1.1.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "falcon-cors" version)) + (sha256 + (base32 + "12pym7hwsbd8b0c1azn95nas8gm3f1qpr6lpyx0958xm65ffr20p")))) + (build-system python-build-system) + (native-inputs + `(("python-falcon" ,python-falcon))) + (home-page + "https://github.com/lwcolton/falcon-cors") + (synopsis "Falcon @dfn{cross-origin resource sharing} (CORS) library") + (description "This middleware provides @dfn{cross-origin resource +sharing} (CORS) support for Falcon. It allows applying a specially crafted +CORS object to the incoming requests, enabling the ability to serve resources +over a different origin than that of the web application.") + (license license:asl2.0))) + +(define-public python2-falcon-cors + (package-with-python2 python-falcon-cors)) + (define-public python-furl (package (name "python-furl") -- cgit v1.2.3 From 3a6e1fe8c8dc7bb556f81568fc878310a15e03e3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 14 Oct 2018 23:53:19 +0200 Subject: gnu: perl-xml-feed: Update to 0.55. * gnu/packages/xml.scm (perl-xml-feed): Update to 0.55. --- gnu/packages/xml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index e14524a684..489541b4f5 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -770,14 +770,14 @@ server, collect the answer, and finally decoding the XML to Perl.") (define-public perl-xml-feed (package (name "perl-xml-feed") - (version "0.54") + (version "0.55") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/D/DA/DAVECROSS/" "XML-Feed-" version ".tar.gz")) (sha256 (base32 - "0ydyi7wdhv8325h7j27vrlwiqxll56sn8zy5nbzhpma3nrf61bci")))) + "0am345qzy5rxxnzh13l6p18a7drgkzmmlkgrgl4cv3b2j1pwls3i")))) (build-system perl-build-system) (arguments `(#:tests? #f)) ; tests require internet connection -- cgit v1.2.3 From 9cac043cc02670fbec6964cc8f858c4b1e43dbfa Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 15 Oct 2018 03:42:42 +0200 Subject: gnu: restic: Update to 0.9.3. * gnu/packages/backup.scm (restic): Update to 0.9.3. [arguments]: Disable 'restic self-update'. --- gnu/packages/backup.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 408b64b48d..52afcbc676 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -862,7 +862,7 @@ is like a time machine for your data. ") (define-public restic (package (name "restic") - (version "0.9.2") + (version "0.9.3") ;; TODO Try packaging the bundled / vendored dependencies in the 'vendor/' ;; directory. (source (origin @@ -873,7 +873,7 @@ is like a time machine for your data. ") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "15bwkydxcg4xhrnqxvxji8wacrsndb1a6frj98wggfaijqzfx3lg")))) + "1l1ddnf61pfsrry97qwhhdzywin2mgnbrkhcc9pabsdfk602anmr")))) (build-system go-build-system) (arguments `(#:import-path "github.com/restic/restic" @@ -887,6 +887,8 @@ is like a time machine for your data. ") (with-directory-excursion (string-append "src/github.com/restic/restic-" ,version) + ;; Disable 'restic self-update'. It makes little sense in Guix. + (substitute* "build.go" (("selfupdate") "")) (invoke "go" "run" "build.go")))) (replace 'check -- cgit v1.2.3 From 4702d45280425f69f70cfb891ccacaf94cbd2790 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 14 Oct 2018 22:02:50 +0200 Subject: gnu: opensm: Update to 3.3.21. * gnu/packages/fabric-management.scm (opensm): Update to 3.3.21. [source]: Update tarball URI. [native-inputs]: Add autoconf, automake, and libtool. [arguments]: Rename 'doc' phase to 'install-doc'. Omit AUTHORS and ChangeLog files. They are more than a decade old. --- gnu/packages/fabric-management.scm | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/fabric-management.scm b/gnu/packages/fabric-management.scm index 76ef9eef2e..ff6ad898b1 100644 --- a/gnu/packages/fabric-management.scm +++ b/gnu/packages/fabric-management.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Dave Love +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,33 +42,38 @@ (define-public opensm (package (name "opensm") - (version "3.3.20") + (version "3.3.21") (source (origin (method url-fetch) (uri - (string-append "https://www.openfabrics.org/downloads/management/opensm-" - version ".tar.gz")) - (sha256 (base32 "162sg1w7kgy8ayl8a4dcbrfacmnfy2lr9a2yjyq0k65rmd378zg1")))) + (string-append "https://github.com/linux-rdma/opensm/releases/download/" + version "/opensm-" version ".tar.gz")) + (sha256 + (base32 "0j4vp118w1l47vs4had46ynybklyacxjlya0r15jg0y01l4j9l2h")))) (build-system gnu-build-system) (native-inputs - `(("flex" ,flex) - ("bison" ,bison))) + `(("bison" ,bison) + ("flex" ,flex) + + ;; The 3.3.21 'release' tarball isn't properly bootstrapped. + ("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) (inputs `(("rdma-core" ,rdma-core))) (arguments `(#:configure-flags '("--disable-static") #:phases (modify-phases %standard-phases - (add-after 'install 'doc + (add-after 'install 'install-doc (lambda* (#:key outputs #:allow-other-keys) (let* ((base (assoc-ref outputs "out")) (doc (string-append base "/share/doc/" ,name "-" ,version))) (for-each (lambda (file) (install-file file doc)) - (append (list "AUTHORS" "COPYING" "ChangeLog") - (find-files "doc"))) + (find-files "doc")) #t)))))) (home-page "https://www.openfabrics.org/") (synopsis "OpenIB InfiniBand Subnet Manager and management utilities") -- cgit v1.2.3 From dfe05297f3922a0403a9d788bc4d87502e148d87 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 15 Oct 2018 06:04:49 +0200 Subject: gnu: x265: Update to 2.9. * gnu/packages/video.scm (x265): Update to 2.9. [source]: Remove x265-fix-ppc64le-build.patch. * gnu/packages/patches/x265-fix-ppc64le-build.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/patches/x265-fix-ppc64le-build.patch | 25 ----------------------- gnu/packages/video.scm | 7 +++---- 3 files changed, 3 insertions(+), 30 deletions(-) delete mode 100644 gnu/packages/patches/x265-fix-ppc64le-build.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index af3773c893..4c0485c04f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1228,7 +1228,6 @@ dist_patch_DATA = \ %D%/packages/patches/wpa-supplicant-krack-followups.patch \ %D%/packages/patches/wxmaxima-do-not-use-old-gnuplot-parameters.patch \ %D%/packages/patches/x265-arm-asm-primitives.patch \ - %D%/packages/patches/x265-fix-ppc64le-build.patch \ %D%/packages/patches/xapian-revert-5489fb2f8.patch \ %D%/packages/patches/xboing-CVE-2004-0149.patch \ %D%/packages/patches/xf86-video-ark-remove-mibstore.patch \ diff --git a/gnu/packages/patches/x265-fix-ppc64le-build.patch b/gnu/packages/patches/x265-fix-ppc64le-build.patch deleted file mode 100644 index f71d2436ab..0000000000 --- a/gnu/packages/patches/x265-fix-ppc64le-build.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://sources.debian.org/data/main/x/x265/2.8-3/debian/patches/0003-Fix-build-error-on-on-ppc64le.patch - -This patch also fixes building on armhf-linux and aarch64-linux - -From: Jayashree -Date: Fri, 25 May 2018 10:26:05 +0530 -Subject: Fix build error on on ppc64le - ---- - source/common/param.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/source/common/param.cpp b/source/common/param.cpp -index 31bcbc7..4a6d0c8 100644 ---- a/source/common/param.cpp -+++ b/source/common/param.cpp -@@ -633,7 +633,7 @@ int x265_param_parse(x265_param* p, const char* name, const char* value) - if (bValueWasNull) - p->cpuid = atobool(value); - else -- p->cpuid = parseCpuName(value, bError); -+ p->cpuid = parseCpuName(value, bError, false); - #endif - } - OPT("fps") diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 3e191ef6da..e281bf8fff 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -392,7 +392,7 @@ and creating Matroska files from other media files (@code{mkvmerge}).") (define-public x265 (package (name "x265") - (version "2.8") + (version "2.9") (source (origin (method url-fetch) @@ -400,9 +400,8 @@ and creating Matroska files from other media files (@code{mkvmerge}).") "x265_" version ".tar.gz")) (sha256 (base32 - "0qx8mavwdzdpkkby7n29i9av7zsnklavacwfz537mf62q2pzjnbf")) - (patches (search-patches "x265-fix-ppc64le-build.patch" - "x265-arm-asm-primitives.patch")) + "090hp4216isis8q5gb7bwzia8rfyzni54z21jnwm97x3hiy6ibpb")) + (patches (search-patches "x265-arm-asm-primitives.patch")) (modules '((guix build utils))) (snippet '(begin (delete-file-recursively "source/compat/getopt") -- cgit v1.2.3 From 4a147986a0839103a9c5bf1b5b74047c7d398349 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 11 Oct 2018 00:19:13 +0200 Subject: gnu: haveged: Teach the controversy. * gnu/packages/linux.scm (haveged)[description]: Suggest adding additional entropy sources. --- gnu/packages/linux.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7aaa7fb644..79a1b0b46a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3760,7 +3760,11 @@ systems with high needs or limited user interaction, such as headless servers. indirect effects of hardware events on hidden processor state using the HArdware Volatile Entropy Gathering and Expansion (@dfn{HAVEGE}) algorithm. It tunes itself to its environment and provides the same built-in test suite for the -output stream as used on certified hardware security devices.") +output stream as used on certified hardware security devices. + +The quality of the randomness produced by this algorithm has not been proven. +It is recommended to run it together with another entropy source like rngd, and +not as a replacement for it.") (license (list (license:non-copyleft "file://nist/mconf.h") (license:non-copyleft "file://nist/packtest.c") license:public-domain ; nist/dfft.c -- cgit v1.2.3 From e02013b7de5c9f30d6b451dcc1c00769992dc3a8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Oct 2018 23:58:03 +0200 Subject: gnu: hexchat: Use HTTPS home page. * gnu/packages/messaging.scm (hexchat)[home-page]: Use HTTPS. --- gnu/packages/messaging.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index d2b61b9ec5..d50732dfc4 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -295,7 +295,7 @@ window shows the list of currently connected networks and their channels, the current conversation and the list of users. It uses colors to differentiate between users and to highlight messages. It checks spelling using available dictionaries. HexChat can be extended with multiple addons.") - (home-page "http://hexchat.net/") + (home-page "https://hexchat.net/") (license license:gpl2+))) (define-public ngircd -- cgit v1.2.3 From 2d5fa80e83190b6bdbeb8a45e68a885b283e2490 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Oct 2018 22:32:14 +0200 Subject: gnu: audacity: Update home page. * gnu/packages/audio.scm (audacity)[home-page]: Update. --- gnu/packages/audio.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 6197f549dd..69b5d01d6f 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -418,7 +418,7 @@ engineers, musicians, soundtrack editors and composers.") ;; and fails with various errors. See ;; . #:tests? #f)) - (home-page "http://audacity.sourceforge.net/") + (home-page "https://www.audacityteam.org/") (synopsis "Software for recording and editing sounds") (description "Audacity is a multi-track audio editor designed for recording, playing -- cgit v1.2.3 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: 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(+) (limited to 'gnu') 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) -- cgit v1.2.3 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: 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(-) (limited to 'gnu') 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") -- cgit v1.2.3 From b7028a16e6fe4f9634cd7d550b3a79450fc4e0db Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 15 Oct 2018 11:33:51 +0300 Subject: gnu: x265: Fix building on armhf-linux and aarch64-linux. * gnu/packages/video.scm (x265)[source]: Update list of patches. [arguments]: Change configure flag to ensure PIC for all architectures. * gnu/packages/patches/x265-arm-asm-primitives.patch: Remove file. * gnu/packages/patches/x265-detect512-all-arches.patch: New file. * gnu/local.mk (dist_patch_DATA): Update patch registry. --- gnu/local.mk | 2 +- gnu/packages/patches/x265-arm-asm-primitives.patch | 360 --------------------- .../patches/x265-detect512-all-arches.patch | 37 +++ gnu/packages/video.scm | 10 +- 4 files changed, 41 insertions(+), 368 deletions(-) delete mode 100644 gnu/packages/patches/x265-arm-asm-primitives.patch create mode 100644 gnu/packages/patches/x265-detect512-all-arches.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 4c0485c04f..1fa2eaba31 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1227,7 +1227,7 @@ dist_patch_DATA = \ %D%/packages/patches/wpa-supplicant-fix-nonce-reuse.patch \ %D%/packages/patches/wpa-supplicant-krack-followups.patch \ %D%/packages/patches/wxmaxima-do-not-use-old-gnuplot-parameters.patch \ - %D%/packages/patches/x265-arm-asm-primitives.patch \ + %D%/packages/patches/x265-detect512-all-arches.patch \ %D%/packages/patches/xapian-revert-5489fb2f8.patch \ %D%/packages/patches/xboing-CVE-2004-0149.patch \ %D%/packages/patches/xf86-video-ark-remove-mibstore.patch \ diff --git a/gnu/packages/patches/x265-arm-asm-primitives.patch b/gnu/packages/patches/x265-arm-asm-primitives.patch deleted file mode 100644 index f49aafe577..0000000000 --- a/gnu/packages/patches/x265-arm-asm-primitives.patch +++ /dev/null @@ -1,360 +0,0 @@ -From . -This fixes build errors like: - - cd /tmp/guix-build-x265-2.8.drv-0/x265_2.8/build/encoder && /gnu/store/cd5q2pni1d95fs3cdabbclyh9hqhw2nq-gcc-5.5.0/bin/c++ -DEXPORT_C_API=1 -DHAVE_ARMV6=1 -DHAVE_INT_TYPES_H=1 -DHAVE_NEON -DHIGH_BIT_DEPTH=0 -DX265_ARCH_ARM=1 -DX265_DEPTH=8 -DX265_NS=x265 -D__STDC_LIMIT_MACROS=1 -I/tmp/guix-build-x265-2.8.drv-0/x265_2.8/source/. -I/tmp/guix-build-x265-2.8.drv-0/x265_2.8/source/common -I/tmp/guix-build-x265-2.8.drv-0/x265_2.8/source/encoder -I/tmp/guix-build-x265-2.8.drv-0/x265_2.8/build -O2 -g -DNDEBUG -Wall -Wextra -Wshadow -std=gnu++98 -fPIC -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC -Wno-array-bounds -ffast-math -fno-exceptions -Wno-uninitialized -o CMakeFiles/encoder.dir/search.cpp.o -c /tmp/guix-build-x265-2.8.drv-0/x265_2.8/source/encoder/search.cpp - /tmp/guix-build-x265-2.8.drv-0/x265_2.8/source/common/arm/asm-primitives.cpp:437:38: error: incompatible types in assignment of ?void(const pixel*, intptr_t, int16_t*, intptr_t) {aka void(const unsigned char*, int, short int*, int)}? to ?void (* [2])(const pixel*, intptr_t, int16_t*, intptr_t) {aka void (* [2])(const unsigned char*, int, short int*, int)}? - p.pu[LUMA_64x48].convert_p2s = PFX(filterPixelToShort_64x48_neon); - ^ - -Downloaded from upstream bug report: -https://bitbucket.org/multicoreware/x265/issues/406 - -Signed-off-by: Bernd Kuhls - ---- ./source/common/arm/asm-primitives.cpp.orig 2018-05-21 02:33:10.000000000 -0600 -+++ ./source/common/arm/asm-primitives.cpp 2018-05-28 20:38:37.302378303 -0600 -@@ -48,77 +48,77 @@ void setupAssemblyPrimitives(EncoderPrim - p.ssim_4x4x2_core = PFX(ssim_4x4x2_core_neon); - - // addAvg -- p.pu[LUMA_4x4].addAvg = PFX(addAvg_4x4_neon); -- p.pu[LUMA_4x8].addAvg = PFX(addAvg_4x8_neon); -- p.pu[LUMA_4x16].addAvg = PFX(addAvg_4x16_neon); -- p.pu[LUMA_8x4].addAvg = PFX(addAvg_8x4_neon); -- p.pu[LUMA_8x8].addAvg = PFX(addAvg_8x8_neon); -- p.pu[LUMA_8x16].addAvg = PFX(addAvg_8x16_neon); -- p.pu[LUMA_8x32].addAvg = PFX(addAvg_8x32_neon); -- p.pu[LUMA_12x16].addAvg = PFX(addAvg_12x16_neon); -- p.pu[LUMA_16x4].addAvg = PFX(addAvg_16x4_neon); -- p.pu[LUMA_16x8].addAvg = PFX(addAvg_16x8_neon); -- p.pu[LUMA_16x12].addAvg = PFX(addAvg_16x12_neon); -- p.pu[LUMA_16x16].addAvg = PFX(addAvg_16x16_neon); -- p.pu[LUMA_16x32].addAvg = PFX(addAvg_16x32_neon); -- p.pu[LUMA_16x64].addAvg = PFX(addAvg_16x64_neon); -- p.pu[LUMA_24x32].addAvg = PFX(addAvg_24x32_neon); -- p.pu[LUMA_32x8].addAvg = PFX(addAvg_32x8_neon); -- p.pu[LUMA_32x16].addAvg = PFX(addAvg_32x16_neon); -- p.pu[LUMA_32x24].addAvg = PFX(addAvg_32x24_neon); -- p.pu[LUMA_32x32].addAvg = PFX(addAvg_32x32_neon); -- p.pu[LUMA_32x64].addAvg = PFX(addAvg_32x64_neon); -- p.pu[LUMA_48x64].addAvg = PFX(addAvg_48x64_neon); -- p.pu[LUMA_64x16].addAvg = PFX(addAvg_64x16_neon); -- p.pu[LUMA_64x32].addAvg = PFX(addAvg_64x32_neon); -- p.pu[LUMA_64x48].addAvg = PFX(addAvg_64x48_neon); -- p.pu[LUMA_64x64].addAvg = PFX(addAvg_64x64_neon); -+ p.pu[LUMA_4x4].addAvg[ALIGNED] = PFX(addAvg_4x4_neon); -+ p.pu[LUMA_4x8].addAvg[ALIGNED] = PFX(addAvg_4x8_neon); -+ p.pu[LUMA_4x16].addAvg[ALIGNED] = PFX(addAvg_4x16_neon); -+ p.pu[LUMA_8x4].addAvg[ALIGNED] = PFX(addAvg_8x4_neon); -+ p.pu[LUMA_8x8].addAvg[ALIGNED] = PFX(addAvg_8x8_neon); -+ p.pu[LUMA_8x16].addAvg[ALIGNED] = PFX(addAvg_8x16_neon); -+ p.pu[LUMA_8x32].addAvg[ALIGNED] = PFX(addAvg_8x32_neon); -+ p.pu[LUMA_12x16].addAvg[ALIGNED] = PFX(addAvg_12x16_neon); -+ p.pu[LUMA_16x4].addAvg[ALIGNED] = PFX(addAvg_16x4_neon); -+ p.pu[LUMA_16x8].addAvg[ALIGNED] = PFX(addAvg_16x8_neon); -+ p.pu[LUMA_16x12].addAvg[ALIGNED] = PFX(addAvg_16x12_neon); -+ p.pu[LUMA_16x16].addAvg[ALIGNED] = PFX(addAvg_16x16_neon); -+ p.pu[LUMA_16x32].addAvg[ALIGNED] = PFX(addAvg_16x32_neon); -+ p.pu[LUMA_16x64].addAvg[ALIGNED] = PFX(addAvg_16x64_neon); -+ p.pu[LUMA_24x32].addAvg[ALIGNED] = PFX(addAvg_24x32_neon); -+ p.pu[LUMA_32x8].addAvg[ALIGNED] = PFX(addAvg_32x8_neon); -+ p.pu[LUMA_32x16].addAvg[ALIGNED] = PFX(addAvg_32x16_neon); -+ p.pu[LUMA_32x24].addAvg[ALIGNED] = PFX(addAvg_32x24_neon); -+ p.pu[LUMA_32x32].addAvg[ALIGNED] = PFX(addAvg_32x32_neon); -+ p.pu[LUMA_32x64].addAvg[ALIGNED] = PFX(addAvg_32x64_neon); -+ p.pu[LUMA_48x64].addAvg[ALIGNED] = PFX(addAvg_48x64_neon); -+ p.pu[LUMA_64x16].addAvg[ALIGNED] = PFX(addAvg_64x16_neon); -+ p.pu[LUMA_64x32].addAvg[ALIGNED] = PFX(addAvg_64x32_neon); -+ p.pu[LUMA_64x48].addAvg[ALIGNED] = PFX(addAvg_64x48_neon); -+ p.pu[LUMA_64x64].addAvg[ALIGNED] = PFX(addAvg_64x64_neon); - - // chroma addAvg -- p.chroma[X265_CSP_I420].pu[CHROMA_420_4x2].addAvg = PFX(addAvg_4x2_neon); -- p.chroma[X265_CSP_I420].pu[CHROMA_420_4x4].addAvg = PFX(addAvg_4x4_neon); -- p.chroma[X265_CSP_I420].pu[CHROMA_420_4x8].addAvg = PFX(addAvg_4x8_neon); -- p.chroma[X265_CSP_I420].pu[CHROMA_420_4x16].addAvg = PFX(addAvg_4x16_neon); -- p.chroma[X265_CSP_I420].pu[CHROMA_420_6x8].addAvg = PFX(addAvg_6x8_neon); -- p.chroma[X265_CSP_I420].pu[CHROMA_420_8x2].addAvg = PFX(addAvg_8x2_neon); -- p.chroma[X265_CSP_I420].pu[CHROMA_420_8x4].addAvg = PFX(addAvg_8x4_neon); -- p.chroma[X265_CSP_I420].pu[CHROMA_420_8x6].addAvg = PFX(addAvg_8x6_neon); -- p.chroma[X265_CSP_I420].pu[CHROMA_420_8x8].addAvg = PFX(addAvg_8x8_neon); -- p.chroma[X265_CSP_I420].pu[CHROMA_420_8x16].addAvg = PFX(addAvg_8x16_neon); -- p.chroma[X265_CSP_I420].pu[CHROMA_420_8x32].addAvg = PFX(addAvg_8x32_neon); -- p.chroma[X265_CSP_I420].pu[CHROMA_420_12x16].addAvg = PFX(addAvg_12x16_neon); -- p.chroma[X265_CSP_I420].pu[CHROMA_420_16x4].addAvg = PFX(addAvg_16x4_neon); -- p.chroma[X265_CSP_I420].pu[CHROMA_420_16x8].addAvg = PFX(addAvg_16x8_neon); -- p.chroma[X265_CSP_I420].pu[CHROMA_420_16x12].addAvg = PFX(addAvg_16x12_neon); -- p.chroma[X265_CSP_I420].pu[CHROMA_420_16x16].addAvg = PFX(addAvg_16x16_neon); -- p.chroma[X265_CSP_I420].pu[CHROMA_420_16x32].addAvg = PFX(addAvg_16x32_neon); -- p.chroma[X265_CSP_I420].pu[CHROMA_420_24x32].addAvg = PFX(addAvg_24x32_neon); -- p.chroma[X265_CSP_I420].pu[CHROMA_420_32x8].addAvg = PFX(addAvg_32x8_neon); -- p.chroma[X265_CSP_I420].pu[CHROMA_420_32x16].addAvg = PFX(addAvg_32x16_neon); -- p.chroma[X265_CSP_I420].pu[CHROMA_420_32x24].addAvg = PFX(addAvg_32x24_neon); -- p.chroma[X265_CSP_I420].pu[CHROMA_420_32x32].addAvg = PFX(addAvg_32x32_neon); -- -- p.chroma[X265_CSP_I422].pu[CHROMA_422_4x8].addAvg = PFX(addAvg_4x8_neon); -- p.chroma[X265_CSP_I422].pu[CHROMA_422_4x16].addAvg = PFX(addAvg_4x16_neon); -- p.chroma[X265_CSP_I422].pu[CHROMA_422_4x32].addAvg = PFX(addAvg_4x32_neon); -- p.chroma[X265_CSP_I422].pu[CHROMA_422_6x16].addAvg = PFX(addAvg_6x16_neon); -- p.chroma[X265_CSP_I422].pu[CHROMA_422_8x4].addAvg = PFX(addAvg_8x4_neon); -- p.chroma[X265_CSP_I422].pu[CHROMA_422_8x8].addAvg = PFX(addAvg_8x8_neon); -- p.chroma[X265_CSP_I422].pu[CHROMA_422_8x12].addAvg = PFX(addAvg_8x12_neon); -- p.chroma[X265_CSP_I422].pu[CHROMA_422_8x16].addAvg = PFX(addAvg_8x16_neon); -- p.chroma[X265_CSP_I422].pu[CHROMA_422_8x32].addAvg = PFX(addAvg_8x32_neon); -- p.chroma[X265_CSP_I422].pu[CHROMA_422_8x64].addAvg = PFX(addAvg_8x64_neon); -- p.chroma[X265_CSP_I422].pu[CHROMA_422_12x32].addAvg = PFX(addAvg_12x32_neon); -- p.chroma[X265_CSP_I422].pu[CHROMA_422_16x8].addAvg = PFX(addAvg_16x8_neon); -- p.chroma[X265_CSP_I422].pu[CHROMA_422_16x16].addAvg = PFX(addAvg_16x16_neon); -- p.chroma[X265_CSP_I422].pu[CHROMA_422_16x24].addAvg = PFX(addAvg_16x24_neon); -- p.chroma[X265_CSP_I422].pu[CHROMA_422_16x32].addAvg = PFX(addAvg_16x32_neon); -- p.chroma[X265_CSP_I422].pu[CHROMA_422_16x64].addAvg = PFX(addAvg_16x64_neon); -- p.chroma[X265_CSP_I422].pu[CHROMA_422_24x64].addAvg = PFX(addAvg_24x64_neon); -- p.chroma[X265_CSP_I422].pu[CHROMA_422_32x16].addAvg = PFX(addAvg_32x16_neon); -- p.chroma[X265_CSP_I422].pu[CHROMA_422_32x32].addAvg = PFX(addAvg_32x32_neon); -- p.chroma[X265_CSP_I422].pu[CHROMA_422_32x48].addAvg = PFX(addAvg_32x48_neon); -- p.chroma[X265_CSP_I422].pu[CHROMA_422_32x64].addAvg = PFX(addAvg_32x64_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_4x2].addAvg[ALIGNED] = PFX(addAvg_4x2_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_4x4].addAvg[ALIGNED] = PFX(addAvg_4x4_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_4x8].addAvg[ALIGNED] = PFX(addAvg_4x8_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_4x16].addAvg[ALIGNED] = PFX(addAvg_4x16_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_6x8].addAvg[ALIGNED] = PFX(addAvg_6x8_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_8x2].addAvg[ALIGNED] = PFX(addAvg_8x2_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_8x4].addAvg[ALIGNED] = PFX(addAvg_8x4_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_8x6].addAvg[ALIGNED] = PFX(addAvg_8x6_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_8x8].addAvg[ALIGNED] = PFX(addAvg_8x8_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_8x16].addAvg[ALIGNED] = PFX(addAvg_8x16_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_8x32].addAvg[ALIGNED] = PFX(addAvg_8x32_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_12x16].addAvg[ALIGNED] = PFX(addAvg_12x16_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_16x4].addAvg[ALIGNED] = PFX(addAvg_16x4_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_16x8].addAvg[ALIGNED] = PFX(addAvg_16x8_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_16x12].addAvg[ALIGNED] = PFX(addAvg_16x12_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_16x16].addAvg[ALIGNED] = PFX(addAvg_16x16_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_16x32].addAvg[ALIGNED] = PFX(addAvg_16x32_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_24x32].addAvg[ALIGNED] = PFX(addAvg_24x32_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_32x8].addAvg[ALIGNED] = PFX(addAvg_32x8_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_32x16].addAvg[ALIGNED] = PFX(addAvg_32x16_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_32x24].addAvg[ALIGNED] = PFX(addAvg_32x24_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_32x32].addAvg[ALIGNED] = PFX(addAvg_32x32_neon); -+ -+ p.chroma[X265_CSP_I422].pu[CHROMA_422_4x8].addAvg[ALIGNED] = PFX(addAvg_4x8_neon); -+ p.chroma[X265_CSP_I422].pu[CHROMA_422_4x16].addAvg[ALIGNED] = PFX(addAvg_4x16_neon); -+ p.chroma[X265_CSP_I422].pu[CHROMA_422_4x32].addAvg[ALIGNED] = PFX(addAvg_4x32_neon); -+ p.chroma[X265_CSP_I422].pu[CHROMA_422_6x16].addAvg[ALIGNED] = PFX(addAvg_6x16_neon); -+ p.chroma[X265_CSP_I422].pu[CHROMA_422_8x4].addAvg[ALIGNED] = PFX(addAvg_8x4_neon); -+ p.chroma[X265_CSP_I422].pu[CHROMA_422_8x8].addAvg[ALIGNED] = PFX(addAvg_8x8_neon); -+ p.chroma[X265_CSP_I422].pu[CHROMA_422_8x12].addAvg[ALIGNED] = PFX(addAvg_8x12_neon); -+ p.chroma[X265_CSP_I422].pu[CHROMA_422_8x16].addAvg[ALIGNED] = PFX(addAvg_8x16_neon); -+ p.chroma[X265_CSP_I422].pu[CHROMA_422_8x32].addAvg[ALIGNED] = PFX(addAvg_8x32_neon); -+ p.chroma[X265_CSP_I422].pu[CHROMA_422_8x64].addAvg[ALIGNED] = PFX(addAvg_8x64_neon); -+ p.chroma[X265_CSP_I422].pu[CHROMA_422_12x32].addAvg[ALIGNED] = PFX(addAvg_12x32_neon); -+ p.chroma[X265_CSP_I422].pu[CHROMA_422_16x8].addAvg[ALIGNED] = PFX(addAvg_16x8_neon); -+ p.chroma[X265_CSP_I422].pu[CHROMA_422_16x16].addAvg[ALIGNED] = PFX(addAvg_16x16_neon); -+ p.chroma[X265_CSP_I422].pu[CHROMA_422_16x24].addAvg[ALIGNED] = PFX(addAvg_16x24_neon); -+ p.chroma[X265_CSP_I422].pu[CHROMA_422_16x32].addAvg[ALIGNED] = PFX(addAvg_16x32_neon); -+ p.chroma[X265_CSP_I422].pu[CHROMA_422_16x64].addAvg[ALIGNED] = PFX(addAvg_16x64_neon); -+ p.chroma[X265_CSP_I422].pu[CHROMA_422_24x64].addAvg[ALIGNED] = PFX(addAvg_24x64_neon); -+ p.chroma[X265_CSP_I422].pu[CHROMA_422_32x16].addAvg[ALIGNED] = PFX(addAvg_32x16_neon); -+ p.chroma[X265_CSP_I422].pu[CHROMA_422_32x32].addAvg[ALIGNED] = PFX(addAvg_32x32_neon); -+ p.chroma[X265_CSP_I422].pu[CHROMA_422_32x48].addAvg[ALIGNED] = PFX(addAvg_32x48_neon); -+ p.chroma[X265_CSP_I422].pu[CHROMA_422_32x64].addAvg[ALIGNED] = PFX(addAvg_32x64_neon); - - // quant - p.quant = PFX(quant_neon); -@@ -402,7 +402,7 @@ void setupAssemblyPrimitives(EncoderPrim - p.scale2D_64to32 = PFX(scale2D_64to32_neon); - - // scale1D_128to64 -- p.scale1D_128to64 = PFX(scale1D_128to64_neon); -+ p.scale1D_128to64[ALIGNED] = PFX(scale1D_128to64_neon); - - // copy_count - p.cu[BLOCK_4x4].copy_cnt = PFX(copy_cnt_4_neon); -@@ -411,37 +411,37 @@ void setupAssemblyPrimitives(EncoderPrim - p.cu[BLOCK_32x32].copy_cnt = PFX(copy_cnt_32_neon); - - // filterPixelToShort -- p.pu[LUMA_4x4].convert_p2s = PFX(filterPixelToShort_4x4_neon); -- p.pu[LUMA_4x8].convert_p2s = PFX(filterPixelToShort_4x8_neon); -- p.pu[LUMA_4x16].convert_p2s = PFX(filterPixelToShort_4x16_neon); -- p.pu[LUMA_8x4].convert_p2s = PFX(filterPixelToShort_8x4_neon); -- p.pu[LUMA_8x8].convert_p2s = PFX(filterPixelToShort_8x8_neon); -- p.pu[LUMA_8x16].convert_p2s = PFX(filterPixelToShort_8x16_neon); -- p.pu[LUMA_8x32].convert_p2s = PFX(filterPixelToShort_8x32_neon); -- p.pu[LUMA_12x16].convert_p2s = PFX(filterPixelToShort_12x16_neon); -- p.pu[LUMA_16x4].convert_p2s = PFX(filterPixelToShort_16x4_neon); -- p.pu[LUMA_16x8].convert_p2s = PFX(filterPixelToShort_16x8_neon); -- p.pu[LUMA_16x12].convert_p2s = PFX(filterPixelToShort_16x12_neon); -- p.pu[LUMA_16x16].convert_p2s = PFX(filterPixelToShort_16x16_neon); -- p.pu[LUMA_16x32].convert_p2s = PFX(filterPixelToShort_16x32_neon); -- p.pu[LUMA_16x64].convert_p2s = PFX(filterPixelToShort_16x64_neon); -- p.pu[LUMA_24x32].convert_p2s = PFX(filterPixelToShort_24x32_neon); -- p.pu[LUMA_32x8].convert_p2s = PFX(filterPixelToShort_32x8_neon); -- p.pu[LUMA_32x16].convert_p2s = PFX(filterPixelToShort_32x16_neon); -- p.pu[LUMA_32x24].convert_p2s = PFX(filterPixelToShort_32x24_neon); -- p.pu[LUMA_32x32].convert_p2s = PFX(filterPixelToShort_32x32_neon); -- p.pu[LUMA_32x64].convert_p2s = PFX(filterPixelToShort_32x64_neon); -- p.pu[LUMA_48x64].convert_p2s = PFX(filterPixelToShort_48x64_neon); -- p.pu[LUMA_64x16].convert_p2s = PFX(filterPixelToShort_64x16_neon); -- p.pu[LUMA_64x32].convert_p2s = PFX(filterPixelToShort_64x32_neon); -- p.pu[LUMA_64x48].convert_p2s = PFX(filterPixelToShort_64x48_neon); -- p.pu[LUMA_64x64].convert_p2s = PFX(filterPixelToShort_64x64_neon); -+ p.pu[LUMA_4x4].convert_p2s[ALIGNED] = PFX(filterPixelToShort_4x4_neon); -+ p.pu[LUMA_4x8].convert_p2s[ALIGNED] = PFX(filterPixelToShort_4x8_neon); -+ p.pu[LUMA_4x16].convert_p2s[ALIGNED] = PFX(filterPixelToShort_4x16_neon); -+ p.pu[LUMA_8x4].convert_p2s[ALIGNED] = PFX(filterPixelToShort_8x4_neon); -+ p.pu[LUMA_8x8].convert_p2s[ALIGNED] = PFX(filterPixelToShort_8x8_neon); -+ p.pu[LUMA_8x16].convert_p2s[ALIGNED] = PFX(filterPixelToShort_8x16_neon); -+ p.pu[LUMA_8x32].convert_p2s[ALIGNED] = PFX(filterPixelToShort_8x32_neon); -+ p.pu[LUMA_12x16].convert_p2s[ALIGNED] = PFX(filterPixelToShort_12x16_neon); -+ p.pu[LUMA_16x4].convert_p2s[ALIGNED] = PFX(filterPixelToShort_16x4_neon); -+ p.pu[LUMA_16x8].convert_p2s[ALIGNED] = PFX(filterPixelToShort_16x8_neon); -+ p.pu[LUMA_16x12].convert_p2s[ALIGNED] = PFX(filterPixelToShort_16x12_neon); -+ p.pu[LUMA_16x16].convert_p2s[ALIGNED] = PFX(filterPixelToShort_16x16_neon); -+ p.pu[LUMA_16x32].convert_p2s[ALIGNED] = PFX(filterPixelToShort_16x32_neon); -+ p.pu[LUMA_16x64].convert_p2s[ALIGNED] = PFX(filterPixelToShort_16x64_neon); -+ p.pu[LUMA_24x32].convert_p2s[ALIGNED] = PFX(filterPixelToShort_24x32_neon); -+ p.pu[LUMA_32x8].convert_p2s[ALIGNED] = PFX(filterPixelToShort_32x8_neon); -+ p.pu[LUMA_32x16].convert_p2s[ALIGNED] = PFX(filterPixelToShort_32x16_neon); -+ p.pu[LUMA_32x24].convert_p2s[ALIGNED] = PFX(filterPixelToShort_32x24_neon); -+ p.pu[LUMA_32x32].convert_p2s[ALIGNED] = PFX(filterPixelToShort_32x32_neon); -+ p.pu[LUMA_32x64].convert_p2s[ALIGNED] = PFX(filterPixelToShort_32x64_neon); -+ p.pu[LUMA_48x64].convert_p2s[ALIGNED] = PFX(filterPixelToShort_48x64_neon); -+ p.pu[LUMA_64x16].convert_p2s[ALIGNED] = PFX(filterPixelToShort_64x16_neon); -+ p.pu[LUMA_64x32].convert_p2s[ALIGNED] = PFX(filterPixelToShort_64x32_neon); -+ p.pu[LUMA_64x48].convert_p2s[ALIGNED] = PFX(filterPixelToShort_64x48_neon); -+ p.pu[LUMA_64x64].convert_p2s[ALIGNED] = PFX(filterPixelToShort_64x64_neon); - - // Block_fill -- p.cu[BLOCK_4x4].blockfill_s = PFX(blockfill_s_4x4_neon); -- p.cu[BLOCK_8x8].blockfill_s = PFX(blockfill_s_8x8_neon); -- p.cu[BLOCK_16x16].blockfill_s = PFX(blockfill_s_16x16_neon); -- p.cu[BLOCK_32x32].blockfill_s = PFX(blockfill_s_32x32_neon); -+ p.cu[BLOCK_4x4].blockfill_s[ALIGNED] = PFX(blockfill_s_4x4_neon); -+ p.cu[BLOCK_8x8].blockfill_s[ALIGNED] = PFX(blockfill_s_8x8_neon); -+ p.cu[BLOCK_16x16].blockfill_s[ALIGNED] = PFX(blockfill_s_16x16_neon); -+ p.cu[BLOCK_32x32].blockfill_s[ALIGNED] = PFX(blockfill_s_32x32_neon); - - // Blockcopy_ss - p.cu[BLOCK_4x4].copy_ss = PFX(blockcopy_ss_4x4_neon); -@@ -495,21 +495,21 @@ void setupAssemblyPrimitives(EncoderPrim - p.chroma[X265_CSP_I422].cu[BLOCK_422_32x64].copy_sp = PFX(blockcopy_sp_32x64_neon); - - // pixel_add_ps -- p.cu[BLOCK_4x4].add_ps = PFX(pixel_add_ps_4x4_neon); -- p.cu[BLOCK_8x8].add_ps = PFX(pixel_add_ps_8x8_neon); -- p.cu[BLOCK_16x16].add_ps = PFX(pixel_add_ps_16x16_neon); -- p.cu[BLOCK_32x32].add_ps = PFX(pixel_add_ps_32x32_neon); -- p.cu[BLOCK_64x64].add_ps = PFX(pixel_add_ps_64x64_neon); -+ p.cu[BLOCK_4x4].add_ps[ALIGNED] = PFX(pixel_add_ps_4x4_neon); -+ p.cu[BLOCK_8x8].add_ps[ALIGNED] = PFX(pixel_add_ps_8x8_neon); -+ p.cu[BLOCK_16x16].add_ps[ALIGNED] = PFX(pixel_add_ps_16x16_neon); -+ p.cu[BLOCK_32x32].add_ps[ALIGNED] = PFX(pixel_add_ps_32x32_neon); -+ p.cu[BLOCK_64x64].add_ps[ALIGNED] = PFX(pixel_add_ps_64x64_neon); - - // chroma add_ps -- p.chroma[X265_CSP_I420].cu[BLOCK_420_4x4].add_ps = PFX(pixel_add_ps_4x4_neon); -- p.chroma[X265_CSP_I420].cu[BLOCK_420_8x8].add_ps = PFX(pixel_add_ps_8x8_neon); -- p.chroma[X265_CSP_I420].cu[BLOCK_420_16x16].add_ps = PFX(pixel_add_ps_16x16_neon); -- p.chroma[X265_CSP_I420].cu[BLOCK_420_32x32].add_ps = PFX(pixel_add_ps_32x32_neon); -- p.chroma[X265_CSP_I422].cu[BLOCK_422_4x8].add_ps = PFX(pixel_add_ps_4x8_neon); -- p.chroma[X265_CSP_I422].cu[BLOCK_422_8x16].add_ps = PFX(pixel_add_ps_8x16_neon); -- p.chroma[X265_CSP_I422].cu[BLOCK_422_16x32].add_ps = PFX(pixel_add_ps_16x32_neon); -- p.chroma[X265_CSP_I422].cu[BLOCK_422_32x64].add_ps = PFX(pixel_add_ps_32x64_neon); -+ p.chroma[X265_CSP_I420].cu[BLOCK_420_4x4].add_ps[ALIGNED] = PFX(pixel_add_ps_4x4_neon); -+ p.chroma[X265_CSP_I420].cu[BLOCK_420_8x8].add_ps[ALIGNED] = PFX(pixel_add_ps_8x8_neon); -+ p.chroma[X265_CSP_I420].cu[BLOCK_420_16x16].add_ps[ALIGNED] = PFX(pixel_add_ps_16x16_neon); -+ p.chroma[X265_CSP_I420].cu[BLOCK_420_32x32].add_ps[ALIGNED] = PFX(pixel_add_ps_32x32_neon); -+ p.chroma[X265_CSP_I422].cu[BLOCK_422_4x8].add_ps[ALIGNED] = PFX(pixel_add_ps_4x8_neon); -+ p.chroma[X265_CSP_I422].cu[BLOCK_422_8x16].add_ps[ALIGNED] = PFX(pixel_add_ps_8x16_neon); -+ p.chroma[X265_CSP_I422].cu[BLOCK_422_16x32].add_ps[ALIGNED] = PFX(pixel_add_ps_16x32_neon); -+ p.chroma[X265_CSP_I422].cu[BLOCK_422_32x64].add_ps[ALIGNED] = PFX(pixel_add_ps_32x64_neon); - - // cpy2Dto1D_shr - p.cu[BLOCK_4x4].cpy2Dto1D_shr = PFX(cpy2Dto1D_shr_4x4_neon); -@@ -518,10 +518,10 @@ void setupAssemblyPrimitives(EncoderPrim - p.cu[BLOCK_32x32].cpy2Dto1D_shr = PFX(cpy2Dto1D_shr_32x32_neon); - - // ssd_s -- p.cu[BLOCK_4x4].ssd_s = PFX(pixel_ssd_s_4x4_neon); -- p.cu[BLOCK_8x8].ssd_s = PFX(pixel_ssd_s_8x8_neon); -- p.cu[BLOCK_16x16].ssd_s = PFX(pixel_ssd_s_16x16_neon); -- p.cu[BLOCK_32x32].ssd_s = PFX(pixel_ssd_s_32x32_neon); -+ p.cu[BLOCK_4x4].ssd_s[ALIGNED] = PFX(pixel_ssd_s_4x4_neon); -+ p.cu[BLOCK_8x8].ssd_s[ALIGNED] = PFX(pixel_ssd_s_8x8_neon); -+ p.cu[BLOCK_16x16].ssd_s[ALIGNED] = PFX(pixel_ssd_s_16x16_neon); -+ p.cu[BLOCK_32x32].ssd_s[ALIGNED] = PFX(pixel_ssd_s_32x32_neon); - - // sse_ss - p.cu[BLOCK_4x4].sse_ss = PFX(pixel_sse_ss_4x4_neon); -@@ -548,10 +548,10 @@ void setupAssemblyPrimitives(EncoderPrim - p.chroma[X265_CSP_I422].cu[BLOCK_422_32x64].sub_ps = PFX(pixel_sub_ps_32x64_neon); - - // calc_Residual -- p.cu[BLOCK_4x4].calcresidual = PFX(getResidual4_neon); -- p.cu[BLOCK_8x8].calcresidual = PFX(getResidual8_neon); -- p.cu[BLOCK_16x16].calcresidual = PFX(getResidual16_neon); -- p.cu[BLOCK_32x32].calcresidual = PFX(getResidual32_neon); -+ p.cu[BLOCK_4x4].calcresidual[ALIGNED] = PFX(getResidual4_neon); -+ p.cu[BLOCK_8x8].calcresidual[ALIGNED] = PFX(getResidual8_neon); -+ p.cu[BLOCK_16x16].calcresidual[ALIGNED] = PFX(getResidual16_neon); -+ p.cu[BLOCK_32x32].calcresidual[ALIGNED] = PFX(getResidual32_neon); - - // sse_pp - p.cu[BLOCK_4x4].sse_pp = PFX(pixel_sse_pp_4x4_neon); -@@ -722,31 +722,31 @@ void setupAssemblyPrimitives(EncoderPrim - p.pu[LUMA_64x64].sad_x4 = PFX(sad_x4_64x64_neon); - - // pixel_avg_pp -- p.pu[LUMA_4x4].pixelavg_pp = PFX(pixel_avg_pp_4x4_neon); -- p.pu[LUMA_4x8].pixelavg_pp = PFX(pixel_avg_pp_4x8_neon); -- p.pu[LUMA_4x16].pixelavg_pp = PFX(pixel_avg_pp_4x16_neon); -- p.pu[LUMA_8x4].pixelavg_pp = PFX(pixel_avg_pp_8x4_neon); -- p.pu[LUMA_8x8].pixelavg_pp = PFX(pixel_avg_pp_8x8_neon); -- p.pu[LUMA_8x16].pixelavg_pp = PFX(pixel_avg_pp_8x16_neon); -- p.pu[LUMA_8x32].pixelavg_pp = PFX(pixel_avg_pp_8x32_neon); -- p.pu[LUMA_12x16].pixelavg_pp = PFX(pixel_avg_pp_12x16_neon); -- p.pu[LUMA_16x4].pixelavg_pp = PFX(pixel_avg_pp_16x4_neon); -- p.pu[LUMA_16x8].pixelavg_pp = PFX(pixel_avg_pp_16x8_neon); -- p.pu[LUMA_16x12].pixelavg_pp = PFX(pixel_avg_pp_16x12_neon); -- p.pu[LUMA_16x16].pixelavg_pp = PFX(pixel_avg_pp_16x16_neon); -- p.pu[LUMA_16x32].pixelavg_pp = PFX(pixel_avg_pp_16x32_neon); -- p.pu[LUMA_16x64].pixelavg_pp = PFX(pixel_avg_pp_16x64_neon); -- p.pu[LUMA_24x32].pixelavg_pp = PFX(pixel_avg_pp_24x32_neon); -- p.pu[LUMA_32x8].pixelavg_pp = PFX(pixel_avg_pp_32x8_neon); -- p.pu[LUMA_32x16].pixelavg_pp = PFX(pixel_avg_pp_32x16_neon); -- p.pu[LUMA_32x24].pixelavg_pp = PFX(pixel_avg_pp_32x24_neon); -- p.pu[LUMA_32x32].pixelavg_pp = PFX(pixel_avg_pp_32x32_neon); -- p.pu[LUMA_32x64].pixelavg_pp = PFX(pixel_avg_pp_32x64_neon); -- p.pu[LUMA_48x64].pixelavg_pp = PFX(pixel_avg_pp_48x64_neon); -- p.pu[LUMA_64x16].pixelavg_pp = PFX(pixel_avg_pp_64x16_neon); -- p.pu[LUMA_64x32].pixelavg_pp = PFX(pixel_avg_pp_64x32_neon); -- p.pu[LUMA_64x48].pixelavg_pp = PFX(pixel_avg_pp_64x48_neon); -- p.pu[LUMA_64x64].pixelavg_pp = PFX(pixel_avg_pp_64x64_neon); -+ p.pu[LUMA_4x4].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_4x4_neon); -+ p.pu[LUMA_4x8].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_4x8_neon); -+ p.pu[LUMA_4x16].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_4x16_neon); -+ p.pu[LUMA_8x4].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_8x4_neon); -+ p.pu[LUMA_8x8].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_8x8_neon); -+ p.pu[LUMA_8x16].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_8x16_neon); -+ p.pu[LUMA_8x32].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_8x32_neon); -+ p.pu[LUMA_12x16].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_12x16_neon); -+ p.pu[LUMA_16x4].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_16x4_neon); -+ p.pu[LUMA_16x8].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_16x8_neon); -+ p.pu[LUMA_16x12].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_16x12_neon); -+ p.pu[LUMA_16x16].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_16x16_neon); -+ p.pu[LUMA_16x32].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_16x32_neon); -+ p.pu[LUMA_16x64].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_16x64_neon); -+ p.pu[LUMA_24x32].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_24x32_neon); -+ p.pu[LUMA_32x8].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_32x8_neon); -+ p.pu[LUMA_32x16].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_32x16_neon); -+ p.pu[LUMA_32x24].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_32x24_neon); -+ p.pu[LUMA_32x32].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_32x32_neon); -+ p.pu[LUMA_32x64].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_32x64_neon); -+ p.pu[LUMA_48x64].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_48x64_neon); -+ p.pu[LUMA_64x16].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_64x16_neon); -+ p.pu[LUMA_64x32].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_64x32_neon); -+ p.pu[LUMA_64x48].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_64x48_neon); -+ p.pu[LUMA_64x64].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_64x64_neon); - - // planecopy - p.planecopy_cp = PFX(pixel_planecopy_cp_neon); diff --git a/gnu/packages/patches/x265-detect512-all-arches.patch b/gnu/packages/patches/x265-detect512-all-arches.patch new file mode 100644 index 0000000000..4d39d868fd --- /dev/null +++ b/gnu/packages/patches/x265-detect512-all-arches.patch @@ -0,0 +1,37 @@ +https://sources.debian.org/data/main/x/x265/2.9-3/debian/patches/0003-detect512-is-needed-on-all-architectures.patch + +From: Adam Sampson +Date: Sun, 14 Oct 2018 14:04:18 +0200 +Subject: detect512 is needed on all architectures + +--- + source/common/cpu.cpp | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/source/common/cpu.cpp b/source/common/cpu.cpp +index 0681ff5..fa687da 100644 +--- a/source/common/cpu.cpp ++++ b/source/common/cpu.cpp +@@ -110,6 +110,11 @@ const cpu_name_t cpu_names[] = + { "", 0 }, + }; + ++bool detect512() ++{ ++ return(enable512); ++} ++ + #if X265_ARCH_X86 + + extern "C" { +@@ -123,10 +128,6 @@ uint64_t PFX(cpu_xgetbv)(int xcr); + #pragma warning(disable: 4309) // truncation of constant value + #endif + +-bool detect512() +-{ +- return(enable512); +-} + uint32_t cpu_detect(bool benableavx512 ) + { + diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index e281bf8fff..88357dfb45 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -401,7 +401,7 @@ and creating Matroska files from other media files (@code{mkvmerge}).") (sha256 (base32 "090hp4216isis8q5gb7bwzia8rfyzni54z21jnwm97x3hiy6ibpb")) - (patches (search-patches "x265-arm-asm-primitives.patch")) + (patches (search-patches "x265-detect512-all-arches.patch")) (modules '((guix build utils))) (snippet '(begin (delete-file-recursively "source/compat/getopt") @@ -409,12 +409,8 @@ and creating Matroska files from other media files (@code{mkvmerge}).") (build-system cmake-build-system) (arguments `(#:tests? #f ; tests are skipped if cpu-optimized code isn't built - ;; Currently the source code doesn't check for aarch64. - ,@(if (any (cute string-prefix? <> (or (%current-system) - (%current-target-system))) - '("armhf" "aarch64")) - '(#:configure-flags '("-DENABLE_PIC=TRUE")) - '()) + ;; Ensure position independent code for everyone. + #:configure-flags '("-DENABLE_PIC=TRUE") #:phases (modify-phases %standard-phases (add-before 'configure 'prepare-build -- cgit v1.2.3 From 2c89b4b5500ab940411d43c97291c931c3f5b8d0 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 15 Oct 2018 10:03:34 +0200 Subject: gnu: wine-staging: Update to 3.18. * gnu/packages/wine.scm (wine-staging-patchset-data): Update to 3.18. * gnu/packages/wine.scm (wine-staging): Update to 3.18. --- gnu/packages/wine.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 68839038b7..169cc6e3c5 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -225,7 +225,7 @@ integrate Windows applications into your desktop.") (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") - (version "3.17") + (version "3.18") (source (origin (method git-fetch) @@ -235,7 +235,7 @@ integrate Windows applications into your desktop.") (file-name (git-file-name name version)) (sha256 (base32 - "1ds9q90xjg59ikic98kqkhmijnqx4yplvwsm6rav4mx72yci7d4w")))) + "18g1lmqzkc7ngppynimfvza1gkdhqlnjbvnckmaws847ns4i0kzp")))) (build-system trivial-build-system) (native-inputs `(("bash" ,bash) @@ -281,7 +281,7 @@ integrate Windows applications into your desktop.") (file-name (string-append name "-" version ".tar.xz")) (sha256 (base32 - "08fcziadw40153a9rv630m7iz6ipfzylms5y191z4sj2vvhy5vac")))) + "0xqs76hxcym8nb95r7l72xx0msbscp7fhkr1wrv4r0923d5x9s4v")))) (inputs `(("autoconf" ,autoconf) ; for autoreconf ("gtk+" ,gtk+) ("libva" ,libva) -- cgit v1.2.3 From 2ab321ca37d1c00c1540d78d587226d3d487b2d4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 15 Oct 2018 13:51:41 +0300 Subject: gnu: go@1.4: Add support for aarch64-linux. * gnu/packages/golang.scm (go@1.4)[arguments]: Build for armhf-linux when building for aarch64-linux. [supported-systems]: Add aarch64-linux. --- gnu/packages/golang.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 7f26fbdab6..f14057417d 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016, 2017 Efraim Flashner +;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2016 Matthew Jordan ;;; Copyright © 2016 Andy Wingo ;;; Copyright © 2016 Ludovic Courtès @@ -77,6 +77,10 @@ (guix build utils) (srfi srfi-1)) #:tests? #f ; Tests are run by the all.bash script. + ,@(if (string-prefix? "aarch64-linux" (or (%current-system) + (%current-target-system))) + '(#:system "armhf-linux") + '()) #:phases (modify-phases %standard-phases (delete 'configure) @@ -213,7 +217,7 @@ programming language designed primarily for systems programming. Go is a compiled, statically typed language in the tradition of C and C++, but adds garbage collection, various safety features, and concurrent programming features in the style of communicating sequential processes (@dfn{CSP}).") - (supported-systems '("x86_64-linux" "i686-linux" "armhf-linux")) + (supported-systems '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux")) (license license:bsd-3))) (define-public go-1.9 -- cgit v1.2.3 From 0627f93db6a57e7411cb332b7509f35753b149e4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 15 Oct 2018 21:45:08 +0300 Subject: 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 (limited to 'gnu') 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 + -- cgit v1.2.3 From 1a2d8d06b53c3c8cf8f94920c6e8734c71b8369b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 15 Oct 2018 21:51:23 +0300 Subject: * 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 +-- .../patches/clang-3.5-libsanitizer-ustat-fix.patch | 46 ++++++++++++++++++++++ .../clang-3.5-libsantitizer-ustat-fix.patch | 46 ---------------------- 3 files changed, 49 insertions(+), 49 deletions(-) create mode 100644 gnu/packages/patches/clang-3.5-libsanitizer-ustat-fix.patch delete mode 100644 gnu/packages/patches/clang-3.5-libsantitizer-ustat-fix.patch (limited to 'gnu') 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-libsanitizer-ustat-fix.patch b/gnu/packages/patches/clang-3.5-libsanitizer-ustat-fix.patch new file mode 100644 index 0000000000..cfb09a8ce3 --- /dev/null +++ b/gnu/packages/patches/clang-3.5-libsanitizer-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 + diff --git a/gnu/packages/patches/clang-3.5-libsantitizer-ustat-fix.patch b/gnu/packages/patches/clang-3.5-libsantitizer-ustat-fix.patch deleted file mode 100644 index cfb09a8ce3..0000000000 --- a/gnu/packages/patches/clang-3.5-libsantitizer-ustat-fix.patch +++ /dev/null @@ -1,46 +0,0 @@ -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 - -- cgit v1.2.3 From 532f92c8f39ef8fa9441bf0840ae642016fac7a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 15 Oct 2018 23:54:20 +0200 Subject: gnu: guix: Update to f9a8fce. * gnu/packages/package-management.scm (guix): Update to f9a8fce. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 9a0023233f..fbbb4c3811 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -101,8 +101,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "0.15.0") - (commit "1d0be47ab680db938ac8da1ee65e1de91e198f67") - (revision 5)) + (commit "f9a8fce10f2d99efec7cb1dd0f6c5f0df9d1b2df") + (revision 6)) (package (name "guix") @@ -118,7 +118,7 @@ (commit commit))) (sha256 (base32 - "19cn4ndmr9cqd7qh6w3nchbmdpaawdl9kc6g0v6g680vzcja417k")) + "1733d5id0h44rrkyj9xw4fcqr1wawcfi8igpgk5wsn1iq4qqwv5f")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 503fe87098a23c0b7d848df5a926ebc22aba7fa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Lassieur?= Date: Tue, 16 Oct 2018 10:57:50 +0200 Subject: gnu: emacs-xelb: Update to 0.16. * gnu/packages/emacs.scm (emacs-xelb): Update to 0.16. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 4b013eb292..fe9047691e 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -6576,14 +6576,14 @@ which code derived from Kelvin H's org-page.") (define-public emacs-xelb (package (name "emacs-xelb") - (version "0.15") + (version "0.16") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/xelb-" version ".tar")) (sha256 (base32 - "031rvgprsqhf344p9wsczr50vj2qcpwdmhxi80jdbrsm7wyxf3qz")))) + "03wsr1jr7f7zfd80h864rd4makwh4widdnj1kjv2xyjwdgap9rl8")))) (build-system emacs-build-system) ;; The following functions and variables needed by emacs-xelb are ;; not included in emacs-minimal: -- cgit v1.2.3 From f1376bfabe81608db85d439351f00505b97e944f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Lassieur?= Date: Tue, 16 Oct 2018 10:58:06 +0200 Subject: gnu: emacs-exwm: Update to 0.20. * gnu/packages/emacs.scm (emacs-exwm): Update to 0.20. [source]: Remove emacs-exwm-fix-fullscreen-issue.patch. * gnu/local.mk (dist_patch_DATA): Remove patch. * gnu/packages/patches/emacs-exwm-fix-fullscreen-issue.patch: Remove patch. --- gnu/local.mk | 1 - gnu/packages/emacs.scm | 5 ++-- .../patches/emacs-exwm-fix-fullscreen-issue.patch | 27 ---------------------- 3 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 gnu/packages/patches/emacs-exwm-fix-fullscreen-issue.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 1fa2eaba31..b8248e8da0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -659,7 +659,6 @@ dist_patch_DATA = \ %D%/packages/patches/elogind-glibc-2.27.patch \ %D%/packages/patches/einstein-build.patch \ %D%/packages/patches/emacs-exec-path.patch \ - %D%/packages/patches/emacs-exwm-fix-fullscreen-issue.patch \ %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 \ diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index fe9047691e..d30a4cc568 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -6615,7 +6615,7 @@ It should enable you to implement low-level X11 applications.") (define-public emacs-exwm (package (name "emacs-exwm") - (version "0.19") + (version "0.20") (synopsis "Emacs X window manager") (source (origin (method url-fetch) @@ -6623,8 +6623,7 @@ It should enable you to implement low-level X11 applications.") version ".tar")) (sha256 (base32 - "11xd2w4h3zdwkdxypvmcz8s7q72cn76lfr9js77jbizyj6b04lr0")) - (patches (search-patches "emacs-exwm-fix-fullscreen-issue.patch")))) + "0nhhzbkm0mkj7sd1dy2c19cmn56gyaj9nl8kgy86h4fp63hjaz04")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-xelb" ,emacs-xelb))) diff --git a/gnu/packages/patches/emacs-exwm-fix-fullscreen-issue.patch b/gnu/packages/patches/emacs-exwm-fix-fullscreen-issue.patch deleted file mode 100644 index 5c9bd36598..0000000000 --- a/gnu/packages/patches/emacs-exwm-fix-fullscreen-issue.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 13a14579cc1bb772735f895dd5b4b90c6812f3ee Mon Sep 17 00:00:00 2001 -From: Chris Feng -Date: Sun, 29 Jul 2018 00:00:00 +0000 -Subject: [PATCH] Fix issues with destroying full screen X windows - -* exwm-manage.el (exwm-manage--unmanage-window): Set the Emacs window -of an full screen X window as non-dedicated before killing its buffer -so as not to cause other side effects. ---- - exwm-manage.el | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/exwm-manage.el b/exwm-manage.el -index a0a9e05..349157f 100644 ---- a/exwm-manage.el -+++ b/exwm-manage.el -@@ -392,6 +392,10 @@ manager is shutting down." - :window window :parent exwm--root :x 0 :y 0)) - (xcb:+request exwm--connection - (make-instance 'xcb:DestroyWindow :window container)))) -+ (when (exwm-layout--fullscreen-p) -+ (let ((window (get-buffer-window))) -+ (when window -+ (set-window-dedicated-p window nil)))) - (exwm-manage--set-client-list) - (xcb:flush exwm--connection)) - (let ((kill-buffer-func -- cgit v1.2.3 From 2d4a753a7cd38a3e7b95066bc92f1c0196737b70 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Tue, 16 Oct 2018 14:23:04 +0200 Subject: gnu: xpra: Update to 2.4. * gnu/packages/xorg.scm (xpra): Update to 2.4. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 7c80e70dac..4cf8eb2de4 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5936,7 +5936,7 @@ basic eye-candy effects.") (define-public xpra (package (name "xpra") - (version "2.3.4") + (version "2.4") (source (origin (method url-fetch) @@ -5944,7 +5944,7 @@ basic eye-candy effects.") version ".tar.xz")) (sha256 (base32 - "0wa3kx54himy3i1b2801hlzfilh3cf4kjk40k1cjl0ds28m5hija")))) + "0blzx231sr1ri1zwzpwzf611sq9104bv3ccvnap9pbvfrc05sfwx")))) (build-system python-build-system) (inputs `(("ffmpeg" ,ffmpeg) ("flac" ,flac) -- cgit v1.2.3 From 08f535eb2d438e52c1e84cefc1c270b9ad50620d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 16 Oct 2018 16:20:11 +0200 Subject: 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(-) (limited to 'gnu') 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-.*") -- cgit v1.2.3 From 29e53b446ccb8959db8a96161c04d98e873e2371 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 16 Oct 2018 16:30:45 +0200 Subject: 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(-) (limited to 'gnu') 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"))) -- cgit v1.2.3 From 56112a577ce445646aaddb9701f4af6b5626fb70 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 16 Oct 2018 16:44:31 +0200 Subject: 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(+) (limited to 'gnu') 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) -- cgit v1.2.3 From 02d5ed4a2700e8613aaf0642333734b60caff0f7 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 16 Oct 2018 12:54:17 -0400 Subject: gnu: GStreamer plugins: Update MP3 features for GStreamer 1.14. GStreamer moved all MPEG-1 audio (mp1, mp2, and mp3) decoders and encoders to the group of "good" plugins in GStreamer 1.14.0. See the 'NEWS' file for more information. * gnu/packages/gstreamer.scm (gst-plugins-ugly)[inputs]: Remove lame, mpg123, and twolame. (gst-plugins-bad): Remove mpg123. (gst-plugins-good): Add lame, mpg123, and twolame. --- gnu/packages/gstreamer.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index f556861857..435c3e5b3a 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -227,6 +227,7 @@ for the GStreamer multimedia library.") ("gdk-pixbuf" ,gdk-pixbuf) ("gst-plugins-base" ,gst-plugins-base) ("jack" ,jack-1) + ("lame" ,lame) ("libavc1394" ,libavc1394) ("libcaca" ,libcaca) ("libdv" ,libdv) @@ -236,10 +237,12 @@ for the GStreamer multimedia library.") ("libshout" ,libshout) ("libsoup" ,libsoup) ("libvpx" ,libvpx) + ("mpg123" ,mpg123) ("orc" ,orc) ("pulseaudio" ,pulseaudio) ("speex" ,speex) ("taglib" ,taglib) + ("twolame" ,twolame) ("wavpack" ,wavpack))) (native-inputs `(("glib:bin" ,glib "bin") @@ -320,7 +323,6 @@ developers consider to have good quality code and correct functionality.") ("libxml2" ,libxml2) ("lrdf" ,lrdf) ("mesa" ,mesa) - ("mpg123" ,mpg123) ("neon" ,neon) ("openal" ,openal) ("openexr" ,openexr) @@ -357,13 +359,10 @@ par compared to the rest.") (inputs `(("gst-plugins-base" ,gst-plugins-base) ("liba52" ,liba52) - ("lame" ,lame) ("libcdio" ,libcdio) - ("twolame" ,twolame) ("libmpeg2" ,libmpeg2) ("libdvdread" ,libdvdread) ("libx264" ,libx264) - ("mpg123" ,mpg123) ;; TODO: ;; * opencore-amr (for the AMR-NB decoder and encoder and the ;; AMR-WB decoder) -- cgit v1.2.3 From c8e3651a824bbc28915802265d9a5e7cc6405eea Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 10 Oct 2018 13:26:54 -0500 Subject: gnu: guile2.0-guix: Fix build. * gnu/packages/gnupg.scm (guile2.0-gcrypt): New variable. * gnu/packages/guile.scm (guile2.0-sqlite3): New variable. * gnu/packages/package-management.scm (guile2.0-guix)[propagated-inputs]: Use them. --- gnu/packages/gnupg.scm | 12 ++++++++++-- gnu/packages/guile.scm | 4 ++++ gnu/packages/package-management.scm | 2 ++ 3 files changed, 16 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 067a2338d4..c38fe64200 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2013, 2015, 2018 Andreas Enge -;;; Copyright © 2014 Eric Bavier +;;; Copyright © 2014, 2018 Eric Bavier ;;; Copyright © 2014, 2015, 2016 Mark H Weaver ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner @@ -67,7 +67,8 @@ #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (guix build-system perl) - #:use-module (guix build-system python)) + #:use-module (guix build-system python) + #:use-module (srfi srfi-1)) (define-public libgpg-error (package @@ -485,6 +486,13 @@ strong randomness, and more. It is implemented using the foreign function interface (FFI) of Guile.") (license license:gpl3+))) +(define-public guile2.0-gcrypt + (package (inherit guile-gcrypt) + (name "guile2.0-gcrypt") + (inputs + `(("guile" ,guile-2.0) + ,@(alist-delete "guile" (package-inputs guile-gcrypt)))))) + (define-public python-gpg (package (name "python-gpg") diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index e223edb9fc..912b0218ef 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2018 Maxim Cournoyer ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2018 Pierre-Antoine Rouby +;;; Copyright © 2018 Eric Bavier ;;; ;;; This file is part of GNU Guix. ;;; @@ -1151,6 +1152,9 @@ Guile's foreign function interface.") "This package provides Guile bindings to the SQLite database system.") (license license:gpl3+))) +(define-public guile2.0-sqlite3 + (package-for-guile-2.0 guile-sqlite3)) + (define-public haunt (package (name "haunt") diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index fbbb4c3811..f06a39ddd6 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -367,7 +367,9 @@ the Nix package manager.") ,@(alist-delete "guile" (package-inputs guix)))) (propagated-inputs `(("gnutls" ,gnutls/guile-2.0) + ("guile-gcrypt" ,guile2.0-gcrypt) ("guile-json" ,guile2.0-json) + ("guile-sqlite3" ,guile2.0-sqlite3) ("guile-ssh" ,guile2.0-ssh) ("guile-git" ,guile2.0-git))))) -- cgit v1.2.3 From 6f1ce09d79fa6148459c90120881e825551651b2 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 10 Oct 2018 13:33:15 -0500 Subject: gnu: Add guix-minimal. * gnu/packages/guile.scm (guile-2.0.13): New variable. * gnu/packages/package-management.scm (guix)[arguments]: Adjust 'wrap-program' phase to handle "missing" inputs. (guix-minimal): New variable. --- gnu/packages/guile.scm | 14 ++++++++++++++ gnu/packages/package-management.scm | 22 ++++++++++++++++++++-- 2 files changed, 34 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 912b0218ef..9e33003375 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -226,6 +226,20 @@ without requiring the source code to be rewritten.") (home-page "https://www.gnu.org/software/guile/") (license license:lgpl3+))) +(define-public guile-2.0.13 + ;; For testing a "minimal" Guix + (hidden-package + (package (inherit guile-2.0) + (name "guile") + (version "2.0.13") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/guile/guile-" version + ".tar.xz")) + (sha256 + (base32 + "12yqkr974y91ylgw6jnmci2v90i90s7h9vxa4zk0sai8vjnz4i1p"))))))) + (define-public guile-2.2 (package (inherit guile-2.0) (name "guile") diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index f06a39ddd6..fd01545082 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2018 Julien Lepiller ;;; Copyright © 2018 Rutger Helling ;;; Copyright © 2018 Sou Bunnbu +;;; Copyright © 2018 Eric Bavier ;;; ;;; This file is part of GNU Guix. ;;; @@ -232,13 +233,13 @@ (map (cut string-append <> "/share/guile/site/" effective) - deps) + (delete #f deps)) ":")) (gopath (string-join (map (cut string-append <> "/lib/guile/" effective "/site-ccache") - deps) + (delete #f deps)) ":"))) (wrap-program (string-append out "/bin/guix") @@ -373,6 +374,23 @@ the Nix package manager.") ("guile-ssh" ,guile2.0-ssh) ("guile-git" ,guile2.0-git))))) +(define-public guix-minimal + ;; A version of Guix which is built with the minimal set of dependencies, as + ;; outlined in the README "Requirements" section. Intended as a CI job, so + ;; marked as hidden. + (let ((guix guile2.0-guix)) + (hidden-package + (package + (inherit guix) + (name "guix-minimal") + (inputs + `(("guile" ,guile-2.0.13) + ,@(alist-delete "guile" (package-inputs guix)))) + (propagated-inputs + (fold alist-delete + (package-propagated-inputs guix) + '("guile-json" "guile-ssh"))))))) + (define (source-file? file stat) "Return true if FILE is likely a source file, false if it is a typical generated file." -- cgit v1.2.3 From 24220e0f09592ae6a3991929a62f79eff2d1df44 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 16 Oct 2018 22:40:44 -0400 Subject: gnu: emacs-nodejs-repl: Update to 0.2.0. * gnu/packages/emacs.scm (emacs-nodejs-repl): Update to 0.2.0. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index d30a4cc568..f7ee26179a 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -4307,14 +4307,14 @@ strings, and code folding.") (define-public emacs-nodejs-repl (package (name "emacs-nodejs-repl") - (version "0.1.6") + (version "0.2.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/abicky/nodejs-repl.el" "/archive/" version ".tar.gz")) (sha256 (base32 - "0sphg1jxi3a5l0gqdp27d0qgyjaiq2p293av9zm8ksm0vwqp3fr9")) + "0hq2cqdq2668yf48g7qnkci90nhih1gnhacsgz355jnib56lhmkz")) (file-name (string-append name "-" version ".tar.gz")))) (build-system emacs-build-system) (home-page "https://github.com/abicky/nodejs-repl.el") -- cgit v1.2.3 From da39ff58987d7ed082233ab9ac3ae8d6d0f50b5d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 17 Oct 2018 10:54:58 +0300 Subject: 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(+) (limited to 'gnu') 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 -- cgit v1.2.3 From 15b283e712a23cbffc9a50bebc8bca94283a3fe6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 17 Oct 2018 11:24:07 +0300 Subject: gnu: streamlink: Update to 0.14.2. * gnu/packages/video.scm (streamlink): Update to 0.14.2. [source]: Download from pypi. --- gnu/packages/video.scm | 63 +++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 34 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 88357dfb45..ab57ee4b45 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1860,41 +1860,36 @@ and custom quantization matrices.") (license license:gpl2+))) (define-public streamlink - ;; Release tarball doesn't contain ‘tests/resources/dash/’ directory. - (let ((commit "2dca7930a938f60b48d8e23260963ea7c49d979f")) - (package - (name "streamlink") - (version (git-version "0.13.0" "1" commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/streamlink/streamlink.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0vq19aspshim63aj8yl2p64ykrbk2mwwlawdx427b3j2djlc5qhw")))) - (build-system python-build-system) - (home-page "https://github.com/streamlink/streamlink") - (native-inputs - `(("python-freezegun" ,python-freezegun) - ("python-pytest" ,python-pytest) - ("python-mock" ,python-mock) - ("python-requests-mock" ,python-requests-mock))) - (propagated-inputs - `(("python-pysocks" ,python-pysocks) - ("python-websocket-client" ,python-websocket-client) - ("python-iso3166" ,python-iso3166) - ("python-iso639" ,python-iso639) - ("python-isodate", python-isodate) - ("python-pycryptodome" ,python-pycryptodome) - ("python-requests" ,python-requests) - ("python-urllib3" ,python-urllib3))) - (synopsis "Extract streams from various services") - (description "Streamlink is command-line utility that extracts streams + (package + (name "streamlink") + (version "0.14.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "streamlink" version)) + (sha256 + (base32 + "0l2145fd60i76afjisfxd48cwhwyir07i7s3bnimdq5db2kzkix8")))) + (build-system python-build-system) + (home-page "https://github.com/streamlink/streamlink") + (native-inputs + `(("python-freezegun" ,python-freezegun) + ("python-pytest" ,python-pytest) + ("python-mock" ,python-mock) + ("python-requests-mock" ,python-requests-mock))) + (propagated-inputs + `(("python-pysocks" ,python-pysocks) + ("python-websocket-client" ,python-websocket-client) + ("python-iso3166" ,python-iso3166) + ("python-iso639" ,python-iso639) + ("python-isodate", python-isodate) + ("python-pycryptodome" ,python-pycryptodome) + ("python-requests" ,python-requests) + ("python-urllib3" ,python-urllib3))) + (synopsis "Extract streams from various services") + (description "Streamlink is command-line utility that extracts streams from sites like Twitch.tv and pipes them into a video player of choice.") - (license license:bsd-2)))) + (license license:bsd-2))) (define-public livestreamer (deprecated-package "livestreamer" streamlink)) -- cgit v1.2.3 From 05f8943f048c30920b0a6dd546400d7c19740d10 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 17 Oct 2018 10:35:40 +0200 Subject: gnu: emacs-helm-system-packages: Add recutils to inputs. * gnu/packages/emacs.scm (emacs-helm-system-packages)[inputs]: Use recutils. --- gnu/packages/emacs.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index f7ee26179a..57841e86fa 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -5929,8 +5929,20 @@ Yasnippet.") (base32 "01by0c4lqi2cw8xmbxkjw7m9x78zssm31sx4hdpw5j35s2951j0f")))) (build-system emacs-build-system) + (inputs + `(("recutils" ,recutils))) (propagated-inputs `(("emacs-helm" ,emacs-helm))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((recutils (assoc-ref inputs "recutils"))) + ;; Specify the absolute file names of the various + ;; programs so that everything works out-of-the-box. + (substitute* "helm-system-packages-guix.el" + (("recsel") (string-append recutils "/bin/recsel"))))))))) (home-page "https://github.com/emacs-helm/helm-system-packages") (synopsis "Helm System Packages is an interface to your package manager") (description "List all available packages in Helm (with installed -- cgit v1.2.3 From fb3ff265cd8c6b4c6160f94240dc8932097e637b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 17 Oct 2018 11:17:26 +0300 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From 82402f76bebfa3bb563a58227eb4081f9bdb6142 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Mon, 15 Oct 2018 20:00:03 -0400 Subject: gnu: hyperrogue: Update to 10.4t. * gnu/packages/games.scm (hyperrogue): Update to 10.4t. [arguments]: Modify 'make-flags'. Modify 'configure' and 'install' phases. --- gnu/packages/games.scm | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 2547c72c23..972dec3419 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3658,7 +3658,7 @@ throwing people around in pseudo-randomly generated buildings.") (define-public hyperrogue (package (name "hyperrogue") - (version "10.4j") + (version "10.4t") ;; When updating this package, be sure to update the "hyperrogue-data" ;; origin in native-inputs. (source (origin @@ -3669,11 +3669,12 @@ throwing people around in pseudo-randomly generated buildings.") "-src.tgz")) (sha256 (base32 - "0909p4xvbi1c2jc5rdgrf8b1c60fmsaapabsi6yyglh5znkf0k27")))) + "0phqhmnzmc16a23qb4fkil0flzb86kibdckf1r35nc3l0k4193nn")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target - #:make-flags '("CXXFLAGS=-std=c++11") + #:make-flags '("HYPERROGUE_USE_GLEW=1" + "HYPERROGUE_USE_PNG=1") #:phases (modify-phases %standard-phases (add-after 'set-paths 'set-sdl-paths @@ -3696,12 +3697,16 @@ throwing people around in pseudo-randomly generated buildings.") (string-append dejavu-dir "/" dejavu-font))) (substitute* music-file (("\\*/") - (string-append share-dir "/sounds/")))) - ;; Fix Makefile. - (substitute* "Makefile" - (("g\\+\\+ langen.cpp") - "g++ langen.cpp ${CXXFLAGS}") - (("savepng.c") "savepng.cpp")) + (string-append share-dir "/sounds/"))) + (substitute* "sound.cpp" + (("musicfile = \"\"") + (string-append "musicfile = \"" + share-dir "/" music-file "\""))) + ;; Disable build machine CPU optimizations and warnings treated + ;; as errors. + (substitute* "Makefile" + (("-march=native") "") + (("-Werror") ""))) #t)) (replace 'install (lambda* (#:key inputs outputs #:allow-other-keys) @@ -3709,7 +3714,7 @@ throwing people around in pseudo-randomly generated buildings.") (bin (string-append out "/bin")) (share-dir (string-append out "/share/hyperrogue"))) (mkdir-p bin) - (copy-file "hyper" (string-append bin "/hyperrogue")) + (install-file "hyperrogue" bin) (install-file "hyperrogue-music.txt" share-dir)) #t)) (add-after 'install 'install-data @@ -3741,7 +3746,7 @@ throwing people around in pseudo-randomly generated buildings.") "-win.zip")) (sha256 (base32 - "0w61iv2rn93hi0q3hxyyyf9xcr8vi9zd7fjvpz5adpgf94jm3zsc")))) + "1xd9v8zzgi8m5ar8g4gy1xx5zqwidz3gn1knz0lwib3kbxx4drpg")))) ("unzip" ,unzip))) (inputs `(("font-dejavu" ,font-dejavu) -- cgit v1.2.3 From 1d43756107077797e0168190ac12ee2564c8e76d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 17 Oct 2018 21:10:19 +0300 Subject: gnu: strace: Check before enabling personalities. * gnu/packages/linux.scm (strace)[arguments]: Add configure flag to check for personality support. --- gnu/packages/linux.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 79a1b0b46a..cd4adf9b6f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -961,6 +961,8 @@ Zerofree requires the file system to be unmounted or mounted read-only.") (substitute* "strace.c" (("/bin/sh") (which "sh"))) #t))) + ;; Don't fail if the architecture doesn't support different personalities. + #:configure-flags '("--enable-mpers=check") ;; See . #:parallel-tests? #f)) ; undeterministic failures (native-inputs `(("perl" ,perl))) -- cgit v1.2.3 From 90aeaee861845142843a0f988fa4ff016c723cdb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 6 Oct 2018 16:47:05 +0200 Subject: gnu: python: Fix CVE-2018-14647. * gnu/packages/patches/python-CVE-2018-14647.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/python.scm (python-3/fixed): New variable. (python-3.6)[replacement]: New field. (python-minimal, python-debug, wrap-python3): Use PACKAGE/INHERIT instead of standard inheritance. --- gnu/local.mk | 1 + gnu/packages/patches/python-CVE-2018-14647.patch | 61 ++++++++++++++++++++++++ gnu/packages/python.scm | 26 ++++++++-- 3 files changed, 84 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/python-CVE-2018-14647.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index b8248e8da0..d30bbedee6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1076,6 +1076,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-3-deterministic-build-info.patch \ %D%/packages/patches/python-3-search-paths.patch \ %D%/packages/patches/python-3-fix-tests.patch \ + %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-fix-tests.patch \ diff --git a/gnu/packages/patches/python-CVE-2018-14647.patch b/gnu/packages/patches/python-CVE-2018-14647.patch new file mode 100644 index 0000000000..24f8d21820 --- /dev/null +++ b/gnu/packages/patches/python-CVE-2018-14647.patch @@ -0,0 +1,61 @@ +Fix CVE-2018-14647: +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-14647 +https://bugs.python.org/issue34623 + +Taken from upstream: +https://github.com/python/cpython/commit/f7666e828cc3d5873136473ea36ba2013d624fa1 + +diff --git Include/pyexpat.h Include/pyexpat.h +index 44259bf6d7..07020b5dc9 100644 +--- Include/pyexpat.h ++++ Include/pyexpat.h +@@ -3,7 +3,7 @@ + + /* note: you must import expat.h before importing this module! */ + +-#define PyExpat_CAPI_MAGIC "pyexpat.expat_CAPI 1.0" ++#define PyExpat_CAPI_MAGIC "pyexpat.expat_CAPI 1.1" + #define PyExpat_CAPSULE_NAME "pyexpat.expat_CAPI" + + struct PyExpat_CAPI +@@ -48,6 +48,8 @@ struct PyExpat_CAPI + enum XML_Status (*SetEncoding)(XML_Parser parser, const XML_Char *encoding); + int (*DefaultUnknownEncodingHandler)( + void *encodingHandlerData, const XML_Char *name, XML_Encoding *info); ++ /* might be none for expat < 2.1.0 */ ++ int (*SetHashSalt)(XML_Parser parser, unsigned long hash_salt); + /* always add new stuff to the end! */ + }; + +diff --git Modules/_elementtree.c Modules/_elementtree.c +index 707ab2912b..53f05f937f 100644 +--- Modules/_elementtree.c ++++ Modules/_elementtree.c +@@ -3261,6 +3261,11 @@ _elementtree_XMLParser___init___impl(XMLParserObject *self, PyObject *html, + PyErr_NoMemory(); + return -1; + } ++ /* expat < 2.1.0 has no XML_SetHashSalt() */ ++ if (EXPAT(SetHashSalt) != NULL) { ++ EXPAT(SetHashSalt)(self->parser, ++ (unsigned long)_Py_HashSecret.expat.hashsalt); ++ } + + if (target) { + Py_INCREF(target); +diff --git Modules/pyexpat.c Modules/pyexpat.c +index 47c3e86c20..aa21d93c11 100644 +--- Modules/pyexpat.c ++++ Modules/pyexpat.c +@@ -1887,6 +1887,11 @@ MODULE_INITFUNC(void) + capi.SetStartDoctypeDeclHandler = XML_SetStartDoctypeDeclHandler; + capi.SetEncoding = XML_SetEncoding; + capi.DefaultUnknownEncodingHandler = PyUnknownEncodingHandler; ++#if XML_COMBINED_VERSION >= 20100 ++ capi.SetHashSalt = XML_SetHashSalt; ++#else ++ capi.SetHashSalt = NULL; ++#endif + + /* export using capsule */ + capi_object = PyCapsule_New(&capi, PyExpat_CAPSULE_NAME, NULL); diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 8261fefd93..3e39866087 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -357,6 +357,7 @@ data types.") (package (inherit python-2) (name "python") (version "3.6.5") + (replacement python-3/fixed) (source (origin (method url-fetch) (uri (string-append "https://www.python.org/ftp/python/" @@ -456,6 +457,24 @@ data types.") ;; Current 3.x version. (define-public python-3 python-3.6) +(define python-3/fixed + (package + (inherit python-3) + (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)))))))) + ;; Current major version. (define-public python python-3) @@ -474,7 +493,7 @@ data types.") ("zlib" ,zlib))))) (define-public python-minimal - (package (inherit python) + (package/inherit python (name "python-minimal") (outputs '("out")) @@ -486,8 +505,7 @@ data types.") ("zlib" ,zlib))))) (define-public python-debug - (package - (inherit python) + (package/inherit python (name "python-debug") (outputs '("out" "debug")) (build-system gnu-build-system) @@ -506,7 +524,7 @@ for more information."))) (define* (wrap-python3 python #:optional (name (string-append (package-name python) "-wrapper"))) - (package (inherit python) + (package/inherit python (name name) (source #f) (build-system trivial-build-system) -- cgit v1.2.3 From a55ebe2e3a7b438b4eec06c594440d3a0fb06a25 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 6 Oct 2018 18:50:47 +0200 Subject: gnu: python2: Add upstream security fixes. This addresses CVE-2018-{1060,1061,14647,1000802}. * gnu/packages/patches/python2-CVE-2018-1000802.patch, gnu/packages/patches/python2-CVE-2018-1060.patch, gnu/packages/patches/python2-CVE-2018-1061.patch, gnu/packages/patches/python2-CVE-2018-14647.patch: New files. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/python.scm (python-2/fixed): New variable. (python-2.7)[replacement]: New field. (python2-minimal): Use PACKAGE/INHERIT. --- gnu/local.mk | 4 ++ .../patches/python2-CVE-2018-1000802.patch | 47 +++++++++++++++++ gnu/packages/patches/python2-CVE-2018-1060.patch | 20 +++++++ gnu/packages/patches/python2-CVE-2018-1061.patch | 20 +++++++ gnu/packages/patches/python2-CVE-2018-14647.patch | 61 ++++++++++++++++++++++ gnu/packages/python.scm | 15 +++++- 6 files changed, 166 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/python2-CVE-2018-1000802.patch create mode 100644 gnu/packages/patches/python2-CVE-2018-1060.patch create mode 100644 gnu/packages/patches/python2-CVE-2018-1061.patch create mode 100644 gnu/packages/patches/python2-CVE-2018-14647.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index d30bbedee6..402505e229 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1068,6 +1068,10 @@ 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 \ %D%/packages/patches/python-2.7-adjust-tests.patch \ %D%/packages/patches/python-2.7-search-paths.patch \ diff --git a/gnu/packages/patches/python2-CVE-2018-1000802.patch b/gnu/packages/patches/python2-CVE-2018-1000802.patch new file mode 100644 index 0000000000..0d5bc77c84 --- /dev/null +++ b/gnu/packages/patches/python2-CVE-2018-1000802.patch @@ -0,0 +1,47 @@ +Fix CVE-2018-1000802: + +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-1000802 + +Taken from upstream commit (sans NEWS): +https://github.com/python/cpython/commit/d8b103b8b3ef9644805341216963a64098642435 + +diff --git a/Lib/shutil.py b/Lib/shutil.py +index 3462f7c5e9..0ab1a06f52 100644 +--- a/Lib/shutil.py ++++ b/Lib/shutil.py +@@ -413,17 +413,21 @@ def _make_tarball(base_name, base_dir, compress="gzip", verbose=0, dry_run=0, + + return archive_name + +-def _call_external_zip(base_dir, zip_filename, verbose=False, dry_run=False): ++def _call_external_zip(base_dir, zip_filename, verbose, dry_run, logger): + # XXX see if we want to keep an external call here + if verbose: + zipoptions = "-r" + else: + zipoptions = "-rq" +- from distutils.errors import DistutilsExecError +- from distutils.spawn import spawn ++ cmd = ["zip", zipoptions, zip_filename, base_dir] ++ if logger is not None: ++ logger.info(' '.join(cmd)) ++ if dry_run: ++ return ++ import subprocess + try: +- spawn(["zip", zipoptions, zip_filename, base_dir], dry_run=dry_run) +- except DistutilsExecError: ++ subprocess.check_call(cmd) ++ except subprocess.CalledProcessError: + # XXX really should distinguish between "couldn't find + # external 'zip' command" and "zip failed". + raise ExecError, \ +@@ -458,7 +462,7 @@ def _make_zipfile(base_name, base_dir, verbose=0, dry_run=0, logger=None): + zipfile = None + + if zipfile is None: +- _call_external_zip(base_dir, zip_filename, verbose, dry_run) ++ _call_external_zip(base_dir, zip_filename, verbose, dry_run, logger) + else: + if logger is not None: + logger.info("creating '%s' and adding '%s' to it", diff --git a/gnu/packages/patches/python2-CVE-2018-1060.patch b/gnu/packages/patches/python2-CVE-2018-1060.patch new file mode 100644 index 0000000000..5eb7ccfbc9 --- /dev/null +++ b/gnu/packages/patches/python2-CVE-2018-1060.patch @@ -0,0 +1,20 @@ +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 new file mode 100644 index 0000000000..6caab24b4d --- /dev/null +++ b/gnu/packages/patches/python2-CVE-2018-1061.patch @@ -0,0 +1,20 @@ +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/patches/python2-CVE-2018-14647.patch b/gnu/packages/patches/python2-CVE-2018-14647.patch new file mode 100644 index 0000000000..6226b06aca --- /dev/null +++ b/gnu/packages/patches/python2-CVE-2018-14647.patch @@ -0,0 +1,61 @@ +Fix CVE-2018-14647: +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-14647 +https://bugs.python.org/issue34623 + +Taken from upstream: +https://github.com/python/cpython/commit/18b20bad75b4ff0486940fba4ec680e96e70f3a2 + +diff --git a/Include/pyexpat.h b/Include/pyexpat.h +index 5340ef5fa3..3fc5fa54da 100644 +--- a/Include/pyexpat.h ++++ b/Include/pyexpat.h +@@ -3,7 +3,7 @@ + + /* note: you must import expat.h before importing this module! */ + +-#define PyExpat_CAPI_MAGIC "pyexpat.expat_CAPI 1.0" ++#define PyExpat_CAPI_MAGIC "pyexpat.expat_CAPI 1.1" + #define PyExpat_CAPSULE_NAME "pyexpat.expat_CAPI" + + struct PyExpat_CAPI +@@ -43,6 +43,8 @@ struct PyExpat_CAPI + XML_Parser parser, XML_UnknownEncodingHandler handler, + void *encodingHandlerData); + void (*SetUserData)(XML_Parser parser, void *userData); ++ /* might be none for expat < 2.1.0 */ ++ int (*SetHashSalt)(XML_Parser parser, unsigned long hash_salt); + /* always add new stuff to the end! */ + }; + +diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c +index f7f992dd3a..b38e0ab329 100644 +--- a/Modules/_elementtree.c ++++ b/Modules/_elementtree.c +@@ -2574,6 +2574,11 @@ xmlparser(PyObject* self_, PyObject* args, PyObject* kw) + PyErr_NoMemory(); + return NULL; + } ++ /* expat < 2.1.0 has no XML_SetHashSalt() */ ++ if (EXPAT(SetHashSalt) != NULL) { ++ EXPAT(SetHashSalt)(self->parser, ++ (unsigned long)_Py_HashSecret.prefix); ++ } + + ALLOC(sizeof(XMLParserObject), "create expatparser"); + +diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c +index 2b4d31293c..1f8c0d70a5 100644 +--- a/Modules/pyexpat.c ++++ b/Modules/pyexpat.c +@@ -2042,6 +2042,11 @@ MODULE_INITFUNC(void) + capi.SetProcessingInstructionHandler = XML_SetProcessingInstructionHandler; + capi.SetUnknownEncodingHandler = XML_SetUnknownEncodingHandler; + capi.SetUserData = XML_SetUserData; ++#if XML_COMBINED_VERSION >= 20100 ++ capi.SetHashSalt = XML_SetHashSalt; ++#else ++ capi.SetHashSalt = NULL; ++#endif + + /* export using capsule */ + capi_object = PyCapsule_New(&capi, PyExpat_CAPSULE_NAME, NULL); diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 3e39866087..e3a04b0344 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -148,6 +148,7 @@ (package (name "python2") (version "2.7.14") + (replacement python-2/fixed) (source (origin (method url-fetch) @@ -344,6 +345,18 @@ data types.") ;; Current 2.x version. (define-public python-2 python-2.7) +(define python-2/fixed + (package + (inherit python-2) + (source (origin + (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" + "python2-CVE-2018-1000802.patch"))))))) + (define-public python2-called-python ;; Both 2.x and 3.x used to be called "python". In commit ;; a7714d42de2c3082f3609d1e63c83d703fb39cf9 (March 2018), we renamed the @@ -482,7 +495,7 @@ data types.") ;; Python (Tk -> libxcb -> Python.) (define-public python2-minimal - (package (inherit python-2) + (package/inherit python-2 (name "python2-minimal") (outputs '("out")) -- cgit v1.2.3 From acce0a474c1493ab18912bc46285248e4ccb0314 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 9 Apr 2018 01:04:10 +0200 Subject: services: wpa-supplicant: Extend to support configuration parameters. This allows using WPA Supplicant "standalone" without an additional network manager. The default configuration is unchanged. * gnu/services/networking.scm (): New record type. (wpa-supplicant-shepherd-service): Pass configuration records to the daemon. (wpa-supplicant-service-type): Adjust accordingly. * doc/guix.texi (Networking Services): Document the new service type. --- gnu/services/networking.scm | 86 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 65 insertions(+), 21 deletions(-) (limited to 'gnu') diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index 3fdb2bb9f7..c809b4a4a4 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016 John Darrington ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017 Thomas Danckaert -;;; Copyright © 2017 Marius Bakke +;;; Copyright © 2017, 2018 Marius Bakke ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Chris Marusich ;;; Copyright © 2018 Arun Isaac @@ -101,6 +101,16 @@ modem-manager-configuration modem-manager-configuration? modem-manager-service-type + + + wpa-supplicant-configuration + wpa-supplicant-configuration? + wpa-supplicant-configuration-wpa-supplicant + wpa-supplicant-configuration-pid-file + wpa-supplicant-configuration-dbus? + wpa-supplicant-configuration-interface + wpa-supplicant-configuration-config-file + wpa-supplicant-configuration-extra-options wpa-supplicant-service-type openvswitch-service-type @@ -1019,28 +1029,62 @@ networking.")))) ;;; WPA supplicant ;;; - -(define (wpa-supplicant-shepherd-service wpa-supplicant) - "Return a shepherd service for wpa_supplicant" - (list (shepherd-service - (documentation "Run WPA supplicant with dbus interface") - (provision '(wpa-supplicant)) - (requirement '(user-processes dbus-system loopback)) - (start #~(make-forkexec-constructor - (list (string-append #$wpa-supplicant - "/sbin/wpa_supplicant") - "-u" "-B" "-P/var/run/wpa_supplicant.pid") - #:pid-file "/var/run/wpa_supplicant.pid")) - (stop #~(make-kill-destructor))))) +(define-record-type* + wpa-supplicant-configuration make-wpa-supplicant-configuration + wpa-supplicant-configuration? + (wpa-supplicant wpa-supplicant-configuration-wpa-supplicant ; + (default wpa-supplicant)) + (pid-file wpa-supplicant-configuration-pid-file ;string + (default "/var/run/wpa_supplicant.pid")) + (dbus? wpa-supplicant-configuration-dbus? ;Boolean + (default #t)) + (interface wpa-supplicant-configuration-interface ;#f | string + (default #f)) + (config-file wpa-supplicant-configuration-config-file ;#f | + (default #f)) + (extra-options wpa-supplicant-configuration-extra-options ;list of strings + (default '()))) + +(define wpa-supplicant-shepherd-service + (match-lambda + (($ wpa-supplicant pid-file dbus? interface + config-file extra-options) + (list (shepherd-service + (documentation "Run the WPA supplicant daemon") + (provision '(wpa-supplicant)) + (requirement '(user-processes dbus-system loopback)) + (start #~(make-forkexec-constructor + (list (string-append #$wpa-supplicant + "/sbin/wpa_supplicant") + (string-append "-P" #$pid-file) + "-B" ;run in background + #$@(if dbus? + #~("-u") + #~()) + #$@(if interface + #~(string-append "-i" #$interface) + #~()) + #$@(if config-file + #~(string-append "-c" #$config-file) + #~()) + #$@extra-options) + #:pid-file #$pid-file)) + (stop #~(make-kill-destructor))))))) (define wpa-supplicant-service-type - (service-type (name 'wpa-supplicant) - (extensions - (list (service-extension shepherd-root-service-type - wpa-supplicant-shepherd-service) - (service-extension dbus-root-service-type list) - (service-extension profile-service-type list))) - (default-value wpa-supplicant))) + (let ((config->package + (match-lambda + (($ wpa-supplicant) + (list wpa-supplicant))))) + (service-type (name 'wpa-supplicant) + (extensions + (list (service-extension shepherd-root-service-type + wpa-supplicant-shepherd-service) + (service-extension dbus-root-service-type config->package) + (service-extension profile-service-type config->package))) + (description "Run the WPA Supplicant daemon, a service that +implements authentication, key negotiation and more for wireless networks.") + (default-value (wpa-supplicant-configuration))))) ;;; -- cgit v1.2.3 From 16f14f63db7a370d3917cf9c7d7e3735b0f59855 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Oct 2018 20:53:24 +0200 Subject: 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 -- gnu/packages/patches/python2-CVE-2018-1060.patch | 20 -------------------- gnu/packages/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 (limited to 'gnu') 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) -- cgit v1.2.3 From 0592db2873c557048026570e75105cf41f86751c Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Wed, 17 Oct 2018 14:05:18 -0400 Subject: gnu: wesnoth: Update to 1.14.5. * gnu/packages/games.scm (wesnoth): Update to 1.14.5. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 972dec3419..83a30cb22c 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2137,7 +2137,7 @@ falling, themeable graphics and sounds, and replays.") (define-public wesnoth (package (name "wesnoth") - (version "1.14.4") + (version "1.14.5") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/wesnoth/wesnoth-" @@ -2146,7 +2146,7 @@ falling, themeable graphics and sounds, and replays.") name "-" version ".tar.bz2")) (sha256 (base32 - "1hw1ap8xxpdwyx1sf8fm1g75p6724y3hwb4kpvyqbsq7bwfwsb9i")))) + "1kgpj2f22nnx4mwd1zis3s5ny2983aasgqsmz7wnqaq7n6a7ac85")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; no check target -- cgit v1.2.3 From b286e3b3686db15195da222b7a75351651f6b1db Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Wed, 17 Oct 2018 17:04:27 -0400 Subject: gnu: retux: Update to 1.3.6. * gnu/packages/games.scm (retux): Update to 1.3.6. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 83a30cb22c..e2d1a5d6a8 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1000,7 +1000,7 @@ Every puzzle has a complete solution, although there may be more than one.") (define-public retux (package (name "retux") - (version "1.3.5") + (version "1.3.6") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/retux/" @@ -1008,7 +1008,7 @@ Every puzzle has a complete solution, although there may be more than one.") version "-src.tar.gz")) (sha256 (base32 - "1pcrh3z16fl412r3k7xccrgika19ahb1xh90jihgl8yy7zza2i6p")))) + "01bidh4zisjp3nc436x0g85v60dvwb3ig37i7y01sa71j8fm4fmb")))) (build-system python-build-system) (arguments `(#:tests? #f ; no check target -- cgit v1.2.3 From 39d7fdce453b0ca23ecbed72048647debbaa58a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 18 Oct 2018 00:45:05 +0200 Subject: services: dhcp-client: Deprecate 'dhcp-client-service' procedure. * gnu/services/networking.scm (dhcp-client-service-type): Add default value. * gnu/system/examples/bare-bones.tmpl: Use (service dhcp-client-service-type) instead of (dhcp-client-service). * gnu/system/examples/beaglebone-black.tmpl: Likewise. * gnu/tests/base.scm (%avahi-os): Likewise. * gnu/tests/databases.scm (%memcached-os): Likewise. (%mongodb-os): Likewise. * gnu/tests/dict.scm (%dicod-os): Likewise. * gnu/tests/mail.scm (%opensmtpd-os): Likewise. (%exim-os): Likewise. (%dovecot-os): Likewise. * gnu/tests/messaging.scm (run-xmpp-test): Likewise. (run-bitlbee-test): Likewise. * gnu/tests/monitoring.scm (%prometheus-node-exporter-os): Likewise. * gnu/tests/networking.scm (%inetd-os): Likewise. (run-iptables-test): Likewise. * gnu/tests/nfs.scm (%base-os): Likewise. * gnu/tests/rsync.scm (%rsync-os): Likewise. * gnu/tests/ssh.scm (run-ssh-test): Likewise. * gnu/tests/version-control.scm (%cgit-os): Likewise. (%git-http-os): Likewise. (%gitolite-os): Likewise. * gnu/tests/virtualization.scm (%libvirt-os): Likewise. * gnu/tests/web.scm (%httpd-os): Likewise. (%nginx-os): Likewise. (%varnish-os): Likewise. (%php-fpm-os): Likewise. (%hpcguix-web-os): Likewise. (%tailon-os): Likewise. * tests/guix-system.sh: Likewise. * doc/guix.texi (Networking Services): Document 'dhcp-client-service-type' and remove 'dhcp-client-service'. --- gnu/services/networking.scm | 6 ++++-- gnu/system/examples/bare-bones.tmpl | 2 +- gnu/system/examples/beaglebone-black.tmpl | 2 +- gnu/tests/base.scm | 2 +- gnu/tests/databases.scm | 4 ++-- gnu/tests/dict.scm | 2 +- gnu/tests/mail.scm | 6 +++--- gnu/tests/messaging.scm | 4 ++-- gnu/tests/monitoring.scm | 2 +- gnu/tests/networking.scm | 4 ++-- gnu/tests/nfs.scm | 2 +- gnu/tests/rsync.scm | 2 +- gnu/tests/ssh.scm | 2 +- gnu/tests/version-control.scm | 6 +++--- gnu/tests/virtualization.scm | 2 +- gnu/tests/web.scm | 12 ++++++------ 16 files changed, 31 insertions(+), 29 deletions(-) (limited to 'gnu') diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index c809b4a4a4..61a0e975c7 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -53,6 +53,7 @@ static-networking-service-type) #:export (%facebook-host-aliases dhcp-client-service + dhcp-client-service-type dhcpd-service-type dhcpd-configuration @@ -202,9 +203,10 @@ fe80::1%lo0 apps.facebook.com\n") "-pf" #$pid-file ifaces)))) (and (zero? (cdr (waitpid pid))) (read-pid-file #$pid-file))))) - (stop #~(make-kill-destructor)))))) + (stop #~(make-kill-destructor)))) + isc-dhcp)) -(define* (dhcp-client-service #:key (dhcp isc-dhcp)) +(define* (dhcp-client-service #:key (dhcp isc-dhcp)) ;deprecated "Return a service that runs @var{dhcp}, a Dynamic Host Configuration Protocol (DHCP) client, on all the non-loopback network interfaces." (service dhcp-client-service-type dhcp)) diff --git a/gnu/system/examples/bare-bones.tmpl b/gnu/system/examples/bare-bones.tmpl index b763258e52..889dcabe64 100644 --- a/gnu/system/examples/bare-bones.tmpl +++ b/gnu/system/examples/bare-bones.tmpl @@ -44,7 +44,7 @@ ;; Add services to the baseline: a DHCP client and ;; an SSH server. - (services (cons* (dhcp-client-service) + (services (cons* (service dhcp-client-service-type) (service openssh-service-type (openssh-configuration (port-number 2222))) diff --git a/gnu/system/examples/beaglebone-black.tmpl b/gnu/system/examples/beaglebone-black.tmpl index d1130c76b6..efef682e3a 100644 --- a/gnu/system/examples/beaglebone-black.tmpl +++ b/gnu/system/examples/beaglebone-black.tmpl @@ -45,7 +45,7 @@ ;; Globally-installed packages. (packages (cons* screen openssh %base-packages)) - (services (cons* (dhcp-client-service) + (services (cons* (service dhcp-client-service-type) ;; mingetty does not work on serial lines. ;; Use agetty with board-specific serial parameters. (agetty-service diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm index f97581de33..896d4a8f88 100644 --- a/gnu/tests/base.scm +++ b/gnu/tests/base.scm @@ -673,7 +673,7 @@ non-ASCII names from /tmp.") (name-service-switch %mdns-host-lookup-nss) (services (cons* (avahi-service #:debug? #t) (dbus-service) - (dhcp-client-service) ;needed for multicast + (service dhcp-client-service-type) ;needed for multicast ;; Enable heavyweight debugging output. (modify-services (operating-system-user-services diff --git a/gnu/tests/databases.scm b/gnu/tests/databases.scm index 5c8ca85c13..e0544bbcd2 100644 --- a/gnu/tests/databases.scm +++ b/gnu/tests/databases.scm @@ -35,7 +35,7 @@ (define %memcached-os (simple-operating-system - (dhcp-client-service) + (service dhcp-client-service-type) (service memcached-service-type))) (define* (run-memcached-test #:optional (port 11211)) @@ -130,7 +130,7 @@ (operating-system (inherit (simple-operating-system - (dhcp-client-service) + (service dhcp-client-service-type) (service mongodb-service-type))) (packages (cons* mongodb %base-packages)))) diff --git a/gnu/tests/dict.scm b/gnu/tests/dict.scm index dd60ffd464..c50e3cd6da 100644 --- a/gnu/tests/dict.scm +++ b/gnu/tests/dict.scm @@ -34,7 +34,7 @@ (define %dicod-os (simple-operating-system - (dhcp-client-service) + (service dhcp-client-service-type) (service dicod-service-type (dicod-configuration (interfaces '("0.0.0.0")) diff --git a/gnu/tests/mail.scm b/gnu/tests/mail.scm index 5677969fac..33aa4d3437 100644 --- a/gnu/tests/mail.scm +++ b/gnu/tests/mail.scm @@ -36,7 +36,7 @@ (define %opensmtpd-os (simple-operating-system - (dhcp-client-service) + (service dhcp-client-service-type) (service opensmtpd-service-type (opensmtpd-configuration (config-file @@ -155,7 +155,7 @@ accept from any for local deliver to mbox (define %exim-os (simple-operating-system - (dhcp-client-service) + (service dhcp-client-service-type) (service mail-aliases-service-type '()) (service exim-service-type (exim-configuration @@ -283,7 +283,7 @@ acl_check_data: (define %dovecot-os (simple-operating-system - (dhcp-client-service) + (service dhcp-client-service-type) (dovecot-service #:config (dovecot-configuration (disable-plaintext-auth? #f) diff --git a/gnu/tests/messaging.scm b/gnu/tests/messaging.scm index f5f99b9f56..36afb987af 100644 --- a/gnu/tests/messaging.scm +++ b/gnu/tests/messaging.scm @@ -35,7 +35,7 @@ "Run a test of an OS running XMPP-SERVICE, which writes its PID to PID-FILE." (define os (marionette-operating-system - (simple-operating-system (dhcp-client-service) + (simple-operating-system (service dhcp-client-service-type) xmpp-service) #:imported-modules '((gnu services herd)))) @@ -167,7 +167,7 @@ (define (run-bitlbee-test) (define os (marionette-operating-system - (simple-operating-system (dhcp-client-service) + (simple-operating-system (service dhcp-client-service-type) (service bitlbee-service-type (bitlbee-configuration (interface "0.0.0.0")))) diff --git a/gnu/tests/monitoring.scm b/gnu/tests/monitoring.scm index 67899987ce..3320a19a77 100644 --- a/gnu/tests/monitoring.scm +++ b/gnu/tests/monitoring.scm @@ -85,7 +85,7 @@ (define %prometheus-node-exporter-os (simple-operating-system - (dhcp-client-service) + (service dhcp-client-service-type) (service prometheus-node-exporter-service-type (prometheus-node-exporter-configuration)))) diff --git a/gnu/tests/networking.scm b/gnu/tests/networking.scm index ceba7f7d5d..9f12a4ae8d 100644 --- a/gnu/tests/networking.scm +++ b/gnu/tests/networking.scm @@ -39,7 +39,7 @@ (define %inetd-os ;; Operating system with 2 inetd services. (simple-operating-system - (dhcp-client-service) + (service dhcp-client-service-type) (service inetd-service-type (inetd-configuration (entries (list @@ -463,7 +463,7 @@ COMMIT (define os (marionette-operating-system (simple-operating-system - (dhcp-client-service) + (service dhcp-client-service-type) (service inetd-service-type (inetd-configuration (entries (list diff --git a/gnu/tests/nfs.scm b/gnu/tests/nfs.scm index 140f03779b..7ef9f1f7bf 100644 --- a/gnu/tests/nfs.scm +++ b/gnu/tests/nfs.scm @@ -55,7 +55,7 @@ (services (cons* (service rpcbind-service-type (rpcbind-configuration)) - (dhcp-client-service) + (service dhcp-client-service-type) %base-services)))) (define (run-nfs-test name socket) diff --git a/gnu/tests/rsync.scm b/gnu/tests/rsync.scm index a6f8fa2bd1..096580022f 100644 --- a/gnu/tests/rsync.scm +++ b/gnu/tests/rsync.scm @@ -111,7 +111,7 @@ PORT." ;; Return operating system under test. (let ((base-os (simple-operating-system - (dhcp-client-service) + (service dhcp-client-service-type) (service rsync-service-type)))) (operating-system (inherit base-os) diff --git a/gnu/tests/ssh.scm b/gnu/tests/ssh.scm index 2e40122add..e5cd439cdf 100644 --- a/gnu/tests/ssh.scm +++ b/gnu/tests/ssh.scm @@ -39,7 +39,7 @@ empty-password logins. When SFTP? is true, run an SFTP server test." (define os (marionette-operating-system - (simple-operating-system (dhcp-client-service) ssh-service) + (simple-operating-system (service dhcp-client-service-type) ssh-service) #:imported-modules '((gnu services herd) (guix combinators)))) (define vm diff --git a/gnu/tests/version-control.scm b/gnu/tests/version-control.scm index 4409b8a12b..230aa9edf9 100644 --- a/gnu/tests/version-control.scm +++ b/gnu/tests/version-control.scm @@ -92,7 +92,7 @@ ;; Operating system under test. (let ((base-os (simple-operating-system - (dhcp-client-service) + (service dhcp-client-service-type) (service cgit-service-type (cgit-configuration (nginx %cgit-configuration-nginx))) @@ -237,7 +237,7 @@ HTTP-PORT." (define %git-http-os (simple-operating-system - (dhcp-client-service) + (service dhcp-client-service-type) (service fcgiwrap-service-type) (service nginx-service-type %git-nginx-configuration) %test-repository-service)) @@ -328,7 +328,7 @@ HTTP-PORT." (define %gitolite-os (simple-operating-system - (dhcp-client-service) + (service dhcp-client-service-type) (service openssh-service-type) (service gitolite-service-type (gitolite-configuration diff --git a/gnu/tests/virtualization.scm b/gnu/tests/virtualization.scm index c2939355b2..fbdec20805 100644 --- a/gnu/tests/virtualization.scm +++ b/gnu/tests/virtualization.scm @@ -32,7 +32,7 @@ (define %libvirt-os (simple-operating-system - (dhcp-client-service) + (service dhcp-client-service-type) (dbus-service) (polkit-service) (service libvirt-service-type))) diff --git a/gnu/tests/web.scm b/gnu/tests/web.scm index 2e209fee97..319655396a 100644 --- a/gnu/tests/web.scm +++ b/gnu/tests/web.scm @@ -125,7 +125,7 @@ HTTP-PORT." (define %httpd-os (simple-operating-system - (dhcp-client-service) + (service dhcp-client-service-type) (service httpd-service-type (httpd-configuration (config @@ -154,7 +154,7 @@ HTTP-PORT." (define %nginx-os ;; Operating system under test. (simple-operating-system - (dhcp-client-service) + (service dhcp-client-service-type) (service nginx-service-type (nginx-configuration (log-directory "/var/log/nginx") @@ -188,7 +188,7 @@ sub vcl_synth { (define %varnish-os (simple-operating-system - (dhcp-client-service) + (service dhcp-client-service-type) ;; Pretend to be a web server that serves %index.html-contents. (service varnish-service-type (varnish-configuration @@ -237,7 +237,7 @@ echo(\"Computed by php:\".((string)(2+3))); (define %php-fpm-os ;; Operating system under test. (simple-operating-system - (dhcp-client-service) + (service dhcp-client-service-type) (service php-fpm-service-type) (service nginx-service-type (nginx-configuration @@ -392,7 +392,7 @@ HTTP-PORT, along with php-fpm." (define %hpcguix-web-os (simple-operating-system - (dhcp-client-service) + (service dhcp-client-service-type) (service hpcguix-web-service-type (hpcguix-web-configuration (specs %hpcguix-web-specs))))) @@ -407,7 +407,7 @@ HTTP-PORT, along with php-fpm." (define %tailon-os ;; Operating system under test. (simple-operating-system - (dhcp-client-service) + (service dhcp-client-service-type) (service tailon-service-type (tailon-configuration (config-file -- cgit v1.2.3 From 53fb0476ec4e5df9511490aaf8c3c70ba68aa83b Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Thu, 24 May 2018 00:21:49 +0800 Subject: gnu: javacc: 'javacc' now inherits from 'javacc-4'. * gnu/packages/java.scm (javacc, javacc-4): 'javacc' now inherits from 'javacc-4' instead of the opposite around. --- gnu/packages/java.scm | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 93f5bb6aff..5447be41a5 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1948,27 +1948,31 @@ designs.") license:asl2.0 license:cpl1.0))))) -(define-public javacc +(define-public javacc-4 (package (name "javacc") - (version "7.0.3") + (version "4.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/javacc/javacc/" - "archive/" version ".tar.gz")) - (file-name (string-append "javacc-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/javacc/javacc.git") + (commit "release_41"))) + (file-name (string-append "javacc-" version "-checkout")) (sha256 (base32 - "111xc9mnmc5a6qz6x3xbhqc07y1lg2b996ggzw0hrblg42zya9xf")))) + "07ysav7j8r1c6h8qxrgqk6lwdp74ly0ad1935lragxml0qqc3ka0")))) (build-system ant-build-system) + ;; Tests fail with + ;; /tmp/guix-build-javacc-4.1.drv-0/source/test/javacodeLA/build.xml:60: + ;; JAVACODE failed (arguments - `(#:test-target "test" + `(#:tests? #f #:phases (modify-phases %standard-phases (add-after 'unpack 'delete-bundled-libs (lambda _ (delete-file-recursively "lib") #t)) - (replace 'install (install-jars "target"))))) + (replace 'install (install-jars "bin/lib"))))) (home-page "https://javacc.org/") (synopsis "Java parser generator") (description "Java Compiler Compiler (JavaCC) is the most popular parser @@ -1980,29 +1984,26 @@ as tree building (via a tool called JJTree included with JavaCC), actions, debugging, etc.") (license license:bsd-3))) -(define-public javacc-4 - (package (inherit javacc) - (version "4.1") +(define-public javacc + (package + (inherit javacc-4) + (version "7.0.3") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/javacc/javacc.git") - (commit "release_41"))) - (file-name (string-append "javacc-" version "-checkout")) + (method url-fetch) + (uri (string-append "https://github.com/javacc/javacc/" + "archive/" version ".tar.gz")) + (file-name (string-append "javacc-" version ".tar.gz")) (sha256 (base32 - "07ysav7j8r1c6h8qxrgqk6lwdp74ly0ad1935lragxml0qqc3ka0")))) - ;; Tests fail with - ;; /tmp/guix-build-javacc-4.1.drv-0/source/test/javacodeLA/build.xml:60: - ;; JAVACODE failed + "111xc9mnmc5a6qz6x3xbhqc07y1lg2b996ggzw0hrblg42zya9xf")))) (arguments - `(#:tests? #f + `(#:test-target "test" #:phases (modify-phases %standard-phases (add-after 'unpack 'delete-bundled-libs (lambda _ (delete-file-recursively "lib") #t)) - (replace 'install (install-jars "bin/lib"))))))) + (replace 'install (install-jars "target"))))))) ;; This is the last 3.x release of ECJ (define-public java-ecj-3 -- cgit v1.2.3 From 6662d65f96b948271eeaa0ba5c93d0e61663e7d3 Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Fri, 25 May 2018 07:43:42 +0800 Subject: gnu: javacc: Use snippet to delete bundled jars. * gnu/packages/java.scm (javacc-4)[source](snippet, modules): New fields. [arguments]: Remove 'delete-bundled-libs' phase and add 'delete-tests' phase. * gnu/packages/java.scm (javacc)[source](snippet, modules): New fields. [arguments]: Remove 'delete-bundled-libs' phase. --- gnu/packages/java.scm | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 5447be41a5..d89ba6a005 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1960,7 +1960,10 @@ designs.") (file-name (string-append "javacc-" version "-checkout")) (sha256 (base32 - "07ysav7j8r1c6h8qxrgqk6lwdp74ly0ad1935lragxml0qqc3ka0")))) + "07ysav7j8r1c6h8qxrgqk6lwdp74ly0ad1935lragxml0qqc3ka0")) + (modules '((guix build utils))) + ;; delete bundled jars + (snippet '(begin (delete-file-recursively "lib") #t)))) (build-system ant-build-system) ;; Tests fail with ;; /tmp/guix-build-javacc-4.1.drv-0/source/test/javacodeLA/build.xml:60: @@ -1969,9 +1972,18 @@ designs.") `(#:tests? #f #:phases (modify-phases %standard-phases - (add-after 'unpack 'delete-bundled-libs + ;; Delete tests to avoid build failure (we don't run them anyway). + (add-after 'unpack 'delete-tests (lambda _ - (delete-file-recursively "lib") #t)) + (for-each delete-file + '("src/org/javacc/JavaCCTestCase.java" + "src/org/javacc/parser/ExpansionTest.java" + "src/org/javacc/parser/OptionsTest.java" + "src/org/javacc/jjtree/JJTreeOptionsTest.java")) + (for-each delete-file-recursively + '("src/org/javacc/parser/test" + "src/org/javacc/jjdoc/test")) + #t)) (replace 'install (install-jars "bin/lib"))))) (home-page "https://javacc.org/") (synopsis "Java parser generator") @@ -1995,14 +2007,14 @@ debugging, etc.") (file-name (string-append "javacc-" version ".tar.gz")) (sha256 (base32 - "111xc9mnmc5a6qz6x3xbhqc07y1lg2b996ggzw0hrblg42zya9xf")))) + "111xc9mnmc5a6qz6x3xbhqc07y1lg2b996ggzw0hrblg42zya9xf")) + (modules '((guix build utils))) + ;; delete bundled jars + (snippet '(begin (delete-file-recursively "lib") #t)))) (arguments `(#:test-target "test" #:phases (modify-phases %standard-phases - (add-after 'unpack 'delete-bundled-libs - (lambda _ - (delete-file-recursively "lib") #t)) (replace 'install (install-jars "target"))))))) ;; This is the last 3.x release of ECJ -- cgit v1.2.3 From 33428d12672fefde745b313ce1f0c02ae9870e39 Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Thu, 24 May 2018 00:32:51 +0800 Subject: gnu: javacc: Bootstrap from javacc-4 instead of bootstrap binary. * gnu/packages/java.scm (javacc)[source](snippet): Delete bootstrap binary. [arguments]: Set 'bootstrap-jar' path. [native-inputs]: Add 'javacc-4'. --- gnu/packages/java.scm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index d89ba6a005..f6d72edeea 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2010,12 +2010,20 @@ debugging, etc.") "111xc9mnmc5a6qz6x3xbhqc07y1lg2b996ggzw0hrblg42zya9xf")) (modules '((guix build utils))) ;; delete bundled jars - (snippet '(begin (delete-file-recursively "lib") #t)))) - (arguments - `(#:test-target "test" + (snippet '(begin (for-each delete-file-recursively + '("bootstrap" "lib")) + #t)))) + (arguments + `(#:make-flags ; bootstrap from javacc-4 + (list (string-append "-Dbootstrap-jar=" + (assoc-ref %build-inputs "javacc") + "/share/java/javacc.jar")) + #:test-target "test" #:phases (modify-phases %standard-phases - (replace 'install (install-jars "target"))))))) + (replace 'install (install-jars "target"))))) + (native-inputs + `(("javacc" ,javacc-4))))) ;; This is the last 3.x release of ECJ (define-public java-ecj-3 -- cgit v1.2.3 From e8ef3cc4d62d573db5e7338a0342ef20df5f8b4d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 18 Oct 2018 19:13:13 +0200 Subject: 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 (limited to 'gnu') 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")))) -- cgit v1.2.3 From 5fb543b3f7bf79208178429d38f2da047fc744c0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 18 Oct 2018 21:12:05 +0300 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From 1febc93f9b13155be7a212fcaf93d5dd181c8aea Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 18 Oct 2018 21:21:14 +0300 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From f793b4ef96d53c548494b4b15b99a31d05c449a3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 18 Oct 2018 21:30:44 +0300 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From b50d58b3445a85bf4395e2b767da10c2e3438902 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 18 Oct 2018 21:46:09 +0300 Subject: 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(-) (limited to 'gnu') 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))) -- cgit v1.2.3 From d36cd888734da3c9d7ce27dafedb00f0e42a636e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 18 Oct 2018 23:56:47 +0200 Subject: gnu: grub-efi: Fix an uninitialized variable issue. * gnu/packages/patches/grub-check-error-efibootmgr.patch: Add hunk to correct uninitialized variable. --- .../patches/grub-check-error-efibootmgr.patch | 23 +++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/patches/grub-check-error-efibootmgr.patch b/gnu/packages/patches/grub-check-error-efibootmgr.patch index b2fd160c9a..efeb20f213 100644 --- a/gnu/packages/patches/grub-check-error-efibootmgr.patch +++ b/gnu/packages/patches/grub-check-error-efibootmgr.patch @@ -160,7 +160,7 @@ index 5e4cdfd..690f180 100644 /* Try to make this image bootable using the EFI Boot Manager, if available. */ if (!efi_distributor || efi_distributor[0] == '\0') -@@ -1887,8 +1892,11 @@ main (int argc, char *argv[]) +@@ -1887,7 +1892,10 @@ main (int argc, char *argv[]) efidir_grub_dev->disk->name, (part ? ",": ""), (part ? : "")); grub_free (part); @@ -173,4 +173,25 @@ index 5e4cdfd..690f180 100644 + strerror (ret)); } break; + + +Below is a followup to the patch above: the uninitialized variable could lead +‘grub-install’ to error out when it shouldn’t (seen on an AArch64 box where +‘grub_install_remove_efi_entries_by_distributor’ didn't have any entry to +remove): + + grub-install: error: efibootmgr failed to register the boot entry: Unknown error 65535. + +See . + +--- grub-2.02/grub-core/osdep/unix/platform.c 2018-10-17 22:21:53.015284846 +0200 ++++ grub-2.02/grub-core/osdep/unix/platform.c 2018-10-17 22:21:55.595271222 +0200 +@@ -85,7 +85,7 @@ grub_install_remove_efi_entries_by_distr + pid_t pid = grub_util_exec_pipe ((const char * []){ "efibootmgr", NULL }, &fd); + char *line = NULL; + size_t len = 0; +- int rc; ++ int rc = 0; + if (!pid) + { -- cgit v1.2.3 From 402e60859da609e95d16a04a253977da88f4077e Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 17 Oct 2018 20:09:19 -0400 Subject: gnu: linux-libre: Enable SHPC PCI Hotplug driver on ARM64. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes on ARM64. * gnu/packages/aux-files/linux-libre/4.18-arm64.conf: Add CONFIG_HOTPLUG_PCI_SHPC=y. Signed-off-by: Ludovic Courtès --- gnu/packages/aux-files/linux-libre/4.18-arm64.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/aux-files/linux-libre/4.18-arm64.conf b/gnu/packages/aux-files/linux-libre/4.18-arm64.conf index ab30f51d2e..64b14b52c0 100644 --- a/gnu/packages/aux-files/linux-libre/4.18-arm64.conf +++ b/gnu/packages/aux-files/linux-libre/4.18-arm64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.18.0-gnu Kernel Configuration +# Linux/arm64 4.18.14-gnu Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y @@ -481,7 +481,7 @@ CONFIG_HOTPLUG_PCI=y CONFIG_HOTPLUG_PCI_ACPI=y CONFIG_HOTPLUG_PCI_ACPI_IBM=m CONFIG_HOTPLUG_PCI_CPCI=y -# CONFIG_HOTPLUG_PCI_SHPC is not set +CONFIG_HOTPLUG_PCI_SHPC=y # # PCI controller drivers -- cgit v1.2.3 From 3d472b5ee1a301a110087ebc08e8dcea8c3c0710 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 19 Oct 2018 03:03:05 +0200 Subject: services: WPA Supplicant: Fix syntax error. This is a followup to commit acce0a474c1493ab18912bc46285248e4ccb0314. No idea how these disappeared.. :-/ * gnu/services/networking.scm (wpa-supplicant-shepherd-service): Add missing parens. --- gnu/services/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index 61a0e975c7..b764cde5ac 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -1064,10 +1064,10 @@ networking.")))) #~("-u") #~()) #$@(if interface - #~(string-append "-i" #$interface) + #~((string-append "-i" #$interface)) #~()) #$@(if config-file - #~(string-append "-c" #$config-file) + #~((string-append "-c" #$config-file)) #~()) #$@extra-options) #:pid-file #$pid-file)) -- cgit v1.2.3 From a908ffd1abff95e526a9224d35ca5f8d31fac95c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Oct 2018 21:41:20 +0200 Subject: gnu: notmuch: Update to 0.28. * gnu/packages/mail.scm (notmuch): Update to 0.28. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 7348719ede..73a17fb21b 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -763,14 +763,14 @@ invoking @command{notifymuch} from the post-new hook.") (define-public notmuch (package (name "notmuch") - (version "0.27") + (version "0.28") (source (origin (method url-fetch) (uri (string-append "https://notmuchmail.org/releases/notmuch-" version ".tar.gz")) (sha256 (base32 - "0xh8vq2sa7r07xb3n13drc6gdiqhcgl0pj0za5xj43qkiwpikls0")))) + "0dqarmjc8544m2w7bqrqmvsfy55fw82707z3lz9cql8nr777bjmc")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) -- cgit v1.2.3 From 2c0a3ed1f98e81c6c2f828c488ec7318181de539 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Oct 2018 22:25:31 +0200 Subject: gnu: tmux: Update to 2.8. * gnu/packages/tmux.scm (tmux): Update to 2.8. --- gnu/packages/tmux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tmux.scm b/gnu/packages/tmux.scm index 1bc947844a..d8af54ce57 100644 --- a/gnu/packages/tmux.scm +++ b/gnu/packages/tmux.scm @@ -34,7 +34,7 @@ (define-public tmux (package (name "tmux") - (version "2.7") + (version "2.8") (source (origin (method url-fetch) (uri (string-append @@ -42,7 +42,7 @@ version "/tmux-" version ".tar.gz")) (sha256 (base32 - "0lnlhnafvi5700afr69g6gr62pblnd440jj0hxdbrxhk0c87vvcx")))) + "1fm22wva2znkcs5jczrnlxrpzsk2jlwdwy4dhzzyrbsgccsz6svz")))) (build-system gnu-build-system) (inputs `(("libevent" ,libevent) -- cgit v1.2.3 From 29f40ee54729bf3e13d5dffaaae01c77a9cf254e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Oct 2018 22:29:38 +0200 Subject: gnu: libgit2: Update to 0.26.7. * gnu/packages/version-control.scm (libgit2): Update to 0.26.7. --- gnu/packages/version-control.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 528d117e29..14a18c8c35 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -427,7 +427,7 @@ everything from small to very large projects with speed and efficiency.") (define-public libgit2 (package (name "libgit2") - (version "0.26.6") + (version "0.26.7") (source (origin (method url-fetch) (uri (string-append "https://github.com/libgit2/libgit2/" @@ -435,7 +435,7 @@ everything from small to very large projects with speed and efficiency.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0qjn1v5q282v8jih8rqjdqxr5v4n4manr0c8i3nnrf6sxd3xssbn")) + "1vy4dnbvhcq3pw8n8zz6clnsv2xnkrichl8k96w3lb6yyk0lln35")) (patches (search-patches "libgit2-mtime-0.patch")) ;; Remove bundled software. -- cgit v1.2.3 From 1e672a01bef602e33248467ada9fb523e8717517 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 18 Oct 2018 22:43:26 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.134. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.134. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index cd4adf9b6f..b639a57e27 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -446,8 +446,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.133" - "1vr94czdv5alzsgm2k1r6wqm01r2zafrayjn10l6kdr4g7aga488" + (make-linux-libre "4.9.134" + "0f5qif27k0mhc57d98arbfkq7zlvg0ra2gz6g5fasblyjz3j7w7h" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From ef8e7e3298e6f4f84717f304191ad64b5dc148d4 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 18 Oct 2018 22:44:09 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.77. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.77. (%linux-libre-4.14-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b639a57e27..1c73532bae 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -436,8 +436,8 @@ It has been modified to remove all non-free binary blobs.") #:patches %linux-libre-4.18-patches #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.76") -(define %linux-libre-4.14-hash "1y5zqf84ngb6f5f85xpd4bdy6mlxr52x19bx3mdrp82awc9fvr7q") +(define %linux-libre-4.14-version "4.14.77") +(define %linux-libre-4.14-hash "18y81rga2lhsk7bjckglxz52pvnzf103ar0z2zj611g37wyf83r5") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.2.3 From 75b2afd95373612d386dba7f75c4de22857f9448 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 18 Oct 2018 22:52:09 -0400 Subject: gnu: linux-libre: Update to 4.18.15. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.18.15. (%linux-libre-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1c73532bae..6a89caf277 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -405,8 +405,8 @@ It has been modified to remove all non-free binary blobs.") ;; supports qemu "virt" machine and possibly a large number of ARM boards. ;; See : https://wiki.debian.org/DebianKernel/ARMMP. -(define %linux-libre-version "4.18.14") -(define %linux-libre-hash "1gwwx8l283w8v1zylw2haqahvjns5dzqxx9li2586nnl8cfmfnwc") +(define %linux-libre-version "4.18.15") +(define %linux-libre-hash "0v6xs85qn1iy2dj3m6s3cfnhbwb1mjy21d9lagjni8dg3jic26hf") (define %linux-libre-4.18-patches (list %boot-logo-patch -- cgit v1.2.3 From eed00f93e8999712191e39c59c15e23461520f43 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 16 Oct 2018 14:15:19 -0400 Subject: gnu: libssh: Update to 0.7.6 [fixes CVE-2018-10933]. * gnu/packages/ssh.scm (libssh): Update to 0.7.6. * gnu/packages/patches/libssh-hostname-parser-bug.patch: Adjust patch. --- .../patches/libssh-hostname-parser-bug.patch | 22 ++------ gnu/packages/ssh.scm | 64 ++++++++++------------ 2 files changed, 34 insertions(+), 52 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/patches/libssh-hostname-parser-bug.patch b/gnu/packages/patches/libssh-hostname-parser-bug.patch index 69f46cbdd6..de2336e86d 100644 --- a/gnu/packages/patches/libssh-hostname-parser-bug.patch +++ b/gnu/packages/patches/libssh-hostname-parser-bug.patch @@ -1,31 +1,17 @@ -Fix "Hostname" parsing in OpenSSH config files, as reported -at . - -From: Niels Ole Salscheider -Date: Mon, 8 May 2017 17:36:13 +0200 -Subject: [PATCH] Fix reading of the first parameter - -This is a fixup for 7b8b5eb4eac314a3a29be812bef0264c6611f6e7. -Previously, it would return as long as the parameter was _not_ seen -before. It also did not handle the case for the unsupported opcode (-1) +It does not handle the case for the unsupported opcode (-1) which would cause a segfault when accessing the "seen" array. ---- - src/config.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/config.c b/src/config.c -index 7c03b27..238a655 100644 +index c5313ec8..72e07639 100644 --- a/src/config.c +++ b/src/config.c -@@ -218,8 +218,9 @@ static int ssh_config_parse_line(ssh_session session, const char *line, +@@ -218,7 +218,8 @@ static int ssh_config_parse_line(ssh_session session, const char *line, } opcode = ssh_config_get_opcode(keyword); - if (*parsing == 1 && opcode != SOC_HOST) { -- if (seen[opcode] == 0) { + if (*parsing == 1 && opcode != SOC_HOST && + opcode > SOC_UNSUPPORTED && opcode < SOC_END) { -+ if (seen[opcode] == 1) { + if (seen[opcode] != 0) { return 0; } - seen[opcode] = 1; diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 362d427a2e..829977f5c5 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -65,40 +65,36 @@ #:use-module (srfi srfi-1)) (define-public libssh - ;; This commit from the 'v0-7' branch contains 7 memory-management-related - ;; bug fixes that we'd rather have. - (let ((commit "239d0f75b5f909174c2ef7fb08d23bcfa6b20ba0") - (revision "0")) - (package - (name "libssh") - (version (git-version "0.7.5" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://git.libssh.org/projects/libssh.git") - (commit commit))) - (sha256 - (base32 - "01w72w1jsgs9ilj3n1gp6qkmdxr9n74i5h2nipi3x1vzm7bv8na1")) - (patches (search-patches "libssh-hostname-parser-bug.patch")) - (file-name (git-file-name name version)))) - (build-system cmake-build-system) - (outputs '("out" "debug")) - (arguments - '(#:configure-flags '("-DWITH_GCRYPT=ON") - - ;; TODO: Add 'CMockery' and '-DWITH_TESTING=ON' for the test suite. - #:tests? #f)) - (inputs `(("zlib" ,zlib) - ("libgcrypt" ,libgcrypt))) - (synopsis "SSH client library") - (description - "libssh is a C library implementing the SSHv2 and SSHv1 protocol for -client and server implementations. With libssh, you can remotely execute -programs, transfer files, and use a secure and transparent tunnel for your -remote applications.") - (home-page "https://www.libssh.org") - (license license:lgpl2.1+)))) + (package + (name "libssh") + (version "0.7.6") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.libssh.org/projects/libssh.git") + (commit (string-append "libssh-" version)))) + (patches (search-patches "libssh-hostname-parser-bug.patch")) + (sha256 + (base32 + "0slwqa36mhyb6brdv2jvb9fxp7rvsv3ziv67kaxx615jxn52l5pa")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (outputs '("out" "debug")) + (arguments + '(#:configure-flags '("-DWITH_GCRYPT=ON") + + ;; TODO: Add 'CMockery' and '-DWITH_TESTING=ON' for the test suite. + #:tests? #f)) + (inputs `(("zlib" ,zlib) + ("libgcrypt" ,libgcrypt))) + (synopsis "SSH client library") + (description + "libssh is a C library implementing the SSHv2 and SSHv1 protocol for client +and server implementations. With libssh, you can remotely execute programs, +transfer files, and use a secure and transparent tunnel for your remote +applications.") + (home-page "https://www.libssh.org") + (license license:lgpl2.1+))) (define-public libssh2 (package -- cgit v1.2.3 From 7d1f21c69aa89e4c7c57ace26af80d168157b243 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Fri, 19 Oct 2018 08:41:25 +0200 Subject: gnu: vulkan-headers: Update to 1.1.85.0. * gnu/packages/vulkan.scm (vulkan-headers): Update to 1.1.85.0. * gnu/packages/vulkan.scm (vulkan-loader): Update hash. * gnu/packages/vulkan.scm (vulkan-tools): Update hash. --- gnu/packages/vulkan.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 2474d640d7..ff1088d2e1 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -163,7 +163,7 @@ interpretation of the specifications for these languages.") (define-public vulkan-headers (package (name "vulkan-headers") - (version "1.1.82.0") + (version "1.1.85.0") (source (origin (method url-fetch) @@ -172,7 +172,7 @@ interpretation of the specifications for these languages.") "archive/sdk-" version ".tar.gz")) (sha256 (base32 - "1rbra47f1dkw5bjzvm0k9s2f89c2x80j904ply4bxks7sl3xlwyz")))) + "166hqqb97kjg6h9vp8yxb1cq02i1kqaxvl693482gf8v21fl7ink")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; No tests. @@ -195,7 +195,7 @@ interpretation of the specifications for these languages.") "archive/sdk-" version ".tar.gz")) (sha256 (base32 - "032vfysb8mi19c2lx08vc6k9mbzxmiy17wp7a22vpgwwv69kxkc6")))) + "04d53ynlc0ww8r67hv4sxwg5sirjhpr1laaa9hc6j4niliw0166n")))) (build-system cmake-build-system) (arguments `(#:tests? #f ;FIXME: 23/39 tests fail. Try "tests/run_all_tests.sh". @@ -251,7 +251,7 @@ and the ICD.") "archive/sdk-" version ".tar.gz")) (sha256 (base32 - "175qhfg9lxxfm5zks6jxaybcxamwd9q5kvjq8ikf2dbmskgybr92")))) + "0r26px9rh09giddajlmafv21rx1la1y3bbnjgnpai8aw98wvq9mm")))) (build-system cmake-build-system) (inputs `(("glslang" ,glslang) -- cgit v1.2.3 From 2f4d43584cb26315c028dfbd2197da0d175933a2 Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Sat, 13 Oct 2018 22:50:36 -0700 Subject: system: Rename .zlogin to .zprofile. Reported by Meiyo Peng . * gnu/system/shadow.scm (default-skeletons): Rename zlogin to zprofile. --- gnu/system/shadow.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm index f800c3b546..63f544cec9 100644 --- a/gnu/system/shadow.scm +++ b/gnu/system/shadow.scm @@ -181,7 +181,7 @@ fi alias ls='ls -p --color=auto' alias ll='ls -l' alias grep='grep --color=auto'\n")) - (zlogin (plain-file "zlogin" "\ + (zprofile (plain-file "zprofile" "\ # Honor system-wide environment variables source /etc/profile\n")) (guile-wm (computed-file "guile-wm" copy-guile-wm)) @@ -197,7 +197,10 @@ set debug-file-directory ~/.guix-profile/lib/debug set auto-load safe-path /gnu/store/*/lib\n"))) `((".bash_profile" ,profile) (".bashrc" ,bashrc) - (".zlogin" ,zlogin) + ;; Zsh sources ~/.zprofile before ~/.zshrc, and it sources ~/.zlogin + ;; after ~/.zshrc. To avoid interfering with any customizations a user + ;; may have made in their ~/.zshrc, put this in .zprofile, not .zlogin. + (".zprofile" ,zprofile) (".nanorc" ,(plain-file "nanorc" "\ # Include all the syntax highlighting modules. include /run/current-system/profile/share/nano/*.nanorc\n")) -- cgit v1.2.3 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: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 0fd874ebd11324139ddf976a39d99e6bb6f6996f Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Fri, 19 Oct 2018 11:42:25 +0200 Subject: gnu: youtube-dl: Update to 2018.10.05. * gnu/packages/video.scm (youtube-dl): Update to 2018.10.05. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index ab57ee4b45..a6930abfda 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1268,7 +1268,7 @@ access to mpv's powerful playback capabilities.") (define-public youtube-dl (package (name "youtube-dl") - (version "2018.09.18") + (version "2018.10.05") (source (origin (method url-fetch) (uri (string-append "https://yt-dl.org/downloads/" @@ -1276,7 +1276,7 @@ access to mpv's powerful playback capabilities.") version ".tar.gz")) (sha256 (base32 - "0mlsdmddmyy3xaqy366k48xds14g17l81al3kglndjkbrrji63sb")))) + "1iq02kwxdgh07bf0w0fvbsjbdshs4kja35gy8m70ji9cj10l1mbw")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion -- cgit v1.2.3 From b718793e2a3e09f458d93f1a000846308a7eb878 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 19 Oct 2018 15:08:45 +0200 Subject: gnu: Add texlive-latex-ms. * gnu/packages/tex.scm (texlive-latex-ms): New variable. --- gnu/packages/tex.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index be75bda7dd..9026c25596 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -4492,3 +4492,33 @@ including: It also ensures compatibility with the @code{media9} and @code{animate} packages.") (license license:lppl))) + +(define-public texlive-latex-ms + (package + (name "texlive-latex-ms") + (version (number->string %texlive-revision)) + (source (origin + (method svn-fetch) + (uri (texlive-ref "latex" "ms")) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "0m4wx3yjb5al1qsv995z8fii8xxy96mcfihbnlx43lpgayiwz35s")))) + (build-system texlive-build-system) + (arguments + '(#:tex-directory "latex/ms" + #:tex-format "latex")) + (home-page "https://ctan.org/pkg/ms") + (synopsis "Various LATEX packages by Martin Schröder") + (description + "A bundle of LATEX packages by Martin Schröder; the collection comprises: + +@itemize +@item @command{count1to}, make use of fixed TEX counters; +@item @command{everysel}, set commands to execute every time a font is selected; +@item @command{everyshi}, set commands to execute whenever a page is shipped out; +@item @command{multitoc}, typeset the table of contents in multiple columns; +@item @command{prelim2e}, mark typeset pages as preliminary; and +@item @command{ragged2e}, typeset ragged text and allow hyphenation. +@end itemize\n") + (license license:lppl1.3c+))) -- cgit v1.2.3 From 707babdde428bfd67d4ea9438d2f834946b1959e Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 19 Oct 2018 15:10:02 +0200 Subject: gnu: Add texlive-latex-needspace. * gnu/packages/tex.scm (texlive-latex-needspace): New variable. --- gnu/packages/tex.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 9026c25596..064ec94243 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -4522,3 +4522,28 @@ It also ensures compatibility with the @code{media9} and @code{animate} packages @item @command{ragged2e}, typeset ragged text and allow hyphenation. @end itemize\n") (license license:lppl1.3c+))) + +(define-public texlive-latex-needspace + (package + (name "texlive-latex-needspace") + (version (number->string %texlive-revision)) + (source (origin + (method svn-fetch) + (uri (texlive-ref "latex" "needspace")) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "0kw80f5jh4gdpa2ka815abza3gr5z8b929w0745vrlc59pl0017y")))) + (build-system texlive-build-system) + (arguments + '(#:tex-directory "latex/needspace" + #:tex-format "latex")) + (inputs + `(("texlive-latex-filecontents" ,texlive-latex-filecontents))) + (home-page "https://www.ctan.org/pkg/needspace") + (synopsis "Insert pagebreak if not enough space") + (description + "Provides commands to disable pagebreaking within a given vertical +space. If there is not enough space between the command and the bottom of the +page, a new page will be started.") + (license license:lppl))) -- cgit v1.2.3 From 0e73c11bb23b47ca73707d7c528e0bdcf222635e Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 19 Oct 2018 15:10:18 +0200 Subject: gnu: Add texlive-latex-eukdate. * gnu/packages/tex.scm (texlive-latex-eukdate): New variable. --- gnu/packages/tex.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 064ec94243..2d5e0865c9 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -4547,3 +4547,39 @@ It also ensures compatibility with the @code{media9} and @code{animate} packages space. If there is not enough space between the command and the bottom of the page, a new page will be started.") (license license:lppl))) + +(define-public texlive-latex-eukdate + (package + (name "texlive-latex-eukdate") + (version (number->string %texlive-revision)) + (source + (origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist/" + "/tex/latex/eukdate")) + (revision %texlive-revision))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "18xan116l8w47v560bkw6nbhkrml7g04xrlzk3jrpc7qsyf3n5fz")))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let ((target (string-append (assoc-ref %outputs "out") + "/share/texmf-dist/tex/latex/eukdate"))) + (mkdir-p target) + (copy-recursively (assoc-ref %build-inputs "source") target) + #t)))) + (home-page "https://www.ctan.org/pkg/eukdate") + (synopsis "UK format dates, with weekday") + (description + "The package is used to change the format of @code{\\today}’s date, +including the weekday, e.g., \"Saturday, 26 June 2008\", the 'UK format', which +is preferred in many parts of the world, as distinct from that which is used in +@code{\\maketitle} of the article class, \"June 26, 2008\", the 'US format'.") + (license license:lppl))) -- cgit v1.2.3 From 910d67fb95aa70c562b74869294d931129b5ddb4 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 19 Oct 2018 15:11:52 +0200 Subject: gnu: Add texlive-generic-ulem. * gnu/packages/tex.scm (texlive-generic-ulem): New variable. --- gnu/packages/tex.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 2d5e0865c9..81c0feb079 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -4583,3 +4583,40 @@ including the weekday, e.g., \"Saturday, 26 June 2008\", the 'UK format', which is preferred in many parts of the world, as distinct from that which is used in @code{\\maketitle} of the article class, \"June 26, 2008\", the 'US format'.") (license license:lppl))) + +(define-public texlive-generic-ulem + (package + (name "texlive-generic-ulem") + (version (number->string %texlive-revision)) + (source + (origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist/" + "/tex/generic/ulem")) + (revision %texlive-revision))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1rzdniqq9zk39w8ch8ylx3ywh2mj87s4ivchrsk2b8nx06jyn797")))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let ((target (string-append (assoc-ref %outputs "out") + "/share/texmf-dist/tex/generic/ulem"))) + (mkdir-p target) + (copy-recursively (assoc-ref %build-inputs "source") target) + #t)))) + (home-page "https://www.ctan.org/pkg/ulem") + (synopsis "Underline text in TeX") + (description + "The package provides an @code{\\ul} (underline) command which will break +over line ends; this technique may be used to replace @code{\\em} (both in that +form and as the @code{\\emph} command), so as to make output look as if it comes +from a typewriter. The package also offers double and wavy underlining, and +striking out (line through words) and crossing out (/// over words).") + (license license:lppl1.3c+))) -- cgit v1.2.3 From 17ef5f1ff9b9bdf1bd19cf21528713cb362a18b6 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 19 Oct 2018 15:16:40 +0200 Subject: gnu: Add texlive-latex-pgf. * gnu/packages/tex.scm (texlive-latex-pgf): New variable. --- gnu/packages/tex.scm | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 81c0feb079..4f0201425d 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -4620,3 +4620,60 @@ form and as the @code{\\emph} command), so as to make output look as if it comes from a typewriter. The package also offers double and wavy underlining, and striking out (line through words) and crossing out (/// over words).") (license license:lppl1.3c+))) + +(define-public texlive-latex-pgf + (package + (name "texlive-latex-pgf") + (version (number->string %texlive-revision)) + (source + (origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist/" + "/tex/latex/pgf")) + (revision %texlive-revision))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1dq8p10pz8wn0vx412m7d7d5gj1syxly3yqdqvf7lv2xl8zndn5h")))) + (build-system trivial-build-system) + (native-inputs + `(("texlive-latex-pgf-generic" + ,(origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist/" + "/tex/generic/pgf")) + (revision %texlive-revision))) + (file-name (string-append "texlive-latex-pgf-generic" version "-checkout")) + (sha256 + (base32 + "0xkxw26sjzr5npjpzpr28yygwdbhzpdd0hsk80gjpidhcxmz393i")))))) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let ((target-generic (string-append (assoc-ref %outputs "out") + "/share/texmf-dist/tex/generic/pgf")) + (target-latex (string-append (assoc-ref %outputs "out") + "/share/texmf-dist/tex/latex/pgf"))) + (mkdir-p target-generic) + (mkdir-p target-latex) + (copy-recursively (assoc-ref %build-inputs "texlive-latex-pgf-generic") target-generic) + (copy-recursively (assoc-ref %build-inputs "source") target-latex) + #t)))) + (home-page "https://www.ctan.org/pkg/tikz") + (synopsis "Create PostScript and PDF graphics in TeX") + (description + "PGF is a macro package for creating graphics. It is platform- and +format-independent and works together with the most important TeX backend +drivers, including pdfTeX and dvips. It comes with a user-friendly syntax layer +called TikZ. + +Its usage is similar to pstricks and the standard picture environment. PGF +works with plain (pdf-)TeX, (pdf-)LaTeX, and ConTeXt. Unlike pstricks, it can +produce either PostScript or PDF output.") + (license license:lppl1.3c+))) -- cgit v1.2.3 From e7b2937d1907ad1fa11b6237bbda9da303160c41 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 19 Oct 2018 15:17:55 +0200 Subject: gnu: Add texlive-latex-koma-script. * gnu/packages/tex.scm (texlive-latex-koma-script): New variable. --- gnu/packages/tex.scm | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 4f0201425d..6a76cbf866 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -4677,3 +4677,63 @@ Its usage is similar to pstricks and the standard picture environment. PGF works with plain (pdf-)TeX, (pdf-)LaTeX, and ConTeXt. Unlike pstricks, it can produce either PostScript or PDF output.") (license license:lppl1.3c+))) + +(define-public texlive-latex-koma-script + (package + (name "texlive-latex-koma-script") + (version (number->string %texlive-revision)) + (source (origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist/" + "/tex/latex/koma-script")) + (revision %texlive-revision))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1g8qg796hc6s092islnybaxs115ldsqwp2vxkk3gpy6vh7wc9r50")))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils) + (ice-9 match)) + #:builder + (begin + (use-modules (guix build utils) + (ice-9 match)) + (let ((root (string-append (assoc-ref %outputs "out") + "/share/texmf-dist/")) + (pkgs '(("source" . "tex/latex/koma-script")))) + (for-each (match-lambda + ((pkg . dir) + (let ((target (string-append root dir))) + (mkdir-p target) + (copy-recursively (assoc-ref %build-inputs pkg) + target)))) + pkgs) + #t)))) + (home-page "https://www.ctan.org/pkg/koma-script") + (synopsis "Bundle of versatile classes and packages") + (description + "The KOMA-Script bundle provides replacements for the article, report, and +book classes with emphasis on typography and versatility. There is also a +letter class. + +The bundle also offers: + +@itemize +@item a package for calculating type areas in the way laid down by the +typographer Jan Tschichold, +@item packages for easily changing and defining page styles, +@item a package scrdate for getting not only the current date but also the name +of the day, and +@item a package scrtime for getting the current time. +@end itemize + +All these packages may be used not only with KOMA-Script classes but also with +the standard classes. + +Since every package has its own version number, the version number quoted only +refers to the version of scrbook, scrreprt, scrartcl, scrlttr2 and +typearea (which are the main parts of the bundle).") + (license license:lppl1.3+))) -- cgit v1.2.3 From 99c61242292987e2eaae1ff32687ab019d225420 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 21 Aug 2018 18:25:50 +0200 Subject: gnu: Add cl-strings. * gnu/packages/lisp.scm (cl-strings, sbcl-cl-strings, ecl-cl-strings): New variables. --- gnu/packages/lisp.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 8b8b9229b5..ef745d0ed8 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1526,3 +1526,34 @@ based on a subset of MDL. Confusion is a MDL interpreter that works just well enough to play the original mainframe Zork all the way through.") (home-page "http://www.russotto.net/git/mrussotto/confusion/src/master/src/README") (license license:gpl3+)))) + +(define-public sbcl-cl-strings + (let ((revision "1") + (commit "c5c5cbafbf3e6181d03c354d66e41a4f063f00ae")) + (package + (name "sbcl-cl-strings") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/diogoalexandrefranco/cl-strings") + (commit commit))) + (sha256 + (base32 + "00754mfaqallj480lwd346nkfb6ra8pa8xcxcylf4baqn604zlmv")) + (file-name (string-append "cl-strings-" version "-checkout")))) + (build-system asdf-build-system/sbcl) + (synopsis "Portable, dependency-free set of utilities to manipulate strings in Common Lisp") + (description + "@command{cl-strings} is a small, portable, dependency-free set of +utilities that make it even easier to manipulate text in Common Lisp. It has +100% test coverage and works at least on sbcl, ecl, ccl, abcl and clisp.") + (home-page "https://github.com/diogoalexandrefranco/cl-strings") + (license license:expat)))) + +(define-public cl-strings + (sbcl-package->cl-source-package sbcl-cl-strings)) + +(define-public ecl-cl-strings + (sbcl-package->ecl-package sbcl-cl-strings)) -- cgit v1.2.3 From 8c661ff1ef48839de868d204487dd69eda9f5ffa Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 24 Aug 2018 11:12:36 +0200 Subject: gnu: Add trivial-features. * gnu/packages/lisp.scm (cl-trivial-features, ecl-trivial-features, sbcl-trivial-features): New variables. --- gnu/packages/lisp.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index ef745d0ed8..675c6dcaa4 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1557,3 +1557,30 @@ utilities that make it even easier to manipulate text in Common Lisp. It has (define-public ecl-cl-strings (sbcl-package->ecl-package sbcl-cl-strings)) + +(define-public sbcl-trivial-features + (package + (name "sbcl-trivial-features") + (version "0.8") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/trivial-features/trivial-features/archive/v" + version ".tar.gz")) + (sha256 + (base32 "0db1awn6jyhcfhyfvpjvfziprmq85cigf19mwbvaprhblydsag3c")) + (file-name (string-append "trivial-features-" version ".tar.gz")))) + (build-system asdf-build-system/sbcl) + (arguments '(#:tests? #f)) + (home-page "http://cliki.net/trivial-features") + (synopsis "Ensures consistency of @code{*FEATURES*} in Common Lisp") + (description "Trivial-features ensures that @code{*FEATURES*} is +consistent across multiple Common Lisp implementations.") + (license license:expat))) + +(define-public cl-trivial-features + (sbcl-package->cl-source-package sbcl-trivial-features)) + +(define-public ecl-trivial-features + (sbcl-package->ecl-package sbcl-trivial-features)) -- cgit v1.2.3 From 0cd6fb49701fcefc5e7e2d86a5bc5211b7248624 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 24 Aug 2018 11:13:46 +0200 Subject: gnu: Add hu.dwim.asdf. * gnu/packages/lisp.scm (cl-hu.dwim.asdf, ecl-hu.dwim.asdf, sbcl-hu.dwim.asdf): New variables. --- gnu/packages/lisp.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 675c6dcaa4..a163d2ec13 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1584,3 +1584,31 @@ consistent across multiple Common Lisp implementations.") (define-public ecl-trivial-features (sbcl-package->ecl-package sbcl-trivial-features)) + +(define-public sbcl-hu.dwim.asdf + (let ((commit "170b0e4fdde3df0bc537327e7600575daac9e141")) + (package + (name "sbcl-hu.dwim.asdf") + (version (git-version "0.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/nixeagle/hu.dwim.asdf") + (commit commit))) + (sha256 + (base32 "10ax7p8y6vjqxzcq125p62kf68zi455a65ysgk0kl1f2v839c33v")) + (file-name (git-file-name "hu.dwim.asdf" version)))) + (build-system asdf-build-system/sbcl) + (home-page "https://hub.darcs.net/hu.dwim/hu.dwim.asdf") + (synopsis "Extensions to ASDF") + (description "Various ASDF extensions such as attached test and +documentation system, explicit development support, etc.") + (license license:public-domain)))) + +(define-public cl-hu.dwim.asdf + (sbcl-package->cl-source-package sbcl-hu.dwim.asdf)) + +(define-public ecl-hu.dwim.asdf + (sbcl-package->ecl-package sbcl-hu.dwim.asdf)) -- cgit v1.2.3 From 4ef9ddbdaeb634948ce67687289c3d841447ec0b Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 24 Aug 2018 11:14:26 +0200 Subject: gnu: Add hu.dwim.stefil. * gnu/packages/lisp.scm (cl-hu.dwim.stefil, ecl-hu.dwim.stefil, sbcl-hu.dwim.stefil): New variables. --- gnu/packages/lisp.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index a163d2ec13..adf91a2880 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1612,3 +1612,35 @@ documentation system, explicit development support, etc.") (define-public ecl-hu.dwim.asdf (sbcl-package->ecl-package sbcl-hu.dwim.asdf)) + +(define-public sbcl-hu.dwim.stefil + (let ((commit "ab6d1aa8995878a1b66d745dfd0ba021090bbcf9")) + (package + (name "sbcl-hu.dwim.stefil") + (version (git-version "0.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://gitlab.common-lisp.net/xcvb/hu.dwim.stefil.git") + (commit commit))) + (sha256 + (base32 "1d8yccw65zj3zh46cbi3x6nmn1dwdb76s9d0av035077mvyirqqp")) + (file-name (git-file-name "hu.dwim.stefil" version)))) + (build-system asdf-build-system/sbcl) + (native-inputs + `(("asdf:cl-hu.dwim.asdf" ,sbcl-hu.dwim.asdf))) + (inputs + `(("sbcl-alexandria" ,sbcl-alexandria))) + (home-page "https://hub.darcs.net/hu.dwim/hu.dwim.stefil") + (synopsis "Simple test framework") + (description "Stefil is a simple test framework for Common Lisp, +with a focus on interactive development.") + (license license:public-domain)))) + +(define-public cl-hu.dwim.stefil + (sbcl-package->cl-source-package sbcl-hu.dwim.stefil)) + +(define-public ecl-hu.dwim.stefil + (sbcl-package->ecl-package sbcl-hu.dwim.stefil)) -- cgit v1.2.3 From 2d418bfa39149df75b3975ad677d3c9b696d1954 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 24 Aug 2018 11:16:43 +0200 Subject: gnu: Add babel. * gnu/packages/lisp.scm (cl-babel, ecl-babel, sbcl-babel): New variables. --- gnu/packages/lisp.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index adf91a2880..f5c0b90946 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1644,3 +1644,34 @@ with a focus on interactive development.") (define-public ecl-hu.dwim.stefil (sbcl-package->ecl-package sbcl-hu.dwim.stefil)) + +(define-public sbcl-babel + (package + (name "sbcl-babel") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/cl-babel/babel/archive/v" + version ".tar.gz")) + (sha256 + (base32 "189kgbmslh36xx0d2i1g6a7mcvjryvjzkdlnhilqy5xs7hkyqirq")) + (file-name (string-append name "-" version ".tar.gz")))) + (build-system asdf-build-system/sbcl) + (native-inputs + `(("tests:cl-hu.dwim.stefil" ,sbcl-hu.dwim.stefil))) + (inputs + `(("sbcl-alexandria" ,sbcl-alexandria) + ("sbcl-trivial-features" ,sbcl-trivial-features))) + (home-page "https://common-lisp.net/project/babel/") + (synopsis "Charset encoding and decoding library") + (description "Babel is a charset encoding and decoding library, not unlike +GNU libiconv, but completely written in Common Lisp.") + (license license:expat))) + +(define-public cl-babel + (sbcl-package->cl-source-package sbcl-babel)) + +(define-public ecl-babel + (sbcl-package->ecl-package sbcl-babel)) -- cgit v1.2.3 From ef091e91552dc849dcf454334449045333af9811 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 24 Aug 2018 11:19:24 +0200 Subject: gnu: Add cl-yacc. * gnu/packages/lisp.scm (cl-cl-yacc, ecl-cl-yacc, sbcl-cl-yacc): New variables. --- gnu/packages/lisp.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index f5c0b90946..d9a2cce260 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1675,3 +1675,38 @@ GNU libiconv, but completely written in Common Lisp.") (define-public ecl-babel (sbcl-package->ecl-package sbcl-babel)) + +(define-public sbcl-cl-yacc + (package + (name "sbcl-cl-yacc") + (version "0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jech/cl-yacc") + (commit (string-append "cl-yacc-" version)))) + (sha256 + (base32 + "16946pzf8vvadnyfayvj8rbh4zjzw90h0azz2qk1mxrvhh5wklib")) + (file-name (string-append "cl-yacc-" version "-checkout")))) + (build-system asdf-build-system/sbcl) + (arguments + `(#:asd-file "yacc.asd" + #:asd-system-name "yacc")) + (synopsis "LALR(1) parser generator for Common Lisp, similar in spirit to Yacc") + (description + "CL-Yacc is a LALR(1) parser generator for Common Lisp, similar in spirit +to AT&T Yacc, Berkeley Yacc, GNU Bison, Zebu, lalr.cl or lalr.scm. + +CL-Yacc uses the algorithm due to Aho and Ullman, which is the one also used +by AT&T Yacc, Berkeley Yacc and Zebu. It does not use the faster algorithm due +to DeRemer and Pennello, which is used by Bison and lalr.scm (not lalr.cl).") + (home-page "https://www.irif.fr/~jch//software/cl-yacc/") + (license license:expat))) + +(define-public cl-yacc + (sbcl-package->cl-source-package sbcl-cl-yacc)) + +(define-public ecl-cl-yacc + (sbcl-package->ecl-package sbcl-cl-yacc)) -- cgit v1.2.3 From 232e1abce7f5d949256bd851b8bf0c2d0c4830fa Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 24 Aug 2018 11:22:05 +0200 Subject: gnu: Add jpl-util. * gnu/packages/lisp.scm (cl-jpl-util, ecl-jpl-util, sbcl-jpl-util): New variables. --- gnu/packages/lisp.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index d9a2cce260..9688e2c44d 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1710,3 +1710,34 @@ to DeRemer and Pennello, which is used by Bison and lalr.scm (not lalr.cl).") (define-public ecl-cl-yacc (sbcl-package->ecl-package sbcl-cl-yacc)) + +(define-public sbcl-jpl-util + (let ((commit "0311ed374e19a49d43318064d729fe3abd9a3b62")) + (package + (name "sbcl-jpl-util") + (version "20151005") + (source + (origin + (method git-fetch) + (uri (git-reference + ;; Quicklisp uses this fork. + (url "https://github.com/hawkir/cl-jpl-util") + (commit commit))) + (file-name + (git-file-name "jpl-util" version)) + (sha256 + (base32 + "0nc0rk9n8grkg3045xsw34whmcmddn2sfrxki4268g7kpgz0d2yz")))) + (build-system asdf-build-system/sbcl) + (synopsis "Collection of Common Lisp utility functions and macros") + (description + "@command{cl-jpl-util} is a collection of Common Lisp utility functions +and macros, primarily for software projects written in CL by the author.") + (home-page "https://www.thoughtcrime.us/software/cl-jpl-util/") + (license license:isc)))) + +(define-public cl-jpl-util + (sbcl-package->cl-source-package sbcl-jpl-util)) + +(define-public ecl-jpl-util + (sbcl-package->ecl-package sbcl-jpl-util)) -- cgit v1.2.3 From 8f41fa066ec624146ace6052d718850ccaff5bcc Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 24 Aug 2018 11:24:21 +0200 Subject: gnu: Add jpl-queues. * gnu/packages/lisp.scm (cl-jpl-queues, ecl-jpl-queues, sbcl-jpl-queues): New variables. --- gnu/packages/lisp.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 9688e2c44d..72d6a6c991 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1741,3 +1741,48 @@ and macros, primarily for software projects written in CL by the author.") (define-public ecl-jpl-util (sbcl-package->ecl-package sbcl-jpl-util)) + +(define-public sbcl-jpl-queues + (package + (name "sbcl-jpl-queues") + (version "0.1") + (source + (origin + (method url-fetch) + (uri (string-append + "http://www.thoughtcrime.us/software/jpl-queues/jpl-queues-" + version + ".tar.gz")) + (sha256 + (base32 + "1wvvv7j117h9a42qaj1g4fh4mji28xqs7s60rn6d11gk9jl76h96")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("jpl-util" ,sbcl-jpl-util) + ("bordeaux-threads" ,sbcl-bordeaux-threads))) + (arguments + ;; Tests seem to be broken. + `(#:tests? #f)) + (synopsis "Common Lisp library implementing a few different kinds of queues") + (description + "A Common Lisp library implementing a few different kinds of queues: + +@itemize +@item Bounded and unbounded FIFO queues. +@item Lossy bounded FIFO queues that drop elements when full. +@item Unbounded random-order queues that use less memory than unbounded FIFO queues. +@end itemize + +Additionally, a synchronization wrapper is provided to make any queue +conforming to the @command{jpl-queues} API thread-safe for lightweight +multithreading applications. (See Calispel for a more sophisticated CL +multithreaded message-passing library with timeouts and alternation among +several blockable channels.)") + (home-page "https://www.thoughtcrime.us/software/jpl-queues/") + (license license:isc))) + +(define-public cl-jpl-queues + (sbcl-package->cl-source-package sbcl-jpl-queues)) + +(define-public ecl-jpl-queues + (sbcl-package->ecl-package sbcl-jpl-queues)) -- cgit v1.2.3 From 989cd79b5ce034df08a149ac7f7ba6ece5c5afb3 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 24 Aug 2018 11:41:45 +0200 Subject: gnu: Add eos. * gnu/packages/lisp.scm (cl-eos, ecl-eos, sbcl-eos): New variables. --- gnu/packages/lisp.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 72d6a6c991..444a1975d0 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1786,3 +1786,33 @@ several blockable channels.)") (define-public ecl-jpl-queues (sbcl-package->ecl-package sbcl-jpl-queues)) + +(define-public sbcl-eos + (let ((commit "b0faca83781ead9a588661e37bd47f90362ccd94")) + (package + (name "sbcl-eos") + (version (git-version "0.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/adlai/Eos") + (commit commit))) + (sha256 + (base32 + "1bq8cfg087iyxmxi1mwgx5cfgy3b8ydrf81xljcis8qbgb2vszph")) + (file-name (git-file-name "eos" version)))) + (build-system asdf-build-system/sbcl) + (synopsis "Unit Testing for Common Lisp") + (description + "Eos was a unit testing library for Common Lisp. +It began as a fork of FiveAM; however, FiveAM development has continued, while +that of Eos has not. Thus, Eos is now deprecated in favor of FiveAM.") + (home-page "https://github.com/adlai/Eos") + (license license:expat)))) + +(define-public cl-eos + (sbcl-package->cl-source-package sbcl-eos)) + +(define-public ecl-eos + (sbcl-package->ecl-package sbcl-eos)) -- cgit v1.2.3 From bdf83297a8cfdc83999f1511db967a3f7ff2ddbd Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 24 Aug 2018 11:44:11 +0200 Subject: gnu: Add esrap. * gnu/packages/lisp.scm (cl-esrap, ecl-esrap, sbcl-esrap): New variables. --- gnu/packages/lisp.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 444a1975d0..eac447d77f 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1816,3 +1816,43 @@ that of Eos has not. Thus, Eos is now deprecated in favor of FiveAM.") (define-public ecl-eos (sbcl-package->ecl-package sbcl-eos)) + +(define-public sbcl-esrap + (let ((commit "133be8b05c2aae48696fe5b739eea2fa573fa48d")) + (package + (name "sbcl-esrap") + (version (git-version "0.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/nikodemus/esrap") + (commit commit))) + (sha256 + (base32 + "02d5clihsdryhf7pix8c5di2571fdsffh75d40fkzhws90r5mksl")) + (file-name (git-file-name "esrap" version)))) + (build-system asdf-build-system/sbcl) + (native-inputs + `(("eos" ,sbcl-eos))) ;For testing only. + (inputs + `(("alexandria" ,sbcl-alexandria))) + (synopsis "Common Lisp packrat parser") + (description + "A packrat parser for Common Lisp. +In addition to regular Packrat / Parsing Grammar / TDPL features ESRAP supports: + +@itemize +@item dynamic redefinition of nonterminals +@item inline grammars +@item semantic predicates +@item introspective facilities (describing grammars, tracing, setting breaks) +@end itemize\n") + (home-page "https://nikodemus.github.io/esrap/") + (license license:expat)))) + +(define-public cl-esrap + (sbcl-package->cl-source-package sbcl-esrap)) + +(define-public ecl-esrap + (sbcl-package->ecl-package sbcl-esrap)) -- cgit v1.2.3 From 141001597d10bdb2d2698398c949d46f92726f46 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 24 Aug 2018 11:45:54 +0200 Subject: gnu: Add split-sequence. * gnu/packages/lisp.scm (cl-split-sequence, ecl-split-sequence, sbcl-split-sequence): New variables. --- gnu/packages/lisp.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index eac447d77f..14df21d9f4 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1856,3 +1856,35 @@ In addition to regular Packrat / Parsing Grammar / TDPL features ESRAP supports: (define-public ecl-esrap (sbcl-package->ecl-package sbcl-esrap)) + +(define-public sbcl-split-sequence + (package + (name "sbcl-split-sequence") + (version "1.4.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sharplispers/split-sequence") + (commit (string-append "v" version)))) + (sha256 + (base32 + "0c3zp6b7fmmp93sfhq112ind4zkld49ycw68z409xpnz3gc0wpf0")) + (file-name (git-file-name "split-sequence" version)))) + (build-system asdf-build-system/sbcl) + (arguments + ;; TODO: Tests seem to be broken. + ;; https://github.com/sharplispers/split-sequence/issues/8 + `(#:tests? #f)) + (synopsis "Member of the Common Lisp Utilities family of programs") + (description + "Splits sequence into a list of subsequences delimited by objects +satisfying the test.") + (home-page "https://cliki.net/split-sequence") + (license license:expat))) + +(define-public cl-split-sequence + (sbcl-package->cl-source-package sbcl-split-sequence)) + +(define-public ecl-split-sequence + (sbcl-package->ecl-package sbcl-split-sequence)) -- cgit v1.2.3 From 6a1761cbf66be57c028b5728d4da04752b9b2f15 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 24 Aug 2018 11:46:45 +0200 Subject: gnu: Add html-encode. * gnu/packages/lisp.scm (cl-html-encode, ecl-html-encode, sbcl-html-encode): New variables. --- gnu/packages/lisp.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 14df21d9f4..3c26766818 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1888,3 +1888,30 @@ satisfying the test.") (define-public ecl-split-sequence (sbcl-package->ecl-package sbcl-split-sequence)) + +(define-public sbcl-html-encode + (package + (name "sbcl-html-encode") + (version "1.2") + (source + (origin + (method url-fetch) + (uri (string-append + "http://beta.quicklisp.org/archive/html-encode/2010-10-06/html-encode-" + version ".tgz")) + (sha256 + (base32 + "06mf8wn95yf5swhmzk4vp0xr4ylfl33dgfknkabbkd8n6jns8gcf")) + (file-name (string-append "colorize" version "-checkout")))) + (build-system asdf-build-system/sbcl) + (synopsis "Common Lisp library for encoding text in various web-savvy encodings") + (description + "A library for encoding text in various web-savvy encodings.") + (home-page "http://quickdocs.org/html-encode/") + (license license:expat))) + +(define-public cl-html-encode + (sbcl-package->cl-source-package sbcl-html-encode)) + +(define-public ecl-html-encode + (sbcl-package->ecl-package sbcl-html-encode)) -- cgit v1.2.3 From b4ba1c0a38ca61cecd40f9bd1ab76b1d16edc04b Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 24 Aug 2018 11:50:31 +0200 Subject: gnu: Add colorize. * gnu/packages/lisp.scm (cl-colorize, ecl-colorize, sbcl-colorize): New variables. --- gnu/packages/lisp.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 3c26766818..d10dc7b888 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1915,3 +1915,38 @@ satisfying the test.") (define-public ecl-html-encode (sbcl-package->ecl-package sbcl-html-encode)) + +(define-public sbcl-colorize + (let ((commit "ea676b584e0899cec82f21a9e6871172fe3c0eb5")) + (package + (name "sbcl-colorize") + (version (git-version "0.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kingcons/colorize") + (commit commit))) + (sha256 + (base32 + "1pdg4kiaczmr3ivffhirp7m3lbr1q27rn7dhaay0vwghmi31zcw9")) + (file-name (git-file-name "colorize" version)))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("split-sequence" ,sbcl-split-sequence) + ("html-encode" ,sbcl-html-encode))) + (synopsis "Common Lisp for syntax highlighting") + (description + "@command{colorize} is a Lisp library for syntax highlighting +supporting the following languages: Common Lisp, Emacs Lisp, Scheme, Clojure, +C, C++, Java, Python, Erlang, Haskell, Objective-C, Diff, Webkit.") + (home-page "https://github.com/kingcons/colorize") + ;; TODO: Missing license? + (license license:expat)))) + +(define-public cl-colorize + (sbcl-package->cl-source-package sbcl-colorize)) + +(define-public ecl-colorize + (sbcl-package->ecl-package sbcl-colorize)) -- cgit v1.2.3 From ef0c3e14295a2335c271f7a4e7026deb3de18a63 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 24 Aug 2018 11:54:08 +0200 Subject: gnu: Add 3bmd. * gnu/packages/lisp.scm (cl-3bmd, ecl-3bmd, sbcl-3bmd): New variables. --- gnu/packages/lisp.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index d10dc7b888..6feff2171c 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1950,3 +1950,39 @@ C, C++, Java, Python, Erlang, Haskell, Objective-C, Diff, Webkit.") (define-public ecl-colorize (sbcl-package->ecl-package sbcl-colorize)) + +(define-public sbcl-3bmd + (let ((commit "192ea13435b605a96ef607df51317056914cabbd")) + (package + (name "sbcl-3bmd") + (version (git-version "0.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/3b/3bmd") + (commit commit))) + (sha256 + (base32 + "1rgv3gi7wf963ikmmpk132wgn0icddf226gq3bmcnk1fr3v9gf2f")) + (file-name (git-file-name "3bmd" version)))) + (build-system asdf-build-system/sbcl) + (arguments + ;; FIXME: We need to specify the name because the build-system thinks + ;; "3" is a version marker. + `(#:asd-system-name "3bmd")) + (inputs + `(("esrap" ,sbcl-esrap) + ("split-sequence" ,sbcl-split-sequence))) + (synopsis "Markdown processor in Command Lisp using esrap parser") + (description + "Common Lisp Markdown -> HTML converter, using @command{esrap} for +parsing, and grammar based on @command{peg-markdown}.") + (home-page "https://github.com/3b/3bmd") + (license license:expat)))) + +(define-public cl-3bmd + (sbcl-package->cl-source-package sbcl-3bmd)) + +(define-public ecl-3bmd + (sbcl-package->ecl-package sbcl-3bmd)) -- cgit v1.2.3 From 1a3d39c44680b811cfaf452de1b07b222c2707c7 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 24 Aug 2018 11:58:37 +0200 Subject: gnu: Add 3bmd-ext-code-blocks. * gnu/packages/lisp.scm (cl-3bmd-ext-code-blocks, ecl-3bmd-ext-code-blocks, sbcl-3bmd-ext-code-blocks): New variables. --- gnu/packages/lisp.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 6feff2171c..f3e3a866c2 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1986,3 +1986,26 @@ parsing, and grammar based on @command{peg-markdown}.") (define-public ecl-3bmd (sbcl-package->ecl-package sbcl-3bmd)) + +(define-public sbcl-3bmd-ext-code-blocks + (let ((commit "192ea13435b605a96ef607df51317056914cabbd")) + (package + (inherit sbcl-3bmd) + (name "sbcl-3bmd-ext-code-blocks") + (arguments + `(#:asd-system-name "3bmd-ext-code-blocks" + #:asd-file "3bmd-ext-code-blocks.asd")) + (inputs + `(("3bmd" ,sbcl-3bmd) + ("colorize" ,sbcl-colorize))) + (synopsis "3bmd extension which adds support for GitHub-style fenced +code blocks") + (description + "3bmd extension which adds support for GitHub-style fenced code blocks, +with @command{colorize} support.")))) + +(define-public cl-3bmd-ext-code-blocks + (sbcl-package->cl-source-package sbcl-3bmd-ext-code-blocks)) + +(define-public ecl-3bmd-ext-code-blocks + (sbcl-package->ecl-package sbcl-3bmd-ext-code-blocks)) -- cgit v1.2.3 From 1855496813bf091113484e4f1646fa5db7edb140 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 24 Aug 2018 12:06:08 +0200 Subject: gnu: Add cl-fad. * gnu/packages/lisp.scm (cl-fad, ecl-cl-fad, sbcl-cl-fad): New variables. --- gnu/packages/lisp.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index f3e3a866c2..0c04a01e66 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -2009,3 +2009,36 @@ with @command{colorize} support.")))) (define-public ecl-3bmd-ext-code-blocks (sbcl-package->ecl-package sbcl-3bmd-ext-code-blocks)) + +(define-public sbcl-cl-fad + (package + (name "sbcl-cl-fad") + (version "0.7.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/edicl/cl-fad/") + (commit (string-append "v" version)))) + (sha256 + (base32 + "1l1qmk9z57q84bz5r04sxsksggsnd7dgkxlybzh9imz6ma7sm52m")) + (file-name (string-append "cl-fad" version "-checkout")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("bordeaux-threads" ,sbcl-bordeaux-threads))) + (synopsis "Portable pathname library for Common Lisp") + (description + "CL-FAD (for \"Files and Directories\") is a thin layer atop Common +Lisp's standard pathname functions. It is intended to provide some +unification between current CL implementations on Windows, OS X, Linux, and +Unix. Most of the code was written by Peter Seibel for his book Practical +Common Lisp.") + (home-page "https://edicl.github.io/cl-fad/") + (license license:bsd-2))) + +(define-public cl-fad + (sbcl-package->cl-source-package sbcl-cl-fad)) + +(define-public ecl-cl-fad + (sbcl-package->ecl-package sbcl-cl-fad)) -- cgit v1.2.3 From 5800c538a1d46d7eae5e9f55ca0bddc7f8644545 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 24 Aug 2018 12:07:48 +0200 Subject: gnu: Add rt. * gnu/packages/lisp.scm (cl-rt, ecl-rt, sbcl-rt): New variables. --- gnu/packages/lisp.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 0c04a01e66..1953cf8f9c 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -2042,3 +2042,28 @@ Common Lisp.") (define-public ecl-cl-fad (sbcl-package->ecl-package sbcl-cl-fad)) + +(define-public sbcl-rt + (package + (name "sbcl-rt") + (version "1990.12.19") + (source + (origin + (method url-fetch) + (uri (string-append "http://beta.quicklisp.org/archive/rt/2010-10-06/rt-" + "20101006-git" ".tgz")) + (sha256 + (base32 + "1jncar0xwkqk8yrc2dln389ivvgzs7ijdhhs3zpfyi5d21f0qa1v")))) + (build-system asdf-build-system/sbcl) + (synopsis "MIT Regression Tester") + (description + "RT provides a framework for writing regression test suites.") + (home-page "https://github.com/sharplispers/nibbles") + (license license:unlicense))) + +(define-public cl-rt + (sbcl-package->cl-source-package sbcl-rt)) + +(define-public ecl-rt + (sbcl-package->ecl-package sbcl-rt)) -- cgit v1.2.3 From fbdd9b2c8bbcb70a6a9c05ece2d7a473c2075534 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 24 Aug 2018 12:09:51 +0200 Subject: gnu: Add nibbles. * gnu/packages/lisp.scm (cl-nibbles, ecl-nibbles, sbcl-nibbles): New variables. --- gnu/packages/lisp.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 1953cf8f9c..3282c31c71 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -2067,3 +2067,46 @@ Common Lisp.") (define-public ecl-rt (sbcl-package->ecl-package sbcl-rt)) + +(define-public sbcl-nibbles + (package + (name "sbcl-nibbles") + (version "0.14") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sharplispers/nibbles/") + (commit (string-append "v" version)))) + (sha256 + (base32 + "1v7qfgpvdr6nz7v63dj69d26dis0kff3rd8xamr1llfdvza2pm8f")) + (file-name (git-file-name "nibbles" version)))) + (build-system asdf-build-system/sbcl) + (native-inputs + ;; Tests only. + `(("rt" ,sbcl-rt))) + (synopsis "Common Lisp library for accessing octet-addressed blocks of data") + (description + "When dealing with network protocols and file formats, it's common to +have to read or write 16-, 32-, or 64-bit datatypes in signed or unsigned +flavors. Common Lisp sort of supports this by specifying :element-type for +streams, but that facility is underspecified and there's nothing similar for +read/write from octet vectors. What most people wind up doing is rolling their +own small facility for their particular needs and calling it a day. + +This library attempts to be comprehensive and centralize such +facilities. Functions to read 16-, 32-, and 64-bit quantities from octet +vectors in signed or unsigned flavors are provided; these functions are also +SETFable. Since it's sometimes desirable to read/write directly from streams, +functions for doing so are also provided. On some implementations, +reading/writing IEEE singles/doubles (i.e. single-float and double-float) will +also be supported.") + (home-page "https://github.com/sharplispers/nibbles") + (license license:bsd-3))) + +(define-public cl-nibbles + (sbcl-package->cl-source-package sbcl-nibbles)) + +(define-public ecl-nibbles + (sbcl-package->ecl-package sbcl-nibbles)) -- cgit v1.2.3 From e549ba059886641c1a28016822824e92be872dd8 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 24 Aug 2018 12:11:21 +0200 Subject: gnu: Add ironclad. * gnu/packages/lisp.scm (cl-ironclad, ecl-ironclad, sbcl-ironclad): New variables. --- gnu/packages/lisp.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 3282c31c71..1eff724387 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -2110,3 +2110,39 @@ also be supported.") (define-public ecl-nibbles (sbcl-package->ecl-package sbcl-nibbles)) + +(define-public sbcl-ironclad + (package + (name "sbcl-ironclad") + (version "0.42") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sharplispers/ironclad/") + (commit (string-append "v" version)))) + (sha256 + (base32 + "1wjcb9vpybxjrmch7f7s78a5abxmnknbd4fl49dl5lz8a3fc8vf0")) + (file-name (string-append "ironblad" version "-checkout")))) + (build-system asdf-build-system/sbcl) + (native-inputs + ;; Tests only. + `(("rt" ,sbcl-rt))) + (inputs + `(("flexi-streams" ,sbcl-flexi-streams) + ("nibbles" ,sbcl-nibbles))) + (synopsis "Cryptographic toolkit written in Common Lisp") + (description + "Ironclad is a cryptography library written entirely in Common Lisp. +It includes support for several popular ciphers, digests, MACs and public key +cryptography algorithms. For several implementations that support Gray +streams, support is included for convenient stream wrappers.") + (home-page "https://github.com/sharplispers/ironclad") + (license license:bsd-3))) + +(define-public cl-ironclad + (sbcl-package->cl-source-package sbcl-ironclad)) + +(define-public ecl-ironclad + (sbcl-package->ecl-package sbcl-ironclad)) -- cgit v1.2.3 From fb8c4bc6baba7a332f071183435fdb426c1365fe Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 24 Aug 2018 12:30:53 +0200 Subject: gnu: Add named-readtables. * gnu/packages/lisp.scm (cl-named-readtables, ecl-named-readtables, sbcl-named-readtables): New variables. FIX named-readtables --- gnu/packages/lisp.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 1eff724387..2b5f240c4d 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -2146,3 +2146,34 @@ streams, support is included for convenient stream wrappers.") (define-public ecl-ironclad (sbcl-package->ecl-package sbcl-ironclad)) + +(define-public sbcl-named-readtables + (let ((commit "4dfb89fa1af6b305b6492b8af042f5190c11e9fc") + (revision "1")) + (package + (name "sbcl-named-readtables") + (version (string-append "0.9-" revision "." (string-take commit 7))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/melisgl/named-readtables.git") + (commit commit))) + (sha256 + (base32 "083kgh5462iqbb4px6kq8s7sggvpvkm36hx4qi9rnaw53b6ilqkk")) + (file-name (git-file-name "named-readtables" version)))) + (build-system asdf-build-system/sbcl) + (arguments + ;; Tests seem to be broken. + `(#:tests? #f)) + (home-page "https://github.com/melisgl/named-readtables/") + (synopsis "Library that creates a namespace for named readtables") + (description "Named readtables is a library that creates a namespace for +named readtables, which is akin to package namespacing in Common Lisp.") + (license license:bsd-3)))) + +(define-public cl-named-readtables + (sbcl-package->cl-source-package sbcl-named-readtables)) + +(define-public ecl-named-readtables + (sbcl-package->ecl-package sbcl-named-readtables)) -- cgit v1.2.3 From f07efbf1e68a26de768694fea9baa249a3183242 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 24 Aug 2018 12:35:50 +0200 Subject: gnu: Add pythonic-string-reader. * gnu/packages/lisp.scm (cl-pythonic-string-reader, ecl-pythonic-string-reader, sbcl-pythonic-string-reader): New variables. --- gnu/packages/lisp.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 2b5f240c4d..864186e080 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -2177,3 +2177,34 @@ named readtables, which is akin to package namespacing in Common Lisp.") (define-public ecl-named-readtables (sbcl-package->ecl-package sbcl-named-readtables)) + +(define-public sbcl-pythonic-string-reader + (let ((commit "47a70ba1e32362e03dad6ef8e6f36180b560f86a")) + (package + (name "sbcl-pythonic-string-reader") + (version (git-version "0.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/smithzvk/pythonic-string-reader/") + (commit commit))) + (sha256 + (base32 "1b5iryqw8xsh36swckmz8rrngmc39k92si33fgy5pml3n9l5rq3j")) + (file-name (git-file-name "pythonic-string-reader" version)))) + (build-system asdf-build-system/sbcl) + (inputs + `(("named-readtables" ,sbcl-named-readtables))) + (home-page "https://github.com/smithzvk/pythonic-string-reader") + (synopsis "Read table modification inspired by Python's three quote strings") + (description "This piece of code sets up some reader macros that make it +simpler to input string literals which contain backslashes and double quotes +This is very useful for writing complicated docstrings and, as it turns out, +writing code that contains string literals that contain code themselves.") + (license license:bsd-3)))) + +(define-public cl-pythonic-string-reader + (sbcl-package->cl-source-package sbcl-pythonic-string-reader)) + +(define-public ecl-pythonic-string-reader + (sbcl-package->ecl-package sbcl-pythonic-string-reader)) -- cgit v1.2.3 From 8d8d1c8d6c06d777369e4680a70345ff3212e3a8 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 24 Aug 2018 13:10:55 +0200 Subject: gnu: Add mgl-pax. * gnu/packages/lisp.scm (cl-mgl-pax, ecl-mgl-pax, sbcl-mgl-pax): New variables. --- gnu/packages/lisp.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 864186e080..18d90d7dbf 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -2208,3 +2208,53 @@ writing code that contains string literals that contain code themselves.") (define-public ecl-pythonic-string-reader (sbcl-package->ecl-package sbcl-pythonic-string-reader)) + +(define-public sbcl-mgl-pax + (let ((commit "818448418d6b9de74620f606f5b23033c6082769")) + (package + (name "sbcl-mgl-pax") + (version (git-version "0.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/melisgl/mgl-pax") + (commit commit))) + (sha256 + (base32 + "1p97zfkh130bdxqqxwaw2j9psv58751wakx7czbfpq410lg7dd7i")) + (file-name (git-file-name "mgl-pax" version)))) + (build-system asdf-build-system/sbcl) + (inputs + `(("3bmd" ,sbcl-3bmd) + ("3bmd-ext-code-blocks" ,sbcl-3bmd-ext-code-blocks) + ("babel" ,sbcl-babel) + ("cl-fad" ,sbcl-cl-fad) + ("ironclad" ,sbcl-ironclad) + ("named-readtables" ,sbcl-named-readtables) + ("pythonic-string-reader" ,sbcl-pythonic-string-reader) + ("swank" ,sbcl-slime-swank))) + (synopsis "Exploratory programming environment and documentation generator") + (description + "PAX provides an extremely poor man's Explorable Programming +environment. Narrative primarily lives in so called sections that mix markdown +docstrings with references to functions, variables, etc, all of which should +probably have their own docstrings. + +The primary focus is on making code easily explorable by using SLIME's +@command{M-.} (@command{slime-edit-definition}). See how to enable some +fanciness in Emacs Integration. Generating documentation from sections and all +the referenced items in Markdown or HTML format is also implemented. + +With the simplistic tools provided, one may accomplish similar effects as with +Literate Programming, but documentation is generated from code, not vice versa +and there is no support for chunking yet. Code is first, code must look +pretty, documentation is code.") + (home-page "http://quotenil.com/") + (license license:expat)))) + +(define-public cl-mgl-pax + (sbcl-package->cl-source-package sbcl-mgl-pax)) + +(define-public ecl-mgl-pax + (sbcl-package->ecl-package sbcl-mgl-pax)) -- cgit v1.2.3 From a927eb3653df9097d0d6768fbfc1652221b7cdcd Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 24 Aug 2018 11:36:22 +0200 Subject: gnu: Add ascii-strings. * gnu/packages/lisp.scm (cl-ascii-strings, ecl-ascii-strings, sbcl-ascii-strings): New variables. --- gnu/packages/lisp.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 18d90d7dbf..139e9d2c5e 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -31,6 +31,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix hg-download) #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system asdf) @@ -2258,3 +2259,38 @@ pretty, documentation is code.") (define-public ecl-mgl-pax (sbcl-package->ecl-package sbcl-mgl-pax)) + +(define-public sbcl-ascii-strings + (let ((revision "1") + (changeset "5048480a61243e6f1b02884012c8f25cdbee6d97")) + (package + (name "sbcl-ascii-strings") + (version (string-append "0-" revision "." (string-take changeset 7))) + (source + (origin + (method hg-fetch) + (uri (hg-reference + (url "https://bitbucket.org/vityok/cl-string-match/") + (changeset changeset))) + (sha256 + (base32 + "01wn5qx562w43ssy92xlfgv79w7p0nv0wbl76mpmba131n9ziq2y")) + (file-name (git-file-name "cl-string-match" version)))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("babel" ,sbcl-babel))) + (arguments + `(#:asd-file "ascii-strings.asd")) + (synopsis "Operations on ASCII strings") + (description + "Operations on ASCII strings. Essentially this can be any kind of +single-byte encoded strings.") + (home-page "https://bitbucket.org/vityok/cl-string-match/") + (license license:bsd-3)))) + +(define-public cl-ascii-strings + (sbcl-package->cl-source-package sbcl-ascii-strings)) + +(define-public ecl-ascii-strings + (sbcl-package->ecl-package sbcl-ascii-strings)) -- cgit v1.2.3 From 109ce303f4f1b99a9b47ced0efbe412e68eb2eb3 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 24 Aug 2018 11:38:00 +0200 Subject: gnu: Add cl-string-match. * gnu/packages/lisp.scm (cl-string-match, ecl-cl-string-match, sbcl-cl-string-match): New variables. --- gnu/packages/lisp.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 139e9d2c5e..e98b937fe6 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -2294,3 +2294,35 @@ single-byte encoded strings.") (define-public ecl-ascii-strings (sbcl-package->ecl-package sbcl-ascii-strings)) + +(define-public sbcl-cl-string-match + (package + (inherit sbcl-ascii-strings) + (name "sbcl-cl-string-match") + (inputs + `(("alexandria" ,sbcl-alexandria) + ("ascii-strings" ,sbcl-ascii-strings) + ("yacc" ,sbcl-cl-yacc) + ("jpl-util" ,sbcl-jpl-util) + ("jpl-queues" ,sbcl-jpl-queues) + ("mgl-pax" ,sbcl-mgl-pax) + ("iterate" ,sbcl-iterate))) + ;; TODO: Tests are not evaluated properly. + (native-inputs + ;; For testing: + `(("lisp-unit" ,sbcl-lisp-unit) + ("simple-scanf" ,sbcl-simple-scanf))) + (arguments + `(#:tests? #f + #:asd-file "cl-string-match.asd")) + (synopsis "Portable, dependency-free set of utilities to manipulate strings in Common Lisp") + (description + "@command{cl-strings} is a small, portable, dependency-free set of +utilities that make it even easier to manipulate text in Common Lisp. It has +100% test coverage and works at least on sbcl, ecl, ccl, abcl and clisp."))) + +(define-public cl-string-match + (sbcl-package->cl-source-package sbcl-cl-string-match)) + +(define-public ecl-cl-string-match + (sbcl-package->ecl-package sbcl-cl-string-match)) -- cgit v1.2.3 From c4d4ae1e16254a96caaeb5ccb4486f301ae4f1b7 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 11 Sep 2018 22:59:35 +0200 Subject: gnu: Add sbcl-slime-swank. * gnu/packages/lisp.scm (sbcl-slime-swank): New variable. --- gnu/packages/lisp.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index e98b937fe6..54beb3b25d 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -2210,6 +2210,50 @@ writing code that contains string literals that contain code themselves.") (define-public ecl-pythonic-string-reader (sbcl-package->ecl-package sbcl-pythonic-string-reader)) +(define-public sbcl-slime-swank + (package + (name "sbcl-slime-swank") + (version "2.22") + (source + (origin + (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + ;; (url "https://github.com/slime/slime/") + ;; (commit "841f61467c03dea9f38ff9d5af0e21a8aa29e8f7") + ;; REVIEW: Do we need sionescu's patch to package SWANK? + (url "https://github.com/sionescu/slime/") + ;; (commit "swank-asdf") + (commit "2f7c3fcb3ac7d50d844d5c6ca0e89b52a45e1d3a"))) + (sha256 + (base32 + ;; "065bc4y6iskazdfwlhgcjlzg9bi2hyjbhmyjw3461506pgkj08vi" + "0pkmg94wn4ii1zhlrncn44mdc5i6c5v0i9gbldx4dwl2yy7ibz5c")) + (modules '((guix build utils))) + (snippet + '(begin + (substitute* "contrib/swank-listener-hooks.lisp" + ((":compile-toplevel :load-toplevel ") "")) + (substitute* "contrib/swank-presentations.lisp" + ((":compile-toplevel :load-toplevel ") "")) + (substitute* "swank.asd" + ((":file \"packages\".*" all) + (string-append all "(:file \"swank-loader-asdf\")\n"))) + (substitute* "swank-loader-asdf.lisp" + ((":common-lisp" all) (string-append all " #:asdf"))) + #t)))) + (build-system asdf-build-system/sbcl) + (arguments + `(#:asd-file "swank.asd" + #:asd-system-name "swank")) + (home-page "https://github.com/slime/slime") + (synopsis "Common Lisp Swank server") + (description + "This is only useful if you want to start a Swank server in a Lisp +processes that doesn't run under Emacs. Lisp processes created by +@command{M-x slime} automatically start the server.") + (license (license (list license:gpl2+ license:public-domain))))) + (define-public sbcl-mgl-pax (let ((commit "818448418d6b9de74620f606f5b23033c6082769")) (package -- cgit v1.2.3 From 19a1c3be9773a6c6accee9e4e1d7f6319c49dfed Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 1 Oct 2018 15:27:37 +0200 Subject: gnu: Add lisp-unit. * gnu/packages/lisp.scm (cl-lisp-unit, ecl-lisp-unit, sbcl-lisp-unit): New variables. --- gnu/packages/lisp.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 54beb3b25d..5c25daff52 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -2304,6 +2304,35 @@ pretty, documentation is code.") (define-public ecl-mgl-pax (sbcl-package->ecl-package sbcl-mgl-pax)) +(define-public sbcl-lisp-unit + (let ((commit "89653a232626b67400bf9a941f9b367da38d3815")) + (package + (name "sbcl-lisp-unit") + (version (git-version "0.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/OdonataResearchLLC/lisp-unit") + (commit commit))) + (sha256 + (base32 + "0p6gdmgr7p383nvd66c9y9fp2bjk4jx1lpa5p09g43hr9y9pp9ry")) + (file-name (git-file-name "lisp-unit" version)))) + (build-system asdf-build-system/sbcl) + (synopsis "Common Lisp Test framework inspired by JUnit to be simple of use") + (description + "@command{lisp-unit} is a Common Lisp library that supports unit +testing. It is an extension of the library written by Chris Riesbeck.") + (home-page "https://github.com/OdonataResearchLLC/lisp-unit") + (license license:expat)))) + +(define-public cl-lisp-unit + (sbcl-package->cl-source-package sbcl-lisp-unit)) + +(define-public ecl-lisp-unit + (sbcl-package->ecl-package sbcl-lisp-unit)) + (define-public sbcl-ascii-strings (let ((revision "1") (changeset "5048480a61243e6f1b02884012c8f25cdbee6d97")) -- cgit v1.2.3 From 9f3000cc11c0b0bb3c8da5dc5f4390243f1e0321 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 1 Oct 2018 15:28:56 +0200 Subject: gnu: Add anaphora. * gnu/packages/lisp.scm (cl-anaphora, ecl-anaphora, sbcl-anaphora): New variables. --- gnu/packages/lisp.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 5c25daff52..967b648506 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -2333,6 +2333,37 @@ testing. It is an extension of the library written by Chris Riesbeck.") (define-public ecl-lisp-unit (sbcl-package->ecl-package sbcl-lisp-unit)) +(define-public sbcl-anaphora + (package + (name "sbcl-anaphora") + (version "0.9.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tokenrove/anaphora") + (commit version))) + (sha256 + (base32 + "19wfrk3asimznkli0x2rfy637hwpdgqyvwj3vhq9x7vjvyf5vv6x")) + (file-name (git-file-name "anaphora" version)))) + (build-system asdf-build-system/sbcl) + (native-inputs + `(("rt" ,sbcl-rt))) + (synopsis "The anaphoric macro collection from Hell") + (description + "Anaphora is the anaphoric macro collection from Hell: it includes many +new fiends in addition to old friends like @command{aif} and +@command{awhen}.") + (home-page "https://github.com/tokenrove/anaphora") + (license license:public-domain))) + +(define-public cl-anaphora + (sbcl-package->cl-source-package sbcl-anaphora)) + +(define-public ecl-anaphora + (sbcl-package->ecl-package sbcl-anaphora)) + (define-public sbcl-ascii-strings (let ((revision "1") (changeset "5048480a61243e6f1b02884012c8f25cdbee6d97")) -- cgit v1.2.3 From 5b8a801d164634e1b34eb49a29c96bc7a1d1fac4 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 1 Oct 2018 15:29:24 +0200 Subject: gnu: Add lift. * gnu/packages/lisp.scm (cl-lift, ecl-lift, sbcl-lift): New variables. --- gnu/packages/lisp.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 967b648506..e6dc798407 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -2364,6 +2364,49 @@ new fiends in addition to old friends like @command{aif} and (define-public ecl-anaphora (sbcl-package->ecl-package sbcl-anaphora)) +(define-public sbcl-lift + (let ((commit "7d49a66c62759535624037826891152223d4206c")) + (package + (name "sbcl-lift") + (version (git-version "0.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gwkkwg/lift") + (commit commit))) + (sha256 + (base32 + "127v5avpz1i4m0lkaxqrq8hrl69rdazqaxf6s8awf0nd7wj2g4dp")) + (file-name (git-file-name "lift" version)))) + (build-system asdf-build-system/sbcl) + (arguments + ;; The tests require a debugger, but we run with the debugger disabled. + '(#:tests? #f + #:phases + (modify-phases %standard-phases + ;; Do this to ensure the 'reset-gzip-timestamps phase works. + (add-after 'unpack 'make-gzips-writeable + (lambda _ + (for-each (lambda (file) + (chmod file #o755)) + (find-files "." "\\.gz$"))))))) + (synopsis "LIsp Framework for Testing") + (description + "The LIsp Framework for Testing (LIFT) is a unit and system test tool for LISP. +Though inspired by SUnit and JUnit, it's built with Lisp in mind. In LIFT, +testcases are organized into hierarchical testsuites each of which can have +its own fixture. When run, a testcase can succeed, fail, or error. LIFT +supports randomized testing, benchmarking, profiling, and reporting.") + (home-page "https://github.com/gwkkwg/lift") + (license license:x11-style)))) + +(define-public cl-lift + (sbcl-package->cl-source-package sbcl-lift)) + +(define-public ecl-lift + (sbcl-package->ecl-package sbcl-lift)) + (define-public sbcl-ascii-strings (let ((revision "1") (changeset "5048480a61243e6f1b02884012c8f25cdbee6d97")) -- cgit v1.2.3 From d414223205d2007e0c08420b34fee178cb04e77b Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 1 Oct 2018 15:29:54 +0200 Subject: gnu: Add let-plus. * gnu/packages/lisp.scm (cl-let-plus, ecl-let-plus, sbcl-let-plus): New variables. --- gnu/packages/lisp.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index e6dc798407..3e9180fc9a 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -2407,6 +2407,48 @@ supports randomized testing, benchmarking, profiling, and reporting.") (define-public ecl-lift (sbcl-package->ecl-package sbcl-lift)) +(define-public sbcl-let-plus + (let ((commit "5f14af61d501ecead02ec6b5a5c810efc0c9fdbb")) + (package + (name "sbcl-let-plus") + (version (git-version "0.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sharplispers/let-plus") + (commit commit))) + (sha256 + (base32 + "0i050ca2iys9f5mb7dgqgqdxfnc3b0rnjdwv95sqd490vkiwrsaj")) + (file-name (git-file-name "let-plus" version)))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("anaphora" ,sbcl-anaphora))) + (native-inputs + `(("lift" ,sbcl-lift))) + (synopsis "Destructuring extension of let*") + (description + "This library implements the let+ macro, which is a dectructuring +extension of let*. It features: + +@itemize +@item Clean, consistent syntax and small implementation (less than 300 LOC, +not counting tests) +@item Placeholder macros allow editor hints and syntax highlighting +@item @command{&ign} for ignored values (in forms where that makes sense) +@item Very easy to extend +@end itemize\n") + (home-page "https://github.com/sharplispers/let-plus") + (license license:boost1.0)))) + +(define-public cl-let-plus + (sbcl-package->cl-source-package sbcl-let-plus)) + +(define-public ecl-let-plus + (sbcl-package->ecl-package sbcl-let-plus)) + (define-public sbcl-ascii-strings (let ((revision "1") (changeset "5048480a61243e6f1b02884012c8f25cdbee6d97")) -- cgit v1.2.3 From 8caa928dd44421322805d623fd47ecb8854345fa Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 1 Oct 2018 15:30:21 +0200 Subject: gnu: Add cl-colors. * gnu/packages/lisp.scm (cl-colors, ecl-cl-colors, sbcl-cl-colors): New variables. --- gnu/packages/lisp.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 3e9180fc9a..689a617850 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -2449,6 +2449,47 @@ not counting tests) (define-public ecl-let-plus (sbcl-package->ecl-package sbcl-let-plus)) +(define-public sbcl-cl-colors + (let ((commit "827410584553f5c717eec6182343b7605f707f75")) + (package + (name "sbcl-cl-colors") + (version (git-version "0.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tpapp/cl-colors") + (commit commit))) + (sha256 + (base32 + "0l446lday4hybsm9bq3jli97fvv8jb1d33abg79vbylpwjmf3y9a")) + (file-name (git-file-name "cl-colors" version)))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("let-plus" ,sbcl-let-plus))) + (synopsis "Simple color library for Common Lisp") + (description + "This is a very simple color library for Common Lisp, providing + +@itemize +@item Types for representing colors in HSV and RGB spaces. +@item Simple conversion functions between the above types (and also +hexadecimal representation for RGB). +@item Some predefined colors (currently X11 color names – of course the +library does not depend on X11).Because color in your terminal is nice. +@end itemize + +This library is no longer supported by its author.") + (home-page "https://github.com/tpapp/cl-colors") + (license license:boost1.0)))) + +(define-public cl-colors + (sbcl-package->cl-source-package sbcl-cl-colors)) + +(define-public ecl-cl-colors + (sbcl-package->ecl-package sbcl-cl-colors)) + (define-public sbcl-ascii-strings (let ((revision "1") (changeset "5048480a61243e6f1b02884012c8f25cdbee6d97")) -- cgit v1.2.3 From 68a7b929f375bb11f29b822571c33ab0bdfd0187 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 1 Oct 2018 15:30:47 +0200 Subject: gnu: Add cl-ansi-text. * gnu/packages/lisp.scm (cl-ansi-text, ecl-cl-ansi-text, sbcl-cl-ansi-text): New variables. --- gnu/packages/lisp.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 689a617850..8402c805aa 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -2490,6 +2490,44 @@ This library is no longer supported by its author.") (define-public ecl-cl-colors (sbcl-package->ecl-package sbcl-cl-colors)) +(define-public sbcl-cl-ansi-text + (let ((commit "53badf7878f27f22f2d4a2a43e6df458e43acbe9")) + (package + (name "sbcl-cl-ansi-text") + (version (git-version "1.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pnathan/cl-ansi-text") + (commit commit))) + (sha256 + (base32 + "11i27n0dbz5lmygiw65zzr8lx0rac6b6yysqranphn31wls6ja3v")) + (file-name (git-file-name "cl-ansi-text" version)))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cl-colors" ,sbcl-cl-colors))) + (native-inputs + `(("fiveam" ,sbcl-fiveam))) + (synopsis "ANSI terminal color implementation for Common Lisp") + (description + "@command{cl-ansi-text} provides utilities which enable printing to an +ANSI terminal with colored text. It provides the macro @command{with-color} +which causes everything printed in the body to be displayed with the provided +color. It further provides functions which will print the argument with the +named color.") + (home-page "https://github.com/pnathan/cl-ansi-text") + ;; REVIEW: The actual license is LLGPL. Should we add it to Guix? + (license license:lgpl3+)))) + +(define-public cl-ansi-text + (sbcl-package->cl-source-package sbcl-cl-ansi-text)) + +(define-public ecl-cl-ansi-text + (sbcl-package->ecl-package sbcl-cl-ansi-text)) + (define-public sbcl-ascii-strings (let ((revision "1") (changeset "5048480a61243e6f1b02884012c8f25cdbee6d97")) -- cgit v1.2.3 From 1a42bb80cb257aa4cec725dd2ef5c20123b8be9f Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 1 Oct 2018 15:31:03 +0200 Subject: gnu: Add prove-asdf. * gnu/packages/lisp.scm (cl-prove-asdf, ecl-prove-asdf, sbcl-prove-asdf): New variables. --- gnu/packages/lisp.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 8402c805aa..5f97c620fb 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -2528,6 +2528,36 @@ named color.") (define-public ecl-cl-ansi-text (sbcl-package->ecl-package sbcl-cl-ansi-text)) +(define-public sbcl-prove-asdf + (let ((commit "4f9122bd393e63c5c70c1fba23070622317cfaa0")) + (package + (name "sbcl-prove-asdf") + (version (git-version "1.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fukamachi/prove") + (commit commit))) + (sha256 + (base32 + "07sbfw459z8bbjvx1qlmfa8qk2mvbjnnzi2mi0x72blaj8bkl4vc")) + (file-name (git-file-name "prove" version)))) + (build-system asdf-build-system/sbcl) + (arguments + `(#:asd-file "prove-asdf.asd")) + (synopsis "Test requirement for the Common Lisp 'prove' library") + (description + "Test requirement for the Common Lisp @command{prove} library.") + (home-page "https://github.com/fukamachi/prove") + (license license:expat)))) + +(define-public cl-prove-asdf + (sbcl-package->cl-source-package sbcl-prove-asdf)) + +(define-public ecl-prove-asdf + (sbcl-package->ecl-package sbcl-prove-asdf)) + (define-public sbcl-ascii-strings (let ((revision "1") (changeset "5048480a61243e6f1b02884012c8f25cdbee6d97")) -- cgit v1.2.3 From 86afb0a272dc24b68245d35825c0b7b5cc73f64a Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 1 Oct 2018 15:31:25 +0200 Subject: gnu: Add prove. * gnu/packages/lisp.scm (cl-prove, ecl-prove, sbcl-prove): New variables. --- gnu/packages/lisp.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 5f97c620fb..2e4725e084 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -2558,6 +2558,38 @@ named color.") (define-public ecl-prove-asdf (sbcl-package->ecl-package sbcl-prove-asdf)) +(define-public sbcl-prove + (package + (inherit sbcl-prove-asdf) + (name "sbcl-prove") + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cl-ppcre" ,sbcl-cl-ppcre) + ("cl-ansi-text" ,sbcl-cl-ansi-text))) + (native-inputs + `(("prove-asdf" ,sbcl-prove-asdf))) + (arguments + `(#:asd-file "prove.asd")) + (synopsis "Yet another unit testing framework for Common Lisp") + (description + "This project was originally called @command{cl-test-more}. +@command{prove} is yet another unit testing framework for Common Lisp. The +advantages of @command{prove} are: + +@itemize +@item Various simple functions for testing and informative error messages +@item ASDF integration +@item Extensible test reporters +@item Colorizes the report if it's available (note for SLIME) +@item Reports test durations +@end itemize\n"))) + +(define-public cl-prove + (sbcl-package->cl-source-package sbcl-prove)) + +(define-public ecl-prove + (sbcl-package->ecl-package sbcl-prove)) + (define-public sbcl-ascii-strings (let ((revision "1") (changeset "5048480a61243e6f1b02884012c8f25cdbee6d97")) -- cgit v1.2.3 From 41b3b866ce1166d73b3c8530998f91730b3d48e3 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 1 Oct 2018 15:31:46 +0200 Subject: gnu: Add proc-parse. * gnu/packages/lisp.scm (cl-proc-parse, ecl-proc-parse, sbcl-proc-parse): New variables. --- gnu/packages/lisp.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 2e4725e084..cc3c343c81 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -2590,6 +2590,45 @@ advantages of @command{prove} are: (define-public ecl-prove (sbcl-package->ecl-package sbcl-prove)) +(define-public sbcl-proc-parse + (let ((commit "ac3636834d561bdc2686c956dbd82494537285fd")) + (package + (name "sbcl-proc-parse") + (version (git-version "0.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fukamachi/proc-parse") + (commit commit))) + (sha256 + (base32 + "06rnl0h4cx6xv2wj3jczmmcxqn2703inmmvg1s4npbghmijsybfh")) + (file-name (git-file-name "proc-parse" version)))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("babel" ,sbcl-babel))) + (native-inputs + `(("prove" ,sbcl-prove) + ("prove-asdf" ,sbcl-prove-asdf))) + (arguments + ;; TODO: Tests don't find "proc-parse-test", why? + `(#:tests? #f)) + (synopsis "Procedural vector parser") + (description + "This is a string/octets parser library for Common Lisp with speed and +readability in mind. Unlike other libraries, the code is not a +pattern-matching-like, but a char-by-char procedural parser.") + (home-page "https://github.com/fukamachi/proc-parse") + (license license:bsd-2)))) + +(define-public cl-proc-parse + (sbcl-package->cl-source-package sbcl-proc-parse)) + +(define-public ecl-proc-parse + (sbcl-package->ecl-package sbcl-proc-parse)) + (define-public sbcl-ascii-strings (let ((revision "1") (changeset "5048480a61243e6f1b02884012c8f25cdbee6d97")) -- cgit v1.2.3 From 28b52970ba097f9ff274b3484b1a353d67865968 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 1 Oct 2018 15:31:59 +0200 Subject: gnu: Add parse-float. * gnu/packages/lisp.scm (cl-parse-float, ecl-parse-float, sbcl-parse-float): New variables. --- gnu/packages/lisp.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index cc3c343c81..807398d508 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -2629,6 +2629,45 @@ pattern-matching-like, but a char-by-char procedural parser.") (define-public ecl-proc-parse (sbcl-package->ecl-package sbcl-proc-parse)) +(define-public sbcl-parse-float + (let ((commit "2aae569f2a4b2eb3bfb5401a959425dcf151b09c")) + (package + (name "sbcl-parse-float") + (version (git-version "0.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/soemraws/parse-float") + (commit commit))) + (sha256 + (base32 + "08xw8cchhmqcc0byng69m3f5a2izc9y2290jzz2k0qrbibp1fdk7")) + (file-name (git-file-name "proc-parse" version)))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("babel" ,sbcl-babel))) + (native-inputs + `(("prove" ,sbcl-prove) + ("prove-asdf" ,sbcl-prove-asdf))) + (arguments + ;; TODO: Tests don't find "proc-parse-test", why? + `(#:tests? #f)) + (synopsis "Parse a floating point value from a string in Common Lisp") + (description + "This package exports the following function to parse floating-point +values from a string in Common Lisp.") + (home-page "https://github.com/soemraws/parse-float") + ;; TODO: Missing license? + (license license:public-domain)))) + +(define-public cl-parse-float + (sbcl-package->cl-source-package sbcl-parse-float)) + +(define-public ecl-parse-float + (sbcl-package->ecl-package sbcl-parse-float)) + (define-public sbcl-ascii-strings (let ((revision "1") (changeset "5048480a61243e6f1b02884012c8f25cdbee6d97")) -- cgit v1.2.3 From a28d00d999e7429a0be3e27c648688065089a6cb Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 1 Oct 2018 15:32:42 +0200 Subject: gnu: Add simple-scanf. * gnu/packages/lisp.scm (cl-simple-scanf, ecl-simple-scanf, sbcl-simple-scanf): New variables. --- gnu/packages/lisp.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 807398d508..7a6bf7496d 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -2703,6 +2703,27 @@ single-byte encoded strings.") (define-public ecl-ascii-strings (sbcl-package->ecl-package sbcl-ascii-strings)) +(define-public sbcl-simple-scanf + (package + (inherit sbcl-ascii-strings) + (name "sbcl-simple-scanf") + (inputs + `(("alexandria" ,sbcl-alexandria) + ("iterate" ,sbcl-iterate) + ("proc-parse" ,sbcl-proc-parse) + ("parse-float" ,sbcl-parse-float))) + (arguments + `(#:asd-file "simple-scanf.asd")) + (synopsis "Simple scanf-like functionality implementation") + (description + "A simple scanf-like functionality implementation."))) + +(define-public cl-simple-scanf + (sbcl-package->cl-source-package sbcl-simple-scanf)) + +(define-public ecl-simple-scanf + (sbcl-package->ecl-package sbcl-simple-scanf)) + (define-public sbcl-cl-string-match (package (inherit sbcl-ascii-strings) -- cgit v1.2.3 From 1de50cb73e6ba622c494200066fbd87884122f38 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 1 Oct 2018 22:37:26 +0200 Subject: gnu: Add ptester. * gnu/packages/lisp.scm (cl-ptester, ecl-ptester, sbcl-ptester): New variables. --- gnu/packages/lisp.scm | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 7a6bf7496d..f866255bf6 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -63,7 +63,8 @@ #:use-module (gnu packages version-control) #:use-module (gnu packages xorg) #:use-module (ice-9 match) - #:use-module (srfi srfi-1)) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-19)) (define (asdf-substitutions lisp) ;; Prepend XDG_DATA_DIRS/LISP-bundle-systems to ASDF's @@ -2755,3 +2756,32 @@ utilities that make it even easier to manipulate text in Common Lisp. It has (define-public ecl-cl-string-match (sbcl-package->ecl-package sbcl-cl-string-match)) + +(define-public sbcl-ptester + (package + (name "sbcl-ptester") + (version "20160929") + (source + (origin + (method url-fetch) + (uri (string-append "http://beta.quicklisp.org/archive/ptester/" + (date->string (string->date version "~Y~m~d") "~Y-~m-~d") + "/ptester-" + version + "-git.tgz")) + (sha256 + (base32 + "04rlq1zljhxc65pm31bah3sq3as24l0sdivz440s79qlnnyh13hz")))) + (build-system asdf-build-system/sbcl) + (home-page "http://quickdocs.org/ptester/") + (synopsis "Portable test harness package") + (description + "@command{ptester} is a portable testing framework based on Franz's +tester module.") + (license license:lgpl3+))) + +(define-public cl-ptester + (sbcl-package->cl-source-package sbcl-ptester)) + +(define-public ecl-ptester + (sbcl-package->ecl-package sbcl-ptester)) -- cgit v1.2.3 From 3f4c21c53e3256f8c010e6df8cf5a492965c5892 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 1 Oct 2018 22:37:53 +0200 Subject: gnu: Add puri. * gnu/packages/lisp.scm (cl-puri, ecl-puri, sbcl-puri): New variables. --- gnu/packages/lisp.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index f866255bf6..7b4b11560e 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -2785,3 +2785,35 @@ tester module.") (define-public ecl-ptester (sbcl-package->ecl-package sbcl-ptester)) + +(define-public sbcl-puri + (package + (name "sbcl-puri") + (version "20180228") + (source + (origin + (method url-fetch) + (uri (string-append "http://beta.quicklisp.org/archive/puri/" + (date->string (string->date version "~Y~m~d") "~Y-~m-~d") + "/puri-" + version + "-git.tgz")) + (sha256 + (base32 + "1s4r5adrjy5asry45xbcbklxhdjydvf6n55z897nvyw33bigrnbz")))) + (build-system asdf-build-system/sbcl) + ;; REVIEW: Webiste down? + (native-inputs + `(("ptester" ,sbcl-ptester))) + (home-page "http://files.kpe.io/puri/") + (synopsis "Portable URI Library") + (description + "This is portable Universal Resource Identifier library for Common Lisp +programs. It parses URI according to the RFC 2396 specification") + (license license:lgpl3+))) + +(define-public cl-puri + (sbcl-package->cl-source-package sbcl-puri)) + +(define-public ecl-puri + (sbcl-package->ecl-package sbcl-puri)) -- cgit v1.2.3 From eb766dfed01fb9e162c87d22dc746691d897688a Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 1 Oct 2018 22:38:13 +0200 Subject: gnu: Add queues. * gnu/packages/lisp.scm (cl-queues, ecl-queues, sbcl-queues): New variables. --- gnu/packages/lisp.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 7b4b11560e..cabc791bf3 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -2817,3 +2817,32 @@ programs. It parses URI according to the RFC 2396 specification") (define-public ecl-puri (sbcl-package->ecl-package sbcl-puri)) + +(define-public sbcl-queues + (let ((commit "47d4da65e9ea20953b74aeeab7e89a831b66bc94")) + (package + (name "sbcl-queues") + (version (git-version "0.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/oconnore/queues") + (commit commit))) + (file-name (git-file-name "queues" version)) + (sha256 + (base32 + "0wdhfnzi4v6d97pggzj2aw55si94w4327br94jrmyvwf351wqjvv")))) + (build-system asdf-build-system/sbcl) + (home-page "https://github.com/oconnore/queues") + (synopsis "Common Lisp queue library") + (description + "This is a simple queue library for Common Lisp with features such as +non-consing thread safe queues and fibonacci priority queues.") + (license license:expat)))) + +(define-public cl-queues + (sbcl-package->cl-source-package sbcl-queues)) + +(define-public ecl-queues + (sbcl-package->ecl-package sbcl-queues)) -- cgit v1.2.3 From 6fef7c0ec89fac73410d0b850f4443c55e0943ef Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 1 Oct 2018 22:38:31 +0200 Subject: gnu: Add queues.simple-queue. * gnu/packages/lisp.scm (cl-queues.simple-queue, ecl-queues.simple-queue, sbcl-queues.simple-queue): New variables. --- gnu/packages/lisp.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index cabc791bf3..aecdfc5972 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -2846,3 +2846,23 @@ non-consing thread safe queues and fibonacci priority queues.") (define-public ecl-queues (sbcl-package->ecl-package sbcl-queues)) + +(define-public sbcl-queues.simple-queue + (package + (inherit sbcl-queues) + (name "sbcl-queues.simple-queue") + (inputs + `(("sbcl-queues" ,sbcl-queues))) + (arguments + `(#:asd-file "queues.simple-queue.asd")) + (synopsis "Simple queue implementation") + (description + "This is a simple queue library for Common Lisp with features such as +non-consing thread safe queues and fibonacci priority queues.") + (license license:expat))) + +(define-public cl-queues.simple-queue + (sbcl-package->cl-source-package sbcl-queues.simple-queue)) + +(define-public ecl-queues.simple-queue + (sbcl-package->ecl-package sbcl-queues.simple-queue)) -- cgit v1.2.3 From a889ba99c1d616d6ebd50e480685464fd0b236f3 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 1 Oct 2018 22:38:46 +0200 Subject: gnu: Add queues.simple-cqueue. * gnu/packages/lisp.scm (cl-queues.simple-cqueue, ecl-queues.simple-cqueue, sbcl-queues.simple-cqueue): New variables. --- gnu/packages/lisp.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index aecdfc5972..b4c9c9ebf1 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -2866,3 +2866,25 @@ non-consing thread safe queues and fibonacci priority queues.") (define-public ecl-queues.simple-queue (sbcl-package->ecl-package sbcl-queues.simple-queue)) + +(define-public sbcl-queues.simple-cqueue + (package + (inherit sbcl-queues) + (name "sbcl-queues.simple-cqueue") + (inputs + `(("sbcl-queues" ,sbcl-queues) + ("sbcl-queues.simple-queue" ,sbcl-queues.simple-queue) + ("bordeaux-threads" ,sbcl-bordeaux-threads))) + (arguments + `(#:asd-file "queues.simple-cqueue.asd")) + (synopsis "Thread safe queue implementation") + (description + "This is a simple queue library for Common Lisp with features such as +non-consing thread safe queues and fibonacci priority queues.") + (license license:expat))) + +(define-public cl-queues.simple-cqueue + (sbcl-package->cl-source-package sbcl-queues.simple-cqueue)) + +(define-public ecl-queues.simple-cqueue + (sbcl-package->ecl-package sbcl-queues.simple-cqueue)) -- cgit v1.2.3 From 144085cd69de3a16187f12ae9f436cd05db7b75a Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 1 Oct 2018 22:39:02 +0200 Subject: gnu: Add queues.priority-queue. * gnu/packages/lisp.scm (cl-queues.priority-queue, ecl-queues.priority-queue, sbcl-queues.priority-queue): New variables. --- gnu/packages/lisp.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index b4c9c9ebf1..6dc6d8081d 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -2888,3 +2888,23 @@ non-consing thread safe queues and fibonacci priority queues.") (define-public ecl-queues.simple-cqueue (sbcl-package->ecl-package sbcl-queues.simple-cqueue)) + +(define-public sbcl-queues.priority-queue + (package + (inherit sbcl-queues) + (name "sbcl-queues.priority-queue") + (inputs + `(("sbcl-queues" ,sbcl-queues))) + (arguments + `(#:asd-file "queues.priority-queue.asd")) + (synopsis "Priority queue (Fibonacci) implementation") + (description + "This is a simple queue library for Common Lisp with features such as +non-consing thread safe queues and fibonacci priority queues.") + (license license:expat))) + +(define-public cl-queues.priority-queue + (sbcl-package->cl-source-package sbcl-queues.priority-queue)) + +(define-public ecl-queues.priority-queue + (sbcl-package->ecl-package sbcl-queues.priority-queue)) -- cgit v1.2.3 From 92b1d09b68a4d8226163a93874ff8c4d4a9a1e84 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 1 Oct 2018 22:39:18 +0200 Subject: gnu: Add queues.priority-cqueue. * gnu/packages/lisp.scm (cl-queues.priority-cqueue, ecl-queues.priority-cqueue, sbcl-queues.priority-cqueue): New variables. --- gnu/packages/lisp.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 6dc6d8081d..fb4b8d73ac 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -2908,3 +2908,25 @@ non-consing thread safe queues and fibonacci priority queues.") (define-public ecl-queues.priority-queue (sbcl-package->ecl-package sbcl-queues.priority-queue)) + +(define-public sbcl-queues.priority-cqueue + (package + (inherit sbcl-queues) + (name "sbcl-queues.priority-cqueue") + (inputs + `(("sbcl-queues" ,sbcl-queues) + ("sbcl-queues.priority-queue" ,sbcl-queues.priority-queue) + ("bordeaux-threads" ,sbcl-bordeaux-threads))) + (arguments + `(#:asd-file "queues.priority-cqueue.asd")) + (synopsis "Thread safe fibonacci priority queue implementation") + (description + "This is a simple queue library for Common Lisp with features such as +non-consing thread safe queues and fibonacci priority queues.") + (license license:expat))) + +(define-public cl-queues.priority-cqueue + (sbcl-package->cl-source-package sbcl-queues.priority-cqueue)) + +(define-public ecl-queues.priority-cqueue + (sbcl-package->ecl-package sbcl-queues.priority-cqueue)) -- cgit v1.2.3 From 5d9bf76235aaaf4c17356957a8a2e957fa4e6185 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 2 Oct 2018 19:58:33 +0200 Subject: gnu: Add sbcl-cffi-bootstrap. * gnu/packages/lisp.scm (sbcl-cffi-bootstrap): New variable. --- gnu/packages/lisp.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index fb4b8d73ac..fe1b7cb056 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -2930,3 +2930,45 @@ non-consing thread safe queues and fibonacci priority queues.") (define-public ecl-queues.priority-cqueue (sbcl-package->ecl-package sbcl-queues.priority-cqueue)) + +(define sbcl-cffi-bootstrap + (package + (name "sbcl-cffi-bootstrap") + (version "0.19.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/cffi/cffi/archive/v" + version ".tar.gz")) + (sha256 + (base32 "07bc3c1fbfx17wgrvx6bh9byilfzfwv5n597cfdllm0vzwvbmiyk")) + (file-name (string-append name "-" version ".tar.gz")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("libffi" ,libffi) + ("alexandria" ,sbcl-alexandria) + ("babel" ,sbcl-babel) + ("trivial-features" ,sbcl-trivial-features))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "libffi/libffi.lisp" + (("libffi.so.6" all) (string-append + (assoc-ref inputs "libffi") + "/lib/" all))) + (substitute* "toolchain/c-toolchain.lisp" + (("\"cc\"") (format #f "~S" (which "gcc"))))))) + #:asd-system-name "cffi" + #:tests? #f)) + (home-page "https://common-lisp.net/project/cffi/") + (synopsis "Common Foreign Function Interface for Common Lisp") + (description "The Common Foreign Function Interface (CFFI) +purports to be a portable foreign function interface for Common Lisp. +The CFFI library is composed of a Lisp-implementation-specific backend +in the CFFI-SYS package, and a portable frontend in the CFFI +package.") + (license license:expat))) -- cgit v1.2.3 From 99b3d203fb5426a53fb6cdd171cf903a69949fce Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 2 Oct 2018 19:58:49 +0200 Subject: gnu: Add sbcl-cffi-toolchain. * gnu/packages/lisp.scm (sbcl-cffi-toolchain): New variable. --- gnu/packages/lisp.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index fe1b7cb056..72aa166e54 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -2972,3 +2972,15 @@ The CFFI library is composed of a Lisp-implementation-specific backend in the CFFI-SYS package, and a portable frontend in the CFFI package.") (license license:expat))) + +(define-public sbcl-cffi-toolchain + (package + (inherit sbcl-cffi-bootstrap) + (name "sbcl-cffi-toolchain") + (inputs + `(("libffi" ,libffi) + ("sbcl-cffi" ,sbcl-cffi-bootstrap))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cffi-bootstrap) + ((#:asd-system-name _) #f) + ((#:tests? _) #t))))) -- cgit v1.2.3 From 9eea4e03028f0aaed9ef4a0d371601fff622ebd4 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 2 Oct 2018 19:59:05 +0200 Subject: gnu: Add sbcl-cffi-libffi. * gnu/packages/lisp.scm (sbcl-cffi-libffi): New variable. --- gnu/packages/lisp.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 72aa166e54..6608413fd0 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -2984,3 +2984,13 @@ package.") (substitute-keyword-arguments (package-arguments sbcl-cffi-bootstrap) ((#:asd-system-name _) #f) ((#:tests? _) #t))))) + +(define-public sbcl-cffi-libffi + (package + (inherit sbcl-cffi-toolchain) + (name "sbcl-cffi-libffi") + (inputs + `(("cffi" ,sbcl-cffi-bootstrap) + ("cffi-grovel" ,sbcl-cffi-grovel) + ("trivial-features" ,sbcl-trivial-features) + ("libffi" ,libffi))))) -- cgit v1.2.3 From d3142f2ffbb53f511538d3b1517f34b0e17d6414 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 2 Oct 2018 19:59:19 +0200 Subject: gnu: Add sbcl-cffi-grovel. * gnu/packages/lisp.scm (sbcl-cffi-grovel): New variable. --- gnu/packages/lisp.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 6608413fd0..c2ec5e5acc 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -2994,3 +2994,23 @@ package.") ("cffi-grovel" ,sbcl-cffi-grovel) ("trivial-features" ,sbcl-trivial-features) ("libffi" ,libffi))))) + +(define-public sbcl-cffi-grovel + (package + (inherit sbcl-cffi-toolchain) + (name "sbcl-cffi-grovel") + (inputs + `(("libffi" ,libffi) + ("cffi" ,sbcl-cffi-bootstrap) + ("cffi-toolchain" ,sbcl-cffi-toolchain) + ("alexandria" ,sbcl-alexandria))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-cffi-toolchain) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'build 'install-headers + (lambda* (#:key outputs #:allow-other-keys) + (install-file "grovel/common.h" + (string-append + (assoc-ref outputs "out") + "/include/grovel")))))))))) -- cgit v1.2.3 From 41123072682e4adefd200d76c594a1a529400a11 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 2 Oct 2018 19:59:29 +0200 Subject: gnu: Add sbcl-cffi. * gnu/packages/lisp.scm (sbcl-cffi): New variable. --- gnu/packages/lisp.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index c2ec5e5acc..7a5fcfe4dc 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -3014,3 +3014,15 @@ package.") (string-append (assoc-ref outputs "out") "/include/grovel")))))))))) + +(define-public sbcl-cffi + (package + (inherit sbcl-cffi-toolchain) + (name "sbcl-cffi") + (inputs (package-inputs sbcl-cffi-bootstrap)) + (native-inputs + `(("cffi-grovel" ,sbcl-cffi-grovel) + ("cffi-libffi" ,sbcl-cffi-libffi) + ("rt" ,sbcl-rt) + ("bordeaux-threads" ,sbcl-bordeaux-threads) + ,@(package-native-inputs sbcl-cffi-bootstrap))))) -- cgit v1.2.3 From 8f065b47c7b8db82544e85fd26c833ef01e0f036 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 3 Oct 2018 20:18:13 +0200 Subject: gnu: Add sbcl-cl-sqlite. * gnu/packages/lisp.scm (sbcl-cl-sqlite): New variable. --- gnu/packages/lisp.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 7a5fcfe4dc..c83348d902 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -62,6 +62,7 @@ #:use-module (gnu packages texinfo) #:use-module (gnu packages version-control) #:use-module (gnu packages xorg) + #:use-module (gnu packages databases) #:use-module (ice-9 match) #:use-module (srfi srfi-1) #:use-module (srfi srfi-19)) @@ -3026,3 +3027,44 @@ package.") ("rt" ,sbcl-rt) ("bordeaux-threads" ,sbcl-bordeaux-threads) ,@(package-native-inputs sbcl-cffi-bootstrap))))) + +(define-public sbcl-cl-sqlite + (let ((commit "c738e66d4266ef63a1debc4ef4a1b871a068c112")) + (package + (name "sbcl-cl-sqlite") + (version (git-version "0.2" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dmitryvk/cl-sqlite") + (commit commit))) + (file-name (git-file-name "cl-sqlite" version)) + (sha256 + (base32 + "1ng45k1hdb84sqjryrfx93g66bsbybmpy301wd0fdybnc5jzr36q")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("iterate" ,sbcl-iterate) + ("cffi" ,sbcl-cffi) + ("sqlite" ,sqlite))) + (native-inputs + `(("fiveam" ,sbcl-fiveam) + ("bordeaux-threads" ,sbcl-bordeaux-threads))) + (arguments + `(#:tests? #f ; Upstream seems to have issues with tests: https://github.com/dmitryvk/cl-sqlite/issues/7 + #:asd-file "sqlite.asd" + #:asd-system-name "sqlite" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "sqlite-ffi.lisp" + (("libsqlite3" all) (string-append + (assoc-ref inputs "sqlite")"/lib/" all)))))))) + (home-page "https://common-lisp.net/project/cl-sqlite/") + (synopsis "Common Lisp binding for SQLite") + (description + "The @command{cl-sqlite} package is an interface to the SQLite embedded +relational database engine.") + (license license:public-domain)))) -- cgit v1.2.3 From 4624d2e2b446d7b2ad663e6cd377314cefe0776d Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 5 Oct 2018 16:14:30 +0200 Subject: gnu: Add parenscript. * gnu/packages/lisp.scm (cl-parenscript, ecl-parenscript, sbcl-parenscript): New variables. --- gnu/packages/lisp.scm | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index c83348d902..1315edc39f 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -3068,3 +3068,63 @@ package.") "The @command{cl-sqlite} package is an interface to the SQLite embedded relational database engine.") (license license:public-domain)))) + +(define-public sbcl-parenscript + (let ((commit "061d8e286c81c3f45c84fb2b11ee7d83f590a8f8")) + (package + (name "sbcl-parenscript") + (version (git-version "2.6" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.common-lisp.net/parenscript/parenscript") + (commit commit))) + (file-name (git-file-name "parenscript" version)) + (sha256 + (base32 + "1kbhgsjbikc73m5cwdp4d4fdafyqcr1b7b630qjrziql0nh6mi3k")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("cl-ppcre" ,sbcl-cl-ppcre) + ("anaphora" ,sbcl-anaphora) + ("named-readtables" ,sbcl-named-readtables))) + (home-page "https://common-lisp.net/project/parenscript/") + (synopsis "Translator from a subset of Common Lisp to JavaScript") + (description + "Parenscript is a translator from an extended subset of Common Lisp to +JavaScript. Parenscript code can run almost identically on both the +browser (as JavaScript) and server (as Common Lisp). + +Parenscript code is treated the same way as Common Lisp code, making the full +power of Lisp macros available for JavaScript. This provides a web +development environment that is unmatched in its ability to reduce code +duplication and provide advanced meta-programming facilities to web +developers. + +At the same time, Parenscript is different from almost all other \"language +X\" to JavaScript translators in that it imposes almost no overhead: + +@itemize +@item No run-time dependencies: Any piece of Parenscript code is runnable +as-is. There are no JavaScript files to include. +@item Native types: Parenscript works entirely with native JavaScript data +types. There are no new types introduced, and object prototypes are not +touched. +@item Native calling convention: Any JavaScript code can be called without the +need for bindings. Likewise, Parenscript can be used to make efficient, +self-contained JavaScript libraries. +@item Readable code: Parenscript generates concise, formatted, idiomatic +JavaScript code. Identifier names are preserved. This enables seamless +debugging in tools like Firebug. +@item Efficiency: Parenscript introduces minimal overhead for advanced Common +Lisp features. The generated code is almost as fast as hand-written +JavaScript. +@end itemize\n") + (license license:bsd-3)))) + +(define-public cl-parenscript + (sbcl-package->cl-source-package sbcl-parenscript)) + +(define-public ecl-parenscript + (sbcl-package->ecl-package sbcl-parenscript)) -- cgit v1.2.3 From dedbf37e5d158bdc78d1fdff2c4c5151e6d32473 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 9 Oct 2018 11:59:30 +0200 Subject: gnu: Add cl-json. * gnu/packages/lisp.scm (cl-json, ecl-cl-json, sbcl-cl-json): New variables. --- gnu/packages/lisp.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 1315edc39f..959298f316 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -3128,3 +3128,37 @@ JavaScript. (define-public ecl-parenscript (sbcl-package->ecl-package sbcl-parenscript)) + +(define-public sbcl-cl-json + (let ((commit "6dfebb9540bfc3cc33582d0c03c9ec27cb913e79")) + (package + (name "sbcl-cl-json") + (version (git-version "0.5" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hankhero/cl-json") + (commit commit))) + (file-name (git-file-name "cl-json" version)) + (sha256 + (base32 + "0fx3m3x3s5ji950yzpazz4s0img3l6b3d6l3jrfjv0lr702496lh")))) + (build-system asdf-build-system/sbcl) + (native-inputs + `(("fiveam" ,sbcl-fiveam))) + (home-page "https://github.com/hankhero/cl-json") + (synopsis "JSON encoder and decoder for Common-Lisp") + (description + "@command{cl-json} provides an encoder of Lisp objects to JSON format +and a corresponding decoder of JSON data to Lisp objects. Both the encoder +and the decoder are highly customizable; at the same time, the default +settings ensure a very simple mode of operation, similar to that provided by +@command{yason} or @command{st-json}.") + (license license:expat)))) + +(define-public cl-json + (sbcl-package->cl-source-package sbcl-cl-json)) + +(define-public ecl-cl-json + (sbcl-package->ecl-package sbcl-cl-json)) -- cgit v1.2.3 From 2cc931db448430433b89326fce3a9815c63775df Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 9 Oct 2018 12:05:23 +0200 Subject: gnu: Add cl-unix-opts. * gnu/packages/lisp.scm (cl-unix-opts, ecl-unix-opts, sbcl-unix-opts): New variables. --- gnu/packages/lisp.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 959298f316..de50eb43de 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -3162,3 +3162,36 @@ settings ensure a very simple mode of operation, similar to that provided by (define-public ecl-cl-json (sbcl-package->ecl-package sbcl-cl-json)) + +(define-public sbcl-unix-opts + (package + (name "sbcl-unix-opts") + (version "0.1.7") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libre-man/unix-opts") + (commit version))) + (file-name (git-file-name "unix-opts" version)) + (sha256 + (base32 + "08djdi1ard09fijb7w9bdmhmwd98b1hzmcnjw9fqjiqa0g3b44rr")))) + (build-system asdf-build-system/sbcl) + (home-page "https://github.com/hankhero/cl-json") + (synopsis "Unix-style command line options parser") + (description + "This is a minimalistic parser of command line options. The main +advantage of the library is the ability to concisely define command line +options once and then use this definition for parsing and extraction of +command line arguments, as well as printing description of command line +options (you get --help for free). This way you don't need to repeat +yourself. Also, @command{unix-opts} doesn't depend on anything and allows to +precisely control behavior of the parser via Common Lisp restarts.") + (license license:expat))) + +(define-public cl-unix-opts + (sbcl-package->cl-source-package sbcl-unix-opts)) + +(define-public ecl-unix-opts + (sbcl-package->ecl-package sbcl-unix-opts)) -- cgit v1.2.3 From 4aa2342008df3e2eaa861d14c208c8c625077f82 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 10 Oct 2018 11:15:17 +0200 Subject: gnu: Add trivial-garbage. * gnu/packages/lisp.scm (cl-trivial-garbage, ecl-trivial-garbage, sbcl-trivial-garbage): New variables. --- gnu/packages/lisp.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index de50eb43de..d636c0d9b3 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -3195,3 +3195,32 @@ precisely control behavior of the parser via Common Lisp restarts.") (define-public ecl-unix-opts (sbcl-package->ecl-package sbcl-unix-opts)) + +(define-public sbcl-trivial-garbage + (package + (name "sbcl-trivial-garbage") + (version "0.21") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/trivial-garbage/trivial-garbage/archive/v" + version ".tar.gz")) + (sha256 + (base32 "0b244nlszkrqawsnp568clnx32xmvjmbbagbz7625w9n0yq7396y")) + (file-name (string-append "trivial-garbage-" version ".tar.gz")))) + (build-system asdf-build-system/sbcl) + (native-inputs + `(("rt" ,sbcl-rt))) + (home-page "https://common-lisp.net/project/trivial-garbage/") + (synopsis "Portable GC-related APIs for Common Lisp") + (description "@command{trivial-garbage} provides a portable API to +finalizers, weak hash-tables and weak pointers on all major implementations of +the Common Lisp programming language.") + (license license:public-domain))) + +(define-public cl-trivial-garbage + (sbcl-package->cl-source-package sbcl-trivial-garbage)) + +(define-public ecl-trivial-garbage + (sbcl-package->ecl-package sbcl-trivial-garbage)) -- cgit v1.2.3 From 85be9191ee8737b5d021f1126a826727fb8fea1b Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 10 Oct 2018 11:22:51 +0200 Subject: gnu: Add closer-mop. * gnu/packages/lisp.scm (cl-closer-mop, ecl-closer-mop, sbcl-closer-mop): New variables. --- gnu/packages/lisp.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index d636c0d9b3..cc4b5a026d 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -3224,3 +3224,31 @@ the Common Lisp programming language.") (define-public ecl-trivial-garbage (sbcl-package->ecl-package sbcl-trivial-garbage)) + +(define-public sbcl-closer-mop + (let ((commit "fac29ce90e3a46e1fc6cf182190e193526fa9dbc")) + (package + (name "sbcl-closer-mop") + (version (git-version "1.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pcostanza/closer-mop") + (commit commit))) + (sha256 + (base32 "0hvh77y869h8fg9di5snyg85fxq6fdh9gj1igmx1g6j6j5x915dl")) + (file-name (git-file-name "closer-mop" version )))) + (build-system asdf-build-system/sbcl) + (home-page "https://github.com/pcostanza/closer-mop") + (synopsis "Rectifies absent or incorrect CLOS MOP features") + (description "Closer to MOP is a compatibility layer that rectifies many +of the absent or incorrect CLOS MOP features across a broad range of Common +Lisp implementations.") + (license license:expat)))) + +(define-public cl-closer-mop + (sbcl-package->cl-source-package sbcl-closer-mop)) + +(define-public ecl-closer-mop + (sbcl-package->ecl-package sbcl-closer-mop)) -- cgit v1.2.3 From c88985d9b062790be45b588bf65d4876c2ad96ac Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 9 Oct 2018 21:38:43 +0200 Subject: gnu: Add sbcl-cl-cffi-gtk. * gnu/packages/lisp.scm (sbcl-cl-cffi-gtk): New variable. --- gnu/packages/lisp.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index cc4b5a026d..a4b64fc0fe 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -3252,3 +3252,30 @@ Lisp implementations.") (define-public ecl-closer-mop (sbcl-package->ecl-package sbcl-closer-mop)) + +(define sbcl-cl-cffi-gtk-boot0 + (let ((commit "29443c5aaca975709df8025c4649366d882033cb")) + (package + (name "sbcl-cl-cffi-gtk-boot0") + (version (git-version "0.11.2" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Ferada/cl-cffi-gtk/") + (commit commit))) + (file-name (git-file-name "cl-cffi-gtk" version)) + (sha256 + (base32 + "0f6s92sf8xyzh1yksqx8bsy1sv0zmy0c13j3b8bavaba5hlxpxah")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("iterate" ,sbcl-iterate) + ("cffi" ,sbcl-cffi) + ("trivial-features" ,sbcl-trivial-features))) + (home-page "https://github.com/Ferada/cl-cffi-gtk/") + (synopsis "Common Lisp binding for GTK+3") + (description + "@command{cl-cffi-gtk} is a Lisp binding to GTK+ 3 (GIMP Toolkit) which +is a library for creating graphical user interfaces.") + (license license:lgpl3)))) -- cgit v1.2.3 From 64dcf7d99b09805b8e8888051fe47a981ff9dba6 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 19 Oct 2018 16:52:22 +0200 Subject: gnu: Add sbcl-cl-cffi-gtk-glib. * gnu/packages/lisp.scm (sbcl-cl-cffi-gtk-glib): New variable. --- gnu/packages/lisp.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index a4b64fc0fe..6ba678961c 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -63,6 +63,7 @@ #:use-module (gnu packages version-control) #:use-module (gnu packages xorg) #:use-module (gnu packages databases) + #:use-module (gnu packages gtk) #:use-module (ice-9 match) #:use-module (srfi srfi-1) #:use-module (srfi srfi-19)) @@ -3279,3 +3280,20 @@ Lisp implementations.") "@command{cl-cffi-gtk} is a Lisp binding to GTK+ 3 (GIMP Toolkit) which is a library for creating graphical user interfaces.") (license license:lgpl3)))) + +(define-public sbcl-cl-cffi-gtk-glib + (package + (inherit sbcl-cl-cffi-gtk-boot0) + (name "sbcl-cl-cffi-gtk-glib") + (inputs + `(("glib" ,glib) + ,@(package-inputs sbcl-cl-cffi-gtk-boot0))) + (arguments + `(#:asd-file "glib/cl-cffi-gtk-glib.asd" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "glib/glib.init.lisp" + (("libglib|libgthread" all) (string-append + (assoc-ref inputs "glib") "/lib/" all)))))))))) -- cgit v1.2.3 From 77a5461c31c5e53f23a9a3e90fd77d814fa24be6 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 19 Oct 2018 16:52:59 +0200 Subject: gnu: Add sbcl-cl-cffi-gtk-gobject. * gnu/packages/lisp.scm (sbcl-cl-cffi-gtk-gobject): New variable. --- gnu/packages/lisp.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 6ba678961c..6d945da557 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -3297,3 +3297,24 @@ is a library for creating graphical user interfaces.") (substitute* "glib/glib.init.lisp" (("libglib|libgthread" all) (string-append (assoc-ref inputs "glib") "/lib/" all)))))))))) + +(define-public sbcl-cl-cffi-gtk-gobject + (package + (inherit sbcl-cl-cffi-gtk-boot0) + (name "sbcl-cl-cffi-gtk-gobject") + (inputs + `(("glib" ,glib) + ("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) + ("trivial-garbage" ,sbcl-trivial-garbage) + ("bordeaux-threads" ,sbcl-bordeaux-threads) + ("closer-mop" ,sbcl-closer-mop) + ,@(package-inputs sbcl-cl-cffi-gtk-boot0))) + (arguments + `(#:asd-file "gobject/cl-cffi-gtk-gobject.asd" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "gobject/gobject.init.lisp" + (("libgobject" all) (string-append + (assoc-ref inputs "glib") "/lib/" all)))))))))) -- cgit v1.2.3 From 867b3f4780e293585d30585bb49473d7309b66ac Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 19 Oct 2018 16:53:16 +0200 Subject: gnu: Add sbcl-cl-cffi-gtk-gio. * gnu/packages/lisp.scm (sbcl-cl-cffi-gtk-gio): New variable. --- gnu/packages/lisp.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 6d945da557..70282e4cb5 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -3318,3 +3318,23 @@ is a library for creating graphical user interfaces.") (substitute* "gobject/gobject.init.lisp" (("libgobject" all) (string-append (assoc-ref inputs "glib") "/lib/" all)))))))))) + +(define-public sbcl-cl-cffi-gtk-gio + (package + (inherit sbcl-cl-cffi-gtk-boot0) + (name "sbcl-cl-cffi-gtk-gio") + (inputs + `(("glib" ,glib) + ("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) + ("cl-cffi-gtk-gobject" ,sbcl-cl-cffi-gtk-gobject) + ,@(package-inputs sbcl-cl-cffi-gtk-boot0))) + (arguments + `(#:asd-file "gio/cl-cffi-gtk-gio.asd" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "gio/gio.init.lisp" + (("libgio" all) + (string-append + (assoc-ref inputs "glib") "/lib/" all)))))))))) -- cgit v1.2.3 From 7176fe7c328f0b4778b5f600c563c8073d16b135 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 19 Oct 2018 16:53:38 +0200 Subject: gnu: Add sbcl-cl-cffi-gtk-cairo. * gnu/packages/lisp.scm (sbcl-cl-cffi-gtk-cairo): New variable. --- gnu/packages/lisp.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 70282e4cb5..ac694e3e7e 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -3338,3 +3338,22 @@ is a library for creating graphical user interfaces.") (("libgio" all) (string-append (assoc-ref inputs "glib") "/lib/" all)))))))))) + +(define-public sbcl-cl-cffi-gtk-cairo + (package + (inherit sbcl-cl-cffi-gtk-boot0) + (name "sbcl-cl-cffi-gtk-cairo") + (inputs + `(("cairo" ,cairo) + ("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) + ,@(package-inputs sbcl-cl-cffi-gtk-boot0))) + (arguments + `(#:asd-file "cairo/cl-cffi-gtk-cairo.asd" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "cairo/cairo.init.lisp" + (("libcairo" all) + (string-append + (assoc-ref inputs "cairo") "/lib/" all)))))))))) -- cgit v1.2.3 From 9ecc457b52186fd96a63aeb1d8b9f2eda169f287 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 19 Oct 2018 16:53:51 +0200 Subject: gnu: Add sbcl-cl-cffi-gtk-pango. * gnu/packages/lisp.scm (sbcl-cl-cffi-gtk-pango): New variable. --- gnu/packages/lisp.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index ac694e3e7e..dc0481dd95 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -3357,3 +3357,24 @@ is a library for creating graphical user interfaces.") (("libcairo" all) (string-append (assoc-ref inputs "cairo") "/lib/" all)))))))))) + +(define-public sbcl-cl-cffi-gtk-pango + (package + (inherit sbcl-cl-cffi-gtk-boot0) + (name "sbcl-cl-cffi-gtk-pango") + (inputs + `(("pango" ,pango) + ("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) + ("cl-cffi-gtk-gobject" ,sbcl-cl-cffi-gtk-gobject) + ("cl-cffi-gtk-cairo" ,sbcl-cl-cffi-gtk-cairo) + ,@(package-inputs sbcl-cl-cffi-gtk-boot0))) + (arguments + `(#:asd-file "pango/cl-cffi-gtk-pango.asd" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "pango/pango.init.lisp" + (("libpango" all) + (string-append + (assoc-ref inputs "pango") "/lib/" all)))))))))) -- cgit v1.2.3 From a3bdddc359643a9a32e78e32b919390041818c49 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 19 Oct 2018 16:54:06 +0200 Subject: gnu: Add sbcl-cl-cffi-gtk-gdk-pixbuf. * gnu/packages/lisp.scm (sbcl-cl-cffi-gtk-gdk-pixbuf): New variable. --- gnu/packages/lisp.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index dc0481dd95..b63a55f4ac 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -3378,3 +3378,22 @@ is a library for creating graphical user interfaces.") (("libpango" all) (string-append (assoc-ref inputs "pango") "/lib/" all)))))))))) + +(define-public sbcl-cl-cffi-gtk-gdk-pixbuf + (package + (inherit sbcl-cl-cffi-gtk-boot0) + (name "sbcl-cl-cffi-gtk-gdk-pixbuf") + (inputs + `(("gdk-pixbuf" ,gdk-pixbuf) + ("cl-cffi-gtk-gobject" ,sbcl-cl-cffi-gtk-gobject) + ,@(package-inputs sbcl-cl-cffi-gtk-boot0))) + (arguments + `(#:asd-file "gdk-pixbuf/cl-cffi-gtk-gdk-pixbuf.asd" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "gdk-pixbuf/gdk-pixbuf.init.lisp" + (("libgdk_pixbuf" all) + (string-append + (assoc-ref inputs "gdk-pixbuf") "/lib/" all)))))))))) -- cgit v1.2.3 From 7b5b8c44050c459eb94998ac6a0ece204bcc5a04 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 19 Oct 2018 16:54:26 +0200 Subject: gnu: Add sbcl-cl-cffi-gtk-gdk. * gnu/packages/lisp.scm (sbcl-cl-cffi-gtk-gdk): New variable. --- gnu/packages/lisp.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index b63a55f4ac..ac1d4a432f 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -3397,3 +3397,30 @@ is a library for creating graphical user interfaces.") (("libgdk_pixbuf" all) (string-append (assoc-ref inputs "gdk-pixbuf") "/lib/" all)))))))))) + +(define-public sbcl-cl-cffi-gtk-gdk + (package + (inherit sbcl-cl-cffi-gtk-boot0) + (name "sbcl-cl-cffi-gtk-gdk") + (inputs + `(("gtk" ,gtk+) + ("cl-cffi-gtk-gobject" ,sbcl-cl-cffi-gtk-gobject) + ("cl-cffi-gtk-gio" ,sbcl-cl-cffi-gtk-gio) + ("cl-cffi-gtk-gdk-pixbuf" ,sbcl-cl-cffi-gtk-gdk-pixbuf) + ("cl-cffi-gtk-cairo" ,sbcl-cl-cffi-gtk-cairo) + ("cl-cffi-gtk-pango" ,sbcl-cl-cffi-gtk-pango) + ,@(package-inputs sbcl-cl-cffi-gtk-boot0))) + (arguments + `(#:asd-file "gdk/cl-cffi-gtk-gdk.asd" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "gdk/gdk.init.lisp" + (("libgdk" all) + (string-append + (assoc-ref inputs "gtk") "/lib/" all))) + (substitute* "gdk/gdk.package.lisp" + (("libgtk" all) + (string-append + (assoc-ref inputs "gtk") "/lib/" all)))))))))) -- cgit v1.2.3 From c80dfee9f18aaba422ba0ad45aa3aeb17b789fa1 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 19 Oct 2018 16:54:46 +0200 Subject: gnu: Add sbcl-cl-cffi-gtk. * gnu/packages/lisp.scm (sbcl-cl-cffi-gtk): New variable. --- gnu/packages/lisp.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index ac1d4a432f..68927971b5 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -3424,3 +3424,22 @@ is a library for creating graphical user interfaces.") (("libgtk" all) (string-append (assoc-ref inputs "gtk") "/lib/" all)))))))))) + +(define-public sbcl-cl-cffi-gtk + (package + (inherit sbcl-cl-cffi-gtk-boot0) + (name "sbcl-cl-cffi-gtk") + (inputs + `(("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) + ("cl-cffi-gtk-gobject" ,sbcl-cl-cffi-gtk-gobject) + ("cl-cffi-gtk-gio" ,sbcl-cl-cffi-gtk-gio) + ("cl-cffi-gtk-gdk" ,sbcl-cl-cffi-gtk-gdk) + ,@(package-inputs sbcl-cl-cffi-gtk-boot0))) + (native-inputs + `(("fiveam" ,sbcl-fiveam))) + (arguments + `(#:asd-file "gtk/cl-cffi-gtk.asd" + #:test-asd-file "test/cl-cffi-gtk-test.asd" + ;; TODO: Tests fail with memory fault. + ;; See https://github.com/Ferada/cl-cffi-gtk/issues/24. + #:tests? #f)))) -- cgit v1.2.3 From 24fd7586a4d0ce7f61887fbc9341c6fcb72310a6 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 10 Oct 2018 15:07:01 +0200 Subject: gnu: Add sbcl-cl-webkit. * gnu/packages/lisp.scm (sbcl-cl-webkit): New variable. --- gnu/packages/lisp.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 68927971b5..8e201f3b13 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -64,6 +64,7 @@ #:use-module (gnu packages xorg) #:use-module (gnu packages databases) #:use-module (gnu packages gtk) + #:use-module (gnu packages webkit) #:use-module (ice-9 match) #:use-module (srfi srfi-1) #:use-module (srfi srfi-19)) @@ -3443,3 +3444,43 @@ is a library for creating graphical user interfaces.") ;; TODO: Tests fail with memory fault. ;; See https://github.com/Ferada/cl-cffi-gtk/issues/24. #:tests? #f)))) + +(define-public sbcl-cl-webkit + (let ((commit "cd2a9008e0c152e54755e8a7f07b050fe36bab31")) + (package + (name "sbcl-cl-webkit") + (version (git-version "2.4" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/atlas-engineer/cl-webkit") + (commit commit))) + (file-name (git-file-name "cl-webkit" version)) + (sha256 + (base32 + "0f5lyn9i7xrn3g1bddga377mcbawkbxydijpg389q4n04gqj0vwf")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("cffi" ,sbcl-cffi) + ("cl-cffi-gtk" ,sbcl-cl-cffi-gtk) + ("webkitgtk" ,webkitgtk))) + (arguments + `(#:asd-file "webkit2/cl-webkit2.asd" + #:asd-system-name "cl-webkit2" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "webkit2/webkit2.init.lisp" + (("libwebkit2gtk" all) + (string-append + (assoc-ref inputs "webkitgtk") "/lib/" all)))))))) + (home-page "https://github.com/atlas-engineer/cl-webkit") + (synopsis "Binding to WebKitGTK+ for Common Lisp") + (description + "@command{cl-webkit} is a binding to WebKitGTK+ for Common Lisp, +currently targeting WebKit version 2. The WebKitGTK+ library adds web +browsing capabilities to an application, leveraging the full power of the +WebKit browsing engine.") + (license license:expat)))) -- cgit v1.2.3 From e2e5004f6ee4f210440e4c8a2466185c463b8dbb Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 10 Oct 2018 15:07:19 +0200 Subject: gnu: Add lparallel. * gnu/packages/lisp.scm (cl-lparallel, ecl-lparallel, sbcl-lparallel): New variables. --- gnu/packages/lisp.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 8e201f3b13..bc6216018b 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -3484,3 +3484,48 @@ currently targeting WebKit version 2. The WebKitGTK+ library adds web browsing capabilities to an application, leveraging the full power of the WebKit browsing engine.") (license license:expat)))) + +(define-public sbcl-lparallel + (package + (name "sbcl-lparallel") + (version "2.8.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/lmj/lparallel/") + (commit (string-append "lparallel-" version)))) + (file-name (git-file-name "lparallel" version)) + (sha256 + (base32 + "0g0aylrbbrqsz0ahmwhvnk4cmc2931fllbpcfgzsprwnqqd7vwq9")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("bordeaux-threads" ,sbcl-bordeaux-threads) + ("trivial-garbage" ,sbcl-trivial-garbage))) + (home-page "https://lparallel.org/") + (synopsis "Parallelism for Common Lisp") + (description + "@command{lparallel} is a library for parallel programming in Common +Lisp, featuring: + +@itemize +@item a simple model of task submission with receiving queue, +@item constructs for expressing fine-grained parallelism, +@item asynchronous condition handling across thread boundaries, +@item parallel versions of map, reduce, sort, remove, and many others, +@item promises, futures, and delayed evaluation constructs, +@item computation trees for parallelizing interconnected tasks, +@item bounded and unbounded FIFO queues, +@item high and low priority tasks, +@item task killing by category, +@item integrated timeouts. +@end itemize\n") + (license license:expat))) + +(define-public cl-lparallel + (sbcl-package->cl-source-package sbcl-lparallel)) + +(define-public ecl-lparallel + (sbcl-package->ecl-package sbcl-lparallel)) -- cgit v1.2.3 From 3bd45f5c809a56baafb355d93c1d2a243d6dd996 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 19 Oct 2018 18:00:14 +0200 Subject: gnu: emacs-slime: License is a mix of GPL2+ and public domain. * gnu/packages/emacs.scm (emacs-slime)[license]: Update to (gpl2+ public-domain) --- gnu/packages/emacs.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 57841e86fa..6b360b5ac3 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -3091,7 +3091,7 @@ an Emacs minor mode that complements the standard @command{lisp-mode}. While lisp-mode supports editing Lisp source files, @command{slime-mode} adds support for interacting with a running Common Lisp process for compilation, debugging, documentation lookup, and so on.") - (license license:gpl2+))) + (license (list license:gpl2+ license:public-domain)))) (define-public emacs-popup (package -- cgit v1.2.3 From 4680fef705d9aa37737422804dc2cc1805522647 Mon Sep 17 00:00:00 2001 From: Amirouche Date: Mon, 15 Oct 2018 20:54:45 +0200 Subject: gnu: Add wiredtiger 3.1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/databases.scm (wiredtiger-3): New variable that inherits from wiredtiger Signed-off-by: Ludovic Courtès --- gnu/packages/databases.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 73026c5e66..ee00f23717 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1768,6 +1768,19 @@ trees (LSM), for sustained throughput under random insert workloads.") ;; configure.ac: WiredTiger requires a 64-bit build. (supported-systems '("x86_64-linux" "mips64el-linux" "aarch64-linux")))) +(define-public wiredtiger-3 + (package + (inherit wiredtiger) + (name "wiredtiger") + (version "3.1.0") + (source (origin + (method url-fetch) + (uri (string-append "http://source.wiredtiger.com/releases/wiredtiger-" + version ".tar.bz2")) + (sha256 + (base32 + "014awypv579ascg4jbx4pndj2wld337m79yyzrzyr7hxrff139jx")))))) + (define-public guile-wiredtiger (package (name "guile-wiredtiger") -- cgit v1.2.3 From b1e6b9380589a6cbbe903255390888b0540bfe8e Mon Sep 17 00:00:00 2001 From: Amirouche Date: Tue, 16 Oct 2018 20:45:28 +0200 Subject: gnu: guile-wiredtiger: Update to 0.7.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/databases.scm (guile-wiredtiger): Update to 0.7.0. [inputs]: Replace wiredtiger with wiredtiger-3 [propagated-inputs]: Remove guile-lib, add guile-bytestructures [description]: Update it. Signed-off-by: Ludovic Courtès --- gnu/packages/databases.scm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index ee00f23717..7b483a207d 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1784,16 +1784,16 @@ trees (LSM), for sustained throughput under random insert workloads.") (define-public guile-wiredtiger (package (name "guile-wiredtiger") - (version "0.6.3") + (version "0.7.0") (source (origin (method git-fetch) (uri (git-reference (url "https://framagit.org/a-guile-mind/guile-wiredtiger.git") - (commit "070ed68139d99c279f058a6c293f00292d35dbd7"))) + (commit "340ad4bc2ff4dcc6216a2f5c6f9172ca320ac66b"))) (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "14rna97wsylajzxfif95wnblq85csgcfc666gh5dl0ssgd7x8llh")))) + "15j36bvxxzil7qpwlmh1rffqpva3ynvrcpqhhqbj2c9208ayz595")))) (build-system gnu-build-system) (arguments '(#:parallel-tests? #f ;; tests can't be run in parallel, yet. @@ -1801,21 +1801,19 @@ trees (LSM), for sustained throughput under random insert workloads.") (list (string-append "--with-libwiredtiger-prefix=" (assoc-ref %build-inputs "wiredtiger"))) #:make-flags '("GUILE_AUTO_COMPILE=0"))) - ;; TODO: Remove microkanren.scm when we have a separate package - ;; for it. (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) ("pkg-config" ,pkg-config))) (inputs - `(("wiredtiger" ,wiredtiger) + `(("wiredtiger" ,wiredtiger-3) ("guile" ,guile-2.2))) (propagated-inputs - `(("guile-lib" ,guile-lib))) ;for (htmlprag) + `(("guile-bytestructures" ,guile-bytestructures))) (synopsis "WiredTiger bindings for GNU Guile") (description "This package provides Guile bindings to the WiredTiger ``NoSQL'' -database. Various higher level database abstractions.") +database.") (home-page "https://framagit.org/a-guile-mind/guile-wiredtiger") (license license:gpl3+))) -- cgit v1.2.3 From 0ee6692a63538e874ba0b4d85584a4a73b75367c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 19 Oct 2018 18:34:07 +0200 Subject: gnu: sbcl-slime-swank: Remove reference to unbound variable. Fixes a regression introduced in commit c4d4ae1e16254a96caaeb5ccb4486f301ae4f1b7. * gnu/packages/lisp.scm (sbcl-slime-swank)[license]: Remove extra 'license'. --- gnu/packages/lisp.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index bc6216018b..89ccdb720a 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -2256,7 +2256,7 @@ writing code that contains string literals that contain code themselves.") "This is only useful if you want to start a Swank server in a Lisp processes that doesn't run under Emacs. Lisp processes created by @command{M-x slime} automatically start the server.") - (license (license (list license:gpl2+ license:public-domain))))) + (license (list license:gpl2+ license:public-domain)))) (define-public sbcl-mgl-pax (let ((commit "818448418d6b9de74620f606f5b23033c6082769")) -- cgit v1.2.3 From be200ef316478585059041a33d8f4287017dea5a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 19 Oct 2018 18:51:46 +0200 Subject: 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(+) (limited to 'gnu') 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")) -- cgit v1.2.3 From cdb84eb0e6a2c0a885c742c01615c5c0e3c04124 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 19 Oct 2018 21:58:48 +0200 Subject: gnu: qsynth: Update to 0.5.3. * gnu/packages/audio.scm (qsynth): Update to 0.5.3. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 69b5d01d6f..ac41ed2dfe 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2759,7 +2759,7 @@ interface.") (define-public qsynth (package (name "qsynth") - (version "0.5.2") + (version "0.5.3") (source (origin (method url-fetch) @@ -2767,7 +2767,7 @@ interface.") "/qsynth-" version ".tar.gz")) (sha256 (base32 - "1rfkaxq1pyc4hv3l0i6wicianbcbm1wp53kh9i5d4jsljgisd1dv")))) + "1jghczmmva7cyavg1q0j8nr3hmjpzzglzi5ckg92ax4ji8gpks9c")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no "check" phase -- cgit v1.2.3 From 58352f269e46942c34d7ee4e29f91144576ca661 Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Thu, 18 Oct 2018 02:53:32 +0800 Subject: 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 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu') 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") -- cgit v1.2.3 From bc83b2e22f39c00ab3d0072c9c8f13285f7967d6 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Tue, 16 Oct 2018 15:16:43 +0800 Subject: gnu: Add i3blocks. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/wm.scm (i3blocks): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/wm.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 7c58770de7..68d497e955 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2017 Oleg Pykhalov ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Pierre-Antoine Rouby +;;; Copyright © 2018 Meiyo Peng ;;; ;;; This file is part of GNU Guix. ;;; @@ -233,6 +234,46 @@ from scratch. i3 is primarily targeted at advanced users and developers.") (license license:bsd-3))) +(define-public i3blocks + (let ((commit "37f23805ff886639163fbef8aedba71c8071eff8") + (revision "1")) + (package + (name "i3blocks") + (version (string-append "1.4-" revision "." + (string-take commit 7))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vivien/i3blocks.git") + (commit commit))) + (sha256 + (base32 + "15rnrcajzyrmhlz1a21qqsjlj3dkib70806dlb386fliylc2kisb")) + (file-name (string-append name "-" version "-checkout")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags (list "CC=gcc" (string-append "PREFIX=" %output)) + #:phases (modify-phases %standard-phases + (add-after 'unpack 'autogen + (lambda _ (invoke "sh" "autogen.sh"))) + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (man1 (string-append out "/share/man/man1"))) + (install-file "docs/i3blocks.1" man1) + #t)))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config))) + (home-page "https://github.com/vivien/i3blocks") + (synopsis "Minimalist scheduler for status bar scripts") + (description "i3blocks executes your command lines and generates a +status line from their output. The generated line is meant to be displayed by +the i3 window manager through its i3bar component, as an alternative to +i3status.") + (license license:gpl3+)))) + (define-public perl-anyevent-i3 (package (name "perl-anyevent-i3") -- cgit v1.2.3 From 64791eb7e1dceb0940cc881e84820f0170298b34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 19 Oct 2018 22:46:23 +0200 Subject: services: ntp: Document 'ntp-service-type' and 'ntp-configuration'. * gnu/services/networking.scm ()[servers]: Add default value. (ntp-service-type)[default-value]: New field. (ntp-service): Mark as deprecated. * gnu/services/desktop.scm (%desktop-services): Use (service ntp-service-type) instead of calling 'ntp-service'. * doc/guix.texi (Networking Services): Document 'ntp-service-type' and 'ntp-configuration'. --- gnu/services/desktop.scm | 4 ++-- gnu/services/networking.scm | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 1e8c02c02a..e038f97683 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès +;;; Copyright © 2014, 2015, 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2015 Andy Wingo ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016 Sou Bunnbu @@ -996,7 +996,7 @@ as expected."))) (elogind-service) (dbus-service) - (ntp-service) + (service ntp-service-type) x11-socket-directory-service diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index b764cde5ac..bfa6e297e6 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -297,7 +297,8 @@ Protocol (DHCP) client, on all the non-loopback network interfaces." ntp-configuration? (ntp ntp-configuration-ntp (default ntp)) - (servers ntp-configuration-servers) + (servers ntp-configuration-servers + (default %ntp-servers)) (allow-large-adjustment? ntp-allow-large-adjustment? (default #f))) @@ -370,9 +371,10 @@ restrict -6 ::1\n")) (description "Run the @command{ntpd}, the Network Time Protocol (NTP) daemon of the @uref{http://www.ntp.org, Network Time Foundation}. The daemon -will keep the system clock synchronized with that of the given servers."))) +will keep the system clock synchronized with that of the given servers.") + (default-value (ntp-configuration)))) -(define* (ntp-service #:key (ntp ntp) +(define* (ntp-service #:key (ntp ntp) ;deprecated (servers %ntp-servers) allow-large-adjustment?) "Return a service that runs the daemon from @var{ntp}, the -- cgit v1.2.3 From b5a927b3baa10d4eade7e7194db6c2b5b7d8c6b6 Mon Sep 17 00:00:00 2001 From: nixo Date: Tue, 16 Oct 2018 14:18:14 +0200 Subject: gnu: Add enchive. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/crypto.scm (enchive): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/crypto.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 33f4abb5ae..77b4dba6d4 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2018 Efraim Flashner ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2018 Nicolas Goaziou +;;; Copyright © 2018 Nicolò Balzarotti ;;; ;;; This file is part of GNU Guix. ;;; @@ -854,3 +855,36 @@ public-key cryptography. Asignify is designed to be portable and self-contained with zero external dependencies. Asignify can verify OpenBSD signatures, but it cannot sign messages in OpenBSD format yet.") (license license:bsd-2)))) + +(define-public enchive + (package + (name "enchive") + (version "3.4") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/skeeto/" name "/archive/" + version ".tar.gz")) + (sha256 + (base32 + "17hrxpp4cpn10bk48sfvfjc8hghky34agsnypam1v9f36kbalqfk")) + (file-name (string-append name "-" version ".tar.gz")))) + (build-system gnu-build-system) + (arguments + '(#:tests? #f ; no check target ' + #:make-flags (list "CC=gcc" "PREFIX=$(out)") + #:phases (modify-phases %standard-phases + (delete 'configure) + (add-after 'install 'post-install + (lambda _ + (let* ((out (assoc-ref %outputs "out")) + (lisp (string-append out "/share/emacs/site-lisp"))) + (install-file "enchive-mode.el" lisp) + #t)))))) + (synopsis "Encrypted personal archives") + (description + "Enchive is a tool to encrypt files to yourself for long-term +archival. It's a focused, simple alternative to more complex solutions such as +GnuPG or encrypted filesystems. Enchive has no external dependencies and is +trivial to build for local use. Portability is emphasized over performance.") + (home-page "https://github.com/skeeto/enchive") + (license license:unlicense))) -- cgit v1.2.3 From 0d3f17086480ad13d2c993022c1b8b5304e327d2 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 14 Oct 2018 21:17:28 +0100 Subject: gnu: Add soundconverter. * gnu/packages/gnome.scm (soundconverter): New variable. * gnu/packages/patches/soundconverter-remove-gconf-dependency.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 65 +++++++++++++++++ .../soundconverter-remove-gconf-dependency.patch | 83 ++++++++++++++++++++++ 3 files changed, 149 insertions(+) create mode 100644 gnu/packages/patches/soundconverter-remove-gconf-dependency.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 402505e229..71aa115621 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1150,6 +1150,7 @@ dist_patch_DATA = \ %D%/packages/patches/slim-reset.patch \ %D%/packages/patches/slim-login.patch \ %D%/packages/patches/sooperlooper-build-with-wx-30.patch \ + %D%/packages/patches/soundconverter-remove-gconf-dependency.patch \ %D%/packages/patches/soundtouch-CVE-2018-14044-14045.patch \ %D%/packages/patches/soundtouch-CVE-2018-1000223.patch \ %D%/packages/patches/steghide-fixes.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index de938e4b14..7b04716fa2 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7220,6 +7220,71 @@ It supports ripping to any audio codec supported by a GStreamer plugin, such as mp3, Ogg Vorbis and FLAC") (license license:gpl2+))) +(define-public soundconverter + (package + (name "soundconverter") + (version "3.0.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://launchpad.net/soundconverter/trunk/" + version "/+download/" + "soundconverter-" version ".tar.xz")) + + (sha256 + (base32 + "1wrxf5py54xplrf97qp24pzbis0cvax5c6k0c7vr3z3ry8r7gd7c")) + (patches + (search-patches + "soundconverter-remove-gconf-dependency.patch")))) + (build-system glib-or-gtk-build-system) + (arguments + `(#:imported-modules ((guix build python-build-system) + (guix build glib-or-gtk-build-system) + ,@%gnu-build-system-modules) + + #:modules ((guix build glib-or-gtk-build-system) + (guix build utils) + ((guix build gnu-build-system) #:prefix gnu:) + ((guix build python-build-system) #:prefix python:)) + + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-POTFILES.in + (lambda _ + (substitute* "po/POTFILES.in" + ;; This file doesn't exist, so without removing it, the 'check + ;; phase fails for the po directory + (("soundconverter/gconfstore\\.py") "")))) + (add-after 'install 'wrap-soundconverter-for-python + (assoc-ref python:%standard-phases 'wrap)) + (add-after 'install 'wrap-soundconverter + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gi-typelib-path (getenv "GI_TYPELIB_PATH")) + (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH"))) + (wrap-program (string-append out "/bin/soundconverter") + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)) + `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path)))) + #t))))) + (native-inputs + `(("intltool" ,intltool) + ("pkg-config" ,pkg-config) + ("glib:bin" ,glib "bin"))) + (inputs + `(("gtk+" ,gtk+) + ("python" ,python) + ("python-pygobject" ,python-pygobject) + ("gstreamer" ,gstreamer) + ("gst-plugins-base" ,gst-plugins-base))) + (home-page "http://soundconverter.org/") + (synopsis "Convert between audio formats with a graphical interface") + (description + "SoundConverter supports converting between many audio formats including +Opus, Ogg Vorbis, FLAC and more. It supports parallel conversion, and +configurable file renaming. ") + (license license:gpl3))) + (define-public workrave (let ((commit "v1_10_21")) (package diff --git a/gnu/packages/patches/soundconverter-remove-gconf-dependency.patch b/gnu/packages/patches/soundconverter-remove-gconf-dependency.patch new file mode 100644 index 0000000000..f065b9a3d4 --- /dev/null +++ b/gnu/packages/patches/soundconverter-remove-gconf-dependency.patch @@ -0,0 +1,83 @@ +From: Sebastian Ramacher +Date: Fri, 6 Apr 2018 13:25:35 +0200 +Subject: Only fetch profiles if GConf is still available + +--- + bin/soundconverter.py | 1 - + soundconverter/gstreamer.py | 44 ++++++++++++++++++++++++-------------------- + 2 files changed, 24 insertions(+), 21 deletions(-) + +diff --git a/bin/soundconverter.py b/bin/soundconverter.py +index 39055ce..5198443 100644 +--- a/bin/soundconverter.py ++++ b/bin/soundconverter.py +@@ -66,7 +66,6 @@ def _check_libs(): + import gi + gi.require_version('Gst', '1.0') + gi.require_version('Gtk', '3.0') +- gi.require_version('GConf', '2.0') + from gi.repository import GObject + # force GIL creation - see https://bugzilla.gnome.org/show_bug.cgi?id=710447 + import threading +diff --git a/soundconverter/gstreamer.py b/soundconverter/gstreamer.py +index 23aaa9b..211b052 100644 +--- a/soundconverter/gstreamer.py ++++ b/soundconverter/gstreamer.py +@@ -25,7 +25,7 @@ from urllib.parse import urlparse + from gettext import gettext as _ + + import gi +-from gi.repository import Gst, Gtk, GObject, GConf, Gio ++from gi.repository import Gst, Gtk, GObject, Gio + + from soundconverter.fileoperations import vfs_encode_filename, file_encode_filename + from soundconverter.fileoperations import unquote_filename, vfs_makedirs, vfs_unlink +@@ -66,25 +66,29 @@ _GCONF_PROFILE_LIST_PATH = "/system/gstreamer/1.0/audio/global/profile_list" + audio_profiles_list = [] + audio_profiles_dict = {} + +-_GCONF = GConf.Client.get_default() +-profiles = _GCONF.all_dirs(_GCONF_PROFILE_LIST_PATH) +-for name in profiles: +- if _GCONF.get_bool(_GCONF_PROFILE_PATH + name + "/active"): +- # get profile +- description = _GCONF.get_string(_GCONF_PROFILE_PATH + name + "/name") +- extension = _GCONF.get_string(_GCONF_PROFILE_PATH + name + "/extension") +- pipeline = _GCONF.get_string(_GCONF_PROFILE_PATH + name + "/pipeline") +- # check profile validity +- if not extension or not pipeline: +- continue +- if not description: +- description = extension +- if description in audio_profiles_dict: +- continue +- # store +- profile = description, extension, pipeline +- audio_profiles_list.append(profile) +- audio_profiles_dict[description] = profile ++try: ++ from gi.repository import GConf ++ _GCONF = GConf.Client.get_default() ++ profiles = _GCONF.all_dirs(_GCONF_PROFILE_LIST_PATH) ++ for name in profiles: ++ if _GCONF.get_bool(_GCONF_PROFILE_PATH + name + "/active"): ++ # get profile ++ description = _GCONF.get_string(_GCONF_PROFILE_PATH + name + "/name") ++ extension = _GCONF.get_string(_GCONF_PROFILE_PATH + name + "/extension") ++ pipeline = _GCONF.get_string(_GCONF_PROFILE_PATH + name + "/pipeline") ++ # check profile validity ++ if not extension or not pipeline: ++ continue ++ if not description: ++ description = extension ++ if description in audio_profiles_dict: ++ continue ++ # store ++ profile = description, extension, pipeline ++ audio_profiles_list.append(profile) ++ audio_profiles_dict[description] = profile ++except ImportError: ++ pass + + required_elements = ('decodebin', 'fakesink', 'audioconvert', 'typefind', 'audiorate') + for element in required_elements: -- cgit v1.2.3 From 42f9ebdc77693f78030c0251e3ffde863542fcc6 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sat, 20 Oct 2018 17:37:32 +0300 Subject: gnu: emacs-which-key: Update to 3.3.0. * gnu/packages/emacs.scm (emacs-which-key): Update to 3.3.0. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 6b360b5ac3..2c6aeca058 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -7243,7 +7243,7 @@ or @code{treemacs}, but leveraging @code{Dired} to do the job of display.") (define-public emacs-which-key (package (name "emacs-which-key") - (version "3.0.2") + (version "3.3.0") (source (origin (method url-fetch) @@ -7252,7 +7252,7 @@ or @code{treemacs}, but leveraging @code{Dired} to do the job of display.") version ".tar.gz")) (sha256 (base32 - "1xvd70cwq9n31f28viyjxmr3nn8l153gsy6scpszvgvjxkiikv24")) + "1lsj314111cp2hjjwnv3f46ws1za6bm39rgy3l19044xf6a68j5w")) (file-name (string-append name "-" version ".tar.gz")))) (build-system emacs-build-system) (arguments -- cgit v1.2.3 From 83246854f32ccb30bb4dfa7e8d4aeb4689b8a372 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sat, 20 Oct 2018 17:46:43 +0300 Subject: gnu: emacs-ggtags: Update to 0.8.13. * gnu/packages/emacs.scm (emacs-ggtags): Update to 0.8.13. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 2c6aeca058..25bb3bd5bc 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1376,7 +1376,7 @@ environment set through Direnv.") (define-public emacs-ggtags (package (name "emacs-ggtags") - (version "0.8.12") + (version "0.8.13") (source (origin (method url-fetch) @@ -1384,7 +1384,7 @@ environment set through Direnv.") version ".el")) (sha256 (base32 - "0ny3llk021g6r0s75xdm4hzpbxv393ddm2r6f2xdk8kqnq4gnirp")))) + "1qa7lcrcmf76sf6dy8sxbg4adq7rg59fm0n5848w3qxgsr0h45fg")))) (build-system emacs-build-system) (home-page "https://github.com/leoliu/ggtags") (synopsis "Frontend to the GNU Global source code tagging system") -- cgit v1.2.3 From 9137596179193434c3ddde3f4ee41552c3db6f13 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sat, 20 Oct 2018 17:47:13 +0300 Subject: gnu: emacs-fill-column-indicator: Update to 1.89. * gnu/packages/emacs.scm (emacs-fill-column-indicator): Update to 1.89. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 25bb3bd5bc..24736fd6e7 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -2162,7 +2162,7 @@ keep pressing the key until it selects what you want. There's also (define-public emacs-fill-column-indicator (package (name "emacs-fill-column-indicator") - (version "1.81") + (version "1.89") (source (origin (method url-fetch) @@ -2171,7 +2171,7 @@ keep pressing the key until it selects what you want. There's also (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1xwyqbjbbicmvhlb85vg4j5snwy1vd7rfk89ws4viws5ljkhhyg8")))) + "09ab01np14bdcsr38xf95kpnvxzqr46mdjmphg3pigwnx39a3jvg")))) (build-system emacs-build-system) (home-page "https://www.emacswiki.org/emacs/FillColumnIndicator") (synopsis "Graphically indicate the fill column") -- cgit v1.2.3 From 45dcdf53491209da56e4f9154cbc63efad39bd86 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sat, 20 Oct 2018 17:47:46 +0300 Subject: gnu: emacs-smart-mode-line: Update to 2.12.0. * gnu/packages/emacs.scm (emacs-smart-mode-line): Update to 2.12.0. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 24736fd6e7..8fdf4b43be 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -2512,7 +2512,7 @@ snippets for yasnippet.") (define-public emacs-smart-mode-line (package (name "emacs-smart-mode-line") - (version "2.10.1") + (version "2.12.0") (source (origin (method url-fetch) @@ -2521,7 +2521,7 @@ snippets for yasnippet.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0i9wajabrrsjzwd842q0m2611kf0q31p9hg1pdj81177gynkw8l8")))) + "1hn8s6laijmg7w1bgwdfrki6h9vxkbgr8rmmssvd5yqyad5w2sba")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-rich-minority" ,emacs-rich-minority))) -- cgit v1.2.3 From 2f1dacc281b49436868e7905d0cc25f451a4d984 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sat, 20 Oct 2018 17:48:07 +0300 Subject: gnu: emacs-rainbow-mode: Update to 1.0.1. * gnu/packages/emacs.scm (emacs-rainbow-mode): Update to 1.0.1. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 8fdf4b43be..24e198465b 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -4757,14 +4757,14 @@ of its name.") (define-public emacs-rainbow-mode (package (name "emacs-rainbow-mode") - (version "0.13") + (version "1.0.1") (source (origin (method url-fetch) (uri (string-append "http://elpa.gnu.org/packages/rainbow-mode-" version ".el")) (sha256 (base32 - "1d3aamx6qgqqpqijwsr02ggwrh67gfink1bir0692alfkm3zdddl")))) + "0cpga4ax635rfpj7y2vmh7ank0yw00dcy20gjg1mj74r97by8csf")))) (build-system emacs-build-system) (home-page "http://elpa.gnu.org/packages/rainbow-mode.html") (synopsis "Colorize color names in buffers") -- cgit v1.2.3 From 292d637b9eb20364c10610e5587c076f6a0cce72 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sat, 20 Oct 2018 17:48:28 +0300 Subject: gnu: emacs-nginx-mode: Update to 1.1.9. * gnu/packages/emacs.scm (emacs-nginx-mode): Update to 1.1.9. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 24e198465b..ec55018ad4 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -5599,7 +5599,7 @@ This package contains the library runtime.") (define-public emacs-nginx-mode (package (name "emacs-nginx-mode") - (version "1.1.4") + (version "1.1.9") (source (origin (method url-fetch) @@ -5609,7 +5609,7 @@ This package contains the library runtime.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1lvkj07kq0jkskr2f61vqb5rlrbnaz9a76ikq40w6925i2r970rr")))) + "0bzyrj6zz1hm67bkhw23bam7qc869s3zg7m1rb1c3aa4n0aw90cq")))) (build-system emacs-build-system) (home-page "https://github.com/ajc/nginx-mode") (synopsis "Emacs major mode for editing nginx config files") -- cgit v1.2.3 From 91c5e6a69d1c073459e1f26b94bf803dcd85414c Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sat, 20 Oct 2018 17:48:36 +0300 Subject: gnu: emacs-yasnippet: Update to 0.13.0. * gnu/packages/emacs.scm (emacs-yasnippet): Update to 0.13.0. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index ec55018ad4..13d8dd99dc 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -5814,7 +5814,7 @@ mode-line.") (define-public emacs-yasnippet (package (name "emacs-yasnippet") - (version "0.12.2") + (version "0.13.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/joaotavora/yasnippet/" @@ -5822,7 +5822,7 @@ mode-line.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "01jabaz0g67bsziayrxgv74px55fx4nlrcl0csl8f1by2102pwc5")) + "12ls2x17agzbrj1xynjbmfa11igqxia4hj4fv6fpr66yci2r1plc")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From e661dca879796e7b209446e63faf94ba9cce91d9 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sat, 20 Oct 2018 17:48:49 +0300 Subject: gnu: emacs-erc-hl-nicks: Update to 1.3.3. * gnu/packages/emacs.scm (emacs-erc-hl-nicks): Update to 1.3.3. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 13d8dd99dc..539b1bf46a 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -7421,7 +7421,7 @@ created by @code{git format-patch}, from @code{magit}, @code{dired} and (define-public emacs-erc-hl-nicks (package (name "emacs-erc-hl-nicks") - (version "1.3.2") + (version "1.3.3") (source (origin (method url-fetch) @@ -7430,7 +7430,7 @@ created by @code{git format-patch}, from @code{magit}, @code{dired} and (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "01svpl9bps5kx4y1wnymakxya2cznqmlynvqv2r500wpnbxczrbs")))) + "1a1r2kc3688g8c2ybkpwh88kgmnqhg3h3032g2yn4zr9m0n3vpkr")))) (build-system emacs-build-system) (synopsis "Nickname highlighting for Emacs ERC") (description "@code{erc-hl-nicks} highlights nicknames in ERC, an IRC -- cgit v1.2.3 From 67fd64a490f549a08f2eaa869915c37836f8c9f3 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sat, 20 Oct 2018 17:48:58 +0300 Subject: gnu: emacs-hy-mode: Update to 1.0.3. * gnu/packages/emacs.scm (emacs-hy-mode): Update to 1.0.3. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 539b1bf46a..1069b9e3c3 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -9736,7 +9736,7 @@ documentation.") (define-public emacs-hy-mode (package (name "emacs-hy-mode") - (version "1.0.2") + (version "1.0.3") (source (origin (method url-fetch) @@ -9745,7 +9745,7 @@ documentation.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0sbga36zkyhzrzcczsyjzll7b9qsa215pnlw51m4li2irm23jh17")))) + "0b4pvbr2hf77bq2vsyfsv653q0dab7qzq85wc7kdziw7687jdf2z")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash) -- cgit v1.2.3 From 227da3a4c5e8420927c1f69c6c87d7d2a62040fe Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sat, 20 Oct 2018 18:24:23 +0300 Subject: gnu: python-glances: Update to 3.0.2. * gnu/packages/python.scm (python-glances): Update to 3.0.2. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index e3a04b0344..29ce213afb 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -10246,14 +10246,14 @@ functionality in the command line.") (define-public python-glances (package (name "python-glances") - (version "2.7.1") + (version "3.0.2") (source (origin (method url-fetch) (uri (pypi-uri "Glances" version)) (sha256 (base32 - "11jbq40g8alsbirnd4kiagznqg270247i0m8qhi48ldf2i5xppxg")))) + "09fxysfp1n16csqvzvawy74qm6a94nvwjf3vcf5gkqp4i6k4vjjy")))) (build-system python-build-system) (propagated-inputs `(("python-psutil" ,python-psutil))) -- cgit v1.2.3 From 82cbe4e0467304e5d8f5931ca4d70617a0e323ba Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sun, 14 Oct 2018 13:55:10 -0400 Subject: gnu: maxima: Update to 5.42.0. * gnu/packages/maths.scm (maxima): Update to 5.42.0. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index d4128f55c4..48bfcba35a 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2659,7 +2659,7 @@ to BMP, JPEG or PNG image formats.") (define-public maxima (package (name "maxima") - (version "5.41.0") + (version "5.42.0") (source (origin (method url-fetch) @@ -2667,7 +2667,7 @@ to BMP, JPEG or PNG image formats.") version "-source/" name "-" version ".tar.gz")) (sha256 (base32 - "0x0n81z0s4pl8nwpf7ivlsbvsdphm9w42250g7qdkizl0132by6s")) + "0d5pdihvcbwb7r4i4qs5qqgsz46hxlq33qj8is053llrgn9ylpyn")) (patches (search-patches "maxima-defsystem-mkdir.patch")))) (build-system gnu-build-system) (inputs -- cgit v1.2.3 From bfa47f14b1a19150d6ddf149597d16493f69ae6d Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 20 Oct 2018 14:37:24 -0400 Subject: gnu: cataclysm-dda: Update snapshot. * gnu/packages/games.scm (cataclysm-dda): Update snapshot to 0b2c194e5. --- gnu/packages/games.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index e2d1a5d6a8..c3067c5684 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -246,8 +246,8 @@ canyons and wait for the long I-shaped block to clear four rows at a time.") (license license:gpl3+))) (define-public cataclysm-dda - (let ((commit "ad3b0c3d521292d119f97a83390e7acfe9e9e7f7") - (revision "1")) + (let ((commit "0b2c194e5c6a06f4fbf14a0ec1260e0f3cf2567c") + (revision "2")) (package (name "cataclysm-dda") ;; This denotes the version released after the 0.C release. @@ -260,7 +260,7 @@ canyons and wait for the long I-shaped block to clear four rows at a time.") (commit commit))) (sha256 (base32 - "1kdgbl8zqd53f5yilm2c9nyq3w6585yxl5jvgxy65dlpzxcqqj7y")) + "1yzsn0y2g27bvbxjvivjyjhkmf2w5na1qqw5qfkswcfqqwym2y33")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 129363b762ad235fe729fdce6c1120f143d0620f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 20 Oct 2018 18:12:21 +0200 Subject: gnu: Add bedtools-2.26. * gnu/packages/bioinformatics.scm (bedtools-2.26): New variable. --- gnu/packages/bioinformatics.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 91bb94c549..c5abe6755e 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -453,6 +453,20 @@ BED, GFF/GTF, VCF.") (find-files "bin" ".*"))) #t))))))) +;; Needed for pybedtools. +(define-public bedtools-2.26 + (package (inherit bedtools) + (name "bedtools") + (version "2.26.0") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/arq5x/bedtools2/releases/" + "download/v" version "/" + "bedtools-" version ".tar.gz")) + (sha256 + (base32 + "0jhavwifnf7lmkb11h9y7dynr8d699h0rd2l52j1pfgircr2zwv5")))))) + (define-public ribotaper (package (name "ribotaper") -- cgit v1.2.3 From 895cf8278abab83032b1efb9e050134639491624 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 20 Oct 2018 19:29:37 +0200 Subject: gnu: python-pybedtools: Update to 0.7.10. * gnu/packages/bioinformatics.scm (python2-pybedtools): Update to 0.7.10. [arguments]: Disable broken tests. [propagated-inputs]: Replace bedtools with bedtools-2.26; add python-matplotlib, python-pysam, and python-pyyaml. [native-inputs]: Remove python-pyyaml; add kentutils, python-numpy, python-pandas, and python-six. (python-pybedtools): New variable. --- gnu/packages/bioinformatics.scm | 85 +++++++++++++++++++++++++++++++++-------- 1 file changed, 70 insertions(+), 15 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index c5abe6755e..bb9bf00499 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -596,29 +596,54 @@ input/output delimiter. When the new functionality is not used, bioawk is intended to behave exactly the same as the original BWK awk.") (license license:x11))) -(define-public python2-pybedtools +(define-public python-pybedtools (package - (name "python2-pybedtools") - (version "0.6.9") + (name "python-pybedtools") + (version "0.7.10") (source (origin (method url-fetch) - (uri (string-append - "https://pypi.python.org/packages/source/p/pybedtools/pybedtools-" - version ".tar.gz")) + (uri (pypi-uri "pybedtools" version)) (sha256 (base32 - "1ldzdxw1p4y3g2ignmggsdypvqkcwqwzhdha4rbgpih048z5p4an")))) + "0l2b2wrnj85azfqgr0zwr60f7j58vlla1hcgxvr9rwikpl8j72ji")))) (build-system python-build-system) - (arguments `(#:python ,python-2)) ; no Python 3 support - (inputs - `(("python-matplotlib" ,python2-matplotlib))) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; See https://github.com/daler/pybedtools/issues/261 + (add-after 'unpack 'disable-broken-tests + (lambda _ + ;; This test (pybedtools.test.test_scripts.test_venn_mpl) needs a + ;; graphical environment. + (substitute* "pybedtools/test/test_scripts.py" + (("def test_venn_mpl") + "def _do_not_test_venn_mpl")) + ;; Requires internet access. + (substitute* "pybedtools/test/test_helpers.py" + (("def test_chromsizes") + "def _do_not_test_chromsizes")) + ;; FIXME: these two fail for no good reason. + (substitute* "pybedtools/test/test1.py" + (("def test_issue_157") + "def _do_not_test_issue_157") + (("def test_to_dataframe") + "def _do_not_test_to_dataframe")) + #t))))) (propagated-inputs - `(("bedtools" ,bedtools) - ("samtools" ,samtools))) + ;; Tests don't pass with Bedtools 2.27.1. + ;; See https://github.com/daler/pybedtools/issues/260 + `(("bedtools" ,bedtools-2.26) + ("samtools" ,samtools) + ("python-matplotlib" ,python-matplotlib) + ("python-pysam" ,python-pysam) + ("python-pyyaml" ,python-pyyaml))) (native-inputs - `(("python-cython" ,python2-cython) - ("python-pyyaml" ,python2-pyyaml) - ("python-nose" ,python2-nose))) + `(("python-numpy" ,python-numpy) + ("python-pandas" ,python-pandas) + ("python-cython" ,python-cython) + ("python-nose" ,python-nose) + ("kentutils" ,kentutils) ; for bedGraphToBigWig + ("python-six" ,python-six))) (home-page "https://pythonhosted.org/pybedtools/") (synopsis "Python wrapper for BEDtools programs") (description @@ -628,6 +653,36 @@ pybedtools extends BEDTools by offering feature-level manipulations from with Python.") (license license:gpl2+))) +(define-public python2-pybedtools + (let ((pkg (package-with-python2 python-pybedtools))) + (package (inherit pkg) + (arguments + `(#:modules ((ice-9 ftw) + (srfi srfi-1) + (srfi srfi-26) + (guix build utils) + (guix build python-build-system)) + ;; See https://github.com/daler/pybedtools/issues/192 + ,@(substitute-keyword-arguments (package-arguments pkg) + ((#:phases phases) + `(modify-phases ,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")))) + ;; The tests need to be run from elsewhere... + (mkdir-p "/tmp/test") + (copy-recursively "pybedtools/test" "/tmp/test") + (with-directory-excursion "/tmp/test" + (invoke "nosetests" + ;; This test fails for unknown reasons + "--exclude=.*test_getting_example_beds")) + #t)))))))))) + (define-public python-biom-format (package (name "python-biom-format") -- cgit v1.2.3 From 8b4102b9038f394749463d002572a730a44b78ef Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 20 Oct 2018 21:31:56 +0200 Subject: gnu: clipper: Update to 1.2.1. * gnu/packages/bioinformatics.scm (clipper): Update to 1.2.1. [source]: Fetch from git. [arguments]: Add fix-typo phase. --- gnu/packages/bioinformatics.scm | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index bb9bf00499..3f50ce0737 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1707,29 +1707,35 @@ databases.") (define-public clipper (package (name "clipper") - (version "1.1") + (version "1.2.1") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/YeoLab/clipper/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/YeoLab/clipper.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0pflmsvhbf8izbgwhbhj1i7349sw1f55qpqj8ljmapp16hb0p0qi")) + "0fja1rj84wp9vpj8rxpj3n8zqzcqq454m904yp9as1w4phccirjb")) (modules '((guix build utils))) (snippet '(begin ;; remove unnecessary setup dependency (substitute* "setup.py" (("setup_requires = .*") "")) - (for-each delete-file - '("clipper/src/peaks.so" - "clipper/src/readsToWiggle.so")) - (delete-file-recursively "dist/") #t)))) (build-system python-build-system) - (arguments `(#:python ,python-2)) ; only Python 2 is supported + (arguments + `(#:python ,python-2 ; only Python 2 is supported + #:phases + (modify-phases %standard-phases + ;; This is fixed in upstream commit + ;; f6c2990198f906bf97730d95695b4bd5a6d01ddb. + (add-after 'unpack 'fix-typo + (lambda _ + (substitute* "clipper/src/readsToWiggle.pyx" + (("^sc.*") "")) + #t))))) (inputs `(("htseq" ,python2-htseq) ("python-pybedtools" ,python2-pybedtools) -- cgit v1.2.3 From 95758e2faf7bb96d8df270d37bf71d52cbd4270c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 20 Oct 2018 21:34:20 +0200 Subject: gnu: aragorn: Use invoke and simplify. * gnu/packages/bioinformatics.scm (aragorn)[arguments]: Use INVOKE in build phase; simplify install phase. --- gnu/packages/bioinformatics.scm | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 3f50ce0737..56a566f1ef 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -136,24 +136,23 @@ (modify-phases %standard-phases (delete 'configure) (replace 'build - (lambda _ - (zero? (system* "gcc" - "-O3" - "-ffast-math" - "-finline-functions" - "-o" - "aragorn" - (string-append "aragorn" ,version ".c"))))) + (lambda _ + (invoke "gcc" + "-O3" + "-ffast-math" + "-finline-functions" + "-o" + "aragorn" + (string-append "aragorn" ,version ".c")) + #t)) (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (man (string-append out "/share/man/man1"))) - (mkdir-p bin) - (install-file "aragorn" bin) - (mkdir-p man) - (install-file "aragorn.1" man)) - #t))))) + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (man (string-append out "/share/man/man1"))) + (install-file "aragorn" bin) + (install-file "aragorn.1" man)) + #t))))) (home-page "http://mbio-serv2.mbioekol.lu.se/ARAGORN") (synopsis "Detect tRNA, mtRNA and tmRNA genes in nucleotide sequences") (description -- cgit v1.2.3 From c793f4d8fb25044994b2694632c6d6f3d40b49b7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 20 Oct 2018 22:03:02 +0200 Subject: gnu: bamm: Fetch from git and use INVOKE. * gnu/packages/bioinformatics.scm (bamm)[source]: Fetch from git. [arguments]: Use INVOKE and return #T unconditionally. --- gnu/packages/bioinformatics.scm | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 56a566f1ef..4192a6c61b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -167,15 +167,16 @@ structure of the predicted RNA.") (name "bamm") (version "1.7.3") (source (origin - (method url-fetch) + (method git-fetch) ;; BamM is not available on pypi. - (uri (string-append - "https://github.com/Ecogenomics/BamM/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (uri (git-reference + (url "https://github.com/Ecogenomics/BamM.git") + (commit version) + (recursive? #t))) + (file-name (git-file-name name version)) (sha256 (base32 - "1f35yxp4pc8aadsvbpg6r4kg2jh4fkjci0iby4iyljm6980sac0s")) + "1p83ahi984ipslxlg4yqy1gdnya9rkn1v71z8djgxkm9d2chw4c5")) (modules '((guix build utils))) (snippet `(begin @@ -197,11 +198,12 @@ structure of the predicted RNA.") (lambda _ (with-directory-excursion "c" (let ((sh (which "sh"))) + (for-each make-file-writable (find-files "." ".*")) ;; Use autogen so that 'configure' works. (substitute* "autogen.sh" (("/bin/sh") sh)) (setenv "CONFIG_SHELL" sh) - (substitute* "configure" (("/bin/sh") sh)) - (zero? (system* "./autogen.sh")))))) + (invoke "./autogen.sh"))) + #t)) (delete 'build) ;; Run tests after installation so compilation only happens once. (delete 'check) @@ -229,7 +231,8 @@ structure of the predicted RNA.") ;; There are 2 errors printed, but they are safe to ignore: ;; 1) [E::hts_open_format] fail to open file ... ;; 2) samtools view: failed to open ... - (zero? (system* "nosetests"))))))) + (invoke "nosetests") + #t))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- cgit v1.2.3 From 337d72fb4410d0ed255b032ca55d2d9dd3dd3065 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 20 Oct 2018 22:05:10 +0200 Subject: gnu: bedops: Use INVOKE. * gnu/packages/bioinformatics.scm (bedops)[arguments]: Use INVOKE. --- gnu/packages/bioinformatics.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 4192a6c61b..ef1f1ae0c2 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -367,9 +367,9 @@ transparently with both VCFs and BCFs, both uncompressed and BGZF-compressed.") ;; Unpack the tarballs to benefit from shebang patching. (with-directory-excursion "third-party" - (and (zero? (system* "tar" "xvf" "jansson-2.6.tar.bz2")) - (zero? (system* "tar" "xvf" "zlib-1.2.7.tar.bz2")) - (zero? (system* "tar" "xvf" "bzip2-1.0.6.tar.bz2")))) + (invoke "tar" "xvf" "jansson-2.6.tar.bz2") + (invoke "tar" "xvf" "zlib-1.2.7.tar.bz2") + (invoke "tar" "xvf" "bzip2-1.0.6.tar.bz2")) ;; Disable unpacking of tarballs in Makefile. (substitute* "system.mk/Makefile.linux" (("^\tbzcat .*") "\t@echo \"not unpacking\"\n") -- cgit v1.2.3 From f8b697a3855adbf583fedd970fe8bc3ab5a8d3f1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 20 Oct 2018 22:17:44 +0200 Subject: gnu: bedops: Update to 2.4.35. * gnu/packages/bioinformatics.scm (bedops): Update to 2.4.35. [source]: Fetch from git. --- gnu/packages/bioinformatics.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index ef1f1ae0c2..a77eaead7e 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -337,15 +337,16 @@ transparently with both VCFs and BCFs, both uncompressed and BGZF-compressed.") (define-public bedops (package (name "bedops") - (version "2.4.33") + (version "2.4.35") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/bedops/bedops/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/bedops/bedops.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0kx4awrwby8f33wqyx8w7ms7v25xhf0d421csgf96a3hfzn2mb0m")))) + "0mmgsgwz5r9w76hzgxkxc9s9lkdhhaf7vr6i02b09vbswvs1fyqx")))) (build-system gnu-build-system) (arguments '(#:tests? #f -- cgit v1.2.3 From f45093429c8319475b22c5478ea6b719b7c97cb8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 20 Oct 2018 22:22:28 +0200 Subject: gnu: blast+: Use INVOKE and return #T unconditionally. * gnu/packages/bioinformatics.scm (blast+)[arguments]: Use INVOKE and return #T unconditionally. --- gnu/packages/bioinformatics.scm | 59 +++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 31 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a77eaead7e..66e06869c4 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1071,15 +1071,12 @@ package provides command line tools using the Bio++ library.") #:parallel-build? #f ; not supported #:phases (modify-phases %standard-phases - (add-before - 'configure 'set-HOME + (add-before 'configure 'set-HOME ;; $HOME needs to be set at some point during the configure phase (lambda _ (setenv "HOME" "/tmp") #t)) - (add-after - 'unpack 'enter-dir + (add-after 'unpack 'enter-dir (lambda _ (chdir "c++") #t)) - (add-after - 'enter-dir 'fix-build-system + (add-after 'enter-dir 'fix-build-system (lambda _ (define (which* cmd) (cond ((string=? cmd "date") @@ -1127,31 +1124,31 @@ package provides command line tools using the Bio++ library.") (("action=/bin/") "action=") (("export PATH") ":")) #t)) - (replace - 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (lib (string-append (assoc-ref outputs "lib") "/lib")) - (include (string-append (assoc-ref outputs "include") - "/include/ncbi-tools++"))) - ;; The 'configure' script doesn't recognize things like - ;; '--enable-fast-install'. - (zero? (system* "./configure.orig" - (string-append "--with-build-root=" (getcwd) "/build") - (string-append "--prefix=" out) - (string-append "--libdir=" lib) - (string-append "--includedir=" include) - (string-append "--with-bz2=" - (assoc-ref inputs "bzip2")) - (string-append "--with-z=" - (assoc-ref inputs "zlib")) - (string-append "--with-pcre=" - (assoc-ref inputs "pcre")) - ;; Each library is built twice by default, once - ;; with "-static" in its name, and again - ;; without. - "--without-static" - "--with-dll")))))))) + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (lib (string-append (assoc-ref outputs "lib") "/lib")) + (include (string-append (assoc-ref outputs "include") + "/include/ncbi-tools++"))) + ;; The 'configure' script doesn't recognize things like + ;; '--enable-fast-install'. + (invoke "./configure.orig" + (string-append "--with-build-root=" (getcwd) "/build") + (string-append "--prefix=" out) + (string-append "--libdir=" lib) + (string-append "--includedir=" include) + (string-append "--with-bz2=" + (assoc-ref inputs "bzip2")) + (string-append "--with-z=" + (assoc-ref inputs "zlib")) + (string-append "--with-pcre=" + (assoc-ref inputs "pcre")) + ;; Each library is built twice by default, once + ;; with "-static" in its name, and again + ;; without. + "--without-static" + "--with-dll") + #t)))))) (outputs '("out" ; 21 MB "lib" ; 226 MB "include")) ; 33 MB -- cgit v1.2.3 From 21c837405a7d46590fbe1d9e45e16a56f182e451 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 20 Oct 2018 23:04:02 +0200 Subject: gnu: bowtie: Update to 2.3.4.3. * gnu/packages/bioinformatics.scm (bowtie): Update to 2.3.4.3. [source]: Fetch from git. [inputs]: Replace python-2 with python-wrapper; move perl, perl-clone, perl-test-deep, and perl-test-simple from here... [native-inputs]: ...to here. [arguments]: Simplify check phase. --- gnu/packages/bioinformatics.scm | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 66e06869c4..7c58ab2455 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1273,15 +1273,16 @@ errors at the end of reads.") (define-public bowtie (package (name "bowtie") - (version "2.3.2") + (version "2.3.4.3") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/BenLangmead/bowtie2/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/BenLangmead/bowtie2.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0hwa5r9qbglppb7sz5z79rlmmddr3n51n468jb3wh8rwjgn3yr90")) + "1zl3cf327y2p7p03cavymbh7b00djc7lncfaqih33n96iy9q8ibp")) (modules '((guix build utils))) (snippet '(begin @@ -1291,14 +1292,6 @@ errors at the end of reads.") (("-DBUILD_TIME=.*") "-DBUILD_TIME=\"\\\"0\\\"\"")) #t)))) (build-system gnu-build-system) - (inputs - `(("perl" ,perl) - ("perl-clone" ,perl-clone) - ("perl-test-deep" ,perl-test-deep) - ("perl-test-simple" ,perl-test-simple) - ("python" ,python-2) - ("tbb" ,tbb) - ("zlib" ,zlib))) (arguments '(#:make-flags (list "allall" @@ -1308,11 +1301,21 @@ errors at the end of reads.") (modify-phases %standard-phases (delete 'configure) (replace 'check - (lambda* (#:key outputs #:allow-other-keys) - (zero? (system* "perl" - "scripts/test/simple_tests.pl" - "--bowtie2=./bowtie2" - "--bowtie2-build=./bowtie2-build"))))))) + (lambda _ + (invoke "perl" + "scripts/test/simple_tests.pl" + "--bowtie2=./bowtie2" + "--bowtie2-build=./bowtie2-build") + #t))))) + (inputs + `(("tbb" ,tbb) + ("zlib" ,zlib) + ("python" ,python-wrapper))) + (native-inputs + `(("perl" ,perl) + ("perl-clone" ,perl-clone) + ("perl-test-deep" ,perl-test-deep) + ("perl-test-simple" ,perl-test-simple))) (home-page "http://bowtie-bio.sourceforge.net/bowtie2/index.shtml") (synopsis "Fast and sensitive nucleotide sequence read aligner") (description -- cgit v1.2.3 From 617c478506888daea35dceeda3679196eb8a5177 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Sun, 21 Oct 2018 22:31:56 +1000 Subject: gnu: python2-dendropy: Disable failing test. * gnu/packages/bioinformatics.scm (python2-dendropy)[arguments]: Disable failing test. --- gnu/packages/bioinformatics.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 7c58ab2455..1e04081ceb 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2063,7 +2063,21 @@ trees (phylogenies) and characters.") (license license:bsd-3))) (define-public python2-dendropy - (package-with-python2 python-dendropy)) + (let ((base (package-with-python2 python-dendropy))) + (package + (inherit base) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-failing-test + (lambda _ + ;; This test fails when the full test suite is run, as documented + ;; at https://github.com/jeetsukumaran/DendroPy/issues/74 + (substitute* "tests/test_dataio_nexml_reader_tree_list.py" + (("test_collection_comments_and_annotations") + "do_not_test_collection_comments_and_annotations")) + #t))) + ,@(package-arguments base)))))) (define-public python-py2bit (package -- cgit v1.2.3 From 2c17bd7b2955beef4130d11b33e07e4fb3b234dc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 21 Oct 2018 12:06:13 +0300 Subject: gnu: kodi: Disable version checker. Fixes bug#32997. * gnu/packages/kodi.scm (kodi)[arguments]: Add substitution to remove the version checking configuration option. --- gnu/packages/kodi.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index 86ce914d53..21e7b12d3e 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -317,6 +317,11 @@ generator library for C++.") (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo"))) + ;; Don't phone home to check for updates.¬ + (substitute* "system/addon-manifest.xml"¬ + (("service.xbmc.versioncheck") + "")) + ;; Let's disable some tests that are known not to work here. ;; Doing this later while in the cmake "../build" directory ;; is trickier. -- cgit v1.2.3 From 8eadc552029a6ec6385d28aaa687f0208aad26c3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 20 Oct 2018 17:23:45 +0200 Subject: gnu: openal: Update to 1.19.1. * gnu/packages/audio.scm (openal): Update to 1.19.1. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index ac41ed2dfe..5ec10b370e 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1910,7 +1910,7 @@ lv2-c++-tools.") (define-public openal (package (name "openal") - (version "1.19.0") + (version "1.19.1") (source (origin (method url-fetch) (uri (string-append @@ -1918,7 +1918,7 @@ lv2-c++-tools.") version ".tar.bz2")) (sha256 (base32 - "1mhf5bsb58s1xk6hvxl7ly7rd4rpl9z8h07xl1q94brywykg7bgi")))) + "1sdjhkz2gd6lbnwphi1b6aw3br4wv2lik5vnqh6mxfc8a7zqfbsw")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; no check target -- cgit v1.2.3 From 8941b4ab3d41ff2ca036c2ec6aa762fe78516c4b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 20 Oct 2018 17:24:12 +0200 Subject: gnu: appstream-glib: Update to 0.7.14. * gnu/packages/glib.scm (appstream-glib): Update to 0.7.14. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 14d2a8b315..703cd3f74e 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -787,7 +787,7 @@ programming langauage. It also contains the utility (define-public appstream-glib (package (name "appstream-glib") - (version "0.7.12") + (version "0.7.14") (source (origin (method url-fetch) (uri (string-append "https://people.freedesktop.org/~hughsient/" @@ -795,7 +795,7 @@ programming langauage. It also contains the utility "appstream-glib-" version ".tar.xz")) (sha256 (base32 - "1jcb2bggcic3iczr2hn8zp8a3c2hl1xjij0aawr7kwqmzh9b3jms")))) + "0n0s99jmx2sx5895lcvmfjwa9r0f06i71495dpn9v9frz4asvk3d")))) (build-system meson-build-system) (native-inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From ab5e4be647613e7b3d741b4cabf682cc96514658 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 20 Oct 2018 17:24:34 +0200 Subject: gnu: libgphoto2: Update to 2.5.19. * gnu/packages/photo.scm (libgphoto2): Update to 2.5.19. --- gnu/packages/photo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 7bdf04cb49..db7a9f9d45 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -131,14 +131,14 @@ data as produced by digital cameras.") (define-public libgphoto2 (package (name "libgphoto2") - (version "2.5.18") + (version "2.5.19") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gphoto/libgphoto/" version "/libgphoto2-" version ".tar.bz2")) (sha256 (base32 - "1v57ayp17j88bj79nl7rf4iyajbxx00kgb4l5k3kbv50gjfvh5sv")))) + "0qrcc6kajbfb237paxrl904vvwl7hd8mnqvjw00j6m5qwd93wlk2")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs -- cgit v1.2.3 From 920de4286adb1b4afe2ce48bac1bbef57f1c2cba Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 20 Oct 2018 17:24:55 +0200 Subject: gnu: re2: Update to 2018-10-01. * gnu/packages/regex.scm (re2): Update to 2018-10-01. --- gnu/packages/regex.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/regex.scm b/gnu/packages/regex.scm index c9d9e8a359..c05d819d65 100644 --- a/gnu/packages/regex.scm +++ b/gnu/packages/regex.scm @@ -29,7 +29,7 @@ (define-public re2 (package (name "re2") - (version "2018-09-01") + (version "2018-10-01") (home-page "https://github.com/google/re2") (source (origin (method url-fetch) @@ -37,7 +37,7 @@ (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0hygr88hvy7if1i45m5r6x60zf73439j2fwzw7wwcw9gb01v690l")))) + "10fsxsj3yip34hp2zl5rw8h2x2lgnp83fwrh7m0qfd9m99qrf4x3")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) -- cgit v1.2.3 From c8d62d936e23ed6c3aee0d7cbfca16e66e0de9cb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 20 Oct 2018 17:36:13 +0200 Subject: gnu: libgxps: Propagate required inputs. * gnu/packages/gnome.scm (libgxps)[inputs]: Move CAIRO, GLIB and LIBARCHIVE ... [propagated-inputs]: ... here. New field. --- gnu/packages/gnome.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7b04716fa2..4251d5cf8f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -412,13 +412,16 @@ access the common Google services, and has full asynchronous support.") `(("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config))) (inputs - `(("cairo" ,cairo) - ("glib" ,glib) - ("libarchive" ,libarchive) + `(("gtk+" ,gtk+) ("libjpeg" ,libjpeg) ("lcms" ,lcms) ("libtiff" ,libtiff) ("nettle" ,nettle))) + (propagated-inputs + ;; In Requires of libgxps.pc. + `(("cairo" ,cairo) + ("glib" ,glib) + ("libarchive" ,libarchive))) (home-page "https://wiki.gnome.org/Projects/libgxps") (synopsis "GObject-based library for handling and rendering XPS documents") (description -- cgit v1.2.3 From b6b3e5120ad3badba4f55af45b02667b662c1362 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 20 Oct 2018 17:43:47 +0200 Subject: gnu: libgxps: Update to 0.3.0. * gnu/packages/gnome.scm (libgxps): Update to 0.3.0. [source](patches): Remove. [build-system]: Switch to MESON-BUILD-SYSTEM. [inputs]: Change LIBJPEG to LIBJPEG-TURBO. * gnu/packages/patches/libgxps-CVE-2017-11590.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 1 - gnu/packages/gnome.scm | 9 ++--- gnu/packages/patches/libgxps-CVE-2017-11590.patch | 48 ----------------------- 3 files changed, 4 insertions(+), 54 deletions(-) delete mode 100644 gnu/packages/patches/libgxps-CVE-2017-11590.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 71aa115621..1c48fd3d6e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -883,7 +883,6 @@ dist_patch_DATA = \ %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 \ %D%/packages/patches/libjxr-fix-typos.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4251d5cf8f..7d2742f08d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -397,23 +397,22 @@ access the common Google services, and has full asynchronous support.") (define-public libgxps (package (name "libgxps") - (version "0.2.5") + (version "0.3.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" (version-major+minor version) "/" name "-" version ".tar.xz")) - (patches (search-patches "libgxps-CVE-2017-11590.patch")) (sha256 (base32 - "184r06s8g20cfigg7m169n42jjsc9wmzzlycr4g1fxxhr72r8x9y")))) - (build-system gnu-build-system) + "1bhgrpb6ndlp11qwr95g9piklmjcsca7bi04f8gy9ziipm1i6as1")))) + (build-system meson-build-system) (native-inputs `(("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config))) (inputs `(("gtk+" ,gtk+) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("lcms" ,lcms) ("libtiff" ,libtiff) ("nettle" ,nettle))) diff --git a/gnu/packages/patches/libgxps-CVE-2017-11590.patch b/gnu/packages/patches/libgxps-CVE-2017-11590.patch deleted file mode 100644 index 9caa79b6f0..0000000000 --- a/gnu/packages/patches/libgxps-CVE-2017-11590.patch +++ /dev/null @@ -1,48 +0,0 @@ -Fix CVE-2017-11590: - -https://bugzilla.gnome.org/show_bug.cgi?id=785479 -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-11590 - -Patch copied from upstream source repository: - -https://git.gnome.org/browse/libgxps/commit/?id=9d5d292055250ed298f3b89dc332d6db4003a031 - -From 9d5d292055250ed298f3b89dc332d6db4003a031 Mon Sep 17 00:00:00 2001 -From: Marek Kasik -Date: Wed, 26 Jul 2017 16:23:37 +0200 -Subject: archive: Check for pathname being NULL before dereferencing - -Check whether "archive_entry_pathname ()" returns a non-NULL pathname -before using it to avoid a NULL pointer being dereferenced. - -https://bugzilla.gnome.org/show_bug.cgi?id=785479 ---- - libgxps/gxps-archive.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/libgxps/gxps-archive.c b/libgxps/gxps-archive.c -index acf8d7d..e763773 100644 ---- a/libgxps/gxps-archive.c -+++ b/libgxps/gxps-archive.c -@@ -257,6 +257,7 @@ gxps_archive_initable_init (GInitable *initable, - GXPSArchive *archive; - ZipArchive *zip; - struct archive_entry *entry; -+ const gchar *pathname; - - archive = GXPS_ARCHIVE (initable); - -@@ -281,7 +282,9 @@ gxps_archive_initable_init (GInitable *initable, - - while (gxps_zip_archive_iter_next (zip, &entry)) { - /* FIXME: We can ignore directories here */ -- g_hash_table_add (archive->entries, g_strdup (archive_entry_pathname (entry))); -+ pathname = archive_entry_pathname (entry); -+ if (pathname != NULL) -+ g_hash_table_add (archive->entries, g_strdup (pathname)); - archive_read_data_skip (zip->archive); - } - --- -cgit v0.12 - -- cgit v1.2.3 From 9b6dc31b6d0fa56e005c928453a6bc72cff9ae73 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 21 Oct 2018 17:47:35 +0200 Subject: gnu: fluidsynth: Update to 2.0.1. * gnu/packages/audio.scm (fluidsynth): Update to 2.0.1. (fluidsynth-1): New public variable. * gnu/packages/games.scm (gzdoom)[inputs]: Change FLUIDSYNTH to FLUIDSYNTH-1. * gnu/packages/music.scm (lmms)[inputs]: Likewise. --- gnu/packages/audio.scm | 21 +++++++++++++++++++-- gnu/packages/games.scm | 2 +- gnu/packages/music.scm | 2 +- 3 files changed, 21 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 5ec10b370e..a1745bb7a6 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2018 Maxim Cournoyer ;;; Copyright © 2018 Clément Lassieur ;;; Copyright © 2018 Brett Gilio +;;; Copyright © 2018 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -1041,7 +1042,7 @@ follower.") (define-public fluidsynth (package (name "fluidsynth") - (version "1.1.11") + (version "2.0.1") (source (origin (method git-fetch) (uri (git-reference @@ -1050,7 +1051,7 @@ follower.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0n75jq3xgq46hfmjkaaxz3gic77shs4fzajq40c8gk043i84xbdh")))) + "1mqyym5qkh8xd1rqj3yhfxbw5dxjcrljb6nkfqzvcarlv4h6rjn7")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; no check target @@ -1082,6 +1083,22 @@ device. It is the software analogue of a MIDI synthesizer. FluidSynth can also play midifiles using a Soundfont.") (license license:lgpl2.1+))) +;; gzdoom@3.3.0 and lmms@1.1.3 requires this version. Remove once no longer +;; needed. +(define-public fluidsynth-1 + (package + (inherit fluidsynth) + (version "1.1.11") + (source (origin + (inherit (package-source fluidsynth)) + (uri (git-reference + (url "https://github.com/FluidSynth/fluidsynth") + (commit (string-append "v" version)))) + (file-name (git-file-name "fluidsynth" version)) + (sha256 + (base32 + "0n75jq3xgq46hfmjkaaxz3gic77shs4fzajq40c8gk043i84xbdh")))))) + (define-public faad2 (package (name "faad2") diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index c3067c5684..bb96bbe68a 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5355,7 +5355,7 @@ You can save humanity and get programming skills!") (build-system cmake-build-system) (inputs `(("bzip2" ,bzip2) ("fluid-3" ,fluid-3) - ("fluidsynth" ,fluidsynth) + ("fluidsynth" ,fluidsynth-1) ;XXX: try using 2.x when updating ("gtk+3" ,gtk+) ("libgme" ,libgme) ("libjpeg" ,libjpeg) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 13a6ecc36f..cdd06647e1 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3567,7 +3567,7 @@ are a C compiler and glib. Full API documentation and examples are included.") ("fltk" ,fltk) ("libogg" ,libogg) ("libsamplerate" ,libsamplerate) - ("fluidsynth" ,fluidsynth) + ("fluidsynth" ,fluidsynth-1) ;XXX: try using 2.x when updating ("libvorbis" ,libvorbis) ("alsa-lib" ,alsa-lib) ("portaudio" ,portaudio) -- cgit v1.2.3 From 3a69b59332f02805fde2aee22b8f622c651f7007 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 21 Oct 2018 17:51:42 +0200 Subject: gnu: rng-tools: Update to 6.6. * gnu/packages/linux.scm (rng-tools): Update to 6.6. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 6a89caf277..2aeddc2a34 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3671,7 +3671,7 @@ The collection contains a set of bandwidth and latency benchmark such as: (package (name "rng-tools") (home-page "https://github.com/nhorman/rng-tools") - (version "6.5") + (version "6.6") (source (origin (method git-fetch) (uri (git-reference (url home-page) @@ -3679,7 +3679,7 @@ The collection contains a set of bandwidth and latency benchmark such as: (file-name (git-file-name name version)) (sha256 (base32 - "11kw1rcgzmgzwk7g1w2g0nzjraqb0pf24gxpy50k4ls2qxslw3rk")))) + "0c32sxfvngdjzfmxn5ngc5yxwi8ij3yl216nhzyz9r31qi3m14v7")))) (build-system gnu-build-system) (arguments `(;; Avoid using OpenSSL, curl, and libxml2, reducing the closure by 166 MiB. -- cgit v1.2.3 From ecc604baf0357fa32e5e0c983193573eab3cd9d3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 19 Oct 2018 19:17:54 +0200 Subject: 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(+) (limited to 'gnu') 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) -- cgit v1.2.3 From e381ae317c054a8ac52037c3f0df72ca3c96b91f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 19 Oct 2018 21:29:51 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 673364cd3a7848067dc3ecb69c7f8a4f3a28f6d5 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 21 Oct 2018 19:49:10 +0200 Subject: gnu: Add emacs-slime-repl-ansi-color. * gnu/packages/emacs.scm (emacs-slime-repl-ansi-color): New variable. --- gnu/packages/emacs.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 1069b9e3c3..47e984e101 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -12386,3 +12386,23 @@ have special meaning. It is also handy for aligning text across long vertical distances. Multi-column characters, such as @kbd{TAB} are treated correctly.") (license license:gpl2+))) + +(define-public emacs-slime-repl-ansi-color + (let ((commit "ad03263f5d4de473bc173b64a6fc3dc1106393d7")) + (package + (name "emacs-slime-repl-ansi-color") + (version (git-version "0.0.0" "1" commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/deadtrickster/slime-repl-ansi-color") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0bpg7gxz310x7bnlg324c507sxc5gxwwz6h64h6kdq141r73vbi4")))) + (build-system emacs-build-system) + (home-page "https://github.com/deadtrickster/slime-repl-ansi-color") + (synopsis "Color ANSI codes in the REPL of SLIME") + (description "Color ANSI codes in the REPL of SLIME") + (license license:gpl2+)))) -- cgit v1.2.3 From 9ab6c680ba7e42d3a7cf13c74a7bbcb53c5c390e Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 21 Oct 2018 14:56:44 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.162. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.162. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2aeddc2a34..5cbf87b68c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -452,8 +452,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.161" - "1q6bsndpjgw72mybhl5l8vrxs4mimg6821bjgi1pjkxbc7nd921b" + (make-linux-libre "4.4.162" + "1anb2k9i03369lvbwlw24vimxvk8zpcql4ryz0ydvf3pxv8lirm2" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From c4a7a512922467313f5cc18fc61029c44ac5360e Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 21 Oct 2018 14:57:24 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.135. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.135. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 5cbf87b68c..09f64d5e04 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -446,8 +446,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.134" - "0f5qif27k0mhc57d98arbfkq7zlvg0ra2gz6g5fasblyjz3j7w7h" + (make-linux-libre "4.9.135" + "07v5s6hl08ls2z9xdkbqq1s210mqayfchqbckhp8hlaw089ap71f" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From 668834cae0f6b761d88533c91475d9184a8ab4ad Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 21 Oct 2018 14:58:03 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.78. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.78. (%linux-libre-4.14-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 09f64d5e04..61560b7a1b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -436,8 +436,8 @@ It has been modified to remove all non-free binary blobs.") #:patches %linux-libre-4.18-patches #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.77") -(define %linux-libre-4.14-hash "18y81rga2lhsk7bjckglxz52pvnzf103ar0z2zj611g37wyf83r5") +(define %linux-libre-4.14-version "4.14.78") +(define %linux-libre-4.14-hash "07dhhw6zdnqn2dznpmkniz58hfkdx89yx7csm9vbx45blnyhjw5z") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.2.3 From f7618bf18e00f6ece8e886f2fc6328314d1ed544 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 21 Oct 2018 14:59:30 -0400 Subject: gnu: linux-libre: Update to 4.18.16. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.18.16. (%linux-libre-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 61560b7a1b..bc53a88bfc 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -405,8 +405,8 @@ It has been modified to remove all non-free binary blobs.") ;; supports qemu "virt" machine and possibly a large number of ARM boards. ;; See : https://wiki.debian.org/DebianKernel/ARMMP. -(define %linux-libre-version "4.18.15") -(define %linux-libre-hash "0v6xs85qn1iy2dj3m6s3cfnhbwb1mjy21d9lagjni8dg3jic26hf") +(define %linux-libre-version "4.18.16") +(define %linux-libre-hash "15apfgswp2lrwjpi3vwnanlkdw3q6rkvwrbgrb71rjsy9gazlz62") (define %linux-libre-4.18-patches (list %boot-logo-patch -- cgit v1.2.3 From 9a6808e0c00d6acb00b7be4aa573f252fa7d9635 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 21 Oct 2018 11:54:44 +0200 Subject: gnu: tophat: Update to 2.1.1. * gnu/packages/bioinformatics.scm (tophat): Update to 2.1.1. * gnu/packages/patches/tophat-build-with-later-seqan.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove patch. --- gnu/local.mk | 1 - gnu/packages/bioinformatics.scm | 7 +++---- .../patches/tophat-build-with-later-seqan.patch | 24 ---------------------- 3 files changed, 3 insertions(+), 29 deletions(-) delete mode 100644 gnu/packages/patches/tophat-build-with-later-seqan.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 1c48fd3d6e..c167e6753c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1177,7 +1177,6 @@ dist_patch_DATA = \ %D%/packages/patches/tk-find-library.patch \ %D%/packages/patches/ttf2eot-cstddef.patch \ %D%/packages/patches/ttfautohint-source-date-epoch.patch \ - %D%/packages/patches/tophat-build-with-later-seqan.patch \ %D%/packages/patches/totem-meson-easy-codec.patch \ %D%/packages/patches/tuxpaint-stamps-path.patch \ %D%/packages/patches/twinkle-include-qregexpvalidator.patch \ diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 1e04081ceb..0dc81c8f61 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1332,7 +1332,7 @@ gapped, local, and paired-end alignment modes.") (define-public tophat (package (name "tophat") - (version "2.1.0") + (version "2.1.1") (source (origin (method url-fetch) (uri (string-append @@ -1340,13 +1340,12 @@ gapped, local, and paired-end alignment modes.") version ".tar.gz")) (sha256 (base32 - "168zlzykq622zbgkh90a90f1bdgsxkscq2zxzbj8brq80hbjpyp7")) - (patches (search-patches "tophat-build-with-later-seqan.patch")) + "19add02kv2xhd6ihd779dr7x35ggym3jqr0m5c4315i1yfb0p11p")) (modules '((guix build utils))) (snippet '(begin ;; Remove bundled SeqAn and samtools - (delete-file-recursively "src/SeqAn-1.3") + (delete-file-recursively "src/SeqAn-1.4.2") (delete-file-recursively "src/samtools-0.1.18") #t)))) (build-system gnu-build-system) diff --git a/gnu/packages/patches/tophat-build-with-later-seqan.patch b/gnu/packages/patches/tophat-build-with-later-seqan.patch deleted file mode 100644 index fc742e2a7d..0000000000 --- a/gnu/packages/patches/tophat-build-with-later-seqan.patch +++ /dev/null @@ -1,24 +0,0 @@ -This patch resolves a build failure when building TopHat 2.1.0 with SeqAn 1.4. -This is the relevant part of a patch originally posted here: -https://lists.fu-berlin.de/pipermail/seqan-dev/2014-July/msg00001.html - ---- a/src/segment_juncs.cpp -+++ b/src/segment_juncs.cpp -@@ -2050,10 +2050,13 @@ void juncs_from_ref_segs(RefSequenceTabl - typedef map MotifMap; - - MotifMap ims; -- -- seqan::DnaStringReverseComplement rev_donor_dinuc(donor_dinuc); -- seqan::DnaStringReverseComplement rev_acceptor_dinuc(acceptor_dinuc); -- -+ -+ typedef seqan::ModifiedString< -+ seqan::ModifiedString > >, -+ seqan::ModReverse> ConstDnaStringReverseComplement; -+ ConstDnaStringReverseComplement rev_donor_dinuc(donor_dinuc); -+ ConstDnaStringReverseComplement rev_acceptor_dinuc(acceptor_dinuc); -+ - if (talkative) - fprintf(stderr, "Collecting potential splice sites in islands\n"); - -- cgit v1.2.3 From 1d18ee6dfd99d9945a0e8eae7557250a1bdc6306 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 21 Oct 2018 12:00:41 +0200 Subject: gnu: bwa-pssm: Fetch from git. * gnu/packages/bioinformatics.scm (bwa-pssm)[source]: Fetch from git. --- gnu/packages/bioinformatics.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 0dc81c8f61..593b5b6202 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1449,13 +1449,14 @@ and more accurate. BWA-MEM also has better performance than BWA-backtrack for (name "bwa-pssm") (version "0.5.11") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/pkerpedjiev/bwa-pssm/" - "archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/pkerpedjiev/bwa-pssm.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "02p7mpbs4mlxmn84g2x4ghak638vbj4lqix2ipx5g84pz9bhdavg")))) + "076c4q0cdqz8jgylb067y9zmvxglppnzi3qiscn0xiypgc6lgb5r")))) (build-system gnu-build-system) (inputs `(("gdsl" ,gdsl) -- cgit v1.2.3 From 2ba2d62c69409255e0c00c480c424c668cba845f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 21 Oct 2018 12:33:01 +0200 Subject: gnu: python2-bx-python: Update to 0.8.2. * gnu/packages/bioinformatics.scm (python2-bx-python): Update to 0.8.2. [source]: Remove obsolete snippet. [inputs]: Move python2-numpy from here... [propagated-inputs]: ...to here; add python2-six. [native-inputs]: Add python2-lzo and python2-cython. [home-page]: Update to new home at Github. --- gnu/packages/bioinformatics.scm | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 593b5b6202..dee8a975b9 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1477,31 +1477,27 @@ well as many of the command line options.") (define-public python2-bx-python (package (name "python2-bx-python") - (version "0.7.3") + (version "0.8.2") (source (origin (method url-fetch) (uri (pypi-uri "bx-python" version)) (sha256 (base32 - "15z2w3bvnc0n4qmb9bd6d8ylc2h2nj883x2w9iixf4x3vki9b22i")) - (modules '((guix build utils))) - (snippet - '(begin - (substitute* "setup.py" - ;; remove dependency on outdated "distribute" module - (("^from distribute_setup import use_setuptools") "") - (("^use_setuptools\\(\\)") "")) - #t)))) + "11kksg2rbzihpmcid823xvg42xi88m7sz58rzk29abybkxy0rszs")))) (build-system python-build-system) (arguments `(#:tests? #f ;tests fail because test data are not included #:python ,python-2)) - (inputs + (propagated-inputs `(("python-numpy" ,python2-numpy) - ("zlib" ,zlib))) + ("python-six" ,python2-six))) + (inputs + `(("zlib" ,zlib))) (native-inputs - `(("python-nose" ,python2-nose))) - (home-page "http://bitbucket.org/james_taylor/bx-python/") + `(("python-lzo" ,python2-lzo) + ("python-nose" ,python2-nose) + ("python-cython" ,python2-cython))) + (home-page "https://github.com/bxlab/bx-python") (synopsis "Tools for manipulating biological data") (description "bx-python provides tools for manipulating biological data, particularly -- cgit v1.2.3 From f5cec0068a7e6f9ca1b7542d1839b832ee057648 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 21 Oct 2018 12:36:53 +0200 Subject: gnu: Add python-bx-python. * gnu/packages/bioinformatics.scm (python-bx-python): New variable. (python2-bx-python): Define in terms of python-bx-python. --- gnu/packages/bioinformatics.scm | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index dee8a975b9..7cd9172446 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1474,9 +1474,9 @@ the original BWA alignment program and shares the genome index structure as well as many of the command line options.") (license license:gpl3+))) -(define-public python2-bx-python +(define-public python-bx-python (package - (name "python2-bx-python") + (name "python-bx-python") (version "0.8.2") (source (origin (method url-fetch) @@ -1485,18 +1485,17 @@ well as many of the command line options.") (base32 "11kksg2rbzihpmcid823xvg42xi88m7sz58rzk29abybkxy0rszs")))) (build-system python-build-system) - (arguments - `(#:tests? #f ;tests fail because test data are not included - #:python ,python-2)) + ;; Tests fail because test data are not included + (arguments '(#:tests? #f)) (propagated-inputs - `(("python-numpy" ,python2-numpy) - ("python-six" ,python2-six))) + `(("python-numpy" ,python-numpy) + ("python-six" ,python-six))) (inputs `(("zlib" ,zlib))) (native-inputs - `(("python-lzo" ,python2-lzo) - ("python-nose" ,python2-nose) - ("python-cython" ,python2-cython))) + `(("python-lzo" ,python-lzo) + ("python-nose" ,python-nose) + ("python-cython" ,python-cython))) (home-page "https://github.com/bxlab/bx-python") (synopsis "Tools for manipulating biological data") (description @@ -1504,6 +1503,9 @@ well as many of the command line options.") multiple sequence alignments.") (license license:expat))) +(define-public python2-bx-python + (package-with-python2 python-bx-python)) + (define-public python-pysam (package (name "python-pysam") -- cgit v1.2.3 From 8640f9ec91f7a9e81457a3651a06465fd8dd03a3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 21 Oct 2018 12:42:14 +0200 Subject: gnu: python-twobitreader: Update to 3.1.6. * gnu/packages/bioinformatics.scm (python-twobitreader): Update to 3.1.6. [source]: Fetch from git. --- gnu/packages/bioinformatics.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 7cd9172446..795b0f208e 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1595,19 +1595,19 @@ also includes an interface for tabix.") (define-public python-twobitreader (package (name "python-twobitreader") - (version "3.1.4") + (version "3.1.6") (source (origin - (method url-fetch) - (uri (pypi-uri "twobitreader" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/benjschiller/twobitreader") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1q8wnj2kga9nz1lwc4w7qv52smfm536hp6mc8w6s53lhyj0mpi22")))) + "1qbxvv1h58cismbk1anpjrkpghsaiy64a11ir3lhy6qch6xf8n62")))) (build-system python-build-system) - (arguments - '(;; Tests are not distributed in the PyPi release. - ;; TODO Try building from the Git repo or asking the upstream maintainer - ;; to distribute the tests on PyPi. - #:tests? #f)) + ;; Tests are not included + (arguments '(#:tests? #f)) (native-inputs `(("python-sphinx" ,python-sphinx))) (home-page "https://github.com/benjschiller/twobitreader") -- cgit v1.2.3 From 7321920cd3c9c1d7532024dfcdb958cce54b6368 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 21 Oct 2018 12:51:31 +0200 Subject: gnu: crossmap: Update to 0.2.9. * gnu/packages/bioinformatics.scm (crossmap): Update to 0.2.9. * gnu/packages/patches/crossmap-allow-system-pysam.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove patch. --- gnu/local.mk | 1 - gnu/packages/bioinformatics.scm | 25 +---- .../patches/crossmap-allow-system-pysam.patch | 121 --------------------- 3 files changed, 6 insertions(+), 141 deletions(-) delete mode 100644 gnu/packages/patches/crossmap-allow-system-pysam.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index c167e6753c..c76908f92f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -634,7 +634,6 @@ dist_patch_DATA = \ %D%/packages/patches/cracklib-fix-buffer-overflow.patch \ %D%/packages/patches/crawl-upgrade-saves.patch \ %D%/packages/patches/crda-optional-gcrypt.patch \ - %D%/packages/patches/crossmap-allow-system-pysam.patch \ %D%/packages/patches/clucene-contribs-lib.patch \ %D%/packages/patches/cube-nocheck.patch \ %D%/packages/patches/cursynth-wave-rand.patch \ diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 795b0f208e..6469e9e1a1 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1894,31 +1894,18 @@ time.") (define-public crossmap (package (name "crossmap") - (version "0.2.1") + (version "0.2.9") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/crossmap/CrossMap-" - version ".tar.gz")) + (uri (pypi-uri "CrossMap" version)) (sha256 (base32 - "07y179f63d7qnzdvkqcziwk9bs3k4zhp81q392fp1hwszjdvy22f")) - ;; This patch has been sent upstream already and is available - ;; for download from Sourceforge, but it has not been merged. - (patches (search-patches "crossmap-allow-system-pysam.patch")) - (modules '((guix build utils))) - (snippet '(begin - ;; remove bundled copy of pysam - (delete-file-recursively "lib/pysam") - #t)))) + "1byhclrqnqpvc1rqkfh4jwj6yhn0x9y7jk47i0qcjlhk0pjkw92p")))) (build-system python-build-system) - (arguments - `(#:python ,python-2 - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'set-env - (lambda _ (setenv "CROSSMAP_USE_SYSTEM_PYSAM" "1") #t))))) + (arguments `(#:python ,python-2)) (inputs - `(("python-numpy" ,python2-numpy) + `(("python-bx-python" ,python2-bx-python) + ("python-numpy" ,python2-numpy) ("python-pysam" ,python2-pysam) ("zlib" ,zlib))) (native-inputs diff --git a/gnu/packages/patches/crossmap-allow-system-pysam.patch b/gnu/packages/patches/crossmap-allow-system-pysam.patch deleted file mode 100644 index 611c4ff74d..0000000000 --- a/gnu/packages/patches/crossmap-allow-system-pysam.patch +++ /dev/null @@ -1,121 +0,0 @@ -This patch modifies the build process such that the bundled copy of pysam does -not need to be built if CROSSMAP_USE_SYSTEM_PYSAM is set and the pysam module -can be imported. - -Upstream has agreed to apply the patch in the next maintenance release of -crossmap. The patch has already been uploaded to -http://sourceforge.net/projects/crossmap/files/patch/. - -diff --git a/setup.py b/setup.py ---- a/setup.py 2015-02-26 15:28:49.771189185 +0100 -+++ b/setup.py 2015-02-26 15:55:03.440327752 +0100 -@@ -19,6 +19,15 @@ - except: - have_numpy = False - -+try: -+ import pysam -+ if os.environ['CROSSMAP_USE_SYSTEM_PYSAM']: -+ have_pysam = True -+ else: -+ have_pysam = False -+except ImportError: -+ have_pysam = False -+ - if platform.system()=='Windows': - print >> sys.stderr, "Sorry, Windows platform is not supported!" - sys.exit() -@@ -165,49 +174,50 @@ - - - #================= pysam samtools ==================== -- extensions.append(Extension( -- "pysam.csamtools", -- csamtools_sources + [ "lib/pysam/%s" % x for x in ("pysam_util.c", )] +\ -- glob.glob( os.path.join( "lib/samtools", "*.pysam.c" )) +\ -- os_c_files + \ -- glob.glob( os.path.join( "lib/samtools", "*", "*.pysam.c" ) ), -- library_dirs=[], -- include_dirs=[ "lib/samtools", "lib/pysam" ] + include_os, -- libraries=[ "z", ], -- language="c", -- define_macros = [('_FILE_OFFSET_BITS','64'),('_USE_KNETFILE','')], -- )) -- -- extensions.append(Extension( -- "pysam.ctabix", -- tabix_sources + [ "lib/pysam/%s" % x for x in ( "tabix_util.c", )] +\ -- os_c_files + \ -- glob.glob( os.path.join( "lib/tabix", "*.pysam.c" ) ), -- library_dirs=[], -- include_dirs=[ "lib/tabix", "lib/pysam" ] + include_os, -- libraries=[ "z", ], -- language="c", -- define_macros = [('_FILE_OFFSET_BITS','64'), -- ('_USE_KNETFILE','')], -- )) -- -- extensions.append(Extension( -- "pysam.TabProxies", -- tabproxies_sources + os_c_files, -- library_dirs=[], -- include_dirs= include_os, -- libraries=[ "z", ], -- language="c", -- )) -- -- extensions.append(Extension( -- "pysam.cvcf", -- cvcf_sources + os_c_files, -- library_dirs=[], -- include_dirs= ["lib/tabix",] + include_os, -- libraries=[ "z", ], -- language="c", -- )) -+ if not have_pysam: -+ extensions.append(Extension( -+ "pysam.csamtools", -+ csamtools_sources + [ "lib/pysam/%s" % x for x in ("pysam_util.c", )] +\ -+ glob.glob( os.path.join( "lib/samtools", "*.pysam.c" )) +\ -+ os_c_files + \ -+ glob.glob( os.path.join( "lib/samtools", "*", "*.pysam.c" ) ), -+ library_dirs=[], -+ include_dirs=[ "lib/samtools", "lib/pysam" ] + include_os, -+ libraries=[ "z", ], -+ language="c", -+ define_macros = [('_FILE_OFFSET_BITS','64'),('_USE_KNETFILE','')], -+ )) -+ -+ extensions.append(Extension( -+ "pysam.ctabix", -+ tabix_sources + [ "lib/pysam/%s" % x for x in ( "tabix_util.c", )] +\ -+ os_c_files + \ -+ glob.glob( os.path.join( "lib/tabix", "*.pysam.c" ) ), -+ library_dirs=[], -+ include_dirs=[ "lib/tabix", "lib/pysam" ] + include_os, -+ libraries=[ "z", ], -+ language="c", -+ define_macros = [('_FILE_OFFSET_BITS','64'), -+ ('_USE_KNETFILE','')], -+ )) -+ -+ extensions.append(Extension( -+ "pysam.TabProxies", -+ tabproxies_sources + os_c_files, -+ library_dirs=[], -+ include_dirs= include_os, -+ libraries=[ "z", ], -+ language="c", -+ )) -+ -+ extensions.append(Extension( -+ "pysam.cvcf", -+ cvcf_sources + os_c_files, -+ library_dirs=[], -+ include_dirs= ["lib/tabix",] + include_os, -+ libraries=[ "z", ], -+ language="c", -+ )) - - - return extensions -- cgit v1.2.3 From a5b0038cbdfd8ad81472279089aaebc4270c683a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 21 Oct 2018 12:57:43 +0200 Subject: gnu: Add python-dnaio. * gnu/packages/bioinformatics.scm (python-dnaio): New variable. --- gnu/packages/bioinformatics.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 6469e9e1a1..58b29e2a30 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1919,6 +1919,29 @@ files between different genome assemblies. It supports most commonly used file formats including SAM/BAM, Wiggle/BigWig, BED, GFF/GTF, VCF.") (license license:gpl2+))) +(define-public python-dnaio + (package + (name "python-dnaio") + (version "0.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "dnaio" version)) + (sha256 + (base32 + "0f16m7hdlm0fz1n7y5asy0v9ghyrq17ni1p9iybq22ddzyd49r27")))) + (build-system python-build-system) + (native-inputs + `(("python-cython" ,python-cython) + ("python-pytest" ,python-pytest) + ("python-xopen" ,python-xopen))) + (home-page "https://github.com/marcelm/dnaio/") + (synopsis "Read FASTA and FASTQ files efficiently") + (description + "dnaio is a Python library for fast parsing of FASTQ and also FASTA +files. The code was previously part of the cutadapt tool.") + (license license:expat))) + (define-public cutadapt (package (name "cutadapt") -- cgit v1.2.3 From 6b7260bad124d3d63ce5ae305d7b74da28e9a947 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 21 Oct 2018 12:57:53 +0200 Subject: gnu: cutadapt: Update to 1.18. * gnu/packages/bioinformatics.scm (cutadapt): Update to 1.18. [inputs]: Add python-dnaio. --- gnu/packages/bioinformatics.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 58b29e2a30..995cbc76eb 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1945,19 +1945,20 @@ files. The code was previously part of the cutadapt tool.") (define-public cutadapt (package (name "cutadapt") - (version "1.16") + (version "1.18") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/marcelm/cutadapt.git") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 - "09pr02067jiks19nc0aby4xp70hhgvb554i2y1c04rv1m401w7q8")))) + "08bbfwyc0kvcd95jf2s95xiv9s3cbsxm39ydl0qck3fw3cviwxpg")))) (build-system python-build-system) (inputs - `(("python-xopen" ,python-xopen))) + `(("python-dnaio" ,python-dnaio) + ("python-xopen" ,python-xopen))) (native-inputs `(("python-cython" ,python-cython) ("python-pytest" ,python-pytest))) -- cgit v1.2.3 From 6b31040ae6865436c1a21378a8b9a09e25ec4adc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 21 Oct 2018 13:42:22 +0200 Subject: gnu: python-py2bit: Update to 0.3.0. * gnu/packages/bioinformatics.scm (python-py2bit): Update to 0.3.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 995cbc76eb..feb4928a93 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2091,14 +2091,14 @@ trees (phylogenies) and characters.") (define-public python-py2bit (package (name "python-py2bit") - (version "0.2.1") + (version "0.3.0") (source (origin (method url-fetch) (uri (pypi-uri "py2bit" version)) (sha256 (base32 - "1cdf4qlmgwsh1f4k0wdv2sr8x9qn4366p0k3614vbd0fpqiarxrl")))) + "1vw2nvw1yrl7ikkqsqs1pg239yr5nspvd969r1x9arms1k25a1a5")))) (build-system python-build-system) (home-page "https://github.com/dpryan79/py2bit") (synopsis "Access 2bit files using lib2bit") -- cgit v1.2.3 From 42643fc24dd1f418f5f2e0991181d526c0419c1a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 21 Oct 2018 13:43:07 +0200 Subject: gnu: python-dendropy: Fetch from git. * gnu/packages/bioinformatics.scm (python-dendropy)[source]: Fetch from git. --- gnu/packages/bioinformatics.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index feb4928a93..60e8f6e55a 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2053,15 +2053,15 @@ accessing bigWig files.") (version "4.4.0") (source (origin - (method url-fetch) + (method git-fetch) ;; Source from GitHub so that tests are included. - (uri - (string-append "https://github.com/jeetsukumaran/DendroPy/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (uri (git-reference + (url "https://github.com/jeetsukumaran/DendroPy.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0v2fccny5xjaah546bsch1mw4kh61qq5frz2ibllxs9mp6ih9bsn")))) + "097hfyv2kaf4x92i4rjx0paw2cncxap48qivv8zxng4z7nhid0x9")))) (build-system python-build-system) (home-page "http://packages.python.org/DendroPy/") (synopsis "Library for phylogenetics and phylogenetic computing") -- cgit v1.2.3 From e6b65bd219a909514b32a46536a94e288da006fd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 21 Oct 2018 13:43:33 +0200 Subject: gnu: eolie: Update to 0.9.45. * gnu/packages/gnome.scm (eolie): Update to 0.9.45. --- gnu/packages/gnome.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7d2742f08d..4b94b2f271 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4092,15 +4092,15 @@ work and the interface is well tested.") (define-public eolie (package (name "eolie") - (version "0.9.38") + (version "0.9.45") (source (origin (method url-fetch) (uri (string-append "https://gitlab.gnome.org/World/eolie/" - "uploads/9814c06a1bc83ea09c3da8719a9ed11b/" + "uploads/020f3f686e2b938731752a1d9f5bfa7e/" "eolie-" version ".tar.xz")) (sha256 (base32 - "10vrh91rapgfmqwc6jkcybpmlvn4q0y8bnklw3rddzigf9kvqsff")))) + "0371p7g13r0b7zjc48fdcil43ddwpmyvkd2a4vv6ifsqmny6kl42")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t -- cgit v1.2.3 From 4d494a4fa3ebb2d1deacede405d0b0d8e5dbc32b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 21 Oct 2018 13:52:27 +0200 Subject: gnu: deeptools: Update to 3.1.3. * gnu/packages/bioinformatics.scm (deeptools): Update to 3.1.3. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 60e8f6e55a..bc21848367 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2110,7 +2110,7 @@ with Python.") (define-public deeptools (package (name "deeptools") - (version "3.1.2") + (version "3.1.3") (source (origin (method git-fetch) (uri (git-reference @@ -2119,7 +2119,7 @@ with Python.") (file-name (git-file-name name version)) (sha256 (base32 - "06fdpp6cg3xiwryxjhixvfysl4z0ps1crjgia587qa9ikqpsa7fd")))) + "1vggnf52g6q2vifdl4cyi7s2fnfqq0ky2zrkj5zv2qfzsc3p3siw")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 7a1e62ca67849f9ca19ded4d26c542021db71e38 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 21 Oct 2018 14:00:07 +0200 Subject: gnu: delly: Update to 0.7.9. * gnu/packages/bioinformatics.scm (delly): Update to 0.7.9. [source]: Fetch from git. [arguments]: Add phase install-templates; use default install phase. [native-inputs]: Remove python-2. [home-page]: Use new home page. * gnu/packages/patches/delly-use-system-libraries.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove patch. --- gnu/local.mk | 1 - gnu/packages/bioinformatics.scm | 40 ++++++++-------- .../patches/delly-use-system-libraries.patch | 56 ---------------------- 3 files changed, 20 insertions(+), 77 deletions(-) delete mode 100644 gnu/packages/patches/delly-use-system-libraries.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index c76908f92f..d155b4c613 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -642,7 +642,6 @@ dist_patch_DATA = \ %D%/packages/patches/datamash-arm-tests.patch \ %D%/packages/patches/dbus-helper-search-path.patch \ %D%/packages/patches/deja-dup-use-ref-keyword-for-iter.patch \ - %D%/packages/patches/delly-use-system-libraries.patch \ %D%/packages/patches/dfu-programmer-fix-libusb.patch \ %D%/packages/patches/diffutils-gets-undeclared.patch \ %D%/packages/patches/diffutils-getopt.patch \ diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index bc21848367..78debbc873 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2155,42 +2155,42 @@ identify enrichments with functional annotations of the genome.") (define-public delly (package (name "delly") - (version "0.7.7") + (version "0.7.9") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/tobiasrausch/delly/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/dellytools/delly.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "0dkwy3pyxmi6dhh1lpsr3698ri5sslw9qz67hfys0bz8dgrqwabj")) - (patches (search-patches "delly-use-system-libraries.patch")))) + (base32 "034jqsxswy9gqdh2zkgc1js99qkv75ks4xvzgmh0284sraagv61z")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "src/htslib") + #t)))) (build-system gnu-build-system) (arguments `(#:tests? #f ; There are no tests to run. - #:make-flags '("PARALLEL=1") ; Allow parallel execution at run-time. + #:make-flags + (list "PARALLEL=1" ; Allow parallel execution at run-time. + (string-append "prefix=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases (delete 'configure) ; There is no configure phase. - (replace 'install - (lambda _ - (let ((bin (string-append (assoc-ref %outputs "out") "/bin")) - (templates (string-append (assoc-ref %outputs "out") + (add-after 'install 'install-templates + (lambda* (#:key outputs #:allow-other-keys) + (let ((templates (string-append (assoc-ref outputs "out") "/share/delly/templates"))) - (mkdir-p bin) (mkdir-p templates) (copy-recursively "excludeTemplates" templates) - (install-file "src/cov" bin) - (install-file "src/delly" bin) - (install-file "src/dpe" bin))))))) - (native-inputs - `(("python" ,python-2))) + #t)))))) (inputs `(("boost" ,boost) ("htslib" ,htslib) ("zlib" ,zlib) ("bzip2" ,bzip2))) - (home-page "https://github.com/tobiasrausch/delly") + (home-page "https://github.com/dellytools/delly") (synopsis "Integrated structural variant prediction method") (description "Delly is an integrated structural variant prediction method that can discover and genotype deletions, tandem duplications, inversions and diff --git a/gnu/packages/patches/delly-use-system-libraries.patch b/gnu/packages/patches/delly-use-system-libraries.patch deleted file mode 100644 index 3315c2a176..0000000000 --- a/gnu/packages/patches/delly-use-system-libraries.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/Makefile 2017-04-09 12:48:15.000000000 +0200 -+++ b/Makefile 2017-06-21 14:26:02.749282787 +0200 -@@ -9,8 +9,8 @@ - - # Flags - CXX=g++ --CXXFLAGS += -isystem ${SEQTK_ROOT} -isystem ${BOOST_ROOT} -pedantic -W -Wall -Wno-unknown-pragmas -D__STDC_LIMIT_MACROS -fno-strict-aliasing --LDFLAGS += -L${SEQTK_ROOT} -L${BOOST_ROOT}/stage/lib -lboost_iostreams -lboost_filesystem -lboost_system -lboost_program_options -lboost_date_time -+CXXFLAGS += -pedantic -W -Wall -Wno-unknown-pragmas -D__STDC_LIMIT_MACROS -fno-strict-aliasing -+LDFLAGS += -lboost_iostreams -lboost_filesystem -lboost_system -lboost_program_options -lboost_date_time - - # Additional flags for release/debug - ifeq (${PARALLEL}, 1) -@@ -23,7 +23,7 @@ - ifeq (${STATIC}, 1) - LDFLAGS += -static -static-libgcc -pthread -lhts -lz - else -- LDFLAGS += -lhts -lz -Wl,-rpath,${SEQTK_ROOT},-rpath,${BOOST_ROOT}/stage/lib -+ LDFLAGS += -lhts -lz - endif - ifeq (${DEBUG}, 1) - CXXFLAGS += -g -O0 -fno-inline -DDEBUG -@@ -41,29 +41,17 @@ - DELLYSOURCES = $(wildcard src/*.h) $(wildcard src/*.cpp) - - # Targets --TARGETS = .htslib .bcftools .boost src/delly src/cov src/dpe -+TARGETS = src/delly src/cov src/dpe - - all: $(TARGETS) - --.htslib: $(HTSLIBSOURCES) -- cd src/htslib && make && make lib-static && cd ../../ && touch .htslib -- --.bcftools: $(HTSLIBSOURCES) -- cd src/bcftools && make && cd ../../ && touch .bcftools -- --.boost: $(BOOSTSOURCES) -- cd src/modular-boost && ./bootstrap.sh --prefix=${PWD}/src/modular-boost --without-icu --with-libraries=iostreams,filesystem,system,program_options,date_time && ./b2 && ./b2 headers && cd ../../ && touch .boost -- --src/delly: .htslib .bcftools .boost $(DELLYSOURCES) -- $(CXX) $(CXXFLAGS) $@.cpp -o $@ $(LDFLAGS) -- --src/cov: .htslib .bcftools .boost $(DELLYSOURCES) -+src/cov: $(DELLYSOURCES) - $(CXX) $(CXXFLAGS) $@.cpp -o $@ $(LDFLAGS) - --src/dpe: .htslib .bcftools .boost $(DELLYSOURCES) -+src/dpe: $(DELLYSOURCES) - $(CXX) $(CXXFLAGS) $@.cpp -o $@ $(LDFLAGS) - - clean: - cd src/htslib && make clean - cd src/modular-boost && ./b2 --clean-all -- rm -f $(TARGETS) $(TARGETS:=.o) .htslib .boost .bcftools -+ rm -f $(TARGETS) $(TARGETS:=.o) -- cgit v1.2.3 From 1c0639935809cc64150192517c58d95411748407 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 21 Oct 2018 14:04:37 +0200 Subject: gnu: diamond: Fetch from git. * gnu/packages/bioinformatics.scm (diamond)[source]: Fetch from git. --- gnu/packages/bioinformatics.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 78debbc873..35611f7b1c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2204,14 +2204,14 @@ accurately delineate genomic rearrangements throughout the genome.") (name "diamond") (version "0.9.22") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/bbuchfink/diamond/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/bbuchfink/diamond.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0adp87r9ak63frdrdmrdfhsn6g0jnnyq1lr2wibvqbxcl37iir9m")))) + "0bky78v79g3wmdpsd706cscckgw1v09fg8vdd0z8z0d5b97aj9zl")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; no "check" target -- cgit v1.2.3 From 49b2e86adf2b0788c627120ae4c3cf55d3eb9afa Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 21 Oct 2018 20:51:02 +0200 Subject: gnu: Add texlive-latex-doi. * gnu/packages/tex.scm (texlive-latex-doi): New variable. --- gnu/packages/tex.scm | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 6a76cbf866..e4c307e54f 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, 2018 Tobias Geerinckx-Rice @@ -2274,6 +2274,44 @@ space-stripped macros.") to something that's not a float.") (license license:lppl))) +(define-public texlive-latex-doi + (package + (name "texlive-latex-doi") + (version (number->string %texlive-revision)) + (source (origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist/" + "/tex/latex/doi")) + (revision %texlive-revision))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "0378rdmrgr2lzbfi4qqy4dfpj5im20diyd8z8b9m4mlg05r7wgnb")))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let ((target (string-append (assoc-ref %outputs "out") + "/share/texmf-dist/tex/latex/doi"))) + (mkdir-p target) + (copy-recursively (assoc-ref %build-inputs "source") target) + #t)))) + (home-page "https://www.ctan.org/pkg/doi") + (synopsis "Create correct hyperlinks for DOI numbers") + (description + "You can hyperlink DOI numbers to doi.org. However, some publishers have +elected to use nasty characters in their DOI numbering scheme (@code{<}, +@code{>}, @code{_} and @code{;} have all been spotted). This will either +upset LaTeX, or your PDF reader. This package contains a single user-level +command @code{\\doi{}}, which takes a DOI number, and creates a correct +hyperlink to the target of the DOI.") + ;; Any version of the LPPL. + (license license:lppl1.3+))) + (define-public texlive-latex-etoolbox (package (name "texlive-latex-etoolbox") -- cgit v1.2.3 From 893fbf1285fe2298366a5f1631a191e5daccf3d0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 21 Oct 2018 20:51:27 +0200 Subject: gnu: Add texlive-generic-listofitems. * gnu/packages/tex.scm (texlive-generic-listofitems): New variable. --- gnu/packages/tex.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index e4c307e54f..8994349e3d 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -4775,3 +4775,37 @@ Since every package has its own version number, the version number quoted only refers to the version of scrbook, scrreprt, scrartcl, scrlttr2 and typearea (which are the main parts of the bundle).") (license license:lppl1.3+))) + +(define-public texlive-generic-listofitems + (package + (name "texlive-generic-listofitems") + (version (number->string %texlive-revision)) + (source (origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist/" + "/tex/generic/listofitems")) + (revision %texlive-revision))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1k50z6ixgwwzy84mi0dr5vcjah5p7wvgq66y45bilm91a4m8sgla")))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let ((target (string-append (assoc-ref %outputs "out") + "/share/texmf-dist/tex/generic/listofitems"))) + (mkdir-p target) + (copy-recursively (assoc-ref %build-inputs "source") target) + #t)))) + (home-page "https://www.ctan.org/pkg/listofitems") + (synopsis "Grab items in lists using user-specified seperation character") + (description + "This package allows one to capture all the items of a list, for which +the parsing character has been selected by the user, and to access any of +these items with a simple syntax.") + (license license:lppl1.3c+))) -- cgit v1.2.3 From 1d0669f4b4658d2d9bef7cf38366099dee40d272 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 21 Oct 2018 20:51:54 +0200 Subject: gnu: Add texlive-latex-readarray. * gnu/packages/tex.scm (texlive-latex-readarray): New variable. --- gnu/packages/tex.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 8994349e3d..e796fe4c88 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -4809,3 +4809,40 @@ typearea (which are the main parts of the bundle).") the parsing character has been selected by the user, and to access any of these items with a simple syntax.") (license license:lppl1.3c+))) + +(define-public texlive-latex-readarray + (package + (name "texlive-latex-readarray") + (version (number->string %texlive-revision)) + (source (origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist/" + "/tex/latex/readarray")) + (revision %texlive-revision))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "0c53k180ivn1n7fz3ngvd2w1i5dw3kxml0n64vhki88xsylz7lxp")))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let ((target (string-append (assoc-ref %outputs "out") + "/share/texmf-dist/tex/latex/readarray"))) + (mkdir-p target) + (copy-recursively (assoc-ref %build-inputs "source") target) + #t)))) + (propagated-inputs + `(("texlive-generic-listofitems" ,texlive-generic-listofitems))) + (home-page "https://www.ctan.org/pkg/readarray") + (synopsis "Read, store and recall array-formatted data") + (description + "This package allows the user to input formatted data into elements of a +2-D or 3-D array and to recall that data at will by individual cell number. +The data can be but need not be numerical in nature. It can be, for example, +formatted text.") + (license license:lppl1.3))) -- cgit v1.2.3 From f50f343e0d138adb328132fb6e17f170261b8798 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 21 Oct 2018 20:52:07 +0200 Subject: gnu: Add texlive-latex-verbatimbox. * gnu/packages/tex.scm (texlive-latex-verbatimbox): New variable. --- gnu/packages/tex.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index e796fe4c88..46f013b7db 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -4846,3 +4846,42 @@ these items with a simple syntax.") The data can be but need not be numerical in nature. It can be, for example, formatted text.") (license license:lppl1.3))) + +(define-public texlive-latex-verbatimbox + (package + (name "texlive-latex-verbatimbox") + (version (number->string %texlive-revision)) + (source (origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist/" + "/tex/latex/verbatimbox")) + (revision %texlive-revision))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "0qh1cgvfs463zsi2pjg490gj0mkjfdpfc381j10cbb5la304psna")))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let ((target (string-append (assoc-ref %outputs "out") + "/share/texmf-dist/tex/latex/verbatimbox"))) + (mkdir-p target) + (copy-recursively (assoc-ref %build-inputs "source") target) + #t)))) + (propagated-inputs + `(("texlive-latex-readarray" ,texlive-latex-readarray))) + (home-page "https://www.ctan.org/pkg/verbatimbox") + (synopsis "Deposit verbatim text in a box") + (description + "The package provides a @code{verbbox} environment to place its contents +into a globally available box, or into a box specified by the user. The +global box may then be used in a variety of situations (for example, providing +a replica of the @code{boxedverbatim} environment itself). A valuable use is +in places where the standard @code{verbatim} environment (which is based on a +@code{trivlist}) may not appear.") + (license license:lppl1.3+))) -- cgit v1.2.3 From 4348a059e527969b55875ad33525d6023cd82201 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 21 Oct 2018 20:53:20 +0200 Subject: gnu: Add texlive-latex-examplep. * gnu/packages/tex.scm (texlive-latex-examplep): New variable. --- gnu/packages/tex.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 46f013b7db..f8b11f7e1a 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -4885,3 +4885,44 @@ a replica of the @code{boxedverbatim} environment itself). A valuable use is in places where the standard @code{verbatim} environment (which is based on a @code{trivlist}) may not appear.") (license license:lppl1.3+))) + +(define-public texlive-latex-examplep + (package + (name "texlive-latex-examplep") + (version (number->string %texlive-revision)) + (source (origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist/" + "/tex/latex/examplep")) + (revision %texlive-revision))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "0fsvvmz68ij0zwfzrny6x13d92grxr4ap59lxgah4smbkccd6s27")))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let ((target (string-append (assoc-ref %outputs "out") + "/share/texmf-dist/tex/latex/examplep"))) + (mkdir-p target) + (copy-recursively (assoc-ref %build-inputs "source") target) + #t)))) + (home-page "https://www.ctan.org/pkg/examplep") + (synopsis "Verbatim phrases and listings in LaTeX") + (description + "Examplep provides sophisticated features for typesetting verbatim source +code listings, including the display of the source code and its compiled LaTeX +or METAPOST output side-by-side, with automatic width detection and enabled +page breaks (in the source), without the need for specifying the source twice. +Special care is taken that section, page and footnote numbers do not interfere +with the main document. For typesetting short verbatim phrases, a replacement +for the @code{\\verb} command is also provided in the package, which can be +used inside tables and moving arguments such as footnotes and section +titles.") + ;; No version of the GPL is specified. + (license license:gpl3+))) -- cgit v1.2.3 From 5748fe5fccef9653ed1e16f83d0fe3e889de6a26 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 21 Oct 2018 20:53:40 +0200 Subject: gnu: discrover: Fetch from git. * gnu/packages/bioinformatics.scm (discrover)[source]: Fetch from git. --- gnu/packages/bioinformatics.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 35611f7b1c..b6bd2c619a 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2239,13 +2239,14 @@ data and settings.") (version "1.6.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/maaskola/discrover/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/maaskola/discrover.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0rah9ja4m0rl5mldd6vag9rwrivw1zrqxssfq8qx64m7961fp68k")))) + "173fwi2vb6a5kp406hm3jj6j7v4whww796f2qcygp4rpvamh307y")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; there are no tests -- cgit v1.2.3 From 949fa34b84ce8c8027e568878db648c20ff37a5c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 21 Oct 2018 20:58:45 +0200 Subject: gnu: eigensoft: Update to 7.2.1. * gnu/packages/bioinformatics.scm (eigensoft): Update to 7.2.1. [arguments]: Remove Makefile modification. --- gnu/packages/bioinformatics.scm | 113 ++++++++++++++++++---------------------- 1 file changed, 52 insertions(+), 61 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b6bd2c619a..d0f4429a4c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2274,72 +2274,63 @@ of nucleic acid binding proteins.") (license license:gpl3+))) (define-public eigensoft - (let ((revision "1") - (commit "b14d1e202e21e532536ff8004f0419cd5e259dc7")) - (package - (name "eigensoft") - (version (string-append "6.1.2-" - revision "." - (string-take commit 9))) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/DReichLab/EIG.git") - (commit commit))) - (file-name (string-append "eigensoft-" commit "-checkout")) - (sha256 - (base32 - "0f5m6k2j5c16xc3xbywcs989xyc26ncy1zfzp9j9n55n9r4xcaiq")) - (modules '((guix build utils))) - ;; Remove pre-built binaries. - (snippet '(begin - (delete-file-recursively "bin") - (mkdir "bin") - #t)))) - (build-system gnu-build-system) - (arguments - `(#:tests? #f ; There are no tests. - #:make-flags '("CC=gcc") - #:phases - (modify-phases %standard-phases - ;; There is no configure phase, but the Makefile is in a - ;; sub-directory. - (replace 'configure - (lambda _ - (chdir "src") - ;; The link flags are incomplete. - (substitute* "Makefile" - (("-lgsl") "-lgsl -lm -llapack -llapacke -lpthread")) - #t)) - ;; The provided install target only copies executables to - ;; the "bin" directory in the build root. - (add-after 'install 'actually-install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (for-each (lambda (file) - (install-file file bin)) - (find-files "../bin" ".*")) - #t)))))) - (inputs - `(("gsl" ,gsl) - ("lapack" ,lapack) - ("openblas" ,openblas) - ("perl" ,perl) - ("gfortran" ,gfortran "lib"))) - (home-page "https://github.com/DReichLab/EIG") - (synopsis "Tools for population genetics") - (description "The EIGENSOFT package provides tools for population + (package + (name "eigensoft") + (version "7.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/DReichLab/EIG.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1c141fqvhnzibmnf22sv23vbmzm20kjjyrib44cfh75wyndp2d9k")) + (modules '((guix build utils))) + ;; Remove pre-built binaries. + (snippet '(begin + (delete-file-recursively "bin") + (mkdir "bin") + #t)))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; There are no tests. + #:make-flags '("CC=gcc") + #:phases + (modify-phases %standard-phases + ;; There is no configure phase, but the Makefile is in a + ;; sub-directory. + (replace 'configure + (lambda _ (chdir "src") #t)) + ;; The provided install target only copies executables to + ;; the "bin" directory in the build root. + (add-after 'install 'actually-install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (for-each (lambda (file) + (install-file file bin)) + (find-files "../bin" ".*")) + #t)))))) + (inputs + `(("gsl" ,gsl) + ("lapack" ,lapack) + ("openblas" ,openblas) + ("perl" ,perl) + ("gfortran" ,gfortran "lib"))) + (home-page "https://github.com/DReichLab/EIG") + (synopsis "Tools for population genetics") + (description "The EIGENSOFT package provides tools for population genetics and stratification correction. EIGENSOFT implements methods commonly used in population genetics analyses such as PCA, computation of Tracy-Widom statistics, and finding related individuals in structured populations. It comes with a built-in plotting script and supports multiple file formats and quantitative phenotypes.") - ;; The license of the eigensoft tools is Expat, but since it's - ;; linking with the GNU Scientific Library (GSL) the effective - ;; license is the GPL. - (license license:gpl3+)))) + ;; The license of the eigensoft tools is Expat, but since it's + ;; linking with the GNU Scientific Library (GSL) the effective + ;; license is the GPL. + (license license:gpl3+))) (define-public edirect (package -- cgit v1.2.3 From c96ca68f31619ed678720fc1dc6bbf0906ce5638 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 21 Oct 2018 21:11:37 +0200 Subject: gnu: edirect: Update to 10.2.20181018. * gnu/packages/bioinformatics.scm (edirect): Update to 10.2.20181018. [arguments]: Add simple check phase; simplify other phases. [inputs]: Add perl-xml-simple. --- gnu/packages/bioinformatics.scm | 46 +++++++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 20 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index d0f4429a4c..a806fd5f22 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2335,36 +2335,41 @@ quantitative phenotypes.") (define-public edirect (package (name "edirect") - (version "4.10") + (version "10.2.20181018") (source (origin (method url-fetch) - (uri (string-append "ftp://ftp.ncbi.nlm.nih.gov/entrez/entrezdirect/" - "versions/2016-05-03/edirect.tar.gz")) + (uri (string-append "ftp://ftp.ncbi.nlm.nih.gov/entrez/entrezdirect" + "/versions/" version + "/edirect-" version ".tar.gz")) (sha256 (base32 - "15zsprak5yh8c1yrz4r1knmb5s8qcmdid4xdhkh3lqcv64l60hli")))) + "091f4aigzpbqih6h82nq566gkp3y07i72yqndmqskfgar1vwgci7")))) (build-system perl-build-system) (arguments - `(#:tests? #f ;no "check" target - #:phases + `(#:phases (modify-phases %standard-phases (delete 'configure) (delete 'build) + (delete 'check) ; simple check after install (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((target (string-append (assoc-ref outputs "out") - "/bin"))) - (mkdir-p target) - (install-file "edirect.pl" target) - #t))) - (add-after - 'install 'wrap-program - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Make sure 'edirect.pl' finds all perl inputs at runtime. - (let* ((out (assoc-ref outputs "out")) - (path (getenv "PERL5LIB"))) - (wrap-program (string-append out "/bin/edirect.pl") - `("PERL5LIB" ":" prefix (,path))))))))) + (lambda* (#:key outputs #:allow-other-keys) + (install-file "edirect.pl" + (string-append (assoc-ref outputs "out") "/bin")) + #t)) + (add-after 'install 'wrap-program + (lambda* (#:key outputs #:allow-other-keys) + ;; Make sure 'edirect.pl' finds all perl inputs at runtime. + (let* ((out (assoc-ref outputs "out")) + (path (getenv "PERL5LIB"))) + (wrap-program (string-append out "/bin/edirect.pl") + `("PERL5LIB" ":" prefix (,path)))) + #t)) + (add-after 'wrap-program 'check + (lambda* (#:key outputs #:allow-other-keys) + (invoke (string-append (assoc-ref outputs "out") + "/bin/edirect.pl") + "-filter" "-help") + #t))))) (inputs `(("perl-html-parser" ,perl-html-parser) ("perl-encode-locale" ,perl-encode-locale) @@ -2380,6 +2385,7 @@ quantitative phenotypes.") ("perl-net-http" ,perl-net-http) ("perl-uri" ,perl-uri) ("perl-www-robotrules" ,perl-www-robotrules) + ("perl-xml-simple" ,perl-xml-simple) ("perl" ,perl))) (home-page "http://www.ncbi.nlm.nih.gov/books/NBK179288/") (synopsis "Tools for accessing the NCBI's set of databases") -- cgit v1.2.3 From 38622ccd14c5d2df152ff8d72f1f5269afb36565 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 21 Oct 2018 21:26:35 +0200 Subject: gnu: express-beta-diversity: Update to 1.0.8. * gnu/packages/bioinformatics.scm (express-beta-diversity): Update to 1.0.8. [source]: Fetch from git. [arguments]: Use INVOKE; remove "exit-source" build phase; simplify. --- gnu/packages/bioinformatics.scm | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a806fd5f22..9a04118588 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2481,17 +2481,16 @@ ChIP-Seq, and analysis of metagenomic data.") (define-public express-beta-diversity (package (name "express-beta-diversity") - (version "1.0.7") + (version "1.0.8") (source (origin - (method url-fetch) - (uri - (string-append - "https://github.com/dparks1134/ExpressBetaDiversity/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/dparks1134/ExpressBetaDiversity.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1djvdlmqvjf6h0zq7w36y8cl5cli6rgj86x65znl48agnwmzxfxr")))) + "0s0yzg5c21349rh7x4w9266jsvnp7j1hp9cf8sk32hz8nvrj745x")))) (build-system gnu-build-system) (arguments `(#:phases @@ -2499,17 +2498,13 @@ ChIP-Seq, and analysis of metagenomic data.") (delete 'configure) (add-before 'build 'enter-source (lambda _ (chdir "source") #t)) (replace 'check - (lambda _ (zero? (system* "../bin/ExpressBetaDiversity" - "-u")))) - (add-after 'check 'exit-source (lambda _ (chdir "..") #t)) + (lambda _ (invoke "../bin/ExpressBetaDiversity" "-u") #t)) (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((bin (string-append (assoc-ref outputs "out") - "/bin"))) - (mkdir-p bin) - (install-file "scripts/convertToEBD.py" bin) - (install-file "bin/ExpressBetaDiversity" bin) - #t)))))) + (lambda* (#:key outputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) + (install-file "../scripts/convertToEBD.py" bin) + (install-file "../bin/ExpressBetaDiversity" bin) + #t)))))) (inputs `(("python" ,python-2))) (home-page "http://kiwi.cs.dal.ca/Software/ExpressBetaDiversity") -- cgit v1.2.3 From 0db75f7a79126a368e0c8fb2d71abf76da065a3f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 21 Oct 2018 21:30:53 +0200 Subject: gnu: fasttree: Use INVOKE. * gnu/packages/bioinformatics.scm (fasttree)[arguments]: Use INVOKE; simplify install phase. --- gnu/packages/bioinformatics.scm | 45 ++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 23 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9a04118588..a99deeb0a6 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2537,31 +2537,30 @@ similarity of community members.") (delete 'configure) (replace 'build (lambda* (#:key source #:allow-other-keys) - (and (zero? (system* "gcc" - "-O3" - "-finline-functions" - "-funroll-loops" - "-Wall" - "-o" - "FastTree" - source - "-lm")) - (zero? (system* "gcc" - "-DOPENMP" - "-fopenmp" - "-O3" - "-finline-functions" - "-funroll-loops" - "-Wall" - "-o" - "FastTreeMP" - source - "-lm"))))) + (invoke "gcc" + "-O3" + "-finline-functions" + "-funroll-loops" + "-Wall" + "-o" + "FastTree" + source + "-lm") + (invoke "gcc" + "-DOPENMP" + "-fopenmp" + "-O3" + "-finline-functions" + "-funroll-loops" + "-Wall" + "-o" + "FastTreeMP" + source + "-lm") + #t)) (replace 'install (lambda* (#:key outputs #:allow-other-keys) - (let ((bin (string-append (assoc-ref outputs "out") - "/bin"))) - (mkdir-p bin) + (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) (install-file "FastTree" bin) (install-file "FastTreeMP" bin) #t)))))) -- cgit v1.2.3 From 50e33c3a8c591af8a6112ea42d53ed6f0ec80208 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 21 Oct 2018 22:58:30 +0200 Subject: gnu: python-screed: Update to 1.0. * gnu/packages/bioinformatics.scm (python-screed): Update to 1.0. [arguments]: Run tests after installation. [native-inputs]: Add python-pytest, python-pytest-cov, and python-pytest-runner; remove python-nose. --- gnu/packages/bioinformatics.scm | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a99deeb0a6..9afb2c1197 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5602,25 +5602,38 @@ complexity samples.") (define-public python-screed (package (name "python-screed") - (version "0.9") + (version "1.0") (source (origin (method url-fetch) (uri (pypi-uri "screed" version)) (sha256 (base32 - "18czszp9fkx3j6jr7y5kp6dfialscgddk05mw1zkhh2zhn0jd8i0")))) + "148vcb7w2wr6a4w6vs2bsxanbqibxfk490zbcbg4m61s8669zdjx")))) (build-system python-build-system) (arguments - `(#:phases + '(#:phases (modify-phases %standard-phases - (replace 'check - (lambda _ - (setenv "PYTHONPATH" - (string-append (getenv "PYTHONPATH") ":.")) - (zero? (system* "nosetests" "--attr" "!known_failing"))))))) + ;; Tests must be run after installation, as the "screed" command does + ;; not exist right after building. + (delete 'check) + (add-after 'install 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (setenv "PYTHONPATH" + (string-append out "/lib/python" + (string-take (string-take-right + (assoc-ref inputs "python") + 5) 3) + "/site-packages:" + (getenv "PYTHONPATH"))) + (setenv "PATH" (string-append out "/bin:" (getenv "PATH")))) + (invoke "python" "setup.py" "test") + #t))))) (native-inputs - `(("python-nose" ,python-nose))) + `(("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov) + ("python-pytest-runner" ,python-pytest-runner))) (inputs `(("python-bz2file" ,python-bz2file))) (home-page "https://github.com/dib-lab/screed/") -- cgit v1.2.3 From 4b8f4536ce6107bf3417252b2206d14912399344 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 21 Oct 2018 22:59:37 +0200 Subject: gnu: khmer: Update to 2.1.2. * gnu/packages/bioinformatics.scm (khmer): Update to 2.1.2. [source]: Fetch from git; remove bundled libraries in snippet. [arguments]: Remove "set-paths" phase; remove "post-install-check" phase; remove "reset-gzip-timestamps" phase. [native-inputs]: Remove seqan and python-nose; add python-cython, python-pytest, and python-pytest-runner. [inputs]: Remove gcc-4.9. --- gnu/packages/bioinformatics.scm | 83 ++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 55 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9afb2c1197..9163b5dc8a 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -3742,75 +3742,48 @@ command, or queried for specific k-mers with @code{jellyfish query}.") (define-public khmer (package (name "khmer") - (version "2.0") + (version "2.1.2") (source (origin - (method url-fetch) - (uri (pypi-uri "khmer" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/dib-lab/khmer.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0wb05shqh77v00256qlm68vbbx3kl76fyzihszbz5nhanl4ni33a")) - (patches (search-patches "khmer-use-libraries.patch")))) + "02x38d9jw2r58y8dmnj4hffy9wxv1yc1jwbvdbhby9dxndv94r9m")) + (patches (search-patches "khmer-use-libraries.patch")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Delete bundled libraries. We do not replace the bundled seqan + ;; as it is a modified subset of the old version 1.4.1. + ;; + ;; We do not replace the bundled MurmurHash as the canonical + ;; repository for this code 'SMHasher' is unsuitable for providing + ;; a library. See + ;; https://lists.gnu.org/archive/html/guix-devel/2016-06/msg00977.html + (delete-file-recursively "third-party/zlib") + (delete-file-recursively "third-party/bzip2") + #t)))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'set-paths - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Delete bundled libraries. - (delete-file-recursively "third-party/zlib") - (delete-file-recursively "third-party/bzip2") - ;; Replace bundled seqan. - (let* ((seqan-all "third-party/seqan") - (seqan-include (string-append - seqan-all "/core/include"))) - (delete-file-recursively seqan-all) - (copy-recursively (string-append (assoc-ref inputs "seqan") - "/include/seqan") - (string-append seqan-include "/seqan"))) - ;; We do not replace the bundled MurmurHash as the canonical - ;; repository for this code 'SMHasher' is unsuitable for - ;; providing a library. See - ;; https://lists.gnu.org/archive/html/guix-devel/2016-06/msg00977.html - #t)) (add-after 'unpack 'set-cc - (lambda _ - (setenv "CC" "gcc") - #t)) - ;; It is simpler to test after installation. - (delete 'check) - (add-after 'install 'post-install-check - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (setenv "PATH" - (string-append - (getenv "PATH") - ":" - (assoc-ref outputs "out") - "/bin")) - (setenv "PYTHONPATH" - (string-append - (getenv "PYTHONPATH") - ":" - out - "/lib/python" - (string-take (string-take-right - (assoc-ref inputs "python") 5) 3) - "/site-packages")) - (with-directory-excursion "build" - (zero? (system* "nosetests" "khmer" "--attr" - "!known_failing"))))))))) + (lambda _ (setenv "CC" "gcc") #t)) + ;; FIXME: This fails with "permission denied". + (delete 'reset-gzip-timestamps)))) (native-inputs - `(("seqan" ,seqan) - ("python-nose" ,python-nose))) + `(("python-cython" ,python-cython) + ("python-pytest" ,python-pytest) + ("python-pytest-runner" ,python-pytest-runner))) (inputs `(("zlib" ,zlib) ("bzip2" ,bzip2) ("python-screed" ,python-screed) - ("python-bz2file" ,python-bz2file) - ;; Tests fail when gcc-5 is used for compilation. Use gcc-4.9 at least - ;; until the next version of khmer (likely 2.1) is released. - ("gcc" ,gcc-4.9))) + ("python-bz2file" ,python-bz2file))) (home-page "https://khmer.readthedocs.org/") (synopsis "K-mer counting, filtering and graph traversal library") (description "The khmer software is a set of command-line tools for -- cgit v1.2.3 From 4d93a9a36c3ddc431789fa38201b0fd657412dbe Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 21 Oct 2018 23:03:57 +0200 Subject: gnu: seqan: Update to 2.4.0. * gnu/packages/bioinformatics.scm (seqan): Update to 2.4.0. [native-inputs]: Replace bzip2 with xz. (seqan-1): New variable. (tophat)[inputs]: Use seqan-1. --- gnu/packages/bioinformatics.scm | 58 +++++++++++++++++++++++++++++++++-------- 1 file changed, 47 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9163b5dc8a..cdb82aee8b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1382,7 +1382,7 @@ gapped, local, and paired-end alignment modes.") ("python" ,python-2) ("perl" ,perl) ("zlib" ,zlib) - ("seqan" ,seqan))) + ("seqan" ,seqan-1))) (home-page "http://ccb.jhu.edu/software/tophat/index.shtml") (synopsis "Spliced read mapper for RNA-Seq data") (description @@ -5733,14 +5733,15 @@ writing files into the .sra format.") (define-public seqan (package (name "seqan") - (version "1.4.2") + (version "2.4.0") (source (origin (method url-fetch) - (uri (string-append "http://packages.seqan.de/seqan-library/" - "seqan-library-" version ".tar.bz2")) + (uri (string-append "https://github.com/seqan/seqan/releases/" + "download/seqan-v" version + "/seqan-library-" version ".tar.xz")) (sha256 (base32 - "05s3wrrwn50f81aklfm65i4a749zag1vr8z03k21xm0pdxy47yvp")))) + "19a1rlxx03qy1i1iriicly68w64yjxbv24g9gdywnfmq998v35yx")))) ;; The documentation is 7.8MB and the includes are 3.6MB heavy, so it ;; makes sense to split the outputs. (outputs '("out" "doc")) @@ -5750,11 +5751,11 @@ writing files into the .sra format.") #:builder (begin (use-modules (guix build utils)) - (let ((tar (assoc-ref %build-inputs "tar")) - (bzip (assoc-ref %build-inputs "bzip2")) - (out (assoc-ref %outputs "out")) - (doc (assoc-ref %outputs "doc"))) - (setenv "PATH" (string-append tar "/bin:" bzip "/bin")) + (let ((tar (assoc-ref %build-inputs "tar")) + (xz (assoc-ref %build-inputs "xz")) + (out (assoc-ref %outputs "out")) + (doc (assoc-ref %outputs "doc"))) + (setenv "PATH" (string-append tar "/bin:" xz "/bin")) (invoke "tar" "xvf" (assoc-ref %build-inputs "source")) (chdir (string-append "seqan-library-" ,version)) (copy-recursively "include" (string-append out "/include")) @@ -5763,7 +5764,7 @@ writing files into the .sra format.") (native-inputs `(("source" ,source) ("tar" ,tar) - ("bzip2" ,bzip2))) + ("xz" ,xz))) (home-page "http://www.seqan.de") (synopsis "Library for nucleotide sequence analysis") (description @@ -5774,6 +5775,41 @@ manipulation, online and indexed string search, efficient I/O of bioinformatics file formats, sequence alignment, and more.") (license license:bsd-3))) +(define-public seqan-1 + (package (inherit seqan) + (name "seqan") + (version "1.4.2") + (source (origin + (method url-fetch) + (uri (string-append "http://packages.seqan.de/seqan-library/" + "seqan-library-" version ".tar.bz2")) + (sha256 + (base32 + "05s3wrrwn50f81aklfm65i4a749zag1vr8z03k21xm0pdxy47yvp")))) + ;; The documentation is 7.8MB and the includes are 3.6MB heavy, so it + ;; makes sense to split the outputs. + (outputs '("out" "doc")) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let ((tar (assoc-ref %build-inputs "tar")) + (bzip (assoc-ref %build-inputs "bzip2")) + (out (assoc-ref %outputs "out")) + (doc (assoc-ref %outputs "doc"))) + (setenv "PATH" (string-append tar "/bin:" bzip "/bin")) + (invoke "tar" "xvf" (assoc-ref %build-inputs "source")) + (chdir (string-append "seqan-library-" ,version)) + (copy-recursively "include" (string-append out "/include")) + (copy-recursively "share" (string-append doc "/share")) + #t)))) + (native-inputs + `(("source" ,source) + ("tar" ,tar) + ("bzip2" ,bzip2))))) + (define-public seqmagick (package (name "seqmagick") -- cgit v1.2.3 From f8ee22fc8b486612a9f041bb351d99ba0ce16dc0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 21 Oct 2018 23:05:11 +0200 Subject: gnu: flexbar: Update to 3.4.0. * gnu/packages/bioinformatics.scm (flexbar): Update to 3.4.0. [source]: Fetch from git. [arguments]: Adjust check and install phases. [home-page]: Update to new home at Github. [license]: Change to bsd-3. --- gnu/packages/bioinformatics.scm | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index cdb82aee8b..96ea07bdc4 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2607,38 +2607,39 @@ results. The FASTX-Toolkit tools perform some of these preprocessing tasks.") (define-public flexbar (package (name "flexbar") - (version "2.5") + (version "3.4.0") (source (origin - (method url-fetch) - (uri - (string-append "mirror://sourceforge/flexbar/" - version "/flexbar_v" version "_src.tgz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/seqan/flexbar.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "13jaykc3y1x8y5nn9j8ljnb79s5y51kyxz46hdmvvjj6qhyympmf")))) + "1pq9sxvdnldl14libk234m72dqhwgzs3acgl943wchwdqlcsi5r2")))) (build-system cmake-build-system) (arguments - `(#:configure-flags (list - (string-append "-DFLEXBAR_BINARY_DIR=" - (assoc-ref %outputs "out") - "/bin/")) - #:phases + `(#:phases (modify-phases %standard-phases (replace 'check (lambda* (#:key outputs #:allow-other-keys) - (setenv "PATH" (string-append - (assoc-ref outputs "out") "/bin:" - (getenv "PATH"))) - (chdir "../flexbar_v2.5_src/test") - (zero? (system* "bash" "flexbar_validate.sh")))) - (delete 'install)))) + (setenv "PATH" (string-append (getcwd) ":" (getenv "PATH"))) + (with-directory-excursion "../source/test" + (invoke "bash" "flexbar_test.sh")) + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (string-append (assoc-ref outputs "out"))) + (bin (string-append out "/bin/"))) + (install-file "flexbar" bin)) + #t))))) (inputs `(("tbb" ,tbb) ("zlib" ,zlib))) (native-inputs `(("pkg-config" ,pkg-config) ("seqan" ,seqan))) - (home-page "http://flexbar.sourceforge.net") + (home-page "https://github.com/seqan/flexbar") (synopsis "Barcode and adapter removal tool for sequencing platforms") (description "Flexbar preprocesses high-throughput nucleotide sequencing data @@ -2647,7 +2648,7 @@ Moreover, trimming and filtering features are provided. Flexbar increases read mapping rates and improves genome and transcriptome assemblies. It supports next-generation sequencing data in fasta/q and csfasta/q format from Illumina, Roche 454, and the SOLiD platform.") - (license license:gpl3))) + (license license:bsd-3))) (define-public fraggenescan (package -- cgit v1.2.3 From aff38cb199fc847f97059600a6c9c99ee754fc07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 20 Oct 2018 17:39:53 +0200 Subject: =?UTF-8?q?install:=20Make=20/var/guix/=E2=80=A6/guix-profile=20a?= =?UTF-8?q?=20relative=20symlink.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/build/install.scm (populate-single-profile-directory): Make /var/guix/profiles/per-user/root/guix-profile a relative symlink. --- gnu/build/install.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/build/install.scm b/gnu/build/install.scm index 5a5e703872..c602d69489 100644 --- a/gnu/build/install.scm +++ b/gnu/build/install.scm @@ -199,7 +199,7 @@ This is used to create the self-contained tarballs with 'guix pack'." (mkdir-p* %root-profile) (symlink* profile (string-append %root-profile "/guix-profile-1-link")) - (symlink* (string-append %root-profile "/guix-profile-1-link") + (symlink* "guix-profile-1-link" (string-append %root-profile "/guix-profile")) (mkdir-p* "/root") -- cgit v1.2.3 From 16d212510aa597639ffe5a847503a07170e239cd Mon Sep 17 00:00:00 2001 From: Luther Thompson Date: Sun, 21 Oct 2018 23:45:52 +0200 Subject: gnu: Add python-ilinkedlist. * gnu/packages/python.scm (python-ilinkedlist): New variable. --- gnu/packages/python.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 29ce213afb..9c749227de 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -55,6 +55,7 @@ ;;; Copyright © 2018 Oleg Pykhalov ;;; Copyright © 2018 Clément Lassieur ;;; Copyright © 2018 Maxim Cournoyer +;;; Copyright © 2018 Luther Thompson ;;; ;;; This file is part of GNU Guix. ;;; @@ -14504,3 +14505,28 @@ extend common interfaces like NumPy, Pandas, or Python iterators to larger-than-memory or distributed environments. These parallel collections run on top of the dynamic task schedulers. ") (license license:bsd-3))) + +(define-public python-ilinkedlist + (package + (name "python-ilinkedlist") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "ilinkedlist" version)) + (sha256 + (base32 + "063c2gm4jkgkv0nsg7mrc8y0w82ms98l4xchmbrvr68cscglhk69")))) + (build-system python-build-system) + (native-inputs `(("python-pytest" ,python-pytest))) + (inputs `(("python" ,python))) + (home-page "https://github.com/luther9/ilinkedlist-py") + (synopsis "Immutable linked list library") + (description + "This is a implementation of immutable linked lists for Python. It +contains @code{nil} (the empty linked list) and a @code{Pair} class for nodes. +Since a linked list is treated as immutable, it is hashable, and its length +can be retrieved in constant time. Some of the terminology is inspired by +LISP. It is possible to create an improper list by creating a @code{Pair} +with a non-list @code{cdr}.") + (license license:gpl3+))) -- cgit v1.2.3 From ff598353c01b1953243ba0ecb87efbd73c66720e Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sat, 20 Oct 2018 11:17:24 +0100 Subject: gnu: light: Update to 1.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/linux.scm (light): Update to 1.2. [source]: Switch to url-fetch. [arguments]: Remove. [native-inputs]: Remove help2man. Add autoconf and automake. Signed-off-by: Ludovic Courtès --- gnu/packages/linux.scm | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index bc53a88bfc..2c6bd79231 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -30,6 +30,7 @@ ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2018 Brendan Tildesley ;;; Copyright © 2018 Manuel Graf +;;; Copyright © 2018 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -4167,30 +4168,21 @@ monitoring tools for Linux. These include @code{mpstat}, @code{iostat}, (define-public light (package (name "light") - (version "1.1.2") + (version "1.2") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/haikarainen/light") - (commit version))) + (method url-fetch) + (uri (string-append + "https://github.com/haikarainen/light/archive/v" + version ".tar.gz")) (sha256 (base32 - "0c934gxav9cgdf94li6dp0rfqmpday9d33vdn9xb2mfp4war9n4w")))) + "1gfvsw7gh5pis733l7j54vzp272pvjyzbg8a0pvapfmg0s7mip97")) + (file-name (string-append name "-" version ".tar.gz")))) (build-system gnu-build-system) - (arguments - '(#:tests? #f ; no tests - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" %output)) - #:phases - (modify-phases %standard-phases - (delete 'configure) ; no configure script - (add-after 'unpack 'patch-makefile - (lambda _ - (substitute* "Makefile" (("chown") "#")) - #t))))) (native-inputs - `(("help2man" ,help2man))) - (home-page "https://haikarainen.github.io/light") + `(("autoconf" ,autoconf) + ("automake" ,automake))) + (home-page "https://haikarainen.github.io/light/") (synopsis "GNU/Linux application to control backlights") (description "Light is a program to send commands to screen backlight controllers -- cgit v1.2.3 From df71447e992e82d029ac57d0d721af02fc6a5061 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 20 Oct 2018 12:26:51 -0400 Subject: gnu: OpenSSH: Update to 7.9p1. * gnu/packages/ssh.scm (openssh): Update to 7.9p1. --- gnu/packages/ssh.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 829977f5c5..e806fc80f2 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -147,14 +147,14 @@ a server that supports the SSH-2 protocol.") (define-public openssh (package (name "openssh") - (version "7.8p1") + (version "7.9p1") (source (origin (method url-fetch) (uri (string-append "mirror://openbsd/OpenSSH/portable/" name "-" version ".tar.gz")) (sha256 (base32 - "1jj4f586r9lhakp2w0zv7j616d6x62m15q8l4nxq7haja6qlnj0s")))) + "1b8sy6v0b8v4ggmknwcqx3y1rjcpsll0f1f8f4vyv11x4ni3njvb")))) (build-system gnu-build-system) (native-inputs `(("groff" ,groff))) (inputs `(("openssl" ,openssl) -- cgit v1.2.3 From dc3dfa131f97105baefeb34e5155e89946dc1eba Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 22 Oct 2018 00:38:26 +0200 Subject: gnu: knot: Update to 2.7.3. * gnu/packages/dns.scm (knot): Update to 2.7.3. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index ad1a8638bc..1dcf73771b 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -569,14 +569,14 @@ Extensions} (DNSSEC).") (define-public knot (package (name "knot") - (version "2.7.2") + (version "2.7.3") (source (origin (method url-fetch) (uri (string-append "https://secure.nic.cz/files/knot-dns/" name "-" version ".tar.xz")) (sha256 (base32 - "0cc4wgb02ch09x99a1fnr7vsdik8k920q7jafzcamjvy3kpb4w6b")) + "1pwjcv7hzhqawisibybma160k77a6f1v94xw6ay9c7j49vrw05w7")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 69c69c2d8e4922ee997f213772acabb95d33a467 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 21 Oct 2018 23:16:50 -0400 Subject: gnu: libmpdclient: Update to 2.16. * gnu/packages/mpd.scm (libmpdclient): Update to 2.16. --- gnu/packages/mpd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 3e69ddba69..b69be2965f 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -58,7 +58,7 @@ (define-public libmpdclient (package (name "libmpdclient") - (version "2.15") + (version "2.16") (source (origin (method url-fetch) (uri @@ -67,7 +67,7 @@ "/libmpdclient-" version ".tar.xz")) (sha256 (base32 - "1la60ar6i4ghpscrlgm45kci9b74bvkpsfybhg0ygs4rzpwzdnxl")))) + "0r24cl3i9nvs6a47mvwaxk1kb5wmnhkhrw1q5cq9010fgjvdlszs")))) (build-system meson-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 318ec0a896dff7f311d67c6ac9f1bea31efb5e3e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 22 Oct 2018 03:31:51 -0400 Subject: gnu: livemedia-utils: Update to 2018.10.17 [fixes CVE-2018-4013]. * gnu/packages/video.scm (livemedia-utils): Update to 2018.10.17. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index a6930abfda..4fcd15e4aa 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2645,7 +2645,7 @@ many codecs and formats supported by libmediainfo.") (define-public livemedia-utils (package (name "livemedia-utils") - (version "2017.10.28") + (version "2018.10.17") (source (origin (method url-fetch) (uri (string-append @@ -2653,7 +2653,7 @@ many codecs and formats supported by libmediainfo.") version ".tar.gz")) (sha256 (base32 - "0f5kxpayqn3yhabqrd2cqlc74i6x2xr01jfkank1lcilxnfyrsnq")) + "1s69ipvdc6ldscp0cr1zpsll8xc3qcagr95nl84x7b1rbg4xjs3w")) (modules '((guix build utils))) (snippet '(begin ;; As of glibc 2.26, no longer is. -- cgit v1.2.3 From 09aa3d063a0eacf3fca8d4803fbb62bd7b1ee663 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 22 Oct 2018 13:00:06 +0200 Subject: gnu: Add r-ruvseq. * gnu/packages/bioconductor.scm (r-ruvseq): New variable. --- gnu/packages/bioconductor.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 1b779855b2..92b67453f6 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -913,3 +913,29 @@ can be analyzed regarding their minimal, maximal and average distances between barcodes. Finally, reads that start with a (possibly mutated) barcode can be demultiplexed, i.e. assigned to their original reference barcode.") (license license:gpl2))) + +(define-public r-ruvseq + (package + (name "r-ruvseq") + (version "1.14.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "RUVSeq" version)) + (sha256 + (base32 + "16i5sm5af761k4zvspfi8jknsgln48bn538hxqqmlaq7wvlfxqxj")))) + (properties `((upstream-name . "RUVSeq"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biobase" ,r-biobase) + ("r-edaseq" ,r-edaseq) + ("r-edger" ,r-edger) + ("r-mass" ,r-mass))) + (home-page "https://github.com/drisso/RUVSeq") + (synopsis "Remove unwanted variation from RNA-Seq data") + (description + "This package implements methods to @dfn{remove unwanted variation} (RUV) +of Risso et al. (2014) for the normalization of RNA-Seq read counts between +samples.") + (license license:artistic2.0))) -- cgit v1.2.3 From 3a352a44056f4680bbb1de038bd0292803c35b1e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 22 Oct 2018 15:56:38 +0200 Subject: gnu: snap: Update to 4.2.2.2. * gnu/packages/education.scm (snap): Update to 4.2.2.2. Update source URL. --- gnu/packages/education.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 8b02adc182..b333bb9d35 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -243,17 +243,17 @@ easy.") (define-public snap (package (name "snap") - (version "4.2.1.4") + (version "4.2.2.2") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jmoenig/Snap--Build-Your-Own-Blocks.git") + (url "https://github.com/jmoenig/Snap.git") (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "0yc0w0cdhvi0nwqqrann2v3y0n7shxh7irgixqvlavp4k49d7aqj")))) + "0bay08yr58qj8wzpjg33gdj78rfhyskfzidknpdl3cr1jrj6i4p9")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) @@ -265,7 +265,7 @@ easy.") (share (string-append out "/share/snap"))) (copy-recursively source share) ;; Replace the sole minified file in the package. - (with-directory-excursion share + (with-directory-excursion (string-append share "/src") (delete-file "FileSaver.min.js") (symlink (string-append (assoc-ref %build-inputs "js-filesaver") "/share/javascript/FileSaver.min.js") -- cgit v1.2.3 From 51f4e36cb9cc45493397bc799f7a87e5de92560d Mon Sep 17 00:00:00 2001 From: Christopher Lemmer Webber Date: Mon, 22 Oct 2018 09:59:42 -0400 Subject: gnu: Add emacs-scribble-mode. * gnu/packages/emacs.scm (emacs-scribble-mode): New variable. --- gnu/packages/emacs.scm | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 47e984e101..ce98dbaeb8 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2015 Federico Beffa ;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus ;;; Copyright © 2016, 2017, 2018 Chris Marusich -;;; Copyright © 2015, 2016 Christopher Allan Webber +;;; Copyright © 2015, 2016, 2018 Christopher Lemmer Webber ;;; Copyright © 2016 Adriano Peluso ;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2016 David Thompson @@ -654,6 +654,33 @@ Gitlab APIs from Emacs packages. It abstracts access to API resources using only a handful of functions that are not resource-specific.") (license license:gpl3+))) +(define-public emacs-scribble-mode + (let ((commit "34e9e5edb921813b6483e0fefa848efb6ee4b314") + (version "0.0") + (revision 0)) + (package + (name "emacs-scribble-mode") + (version (if (zero? revision) + version + (string-append version "-" + (number->string revision) + "." (string-take commit 7)))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacs-pe/scribble-mode.git") + (commit commit))) + (sha256 + (base32 + "0598byqpz2q6yi2q4dwd77jj9z3n99z34d3an51s9m2za0nh1qvp")))) + (build-system emacs-build-system) + (home-page "https://github.com/emacs-pe/scribble-mode") + (synopsis "Emacs mode for editing the Scribble documentation syntax.") + (description + "This package provides basic syntax highlighting and editing support +for editing Racket's Scribble documentation syntax in Emacs.") + (license license:gpl3+)))) + (define-public emacs-haskell-mode (package (name "emacs-haskell-mode") -- cgit v1.2.3 From 50401c2a6853a65d89ab9be3f24a4f5386e3b684 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Thu, 18 Oct 2018 09:22:36 +0800 Subject: gnu: libqtxdg: Update to 3.2.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm (libqtxdg): Update to 3.2.0. Signed-off-by: 宋文武 --- gnu/packages/lxqt.scm | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index c84d26d4cb..57dd5b9c2f 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2017 Nils Gillmann ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Meiyo Peng ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,25 +37,33 @@ (define-public libqtxdg (package (name "libqtxdg") - (version "1.2.0") + (version "3.2.0") (source (origin (method url-fetch) - (uri - (string-append "https://github.com/lxde/libqtxdg/releases/" - "download/" version "/" name "-" version ".tar.xz")) + (uri (string-append + "https://github.com/lxqt/" name "/releases/download/" + version "/" name "-" version ".tar.xz")) (sha256 - (base32 - "1ncqs0lcll5nx69hxfg33m3jfkryjqrjhr2kdci0b8pyaqdv1jc8")))) + (base32 "0lq548pa69hfvnbj2ypba5ygm8n6v6g7bqqm8p5g538l1l3394cl")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; test fails with message "Exception" - #:configure-flags '("-DBUILD_TESTS=ON"))) - (native-inputs - `(("pkg-config" ,pkg-config))) + `(#:configure-flags + `("-DBUILD_TESTS=ON" + ,(string-append "-DQTXDGX_ICONENGINEPLUGIN_INSTALL_PATH=" + %output "/lib/qt5/plugins/iconengines")) + #:phases + (modify-phases %standard-phases + (add-before 'check 'pre-check + (lambda _ + ;; Run the tests offscreen. + (setenv "QT_QPA_PLATFORM" "offscreen") + #t))))) (propagated-inputs - `(("qtbase" ,qtbase))) ; according to Qt5Xdg.pc - (home-page "https://github.com/lxde/libqtxdg") + ;; required by Qt5XdgIconLoader.pc + `(("qtbase" ,qtbase) + ("qtsvg" ,qtsvg))) + (home-page "https://github.com/lxqt/libqtxdg") (synopsis "Qt implementation of freedesktop.org xdg specifications") (description "Libqtxdg implements the freedesktop.org xdg specifications in Qt.") -- cgit v1.2.3 From 9861bcd182b1ba89a93630a2178b170a088f0a6b Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Thu, 18 Oct 2018 10:30:35 +0800 Subject: gnu: liblxqt: Update to 0.13.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm (liblxqt): Update to 0.13.0. [source]: Remove patches. [home-page]: Use HTTPS. * gnu/packages/patches/liblxqt-include.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. Signed-off-by: 宋文武 --- gnu/local.mk | 1 - gnu/packages/lxqt.scm | 39 ++++++++++++++++++++---------- gnu/packages/patches/liblxqt-include.patch | 14 ----------- 3 files changed, 26 insertions(+), 28 deletions(-) delete mode 100644 gnu/packages/patches/liblxqt-include.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index d155b4c613..47883f829e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -885,7 +885,6 @@ dist_patch_DATA = \ %D%/packages/patches/libjxr-fix-function-signature.patch \ %D%/packages/patches/libjxr-fix-typos.patch \ %D%/packages/patches/libotr-test-auth-fix.patch \ - %D%/packages/patches/liblxqt-include.patch \ %D%/packages/patches/libmad-armv7-thumb-pt1.patch \ %D%/packages/patches/libmad-armv7-thumb-pt2.patch \ %D%/packages/patches/libmad-frame-length.patch \ diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 57dd5b9c2f..c4d0662e99 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -32,7 +32,9 @@ #:use-module (gnu packages glib) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages qt)) + #:use-module (gnu packages polkit) + #:use-module (gnu packages qt) + #:use-module (gnu packages xorg)) (define-public libqtxdg (package @@ -72,29 +74,40 @@ in Qt.") (define-public liblxqt (package (name "liblxqt") - (version "0.9.0") + (version "0.13.0") (source (origin (method url-fetch) - (uri - (string-append "https://github.com/lxde/" name - "/archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (uri (string-append + "https://github.com/lxqt/" name "/releases/download/" + version "/" name "-" version ".tar.xz")) (sha256 - (base32 - "0mbl3qc0yfgfsndqrw8vg8k5irsy0pg2wrad8nwv0aphphd4n7rg")) - (patches (search-patches "liblxqt-include.patch")))) + (base32 "0fba0nq5b9fvvmklcikcd4nwhzlp5d6k1q1f80r34kncdzfvj7dl")))) (build-system cmake-build-system) (arguments - `(#:tests? #f)) - (native-inputs `(("pkg-config" ,pkg-config))) + `(#:tests? #f ; no tests + #:configure-flags + ;; TODO: prefetch translations files from 'lxqt-l10n'. + '("-DPULL_TRANSLATIONS=NO") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + (substitute* "CMakeLists.txt" + (("DESTINATION \"\\$\\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\\}") + "DESTINATION \"${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions")) + #t))))) (inputs `(("kwindowsystem" ,kwindowsystem) ("libqtxdg" ,libqtxdg) - ("qtbase" ,qtbase) + ("libxscrnsaver" ,libxscrnsaver) + ("polkit-qt" ,polkit-qt) + ("qtsvg" ,qtsvg) ("qttools" ,qttools) ("qtx11extras" ,qtx11extras))) - (home-page "http://lxqt.org/") + (native-inputs + `(("lxqt-build-tools" ,lxqt-build-tools))) + (home-page "https://lxqt.org/") (synopsis "Core utility library for all LXQt components") (description "liblxqt provides the basic libraries shared by the components of the LXQt desktop environment.") diff --git a/gnu/packages/patches/liblxqt-include.patch b/gnu/packages/patches/liblxqt-include.patch deleted file mode 100644 index 4e8cf04789..0000000000 --- a/gnu/packages/patches/liblxqt-include.patch +++ /dev/null @@ -1,14 +0,0 @@ -Patch to fix build with Qt 5.5, taken from upstream: - https://github.com/lxde/liblxqt/commit/7303ea207de0771d6f450a31ec4a1ce69202869b - -diff -u -r liblxqt-0.9.0.orig/lxqtnotification.h liblxqt-0.9.0/lxqtnotification.h ---- liblxqt-0.9.0.orig/lxqtnotification.h 2015-07-27 22:49:05.365166482 +0200 -+++ liblxqt-0.9.0/lxqtnotification.h 2015-07-27 22:49:36.897606619 +0200 -@@ -25,6 +25,7 @@ - #ifndef LXQTNOTIFICATION_H - #define LXQTNOTIFICATION_H - -+#include - #include - #include "lxqtglobals.h" - -- cgit v1.2.3 From b45688313b525a8c590136adb62624d109ee73c4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 21 Oct 2018 23:38:29 +0200 Subject: gnu: python-mistune: Update to 0.8.4. * gnu/packages/python.scm (python-mistune): Update to 0.8.4. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 9c749227de..d189438dec 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6004,14 +6004,14 @@ plugins that intend to support Flake8 2.x and 3.x simultaneously.") (define-public python-mistune (package (name "python-mistune") - (version "0.8.3") + (version "0.8.4") (source (origin (method url-fetch) (uri (pypi-uri "mistune" version)) (sha256 (base32 - "06b662p6kf46wh2jsabaqhaq4bz1srh2zxkrnx4yg96azlxw645w")))) + "0vkmsh0x480rni51lhyvigfdf06b9247z868pk3bal1wnnfl58sr")))) (build-system python-build-system) (native-inputs `(("python-nose" ,python-nose) -- cgit v1.2.3 From f232c875d2d591eac99e0168652ecbcb3d21a8ff Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 21 Oct 2018 23:53:16 +0200 Subject: gnu: python-lazy-object-proxy: Update to 1.3.1. * gnu/packages/python.scm (python-lazy-object-proxy): Update to 1.3.1. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index d189438dec..c39a53d8d9 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -9578,13 +9578,13 @@ docstring and colored output.") (define-public python-lazy-object-proxy (package (name "python-lazy-object-proxy") - (version "1.2.2") + (version "1.3.1") (source (origin (method url-fetch) (uri (pypi-uri "lazy-object-proxy" version)) (sha256 (base32 - "0s22aqqkdscyh8sjspyyax7qa1aiz8p4midrnyf39717fhfczm6x")))) + "0yha7q9bhw857fwaby785d63mffhngl9npwzlk9i0pwlkwvbx4gb")))) (build-system python-build-system) (home-page "https://github.com/ionelmc/python-lazy-object-proxy") (synopsis "Lazy object proxy for python") -- cgit v1.2.3 From 3ad0a35890ea3142e0ac16a8be6addd1693a10a1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Sep 2018 13:45:34 +0200 Subject: gnu: Add GN. * gnu/packages/build-tools.scm (gn): New public variable. --- gnu/packages/build-tools.scm | 58 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 4fc2d5acf7..42de56f8c3 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Fis Trivial ;;; Copyright © 2018 Tomáš Čech +;;; Copyright © 2018 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -98,6 +99,63 @@ it is easy to re-run the compilation with alternate programs. Bear is used to generate such a compilation database.") (license license:gpl3+))) +(define-public gn + (let ((commit "f73698ebb33e26a0bf120e2b55d12528fd1dbe7d") + (revision "1481")) ;as returned by `git describe`, used below + (package + (name "gn") + (version (git-version "0.0" revision commit)) + (home-page "https://gn.googlesource.com/gn") + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) (commit commit))) + (sha256 + (base32 + "078ydwak4424bkqh3hd7q955zxp2c3qlw44lsb29i8jqap140f9d")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;FIXME: How to run? + #:phases (modify-phases %standard-phases + (add-before 'configure 'set-build-environment + (lambda _ + (setenv "CC" "gcc") (setenv "CXX" "g++") + (setenv "AR" "ar") + #t)) + (replace 'configure + (lambda _ + (invoke "python" "build/gen.py" "--no-sysroot" + "--no-last-commit-position"))) + (add-after 'configure 'create-last-commit-position + (lambda _ + ;; Create "last_commit_position.h" to avoid a dependency + ;; on 'git' (and the checkout..). + (call-with-output-file "out/last_commit_position.h" + (lambda (port) + (format port + "#define LAST_COMMIT_POSITION \"~a (~a)\"\n" + ,revision ,(string-take commit 8)) + #t)))) + (replace 'build + (lambda _ + (invoke "ninja" "-C" "out" "gn" + "-j" (number->string (parallel-job-count))))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (install-file "out/gn" (string-append out "/bin")) + #t)))))) + (native-inputs + `(("ninja" ,ninja) + ("python" ,python-2))) + (synopsis "Generate Ninja build files") + (description + "GN is a tool that collects information about a project from @file{.gn} +files and generates build instructions for the Ninja build system.") + ;; GN is distributed as BSD-3, but bundles some files from ICU using the + ;; X11 license. + (license (list license:bsd-3 license:x11))))) + (define-public meson (package (name "meson") -- cgit v1.2.3 From f38eedd518816707cd407879f2f862095960b9fc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 22 Oct 2018 18:12:37 +0200 Subject: gnu: samba: Update to 4.8.6. * gnu/packages/samba.scm (samba): Update to 4.8.6. --- gnu/packages/samba.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index a6d6ee30cd..458ff50ae8 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -150,14 +150,14 @@ anywhere.") (define-public samba (package (name "samba") - (version "4.8.5") + (version "4.8.6") (source (origin (method url-fetch) (uri (string-append "https://download.samba.org/pub/samba/stable/" "samba-" version ".tar.gz")) (sha256 (base32 - "0mailvhjsma19k6b6zjl02z9n2hbbyfybvicjfw2hh9d4sqyd3p5")))) + "15hawqdm37l6lp9k14c634315p77cllsx89bvbw9h38fg1hj3fbk")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 3743e117a6424f6463d8abfca4dd71ce576a918a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 22 Oct 2018 18:15:02 +0200 Subject: gnu: libmd: Update to 1.0.1. * gnu/packages/crypto.scm (libmd): Update to 1.0.1. --- gnu/packages/crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 77b4dba6d4..29d9a3d6ab 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -94,7 +94,7 @@ communication, encryption, decryption, signatures, etc.") (define-public libmd (package (name "libmd") - (version "1.0.0") + (version "1.0.1") (source (origin (method url-fetch) (uri @@ -105,7 +105,7 @@ communication, encryption, decryption, signatures, etc.") version ".tar.xz"))) (sha256 (base32 - "1iv45npzv0gncjgcpx5m081861zdqxw667ysghqb8721yrlyl6pj")))) + "0waclg2d5qin3r26gy5jvy4584ik60njc8pqbzwk0lzq3j9ynkp1")))) (build-system gnu-build-system) (synopsis "Message Digest functions from BSD systems") (description -- cgit v1.2.3 From 4350cacdf73f6e589a7d19b147f3707836e30210 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 22 Oct 2018 18:19:16 +0200 Subject: gnu: xf86-input-libinput: Update to 0.28.1. * gnu/packages/xorg.scm (xf86-input-libinput): Update to 0.28.1. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 4cf8eb2de4..dff50e9919 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2448,7 +2448,7 @@ including most mice, keyboards, tablets and touchscreens.") (define-public xf86-input-libinput (package (name "xf86-input-libinput") - (version "0.28.0") + (version "0.28.1") (source (origin (method url-fetch) (uri (string-append @@ -2456,7 +2456,7 @@ including most mice, keyboards, tablets and touchscreens.") name "-" version ".tar.bz2")) (sha256 (base32 - "189h8vl0005yizwrs4d0sng6j8lwkd3xi1zwqg8qavn2bw34v691")))) + "12yr0yki94j2416bfhmkz5jpacffm27jkra89fl7h03c0y749nls")))) (build-system gnu-build-system) (arguments '(#:configure-flags -- cgit v1.2.3 From 90fb136ff72533d138ae0153bee1f88a8bf58115 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 22 Oct 2018 18:21:08 +0200 Subject: gnu: xorg-server: Update to 1.20.2. * gnu/packages/xorg.scm (xorg-server): Update to 1.20.2. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index dff50e9919..86b4470aa0 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5065,7 +5065,7 @@ over Xlib, including: (define-public xorg-server (package (name "xorg-server") - (version "1.20.1") + (version "1.20.2") (source (origin (method url-fetch) @@ -5074,7 +5074,7 @@ over Xlib, including: name "-" version ".tar.bz2")) (sha256 (base32 - "0679942x1ma2p30vlvqylpjc5v1ak1pgqysnqrj82nz7dzl9zjar")) + "1qnf7jdygdgbgjfm5mfr691dl8d56mpssa82mvhm8bzj92yggm8f")) (patches (list ;; See: -- cgit v1.2.3 From e810de3e68db1e892688dc21a8804df066ff218b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 22 Oct 2018 18:23:15 +0200 Subject: gnu: python-m2crypto: python-typing is only needed for python2. * gnu/packages/python-crypto.scm (python-m2crypto)[propagated-inputs]: Remove. [properties]: New field. (python2-m2crypto)[propagated-inputs]: Add PYTHON2-TYPING. --- gnu/packages/python-crypto.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index bda547417c..8bee14c695 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -859,7 +859,6 @@ in userspace) (base32 "1h16gpilrnlzc0iyj1mnd1iqh8wchzjsxjqw9n344glimg2s5zm0")))) (build-system python-build-system) (inputs `(("openssl" ,openssl))) - (propagated-inputs `(("python-typing" ,python-typing))) (home-page "https://gitlab.com/m2crypto/m2crypto") (synopsis "Python crypto and TLS toolkit") (description "@code{M2Crypto} is a complete Python wrapper for OpenSSL @@ -869,10 +868,15 @@ extensions to Python's httplib, urllib, and xmlrpclib; unforgeable HMAC'ing AuthCookies for web session management; FTP/TLS client and server; S/MIME; M2Crypto can also be used to provide TLS for Twisted. Smartcards supported through the Engine interface.") + (properties `((python2-variant . ,(delay python2-m2crypto)))) (license license:expat))) (define-public python2-m2crypto - (package-with-python2 python-m2crypto)) + (let ((m2crypto (package-with-python2 + (strip-python2-variant python-m2crypto)))) + (package (inherit m2crypto) + (propagated-inputs + `(("python2-typing" ,python2-typing)))))) (define-public python-pylibscrypt (package -- cgit v1.2.3 From cb61baf0e72e0756c3386acb0d7745c507daa3ac Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 22 Oct 2018 18:24:28 +0200 Subject: gnu: python-m2crypto: Update to 0.30.1. * gnu/packages/python-crypto.scm (python-m2crypto): Update to 0.30.1. --- gnu/packages/python-crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 8bee14c695..f71b8a3467 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -850,13 +850,13 @@ in userspace) (define-public python-m2crypto (package (name "python-m2crypto") - (version "0.29.0") + (version "0.30.1") (source (origin (method url-fetch) (uri (pypi-uri "M2Crypto" version)) (sha256 - (base32 "1h16gpilrnlzc0iyj1mnd1iqh8wchzjsxjqw9n344glimg2s5zm0")))) + (base32 "1iizrpkn4c2n70nvcjqlmnk6fz3vddkrjmwavz1zlsnwv8f7bcm1")))) (build-system python-build-system) (inputs `(("openssl" ,openssl))) (home-page "https://gitlab.com/m2crypto/m2crypto") -- cgit v1.2.3 From 1b50df7d5b13921eb61bfd81787d4d5596064cc6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 22 Oct 2018 18:31:56 +0200 Subject: gnu: python-markdown: Update home page. * gnu/packages/python.scm (python-markdown)[home-page]: Change to current. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c39a53d8d9..b95774e9f7 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6046,7 +6046,7 @@ Python.") (native-inputs `(("python-nose" ,python-nose) ("python-pyyaml" ,python-pyyaml))) - (home-page "https://pythonhosted.org/Markdown/") + (home-page "https://python-markdown.github.io/") (synopsis "Python implementation of Markdown") (description "This package provides a Python implementation of John Gruber's -- cgit v1.2.3 From 9b9aaa57e3bf8e75305b557e79b79f90e4fb331c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 22 Oct 2018 18:32:41 +0200 Subject: gnu: python-markdown: Update to 3.0.1. * gnu/packages/python.scm (python-markdown): Update to 3.0.1. [arguments]: Remove. --- gnu/packages/python.scm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b95774e9f7..7e2082e5f2 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6028,21 +6028,15 @@ Python.") (define-public python-markdown (package (name "python-markdown") - (version "2.6.11") + (version "3.0.1") (source (origin (method url-fetch) (uri (pypi-uri "Markdown" version)) (sha256 (base32 - "108g80ryzykh8bj0i7jfp71510wrcixdi771lf2asyghgyf8cmm8")))) + "0z6v8649sr434d5r5zmrhydka7v7f9yas4bwcgkcs0650jdhybnh")))) (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - (zero? (system* "python" "run-tests.py"))))))) (native-inputs `(("python-nose" ,python-nose) ("python-pyyaml" ,python-pyyaml))) -- cgit v1.2.3 From 47d7c10387f391b107acd612137f247be506c46a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 22 Oct 2018 18:37:49 +0200 Subject: gnu: python-sure: Update to 1.4.11. * gnu/packages/python.scm (python-sure): Update to 1.4.11. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 7e2082e5f2..664f7720ff 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -11933,14 +11933,14 @@ Supported metrics are: (define-public python-sure (package (name "python-sure") - (version "1.4.6") + (version "1.4.11") (source (origin (method url-fetch) (uri (pypi-uri "sure" version)) (sha256 (base32 - "1iyqsy2d6radi88g1qf0lziy5b39h5cpb3g5jiqyb4xi46ig3x1z")))) + "1and0drq8w9iplsic22n2h7hkpyq03a1mbqk4sgcdqhqzdqm539w")))) (build-system python-build-system) (propagated-inputs `(("python-mock" ,python-mock) -- cgit v1.2.3 From 63abd1e2a36d48e1f8f7057a4c844b9cf5733be7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 22 Oct 2018 18:53:38 +0200 Subject: gnu: python-pymongo: Update to 3.7.2. * gnu/packages/python.scm (python-pymongo): Update to 3.7.2. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 664f7720ff..dee7d9a06a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -10060,13 +10060,13 @@ reasoning, wrappers for natural language processing libraries.") (define-public python-pymongo (package (name "python-pymongo") - (version "3.3.0") + (version "3.7.2") (source (origin (method url-fetch) (uri (pypi-uri "pymongo" version)) (sha256 (base32 - "07mra6w86wjqy4lx5fvimidjhhfzd562gfjn8grsnbv2q8pk0i9x")))) + "0zis4707r9hdg5qgkhp3wss9camr9h56ixyfc8n9dxwlnnly4x4c")))) (build-system python-build-system) (propagated-inputs `(("python-certifi" ,python-certifi))) -- cgit v1.2.3 From 3a23036a0a8fb51b56ec88a06c64bf546f97032b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 22 Oct 2018 18:30:04 +0200 Subject: 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(+) (limited to 'gnu') 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) -- cgit v1.2.3 From 4cdbffdc2fa5f90b7c0231d7d68de8f2d4a4dbed Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 21 Oct 2018 19:37:01 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 2820e3159090e0da86fc092e80bddbb7a74b3b23 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 22 Oct 2018 16:36:24 +0200 Subject: gnu: zstd: Update to 1.3.7. * gnu/packages/compression.scm (zstd): Update to 1.3.7. --- gnu/packages/compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 8c940f3036..5a151b486d 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1694,14 +1694,14 @@ or junctions, and always follows hard links.") (define-public zstd (package (name "zstd") - (version "1.3.6") + (version "1.3.7") (source (origin (method url-fetch) (uri (string-append "https://github.com/facebook/zstd/releases/download/" "v" version "/zstd-" version ".tar.gz")) (sha256 - (base32 "1525b31jmbiczjj1n58nckdzky4cdnbwcsil3zgy4cx03v0a0cp8")))) + (base32 "0gapsdzqfsfqqddzv22592iwa0008xjyi15f06pfv9hcvwvg4xrj")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 3891c383465a0033b19fc2dc1ca3296fb17d0a2f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 22 Oct 2018 16:37:36 +0200 Subject: gnu: bs1770gain: Update to 0.5.1. * gnu/packages/audio.scm (bs1770gain): Update to 0.5.1. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index a1745bb7a6..ee18b00226 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3105,7 +3105,7 @@ with support for HD extensions.") (define-public bs1770gain (package (name "bs1770gain") - (version "0.5.0") + (version "0.5.1") (source (origin (method url-fetch) @@ -3113,7 +3113,7 @@ with support for HD extensions.") version "/bs1770gain-" version ".tar.gz")) (sha256 (base32 - "0vd7320k7s2zcn2vganclxbr1vav18ghld27rcwskvcc3dm8prii")))) + "0r4fbajgfmnwgl63hcm56f1j8m5f135q6j5jkzdvrrhpcj39yx06")))) (build-system gnu-build-system) (inputs `(("ffmpeg" ,ffmpeg) ("sox" ,sox))) -- cgit v1.2.3 From ee5c83533dac8efebc16ce49eec201d90f09c2ad Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 22 Oct 2018 16:56:33 +0200 Subject: gnu: cppcheck: Update to 1.85. * gnu/packages/check.scm (cppcheck): Update to 1.85. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 866fa801c0..40f341fb64 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -293,13 +293,13 @@ format.") (define-public cppcheck (package (name "cppcheck") - (version "1.84") + (version "1.85") (source (origin (method url-fetch) (uri (string-append "https://github.com/danmar/cppcheck/archive/" version ".tar.gz")) (sha256 - (base32 "1ibz07dgs1dpfb8bmjh3qsma37wl5p6s6b4qlv5ccpshj4yjk9ma")) + (base32 "18qlddf1i9bk5nnvy1v2nfxjd46y8wvp3rqz2hrfxjxsyvrfq5yw")) (file-name (string-append name "-" version ".tar.gz")))) (build-system cmake-build-system) (home-page "http://cppcheck.sourceforge.net") -- cgit v1.2.3 From 661da251331bfaf821a63efaa1943686184d7dd7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 22 Oct 2018 17:19:12 +0200 Subject: gnu: Remove duplicate import from (gnu packages messaging). * gnu/packages/messaging.scm (define-module): Remove duplicate module import. Order the remainder alphabetically. --- gnu/packages/messaging.scm | 69 +++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 35 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index d50732dfc4..3f050391b1 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -32,71 +32,70 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages messaging) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix utils) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix git-download) - #:use-module (guix build-system gnu) - #:use-module (guix build-system glib-or-gtk) - #:use-module (guix build-system meson) - #:use-module (guix build-system python) - #:use-module (guix build-system perl) - #:use-module (guix build-system cmake) #:use-module (gnu packages) + #:use-module (gnu packages admin) #:use-module (gnu packages aidc) #:use-module (gnu packages aspell) + #:use-module (gnu packages audio) #:use-module (gnu packages autotools) #:use-module (gnu packages avahi) #:use-module (gnu packages base) + #:use-module (gnu packages bash) + #:use-module (gnu packages bison) #:use-module (gnu packages check) + #:use-module (gnu packages compression) #:use-module (gnu packages crypto) #:use-module (gnu packages curl) #:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages databases) #:use-module (gnu packages documentation) #:use-module (gnu packages enchant) + #:use-module (gnu packages fontutils) #:use-module (gnu packages gettext) + #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages gnupg) #:use-module (gnu packages gtk) + #:use-module (gnu packages guile) + #:use-module (gnu packages icu4c) #:use-module (gnu packages image) - #:use-module (gnu packages xorg) - #:use-module (gnu packages xdisorg) + #:use-module (gnu packages less) #:use-module (gnu packages libcanberra) - #:use-module (gnu packages man) - #:use-module (gnu packages networking) #:use-module (gnu packages libidn) + #:use-module (gnu packages linux) #:use-module (gnu packages lua) - #:use-module (gnu packages xml) - #:use-module (gnu packages gnupg) + #:use-module (gnu packages man) #:use-module (gnu packages ncurses) + #:use-module (gnu packages networking) + #:use-module (gnu packages pcre) + #:use-module (gnu packages perl) + #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages glib) #:use-module (gnu packages python) #:use-module (gnu packages python-crypto) - #:use-module (gnu packages pcre) - #:use-module (gnu packages perl) + #:use-module (gnu packages qt) + #:use-module (gnu packages readline) #:use-module (gnu packages tcl) - #:use-module (gnu packages compression) - #:use-module (gnu packages check) - #:use-module (gnu packages admin) - #:use-module (gnu packages linux) + #:use-module (gnu packages texinfo) #:use-module (gnu packages textutils) #:use-module (gnu packages tls) - #:use-module (gnu packages icu4c) - #:use-module (gnu packages qt) #:use-module (gnu packages video) #:use-module (gnu packages web) + #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) - #:use-module (gnu packages audio) - #:use-module (gnu packages bison) - #:use-module (gnu packages fontutils) - #:use-module (gnu packages bash) - #:use-module (gnu packages guile) - #:use-module (gnu packages less) - #:use-module (gnu packages readline) - #:use-module (gnu packages photo) - #:use-module (gnu packages texinfo)) + #:use-module (gnu packages xml) + #:use-module (gnu packages xorg) + #:use-module (guix build-system cmake) + #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system gnu) + #:use-module (guix build-system meson) + #:use-module (guix build-system perl) + #:use-module (guix build-system python) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix utils)) (define-public libotr (package -- cgit v1.2.3 From d6a9c4ecfb8a6237efe463f9faed65c1da60a76c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 23 Oct 2018 01:57:09 +0200 Subject: gnu: unbound: Update to 1.8.1. * gnu/packages/dns.scm (unbound): Update to 1.8.1. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 1dcf73771b..e738d3fe2f 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -363,7 +363,7 @@ to result in system-wide compromise.") (define-public unbound (package (name "unbound") - (version "1.8.0") + (version "1.8.1") (source (origin (method url-fetch) @@ -371,7 +371,7 @@ to result in system-wide compromise.") version ".tar.gz")) (sha256 (base32 - "0gxqc4ynd2g1a5dwaazqh9n8injh49a7dz0l9bbxqgv47dnrvxvq")))) + "0p9w6spar5dfi7fplxjcq4394wldabaws0ns30cqq6sxqfwv6qn3")))) (build-system gnu-build-system) (outputs '("out" "python")) (native-inputs -- cgit v1.2.3 From ce08d54c35e66292955a114b694bbf52ade10e23 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 19 Oct 2018 16:23:27 -0400 Subject: gnu: Add libopusenc. * gnu/packages/xiph.scm (libopusenc): New variable. --- gnu/packages/xiph.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index 7ecfa580ec..523f82dc97 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2015, 2016, 2017 Efraim Flashner ;;; Copyright © 2017, 2018 Marius Bakke ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Leo Famulari ;;; ;;; This file is part of GNU Guix. ;;; @@ -412,6 +413,28 @@ windows systems.") (license license:bsd-3) (home-page "https://www.opus-codec.org"))) +(define-public libopusenc + (package + (name "libopusenc") + (version "0.2.1") + (source (origin + (method url-fetch) + (uri (string-append "https://archive.mozilla.org/pub/opus/" + "libopusenc-" version ".tar.gz")) + (sha256 + (base32 + "1ffb0vhlymlsq70pxsjj0ksz77yfm2x0a1x8q50kxmnkm1hxp642")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (propagated-inputs + `(("opus" ,opus))) + (synopsis "Library for encoding Opus audio files and streams ") + (description "The libopusenc libraries provide a high-level API for +encoding Opus files and streams.") + (home-page "https://www.opus-codec.org/") + (license license:bsd-3))) + (define-public icecast (package (name "icecast") -- cgit v1.2.3 From 844b3272dab2165fd87f26647cac5e53a080c0ce Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 19 Oct 2018 16:31:12 -0400 Subject: gnu: opusfile: Propagate dependencies required in pkg-config. * gnu/packages/xiph.scm (opusfile)[inputs]: Move libogg and openssl to propagated-inputs. --- gnu/packages/xiph.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index 523f82dc97..f40522730b 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -398,13 +398,13 @@ decoding .opus files.") (base32 "1gq3aszzl5glgbajw5p1f5a1kdyf23w5vjdmwwrk246syin9pkkl")))) (build-system gnu-build-system) + ;; Required by opusfile.pc and opusurl.pc. (propagated-inputs - `(("opus" ,opus))) + `(("libogg" ,libogg) + ("openssl" ,openssl) + ("opus" ,opus))) (native-inputs `(("pkg-config" ,pkg-config))) - (inputs - `(("libogg" ,libogg) - ("openssl" ,openssl))) (synopsis "Versatile audio codec") (description "The opusfile library provides seeking, decode, and playback of Opus -- cgit v1.2.3 From d0ff383ed8368e11edd837aa61e6900ee5237acd Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 19 Oct 2018 16:27:58 -0400 Subject: gnu: opus-tools: Update to 0.2. * gnu/packages/xiph.scm (opus-tools): Update to 0.2. [native-inputs]: Add pkg-config. [inputs]: Add libopusenc and opusfile. Remove libogg and opus. --- gnu/packages/xiph.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index f40522730b..8991bfa609 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -355,7 +355,7 @@ incorporated technology from Skype's SILK codec and Xiph.Org's CELT codec.") (define opus-tools (package (name "opus-tools") - (version "0.1.10") + (version "0.2") (source (origin (method url-fetch) (uri (string-append @@ -363,7 +363,7 @@ incorporated technology from Skype's SILK codec and Xiph.Org's CELT codec.") version ".tar.gz")) (sha256 (base32 - "135jfb9ny3xvd27idsxj7j5ns90lslbyrq70cq3bfwcls4r7add2")))) + "11pzl27s4vcz4m18ch72nivbhww2zmzn56wspb7rll1y1nq6rrdl")))) (build-system gnu-build-system) (arguments ;; The package developers misuse pkg-config such that it doesn't work @@ -374,9 +374,12 @@ incorporated technology from Skype's SILK codec and Xiph.Org's CELT codec.") "/include -I" (assoc-ref %build-inputs "opus") "/include/opus")))) - (inputs `(("libogg" ,libogg) - ("opus" ,opus) - ("flac" ,flac))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("libopusenc" ,libopusenc) + ("opusfile" ,opusfile) + ("flac" ,flac))) (synopsis "Command line utilities to encode, inspect, and decode .opus files") (description "Opus is a royalty-free, highly versatile audio codec. -- cgit v1.2.3 From a640492f6dc5955cc5818156de939850db07d720 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 19 Oct 2018 16:27:41 -0400 Subject: gnu: Opus: Update to 1.3. * gnu/packages/xiph.scm (opus): Update to 1.3. --- gnu/packages/xiph.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index 8991bfa609..c3072f47a3 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -333,14 +333,14 @@ ogginfo, to obtain information (tags, bitrate, length, etc.) about (define opus (package (name "opus") - (version "1.2.1") + (version "1.3") (source (origin (method url-fetch) (uri (string-append "https://archive.mozilla.org/pub/opus/opus-" version ".tar.gz")) (sha256 (base32 - "0ch7yzgg4bn1g36bpjsfrgs4n19c84d7wpdida6yzifrrhwx7byg")))) + "0l651n19h0vhc0sn6w2c95hgqks1i8m4b3j04ncaznzjznp6jgag")))) (build-system gnu-build-system) (synopsis "Versatile audio codec") (description -- cgit v1.2.3 From a89f731b1506b3b560f4a179da2889408dfa881d Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 21 Oct 2018 22:30:17 -0400 Subject: gnu: Xiph: Use HTTPS URLs. * gnu/packages/xiph.scm (libogg, libvorbis, libtheora, speex, speexdsp, ao, flac, libkate, vorbis-tools, opus-tools opusfile, icecast, libshout)[source]: Use HTTPS URLs. (icecast)[home-page]: Use HTTPS URL. --- gnu/packages/xiph.scm | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index c3072f47a3..9a1bece63f 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -61,7 +61,7 @@ (version "1.3.3") (source (origin (method url-fetch) - (uri (string-append "http://downloads.xiph.org/releases/ogg/libogg-" + (uri (string-append "https://downloads.xiph.org/releases/ogg/libogg-" version ".tar.xz")) (sha256 (base32 @@ -84,7 +84,7 @@ periodic timestamps for seeking.") (version "1.3.6") (source (origin (method url-fetch) - (uri (string-append "http://downloads.xiph.org/releases/vorbis/" + (uri (string-append "https://downloads.xiph.org/releases/vorbis/" "libvorbis-" version ".tar.xz")) (sha256 (base32 @@ -110,7 +110,7 @@ polyphonic) audio and music at fixed and variable bitrates from 16 to (version "1.1.1") (source (origin (method url-fetch) - (uri (string-append "http://downloads.xiph.org/releases/theora/" + (uri (string-append "https://downloads.xiph.org/releases/theora/" "libtheora-" version ".tar.xz")) (sha256 (base32 @@ -135,7 +135,7 @@ compressed video format.") (source (origin (method url-fetch) - (uri (string-append "http://downloads.xiph.org/releases/speex/speex-" + (uri (string-append "https://downloads.xiph.org/releases/speex/speex-" version ".tar.gz")) (sha256 (base32 @@ -163,7 +163,7 @@ stereo encoding, and voice activity detection.") (version "1.2rc3") (source (origin (method url-fetch) - (uri (string-append "http://downloads.xiph.org/releases/speex/" + (uri (string-append "https://downloads.xiph.org/releases/speex/" "speexdsp-" version ".tar.gz")) (sha256 (base32 @@ -189,7 +189,7 @@ work from the @code{speex} codec.") (source (origin (method url-fetch) - (uri (string-append "http://downloads.xiph.org/releases/ao/libao-" + (uri (string-append "https://downloads.xiph.org/releases/ao/libao-" version ".tar.gz")) (sha256 (base32 @@ -238,7 +238,7 @@ It currently supports: (version "1.3.2") (source (origin (method url-fetch) - (uri (string-append "http://downloads.xiph.org/releases/flac/flac-" + (uri (string-append "https://downloads.xiph.org/releases/flac/flac-" version ".tar.xz")) (sha256 (base32 @@ -262,7 +262,7 @@ meaning that audio is compressed in FLAC without any loss in quality.") (version "0.4.1") (source (origin (method url-fetch) - (uri (string-append "http://downloads.xiph.org/releases/kate/" + (uri (string-append "https://downloads.xiph.org/releases/kate/" "libkate-" version ".tar.gz")) (sha256 (base32 @@ -298,7 +298,7 @@ Kate stream.") (version "1.4.0") (source (origin (method url-fetch) - (uri (string-append "http://downloads.xiph.org/releases/vorbis/" + (uri (string-append "https://downloads.xiph.org/releases/vorbis/" "vorbis-tools-" version ".tar.gz")) (sha256 (base32 @@ -359,7 +359,7 @@ incorporated technology from Skype's SILK codec and Xiph.Org's CELT codec.") (source (origin (method url-fetch) (uri (string-append - "http://downloads.xiph.org/releases/opus/opus-tools-" + "https://downloads.xiph.org/releases/opus/opus-tools-" version ".tar.gz")) (sha256 (base32 @@ -395,7 +395,7 @@ decoding .opus files.") (source (origin (method url-fetch) (uri (string-append - "http://downloads.xiph.org/releases/opus/opusfile-" version + "https://downloads.xiph.org/releases/opus/opusfile-" version ".tar.gz")) (sha256 (base32 @@ -445,7 +445,7 @@ encoding Opus files and streams.") (source (origin (method url-fetch) (uri (string-append - "http://downloads.xiph.org/releases/icecast/icecast-" + "https://downloads.xiph.org/releases/icecast/icecast-" version ".tar.gz")) (sha256 (base32 @@ -477,7 +477,7 @@ things in between.") (source (origin (method url-fetch) (uri (string-append - "http://downloads.xiph.org/releases/libshout/" + "https://downloads.xiph.org/releases/libshout/" name "-" version ".tar.gz")) (sha256 (base32 @@ -490,7 +490,7 @@ things in between.") `(("libtheora" ,libtheora) ("libvorbis" ,libvorbis) ("speex" ,speex))) - (home-page "http://www.icecast.org/") + (home-page "https://icecast.org/") (synopsis "Audio streaming library for icecast encoders") (description "Libshout is a library for communicating with and sending data to an -- cgit v1.2.3 From f0ac761f95d654342bbfd0a49892b518dc31d390 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 23 Oct 2018 09:59:16 +0200 Subject: gnu: grammalecte: Update home page. * gnu/packages/dictionaries.scm (grammalecte)[home-page]: Update URL. --- gnu/packages/dictionaries.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index ce7ef1cf75..3d58589e5e 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -222,7 +222,7 @@ It comes with a German-English dictionary with approximately 270,000 entries.") (base32 "11byjs3ggdhia5f4vyfqfvbbczsfqimll98h98g7hlsrm7vrifb0")))) (build-system python-build-system) - (home-page "https://www.dicollecte.org") + (home-page "https://grammalecte.net") (synopsis "French spelling and grammar checker") (description "Grammalecte is a grammar checker dedicated to the French language, derived from Lightproof. -- cgit v1.2.3 From 70c488f8ddfbf21301f215424c4bdcc7cf6e9936 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Thu, 18 Oct 2018 10:34:41 +0800 Subject: gnu: lxqt-session: Update to 0.13.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm (lxqt-session): Update to 0.13.0. Signed-off-by: 宋文武 --- gnu/packages/lxqt.scm | 49 +++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index c4d0662e99..a25984db73 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -29,8 +29,10 @@ #:use-module (guix utils) #:use-module (guix build-system cmake) #:use-module (gnu packages) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) #:use-module (gnu packages kde-frameworks) + #:use-module (gnu packages linux) #:use-module (gnu packages pkg-config) #:use-module (gnu packages polkit) #:use-module (gnu packages qt) @@ -116,43 +118,42 @@ components of the LXQt desktop environment.") (define-public lxqt-session (package (name "lxqt-session") - (version "0.9.0") + (version "0.13.0") (source (origin (method url-fetch) - (uri - (string-append "https://github.com/lxde/" name - "/archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (uri (string-append "https://github.com/lxqt/" name "/releases/download/" + version "/" name "-" version ".tar.xz")) (sha256 - (base32 - "1sdwcfrfqkg7ibrsncs1skdap9n8wm4rg6n9d0fgdz2q4d45h75a")))) + (base32 "1aibppppmg46ybbajx2qc395l0yp9rqlp2am01fqjxadsf8vci5z")))) (build-system cmake-build-system) - (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("kwindowsystem" ,kwindowsystem) + `(("eudev" ,eudev) + ("kwindowsystem" ,kwindowsystem) ("liblxqt" ,liblxqt) ("libqtxdg" ,libqtxdg) ("qtbase" ,qtbase) + ("qtsvg" ,qtsvg) ("qttools" ,qttools) - ("qtx11extras" ,qtx11extras))) + ("qtx11extras" ,qtx11extras) + ("xdg-user-dirs" ,xdg-user-dirs))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("lxqt-build-tools" ,lxqt-build-tools))) (arguments - `(#:tests? #f ; no check target + `(#:tests? #f + #:configure-flags + `("-DPULL_TRANSLATIONS=NO") #:phases - (modify-phases %standard-phases - (add-before 'configure 'fix-installation-paths + (modify-phases %standard-phases + (add-after 'unpack 'patch-source (lambda _ - ;; The variable LXQT_TRANSLATIONS_DIR is set in - ;; liblxqt-0.9.0/share/cmake/lxqt/lxqt-config.cmake - ;; to the liblxqt installation directory, followed by - ;; "/share/lxqt/translations". - ;; We need to have it point to the current installation - ;; directory instead. - (substitute* '("lxqt-session/CMakeLists.txt" - "lxqt-config-session/CMakeLists.txt") - (("\\$\\{LXQT_TRANSLATIONS_DIR\\}") - "${CMAKE_INSTALL_PREFIX}/share/lxqt/translations"))))))) - (home-page "http://lxqt.org/") + (substitute* '("autostart/CMakeLists.txt" + "config/CMakeLists.txt") + (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") + "DESTINATION \"${CMAKE_INSTALL_PREFIX}/etc/xdg")) + #t))))) + (home-page "https://lxqt.org/") (synopsis "Session manager for LXQt") (description "lxqt-session provides the standard session manager for the LXQt desktop environment.") -- cgit v1.2.3 From 088096aa0e0567a1d3d666322c3e919069216261 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Thu, 18 Oct 2018 10:35:56 +0800 Subject: gnu: lxqt-build-tools: Update download URL and home page URL. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm (lxqt-build-tools) [source]: Update download URL to the 'lxqt' repository. [home-page]: Use HTTPS. Signed-off-by: 宋文武 --- gnu/packages/lxqt.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index a25984db73..49a7040bcc 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -166,12 +166,10 @@ for the LXQt desktop environment.") (source (origin (method url-fetch) - (uri (string-append "https://github.com/lxde/lxqt-build-tools/releases/" - "download/" version "/" name "-" version ".tar.xz")) - (file-name (string-append name "-" version ".tar.xz")) + (uri (string-append "https://github.com/lxqt/" name "/releases/download/" + version "/" name "-" version ".tar.xz")) (sha256 - (base32 - "13b5x26p6ycnwzlgg1cgvlc88wjrjmlb3snrrmzh0xgh9h6hhvd6")))) + (base32 "13b5x26p6ycnwzlgg1cgvlc88wjrjmlb3snrrmzh0xgh9h6hhvd6")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; no tests @@ -184,5 +182,5 @@ for the LXQt desktop environment.") (description "Lxqt-build-tools is providing several tools needed to build LXQt itself as well as other components maintained by the LXQt project.") - (home-page "http://lxqt.org") + (home-page "https://lxqt.org") (license lgpl2.1+))) -- cgit v1.2.3 From d58aefdf06586365e0cc9f832e40fe6c5fddb1e3 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Thu, 18 Oct 2018 10:38:24 +0800 Subject: gnu: lxqt.scm: Sort packages alphabetically. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm: Sort packages alphabetically. Signed-off-by: 宋文武 --- gnu/packages/lxqt.scm | 116 +++++++++++++++++++++++++------------------------- 1 file changed, 58 insertions(+), 58 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 49a7040bcc..dda4dd8b0f 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -38,6 +38,48 @@ #:use-module (gnu packages qt) #:use-module (gnu packages xorg)) +(define-public liblxqt + (package + (name "liblxqt") + (version "0.13.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/lxqt/" name "/releases/download/" + version "/" name "-" version ".tar.xz")) + (sha256 + (base32 "0fba0nq5b9fvvmklcikcd4nwhzlp5d6k1q1f80r34kncdzfvj7dl")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; no tests + #:configure-flags + ;; TODO: prefetch translations files from 'lxqt-l10n'. + '("-DPULL_TRANSLATIONS=NO") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + (substitute* "CMakeLists.txt" + (("DESTINATION \"\\$\\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\\}") + "DESTINATION \"${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions")) + #t))))) + (inputs + `(("kwindowsystem" ,kwindowsystem) + ("libqtxdg" ,libqtxdg) + ("libxscrnsaver" ,libxscrnsaver) + ("polkit-qt" ,polkit-qt) + ("qtsvg" ,qtsvg) + ("qttools" ,qttools) + ("qtx11extras" ,qtx11extras))) + (native-inputs + `(("lxqt-build-tools" ,lxqt-build-tools))) + (home-page "https://lxqt.org/") + (synopsis "Core utility library for all LXQt components") + (description "liblxqt provides the basic libraries shared by the +components of the LXQt desktop environment.") + (license lgpl2.1+))) + (define-public libqtxdg (package (name "libqtxdg") @@ -73,46 +115,30 @@ in Qt.") (license lgpl2.1+))) -(define-public liblxqt +(define-public lxqt-build-tools (package - (name "liblxqt") - (version "0.13.0") + (name "lxqt-build-tools") + (version "0.5.0") (source (origin (method url-fetch) - (uri (string-append - "https://github.com/lxqt/" name "/releases/download/" - version "/" name "-" version ".tar.xz")) + (uri (string-append "https://github.com/lxqt/" name "/releases/download/" + version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0fba0nq5b9fvvmklcikcd4nwhzlp5d6k1q1f80r34kncdzfvj7dl")))) + (base32 "13b5x26p6ycnwzlgg1cgvlc88wjrjmlb3snrrmzh0xgh9h6hhvd6")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; no tests - #:configure-flags - ;; TODO: prefetch translations files from 'lxqt-l10n'. - '("-DPULL_TRANSLATIONS=NO") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-source - (lambda _ - (substitute* "CMakeLists.txt" - (("DESTINATION \"\\$\\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\\}") - "DESTINATION \"${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions")) - #t))))) - (inputs - `(("kwindowsystem" ,kwindowsystem) - ("libqtxdg" ,libqtxdg) - ("libxscrnsaver" ,libxscrnsaver) - ("polkit-qt" ,polkit-qt) - ("qtsvg" ,qtsvg) - ("qttools" ,qttools) - ("qtx11extras" ,qtx11extras))) + `(#:tests? #f)) ; no tests (native-inputs - `(("lxqt-build-tools" ,lxqt-build-tools))) - (home-page "https://lxqt.org/") - (synopsis "Core utility library for all LXQt components") - (description "liblxqt provides the basic libraries shared by the -components of the LXQt desktop environment.") + `(("pkg-config" ,pkg-config) + ("glib" ,glib))) + (inputs + `(("qtbase" ,qtbase))) + (synopsis "LXQt Build tools") + (description + "Lxqt-build-tools is providing several tools needed to build LXQt +itself as well as other components maintained by the LXQt project.") + (home-page "https://lxqt.org") (license lgpl2.1+))) (define-public lxqt-session @@ -158,29 +184,3 @@ components of the LXQt desktop environment.") (description "lxqt-session provides the standard session manager for the LXQt desktop environment.") (license lgpl2.1+))) - -(define-public lxqt-build-tools - (package - (name "lxqt-build-tools") - (version "0.5.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/lxqt/" name "/releases/download/" - version "/" name "-" version ".tar.xz")) - (sha256 - (base32 "13b5x26p6ycnwzlgg1cgvlc88wjrjmlb3snrrmzh0xgh9h6hhvd6")))) - (build-system cmake-build-system) - (arguments - `(#:tests? #f)) ; no tests - (native-inputs - `(("pkg-config" ,pkg-config) - ("glib" ,glib))) - (inputs - `(("qtbase" ,qtbase))) - (synopsis "LXQt Build tools") - (description - "Lxqt-build-tools is providing several tools needed to build LXQt -itself as well as other components maintained by the LXQt project.") - (home-page "https://lxqt.org") - (license lgpl2.1+))) -- cgit v1.2.3 From 64fac507dd27c2bd68d4d0e6c4716a0370b6f2cb Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Thu, 18 Oct 2018 10:40:26 +0800 Subject: gnu: Add libdbusmenu-qt. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm (libdbusmenu-qt): New variable. Signed-off-by: 宋文武 --- gnu/packages/lxqt.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index dda4dd8b0f..b1f81bdd51 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -29,6 +29,7 @@ #:use-module (guix utils) #:use-module (guix build-system cmake) #:use-module (gnu packages) + #:use-module (gnu packages documentation) #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) #:use-module (gnu packages kde-frameworks) @@ -38,6 +39,35 @@ #:use-module (gnu packages qt) #:use-module (gnu packages xorg)) +(define-public libdbusmenu-qt + (package + (name "libdbusmenu-qt") + (version "0.9.3+16.04.20160218-0ubuntu1") + (source + (origin + (method url-fetch) + ;; Download from github rather than launchpad beacuse launchpad trunk + ;; tarball hash is not deterministic. + (uri (string-append "https://github.com/unity8-team/" name + "/archive/" version ".tar.gz")) + (sha256 + (base32 "0abwyggnpg50sa9cxphscp5zdkv9nxqnlav55vj21df6q1h3jb5w")) + (file-name (string-append name "-" version ".tar.gz")))) + (build-system cmake-build-system) + (arguments + ;; XXX: Tests require a dbus session and some icons. + '(#:tests? #f)) + (native-inputs + `(("doxygen" ,doxygen))) + (inputs + `(("qtbase" ,qtbase))) + (home-page "https://launchpad.net/libdbusmenu-qt") + (synopsis "Qt implementation of the DBusMenu spec") + (description "This library provides a Qt implementation of the DBusMenu +protocol. The DBusMenu protocol makes it possible for applications to export +and import their menus over DBus.") + (license lgpl2.1+))) + (define-public liblxqt (package (name "liblxqt") -- cgit v1.2.3 From bf076d8ba6acf658a0d290ff02541decc4e729c5 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Thu, 18 Oct 2018 10:41:43 +0800 Subject: gnu: Add libstatgrab. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm (libstatgrab): New variable. Signed-off-by: 宋文武 --- gnu/packages/lxqt.scm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index b1f81bdd51..b45d21c87b 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -24,16 +24,18 @@ (define-module (gnu packages lxqt) #:use-module (guix download) - #:use-module ((guix licenses) #:select (lgpl2.1+)) + #:use-module ((guix licenses)) #:use-module (guix packages) #:use-module (guix utils) #:use-module (guix build-system cmake) + #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages documentation) #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages linux) + #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages polkit) #:use-module (gnu packages qt) @@ -145,6 +147,30 @@ components of the LXQt desktop environment.") in Qt.") (license lgpl2.1+))) +(define-public libstatgrab + (package + (name "libstatgrab") + (version "0.91") + (source + (origin + (method url-fetch) + (uri (string-append "https://ftp.i-scream.org/pub/i-scream/libstatgrab/" + name "-" version ".tar.gz")) + (sha256 + (base32 "1azinx2yzs442ycwq6p15skl3mscmqj7fd5hq7fckhjp92735s83")))) + (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--enable-tests"))) + (native-inputs + ;; For testing. + `(("perl" ,perl))) + (home-page "https://www.i-scream.org/libstatgrab/") + (synopsis "Provides access to statistics about the system") + (description "libstatgrab is a library that provides cross platform access +to statistics about the system on which it's run.") + ;; Libraries are under LGPL2.1+, and programs under GPLv2+. + (license gpl2+))) + (define-public lxqt-build-tools (package (name "lxqt-build-tools") -- cgit v1.2.3 From 22ce8b56f25b90b40ded1d29ea488d2f1336f24c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 23 Oct 2018 01:32:47 +0200 Subject: gnu: ganv: Use python2 for building. * gnu/packages/gtk.scm (ganv)[arguments]: Set #:python. --- gnu/packages/gtk.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') 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) -- cgit v1.2.3 From 78da6977c738824d730803cb918137d5fe6cbbce Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 23 Oct 2018 01:35:34 +0200 Subject: gnu: suil: Use python2 for building. * gnu/packages/audio.scm (suil)[arguments]: Set #:python. --- gnu/packages/audio.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') 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 -- cgit v1.2.3 From 5176795d22860c18015e36b7a9d3b8729b6729f1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Jul 2018 13:56:42 +0200 Subject: 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(+) (limited to 'gnu') 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") -- cgit v1.2.3 From 0c8e255549760e83c4acf08747047449ec952113 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 23 Oct 2018 16:56:57 +0200 Subject: 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(-) (limited to 'gnu') 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)))) -- cgit v1.2.3 From d89872f95567c4f263f3cf97aa0474dfff1973bc Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 23 Oct 2018 20:36:58 +0200 Subject: gnu: sbcl-parse-float: Remove comment about license. * gnu/packages/lisp.scm (sbcl-parse-float): The license really is public domain. --- gnu/packages/lisp.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 89ccdb720a..7964aa307e 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -2663,7 +2663,6 @@ pattern-matching-like, but a char-by-char procedural parser.") "This package exports the following function to parse floating-point values from a string in Common Lisp.") (home-page "https://github.com/soemraws/parse-float") - ;; TODO: Missing license? (license license:public-domain)))) (define-public cl-parse-float -- cgit v1.2.3 From b55697fbb430ae9a973eeae91f09213d1e603a9e Mon Sep 17 00:00:00 2001 From: Laura Lazzati Date: Tue, 23 Oct 2018 01:59:22 -0300 Subject: gnu: Add r-aspi. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cran.scm (r-aspi): New variable. Signed-off-by: Gábor Boskovits --- gnu/packages/cran.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index efcc2dccb5..73680a7453 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2018 Charlie Ritter ;;; Copyright © 2018 Konrad Hinsen ;;; Copyright © 2018 Mădălin Ionel Patrașcu +;;; Copyright © 2018 Laura Lazzati ;;; ;;; This file is part of GNU Guix. ;;; @@ -6256,3 +6257,23 @@ a header row or not. The dataset should contain only one independent variable (x) and one dependent variable (y) and can contain a weight for each observation.") (license license:gpl2))) + +(define-public r-aspi + (package + (name "r-aspi") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "aspi" version)) + (sha256 + (base32 "0rhvxw243vvdv3hxa6pi343gcjc2cbxq1jzqirl9k1l4i3897l87")))) + (build-system r-build-system) + (home-page + "https://cran.r-project.org/web/packages/aspi/") + (synopsis + "Analysis of symmetry of parasitic infections") + (description + "This package provides tools for the analysis and visualization of bilateral + asymmetry in parasitic infections.") + (license license:gpl3+))) -- cgit v1.2.3 From 12995856e2fe31dfbc5cf97aa0d2c6c128aa7c81 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 22 Oct 2018 13:00:55 -0400 Subject: gnu: libssh: Fetch the source code more efficiently. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ssh.scm (libssh)[source]: Use the git:// protocol. Signed-off-by: Ludovic Courtès --- gnu/packages/ssh.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index e806fc80f2..b93cb03a14 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -71,8 +71,14 @@ (source (origin (method git-fetch) (uri (git-reference - (url "https://git.libssh.org/projects/libssh.git") - (commit (string-append "libssh-" version)))) + ;; git.libssh.org does not support the fast "smart" HTTP + ;; Git protocol. The "dumb" HTTP Git protocol is extremely + ;; slow, and does not support shallow clones, so we use the + ;; plain Git protocol despite its flaws. This offers an + ;; incredible speedup and reduces the size of the the + ;; source by more than half. + (url "git://git.libssh.org/projects/libssh.git") + (commit (string-append "libssh-" version)))) (patches (search-patches "libssh-hostname-parser-bug.patch")) (sha256 (base32 -- cgit v1.2.3 From b4237a6ec0e4e0cd10656a870eb921a3ba14f46f Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Tue, 23 Oct 2018 14:42:47 -0500 Subject: gnu: emacs-nov-el: Update to 0.2.6. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs.scm (emacs-nov-el): Update to 0.2.6. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index ce98dbaeb8..45e92ee47b 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -8200,7 +8200,7 @@ the format.") (define-public emacs-nov-el (package (name "emacs-nov-el") - (version "0.2.2") + (version "0.2.6") (source (origin (method git-fetch) (uri (git-reference @@ -8209,7 +8209,7 @@ the format.") (file-name (git-file-name name version)) (sha256 (base32 - "03s0qjvwk1f7y3i4wh2p5y3z4hdv00adgz8za3vphzc0q8i1kjzb")))) + "188h5gzn1zf443g0b7q5bpmvvpr6ds5h8aci8vxc92py56rhyrvc")))) (build-system emacs-build-system) (arguments `(#:phases -- cgit v1.2.3 From d78587edca215c5ddab00fa834cadc577fe714b6 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 23 Oct 2018 16:49:45 -0400 Subject: gnu: icecat: Add fixes from mozilla-esr60 [security fixes]. Includes fixes for CVE-2018-12389, CVE-2018-12390, CVE-2018-12391, CVE-2018-12392, CVE-2018-12393, CVE-2018-12395, CVE-2018-12396, and CVE-2018-12397. * gnu/packages/gnuzilla.scm (icecat)[source]: Add selected changesets from the upstream mozilla-esr60 repository. Relabel some previously existing patches to reflect CVE assignments. --- gnu/packages/gnuzilla.scm | 48 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 39281b59e5..1dd0e930d3 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -510,15 +510,55 @@ security standards.") (mozilla-patch "icecat-bug-1478685.patch" "098585dc86fc" "1b0x4qdh6isvffmibvc8ad8z62m3iky9q6jq0z6gyvn8q252cqal") (mozilla-patch "icecat-bug-1486080.patch" "3f8d57d936ea" "0pz2c18wcgj44v0j8my9xbm90m4bsjcvzmavj569fi8bh6s6zz8p") (mozilla-patch "icecat-bug-1423278.patch" "878ceaee5634" "0i47s5nvrx9vqbnj6s9y9f4ffww20p8nviqa6frg676y1188xlyl") - (mozilla-patch "icecat-bug-1442010.patch" "87be1b98ec9a" "15f4l18c7hz9aqn89gg3dwmdidfwgn10dywgpzydm8mps45amx7j") + (mozilla-patch "icecat-CVE-2018-12390-pt01.patch" "87be1b98ec9a" "15f4l18c7hz9aqn89gg3dwmdidfwgn10dywgpzydm8mps45amx7j") (mozilla-patch "icecat-bug-1484559.patch" "99e58b5307ce" "02fdgbliwzi2r2376wg6k1rky1isfka0smac4ii2cll01jhpfrn6") - (mozilla-patch "icecat-bug-1487098.patch" "f25ce451a492" "18nzg39iyxza1686180qk9cc88l5j2hf1h35d62lrqmdgd9vcj33") - (mozilla-patch "icecat-bug-1484905.patch" "35c26bc231df" "0qh8d4z6y03h5xh7djci26a01l6zq667lg2k11f6zzg7z2j0h67x") + (mozilla-patch "icecat-CVE-2018-12390-pt02.patch" "f25ce451a492" "18nzg39iyxza1686180qk9cc88l5j2hf1h35d62lrqmdgd9vcj33") + (mozilla-patch "icecat-CVE-2018-12390-pt03.patch" "35c26bc231df" "0qh8d4z6y03h5xh7djci26a01l6zq667lg2k11f6zzg7z2j0h67x") (mozilla-patch "icecat-bug-1488061.patch" "050d0cfa8e3d" "05ql798ynbyz5pvyri4b95j4ixmgnny3zl7sd2ckfrrbm9mxh627") (mozilla-patch "icecat-bug-1434963-pt1.patch" "1e6dad87efed" "1v00a6cmgswjk54041jyv1ib129fxshpzwk6mn6lr0v5hylk3bx9") (mozilla-patch "icecat-bug-1434963-pt2.patch" "6558c46df9ea" "0vdy9dm9w5k1flhcfxwvvff0aa415b5mgmmq5r37i83686768xfb") (mozilla-patch "icecat-bug-1434963-pt3.patch" "686fcfa8abd6" "0ihqr11aq4b0y7mx7bwn8yzn25mv3k2gdphm951mj1g85qg35ann") - (mozilla-patch "icecat-bug-1491132.patch" "14120e0c74d6" "188c5fbhqqhmlk88p70l6d97skh7xy4jhqdby1ri3h9ix967515j"))) + (mozilla-patch "icecat-bug-1491132.patch" "14120e0c74d6" "188c5fbhqqhmlk88p70l6d97skh7xy4jhqdby1ri3h9ix967515j") + (mozilla-patch "icecat-bug-1492065.patch" "ec4b5969c6ae" "18gfwn15kh0826vlg6lhrx3q4gv82i7v1k3y5jp72mvrjq154gy0") + (mozilla-patch "icecat-bug-1492064.patch" "528cabdd9665" "0rdwpkfma24hn8namfb9saw4rgi9yyyj4af5h2ijrvadw6r8lyyn") + (mozilla-patch "icecat-bug-1489757.patch" "46f19852aaa6" "0dga7mw847klm8x6il2fyzpjxqxxgx1q5cya658f1w66kxms1f29") + (mozilla-patch "icecat-bug-1492897.patch" "c3a48066f383" "09n6sdck4jzzmznzrq0iixg5nsgrc5ibpdfsh3i7ppwad3fsy2m3") + (mozilla-patch "icecat-bug-1492915.patch" "2d280e557331" "11x2n61pw5way9cg8lbrfl3lqvgfnbmcs1fwm78i06kmfwj0msk3") + (mozilla-patch "icecat-CVE-2018-12390-pt04.patch" "b80f94262165" "1hw43h4sgf77x323745rixyp6cci3fb6d3fnp33q82m4ssdb5623") + (mozilla-patch "icecat-bug-1492484.patch" "1b3e6759cf3a" "1yn2cd2227ncg90c88ymdi5fyfs4hk335bd16vkkgljs0924yy0m") + (mozilla-patch "icecat-bug-1493590.patch" "d9fe3b2025fc" "06783hj1aqms2f9a3mp18bk8hgijk3pz70bpccn173v4w0zlbbd4") + (mozilla-patch "icecat-CVE-2018-12390-pt05.patch" "20c59797e994" "1vxnhpirjsj040hrq9xmq2xhkpq4l5mnnzqy0nda92dfh47zvidj") + (mozilla-patch "icecat-CVE-2018-12390-pt06.patch" "1749661dfd28" "0g0sj2fgp3asj0yvxksnhrc59yxncn35bz5nzlvkpgdf7h06gscd") + (mozilla-patch "icecat-CVE-2018-12390-pt07.patch" "a511a9242406" "1hhfrvdmkccnhs4skbi06174x37rmvf4ic86xawyyzr67yga73b2") + (mozilla-patch "icecat-bug-1495404.patch" "3232bb3b622f" "1pnaxf8r9h0wldjc4qgl7z3rk34fpz9h1vd3zmhswa6mvyln5jhg") + (mozilla-patch "icecat-bug-1465388.patch" "a9577451dcc2" "0v29s0v3vv9vblkcachhh46qvwjcrmv2bkcdb7sj2asc503l0lqv") + (mozilla-patch "icecat-CVE-2018-12390-pt08.patch" "e965f6f6ed75" "0hh091854xj5j0x1r8pg46xmn00fqi5n212xhzbdpgyf96rsf513") + (mozilla-patch "icecat-bug-1445528.patch" "8a503e022a29" "1y2ll3h0yz8sfdddjmk90qjfxcr1ffhw7a9ww3yw26gyhnbpg404") + (mozilla-patch "icecat-bug-1409570.patch" "8d326641d1c0" "0w29s6dixi7b7q3nicshrp29n9sj5awssdln00yx664m8a8a8ihs") + (mozilla-patch "icecat-bug-1496094.patch" "6cdd6d88eca9" "1ssqa4fy2xpbr63ph3av3hkpl92g4yszx402fq9d2xn9482q43dp") + (mozilla-patch "icecat-CVE-2018-12391.patch" "0fa07c704ca4" "055xdyb3g2l4rj188235i579qnr50v19q36jjpliws9nik129iqy") + (mozilla-patch "icecat-bug-1462162.patch" "739e898cb7c8" "17m9y0pskmqx15dkgkw4k93njph14mpsf37wb1azwkq3xx7s0fhx") + (mozilla-patch "icecat-bug-1492764.patch" "16310ab35452" "1kq5r3w9i4n6q9msmw2qsqa0jd4qw1mjlyyz8aq14fwlbkhvv199") + (mozilla-patch "icecat-CVE-2018-12390-pt09.patch" "9b669d047d55" "063ig49gx9468nvc9w8259j819qfdjvq0sbbz8n4kj5r6hcxjc5l") + (mozilla-patch "icecat-CVE-2018-12390-pt10.patch" "9d51e65c797a" "0m23cq9zl22w80dvx5rlgpbam1l3d6v56h7g9wzamzl21bwxq9fv") + (mozilla-patch "icecat-CVE-2018-12390-pt11.patch" "efc0596dd381" "1alvbb6wvawxxh6isisk9c40vhdiv59fy0af0n10yn1dgy8ffv5i") + (mozilla-patch "icecat-CVE-2018-12393.patch" "c4fb48bb5d28" "09izww9dsg9n8cish8f3y7phxibsnd12bfkcxd7rzcdhg10nr4pl") + (mozilla-patch "icecat-CVE-2018-12390-pt12.patch" "b3359becd7b1" "188byxmbgrvrid2fcz34w5xdvaw571frxx1c6nqaa9k03iljdzjr") + (mozilla-patch "icecat-CVE-2018-12390-pt13.patch" "791c8ecf252d" "02h37594aba0pklxm3g7w1wv8vz9xmcf30fd0az8pfaccsklmx74") + (mozilla-patch "icecat-bug-1494328.patch" "333276fac37c" "0qyq42jl0al63m6pwj9gva7nj82l76szzbj7sklsygx0a9mqs13z") + (mozilla-patch "icecat-CVE-2018-12397.patch" "cb73374a0e4e" "0x2s1nwgwdag9df5hkwzvjj0qznp5c3d6w6y63rn2y287jn9m3vl") + (mozilla-patch "icecat-CVE-2018-12392.patch" "f6bb138ad0ab" "0f0z9dsyw2a11p4p31mdyic571153jpfgy2q04i4v6dmmcz76pm3") + (mozilla-patch "icecat-CVE-2018-12396.patch" "f27145bd5502" "0vznmlm1fbl3ynax2zpi6xxzr9qp9b83afr3mv90jgrhlgpzdbcz") + (mozilla-patch "icecat-CVE-2018-12395-pt1.patch" "133a99a8f3ca" "0im7m4jmc273mg9kih0i70hxsgzy04j6ydm9zmaz2933hkhdf4iw") + (mozilla-patch "icecat-CVE-2018-12395-pt2.patch" "82176a4a9b14" "0g3yqx4854d4mx5a0ghb7p7saj6y5d5bm2lfhabvkwybcd477zmc") + (mozilla-patch "icecat-bug-1474265.patch" "e8abd9a8ce6e" "1q2sv5h081rvnhsx6g1y8a43hwv6hsg0cr6zdcij58mkgzf6hyvd") + (mozilla-patch "icecat-bug-1492737-pt1.patch" "eeb9060379dc" "1d2mf0x4rni7anvi0sgra4dg87fmc6g7zhizzl9jv2x8va27ycbp") + (mozilla-patch "icecat-bug-1492737-pt2.patch" "99eae0d15092" "0f9j6cvhrbrrxa95p4pkcn285r9wmi9yj13nwj5x0gkglwx6idbk") + (mozilla-patch "icecat-CVE-2018-12389-pt1.patch" "23b23e12c548" "0nsdycggki5rhh59yvmh41nf1ahjmgii89fx38jryprhspy3wg62") + (mozilla-patch "icecat-CVE-2018-12390-pt14.patch" "023133ff02ec" "1g22qxnmgiy8bgrn2nv6har6vpz4p2h5pdas8ib1yyz7p2ic8652") + (mozilla-patch "icecat-CVE-2018-12390-pt15.patch" "9461988ff462" "0yq2cr5grqskr0kz4nxcwmnywy9g0xyv6k6q44i490jcj8x2y1vw") + (mozilla-patch "icecat-CVE-2018-12390-pt16.patch" "09939be135d8" "1546xlk368v4hnjd3hf4w868i6m8r4wfd34qxz4wg1cdpr4m5mik") + (mozilla-patch "icecat-CVE-2018-12389-pt2.patch" "ea9412b18ca8" "0fmdncrylbmjh0bcb6dmw1rq7zww8a0v9v9p1pxqfz0vbc6v9l5d"))) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 0ba0ab814ad12af964d0b7f6e8ef3c50e5815264 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 23 Oct 2018 20:42:17 +0200 Subject: gnu: Add wavemon. * gnu/packages/hardware.scm (wavemon): New public variable. --- gnu/packages/hardware.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 52bc3d0527..0a2a7dbb7b 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -22,11 +22,13 @@ #:use-module (gnu packages glib) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) + #:use-module (gnu packages ncurses) #:use-module (gnu packages pkg-config) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg) #:use-module (guix build-system gnu) #:use-module (guix download) + #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages)) @@ -232,3 +234,45 @@ such as the Turbo Boost ratio and Thermal Design Power (@dfn{TDP}) limits. MSR addresses differ (greatly) between processors, and any such modification can be dangerous and may void your CPU or system board's warranty.") (license license:gpl2))) ; cpuid.c is gpl2, {rd,wr}msr.c are gpl2+ + +(define-public wavemon + (package + (name "wavemon") + (version "0.8.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/uoaerg/wavemon.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0rqpp7rhl9rlwnihsapaiy62v33h45fm3d0ia2nhdjw7fwkwcqvs")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags + (list "CC=gcc" + ;; Makefile.in (ab)uses $(datadir) as $(docdir). Set it to Guix's + ;; standard --docdir since it's only used as such. + (string-append "datadir=" (assoc-ref %outputs "out") + "/share/doc/" ,name "-" ,version)) + #:tests? #f)) ; no tests + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("libcap" ,libcap) + ("libnl" ,libnl) + ("ncurses" ,ncurses))) + (home-page "https://github.com/uoaerg/wavemon") + (synopsis "Wireless network device monitor") + (description + "Wavemon is a wireless device monitor with an interactive ncurses terminal +interface. It can display and plot signal and noise levels in real time. It +also reports packet statistics, device configuration, network parameters, and +access points and other wireless clients of your wireless network hardware. + +Wavemon should work (with varying levels of detail and features) with any device +supported by the Linux kernel.") + ;; Source file headers still say GPL2+, but the authorial intent + ;; (from COPYING and the F9 'about' screen) is clearly GPL3+. + (license license:gpl3+))) -- cgit v1.2.3 From 50f5aa4b9e18345b3aa19e73014acad47a921137 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 24 Oct 2018 01:40:40 +0200 Subject: gnu: xmlsec: Update to 1.2.27. * gnu/packages/xml.scm (xmlsec): Update to 1.2.27. [source]: Don't rely on NAME. --- gnu/packages/xml.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 489541b4f5..1173dc47bb 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -920,16 +920,16 @@ XSL-T processor. It also performs any necessary post-processing.") (define-public xmlsec (package (name "xmlsec") - (version "1.2.26") + (version "1.2.27") (source (origin - (method url-fetch) - (uri (string-append "https://www.aleksey.com/xmlsec/download/" - name "1-" version ".tar.gz")) - (sha256 - (base32 - "0l1dk344rn3j2vnj13daz72xd8j1msvzhg82n2il5ji0qz4pd0ld")))) + (method url-fetch) + (uri (string-append "https://www.aleksey.com/xmlsec/download/" + "xmlsec1-" version ".tar.gz")) + (sha256 + (base32 + "1dlf263mvxj9n4lnhhjawc2hv45agrwjf8kxk7k8h9g9v2x5dmwp")))) (build-system gnu-build-system) - (propagated-inputs ; according to xmlsec1.pc + (propagated-inputs ; according to xmlsec1.pc `(("libxml2" ,libxml2) ("libxslt" ,libxslt))) (inputs -- cgit v1.2.3 From 94617bddb01b9e295f82a59550ee983341d59288 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 23 Oct 2018 16:30:49 +0200 Subject: gnu: libbytesize: Update to 1.4. * gnu/packages/c.scm (libbytesize): Update to 1.4. [source]: Parametrise. --- gnu/packages/c.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index e6df1d23c7..83268e871c 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -178,15 +178,15 @@ compiler while still keeping it small, simple, fast and understandable.") (define-public libbytesize (package (name "libbytesize") - (version "1.3") + (version "1.4") (source (origin (method url-fetch) (uri (string-append - "https://github.com/storaged-project/libbytesize/releases/download/1.3/libbytesize-" - version ".tar.gz")) + "https://github.com/storaged-project/libbytesize/releases/" + "download/" version "/libbytesize-" version ".tar.gz")) (sha256 (base32 - "1l7mxm2vq2h6137fyfa46v9r4lydp9dvmsixkd64xr3ylqk1g6fi")))) + "0bbqzln1nhjxl71aydq9k4jg3hvki9lqsb4w10s1i27jgibxqkdv")))) (build-system gnu-build-system) (native-inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From d9bcdfce29b07235772657d58399e16be1022ee5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 24 Oct 2018 01:42:37 +0200 Subject: gnu: mongodb: Use INVOKE. * gnu/packages/databases.scm (mongodb)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/databases.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 7b483a207d..6ebbc281fd 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -503,10 +503,9 @@ applications.") #t)) (replace 'build (lambda _ - (zero? (apply system* - `("scons" + (apply invoke `("scons" ,@common-options - "mongod" "mongo" "mongos"))))) + "mongod" "mongo" "mongos")))) (replace 'check (lambda* (#:key tests? inputs #:allow-other-keys) (setenv "TZDIR" -- cgit v1.2.3 From ce7ceef37f4164fe83170061c6d8111bafd82c2b Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 23 Oct 2018 18:37:02 -0400 Subject: gnu: linux-libre: Update to 4.19. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.19. (%linux-libre-hash): Update hash. (%linux-libre-4.18-patches): Rename to ... (%linux-libre-4.19-patches): ... this, and remove a patch that is no longer needed. (linux-libre, linux-libre-arm-generic, linux-libre-arm-omap2plus): Use %linux-libre-4.19-patches instead of %linux-libre-4.18-patches. * gnu/packages/aux-files/linux-libre/4.18-arm.conf, gnu/packages/aux-files/linux-libre/4.18-arm64.conf, gnu/packages/aux-files/linux-libre/4.18-i686.conf, gnu/packages/aux-files/linux-libre/4.18-x86_64.conf: Remove files. * gnu/packages/aux-files/linux-libre/4.19-arm.conf, gnu/packages/aux-files/linux-libre/4.19-arm64.conf, gnu/packages/aux-files/linux-libre/4.19-i686.conf, gnu/packages/aux-files/linux-libre/4.19-x86_64.conf: New files. * Makefile.am (AUX_FILES): Adjust accordingly. --- gnu/packages/aux-files/linux-libre/4.18-arm.conf | 8482 ----------------- gnu/packages/aux-files/linux-libre/4.18-arm64.conf | 8169 ----------------- gnu/packages/aux-files/linux-libre/4.18-i686.conf | 9583 ------------------- .../aux-files/linux-libre/4.18-x86_64.conf | 9485 ------------------- gnu/packages/aux-files/linux-libre/4.19-arm.conf | 8569 +++++++++++++++++ gnu/packages/aux-files/linux-libre/4.19-arm64.conf | 8303 +++++++++++++++++ gnu/packages/aux-files/linux-libre/4.19-i686.conf | 9689 ++++++++++++++++++++ .../aux-files/linux-libre/4.19-x86_64.conf | 9591 +++++++++++++++++++ gnu/packages/linux.scm | 22 +- 9 files changed, 36159 insertions(+), 35734 deletions(-) delete mode 100644 gnu/packages/aux-files/linux-libre/4.18-arm.conf delete mode 100644 gnu/packages/aux-files/linux-libre/4.18-arm64.conf delete mode 100644 gnu/packages/aux-files/linux-libre/4.18-i686.conf delete mode 100644 gnu/packages/aux-files/linux-libre/4.18-x86_64.conf create mode 100644 gnu/packages/aux-files/linux-libre/4.19-arm.conf create mode 100644 gnu/packages/aux-files/linux-libre/4.19-arm64.conf create mode 100644 gnu/packages/aux-files/linux-libre/4.19-i686.conf create mode 100644 gnu/packages/aux-files/linux-libre/4.19-x86_64.conf (limited to 'gnu') diff --git a/gnu/packages/aux-files/linux-libre/4.18-arm.conf b/gnu/packages/aux-files/linux-libre/4.18-arm.conf deleted file mode 100644 index 46be71cded..0000000000 --- a/gnu/packages/aux-files/linux-libre/4.18-arm.conf +++ /dev/null @@ -1,8482 +0,0 @@ -# -# Automatically generated file; DO NOT EDIT. -# Linux/arm 4.18.0-gnu Kernel Configuration -# -CONFIG_ARM=y -CONFIG_ARM_HAS_SG_CHAIN=y -CONFIG_ARM_DMA_USE_IOMMU=y -CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8 -CONFIG_MIGHT_HAVE_PCI=y -CONFIG_SYS_SUPPORTS_APM_EMULATION=y -CONFIG_HAVE_PROC_CPU=y -CONFIG_NO_IOPORT_MAP=y -CONFIG_STACKTRACE_SUPPORT=y -CONFIG_LOCKDEP_SUPPORT=y -CONFIG_TRACE_IRQFLAGS_SUPPORT=y -CONFIG_RWSEM_XCHGADD_ALGORITHM=y -CONFIG_ARCH_HAS_BANDGAP=y -CONFIG_FIX_EARLYCON_MEM=y -CONFIG_GENERIC_HWEIGHT=y -CONFIG_GENERIC_CALIBRATE_DELAY=y -CONFIG_ARCH_SUPPORTS_UPROBES=y -CONFIG_FIQ=y -CONFIG_ARM_PATCH_PHYS_VIRT=y -CONFIG_GENERIC_BUG=y -CONFIG_PGTABLE_LEVELS=2 -CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=70300 -CONFIG_CLANG_VERSION=0 -CONFIG_IRQ_WORK=y -CONFIG_BUILDTIME_EXTABLE_SORT=y - -# -# General setup -# -CONFIG_INIT_ENV_ARG_LIMIT=32 -# CONFIG_COMPILE_TEST is not set -CONFIG_LOCALVERSION="" -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_HAVE_KERNEL_GZIP=y -CONFIG_HAVE_KERNEL_LZMA=y -CONFIG_HAVE_KERNEL_XZ=y -CONFIG_HAVE_KERNEL_LZO=y -CONFIG_HAVE_KERNEL_LZ4=y -# CONFIG_KERNEL_GZIP is not set -# CONFIG_KERNEL_LZMA is not set -CONFIG_KERNEL_XZ=y -# CONFIG_KERNEL_LZO is not set -# CONFIG_KERNEL_LZ4 is not set -CONFIG_DEFAULT_HOSTNAME="(none)" -CONFIG_SWAP=y -CONFIG_SYSVIPC=y -CONFIG_SYSVIPC_SYSCTL=y -CONFIG_POSIX_MQUEUE=y -CONFIG_POSIX_MQUEUE_SYSCTL=y -CONFIG_CROSS_MEMORY_ATTACH=y -# CONFIG_USELIB is not set -CONFIG_AUDIT=y -CONFIG_HAVE_ARCH_AUDITSYSCALL=y -CONFIG_AUDITSYSCALL=y -CONFIG_AUDIT_WATCH=y -CONFIG_AUDIT_TREE=y - -# -# IRQ subsystem -# -CONFIG_GENERIC_IRQ_PROBE=y -CONFIG_GENERIC_IRQ_SHOW=y -CONFIG_GENERIC_IRQ_SHOW_LEVEL=y -CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y -CONFIG_HARDIRQS_SW_RESEND=y -CONFIG_GENERIC_IRQ_CHIP=y -CONFIG_IRQ_DOMAIN=y -CONFIG_IRQ_DOMAIN_HIERARCHY=y -CONFIG_GENERIC_MSI_IRQ=y -CONFIG_GENERIC_MSI_IRQ_DOMAIN=y -CONFIG_HANDLE_DOMAIN_IRQ=y -CONFIG_IRQ_FORCED_THREADING=y -CONFIG_SPARSE_IRQ=y -# CONFIG_GENERIC_IRQ_DEBUGFS is not set -CONFIG_ARCH_CLOCKSOURCE_DATA=y -CONFIG_GENERIC_TIME_VSYSCALL=y -CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_ARCH_HAS_TICK_BROADCAST=y -CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y - -# -# Timers subsystem -# -CONFIG_TICK_ONESHOT=y -CONFIG_NO_HZ_COMMON=y -# CONFIG_HZ_PERIODIC is not set -CONFIG_NO_HZ_IDLE=y -# CONFIG_NO_HZ_FULL is not set -# CONFIG_NO_HZ is not set -CONFIG_HIGH_RES_TIMERS=y - -# -# CPU/Task time and stats accounting -# -CONFIG_TICK_CPU_ACCOUNTING=y -# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set -# CONFIG_IRQ_TIME_ACCOUNTING is not set -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_BSD_PROCESS_ACCT_V3=y -CONFIG_TASKSTATS=y -CONFIG_TASK_DELAY_ACCT=y -CONFIG_TASK_XACCT=y -CONFIG_TASK_IO_ACCOUNTING=y -CONFIG_CPU_ISOLATION=y - -# -# RCU Subsystem -# -CONFIG_TREE_RCU=y -# CONFIG_RCU_EXPERT is not set -CONFIG_SRCU=y -CONFIG_TREE_SRCU=y -CONFIG_RCU_STALL_COMMON=y -CONFIG_RCU_NEED_SEGCBLIST=y -CONFIG_BUILD_BIN2C=y -# CONFIG_IKCONFIG is not set -CONFIG_LOG_BUF_SHIFT=17 -CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 -CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13 -CONFIG_GENERIC_SCHED_CLOCK=y -CONFIG_CGROUPS=y -CONFIG_PAGE_COUNTER=y -CONFIG_MEMCG=y -CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_SWAP_ENABLED is not set -CONFIG_BLK_CGROUP=y -# CONFIG_DEBUG_BLK_CGROUP is not set -CONFIG_CGROUP_WRITEBACK=y -CONFIG_CGROUP_SCHED=y -CONFIG_FAIR_GROUP_SCHED=y -CONFIG_CFS_BANDWIDTH=y -# CONFIG_RT_GROUP_SCHED is not set -CONFIG_CGROUP_PIDS=y -# CONFIG_CGROUP_RDMA is not set -CONFIG_CGROUP_FREEZER=y -CONFIG_CPUSETS=y -CONFIG_PROC_PID_CPUSET=y -CONFIG_CGROUP_DEVICE=y -CONFIG_CGROUP_CPUACCT=y -CONFIG_CGROUP_PERF=y -# CONFIG_CGROUP_BPF is not set -# CONFIG_CGROUP_DEBUG is not set -CONFIG_SOCK_CGROUP_DATA=y -CONFIG_NAMESPACES=y -CONFIG_UTS_NS=y -CONFIG_IPC_NS=y -CONFIG_USER_NS=y -CONFIG_PID_NS=y -CONFIG_NET_NS=y -CONFIG_SCHED_AUTOGROUP=y -# CONFIG_SYSFS_DEPRECATED is not set -CONFIG_RELAY=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="" -CONFIG_RD_GZIP=y -CONFIG_RD_BZIP2=y -CONFIG_RD_LZMA=y -CONFIG_RD_XZ=y -CONFIG_RD_LZO=y -CONFIG_RD_LZ4=y -CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_SYSCTL=y -CONFIG_ANON_INODES=y -CONFIG_HAVE_UID16=y -CONFIG_BPF=y -CONFIG_EXPERT=y -CONFIG_UID16=y -CONFIG_MULTIUSER=y -# CONFIG_SGETMASK_SYSCALL is not set -# CONFIG_SYSFS_SYSCALL is not set -# CONFIG_SYSCTL_SYSCALL is not set -CONFIG_FHANDLE=y -CONFIG_POSIX_TIMERS=y -CONFIG_PRINTK=y -CONFIG_PRINTK_NMI=y -CONFIG_BUG=y -CONFIG_ELF_CORE=y -CONFIG_BASE_FULL=y -CONFIG_FUTEX=y -CONFIG_FUTEX_PI=y -CONFIG_EPOLL=y -CONFIG_SIGNALFD=y -CONFIG_TIMERFD=y -CONFIG_EVENTFD=y -CONFIG_SHMEM=y -CONFIG_AIO=y -CONFIG_ADVISE_SYSCALLS=y -CONFIG_MEMBARRIER=y -CONFIG_CHECKPOINT_RESTORE=y -CONFIG_KALLSYMS=y -# CONFIG_KALLSYMS_ALL is not set -CONFIG_KALLSYMS_BASE_RELATIVE=y -CONFIG_BPF_SYSCALL=y -# CONFIG_BPF_JIT_ALWAYS_ON is not set -CONFIG_USERFAULTFD=y -CONFIG_RSEQ=y -# CONFIG_DEBUG_RSEQ is not set -# CONFIG_EMBEDDED is not set -CONFIG_HAVE_PERF_EVENTS=y -CONFIG_PERF_USE_VMALLOC=y -# CONFIG_PC104 is not set - -# -# Kernel Performance Events And Counters -# -CONFIG_PERF_EVENTS=y -# CONFIG_DEBUG_PERF_USE_VMALLOC is not set -CONFIG_VM_EVENT_COUNTERS=y -# CONFIG_COMPAT_BRK is not set -CONFIG_SLAB=y -# CONFIG_SLUB is not set -# CONFIG_SLOB is not set -CONFIG_SLAB_MERGE_DEFAULT=y -CONFIG_SLAB_FREELIST_RANDOM=y -CONFIG_SYSTEM_DATA_VERIFICATION=y -CONFIG_PROFILING=y -CONFIG_TRACEPOINTS=y -CONFIG_CRASH_CORE=y -CONFIG_KEXEC_CORE=y -CONFIG_OPROFILE=m -CONFIG_HAVE_OPROFILE=y -CONFIG_KPROBES=y -CONFIG_JUMP_LABEL=y -# CONFIG_STATIC_KEYS_SELFTEST is not set -CONFIG_OPTPROBES=y -CONFIG_UPROBES=y -CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y -CONFIG_ARCH_USE_BUILTIN_BSWAP=y -CONFIG_KRETPROBES=y -CONFIG_HAVE_KPROBES=y -CONFIG_HAVE_KRETPROBES=y -CONFIG_HAVE_OPTPROBES=y -CONFIG_HAVE_NMI=y -CONFIG_HAVE_ARCH_TRACEHOOK=y -CONFIG_HAVE_DMA_CONTIGUOUS=y -CONFIG_GENERIC_SMP_IDLE_THREAD=y -CONFIG_GENERIC_IDLE_POLL_SETUP=y -CONFIG_ARCH_HAS_FORTIFY_SOURCE=y -CONFIG_ARCH_HAS_SET_MEMORY=y -CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y -CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y -CONFIG_HAVE_RSEQ=y -CONFIG_HAVE_CLK=y -CONFIG_HAVE_HW_BREAKPOINT=y -CONFIG_HAVE_PERF_REGS=y -CONFIG_HAVE_PERF_USER_STACK_DUMP=y -CONFIG_HAVE_ARCH_JUMP_LABEL=y -CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y -CONFIG_HAVE_ARCH_SECCOMP_FILTER=y -CONFIG_SECCOMP_FILTER=y -CONFIG_PLUGIN_HOSTCC="" -CONFIG_HAVE_GCC_PLUGINS=y -CONFIG_HAVE_STACKPROTECTOR=y -CONFIG_CC_HAS_STACKPROTECTOR_NONE=y -CONFIG_STACKPROTECTOR=y -CONFIG_STACKPROTECTOR_STRONG=y -CONFIG_HAVE_CONTEXT_TRACKING=y -CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y -CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y -CONFIG_HAVE_MOD_ARCH_SPECIFIC=y -CONFIG_MODULES_USE_ELF_REL=y -CONFIG_ARCH_HAS_ELF_RANDOMIZE=y -CONFIG_HAVE_ARCH_MMAP_RND_BITS=y -CONFIG_HAVE_EXIT_THREAD=y -CONFIG_ARCH_MMAP_RND_BITS_MIN=8 -CONFIG_ARCH_MMAP_RND_BITS_MAX=16 -CONFIG_ARCH_MMAP_RND_BITS=8 -CONFIG_CLONE_BACKWARDS=y -CONFIG_OLD_SIGSUSPEND3=y -CONFIG_OLD_SIGACTION=y -CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y -CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y -CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y -CONFIG_STRICT_KERNEL_RWX=y -CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y -CONFIG_STRICT_MODULE_RWX=y -CONFIG_ARCH_HAS_PHYS_TO_DMA=y -CONFIG_REFCOUNT_FULL=y - -# -# GCOV-based kernel profiling -# -# CONFIG_GCOV_KERNEL is not set -CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y -CONFIG_RT_MUTEXES=y -CONFIG_BASE_SMALL=0 -CONFIG_MODULES=y -CONFIG_MODULE_FORCE_LOAD=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MODVERSIONS=y -# CONFIG_MODULE_SRCVERSION_ALL is not set -# CONFIG_MODULE_SIG is not set -# CONFIG_MODULE_COMPRESS is not set -# CONFIG_TRIM_UNUSED_KSYMS is not set -CONFIG_MODULES_TREE_LOOKUP=y -CONFIG_BLOCK=y -CONFIG_LBDAF=y -CONFIG_BLK_SCSI_REQUEST=y -CONFIG_BLK_DEV_BSG=y -CONFIG_BLK_DEV_BSGLIB=y -CONFIG_BLK_DEV_INTEGRITY=y -# CONFIG_BLK_DEV_ZONED is not set -CONFIG_BLK_DEV_THROTTLING=y -# CONFIG_BLK_DEV_THROTTLING_LOW is not set -# CONFIG_BLK_CMDLINE_PARSER is not set -CONFIG_BLK_WBT=y -# CONFIG_BLK_WBT_SQ is not set -CONFIG_BLK_WBT_MQ=y -CONFIG_BLK_DEBUG_FS=y -# CONFIG_BLK_SED_OPAL is not set - -# -# Partition Types -# -CONFIG_PARTITION_ADVANCED=y -# CONFIG_ACORN_PARTITION is not set -# CONFIG_AIX_PARTITION is not set -# CONFIG_OSF_PARTITION is not set -# CONFIG_AMIGA_PARTITION is not set -# CONFIG_ATARI_PARTITION is not set -# CONFIG_MAC_PARTITION is not set -CONFIG_MSDOS_PARTITION=y -# CONFIG_BSD_DISKLABEL is not set -# CONFIG_MINIX_SUBPARTITION is not set -# CONFIG_SOLARIS_X86_PARTITION is not set -# CONFIG_UNIXWARE_DISKLABEL is not set -# CONFIG_LDM_PARTITION is not set -# CONFIG_SGI_PARTITION is not set -# CONFIG_ULTRIX_PARTITION is not set -# CONFIG_SUN_PARTITION is not set -CONFIG_KARMA_PARTITION=y -CONFIG_EFI_PARTITION=y -# CONFIG_SYSV68_PARTITION is not set -# CONFIG_CMDLINE_PARTITION is not set -CONFIG_BLK_MQ_PCI=y -CONFIG_BLK_MQ_VIRTIO=y -CONFIG_BLK_MQ_RDMA=y - -# -# IO Schedulers -# -CONFIG_IOSCHED_NOOP=y -CONFIG_IOSCHED_DEADLINE=y -CONFIG_IOSCHED_CFQ=y -CONFIG_CFQ_GROUP_IOSCHED=y -# CONFIG_DEFAULT_DEADLINE is not set -CONFIG_DEFAULT_CFQ=y -# CONFIG_DEFAULT_NOOP is not set -CONFIG_DEFAULT_IOSCHED="cfq" -CONFIG_MQ_IOSCHED_DEADLINE=y -CONFIG_MQ_IOSCHED_KYBER=m -CONFIG_IOSCHED_BFQ=m -CONFIG_BFQ_GROUP_IOSCHED=y -CONFIG_PADATA=y -CONFIG_ASN1=y -CONFIG_INLINE_SPIN_UNLOCK_IRQ=y -CONFIG_INLINE_READ_UNLOCK=y -CONFIG_INLINE_READ_UNLOCK_IRQ=y -CONFIG_INLINE_WRITE_UNLOCK=y -CONFIG_INLINE_WRITE_UNLOCK_IRQ=y -CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y -CONFIG_MUTEX_SPIN_ON_OWNER=y -CONFIG_RWSEM_SPIN_ON_OWNER=y -CONFIG_LOCK_SPIN_ON_OWNER=y -CONFIG_FREEZER=y - -# -# System Type -# -CONFIG_MMU=y -CONFIG_ARCH_MULTIPLATFORM=y -# CONFIG_ARCH_EBSA110 is not set -# CONFIG_ARCH_EP93XX is not set -# CONFIG_ARCH_FOOTBRIDGE is not set -# CONFIG_ARCH_NETX is not set -# CONFIG_ARCH_IOP13XX is not set -# CONFIG_ARCH_IOP32X is not set -# CONFIG_ARCH_IOP33X is not set -# CONFIG_ARCH_IXP4XX is not set -# CONFIG_ARCH_DOVE is not set -# CONFIG_ARCH_KS8695 is not set -# CONFIG_ARCH_W90X900 is not set -# CONFIG_ARCH_LPC32XX is not set -# CONFIG_ARCH_PXA is not set -# CONFIG_ARCH_RPC is not set -# CONFIG_ARCH_SA1100 is not set -# CONFIG_ARCH_S3C24XX is not set -# CONFIG_ARCH_DAVINCI is not set -# CONFIG_ARCH_OMAP1 is not set - -# -# Multiple platform selection -# - -# -# CPU Core family selection -# -# CONFIG_ARCH_MULTI_V6 is not set -CONFIG_ARCH_MULTI_V7=y -CONFIG_ARCH_MULTI_V6_V7=y -CONFIG_ARCH_VIRT=y -# CONFIG_ARCH_ACTIONS is not set -# CONFIG_ARCH_ALPINE is not set -# CONFIG_ARCH_ARTPEC is not set -# CONFIG_ARCH_AT91 is not set -CONFIG_ARCH_BCM=y - -# -# IPROC architected SoCs -# -# CONFIG_ARCH_BCM_CYGNUS is not set -# CONFIG_ARCH_BCM_HR2 is not set -# CONFIG_ARCH_BCM_NSP is not set -# CONFIG_ARCH_BCM_5301X is not set - -# -# KONA architected SoCs -# -# CONFIG_ARCH_BCM_281XX is not set -# CONFIG_ARCH_BCM_21664 is not set -# CONFIG_ARCH_BCM_23550 is not set - -# -# Other Architectures -# -CONFIG_ARCH_BCM2835=y -# CONFIG_ARCH_BCM_53573 is not set -# CONFIG_ARCH_BCM_63XX is not set -# CONFIG_ARCH_BRCMSTB is not set -# CONFIG_ARCH_BERLIN is not set -# CONFIG_ARCH_DIGICOLOR is not set -CONFIG_ARCH_EXYNOS=y -CONFIG_S5P_DEV_MFC=y -# CONFIG_ARCH_EXYNOS3 is not set -CONFIG_ARCH_EXYNOS4=y -CONFIG_ARCH_EXYNOS5=y - -# -# EXYNOS SoCs -# -CONFIG_CPU_EXYNOS4210=y -CONFIG_SOC_EXYNOS4412=y -CONFIG_SOC_EXYNOS5250=y -CONFIG_SOC_EXYNOS5260=y -CONFIG_SOC_EXYNOS5410=y -CONFIG_SOC_EXYNOS5420=y -CONFIG_SOC_EXYNOS5800=y -CONFIG_EXYNOS5420_MCPM=y -CONFIG_EXYNOS_CPU_SUSPEND=y -CONFIG_PLAT_SAMSUNG=y - -# -# Samsung Common options -# - -# -# Boot options -# - -# -# Power management -# -# CONFIG_SAMSUNG_PM_CHECK is not set -CONFIG_ARCH_HIGHBANK=y -# CONFIG_ARCH_HISI is not set -CONFIG_ARCH_MXC=y -CONFIG_MXC_TZIC=y -CONFIG_HAVE_IMX_ANATOP=y -CONFIG_HAVE_IMX_GPC=y -CONFIG_HAVE_IMX_MMDC=y -CONFIG_HAVE_IMX_SRC=y - -# -# Device tree only -# - -# -# Cortex-A platforms -# -CONFIG_SOC_IMX5=y -# CONFIG_SOC_IMX50 is not set -CONFIG_SOC_IMX51=y -CONFIG_SOC_IMX53=y -CONFIG_SOC_IMX6=y -CONFIG_SOC_IMX6Q=y -# CONFIG_SOC_IMX6SL is not set -# CONFIG_SOC_IMX6SLL is not set -# CONFIG_SOC_IMX6SX is not set -# CONFIG_SOC_IMX6UL is not set -# CONFIG_SOC_IMX7D is not set -# CONFIG_SOC_LS1021A is not set - -# -# Cortex-A/Cortex-M asymmetric multiprocessing platforms -# -# CONFIG_SOC_VF610 is not set -# CONFIG_ARCH_KEYSTONE is not set -# CONFIG_ARCH_MEDIATEK is not set -# CONFIG_ARCH_MESON is not set -# CONFIG_ARCH_MMP is not set -CONFIG_ARCH_MVEBU=y -CONFIG_MACH_MVEBU_ANY=y -CONFIG_MACH_MVEBU_V7=y -CONFIG_MACH_ARMADA_370=y -CONFIG_MACH_ARMADA_375=y -CONFIG_MACH_ARMADA_38X=y -CONFIG_MACH_ARMADA_39X=y -CONFIG_MACH_ARMADA_XP=y -# CONFIG_MACH_DOVE is not set -# CONFIG_ARCH_NPCM is not set -CONFIG_ARCH_OMAP=y - -# -# TI OMAP Common Features -# - -# -# OMAP Feature Selections -# -CONFIG_POWER_AVS_OMAP=y -CONFIG_POWER_AVS_OMAP_CLASS3=y -CONFIG_OMAP_RESET_CLOCKS=y -CONFIG_OMAP_32K_TIMER=y -# CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set -CONFIG_MACH_OMAP_GENERIC=y - -# -# TI OMAP/AM/DM/DRA Family -# -CONFIG_ARCH_OMAP3=y -CONFIG_ARCH_OMAP4=y -CONFIG_SOC_OMAP5=y -CONFIG_SOC_AM33XX=y -# CONFIG_SOC_AM43XX is not set -CONFIG_SOC_DRA7XX=y -CONFIG_ARCH_OMAP2PLUS=y -CONFIG_OMAP_INTERCONNECT_BARRIER=y - -# -# TI OMAP2/3/4 Specific Features -# -CONFIG_ARCH_OMAP2PLUS_TYPICAL=y -CONFIG_SOC_HAS_OMAP2_SDRC=y -CONFIG_SOC_HAS_REALTIME_COUNTER=y -CONFIG_SOC_OMAP3430=y -CONFIG_SOC_TI81XX=y -CONFIG_OMAP_PACKAGE_CBB=y - -# -# OMAP Legacy Platform Data Board Type -# -CONFIG_MACH_OMAP3517EVM=y -CONFIG_MACH_OMAP3_PANDORA=y -# CONFIG_OMAP3_SDRC_AC_TIMING is not set -# CONFIG_OMAP5_ERRATA_801819 is not set -# CONFIG_ARCH_SIRF is not set -# CONFIG_ARCH_QCOM is not set -# CONFIG_ARCH_REALVIEW is not set -CONFIG_ARCH_ROCKCHIP=y -# CONFIG_ARCH_S5PV210 is not set -# CONFIG_ARCH_RENESAS is not set -CONFIG_ARCH_SOCFPGA=y -# CONFIG_SOCFPGA_SUSPEND is not set -# CONFIG_PLAT_SPEAR is not set -# CONFIG_ARCH_STI is not set -# CONFIG_ARCH_STM32 is not set -CONFIG_ARCH_SUNXI=y -CONFIG_MACH_SUN4I=y -CONFIG_MACH_SUN5I=y -CONFIG_MACH_SUN6I=y -CONFIG_MACH_SUN7I=y -CONFIG_MACH_SUN8I=y -CONFIG_MACH_SUN9I=y -CONFIG_ARCH_SUNXI_MC_SMP=y -# CONFIG_ARCH_TANGO is not set -CONFIG_ARCH_TEGRA=y -# CONFIG_ARCH_UNIPHIER is not set -# CONFIG_ARCH_U8500 is not set -CONFIG_ARCH_VEXPRESS=y -CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y -# CONFIG_ARCH_VEXPRESS_DCSCB is not set -# CONFIG_ARCH_VEXPRESS_SPC is not set -# CONFIG_ARCH_VEXPRESS_TC2_PM is not set -CONFIG_ARCH_VT8500=y -CONFIG_ARCH_WM8850=y -# CONFIG_ARCH_ZX is not set -# CONFIG_ARCH_ZYNQ is not set -CONFIG_PLAT_ORION=y -CONFIG_PLAT_VERSATILE=y -CONFIG_ARCH_SUPPORTS_FIRMWARE=y -CONFIG_ARCH_SUPPORTS_TRUSTED_FOUNDATIONS=y - -# -# Firmware options -# -CONFIG_TRUSTED_FOUNDATIONS=y - -# -# Processor Type -# -CONFIG_CPU_PJ4B=y -CONFIG_CPU_V7=y -CONFIG_CPU_THUMB_CAPABLE=y -CONFIG_CPU_32v6K=y -CONFIG_CPU_32v7=y -CONFIG_CPU_ABRT_EV7=y -CONFIG_CPU_PABRT_V7=y -CONFIG_CPU_CACHE_V7=y -CONFIG_CPU_CACHE_VIPT=y -CONFIG_CPU_COPY_V6=y -CONFIG_CPU_TLB_V7=y -CONFIG_CPU_HAS_ASID=y -CONFIG_CPU_CP15=y -CONFIG_CPU_CP15_MMU=y - -# -# Processor Features -# -# CONFIG_ARM_LPAE is not set -CONFIG_ARM_THUMB=y -CONFIG_ARM_THUMBEE=y -CONFIG_ARM_VIRT_EXT=y -CONFIG_SWP_EMULATE=y -# CONFIG_CPU_BIG_ENDIAN is not set -# CONFIG_CPU_ICACHE_DISABLE is not set -# CONFIG_CPU_BPREDICT_DISABLE is not set -CONFIG_CPU_SPECTRE=y -CONFIG_HARDEN_BRANCH_PREDICTOR=y -CONFIG_KUSER_HELPERS=y -CONFIG_VDSO=y -CONFIG_OUTER_CACHE=y -CONFIG_OUTER_CACHE_SYNC=y -CONFIG_CACHE_FEROCEON_L2=y -# CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set -CONFIG_MIGHT_HAVE_CACHE_L2X0=y -CONFIG_CACHE_L2X0=y -# CONFIG_CACHE_L2X0_PMU is not set -CONFIG_PL310_ERRATA_588369=y -CONFIG_PL310_ERRATA_727915=y -CONFIG_PL310_ERRATA_753970=y -CONFIG_PL310_ERRATA_769419=y -CONFIG_ARM_L1_CACHE_SHIFT_6=y -CONFIG_ARM_L1_CACHE_SHIFT=6 -CONFIG_ARM_DMA_MEM_BUFFERABLE=y -CONFIG_ARM_HEAVY_MB=y -CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y -CONFIG_DEBUG_ALIGN_RODATA=y -CONFIG_IWMMXT=y -CONFIG_MULTI_IRQ_HANDLER=y -CONFIG_PJ4B_ERRATA_4742=y -CONFIG_ARM_ERRATA_430973=y -CONFIG_ARM_ERRATA_643719=y -CONFIG_ARM_ERRATA_720789=y -CONFIG_ARM_ERRATA_754322=y -CONFIG_ARM_ERRATA_754327=y -CONFIG_ARM_ERRATA_764369=y -CONFIG_ARM_ERRATA_775420=y -CONFIG_ARM_ERRATA_798181=y -CONFIG_ARM_ERRATA_773022=y -# CONFIG_ARM_ERRATA_818325_852422 is not set -# CONFIG_ARM_ERRATA_821420 is not set -# CONFIG_ARM_ERRATA_825619 is not set -# CONFIG_ARM_ERRATA_852421 is not set -# CONFIG_ARM_ERRATA_852423 is not set - -# -# Bus support -# -CONFIG_PCI=y -CONFIG_PCI_DOMAINS=y -CONFIG_PCI_DOMAINS_GENERIC=y -CONFIG_PCI_SYSCALL=y -CONFIG_PCIEPORTBUS=y -CONFIG_PCIEAER=y -CONFIG_PCIEAER_INJECT=m -# CONFIG_PCIE_ECRC is not set -CONFIG_PCIEASPM=y -# CONFIG_PCIEASPM_DEBUG is not set -CONFIG_PCIEASPM_DEFAULT=y -# CONFIG_PCIEASPM_POWERSAVE is not set -# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set -# CONFIG_PCIEASPM_PERFORMANCE is not set -CONFIG_PCIE_PME=y -CONFIG_PCIE_DPC=y -CONFIG_PCIE_PTM=y -CONFIG_PCI_MSI=y -CONFIG_PCI_MSI_IRQ_DOMAIN=y -CONFIG_PCI_QUIRKS=y -# CONFIG_PCI_DEBUG is not set -CONFIG_PCI_STUB=m -CONFIG_PCI_ECAM=y -# CONFIG_PCI_IOV is not set -# CONFIG_PCI_PRI is not set -# CONFIG_PCI_PASID is not set -CONFIG_PCI_LABEL=y -# CONFIG_HOTPLUG_PCI is not set - -# -# PCI controller drivers -# -CONFIG_PCI_MVEBU=y - -# -# Cadence PCIe controllers support -# -# CONFIG_PCIE_CADENCE_HOST is not set -# CONFIG_PCI_FTPCI100 is not set -CONFIG_PCI_TEGRA=y -CONFIG_PCI_HOST_COMMON=y -CONFIG_PCI_HOST_GENERIC=y -# CONFIG_PCI_V3_SEMI is not set -# CONFIG_PCIE_ALTERA is not set -CONFIG_PCIE_ROCKCHIP=y -CONFIG_PCIE_ROCKCHIP_HOST=m - -# -# DesignWare PCI Core Support -# -CONFIG_PCIE_DW=y -CONFIG_PCIE_DW_HOST=y -CONFIG_PCI_DRA7XX=y -CONFIG_PCI_DRA7XX_HOST=y -# CONFIG_PCIE_DW_PLAT_HOST is not set -CONFIG_PCI_IMX6=y -# CONFIG_PCI_LAYERSCAPE is not set -# CONFIG_PCIE_ARMADA_8K is not set - -# -# PCI Endpoint -# -# CONFIG_PCI_ENDPOINT is not set - -# -# PCI switch controller drivers -# -# CONFIG_PCI_SW_SWITCHTEC is not set -# CONFIG_PCCARD is not set - -# -# Kernel Features -# -CONFIG_HAVE_SMP=y -CONFIG_SMP=y -CONFIG_SMP_ON_UP=y -CONFIG_ARM_CPU_TOPOLOGY=y -# CONFIG_SCHED_MC is not set -# CONFIG_SCHED_SMT is not set -CONFIG_HAVE_ARM_SCU=y -CONFIG_HAVE_ARM_ARCH_TIMER=y -CONFIG_HAVE_ARM_TWD=y -CONFIG_MCPM=y -# CONFIG_BIG_LITTLE is not set -CONFIG_VMSPLIT_3G=y -# CONFIG_VMSPLIT_3G_OPT is not set -# CONFIG_VMSPLIT_2G is not set -# CONFIG_VMSPLIT_1G is not set -CONFIG_PAGE_OFFSET=0xC0000000 -CONFIG_NR_CPUS=8 -CONFIG_HOTPLUG_CPU=y -CONFIG_ARM_PSCI=y -CONFIG_ARCH_NR_GPIO=2048 -# CONFIG_PREEMPT_NONE is not set -CONFIG_PREEMPT_VOLUNTARY=y -# CONFIG_PREEMPT is not set -CONFIG_HZ_FIXED=0 -# CONFIG_HZ_100 is not set -# CONFIG_HZ_200 is not set -CONFIG_HZ_250=y -# CONFIG_HZ_300 is not set -# CONFIG_HZ_500 is not set -# CONFIG_HZ_1000 is not set -CONFIG_HZ=250 -CONFIG_SCHED_HRTICK=y -# CONFIG_THUMB2_KERNEL is not set -CONFIG_ARM_PATCH_IDIV=y -CONFIG_AEABI=y -# CONFIG_OABI_COMPAT is not set -CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y -CONFIG_HAVE_ARCH_PFN_VALID=y -CONFIG_HIGHMEM=y -CONFIG_HIGHPTE=y -CONFIG_CPU_SW_DOMAIN_PAN=y -CONFIG_HW_PERF_EVENTS=y -CONFIG_ARCH_WANT_GENERAL_HUGETLB=y -# CONFIG_ARM_MODULE_PLTS is not set -CONFIG_FLATMEM=y -CONFIG_FLAT_NODE_MEM_MAP=y -CONFIG_HAVE_MEMBLOCK=y -CONFIG_NO_BOOTMEM=y -CONFIG_MEMORY_ISOLATION=y -CONFIG_SPLIT_PTLOCK_CPUS=4 -CONFIG_MEMORY_BALLOON=y -CONFIG_BALLOON_COMPACTION=y -CONFIG_COMPACTION=y -CONFIG_MIGRATION=y -CONFIG_BOUNCE=y -CONFIG_MMU_NOTIFIER=y -CONFIG_KSM=y -CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 -# CONFIG_CLEANCACHE is not set -CONFIG_FRONTSWAP=y -CONFIG_CMA=y -# CONFIG_CMA_DEBUG is not set -# CONFIG_CMA_DEBUGFS is not set -CONFIG_CMA_AREAS=7 -CONFIG_ZSWAP=y -CONFIG_ZPOOL=y -CONFIG_ZBUD=y -# CONFIG_Z3FOLD is not set -CONFIG_ZSMALLOC=m -# CONFIG_PGTABLE_MAPPING is not set -# CONFIG_ZSMALLOC_STAT is not set -CONFIG_GENERIC_EARLY_IOREMAP=y -# CONFIG_IDLE_PAGE_TRACKING is not set -CONFIG_FRAME_VECTOR=y -# CONFIG_PERCPU_STATS is not set -# CONFIG_GUP_BENCHMARK is not set -CONFIG_FORCE_MAX_ZONEORDER=12 -CONFIG_ALIGNMENT_TRAP=y -# CONFIG_UACCESS_WITH_MEMCPY is not set -CONFIG_SECCOMP=y -CONFIG_PARAVIRT=y -# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set -CONFIG_XEN_DOM0=y -CONFIG_XEN=y - -# -# Boot options -# -CONFIG_USE_OF=y -CONFIG_ATAGS=y -# CONFIG_DEPRECATED_PARAM_STRUCT is not set -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_ARM_APPENDED_DTB=y -CONFIG_ARM_ATAG_DTB_COMPAT=y -CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y -# CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set -CONFIG_CMDLINE="" -CONFIG_KEXEC=y -CONFIG_ATAGS_PROC=y -# CONFIG_CRASH_DUMP is not set -CONFIG_AUTO_ZRELADDR=y -CONFIG_EFI_STUB=y -CONFIG_EFI=y -CONFIG_DMI=y - -# -# CPU Power Management -# - -# -# CPU Frequency scaling -# -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_GOV_ATTR_SET=y -CONFIG_CPU_FREQ_GOV_COMMON=y -CONFIG_CPU_FREQ_STAT=y -CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y -# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set -CONFIG_CPU_FREQ_GOV_PERFORMANCE=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=m -CONFIG_CPU_FREQ_GOV_USERSPACE=m -CONFIG_CPU_FREQ_GOV_ONDEMAND=m -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m -CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y - -# -# CPU frequency scaling drivers -# -CONFIG_CPUFREQ_DT=m -CONFIG_CPUFREQ_DT_PLATDEV=y -CONFIG_ARM_ARMADA_37XX_CPUFREQ=m -# CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set -CONFIG_ARM_HIGHBANK_CPUFREQ=m -CONFIG_ARM_IMX6Q_CPUFREQ=m -CONFIG_ARM_OMAP2PLUS_CPUFREQ=y -CONFIG_ARM_SCMI_CPUFREQ=m -CONFIG_ARM_TEGRA20_CPUFREQ=y -CONFIG_ARM_TEGRA124_CPUFREQ=m -# CONFIG_ARM_TI_CPUFREQ is not set -# CONFIG_QORIQ_CPUFREQ is not set - -# -# CPU Idle -# -# CONFIG_CPU_IDLE is not set -CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y - -# -# Floating point emulation -# - -# -# At least one emulation must be selected -# -CONFIG_VFP=y -CONFIG_VFPv3=y -CONFIG_NEON=y -# CONFIG_KERNEL_MODE_NEON is not set - -# -# Userspace binary formats -# -CONFIG_BINFMT_ELF=y -# CONFIG_BINFMT_ELF_FDPIC is not set -CONFIG_ELFCORE=y -CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y -CONFIG_BINFMT_SCRIPT=y -# CONFIG_BINFMT_FLAT is not set -CONFIG_BINFMT_MISC=m -CONFIG_COREDUMP=y - -# -# Power management options -# -CONFIG_SUSPEND=y -CONFIG_SUSPEND_FREEZER=y -# CONFIG_SUSPEND_SKIP_SYNC is not set -CONFIG_HIBERNATE_CALLBACKS=y -CONFIG_HIBERNATION=y -CONFIG_PM_STD_PARTITION="" -CONFIG_PM_SLEEP=y -CONFIG_PM_SLEEP_SMP=y -# CONFIG_PM_AUTOSLEEP is not set -# CONFIG_PM_WAKELOCKS is not set -CONFIG_PM=y -CONFIG_PM_DEBUG=y -CONFIG_PM_ADVANCED_DEBUG=y -# CONFIG_PM_TEST_SUSPEND is not set -CONFIG_PM_SLEEP_DEBUG=y -CONFIG_APM_EMULATION=y -CONFIG_PM_CLK=y -CONFIG_PM_GENERIC_DOMAINS=y -# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set -CONFIG_PM_GENERIC_DOMAINS_SLEEP=y -CONFIG_PM_GENERIC_DOMAINS_OF=y -CONFIG_CPU_PM=y -CONFIG_ARCH_SUSPEND_POSSIBLE=y -CONFIG_ARM_CPU_SUSPEND=y -CONFIG_ARCH_HIBERNATION_POSSIBLE=y -CONFIG_NET=y -CONFIG_NET_INGRESS=y -CONFIG_NET_EGRESS=y - -# -# Networking options -# -CONFIG_PACKET=y -CONFIG_PACKET_DIAG=m -CONFIG_UNIX=y -CONFIG_UNIX_DIAG=m -# CONFIG_TLS is not set -CONFIG_XFRM=y -CONFIG_XFRM_ALGO=m -CONFIG_XFRM_USER=m -CONFIG_XFRM_SUB_POLICY=y -CONFIG_XFRM_MIGRATE=y -# CONFIG_XFRM_STATISTICS is not set -CONFIG_XFRM_IPCOMP=m -CONFIG_NET_KEY=m -CONFIG_NET_KEY_MIGRATE=y -# CONFIG_SMC is not set -# CONFIG_XDP_SOCKETS is not set -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_FIB_TRIE_STATS=y -CONFIG_IP_MULTIPLE_TABLES=y -CONFIG_IP_ROUTE_MULTIPATH=y -CONFIG_IP_ROUTE_VERBOSE=y -CONFIG_IP_ROUTE_CLASSID=y -# CONFIG_IP_PNP is not set -CONFIG_NET_IPIP=m -CONFIG_NET_IPGRE_DEMUX=m -CONFIG_NET_IP_TUNNEL=m -CONFIG_NET_IPGRE=m -CONFIG_NET_IPGRE_BROADCAST=y -CONFIG_IP_MROUTE_COMMON=y -CONFIG_IP_MROUTE=y -CONFIG_IP_MROUTE_MULTIPLE_TABLES=y -CONFIG_IP_PIMSM_V1=y -CONFIG_IP_PIMSM_V2=y -CONFIG_SYN_COOKIES=y -CONFIG_NET_IPVTI=m -CONFIG_NET_UDP_TUNNEL=m -CONFIG_NET_FOU=m -CONFIG_NET_FOU_IP_TUNNELS=y -CONFIG_INET_AH=m -CONFIG_INET_ESP=m -# CONFIG_INET_ESP_OFFLOAD is not set -CONFIG_INET_IPCOMP=m -CONFIG_INET_XFRM_TUNNEL=m -CONFIG_INET_TUNNEL=m -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m -CONFIG_INET_XFRM_MODE_BEET=m -CONFIG_INET_DIAG=m -CONFIG_INET_TCP_DIAG=m -CONFIG_INET_UDP_DIAG=m -# CONFIG_INET_RAW_DIAG is not set -CONFIG_INET_DIAG_DESTROY=y -CONFIG_TCP_CONG_ADVANCED=y -CONFIG_TCP_CONG_BIC=m -CONFIG_TCP_CONG_CUBIC=y -CONFIG_TCP_CONG_WESTWOOD=m -CONFIG_TCP_CONG_HTCP=m -CONFIG_TCP_CONG_HSTCP=m -CONFIG_TCP_CONG_HYBLA=m -CONFIG_TCP_CONG_VEGAS=m -CONFIG_TCP_CONG_NV=m -CONFIG_TCP_CONG_SCALABLE=m -CONFIG_TCP_CONG_LP=m -CONFIG_TCP_CONG_VENO=m -CONFIG_TCP_CONG_YEAH=m -CONFIG_TCP_CONG_ILLINOIS=m -CONFIG_TCP_CONG_DCTCP=m -CONFIG_TCP_CONG_CDG=m -CONFIG_TCP_CONG_BBR=m -CONFIG_DEFAULT_CUBIC=y -# CONFIG_DEFAULT_RENO is not set -CONFIG_DEFAULT_TCP_CONG="cubic" -CONFIG_TCP_MD5SIG=y -CONFIG_IPV6=y -CONFIG_IPV6_ROUTER_PREF=y -CONFIG_IPV6_ROUTE_INFO=y -CONFIG_IPV6_OPTIMISTIC_DAD=y -CONFIG_INET6_AH=m -CONFIG_INET6_ESP=m -# CONFIG_INET6_ESP_OFFLOAD is not set -CONFIG_INET6_IPCOMP=m -CONFIG_IPV6_MIP6=y -CONFIG_IPV6_ILA=m -CONFIG_INET6_XFRM_TUNNEL=m -CONFIG_INET6_TUNNEL=m -CONFIG_INET6_XFRM_MODE_TRANSPORT=m -CONFIG_INET6_XFRM_MODE_TUNNEL=m -CONFIG_INET6_XFRM_MODE_BEET=m -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m -CONFIG_IPV6_VTI=m -CONFIG_IPV6_SIT=m -CONFIG_IPV6_SIT_6RD=y -CONFIG_IPV6_NDISC_NODETYPE=y -CONFIG_IPV6_TUNNEL=m -CONFIG_IPV6_GRE=m -CONFIG_IPV6_FOU=m -CONFIG_IPV6_FOU_TUNNEL=m -CONFIG_IPV6_MULTIPLE_TABLES=y -CONFIG_IPV6_SUBTREES=y -CONFIG_IPV6_MROUTE=y -CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y -CONFIG_IPV6_PIMSM_V2=y -# CONFIG_IPV6_SEG6_LWTUNNEL is not set -# CONFIG_IPV6_SEG6_HMAC is not set -# CONFIG_NETLABEL is not set -CONFIG_NETWORK_SECMARK=y -CONFIG_NET_PTP_CLASSIFY=y -# CONFIG_NETWORK_PHY_TIMESTAMPING is not set -CONFIG_NETFILTER=y -CONFIG_NETFILTER_ADVANCED=y -CONFIG_BRIDGE_NETFILTER=m - -# -# Core Netfilter Configuration -# -CONFIG_NETFILTER_INGRESS=y -CONFIG_NETFILTER_NETLINK=m -CONFIG_NETFILTER_FAMILY_BRIDGE=y -CONFIG_NETFILTER_FAMILY_ARP=y -CONFIG_NETFILTER_NETLINK_ACCT=m -CONFIG_NETFILTER_NETLINK_QUEUE=m -CONFIG_NETFILTER_NETLINK_LOG=m -CONFIG_NF_CONNTRACK=m -CONFIG_NF_LOG_COMMON=m -# CONFIG_NF_LOG_NETDEV is not set -CONFIG_NETFILTER_CONNCOUNT=m -CONFIG_NF_CONNTRACK_MARK=y -CONFIG_NF_CONNTRACK_SECMARK=y -CONFIG_NF_CONNTRACK_ZONES=y -CONFIG_NF_CONNTRACK_PROCFS=y -CONFIG_NF_CONNTRACK_EVENTS=y -CONFIG_NF_CONNTRACK_TIMEOUT=y -CONFIG_NF_CONNTRACK_TIMESTAMP=y -CONFIG_NF_CONNTRACK_LABELS=y -CONFIG_NF_CT_PROTO_DCCP=y -CONFIG_NF_CT_PROTO_GRE=m -CONFIG_NF_CT_PROTO_SCTP=y -CONFIG_NF_CT_PROTO_UDPLITE=y -CONFIG_NF_CONNTRACK_AMANDA=m -CONFIG_NF_CONNTRACK_FTP=m -CONFIG_NF_CONNTRACK_H323=m -CONFIG_NF_CONNTRACK_IRC=m -CONFIG_NF_CONNTRACK_BROADCAST=m -CONFIG_NF_CONNTRACK_NETBIOS_NS=m -CONFIG_NF_CONNTRACK_SNMP=m -CONFIG_NF_CONNTRACK_PPTP=m -CONFIG_NF_CONNTRACK_SANE=m -CONFIG_NF_CONNTRACK_SIP=m -CONFIG_NF_CONNTRACK_TFTP=m -CONFIG_NF_CT_NETLINK=m -CONFIG_NF_CT_NETLINK_TIMEOUT=m -CONFIG_NF_CT_NETLINK_HELPER=m -CONFIG_NETFILTER_NETLINK_GLUE_CT=y -CONFIG_NF_NAT=m -CONFIG_NF_NAT_NEEDED=y -CONFIG_NF_NAT_PROTO_DCCP=y -CONFIG_NF_NAT_PROTO_UDPLITE=y -CONFIG_NF_NAT_PROTO_SCTP=y -CONFIG_NF_NAT_AMANDA=m -CONFIG_NF_NAT_FTP=m -CONFIG_NF_NAT_IRC=m -CONFIG_NF_NAT_SIP=m -CONFIG_NF_NAT_TFTP=m -CONFIG_NF_NAT_REDIRECT=y -CONFIG_NETFILTER_SYNPROXY=m -CONFIG_NF_OSF=m -CONFIG_NF_TABLES=m -CONFIG_NF_TABLES_SET=m -# CONFIG_NF_TABLES_INET is not set -# CONFIG_NF_TABLES_NETDEV is not set -CONFIG_NFT_NUMGEN=m -CONFIG_NFT_CT=m -CONFIG_NFT_FLOW_OFFLOAD=m -CONFIG_NFT_COUNTER=m -CONFIG_NFT_CONNLIMIT=m -CONFIG_NFT_LOG=m -CONFIG_NFT_LIMIT=m -CONFIG_NFT_MASQ=m -CONFIG_NFT_REDIR=m -CONFIG_NFT_NAT=m -# CONFIG_NFT_OBJREF is not set -CONFIG_NFT_QUEUE=m -CONFIG_NFT_QUOTA=m -CONFIG_NFT_REJECT=m -CONFIG_NFT_COMPAT=m -CONFIG_NFT_HASH=m -CONFIG_NFT_SOCKET=m -CONFIG_NF_FLOW_TABLE_INET=m -CONFIG_NF_FLOW_TABLE=m -CONFIG_NETFILTER_XTABLES=m - -# -# Xtables combined modules -# -CONFIG_NETFILTER_XT_MARK=m -CONFIG_NETFILTER_XT_CONNMARK=m -CONFIG_NETFILTER_XT_SET=m - -# -# Xtables targets -# -CONFIG_NETFILTER_XT_TARGET_AUDIT=m -CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m -CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m -CONFIG_NETFILTER_XT_TARGET_CONNMARK=m -CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m -CONFIG_NETFILTER_XT_TARGET_CT=m -CONFIG_NETFILTER_XT_TARGET_DSCP=m -CONFIG_NETFILTER_XT_TARGET_HL=m -CONFIG_NETFILTER_XT_TARGET_HMARK=m -CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m -CONFIG_NETFILTER_XT_TARGET_LED=m -CONFIG_NETFILTER_XT_TARGET_LOG=m -CONFIG_NETFILTER_XT_TARGET_MARK=m -CONFIG_NETFILTER_XT_NAT=m -CONFIG_NETFILTER_XT_TARGET_NETMAP=m -CONFIG_NETFILTER_XT_TARGET_NFLOG=m -CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m -# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set -CONFIG_NETFILTER_XT_TARGET_RATEEST=m -CONFIG_NETFILTER_XT_TARGET_REDIRECT=m -CONFIG_NETFILTER_XT_TARGET_TEE=m -CONFIG_NETFILTER_XT_TARGET_TPROXY=m -CONFIG_NETFILTER_XT_TARGET_TRACE=m -CONFIG_NETFILTER_XT_TARGET_SECMARK=m -CONFIG_NETFILTER_XT_TARGET_TCPMSS=m -CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m - -# -# Xtables matches -# -CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m -CONFIG_NETFILTER_XT_MATCH_BPF=m -CONFIG_NETFILTER_XT_MATCH_CGROUP=m -CONFIG_NETFILTER_XT_MATCH_CLUSTER=m -CONFIG_NETFILTER_XT_MATCH_COMMENT=m -CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m -CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m -CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m -CONFIG_NETFILTER_XT_MATCH_CONNMARK=m -CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m -CONFIG_NETFILTER_XT_MATCH_CPU=m -CONFIG_NETFILTER_XT_MATCH_DCCP=m -CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m -CONFIG_NETFILTER_XT_MATCH_DSCP=m -CONFIG_NETFILTER_XT_MATCH_ECN=m -CONFIG_NETFILTER_XT_MATCH_ESP=m -CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m -CONFIG_NETFILTER_XT_MATCH_HELPER=m -CONFIG_NETFILTER_XT_MATCH_HL=m -CONFIG_NETFILTER_XT_MATCH_IPCOMP=m -CONFIG_NETFILTER_XT_MATCH_IPRANGE=m -CONFIG_NETFILTER_XT_MATCH_IPVS=m -CONFIG_NETFILTER_XT_MATCH_L2TP=m -CONFIG_NETFILTER_XT_MATCH_LENGTH=m -CONFIG_NETFILTER_XT_MATCH_LIMIT=m -CONFIG_NETFILTER_XT_MATCH_MAC=m -CONFIG_NETFILTER_XT_MATCH_MARK=m -CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m -CONFIG_NETFILTER_XT_MATCH_NFACCT=m -CONFIG_NETFILTER_XT_MATCH_OSF=m -CONFIG_NETFILTER_XT_MATCH_OWNER=m -CONFIG_NETFILTER_XT_MATCH_POLICY=m -CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m -CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m -CONFIG_NETFILTER_XT_MATCH_QUOTA=m -CONFIG_NETFILTER_XT_MATCH_RATEEST=m -CONFIG_NETFILTER_XT_MATCH_REALM=m -CONFIG_NETFILTER_XT_MATCH_RECENT=m -CONFIG_NETFILTER_XT_MATCH_SCTP=m -CONFIG_NETFILTER_XT_MATCH_SOCKET=m -CONFIG_NETFILTER_XT_MATCH_STATE=m -CONFIG_NETFILTER_XT_MATCH_STATISTIC=m -CONFIG_NETFILTER_XT_MATCH_STRING=m -CONFIG_NETFILTER_XT_MATCH_TCPMSS=m -CONFIG_NETFILTER_XT_MATCH_TIME=m -CONFIG_NETFILTER_XT_MATCH_U32=m -CONFIG_IP_SET=m -CONFIG_IP_SET_MAX=256 -CONFIG_IP_SET_BITMAP_IP=m -CONFIG_IP_SET_BITMAP_IPMAC=m -CONFIG_IP_SET_BITMAP_PORT=m -CONFIG_IP_SET_HASH_IP=m -CONFIG_IP_SET_HASH_IPMARK=m -CONFIG_IP_SET_HASH_IPPORT=m -CONFIG_IP_SET_HASH_IPPORTIP=m -CONFIG_IP_SET_HASH_IPPORTNET=m -# CONFIG_IP_SET_HASH_IPMAC is not set -CONFIG_IP_SET_HASH_MAC=m -CONFIG_IP_SET_HASH_NETPORTNET=m -CONFIG_IP_SET_HASH_NET=m -CONFIG_IP_SET_HASH_NETNET=m -CONFIG_IP_SET_HASH_NETPORT=m -CONFIG_IP_SET_HASH_NETIFACE=m -CONFIG_IP_SET_LIST_SET=m -CONFIG_IP_VS=m -CONFIG_IP_VS_IPV6=y -# CONFIG_IP_VS_DEBUG is not set -CONFIG_IP_VS_TAB_BITS=12 - -# -# IPVS transport protocol load balancing support -# -CONFIG_IP_VS_PROTO_TCP=y -CONFIG_IP_VS_PROTO_UDP=y -CONFIG_IP_VS_PROTO_AH_ESP=y -CONFIG_IP_VS_PROTO_ESP=y -CONFIG_IP_VS_PROTO_AH=y -CONFIG_IP_VS_PROTO_SCTP=y - -# -# IPVS scheduler -# -CONFIG_IP_VS_RR=m -CONFIG_IP_VS_WRR=m -CONFIG_IP_VS_LC=m -CONFIG_IP_VS_WLC=m -CONFIG_IP_VS_FO=m -CONFIG_IP_VS_OVF=m -CONFIG_IP_VS_LBLC=m -CONFIG_IP_VS_LBLCR=m -CONFIG_IP_VS_DH=m -CONFIG_IP_VS_SH=m -CONFIG_IP_VS_MH=m -CONFIG_IP_VS_SED=m -CONFIG_IP_VS_NQ=m - -# -# IPVS SH scheduler -# -CONFIG_IP_VS_SH_TAB_BITS=8 - -# -# IPVS MH scheduler -# -CONFIG_IP_VS_MH_TAB_INDEX=12 - -# -# IPVS application helper -# -CONFIG_IP_VS_FTP=m -CONFIG_IP_VS_NFCT=y -CONFIG_IP_VS_PE_SIP=m - -# -# IP: Netfilter Configuration -# -CONFIG_NF_DEFRAG_IPV4=m -CONFIG_NF_CONNTRACK_IPV4=m -CONFIG_NF_SOCKET_IPV4=m -CONFIG_NF_TPROXY_IPV4=m -# CONFIG_NF_TABLES_IPV4 is not set -# CONFIG_NF_TABLES_ARP is not set -CONFIG_NF_FLOW_TABLE_IPV4=m -CONFIG_NF_DUP_IPV4=m -CONFIG_NF_LOG_ARP=m -CONFIG_NF_LOG_IPV4=m -CONFIG_NF_REJECT_IPV4=m -CONFIG_NF_NAT_IPV4=m -CONFIG_NF_NAT_MASQUERADE_IPV4=y -CONFIG_NF_NAT_SNMP_BASIC=m -CONFIG_NF_NAT_PROTO_GRE=m -CONFIG_NF_NAT_PPTP=m -CONFIG_NF_NAT_H323=m -CONFIG_IP_NF_IPTABLES=m -CONFIG_IP_NF_MATCH_AH=m -CONFIG_IP_NF_MATCH_ECN=m -CONFIG_IP_NF_MATCH_RPFILTER=m -CONFIG_IP_NF_MATCH_TTL=m -CONFIG_IP_NF_FILTER=m -CONFIG_IP_NF_TARGET_REJECT=m -CONFIG_IP_NF_TARGET_SYNPROXY=m -CONFIG_IP_NF_NAT=m -CONFIG_IP_NF_TARGET_MASQUERADE=m -CONFIG_IP_NF_TARGET_NETMAP=m -CONFIG_IP_NF_TARGET_REDIRECT=m -CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_TARGET_CLUSTERIP=m -CONFIG_IP_NF_TARGET_ECN=m -CONFIG_IP_NF_TARGET_TTL=m -CONFIG_IP_NF_RAW=m -CONFIG_IP_NF_SECURITY=m -CONFIG_IP_NF_ARPTABLES=m -CONFIG_IP_NF_ARPFILTER=m -CONFIG_IP_NF_ARP_MANGLE=m - -# -# IPv6: Netfilter Configuration -# -CONFIG_NF_DEFRAG_IPV6=m -CONFIG_NF_CONNTRACK_IPV6=m -CONFIG_NF_SOCKET_IPV6=m -CONFIG_NF_TPROXY_IPV6=m -# CONFIG_NF_TABLES_IPV6 is not set -CONFIG_NF_FLOW_TABLE_IPV6=m -CONFIG_NF_DUP_IPV6=m -CONFIG_NF_REJECT_IPV6=m -CONFIG_NF_LOG_IPV6=m -CONFIG_NF_NAT_IPV6=m -CONFIG_NF_NAT_MASQUERADE_IPV6=y -CONFIG_IP6_NF_IPTABLES=m -CONFIG_IP6_NF_MATCH_AH=m -CONFIG_IP6_NF_MATCH_EUI64=m -CONFIG_IP6_NF_MATCH_FRAG=m -CONFIG_IP6_NF_MATCH_OPTS=m -CONFIG_IP6_NF_MATCH_HL=m -CONFIG_IP6_NF_MATCH_IPV6HEADER=m -CONFIG_IP6_NF_MATCH_MH=m -CONFIG_IP6_NF_MATCH_RPFILTER=m -CONFIG_IP6_NF_MATCH_RT=m -CONFIG_IP6_NF_MATCH_SRH=m -CONFIG_IP6_NF_TARGET_HL=m -CONFIG_IP6_NF_FILTER=m -CONFIG_IP6_NF_TARGET_REJECT=m -CONFIG_IP6_NF_TARGET_SYNPROXY=m -CONFIG_IP6_NF_MANGLE=m -CONFIG_IP6_NF_RAW=m -CONFIG_IP6_NF_SECURITY=m -CONFIG_IP6_NF_NAT=m -CONFIG_IP6_NF_TARGET_MASQUERADE=m -CONFIG_IP6_NF_TARGET_NPT=m -# CONFIG_NF_TABLES_BRIDGE is not set -CONFIG_BRIDGE_NF_EBTABLES=m -CONFIG_BRIDGE_EBT_BROUTE=m -CONFIG_BRIDGE_EBT_T_FILTER=m -CONFIG_BRIDGE_EBT_T_NAT=m -CONFIG_BRIDGE_EBT_802_3=m -CONFIG_BRIDGE_EBT_AMONG=m -CONFIG_BRIDGE_EBT_ARP=m -CONFIG_BRIDGE_EBT_IP=m -CONFIG_BRIDGE_EBT_IP6=m -CONFIG_BRIDGE_EBT_LIMIT=m -CONFIG_BRIDGE_EBT_MARK=m -CONFIG_BRIDGE_EBT_PKTTYPE=m -CONFIG_BRIDGE_EBT_STP=m -CONFIG_BRIDGE_EBT_VLAN=m -CONFIG_BRIDGE_EBT_ARPREPLY=m -CONFIG_BRIDGE_EBT_DNAT=m -CONFIG_BRIDGE_EBT_MARK_T=m -CONFIG_BRIDGE_EBT_REDIRECT=m -CONFIG_BRIDGE_EBT_SNAT=m -CONFIG_BRIDGE_EBT_LOG=m -CONFIG_BRIDGE_EBT_NFLOG=m -# CONFIG_BPFILTER is not set -CONFIG_IP_DCCP=m -CONFIG_INET_DCCP_DIAG=m - -# -# DCCP CCIDs Configuration -# -# CONFIG_IP_DCCP_CCID2_DEBUG is not set -CONFIG_IP_DCCP_CCID3=y -# CONFIG_IP_DCCP_CCID3_DEBUG is not set -CONFIG_IP_DCCP_TFRC_LIB=y - -# -# DCCP Kernel Hacking -# -# CONFIG_IP_DCCP_DEBUG is not set -CONFIG_IP_SCTP=m -# CONFIG_SCTP_DBG_OBJCNT is not set -CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y -# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set -# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set -CONFIG_SCTP_COOKIE_HMAC_MD5=y -CONFIG_SCTP_COOKIE_HMAC_SHA1=y -CONFIG_INET_SCTP_DIAG=m -CONFIG_RDS=m -CONFIG_RDS_RDMA=m -CONFIG_RDS_TCP=m -# CONFIG_RDS_DEBUG is not set -CONFIG_TIPC=m -CONFIG_TIPC_MEDIA_IB=y -CONFIG_TIPC_MEDIA_UDP=y -CONFIG_TIPC_DIAG=m -CONFIG_ATM=m -CONFIG_ATM_CLIP=m -# CONFIG_ATM_CLIP_NO_ICMP is not set -CONFIG_ATM_LANE=m -CONFIG_ATM_MPOA=m -CONFIG_ATM_BR2684=m -# CONFIG_ATM_BR2684_IPFILTER is not set -CONFIG_L2TP=m -CONFIG_L2TP_DEBUGFS=m -CONFIG_L2TP_V3=y -CONFIG_L2TP_IP=m -CONFIG_L2TP_ETH=m -CONFIG_STP=m -CONFIG_GARP=m -CONFIG_MRP=m -CONFIG_BRIDGE=m -CONFIG_BRIDGE_IGMP_SNOOPING=y -CONFIG_BRIDGE_VLAN_FILTERING=y -CONFIG_HAVE_NET_DSA=y -CONFIG_NET_DSA=m -CONFIG_NET_DSA_LEGACY=y -CONFIG_NET_DSA_TAG_BRCM=y -CONFIG_NET_DSA_TAG_BRCM_PREPEND=y -CONFIG_NET_DSA_TAG_DSA=y -CONFIG_NET_DSA_TAG_EDSA=y -CONFIG_NET_DSA_TAG_TRAILER=y -CONFIG_VLAN_8021Q=m -CONFIG_VLAN_8021Q_GVRP=y -CONFIG_VLAN_8021Q_MVRP=y -# CONFIG_DECNET is not set -CONFIG_LLC=m -CONFIG_LLC2=m -CONFIG_ATALK=m -CONFIG_DEV_APPLETALK=m -CONFIG_IPDDP=m -CONFIG_IPDDP_ENCAP=y -# CONFIG_X25 is not set -# CONFIG_LAPB is not set -CONFIG_PHONET=m -CONFIG_6LOWPAN=m -# CONFIG_6LOWPAN_DEBUGFS is not set -CONFIG_6LOWPAN_NHC=m -CONFIG_6LOWPAN_NHC_DEST=m -CONFIG_6LOWPAN_NHC_FRAGMENT=m -CONFIG_6LOWPAN_NHC_HOP=m -CONFIG_6LOWPAN_NHC_IPV6=m -CONFIG_6LOWPAN_NHC_MOBILITY=m -CONFIG_6LOWPAN_NHC_ROUTING=m -CONFIG_6LOWPAN_NHC_UDP=m -CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m -CONFIG_6LOWPAN_GHC_UDP=m -CONFIG_6LOWPAN_GHC_ICMPV6=m -CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m -CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m -CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m -CONFIG_IEEE802154=m -# CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set -CONFIG_IEEE802154_SOCKET=m -CONFIG_IEEE802154_6LOWPAN=m -CONFIG_MAC802154=m -CONFIG_NET_SCHED=y - -# -# Queueing/Scheduling -# -CONFIG_NET_SCH_CBQ=m -CONFIG_NET_SCH_HTB=m -CONFIG_NET_SCH_HFSC=m -CONFIG_NET_SCH_ATM=m -CONFIG_NET_SCH_PRIO=m -CONFIG_NET_SCH_MULTIQ=m -CONFIG_NET_SCH_RED=m -CONFIG_NET_SCH_SFB=m -CONFIG_NET_SCH_SFQ=m -CONFIG_NET_SCH_TEQL=m -CONFIG_NET_SCH_TBF=m -CONFIG_NET_SCH_CBS=m -CONFIG_NET_SCH_GRED=m -CONFIG_NET_SCH_DSMARK=m -CONFIG_NET_SCH_NETEM=m -CONFIG_NET_SCH_DRR=m -CONFIG_NET_SCH_MQPRIO=m -CONFIG_NET_SCH_CHOKE=m -CONFIG_NET_SCH_QFQ=m -CONFIG_NET_SCH_CODEL=m -CONFIG_NET_SCH_FQ_CODEL=m -CONFIG_NET_SCH_FQ=m -CONFIG_NET_SCH_HHF=m -CONFIG_NET_SCH_PIE=m -CONFIG_NET_SCH_INGRESS=m -CONFIG_NET_SCH_PLUG=m -# CONFIG_NET_SCH_DEFAULT is not set - -# -# Classification -# -CONFIG_NET_CLS=y -CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m -CONFIG_NET_CLS_ROUTE4=m -CONFIG_NET_CLS_FW=m -CONFIG_NET_CLS_U32=m -CONFIG_CLS_U32_PERF=y -CONFIG_CLS_U32_MARK=y -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_RSVP6=m -CONFIG_NET_CLS_FLOW=m -CONFIG_NET_CLS_CGROUP=m -CONFIG_NET_CLS_BPF=m -CONFIG_NET_CLS_FLOWER=m -CONFIG_NET_CLS_MATCHALL=m -CONFIG_NET_EMATCH=y -CONFIG_NET_EMATCH_STACK=32 -CONFIG_NET_EMATCH_CMP=m -CONFIG_NET_EMATCH_NBYTE=m -CONFIG_NET_EMATCH_U32=m -CONFIG_NET_EMATCH_META=m -CONFIG_NET_EMATCH_TEXT=m -CONFIG_NET_EMATCH_CANID=m -CONFIG_NET_EMATCH_IPSET=m -CONFIG_NET_EMATCH_IPT=m -CONFIG_NET_CLS_ACT=y -CONFIG_NET_ACT_POLICE=m -CONFIG_NET_ACT_GACT=m -CONFIG_GACT_PROB=y -CONFIG_NET_ACT_MIRRED=m -# CONFIG_NET_ACT_SAMPLE is not set -CONFIG_NET_ACT_IPT=m -CONFIG_NET_ACT_NAT=m -CONFIG_NET_ACT_PEDIT=m -CONFIG_NET_ACT_SIMP=m -CONFIG_NET_ACT_SKBEDIT=m -CONFIG_NET_ACT_CSUM=m -CONFIG_NET_ACT_VLAN=m -CONFIG_NET_ACT_BPF=m -CONFIG_NET_ACT_CONNMARK=m -CONFIG_NET_ACT_SKBMOD=m -CONFIG_NET_ACT_IFE=m -CONFIG_NET_ACT_TUNNEL_KEY=m -CONFIG_NET_IFE_SKBMARK=m -CONFIG_NET_IFE_SKBPRIO=m -CONFIG_NET_IFE_SKBTCINDEX=m -CONFIG_NET_CLS_IND=y -CONFIG_NET_SCH_FIFO=y -CONFIG_DCB=y -CONFIG_DNS_RESOLVER=m -CONFIG_BATMAN_ADV=m -# CONFIG_BATMAN_ADV_BATMAN_V is not set -CONFIG_BATMAN_ADV_BLA=y -CONFIG_BATMAN_ADV_DAT=y -CONFIG_BATMAN_ADV_NC=y -CONFIG_BATMAN_ADV_MCAST=y -CONFIG_BATMAN_ADV_DEBUGFS=y -# CONFIG_BATMAN_ADV_DEBUG is not set -CONFIG_OPENVSWITCH=m -CONFIG_OPENVSWITCH_GRE=m -CONFIG_OPENVSWITCH_VXLAN=m -CONFIG_OPENVSWITCH_GENEVE=m -CONFIG_VSOCKETS=m -CONFIG_VSOCKETS_DIAG=m -CONFIG_VIRTIO_VSOCKETS=m -CONFIG_VIRTIO_VSOCKETS_COMMON=m -CONFIG_NETLINK_DIAG=m -CONFIG_MPLS=y -CONFIG_NET_MPLS_GSO=y -CONFIG_MPLS_ROUTING=m -CONFIG_MPLS_IPTUNNEL=m -CONFIG_NET_NSH=m -# CONFIG_HSR is not set -CONFIG_NET_SWITCHDEV=y -CONFIG_NET_L3_MASTER_DEV=y -# CONFIG_NET_NCSI is not set -CONFIG_RPS=y -CONFIG_RFS_ACCEL=y -CONFIG_XPS=y -CONFIG_CGROUP_NET_PRIO=y -CONFIG_CGROUP_NET_CLASSID=y -CONFIG_NET_RX_BUSY_POLL=y -CONFIG_BQL=y -CONFIG_BPF_JIT=y -# CONFIG_BPF_STREAM_PARSER is not set -CONFIG_NET_FLOW_LIMIT=y - -# -# Network testing -# -CONFIG_NET_PKTGEN=m -CONFIG_NET_DROP_MONITOR=m -# CONFIG_HAMRADIO is not set -CONFIG_CAN=m -CONFIG_CAN_RAW=m -CONFIG_CAN_BCM=m -CONFIG_CAN_GW=m - -# -# CAN Device Drivers -# -CONFIG_CAN_VCAN=m -# CONFIG_CAN_VXCAN is not set -CONFIG_CAN_SLCAN=m -CONFIG_CAN_DEV=m -CONFIG_CAN_CALC_BITTIMING=y -# CONFIG_CAN_LEDS is not set -# CONFIG_CAN_FLEXCAN is not set -# CONFIG_CAN_GRCAN is not set -CONFIG_CAN_SUN4I=m -# CONFIG_CAN_TI_HECC is not set -# CONFIG_CAN_C_CAN is not set -# CONFIG_CAN_CC770 is not set -# CONFIG_CAN_IFI_CANFD is not set -# CONFIG_CAN_M_CAN is not set -# CONFIG_CAN_PEAK_PCIEFD is not set -# CONFIG_CAN_RCAR is not set -# CONFIG_CAN_RCAR_CANFD is not set -CONFIG_CAN_SJA1000=m -CONFIG_CAN_SJA1000_ISA=m -# CONFIG_CAN_SJA1000_PLATFORM is not set -CONFIG_CAN_EMS_PCI=m -CONFIG_CAN_PEAK_PCI=m -CONFIG_CAN_PEAK_PCIEC=y -CONFIG_CAN_KVASER_PCI=m -CONFIG_CAN_PLX_PCI=m -CONFIG_CAN_SOFTING=m - -# -# CAN SPI interfaces -# -# CONFIG_CAN_HI311X is not set -# CONFIG_CAN_MCP251X is not set - -# -# CAN USB interfaces -# -CONFIG_CAN_EMS_USB=m -CONFIG_CAN_ESD_USB2=m -CONFIG_CAN_GS_USB=m -CONFIG_CAN_KVASER_USB=m -CONFIG_CAN_PEAK_USB=m -CONFIG_CAN_8DEV_USB=m -# CONFIG_CAN_MCBA_USB is not set -# CONFIG_CAN_DEBUG_DEVICES is not set -CONFIG_BT=m -CONFIG_BT_BREDR=y -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_HIDP=m -CONFIG_BT_HS=y -CONFIG_BT_LE=y -CONFIG_BT_6LOWPAN=m -# CONFIG_BT_LEDS is not set -# CONFIG_BT_SELFTEST is not set -CONFIG_BT_DEBUGFS=y - -# -# Bluetooth device drivers -# -CONFIG_BT_INTEL=m -CONFIG_BT_BCM=m -CONFIG_BT_RTL=m -CONFIG_BT_HCIBTUSB=m -# CONFIG_BT_HCIBTUSB_AUTOSUSPEND is not set -CONFIG_BT_HCIBTUSB_BCM=y -CONFIG_BT_HCIBTUSB_RTL=y -CONFIG_BT_HCIBTSDIO=m -# CONFIG_BT_HCIUART is not set -# CONFIG_BT_HCIBCM203X is not set -# CONFIG_BT_HCIBPA10X is not set -# CONFIG_BT_HCIBFUSB is not set -# CONFIG_BT_HCIVHCI is not set -CONFIG_BT_MRVL=m -CONFIG_BT_MRVL_SDIO=m -CONFIG_BT_ATH3K=m -CONFIG_BT_WILINK=m -CONFIG_BT_HCIRSI=m -CONFIG_AF_RXRPC=m -CONFIG_AF_RXRPC_IPV6=y -# CONFIG_AF_RXRPC_INJECT_LOSS is not set -# CONFIG_AF_RXRPC_DEBUG is not set -CONFIG_RXKAD=y -# CONFIG_AF_KCM is not set -CONFIG_FIB_RULES=y -CONFIG_WIRELESS=y -CONFIG_WIRELESS_EXT=y -CONFIG_WEXT_CORE=y -CONFIG_WEXT_PROC=y -CONFIG_WEXT_SPY=y -CONFIG_WEXT_PRIV=y -CONFIG_CFG80211=m -# CONFIG_NL80211_TESTMODE is not set -# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set -# CONFIG_CFG80211_CERTIFICATION_ONUS is not set -CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y -CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y -CONFIG_CFG80211_DEFAULT_PS=y -# CONFIG_CFG80211_DEBUGFS is not set -CONFIG_CFG80211_CRDA_SUPPORT=y -CONFIG_CFG80211_WEXT=y -CONFIG_CFG80211_WEXT_EXPORT=y -CONFIG_LIB80211=m -CONFIG_LIB80211_CRYPT_WEP=m -CONFIG_LIB80211_CRYPT_CCMP=m -CONFIG_LIB80211_CRYPT_TKIP=m -# CONFIG_LIB80211_DEBUG is not set -CONFIG_MAC80211=m -CONFIG_MAC80211_HAS_RC=y -CONFIG_MAC80211_RC_MINSTREL=y -CONFIG_MAC80211_RC_MINSTREL_HT=y -# CONFIG_MAC80211_RC_MINSTREL_VHT is not set -CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y -CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" -CONFIG_MAC80211_MESH=y -CONFIG_MAC80211_LEDS=y -# CONFIG_MAC80211_DEBUGFS is not set -# CONFIG_MAC80211_MESSAGE_TRACING is not set -# CONFIG_MAC80211_DEBUG_MENU is not set -CONFIG_MAC80211_STA_HASH_MAX_SIZE=0 -CONFIG_WIMAX=m -CONFIG_WIMAX_DEBUG_LEVEL=8 -CONFIG_RFKILL=m -CONFIG_RFKILL_LEDS=y -CONFIG_RFKILL_INPUT=y -# CONFIG_RFKILL_GPIO is not set -CONFIG_NET_9P=m -CONFIG_NET_9P_VIRTIO=m -# CONFIG_NET_9P_XEN is not set -CONFIG_NET_9P_RDMA=m -# CONFIG_NET_9P_DEBUG is not set -# CONFIG_CAIF is not set -CONFIG_CEPH_LIB=m -# CONFIG_CEPH_LIB_PRETTYDEBUG is not set -# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set -CONFIG_NFC=m -CONFIG_NFC_DIGITAL=m -# CONFIG_NFC_NCI is not set -# CONFIG_NFC_HCI is not set - -# -# Near Field Communication (NFC) devices -# -# CONFIG_NFC_TRF7970A is not set -CONFIG_NFC_SIM=m -CONFIG_NFC_PORT100=m -CONFIG_NFC_PN533=m -CONFIG_NFC_PN533_USB=m -# CONFIG_NFC_PN533_I2C is not set -# CONFIG_NFC_ST95HF is not set -# CONFIG_PSAMPLE is not set -CONFIG_NET_IFE=m -CONFIG_LWTUNNEL=y -CONFIG_LWTUNNEL_BPF=y -CONFIG_DST_CACHE=y -CONFIG_GRO_CELLS=y -CONFIG_NET_DEVLINK=m -CONFIG_MAY_USE_DEVLINK=m -CONFIG_PAGE_POOL=y -CONFIG_FAILOVER=m -CONFIG_HAVE_EBPF_JIT=y - -# -# Device Drivers -# -CONFIG_ARM_AMBA=y -CONFIG_TEGRA_AHB=y - -# -# Generic Driver Options -# -# CONFIG_UEVENT_HELPER is not set -CONFIG_DEVTMPFS=y -CONFIG_DEVTMPFS_MOUNT=y -CONFIG_STANDALONE=y -CONFIG_PREVENT_FIRMWARE_BUILD=y - -# -# Firmware loader -# -CONFIG_FW_LOADER=y -CONFIG_EXTRA_FIRMWARE="" -CONFIG_FW_LOADER_USER_HELPER=y -# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set -CONFIG_WANT_DEV_COREDUMP=y -CONFIG_ALLOW_DEV_COREDUMP=y -CONFIG_DEV_COREDUMP=y -# CONFIG_DEBUG_DRIVER is not set -# CONFIG_DEBUG_DEVRES is not set -# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set -# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set -CONFIG_SYS_HYPERVISOR=y -CONFIG_GENERIC_CPU_AUTOPROBE=y -CONFIG_SOC_BUS=y -CONFIG_REGMAP=y -CONFIG_REGMAP_AC97=m -CONFIG_REGMAP_I2C=y -CONFIG_REGMAP_SPI=y -CONFIG_REGMAP_W1=m -CONFIG_REGMAP_MMIO=y -CONFIG_REGMAP_IRQ=y -CONFIG_DMA_SHARED_BUFFER=y -# CONFIG_DMA_FENCE_TRACE is not set -CONFIG_DMA_CMA=y - -# -# Default contiguous memory area size: -# -CONFIG_CMA_SIZE_MBYTES=16 -CONFIG_CMA_SIZE_SEL_MBYTES=y -# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set -# CONFIG_CMA_SIZE_SEL_MIN is not set -# CONFIG_CMA_SIZE_SEL_MAX is not set -CONFIG_CMA_ALIGNMENT=8 -CONFIG_GENERIC_ARCH_TOPOLOGY=y - -# -# Bus devices -# -CONFIG_ARM_CCI=y -CONFIG_ARM_CCI400_COMMON=y -CONFIG_ARM_CCI400_PORT_CTRL=y -# CONFIG_BRCMSTB_GISB_ARB is not set -# CONFIG_IMX_WEIM is not set -CONFIG_MVEBU_MBUS=y -CONFIG_OMAP_INTERCONNECT=y -CONFIG_OMAP_OCP2SCP=m -# CONFIG_SIMPLE_PM_BUS is not set -CONFIG_SUNXI_RSB=y -# CONFIG_TEGRA_GMI is not set -CONFIG_TI_SYSC=y -CONFIG_VEXPRESS_CONFIG=y -CONFIG_CONNECTOR=y -CONFIG_PROC_EVENTS=y -CONFIG_MTD=y -# CONFIG_MTD_TESTS is not set -# CONFIG_MTD_REDBOOT_PARTS is not set -# CONFIG_MTD_CMDLINE_PARTS is not set -# CONFIG_MTD_AFS_PARTS is not set -CONFIG_MTD_OF_PARTS=m -CONFIG_MTD_AR7_PARTS=m - -# -# Partition parsers -# - -# -# User Modules And Translation Layers -# -CONFIG_MTD_BLKDEVS=m -CONFIG_MTD_BLOCK=m -CONFIG_MTD_BLOCK_RO=m -# CONFIG_FTL is not set -# CONFIG_NFTL is not set -# CONFIG_INFTL is not set -CONFIG_RFD_FTL=m -CONFIG_SSFDC=m -# CONFIG_SM_FTL is not set -CONFIG_MTD_OOPS=m -CONFIG_MTD_SWAP=m -# CONFIG_MTD_PARTITIONED_MASTER is not set - -# -# RAM/ROM/Flash chip drivers -# -# CONFIG_MTD_CFI is not set -# CONFIG_MTD_JEDECPROBE is not set -CONFIG_MTD_MAP_BANK_WIDTH_1=y -CONFIG_MTD_MAP_BANK_WIDTH_2=y -CONFIG_MTD_MAP_BANK_WIDTH_4=y -CONFIG_MTD_CFI_I1=y -CONFIG_MTD_CFI_I2=y -CONFIG_MTD_RAM=m -# CONFIG_MTD_ROM is not set -# CONFIG_MTD_ABSENT is not set - -# -# Mapping drivers for chip access -# -# CONFIG_MTD_COMPLEX_MAPPINGS is not set -CONFIG_MTD_PHYSMAP=m -# CONFIG_MTD_PHYSMAP_COMPAT is not set -# CONFIG_MTD_PHYSMAP_OF is not set -CONFIG_MTD_INTEL_VR_NOR=m -CONFIG_MTD_PLATRAM=m - -# -# Self-contained MTD device drivers -# -# CONFIG_MTD_PMC551 is not set -CONFIG_MTD_DATAFLASH=m -# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set -# CONFIG_MTD_DATAFLASH_OTP is not set -CONFIG_MTD_M25P80=m -# CONFIG_MTD_MCHP23K256 is not set -CONFIG_MTD_SST25L=m -# CONFIG_MTD_SLRAM is not set -# CONFIG_MTD_PHRAM is not set -# CONFIG_MTD_MTDRAM is not set -# CONFIG_MTD_BLOCK2MTD is not set - -# -# Disk-On-Chip Device Drivers -# -# CONFIG_MTD_DOCG3 is not set -CONFIG_MTD_ONENAND=y -CONFIG_MTD_ONENAND_VERIFY_WRITE=y -# CONFIG_MTD_ONENAND_GENERIC is not set -CONFIG_MTD_ONENAND_OMAP2=m -# CONFIG_MTD_ONENAND_SAMSUNG is not set -# CONFIG_MTD_ONENAND_OTP is not set -CONFIG_MTD_ONENAND_2X_PROGRAM=y -CONFIG_MTD_NAND_ECC=y -# CONFIG_MTD_NAND_ECC_SMC is not set -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_BCH=y -CONFIG_MTD_NAND_ECC_BCH=y -CONFIG_MTD_SM_COMMON=m -# CONFIG_MTD_NAND_DENALI_PCI is not set -# CONFIG_MTD_NAND_DENALI_DT is not set -# CONFIG_MTD_NAND_GPIO is not set -CONFIG_MTD_NAND_OMAP2=m -# CONFIG_MTD_NAND_OMAP_BCH is not set -CONFIG_MTD_NAND_RICOH=m -# CONFIG_MTD_NAND_DISKONCHIP is not set -# CONFIG_MTD_NAND_DOCG4 is not set -CONFIG_MTD_NAND_CAFE=m -CONFIG_MTD_NAND_MARVELL=m -CONFIG_MTD_NAND_NANDSIM=m -CONFIG_MTD_NAND_GPMI_NAND=m -# CONFIG_MTD_NAND_BRCMNAND is not set -# CONFIG_MTD_NAND_PLATFORM is not set -CONFIG_MTD_NAND_ORION=m -CONFIG_MTD_NAND_MXC=m -CONFIG_MTD_NAND_SUNXI=m - -# -# LPDDR & LPDDR2 PCM memory drivers -# -CONFIG_MTD_LPDDR=m -CONFIG_MTD_QINFO_PROBE=m -# CONFIG_MTD_LPDDR2_NVM is not set -CONFIG_MTD_SPI_NOR=m -# CONFIG_MTD_MT81xx_NOR is not set -CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y -# CONFIG_SPI_CADENCE_QUADSPI is not set -# CONFIG_SPI_FSL_QUADSPI is not set -CONFIG_MTD_UBI=m -CONFIG_MTD_UBI_WL_THRESHOLD=4096 -CONFIG_MTD_UBI_BEB_LIMIT=20 -# CONFIG_MTD_UBI_FASTMAP is not set -# CONFIG_MTD_UBI_GLUEBI is not set -CONFIG_MTD_UBI_BLOCK=y -CONFIG_DTC=y -CONFIG_OF=y -# CONFIG_OF_UNITTEST is not set -CONFIG_OF_FLATTREE=y -CONFIG_OF_EARLY_FLATTREE=y -CONFIG_OF_KOBJ=y -CONFIG_OF_DYNAMIC=y -CONFIG_OF_ADDRESS=y -CONFIG_OF_IRQ=y -CONFIG_OF_NET=y -CONFIG_OF_MDIO=y -CONFIG_OF_RESERVED_MEM=y -CONFIG_OF_RESOLVE=y -CONFIG_OF_OVERLAY=y -CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y -CONFIG_PARPORT=m -# CONFIG_PARPORT_PC is not set -# CONFIG_PARPORT_AX88796 is not set -CONFIG_PARPORT_1284=y -CONFIG_PARPORT_NOT_PC=y -CONFIG_BLK_DEV=y -CONFIG_BLK_DEV_NULL_BLK=m -CONFIG_CDROM=m -CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m -CONFIG_ZRAM=m -# CONFIG_ZRAM_WRITEBACK is not set -# CONFIG_ZRAM_MEMORY_TRACKING is not set -# CONFIG_BLK_DEV_DAC960 is not set -# CONFIG_BLK_DEV_UMEM is not set -CONFIG_BLK_DEV_LOOP=m -CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 -# CONFIG_BLK_DEV_CRYPTOLOOP is not set -CONFIG_BLK_DEV_DRBD=m -# CONFIG_DRBD_FAULT_INJECTION is not set -CONFIG_BLK_DEV_NBD=m -# CONFIG_BLK_DEV_SX8 is not set -CONFIG_BLK_DEV_RAM=m -CONFIG_BLK_DEV_RAM_COUNT=16 -CONFIG_BLK_DEV_RAM_SIZE=16384 -# CONFIG_CDROM_PKTCDVD is not set -CONFIG_ATA_OVER_ETH=m -CONFIG_XEN_BLKDEV_FRONTEND=m -CONFIG_XEN_BLKDEV_BACKEND=m -CONFIG_VIRTIO_BLK=m -# CONFIG_VIRTIO_BLK_SCSI is not set -CONFIG_BLK_DEV_RBD=m -# CONFIG_BLK_DEV_RSXX is not set - -# -# NVME Support -# -CONFIG_NVME_CORE=y -CONFIG_BLK_DEV_NVME=y -# CONFIG_NVME_MULTIPATH is not set -CONFIG_NVME_FABRICS=m -CONFIG_NVME_RDMA=m -# CONFIG_NVME_FC is not set -CONFIG_NVME_TARGET=m -# CONFIG_NVME_TARGET_LOOP is not set -CONFIG_NVME_TARGET_RDMA=m -# CONFIG_NVME_TARGET_FC is not set - -# -# Misc devices -# -CONFIG_SENSORS_LIS3LV02D=m -CONFIG_AD525X_DPOT=m -CONFIG_AD525X_DPOT_I2C=m -CONFIG_AD525X_DPOT_SPI=m -# CONFIG_DUMMY_IRQ is not set -# CONFIG_PHANTOM is not set -CONFIG_SGI_IOC4=m -CONFIG_TIFM_CORE=m -CONFIG_TIFM_7XX1=m -CONFIG_ICS932S401=m -CONFIG_ENCLOSURE_SERVICES=m -# CONFIG_HP_ILO is not set -CONFIG_APDS9802ALS=m -CONFIG_ISL29003=m -CONFIG_ISL29020=m -CONFIG_SENSORS_TSL2550=m -CONFIG_SENSORS_BH1770=m -CONFIG_SENSORS_APDS990X=m -CONFIG_HMC6352=m -CONFIG_DS1682=m -# CONFIG_USB_SWITCH_FSA9480 is not set -# CONFIG_LATTICE_ECP3_CONFIG is not set -CONFIG_SRAM=y -CONFIG_SRAM_EXEC=y -CONFIG_VEXPRESS_SYSCFG=y -# CONFIG_PCI_ENDPOINT_TEST is not set -CONFIG_MISC_RTSX=m -CONFIG_C2PORT=m - -# -# EEPROM support -# -CONFIG_EEPROM_AT24=m -CONFIG_EEPROM_AT25=m -CONFIG_EEPROM_LEGACY=m -CONFIG_EEPROM_MAX6875=m -CONFIG_EEPROM_93CX6=m -# CONFIG_EEPROM_93XX46 is not set -# CONFIG_EEPROM_IDT_89HPESX is not set -CONFIG_CB710_CORE=m -# CONFIG_CB710_DEBUG is not set -CONFIG_CB710_DEBUG_ASSUMPTIONS=y - -# -# Texas Instruments shared transport line discipline -# -CONFIG_TI_ST=m -# CONFIG_SENSORS_LIS3_SPI is not set -CONFIG_SENSORS_LIS3_I2C=m -CONFIG_ALTERA_STAPL=m - -# -# Intel MIC & related support -# - -# -# Intel MIC Bus Driver -# - -# -# SCIF Bus Driver -# - -# -# VOP Bus Driver -# - -# -# Intel MIC Host Driver -# - -# -# Intel MIC Card Driver -# - -# -# SCIF Driver -# - -# -# Intel MIC Coprocessor State Management (COSM) Drivers -# - -# -# VOP Driver -# -# CONFIG_ECHO is not set -CONFIG_MISC_RTSX_PCI=m -CONFIG_MISC_RTSX_USB=m -CONFIG_HAVE_IDE=y -# CONFIG_IDE is not set - -# -# SCSI device support -# -CONFIG_SCSI_MOD=m -CONFIG_RAID_ATTRS=m -CONFIG_SCSI=m -CONFIG_SCSI_DMA=y -CONFIG_SCSI_NETLINK=y -# CONFIG_SCSI_MQ_DEFAULT is not set -# CONFIG_SCSI_PROC_FS is not set - -# -# SCSI support type (disk, tape, CD-ROM) -# -CONFIG_BLK_DEV_SD=m -CONFIG_CHR_DEV_ST=m -CONFIG_CHR_DEV_OSST=m -CONFIG_BLK_DEV_SR=m -CONFIG_BLK_DEV_SR_VENDOR=y -CONFIG_CHR_DEV_SG=m -CONFIG_CHR_DEV_SCH=m -CONFIG_SCSI_ENCLOSURE=m -CONFIG_SCSI_CONSTANTS=y -CONFIG_SCSI_LOGGING=y -CONFIG_SCSI_SCAN_ASYNC=y - -# -# SCSI Transports -# -CONFIG_SCSI_SPI_ATTRS=m -CONFIG_SCSI_FC_ATTRS=m -CONFIG_SCSI_ISCSI_ATTRS=m -CONFIG_SCSI_SAS_ATTRS=m -CONFIG_SCSI_SAS_LIBSAS=m -CONFIG_SCSI_SAS_ATA=y -CONFIG_SCSI_SAS_HOST_SMP=y -CONFIG_SCSI_SRP_ATTRS=m -CONFIG_SCSI_LOWLEVEL=y -CONFIG_ISCSI_TCP=m -CONFIG_ISCSI_BOOT_SYSFS=m -CONFIG_SCSI_CXGB3_ISCSI=m -CONFIG_SCSI_CXGB4_ISCSI=m -CONFIG_SCSI_BNX2_ISCSI=m -CONFIG_SCSI_BNX2X_FCOE=m -CONFIG_BE2ISCSI=m -# CONFIG_BLK_DEV_3W_XXXX_RAID is not set -CONFIG_SCSI_HPSA=m -# CONFIG_SCSI_3W_9XXX is not set -CONFIG_SCSI_3W_SAS=m -CONFIG_SCSI_ACARD=m -# CONFIG_SCSI_AACRAID is not set -# CONFIG_SCSI_AIC7XXX is not set -# CONFIG_SCSI_AIC79XX is not set -# CONFIG_SCSI_AIC94XX is not set -CONFIG_SCSI_MVSAS=m -# CONFIG_SCSI_MVSAS_DEBUG is not set -# CONFIG_SCSI_MVSAS_TASKLET is not set -CONFIG_SCSI_MVUMI=m -CONFIG_SCSI_ADVANSYS=m -# CONFIG_SCSI_ARCMSR is not set -CONFIG_SCSI_ESAS2R=m -# CONFIG_MEGARAID_NEWGEN is not set -# CONFIG_MEGARAID_LEGACY is not set -# CONFIG_MEGARAID_SAS is not set -CONFIG_SCSI_MPT3SAS=m -CONFIG_SCSI_MPT2SAS_MAX_SGE=128 -CONFIG_SCSI_MPT3SAS_MAX_SGE=128 -CONFIG_SCSI_MPT2SAS=m -CONFIG_SCSI_SMARTPQI=m -CONFIG_SCSI_UFSHCD=m -CONFIG_SCSI_UFSHCD_PCI=m -# CONFIG_SCSI_UFS_DWC_TC_PCI is not set -# CONFIG_SCSI_UFSHCD_PLATFORM is not set -# CONFIG_SCSI_HPTIOP is not set -CONFIG_XEN_SCSI_FRONTEND=m -CONFIG_LIBFC=m -CONFIG_LIBFCOE=m -CONFIG_FCOE=m -CONFIG_SCSI_SNIC=m -# CONFIG_SCSI_SNIC_DEBUG_FS is not set -CONFIG_SCSI_DMX3191D=m -# CONFIG_SCSI_IPS is not set -# CONFIG_SCSI_INITIO is not set -# CONFIG_SCSI_INIA100 is not set -CONFIG_SCSI_STEX=m -# CONFIG_SCSI_SYM53C8XX_2 is not set -# CONFIG_SCSI_IPR is not set -# CONFIG_SCSI_QLOGIC_1280 is not set -# CONFIG_SCSI_QLA_FC is not set -# CONFIG_SCSI_QLA_ISCSI is not set -# CONFIG_QEDI is not set -# CONFIG_QEDF is not set -CONFIG_SCSI_LPFC=m -# CONFIG_SCSI_LPFC_DEBUG_FS is not set -# CONFIG_SCSI_DC395x is not set -CONFIG_SCSI_AM53C974=m -# CONFIG_SCSI_NSP32 is not set -CONFIG_SCSI_WD719X=m -# CONFIG_SCSI_DEBUG is not set -CONFIG_SCSI_PMCRAID=m -CONFIG_SCSI_PM8001=m -CONFIG_SCSI_BFA_FC=m -CONFIG_SCSI_VIRTIO=m -CONFIG_SCSI_CHELSIO_FCOE=m -CONFIG_SCSI_DH=y -CONFIG_SCSI_DH_RDAC=m -CONFIG_SCSI_DH_HP_SW=m -CONFIG_SCSI_DH_EMC=m -CONFIG_SCSI_DH_ALUA=m -CONFIG_SCSI_OSD_INITIATOR=m -CONFIG_SCSI_OSD_ULD=m -CONFIG_SCSI_OSD_DPRINT_SENSE=1 -# CONFIG_SCSI_OSD_DEBUG is not set -CONFIG_HAVE_PATA_PLATFORM=y -CONFIG_ATA=m -CONFIG_ATA_VERBOSE_ERROR=y -CONFIG_SATA_PMP=y - -# -# Controllers with non-SFF native interface -# -CONFIG_SATA_AHCI=m -CONFIG_SATA_MOBILE_LPM_POLICY=0 -CONFIG_SATA_AHCI_PLATFORM=m -# CONFIG_AHCI_DM816 is not set -CONFIG_AHCI_IMX=m -# CONFIG_AHCI_CEVA is not set -CONFIG_AHCI_MVEBU=m -CONFIG_AHCI_SUNXI=m -CONFIG_AHCI_TEGRA=m -# CONFIG_AHCI_QORIQ is not set -# CONFIG_SATA_INIC162X is not set -CONFIG_SATA_ACARD_AHCI=m -CONFIG_SATA_SIL24=m -CONFIG_ATA_SFF=y - -# -# SFF controllers with custom DMA interface -# -CONFIG_PDC_ADMA=m -CONFIG_SATA_QSTOR=m -CONFIG_SATA_SX4=m -CONFIG_ATA_BMDMA=y - -# -# SATA SFF controllers with BMDMA -# -CONFIG_ATA_PIIX=m -# CONFIG_SATA_DWC is not set -CONFIG_SATA_HIGHBANK=m -CONFIG_SATA_MV=m -CONFIG_SATA_NV=m -CONFIG_SATA_PROMISE=m -CONFIG_SATA_SIL=m -CONFIG_SATA_SIS=m -CONFIG_SATA_SVW=m -CONFIG_SATA_ULI=m -CONFIG_SATA_VIA=m -CONFIG_SATA_VITESSE=m - -# -# PATA SFF controllers with BMDMA -# -# CONFIG_PATA_ALI is not set -# CONFIG_PATA_AMD is not set -CONFIG_PATA_ARTOP=m -# CONFIG_PATA_ATIIXP is not set -CONFIG_PATA_ATP867X=m -CONFIG_PATA_CMD64X=m -# CONFIG_PATA_CYPRESS is not set -# CONFIG_PATA_EFAR is not set -# CONFIG_PATA_HPT366 is not set -# CONFIG_PATA_HPT37X is not set -# CONFIG_PATA_HPT3X2N is not set -# CONFIG_PATA_HPT3X3 is not set -CONFIG_PATA_IMX=m -CONFIG_PATA_IT8213=m -CONFIG_PATA_IT821X=m -CONFIG_PATA_JMICRON=m -CONFIG_PATA_MARVELL=m -# CONFIG_PATA_NETCELL is not set -CONFIG_PATA_NINJA32=m -# CONFIG_PATA_NS87415 is not set -# CONFIG_PATA_OLDPIIX is not set -# CONFIG_PATA_OPTIDMA is not set -# CONFIG_PATA_PDC2027X is not set -# CONFIG_PATA_PDC_OLD is not set -# CONFIG_PATA_RADISYS is not set -CONFIG_PATA_RDC=m -CONFIG_PATA_SCH=m -# CONFIG_PATA_SERVERWORKS is not set -# CONFIG_PATA_SIL680 is not set -CONFIG_PATA_SIS=m -CONFIG_PATA_TOSHIBA=m -# CONFIG_PATA_TRIFLEX is not set -# CONFIG_PATA_VIA is not set -# CONFIG_PATA_WINBOND is not set - -# -# PIO-only SFF controllers -# -# CONFIG_PATA_CMD640_PCI is not set -# CONFIG_PATA_MPIIX is not set -# CONFIG_PATA_NS87410 is not set -# CONFIG_PATA_OPTI is not set -CONFIG_PATA_PLATFORM=m -CONFIG_PATA_OF_PLATFORM=m -# CONFIG_PATA_RZ1000 is not set - -# -# Generic fallback / legacy drivers -# -CONFIG_ATA_GENERIC=m -# CONFIG_PATA_LEGACY is not set -CONFIG_MD=y -CONFIG_BLK_DEV_MD=m -CONFIG_MD_LINEAR=m -CONFIG_MD_RAID0=m -CONFIG_MD_RAID1=m -CONFIG_MD_RAID10=m -CONFIG_MD_RAID456=m -CONFIG_MD_MULTIPATH=m -CONFIG_MD_FAULTY=m -# CONFIG_MD_CLUSTER is not set -CONFIG_BCACHE=m -# CONFIG_BCACHE_DEBUG is not set -# CONFIG_BCACHE_CLOSURES_DEBUG is not set -CONFIG_BLK_DEV_DM_BUILTIN=y -CONFIG_BLK_DEV_DM=m -# CONFIG_DM_MQ_DEFAULT is not set -# CONFIG_DM_DEBUG is not set -CONFIG_DM_BUFIO=m -# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set -CONFIG_DM_BIO_PRISON=m -CONFIG_DM_PERSISTENT_DATA=m -CONFIG_DM_UNSTRIPED=m -CONFIG_DM_CRYPT=m -CONFIG_DM_SNAPSHOT=m -CONFIG_DM_THIN_PROVISIONING=m -CONFIG_DM_CACHE=m -CONFIG_DM_CACHE_SMQ=m -# CONFIG_DM_WRITECACHE is not set -CONFIG_DM_ERA=m -CONFIG_DM_MIRROR=m -CONFIG_DM_LOG_USERSPACE=m -CONFIG_DM_RAID=m -CONFIG_DM_ZERO=m -CONFIG_DM_MULTIPATH=m -CONFIG_DM_MULTIPATH_QL=m -CONFIG_DM_MULTIPATH_ST=m -CONFIG_DM_DELAY=m -CONFIG_DM_UEVENT=y -CONFIG_DM_FLAKEY=m -CONFIG_DM_VERITY=m -# CONFIG_DM_VERITY_FEC is not set -CONFIG_DM_SWITCH=m -CONFIG_DM_LOG_WRITES=m -# CONFIG_DM_INTEGRITY is not set -CONFIG_TARGET_CORE=m -CONFIG_TCM_IBLOCK=m -CONFIG_TCM_FILEIO=m -CONFIG_TCM_PSCSI=m -CONFIG_TCM_USER2=m -CONFIG_LOOPBACK_TARGET=m -CONFIG_TCM_FC=m -CONFIG_ISCSI_TARGET=m -CONFIG_ISCSI_TARGET_CXGB4=m -CONFIG_SBP_TARGET=m -CONFIG_FUSION=y -CONFIG_FUSION_SPI=m -CONFIG_FUSION_FC=m -CONFIG_FUSION_SAS=m -CONFIG_FUSION_MAX_SGE=128 -CONFIG_FUSION_CTL=m -# CONFIG_FUSION_LOGGING is not set - -# -# IEEE 1394 (FireWire) support -# -CONFIG_FIREWIRE=m -CONFIG_FIREWIRE_OHCI=m -CONFIG_FIREWIRE_SBP2=m -CONFIG_FIREWIRE_NET=m -CONFIG_FIREWIRE_NOSY=m -CONFIG_NETDEVICES=y -CONFIG_MII=m -CONFIG_NET_CORE=y -CONFIG_BONDING=m -CONFIG_DUMMY=m -CONFIG_EQUALIZER=m -# CONFIG_NET_FC is not set -CONFIG_IFB=m -CONFIG_NET_TEAM=m -CONFIG_NET_TEAM_MODE_BROADCAST=m -CONFIG_NET_TEAM_MODE_ROUNDROBIN=m -CONFIG_NET_TEAM_MODE_RANDOM=m -CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m -CONFIG_NET_TEAM_MODE_LOADBALANCE=m -CONFIG_MACVLAN=m -CONFIG_MACVTAP=m -CONFIG_IPVLAN=m -# CONFIG_IPVTAP is not set -CONFIG_VXLAN=m -CONFIG_GENEVE=m -CONFIG_GTP=m -CONFIG_MACSEC=m -CONFIG_NETCONSOLE=m -CONFIG_NETCONSOLE_DYNAMIC=y -CONFIG_NETPOLL=y -CONFIG_NET_POLL_CONTROLLER=y -CONFIG_TUN=m -CONFIG_TAP=m -# CONFIG_TUN_VNET_CROSS_LE is not set -CONFIG_VETH=m -CONFIG_VIRTIO_NET=m -CONFIG_NLMON=m -CONFIG_NET_VRF=m -# CONFIG_ARCNET is not set -CONFIG_ATM_DRIVERS=y -CONFIG_ATM_DUMMY=m -# CONFIG_ATM_TCP is not set -# CONFIG_ATM_LANAI is not set -# CONFIG_ATM_ENI is not set -CONFIG_ATM_NICSTAR=m -CONFIG_ATM_NICSTAR_USE_SUNI=y -CONFIG_ATM_NICSTAR_USE_IDT77105=y -# CONFIG_ATM_IDT77252 is not set -CONFIG_ATM_IA=m -# CONFIG_ATM_IA_DEBUG is not set -CONFIG_ATM_FORE200E=m -# CONFIG_ATM_FORE200E_USE_TASKLET is not set -CONFIG_ATM_FORE200E_TX_RETRY=16 -CONFIG_ATM_FORE200E_DEBUG=0 -# CONFIG_ATM_HE is not set -CONFIG_ATM_SOLOS=m - -# -# CAIF transport drivers -# - -# -# Distributed Switch Architecture drivers -# -CONFIG_B53=m -# CONFIG_B53_SPI_DRIVER is not set -CONFIG_B53_MDIO_DRIVER=m -# CONFIG_B53_MMAP_DRIVER is not set -# CONFIG_B53_SRAB_DRIVER is not set -CONFIG_NET_DSA_BCM_SF2=m -# CONFIG_NET_DSA_LOOP is not set -# CONFIG_NET_DSA_MT7530 is not set -CONFIG_NET_DSA_MV88E6060=m -# CONFIG_MICROCHIP_KSZ is not set -CONFIG_NET_DSA_MV88E6XXX=m -CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y -# CONFIG_NET_DSA_MV88E6XXX_PTP is not set -# CONFIG_NET_DSA_QCA8K is not set -# CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set -# CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set -CONFIG_ETHERNET=y -CONFIG_MDIO=m -CONFIG_NET_VENDOR_3COM=y -CONFIG_TYPHOON=m -CONFIG_NET_VENDOR_ADAPTEC=y -CONFIG_ADAPTEC_STARFIRE=m -CONFIG_NET_VENDOR_AGERE=y -CONFIG_ET131X=m -CONFIG_NET_VENDOR_ALACRITECH=y -# CONFIG_SLICOSS is not set -CONFIG_NET_VENDOR_ALLWINNER=y -CONFIG_SUN4I_EMAC=m -CONFIG_NET_VENDOR_ALTEON=y -CONFIG_ACENIC=m -# CONFIG_ACENIC_OMIT_TIGON_I is not set -# CONFIG_ALTERA_TSE is not set -CONFIG_NET_VENDOR_AMAZON=y -CONFIG_NET_VENDOR_AMD=y -# CONFIG_AMD8111_ETH is not set -CONFIG_PCNET32=m -CONFIG_NET_VENDOR_AQUANTIA=y -# CONFIG_NET_VENDOR_ARC is not set -CONFIG_NET_VENDOR_ATHEROS=y -CONFIG_ATL2=m -CONFIG_ATL1=m -CONFIG_ATL1E=m -CONFIG_ATL1C=m -CONFIG_ALX=m -# CONFIG_NET_VENDOR_AURORA is not set -CONFIG_NET_VENDOR_BROADCOM=y -# CONFIG_B44 is not set -# CONFIG_BCMGENET is not set -CONFIG_BNX2=m -CONFIG_CNIC=m -CONFIG_TIGON3=m -CONFIG_TIGON3_HWMON=y -CONFIG_BNX2X=m -# CONFIG_SYSTEMPORT is not set -CONFIG_BNXT=m -CONFIG_BNXT_FLOWER_OFFLOAD=y -# CONFIG_BNXT_DCB is not set -CONFIG_NET_VENDOR_BROCADE=y -CONFIG_BNA=m -CONFIG_NET_CADENCE=y -# CONFIG_MACB is not set -CONFIG_NET_CALXEDA_XGMAC=m -CONFIG_NET_VENDOR_CAVIUM=y -CONFIG_NET_VENDOR_CHELSIO=y -CONFIG_CHELSIO_T1=m -CONFIG_CHELSIO_T1_1G=y -CONFIG_CHELSIO_T3=m -CONFIG_CHELSIO_T4=m -CONFIG_CHELSIO_T4_DCB=y -CONFIG_CHELSIO_T4_FCOE=y -CONFIG_CHELSIO_T4VF=m -CONFIG_CHELSIO_LIB=m -CONFIG_NET_VENDOR_CIRRUS=y -# CONFIG_CS89x0 is not set -CONFIG_NET_VENDOR_CISCO=y -CONFIG_ENIC=m -CONFIG_NET_VENDOR_CORTINA=y -CONFIG_GEMINI_ETHERNET=m -# CONFIG_DM9000 is not set -# CONFIG_DNET is not set -CONFIG_NET_VENDOR_DEC=y -CONFIG_NET_TULIP=y -CONFIG_DE2104X=m -CONFIG_DE2104X_DSL=0 -CONFIG_TULIP=m -# CONFIG_TULIP_MWI is not set -# CONFIG_TULIP_MMIO is not set -CONFIG_TULIP_NAPI=y -CONFIG_TULIP_NAPI_HW_MITIGATION=y -CONFIG_WINBOND_840=m -CONFIG_DM9102=m -CONFIG_ULI526X=m -CONFIG_NET_VENDOR_DLINK=y -CONFIG_DL2K=m -CONFIG_SUNDANCE=m -# CONFIG_SUNDANCE_MMIO is not set -CONFIG_NET_VENDOR_EMULEX=y -CONFIG_BE2NET=m -CONFIG_BE2NET_HWMON=y -CONFIG_NET_VENDOR_EZCHIP=y -# CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set -CONFIG_NET_VENDOR_FARADAY=y -# CONFIG_FTMAC100 is not set -# CONFIG_FTGMAC100 is not set -CONFIG_NET_VENDOR_FREESCALE=y -CONFIG_FEC=y -# CONFIG_FSL_PQ_MDIO is not set -# CONFIG_FSL_XGMAC_MDIO is not set -# CONFIG_GIANFAR is not set -CONFIG_NET_VENDOR_HISILICON=y -# CONFIG_HIX5HD2_GMAC is not set -# CONFIG_HISI_FEMAC is not set -# CONFIG_HIP04_ETH is not set -# CONFIG_HNS is not set -# CONFIG_HNS_DSAF is not set -# CONFIG_HNS_ENET is not set -# CONFIG_HNS3 is not set -CONFIG_NET_VENDOR_HP=y -# CONFIG_HP100 is not set -CONFIG_NET_VENDOR_HUAWEI=y -CONFIG_NET_VENDOR_I825XX=y -CONFIG_NET_VENDOR_INTEL=y -CONFIG_E100=m -CONFIG_E1000=m -CONFIG_E1000E=m -CONFIG_IGB=m -CONFIG_IGB_HWMON=y -CONFIG_IGBVF=m -CONFIG_IXGB=m -CONFIG_IXGBE=m -CONFIG_IXGBE_HWMON=y -CONFIG_IXGBE_DCB=y -CONFIG_IXGBEVF=m -CONFIG_I40E=m -CONFIG_I40E_DCB=y -CONFIG_I40EVF=m -# CONFIG_ICE is not set -# CONFIG_FM10K is not set -CONFIG_NET_VENDOR_EXAR=y -CONFIG_S2IO=m -CONFIG_VXGE=m -# CONFIG_VXGE_DEBUG_TRACE_ALL is not set -CONFIG_JME=m -CONFIG_NET_VENDOR_MARVELL=y -# CONFIG_MV643XX_ETH is not set -CONFIG_MVMDIO=m -# CONFIG_MVNETA_BM_ENABLE is not set -CONFIG_MVNETA=m -CONFIG_MVPP2=m -CONFIG_SKGE=m -# CONFIG_SKGE_DEBUG is not set -CONFIG_SKGE_GENESIS=y -CONFIG_SKY2=m -# CONFIG_SKY2_DEBUG is not set -CONFIG_NET_VENDOR_MELLANOX=y -CONFIG_MLX4_EN=m -CONFIG_MLX4_EN_DCB=y -CONFIG_MLX4_CORE=m -CONFIG_MLX4_DEBUG=y -CONFIG_MLX4_CORE_GEN2=y -CONFIG_MLX5_CORE=m -# CONFIG_MLX5_FPGA is not set -CONFIG_MLX5_CORE_EN=y -CONFIG_MLX5_MPFS=y -CONFIG_MLX5_ESWITCH=y -CONFIG_MLX5_CORE_EN_DCB=y -# CONFIG_MLX5_CORE_IPOIB is not set -# CONFIG_MLXSW_CORE is not set -# CONFIG_MLXFW is not set -CONFIG_NET_VENDOR_MICREL=y -# CONFIG_KS8842 is not set -# CONFIG_KS8851 is not set -# CONFIG_KS8851_MLL is not set -CONFIG_KSZ884X_PCI=m -CONFIG_NET_VENDOR_MICROCHIP=y -CONFIG_ENC28J60=m -# CONFIG_ENC28J60_WRITEVERIFY is not set -# CONFIG_ENCX24J600 is not set -# CONFIG_LAN743X is not set -CONFIG_NET_VENDOR_MICROSEMI=y -# CONFIG_MSCC_OCELOT_SWITCH is not set -CONFIG_NET_VENDOR_MYRI=y -CONFIG_MYRI10GE=m -CONFIG_FEALNX=m -CONFIG_NET_VENDOR_NATSEMI=y -CONFIG_NATSEMI=m -CONFIG_NS83820=m -CONFIG_NET_VENDOR_NETRONOME=y -CONFIG_NFP=m -# CONFIG_NFP_APP_FLOWER is not set -CONFIG_NFP_APP_ABM_NIC=y -# CONFIG_NFP_DEBUG is not set -CONFIG_NET_VENDOR_NI=y -CONFIG_NET_VENDOR_8390=y -# CONFIG_AX88796 is not set -CONFIG_NE2K_PCI=m -CONFIG_NET_VENDOR_NVIDIA=y -# CONFIG_FORCEDETH is not set -CONFIG_NET_VENDOR_OKI=y -# CONFIG_ETHOC is not set -CONFIG_NET_PACKET_ENGINE=y -CONFIG_HAMACHI=m -CONFIG_YELLOWFIN=m -CONFIG_NET_VENDOR_QLOGIC=y -CONFIG_QLA3XXX=m -CONFIG_QLCNIC=m -CONFIG_QLCNIC_DCB=y -CONFIG_QLCNIC_HWMON=y -CONFIG_QLGE=m -CONFIG_NETXEN_NIC=m -CONFIG_QED=m -CONFIG_QEDE=m -CONFIG_NET_VENDOR_QUALCOMM=y -# CONFIG_QCA7000_SPI is not set -# CONFIG_QCOM_EMAC is not set -CONFIG_RMNET=m -CONFIG_NET_VENDOR_RDC=y -CONFIG_R6040=m -CONFIG_NET_VENDOR_REALTEK=y -CONFIG_8139CP=m -CONFIG_8139TOO=m -# CONFIG_8139TOO_PIO is not set -CONFIG_8139TOO_TUNE_TWISTER=y -CONFIG_8139TOO_8129=y -# CONFIG_8139_OLD_RX_RESET is not set -CONFIG_R8169=m -CONFIG_NET_VENDOR_RENESAS=y -CONFIG_NET_VENDOR_ROCKER=y -# CONFIG_ROCKER is not set -CONFIG_NET_VENDOR_SAMSUNG=y -# CONFIG_SXGBE_ETH is not set -# CONFIG_NET_VENDOR_SEEQ is not set -CONFIG_NET_VENDOR_SOLARFLARE=y -CONFIG_SFC=m -CONFIG_SFC_MTD=y -CONFIG_SFC_MCDI_MON=y -CONFIG_SFC_MCDI_LOGGING=y -CONFIG_SFC_FALCON=m -CONFIG_SFC_FALCON_MTD=y -CONFIG_NET_VENDOR_SILAN=y -CONFIG_SC92031=m -CONFIG_NET_VENDOR_SIS=y -# CONFIG_SIS900 is not set -CONFIG_SIS190=m -CONFIG_NET_VENDOR_SMSC=y -CONFIG_SMC91X=m -CONFIG_EPIC100=m -CONFIG_SMC911X=m -CONFIG_SMSC911X=m -CONFIG_SMSC9420=m -CONFIG_NET_VENDOR_SOCIONEXT=y -CONFIG_NET_VENDOR_STMICRO=y -CONFIG_STMMAC_ETH=m -CONFIG_STMMAC_PLATFORM=m -# CONFIG_DWMAC_DWC_QOS_ETH is not set -CONFIG_DWMAC_GENERIC=m -CONFIG_DWMAC_ROCKCHIP=m -CONFIG_DWMAC_SOCFPGA=m -CONFIG_DWMAC_SUNXI=m -CONFIG_DWMAC_SUN8I=m -# CONFIG_STMMAC_PCI is not set -CONFIG_NET_VENDOR_SUN=y -# CONFIG_HAPPYMEAL is not set -# CONFIG_SUNGEM is not set -CONFIG_CASSINI=m -CONFIG_NIU=m -CONFIG_NET_VENDOR_SYNOPSYS=y -# CONFIG_DWC_XLGMAC is not set -CONFIG_NET_VENDOR_TEHUTI=y -CONFIG_TEHUTI=m -CONFIG_NET_VENDOR_TI=y -CONFIG_TI_DAVINCI_EMAC=m -CONFIG_TI_DAVINCI_MDIO=m -CONFIG_TI_DAVINCI_CPDMA=m -CONFIG_TI_CPSW_PHY_SEL=y -CONFIG_TI_CPSW_ALE=m -CONFIG_TI_CPSW=m -# CONFIG_TI_CPTS is not set -CONFIG_TLAN=m -CONFIG_NET_VENDOR_VIA=y -# CONFIG_VIA_RHINE is not set -CONFIG_VIA_VELOCITY=m -CONFIG_NET_VENDOR_WIZNET=y -# CONFIG_WIZNET_W5100 is not set -# CONFIG_WIZNET_W5300 is not set -CONFIG_FDDI=y -CONFIG_DEFXX=m -# CONFIG_DEFXX_MMIO is not set -CONFIG_SKFP=m -# CONFIG_HIPPI is not set -CONFIG_MDIO_DEVICE=y -CONFIG_MDIO_BUS=y -CONFIG_MDIO_BCM_UNIMAC=m -# CONFIG_MDIO_BITBANG is not set -CONFIG_MDIO_BUS_MUX=m -# CONFIG_MDIO_BUS_MUX_GPIO is not set -# CONFIG_MDIO_BUS_MUX_MMIOREG is not set -# CONFIG_MDIO_HISI_FEMAC is not set -CONFIG_MDIO_I2C=m -# CONFIG_MDIO_MSCC_MIIM is not set -CONFIG_MDIO_SUN4I=y -CONFIG_PHYLINK=m -CONFIG_PHYLIB=y -CONFIG_SWPHY=y -# CONFIG_LED_TRIGGER_PHY is not set - -# -# MII PHY device drivers -# -CONFIG_SFP=m -CONFIG_AMD_PHY=m -CONFIG_AQUANTIA_PHY=m -CONFIG_ASIX_PHY=m -CONFIG_AT803X_PHY=m -CONFIG_BCM7XXX_PHY=m -CONFIG_BCM87XX_PHY=m -CONFIG_BCM_NET_PHYLIB=m -CONFIG_BROADCOM_PHY=m -CONFIG_CICADA_PHY=m -# CONFIG_CORTINA_PHY is not set -CONFIG_DAVICOM_PHY=m -CONFIG_DP83822_PHY=m -CONFIG_DP83TC811_PHY=m -CONFIG_DP83848_PHY=m -CONFIG_DP83867_PHY=m -CONFIG_FIXED_PHY=y -CONFIG_ICPLUS_PHY=m -# CONFIG_INTEL_XWAY_PHY is not set -CONFIG_LSI_ET1011C_PHY=m -CONFIG_LXT_PHY=m -CONFIG_MARVELL_PHY=m -# CONFIG_MARVELL_10G_PHY is not set -CONFIG_MICREL_PHY=m -CONFIG_MICROCHIP_PHY=m -CONFIG_MICROCHIP_T1_PHY=m -CONFIG_MICROSEMI_PHY=m -CONFIG_NATIONAL_PHY=m -CONFIG_QSEMI_PHY=m -CONFIG_REALTEK_PHY=m -CONFIG_RENESAS_PHY=m -CONFIG_ROCKCHIP_PHY=m -CONFIG_SMSC_PHY=m -CONFIG_STE10XP=m -CONFIG_TERANETICS_PHY=m -CONFIG_VITESSE_PHY=m -# CONFIG_XILINX_GMII2RGMII is not set -# CONFIG_MICREL_KS8995MA is not set -# CONFIG_PLIP is not set -CONFIG_PPP=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_FILTER=y -CONFIG_PPP_MPPE=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPPOATM=m -CONFIG_PPPOE=m -CONFIG_PPTP=m -CONFIG_PPPOL2TP=m -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_SLIP=m -CONFIG_SLHC=m -CONFIG_SLIP_COMPRESSED=y -CONFIG_SLIP_SMART=y -CONFIG_SLIP_MODE_SLIP6=y - -# -# Host-side USB support is needed for USB Network Adapter support -# -CONFIG_USB_NET_DRIVERS=m -CONFIG_USB_CATC=m -CONFIG_USB_KAWETH=m -CONFIG_USB_PEGASUS=m -CONFIG_USB_RTL8150=m -CONFIG_USB_RTL8152=m -CONFIG_USB_LAN78XX=m -CONFIG_USB_USBNET=m -CONFIG_USB_NET_AX8817X=m -CONFIG_USB_NET_AX88179_178A=m -CONFIG_USB_NET_CDCETHER=m -CONFIG_USB_NET_CDC_EEM=m -CONFIG_USB_NET_CDC_NCM=m -CONFIG_USB_NET_HUAWEI_CDC_NCM=m -CONFIG_USB_NET_CDC_MBIM=m -CONFIG_USB_NET_DM9601=m -CONFIG_USB_NET_SR9700=m -CONFIG_USB_NET_SR9800=m -CONFIG_USB_NET_SMSC75XX=m -CONFIG_USB_NET_SMSC95XX=m -CONFIG_USB_NET_GL620A=m -CONFIG_USB_NET_NET1080=m -CONFIG_USB_NET_PLUSB=m -CONFIG_USB_NET_MCS7830=m -CONFIG_USB_NET_RNDIS_HOST=m -CONFIG_USB_NET_CDC_SUBSET_ENABLE=m -CONFIG_USB_NET_CDC_SUBSET=m -CONFIG_USB_ALI_M5632=y -CONFIG_USB_AN2720=y -CONFIG_USB_BELKIN=y -CONFIG_USB_ARMLINUX=y -CONFIG_USB_EPSON2888=y -CONFIG_USB_KC2190=y -CONFIG_USB_NET_ZAURUS=m -CONFIG_USB_NET_CX82310_ETH=m -CONFIG_USB_NET_KALMIA=m -CONFIG_USB_NET_QMI_WWAN=m -CONFIG_USB_HSO=m -CONFIG_USB_NET_INT51X1=m -CONFIG_USB_CDC_PHONET=m -CONFIG_USB_IPHETH=m -CONFIG_USB_SIERRA_NET=m -CONFIG_USB_VL600=m -CONFIG_USB_NET_CH9200=m -CONFIG_WLAN=y -# CONFIG_WIRELESS_WDS is not set -CONFIG_WLAN_VENDOR_ADMTEK=y -CONFIG_ADM8211=m -CONFIG_ATH_COMMON=m -CONFIG_WLAN_VENDOR_ATH=y -# CONFIG_ATH_DEBUG is not set -CONFIG_ATH5K=m -# CONFIG_ATH5K_DEBUG is not set -# CONFIG_ATH5K_TRACER is not set -CONFIG_ATH5K_PCI=y -CONFIG_ATH9K_HW=m -CONFIG_ATH9K_COMMON=m -CONFIG_ATH9K_BTCOEX_SUPPORT=y -CONFIG_ATH9K=m -CONFIG_ATH9K_PCI=y -# CONFIG_ATH9K_AHB is not set -# CONFIG_ATH9K_DEBUGFS is not set -# CONFIG_ATH9K_DYNACK is not set -# CONFIG_ATH9K_WOW is not set -CONFIG_ATH9K_RFKILL=y -# CONFIG_ATH9K_CHANNEL_CONTEXT is not set -CONFIG_ATH9K_PCOEM=y -CONFIG_ATH9K_HTC=m -# CONFIG_ATH9K_HTC_DEBUGFS is not set -# CONFIG_ATH9K_HWRNG is not set -CONFIG_CARL9170=m -CONFIG_CARL9170_LEDS=y -CONFIG_CARL9170_WPC=y -# CONFIG_CARL9170_HWRNG is not set -CONFIG_ATH6KL=m -CONFIG_ATH6KL_SDIO=m -CONFIG_ATH6KL_USB=m -# CONFIG_ATH6KL_DEBUG is not set -# CONFIG_ATH6KL_TRACING is not set -CONFIG_AR5523=m -CONFIG_WIL6210=m -CONFIG_WIL6210_ISR_COR=y -CONFIG_WIL6210_TRACING=y -CONFIG_WIL6210_DEBUGFS=y -CONFIG_ATH10K=m -CONFIG_ATH10K_CE=y -CONFIG_ATH10K_PCI=m -# CONFIG_ATH10K_AHB is not set -# CONFIG_ATH10K_SDIO is not set -CONFIG_ATH10K_USB=m -# CONFIG_ATH10K_DEBUG is not set -# CONFIG_ATH10K_DEBUGFS is not set -# CONFIG_ATH10K_TRACING is not set -# CONFIG_WCN36XX is not set -CONFIG_WLAN_VENDOR_ATMEL=y -# CONFIG_ATMEL is not set -CONFIG_AT76C50X_USB=m -CONFIG_WLAN_VENDOR_BROADCOM=y -CONFIG_B43=m -CONFIG_B43_BCMA=y -CONFIG_B43_SSB=y -CONFIG_B43_BUSES_BCMA_AND_SSB=y -# CONFIG_B43_BUSES_BCMA is not set -# CONFIG_B43_BUSES_SSB is not set -CONFIG_B43_PCI_AUTOSELECT=y -CONFIG_B43_PCICORE_AUTOSELECT=y -CONFIG_B43_SDIO=y -CONFIG_B43_BCMA_PIO=y -CONFIG_B43_PIO=y -CONFIG_B43_PHY_G=y -CONFIG_B43_PHY_N=y -CONFIG_B43_PHY_LP=y -CONFIG_B43_PHY_HT=y -CONFIG_B43_LEDS=y -CONFIG_B43_HWRNG=y -# CONFIG_B43_DEBUG is not set -CONFIG_B43LEGACY=m -CONFIG_B43LEGACY_PCI_AUTOSELECT=y -CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y -CONFIG_B43LEGACY_LEDS=y -CONFIG_B43LEGACY_HWRNG=y -CONFIG_B43LEGACY_DEBUG=y -CONFIG_B43LEGACY_DMA=y -CONFIG_B43LEGACY_PIO=y -CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y -# CONFIG_B43LEGACY_DMA_MODE is not set -# CONFIG_B43LEGACY_PIO_MODE is not set -CONFIG_BRCMUTIL=m -CONFIG_BRCMSMAC=m -CONFIG_BRCMFMAC=m -CONFIG_BRCMFMAC_PROTO_BCDC=y -CONFIG_BRCMFMAC_PROTO_MSGBUF=y -CONFIG_BRCMFMAC_SDIO=y -CONFIG_BRCMFMAC_USB=y -CONFIG_BRCMFMAC_PCIE=y -# CONFIG_BRCM_TRACING is not set -# CONFIG_BRCMDBG is not set -CONFIG_WLAN_VENDOR_CISCO=y -CONFIG_WLAN_VENDOR_INTEL=y -# CONFIG_IPW2100 is not set -CONFIG_IPW2200=m -CONFIG_IPW2200_MONITOR=y -CONFIG_IPW2200_RADIOTAP=y -CONFIG_IPW2200_PROMISCUOUS=y -CONFIG_IPW2200_QOS=y -# CONFIG_IPW2200_DEBUG is not set -CONFIG_LIBIPW=m -# CONFIG_LIBIPW_DEBUG is not set -CONFIG_IWLEGACY=m -CONFIG_IWL4965=m -CONFIG_IWL3945=m - -# -# iwl3945 / iwl4965 Debugging Options -# -# CONFIG_IWLEGACY_DEBUG is not set -CONFIG_IWLWIFI=m -CONFIG_IWLWIFI_LEDS=y -CONFIG_IWLDVM=m -CONFIG_IWLMVM=m -CONFIG_IWLWIFI_OPMODE_MODULAR=y -# CONFIG_IWLWIFI_BCAST_FILTERING is not set -# CONFIG_IWLWIFI_PCIE_RTPM is not set - -# -# Debugging Options -# -# CONFIG_IWLWIFI_DEBUG is not set -# CONFIG_IWLWIFI_DEVICE_TRACING is not set -CONFIG_WLAN_VENDOR_INTERSIL=y -CONFIG_HOSTAP=m -CONFIG_HOSTAP_FIRMWARE=y -# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set -CONFIG_HOSTAP_PLX=m -CONFIG_HOSTAP_PCI=m -# CONFIG_HERMES is not set -CONFIG_P54_COMMON=m -CONFIG_P54_USB=m -CONFIG_P54_PCI=m -# CONFIG_P54_SPI is not set -CONFIG_P54_LEDS=y -# CONFIG_PRISM54 is not set -CONFIG_WLAN_VENDOR_MARVELL=y -CONFIG_LIBERTAS=m -CONFIG_LIBERTAS_USB=m -CONFIG_LIBERTAS_SDIO=m -# CONFIG_LIBERTAS_SPI is not set -# CONFIG_LIBERTAS_DEBUG is not set -CONFIG_LIBERTAS_MESH=y -CONFIG_LIBERTAS_THINFIRM=m -# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set -CONFIG_LIBERTAS_THINFIRM_USB=m -# CONFIG_MWIFIEX is not set -CONFIG_MWL8K=m -CONFIG_WLAN_VENDOR_MEDIATEK=y -CONFIG_MT7601U=m -CONFIG_MT76_CORE=m -CONFIG_MT76x2E=m -CONFIG_WLAN_VENDOR_RALINK=y -CONFIG_RT2X00=m -CONFIG_RT2400PCI=m -CONFIG_RT2500PCI=m -CONFIG_RT61PCI=m -CONFIG_RT2800PCI=m -CONFIG_RT2800PCI_RT33XX=y -CONFIG_RT2800PCI_RT35XX=y -CONFIG_RT2800PCI_RT53XX=y -CONFIG_RT2800PCI_RT3290=y -CONFIG_RT2500USB=m -CONFIG_RT73USB=m -CONFIG_RT2800USB=m -CONFIG_RT2800USB_RT33XX=y -CONFIG_RT2800USB_RT35XX=y -CONFIG_RT2800USB_RT3573=y -CONFIG_RT2800USB_RT53XX=y -CONFIG_RT2800USB_RT55XX=y -# CONFIG_RT2800USB_UNKNOWN is not set -CONFIG_RT2800_LIB=m -CONFIG_RT2800_LIB_MMIO=m -CONFIG_RT2X00_LIB_MMIO=m -CONFIG_RT2X00_LIB_PCI=m -CONFIG_RT2X00_LIB_USB=m -CONFIG_RT2X00_LIB=m -CONFIG_RT2X00_LIB_FIRMWARE=y -CONFIG_RT2X00_LIB_CRYPTO=y -CONFIG_RT2X00_LIB_LEDS=y -# CONFIG_RT2X00_DEBUG is not set -CONFIG_WLAN_VENDOR_REALTEK=y -CONFIG_RTL8180=m -CONFIG_RTL8187=m -CONFIG_RTL8187_LEDS=y -CONFIG_RTL_CARDS=m -CONFIG_RTL8192CE=m -CONFIG_RTL8192SE=m -CONFIG_RTL8192DE=m -CONFIG_RTL8723AE=m -CONFIG_RTL8723BE=m -CONFIG_RTL8188EE=m -CONFIG_RTL8192EE=m -CONFIG_RTL8821AE=m -CONFIG_RTL8192CU=m -CONFIG_RTLWIFI=m -CONFIG_RTLWIFI_PCI=m -CONFIG_RTLWIFI_USB=m -# CONFIG_RTLWIFI_DEBUG is not set -CONFIG_RTL8192C_COMMON=m -CONFIG_RTL8723_COMMON=m -CONFIG_RTLBTCOEXIST=m -CONFIG_RTL8XXXU=m -# CONFIG_RTL8XXXU_UNTESTED is not set -CONFIG_WLAN_VENDOR_RSI=y -CONFIG_RSI_91X=m -CONFIG_RSI_DEBUGFS=y -# CONFIG_RSI_SDIO is not set -CONFIG_RSI_USB=m -CONFIG_RSI_COEX=y -CONFIG_WLAN_VENDOR_ST=y -# CONFIG_CW1200 is not set -CONFIG_WLAN_VENDOR_TI=y -CONFIG_WL1251=m -CONFIG_WL1251_SPI=m -CONFIG_WL1251_SDIO=m -CONFIG_WL12XX=m -CONFIG_WL18XX=m -CONFIG_WLCORE=m -CONFIG_WLCORE_SPI=m -CONFIG_WLCORE_SDIO=m -CONFIG_WILINK_PLATFORM_DATA=y -CONFIG_WLAN_VENDOR_ZYDAS=y -# CONFIG_USB_ZD1201 is not set -CONFIG_ZD1211RW=m -# CONFIG_ZD1211RW_DEBUG is not set -CONFIG_WLAN_VENDOR_QUANTENNA=y -# CONFIG_QTNFMAC_PEARL_PCIE is not set -CONFIG_MAC80211_HWSIM=m -CONFIG_USB_NET_RNDIS_WLAN=m - -# -# WiMAX Wireless Broadband devices -# -CONFIG_WIMAX_I2400M=m -CONFIG_WIMAX_I2400M_USB=m -CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 -# CONFIG_WAN is not set -CONFIG_IEEE802154_DRIVERS=m -CONFIG_IEEE802154_FAKELB=m -CONFIG_IEEE802154_AT86RF230=m -# CONFIG_IEEE802154_AT86RF230_DEBUGFS is not set -CONFIG_IEEE802154_MRF24J40=m -CONFIG_IEEE802154_CC2520=m -CONFIG_IEEE802154_ATUSB=m -CONFIG_IEEE802154_ADF7242=m -# CONFIG_IEEE802154_CA8210 is not set -# CONFIG_IEEE802154_MCR20A is not set -CONFIG_XEN_NETDEV_FRONTEND=m -CONFIG_XEN_NETDEV_BACKEND=m -# CONFIG_VMXNET3 is not set -CONFIG_NETDEVSIM=m -CONFIG_NET_FAILOVER=m -# CONFIG_ISDN is not set -# CONFIG_NVM is not set - -# -# Input device support -# -CONFIG_INPUT=y -CONFIG_INPUT_LEDS=y -CONFIG_INPUT_FF_MEMLESS=m -CONFIG_INPUT_POLLDEV=m -CONFIG_INPUT_SPARSEKMAP=m -CONFIG_INPUT_MATRIXKMAP=m - -# -# Userland interfaces -# -CONFIG_INPUT_MOUSEDEV=y -CONFIG_INPUT_MOUSEDEV_PSAUX=y -CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 -CONFIG_INPUT_JOYDEV=m -CONFIG_INPUT_EVDEV=m -# CONFIG_INPUT_EVBUG is not set -# CONFIG_INPUT_APMPOWER is not set - -# -# Input Device Drivers -# -CONFIG_INPUT_KEYBOARD=y -# CONFIG_KEYBOARD_ADC is not set -CONFIG_KEYBOARD_ADP5588=m -# CONFIG_KEYBOARD_ADP5589 is not set -CONFIG_KEYBOARD_ATKBD=y -# CONFIG_KEYBOARD_QT1070 is not set -CONFIG_KEYBOARD_QT2160=m -# CONFIG_KEYBOARD_DLINK_DIR685 is not set -# CONFIG_KEYBOARD_LKKBD is not set -CONFIG_KEYBOARD_GPIO=y -# CONFIG_KEYBOARD_GPIO_POLLED is not set -# CONFIG_KEYBOARD_TCA6416 is not set -# CONFIG_KEYBOARD_TCA8418 is not set -# CONFIG_KEYBOARD_MATRIX is not set -CONFIG_KEYBOARD_LM8323=m -# CONFIG_KEYBOARD_LM8333 is not set -CONFIG_KEYBOARD_MAX7359=m -# CONFIG_KEYBOARD_MCS is not set -# CONFIG_KEYBOARD_MPR121 is not set -CONFIG_KEYBOARD_IMX=m -# CONFIG_KEYBOARD_NEWTON is not set -CONFIG_KEYBOARD_TEGRA=m -CONFIG_KEYBOARD_OPENCORES=m -# CONFIG_KEYBOARD_SAMSUNG is not set -CONFIG_KEYBOARD_STOWAWAY=m -# CONFIG_KEYBOARD_SUNKBD is not set -# CONFIG_KEYBOARD_STMPE is not set -CONFIG_KEYBOARD_SUN4I_LRADC=m -CONFIG_KEYBOARD_OMAP4=m -# CONFIG_KEYBOARD_TM2_TOUCHKEY is not set -CONFIG_KEYBOARD_TWL4030=m -# CONFIG_KEYBOARD_XTKBD is not set -CONFIG_KEYBOARD_CROS_EC=m -# CONFIG_KEYBOARD_CAP11XX is not set -# CONFIG_KEYBOARD_BCM is not set -CONFIG_INPUT_MOUSE=y -CONFIG_MOUSE_PS2=m -CONFIG_MOUSE_PS2_ALPS=y -CONFIG_MOUSE_PS2_BYD=y -CONFIG_MOUSE_PS2_LOGIPS2PP=y -CONFIG_MOUSE_PS2_SYNAPTICS=y -CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y -CONFIG_MOUSE_PS2_CYPRESS=y -CONFIG_MOUSE_PS2_TRACKPOINT=y -CONFIG_MOUSE_PS2_ELANTECH=y -CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y -CONFIG_MOUSE_PS2_SENTELIC=y -# CONFIG_MOUSE_PS2_TOUCHKIT is not set -CONFIG_MOUSE_PS2_FOCALTECH=y -CONFIG_MOUSE_PS2_SMBUS=y -# CONFIG_MOUSE_SERIAL is not set -CONFIG_MOUSE_APPLETOUCH=m -# CONFIG_MOUSE_BCM5974 is not set -# CONFIG_MOUSE_CYAPA is not set -CONFIG_MOUSE_ELAN_I2C=m -CONFIG_MOUSE_ELAN_I2C_I2C=y -# CONFIG_MOUSE_ELAN_I2C_SMBUS is not set -# CONFIG_MOUSE_VSXXXAA is not set -# CONFIG_MOUSE_GPIO is not set -CONFIG_MOUSE_SYNAPTICS_I2C=m -CONFIG_MOUSE_SYNAPTICS_USB=m -# CONFIG_INPUT_JOYSTICK is not set -CONFIG_INPUT_TABLET=y -CONFIG_TABLET_USB_ACECAD=m -CONFIG_TABLET_USB_AIPTEK=m -CONFIG_TABLET_USB_GTCO=m -CONFIG_TABLET_USB_HANWANG=m -CONFIG_TABLET_USB_KBTAB=m -CONFIG_TABLET_USB_PEGASUS=m -CONFIG_TABLET_SERIAL_WACOM4=m -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_PROPERTIES=y -CONFIG_TOUCHSCREEN_ADS7846=m -CONFIG_TOUCHSCREEN_AD7877=m -CONFIG_TOUCHSCREEN_AD7879=m -CONFIG_TOUCHSCREEN_AD7879_I2C=m -# CONFIG_TOUCHSCREEN_AD7879_SPI is not set -# CONFIG_TOUCHSCREEN_AR1021_I2C is not set -CONFIG_TOUCHSCREEN_ATMEL_MXT=m -# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set -# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set -# CONFIG_TOUCHSCREEN_BU21013 is not set -# CONFIG_TOUCHSCREEN_CHIPONE_ICN8318 is not set -# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set -# CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set -# CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set -# CONFIG_TOUCHSCREEN_DA9052 is not set -CONFIG_TOUCHSCREEN_DYNAPRO=m -CONFIG_TOUCHSCREEN_HAMPSHIRE=m -# CONFIG_TOUCHSCREEN_EETI is not set -# CONFIG_TOUCHSCREEN_EGALAX is not set -# CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set -CONFIG_TOUCHSCREEN_EXC3000=m -CONFIG_TOUCHSCREEN_FUJITSU=m -CONFIG_TOUCHSCREEN_GOODIX=m -CONFIG_TOUCHSCREEN_HIDEEP=m -# CONFIG_TOUCHSCREEN_ILI210X is not set -CONFIG_TOUCHSCREEN_S6SY761=m -CONFIG_TOUCHSCREEN_GUNZE=m -# CONFIG_TOUCHSCREEN_EKTF2127 is not set -# CONFIG_TOUCHSCREEN_ELAN is not set -CONFIG_TOUCHSCREEN_ELO=m -CONFIG_TOUCHSCREEN_WACOM_W8001=m -# CONFIG_TOUCHSCREEN_WACOM_I2C is not set -# CONFIG_TOUCHSCREEN_MAX11801 is not set -CONFIG_TOUCHSCREEN_MCS5000=m -# CONFIG_TOUCHSCREEN_MMS114 is not set -# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set -CONFIG_TOUCHSCREEN_MTOUCH=m -# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set -CONFIG_TOUCHSCREEN_INEXIO=m -CONFIG_TOUCHSCREEN_MK712=m -CONFIG_TOUCHSCREEN_PENMOUNT=m -# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set -CONFIG_TOUCHSCREEN_TOUCHRIGHT=m -CONFIG_TOUCHSCREEN_TOUCHWIN=m -CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m -# CONFIG_TOUCHSCREEN_PIXCIR is not set -# CONFIG_TOUCHSCREEN_WDT87XX_I2C is not set -CONFIG_TOUCHSCREEN_WM97XX=m -CONFIG_TOUCHSCREEN_WM9705=y -CONFIG_TOUCHSCREEN_WM9712=y -CONFIG_TOUCHSCREEN_WM9713=y -CONFIG_TOUCHSCREEN_USB_COMPOSITE=m -CONFIG_TOUCHSCREEN_MC13783=m -CONFIG_TOUCHSCREEN_USB_EGALAX=y -CONFIG_TOUCHSCREEN_USB_PANJIT=y -CONFIG_TOUCHSCREEN_USB_3M=y -CONFIG_TOUCHSCREEN_USB_ITM=y -CONFIG_TOUCHSCREEN_USB_ETURBO=y -CONFIG_TOUCHSCREEN_USB_GUNZE=y -CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y -CONFIG_TOUCHSCREEN_USB_IRTOUCH=y -CONFIG_TOUCHSCREEN_USB_IDEALTEK=y -CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y -CONFIG_TOUCHSCREEN_USB_GOTOP=y -CONFIG_TOUCHSCREEN_USB_JASTEC=y -CONFIG_TOUCHSCREEN_USB_ELO=y -CONFIG_TOUCHSCREEN_USB_E2I=y -CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y -CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y -CONFIG_TOUCHSCREEN_USB_NEXIO=y -CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y -CONFIG_TOUCHSCREEN_TOUCHIT213=m -# CONFIG_TOUCHSCREEN_TS4800 is not set -# CONFIG_TOUCHSCREEN_TSC_SERIO is not set -CONFIG_TOUCHSCREEN_TSC200X_CORE=m -# CONFIG_TOUCHSCREEN_TSC2004 is not set -CONFIG_TOUCHSCREEN_TSC2005=m -CONFIG_TOUCHSCREEN_TSC2007=m -# CONFIG_TOUCHSCREEN_TSC2007_IIO is not set -# CONFIG_TOUCHSCREEN_RM_TS is not set -# CONFIG_TOUCHSCREEN_SILEAD is not set -# CONFIG_TOUCHSCREEN_SIS_I2C is not set -# CONFIG_TOUCHSCREEN_ST1232 is not set -# CONFIG_TOUCHSCREEN_STMFTS is not set -CONFIG_TOUCHSCREEN_STMPE=m -CONFIG_TOUCHSCREEN_SUN4I=m -CONFIG_TOUCHSCREEN_SUR40=m -# CONFIG_TOUCHSCREEN_SURFACE3_SPI is not set -# CONFIG_TOUCHSCREEN_SX8654 is not set -CONFIG_TOUCHSCREEN_TPS6507X=m -# CONFIG_TOUCHSCREEN_ZET6223 is not set -# CONFIG_TOUCHSCREEN_ZFORCE is not set -# CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set -CONFIG_INPUT_MISC=y -# CONFIG_INPUT_AD714X is not set -# CONFIG_INPUT_ATMEL_CAPTOUCH is not set -# CONFIG_INPUT_BMA150 is not set -# CONFIG_INPUT_E3X0_BUTTON is not set -# CONFIG_INPUT_MC13783_PWRBUTTON is not set -CONFIG_INPUT_MMA8450=m -# CONFIG_INPUT_GP2A is not set -# CONFIG_INPUT_GPIO_BEEPER is not set -# CONFIG_INPUT_GPIO_DECODER is not set -CONFIG_INPUT_ATI_REMOTE2=m -CONFIG_INPUT_KEYSPAN_REMOTE=m -# CONFIG_INPUT_KXTJ9 is not set -CONFIG_INPUT_POWERMATE=m -CONFIG_INPUT_YEALINK=m -CONFIG_INPUT_CM109=m -# CONFIG_INPUT_REGULATOR_HAPTIC is not set -CONFIG_INPUT_AXP20X_PEK=m -CONFIG_INPUT_TWL4030_PWRBUTTON=m -CONFIG_INPUT_TWL4030_VIBRA=m -CONFIG_INPUT_TWL6040_VIBRA=m -CONFIG_INPUT_UINPUT=m -# CONFIG_INPUT_PALMAS_PWRBUTTON is not set -# CONFIG_INPUT_PCF8574 is not set -# CONFIG_INPUT_PWM_BEEPER is not set -# CONFIG_INPUT_PWM_VIBRA is not set -CONFIG_INPUT_RK805_PWRKEY=m -# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set -# CONFIG_INPUT_DA9052_ONKEY is not set -# CONFIG_INPUT_ADXL34X is not set -# CONFIG_INPUT_IMS_PCU is not set -# CONFIG_INPUT_CMA3000 is not set -CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y -# CONFIG_INPUT_SOC_BUTTON_ARRAY is not set -# CONFIG_INPUT_DRV260X_HAPTICS is not set -# CONFIG_INPUT_DRV2665_HAPTICS is not set -# CONFIG_INPUT_DRV2667_HAPTICS is not set -CONFIG_RMI4_CORE=m -# CONFIG_RMI4_I2C is not set -# CONFIG_RMI4_SPI is not set -# CONFIG_RMI4_SMB is not set -CONFIG_RMI4_F03=y -CONFIG_RMI4_F03_SERIO=m -CONFIG_RMI4_2D_SENSOR=y -CONFIG_RMI4_F11=y -CONFIG_RMI4_F12=y -CONFIG_RMI4_F30=y -# CONFIG_RMI4_F34 is not set -# CONFIG_RMI4_F54 is not set -# CONFIG_RMI4_F55 is not set - -# -# Hardware I/O ports -# -CONFIG_SERIO=y -CONFIG_SERIO_SERPORT=y -# CONFIG_SERIO_PARKBD is not set -CONFIG_SERIO_AMBAKMI=m -# CONFIG_SERIO_PCIPS2 is not set -CONFIG_SERIO_LIBPS2=y -# CONFIG_SERIO_RAW is not set -CONFIG_SERIO_ALTERA_PS2=m -# CONFIG_SERIO_PS2MULT is not set -# CONFIG_SERIO_ARC_PS2 is not set -# CONFIG_SERIO_APBPS2 is not set -CONFIG_SERIO_SUN4I_PS2=m -CONFIG_SERIO_GPIO_PS2=m -# CONFIG_USERIO is not set -# CONFIG_GAMEPORT is not set - -# -# Character devices -# -CONFIG_TTY=y -CONFIG_VT=y -CONFIG_CONSOLE_TRANSLATIONS=y -CONFIG_VT_CONSOLE=y -CONFIG_VT_CONSOLE_SLEEP=y -CONFIG_HW_CONSOLE=y -CONFIG_VT_HW_CONSOLE_BINDING=y -CONFIG_UNIX98_PTYS=y -# CONFIG_LEGACY_PTYS is not set -# CONFIG_SERIAL_NONSTANDARD is not set -CONFIG_NOZOMI=m -CONFIG_N_GSM=m -# CONFIG_TRACE_SINK is not set -CONFIG_DEVMEM=y -# CONFIG_DEVKMEM is not set - -# -# Serial drivers -# -CONFIG_SERIAL_EARLYCON=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y -# CONFIG_SERIAL_8250_FINTEK is not set -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_DMA=y -CONFIG_SERIAL_8250_PCI=y -CONFIG_SERIAL_8250_EXAR=y -CONFIG_SERIAL_8250_NR_UARTS=4 -CONFIG_SERIAL_8250_RUNTIME_UARTS=4 -# CONFIG_SERIAL_8250_EXTENDED is not set -# CONFIG_SERIAL_8250_ASPEED_VUART is not set -CONFIG_SERIAL_8250_FSL=y -CONFIG_SERIAL_8250_DW=y -# CONFIG_SERIAL_8250_EM is not set -# CONFIG_SERIAL_8250_RT288X is not set -# CONFIG_SERIAL_8250_OMAP is not set -CONFIG_SERIAL_8250_MOXA=m -CONFIG_SERIAL_OF_PLATFORM=y - -# -# Non-8250 serial port support -# -CONFIG_SERIAL_AMBA_PL010=y -CONFIG_SERIAL_AMBA_PL010_CONSOLE=y -CONFIG_SERIAL_AMBA_PL011=y -CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -# CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST is not set -CONFIG_SERIAL_SAMSUNG=y -CONFIG_SERIAL_SAMSUNG_UARTS_4=y -CONFIG_SERIAL_SAMSUNG_UARTS=4 -CONFIG_SERIAL_SAMSUNG_CONSOLE=y -CONFIG_SERIAL_TEGRA=y -# CONFIG_SERIAL_MAX3100 is not set -# CONFIG_SERIAL_MAX310X is not set -CONFIG_SERIAL_IMX=y -CONFIG_SERIAL_IMX_CONSOLE=y -# CONFIG_SERIAL_UARTLITE is not set -CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_CORE_CONSOLE=y -# CONFIG_SERIAL_JSM is not set -CONFIG_SERIAL_VT8500=y -CONFIG_SERIAL_VT8500_CONSOLE=y -CONFIG_SERIAL_OMAP=y -CONFIG_SERIAL_OMAP_CONSOLE=y -# CONFIG_SERIAL_SCCNXP is not set -# CONFIG_SERIAL_SC16IS7XX is not set -# CONFIG_SERIAL_BCM63XX is not set -# CONFIG_SERIAL_ALTERA_JTAGUART is not set -# CONFIG_SERIAL_ALTERA_UART is not set -# CONFIG_SERIAL_IFX6X60 is not set -# CONFIG_SERIAL_XILINX_PS_UART is not set -CONFIG_SERIAL_ARC=y -CONFIG_SERIAL_ARC_CONSOLE=y -CONFIG_SERIAL_ARC_NR_PORTS=1 -CONFIG_SERIAL_RP2=m -CONFIG_SERIAL_RP2_NR_UARTS=32 -# CONFIG_SERIAL_FSL_LPUART is not set -# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set -# CONFIG_SERIAL_ST_ASC is not set -# CONFIG_SERIAL_MVEBU_UART is not set -CONFIG_SERIAL_MCTRL_GPIO=y -# CONFIG_SERIAL_DEV_BUS is not set -CONFIG_TTY_PRINTK=m -# CONFIG_PRINTER is not set -# CONFIG_PPDEV is not set -CONFIG_HVC_DRIVER=y -CONFIG_HVC_IRQ=y -CONFIG_HVC_XEN=y -CONFIG_HVC_XEN_FRONTEND=y -# CONFIG_HVC_DCC is not set -CONFIG_VIRTIO_CONSOLE=m -# CONFIG_IPMI_HANDLER is not set -CONFIG_HW_RANDOM=m -# CONFIG_HW_RANDOM_TIMERIOMEM is not set -CONFIG_HW_RANDOM_BCM2835=m -CONFIG_HW_RANDOM_OMAP=m -CONFIG_HW_RANDOM_OMAP3_ROM=m -CONFIG_HW_RANDOM_VIRTIO=m -CONFIG_HW_RANDOM_IMX_RNGC=m -CONFIG_HW_RANDOM_EXYNOS=m -# CONFIG_R3964 is not set -# CONFIG_APPLICOM is not set -# CONFIG_RAW_DRIVER is not set -CONFIG_TCG_TPM=y -# CONFIG_TCG_TIS is not set -# CONFIG_TCG_TIS_SPI is not set -# CONFIG_TCG_TIS_I2C_ATMEL is not set -# CONFIG_TCG_TIS_I2C_INFINEON is not set -# CONFIG_TCG_TIS_I2C_NUVOTON is not set -# CONFIG_TCG_XEN is not set -# CONFIG_TCG_VTPM_PROXY is not set -# CONFIG_TCG_TIS_ST33ZP24_I2C is not set -# CONFIG_TCG_TIS_ST33ZP24_SPI is not set -CONFIG_DEVPORT=y -# CONFIG_XILLYBUS is not set - -# -# I2C support -# -CONFIG_I2C=y -CONFIG_I2C_BOARDINFO=y -CONFIG_I2C_COMPAT=y -CONFIG_I2C_CHARDEV=m -CONFIG_I2C_MUX=y - -# -# Multiplexer I2C Chip support -# -CONFIG_I2C_ARB_GPIO_CHALLENGE=m -# CONFIG_I2C_MUX_GPIO is not set -# CONFIG_I2C_MUX_GPMUX is not set -# CONFIG_I2C_MUX_LTC4306 is not set -# CONFIG_I2C_MUX_PCA9541 is not set -CONFIG_I2C_MUX_PCA954x=m -# CONFIG_I2C_MUX_PINCTRL is not set -# CONFIG_I2C_MUX_REG is not set -# CONFIG_I2C_DEMUX_PINCTRL is not set -# CONFIG_I2C_MUX_MLXCPLD is not set -CONFIG_I2C_HELPER_AUTO=y -CONFIG_I2C_SMBUS=m -CONFIG_I2C_ALGOBIT=y -CONFIG_I2C_ALGOPCA=m - -# -# I2C Hardware Bus support -# - -# -# PC SMBus host controller drivers -# -# CONFIG_I2C_ALI1535 is not set -# CONFIG_I2C_ALI1563 is not set -# CONFIG_I2C_ALI15X3 is not set -# CONFIG_I2C_AMD756 is not set -# CONFIG_I2C_AMD8111 is not set -# CONFIG_I2C_I801 is not set -CONFIG_I2C_ISCH=m -# CONFIG_I2C_PIIX4 is not set -# CONFIG_I2C_NFORCE2 is not set -# CONFIG_I2C_SIS5595 is not set -# CONFIG_I2C_SIS630 is not set -# CONFIG_I2C_SIS96X is not set -# CONFIG_I2C_VIA is not set -# CONFIG_I2C_VIAPRO is not set - -# -# I2C system bus drivers (mostly embedded / system-on-chip) -# -CONFIG_I2C_ALTERA=m -CONFIG_I2C_BCM2835=m -# CONFIG_I2C_CBUS_GPIO is not set -# CONFIG_I2C_DESIGNWARE_PLATFORM is not set -# CONFIG_I2C_DESIGNWARE_PCI is not set -# CONFIG_I2C_EMEV2 is not set -CONFIG_I2C_EXYNOS5=m -CONFIG_I2C_GPIO=y -# CONFIG_I2C_GPIO_FAULT_INJECTOR is not set -CONFIG_I2C_IMX=m -# CONFIG_I2C_IMX_LPI2C is not set -CONFIG_I2C_MV64XXX=m -# CONFIG_I2C_NOMADIK is not set -CONFIG_I2C_OCORES=m -CONFIG_I2C_OMAP=y -CONFIG_I2C_PCA_PLATFORM=m -# CONFIG_I2C_PXA is not set -CONFIG_I2C_RK3X=m -CONFIG_HAVE_S3C2410_I2C=y -CONFIG_I2C_S3C2410=y -CONFIG_I2C_SIMTEC=m -CONFIG_I2C_SUN6I_P2WI=m -CONFIG_I2C_TEGRA=y -CONFIG_I2C_VERSATILE=m -# CONFIG_I2C_WMT is not set -# CONFIG_I2C_XILINX is not set - -# -# External I2C/SMBus adapter drivers -# -CONFIG_I2C_DIOLAN_U2C=m -# CONFIG_I2C_PARPORT is not set -# CONFIG_I2C_PARPORT_LIGHT is not set -CONFIG_I2C_ROBOTFUZZ_OSIF=m -CONFIG_I2C_TAOS_EVM=m -CONFIG_I2C_TINY_USB=m -CONFIG_I2C_VIPERBOARD=m - -# -# Other I2C/SMBus bus drivers -# -CONFIG_I2C_CROS_EC_TUNNEL=m -# CONFIG_I2C_STUB is not set -# CONFIG_I2C_SLAVE is not set -# CONFIG_I2C_DEBUG_CORE is not set -# CONFIG_I2C_DEBUG_ALGO is not set -# CONFIG_I2C_DEBUG_BUS is not set -CONFIG_SPI=y -# CONFIG_SPI_DEBUG is not set -CONFIG_SPI_MASTER=y -CONFIG_SPI_MEM=y - -# -# SPI Master Controller Drivers -# -# CONFIG_SPI_ALTERA is not set -# CONFIG_SPI_ARMADA_3700 is not set -# CONFIG_SPI_AXI_SPI_ENGINE is not set -CONFIG_SPI_BCM2835=m -CONFIG_SPI_BCM2835AUX=m -# CONFIG_SPI_BCM_QSPI is not set -CONFIG_SPI_BITBANG=y -CONFIG_SPI_BUTTERFLY=m -# CONFIG_SPI_CADENCE is not set -# CONFIG_SPI_DESIGNWARE is not set -# CONFIG_SPI_FSL_LPSPI is not set -CONFIG_SPI_GPIO=y -CONFIG_SPI_IMX=m -CONFIG_SPI_LM70_LLP=m -# CONFIG_SPI_FSL_SPI is not set -# CONFIG_SPI_OC_TINY is not set -CONFIG_SPI_OMAP24XX=m -CONFIG_SPI_TI_QSPI=m -CONFIG_SPI_ORION=m -CONFIG_SPI_PL022=m -# CONFIG_SPI_PXA2XX is not set -CONFIG_SPI_ROCKCHIP=m -# CONFIG_SPI_S3C64XX is not set -# CONFIG_SPI_SC18IS602 is not set -CONFIG_SPI_SUN4I=m -CONFIG_SPI_SUN6I=m -CONFIG_SPI_TEGRA114=m -CONFIG_SPI_TEGRA20_SFLASH=m -# CONFIG_SPI_TEGRA20_SLINK is not set -# CONFIG_SPI_XCOMM is not set -# CONFIG_SPI_XILINX is not set -# CONFIG_SPI_ZYNQMP_GQSPI is not set - -# -# SPI Protocol Masters -# -CONFIG_SPI_SPIDEV=y -# CONFIG_SPI_LOOPBACK_TEST is not set -# CONFIG_SPI_TLE62X0 is not set -# CONFIG_SPI_SLAVE is not set -# CONFIG_SPMI is not set -CONFIG_HSI=m -CONFIG_HSI_BOARDINFO=y - -# -# HSI controllers -# -CONFIG_OMAP_SSI=m - -# -# HSI clients -# -CONFIG_NOKIA_MODEM=m -CONFIG_CMT_SPEECH=m -CONFIG_SSI_PROTOCOL=m -# CONFIG_HSI_CHAR is not set -CONFIG_PPS=y -# CONFIG_PPS_DEBUG is not set - -# -# PPS clients support -# -# CONFIG_PPS_CLIENT_KTIMER is not set -CONFIG_PPS_CLIENT_LDISC=m -CONFIG_PPS_CLIENT_PARPORT=m -# CONFIG_PPS_CLIENT_GPIO is not set - -# -# PPS generators support -# - -# -# PTP clock support -# -CONFIG_PTP_1588_CLOCK=y - -# -# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks. -# -CONFIG_PINCTRL=y -CONFIG_GENERIC_PINCTRL_GROUPS=y -CONFIG_PINMUX=y -CONFIG_GENERIC_PINMUX_FUNCTIONS=y -CONFIG_PINCONF=y -CONFIG_GENERIC_PINCONF=y -# CONFIG_DEBUG_PINCTRL is not set -CONFIG_PINCTRL_AS3722=y -CONFIG_PINCTRL_AXP209=m -# CONFIG_PINCTRL_AMD is not set -CONFIG_PINCTRL_MCP23S08=m -CONFIG_PINCTRL_ROCKCHIP=y -CONFIG_PINCTRL_SINGLE=y -# CONFIG_PINCTRL_SX150X is not set -CONFIG_PINCTRL_PALMAS=y -CONFIG_PINCTRL_RK805=m -CONFIG_PINCTRL_BCM2835=y -CONFIG_PINCTRL_IMX=y -CONFIG_PINCTRL_IMX51=y -CONFIG_PINCTRL_IMX53=y -CONFIG_PINCTRL_IMX6Q=y -CONFIG_PINCTRL_MVEBU=y -CONFIG_PINCTRL_ARMADA_370=y -CONFIG_PINCTRL_ARMADA_375=y -CONFIG_PINCTRL_ARMADA_38X=y -CONFIG_PINCTRL_ARMADA_39X=y -CONFIG_PINCTRL_ARMADA_XP=y -CONFIG_PINCTRL_SAMSUNG=y -CONFIG_PINCTRL_EXYNOS=y -CONFIG_PINCTRL_EXYNOS_ARM=y -CONFIG_PINCTRL_SUNXI=y -CONFIG_PINCTRL_SUN4I_A10=y -CONFIG_PINCTRL_SUN5I=y -CONFIG_PINCTRL_SUN6I_A31=y -CONFIG_PINCTRL_SUN6I_A31_R=y -CONFIG_PINCTRL_SUN8I_A23=y -CONFIG_PINCTRL_SUN8I_A33=y -CONFIG_PINCTRL_SUN8I_A83T=y -CONFIG_PINCTRL_SUN8I_A83T_R=y -CONFIG_PINCTRL_SUN8I_A23_R=y -CONFIG_PINCTRL_SUN8I_H3=y -CONFIG_PINCTRL_SUN8I_H3_R=y -CONFIG_PINCTRL_SUN8I_V3S=y -CONFIG_PINCTRL_SUN9I_A80=y -CONFIG_PINCTRL_SUN9I_A80_R=y -CONFIG_PINCTRL_TEGRA=y -CONFIG_PINCTRL_TEGRA124=y -CONFIG_PINCTRL_TEGRA_XUSB=y -CONFIG_PINCTRL_TI_IODELAY=y -CONFIG_PINCTRL_WMT=y -CONFIG_PINCTRL_WM8850=y -CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y -CONFIG_GPIOLIB=y -CONFIG_GPIOLIB_FASTPATH_LIMIT=512 -CONFIG_OF_GPIO=y -CONFIG_GPIOLIB_IRQCHIP=y -# CONFIG_DEBUG_GPIO is not set -CONFIG_GPIO_SYSFS=y -CONFIG_GPIO_GENERIC=y - -# -# Memory mapped GPIO drivers -# -# CONFIG_GPIO_74XX_MMIO is not set -# CONFIG_GPIO_ALTERA is not set -CONFIG_GPIO_RASPBERRYPI_EXP=m -# CONFIG_GPIO_DWAPB is not set -# CONFIG_GPIO_EXAR is not set -# CONFIG_GPIO_FTGPIO010 is not set -CONFIG_GPIO_GENERIC_PLATFORM=y -# CONFIG_GPIO_GRGPIO is not set -# CONFIG_GPIO_HLWD is not set -CONFIG_GPIO_MB86S7X=m -# CONFIG_GPIO_MOCKUP is not set -# CONFIG_GPIO_MPC8XXX is not set -CONFIG_GPIO_MVEBU=y -CONFIG_GPIO_MXC=y -CONFIG_GPIO_OMAP=y -CONFIG_GPIO_PL061=y -# CONFIG_GPIO_SYSCON is not set -CONFIG_GPIO_TEGRA=y -# CONFIG_GPIO_TS4800 is not set -# CONFIG_GPIO_XILINX is not set -# CONFIG_GPIO_ZEVIO is not set - -# -# I2C GPIO expanders -# -# CONFIG_GPIO_ADP5588 is not set -# CONFIG_GPIO_ADNP is not set -# CONFIG_GPIO_MAX7300 is not set -# CONFIG_GPIO_MAX732X is not set -CONFIG_GPIO_PCA953X=m -CONFIG_GPIO_PCF857X=m -# CONFIG_GPIO_TPIC2810 is not set -# CONFIG_GPIO_TS4900 is not set - -# -# MFD GPIO expanders -# -CONFIG_GPIO_BD9571MWV=m -CONFIG_GPIO_DA9052=m -# CONFIG_HTC_EGPIO is not set -CONFIG_GPIO_PALMAS=y -# CONFIG_GPIO_STMPE is not set -CONFIG_GPIO_TWL4030=y -CONFIG_GPIO_TWL6040=y - -# -# PCI GPIO expanders -# -# CONFIG_GPIO_PCI_IDIO_16 is not set -# CONFIG_GPIO_PCIE_IDIO_24 is not set -# CONFIG_GPIO_RDC321X is not set - -# -# SPI GPIO expanders -# -# CONFIG_GPIO_74X164 is not set -CONFIG_GPIO_MAX3191X=m -# CONFIG_GPIO_MAX7301 is not set -# CONFIG_GPIO_MC33880 is not set -# CONFIG_GPIO_PISOSR is not set -# CONFIG_GPIO_XRA1403 is not set - -# -# USB GPIO expanders -# -CONFIG_GPIO_VIPERBOARD=m -CONFIG_W1=m -CONFIG_W1_CON=y - -# -# 1-wire Bus Masters -# -# CONFIG_W1_MASTER_MATROX is not set -CONFIG_W1_MASTER_DS2490=m -CONFIG_W1_MASTER_DS2482=m -# CONFIG_W1_MASTER_MXC is not set -# CONFIG_W1_MASTER_DS1WM is not set -CONFIG_W1_MASTER_GPIO=m -CONFIG_HDQ_MASTER_OMAP=m - -# -# 1-wire Slaves -# -CONFIG_W1_SLAVE_THERM=m -CONFIG_W1_SLAVE_SMEM=m -# CONFIG_W1_SLAVE_DS2405 is not set -# CONFIG_W1_SLAVE_DS2408 is not set -# CONFIG_W1_SLAVE_DS2413 is not set -# CONFIG_W1_SLAVE_DS2406 is not set -# CONFIG_W1_SLAVE_DS2423 is not set -CONFIG_W1_SLAVE_DS2805=m -CONFIG_W1_SLAVE_DS2431=m -CONFIG_W1_SLAVE_DS2433=m -# CONFIG_W1_SLAVE_DS2433_CRC is not set -# CONFIG_W1_SLAVE_DS2438 is not set -# CONFIG_W1_SLAVE_DS2760 is not set -# CONFIG_W1_SLAVE_DS2780 is not set -# CONFIG_W1_SLAVE_DS2781 is not set -# CONFIG_W1_SLAVE_DS28E04 is not set -CONFIG_W1_SLAVE_DS28E17=m -CONFIG_POWER_AVS=y -CONFIG_ROCKCHIP_IODOMAIN=m -CONFIG_POWER_RESET=y -CONFIG_POWER_RESET_AS3722=y -# CONFIG_POWER_RESET_BRCMKONA is not set -# CONFIG_POWER_RESET_BRCMSTB is not set -CONFIG_POWER_RESET_GPIO=y -CONFIG_POWER_RESET_GPIO_RESTART=y -# CONFIG_POWER_RESET_LTC2952 is not set -# CONFIG_POWER_RESET_QNAP is not set -CONFIG_POWER_RESET_RESTART=y -# CONFIG_POWER_RESET_VERSATILE is not set -CONFIG_POWER_RESET_VEXPRESS=y -CONFIG_POWER_RESET_SYSCON=y -CONFIG_POWER_RESET_SYSCON_POWEROFF=y -# CONFIG_SYSCON_REBOOT_MODE is not set -CONFIG_POWER_SUPPLY=y -# CONFIG_POWER_SUPPLY_DEBUG is not set -# CONFIG_PDA_POWER is not set -# CONFIG_APM_POWER is not set -# CONFIG_GENERIC_ADC_BATTERY is not set -# CONFIG_TEST_POWER is not set -# CONFIG_BATTERY_DS2780 is not set -# CONFIG_BATTERY_DS2781 is not set -# CONFIG_BATTERY_DS2782 is not set -# CONFIG_BATTERY_LEGO_EV3 is not set -CONFIG_BATTERY_SBS=m -# CONFIG_CHARGER_SBS is not set -CONFIG_MANAGER_SBS=m -CONFIG_BATTERY_BQ27XXX=m -CONFIG_BATTERY_BQ27XXX_I2C=m -CONFIG_BATTERY_BQ27XXX_HDQ=m -# CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set -# CONFIG_BATTERY_DA9052 is not set -CONFIG_CHARGER_AXP20X=m -CONFIG_BATTERY_AXP20X=m -CONFIG_AXP20X_POWER=m -CONFIG_AXP288_FUEL_GAUGE=m -# CONFIG_BATTERY_MAX17040 is not set -# CONFIG_BATTERY_MAX17042 is not set -CONFIG_BATTERY_MAX1721X=m -CONFIG_BATTERY_TWL4030_MADC=m -CONFIG_BATTERY_RX51=m -CONFIG_CHARGER_ISP1704=m -# CONFIG_CHARGER_MAX8903 is not set -CONFIG_CHARGER_TWL4030=m -# CONFIG_CHARGER_LP8727 is not set -CONFIG_CHARGER_GPIO=m -# CONFIG_CHARGER_MANAGER is not set -# CONFIG_CHARGER_LTC3651 is not set -# CONFIG_CHARGER_DETECTOR_MAX14656 is not set -CONFIG_CHARGER_BQ2415X=m -# CONFIG_CHARGER_BQ24190 is not set -# CONFIG_CHARGER_BQ24257 is not set -# CONFIG_CHARGER_BQ24735 is not set -# CONFIG_CHARGER_BQ25890 is not set -# CONFIG_CHARGER_SMB347 is not set -# CONFIG_BATTERY_GAUGE_LTC2941 is not set -# CONFIG_CHARGER_RT9455 is not set -CONFIG_HWMON=y -CONFIG_HWMON_VID=m -# CONFIG_HWMON_DEBUG_CHIP is not set - -# -# Native drivers -# -# CONFIG_SENSORS_AD7314 is not set -CONFIG_SENSORS_AD7414=m -CONFIG_SENSORS_AD7418=m -# CONFIG_SENSORS_ADM1021 is not set -# CONFIG_SENSORS_ADM1025 is not set -# CONFIG_SENSORS_ADM1026 is not set -CONFIG_SENSORS_ADM1029=m -# CONFIG_SENSORS_ADM1031 is not set -CONFIG_SENSORS_ADM9240=m -# CONFIG_SENSORS_ADT7310 is not set -# CONFIG_SENSORS_ADT7410 is not set -CONFIG_SENSORS_ADT7411=m -CONFIG_SENSORS_ADT7462=m -CONFIG_SENSORS_ADT7470=m -CONFIG_SENSORS_ADT7475=m -CONFIG_SENSORS_ASC7621=m -CONFIG_SENSORS_ARM_SCMI=m -# CONFIG_SENSORS_ASPEED is not set -CONFIG_SENSORS_ATXP1=m -CONFIG_SENSORS_DS620=m -# CONFIG_SENSORS_DS1621 is not set -# CONFIG_SENSORS_DA9052_ADC is not set -CONFIG_SENSORS_I5K_AMB=m -# CONFIG_SENSORS_F71805F is not set -CONFIG_SENSORS_F71882FG=m -CONFIG_SENSORS_F75375S=m -CONFIG_SENSORS_MC13783_ADC=m -CONFIG_SENSORS_FTSTEUTATES=m -# CONFIG_SENSORS_GL518SM is not set -# CONFIG_SENSORS_GL520SM is not set -CONFIG_SENSORS_G760A=m -CONFIG_SENSORS_G762=m -CONFIG_SENSORS_GPIO_FAN=m -# CONFIG_SENSORS_HIH6130 is not set -# CONFIG_SENSORS_IIO_HWMON is not set -# CONFIG_SENSORS_IT87 is not set -CONFIG_SENSORS_JC42=m -# CONFIG_SENSORS_POWR1220 is not set -CONFIG_SENSORS_LINEAGE=m -# CONFIG_SENSORS_LTC2945 is not set -# CONFIG_SENSORS_LTC2990 is not set -CONFIG_SENSORS_LTC4151=m -CONFIG_SENSORS_LTC4215=m -# CONFIG_SENSORS_LTC4222 is not set -CONFIG_SENSORS_LTC4245=m -# CONFIG_SENSORS_LTC4260 is not set -CONFIG_SENSORS_LTC4261=m -CONFIG_SENSORS_MAX1111=m -CONFIG_SENSORS_MAX16065=m -# CONFIG_SENSORS_MAX1619 is not set -CONFIG_SENSORS_MAX1668=m -# CONFIG_SENSORS_MAX197 is not set -# CONFIG_SENSORS_MAX31722 is not set -CONFIG_SENSORS_MAX6621=m -CONFIG_SENSORS_MAX6639=m -CONFIG_SENSORS_MAX6642=m -CONFIG_SENSORS_MAX6650=m -# CONFIG_SENSORS_MAX6697 is not set -# CONFIG_SENSORS_MAX31790 is not set -# CONFIG_SENSORS_MCP3021 is not set -# CONFIG_SENSORS_TC654 is not set -CONFIG_SENSORS_ADCXX=m -# CONFIG_SENSORS_LM63 is not set -CONFIG_SENSORS_LM70=m -CONFIG_SENSORS_LM73=m -# CONFIG_SENSORS_LM75 is not set -# CONFIG_SENSORS_LM77 is not set -# CONFIG_SENSORS_LM78 is not set -# CONFIG_SENSORS_LM80 is not set -# CONFIG_SENSORS_LM83 is not set -# CONFIG_SENSORS_LM85 is not set -# CONFIG_SENSORS_LM87 is not set -# CONFIG_SENSORS_LM90 is not set -# CONFIG_SENSORS_LM92 is not set -CONFIG_SENSORS_LM93=m -# CONFIG_SENSORS_LM95234 is not set -CONFIG_SENSORS_LM95241=m -CONFIG_SENSORS_LM95245=m -# CONFIG_SENSORS_PC87360 is not set -CONFIG_SENSORS_PC87427=m -CONFIG_SENSORS_NTC_THERMISTOR=m -CONFIG_SENSORS_NCT6683=m -CONFIG_SENSORS_NCT6775=m -# CONFIG_SENSORS_NCT7802 is not set -# CONFIG_SENSORS_NCT7904 is not set -# CONFIG_SENSORS_PCF8591 is not set -# CONFIG_PMBUS is not set -CONFIG_SENSORS_PWM_FAN=m -# CONFIG_SENSORS_SHT15 is not set -CONFIG_SENSORS_SHT21=m -# CONFIG_SENSORS_SHT3x is not set -# CONFIG_SENSORS_SHTC1 is not set -# CONFIG_SENSORS_SIS5595 is not set -CONFIG_SENSORS_DME1737=m -CONFIG_SENSORS_EMC1403=m -CONFIG_SENSORS_EMC2103=m -CONFIG_SENSORS_EMC6W201=m -# CONFIG_SENSORS_SMSC47M1 is not set -CONFIG_SENSORS_SMSC47M192=m -# CONFIG_SENSORS_SMSC47B397 is not set -CONFIG_SENSORS_SCH56XX_COMMON=m -CONFIG_SENSORS_SCH5627=m -# CONFIG_SENSORS_SCH5636 is not set -# CONFIG_SENSORS_STTS751 is not set -CONFIG_SENSORS_SMM665=m -# CONFIG_SENSORS_ADC128D818 is not set -CONFIG_SENSORS_ADS1015=m -CONFIG_SENSORS_ADS7828=m -CONFIG_SENSORS_ADS7871=m -CONFIG_SENSORS_AMC6821=m -# CONFIG_SENSORS_INA209 is not set -# CONFIG_SENSORS_INA2XX is not set -# CONFIG_SENSORS_INA3221 is not set -# CONFIG_SENSORS_TC74 is not set -CONFIG_SENSORS_THMC50=m -CONFIG_SENSORS_TMP102=m -# CONFIG_SENSORS_TMP103 is not set -# CONFIG_SENSORS_TMP108 is not set -CONFIG_SENSORS_TMP401=m -CONFIG_SENSORS_TMP421=m -# CONFIG_SENSORS_VEXPRESS is not set -# CONFIG_SENSORS_VIA686A is not set -CONFIG_SENSORS_VT1211=m -CONFIG_SENSORS_VT8231=m -CONFIG_SENSORS_W83773G=m -# CONFIG_SENSORS_W83781D is not set -CONFIG_SENSORS_W83791D=m -CONFIG_SENSORS_W83792D=m -CONFIG_SENSORS_W83793=m -CONFIG_SENSORS_W83795=m -# CONFIG_SENSORS_W83795_FANCTRL is not set -# CONFIG_SENSORS_W83L785TS is not set -CONFIG_SENSORS_W83L786NG=m -# CONFIG_SENSORS_W83627HF is not set -CONFIG_SENSORS_W83627EHF=m -CONFIG_THERMAL=y -# CONFIG_THERMAL_STATISTICS is not set -CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 -CONFIG_THERMAL_HWMON=y -CONFIG_THERMAL_OF=y -# CONFIG_THERMAL_WRITABLE_TRIPS is not set -CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y -# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set -# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set -# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set -CONFIG_THERMAL_GOV_FAIR_SHARE=y -CONFIG_THERMAL_GOV_STEP_WISE=y -# CONFIG_THERMAL_GOV_BANG_BANG is not set -# CONFIG_THERMAL_GOV_USER_SPACE is not set -# CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set -CONFIG_CPU_THERMAL=y -# CONFIG_CLOCK_THERMAL is not set -# CONFIG_DEVFREQ_THERMAL is not set -# CONFIG_THERMAL_EMULATION is not set -# CONFIG_IMX_THERMAL is not set -# CONFIG_QORIQ_THERMAL is not set -CONFIG_ROCKCHIP_THERMAL=m -CONFIG_ARMADA_THERMAL=y - -# -# ACPI INT340X thermal drivers -# - -# -# Broadcom thermal drivers -# -CONFIG_BCM2835_THERMAL=m - -# -# Texas Instruments thermal drivers -# -CONFIG_TI_SOC_THERMAL=m -CONFIG_TI_THERMAL=y -# CONFIG_OMAP3_THERMAL is not set -CONFIG_OMAP4_THERMAL=y -CONFIG_OMAP5_THERMAL=y -CONFIG_DRA752_THERMAL=y - -# -# Samsung thermal drivers -# -CONFIG_EXYNOS_THERMAL=y - -# -# NVIDIA Tegra thermal drivers -# -CONFIG_TEGRA_SOCTHERM=y -# CONFIG_GENERIC_ADC_THERMAL is not set -CONFIG_WATCHDOG=y -CONFIG_WATCHDOG_CORE=y -# CONFIG_WATCHDOG_NOWAYOUT is not set -CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y -CONFIG_WATCHDOG_SYSFS=y - -# -# Watchdog Device Drivers -# -CONFIG_SOFT_WATCHDOG=m -CONFIG_DA9052_WATCHDOG=m -# CONFIG_GPIO_WATCHDOG is not set -# CONFIG_XILINX_WATCHDOG is not set -# CONFIG_ZIIRAVE_WATCHDOG is not set -CONFIG_ARM_SP805_WATCHDOG=m -# CONFIG_CADENCE_WATCHDOG is not set -CONFIG_FTWDT010_WATCHDOG=m -CONFIG_HAVE_S3C2410_WATCHDOG=y -CONFIG_S3C2410_WATCHDOG=m -CONFIG_DW_WATCHDOG=m -CONFIG_OMAP_WATCHDOG=m -CONFIG_ORION_WATCHDOG=m -CONFIG_SUNXI_WATCHDOG=m -CONFIG_TWL4030_WATCHDOG=m -# CONFIG_TS4800_WATCHDOG is not set -# CONFIG_MAX63XX_WATCHDOG is not set -CONFIG_IMX2_WDT=m -CONFIG_TEGRA_WATCHDOG=m -# CONFIG_ALIM7101_WDT is not set -# CONFIG_I6300ESB_WDT is not set -CONFIG_BCM2835_WDT=m -# CONFIG_MEN_A21_WDT is not set -CONFIG_XEN_WDT=m - -# -# PCI-based Watchdog Cards -# -# CONFIG_PCIPCWATCHDOG is not set -# CONFIG_WDTPCI is not set - -# -# USB-based Watchdog Cards -# -# CONFIG_USBPCWATCHDOG is not set - -# -# Watchdog Pretimeout Governors -# -# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set -CONFIG_SSB_POSSIBLE=y -CONFIG_SSB=m -CONFIG_SSB_SPROM=y -CONFIG_SSB_BLOCKIO=y -CONFIG_SSB_PCIHOST_POSSIBLE=y -CONFIG_SSB_PCIHOST=y -CONFIG_SSB_B43_PCI_BRIDGE=y -CONFIG_SSB_SDIOHOST_POSSIBLE=y -CONFIG_SSB_SDIOHOST=y -# CONFIG_SSB_SILENT is not set -# CONFIG_SSB_DEBUG is not set -CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y -CONFIG_SSB_DRIVER_PCICORE=y -# CONFIG_SSB_DRIVER_GPIO is not set -CONFIG_BCMA_POSSIBLE=y -CONFIG_BCMA=m -CONFIG_BCMA_BLOCKIO=y -CONFIG_BCMA_HOST_PCI_POSSIBLE=y -CONFIG_BCMA_HOST_PCI=y -# CONFIG_BCMA_HOST_SOC is not set -CONFIG_BCMA_DRIVER_PCI=y -# CONFIG_BCMA_DRIVER_GMAC_CMN is not set -# CONFIG_BCMA_DRIVER_GPIO is not set -# CONFIG_BCMA_DEBUG is not set - -# -# Multifunction device drivers -# -CONFIG_MFD_CORE=y -# CONFIG_MFD_ALTERA_A10SR is not set -# CONFIG_MFD_ACT8945A is not set -# CONFIG_MFD_SUN4I_GPADC is not set -# CONFIG_MFD_AS3711 is not set -CONFIG_MFD_AS3722=y -# CONFIG_PMIC_ADP5520 is not set -# CONFIG_MFD_AAT2870_CORE is not set -# CONFIG_MFD_ATMEL_FLEXCOM is not set -# CONFIG_MFD_ATMEL_HLCDC is not set -# CONFIG_MFD_BCM590XX is not set -CONFIG_MFD_BD9571MWV=m -# CONFIG_MFD_AC100 is not set -CONFIG_MFD_AXP20X=y -CONFIG_MFD_AXP20X_I2C=y -# CONFIG_MFD_AXP20X_RSB is not set -CONFIG_MFD_CROS_EC=m -# CONFIG_MFD_CROS_EC_I2C is not set -CONFIG_MFD_CROS_EC_SPI=m -CONFIG_MFD_CROS_EC_CHARDEV=m -# CONFIG_MFD_ASIC3 is not set -# CONFIG_PMIC_DA903X is not set -CONFIG_PMIC_DA9052=y -CONFIG_MFD_DA9052_SPI=y -CONFIG_MFD_DA9052_I2C=y -# CONFIG_MFD_DA9055 is not set -# CONFIG_MFD_DA9062 is not set -# CONFIG_MFD_DA9063 is not set -# CONFIG_MFD_DA9150 is not set -# CONFIG_MFD_DLN2 is not set -# CONFIG_MFD_EXYNOS_LPASS is not set -CONFIG_MFD_MC13XXX=m -CONFIG_MFD_MC13XXX_SPI=m -CONFIG_MFD_MC13XXX_I2C=m -# CONFIG_MFD_HI6421_PMIC is not set -# CONFIG_HTC_PASIC3 is not set -# CONFIG_HTC_I2CPLD is not set -# CONFIG_LPC_ICH is not set -CONFIG_LPC_SCH=m -# CONFIG_MFD_JANZ_CMODIO is not set -# CONFIG_MFD_KEMPLD is not set -# CONFIG_MFD_88PM800 is not set -# CONFIG_MFD_88PM805 is not set -# CONFIG_MFD_88PM860X is not set -# CONFIG_MFD_MAX14577 is not set -# CONFIG_MFD_MAX77620 is not set -CONFIG_MFD_MAX77686=y -# CONFIG_MFD_MAX77693 is not set -# CONFIG_MFD_MAX77843 is not set -# CONFIG_MFD_MAX8907 is not set -# CONFIG_MFD_MAX8925 is not set -# CONFIG_MFD_MAX8997 is not set -# CONFIG_MFD_MAX8998 is not set -# CONFIG_MFD_MT6397 is not set -# CONFIG_MFD_MENF21BMC is not set -# CONFIG_EZX_PCAP is not set -# CONFIG_MFD_CPCAP is not set -CONFIG_MFD_VIPERBOARD=m -# CONFIG_MFD_RETU is not set -# CONFIG_MFD_PCF50633 is not set -# CONFIG_UCB1400_CORE is not set -# CONFIG_MFD_PM8XXX is not set -# CONFIG_MFD_RDC321X is not set -# CONFIG_MFD_RT5033 is not set -# CONFIG_MFD_RC5T583 is not set -CONFIG_MFD_RK808=y -# CONFIG_MFD_RN5T618 is not set -CONFIG_MFD_SEC_CORE=y -# CONFIG_MFD_SI476X_CORE is not set -# CONFIG_MFD_SM501 is not set -# CONFIG_MFD_SKY81452 is not set -# CONFIG_MFD_SMSC is not set -# CONFIG_ABX500_CORE is not set -CONFIG_MFD_STMPE=y - -# -# STMicroelectronics STMPE Interface Drivers -# -CONFIG_STMPE_I2C=y -# CONFIG_STMPE_SPI is not set -CONFIG_MFD_SUN6I_PRCM=y -CONFIG_MFD_SYSCON=y -CONFIG_MFD_TI_AM335X_TSCADC=m -# CONFIG_MFD_LP3943 is not set -# CONFIG_MFD_LP8788 is not set -# CONFIG_MFD_TI_LMU is not set -CONFIG_MFD_OMAP_USB_HOST=y -CONFIG_MFD_PALMAS=y -# CONFIG_TPS6105X is not set -# CONFIG_TPS65010 is not set -# CONFIG_TPS6507X is not set -# CONFIG_MFD_TPS65086 is not set -# CONFIG_MFD_TPS65090 is not set -# CONFIG_MFD_TPS65217 is not set -# CONFIG_MFD_TI_LP873X is not set -# CONFIG_MFD_TI_LP87565 is not set -# CONFIG_MFD_TPS65218 is not set -# CONFIG_MFD_TPS6586X is not set -# CONFIG_MFD_TPS65910 is not set -# CONFIG_MFD_TPS65912_I2C is not set -# CONFIG_MFD_TPS65912_SPI is not set -# CONFIG_MFD_TPS80031 is not set -CONFIG_TWL4030_CORE=y -CONFIG_TWL4030_POWER=y -CONFIG_MFD_TWL4030_AUDIO=y -CONFIG_TWL6040_CORE=y -# CONFIG_MFD_WL1273_CORE is not set -# CONFIG_MFD_LM3533 is not set -# CONFIG_MFD_TC3589X is not set -# CONFIG_MFD_T7L66XB is not set -# CONFIG_MFD_TC6387XB is not set -# CONFIG_MFD_TC6393XB is not set -# CONFIG_MFD_VX855 is not set -# CONFIG_MFD_ARIZONA_I2C is not set -# CONFIG_MFD_ARIZONA_SPI is not set -# CONFIG_MFD_WM8400 is not set -# CONFIG_MFD_WM831X_I2C is not set -# CONFIG_MFD_WM831X_SPI is not set -# CONFIG_MFD_WM8350_I2C is not set -# CONFIG_MFD_WM8994 is not set -CONFIG_MFD_VEXPRESS_SYSREG=y -CONFIG_REGULATOR=y -# CONFIG_REGULATOR_DEBUG is not set -CONFIG_REGULATOR_FIXED_VOLTAGE=y -# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set -# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set -# CONFIG_REGULATOR_88PG86X is not set -CONFIG_REGULATOR_ACT8865=m -# CONFIG_REGULATOR_AD5398 is not set -CONFIG_REGULATOR_ANATOP=m -CONFIG_REGULATOR_AS3722=y -CONFIG_REGULATOR_AXP20X=m -CONFIG_REGULATOR_BD9571MWV=m -CONFIG_REGULATOR_DA9052=m -# CONFIG_REGULATOR_DA9210 is not set -# CONFIG_REGULATOR_DA9211 is not set -CONFIG_REGULATOR_FAN53555=m -CONFIG_REGULATOR_GPIO=m -# CONFIG_REGULATOR_ISL9305 is not set -# CONFIG_REGULATOR_ISL6271A is not set -# CONFIG_REGULATOR_LP3971 is not set -# CONFIG_REGULATOR_LP3972 is not set -# CONFIG_REGULATOR_LP872X is not set -# CONFIG_REGULATOR_LP8755 is not set -# CONFIG_REGULATOR_LTC3589 is not set -# CONFIG_REGULATOR_LTC3676 is not set -# CONFIG_REGULATOR_MAX1586 is not set -# CONFIG_REGULATOR_MAX8649 is not set -# CONFIG_REGULATOR_MAX8660 is not set -# CONFIG_REGULATOR_MAX8952 is not set -# CONFIG_REGULATOR_MAX8973 is not set -CONFIG_REGULATOR_MAX77686=m -# CONFIG_REGULATOR_MAX77802 is not set -CONFIG_REGULATOR_MC13XXX_CORE=m -CONFIG_REGULATOR_MC13783=m -CONFIG_REGULATOR_MC13892=m -# CONFIG_REGULATOR_MT6311 is not set -CONFIG_REGULATOR_PALMAS=y -CONFIG_REGULATOR_PBIAS=m -CONFIG_REGULATOR_PFUZE100=m -# CONFIG_REGULATOR_PV88060 is not set -# CONFIG_REGULATOR_PV88080 is not set -# CONFIG_REGULATOR_PV88090 is not set -# CONFIG_REGULATOR_PWM is not set -CONFIG_REGULATOR_RK808=m -CONFIG_REGULATOR_S2MPA01=m -CONFIG_REGULATOR_S2MPS11=m -CONFIG_REGULATOR_S5M8767=m -CONFIG_REGULATOR_TI_ABB=m -CONFIG_REGULATOR_SY8106A=m -# CONFIG_REGULATOR_TPS51632 is not set -# CONFIG_REGULATOR_TPS62360 is not set -# CONFIG_REGULATOR_TPS65023 is not set -# CONFIG_REGULATOR_TPS6507X is not set -# CONFIG_REGULATOR_TPS65132 is not set -# CONFIG_REGULATOR_TPS6524X is not set -CONFIG_REGULATOR_TWL4030=y -# CONFIG_REGULATOR_VCTRL is not set -CONFIG_REGULATOR_VEXPRESS=m -CONFIG_CEC_CORE=m -CONFIG_CEC_NOTIFIER=y -CONFIG_RC_CORE=y -CONFIG_RC_MAP=m -CONFIG_LIRC=y -# CONFIG_BPF_LIRC_MODE2 is not set -CONFIG_RC_DECODERS=y -CONFIG_IR_NEC_DECODER=m -CONFIG_IR_RC5_DECODER=m -CONFIG_IR_RC6_DECODER=m -CONFIG_IR_JVC_DECODER=m -CONFIG_IR_SONY_DECODER=m -CONFIG_IR_SANYO_DECODER=m -CONFIG_IR_SHARP_DECODER=m -CONFIG_IR_MCE_KBD_DECODER=m -CONFIG_IR_XMP_DECODER=m -CONFIG_IR_IMON_DECODER=m -CONFIG_RC_DEVICES=y -CONFIG_RC_ATI_REMOTE=m -# CONFIG_IR_HIX5HD2 is not set -CONFIG_IR_IMON=m -CONFIG_IR_IMON_RAW=m -CONFIG_IR_MCEUSB=m -CONFIG_IR_REDRAT3=m -# CONFIG_IR_SPI is not set -CONFIG_IR_STREAMZAP=m -CONFIG_IR_IGORPLUGUSB=m -CONFIG_IR_IGUANA=m -CONFIG_IR_TTUSBIR=m -# CONFIG_IR_RX51 is not set -CONFIG_RC_LOOPBACK=m -CONFIG_IR_GPIO_CIR=m -CONFIG_IR_GPIO_TX=m -CONFIG_IR_PWM_TX=m -CONFIG_IR_SUNXI=m -# CONFIG_IR_SERIAL is not set -# CONFIG_IR_SIR is not set -CONFIG_MEDIA_SUPPORT=y - -# -# Multimedia core support -# -CONFIG_MEDIA_CAMERA_SUPPORT=y -CONFIG_MEDIA_ANALOG_TV_SUPPORT=y -CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y -CONFIG_MEDIA_RADIO_SUPPORT=y -CONFIG_MEDIA_SDR_SUPPORT=y -CONFIG_MEDIA_CEC_SUPPORT=y -# CONFIG_MEDIA_CEC_RC is not set -CONFIG_MEDIA_CONTROLLER=y -# CONFIG_MEDIA_CONTROLLER_DVB is not set -CONFIG_VIDEO_DEV=y -CONFIG_VIDEO_V4L2_SUBDEV_API=y -CONFIG_VIDEO_V4L2=y -# CONFIG_VIDEO_ADV_DEBUG is not set -# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set -# CONFIG_VIDEO_PCI_SKELETON is not set -CONFIG_VIDEO_TUNER=m -CONFIG_V4L2_MEM2MEM_DEV=m -CONFIG_V4L2_FWNODE=m -CONFIG_VIDEOBUF_GEN=m -CONFIG_VIDEOBUF_DMA_SG=m -CONFIG_VIDEOBUF_VMALLOC=m -CONFIG_DVB_CORE=y -# CONFIG_DVB_MMAP is not set -CONFIG_DVB_NET=y -CONFIG_TTPCI_EEPROM=m -CONFIG_DVB_MAX_ADAPTERS=8 -CONFIG_DVB_DYNAMIC_MINORS=y -# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set -# CONFIG_DVB_ULE_DEBUG is not set - -# -# Media drivers -# -CONFIG_MEDIA_USB_SUPPORT=y - -# -# Webcam devices -# -CONFIG_USB_VIDEO_CLASS=m -CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y -CONFIG_USB_GSPCA=m -CONFIG_USB_M5602=m -CONFIG_USB_STV06XX=m -CONFIG_USB_GL860=m -CONFIG_USB_GSPCA_BENQ=m -CONFIG_USB_GSPCA_CONEX=m -CONFIG_USB_GSPCA_CPIA1=m -CONFIG_USB_GSPCA_DTCS033=m -CONFIG_USB_GSPCA_ETOMS=m -CONFIG_USB_GSPCA_FINEPIX=m -CONFIG_USB_GSPCA_JEILINJ=m -CONFIG_USB_GSPCA_JL2005BCD=m -CONFIG_USB_GSPCA_KINECT=m -CONFIG_USB_GSPCA_KONICA=m -CONFIG_USB_GSPCA_MARS=m -CONFIG_USB_GSPCA_MR97310A=m -CONFIG_USB_GSPCA_NW80X=m -CONFIG_USB_GSPCA_OV519=m -CONFIG_USB_GSPCA_OV534=m -CONFIG_USB_GSPCA_OV534_9=m -CONFIG_USB_GSPCA_PAC207=m -CONFIG_USB_GSPCA_PAC7302=m -CONFIG_USB_GSPCA_PAC7311=m -CONFIG_USB_GSPCA_SE401=m -CONFIG_USB_GSPCA_SN9C2028=m -CONFIG_USB_GSPCA_SN9C20X=m -CONFIG_USB_GSPCA_SONIXB=m -CONFIG_USB_GSPCA_SONIXJ=m -CONFIG_USB_GSPCA_SPCA500=m -CONFIG_USB_GSPCA_SPCA501=m -CONFIG_USB_GSPCA_SPCA505=m -CONFIG_USB_GSPCA_SPCA506=m -CONFIG_USB_GSPCA_SPCA508=m -CONFIG_USB_GSPCA_SPCA561=m -CONFIG_USB_GSPCA_SPCA1528=m -CONFIG_USB_GSPCA_SQ905=m -CONFIG_USB_GSPCA_SQ905C=m -CONFIG_USB_GSPCA_SQ930X=m -CONFIG_USB_GSPCA_STK014=m -CONFIG_USB_GSPCA_STK1135=m -CONFIG_USB_GSPCA_STV0680=m -CONFIG_USB_GSPCA_SUNPLUS=m -CONFIG_USB_GSPCA_T613=m -CONFIG_USB_GSPCA_TOPRO=m -CONFIG_USB_GSPCA_TOUPTEK=m -CONFIG_USB_GSPCA_TV8532=m -CONFIG_USB_GSPCA_VC032X=m -CONFIG_USB_GSPCA_VICAM=m -CONFIG_USB_GSPCA_XIRLINK_CIT=m -CONFIG_USB_GSPCA_ZC3XX=m -CONFIG_USB_PWC=m -# CONFIG_USB_PWC_DEBUG is not set -CONFIG_USB_PWC_INPUT_EVDEV=y -CONFIG_VIDEO_CPIA2=m -CONFIG_USB_ZR364XX=m -CONFIG_USB_STKWEBCAM=m -CONFIG_USB_S2255=m -CONFIG_VIDEO_USBTV=m - -# -# Analog TV USB devices -# -CONFIG_VIDEO_PVRUSB2=m -CONFIG_VIDEO_PVRUSB2_SYSFS=y -CONFIG_VIDEO_PVRUSB2_DVB=y -# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set -CONFIG_VIDEO_HDPVR=m -CONFIG_VIDEO_USBVISION=m -CONFIG_VIDEO_STK1160_COMMON=m -CONFIG_VIDEO_STK1160=m -CONFIG_VIDEO_GO7007=m -CONFIG_VIDEO_GO7007_USB=m -CONFIG_VIDEO_GO7007_LOADER=m -CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m - -# -# Analog/digital TV USB devices -# -CONFIG_VIDEO_AU0828=m -CONFIG_VIDEO_AU0828_V4L2=y -CONFIG_VIDEO_AU0828_RC=y -CONFIG_VIDEO_CX231XX=m -CONFIG_VIDEO_CX231XX_RC=y -CONFIG_VIDEO_CX231XX_ALSA=m -CONFIG_VIDEO_CX231XX_DVB=m -# CONFIG_VIDEO_TM6000 is not set - -# -# Digital TV USB devices -# -CONFIG_DVB_USB=m -# CONFIG_DVB_USB_DEBUG is not set -CONFIG_DVB_USB_DIB3000MC=m -CONFIG_DVB_USB_A800=m -CONFIG_DVB_USB_DIBUSB_MB=m -CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y -CONFIG_DVB_USB_DIBUSB_MC=m -CONFIG_DVB_USB_DIB0700=m -CONFIG_DVB_USB_UMT_010=m -CONFIG_DVB_USB_CXUSB=m -CONFIG_DVB_USB_M920X=m -CONFIG_DVB_USB_DIGITV=m -CONFIG_DVB_USB_VP7045=m -CONFIG_DVB_USB_VP702X=m -CONFIG_DVB_USB_GP8PSK=m -CONFIG_DVB_USB_NOVA_T_USB2=m -CONFIG_DVB_USB_TTUSB2=m -CONFIG_DVB_USB_DTT200U=m -CONFIG_DVB_USB_OPERA1=m -CONFIG_DVB_USB_AF9005=m -CONFIG_DVB_USB_AF9005_REMOTE=m -CONFIG_DVB_USB_PCTV452E=m -CONFIG_DVB_USB_DW2102=m -CONFIG_DVB_USB_CINERGY_T2=m -CONFIG_DVB_USB_DTV5100=m -CONFIG_DVB_USB_FRIIO=m -CONFIG_DVB_USB_AZ6027=m -CONFIG_DVB_USB_TECHNISAT_USB2=m -CONFIG_DVB_USB_V2=m -CONFIG_DVB_USB_AF9015=m -CONFIG_DVB_USB_AF9035=m -CONFIG_DVB_USB_ANYSEE=m -CONFIG_DVB_USB_AU6610=m -CONFIG_DVB_USB_AZ6007=m -CONFIG_DVB_USB_CE6230=m -CONFIG_DVB_USB_EC168=m -CONFIG_DVB_USB_GL861=m -CONFIG_DVB_USB_LME2510=m -CONFIG_DVB_USB_MXL111SF=m -CONFIG_DVB_USB_RTL28XXU=m -CONFIG_DVB_USB_DVBSKY=m -# CONFIG_DVB_USB_ZD1301 is not set -CONFIG_DVB_TTUSB_BUDGET=m -CONFIG_DVB_TTUSB_DEC=m -CONFIG_SMS_USB_DRV=m -CONFIG_DVB_B2C2_FLEXCOP_USB=m -# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set -CONFIG_DVB_AS102=m - -# -# Webcam, TV (analog/digital) USB devices -# -CONFIG_VIDEO_EM28XX=m -CONFIG_VIDEO_EM28XX_V4L2=m -CONFIG_VIDEO_EM28XX_ALSA=m -CONFIG_VIDEO_EM28XX_DVB=m -CONFIG_VIDEO_EM28XX_RC=m - -# -# Software defined radio USB devices -# -CONFIG_USB_AIRSPY=m -CONFIG_USB_HACKRF=m -CONFIG_USB_MSI2500=m - -# -# USB HDMI CEC adapters -# -CONFIG_USB_PULSE8_CEC=m -CONFIG_USB_RAINSHADOW_CEC=m -CONFIG_MEDIA_PCI_SUPPORT=y - -# -# Media capture support -# -CONFIG_VIDEO_SOLO6X10=m -CONFIG_VIDEO_TW5864=m -CONFIG_VIDEO_TW68=m -CONFIG_VIDEO_TW686X=m - -# -# Media capture/analog TV support -# -CONFIG_VIDEO_IVTV=m -# CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set -CONFIG_VIDEO_IVTV_ALSA=m -CONFIG_VIDEO_FB_IVTV=m -CONFIG_VIDEO_HEXIUM_GEMINI=m -CONFIG_VIDEO_HEXIUM_ORION=m -CONFIG_VIDEO_MXB=m -CONFIG_VIDEO_DT3155=m - -# -# Media capture/analog/hybrid TV support -# -CONFIG_VIDEO_CX18=m -CONFIG_VIDEO_CX18_ALSA=m -CONFIG_VIDEO_CX23885=m -CONFIG_MEDIA_ALTERA_CI=m -# CONFIG_VIDEO_CX25821 is not set -CONFIG_VIDEO_CX88=m -CONFIG_VIDEO_CX88_ALSA=m -CONFIG_VIDEO_CX88_BLACKBIRD=m -CONFIG_VIDEO_CX88_DVB=m -CONFIG_VIDEO_CX88_ENABLE_VP3054=y -CONFIG_VIDEO_CX88_VP3054=m -CONFIG_VIDEO_CX88_MPEG=m -CONFIG_VIDEO_BT848=m -CONFIG_DVB_BT8XX=m -CONFIG_VIDEO_SAA7134=m -CONFIG_VIDEO_SAA7134_ALSA=m -CONFIG_VIDEO_SAA7134_RC=y -CONFIG_VIDEO_SAA7134_DVB=m -# CONFIG_VIDEO_SAA7134_GO7007 is not set -CONFIG_VIDEO_SAA7164=m - -# -# Media digital TV PCI Adapters -# -CONFIG_DVB_AV7110_IR=y -CONFIG_DVB_AV7110=m -CONFIG_DVB_AV7110_OSD=y -CONFIG_DVB_BUDGET_CORE=m -CONFIG_DVB_BUDGET=m -CONFIG_DVB_BUDGET_CI=m -CONFIG_DVB_BUDGET_AV=m -CONFIG_DVB_BUDGET_PATCH=m -CONFIG_DVB_B2C2_FLEXCOP_PCI=m -# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set -CONFIG_DVB_PLUTO2=m -CONFIG_DVB_DM1105=m -CONFIG_DVB_PT1=m -CONFIG_DVB_PT3=m -CONFIG_MANTIS_CORE=m -CONFIG_DVB_MANTIS=m -CONFIG_DVB_HOPPER=m -CONFIG_DVB_NGENE=m -CONFIG_DVB_DDBRIDGE=m -# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set -CONFIG_DVB_SMIPCIE=m -CONFIG_DVB_NETUP_UNIDVB=m -CONFIG_V4L_PLATFORM_DRIVERS=y -CONFIG_VIDEO_CAFE_CCIC=m -CONFIG_VIDEO_CADENCE=y -CONFIG_VIDEO_CADENCE_CSI2RX=m -CONFIG_VIDEO_CADENCE_CSI2TX=m -# CONFIG_VIDEO_MUX is not set -CONFIG_VIDEO_OMAP3=m -# CONFIG_VIDEO_OMAP3_DEBUG is not set -# CONFIG_SOC_CAMERA is not set -# CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS is not set -# CONFIG_VIDEO_XILINX is not set -# CONFIG_VIDEO_TI_CAL is not set -CONFIG_V4L_MEM2MEM_DRIVERS=y -# CONFIG_VIDEO_CODA is not set -# CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set -# CONFIG_VIDEO_SAMSUNG_S5P_G2D is not set -# CONFIG_VIDEO_SAMSUNG_S5P_JPEG is not set -# CONFIG_VIDEO_SAMSUNG_S5P_MFC is not set -# CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC is not set -# CONFIG_VIDEO_SH_VEU is not set -CONFIG_VIDEO_ROCKCHIP_RGA=m -CONFIG_VIDEO_TI_VPE=m -# CONFIG_VIDEO_TI_VPE_DEBUG is not set -CONFIG_VIDEO_TI_VPDMA=m -CONFIG_VIDEO_TI_SC=m -CONFIG_VIDEO_TI_CSC=m -CONFIG_V4L_TEST_DRIVERS=y -# CONFIG_VIDEO_VIMC is not set -CONFIG_VIDEO_VIVID=m -CONFIG_VIDEO_VIVID_CEC=y -CONFIG_VIDEO_VIVID_MAX_DEVS=64 -# CONFIG_VIDEO_VIM2M is not set -# CONFIG_DVB_PLATFORM_DRIVERS is not set -# CONFIG_CEC_PLATFORM_DRIVERS is not set -# CONFIG_SDR_PLATFORM_DRIVERS is not set - -# -# Supported MMC/SDIO adapters -# -CONFIG_SMS_SDIO_DRV=m -CONFIG_RADIO_ADAPTERS=y -CONFIG_RADIO_TEA575X=m -CONFIG_RADIO_SI470X=y -CONFIG_USB_SI470X=m -# CONFIG_I2C_SI470X is not set -CONFIG_RADIO_SI4713=m -# CONFIG_USB_SI4713 is not set -# CONFIG_PLATFORM_SI4713 is not set -CONFIG_I2C_SI4713=m -CONFIG_USB_MR800=m -# CONFIG_USB_DSBR is not set -# CONFIG_RADIO_MAXIRADIO is not set -CONFIG_RADIO_SHARK=m -CONFIG_RADIO_SHARK2=m -CONFIG_USB_KEENE=m -CONFIG_USB_RAREMONO=m -CONFIG_USB_MA901=m -# CONFIG_RADIO_TEA5764 is not set -# CONFIG_RADIO_SAA7706H is not set -# CONFIG_RADIO_TEF6862 is not set -# CONFIG_RADIO_WL1273 is not set - -# -# Texas Instruments WL128x FM driver (ST based) -# -CONFIG_RADIO_WL128X=m - -# -# Supported FireWire (IEEE 1394) Adapters -# -CONFIG_DVB_FIREDTV=m -CONFIG_DVB_FIREDTV_INPUT=y -CONFIG_MEDIA_COMMON_OPTIONS=y - -# -# common driver options -# -CONFIG_VIDEO_CX2341X=m -CONFIG_VIDEO_TVEEPROM=m -CONFIG_CYPRESS_FIRMWARE=m -CONFIG_VIDEOBUF2_CORE=m -CONFIG_VIDEOBUF2_V4L2=m -CONFIG_VIDEOBUF2_MEMOPS=m -CONFIG_VIDEOBUF2_DMA_CONTIG=m -CONFIG_VIDEOBUF2_VMALLOC=m -CONFIG_VIDEOBUF2_DMA_SG=m -CONFIG_VIDEOBUF2_DVB=m -CONFIG_DVB_B2C2_FLEXCOP=m -CONFIG_VIDEO_SAA7146=m -CONFIG_VIDEO_SAA7146_VV=m -CONFIG_SMS_SIANO_MDTV=m -CONFIG_SMS_SIANO_RC=y -# CONFIG_SMS_SIANO_DEBUGFS is not set -CONFIG_VIDEO_V4L2_TPG=m - -# -# Media ancillary drivers (tuners, sensors, i2c, spi, frontends) -# -CONFIG_MEDIA_SUBDRV_AUTOSELECT=y -CONFIG_MEDIA_ATTACH=y -CONFIG_VIDEO_IR_I2C=y - -# -# Audio decoders, processors and mixers -# -CONFIG_VIDEO_TVAUDIO=m -CONFIG_VIDEO_TDA7432=m -CONFIG_VIDEO_TDA9840=m -CONFIG_VIDEO_TEA6415C=m -CONFIG_VIDEO_TEA6420=m -CONFIG_VIDEO_MSP3400=m -CONFIG_VIDEO_CS3308=m -CONFIG_VIDEO_CS5345=m -CONFIG_VIDEO_CS53L32A=m -CONFIG_VIDEO_UDA1342=m -CONFIG_VIDEO_WM8775=m -CONFIG_VIDEO_WM8739=m -CONFIG_VIDEO_VP27SMPX=m -CONFIG_VIDEO_SONY_BTF_MPX=m - -# -# RDS decoders -# -CONFIG_VIDEO_SAA6588=m - -# -# Video decoders -# -CONFIG_VIDEO_SAA711X=m -CONFIG_VIDEO_TVP5150=m -CONFIG_VIDEO_TW2804=m -CONFIG_VIDEO_TW9903=m -CONFIG_VIDEO_TW9906=m - -# -# Video and audio decoders -# -CONFIG_VIDEO_SAA717X=m -CONFIG_VIDEO_CX25840=m - -# -# Video encoders -# -CONFIG_VIDEO_SAA7127=m - -# -# Camera sensor devices -# -CONFIG_VIDEO_OV2640=m -CONFIG_VIDEO_OV7640=m -CONFIG_VIDEO_OV7670=m -CONFIG_VIDEO_MT9V011=m - -# -# Flash devices -# - -# -# Video improvement chips -# -CONFIG_VIDEO_UPD64031A=m -CONFIG_VIDEO_UPD64083=m - -# -# Audio/Video compression chips -# -CONFIG_VIDEO_SAA6752HS=m - -# -# SDR tuner chips -# - -# -# Miscellaneous helper chips -# -CONFIG_VIDEO_M52790=m - -# -# Sensors used on soc_camera driver -# - -# -# Media SPI Adapters -# -# CONFIG_CXD2880_SPI_DRV is not set -CONFIG_MEDIA_TUNER=y -CONFIG_MEDIA_TUNER_SIMPLE=y -CONFIG_MEDIA_TUNER_TDA18250=m -CONFIG_MEDIA_TUNER_TDA8290=y -CONFIG_MEDIA_TUNER_TDA827X=y -CONFIG_MEDIA_TUNER_TDA18271=y -CONFIG_MEDIA_TUNER_TDA9887=y -CONFIG_MEDIA_TUNER_TEA5761=y -CONFIG_MEDIA_TUNER_TEA5767=y -CONFIG_MEDIA_TUNER_MSI001=m -CONFIG_MEDIA_TUNER_MT20XX=y -CONFIG_MEDIA_TUNER_MT2060=m -CONFIG_MEDIA_TUNER_MT2063=m -CONFIG_MEDIA_TUNER_MT2266=m -CONFIG_MEDIA_TUNER_MT2131=m -CONFIG_MEDIA_TUNER_QT1010=m -CONFIG_MEDIA_TUNER_XC2028=y -CONFIG_MEDIA_TUNER_XC5000=y -CONFIG_MEDIA_TUNER_XC4000=y -CONFIG_MEDIA_TUNER_MXL5005S=m -CONFIG_MEDIA_TUNER_MXL5007T=m -CONFIG_MEDIA_TUNER_MC44S803=y -CONFIG_MEDIA_TUNER_MAX2165=m -CONFIG_MEDIA_TUNER_TDA18218=m -CONFIG_MEDIA_TUNER_FC0011=m -CONFIG_MEDIA_TUNER_FC0012=m -CONFIG_MEDIA_TUNER_FC0013=m -CONFIG_MEDIA_TUNER_TDA18212=m -CONFIG_MEDIA_TUNER_E4000=m -CONFIG_MEDIA_TUNER_FC2580=m -CONFIG_MEDIA_TUNER_M88RS6000T=m -CONFIG_MEDIA_TUNER_TUA9001=m -CONFIG_MEDIA_TUNER_SI2157=m -CONFIG_MEDIA_TUNER_IT913X=m -CONFIG_MEDIA_TUNER_R820T=m -CONFIG_MEDIA_TUNER_MXL301RF=m -CONFIG_MEDIA_TUNER_QM1D1C0042=m -CONFIG_MEDIA_TUNER_QM1D1B0004=m - -# -# Multistandard (satellite) frontends -# -CONFIG_DVB_STB0899=m -CONFIG_DVB_STB6100=m -CONFIG_DVB_STV090x=m -CONFIG_DVB_STV0910=m -CONFIG_DVB_STV6110x=m -CONFIG_DVB_STV6111=m -CONFIG_DVB_MXL5XX=m -CONFIG_DVB_M88DS3103=m - -# -# Multistandard (cable + terrestrial) frontends -# -CONFIG_DVB_DRXK=m -CONFIG_DVB_TDA18271C2DD=m -CONFIG_DVB_SI2165=m -CONFIG_DVB_MN88472=m -CONFIG_DVB_MN88473=m - -# -# DVB-S (satellite) frontends -# -CONFIG_DVB_CX24110=m -CONFIG_DVB_CX24123=m -CONFIG_DVB_MT312=m -CONFIG_DVB_ZL10036=m -CONFIG_DVB_ZL10039=m -CONFIG_DVB_S5H1420=m -CONFIG_DVB_STV0288=m -CONFIG_DVB_STB6000=m -CONFIG_DVB_STV0299=m -CONFIG_DVB_STV6110=m -CONFIG_DVB_STV0900=m -CONFIG_DVB_TDA8083=m -CONFIG_DVB_TDA10086=m -CONFIG_DVB_TDA8261=m -CONFIG_DVB_VES1X93=m -CONFIG_DVB_TUNER_ITD1000=m -CONFIG_DVB_TUNER_CX24113=m -CONFIG_DVB_TDA826X=m -CONFIG_DVB_TUA6100=m -CONFIG_DVB_CX24116=m -CONFIG_DVB_CX24117=m -CONFIG_DVB_CX24120=m -CONFIG_DVB_SI21XX=m -CONFIG_DVB_TS2020=m -CONFIG_DVB_DS3000=m -CONFIG_DVB_MB86A16=m -CONFIG_DVB_TDA10071=m - -# -# DVB-T (terrestrial) frontends -# -CONFIG_DVB_SP8870=m -CONFIG_DVB_SP887X=m -CONFIG_DVB_CX22700=m -CONFIG_DVB_CX22702=m -CONFIG_DVB_DRXD=m -CONFIG_DVB_L64781=m -CONFIG_DVB_TDA1004X=m -CONFIG_DVB_NXT6000=m -CONFIG_DVB_MT352=m -CONFIG_DVB_ZL10353=m -CONFIG_DVB_DIB3000MB=m -CONFIG_DVB_DIB3000MC=m -CONFIG_DVB_DIB7000M=m -CONFIG_DVB_DIB7000P=m -CONFIG_DVB_TDA10048=m -CONFIG_DVB_AF9013=m -CONFIG_DVB_EC100=m -CONFIG_DVB_STV0367=m -CONFIG_DVB_CXD2820R=m -CONFIG_DVB_CXD2841ER=m -CONFIG_DVB_RTL2830=m -CONFIG_DVB_RTL2832=m -CONFIG_DVB_RTL2832_SDR=m -CONFIG_DVB_SI2168=m -CONFIG_DVB_AS102_FE=m -CONFIG_DVB_GP8PSK_FE=m - -# -# DVB-C (cable) frontends -# -CONFIG_DVB_VES1820=m -CONFIG_DVB_TDA10021=m -CONFIG_DVB_TDA10023=m -CONFIG_DVB_STV0297=m - -# -# ATSC (North American/Korean Terrestrial/Cable DTV) frontends -# -CONFIG_DVB_NXT200X=m -CONFIG_DVB_OR51211=m -CONFIG_DVB_OR51132=m -CONFIG_DVB_BCM3510=m -CONFIG_DVB_LGDT330X=m -CONFIG_DVB_LGDT3305=m -CONFIG_DVB_LGDT3306A=m -CONFIG_DVB_LG2160=m -CONFIG_DVB_S5H1409=m -CONFIG_DVB_AU8522=m -CONFIG_DVB_AU8522_DTV=m -CONFIG_DVB_AU8522_V4L=m -CONFIG_DVB_S5H1411=m - -# -# ISDB-T (terrestrial) frontends -# -CONFIG_DVB_S921=m -CONFIG_DVB_DIB8000=m -CONFIG_DVB_MB86A20S=m - -# -# ISDB-S (satellite) & ISDB-T (terrestrial) frontends -# -CONFIG_DVB_TC90522=m - -# -# Digital terrestrial only tuners/PLL -# -CONFIG_DVB_PLL=m -CONFIG_DVB_TUNER_DIB0070=m -CONFIG_DVB_TUNER_DIB0090=m - -# -# SEC control devices for DVB-S -# -CONFIG_DVB_DRX39XYJ=m -CONFIG_DVB_LNBH25=m -CONFIG_DVB_LNBP21=m -CONFIG_DVB_LNBP22=m -CONFIG_DVB_ISL6405=m -CONFIG_DVB_ISL6421=m -CONFIG_DVB_ISL6423=m -CONFIG_DVB_A8293=m -CONFIG_DVB_LGS8GXX=m -CONFIG_DVB_ATBM8830=m -CONFIG_DVB_TDA665x=m -CONFIG_DVB_IX2505V=m -CONFIG_DVB_M88RS2000=m -CONFIG_DVB_AF9033=m -CONFIG_DVB_HORUS3A=m -CONFIG_DVB_ASCOT2E=m -CONFIG_DVB_HELENE=m - -# -# Common Interface (EN50221) controller drivers -# -CONFIG_DVB_CXD2099=m -CONFIG_DVB_SP2=m - -# -# Tools to develop new frontends -# -CONFIG_DVB_DUMMY_FE=m - -# -# Graphics support -# -CONFIG_VGA_ARB=y -CONFIG_VGA_ARB_MAX_GPUS=16 -# CONFIG_TEGRA_HOST1X is not set -CONFIG_IMX_IPUV3_CORE=m -CONFIG_DRM=m -CONFIG_DRM_MIPI_DSI=y -# CONFIG_DRM_DP_AUX_CHARDEV is not set -# CONFIG_DRM_DEBUG_SELFTEST is not set -CONFIG_DRM_KMS_HELPER=m -CONFIG_DRM_KMS_FB_HELPER=y -CONFIG_DRM_FBDEV_EMULATION=y -CONFIG_DRM_FBDEV_OVERALLOC=100 -CONFIG_DRM_LOAD_EDID_FIRMWARE=y -CONFIG_DRM_TTM=m -CONFIG_DRM_GEM_CMA_HELPER=y -CONFIG_DRM_KMS_CMA_HELPER=y -CONFIG_DRM_VM=y -CONFIG_DRM_SCHED=m - -# -# I2C encoder or helper chips -# -# CONFIG_DRM_I2C_CH7006 is not set -# CONFIG_DRM_I2C_SIL164 is not set -CONFIG_DRM_I2C_NXP_TDA998X=m -CONFIG_DRM_I2C_NXP_TDA9950=m -# CONFIG_DRM_HDLCD is not set -# CONFIG_DRM_MALI_DISPLAY is not set -# CONFIG_DRM_RADEON is not set -# CONFIG_DRM_AMDGPU is not set - -# -# ACP (Audio CoProcessor) Configuration -# - -# -# AMD Library routines -# -# CONFIG_DRM_NOUVEAU is not set -CONFIG_DRM_VGEM=m -CONFIG_DRM_EXYNOS=m - -# -# CRTCs -# -CONFIG_DRM_EXYNOS_FIMD=y -# CONFIG_DRM_EXYNOS5433_DECON is not set -# CONFIG_DRM_EXYNOS7_DECON is not set -CONFIG_DRM_EXYNOS_MIXER=y -# CONFIG_DRM_EXYNOS_VIDI is not set - -# -# Encoders and Bridges -# -# CONFIG_DRM_EXYNOS_DPI is not set -CONFIG_DRM_EXYNOS_DSI=y -CONFIG_DRM_EXYNOS_DP=y -CONFIG_DRM_EXYNOS_HDMI=y - -# -# Sub-drivers -# -# CONFIG_DRM_EXYNOS_G2D is not set -# CONFIG_DRM_EXYNOS_FIMC is not set -# CONFIG_DRM_EXYNOS_ROTATOR is not set -# CONFIG_DRM_EXYNOS_SCALER is not set -# CONFIG_DRM_EXYNOS_GSC is not set -CONFIG_DRM_ROCKCHIP=m -CONFIG_ROCKCHIP_ANALOGIX_DP=y -# CONFIG_ROCKCHIP_CDN_DP is not set -CONFIG_ROCKCHIP_DW_HDMI=y -CONFIG_ROCKCHIP_DW_MIPI_DSI=y -# CONFIG_ROCKCHIP_INNO_HDMI is not set -CONFIG_ROCKCHIP_LVDS=y -CONFIG_DRM_UDL=m -# CONFIG_DRM_AST is not set -# CONFIG_DRM_MGAG200 is not set -CONFIG_DRM_CIRRUS_QEMU=m -# CONFIG_DRM_ARMADA is not set -# CONFIG_DRM_RCAR_DW_HDMI is not set -# CONFIG_DRM_RCAR_LVDS is not set -# CONFIG_DRM_SUN4I is not set -CONFIG_DRM_OMAP=m -CONFIG_OMAP2_DSS_INIT=y -CONFIG_OMAP_DSS_BASE=m -CONFIG_OMAP2_DSS=m -# CONFIG_OMAP2_DSS_DEBUG is not set -# CONFIG_OMAP2_DSS_DEBUGFS is not set -CONFIG_OMAP2_DSS_DPI=y -CONFIG_OMAP2_DSS_VENC=y -CONFIG_OMAP2_DSS_HDMI_COMMON=y -CONFIG_OMAP4_DSS_HDMI=y -CONFIG_OMAP4_DSS_HDMI_CEC=y -CONFIG_OMAP5_DSS_HDMI=y -CONFIG_OMAP2_DSS_SDI=y -CONFIG_OMAP2_DSS_DSI=y -CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0 -CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET=y - -# -# OMAPDRM External Display Device Drivers -# -# CONFIG_DRM_OMAP_ENCODER_OPA362 is not set -# CONFIG_DRM_OMAP_ENCODER_TFP410 is not set -CONFIG_DRM_OMAP_ENCODER_TPD12S015=m -# CONFIG_DRM_OMAP_CONNECTOR_DVI is not set -CONFIG_DRM_OMAP_CONNECTOR_HDMI=m -CONFIG_DRM_OMAP_CONNECTOR_ANALOG_TV=m -# CONFIG_DRM_OMAP_PANEL_DPI is not set -# CONFIG_DRM_OMAP_PANEL_DSI_CM is not set -CONFIG_DRM_OMAP_PANEL_SONY_ACX565AKM=m -# CONFIG_DRM_OMAP_PANEL_LGPHILIPS_LB035Q02 is not set -# CONFIG_DRM_OMAP_PANEL_SHARP_LS037V7DW01 is not set -CONFIG_DRM_OMAP_PANEL_TPO_TD028TTEC1=m -CONFIG_DRM_OMAP_PANEL_TPO_TD043MTEA1=m -# CONFIG_DRM_OMAP_PANEL_NEC_NL8048HL11 is not set -CONFIG_DRM_TILCDC=m -CONFIG_DRM_QXL=m -CONFIG_DRM_BOCHS=m -CONFIG_DRM_VIRTIO_GPU=m -# CONFIG_DRM_FSL_DCU is not set -# CONFIG_DRM_TEGRA is not set -# CONFIG_DRM_STM is not set -CONFIG_DRM_PANEL=y - -# -# Display Panels -# -CONFIG_DRM_PANEL_ARM_VERSATILE=m -# CONFIG_DRM_PANEL_LVDS is not set -CONFIG_DRM_PANEL_SIMPLE=m -CONFIG_DRM_PANEL_ILITEK_IL9322=m -# CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set -# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set -# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set -# CONFIG_DRM_PANEL_LG_LG4573 is not set -# CONFIG_DRM_PANEL_ORISETECH_OTM8009A is not set -# CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set -CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m -# CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set -# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set -# CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set -# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set -# CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set -# CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set -# CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set -# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set -CONFIG_DRM_BRIDGE=y -CONFIG_DRM_PANEL_BRIDGE=y - -# -# Display Interface Bridges -# -# CONFIG_DRM_ANALOGIX_ANX78XX is not set -CONFIG_DRM_CDNS_DSI=m -# CONFIG_DRM_DUMB_VGA_DAC is not set -# CONFIG_DRM_LVDS_ENCODER is not set -# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set -# CONFIG_DRM_NXP_PTN3460 is not set -# CONFIG_DRM_PARADE_PS8622 is not set -# CONFIG_DRM_SIL_SII8620 is not set -# CONFIG_DRM_SII902X is not set -# CONFIG_DRM_SII9234 is not set -# CONFIG_DRM_THINE_THC63LVD1024 is not set -# CONFIG_DRM_TOSHIBA_TC358767 is not set -# CONFIG_DRM_TI_TFP410 is not set -CONFIG_DRM_ANALOGIX_DP=m -# CONFIG_DRM_I2C_ADV7511 is not set -CONFIG_DRM_DW_HDMI=m -# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set -# CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set -CONFIG_DRM_DW_HDMI_CEC=m -# CONFIG_DRM_STI is not set -CONFIG_DRM_IMX=m -# CONFIG_DRM_IMX_PARALLEL_DISPLAY is not set -# CONFIG_DRM_IMX_TVE is not set -CONFIG_DRM_IMX_LDB=m -CONFIG_DRM_IMX_HDMI=m -CONFIG_DRM_V3D=m -CONFIG_DRM_VC4=m -# CONFIG_DRM_VC4_HDMI_CEC is not set -CONFIG_DRM_ETNAVIV=m -CONFIG_DRM_ETNAVIV_THERMAL=y -# CONFIG_DRM_ARCPGU is not set -# CONFIG_DRM_HISI_HIBMC is not set -# CONFIG_DRM_MXSFB is not set -# CONFIG_DRM_TINYDRM is not set -# CONFIG_DRM_PL111 is not set -# CONFIG_DRM_TVE200 is not set -# CONFIG_DRM_XEN is not set -CONFIG_DRM_LEGACY=y -# CONFIG_DRM_TDFX is not set -# CONFIG_DRM_R128 is not set -# CONFIG_DRM_MGA is not set -CONFIG_DRM_VIA=m -CONFIG_DRM_SAVAGE=m -CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y - -# -# Frame buffer Devices -# -CONFIG_FB=y -CONFIG_FIRMWARE_EDID=y -CONFIG_FB_CMDLINE=y -CONFIG_FB_NOTIFY=y -CONFIG_FB_DDC=m -CONFIG_FB_CFB_FILLRECT=y -CONFIG_FB_CFB_COPYAREA=y -CONFIG_FB_CFB_IMAGEBLIT=y -CONFIG_FB_SYS_FILLRECT=y -CONFIG_FB_SYS_COPYAREA=y -CONFIG_FB_SYS_IMAGEBLIT=y -# CONFIG_FB_FOREIGN_ENDIAN is not set -CONFIG_FB_SYS_FOPS=y -CONFIG_FB_DEFERRED_IO=y -CONFIG_FB_SVGALIB=m -CONFIG_FB_BACKLIGHT=y -CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_TILEBLITTING=y - -# -# Frame buffer hardware drivers -# -# CONFIG_FB_CIRRUS is not set -# CONFIG_FB_PM2 is not set -CONFIG_FB_ARMCLCD=y -CONFIG_PLAT_VERSATILE_CLCD=y -# CONFIG_FB_IMX is not set -# CONFIG_FB_CYBER2000 is not set -# CONFIG_FB_ASILIANT is not set -# CONFIG_FB_IMSTT is not set -# CONFIG_FB_UVESA is not set -CONFIG_FB_EFI=y -# CONFIG_FB_OPENCORES is not set -# CONFIG_FB_S1D13XXX is not set -CONFIG_FB_NVIDIA=m -# CONFIG_FB_NVIDIA_I2C is not set -# CONFIG_FB_NVIDIA_DEBUG is not set -CONFIG_FB_NVIDIA_BACKLIGHT=y -CONFIG_FB_RIVA=m -# CONFIG_FB_RIVA_I2C is not set -# CONFIG_FB_RIVA_DEBUG is not set -CONFIG_FB_RIVA_BACKLIGHT=y -# CONFIG_FB_I740 is not set -# CONFIG_FB_MATROX is not set -# CONFIG_FB_RADEON is not set -# CONFIG_FB_ATY128 is not set -# CONFIG_FB_ATY is not set -CONFIG_FB_S3=m -CONFIG_FB_S3_DDC=y -# CONFIG_FB_SAVAGE is not set -# CONFIG_FB_SIS is not set -# CONFIG_FB_NEOMAGIC is not set -# CONFIG_FB_KYRO is not set -CONFIG_FB_3DFX=m -# CONFIG_FB_3DFX_ACCEL is not set -CONFIG_FB_3DFX_I2C=y -# CONFIG_FB_VOODOO1 is not set -CONFIG_FB_VT8623=m -# CONFIG_FB_TRIDENT is not set -CONFIG_FB_ARK=m -CONFIG_FB_PM3=m -# CONFIG_FB_CARMINE is not set -CONFIG_FB_VT8500=y -CONFIG_FB_WM8505=y -# CONFIG_FB_WMT_GE_ROPS is not set -CONFIG_FB_SMSCUFX=m -CONFIG_FB_UDL=m -# CONFIG_FB_IBM_GXT4500 is not set -# CONFIG_FB_DA8XX is not set -# CONFIG_FB_VIRTUAL is not set -CONFIG_XEN_FBDEV_FRONTEND=y -# CONFIG_FB_METRONOME is not set -CONFIG_FB_MB862XX=m -CONFIG_FB_MB862XX_PCI_GDC=y -CONFIG_FB_MB862XX_I2C=y -CONFIG_FB_MX3=y -# CONFIG_FB_BROADSHEET is not set -# CONFIG_FB_MXS is not set -CONFIG_FB_SIMPLE=y -# CONFIG_FB_SSD1307 is not set -# CONFIG_FB_SM712 is not set -CONFIG_BACKLIGHT_LCD_SUPPORT=y -# CONFIG_LCD_CLASS_DEVICE is not set -CONFIG_BACKLIGHT_CLASS_DEVICE=y -# CONFIG_BACKLIGHT_GENERIC is not set -CONFIG_BACKLIGHT_PWM=m -# CONFIG_BACKLIGHT_DA9052 is not set -# CONFIG_BACKLIGHT_PM8941_WLED is not set -# CONFIG_BACKLIGHT_ADP8860 is not set -# CONFIG_BACKLIGHT_ADP8870 is not set -# CONFIG_BACKLIGHT_LM3630A is not set -# CONFIG_BACKLIGHT_LM3639 is not set -# CONFIG_BACKLIGHT_LP855X is not set -CONFIG_BACKLIGHT_PANDORA=m -CONFIG_BACKLIGHT_GPIO=m -# CONFIG_BACKLIGHT_LV5207LP is not set -# CONFIG_BACKLIGHT_BD6107 is not set -# CONFIG_BACKLIGHT_ARCXCNN is not set -CONFIG_VGASTATE=m -CONFIG_VIDEOMODE_HELPERS=y -CONFIG_HDMI=y - -# -# Console display driver support -# -CONFIG_DUMMY_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y -CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y -# CONFIG_LOGO is not set -CONFIG_SOUND=m -CONFIG_SOUND_OSS_CORE=y -# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set -CONFIG_SND=m -CONFIG_SND_TIMER=m -CONFIG_SND_PCM=m -CONFIG_SND_PCM_ELD=y -CONFIG_SND_PCM_IEC958=y -CONFIG_SND_DMAENGINE_PCM=m -CONFIG_SND_HWDEP=m -CONFIG_SND_SEQ_DEVICE=m -CONFIG_SND_RAWMIDI=m -CONFIG_SND_JACK=y -CONFIG_SND_JACK_INPUT_DEV=y -CONFIG_SND_OSSEMUL=y -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m -CONFIG_SND_PCM_OSS_PLUGINS=y -CONFIG_SND_PCM_TIMER=y -CONFIG_SND_HRTIMER=m -CONFIG_SND_DYNAMIC_MINORS=y -CONFIG_SND_MAX_CARDS=32 -CONFIG_SND_SUPPORT_OLD_API=y -CONFIG_SND_PROC_FS=y -CONFIG_SND_VERBOSE_PROCFS=y -# CONFIG_SND_VERBOSE_PRINTK is not set -# CONFIG_SND_DEBUG is not set -CONFIG_SND_VMASTER=y -CONFIG_SND_SEQUENCER=m -CONFIG_SND_SEQ_DUMMY=m -# CONFIG_SND_SEQUENCER_OSS is not set -CONFIG_SND_SEQ_HRTIMER_DEFAULT=y -CONFIG_SND_SEQ_MIDI_EVENT=m -CONFIG_SND_SEQ_MIDI=m -CONFIG_SND_SEQ_MIDI_EMUL=m -CONFIG_SND_MPU401_UART=m -CONFIG_SND_OPL3_LIB=m -CONFIG_SND_OPL3_LIB_SEQ=m -CONFIG_SND_AC97_CODEC=m -CONFIG_SND_DRIVERS=y -# CONFIG_SND_DUMMY is not set -CONFIG_SND_ALOOP=m -# CONFIG_SND_VIRMIDI is not set -# CONFIG_SND_MTPAV is not set -CONFIG_SND_MTS64=m -# CONFIG_SND_SERIAL_U16550 is not set -# CONFIG_SND_MPU401 is not set -CONFIG_SND_PORTMAN2X4=m -CONFIG_SND_AC97_POWER_SAVE=y -CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 -CONFIG_SND_PCI=y -CONFIG_SND_AD1889=m -# CONFIG_SND_ATIIXP is not set -# CONFIG_SND_ATIIXP_MODEM is not set -# CONFIG_SND_AU8810 is not set -# CONFIG_SND_AU8820 is not set -# CONFIG_SND_AU8830 is not set -# CONFIG_SND_AW2 is not set -# CONFIG_SND_BT87X is not set -# CONFIG_SND_CA0106 is not set -# CONFIG_SND_CMIPCI is not set -CONFIG_SND_OXYGEN_LIB=m -CONFIG_SND_OXYGEN=m -# CONFIG_SND_CS4281 is not set -# CONFIG_SND_CS46XX is not set -CONFIG_SND_CTXFI=m -CONFIG_SND_DARLA20=m -CONFIG_SND_GINA20=m -CONFIG_SND_LAYLA20=m -CONFIG_SND_DARLA24=m -CONFIG_SND_GINA24=m -CONFIG_SND_LAYLA24=m -CONFIG_SND_MONA=m -CONFIG_SND_MIA=m -CONFIG_SND_ECHO3G=m -CONFIG_SND_INDIGO=m -CONFIG_SND_INDIGOIO=m -CONFIG_SND_INDIGODJ=m -CONFIG_SND_INDIGOIOX=m -CONFIG_SND_INDIGODJX=m -# CONFIG_SND_ENS1370 is not set -# CONFIG_SND_ENS1371 is not set -# CONFIG_SND_FM801 is not set -# CONFIG_SND_HDSP is not set -CONFIG_SND_HDSPM=m -# CONFIG_SND_ICE1724 is not set -# CONFIG_SND_INTEL8X0 is not set -# CONFIG_SND_INTEL8X0M is not set -# CONFIG_SND_KORG1212 is not set -CONFIG_SND_LOLA=m -# CONFIG_SND_MIXART is not set -# CONFIG_SND_NM256 is not set -CONFIG_SND_PCXHR=m -CONFIG_SND_RIPTIDE=m -# CONFIG_SND_RME32 is not set -# CONFIG_SND_RME96 is not set -# CONFIG_SND_RME9652 is not set -# CONFIG_SND_VIA82XX is not set -# CONFIG_SND_VIA82XX_MODEM is not set -CONFIG_SND_VIRTUOSO=m -# CONFIG_SND_VX222 is not set -# CONFIG_SND_YMFPCI is not set - -# -# HD-Audio -# -CONFIG_SND_HDA=m -# CONFIG_SND_HDA_INTEL is not set -CONFIG_SND_HDA_TEGRA=m -CONFIG_SND_HDA_HWDEP=y -CONFIG_SND_HDA_RECONFIG=y -CONFIG_SND_HDA_INPUT_BEEP=y -CONFIG_SND_HDA_INPUT_BEEP_MODE=1 -CONFIG_SND_HDA_PATCH_LOADER=y -CONFIG_SND_HDA_CODEC_REALTEK=m -CONFIG_SND_HDA_CODEC_ANALOG=m -CONFIG_SND_HDA_CODEC_SIGMATEL=m -CONFIG_SND_HDA_CODEC_VIA=m -CONFIG_SND_HDA_CODEC_HDMI=m -CONFIG_SND_HDA_CODEC_CIRRUS=m -CONFIG_SND_HDA_CODEC_CONEXANT=m -CONFIG_SND_HDA_CODEC_CA0110=m -CONFIG_SND_HDA_CODEC_CA0132=m -CONFIG_SND_HDA_CODEC_CA0132_DSP=y -CONFIG_SND_HDA_CODEC_CMEDIA=m -CONFIG_SND_HDA_CODEC_SI3054=m -CONFIG_SND_HDA_GENERIC=m -CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 -CONFIG_SND_HDA_CORE=m -CONFIG_SND_HDA_DSP_LOADER=y -CONFIG_SND_HDA_PREALLOC_SIZE=2048 -CONFIG_SND_ARM=y -# CONFIG_SND_ARMAACI is not set -CONFIG_SND_SPI=y -CONFIG_SND_USB=y -CONFIG_SND_USB_AUDIO=m -CONFIG_SND_USB_UA101=m -CONFIG_SND_USB_CAIAQ=m -CONFIG_SND_USB_CAIAQ_INPUT=y -CONFIG_SND_USB_6FIRE=m -CONFIG_SND_USB_HIFACE=m -CONFIG_SND_BCD2000=m -CONFIG_SND_USB_LINE6=m -CONFIG_SND_USB_POD=m -CONFIG_SND_USB_PODHD=m -CONFIG_SND_USB_TONEPORT=m -CONFIG_SND_USB_VARIAX=m -CONFIG_SND_FIREWIRE=y -CONFIG_SND_FIREWIRE_LIB=m -CONFIG_SND_DICE=m -CONFIG_SND_OXFW=m -CONFIG_SND_ISIGHT=m -CONFIG_SND_FIREWORKS=m -CONFIG_SND_BEBOB=m -CONFIG_SND_FIREWIRE_DIGI00X=m -CONFIG_SND_FIREWIRE_TASCAM=m -# CONFIG_SND_FIREWIRE_MOTU is not set -# CONFIG_SND_FIREFACE is not set -CONFIG_SND_SOC=m -CONFIG_SND_SOC_AC97_BUS=y -CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y -# CONFIG_SND_SOC_AMD_ACP is not set -# CONFIG_SND_ATMEL_SOC is not set -CONFIG_SND_BCM2835_SOC_I2S=m -# CONFIG_SND_EDMA_SOC is not set -CONFIG_SND_DAVINCI_SOC_MCASP=m -# CONFIG_SND_DESIGNWARE_I2S is not set - -# -# SoC Audio for Freescale CPUs -# - -# -# Common SoC Audio options for Freescale CPUs: -# -# CONFIG_SND_SOC_FSL_ASRC is not set -# CONFIG_SND_SOC_FSL_SAI is not set -CONFIG_SND_SOC_FSL_SSI=m -CONFIG_SND_SOC_FSL_SPDIF=m -# CONFIG_SND_SOC_FSL_ESAI is not set -CONFIG_SND_SOC_FSL_UTILS=m -CONFIG_SND_SOC_IMX_PCM_DMA=m -CONFIG_SND_SOC_IMX_AUDMUX=m -CONFIG_SND_IMX_SOC=m -CONFIG_SND_SOC_IMX_SSI=m -CONFIG_SND_SOC_IMX_PCM_FIQ=m - -# -# SoC Audio support for Freescale i.MX boards: -# -CONFIG_SND_SOC_EUKREA_TLV320=m -CONFIG_SND_SOC_IMX_ES8328=m -CONFIG_SND_SOC_IMX_SGTL5000=m -CONFIG_SND_SOC_IMX_SPDIF=m -CONFIG_SND_SOC_IMX_MC13783=m -# CONFIG_SND_SOC_FSL_ASOC_CARD is not set -# CONFIG_SND_I2S_HI6210_I2S is not set -CONFIG_SND_OMAP_SOC=m -CONFIG_SND_SDMA_SOC=m -CONFIG_SND_OMAP_SOC_DMIC=m -CONFIG_SND_OMAP_SOC_MCBSP=m -CONFIG_SND_OMAP_SOC_MCPDM=m -# CONFIG_SND_OMAP_SOC_HDMI_AUDIO is not set -CONFIG_SND_OMAP_SOC_RX51=m -CONFIG_SND_OMAP_SOC_AM3517EVM=m -CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m -CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m -CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m -# CONFIG_SND_KIRKWOOD_SOC is not set -# CONFIG_SND_SOC_IMG is not set -CONFIG_SND_SOC_ROCKCHIP=m -CONFIG_SND_SOC_ROCKCHIP_I2S=m -# CONFIG_SND_SOC_ROCKCHIP_PDM is not set -CONFIG_SND_SOC_ROCKCHIP_SPDIF=m -CONFIG_SND_SOC_ROCKCHIP_MAX98090=m -CONFIG_SND_SOC_ROCKCHIP_RT5645=m -# CONFIG_SND_SOC_RK3288_HDMI_ANALOG is not set -# CONFIG_SND_SOC_RK3399_GRU_SOUND is not set -# CONFIG_SND_SOC_SAMSUNG is not set - -# -# STMicroelectronics STM32 SOC audio support -# - -# -# Allwinner SoC Audio support -# -CONFIG_SND_SUN4I_CODEC=m -# CONFIG_SND_SUN8I_CODEC is not set -# CONFIG_SND_SUN8I_CODEC_ANALOG is not set -# CONFIG_SND_SUN4I_I2S is not set -CONFIG_SND_SUN4I_SPDIF=m -CONFIG_SND_SOC_TEGRA=m -CONFIG_SND_SOC_TEGRA20_AC97=m -CONFIG_SND_SOC_TEGRA20_DAS=m -CONFIG_SND_SOC_TEGRA20_I2S=m -CONFIG_SND_SOC_TEGRA20_SPDIF=m -CONFIG_SND_SOC_TEGRA30_AHUB=m -CONFIG_SND_SOC_TEGRA30_I2S=m -CONFIG_SND_SOC_TEGRA_RT5640=m -CONFIG_SND_SOC_TEGRA_WM8753=m -CONFIG_SND_SOC_TEGRA_WM8903=m -CONFIG_SND_SOC_TEGRA_WM9712=m -CONFIG_SND_SOC_TEGRA_TRIMSLICE=m -CONFIG_SND_SOC_TEGRA_ALC5632=m -CONFIG_SND_SOC_TEGRA_MAX98090=m -CONFIG_SND_SOC_TEGRA_RT5677=m -# CONFIG_SND_SOC_TEGRA_SGTL5000 is not set -# CONFIG_SND_SOC_XTFPGA_I2S is not set -# CONFIG_ZX_TDM is not set -CONFIG_SND_SOC_I2C_AND_SPI=m - -# -# CODEC drivers -# -# CONFIG_SND_SOC_AC97_CODEC is not set -# CONFIG_SND_SOC_ADAU1701 is not set -# CONFIG_SND_SOC_ADAU1761_I2C is not set -# CONFIG_SND_SOC_ADAU1761_SPI is not set -# CONFIG_SND_SOC_ADAU7002 is not set -# CONFIG_SND_SOC_AK4104 is not set -# CONFIG_SND_SOC_AK4458 is not set -# CONFIG_SND_SOC_AK4554 is not set -# CONFIG_SND_SOC_AK4613 is not set -# CONFIG_SND_SOC_AK4642 is not set -# CONFIG_SND_SOC_AK5386 is not set -# CONFIG_SND_SOC_AK5558 is not set -# CONFIG_SND_SOC_ALC5623 is not set -CONFIG_SND_SOC_ALC5632=m -# CONFIG_SND_SOC_BD28623 is not set -# CONFIG_SND_SOC_BT_SCO is not set -# CONFIG_SND_SOC_CS35L32 is not set -# CONFIG_SND_SOC_CS35L33 is not set -# CONFIG_SND_SOC_CS35L34 is not set -# CONFIG_SND_SOC_CS35L35 is not set -# CONFIG_SND_SOC_CS42L42 is not set -# CONFIG_SND_SOC_CS42L51_I2C is not set -# CONFIG_SND_SOC_CS42L52 is not set -# CONFIG_SND_SOC_CS42L56 is not set -# CONFIG_SND_SOC_CS42L73 is not set -# CONFIG_SND_SOC_CS4265 is not set -# CONFIG_SND_SOC_CS4270 is not set -# CONFIG_SND_SOC_CS4271_I2C is not set -# CONFIG_SND_SOC_CS4271_SPI is not set -# CONFIG_SND_SOC_CS42XX8_I2C is not set -# CONFIG_SND_SOC_CS43130 is not set -# CONFIG_SND_SOC_CS4349 is not set -# CONFIG_SND_SOC_CS53L30 is not set -# CONFIG_SND_SOC_DIO2125 is not set -CONFIG_SND_SOC_DMIC=m -CONFIG_SND_SOC_HDMI_CODEC=m -# CONFIG_SND_SOC_ES7134 is not set -# CONFIG_SND_SOC_ES8316 is not set -CONFIG_SND_SOC_ES8328=m -CONFIG_SND_SOC_ES8328_I2C=m -CONFIG_SND_SOC_ES8328_SPI=m -# CONFIG_SND_SOC_GTM601 is not set -# CONFIG_SND_SOC_INNO_RK3036 is not set -CONFIG_SND_SOC_MAX98090=m -# CONFIG_SND_SOC_MAX98504 is not set -# CONFIG_SND_SOC_MAX9867 is not set -# CONFIG_SND_SOC_MAX98927 is not set -# CONFIG_SND_SOC_MAX98373 is not set -# CONFIG_SND_SOC_MAX9860 is not set -# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set -# CONFIG_SND_SOC_PCM1681 is not set -# CONFIG_SND_SOC_PCM1789_I2C is not set -# CONFIG_SND_SOC_PCM179X_I2C is not set -# CONFIG_SND_SOC_PCM179X_SPI is not set -# CONFIG_SND_SOC_PCM186X_I2C is not set -# CONFIG_SND_SOC_PCM186X_SPI is not set -# CONFIG_SND_SOC_PCM3168A_I2C is not set -# CONFIG_SND_SOC_PCM3168A_SPI is not set -# CONFIG_SND_SOC_PCM512x_I2C is not set -# CONFIG_SND_SOC_PCM512x_SPI is not set -CONFIG_SND_SOC_RL6231=m -# CONFIG_SND_SOC_RT5616 is not set -# CONFIG_SND_SOC_RT5631 is not set -CONFIG_SND_SOC_RT5640=m -CONFIG_SND_SOC_RT5645=m -CONFIG_SND_SOC_RT5677=m -CONFIG_SND_SOC_RT5677_SPI=m -CONFIG_SND_SOC_SGTL5000=m -# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set -# CONFIG_SND_SOC_SPDIF is not set -# CONFIG_SND_SOC_SSM2305 is not set -# CONFIG_SND_SOC_SSM2602_SPI is not set -# CONFIG_SND_SOC_SSM2602_I2C is not set -# CONFIG_SND_SOC_SSM4567 is not set -# CONFIG_SND_SOC_STA32X is not set -# CONFIG_SND_SOC_STA350 is not set -# CONFIG_SND_SOC_STI_SAS is not set -# CONFIG_SND_SOC_TAS2552 is not set -# CONFIG_SND_SOC_TAS5086 is not set -# CONFIG_SND_SOC_TAS571X is not set -# CONFIG_SND_SOC_TAS5720 is not set -# CONFIG_SND_SOC_TAS6424 is not set -# CONFIG_SND_SOC_TDA7419 is not set -# CONFIG_SND_SOC_TFA9879 is not set -CONFIG_SND_SOC_TLV320AIC23=m -CONFIG_SND_SOC_TLV320AIC23_I2C=m -# CONFIG_SND_SOC_TLV320AIC23_SPI is not set -# CONFIG_SND_SOC_TLV320AIC31XX is not set -# CONFIG_SND_SOC_TLV320AIC32X4_I2C is not set -# CONFIG_SND_SOC_TLV320AIC32X4_SPI is not set -CONFIG_SND_SOC_TLV320AIC3X=m -CONFIG_SND_SOC_TS3A227E=m -# CONFIG_SND_SOC_TSCS42XX is not set -# CONFIG_SND_SOC_TSCS454 is not set -CONFIG_SND_SOC_TWL4030=m -CONFIG_SND_SOC_TWL6040=m -# CONFIG_SND_SOC_WM8510 is not set -# CONFIG_SND_SOC_WM8523 is not set -# CONFIG_SND_SOC_WM8524 is not set -# CONFIG_SND_SOC_WM8580 is not set -# CONFIG_SND_SOC_WM8711 is not set -# CONFIG_SND_SOC_WM8728 is not set -# CONFIG_SND_SOC_WM8731 is not set -# CONFIG_SND_SOC_WM8737 is not set -# CONFIG_SND_SOC_WM8741 is not set -# CONFIG_SND_SOC_WM8750 is not set -CONFIG_SND_SOC_WM8753=m -# CONFIG_SND_SOC_WM8770 is not set -# CONFIG_SND_SOC_WM8776 is not set -# CONFIG_SND_SOC_WM8782 is not set -# CONFIG_SND_SOC_WM8804_I2C is not set -# CONFIG_SND_SOC_WM8804_SPI is not set -CONFIG_SND_SOC_WM8903=m -# CONFIG_SND_SOC_WM8960 is not set -# CONFIG_SND_SOC_WM8962 is not set -# CONFIG_SND_SOC_WM8974 is not set -# CONFIG_SND_SOC_WM8978 is not set -# CONFIG_SND_SOC_WM8985 is not set -CONFIG_SND_SOC_WM9712=m -# CONFIG_SND_SOC_ZX_AUD96P22 is not set -# CONFIG_SND_SOC_MAX9759 is not set -CONFIG_SND_SOC_MC13783=m -# CONFIG_SND_SOC_MT6351 is not set -# CONFIG_SND_SOC_NAU8540 is not set -# CONFIG_SND_SOC_NAU8810 is not set -# CONFIG_SND_SOC_NAU8824 is not set -CONFIG_SND_SOC_TPA6130A2=m -CONFIG_SND_SIMPLE_CARD_UTILS=m -CONFIG_SND_SIMPLE_CARD=m -# CONFIG_SND_SIMPLE_SCU_CARD is not set -# CONFIG_SND_AUDIO_GRAPH_CARD is not set -# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set -# CONFIG_SND_XEN_FRONTEND is not set -CONFIG_AC97_BUS=m - -# -# HID support -# -CONFIG_HID=m -CONFIG_HID_BATTERY_STRENGTH=y -CONFIG_HIDRAW=y -CONFIG_UHID=m -CONFIG_HID_GENERIC=m - -# -# Special HID drivers -# -CONFIG_HID_A4TECH=m -# CONFIG_HID_ACCUTOUCH is not set -CONFIG_HID_ACRUX=m -CONFIG_HID_ACRUX_FF=y -CONFIG_HID_APPLE=m -# CONFIG_HID_APPLEIR is not set -CONFIG_HID_ASUS=m -CONFIG_HID_AUREAL=m -CONFIG_HID_BELKIN=m -CONFIG_HID_BETOP_FF=m -CONFIG_HID_CHERRY=m -CONFIG_HID_CHICONY=m -CONFIG_HID_CORSAIR=m -CONFIG_HID_PRODIKEYS=m -CONFIG_HID_CMEDIA=m -CONFIG_HID_CP2112=m -CONFIG_HID_CYPRESS=m -CONFIG_HID_DRAGONRISE=m -CONFIG_DRAGONRISE_FF=y -CONFIG_HID_EMS_FF=m -# CONFIG_HID_ELAN is not set -CONFIG_HID_ELECOM=m -CONFIG_HID_ELO=m -CONFIG_HID_EZKEY=m -CONFIG_HID_GEMBIRD=m -# CONFIG_HID_GFRM is not set -CONFIG_HID_HOLTEK=m -CONFIG_HOLTEK_FF=y -# CONFIG_HID_GOOGLE_HAMMER is not set -# CONFIG_HID_GT683R is not set -CONFIG_HID_KEYTOUCH=m -CONFIG_HID_KYE=m -CONFIG_HID_UCLOGIC=m -CONFIG_HID_WALTOP=m -CONFIG_HID_GYRATION=m -CONFIG_HID_ICADE=m -# CONFIG_HID_ITE is not set -CONFIG_HID_JABRA=m -CONFIG_HID_TWINHAN=m -CONFIG_HID_KENSINGTON=m -CONFIG_HID_LCPOWER=m -CONFIG_HID_LED=m -CONFIG_HID_LENOVO=m -CONFIG_HID_LOGITECH=m -CONFIG_HID_LOGITECH_DJ=m -CONFIG_HID_LOGITECH_HIDPP=m -CONFIG_LOGITECH_FF=y -CONFIG_LOGIRUMBLEPAD2_FF=y -CONFIG_LOGIG940_FF=y -CONFIG_LOGIWHEELS_FF=y -CONFIG_HID_MAGICMOUSE=m -# CONFIG_HID_MAYFLASH is not set -# CONFIG_HID_REDRAGON is not set -CONFIG_HID_MICROSOFT=m -CONFIG_HID_MONTEREY=m -CONFIG_HID_MULTITOUCH=m -# CONFIG_HID_NTI is not set -CONFIG_HID_NTRIG=m -CONFIG_HID_ORTEK=m -CONFIG_HID_PANTHERLORD=m -CONFIG_PANTHERLORD_FF=y -CONFIG_HID_PENMOUNT=m -CONFIG_HID_PETALYNX=m -CONFIG_HID_PICOLCD=m -CONFIG_HID_PICOLCD_FB=y -CONFIG_HID_PICOLCD_BACKLIGHT=y -CONFIG_HID_PICOLCD_LEDS=y -CONFIG_HID_PICOLCD_CIR=y -CONFIG_HID_PLANTRONICS=m -CONFIG_HID_PRIMAX=m -# CONFIG_HID_RETRODE is not set -CONFIG_HID_ROCCAT=m -CONFIG_HID_SAITEK=m -CONFIG_HID_SAMSUNG=m -CONFIG_HID_SONY=m -CONFIG_SONY_FF=y -CONFIG_HID_SPEEDLINK=m -# CONFIG_HID_STEAM is not set -CONFIG_HID_STEELSERIES=m -CONFIG_HID_SUNPLUS=m -CONFIG_HID_RMI=m -CONFIG_HID_GREENASIA=m -CONFIG_GREENASIA_FF=y -CONFIG_HID_SMARTJOYPLUS=m -CONFIG_SMARTJOYPLUS_FF=y -CONFIG_HID_TIVO=m -CONFIG_HID_TOPSEED=m -CONFIG_HID_THINGM=m -CONFIG_HID_THRUSTMASTER=m -CONFIG_THRUSTMASTER_FF=y -# CONFIG_HID_UDRAW_PS3 is not set -CONFIG_HID_WACOM=m -CONFIG_HID_WIIMOTE=m -CONFIG_HID_XINMO=m -CONFIG_HID_ZEROPLUS=m -CONFIG_ZEROPLUS_FF=y -CONFIG_HID_ZYDACRON=m -CONFIG_HID_SENSOR_HUB=m -CONFIG_HID_SENSOR_CUSTOM_SENSOR=m -CONFIG_HID_ALPS=m - -# -# USB HID support -# -CONFIG_USB_HID=m -CONFIG_HID_PID=y -CONFIG_USB_HIDDEV=y - -# -# USB HID Boot Protocol drivers -# -# CONFIG_USB_KBD is not set -# CONFIG_USB_MOUSE is not set - -# -# I2C HID support -# -# CONFIG_I2C_HID is not set -CONFIG_USB_OHCI_LITTLE_ENDIAN=y -CONFIG_USB_SUPPORT=y -CONFIG_USB_COMMON=y -CONFIG_USB_ARCH_HAS_HCD=y -CONFIG_USB=m -CONFIG_USB_PCI=y -CONFIG_USB_ANNOUNCE_NEW_DEVICES=y - -# -# Miscellaneous USB options -# -CONFIG_USB_DEFAULT_PERSIST=y -CONFIG_USB_DYNAMIC_MINORS=y -# CONFIG_USB_OTG is not set -# CONFIG_USB_OTG_WHITELIST is not set -# CONFIG_USB_OTG_BLACKLIST_HUB is not set -CONFIG_USB_LEDS_TRIGGER_USBPORT=m -CONFIG_USB_MON=m -CONFIG_USB_WUSB=m -CONFIG_USB_WUSB_CBAF=m -# CONFIG_USB_WUSB_CBAF_DEBUG is not set - -# -# USB Host Controller Drivers -# -# CONFIG_USB_C67X00_HCD is not set -CONFIG_USB_XHCI_HCD=m -# CONFIG_USB_XHCI_DBGCAP is not set -CONFIG_USB_XHCI_PCI=m -CONFIG_USB_XHCI_PLATFORM=m -CONFIG_USB_XHCI_MVEBU=m -CONFIG_USB_XHCI_TEGRA=m -CONFIG_USB_EHCI_HCD=m -CONFIG_USB_EHCI_ROOT_HUB_TT=y -CONFIG_USB_EHCI_TT_NEWSCHED=y -CONFIG_USB_EHCI_PCI=m -CONFIG_USB_EHCI_MXC=m -CONFIG_USB_EHCI_HCD_OMAP=m -CONFIG_USB_EHCI_HCD_ORION=m -CONFIG_USB_EHCI_TEGRA=m -CONFIG_USB_EHCI_EXYNOS=m -CONFIG_USB_EHCI_HCD_PLATFORM=m -# CONFIG_USB_OXU210HP_HCD is not set -# CONFIG_USB_ISP116X_HCD is not set -# CONFIG_USB_FOTG210_HCD is not set -# CONFIG_USB_MAX3421_HCD is not set -CONFIG_USB_OHCI_HCD=m -CONFIG_USB_OHCI_HCD_OMAP3=m -CONFIG_USB_OHCI_HCD_PCI=m -# CONFIG_USB_OHCI_HCD_SSB is not set -CONFIG_USB_OHCI_EXYNOS=m -CONFIG_USB_OHCI_HCD_PLATFORM=m -# CONFIG_USB_UHCI_HCD is not set -CONFIG_USB_UHCI_SUPPORT_NON_PCI_HC=y -CONFIG_USB_UHCI_PLATFORM=y -CONFIG_USB_U132_HCD=m -# CONFIG_USB_SL811_HCD is not set -# CONFIG_USB_R8A66597_HCD is not set -CONFIG_USB_WHCI_HCD=m -CONFIG_USB_HWA_HCD=m -# CONFIG_USB_IMX21_HCD is not set -# CONFIG_USB_HCD_BCMA is not set -# CONFIG_USB_HCD_SSB is not set -# CONFIG_USB_HCD_TEST_MODE is not set - -# -# USB Device Class drivers -# -CONFIG_USB_ACM=m -CONFIG_USB_PRINTER=m -CONFIG_USB_WDM=m -CONFIG_USB_TMC=m - -# -# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may -# - -# -# also be needed; see USB_STORAGE Help for more info -# -CONFIG_USB_STORAGE=m -# CONFIG_USB_STORAGE_DEBUG is not set -CONFIG_USB_STORAGE_REALTEK=m -CONFIG_REALTEK_AUTOPM=y -CONFIG_USB_STORAGE_DATAFAB=m -CONFIG_USB_STORAGE_FREECOM=m -CONFIG_USB_STORAGE_ISD200=m -CONFIG_USB_STORAGE_USBAT=m -CONFIG_USB_STORAGE_SDDR09=m -CONFIG_USB_STORAGE_SDDR55=m -CONFIG_USB_STORAGE_JUMPSHOT=m -CONFIG_USB_STORAGE_ALAUDA=m -CONFIG_USB_STORAGE_ONETOUCH=m -CONFIG_USB_STORAGE_KARMA=m -CONFIG_USB_STORAGE_CYPRESS_ATACB=m -CONFIG_USB_STORAGE_ENE_UB6250=m -CONFIG_USB_UAS=m - -# -# USB Imaging devices -# -CONFIG_USB_MDC800=m -CONFIG_USB_MICROTEK=m -# CONFIG_USBIP_CORE is not set -CONFIG_USB_MUSB_HDRC=m -# CONFIG_USB_MUSB_HOST is not set -# CONFIG_USB_MUSB_GADGET is not set -CONFIG_USB_MUSB_DUAL_ROLE=y - -# -# Platform Glue Layer -# -CONFIG_USB_MUSB_SUNXI=m -CONFIG_USB_MUSB_TUSB6010=m -CONFIG_USB_MUSB_OMAP2PLUS=m -CONFIG_USB_MUSB_AM35X=m -CONFIG_USB_MUSB_DSPS=m -CONFIG_USB_MUSB_AM335X_CHILD=m - -# -# MUSB DMA mode -# -# CONFIG_MUSB_PIO_ONLY is not set -CONFIG_USB_INVENTRA_DMA=y -CONFIG_USB_TI_CPPI41_DMA=y -CONFIG_USB_TUSB_OMAP_DMA=y -CONFIG_USB_DWC3=m -# CONFIG_USB_DWC3_ULPI is not set -# CONFIG_USB_DWC3_HOST is not set -# CONFIG_USB_DWC3_GADGET is not set -CONFIG_USB_DWC3_DUAL_ROLE=y - -# -# Platform Glue Driver Support -# -CONFIG_USB_DWC3_OMAP=m -CONFIG_USB_DWC3_EXYNOS=m -CONFIG_USB_DWC3_OF_SIMPLE=m -CONFIG_USB_DWC2=m -# CONFIG_USB_DWC2_HOST is not set - -# -# Gadget/Dual-role mode requires USB Gadget support to be enabled -# -# CONFIG_USB_DWC2_PERIPHERAL is not set -CONFIG_USB_DWC2_DUAL_ROLE=y -# CONFIG_USB_DWC2_PCI is not set -# CONFIG_USB_DWC2_DEBUG is not set -# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set -CONFIG_USB_CHIPIDEA=m -CONFIG_USB_CHIPIDEA_OF=m -CONFIG_USB_CHIPIDEA_PCI=m -CONFIG_USB_CHIPIDEA_UDC=y -CONFIG_USB_CHIPIDEA_HOST=y -# CONFIG_USB_ISP1760 is not set - -# -# USB port drivers -# -# CONFIG_USB_USS720 is not set -CONFIG_USB_SERIAL=m -CONFIG_USB_SERIAL_GENERIC=y -CONFIG_USB_SERIAL_SIMPLE=m -CONFIG_USB_SERIAL_AIRCABLE=m -CONFIG_USB_SERIAL_ARK3116=m -CONFIG_USB_SERIAL_BELKIN=m -CONFIG_USB_SERIAL_CH341=m -CONFIG_USB_SERIAL_WHITEHEAT=m -CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -CONFIG_USB_SERIAL_CP210X=m -CONFIG_USB_SERIAL_CYPRESS_M8=m -CONFIG_USB_SERIAL_EMPEG=m -CONFIG_USB_SERIAL_FTDI_SIO=m -CONFIG_USB_SERIAL_VISOR=m -CONFIG_USB_SERIAL_IPAQ=m -CONFIG_USB_SERIAL_IR=m -CONFIG_USB_SERIAL_EDGEPORT=m -CONFIG_USB_SERIAL_EDGEPORT_TI=m -CONFIG_USB_SERIAL_F81232=m -# CONFIG_USB_SERIAL_F8153X is not set -CONFIG_USB_SERIAL_GARMIN=m -CONFIG_USB_SERIAL_IPW=m -CONFIG_USB_SERIAL_IUU=m -CONFIG_USB_SERIAL_KEYSPAN_PDA=m -CONFIG_USB_SERIAL_KEYSPAN=m -CONFIG_USB_SERIAL_KLSI=m -CONFIG_USB_SERIAL_KOBIL_SCT=m -CONFIG_USB_SERIAL_MCT_U232=m -CONFIG_USB_SERIAL_METRO=m -CONFIG_USB_SERIAL_MOS7720=m -CONFIG_USB_SERIAL_MOS7715_PARPORT=y -CONFIG_USB_SERIAL_MOS7840=m -CONFIG_USB_SERIAL_MXUPORT=m -CONFIG_USB_SERIAL_NAVMAN=m -CONFIG_USB_SERIAL_PL2303=m -CONFIG_USB_SERIAL_OTI6858=m -CONFIG_USB_SERIAL_QCAUX=m -CONFIG_USB_SERIAL_QUALCOMM=m -CONFIG_USB_SERIAL_SPCP8X5=m -CONFIG_USB_SERIAL_SAFE=m -# CONFIG_USB_SERIAL_SAFE_PADDED is not set -CONFIG_USB_SERIAL_SIERRAWIRELESS=m -CONFIG_USB_SERIAL_SYMBOL=m -CONFIG_USB_SERIAL_TI=m -CONFIG_USB_SERIAL_CYBERJACK=m -CONFIG_USB_SERIAL_XIRCOM=m -CONFIG_USB_SERIAL_WWAN=m -CONFIG_USB_SERIAL_OPTION=m -CONFIG_USB_SERIAL_OMNINET=m -CONFIG_USB_SERIAL_OPTICON=m -CONFIG_USB_SERIAL_XSENS_MT=m -CONFIG_USB_SERIAL_WISHBONE=m -CONFIG_USB_SERIAL_SSU100=m -CONFIG_USB_SERIAL_QT2=m -# CONFIG_USB_SERIAL_UPD78F0730 is not set -CONFIG_USB_SERIAL_DEBUG=m - -# -# USB Miscellaneous drivers -# -CONFIG_USB_EMI62=m -CONFIG_USB_EMI26=m -CONFIG_USB_ADUTUX=m -CONFIG_USB_SEVSEG=m -CONFIG_USB_RIO500=m -CONFIG_USB_LEGOTOWER=m -CONFIG_USB_LCD=m -CONFIG_USB_CYPRESS_CY7C63=m -CONFIG_USB_CYTHERM=m -CONFIG_USB_IDMOUSE=m -CONFIG_USB_FTDI_ELAN=m -CONFIG_USB_APPLEDISPLAY=m -CONFIG_USB_SISUSBVGA=m -CONFIG_USB_SISUSBVGA_CON=y -CONFIG_USB_LD=m -CONFIG_USB_TRANCEVIBRATOR=m -CONFIG_USB_IOWARRIOR=m -CONFIG_USB_TEST=m -CONFIG_USB_EHSET_TEST_FIXTURE=m -CONFIG_USB_ISIGHTFW=m -CONFIG_USB_YUREX=m -CONFIG_USB_EZUSB_FX2=m -# CONFIG_USB_HUB_USB251XB is not set -CONFIG_USB_HSIC_USB3503=m -# CONFIG_USB_HSIC_USB4604 is not set -# CONFIG_USB_LINK_LAYER_TEST is not set -CONFIG_USB_CHAOSKEY=m -# CONFIG_USB_ATM is not set - -# -# USB Physical Layer drivers -# -CONFIG_USB_PHY=y -CONFIG_NOP_USB_XCEIV=m -CONFIG_AM335X_CONTROL_USB=m -CONFIG_AM335X_PHY_USB=m -CONFIG_TWL6030_USB=m -# CONFIG_USB_GPIO_VBUS is not set -# CONFIG_USB_ISP1301 is not set -CONFIG_USB_MXS_PHY=m -CONFIG_USB_TEGRA_PHY=m -CONFIG_USB_ULPI=y -CONFIG_USB_ULPI_VIEWPORT=y -CONFIG_USB_GADGET=m -# CONFIG_USB_GADGET_DEBUG is not set -# CONFIG_USB_GADGET_DEBUG_FILES is not set -# CONFIG_USB_GADGET_DEBUG_FS is not set -CONFIG_USB_GADGET_VBUS_DRAW=2 -CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 -# CONFIG_U_SERIAL_CONSOLE is not set - -# -# USB Peripheral Controller -# -# CONFIG_USB_FSL_USB2 is not set -# CONFIG_USB_FUSB300 is not set -# CONFIG_USB_FOTG210_UDC is not set -# CONFIG_USB_GR_UDC is not set -# CONFIG_USB_R8A66597 is not set -# CONFIG_USB_PXA27X is not set -# CONFIG_USB_MV_UDC is not set -# CONFIG_USB_MV_U3D is not set -# CONFIG_USB_SNP_UDC_PLAT is not set -# CONFIG_USB_M66592 is not set -# CONFIG_USB_BDC_UDC is not set -# CONFIG_USB_AMD5536UDC is not set -# CONFIG_USB_NET2272 is not set -CONFIG_USB_NET2280=m -# CONFIG_USB_GOKU is not set -# CONFIG_USB_EG20T is not set -# CONFIG_USB_GADGET_XILINX is not set -# CONFIG_USB_DUMMY_HCD is not set -CONFIG_USB_LIBCOMPOSITE=m -CONFIG_USB_F_ACM=m -CONFIG_USB_F_SS_LB=m -CONFIG_USB_U_SERIAL=m -CONFIG_USB_U_ETHER=m -CONFIG_USB_U_AUDIO=m -CONFIG_USB_F_SERIAL=m -CONFIG_USB_F_OBEX=m -CONFIG_USB_F_NCM=m -CONFIG_USB_F_ECM=m -CONFIG_USB_F_PHONET=m -CONFIG_USB_F_EEM=m -CONFIG_USB_F_SUBSET=m -CONFIG_USB_F_RNDIS=m -CONFIG_USB_F_MASS_STORAGE=m -CONFIG_USB_F_FS=m -CONFIG_USB_F_UAC1=m -CONFIG_USB_F_UAC2=m -CONFIG_USB_F_UVC=m -CONFIG_USB_F_MIDI=m -CONFIG_USB_F_HID=m -CONFIG_USB_F_PRINTER=m -CONFIG_USB_CONFIGFS=m -CONFIG_USB_CONFIGFS_SERIAL=y -CONFIG_USB_CONFIGFS_ACM=y -CONFIG_USB_CONFIGFS_OBEX=y -CONFIG_USB_CONFIGFS_NCM=y -CONFIG_USB_CONFIGFS_ECM=y -CONFIG_USB_CONFIGFS_ECM_SUBSET=y -CONFIG_USB_CONFIGFS_RNDIS=y -CONFIG_USB_CONFIGFS_EEM=y -CONFIG_USB_CONFIGFS_PHONET=y -CONFIG_USB_CONFIGFS_MASS_STORAGE=y -CONFIG_USB_CONFIGFS_F_LB_SS=y -CONFIG_USB_CONFIGFS_F_FS=y -CONFIG_USB_CONFIGFS_F_UAC1=y -# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set -CONFIG_USB_CONFIGFS_F_UAC2=y -CONFIG_USB_CONFIGFS_F_MIDI=y -CONFIG_USB_CONFIGFS_F_HID=y -CONFIG_USB_CONFIGFS_F_UVC=y -CONFIG_USB_CONFIGFS_F_PRINTER=y -# CONFIG_USB_CONFIGFS_F_TCM is not set -# CONFIG_USB_ZERO is not set -# CONFIG_USB_AUDIO is not set -CONFIG_USB_ETH=m -CONFIG_USB_ETH_RNDIS=y -# CONFIG_USB_ETH_EEM is not set -# CONFIG_USB_G_NCM is not set -CONFIG_USB_GADGETFS=m -CONFIG_USB_FUNCTIONFS=m -CONFIG_USB_FUNCTIONFS_ETH=y -CONFIG_USB_FUNCTIONFS_RNDIS=y -CONFIG_USB_FUNCTIONFS_GENERIC=y -# CONFIG_USB_MASS_STORAGE is not set -# CONFIG_USB_GADGET_TARGET is not set -CONFIG_USB_G_SERIAL=m -# CONFIG_USB_MIDI_GADGET is not set -# CONFIG_USB_G_PRINTER is not set -# CONFIG_USB_CDC_COMPOSITE is not set -CONFIG_USB_G_NOKIA=m -# CONFIG_USB_G_ACM_MS is not set -# CONFIG_USB_G_MULTI is not set -# CONFIG_USB_G_HID is not set -# CONFIG_USB_G_DBGP is not set -# CONFIG_USB_G_WEBCAM is not set -CONFIG_TYPEC=m -# CONFIG_TYPEC_TCPM is not set -CONFIG_TYPEC_UCSI=m -# CONFIG_TYPEC_TPS6598X is not set - -# -# USB Type-C Multiplexer/DeMultiplexer Switch support -# -# CONFIG_TYPEC_MUX_PI3USB30532 is not set -CONFIG_USB_LED_TRIG=y -CONFIG_USB_ULPI_BUS=m -CONFIG_UWB=m -CONFIG_UWB_HWA=m -CONFIG_UWB_WHCI=m -CONFIG_UWB_I1480U=m -CONFIG_MMC=y -CONFIG_PWRSEQ_EMMC=y -# CONFIG_PWRSEQ_SD8787 is not set -CONFIG_PWRSEQ_SIMPLE=y -CONFIG_MMC_BLOCK=y -CONFIG_MMC_BLOCK_MINORS=256 -CONFIG_SDIO_UART=m -# CONFIG_MMC_TEST is not set - -# -# MMC/SD/SDIO Host Controller Drivers -# -# CONFIG_MMC_DEBUG is not set -CONFIG_MMC_ARMMMCI=m -CONFIG_MMC_SDHCI=m -CONFIG_MMC_SDHCI_IO_ACCESSORS=y -CONFIG_MMC_SDHCI_PCI=m -CONFIG_MMC_RICOH_MMC=y -CONFIG_MMC_SDHCI_PLTFM=m -# CONFIG_MMC_SDHCI_OF_ARASAN is not set -# CONFIG_MMC_SDHCI_OF_AT91 is not set -# CONFIG_MMC_SDHCI_OF_ESDHC is not set -# CONFIG_MMC_SDHCI_CADENCE is not set -CONFIG_MMC_SDHCI_ESDHC_IMX=m -CONFIG_MMC_SDHCI_TEGRA=m -CONFIG_MMC_SDHCI_S3C=m -CONFIG_MMC_SDHCI_PXAV3=m -# CONFIG_MMC_SDHCI_S3C_DMA is not set -# CONFIG_MMC_SDHCI_F_SDH30 is not set -CONFIG_MMC_SDHCI_IPROC=m -CONFIG_MMC_OMAP=m -CONFIG_MMC_OMAP_HS=m -# CONFIG_MMC_MXC is not set -CONFIG_MMC_TIFM_SD=m -CONFIG_MMC_MVSDIO=m -CONFIG_MMC_SPI=m -CONFIG_MMC_CB710=m -CONFIG_MMC_VIA_SDMMC=m -CONFIG_MMC_DW=m -CONFIG_MMC_DW_PLTFM=m -# CONFIG_MMC_DW_BLUEFIELD is not set -CONFIG_MMC_DW_EXYNOS=m -# CONFIG_MMC_DW_HI3798CV200 is not set -# CONFIG_MMC_DW_K3 is not set -# CONFIG_MMC_DW_PCI is not set -CONFIG_MMC_DW_ROCKCHIP=m -CONFIG_MMC_VUB300=m -CONFIG_MMC_USHC=m -CONFIG_MMC_WMT=m -# CONFIG_MMC_USDHI6ROL0 is not set -CONFIG_MMC_REALTEK_PCI=m -CONFIG_MMC_REALTEK_USB=m -CONFIG_MMC_SUNXI=m -CONFIG_MMC_CQHCI=m -CONFIG_MMC_TOSHIBA_PCI=m -CONFIG_MMC_BCM2835=m -# CONFIG_MMC_MTK is not set -# CONFIG_MMC_SDHCI_XENON is not set -# CONFIG_MMC_SDHCI_OMAP is not set -CONFIG_MEMSTICK=m -# CONFIG_MEMSTICK_DEBUG is not set - -# -# MemoryStick drivers -# -# CONFIG_MEMSTICK_UNSAFE_RESUME is not set -CONFIG_MSPRO_BLOCK=m -# CONFIG_MS_BLOCK is not set - -# -# MemoryStick Host Controller Drivers -# -CONFIG_MEMSTICK_TIFM_MS=m -CONFIG_MEMSTICK_JMICRON_38X=m -CONFIG_MEMSTICK_R592=m -CONFIG_MEMSTICK_REALTEK_PCI=m -CONFIG_MEMSTICK_REALTEK_USB=m -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -# CONFIG_LEDS_CLASS_FLASH is not set -# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set - -# -# LED drivers -# -# CONFIG_LEDS_BCM6328 is not set -# CONFIG_LEDS_BCM6358 is not set -# CONFIG_LEDS_CR0014114 is not set -# CONFIG_LEDS_LM3530 is not set -# CONFIG_LEDS_LM3642 is not set -# CONFIG_LEDS_LM3692X is not set -# CONFIG_LEDS_PCA9532 is not set -CONFIG_LEDS_GPIO=m -CONFIG_LEDS_LP3944=m -# CONFIG_LEDS_LP3952 is not set -CONFIG_LEDS_LP55XX_COMMON=m -# CONFIG_LEDS_LP5521 is not set -CONFIG_LEDS_LP5523=m -# CONFIG_LEDS_LP5562 is not set -# CONFIG_LEDS_LP8501 is not set -# CONFIG_LEDS_LP8860 is not set -CONFIG_LEDS_PCA955X=m -# CONFIG_LEDS_PCA955X_GPIO is not set -# CONFIG_LEDS_PCA963X is not set -CONFIG_LEDS_DA9052=m -CONFIG_LEDS_DAC124S085=m -CONFIG_LEDS_PWM=m -CONFIG_LEDS_REGULATOR=m -CONFIG_LEDS_BD2802=m -CONFIG_LEDS_LT3593=m -CONFIG_LEDS_MC13783=m -CONFIG_LEDS_NS2=y -CONFIG_LEDS_TCA6507=m -# CONFIG_LEDS_TLC591XX is not set -# CONFIG_LEDS_LM355x is not set -# CONFIG_LEDS_IS31FL319X is not set -# CONFIG_LEDS_IS31FL32XX is not set - -# -# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM) -# -# CONFIG_LEDS_BLINKM is not set -# CONFIG_LEDS_SYSCON is not set -# CONFIG_LEDS_MLXREG is not set -# CONFIG_LEDS_USER is not set - -# -# LED Triggers -# -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=m -CONFIG_LEDS_TRIGGER_ONESHOT=m -CONFIG_LEDS_TRIGGER_DISK=y -CONFIG_LEDS_TRIGGER_MTD=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=m -CONFIG_LEDS_TRIGGER_BACKLIGHT=m -CONFIG_LEDS_TRIGGER_CPU=y -CONFIG_LEDS_TRIGGER_ACTIVITY=m -CONFIG_LEDS_TRIGGER_GPIO=m -CONFIG_LEDS_TRIGGER_DEFAULT_ON=m - -# -# iptables trigger is under Netfilter config (LED target) -# -CONFIG_LEDS_TRIGGER_TRANSIENT=m -CONFIG_LEDS_TRIGGER_CAMERA=m -CONFIG_LEDS_TRIGGER_PANIC=y -CONFIG_LEDS_TRIGGER_NETDEV=m -CONFIG_ACCESSIBILITY=y -CONFIG_A11Y_BRAILLE_CONSOLE=y -CONFIG_INFINIBAND=m -CONFIG_INFINIBAND_USER_MAD=m -CONFIG_INFINIBAND_USER_ACCESS=m -# CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI is not set -CONFIG_INFINIBAND_USER_MEM=y -CONFIG_INFINIBAND_ON_DEMAND_PAGING=y -CONFIG_INFINIBAND_ADDR_TRANS=y -CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y -CONFIG_INFINIBAND_MTHCA=m -CONFIG_INFINIBAND_MTHCA_DEBUG=y -CONFIG_INFINIBAND_CXGB3=m -CONFIG_INFINIBAND_CXGB4=m -CONFIG_INFINIBAND_I40IW=m -CONFIG_MLX4_INFINIBAND=m -CONFIG_MLX5_INFINIBAND=m -CONFIG_INFINIBAND_NES=m -# CONFIG_INFINIBAND_NES_DEBUG is not set -CONFIG_INFINIBAND_OCRDMA=m -CONFIG_INFINIBAND_IPOIB=m -CONFIG_INFINIBAND_IPOIB_CM=y -CONFIG_INFINIBAND_IPOIB_DEBUG=y -# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set -CONFIG_INFINIBAND_SRP=m -CONFIG_INFINIBAND_SRPT=m -CONFIG_INFINIBAND_ISER=m -CONFIG_INFINIBAND_ISERT=m -CONFIG_RDMA_RXE=m -# CONFIG_INFINIBAND_BNXT_RE is not set -CONFIG_EDAC_ATOMIC_SCRUB=y -CONFIG_EDAC_SUPPORT=y -# CONFIG_EDAC is not set -CONFIG_RTC_LIB=y -CONFIG_RTC_MC146818_LIB=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_HCTOSYS=y -CONFIG_RTC_HCTOSYS_DEVICE="rtc0" -CONFIG_RTC_SYSTOHC=y -CONFIG_RTC_SYSTOHC_DEVICE="rtc0" -# CONFIG_RTC_DEBUG is not set -CONFIG_RTC_NVMEM=y - -# -# RTC interfaces -# -CONFIG_RTC_INTF_SYSFS=y -CONFIG_RTC_INTF_PROC=y -CONFIG_RTC_INTF_DEV=y -# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set -# CONFIG_RTC_DRV_TEST is not set - -# -# I2C RTC drivers -# -# CONFIG_RTC_DRV_ABB5ZES3 is not set -# CONFIG_RTC_DRV_ABX80X is not set -CONFIG_RTC_DRV_AS3722=y -CONFIG_RTC_DRV_DS1307=y -CONFIG_RTC_DRV_DS1307_HWMON=y -# CONFIG_RTC_DRV_DS1307_CENTURY is not set -# CONFIG_RTC_DRV_DS1374 is not set -# CONFIG_RTC_DRV_DS1672 is not set -# CONFIG_RTC_DRV_HYM8563 is not set -# CONFIG_RTC_DRV_MAX6900 is not set -CONFIG_RTC_DRV_MAX77686=y -CONFIG_RTC_DRV_RK808=y -# CONFIG_RTC_DRV_RS5C372 is not set -# CONFIG_RTC_DRV_ISL1208 is not set -# CONFIG_RTC_DRV_ISL12022 is not set -# CONFIG_RTC_DRV_ISL12026 is not set -# CONFIG_RTC_DRV_X1205 is not set -CONFIG_RTC_DRV_PCF8523=y -# CONFIG_RTC_DRV_PCF85063 is not set -# CONFIG_RTC_DRV_PCF85363 is not set -CONFIG_RTC_DRV_PCF8563=y -# CONFIG_RTC_DRV_PCF8583 is not set -# CONFIG_RTC_DRV_M41T80 is not set -# CONFIG_RTC_DRV_BQ32K is not set -CONFIG_RTC_DRV_TWL4030=y -CONFIG_RTC_DRV_PALMAS=y -# CONFIG_RTC_DRV_S35390A is not set -# CONFIG_RTC_DRV_FM3130 is not set -# CONFIG_RTC_DRV_RX8010 is not set -# CONFIG_RTC_DRV_RX8581 is not set -# CONFIG_RTC_DRV_RX8025 is not set -# CONFIG_RTC_DRV_EM3027 is not set -# CONFIG_RTC_DRV_RV8803 is not set -CONFIG_RTC_DRV_S5M=y - -# -# SPI RTC drivers -# -# CONFIG_RTC_DRV_M41T93 is not set -# CONFIG_RTC_DRV_M41T94 is not set -# CONFIG_RTC_DRV_DS1302 is not set -# CONFIG_RTC_DRV_DS1305 is not set -# CONFIG_RTC_DRV_DS1343 is not set -# CONFIG_RTC_DRV_DS1347 is not set -# CONFIG_RTC_DRV_DS1390 is not set -# CONFIG_RTC_DRV_MAX6916 is not set -# CONFIG_RTC_DRV_R9701 is not set -# CONFIG_RTC_DRV_RX4581 is not set -# CONFIG_RTC_DRV_RX6110 is not set -# CONFIG_RTC_DRV_RS5C348 is not set -# CONFIG_RTC_DRV_MAX6902 is not set -# CONFIG_RTC_DRV_PCF2123 is not set -# CONFIG_RTC_DRV_MCP795 is not set -CONFIG_RTC_I2C_AND_SPI=y - -# -# SPI and I2C RTC drivers -# -# CONFIG_RTC_DRV_DS3232 is not set -# CONFIG_RTC_DRV_PCF2127 is not set -# CONFIG_RTC_DRV_RV3029C2 is not set - -# -# Platform RTC drivers -# -CONFIG_RTC_DRV_CMOS=m -# CONFIG_RTC_DRV_DS1286 is not set -# CONFIG_RTC_DRV_DS1511 is not set -# CONFIG_RTC_DRV_DS1553 is not set -# CONFIG_RTC_DRV_DS1685_FAMILY is not set -# CONFIG_RTC_DRV_DS1742 is not set -# CONFIG_RTC_DRV_DS2404 is not set -CONFIG_RTC_DRV_DA9052=y -CONFIG_RTC_DRV_EFI=y -# CONFIG_RTC_DRV_STK17TA8 is not set -# CONFIG_RTC_DRV_M48T86 is not set -# CONFIG_RTC_DRV_M48T35 is not set -# CONFIG_RTC_DRV_M48T59 is not set -# CONFIG_RTC_DRV_MSM6242 is not set -# CONFIG_RTC_DRV_BQ4802 is not set -# CONFIG_RTC_DRV_RP5C01 is not set -# CONFIG_RTC_DRV_V3020 is not set -# CONFIG_RTC_DRV_ZYNQMP is not set -CONFIG_RTC_DRV_CROS_EC=m - -# -# on-CPU RTC drivers -# -CONFIG_RTC_DRV_IMXDI=y -CONFIG_RTC_DRV_OMAP=y -CONFIG_HAVE_S3C_RTC=y -# CONFIG_RTC_DRV_S3C is not set -CONFIG_RTC_DRV_PL030=y -CONFIG_RTC_DRV_PL031=y -CONFIG_RTC_DRV_VT8500=y -CONFIG_RTC_DRV_SUN6I=y -CONFIG_RTC_DRV_SUNXI=y -CONFIG_RTC_DRV_MV=y -CONFIG_RTC_DRV_ARMADA38X=y -# CONFIG_RTC_DRV_FTRTC010 is not set -CONFIG_RTC_DRV_MC13XXX=m -CONFIG_RTC_DRV_TEGRA=y -CONFIG_RTC_DRV_MXC=y -CONFIG_RTC_DRV_MXC_V2=m -CONFIG_RTC_DRV_SNVS=y -# CONFIG_RTC_DRV_R7301 is not set - -# -# HID Sensor RTC drivers -# -# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set -CONFIG_DMADEVICES=y -# CONFIG_DMADEVICES_DEBUG is not set - -# -# DMA Devices -# -CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y -CONFIG_DMA_ENGINE=y -CONFIG_DMA_VIRTUAL_CHANNELS=y -CONFIG_DMA_OF=y -CONFIG_ALTERA_MSGDMA=m -CONFIG_AMBA_PL08X=y -# CONFIG_AXI_DMAC is not set -CONFIG_DMA_BCM2835=y -CONFIG_DMA_SUN4I=y -CONFIG_DMA_SUN6I=m -# CONFIG_DW_AXI_DMAC is not set -# CONFIG_FSL_EDMA is not set -CONFIG_IMX_DMA=y -CONFIG_IMX_SDMA=y -# CONFIG_INTEL_IDMA64 is not set -CONFIG_MV_XOR=y -CONFIG_MXS_DMA=y -CONFIG_MX3_IPU=y -CONFIG_MX3_IPU_IRQS=4 -# CONFIG_NBPFAXI_DMA is not set -CONFIG_PL330_DMA=y -CONFIG_TEGRA20_APB_DMA=y -# CONFIG_QCOM_HIDMA_MGMT is not set -# CONFIG_QCOM_HIDMA is not set -# CONFIG_DW_DMAC is not set -# CONFIG_DW_DMAC_PCI is not set -CONFIG_TI_CPPI41=m -CONFIG_TI_EDMA=y -CONFIG_DMA_OMAP=y -CONFIG_TI_DMA_CROSSBAR=y - -# -# DMA Clients -# -CONFIG_ASYNC_TX_DMA=y -# CONFIG_DMATEST is not set -CONFIG_DMA_ENGINE_RAID=y - -# -# DMABUF options -# -CONFIG_SYNC_FILE=y -# CONFIG_SW_SYNC is not set -# CONFIG_AUXDISPLAY is not set -# CONFIG_PANEL is not set -CONFIG_UIO=m -CONFIG_UIO_CIF=m -# CONFIG_UIO_PDRV_GENIRQ is not set -# CONFIG_UIO_DMEM_GENIRQ is not set -CONFIG_UIO_AEC=m -CONFIG_UIO_SERCOS3=m -CONFIG_UIO_PCI_GENERIC=m -CONFIG_UIO_NETX=m -# CONFIG_UIO_PRUSS is not set -CONFIG_UIO_MF624=m -# CONFIG_VFIO is not set -CONFIG_VIRT_DRIVERS=y -CONFIG_VIRTIO=m -CONFIG_VIRTIO_MENU=y -CONFIG_VIRTIO_PCI=m -CONFIG_VIRTIO_PCI_LEGACY=y -CONFIG_VIRTIO_BALLOON=m -CONFIG_VIRTIO_INPUT=m -CONFIG_VIRTIO_MMIO=m -# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set - -# -# Microsoft Hyper-V guest support -# - -# -# Xen driver support -# -CONFIG_XEN_BALLOON=y -CONFIG_XEN_SCRUB_PAGES=y -CONFIG_XEN_DEV_EVTCHN=m -CONFIG_XEN_BACKEND=y -CONFIG_XENFS=m -CONFIG_XEN_COMPAT_XENFS=y -CONFIG_XEN_SYS_HYPERVISOR=y -CONFIG_XEN_XENBUS_FRONTEND=y -CONFIG_XEN_GNTDEV=m -CONFIG_XEN_GRANT_DEV_ALLOC=m -CONFIG_SWIOTLB_XEN=y -CONFIG_XEN_PVCALLS_FRONTEND=m -# CONFIG_XEN_PVCALLS_BACKEND is not set -CONFIG_XEN_SCSI_BACKEND=m -CONFIG_XEN_PRIVCMD=m -CONFIG_XEN_EFI=y -CONFIG_XEN_AUTO_XLATE=y -CONFIG_STAGING=y -# CONFIG_PRISM2_USB is not set -# CONFIG_COMEDI is not set -# CONFIG_RTL8192U is not set -# CONFIG_RTLLIB is not set -# CONFIG_RTL8723BS is not set -CONFIG_R8712U=m -CONFIG_R8188EU=m -CONFIG_88EU_AP_MODE=y -CONFIG_R8822BE=m -CONFIG_RTLWIFI_DEBUG_ST=y -# CONFIG_RTS5208 is not set -# CONFIG_VT6655 is not set -# CONFIG_VT6656 is not set - -# -# IIO staging drivers -# - -# -# Accelerometers -# -# CONFIG_ADIS16203 is not set -# CONFIG_ADIS16240 is not set - -# -# Analog to digital converters -# -# CONFIG_AD7606 is not set -# CONFIG_AD7780 is not set -# CONFIG_AD7816 is not set -# CONFIG_AD7192 is not set -# CONFIG_AD7280 is not set - -# -# Analog digital bi-direction converters -# -# CONFIG_ADT7316 is not set - -# -# Capacitance to digital converters -# -# CONFIG_AD7150 is not set -# CONFIG_AD7152 is not set -# CONFIG_AD7746 is not set - -# -# Direct Digital Synthesis -# -# CONFIG_AD9832 is not set -# CONFIG_AD9834 is not set - -# -# Digital gyroscope sensors -# -# CONFIG_ADIS16060 is not set - -# -# Network Analyzer, Impedance Converters -# -# CONFIG_AD5933 is not set - -# -# Active energy metering IC -# -# CONFIG_ADE7854 is not set - -# -# Resolver to digital converters -# -# CONFIG_AD2S90 is not set -# CONFIG_AD2S1210 is not set -# CONFIG_FB_SM750 is not set -# CONFIG_FB_XGI is not set - -# -# Speakup console speech -# -CONFIG_SPEAKUP=m -CONFIG_SPEAKUP_SYNTH_ACNTSA=m -CONFIG_SPEAKUP_SYNTH_APOLLO=m -CONFIG_SPEAKUP_SYNTH_AUDPTR=m -CONFIG_SPEAKUP_SYNTH_BNS=m -CONFIG_SPEAKUP_SYNTH_DECTLK=m -CONFIG_SPEAKUP_SYNTH_DECEXT=m -CONFIG_SPEAKUP_SYNTH_LTLK=m -CONFIG_SPEAKUP_SYNTH_SOFT=m -CONFIG_SPEAKUP_SYNTH_SPKOUT=m -CONFIG_SPEAKUP_SYNTH_TXPRT=m -CONFIG_SPEAKUP_SYNTH_DUMMY=m -# CONFIG_MFD_NVEC is not set -# CONFIG_STAGING_MEDIA is not set - -# -# Android -# -# CONFIG_STAGING_BOARD is not set -# CONFIG_LTE_GDM724X is not set -# CONFIG_FIREWIRE_SERIAL is not set -# CONFIG_MTD_SPINAND_MT29F is not set -# CONFIG_DGNC is not set -# CONFIG_GS_FPGABOOT is not set -# CONFIG_UNISYSSPAR is not set -# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set -# CONFIG_FB_TFT is not set -# CONFIG_WILC1000_SDIO is not set -# CONFIG_WILC1000_SPI is not set -# CONFIG_MOST is not set -# CONFIG_KS7010 is not set -# CONFIG_GREYBUS is not set -CONFIG_BCM_VIDEOCORE=y -# CONFIG_BCM2835_VCHIQ is not set -# CONFIG_SND_BCM2835 is not set -# CONFIG_VIDEO_BCM2835 is not set - -# -# USB Power Delivery and Type-C drivers -# -CONFIG_PI433=m -CONFIG_MTK_MMC=m -# CONFIG_MTK_AEE_KDUMP is not set -# CONFIG_MTK_MMC_CD_POLL is not set -# CONFIG_GOLDFISH is not set -CONFIG_CHROME_PLATFORMS=y -CONFIG_CROS_EC_CTL=m -CONFIG_CROS_EC_PROTO=y -# CONFIG_MELLANOX_PLATFORM is not set -CONFIG_CLKDEV_LOOKUP=y -CONFIG_HAVE_CLK_PREPARE=y -CONFIG_COMMON_CLK=y - -# -# Common Clock Framework -# -CONFIG_ICST=y -CONFIG_COMMON_CLK_VERSATILE=y -CONFIG_CLK_SP810=y -CONFIG_CLK_VEXPRESS_OSC=y -# CONFIG_CLK_HSDK is not set -CONFIG_COMMON_CLK_MAX77686=m -CONFIG_COMMON_CLK_RK808=m -CONFIG_COMMON_CLK_SCMI=m -# CONFIG_COMMON_CLK_SI5351 is not set -# CONFIG_COMMON_CLK_SI514 is not set -# CONFIG_COMMON_CLK_SI544 is not set -# CONFIG_COMMON_CLK_SI570 is not set -# CONFIG_COMMON_CLK_CDCE706 is not set -# CONFIG_COMMON_CLK_CDCE925 is not set -# CONFIG_COMMON_CLK_CS2000_CP is not set -CONFIG_COMMON_CLK_S2MPS11=m -CONFIG_CLK_TWL6040=m -# CONFIG_CLK_QORIQ is not set -CONFIG_COMMON_CLK_PALMAS=m -# CONFIG_COMMON_CLK_PWM is not set -# CONFIG_COMMON_CLK_VC5 is not set -CONFIG_MVEBU_CLK_COMMON=y -CONFIG_MVEBU_CLK_CPU=y -CONFIG_MVEBU_CLK_COREDIV=y -CONFIG_ARMADA_370_CLK=y -CONFIG_ARMADA_375_CLK=y -CONFIG_ARMADA_38X_CLK=y -CONFIG_ARMADA_39X_CLK=y -CONFIG_ARMADA_XP_CLK=y -CONFIG_COMMON_CLK_SAMSUNG=y -CONFIG_EXYNOS_AUDSS_CLK_CON=y -CONFIG_SUNXI_CCU=y -CONFIG_SUN4I_A10_CCU=y -CONFIG_SUN5I_CCU=y -CONFIG_SUN6I_A31_CCU=y -CONFIG_SUN8I_A23_CCU=y -CONFIG_SUN8I_A33_CCU=y -CONFIG_SUN8I_A83T_CCU=y -CONFIG_SUN8I_H3_CCU=y -CONFIG_SUN8I_V3S_CCU=y -# CONFIG_SUN8I_DE2_CCU is not set -CONFIG_SUN8I_R40_CCU=y -CONFIG_SUN9I_A80_CCU=y -CONFIG_SUN8I_R_CCU=y -CONFIG_TEGRA_CLK_EMC=y -CONFIG_COMMON_CLK_TI_ADPLL=y -# CONFIG_HWSPINLOCK is not set - -# -# Clock Source drivers -# -CONFIG_TIMER_OF=y -CONFIG_TIMER_PROBE=y -CONFIG_OMAP_DM_TIMER=y -CONFIG_CLKSRC_MMIO=y -CONFIG_BCM2835_TIMER=y -CONFIG_DW_APB_TIMER=y -CONFIG_DW_APB_TIMER_OF=y -CONFIG_ROCKCHIP_TIMER=y -CONFIG_ARMADA_370_XP_TIMER=y -CONFIG_SUN4I_TIMER=y -CONFIG_SUN5I_HSTIMER=y -CONFIG_TEGRA_TIMER=y -CONFIG_VT8500_TIMER=y -CONFIG_CLKSRC_TI_32K=y -CONFIG_ARM_ARCH_TIMER=y -CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y -CONFIG_ARM_GLOBAL_TIMER=y -CONFIG_ARM_TIMER_SP804=y -CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK=y -CONFIG_CLKSRC_EXYNOS_MCT=y -CONFIG_CLKSRC_SAMSUNG_PWM=y -CONFIG_CLKSRC_VERSATILE=y -CONFIG_CLKSRC_IMX_GPT=y -CONFIG_MAILBOX=y -# CONFIG_ARM_MHU is not set -# CONFIG_PLATFORM_MHU is not set -CONFIG_PL320_MBOX=y -CONFIG_OMAP2PLUS_MBOX=y -CONFIG_OMAP_MBOX_KFIFO_SIZE=256 -# CONFIG_ROCKCHIP_MBOX is not set -# CONFIG_ALTERA_MBOX is not set -CONFIG_BCM2835_MBOX=y -# CONFIG_MAILBOX_TEST is not set -# CONFIG_TEGRA_HSP_MBOX is not set -CONFIG_IOMMU_API=y -CONFIG_IOMMU_SUPPORT=y - -# -# Generic IOMMU Pagetable Support -# -# CONFIG_IOMMU_IO_PGTABLE_LPAE is not set -# CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set -CONFIG_OF_IOMMU=y -CONFIG_OMAP_IOMMU=y -# CONFIG_OMAP_IOMMU_DEBUG is not set -CONFIG_ROCKCHIP_IOMMU=y -CONFIG_TEGRA_IOMMU_SMMU=y -# CONFIG_EXYNOS_IOMMU is not set -# CONFIG_ARM_SMMU is not set - -# -# Remoteproc drivers -# -# CONFIG_REMOTEPROC is not set - -# -# Rpmsg drivers -# -# CONFIG_RPMSG_QCOM_GLINK_RPM is not set -# CONFIG_RPMSG_VIRTIO is not set -# CONFIG_SOUNDWIRE is not set - -# -# SOC (System On Chip) specific Drivers -# - -# -# Amlogic SoC drivers -# - -# -# Broadcom SoC drivers -# -CONFIG_RASPBERRYPI_POWER=y -# CONFIG_SOC_BRCMSTB is not set - -# -# i.MX SoC drivers -# - -# -# Qualcomm SoC drivers -# -CONFIG_ROCKCHIP_GRF=y -CONFIG_ROCKCHIP_PM_DOMAINS=y -CONFIG_SOC_SAMSUNG=y -CONFIG_EXYNOS_PMU=y -CONFIG_EXYNOS_PMU_ARM_DRIVERS=y -CONFIG_EXYNOS_PM_DOMAINS=y -CONFIG_SUNXI_SRAM=y -# CONFIG_ARCH_TEGRA_2x_SOC is not set -# CONFIG_ARCH_TEGRA_3x_SOC is not set -# CONFIG_ARCH_TEGRA_114_SOC is not set -CONFIG_ARCH_TEGRA_124_SOC=y -CONFIG_SOC_TEGRA_FUSE=y -CONFIG_SOC_TEGRA_FLOWCTRL=y -CONFIG_SOC_TEGRA_PMC=y -# CONFIG_SOC_TI is not set - -# -# Xilinx SoC drivers -# -# CONFIG_XILINX_VCU is not set -CONFIG_PM_DEVFREQ=y - -# -# DEVFREQ Governors -# -CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m -# CONFIG_DEVFREQ_GOV_PERFORMANCE is not set -# CONFIG_DEVFREQ_GOV_POWERSAVE is not set -# CONFIG_DEVFREQ_GOV_USERSPACE is not set -# CONFIG_DEVFREQ_GOV_PASSIVE is not set - -# -# DEVFREQ Drivers -# -# CONFIG_ARM_EXYNOS_BUS_DEVFREQ is not set -CONFIG_ARM_TEGRA_DEVFREQ=m -# CONFIG_ARM_RK3399_DMC_DEVFREQ is not set -# CONFIG_PM_DEVFREQ_EVENT is not set -CONFIG_EXTCON=y - -# -# Extcon Device Drivers -# -# CONFIG_EXTCON_ADC_JACK is not set -# CONFIG_EXTCON_GPIO is not set -# CONFIG_EXTCON_MAX3355 is not set -CONFIG_EXTCON_PALMAS=m -# CONFIG_EXTCON_RT8973A is not set -# CONFIG_EXTCON_SM5502 is not set -CONFIG_EXTCON_USB_GPIO=m -CONFIG_EXTCON_USBC_CROS_EC=m -CONFIG_MEMORY=y -# CONFIG_ARM_PL172_MPMC is not set -CONFIG_TI_EMIF=m -CONFIG_OMAP_GPMC=y -# CONFIG_OMAP_GPMC_DEBUG is not set -CONFIG_TI_EMIF_SRAM=m -CONFIG_MVEBU_DEVBUS=y -CONFIG_SAMSUNG_MC=y -CONFIG_EXYNOS_SROM=y -CONFIG_TEGRA_MC=y -CONFIG_TEGRA124_EMC=y -CONFIG_IIO=m -CONFIG_IIO_BUFFER=y -# CONFIG_IIO_BUFFER_CB is not set -# CONFIG_IIO_BUFFER_HW_CONSUMER is not set -CONFIG_IIO_KFIFO_BUF=m -CONFIG_IIO_TRIGGERED_BUFFER=m -# CONFIG_IIO_CONFIGFS is not set -CONFIG_IIO_TRIGGER=y -CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 -# CONFIG_IIO_SW_DEVICE is not set -# CONFIG_IIO_SW_TRIGGER is not set - -# -# Accelerometers -# -# CONFIG_ADIS16201 is not set -# CONFIG_ADIS16209 is not set -# CONFIG_ADXL345_I2C is not set -# CONFIG_ADXL345_SPI is not set -# CONFIG_BMA180 is not set -# CONFIG_BMA220 is not set -# CONFIG_BMC150_ACCEL is not set -# CONFIG_DA280 is not set -# CONFIG_DA311 is not set -# CONFIG_DMARD06 is not set -# CONFIG_DMARD09 is not set -# CONFIG_DMARD10 is not set -CONFIG_HID_SENSOR_ACCEL_3D=m -CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m -CONFIG_IIO_ST_ACCEL_3AXIS=m -CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m -CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m -# CONFIG_KXSD9 is not set -# CONFIG_KXCJK1013 is not set -# CONFIG_MC3230 is not set -# CONFIG_MMA7455_I2C is not set -# CONFIG_MMA7455_SPI is not set -# CONFIG_MMA7660 is not set -CONFIG_MMA8452=m -# CONFIG_MMA9551 is not set -# CONFIG_MMA9553 is not set -# CONFIG_MXC4005 is not set -# CONFIG_MXC6255 is not set -# CONFIG_SCA3000 is not set -# CONFIG_STK8312 is not set -# CONFIG_STK8BA50 is not set - -# -# Analog to digital converters -# -# CONFIG_AD7266 is not set -# CONFIG_AD7291 is not set -# CONFIG_AD7298 is not set -# CONFIG_AD7476 is not set -# CONFIG_AD7766 is not set -# CONFIG_AD7791 is not set -# CONFIG_AD7793 is not set -# CONFIG_AD7887 is not set -# CONFIG_AD7923 is not set -# CONFIG_AD799X is not set -CONFIG_AXP20X_ADC=m -CONFIG_AXP288_ADC=m -# CONFIG_CC10001_ADC is not set -# CONFIG_ENVELOPE_DETECTOR is not set -CONFIG_EXYNOS_ADC=m -# CONFIG_HI8435 is not set -# CONFIG_HX711 is not set -# CONFIG_INA2XX_ADC is not set -# CONFIG_IMX7D_ADC is not set -CONFIG_LTC2471=m -# CONFIG_LTC2485 is not set -# CONFIG_LTC2497 is not set -# CONFIG_MAX1027 is not set -# CONFIG_MAX11100 is not set -# CONFIG_MAX1118 is not set -# CONFIG_MAX1363 is not set -# CONFIG_MAX9611 is not set -# CONFIG_MCP320X is not set -# CONFIG_MCP3422 is not set -# CONFIG_NAU7802 is not set -# CONFIG_PALMAS_GPADC is not set -CONFIG_ROCKCHIP_SARADC=m -CONFIG_SD_ADC_MODULATOR=m -# CONFIG_SUN4I_GPADC is not set -# CONFIG_TI_ADC081C is not set -# CONFIG_TI_ADC0832 is not set -# CONFIG_TI_ADC084S021 is not set -# CONFIG_TI_ADC12138 is not set -# CONFIG_TI_ADC108S102 is not set -# CONFIG_TI_ADC128S052 is not set -# CONFIG_TI_ADC161S626 is not set -# CONFIG_TI_ADS1015 is not set -# CONFIG_TI_ADS7950 is not set -# CONFIG_TI_ADS8688 is not set -CONFIG_TI_AM335X_ADC=m -# CONFIG_TI_TLC4541 is not set -CONFIG_TWL4030_MADC=m -# CONFIG_TWL6030_GPADC is not set -# CONFIG_VF610_ADC is not set -CONFIG_VIPERBOARD_ADC=m - -# -# Analog Front Ends -# -# CONFIG_IIO_RESCALE is not set - -# -# Amplifiers -# -# CONFIG_AD8366 is not set - -# -# Chemical Sensors -# -# CONFIG_ATLAS_PH_SENSOR is not set -CONFIG_CCS811=m -# CONFIG_IAQCORE is not set -# CONFIG_VZ89X is not set -# CONFIG_IIO_CROS_EC_SENSORS_CORE is not set - -# -# Hid Sensor IIO Common -# -CONFIG_HID_SENSOR_IIO_COMMON=m -CONFIG_HID_SENSOR_IIO_TRIGGER=m - -# -# SSP Sensor Common -# -# CONFIG_IIO_SSP_SENSORHUB is not set -CONFIG_IIO_ST_SENSORS_I2C=m -CONFIG_IIO_ST_SENSORS_SPI=m -CONFIG_IIO_ST_SENSORS_CORE=m - -# -# Counters -# - -# -# Digital to analog converters -# -# CONFIG_AD5064 is not set -# CONFIG_AD5360 is not set -# CONFIG_AD5380 is not set -# CONFIG_AD5421 is not set -# CONFIG_AD5446 is not set -# CONFIG_AD5449 is not set -# CONFIG_AD5592R is not set -# CONFIG_AD5593R is not set -# CONFIG_AD5504 is not set -# CONFIG_AD5624R_SPI is not set -# CONFIG_LTC2632 is not set -# CONFIG_AD5686_SPI is not set -# CONFIG_AD5696_I2C is not set -# CONFIG_AD5755 is not set -# CONFIG_AD5761 is not set -# CONFIG_AD5764 is not set -# CONFIG_AD5791 is not set -# CONFIG_AD7303 is not set -# CONFIG_AD8801 is not set -# CONFIG_DPOT_DAC is not set -# CONFIG_DS4424 is not set -# CONFIG_M62332 is not set -# CONFIG_MAX517 is not set -# CONFIG_MAX5821 is not set -# CONFIG_MCP4725 is not set -# CONFIG_MCP4922 is not set -# CONFIG_TI_DAC082S085 is not set -# CONFIG_TI_DAC5571 is not set -# CONFIG_VF610_DAC is not set - -# -# IIO dummy driver -# - -# -# Frequency Synthesizers DDS/PLL -# - -# -# Clock Generator/Distribution -# -# CONFIG_AD9523 is not set - -# -# Phase-Locked Loop (PLL) frequency synthesizers -# -# CONFIG_ADF4350 is not set - -# -# Digital gyroscope sensors -# -# CONFIG_ADIS16080 is not set -# CONFIG_ADIS16130 is not set -# CONFIG_ADIS16136 is not set -# CONFIG_ADIS16260 is not set -# CONFIG_ADXRS450 is not set -# CONFIG_BMG160 is not set -CONFIG_HID_SENSOR_GYRO_3D=m -# CONFIG_MPU3050_I2C is not set -# CONFIG_IIO_ST_GYRO_3AXIS is not set -# CONFIG_ITG3200 is not set - -# -# Health Sensors -# - -# -# Heart Rate Monitors -# -# CONFIG_AFE4403 is not set -# CONFIG_AFE4404 is not set -# CONFIG_MAX30100 is not set -# CONFIG_MAX30102 is not set - -# -# Humidity sensors -# -# CONFIG_AM2315 is not set -# CONFIG_DHT11 is not set -# CONFIG_HDC100X is not set -# CONFIG_HID_SENSOR_HUMIDITY is not set -# CONFIG_HTS221 is not set -# CONFIG_HTU21 is not set -# CONFIG_SI7005 is not set -# CONFIG_SI7020 is not set - -# -# Inertial measurement units -# -# CONFIG_ADIS16400 is not set -# CONFIG_ADIS16480 is not set -# CONFIG_BMI160_I2C is not set -# CONFIG_BMI160_SPI is not set -# CONFIG_KMX61 is not set -# CONFIG_INV_MPU6050_I2C is not set -# CONFIG_INV_MPU6050_SPI is not set -# CONFIG_IIO_ST_LSM6DSX is not set - -# -# Light sensors -# -# CONFIG_ADJD_S311 is not set -# CONFIG_AL3320A is not set -# CONFIG_APDS9300 is not set -# CONFIG_APDS9960 is not set -# CONFIG_BH1750 is not set -CONFIG_BH1780=m -# CONFIG_CM32181 is not set -# CONFIG_CM3232 is not set -# CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set -# CONFIG_CM36651 is not set -# CONFIG_GP2AP020A00F is not set -# CONFIG_SENSORS_ISL29018 is not set -# CONFIG_SENSORS_ISL29028 is not set -# CONFIG_ISL29125 is not set -CONFIG_HID_SENSOR_ALS=m -CONFIG_HID_SENSOR_PROX=m -# CONFIG_JSA1212 is not set -# CONFIG_RPR0521 is not set -# CONFIG_LTR501 is not set -# CONFIG_LV0104CS is not set -# CONFIG_MAX44000 is not set -# CONFIG_OPT3001 is not set -# CONFIG_PA12203001 is not set -# CONFIG_SI1145 is not set -# CONFIG_STK3310 is not set -# CONFIG_ST_UVIS25 is not set -# CONFIG_TCS3414 is not set -# CONFIG_TCS3472 is not set -CONFIG_SENSORS_TSL2563=m -# CONFIG_TSL2583 is not set -# CONFIG_TSL2772 is not set -# CONFIG_TSL4531 is not set -# CONFIG_US5182D is not set -# CONFIG_VCNL4000 is not set -# CONFIG_VEML6070 is not set -# CONFIG_VL6180 is not set -# CONFIG_ZOPT2201 is not set - -# -# Magnetometer sensors -# -# CONFIG_AK8974 is not set -# CONFIG_AK8975 is not set -# CONFIG_AK09911 is not set -# CONFIG_BMC150_MAGN_I2C is not set -# CONFIG_BMC150_MAGN_SPI is not set -# CONFIG_MAG3110 is not set -CONFIG_HID_SENSOR_MAGNETOMETER_3D=m -# CONFIG_MMC35240 is not set -# CONFIG_IIO_ST_MAGN_3AXIS is not set -# CONFIG_SENSORS_HMC5843_I2C is not set -# CONFIG_SENSORS_HMC5843_SPI is not set - -# -# Multiplexers -# -# CONFIG_IIO_MUX is not set - -# -# Inclinometer sensors -# -CONFIG_HID_SENSOR_INCLINOMETER_3D=m -CONFIG_HID_SENSOR_DEVICE_ROTATION=m - -# -# Triggers - standalone -# -# CONFIG_IIO_INTERRUPT_TRIGGER is not set -# CONFIG_IIO_SYSFS_TRIGGER is not set - -# -# Digital potentiometers -# -# CONFIG_AD5272 is not set -# CONFIG_DS1803 is not set -# CONFIG_MAX5481 is not set -# CONFIG_MAX5487 is not set -# CONFIG_MCP4018 is not set -# CONFIG_MCP4131 is not set -# CONFIG_MCP4531 is not set -# CONFIG_TPL0102 is not set - -# -# Digital potentiostats -# -# CONFIG_LMP91000 is not set - -# -# Pressure sensors -# -# CONFIG_ABP060MG is not set -# CONFIG_BMP280 is not set -CONFIG_HID_SENSOR_PRESS=m -# CONFIG_HP03 is not set -# CONFIG_MPL115_I2C is not set -# CONFIG_MPL115_SPI is not set -# CONFIG_MPL3115 is not set -# CONFIG_MS5611 is not set -# CONFIG_MS5637 is not set -# CONFIG_IIO_ST_PRESS is not set -# CONFIG_T5403 is not set -# CONFIG_HP206C is not set -# CONFIG_ZPA2326 is not set - -# -# Lightning sensors -# -# CONFIG_AS3935 is not set - -# -# Proximity and distance sensors -# -# CONFIG_LIDAR_LITE_V2 is not set -# CONFIG_RFD77402 is not set -# CONFIG_SRF04 is not set -# CONFIG_SX9500 is not set -# CONFIG_SRF08 is not set - -# -# Resolver to digital converters -# -# CONFIG_AD2S1200 is not set - -# -# Temperature sensors -# -# CONFIG_MAXIM_THERMOCOUPLE is not set -# CONFIG_HID_SENSOR_TEMP is not set -# CONFIG_MLX90614 is not set -# CONFIG_MLX90632 is not set -# CONFIG_TMP006 is not set -# CONFIG_TMP007 is not set -# CONFIG_TSYS01 is not set -# CONFIG_TSYS02D is not set -# CONFIG_NTB is not set -# CONFIG_VME_BUS is not set -CONFIG_PWM=y -CONFIG_PWM_SYSFS=y -CONFIG_PWM_BCM2835=m -# CONFIG_PWM_CROS_EC is not set -# CONFIG_PWM_FSL_FTM is not set -CONFIG_PWM_IMX=m -CONFIG_PWM_OMAP_DMTIMER=m -# CONFIG_PWM_PCA9685 is not set -CONFIG_PWM_ROCKCHIP=m -CONFIG_PWM_SAMSUNG=m -# CONFIG_PWM_STMPE is not set -CONFIG_PWM_SUN4I=m -CONFIG_PWM_TEGRA=m -CONFIG_PWM_TIECAP=m -CONFIG_PWM_TIEHRPWM=m -CONFIG_PWM_TIPWMSS=y -CONFIG_PWM_TWL=m -CONFIG_PWM_TWL_LED=m -CONFIG_PWM_VT8500=m - -# -# IRQ chip support -# -CONFIG_IRQCHIP=y -CONFIG_ARM_GIC=y -CONFIG_ARM_GIC_MAX_NR=1 -CONFIG_ARM_GIC_V2M=y -CONFIG_GIC_NON_BANKED=y -CONFIG_ARM_GIC_V3=y -CONFIG_ARM_GIC_V3_ITS=y -CONFIG_ARM_GIC_V3_ITS_PCI=y -CONFIG_ARMADA_370_XP_IRQ=y -CONFIG_OMAP_IRQCHIP=y -# CONFIG_TS4800_IRQ is not set -CONFIG_IRQ_CROSSBAR=y -CONFIG_PARTITION_PERCPU=y -# CONFIG_IPACK_BUS is not set -CONFIG_ARCH_HAS_RESET_CONTROLLER=y -CONFIG_RESET_CONTROLLER=y -CONFIG_RESET_SIMPLE=y -CONFIG_RESET_SUNXI=y -# CONFIG_RESET_TI_SYSCON is not set -# CONFIG_FMC is not set - -# -# PHY Subsystem -# -CONFIG_GENERIC_PHY=y -CONFIG_PHY_SUN4I_USB=m -CONFIG_PHY_SUN9I_USB=m -# CONFIG_BCM_KONA_USB2_PHY is not set -CONFIG_ARMADA375_USBCLUSTER_PHY=y -CONFIG_PHY_MVEBU_CP110_COMPHY=m -# CONFIG_PHY_PXA_28NM_HSIC is not set -# CONFIG_PHY_PXA_28NM_USB2 is not set -# CONFIG_PHY_CPCAP_USB is not set -# CONFIG_PHY_MAPPHONE_MDM6600 is not set -CONFIG_PHY_QCOM_USB_HS=m -CONFIG_PHY_QCOM_USB_HSIC=m -CONFIG_PHY_ROCKCHIP_DP=m -CONFIG_PHY_ROCKCHIP_EMMC=m -# CONFIG_PHY_ROCKCHIP_INNO_USB2 is not set -# CONFIG_PHY_ROCKCHIP_PCIE is not set -# CONFIG_PHY_ROCKCHIP_TYPEC is not set -CONFIG_PHY_ROCKCHIP_USB=m -CONFIG_PHY_EXYNOS_DP_VIDEO=m -CONFIG_PHY_EXYNOS_MIPI_VIDEO=m -# CONFIG_PHY_EXYNOS_PCIE is not set -CONFIG_PHY_SAMSUNG_USB2=m -CONFIG_PHY_EXYNOS4210_USB2=y -CONFIG_PHY_EXYNOS4X12_USB2=y -CONFIG_PHY_EXYNOS5250_USB2=y -CONFIG_PHY_EXYNOS5_USBDRD=m -CONFIG_PHY_EXYNOS5250_SATA=m -CONFIG_PHY_TEGRA_XUSB=m -# CONFIG_PHY_DM816X_USB is not set -CONFIG_OMAP_CONTROL_PHY=m -CONFIG_OMAP_USB2=m -CONFIG_TI_PIPE3=m -CONFIG_PHY_TUSB1210=m -CONFIG_TWL4030_USB=m -# CONFIG_POWERCAP is not set -# CONFIG_MCB is not set - -# -# Performance monitor support -# -# CONFIG_ARM_CCI_PMU is not set -# CONFIG_ARM_CCN is not set -CONFIG_ARM_PMU=y -CONFIG_RAS=y - -# -# Android -# -# CONFIG_ANDROID is not set -CONFIG_DAX=m -CONFIG_NVMEM=y -# CONFIG_NVMEM_IMX_IIM is not set -# CONFIG_NVMEM_IMX_OCOTP is not set -CONFIG_ROCKCHIP_EFUSE=m -CONFIG_NVMEM_SUNXI_SID=m -# CONFIG_NVMEM_SNVS_LPGPR is not set - -# -# HW tracing support -# -# CONFIG_STM is not set -# CONFIG_INTEL_TH is not set -# CONFIG_FPGA is not set -# CONFIG_FSI is not set -# CONFIG_TEE is not set -CONFIG_PM_OPP=y -# CONFIG_SIOX is not set -# CONFIG_SLIMBUS is not set - -# -# Firmware Drivers -# -CONFIG_ARM_PSCI_FW=y -CONFIG_ARM_SCMI_PROTOCOL=y -CONFIG_ARM_SCMI_POWER_DOMAIN=m -# CONFIG_ARM_SCPI_PROTOCOL is not set -# CONFIG_FIRMWARE_MEMMAP is not set -CONFIG_DMIID=y -CONFIG_DMI_SYSFS=y -CONFIG_RASPBERRYPI_FIRMWARE=y -CONFIG_HAVE_ARM_SMCCC=y -# CONFIG_GOOGLE_FIRMWARE is not set - -# -# EFI (Extensible Firmware Interface) Support -# -CONFIG_EFI_VARS=m -CONFIG_EFI_ESRT=y -CONFIG_EFI_PARAMS_FROM_FDT=y -CONFIG_EFI_RUNTIME_WRAPPERS=y -CONFIG_EFI_ARMSTUB=y -# CONFIG_EFI_BOOTLOADER_CONTROL is not set -# CONFIG_EFI_CAPSULE_LOADER is not set -# CONFIG_EFI_TEST is not set -CONFIG_RESET_ATTACK_MITIGATION=y - -# -# Tegra firmware driver -# -# CONFIG_TEGRA_IVC is not set - -# -# File systems -# -CONFIG_DCACHE_WORD_ACCESS=y -CONFIG_FS_IOMAP=y -# CONFIG_EXT2_FS is not set -# CONFIG_EXT3_FS is not set -CONFIG_EXT4_FS=y -CONFIG_EXT4_USE_FOR_EXT2=y -CONFIG_EXT4_FS_POSIX_ACL=y -CONFIG_EXT4_FS_SECURITY=y -# CONFIG_EXT4_ENCRYPTION is not set -# CONFIG_EXT4_DEBUG is not set -CONFIG_JBD2=y -# CONFIG_JBD2_DEBUG is not set -CONFIG_FS_MBCACHE=y -CONFIG_REISERFS_FS=m -# CONFIG_REISERFS_CHECK is not set -# CONFIG_REISERFS_PROC_INFO is not set -CONFIG_REISERFS_FS_XATTR=y -CONFIG_REISERFS_FS_POSIX_ACL=y -CONFIG_REISERFS_FS_SECURITY=y -CONFIG_JFS_FS=m -CONFIG_JFS_POSIX_ACL=y -CONFIG_JFS_SECURITY=y -# CONFIG_JFS_DEBUG is not set -# CONFIG_JFS_STATISTICS is not set -CONFIG_XFS_FS=m -CONFIG_XFS_QUOTA=y -CONFIG_XFS_POSIX_ACL=y -CONFIG_XFS_RT=y -# CONFIG_XFS_ONLINE_SCRUB is not set -# CONFIG_XFS_WARN is not set -# CONFIG_XFS_DEBUG is not set -CONFIG_GFS2_FS=m -CONFIG_GFS2_FS_LOCKING_DLM=y -CONFIG_OCFS2_FS=m -CONFIG_OCFS2_FS_O2CB=m -CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m -CONFIG_OCFS2_FS_STATS=y -CONFIG_OCFS2_DEBUG_MASKLOG=y -# CONFIG_OCFS2_DEBUG_FS is not set -CONFIG_BTRFS_FS=m -CONFIG_BTRFS_FS_POSIX_ACL=y -# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set -# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set -# CONFIG_BTRFS_DEBUG is not set -# CONFIG_BTRFS_ASSERT is not set -# CONFIG_BTRFS_FS_REF_VERIFY is not set -CONFIG_NILFS2_FS=m -CONFIG_F2FS_FS=m -CONFIG_F2FS_STAT_FS=y -CONFIG_F2FS_FS_XATTR=y -CONFIG_F2FS_FS_POSIX_ACL=y -CONFIG_F2FS_FS_SECURITY=y -# CONFIG_F2FS_CHECK_FS is not set -CONFIG_F2FS_FS_ENCRYPTION=y -# CONFIG_F2FS_IO_TRACE is not set -# CONFIG_F2FS_FAULT_INJECTION is not set -CONFIG_FS_POSIX_ACL=y -CONFIG_EXPORTFS=y -CONFIG_EXPORTFS_BLOCK_OPS=y -CONFIG_FILE_LOCKING=y -CONFIG_MANDATORY_FILE_LOCKING=y -CONFIG_FS_ENCRYPTION=m -CONFIG_FSNOTIFY=y -CONFIG_DNOTIFY=y -CONFIG_INOTIFY_USER=y -CONFIG_FANOTIFY=y -CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y -CONFIG_QUOTA=y -CONFIG_QUOTA_NETLINK_INTERFACE=y -CONFIG_PRINT_QUOTA_WARNING=y -# CONFIG_QUOTA_DEBUG is not set -CONFIG_QUOTA_TREE=m -CONFIG_QFMT_V1=m -CONFIG_QFMT_V2=m -CONFIG_QUOTACTL=y -CONFIG_AUTOFS4_FS=m -CONFIG_AUTOFS_FS=m -CONFIG_FUSE_FS=m -CONFIG_CUSE=m -CONFIG_OVERLAY_FS=m -# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set -# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set -# CONFIG_OVERLAY_FS_INDEX is not set -# CONFIG_OVERLAY_FS_XINO_AUTO is not set - -# -# Caches -# -CONFIG_FSCACHE=m -CONFIG_FSCACHE_STATS=y -# CONFIG_FSCACHE_HISTOGRAM is not set -# CONFIG_FSCACHE_DEBUG is not set -# CONFIG_FSCACHE_OBJECT_LIST is not set -CONFIG_CACHEFILES=m -# CONFIG_CACHEFILES_DEBUG is not set -# CONFIG_CACHEFILES_HISTOGRAM is not set - -# -# CD-ROM/DVD Filesystems -# -CONFIG_ISO9660_FS=m -CONFIG_JOLIET=y -CONFIG_ZISOFS=y -CONFIG_UDF_FS=m - -# -# DOS/FAT/NT Filesystems -# -CONFIG_FAT_FS=y -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=y -CONFIG_FAT_DEFAULT_CODEPAGE=437 -CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" -# CONFIG_FAT_DEFAULT_UTF8 is not set -CONFIG_NTFS_FS=m -# CONFIG_NTFS_DEBUG is not set -# CONFIG_NTFS_RW is not set - -# -# Pseudo filesystems -# -CONFIG_PROC_FS=y -CONFIG_PROC_SYSCTL=y -CONFIG_PROC_PAGE_MONITOR=y -CONFIG_PROC_CHILDREN=y -CONFIG_KERNFS=y -CONFIG_SYSFS=y -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y -CONFIG_TMPFS_XATTR=y -CONFIG_MEMFD_CREATE=y -CONFIG_CONFIGFS_FS=m -CONFIG_EFIVAR_FS=m -CONFIG_MISC_FILESYSTEMS=y -# CONFIG_ORANGEFS_FS is not set -CONFIG_ADFS_FS=m -# CONFIG_ADFS_FS_RW is not set -CONFIG_AFFS_FS=m -CONFIG_ECRYPT_FS=m -CONFIG_ECRYPT_FS_MESSAGING=y -CONFIG_HFS_FS=m -CONFIG_HFSPLUS_FS=m -# CONFIG_HFSPLUS_FS_POSIX_ACL is not set -CONFIG_BEFS_FS=m -# CONFIG_BEFS_DEBUG is not set -CONFIG_BFS_FS=m -CONFIG_EFS_FS=m -CONFIG_JFFS2_FS=m -CONFIG_JFFS2_FS_DEBUG=0 -CONFIG_JFFS2_FS_WRITEBUFFER=y -# CONFIG_JFFS2_FS_WBUF_VERIFY is not set -CONFIG_JFFS2_SUMMARY=y -CONFIG_JFFS2_FS_XATTR=y -CONFIG_JFFS2_FS_POSIX_ACL=y -CONFIG_JFFS2_FS_SECURITY=y -CONFIG_JFFS2_COMPRESSION_OPTIONS=y -CONFIG_JFFS2_ZLIB=y -CONFIG_JFFS2_LZO=y -CONFIG_JFFS2_RTIME=y -# CONFIG_JFFS2_RUBIN is not set -# CONFIG_JFFS2_CMODE_NONE is not set -CONFIG_JFFS2_CMODE_PRIORITY=y -# CONFIG_JFFS2_CMODE_SIZE is not set -# CONFIG_JFFS2_CMODE_FAVOURLZO is not set -CONFIG_UBIFS_FS=m -CONFIG_UBIFS_FS_ADVANCED_COMPR=y -CONFIG_UBIFS_FS_LZO=y -CONFIG_UBIFS_FS_ZLIB=y -# CONFIG_UBIFS_ATIME_SUPPORT is not set -# CONFIG_UBIFS_FS_ENCRYPTION is not set -CONFIG_UBIFS_FS_SECURITY=y -# CONFIG_CRAMFS is not set -CONFIG_SQUASHFS=m -CONFIG_SQUASHFS_FILE_CACHE=y -# CONFIG_SQUASHFS_FILE_DIRECT is not set -CONFIG_SQUASHFS_DECOMP_SINGLE=y -# CONFIG_SQUASHFS_DECOMP_MULTI is not set -# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set -CONFIG_SQUASHFS_XATTR=y -CONFIG_SQUASHFS_ZLIB=y -# CONFIG_SQUASHFS_LZ4 is not set -CONFIG_SQUASHFS_LZO=y -CONFIG_SQUASHFS_XZ=y -# CONFIG_SQUASHFS_ZSTD is not set -# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set -# CONFIG_SQUASHFS_EMBEDDED is not set -CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 -CONFIG_VXFS_FS=m -CONFIG_MINIX_FS=m -CONFIG_OMFS_FS=m -CONFIG_HPFS_FS=m -CONFIG_QNX4FS_FS=m -CONFIG_QNX6FS_FS=m -# CONFIG_QNX6FS_DEBUG is not set -CONFIG_ROMFS_FS=m -# CONFIG_ROMFS_BACKED_BY_BLOCK is not set -# CONFIG_ROMFS_BACKED_BY_MTD is not set -CONFIG_ROMFS_BACKED_BY_BOTH=y -CONFIG_ROMFS_ON_BLOCK=y -CONFIG_ROMFS_ON_MTD=y -# CONFIG_PSTORE is not set -CONFIG_SYSV_FS=m -CONFIG_UFS_FS=m -# CONFIG_UFS_FS_WRITE is not set -# CONFIG_UFS_DEBUG is not set -CONFIG_EXOFS_FS=m -# CONFIG_EXOFS_DEBUG is not set -CONFIG_ORE=m -CONFIG_NETWORK_FILESYSTEMS=y -CONFIG_NFS_FS=m -CONFIG_NFS_V2=m -CONFIG_NFS_V3=m -CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=m -CONFIG_NFS_SWAP=y -CONFIG_NFS_V4_1=y -CONFIG_NFS_V4_2=y -CONFIG_PNFS_FILE_LAYOUT=m -CONFIG_PNFS_BLOCK=m -CONFIG_PNFS_FLEXFILE_LAYOUT=m -CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" -# CONFIG_NFS_V4_1_MIGRATION is not set -CONFIG_NFS_V4_SECURITY_LABEL=y -CONFIG_NFS_FSCACHE=y -# CONFIG_NFS_USE_LEGACY_DNS is not set -CONFIG_NFS_USE_KERNEL_DNS=y -CONFIG_NFS_DEBUG=y -CONFIG_NFSD=m -CONFIG_NFSD_V2_ACL=y -CONFIG_NFSD_V3=y -CONFIG_NFSD_V3_ACL=y -CONFIG_NFSD_V4=y -CONFIG_NFSD_PNFS=y -CONFIG_NFSD_BLOCKLAYOUT=y -# CONFIG_NFSD_SCSILAYOUT is not set -# CONFIG_NFSD_FLEXFILELAYOUT is not set -CONFIG_NFSD_V4_SECURITY_LABEL=y -# CONFIG_NFSD_FAULT_INJECTION is not set -CONFIG_GRACE_PERIOD=m -CONFIG_LOCKD=m -CONFIG_LOCKD_V4=y -CONFIG_NFS_ACL_SUPPORT=m -CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=m -CONFIG_SUNRPC_GSS=m -CONFIG_SUNRPC_BACKCHANNEL=y -CONFIG_SUNRPC_SWAP=y -CONFIG_RPCSEC_GSS_KRB5=m -CONFIG_SUNRPC_DEBUG=y -CONFIG_SUNRPC_XPRT_RDMA=m -CONFIG_CEPH_FS=m -CONFIG_CEPH_FSCACHE=y -CONFIG_CEPH_FS_POSIX_ACL=y -CONFIG_CIFS=m -# CONFIG_CIFS_STATS is not set -CONFIG_CIFS_WEAK_PW_HASH=y -CONFIG_CIFS_UPCALL=y -CONFIG_CIFS_XATTR=y -CONFIG_CIFS_POSIX=y -CONFIG_CIFS_ACL=y -CONFIG_CIFS_DEBUG=y -# CONFIG_CIFS_DEBUG2 is not set -# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set -CONFIG_CIFS_DFS_UPCALL=y -# CONFIG_CIFS_SMB311 is not set -# CONFIG_CIFS_SMB_DIRECT is not set -CONFIG_CIFS_FSCACHE=y -CONFIG_CODA_FS=m -CONFIG_AFS_FS=m -# CONFIG_AFS_DEBUG is not set -CONFIG_AFS_FSCACHE=y -CONFIG_9P_FS=m -CONFIG_9P_FSCACHE=y -CONFIG_9P_FS_POSIX_ACL=y -CONFIG_9P_FS_SECURITY=y -CONFIG_NLS=y -CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_737=m -CONFIG_NLS_CODEPAGE_775=m -CONFIG_NLS_CODEPAGE_850=m -CONFIG_NLS_CODEPAGE_852=m -CONFIG_NLS_CODEPAGE_855=m -CONFIG_NLS_CODEPAGE_857=m -CONFIG_NLS_CODEPAGE_860=m -CONFIG_NLS_CODEPAGE_861=m -CONFIG_NLS_CODEPAGE_862=m -CONFIG_NLS_CODEPAGE_863=m -CONFIG_NLS_CODEPAGE_864=m -CONFIG_NLS_CODEPAGE_865=m -CONFIG_NLS_CODEPAGE_866=m -CONFIG_NLS_CODEPAGE_869=m -CONFIG_NLS_CODEPAGE_936=m -CONFIG_NLS_CODEPAGE_950=m -CONFIG_NLS_CODEPAGE_932=m -CONFIG_NLS_CODEPAGE_949=m -CONFIG_NLS_CODEPAGE_874=m -CONFIG_NLS_ISO8859_8=m -CONFIG_NLS_CODEPAGE_1250=m -CONFIG_NLS_CODEPAGE_1251=m -CONFIG_NLS_ASCII=m -CONFIG_NLS_ISO8859_1=m -CONFIG_NLS_ISO8859_2=m -CONFIG_NLS_ISO8859_3=m -CONFIG_NLS_ISO8859_4=m -CONFIG_NLS_ISO8859_5=m -CONFIG_NLS_ISO8859_6=m -CONFIG_NLS_ISO8859_7=m -CONFIG_NLS_ISO8859_9=m -CONFIG_NLS_ISO8859_13=m -CONFIG_NLS_ISO8859_14=m -CONFIG_NLS_ISO8859_15=m -CONFIG_NLS_KOI8_R=m -CONFIG_NLS_KOI8_U=m -CONFIG_NLS_MAC_ROMAN=m -CONFIG_NLS_MAC_CELTIC=m -CONFIG_NLS_MAC_CENTEURO=m -CONFIG_NLS_MAC_CROATIAN=m -CONFIG_NLS_MAC_CYRILLIC=m -CONFIG_NLS_MAC_GAELIC=m -CONFIG_NLS_MAC_GREEK=m -CONFIG_NLS_MAC_ICELAND=m -CONFIG_NLS_MAC_INUIT=m -CONFIG_NLS_MAC_ROMANIAN=m -CONFIG_NLS_MAC_TURKISH=m -CONFIG_NLS_UTF8=m -CONFIG_DLM=m -CONFIG_DLM_DEBUG=y - -# -# Kernel hacking -# - -# -# printk and dmesg options -# -CONFIG_PRINTK_TIME=y -CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 -CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 -CONFIG_BOOT_PRINTK_DELAY=y -CONFIG_DYNAMIC_DEBUG=y - -# -# Compile-time checks and compiler options -# -CONFIG_DEBUG_INFO=y -# CONFIG_DEBUG_INFO_REDUCED is not set -# CONFIG_DEBUG_INFO_SPLIT is not set -# CONFIG_DEBUG_INFO_DWARF4 is not set -# CONFIG_GDB_SCRIPTS is not set -CONFIG_ENABLE_WARN_DEPRECATED=y -CONFIG_ENABLE_MUST_CHECK=y -CONFIG_FRAME_WARN=1024 -CONFIG_STRIP_ASM_SYMS=y -# CONFIG_READABLE_ASM is not set -# CONFIG_UNUSED_SYMBOLS is not set -# CONFIG_PAGE_OWNER is not set -CONFIG_DEBUG_FS=y -# CONFIG_HEADERS_CHECK is not set -# CONFIG_DEBUG_SECTION_MISMATCH is not set -CONFIG_SECTION_MISMATCH_WARN_ONLY=y -CONFIG_FRAME_POINTER=y -# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set -CONFIG_MAGIC_SYSRQ=y -CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01b6 -CONFIG_MAGIC_SYSRQ_SERIAL=y -CONFIG_DEBUG_KERNEL=y - -# -# Memory Debugging -# -CONFIG_PAGE_EXTENSION=y -CONFIG_PAGE_POISONING=y -CONFIG_PAGE_POISONING_NO_SANITY=y -# CONFIG_PAGE_POISONING_ZERO is not set -# CONFIG_DEBUG_PAGE_REF is not set -# CONFIG_DEBUG_RODATA_TEST is not set -# CONFIG_DEBUG_OBJECTS is not set -# CONFIG_DEBUG_SLAB is not set -CONFIG_HAVE_DEBUG_KMEMLEAK=y -# CONFIG_DEBUG_KMEMLEAK is not set -# CONFIG_DEBUG_STACK_USAGE is not set -# CONFIG_DEBUG_VM is not set -CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y -# CONFIG_DEBUG_VIRTUAL is not set -CONFIG_DEBUG_MEMORY_INIT=y -# CONFIG_DEBUG_PER_CPU_MAPS is not set -# CONFIG_DEBUG_HIGHMEM is not set -CONFIG_ARCH_HAS_KCOV=y -CONFIG_CC_HAS_SANCOV_TRACE_PC=y -# CONFIG_KCOV is not set -# CONFIG_DEBUG_SHIRQ is not set - -# -# Debug Lockups and Hangs -# -CONFIG_LOCKUP_DETECTOR=y -CONFIG_SOFTLOCKUP_DETECTOR=y -# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set -CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 -CONFIG_DETECT_HUNG_TASK=y -CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 -# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set -CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 -# CONFIG_WQ_WATCHDOG is not set -# CONFIG_PANIC_ON_OOPS is not set -CONFIG_PANIC_ON_OOPS_VALUE=0 -CONFIG_PANIC_TIMEOUT=0 -CONFIG_SCHED_DEBUG=y -CONFIG_SCHED_INFO=y -CONFIG_SCHEDSTATS=y -CONFIG_SCHED_STACK_END_CHECK=y -# CONFIG_DEBUG_TIMEKEEPING is not set - -# -# Lock Debugging (spinlocks, mutexes, etc...) -# -CONFIG_LOCK_DEBUGGING_SUPPORT=y -# CONFIG_PROVE_LOCKING is not set -# CONFIG_LOCK_STAT is not set -# CONFIG_DEBUG_RT_MUTEXES is not set -# CONFIG_DEBUG_SPINLOCK is not set -# CONFIG_DEBUG_MUTEXES is not set -# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set -# CONFIG_DEBUG_RWSEMS is not set -# CONFIG_DEBUG_LOCK_ALLOC is not set -# CONFIG_DEBUG_ATOMIC_SLEEP is not set -# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set -# CONFIG_LOCK_TORTURE_TEST is not set -# CONFIG_WW_MUTEX_SELFTEST is not set -CONFIG_STACKTRACE=y -# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set -# CONFIG_DEBUG_KOBJECT is not set -CONFIG_DEBUG_BUGVERBOSE=y -CONFIG_DEBUG_LIST=y -# CONFIG_DEBUG_PI_LIST is not set -# CONFIG_DEBUG_SG is not set -# CONFIG_DEBUG_NOTIFIERS is not set -# CONFIG_DEBUG_CREDENTIALS is not set - -# -# RCU Debugging -# -# CONFIG_RCU_PERF_TEST is not set -# CONFIG_RCU_TORTURE_TEST is not set -CONFIG_RCU_CPU_STALL_TIMEOUT=21 -# CONFIG_RCU_TRACE is not set -# CONFIG_RCU_EQS_DEBUG is not set -# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set -# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set -# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set -CONFIG_NOTIFIER_ERROR_INJECTION=m -CONFIG_PM_NOTIFIER_ERROR_INJECT=m -# CONFIG_OF_RECONFIG_NOTIFIER_ERROR_INJECT is not set -# CONFIG_NETDEV_NOTIFIER_ERROR_INJECT is not set -# CONFIG_FAULT_INJECTION is not set -# CONFIG_LATENCYTOP is not set -CONFIG_NOP_TRACER=y -CONFIG_HAVE_FUNCTION_TRACER=y -CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y -CONFIG_HAVE_DYNAMIC_FTRACE=y -CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y -CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y -CONFIG_HAVE_SYSCALL_TRACEPOINTS=y -CONFIG_HAVE_C_RECORDMCOUNT=y -CONFIG_TRACER_MAX_TRACE=y -CONFIG_TRACE_CLOCK=y -CONFIG_RING_BUFFER=y -CONFIG_EVENT_TRACING=y -CONFIG_CONTEXT_SWITCH_TRACER=y -CONFIG_RING_BUFFER_ALLOW_SWAP=y -CONFIG_TRACING=y -CONFIG_GENERIC_TRACER=y -CONFIG_TRACING_SUPPORT=y -CONFIG_FTRACE=y -CONFIG_FUNCTION_TRACER=y -CONFIG_FUNCTION_GRAPH_TRACER=y -# CONFIG_PREEMPTIRQ_EVENTS is not set -# CONFIG_IRQSOFF_TRACER is not set -# CONFIG_SCHED_TRACER is not set -# CONFIG_HWLAT_TRACER is not set -CONFIG_FTRACE_SYSCALLS=y -CONFIG_TRACER_SNAPSHOT=y -# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set -CONFIG_BRANCH_PROFILE_NONE=y -# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set -CONFIG_STACK_TRACER=y -CONFIG_BLK_DEV_IO_TRACE=y -CONFIG_KPROBE_EVENTS=y -CONFIG_UPROBE_EVENTS=y -CONFIG_BPF_EVENTS=y -CONFIG_PROBE_EVENTS=y -CONFIG_DYNAMIC_FTRACE=y -CONFIG_DYNAMIC_FTRACE_WITH_REGS=y -# CONFIG_FUNCTION_PROFILER is not set -CONFIG_FTRACE_MCOUNT_RECORD=y -# CONFIG_FTRACE_STARTUP_TEST is not set -# CONFIG_TRACEPOINT_BENCHMARK is not set -# CONFIG_RING_BUFFER_BENCHMARK is not set -# CONFIG_RING_BUFFER_STARTUP_TEST is not set -# CONFIG_TRACE_EVAL_MAP_FILE is not set -CONFIG_TRACING_EVENTS_GPIO=y -# CONFIG_DMA_API_DEBUG is not set -CONFIG_RUNTIME_TESTING_MENU=y -# CONFIG_LKDTM is not set -# CONFIG_TEST_LIST_SORT is not set -# CONFIG_TEST_SORT is not set -# CONFIG_KPROBES_SANITY_TEST is not set -# CONFIG_BACKTRACE_SELF_TEST is not set -# CONFIG_RBTREE_TEST is not set -# CONFIG_INTERVAL_TREE_TEST is not set -# CONFIG_PERCPU_TEST is not set -# CONFIG_ATOMIC64_SELFTEST is not set -# CONFIG_ASYNC_RAID6_TEST is not set -# CONFIG_TEST_HEXDUMP is not set -# CONFIG_TEST_STRING_HELPERS is not set -# CONFIG_TEST_KSTRTOX is not set -# CONFIG_TEST_PRINTF is not set -# CONFIG_TEST_BITMAP is not set -# CONFIG_TEST_UUID is not set -# CONFIG_TEST_OVERFLOW is not set -# CONFIG_TEST_RHASHTABLE is not set -# CONFIG_TEST_HASH is not set -# CONFIG_TEST_LKM is not set -CONFIG_TEST_USER_COPY=m -CONFIG_TEST_BPF=m -CONFIG_FIND_BIT_BENCHMARK=m -CONFIG_TEST_FIRMWARE=m -# CONFIG_TEST_SYSCTL is not set -# CONFIG_TEST_UDELAY is not set -CONFIG_TEST_STATIC_KEYS=m -# CONFIG_TEST_KMOD is not set -# CONFIG_MEMTEST is not set -CONFIG_BUG_ON_DATA_CORRUPTION=y -# CONFIG_SAMPLES is not set -CONFIG_HAVE_ARCH_KGDB=y -# CONFIG_KGDB is not set -# CONFIG_UBSAN is not set -CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y -CONFIG_STRICT_DEVMEM=y -CONFIG_IO_STRICT_DEVMEM=y -CONFIG_ARM_PTDUMP_CORE=y -# CONFIG_ARM_PTDUMP_DEBUGFS is not set -CONFIG_DEBUG_WX=y -CONFIG_ARM_UNWIND=y -CONFIG_OLD_MCOUNT=y -# CONFIG_DEBUG_USER is not set -# CONFIG_DEBUG_LL is not set -CONFIG_DEBUG_IMX_UART_PORT=1 -CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" -CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" -# CONFIG_ARM_KPROBES_TEST is not set -# CONFIG_PID_IN_CONTEXTIDR is not set -# CONFIG_CORESIGHT is not set - -# -# Security options -# -CONFIG_KEYS=y -# CONFIG_PERSISTENT_KEYRINGS is not set -# CONFIG_BIG_KEYS is not set -# CONFIG_TRUSTED_KEYS is not set -# CONFIG_ENCRYPTED_KEYS is not set -# CONFIG_KEY_DH_OPERATIONS is not set -CONFIG_SECURITY_DMESG_RESTRICT=y -CONFIG_SECURITY=y -CONFIG_SECURITYFS=y -CONFIG_SECURITY_NETWORK=y -# CONFIG_SECURITY_INFINIBAND is not set -CONFIG_SECURITY_NETWORK_XFRM=y -CONFIG_SECURITY_PATH=y -CONFIG_LSM_MMAP_MIN_ADDR=32768 -CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y -CONFIG_HARDENED_USERCOPY=y -CONFIG_HARDENED_USERCOPY_FALLBACK=y -# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set -CONFIG_FORTIFY_SOURCE=y -# CONFIG_STATIC_USERMODEHELPER is not set -CONFIG_SECURITY_SELINUX=y -# CONFIG_SECURITY_SELINUX_BOOTPARAM is not set -# CONFIG_SECURITY_SELINUX_DISABLE is not set -CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_AVC_STATS=y -CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0 -# CONFIG_SECURITY_SMACK is not set -CONFIG_SECURITY_TOMOYO=y -CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048 -CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024 -# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set -CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init" -CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init" -CONFIG_SECURITY_APPARMOR=y -CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1 -CONFIG_SECURITY_APPARMOR_HASH=y -CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y -# CONFIG_SECURITY_APPARMOR_DEBUG is not set -# CONFIG_SECURITY_LOADPIN is not set -CONFIG_SECURITY_YAMA=y -CONFIG_INTEGRITY=y -CONFIG_INTEGRITY_SIGNATURE=y -CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y -CONFIG_INTEGRITY_TRUSTED_KEYRING=y -CONFIG_INTEGRITY_AUDIT=y -CONFIG_IMA=y -CONFIG_IMA_MEASURE_PCR_IDX=10 -CONFIG_IMA_LSM_RULES=y -# CONFIG_IMA_TEMPLATE is not set -CONFIG_IMA_NG_TEMPLATE=y -# CONFIG_IMA_SIG_TEMPLATE is not set -CONFIG_IMA_DEFAULT_TEMPLATE="ima-ng" -# CONFIG_IMA_DEFAULT_HASH_SHA1 is not set -CONFIG_IMA_DEFAULT_HASH_SHA256=y -CONFIG_IMA_DEFAULT_HASH="sha256" -# CONFIG_IMA_WRITE_POLICY is not set -# CONFIG_IMA_READ_POLICY is not set -CONFIG_IMA_APPRAISE=y -CONFIG_IMA_APPRAISE_BOOTPARAM=y -CONFIG_IMA_TRUSTED_KEYRING=y -# CONFIG_IMA_BLACKLIST_KEYRING is not set -# CONFIG_IMA_LOAD_X509 is not set -# CONFIG_EVM is not set -# CONFIG_DEFAULT_SECURITY_SELINUX is not set -# CONFIG_DEFAULT_SECURITY_TOMOYO is not set -CONFIG_DEFAULT_SECURITY_APPARMOR=y -# CONFIG_DEFAULT_SECURITY_DAC is not set -CONFIG_DEFAULT_SECURITY="apparmor" -CONFIG_XOR_BLOCKS=m -CONFIG_ASYNC_CORE=m -CONFIG_ASYNC_MEMCPY=m -CONFIG_ASYNC_XOR=m -CONFIG_ASYNC_PQ=m -CONFIG_ASYNC_RAID6_RECOV=m -CONFIG_CRYPTO=y - -# -# Crypto core or helper -# -CONFIG_CRYPTO_ALGAPI=y -CONFIG_CRYPTO_ALGAPI2=y -CONFIG_CRYPTO_AEAD=m -CONFIG_CRYPTO_AEAD2=y -CONFIG_CRYPTO_BLKCIPHER=m -CONFIG_CRYPTO_BLKCIPHER2=y -CONFIG_CRYPTO_HASH=y -CONFIG_CRYPTO_HASH2=y -CONFIG_CRYPTO_RNG=m -CONFIG_CRYPTO_RNG2=y -CONFIG_CRYPTO_RNG_DEFAULT=m -CONFIG_CRYPTO_AKCIPHER2=y -CONFIG_CRYPTO_AKCIPHER=y -CONFIG_CRYPTO_KPP2=y -CONFIG_CRYPTO_KPP=m -CONFIG_CRYPTO_ACOMP2=y -CONFIG_CRYPTO_RSA=y -# CONFIG_CRYPTO_DH is not set -CONFIG_CRYPTO_ECDH=m -CONFIG_CRYPTO_MANAGER=y -CONFIG_CRYPTO_MANAGER2=y -CONFIG_CRYPTO_USER=m -# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set -CONFIG_CRYPTO_GF128MUL=m -CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_NULL2=y -CONFIG_CRYPTO_PCRYPT=m -CONFIG_CRYPTO_WORKQUEUE=y -# CONFIG_CRYPTO_CRYPTD is not set -# CONFIG_CRYPTO_MCRYPTD is not set -CONFIG_CRYPTO_AUTHENC=m -CONFIG_CRYPTO_TEST=m -CONFIG_CRYPTO_ENGINE=m - -# -# Authenticated Encryption with Associated Data -# -CONFIG_CRYPTO_CCM=m -CONFIG_CRYPTO_GCM=m -CONFIG_CRYPTO_CHACHA20POLY1305=m -CONFIG_CRYPTO_AEGIS128=m -CONFIG_CRYPTO_AEGIS128L=m -CONFIG_CRYPTO_AEGIS256=m -CONFIG_CRYPTO_MORUS640=m -CONFIG_CRYPTO_MORUS1280=m -CONFIG_CRYPTO_SEQIV=m -CONFIG_CRYPTO_ECHAINIV=m - -# -# Block modes -# -CONFIG_CRYPTO_CBC=m -CONFIG_CRYPTO_CFB=m -CONFIG_CRYPTO_CTR=m -CONFIG_CRYPTO_CTS=m -CONFIG_CRYPTO_ECB=m -CONFIG_CRYPTO_LRW=m -CONFIG_CRYPTO_PCBC=m -CONFIG_CRYPTO_XTS=m -# CONFIG_CRYPTO_KEYWRAP is not set - -# -# Hash modes -# -CONFIG_CRYPTO_CMAC=m -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_XCBC=m -CONFIG_CRYPTO_VMAC=m - -# -# Digest -# -CONFIG_CRYPTO_CRC32C=y -CONFIG_CRYPTO_CRC32=m -CONFIG_CRYPTO_CRCT10DIF=y -CONFIG_CRYPTO_GHASH=m -CONFIG_CRYPTO_POLY1305=m -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=y -CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_RMD128=m -CONFIG_CRYPTO_RMD160=m -CONFIG_CRYPTO_RMD256=m -CONFIG_CRYPTO_RMD320=m -CONFIG_CRYPTO_SHA1=y -CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_SHA512=m -# CONFIG_CRYPTO_SHA3 is not set -# CONFIG_CRYPTO_SM3 is not set -CONFIG_CRYPTO_TGR192=m -CONFIG_CRYPTO_WP512=m - -# -# Ciphers -# -CONFIG_CRYPTO_AES=y -# CONFIG_CRYPTO_AES_TI is not set -CONFIG_CRYPTO_ANUBIS=m -CONFIG_CRYPTO_ARC4=m -CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_BLOWFISH_COMMON=m -CONFIG_CRYPTO_CAMELLIA=m -CONFIG_CRYPTO_CAST_COMMON=m -CONFIG_CRYPTO_CAST5=m -CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_DES=m -CONFIG_CRYPTO_FCRYPT=m -CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_SALSA20=m -CONFIG_CRYPTO_CHACHA20=m -CONFIG_CRYPTO_SEED=m -CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_SM4=m -CONFIG_CRYPTO_SPECK=m -CONFIG_CRYPTO_TEA=m -CONFIG_CRYPTO_TWOFISH=m -CONFIG_CRYPTO_TWOFISH_COMMON=m - -# -# Compression -# -CONFIG_CRYPTO_DEFLATE=m -CONFIG_CRYPTO_LZO=y -# CONFIG_CRYPTO_842 is not set -CONFIG_CRYPTO_LZ4=m -CONFIG_CRYPTO_LZ4HC=m -CONFIG_CRYPTO_ZSTD=m - -# -# Random Number Generation -# -CONFIG_CRYPTO_ANSI_CPRNG=m -CONFIG_CRYPTO_DRBG_MENU=m -CONFIG_CRYPTO_DRBG_HMAC=y -# CONFIG_CRYPTO_DRBG_HASH is not set -# CONFIG_CRYPTO_DRBG_CTR is not set -CONFIG_CRYPTO_DRBG=m -CONFIG_CRYPTO_JITTERENTROPY=m -CONFIG_CRYPTO_USER_API=m -CONFIG_CRYPTO_USER_API_HASH=m -CONFIG_CRYPTO_USER_API_SKCIPHER=m -CONFIG_CRYPTO_USER_API_RNG=m -CONFIG_CRYPTO_USER_API_AEAD=m -CONFIG_CRYPTO_HASH_INFO=y -CONFIG_CRYPTO_HW=y -CONFIG_CRYPTO_DEV_MARVELL_CESA=m -# CONFIG_CRYPTO_DEV_FSL_CAAM is not set -# CONFIG_CRYPTO_DEV_OMAP is not set -# CONFIG_CRYPTO_DEV_SAHARA is not set -# CONFIG_CRYPTO_DEV_MXC_SCC is not set -# CONFIG_CRYPTO_DEV_EXYNOS_RNG is not set -# CONFIG_CRYPTO_DEV_S5P is not set -# CONFIG_CRYPTO_DEV_MXS_DCP is not set -CONFIG_CRYPTO_DEV_SUN4I_SS=m -# CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG is not set -# CONFIG_CRYPTO_DEV_ROCKCHIP is not set -CONFIG_CRYPTO_DEV_CHELSIO=m -CONFIG_CRYPTO_DEV_VIRTIO=m -# CONFIG_CRYPTO_DEV_CCREE is not set -CONFIG_ASYMMETRIC_KEY_TYPE=y -CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y -CONFIG_X509_CERTIFICATE_PARSER=y -CONFIG_PKCS7_MESSAGE_PARSER=y -# CONFIG_PKCS7_TEST_KEY is not set -# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set - -# -# Certificates for signature checking -# -CONFIG_SYSTEM_TRUSTED_KEYRING=y -CONFIG_SYSTEM_TRUSTED_KEYS="" -# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set -# CONFIG_SECONDARY_TRUSTED_KEYRING is not set -# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set -# CONFIG_ARM_CRYPTO is not set -CONFIG_BINARY_PRINTF=y - -# -# Library routines -# -CONFIG_RAID6_PQ=m -CONFIG_BITREVERSE=y -CONFIG_HAVE_ARCH_BITREVERSE=y -CONFIG_RATIONAL=y -CONFIG_GENERIC_STRNCPY_FROM_USER=y -CONFIG_GENERIC_STRNLEN_USER=y -CONFIG_GENERIC_NET_UTILS=y -CONFIG_GENERIC_PCI_IOMAP=y -CONFIG_STMP_DEVICE=y -CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y -CONFIG_CRC_CCITT=m -CONFIG_CRC16=y -CONFIG_CRC_T10DIF=y -CONFIG_CRC_ITU_T=m -CONFIG_CRC32=y -# CONFIG_CRC32_SELFTEST is not set -CONFIG_CRC32_SLICEBY8=y -# CONFIG_CRC32_SLICEBY4 is not set -# CONFIG_CRC32_SARWATE is not set -# CONFIG_CRC32_BIT is not set -# CONFIG_CRC4 is not set -CONFIG_CRC7=m -CONFIG_LIBCRC32C=m -CONFIG_CRC8=m -CONFIG_XXHASH=m -CONFIG_AUDIT_GENERIC=y -# CONFIG_RANDOM32_SELFTEST is not set -CONFIG_ZLIB_INFLATE=y -CONFIG_ZLIB_DEFLATE=m -CONFIG_LZO_COMPRESS=y -CONFIG_LZO_DECOMPRESS=y -CONFIG_LZ4_COMPRESS=m -CONFIG_LZ4HC_COMPRESS=m -CONFIG_LZ4_DECOMPRESS=y -CONFIG_ZSTD_COMPRESS=m -CONFIG_ZSTD_DECOMPRESS=m -CONFIG_XZ_DEC=y -# CONFIG_XZ_DEC_X86 is not set -# CONFIG_XZ_DEC_POWERPC is not set -# CONFIG_XZ_DEC_IA64 is not set -CONFIG_XZ_DEC_ARM=y -CONFIG_XZ_DEC_ARMTHUMB=y -# CONFIG_XZ_DEC_SPARC is not set -CONFIG_XZ_DEC_BCJ=y -# CONFIG_XZ_DEC_TEST is not set -CONFIG_DECOMPRESS_GZIP=y -CONFIG_DECOMPRESS_BZIP2=y -CONFIG_DECOMPRESS_LZMA=y -CONFIG_DECOMPRESS_XZ=y -CONFIG_DECOMPRESS_LZO=y -CONFIG_DECOMPRESS_LZ4=y -CONFIG_GENERIC_ALLOCATOR=y -CONFIG_REED_SOLOMON=m -CONFIG_REED_SOLOMON_DEC16=y -CONFIG_BCH=y -CONFIG_TEXTSEARCH=y -CONFIG_TEXTSEARCH_KMP=m -CONFIG_TEXTSEARCH_BM=m -CONFIG_TEXTSEARCH_FSM=m -CONFIG_ASSOCIATIVE_ARRAY=y -CONFIG_HAS_IOMEM=y -CONFIG_HAS_DMA=y -CONFIG_NEED_SG_DMA_LENGTH=y -CONFIG_NEED_DMA_MAP_STATE=y -CONFIG_ARCH_DMA_ADDR_T_64BIT=y -CONFIG_HAVE_GENERIC_DMA_COHERENT=y -CONFIG_DMA_DIRECT_OPS=y -CONFIG_DMA_VIRT_OPS=y -CONFIG_SWIOTLB=y -CONFIG_SGL_ALLOC=y -CONFIG_CHECK_SIGNATURE=y -CONFIG_CPU_RMAP=y -CONFIG_DQL=y -CONFIG_GLOB=y -# CONFIG_GLOB_SELFTEST is not set -CONFIG_NLATTR=y -CONFIG_LRU_CACHE=m -CONFIG_CLZ_TAB=y -CONFIG_CORDIC=m -CONFIG_DDR=y -CONFIG_IRQ_POLL=y -CONFIG_MPILIB=y -CONFIG_SIGNATURE=y -CONFIG_LIBFDT=y -CONFIG_OID_REGISTRY=y -CONFIG_UCS2_STRING=y -CONFIG_FONT_SUPPORT=y -# CONFIG_FONTS is not set -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y -CONFIG_SG_SPLIT=y -CONFIG_SG_POOL=y -CONFIG_ARCH_HAS_SG_CHAIN=y -CONFIG_SBITMAP=y -# CONFIG_STRING_SELFTEST is not set -# CONFIG_VIRTUALIZATION is not set diff --git a/gnu/packages/aux-files/linux-libre/4.18-arm64.conf b/gnu/packages/aux-files/linux-libre/4.18-arm64.conf deleted file mode 100644 index 64b14b52c0..0000000000 --- a/gnu/packages/aux-files/linux-libre/4.18-arm64.conf +++ /dev/null @@ -1,8169 +0,0 @@ -# -# Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.18.14-gnu Kernel Configuration -# -CONFIG_ARM64=y -CONFIG_64BIT=y -CONFIG_MMU=y -CONFIG_ARM64_PAGE_SHIFT=12 -CONFIG_ARM64_CONT_SHIFT=4 -CONFIG_ARCH_MMAP_RND_BITS_MIN=18 -CONFIG_ARCH_MMAP_RND_BITS_MAX=33 -CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11 -CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16 -CONFIG_STACKTRACE_SUPPORT=y -CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 -CONFIG_LOCKDEP_SUPPORT=y -CONFIG_TRACE_IRQFLAGS_SUPPORT=y -CONFIG_RWSEM_XCHGADD_ALGORITHM=y -CONFIG_GENERIC_BUG=y -CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y -CONFIG_GENERIC_HWEIGHT=y -CONFIG_GENERIC_CSUM=y -CONFIG_GENERIC_CALIBRATE_DELAY=y -CONFIG_ZONE_DMA32=y -CONFIG_HAVE_GENERIC_GUP=y -CONFIG_SMP=y -CONFIG_KERNEL_MODE_NEON=y -CONFIG_FIX_EARLYCON_MEM=y -CONFIG_PGTABLE_LEVELS=4 -CONFIG_ARCH_SUPPORTS_UPROBES=y -CONFIG_ARCH_PROC_KCORE_TEXT=y -CONFIG_MULTI_IRQ_HANDLER=y -CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=70300 -CONFIG_CLANG_VERSION=0 -CONFIG_IRQ_WORK=y -CONFIG_BUILDTIME_EXTABLE_SORT=y -CONFIG_THREAD_INFO_IN_TASK=y - -# -# General setup -# -CONFIG_INIT_ENV_ARG_LIMIT=32 -# CONFIG_COMPILE_TEST is not set -CONFIG_LOCALVERSION="" -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_DEFAULT_HOSTNAME="(none)" -CONFIG_SWAP=y -CONFIG_SYSVIPC=y -CONFIG_SYSVIPC_SYSCTL=y -CONFIG_POSIX_MQUEUE=y -CONFIG_POSIX_MQUEUE_SYSCTL=y -CONFIG_CROSS_MEMORY_ATTACH=y -# CONFIG_USELIB is not set -CONFIG_AUDIT=y -CONFIG_HAVE_ARCH_AUDITSYSCALL=y -CONFIG_AUDITSYSCALL=y -CONFIG_AUDIT_WATCH=y -CONFIG_AUDIT_TREE=y - -# -# IRQ subsystem -# -CONFIG_GENERIC_IRQ_PROBE=y -CONFIG_GENERIC_IRQ_SHOW=y -CONFIG_GENERIC_IRQ_SHOW_LEVEL=y -CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y -CONFIG_GENERIC_IRQ_MIGRATION=y -CONFIG_HARDIRQS_SW_RESEND=y -CONFIG_GENERIC_IRQ_CHIP=y -CONFIG_IRQ_DOMAIN=y -CONFIG_IRQ_DOMAIN_HIERARCHY=y -CONFIG_GENERIC_MSI_IRQ=y -CONFIG_GENERIC_MSI_IRQ_DOMAIN=y -CONFIG_HANDLE_DOMAIN_IRQ=y -CONFIG_IRQ_FORCED_THREADING=y -CONFIG_SPARSE_IRQ=y -# CONFIG_GENERIC_IRQ_DEBUGFS is not set -CONFIG_ARCH_CLOCKSOURCE_DATA=y -CONFIG_GENERIC_TIME_VSYSCALL=y -CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_ARCH_HAS_TICK_BROADCAST=y -CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y - -# -# Timers subsystem -# -CONFIG_TICK_ONESHOT=y -CONFIG_NO_HZ_COMMON=y -# CONFIG_HZ_PERIODIC is not set -CONFIG_NO_HZ_IDLE=y -# CONFIG_NO_HZ_FULL is not set -# CONFIG_NO_HZ is not set -CONFIG_HIGH_RES_TIMERS=y - -# -# CPU/Task time and stats accounting -# -CONFIG_TICK_CPU_ACCOUNTING=y -# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set -# CONFIG_IRQ_TIME_ACCOUNTING is not set -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_BSD_PROCESS_ACCT_V3=y -CONFIG_TASKSTATS=y -CONFIG_TASK_DELAY_ACCT=y -CONFIG_TASK_XACCT=y -CONFIG_TASK_IO_ACCOUNTING=y -CONFIG_CPU_ISOLATION=y - -# -# RCU Subsystem -# -CONFIG_TREE_RCU=y -# CONFIG_RCU_EXPERT is not set -CONFIG_SRCU=y -CONFIG_TREE_SRCU=y -CONFIG_RCU_STALL_COMMON=y -CONFIG_RCU_NEED_SEGCBLIST=y -CONFIG_BUILD_BIN2C=y -# CONFIG_IKCONFIG is not set -CONFIG_LOG_BUF_SHIFT=17 -CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 -CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13 -CONFIG_GENERIC_SCHED_CLOCK=y -CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y -CONFIG_ARCH_SUPPORTS_INT128=y -CONFIG_NUMA_BALANCING=y -CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y -CONFIG_CGROUPS=y -CONFIG_PAGE_COUNTER=y -CONFIG_MEMCG=y -CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_SWAP_ENABLED is not set -CONFIG_BLK_CGROUP=y -# CONFIG_DEBUG_BLK_CGROUP is not set -CONFIG_CGROUP_WRITEBACK=y -CONFIG_CGROUP_SCHED=y -CONFIG_FAIR_GROUP_SCHED=y -CONFIG_CFS_BANDWIDTH=y -# CONFIG_RT_GROUP_SCHED is not set -CONFIG_CGROUP_PIDS=y -# CONFIG_CGROUP_RDMA is not set -CONFIG_CGROUP_FREEZER=y -# CONFIG_CGROUP_HUGETLB is not set -CONFIG_CPUSETS=y -CONFIG_PROC_PID_CPUSET=y -CONFIG_CGROUP_DEVICE=y -CONFIG_CGROUP_CPUACCT=y -CONFIG_CGROUP_PERF=y -CONFIG_CGROUP_BPF=y -# CONFIG_CGROUP_DEBUG is not set -CONFIG_SOCK_CGROUP_DATA=y -CONFIG_NAMESPACES=y -CONFIG_UTS_NS=y -CONFIG_IPC_NS=y -CONFIG_USER_NS=y -CONFIG_PID_NS=y -CONFIG_NET_NS=y -CONFIG_SCHED_AUTOGROUP=y -# CONFIG_SYSFS_DEPRECATED is not set -CONFIG_RELAY=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="" -CONFIG_RD_GZIP=y -CONFIG_RD_BZIP2=y -CONFIG_RD_LZMA=y -CONFIG_RD_XZ=y -CONFIG_RD_LZO=y -CONFIG_RD_LZ4=y -CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_SYSCTL=y -CONFIG_ANON_INODES=y -CONFIG_HAVE_UID16=y -CONFIG_SYSCTL_EXCEPTION_TRACE=y -CONFIG_BPF=y -CONFIG_EXPERT=y -CONFIG_UID16=y -CONFIG_MULTIUSER=y -# CONFIG_SGETMASK_SYSCALL is not set -# CONFIG_SYSFS_SYSCALL is not set -# CONFIG_SYSCTL_SYSCALL is not set -CONFIG_FHANDLE=y -CONFIG_POSIX_TIMERS=y -CONFIG_PRINTK=y -CONFIG_PRINTK_NMI=y -CONFIG_BUG=y -CONFIG_ELF_CORE=y -CONFIG_BASE_FULL=y -CONFIG_FUTEX=y -CONFIG_FUTEX_PI=y -CONFIG_EPOLL=y -CONFIG_SIGNALFD=y -CONFIG_TIMERFD=y -CONFIG_EVENTFD=y -CONFIG_SHMEM=y -CONFIG_AIO=y -CONFIG_ADVISE_SYSCALLS=y -CONFIG_MEMBARRIER=y -CONFIG_CHECKPOINT_RESTORE=y -CONFIG_KALLSYMS=y -# CONFIG_KALLSYMS_ALL is not set -CONFIG_KALLSYMS_BASE_RELATIVE=y -CONFIG_BPF_SYSCALL=y -# CONFIG_BPF_JIT_ALWAYS_ON is not set -CONFIG_USERFAULTFD=y -CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y -# CONFIG_EMBEDDED is not set -CONFIG_HAVE_PERF_EVENTS=y -# CONFIG_PC104 is not set - -# -# Kernel Performance Events And Counters -# -CONFIG_PERF_EVENTS=y -# CONFIG_DEBUG_PERF_USE_VMALLOC is not set -CONFIG_VM_EVENT_COUNTERS=y -CONFIG_SLUB_DEBUG=y -# CONFIG_SLUB_MEMCG_SYSFS_ON is not set -# CONFIG_COMPAT_BRK is not set -# CONFIG_SLAB is not set -CONFIG_SLUB=y -# CONFIG_SLOB is not set -CONFIG_SLAB_MERGE_DEFAULT=y -CONFIG_SLAB_FREELIST_RANDOM=y -CONFIG_SLAB_FREELIST_HARDENED=y -CONFIG_SLUB_CPU_PARTIAL=y -CONFIG_SYSTEM_DATA_VERIFICATION=y -CONFIG_PROFILING=y -CONFIG_TRACEPOINTS=y -CONFIG_CRASH_CORE=y -CONFIG_KEXEC_CORE=y -CONFIG_KPROBES=y -CONFIG_JUMP_LABEL=y -# CONFIG_STATIC_KEYS_SELFTEST is not set -CONFIG_UPROBES=y -CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y -CONFIG_KRETPROBES=y -CONFIG_HAVE_KPROBES=y -CONFIG_HAVE_KRETPROBES=y -CONFIG_HAVE_NMI=y -CONFIG_HAVE_ARCH_TRACEHOOK=y -CONFIG_HAVE_DMA_CONTIGUOUS=y -CONFIG_GENERIC_SMP_IDLE_THREAD=y -CONFIG_GENERIC_IDLE_POLL_SETUP=y -CONFIG_ARCH_HAS_FORTIFY_SOURCE=y -CONFIG_ARCH_HAS_SET_MEMORY=y -CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y -CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y -CONFIG_HAVE_CLK=y -CONFIG_HAVE_HW_BREAKPOINT=y -CONFIG_HAVE_PERF_REGS=y -CONFIG_HAVE_PERF_USER_STACK_DUMP=y -CONFIG_HAVE_ARCH_JUMP_LABEL=y -CONFIG_HAVE_RCU_TABLE_FREE=y -CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y -CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y -CONFIG_HAVE_CMPXCHG_LOCAL=y -CONFIG_HAVE_CMPXCHG_DOUBLE=y -CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y -CONFIG_HAVE_ARCH_SECCOMP_FILTER=y -CONFIG_SECCOMP_FILTER=y -CONFIG_PLUGIN_HOSTCC="" -CONFIG_HAVE_GCC_PLUGINS=y -CONFIG_HAVE_STACKPROTECTOR=y -CONFIG_CC_HAS_STACKPROTECTOR_NONE=y -CONFIG_STACKPROTECTOR=y -CONFIG_STACKPROTECTOR_STRONG=y -CONFIG_HAVE_CONTEXT_TRACKING=y -CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y -CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y -CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y -CONFIG_HAVE_ARCH_HUGE_VMAP=y -CONFIG_HAVE_MOD_ARCH_SPECIFIC=y -CONFIG_MODULES_USE_ELF_RELA=y -CONFIG_ARCH_HAS_ELF_RANDOMIZE=y -CONFIG_HAVE_ARCH_MMAP_RND_BITS=y -CONFIG_ARCH_MMAP_RND_BITS=18 -CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y -CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11 -CONFIG_CLONE_BACKWARDS=y -CONFIG_OLD_SIGSUSPEND3=y -CONFIG_COMPAT_OLD_SIGACTION=y -CONFIG_COMPAT_32BIT_TIME=y -CONFIG_HAVE_ARCH_VMAP_STACK=y -CONFIG_VMAP_STACK=y -CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y -CONFIG_STRICT_KERNEL_RWX=y -CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y -CONFIG_STRICT_MODULE_RWX=y -CONFIG_REFCOUNT_FULL=y - -# -# GCOV-based kernel profiling -# -# CONFIG_GCOV_KERNEL is not set -CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y -CONFIG_RT_MUTEXES=y -CONFIG_BASE_SMALL=0 -CONFIG_MODULES=y -CONFIG_MODULE_FORCE_LOAD=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MODVERSIONS=y -# CONFIG_MODULE_SRCVERSION_ALL is not set -# CONFIG_MODULE_SIG is not set -# CONFIG_MODULE_COMPRESS is not set -# CONFIG_TRIM_UNUSED_KSYMS is not set -CONFIG_MODULES_TREE_LOOKUP=y -CONFIG_BLOCK=y -CONFIG_BLK_SCSI_REQUEST=y -CONFIG_BLK_DEV_BSG=y -CONFIG_BLK_DEV_BSGLIB=y -CONFIG_BLK_DEV_INTEGRITY=y -# CONFIG_BLK_DEV_ZONED is not set -CONFIG_BLK_DEV_THROTTLING=y -# CONFIG_BLK_DEV_THROTTLING_LOW is not set -# CONFIG_BLK_CMDLINE_PARSER is not set -CONFIG_BLK_WBT=y -# CONFIG_BLK_WBT_SQ is not set -CONFIG_BLK_WBT_MQ=y -CONFIG_BLK_DEBUG_FS=y -CONFIG_BLK_SED_OPAL=y - -# -# Partition Types -# -CONFIG_PARTITION_ADVANCED=y -# CONFIG_ACORN_PARTITION is not set -# CONFIG_AIX_PARTITION is not set -# CONFIG_OSF_PARTITION is not set -# CONFIG_AMIGA_PARTITION is not set -# CONFIG_ATARI_PARTITION is not set -# CONFIG_MAC_PARTITION is not set -CONFIG_MSDOS_PARTITION=y -# CONFIG_BSD_DISKLABEL is not set -# CONFIG_MINIX_SUBPARTITION is not set -# CONFIG_SOLARIS_X86_PARTITION is not set -# CONFIG_UNIXWARE_DISKLABEL is not set -# CONFIG_LDM_PARTITION is not set -# CONFIG_SGI_PARTITION is not set -# CONFIG_ULTRIX_PARTITION is not set -# CONFIG_SUN_PARTITION is not set -CONFIG_KARMA_PARTITION=y -CONFIG_EFI_PARTITION=y -# CONFIG_SYSV68_PARTITION is not set -# CONFIG_CMDLINE_PARTITION is not set -CONFIG_BLOCK_COMPAT=y -CONFIG_BLK_MQ_PCI=y -CONFIG_BLK_MQ_VIRTIO=y -CONFIG_BLK_MQ_RDMA=y - -# -# IO Schedulers -# -CONFIG_IOSCHED_NOOP=y -CONFIG_IOSCHED_DEADLINE=y -CONFIG_IOSCHED_CFQ=y -CONFIG_CFQ_GROUP_IOSCHED=y -# CONFIG_DEFAULT_DEADLINE is not set -CONFIG_DEFAULT_CFQ=y -# CONFIG_DEFAULT_NOOP is not set -CONFIG_DEFAULT_IOSCHED="cfq" -CONFIG_MQ_IOSCHED_DEADLINE=y -CONFIG_MQ_IOSCHED_KYBER=m -CONFIG_IOSCHED_BFQ=m -CONFIG_BFQ_GROUP_IOSCHED=y -CONFIG_PREEMPT_NOTIFIERS=y -CONFIG_PADATA=y -CONFIG_ASN1=y -CONFIG_ARCH_INLINE_READ_LOCK=y -CONFIG_ARCH_INLINE_READ_LOCK_BH=y -CONFIG_ARCH_INLINE_READ_LOCK_IRQ=y -CONFIG_ARCH_INLINE_READ_LOCK_IRQSAVE=y -CONFIG_ARCH_INLINE_READ_UNLOCK=y -CONFIG_ARCH_INLINE_READ_UNLOCK_BH=y -CONFIG_ARCH_INLINE_READ_UNLOCK_IRQ=y -CONFIG_ARCH_INLINE_READ_UNLOCK_IRQRESTORE=y -CONFIG_ARCH_INLINE_WRITE_LOCK=y -CONFIG_ARCH_INLINE_WRITE_LOCK_BH=y -CONFIG_ARCH_INLINE_WRITE_LOCK_IRQ=y -CONFIG_ARCH_INLINE_WRITE_LOCK_IRQSAVE=y -CONFIG_ARCH_INLINE_WRITE_UNLOCK=y -CONFIG_ARCH_INLINE_WRITE_UNLOCK_BH=y -CONFIG_ARCH_INLINE_WRITE_UNLOCK_IRQ=y -CONFIG_ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE=y -CONFIG_INLINE_SPIN_UNLOCK_IRQ=y -CONFIG_INLINE_READ_LOCK=y -CONFIG_INLINE_READ_LOCK_BH=y -CONFIG_INLINE_READ_LOCK_IRQ=y -CONFIG_INLINE_READ_LOCK_IRQSAVE=y -CONFIG_INLINE_READ_UNLOCK=y -CONFIG_INLINE_READ_UNLOCK_BH=y -CONFIG_INLINE_READ_UNLOCK_IRQ=y -CONFIG_INLINE_READ_UNLOCK_IRQRESTORE=y -CONFIG_INLINE_WRITE_LOCK=y -CONFIG_INLINE_WRITE_LOCK_BH=y -CONFIG_INLINE_WRITE_LOCK_IRQ=y -CONFIG_INLINE_WRITE_LOCK_IRQSAVE=y -CONFIG_INLINE_WRITE_UNLOCK=y -CONFIG_INLINE_WRITE_UNLOCK_BH=y -CONFIG_INLINE_WRITE_UNLOCK_IRQ=y -CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE=y -CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y -CONFIG_MUTEX_SPIN_ON_OWNER=y -CONFIG_RWSEM_SPIN_ON_OWNER=y -CONFIG_LOCK_SPIN_ON_OWNER=y -CONFIG_ARCH_USE_QUEUED_RWLOCKS=y -CONFIG_QUEUED_RWLOCKS=y -CONFIG_FREEZER=y - -# -# Platform selection -# -# CONFIG_ARCH_ACTIONS is not set -CONFIG_ARCH_SUNXI=y -# CONFIG_ARCH_ALPINE is not set -CONFIG_ARCH_BCM2835=y -# CONFIG_ARCH_BCM_IPROC is not set -# CONFIG_ARCH_BERLIN is not set -# CONFIG_ARCH_BRCMSTB is not set -# CONFIG_ARCH_EXYNOS is not set -# CONFIG_ARCH_LAYERSCAPE is not set -# CONFIG_ARCH_LG1K is not set -CONFIG_ARCH_HISI=y -# CONFIG_ARCH_MEDIATEK is not set -CONFIG_ARCH_MESON=y -CONFIG_ARCH_MVEBU=y -CONFIG_ARCH_QCOM=y -# CONFIG_ARCH_REALTEK is not set -CONFIG_ARCH_ROCKCHIP=y -CONFIG_ARCH_SEATTLE=y -CONFIG_ARCH_SYNQUACER=y -# CONFIG_ARCH_RENESAS is not set -# CONFIG_ARCH_STRATIX10 is not set -CONFIG_ARCH_TEGRA=y -# CONFIG_ARCH_SPRD is not set -CONFIG_ARCH_THUNDER=y -CONFIG_ARCH_THUNDER2=y -# CONFIG_ARCH_UNIPHIER is not set -CONFIG_ARCH_VEXPRESS=y -CONFIG_ARCH_XGENE=y -# CONFIG_ARCH_ZX is not set -# CONFIG_ARCH_ZYNQMP is not set - -# -# Bus support -# -CONFIG_PCI=y -CONFIG_PCI_DOMAINS=y -CONFIG_PCI_DOMAINS_GENERIC=y -CONFIG_PCI_SYSCALL=y -CONFIG_PCIEPORTBUS=y -CONFIG_HOTPLUG_PCI_PCIE=y -CONFIG_PCIEAER=y -CONFIG_PCIEAER_INJECT=m -# CONFIG_PCIE_ECRC is not set -CONFIG_PCIEASPM=y -# CONFIG_PCIEASPM_DEBUG is not set -CONFIG_PCIEASPM_DEFAULT=y -# CONFIG_PCIEASPM_POWERSAVE is not set -# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set -# CONFIG_PCIEASPM_PERFORMANCE is not set -CONFIG_PCIE_PME=y -CONFIG_PCIE_DPC=y -CONFIG_PCIE_PTM=y -CONFIG_PCI_MSI=y -CONFIG_PCI_MSI_IRQ_DOMAIN=y -CONFIG_PCI_QUIRKS=y -# CONFIG_PCI_DEBUG is not set -CONFIG_PCI_REALLOC_ENABLE_AUTO=y -CONFIG_PCI_STUB=m -# CONFIG_PCI_PF_STUB is not set -CONFIG_PCI_ATS=y -CONFIG_PCI_ECAM=y -CONFIG_PCI_IOV=y -# CONFIG_PCI_PRI is not set -# CONFIG_PCI_PASID is not set -CONFIG_PCI_LABEL=y -CONFIG_HOTPLUG_PCI=y -CONFIG_HOTPLUG_PCI_ACPI=y -CONFIG_HOTPLUG_PCI_ACPI_IBM=m -CONFIG_HOTPLUG_PCI_CPCI=y -CONFIG_HOTPLUG_PCI_SHPC=y - -# -# PCI controller drivers -# -CONFIG_PCI_AARDVARK=y - -# -# Cadence PCIe controllers support -# -# CONFIG_PCIE_CADENCE_HOST is not set -# CONFIG_PCI_FTPCI100 is not set -CONFIG_PCI_TEGRA=y -CONFIG_PCI_HOST_COMMON=y -CONFIG_PCI_HOST_GENERIC=y -CONFIG_PCI_XGENE=y -CONFIG_PCI_XGENE_MSI=y -CONFIG_PCI_HOST_THUNDER_PEM=y -CONFIG_PCI_HOST_THUNDER_ECAM=y -CONFIG_PCIE_ROCKCHIP=y -CONFIG_PCIE_ROCKCHIP_HOST=m - -# -# DesignWare PCI Core Support -# -CONFIG_PCIE_DW=y -CONFIG_PCIE_DW_HOST=y -# CONFIG_PCIE_DW_PLAT_HOST is not set -CONFIG_PCI_HISI=y -CONFIG_PCIE_QCOM=y -CONFIG_PCIE_ARMADA_8K=y -CONFIG_PCIE_KIRIN=y -# CONFIG_PCIE_HISI_STB is not set - -# -# PCI Endpoint -# -# CONFIG_PCI_ENDPOINT is not set - -# -# PCI switch controller drivers -# -# CONFIG_PCI_SW_SWITCHTEC is not set - -# -# Kernel Features -# - -# -# ARM errata workarounds via the alternatives framework -# -CONFIG_ARM64_ERRATUM_826319=y -CONFIG_ARM64_ERRATUM_827319=y -CONFIG_ARM64_ERRATUM_824069=y -CONFIG_ARM64_ERRATUM_819472=y -CONFIG_ARM64_ERRATUM_832075=y -CONFIG_ARM64_ERRATUM_834220=y -CONFIG_ARM64_ERRATUM_845719=y -# CONFIG_ARM64_ERRATUM_843419 is not set -CONFIG_ARM64_ERRATUM_1024718=y -CONFIG_CAVIUM_ERRATUM_22375=y -CONFIG_CAVIUM_ERRATUM_23144=y -CONFIG_CAVIUM_ERRATUM_23154=y -CONFIG_CAVIUM_ERRATUM_27456=y -CONFIG_CAVIUM_ERRATUM_30115=y -CONFIG_QCOM_FALKOR_ERRATUM_1003=y -CONFIG_QCOM_FALKOR_ERRATUM_1009=y -CONFIG_QCOM_QDF2400_ERRATUM_0065=y -CONFIG_SOCIONEXT_SYNQUACER_PREITS=y -CONFIG_HISILICON_ERRATUM_161600802=y -CONFIG_QCOM_FALKOR_ERRATUM_E1041=y -CONFIG_ARM64_4K_PAGES=y -# CONFIG_ARM64_16K_PAGES is not set -# CONFIG_ARM64_64K_PAGES is not set -# CONFIG_ARM64_VA_BITS_39 is not set -CONFIG_ARM64_VA_BITS_48=y -CONFIG_ARM64_VA_BITS=48 -CONFIG_ARM64_PA_BITS_48=y -CONFIG_ARM64_PA_BITS=48 -# CONFIG_CPU_BIG_ENDIAN is not set -CONFIG_SCHED_MC=y -# CONFIG_SCHED_SMT is not set -CONFIG_NR_CPUS=256 -CONFIG_HOTPLUG_CPU=y -CONFIG_NUMA=y -CONFIG_NODES_SHIFT=2 -CONFIG_USE_PERCPU_NUMA_NODE_ID=y -CONFIG_HAVE_SETUP_PER_CPU_AREA=y -CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y -CONFIG_HOLES_IN_ZONE=y -# CONFIG_PREEMPT_NONE is not set -CONFIG_PREEMPT_VOLUNTARY=y -# CONFIG_PREEMPT is not set -# CONFIG_HZ_100 is not set -CONFIG_HZ_250=y -# CONFIG_HZ_300 is not set -# CONFIG_HZ_1000 is not set -CONFIG_HZ=250 -CONFIG_SCHED_HRTICK=y -CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y -CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y -CONFIG_ARCH_SPARSEMEM_ENABLE=y -CONFIG_ARCH_SPARSEMEM_DEFAULT=y -CONFIG_ARCH_SELECT_MEMORY_MODEL=y -CONFIG_HAVE_ARCH_PFN_VALID=y -CONFIG_HW_PERF_EVENTS=y -CONFIG_SYS_SUPPORTS_HUGETLBFS=y -CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y -CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y -CONFIG_SELECT_MEMORY_MODEL=y -CONFIG_SPARSEMEM_MANUAL=y -CONFIG_SPARSEMEM=y -CONFIG_NEED_MULTIPLE_NODES=y -CONFIG_HAVE_MEMORY_PRESENT=y -CONFIG_SPARSEMEM_EXTREME=y -CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y -CONFIG_SPARSEMEM_VMEMMAP=y -CONFIG_HAVE_MEMBLOCK=y -CONFIG_HAVE_MEMBLOCK_NODE_MAP=y -CONFIG_NO_BOOTMEM=y -CONFIG_MEMORY_ISOLATION=y -CONFIG_SPLIT_PTLOCK_CPUS=4 -CONFIG_MEMORY_BALLOON=y -CONFIG_BALLOON_COMPACTION=y -CONFIG_COMPACTION=y -CONFIG_MIGRATION=y -CONFIG_PHYS_ADDR_T_64BIT=y -CONFIG_MMU_NOTIFIER=y -CONFIG_KSM=y -CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 -CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y -CONFIG_MEMORY_FAILURE=y -CONFIG_HWPOISON_INJECT=m -CONFIG_TRANSPARENT_HUGEPAGE=y -CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y -# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set -CONFIG_TRANSPARENT_HUGE_PAGECACHE=y -# CONFIG_CLEANCACHE is not set -CONFIG_FRONTSWAP=y -CONFIG_CMA=y -# CONFIG_CMA_DEBUG is not set -# CONFIG_CMA_DEBUGFS is not set -CONFIG_CMA_AREAS=7 -CONFIG_ZSWAP=y -CONFIG_ZPOOL=y -CONFIG_ZBUD=y -# CONFIG_Z3FOLD is not set -CONFIG_ZSMALLOC=m -# CONFIG_PGTABLE_MAPPING is not set -# CONFIG_ZSMALLOC_STAT is not set -CONFIG_GENERIC_EARLY_IOREMAP=y -# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set -# CONFIG_IDLE_PAGE_TRACKING is not set -CONFIG_FRAME_VECTOR=y -# CONFIG_PERCPU_STATS is not set -# CONFIG_GUP_BENCHMARK is not set -CONFIG_ARCH_HAS_PTE_SPECIAL=y -CONFIG_SECCOMP=y -CONFIG_PARAVIRT=y -# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set -CONFIG_KEXEC=y -CONFIG_CRASH_DUMP=y -CONFIG_XEN_DOM0=y -CONFIG_XEN=y -CONFIG_FORCE_MAX_ZONEORDER=11 -CONFIG_UNMAP_KERNEL_AT_EL0=y -CONFIG_HARDEN_BRANCH_PREDICTOR=y -CONFIG_HARDEN_EL2_VECTORS=y -CONFIG_ARM64_SSBD=y -CONFIG_ARMV8_DEPRECATED=y -CONFIG_SWP_EMULATION=y -CONFIG_CP15_BARRIER_EMULATION=y -CONFIG_SETEND_EMULATION=y -# CONFIG_ARM64_SW_TTBR0_PAN is not set - -# -# ARMv8.1 architectural features -# -CONFIG_ARM64_HW_AFDBM=y -CONFIG_ARM64_PAN=y -# CONFIG_ARM64_LSE_ATOMICS is not set -CONFIG_ARM64_VHE=y - -# -# ARMv8.2 architectural features -# -CONFIG_ARM64_UAO=y -CONFIG_ARM64_PMEM=y -CONFIG_ARM64_RAS_EXTN=y -CONFIG_ARM64_SVE=y -CONFIG_ARM64_MODULE_PLTS=y -CONFIG_RELOCATABLE=y -CONFIG_RANDOMIZE_BASE=y -CONFIG_RANDOMIZE_MODULE_REGION_FULL=y - -# -# Boot options -# -CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y -CONFIG_CMDLINE="" -# CONFIG_CMDLINE_FORCE is not set -CONFIG_EFI_STUB=y -CONFIG_EFI=y -CONFIG_DMI=y - -# -# Userspace binary formats -# -CONFIG_BINFMT_ELF=y -CONFIG_COMPAT_BINFMT_ELF=y -CONFIG_ELFCORE=y -CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y -CONFIG_BINFMT_SCRIPT=y -CONFIG_BINFMT_MISC=m -CONFIG_COREDUMP=y -CONFIG_COMPAT=y -CONFIG_SYSVIPC_COMPAT=y - -# -# Power management options -# -CONFIG_SUSPEND=y -CONFIG_SUSPEND_FREEZER=y -# CONFIG_SUSPEND_SKIP_SYNC is not set -CONFIG_HIBERNATE_CALLBACKS=y -CONFIG_HIBERNATION=y -CONFIG_PM_STD_PARTITION="" -CONFIG_PM_SLEEP=y -CONFIG_PM_SLEEP_SMP=y -# CONFIG_PM_AUTOSLEEP is not set -# CONFIG_PM_WAKELOCKS is not set -CONFIG_PM=y -CONFIG_PM_DEBUG=y -CONFIG_PM_ADVANCED_DEBUG=y -# CONFIG_PM_TEST_SUSPEND is not set -CONFIG_PM_SLEEP_DEBUG=y -# CONFIG_DPM_WATCHDOG is not set -CONFIG_PM_CLK=y -CONFIG_PM_GENERIC_DOMAINS=y -# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set -CONFIG_PM_GENERIC_DOMAINS_SLEEP=y -CONFIG_PM_GENERIC_DOMAINS_OF=y -CONFIG_CPU_PM=y -CONFIG_ARCH_HIBERNATION_POSSIBLE=y -CONFIG_ARCH_HIBERNATION_HEADER=y -CONFIG_ARCH_SUSPEND_POSSIBLE=y - -# -# CPU Power Management -# - -# -# CPU Idle -# -CONFIG_CPU_IDLE=y -CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y -CONFIG_CPU_IDLE_GOV_LADDER=y -CONFIG_CPU_IDLE_GOV_MENU=y -CONFIG_DT_IDLE_STATES=y - -# -# ARM CPU Idle Drivers -# -CONFIG_ARM_CPUIDLE=y - -# -# CPU Frequency scaling -# -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_GOV_ATTR_SET=y -CONFIG_CPU_FREQ_GOV_COMMON=y -CONFIG_CPU_FREQ_STAT=y -CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y -# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set -CONFIG_CPU_FREQ_GOV_PERFORMANCE=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=m -CONFIG_CPU_FREQ_GOV_USERSPACE=m -CONFIG_CPU_FREQ_GOV_ONDEMAND=m -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m -CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y - -# -# CPU frequency scaling drivers -# -CONFIG_CPUFREQ_DT=m -CONFIG_CPUFREQ_DT_PLATDEV=y -CONFIG_ACPI_CPPC_CPUFREQ=m -# CONFIG_ARM_ARMADA_37XX_CPUFREQ is not set -# CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set -CONFIG_ARM_SCMI_CPUFREQ=m -CONFIG_ARM_TEGRA20_CPUFREQ=y -CONFIG_ARM_TEGRA124_CPUFREQ=m -# CONFIG_ARM_TEGRA186_CPUFREQ is not set -# CONFIG_QORIQ_CPUFREQ is not set -CONFIG_NET=y -CONFIG_COMPAT_NETLINK_MESSAGES=y -CONFIG_NET_INGRESS=y -CONFIG_NET_EGRESS=y - -# -# Networking options -# -CONFIG_PACKET=y -CONFIG_PACKET_DIAG=m -CONFIG_UNIX=y -CONFIG_UNIX_DIAG=m -# CONFIG_TLS is not set -CONFIG_XFRM=y -CONFIG_XFRM_OFFLOAD=y -CONFIG_XFRM_ALGO=m -CONFIG_XFRM_USER=m -CONFIG_XFRM_SUB_POLICY=y -CONFIG_XFRM_MIGRATE=y -# CONFIG_XFRM_STATISTICS is not set -CONFIG_XFRM_IPCOMP=m -CONFIG_NET_KEY=m -CONFIG_NET_KEY_MIGRATE=y -# CONFIG_SMC is not set -# CONFIG_XDP_SOCKETS is not set -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_FIB_TRIE_STATS=y -CONFIG_IP_MULTIPLE_TABLES=y -CONFIG_IP_ROUTE_MULTIPATH=y -CONFIG_IP_ROUTE_VERBOSE=y -CONFIG_IP_ROUTE_CLASSID=y -# CONFIG_IP_PNP is not set -CONFIG_NET_IPIP=m -CONFIG_NET_IPGRE_DEMUX=m -CONFIG_NET_IP_TUNNEL=m -CONFIG_NET_IPGRE=m -CONFIG_NET_IPGRE_BROADCAST=y -CONFIG_IP_MROUTE_COMMON=y -CONFIG_IP_MROUTE=y -CONFIG_IP_MROUTE_MULTIPLE_TABLES=y -CONFIG_IP_PIMSM_V1=y -CONFIG_IP_PIMSM_V2=y -CONFIG_SYN_COOKIES=y -CONFIG_NET_IPVTI=m -CONFIG_NET_UDP_TUNNEL=m -CONFIG_NET_FOU=m -CONFIG_NET_FOU_IP_TUNNELS=y -CONFIG_INET_AH=m -CONFIG_INET_ESP=m -CONFIG_INET_ESP_OFFLOAD=m -CONFIG_INET_IPCOMP=m -CONFIG_INET_XFRM_TUNNEL=m -CONFIG_INET_TUNNEL=m -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m -CONFIG_INET_XFRM_MODE_BEET=m -CONFIG_INET_DIAG=m -CONFIG_INET_TCP_DIAG=m -CONFIG_INET_UDP_DIAG=m -# CONFIG_INET_RAW_DIAG is not set -CONFIG_INET_DIAG_DESTROY=y -CONFIG_TCP_CONG_ADVANCED=y -CONFIG_TCP_CONG_BIC=m -CONFIG_TCP_CONG_CUBIC=y -CONFIG_TCP_CONG_WESTWOOD=m -CONFIG_TCP_CONG_HTCP=m -CONFIG_TCP_CONG_HSTCP=m -CONFIG_TCP_CONG_HYBLA=m -CONFIG_TCP_CONG_VEGAS=m -CONFIG_TCP_CONG_NV=m -CONFIG_TCP_CONG_SCALABLE=m -CONFIG_TCP_CONG_LP=m -CONFIG_TCP_CONG_VENO=m -CONFIG_TCP_CONG_YEAH=m -CONFIG_TCP_CONG_ILLINOIS=m -CONFIG_TCP_CONG_DCTCP=m -CONFIG_TCP_CONG_CDG=m -CONFIG_TCP_CONG_BBR=m -CONFIG_DEFAULT_CUBIC=y -# CONFIG_DEFAULT_RENO is not set -CONFIG_DEFAULT_TCP_CONG="cubic" -CONFIG_TCP_MD5SIG=y -CONFIG_IPV6=y -CONFIG_IPV6_ROUTER_PREF=y -CONFIG_IPV6_ROUTE_INFO=y -CONFIG_IPV6_OPTIMISTIC_DAD=y -CONFIG_INET6_AH=m -CONFIG_INET6_ESP=m -CONFIG_INET6_ESP_OFFLOAD=m -CONFIG_INET6_IPCOMP=m -CONFIG_IPV6_MIP6=y -CONFIG_IPV6_ILA=m -CONFIG_INET6_XFRM_TUNNEL=m -CONFIG_INET6_TUNNEL=m -CONFIG_INET6_XFRM_MODE_TRANSPORT=m -CONFIG_INET6_XFRM_MODE_TUNNEL=m -CONFIG_INET6_XFRM_MODE_BEET=m -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m -CONFIG_IPV6_VTI=m -CONFIG_IPV6_SIT=m -CONFIG_IPV6_SIT_6RD=y -CONFIG_IPV6_NDISC_NODETYPE=y -CONFIG_IPV6_TUNNEL=m -CONFIG_IPV6_GRE=m -CONFIG_IPV6_FOU=m -CONFIG_IPV6_FOU_TUNNEL=m -CONFIG_IPV6_MULTIPLE_TABLES=y -CONFIG_IPV6_SUBTREES=y -CONFIG_IPV6_MROUTE=y -CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y -CONFIG_IPV6_PIMSM_V2=y -CONFIG_IPV6_SEG6_LWTUNNEL=y -CONFIG_IPV6_SEG6_HMAC=y -CONFIG_IPV6_SEG6_BPF=y -# CONFIG_NETLABEL is not set -CONFIG_NETWORK_SECMARK=y -CONFIG_NET_PTP_CLASSIFY=y -# CONFIG_NETWORK_PHY_TIMESTAMPING is not set -CONFIG_NETFILTER=y -CONFIG_NETFILTER_ADVANCED=y -CONFIG_BRIDGE_NETFILTER=m - -# -# Core Netfilter Configuration -# -CONFIG_NETFILTER_INGRESS=y -CONFIG_NETFILTER_NETLINK=m -CONFIG_NETFILTER_FAMILY_BRIDGE=y -CONFIG_NETFILTER_FAMILY_ARP=y -CONFIG_NETFILTER_NETLINK_ACCT=m -CONFIG_NETFILTER_NETLINK_QUEUE=m -CONFIG_NETFILTER_NETLINK_LOG=m -CONFIG_NF_CONNTRACK=m -CONFIG_NF_LOG_COMMON=m -CONFIG_NF_LOG_NETDEV=m -CONFIG_NETFILTER_CONNCOUNT=m -CONFIG_NF_CONNTRACK_MARK=y -CONFIG_NF_CONNTRACK_SECMARK=y -CONFIG_NF_CONNTRACK_ZONES=y -CONFIG_NF_CONNTRACK_PROCFS=y -CONFIG_NF_CONNTRACK_EVENTS=y -CONFIG_NF_CONNTRACK_TIMEOUT=y -CONFIG_NF_CONNTRACK_TIMESTAMP=y -CONFIG_NF_CONNTRACK_LABELS=y -CONFIG_NF_CT_PROTO_DCCP=y -CONFIG_NF_CT_PROTO_GRE=m -CONFIG_NF_CT_PROTO_SCTP=y -CONFIG_NF_CT_PROTO_UDPLITE=y -CONFIG_NF_CONNTRACK_AMANDA=m -CONFIG_NF_CONNTRACK_FTP=m -CONFIG_NF_CONNTRACK_H323=m -CONFIG_NF_CONNTRACK_IRC=m -CONFIG_NF_CONNTRACK_BROADCAST=m -CONFIG_NF_CONNTRACK_NETBIOS_NS=m -CONFIG_NF_CONNTRACK_SNMP=m -CONFIG_NF_CONNTRACK_PPTP=m -CONFIG_NF_CONNTRACK_SANE=m -CONFIG_NF_CONNTRACK_SIP=m -CONFIG_NF_CONNTRACK_TFTP=m -CONFIG_NF_CT_NETLINK=m -CONFIG_NF_CT_NETLINK_TIMEOUT=m -CONFIG_NF_CT_NETLINK_HELPER=m -CONFIG_NETFILTER_NETLINK_GLUE_CT=y -CONFIG_NF_NAT=m -CONFIG_NF_NAT_NEEDED=y -CONFIG_NF_NAT_PROTO_DCCP=y -CONFIG_NF_NAT_PROTO_UDPLITE=y -CONFIG_NF_NAT_PROTO_SCTP=y -CONFIG_NF_NAT_AMANDA=m -CONFIG_NF_NAT_FTP=m -CONFIG_NF_NAT_IRC=m -CONFIG_NF_NAT_SIP=m -CONFIG_NF_NAT_TFTP=m -CONFIG_NF_NAT_REDIRECT=y -CONFIG_NETFILTER_SYNPROXY=m -CONFIG_NF_OSF=m -CONFIG_NF_TABLES=m -CONFIG_NF_TABLES_SET=m -# CONFIG_NF_TABLES_INET is not set -# CONFIG_NF_TABLES_NETDEV is not set -CONFIG_NFT_NUMGEN=m -CONFIG_NFT_CT=m -CONFIG_NFT_COUNTER=m -CONFIG_NFT_CONNLIMIT=m -CONFIG_NFT_LOG=m -CONFIG_NFT_LIMIT=m -CONFIG_NFT_MASQ=m -CONFIG_NFT_REDIR=m -CONFIG_NFT_NAT=m -CONFIG_NFT_OBJREF=m -CONFIG_NFT_QUEUE=m -CONFIG_NFT_QUOTA=m -CONFIG_NFT_REJECT=m -CONFIG_NFT_COMPAT=m -CONFIG_NFT_HASH=m -CONFIG_NFT_SOCKET=m -# CONFIG_NF_FLOW_TABLE is not set -CONFIG_NETFILTER_XTABLES=m - -# -# Xtables combined modules -# -CONFIG_NETFILTER_XT_MARK=m -CONFIG_NETFILTER_XT_CONNMARK=m -CONFIG_NETFILTER_XT_SET=m - -# -# Xtables targets -# -CONFIG_NETFILTER_XT_TARGET_AUDIT=m -CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m -CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m -CONFIG_NETFILTER_XT_TARGET_CONNMARK=m -CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m -CONFIG_NETFILTER_XT_TARGET_CT=m -CONFIG_NETFILTER_XT_TARGET_DSCP=m -CONFIG_NETFILTER_XT_TARGET_HL=m -CONFIG_NETFILTER_XT_TARGET_HMARK=m -CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m -CONFIG_NETFILTER_XT_TARGET_LED=m -CONFIG_NETFILTER_XT_TARGET_LOG=m -CONFIG_NETFILTER_XT_TARGET_MARK=m -CONFIG_NETFILTER_XT_NAT=m -CONFIG_NETFILTER_XT_TARGET_NETMAP=m -CONFIG_NETFILTER_XT_TARGET_NFLOG=m -CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m -# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set -CONFIG_NETFILTER_XT_TARGET_RATEEST=m -CONFIG_NETFILTER_XT_TARGET_REDIRECT=m -CONFIG_NETFILTER_XT_TARGET_TEE=m -CONFIG_NETFILTER_XT_TARGET_TPROXY=m -CONFIG_NETFILTER_XT_TARGET_TRACE=m -CONFIG_NETFILTER_XT_TARGET_SECMARK=m -CONFIG_NETFILTER_XT_TARGET_TCPMSS=m -CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m - -# -# Xtables matches -# -CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m -CONFIG_NETFILTER_XT_MATCH_BPF=m -CONFIG_NETFILTER_XT_MATCH_CGROUP=m -CONFIG_NETFILTER_XT_MATCH_CLUSTER=m -CONFIG_NETFILTER_XT_MATCH_COMMENT=m -CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m -CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m -CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m -CONFIG_NETFILTER_XT_MATCH_CONNMARK=m -CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m -CONFIG_NETFILTER_XT_MATCH_CPU=m -CONFIG_NETFILTER_XT_MATCH_DCCP=m -CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m -CONFIG_NETFILTER_XT_MATCH_DSCP=m -CONFIG_NETFILTER_XT_MATCH_ECN=m -CONFIG_NETFILTER_XT_MATCH_ESP=m -CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m -CONFIG_NETFILTER_XT_MATCH_HELPER=m -CONFIG_NETFILTER_XT_MATCH_HL=m -CONFIG_NETFILTER_XT_MATCH_IPCOMP=m -CONFIG_NETFILTER_XT_MATCH_IPRANGE=m -CONFIG_NETFILTER_XT_MATCH_IPVS=m -CONFIG_NETFILTER_XT_MATCH_L2TP=m -CONFIG_NETFILTER_XT_MATCH_LENGTH=m -CONFIG_NETFILTER_XT_MATCH_LIMIT=m -CONFIG_NETFILTER_XT_MATCH_MAC=m -CONFIG_NETFILTER_XT_MATCH_MARK=m -CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m -CONFIG_NETFILTER_XT_MATCH_NFACCT=m -CONFIG_NETFILTER_XT_MATCH_OSF=m -CONFIG_NETFILTER_XT_MATCH_OWNER=m -CONFIG_NETFILTER_XT_MATCH_POLICY=m -CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m -CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m -CONFIG_NETFILTER_XT_MATCH_QUOTA=m -CONFIG_NETFILTER_XT_MATCH_RATEEST=m -CONFIG_NETFILTER_XT_MATCH_REALM=m -CONFIG_NETFILTER_XT_MATCH_RECENT=m -CONFIG_NETFILTER_XT_MATCH_SCTP=m -CONFIG_NETFILTER_XT_MATCH_SOCKET=m -CONFIG_NETFILTER_XT_MATCH_STATE=m -CONFIG_NETFILTER_XT_MATCH_STATISTIC=m -CONFIG_NETFILTER_XT_MATCH_STRING=m -CONFIG_NETFILTER_XT_MATCH_TCPMSS=m -CONFIG_NETFILTER_XT_MATCH_TIME=m -CONFIG_NETFILTER_XT_MATCH_U32=m -CONFIG_IP_SET=m -CONFIG_IP_SET_MAX=256 -CONFIG_IP_SET_BITMAP_IP=m -CONFIG_IP_SET_BITMAP_IPMAC=m -CONFIG_IP_SET_BITMAP_PORT=m -CONFIG_IP_SET_HASH_IP=m -CONFIG_IP_SET_HASH_IPMARK=m -CONFIG_IP_SET_HASH_IPPORT=m -CONFIG_IP_SET_HASH_IPPORTIP=m -CONFIG_IP_SET_HASH_IPPORTNET=m -CONFIG_IP_SET_HASH_IPMAC=m -CONFIG_IP_SET_HASH_MAC=m -CONFIG_IP_SET_HASH_NETPORTNET=m -CONFIG_IP_SET_HASH_NET=m -CONFIG_IP_SET_HASH_NETNET=m -CONFIG_IP_SET_HASH_NETPORT=m -CONFIG_IP_SET_HASH_NETIFACE=m -CONFIG_IP_SET_LIST_SET=m -CONFIG_IP_VS=m -CONFIG_IP_VS_IPV6=y -# CONFIG_IP_VS_DEBUG is not set -CONFIG_IP_VS_TAB_BITS=12 - -# -# IPVS transport protocol load balancing support -# -CONFIG_IP_VS_PROTO_TCP=y -CONFIG_IP_VS_PROTO_UDP=y -CONFIG_IP_VS_PROTO_AH_ESP=y -CONFIG_IP_VS_PROTO_ESP=y -CONFIG_IP_VS_PROTO_AH=y -CONFIG_IP_VS_PROTO_SCTP=y - -# -# IPVS scheduler -# -CONFIG_IP_VS_RR=m -CONFIG_IP_VS_WRR=m -CONFIG_IP_VS_LC=m -CONFIG_IP_VS_WLC=m -CONFIG_IP_VS_FO=m -CONFIG_IP_VS_OVF=m -CONFIG_IP_VS_LBLC=m -CONFIG_IP_VS_LBLCR=m -CONFIG_IP_VS_DH=m -CONFIG_IP_VS_SH=m -CONFIG_IP_VS_MH=m -CONFIG_IP_VS_SED=m -CONFIG_IP_VS_NQ=m - -# -# IPVS SH scheduler -# -CONFIG_IP_VS_SH_TAB_BITS=8 - -# -# IPVS MH scheduler -# -CONFIG_IP_VS_MH_TAB_INDEX=12 - -# -# IPVS application helper -# -CONFIG_IP_VS_FTP=m -CONFIG_IP_VS_NFCT=y -CONFIG_IP_VS_PE_SIP=m - -# -# IP: Netfilter Configuration -# -CONFIG_NF_DEFRAG_IPV4=m -CONFIG_NF_CONNTRACK_IPV4=m -CONFIG_NF_SOCKET_IPV4=m -CONFIG_NF_TPROXY_IPV4=m -# CONFIG_NF_TABLES_IPV4 is not set -# CONFIG_NF_TABLES_ARP is not set -CONFIG_NF_DUP_IPV4=m -CONFIG_NF_LOG_ARP=m -CONFIG_NF_LOG_IPV4=m -CONFIG_NF_REJECT_IPV4=m -CONFIG_NF_NAT_IPV4=m -CONFIG_NF_NAT_MASQUERADE_IPV4=y -CONFIG_NF_NAT_SNMP_BASIC=m -CONFIG_NF_NAT_PROTO_GRE=m -CONFIG_NF_NAT_PPTP=m -CONFIG_NF_NAT_H323=m -CONFIG_IP_NF_IPTABLES=m -CONFIG_IP_NF_MATCH_AH=m -CONFIG_IP_NF_MATCH_ECN=m -CONFIG_IP_NF_MATCH_RPFILTER=m -CONFIG_IP_NF_MATCH_TTL=m -CONFIG_IP_NF_FILTER=m -CONFIG_IP_NF_TARGET_REJECT=m -CONFIG_IP_NF_TARGET_SYNPROXY=m -CONFIG_IP_NF_NAT=m -CONFIG_IP_NF_TARGET_MASQUERADE=m -CONFIG_IP_NF_TARGET_NETMAP=m -CONFIG_IP_NF_TARGET_REDIRECT=m -CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_TARGET_CLUSTERIP=m -CONFIG_IP_NF_TARGET_ECN=m -CONFIG_IP_NF_TARGET_TTL=m -CONFIG_IP_NF_RAW=m -CONFIG_IP_NF_SECURITY=m -CONFIG_IP_NF_ARPTABLES=m -CONFIG_IP_NF_ARPFILTER=m -CONFIG_IP_NF_ARP_MANGLE=m - -# -# IPv6: Netfilter Configuration -# -CONFIG_NF_DEFRAG_IPV6=m -CONFIG_NF_CONNTRACK_IPV6=m -CONFIG_NF_SOCKET_IPV6=m -CONFIG_NF_TPROXY_IPV6=m -# CONFIG_NF_TABLES_IPV6 is not set -CONFIG_NF_DUP_IPV6=m -CONFIG_NF_REJECT_IPV6=m -CONFIG_NF_LOG_IPV6=m -CONFIG_NF_NAT_IPV6=m -CONFIG_NF_NAT_MASQUERADE_IPV6=y -CONFIG_IP6_NF_IPTABLES=m -CONFIG_IP6_NF_MATCH_AH=m -CONFIG_IP6_NF_MATCH_EUI64=m -CONFIG_IP6_NF_MATCH_FRAG=m -CONFIG_IP6_NF_MATCH_OPTS=m -CONFIG_IP6_NF_MATCH_HL=m -CONFIG_IP6_NF_MATCH_IPV6HEADER=m -CONFIG_IP6_NF_MATCH_MH=m -CONFIG_IP6_NF_MATCH_RPFILTER=m -CONFIG_IP6_NF_MATCH_RT=m -# CONFIG_IP6_NF_MATCH_SRH is not set -CONFIG_IP6_NF_TARGET_HL=m -CONFIG_IP6_NF_FILTER=m -CONFIG_IP6_NF_TARGET_REJECT=m -CONFIG_IP6_NF_TARGET_SYNPROXY=m -CONFIG_IP6_NF_MANGLE=m -CONFIG_IP6_NF_RAW=m -CONFIG_IP6_NF_SECURITY=m -CONFIG_IP6_NF_NAT=m -CONFIG_IP6_NF_TARGET_MASQUERADE=m -CONFIG_IP6_NF_TARGET_NPT=m -# CONFIG_NF_TABLES_BRIDGE is not set -CONFIG_BRIDGE_NF_EBTABLES=m -CONFIG_BRIDGE_EBT_BROUTE=m -CONFIG_BRIDGE_EBT_T_FILTER=m -CONFIG_BRIDGE_EBT_T_NAT=m -CONFIG_BRIDGE_EBT_802_3=m -CONFIG_BRIDGE_EBT_AMONG=m -CONFIG_BRIDGE_EBT_ARP=m -CONFIG_BRIDGE_EBT_IP=m -CONFIG_BRIDGE_EBT_IP6=m -CONFIG_BRIDGE_EBT_LIMIT=m -CONFIG_BRIDGE_EBT_MARK=m -CONFIG_BRIDGE_EBT_PKTTYPE=m -CONFIG_BRIDGE_EBT_STP=m -CONFIG_BRIDGE_EBT_VLAN=m -CONFIG_BRIDGE_EBT_ARPREPLY=m -CONFIG_BRIDGE_EBT_DNAT=m -CONFIG_BRIDGE_EBT_MARK_T=m -CONFIG_BRIDGE_EBT_REDIRECT=m -CONFIG_BRIDGE_EBT_SNAT=m -CONFIG_BRIDGE_EBT_LOG=m -CONFIG_BRIDGE_EBT_NFLOG=m -# CONFIG_BPFILTER is not set -CONFIG_IP_DCCP=m -CONFIG_INET_DCCP_DIAG=m - -# -# DCCP CCIDs Configuration -# -# CONFIG_IP_DCCP_CCID2_DEBUG is not set -CONFIG_IP_DCCP_CCID3=y -# CONFIG_IP_DCCP_CCID3_DEBUG is not set -CONFIG_IP_DCCP_TFRC_LIB=y - -# -# DCCP Kernel Hacking -# -# CONFIG_IP_DCCP_DEBUG is not set -CONFIG_IP_SCTP=m -# CONFIG_SCTP_DBG_OBJCNT is not set -CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y -# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set -# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set -CONFIG_SCTP_COOKIE_HMAC_MD5=y -CONFIG_SCTP_COOKIE_HMAC_SHA1=y -CONFIG_INET_SCTP_DIAG=m -CONFIG_RDS=m -CONFIG_RDS_RDMA=m -CONFIG_RDS_TCP=m -# CONFIG_RDS_DEBUG is not set -CONFIG_TIPC=m -CONFIG_TIPC_MEDIA_IB=y -CONFIG_TIPC_MEDIA_UDP=y -CONFIG_TIPC_DIAG=m -CONFIG_ATM=m -CONFIG_ATM_CLIP=m -# CONFIG_ATM_CLIP_NO_ICMP is not set -CONFIG_ATM_LANE=m -CONFIG_ATM_MPOA=m -CONFIG_ATM_BR2684=m -# CONFIG_ATM_BR2684_IPFILTER is not set -CONFIG_L2TP=m -CONFIG_L2TP_DEBUGFS=m -CONFIG_L2TP_V3=y -CONFIG_L2TP_IP=m -CONFIG_L2TP_ETH=m -CONFIG_STP=m -CONFIG_GARP=m -CONFIG_MRP=m -CONFIG_BRIDGE=m -CONFIG_BRIDGE_IGMP_SNOOPING=y -CONFIG_BRIDGE_VLAN_FILTERING=y -CONFIG_HAVE_NET_DSA=y -CONFIG_NET_DSA=m -CONFIG_NET_DSA_LEGACY=y -CONFIG_NET_DSA_TAG_DSA=y -CONFIG_NET_DSA_TAG_EDSA=y -CONFIG_NET_DSA_TAG_TRAILER=y -CONFIG_VLAN_8021Q=m -CONFIG_VLAN_8021Q_GVRP=y -CONFIG_VLAN_8021Q_MVRP=y -# CONFIG_DECNET is not set -CONFIG_LLC=m -CONFIG_LLC2=m -CONFIG_ATALK=m -CONFIG_DEV_APPLETALK=m -CONFIG_IPDDP=m -CONFIG_IPDDP_ENCAP=y -# CONFIG_X25 is not set -# CONFIG_LAPB is not set -CONFIG_PHONET=m -CONFIG_6LOWPAN=m -# CONFIG_6LOWPAN_DEBUGFS is not set -CONFIG_6LOWPAN_NHC=m -CONFIG_6LOWPAN_NHC_DEST=m -CONFIG_6LOWPAN_NHC_FRAGMENT=m -CONFIG_6LOWPAN_NHC_HOP=m -CONFIG_6LOWPAN_NHC_IPV6=m -CONFIG_6LOWPAN_NHC_MOBILITY=m -CONFIG_6LOWPAN_NHC_ROUTING=m -CONFIG_6LOWPAN_NHC_UDP=m -CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m -CONFIG_6LOWPAN_GHC_UDP=m -CONFIG_6LOWPAN_GHC_ICMPV6=m -CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m -CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m -CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m -CONFIG_IEEE802154=m -# CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set -CONFIG_IEEE802154_SOCKET=m -CONFIG_IEEE802154_6LOWPAN=m -CONFIG_MAC802154=m -CONFIG_NET_SCHED=y - -# -# Queueing/Scheduling -# -CONFIG_NET_SCH_CBQ=m -CONFIG_NET_SCH_HTB=m -CONFIG_NET_SCH_HFSC=m -CONFIG_NET_SCH_ATM=m -CONFIG_NET_SCH_PRIO=m -CONFIG_NET_SCH_MULTIQ=m -CONFIG_NET_SCH_RED=m -CONFIG_NET_SCH_SFB=m -CONFIG_NET_SCH_SFQ=m -CONFIG_NET_SCH_TEQL=m -CONFIG_NET_SCH_TBF=m -# CONFIG_NET_SCH_CBS is not set -CONFIG_NET_SCH_GRED=m -CONFIG_NET_SCH_DSMARK=m -CONFIG_NET_SCH_NETEM=m -CONFIG_NET_SCH_DRR=m -CONFIG_NET_SCH_MQPRIO=m -CONFIG_NET_SCH_CHOKE=m -CONFIG_NET_SCH_QFQ=m -CONFIG_NET_SCH_CODEL=m -CONFIG_NET_SCH_FQ_CODEL=m -CONFIG_NET_SCH_FQ=m -CONFIG_NET_SCH_HHF=m -CONFIG_NET_SCH_PIE=m -CONFIG_NET_SCH_INGRESS=m -CONFIG_NET_SCH_PLUG=m -# CONFIG_NET_SCH_DEFAULT is not set - -# -# Classification -# -CONFIG_NET_CLS=y -CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m -CONFIG_NET_CLS_ROUTE4=m -CONFIG_NET_CLS_FW=m -CONFIG_NET_CLS_U32=m -CONFIG_CLS_U32_PERF=y -CONFIG_CLS_U32_MARK=y -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_RSVP6=m -CONFIG_NET_CLS_FLOW=m -CONFIG_NET_CLS_CGROUP=m -CONFIG_NET_CLS_BPF=m -CONFIG_NET_CLS_FLOWER=m -CONFIG_NET_CLS_MATCHALL=m -CONFIG_NET_EMATCH=y -CONFIG_NET_EMATCH_STACK=32 -CONFIG_NET_EMATCH_CMP=m -CONFIG_NET_EMATCH_NBYTE=m -CONFIG_NET_EMATCH_U32=m -CONFIG_NET_EMATCH_META=m -CONFIG_NET_EMATCH_TEXT=m -CONFIG_NET_EMATCH_CANID=m -CONFIG_NET_EMATCH_IPSET=m -CONFIG_NET_EMATCH_IPT=m -CONFIG_NET_CLS_ACT=y -CONFIG_NET_ACT_POLICE=m -CONFIG_NET_ACT_GACT=m -CONFIG_GACT_PROB=y -CONFIG_NET_ACT_MIRRED=m -CONFIG_NET_ACT_SAMPLE=m -CONFIG_NET_ACT_IPT=m -CONFIG_NET_ACT_NAT=m -CONFIG_NET_ACT_PEDIT=m -CONFIG_NET_ACT_SIMP=m -CONFIG_NET_ACT_SKBEDIT=m -CONFIG_NET_ACT_CSUM=m -CONFIG_NET_ACT_VLAN=m -CONFIG_NET_ACT_BPF=m -CONFIG_NET_ACT_CONNMARK=m -CONFIG_NET_ACT_SKBMOD=m -CONFIG_NET_ACT_IFE=m -CONFIG_NET_ACT_TUNNEL_KEY=m -CONFIG_NET_IFE_SKBMARK=m -CONFIG_NET_IFE_SKBPRIO=m -CONFIG_NET_IFE_SKBTCINDEX=m -CONFIG_NET_CLS_IND=y -CONFIG_NET_SCH_FIFO=y -CONFIG_DCB=y -CONFIG_DNS_RESOLVER=m -CONFIG_BATMAN_ADV=m -# CONFIG_BATMAN_ADV_BATMAN_V is not set -CONFIG_BATMAN_ADV_BLA=y -CONFIG_BATMAN_ADV_DAT=y -CONFIG_BATMAN_ADV_NC=y -CONFIG_BATMAN_ADV_MCAST=y -CONFIG_BATMAN_ADV_DEBUGFS=y -# CONFIG_BATMAN_ADV_DEBUG is not set -CONFIG_OPENVSWITCH=m -CONFIG_OPENVSWITCH_GRE=m -CONFIG_OPENVSWITCH_VXLAN=m -CONFIG_OPENVSWITCH_GENEVE=m -CONFIG_VSOCKETS=m -CONFIG_VSOCKETS_DIAG=m -CONFIG_VIRTIO_VSOCKETS=m -CONFIG_VIRTIO_VSOCKETS_COMMON=m -CONFIG_NETLINK_DIAG=m -CONFIG_MPLS=y -CONFIG_NET_MPLS_GSO=y -CONFIG_MPLS_ROUTING=m -CONFIG_MPLS_IPTUNNEL=m -CONFIG_NET_NSH=m -# CONFIG_HSR is not set -CONFIG_NET_SWITCHDEV=y -CONFIG_NET_L3_MASTER_DEV=y -# CONFIG_QRTR is not set -# CONFIG_NET_NCSI is not set -CONFIG_RPS=y -CONFIG_RFS_ACCEL=y -CONFIG_XPS=y -CONFIG_CGROUP_NET_PRIO=y -CONFIG_CGROUP_NET_CLASSID=y -CONFIG_NET_RX_BUSY_POLL=y -CONFIG_BQL=y -CONFIG_BPF_JIT=y -# CONFIG_BPF_STREAM_PARSER is not set -CONFIG_NET_FLOW_LIMIT=y - -# -# Network testing -# -CONFIG_NET_PKTGEN=m -CONFIG_NET_DROP_MONITOR=m -# CONFIG_HAMRADIO is not set -CONFIG_CAN=m -CONFIG_CAN_RAW=m -CONFIG_CAN_BCM=m -CONFIG_CAN_GW=m - -# -# CAN Device Drivers -# -CONFIG_CAN_VCAN=m -# CONFIG_CAN_VXCAN is not set -CONFIG_CAN_SLCAN=m -CONFIG_CAN_DEV=m -CONFIG_CAN_CALC_BITTIMING=y -# CONFIG_CAN_LEDS is not set -# CONFIG_CAN_GRCAN is not set -# CONFIG_CAN_XILINXCAN is not set -# CONFIG_CAN_C_CAN is not set -# CONFIG_CAN_CC770 is not set -# CONFIG_CAN_IFI_CANFD is not set -# CONFIG_CAN_M_CAN is not set -# CONFIG_CAN_PEAK_PCIEFD is not set -CONFIG_CAN_SJA1000=m -CONFIG_CAN_SJA1000_ISA=m -# CONFIG_CAN_SJA1000_PLATFORM is not set -CONFIG_CAN_EMS_PCI=m -CONFIG_CAN_PEAK_PCI=m -CONFIG_CAN_PEAK_PCIEC=y -CONFIG_CAN_KVASER_PCI=m -CONFIG_CAN_PLX_PCI=m -CONFIG_CAN_SOFTING=m - -# -# CAN SPI interfaces -# -# CONFIG_CAN_HI311X is not set -# CONFIG_CAN_MCP251X is not set - -# -# CAN USB interfaces -# -CONFIG_CAN_EMS_USB=m -CONFIG_CAN_ESD_USB2=m -CONFIG_CAN_GS_USB=m -CONFIG_CAN_KVASER_USB=m -CONFIG_CAN_PEAK_USB=m -CONFIG_CAN_8DEV_USB=m -# CONFIG_CAN_MCBA_USB is not set -# CONFIG_CAN_DEBUG_DEVICES is not set -CONFIG_BT=m -CONFIG_BT_BREDR=y -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_HIDP=m -CONFIG_BT_HS=y -CONFIG_BT_LE=y -CONFIG_BT_6LOWPAN=m -CONFIG_BT_LEDS=y -# CONFIG_BT_SELFTEST is not set -CONFIG_BT_DEBUGFS=y - -# -# Bluetooth device drivers -# -CONFIG_BT_INTEL=m -CONFIG_BT_BCM=m -CONFIG_BT_RTL=m -CONFIG_BT_QCA=m -CONFIG_BT_HCIBTUSB=m -# CONFIG_BT_HCIBTUSB_AUTOSUSPEND is not set -CONFIG_BT_HCIBTUSB_BCM=y -CONFIG_BT_HCIBTUSB_RTL=y -CONFIG_BT_HCIBTSDIO=m -CONFIG_BT_HCIUART=m -CONFIG_BT_HCIUART_SERDEV=y -CONFIG_BT_HCIUART_H4=y -# CONFIG_BT_HCIUART_NOKIA is not set -# CONFIG_BT_HCIUART_BCSP is not set -CONFIG_BT_HCIUART_ATH3K=y -CONFIG_BT_HCIUART_LL=y -CONFIG_BT_HCIUART_3WIRE=y -CONFIG_BT_HCIUART_INTEL=y -CONFIG_BT_HCIUART_QCA=y -CONFIG_BT_HCIUART_AG6XX=y -CONFIG_BT_HCIUART_MRVL=y -# CONFIG_BT_HCIBCM203X is not set -# CONFIG_BT_HCIBPA10X is not set -# CONFIG_BT_HCIBFUSB is not set -# CONFIG_BT_HCIVHCI is not set -CONFIG_BT_MRVL=m -CONFIG_BT_MRVL_SDIO=m -CONFIG_BT_ATH3K=m -CONFIG_BT_WILINK=m -CONFIG_BT_QCOMSMD=m -CONFIG_BT_HCIRSI=m -CONFIG_AF_RXRPC=m -CONFIG_AF_RXRPC_IPV6=y -# CONFIG_AF_RXRPC_INJECT_LOSS is not set -# CONFIG_AF_RXRPC_DEBUG is not set -CONFIG_RXKAD=y -# CONFIG_AF_KCM is not set -CONFIG_FIB_RULES=y -CONFIG_WIRELESS=y -CONFIG_WIRELESS_EXT=y -CONFIG_WEXT_CORE=y -CONFIG_WEXT_PROC=y -CONFIG_WEXT_SPY=y -CONFIG_WEXT_PRIV=y -CONFIG_CFG80211=m -# CONFIG_NL80211_TESTMODE is not set -# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set -# CONFIG_CFG80211_CERTIFICATION_ONUS is not set -CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y -CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y -CONFIG_CFG80211_DEFAULT_PS=y -# CONFIG_CFG80211_DEBUGFS is not set -CONFIG_CFG80211_CRDA_SUPPORT=y -CONFIG_CFG80211_WEXT=y -CONFIG_CFG80211_WEXT_EXPORT=y -CONFIG_LIB80211=m -CONFIG_LIB80211_CRYPT_WEP=m -CONFIG_LIB80211_CRYPT_CCMP=m -CONFIG_LIB80211_CRYPT_TKIP=m -# CONFIG_LIB80211_DEBUG is not set -CONFIG_MAC80211=m -CONFIG_MAC80211_HAS_RC=y -CONFIG_MAC80211_RC_MINSTREL=y -CONFIG_MAC80211_RC_MINSTREL_HT=y -# CONFIG_MAC80211_RC_MINSTREL_VHT is not set -CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y -CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" -CONFIG_MAC80211_MESH=y -CONFIG_MAC80211_LEDS=y -# CONFIG_MAC80211_DEBUGFS is not set -# CONFIG_MAC80211_MESSAGE_TRACING is not set -# CONFIG_MAC80211_DEBUG_MENU is not set -CONFIG_MAC80211_STA_HASH_MAX_SIZE=0 -CONFIG_WIMAX=m -CONFIG_WIMAX_DEBUG_LEVEL=8 -CONFIG_RFKILL=m -CONFIG_RFKILL_LEDS=y -CONFIG_RFKILL_INPUT=y -# CONFIG_RFKILL_GPIO is not set -CONFIG_NET_9P=m -CONFIG_NET_9P_VIRTIO=m -# CONFIG_NET_9P_XEN is not set -CONFIG_NET_9P_RDMA=m -# CONFIG_NET_9P_DEBUG is not set -# CONFIG_CAIF is not set -CONFIG_CEPH_LIB=m -# CONFIG_CEPH_LIB_PRETTYDEBUG is not set -# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set -CONFIG_NFC=m -CONFIG_NFC_DIGITAL=m -# CONFIG_NFC_NCI is not set -# CONFIG_NFC_HCI is not set - -# -# Near Field Communication (NFC) devices -# -# CONFIG_NFC_TRF7970A is not set -CONFIG_NFC_SIM=m -CONFIG_NFC_PORT100=m -CONFIG_NFC_PN533=m -CONFIG_NFC_PN533_USB=m -# CONFIG_NFC_PN533_I2C is not set -# CONFIG_NFC_ST95HF is not set -CONFIG_PSAMPLE=m -CONFIG_NET_IFE=m -CONFIG_LWTUNNEL=y -CONFIG_LWTUNNEL_BPF=y -CONFIG_DST_CACHE=y -CONFIG_GRO_CELLS=y -CONFIG_NET_DEVLINK=m -CONFIG_MAY_USE_DEVLINK=m -CONFIG_PAGE_POOL=y -CONFIG_FAILOVER=m -CONFIG_HAVE_EBPF_JIT=y - -# -# Device Drivers -# -CONFIG_ARM_AMBA=y -CONFIG_TEGRA_AHB=y - -# -# Generic Driver Options -# -# CONFIG_UEVENT_HELPER is not set -CONFIG_DEVTMPFS=y -# CONFIG_DEVTMPFS_MOUNT is not set -CONFIG_STANDALONE=y -CONFIG_PREVENT_FIRMWARE_BUILD=y - -# -# Firmware loader -# -CONFIG_FW_LOADER=y -CONFIG_EXTRA_FIRMWARE="" -CONFIG_FW_LOADER_USER_HELPER=y -# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set -CONFIG_WANT_DEV_COREDUMP=y -CONFIG_ALLOW_DEV_COREDUMP=y -CONFIG_DEV_COREDUMP=y -# CONFIG_DEBUG_DRIVER is not set -# CONFIG_DEBUG_DEVRES is not set -# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set -# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set -CONFIG_SYS_HYPERVISOR=y -CONFIG_GENERIC_CPU_AUTOPROBE=y -CONFIG_SOC_BUS=y -CONFIG_REGMAP=y -CONFIG_REGMAP_I2C=y -CONFIG_REGMAP_SPI=y -CONFIG_REGMAP_SPMI=y -CONFIG_REGMAP_MMIO=y -CONFIG_REGMAP_IRQ=y -CONFIG_DMA_SHARED_BUFFER=y -# CONFIG_DMA_FENCE_TRACE is not set -CONFIG_DMA_CMA=y - -# -# Default contiguous memory area size: -# -CONFIG_CMA_SIZE_MBYTES=64 -CONFIG_CMA_SIZE_SEL_MBYTES=y -# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set -# CONFIG_CMA_SIZE_SEL_MIN is not set -# CONFIG_CMA_SIZE_SEL_MAX is not set -CONFIG_CMA_ALIGNMENT=8 -CONFIG_GENERIC_ARCH_TOPOLOGY=y - -# -# Bus devices -# -# CONFIG_BRCMSTB_GISB_ARB is not set -# CONFIG_HISILICON_LPC is not set -CONFIG_QCOM_EBI2=y -# CONFIG_SIMPLE_PM_BUS is not set -CONFIG_SUNXI_RSB=y -CONFIG_TEGRA_ACONNECT=y -# CONFIG_TEGRA_GMI is not set -CONFIG_VEXPRESS_CONFIG=y -CONFIG_CONNECTOR=y -CONFIG_PROC_EVENTS=y -CONFIG_MTD=m -# CONFIG_MTD_TESTS is not set -# CONFIG_MTD_REDBOOT_PARTS is not set -# CONFIG_MTD_CMDLINE_PARTS is not set -# CONFIG_MTD_AFS_PARTS is not set -CONFIG_MTD_OF_PARTS=m -CONFIG_MTD_AR7_PARTS=m - -# -# Partition parsers -# - -# -# User Modules And Translation Layers -# -CONFIG_MTD_BLKDEVS=m -CONFIG_MTD_BLOCK=m -CONFIG_MTD_BLOCK_RO=m -# CONFIG_FTL is not set -# CONFIG_NFTL is not set -# CONFIG_INFTL is not set -CONFIG_RFD_FTL=m -CONFIG_SSFDC=m -# CONFIG_SM_FTL is not set -CONFIG_MTD_OOPS=m -CONFIG_MTD_SWAP=m -# CONFIG_MTD_PARTITIONED_MASTER is not set - -# -# RAM/ROM/Flash chip drivers -# -# CONFIG_MTD_CFI is not set -# CONFIG_MTD_JEDECPROBE is not set -CONFIG_MTD_MAP_BANK_WIDTH_1=y -CONFIG_MTD_MAP_BANK_WIDTH_2=y -CONFIG_MTD_MAP_BANK_WIDTH_4=y -CONFIG_MTD_CFI_I1=y -CONFIG_MTD_CFI_I2=y -CONFIG_MTD_RAM=m -# CONFIG_MTD_ROM is not set -# CONFIG_MTD_ABSENT is not set - -# -# Mapping drivers for chip access -# -# CONFIG_MTD_COMPLEX_MAPPINGS is not set -# CONFIG_MTD_PHYSMAP is not set -# CONFIG_MTD_PHYSMAP_OF is not set -CONFIG_MTD_INTEL_VR_NOR=m -CONFIG_MTD_PLATRAM=m - -# -# Self-contained MTD device drivers -# -# CONFIG_MTD_PMC551 is not set -CONFIG_MTD_DATAFLASH=m -# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set -# CONFIG_MTD_DATAFLASH_OTP is not set -CONFIG_MTD_M25P80=m -# CONFIG_MTD_MCHP23K256 is not set -CONFIG_MTD_SST25L=m -# CONFIG_MTD_SLRAM is not set -# CONFIG_MTD_PHRAM is not set -# CONFIG_MTD_MTDRAM is not set -# CONFIG_MTD_BLOCK2MTD is not set - -# -# Disk-On-Chip Device Drivers -# -# CONFIG_MTD_DOCG3 is not set -CONFIG_MTD_ONENAND=m -CONFIG_MTD_ONENAND_VERIFY_WRITE=y -# CONFIG_MTD_ONENAND_GENERIC is not set -# CONFIG_MTD_ONENAND_OTP is not set -CONFIG_MTD_ONENAND_2X_PROGRAM=y -# CONFIG_MTD_NAND is not set - -# -# LPDDR & LPDDR2 PCM memory drivers -# -CONFIG_MTD_LPDDR=m -CONFIG_MTD_QINFO_PROBE=m -CONFIG_MTD_SPI_NOR=m -# CONFIG_MTD_MT81xx_NOR is not set -CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y -# CONFIG_SPI_CADENCE_QUADSPI is not set -CONFIG_SPI_HISI_SFC=m -CONFIG_MTD_UBI=m -CONFIG_MTD_UBI_WL_THRESHOLD=4096 -CONFIG_MTD_UBI_BEB_LIMIT=20 -# CONFIG_MTD_UBI_FASTMAP is not set -# CONFIG_MTD_UBI_GLUEBI is not set -CONFIG_MTD_UBI_BLOCK=y -CONFIG_DTC=y -CONFIG_OF=y -# CONFIG_OF_UNITTEST is not set -CONFIG_OF_FLATTREE=y -CONFIG_OF_EARLY_FLATTREE=y -CONFIG_OF_KOBJ=y -CONFIG_OF_ADDRESS=y -CONFIG_OF_IRQ=y -CONFIG_OF_NET=y -CONFIG_OF_MDIO=m -CONFIG_OF_RESERVED_MEM=y -# CONFIG_OF_OVERLAY is not set -CONFIG_OF_NUMA=y -CONFIG_PARPORT=m -# CONFIG_PARPORT_AX88796 is not set -CONFIG_PARPORT_1284=y -CONFIG_PARPORT_NOT_PC=y -CONFIG_PNP=y -# CONFIG_PNP_DEBUG_MESSAGES is not set - -# -# Protocols -# -CONFIG_PNPACPI=y -CONFIG_BLK_DEV=y -CONFIG_BLK_DEV_NULL_BLK=m -CONFIG_CDROM=m -CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m -CONFIG_ZRAM=m -# CONFIG_ZRAM_WRITEBACK is not set -# CONFIG_ZRAM_MEMORY_TRACKING is not set -# CONFIG_BLK_DEV_DAC960 is not set -# CONFIG_BLK_DEV_UMEM is not set -CONFIG_BLK_DEV_LOOP=m -CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 -# CONFIG_BLK_DEV_CRYPTOLOOP is not set -CONFIG_BLK_DEV_DRBD=m -# CONFIG_DRBD_FAULT_INJECTION is not set -CONFIG_BLK_DEV_NBD=m -CONFIG_BLK_DEV_SKD=m -# CONFIG_BLK_DEV_SX8 is not set -CONFIG_BLK_DEV_RAM=m -CONFIG_BLK_DEV_RAM_COUNT=16 -CONFIG_BLK_DEV_RAM_SIZE=16384 -# CONFIG_CDROM_PKTCDVD is not set -CONFIG_ATA_OVER_ETH=m -CONFIG_XEN_BLKDEV_FRONTEND=m -CONFIG_XEN_BLKDEV_BACKEND=m -CONFIG_VIRTIO_BLK=m -# CONFIG_VIRTIO_BLK_SCSI is not set -CONFIG_BLK_DEV_RBD=m -# CONFIG_BLK_DEV_RSXX is not set - -# -# NVME Support -# -CONFIG_NVME_CORE=m -CONFIG_BLK_DEV_NVME=m -CONFIG_NVME_MULTIPATH=y -CONFIG_NVME_FABRICS=m -CONFIG_NVME_RDMA=m -CONFIG_NVME_FC=m -CONFIG_NVME_TARGET=m -# CONFIG_NVME_TARGET_LOOP is not set -CONFIG_NVME_TARGET_RDMA=m -CONFIG_NVME_TARGET_FC=m -# CONFIG_NVME_TARGET_FCLOOP is not set - -# -# Misc devices -# -CONFIG_SENSORS_LIS3LV02D=m -CONFIG_AD525X_DPOT=m -CONFIG_AD525X_DPOT_I2C=m -CONFIG_AD525X_DPOT_SPI=m -# CONFIG_DUMMY_IRQ is not set -# CONFIG_PHANTOM is not set -CONFIG_SGI_IOC4=m -CONFIG_TIFM_CORE=m -CONFIG_TIFM_7XX1=m -CONFIG_ICS932S401=m -CONFIG_ENCLOSURE_SERVICES=m -# CONFIG_HP_ILO is not set -CONFIG_QCOM_COINCELL=m -CONFIG_APDS9802ALS=m -CONFIG_ISL29003=m -CONFIG_ISL29020=m -CONFIG_SENSORS_TSL2550=m -CONFIG_SENSORS_BH1770=m -CONFIG_SENSORS_APDS990X=m -CONFIG_HMC6352=m -CONFIG_DS1682=m -# CONFIG_USB_SWITCH_FSA9480 is not set -# CONFIG_LATTICE_ECP3_CONFIG is not set -CONFIG_SRAM=y -CONFIG_VEXPRESS_SYSCFG=y -# CONFIG_PCI_ENDPOINT_TEST is not set -CONFIG_MISC_RTSX=m -CONFIG_C2PORT=m - -# -# EEPROM support -# -CONFIG_EEPROM_AT24=m -CONFIG_EEPROM_AT25=m -CONFIG_EEPROM_LEGACY=m -CONFIG_EEPROM_MAX6875=m -CONFIG_EEPROM_93CX6=m -# CONFIG_EEPROM_93XX46 is not set -# CONFIG_EEPROM_IDT_89HPESX is not set -CONFIG_CB710_CORE=m -# CONFIG_CB710_DEBUG is not set -CONFIG_CB710_DEBUG_ASSUMPTIONS=y - -# -# Texas Instruments shared transport line discipline -# -CONFIG_TI_ST=m -CONFIG_SENSORS_LIS3_I2C=m -CONFIG_ALTERA_STAPL=m - -# -# Intel MIC & related support -# - -# -# Intel MIC Bus Driver -# - -# -# SCIF Bus Driver -# - -# -# VOP Bus Driver -# - -# -# Intel MIC Host Driver -# - -# -# Intel MIC Card Driver -# - -# -# SCIF Driver -# - -# -# Intel MIC Coprocessor State Management (COSM) Drivers -# - -# -# VOP Driver -# -# CONFIG_GENWQE is not set -# CONFIG_ECHO is not set -CONFIG_MISC_RTSX_PCI=m -CONFIG_MISC_RTSX_USB=m - -# -# SCSI device support -# -CONFIG_SCSI_MOD=m -CONFIG_RAID_ATTRS=m -CONFIG_SCSI=m -CONFIG_SCSI_DMA=y -CONFIG_SCSI_NETLINK=y -# CONFIG_SCSI_MQ_DEFAULT is not set -# CONFIG_SCSI_PROC_FS is not set - -# -# SCSI support type (disk, tape, CD-ROM) -# -CONFIG_BLK_DEV_SD=m -CONFIG_CHR_DEV_ST=m -CONFIG_CHR_DEV_OSST=m -CONFIG_BLK_DEV_SR=m -CONFIG_BLK_DEV_SR_VENDOR=y -CONFIG_CHR_DEV_SG=m -CONFIG_CHR_DEV_SCH=m -CONFIG_SCSI_ENCLOSURE=m -CONFIG_SCSI_CONSTANTS=y -CONFIG_SCSI_LOGGING=y -CONFIG_SCSI_SCAN_ASYNC=y - -# -# SCSI Transports -# -CONFIG_SCSI_SPI_ATTRS=m -CONFIG_SCSI_FC_ATTRS=m -CONFIG_SCSI_ISCSI_ATTRS=m -CONFIG_SCSI_SAS_ATTRS=m -CONFIG_SCSI_SAS_LIBSAS=m -CONFIG_SCSI_SAS_ATA=y -CONFIG_SCSI_SAS_HOST_SMP=y -CONFIG_SCSI_SRP_ATTRS=m -CONFIG_SCSI_LOWLEVEL=y -CONFIG_ISCSI_TCP=m -CONFIG_ISCSI_BOOT_SYSFS=m -CONFIG_SCSI_CXGB3_ISCSI=m -CONFIG_SCSI_CXGB4_ISCSI=m -CONFIG_SCSI_BNX2_ISCSI=m -CONFIG_SCSI_BNX2X_FCOE=m -CONFIG_BE2ISCSI=m -CONFIG_BLK_DEV_3W_XXXX_RAID=m -CONFIG_SCSI_HPSA=m -CONFIG_SCSI_3W_9XXX=m -CONFIG_SCSI_3W_SAS=m -CONFIG_SCSI_ACARD=m -CONFIG_SCSI_AACRAID=m -CONFIG_SCSI_AIC7XXX=m -CONFIG_AIC7XXX_CMDS_PER_DEVICE=32 -CONFIG_AIC7XXX_RESET_DELAY_MS=15000 -CONFIG_AIC7XXX_DEBUG_ENABLE=y -CONFIG_AIC7XXX_DEBUG_MASK=0 -CONFIG_AIC7XXX_REG_PRETTY_PRINT=y -CONFIG_SCSI_AIC79XX=m -CONFIG_AIC79XX_CMDS_PER_DEVICE=32 -CONFIG_AIC79XX_RESET_DELAY_MS=15000 -CONFIG_AIC79XX_DEBUG_ENABLE=y -CONFIG_AIC79XX_DEBUG_MASK=0 -CONFIG_AIC79XX_REG_PRETTY_PRINT=y -CONFIG_SCSI_AIC94XX=m -# CONFIG_AIC94XX_DEBUG is not set -CONFIG_SCSI_HISI_SAS=m -CONFIG_SCSI_HISI_SAS_PCI=m -CONFIG_SCSI_MVSAS=m -# CONFIG_SCSI_MVSAS_DEBUG is not set -# CONFIG_SCSI_MVSAS_TASKLET is not set -CONFIG_SCSI_MVUMI=m -CONFIG_SCSI_ADVANSYS=m -# CONFIG_SCSI_ARCMSR is not set -CONFIG_SCSI_ESAS2R=m -# CONFIG_MEGARAID_NEWGEN is not set -# CONFIG_MEGARAID_LEGACY is not set -CONFIG_MEGARAID_SAS=m -CONFIG_SCSI_MPT3SAS=m -CONFIG_SCSI_MPT2SAS_MAX_SGE=128 -CONFIG_SCSI_MPT3SAS_MAX_SGE=128 -CONFIG_SCSI_MPT2SAS=m -CONFIG_SCSI_SMARTPQI=m -CONFIG_SCSI_UFSHCD=m -CONFIG_SCSI_UFSHCD_PCI=m -# CONFIG_SCSI_UFS_DWC_TC_PCI is not set -# CONFIG_SCSI_UFSHCD_PLATFORM is not set -CONFIG_SCSI_HPTIOP=m -CONFIG_XEN_SCSI_FRONTEND=m -CONFIG_LIBFC=m -CONFIG_LIBFCOE=m -CONFIG_FCOE=m -CONFIG_SCSI_SNIC=m -# CONFIG_SCSI_SNIC_DEBUG_FS is not set -CONFIG_SCSI_DMX3191D=m -# CONFIG_SCSI_IPS is not set -# CONFIG_SCSI_INITIO is not set -# CONFIG_SCSI_INIA100 is not set -CONFIG_SCSI_STEX=m -CONFIG_SCSI_SYM53C8XX_2=m -CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 -CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 -CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 -CONFIG_SCSI_SYM53C8XX_MMIO=y -# CONFIG_SCSI_IPR is not set -# CONFIG_SCSI_QLOGIC_1280 is not set -CONFIG_SCSI_QLA_FC=m -CONFIG_TCM_QLA2XXX=m -# CONFIG_TCM_QLA2XXX_DEBUG is not set -CONFIG_SCSI_QLA_ISCSI=m -# CONFIG_QEDI is not set -# CONFIG_QEDF is not set -CONFIG_SCSI_LPFC=m -# CONFIG_SCSI_LPFC_DEBUG_FS is not set -# CONFIG_SCSI_DC395x is not set -# CONFIG_SCSI_AM53C974 is not set -CONFIG_SCSI_WD719X=m -# CONFIG_SCSI_DEBUG is not set -CONFIG_SCSI_PMCRAID=m -CONFIG_SCSI_PM8001=m -CONFIG_SCSI_BFA_FC=m -CONFIG_SCSI_VIRTIO=m -CONFIG_SCSI_CHELSIO_FCOE=m -CONFIG_SCSI_LOWLEVEL_PCMCIA=y -CONFIG_SCSI_DH=y -CONFIG_SCSI_DH_RDAC=m -CONFIG_SCSI_DH_HP_SW=m -CONFIG_SCSI_DH_EMC=m -CONFIG_SCSI_DH_ALUA=m -CONFIG_SCSI_OSD_INITIATOR=m -CONFIG_SCSI_OSD_ULD=m -CONFIG_SCSI_OSD_DPRINT_SENSE=1 -# CONFIG_SCSI_OSD_DEBUG is not set -CONFIG_HAVE_PATA_PLATFORM=y -CONFIG_ATA=m -CONFIG_ATA_VERBOSE_ERROR=y -CONFIG_ATA_ACPI=y -CONFIG_SATA_ZPODD=y -CONFIG_SATA_PMP=y - -# -# Controllers with non-SFF native interface -# -CONFIG_SATA_AHCI=m -CONFIG_SATA_MOBILE_LPM_POLICY=0 -CONFIG_SATA_AHCI_PLATFORM=m -# CONFIG_AHCI_CEVA is not set -CONFIG_AHCI_MVEBU=m -# CONFIG_AHCI_SUNXI is not set -CONFIG_AHCI_TEGRA=m -CONFIG_AHCI_XGENE=m -# CONFIG_AHCI_QORIQ is not set -CONFIG_SATA_AHCI_SEATTLE=m -# CONFIG_SATA_INIC162X is not set -CONFIG_SATA_ACARD_AHCI=m -CONFIG_SATA_SIL24=m -CONFIG_ATA_SFF=y - -# -# SFF controllers with custom DMA interface -# -CONFIG_PDC_ADMA=m -CONFIG_SATA_QSTOR=m -CONFIG_SATA_SX4=m -CONFIG_ATA_BMDMA=y - -# -# SATA SFF controllers with BMDMA -# -CONFIG_ATA_PIIX=m -# CONFIG_SATA_DWC is not set -CONFIG_SATA_MV=m -CONFIG_SATA_NV=m -CONFIG_SATA_PROMISE=m -CONFIG_SATA_SIL=m -CONFIG_SATA_SIS=m -CONFIG_SATA_SVW=m -CONFIG_SATA_ULI=m -CONFIG_SATA_VIA=m -CONFIG_SATA_VITESSE=m - -# -# PATA SFF controllers with BMDMA -# -# CONFIG_PATA_ALI is not set -# CONFIG_PATA_AMD is not set -CONFIG_PATA_ARTOP=m -# CONFIG_PATA_ATIIXP is not set -CONFIG_PATA_ATP867X=m -CONFIG_PATA_CMD64X=m -# CONFIG_PATA_CYPRESS is not set -# CONFIG_PATA_EFAR is not set -# CONFIG_PATA_HPT366 is not set -# CONFIG_PATA_HPT37X is not set -# CONFIG_PATA_HPT3X2N is not set -# CONFIG_PATA_HPT3X3 is not set -CONFIG_PATA_IT8213=m -CONFIG_PATA_IT821X=m -CONFIG_PATA_JMICRON=m -CONFIG_PATA_MARVELL=m -# CONFIG_PATA_NETCELL is not set -CONFIG_PATA_NINJA32=m -# CONFIG_PATA_NS87415 is not set -# CONFIG_PATA_OLDPIIX is not set -# CONFIG_PATA_OPTIDMA is not set -# CONFIG_PATA_PDC2027X is not set -# CONFIG_PATA_PDC_OLD is not set -# CONFIG_PATA_RADISYS is not set -CONFIG_PATA_RDC=m -CONFIG_PATA_SCH=m -# CONFIG_PATA_SERVERWORKS is not set -# CONFIG_PATA_SIL680 is not set -CONFIG_PATA_SIS=m -CONFIG_PATA_TOSHIBA=m -# CONFIG_PATA_TRIFLEX is not set -# CONFIG_PATA_VIA is not set -# CONFIG_PATA_WINBOND is not set - -# -# PIO-only SFF controllers -# -# CONFIG_PATA_CMD640_PCI is not set -# CONFIG_PATA_MPIIX is not set -# CONFIG_PATA_NS87410 is not set -# CONFIG_PATA_OPTI is not set -# CONFIG_PATA_PLATFORM is not set -# CONFIG_PATA_RZ1000 is not set - -# -# Generic fallback / legacy drivers -# -# CONFIG_PATA_ACPI is not set -CONFIG_ATA_GENERIC=m -# CONFIG_PATA_LEGACY is not set -CONFIG_MD=y -CONFIG_BLK_DEV_MD=m -CONFIG_MD_LINEAR=m -CONFIG_MD_RAID0=m -CONFIG_MD_RAID1=m -CONFIG_MD_RAID10=m -CONFIG_MD_RAID456=m -CONFIG_MD_MULTIPATH=m -CONFIG_MD_FAULTY=m -# CONFIG_MD_CLUSTER is not set -CONFIG_BCACHE=m -# CONFIG_BCACHE_DEBUG is not set -# CONFIG_BCACHE_CLOSURES_DEBUG is not set -CONFIG_BLK_DEV_DM_BUILTIN=y -CONFIG_BLK_DEV_DM=m -# CONFIG_DM_MQ_DEFAULT is not set -# CONFIG_DM_DEBUG is not set -CONFIG_DM_BUFIO=m -# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set -CONFIG_DM_BIO_PRISON=m -CONFIG_DM_PERSISTENT_DATA=m -# CONFIG_DM_UNSTRIPED is not set -CONFIG_DM_CRYPT=m -CONFIG_DM_SNAPSHOT=m -CONFIG_DM_THIN_PROVISIONING=m -CONFIG_DM_CACHE=m -CONFIG_DM_CACHE_SMQ=m -CONFIG_DM_WRITECACHE=m -CONFIG_DM_ERA=m -CONFIG_DM_MIRROR=m -CONFIG_DM_LOG_USERSPACE=m -CONFIG_DM_RAID=m -CONFIG_DM_ZERO=m -CONFIG_DM_MULTIPATH=m -CONFIG_DM_MULTIPATH_QL=m -CONFIG_DM_MULTIPATH_ST=m -CONFIG_DM_DELAY=m -CONFIG_DM_UEVENT=y -CONFIG_DM_FLAKEY=m -CONFIG_DM_VERITY=m -# CONFIG_DM_VERITY_FEC is not set -CONFIG_DM_SWITCH=m -CONFIG_DM_LOG_WRITES=m -# CONFIG_DM_INTEGRITY is not set -CONFIG_TARGET_CORE=m -CONFIG_TCM_IBLOCK=m -CONFIG_TCM_FILEIO=m -CONFIG_TCM_PSCSI=m -CONFIG_TCM_USER2=m -CONFIG_LOOPBACK_TARGET=m -CONFIG_TCM_FC=m -CONFIG_ISCSI_TARGET=m -CONFIG_ISCSI_TARGET_CXGB4=m -CONFIG_SBP_TARGET=m -CONFIG_FUSION=y -CONFIG_FUSION_SPI=m -CONFIG_FUSION_FC=m -CONFIG_FUSION_SAS=m -CONFIG_FUSION_MAX_SGE=128 -CONFIG_FUSION_CTL=m -# CONFIG_FUSION_LOGGING is not set - -# -# IEEE 1394 (FireWire) support -# -CONFIG_FIREWIRE=m -CONFIG_FIREWIRE_OHCI=m -CONFIG_FIREWIRE_SBP2=m -CONFIG_FIREWIRE_NET=m -CONFIG_FIREWIRE_NOSY=m -CONFIG_NETDEVICES=y -CONFIG_MII=m -CONFIG_NET_CORE=y -CONFIG_BONDING=m -CONFIG_DUMMY=m -CONFIG_EQUALIZER=m -# CONFIG_NET_FC is not set -CONFIG_IFB=m -CONFIG_NET_TEAM=m -CONFIG_NET_TEAM_MODE_BROADCAST=m -CONFIG_NET_TEAM_MODE_ROUNDROBIN=m -CONFIG_NET_TEAM_MODE_RANDOM=m -CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m -CONFIG_NET_TEAM_MODE_LOADBALANCE=m -CONFIG_MACVLAN=m -CONFIG_MACVTAP=m -CONFIG_IPVLAN=m -CONFIG_IPVTAP=m -CONFIG_VXLAN=m -CONFIG_GENEVE=m -CONFIG_GTP=m -CONFIG_MACSEC=m -CONFIG_NETCONSOLE=m -CONFIG_NETCONSOLE_DYNAMIC=y -CONFIG_NETPOLL=y -CONFIG_NET_POLL_CONTROLLER=y -CONFIG_TUN=m -CONFIG_TAP=m -# CONFIG_TUN_VNET_CROSS_LE is not set -CONFIG_VETH=m -CONFIG_VIRTIO_NET=m -CONFIG_NLMON=m -CONFIG_NET_VRF=m -# CONFIG_VSOCKMON is not set -# CONFIG_ARCNET is not set -CONFIG_ATM_DRIVERS=y -CONFIG_ATM_DUMMY=m -# CONFIG_ATM_TCP is not set -# CONFIG_ATM_LANAI is not set -# CONFIG_ATM_ENI is not set -CONFIG_ATM_NICSTAR=m -CONFIG_ATM_NICSTAR_USE_SUNI=y -CONFIG_ATM_NICSTAR_USE_IDT77105=y -# CONFIG_ATM_IDT77252 is not set -CONFIG_ATM_IA=m -# CONFIG_ATM_IA_DEBUG is not set -CONFIG_ATM_FORE200E=m -# CONFIG_ATM_FORE200E_USE_TASKLET is not set -CONFIG_ATM_FORE200E_TX_RETRY=16 -CONFIG_ATM_FORE200E_DEBUG=0 -# CONFIG_ATM_HE is not set -CONFIG_ATM_SOLOS=m - -# -# CAIF transport drivers -# - -# -# Distributed Switch Architecture drivers -# -# CONFIG_B53 is not set -# CONFIG_NET_DSA_BCM_SF2 is not set -# CONFIG_NET_DSA_LOOP is not set -# CONFIG_NET_DSA_MT7530 is not set -CONFIG_NET_DSA_MV88E6060=m -# CONFIG_MICROCHIP_KSZ is not set -CONFIG_NET_DSA_MV88E6XXX=m -CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y -# CONFIG_NET_DSA_MV88E6XXX_PTP is not set -# CONFIG_NET_DSA_QCA8K is not set -# CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set -# CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set -CONFIG_ETHERNET=y -CONFIG_MDIO=m -CONFIG_NET_VENDOR_3COM=y -CONFIG_VORTEX=m -CONFIG_TYPHOON=m -CONFIG_NET_VENDOR_ADAPTEC=y -CONFIG_ADAPTEC_STARFIRE=m -CONFIG_NET_VENDOR_AGERE=y -CONFIG_ET131X=m -CONFIG_NET_VENDOR_ALACRITECH=y -# CONFIG_SLICOSS is not set -CONFIG_NET_VENDOR_ALLWINNER=y -# CONFIG_SUN4I_EMAC is not set -CONFIG_NET_VENDOR_ALTEON=y -CONFIG_ACENIC=m -# CONFIG_ACENIC_OMIT_TIGON_I is not set -# CONFIG_ALTERA_TSE is not set -CONFIG_NET_VENDOR_AMAZON=y -CONFIG_NET_VENDOR_AMD=y -# CONFIG_AMD8111_ETH is not set -CONFIG_PCNET32=m -CONFIG_AMD_XGBE=m -# CONFIG_AMD_XGBE_DCB is not set -CONFIG_NET_XGENE=m -CONFIG_NET_XGENE_V2=m -CONFIG_NET_VENDOR_AQUANTIA=y -# CONFIG_NET_VENDOR_ARC is not set -CONFIG_NET_VENDOR_ATHEROS=y -CONFIG_ATL2=m -CONFIG_ATL1=m -CONFIG_ATL1E=m -CONFIG_ATL1C=m -CONFIG_ALX=m -# CONFIG_NET_VENDOR_AURORA is not set -CONFIG_NET_VENDOR_BROADCOM=y -# CONFIG_B44 is not set -# CONFIG_BCMGENET is not set -CONFIG_BNX2=m -CONFIG_CNIC=m -CONFIG_TIGON3=m -CONFIG_TIGON3_HWMON=y -CONFIG_BNX2X=m -CONFIG_BNX2X_SRIOV=y -# CONFIG_SYSTEMPORT is not set -CONFIG_BNXT=m -CONFIG_BNXT_SRIOV=y -CONFIG_BNXT_FLOWER_OFFLOAD=y -# CONFIG_BNXT_DCB is not set -CONFIG_NET_VENDOR_BROCADE=y -CONFIG_BNA=m -CONFIG_NET_CADENCE=y -# CONFIG_MACB is not set -CONFIG_NET_VENDOR_CAVIUM=y -CONFIG_THUNDER_NIC_PF=m -CONFIG_THUNDER_NIC_VF=m -CONFIG_THUNDER_NIC_BGX=m -CONFIG_THUNDER_NIC_RGX=m -CONFIG_CAVIUM_PTP=y -CONFIG_LIQUIDIO=m -# CONFIG_LIQUIDIO_VF is not set -CONFIG_NET_VENDOR_CHELSIO=y -CONFIG_CHELSIO_T1=m -CONFIG_CHELSIO_T1_1G=y -CONFIG_CHELSIO_T3=m -CONFIG_CHELSIO_T4=m -CONFIG_CHELSIO_T4_DCB=y -CONFIG_CHELSIO_T4_FCOE=y -CONFIG_CHELSIO_T4VF=m -CONFIG_CHELSIO_LIB=m -CONFIG_NET_VENDOR_CISCO=y -CONFIG_ENIC=m -CONFIG_NET_VENDOR_CORTINA=y -# CONFIG_GEMINI_ETHERNET is not set -# CONFIG_DNET is not set -CONFIG_NET_VENDOR_DEC=y -CONFIG_NET_TULIP=y -CONFIG_DE2104X=m -CONFIG_DE2104X_DSL=0 -CONFIG_TULIP=m -# CONFIG_TULIP_MWI is not set -# CONFIG_TULIP_MMIO is not set -CONFIG_TULIP_NAPI=y -CONFIG_TULIP_NAPI_HW_MITIGATION=y -CONFIG_WINBOND_840=m -CONFIG_DM9102=m -CONFIG_ULI526X=m -CONFIG_NET_VENDOR_DLINK=y -CONFIG_DL2K=m -CONFIG_SUNDANCE=m -# CONFIG_SUNDANCE_MMIO is not set -CONFIG_NET_VENDOR_EMULEX=y -CONFIG_BE2NET=m -CONFIG_BE2NET_HWMON=y -CONFIG_NET_VENDOR_EZCHIP=y -# CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set -CONFIG_NET_VENDOR_HISILICON=y -CONFIG_HIX5HD2_GMAC=m -CONFIG_HISI_FEMAC=m -CONFIG_HIP04_ETH=m -CONFIG_HNS_MDIO=m -CONFIG_HNS=m -CONFIG_HNS_DSAF=m -CONFIG_HNS_ENET=m -# CONFIG_HNS3 is not set -CONFIG_NET_VENDOR_HP=y -# CONFIG_HP100 is not set -CONFIG_NET_VENDOR_HUAWEI=y -CONFIG_HINIC=m -CONFIG_NET_VENDOR_I825XX=y -CONFIG_NET_VENDOR_INTEL=y -CONFIG_E100=m -CONFIG_E1000=m -CONFIG_E1000E=m -CONFIG_IGB=m -CONFIG_IGB_HWMON=y -CONFIG_IGBVF=m -CONFIG_IXGB=m -CONFIG_IXGBE=m -CONFIG_IXGBE_HWMON=y -CONFIG_IXGBE_DCB=y -CONFIG_IXGBEVF=m -CONFIG_I40E=m -CONFIG_I40E_DCB=y -CONFIG_I40EVF=m -CONFIG_ICE=m -# CONFIG_FM10K is not set -CONFIG_NET_VENDOR_EXAR=y -CONFIG_S2IO=m -CONFIG_VXGE=m -# CONFIG_VXGE_DEBUG_TRACE_ALL is not set -CONFIG_JME=m -CONFIG_NET_VENDOR_MARVELL=y -CONFIG_MVMDIO=m -CONFIG_MVNETA=m -CONFIG_MVPP2=m -CONFIG_SKGE=m -# CONFIG_SKGE_DEBUG is not set -CONFIG_SKGE_GENESIS=y -CONFIG_SKY2=m -# CONFIG_SKY2_DEBUG is not set -CONFIG_NET_VENDOR_MELLANOX=y -CONFIG_MLX4_EN=m -CONFIG_MLX4_EN_DCB=y -CONFIG_MLX4_CORE=m -CONFIG_MLX4_DEBUG=y -CONFIG_MLX4_CORE_GEN2=y -CONFIG_MLX5_CORE=m -# CONFIG_MLX5_FPGA is not set -CONFIG_MLX5_CORE_EN=y -CONFIG_MLX5_MPFS=y -CONFIG_MLX5_ESWITCH=y -CONFIG_MLX5_CORE_EN_DCB=y -# CONFIG_MLX5_CORE_IPOIB is not set -# CONFIG_MLXSW_CORE is not set -# CONFIG_MLXFW is not set -CONFIG_NET_VENDOR_MICREL=y -# CONFIG_KS8842 is not set -# CONFIG_KS8851 is not set -# CONFIG_KS8851_MLL is not set -CONFIG_KSZ884X_PCI=m -CONFIG_NET_VENDOR_MICROCHIP=y -# CONFIG_ENC28J60 is not set -# CONFIG_ENCX24J600 is not set -# CONFIG_LAN743X is not set -CONFIG_NET_VENDOR_MICROSEMI=y -CONFIG_MSCC_OCELOT_SWITCH=m -CONFIG_MSCC_OCELOT_SWITCH_OCELOT=m -CONFIG_NET_VENDOR_MYRI=y -CONFIG_MYRI10GE=m -CONFIG_FEALNX=m -CONFIG_NET_VENDOR_NATSEMI=y -CONFIG_NATSEMI=m -CONFIG_NS83820=m -CONFIG_NET_VENDOR_NETRONOME=y -CONFIG_NFP=m -CONFIG_NFP_APP_FLOWER=y -CONFIG_NFP_APP_ABM_NIC=y -# CONFIG_NFP_DEBUG is not set -CONFIG_NET_VENDOR_NI=y -CONFIG_NET_VENDOR_8390=y -CONFIG_NE2K_PCI=m -CONFIG_NET_VENDOR_NVIDIA=y -# CONFIG_FORCEDETH is not set -CONFIG_NET_VENDOR_OKI=y -# CONFIG_ETHOC is not set -CONFIG_NET_PACKET_ENGINE=y -CONFIG_HAMACHI=m -CONFIG_YELLOWFIN=m -CONFIG_NET_VENDOR_QLOGIC=y -CONFIG_QLA3XXX=m -CONFIG_QLCNIC=m -CONFIG_QLCNIC_SRIOV=y -CONFIG_QLCNIC_DCB=y -CONFIG_QLCNIC_HWMON=y -CONFIG_QLGE=m -CONFIG_NETXEN_NIC=m -CONFIG_QED=m -CONFIG_QED_LL2=y -CONFIG_QED_SRIOV=y -CONFIG_QEDE=m -CONFIG_QED_RDMA=y -CONFIG_QED_OOO=y -CONFIG_NET_VENDOR_QUALCOMM=y -# CONFIG_QCA7000_SPI is not set -# CONFIG_QCA7000_UART is not set -CONFIG_QCOM_EMAC=m -# CONFIG_RMNET is not set -CONFIG_NET_VENDOR_RDC=y -CONFIG_R6040=m -CONFIG_NET_VENDOR_REALTEK=y -CONFIG_8139CP=m -CONFIG_8139TOO=m -# CONFIG_8139TOO_PIO is not set -CONFIG_8139TOO_TUNE_TWISTER=y -CONFIG_8139TOO_8129=y -# CONFIG_8139_OLD_RX_RESET is not set -CONFIG_R8169=m -CONFIG_NET_VENDOR_RENESAS=y -CONFIG_NET_VENDOR_ROCKER=y -# CONFIG_ROCKER is not set -CONFIG_NET_VENDOR_SAMSUNG=y -# CONFIG_SXGBE_ETH is not set -# CONFIG_NET_VENDOR_SEEQ is not set -CONFIG_NET_VENDOR_SOLARFLARE=y -CONFIG_SFC=m -CONFIG_SFC_MTD=y -CONFIG_SFC_MCDI_MON=y -CONFIG_SFC_SRIOV=y -CONFIG_SFC_MCDI_LOGGING=y -CONFIG_SFC_FALCON=m -CONFIG_SFC_FALCON_MTD=y -CONFIG_NET_VENDOR_SILAN=y -CONFIG_SC92031=m -CONFIG_NET_VENDOR_SIS=y -# CONFIG_SIS900 is not set -CONFIG_SIS190=m -CONFIG_NET_VENDOR_SMSC=y -CONFIG_SMC91X=m -CONFIG_EPIC100=m -CONFIG_SMSC911X=m -CONFIG_SMSC9420=m -CONFIG_NET_VENDOR_SOCIONEXT=y -CONFIG_SNI_NETSEC=m -CONFIG_NET_VENDOR_STMICRO=y -CONFIG_STMMAC_ETH=m -CONFIG_STMMAC_PLATFORM=m -# CONFIG_DWMAC_DWC_QOS_ETH is not set -CONFIG_DWMAC_GENERIC=m -CONFIG_DWMAC_IPQ806X=m -CONFIG_DWMAC_MESON=m -CONFIG_DWMAC_ROCKCHIP=m -CONFIG_DWMAC_SUNXI=m -CONFIG_DWMAC_SUN8I=m -# CONFIG_STMMAC_PCI is not set -CONFIG_NET_VENDOR_SUN=y -# CONFIG_HAPPYMEAL is not set -# CONFIG_SUNGEM is not set -CONFIG_CASSINI=m -CONFIG_NIU=m -CONFIG_NET_VENDOR_SYNOPSYS=y -# CONFIG_DWC_XLGMAC is not set -CONFIG_NET_VENDOR_TEHUTI=y -CONFIG_TEHUTI=m -CONFIG_NET_VENDOR_TI=y -# CONFIG_TI_CPSW_ALE is not set -CONFIG_TLAN=m -CONFIG_NET_VENDOR_VIA=y -# CONFIG_VIA_RHINE is not set -CONFIG_VIA_VELOCITY=m -CONFIG_NET_VENDOR_WIZNET=y -# CONFIG_WIZNET_W5100 is not set -# CONFIG_WIZNET_W5300 is not set -CONFIG_FDDI=y -CONFIG_DEFXX=m -# CONFIG_DEFXX_MMIO is not set -CONFIG_SKFP=m -# CONFIG_HIPPI is not set -# CONFIG_NET_SB1000 is not set -CONFIG_MDIO_DEVICE=m -CONFIG_MDIO_BUS=m -# CONFIG_MDIO_BCM_UNIMAC is not set -# CONFIG_MDIO_BITBANG is not set -CONFIG_MDIO_BUS_MUX=m -# CONFIG_MDIO_BUS_MUX_GPIO is not set -CONFIG_MDIO_BUS_MUX_MMIOREG=m -CONFIG_MDIO_CAVIUM=m -CONFIG_MDIO_HISI_FEMAC=m -CONFIG_MDIO_MSCC_MIIM=m -# CONFIG_MDIO_OCTEON is not set -# CONFIG_MDIO_SUN4I is not set -CONFIG_MDIO_THUNDER=m -CONFIG_MDIO_XGENE=m -CONFIG_PHYLINK=m -CONFIG_PHYLIB=m -CONFIG_SWPHY=y -# CONFIG_LED_TRIGGER_PHY is not set - -# -# MII PHY device drivers -# -# CONFIG_SFP is not set -CONFIG_AMD_PHY=m -CONFIG_AQUANTIA_PHY=m -CONFIG_ASIX_PHY=m -CONFIG_AT803X_PHY=m -# CONFIG_BCM7XXX_PHY is not set -CONFIG_BCM87XX_PHY=m -CONFIG_BCM_NET_PHYLIB=m -CONFIG_BROADCOM_PHY=m -CONFIG_CICADA_PHY=m -# CONFIG_CORTINA_PHY is not set -CONFIG_DAVICOM_PHY=m -# CONFIG_DP83822_PHY is not set -CONFIG_DP83TC811_PHY=m -CONFIG_DP83848_PHY=m -CONFIG_DP83867_PHY=m -CONFIG_FIXED_PHY=m -CONFIG_ICPLUS_PHY=m -# CONFIG_INTEL_XWAY_PHY is not set -CONFIG_LSI_ET1011C_PHY=m -CONFIG_LXT_PHY=m -CONFIG_MARVELL_PHY=m -CONFIG_MARVELL_10G_PHY=m -CONFIG_MESON_GXL_PHY=m -CONFIG_MICREL_PHY=m -CONFIG_MICROCHIP_PHY=m -CONFIG_MICROCHIP_T1_PHY=m -CONFIG_MICROSEMI_PHY=m -CONFIG_NATIONAL_PHY=m -CONFIG_QSEMI_PHY=m -CONFIG_REALTEK_PHY=m -# CONFIG_RENESAS_PHY is not set -# CONFIG_ROCKCHIP_PHY is not set -CONFIG_SMSC_PHY=m -CONFIG_STE10XP=m -CONFIG_TERANETICS_PHY=m -CONFIG_VITESSE_PHY=m -# CONFIG_XILINX_GMII2RGMII is not set -# CONFIG_MICREL_KS8995MA is not set -# CONFIG_PLIP is not set -CONFIG_PPP=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_FILTER=y -CONFIG_PPP_MPPE=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPPOATM=m -CONFIG_PPPOE=m -CONFIG_PPTP=m -CONFIG_PPPOL2TP=m -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_SLIP=m -CONFIG_SLHC=m -CONFIG_SLIP_COMPRESSED=y -CONFIG_SLIP_SMART=y -CONFIG_SLIP_MODE_SLIP6=y - -# -# Host-side USB support is needed for USB Network Adapter support -# -CONFIG_USB_NET_DRIVERS=m -CONFIG_USB_CATC=m -CONFIG_USB_KAWETH=m -CONFIG_USB_PEGASUS=m -CONFIG_USB_RTL8150=m -CONFIG_USB_RTL8152=m -CONFIG_USB_LAN78XX=m -CONFIG_USB_USBNET=m -CONFIG_USB_NET_AX8817X=m -CONFIG_USB_NET_AX88179_178A=m -CONFIG_USB_NET_CDCETHER=m -CONFIG_USB_NET_CDC_EEM=m -CONFIG_USB_NET_CDC_NCM=m -CONFIG_USB_NET_HUAWEI_CDC_NCM=m -CONFIG_USB_NET_CDC_MBIM=m -CONFIG_USB_NET_DM9601=m -CONFIG_USB_NET_SR9700=m -CONFIG_USB_NET_SR9800=m -CONFIG_USB_NET_SMSC75XX=m -CONFIG_USB_NET_SMSC95XX=m -CONFIG_USB_NET_GL620A=m -CONFIG_USB_NET_NET1080=m -CONFIG_USB_NET_PLUSB=m -CONFIG_USB_NET_MCS7830=m -CONFIG_USB_NET_RNDIS_HOST=m -CONFIG_USB_NET_CDC_SUBSET_ENABLE=m -CONFIG_USB_NET_CDC_SUBSET=m -CONFIG_USB_ALI_M5632=y -CONFIG_USB_AN2720=y -CONFIG_USB_BELKIN=y -CONFIG_USB_ARMLINUX=y -CONFIG_USB_EPSON2888=y -CONFIG_USB_KC2190=y -CONFIG_USB_NET_ZAURUS=m -CONFIG_USB_NET_CX82310_ETH=m -CONFIG_USB_NET_KALMIA=m -CONFIG_USB_NET_QMI_WWAN=m -CONFIG_USB_HSO=m -CONFIG_USB_NET_INT51X1=m -CONFIG_USB_CDC_PHONET=m -CONFIG_USB_IPHETH=m -CONFIG_USB_SIERRA_NET=m -CONFIG_USB_VL600=m -CONFIG_USB_NET_CH9200=m -CONFIG_WLAN=y -# CONFIG_WIRELESS_WDS is not set -CONFIG_WLAN_VENDOR_ADMTEK=y -CONFIG_ADM8211=m -CONFIG_ATH_COMMON=m -CONFIG_WLAN_VENDOR_ATH=y -# CONFIG_ATH_DEBUG is not set -CONFIG_ATH5K=m -# CONFIG_ATH5K_DEBUG is not set -# CONFIG_ATH5K_TRACER is not set -CONFIG_ATH5K_PCI=y -CONFIG_ATH9K_HW=m -CONFIG_ATH9K_COMMON=m -CONFIG_ATH9K_BTCOEX_SUPPORT=y -CONFIG_ATH9K=m -CONFIG_ATH9K_PCI=y -# CONFIG_ATH9K_AHB is not set -# CONFIG_ATH9K_DEBUGFS is not set -# CONFIG_ATH9K_DYNACK is not set -# CONFIG_ATH9K_WOW is not set -CONFIG_ATH9K_RFKILL=y -# CONFIG_ATH9K_CHANNEL_CONTEXT is not set -CONFIG_ATH9K_PCOEM=y -CONFIG_ATH9K_HTC=m -# CONFIG_ATH9K_HTC_DEBUGFS is not set -# CONFIG_ATH9K_HWRNG is not set -CONFIG_CARL9170=m -CONFIG_CARL9170_LEDS=y -CONFIG_CARL9170_WPC=y -# CONFIG_CARL9170_HWRNG is not set -CONFIG_ATH6KL=m -CONFIG_ATH6KL_SDIO=m -CONFIG_ATH6KL_USB=m -# CONFIG_ATH6KL_DEBUG is not set -# CONFIG_ATH6KL_TRACING is not set -CONFIG_AR5523=m -CONFIG_WIL6210=m -CONFIG_WIL6210_ISR_COR=y -CONFIG_WIL6210_TRACING=y -CONFIG_WIL6210_DEBUGFS=y -CONFIG_ATH10K=m -CONFIG_ATH10K_CE=y -CONFIG_ATH10K_PCI=m -# CONFIG_ATH10K_AHB is not set -# CONFIG_ATH10K_SDIO is not set -# CONFIG_ATH10K_USB is not set -# CONFIG_ATH10K_SNOC is not set -# CONFIG_ATH10K_DEBUG is not set -# CONFIG_ATH10K_DEBUGFS is not set -# CONFIG_ATH10K_TRACING is not set -CONFIG_WCN36XX=m -# CONFIG_WCN36XX_DEBUGFS is not set -CONFIG_WLAN_VENDOR_ATMEL=y -# CONFIG_ATMEL is not set -CONFIG_AT76C50X_USB=m -CONFIG_WLAN_VENDOR_BROADCOM=y -CONFIG_B43=m -CONFIG_B43_BCMA=y -CONFIG_B43_SSB=y -CONFIG_B43_BUSES_BCMA_AND_SSB=y -# CONFIG_B43_BUSES_BCMA is not set -# CONFIG_B43_BUSES_SSB is not set -CONFIG_B43_PCI_AUTOSELECT=y -CONFIG_B43_PCICORE_AUTOSELECT=y -CONFIG_B43_SDIO=y -CONFIG_B43_BCMA_PIO=y -CONFIG_B43_PIO=y -CONFIG_B43_PHY_G=y -CONFIG_B43_PHY_N=y -CONFIG_B43_PHY_LP=y -CONFIG_B43_PHY_HT=y -CONFIG_B43_LEDS=y -CONFIG_B43_HWRNG=y -# CONFIG_B43_DEBUG is not set -CONFIG_B43LEGACY=m -CONFIG_B43LEGACY_PCI_AUTOSELECT=y -CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y -CONFIG_B43LEGACY_LEDS=y -CONFIG_B43LEGACY_HWRNG=y -CONFIG_B43LEGACY_DEBUG=y -CONFIG_B43LEGACY_DMA=y -CONFIG_B43LEGACY_PIO=y -CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y -# CONFIG_B43LEGACY_DMA_MODE is not set -# CONFIG_B43LEGACY_PIO_MODE is not set -CONFIG_BRCMUTIL=m -CONFIG_BRCMSMAC=m -CONFIG_BRCMFMAC=m -CONFIG_BRCMFMAC_PROTO_BCDC=y -CONFIG_BRCMFMAC_PROTO_MSGBUF=y -CONFIG_BRCMFMAC_SDIO=y -CONFIG_BRCMFMAC_USB=y -CONFIG_BRCMFMAC_PCIE=y -# CONFIG_BRCM_TRACING is not set -# CONFIG_BRCMDBG is not set -CONFIG_WLAN_VENDOR_CISCO=y -CONFIG_WLAN_VENDOR_INTEL=y -# CONFIG_IPW2100 is not set -CONFIG_IPW2200=m -CONFIG_IPW2200_MONITOR=y -CONFIG_IPW2200_RADIOTAP=y -CONFIG_IPW2200_PROMISCUOUS=y -CONFIG_IPW2200_QOS=y -# CONFIG_IPW2200_DEBUG is not set -CONFIG_LIBIPW=m -# CONFIG_LIBIPW_DEBUG is not set -CONFIG_IWLEGACY=m -CONFIG_IWL4965=m -CONFIG_IWL3945=m - -# -# iwl3945 / iwl4965 Debugging Options -# -# CONFIG_IWLEGACY_DEBUG is not set -CONFIG_IWLWIFI=m -CONFIG_IWLWIFI_LEDS=y -CONFIG_IWLDVM=m -CONFIG_IWLMVM=m -CONFIG_IWLWIFI_OPMODE_MODULAR=y -# CONFIG_IWLWIFI_BCAST_FILTERING is not set -# CONFIG_IWLWIFI_PCIE_RTPM is not set - -# -# Debugging Options -# -# CONFIG_IWLWIFI_DEBUG is not set -# CONFIG_IWLWIFI_DEVICE_TRACING is not set -CONFIG_WLAN_VENDOR_INTERSIL=y -CONFIG_HOSTAP=m -CONFIG_HOSTAP_FIRMWARE=y -# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set -CONFIG_HOSTAP_PLX=m -CONFIG_HOSTAP_PCI=m -# CONFIG_HERMES is not set -CONFIG_P54_COMMON=m -CONFIG_P54_USB=m -CONFIG_P54_PCI=m -# CONFIG_P54_SPI is not set -CONFIG_P54_LEDS=y -# CONFIG_PRISM54 is not set -CONFIG_WLAN_VENDOR_MARVELL=y -CONFIG_LIBERTAS=m -CONFIG_LIBERTAS_USB=m -CONFIG_LIBERTAS_SDIO=m -# CONFIG_LIBERTAS_SPI is not set -# CONFIG_LIBERTAS_DEBUG is not set -CONFIG_LIBERTAS_MESH=y -CONFIG_LIBERTAS_THINFIRM=m -# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set -CONFIG_LIBERTAS_THINFIRM_USB=m -# CONFIG_MWIFIEX is not set -CONFIG_MWL8K=m -CONFIG_WLAN_VENDOR_MEDIATEK=y -CONFIG_MT7601U=m -# CONFIG_MT76x2E is not set -CONFIG_WLAN_VENDOR_RALINK=y -CONFIG_RT2X00=m -CONFIG_RT2400PCI=m -CONFIG_RT2500PCI=m -CONFIG_RT61PCI=m -CONFIG_RT2800PCI=m -CONFIG_RT2800PCI_RT33XX=y -CONFIG_RT2800PCI_RT35XX=y -CONFIG_RT2800PCI_RT53XX=y -CONFIG_RT2800PCI_RT3290=y -CONFIG_RT2500USB=m -CONFIG_RT73USB=m -CONFIG_RT2800USB=m -CONFIG_RT2800USB_RT33XX=y -CONFIG_RT2800USB_RT35XX=y -CONFIG_RT2800USB_RT3573=y -CONFIG_RT2800USB_RT53XX=y -CONFIG_RT2800USB_RT55XX=y -# CONFIG_RT2800USB_UNKNOWN is not set -CONFIG_RT2800_LIB=m -CONFIG_RT2800_LIB_MMIO=m -CONFIG_RT2X00_LIB_MMIO=m -CONFIG_RT2X00_LIB_PCI=m -CONFIG_RT2X00_LIB_USB=m -CONFIG_RT2X00_LIB=m -CONFIG_RT2X00_LIB_FIRMWARE=y -CONFIG_RT2X00_LIB_CRYPTO=y -CONFIG_RT2X00_LIB_LEDS=y -# CONFIG_RT2X00_DEBUG is not set -CONFIG_WLAN_VENDOR_REALTEK=y -CONFIG_RTL8180=m -CONFIG_RTL8187=m -CONFIG_RTL8187_LEDS=y -CONFIG_RTL_CARDS=m -CONFIG_RTL8192CE=m -CONFIG_RTL8192SE=m -CONFIG_RTL8192DE=m -CONFIG_RTL8723AE=m -CONFIG_RTL8723BE=m -CONFIG_RTL8188EE=m -CONFIG_RTL8192EE=m -CONFIG_RTL8821AE=m -CONFIG_RTL8192CU=m -CONFIG_RTLWIFI=m -CONFIG_RTLWIFI_PCI=m -CONFIG_RTLWIFI_USB=m -# CONFIG_RTLWIFI_DEBUG is not set -CONFIG_RTL8192C_COMMON=m -CONFIG_RTL8723_COMMON=m -CONFIG_RTLBTCOEXIST=m -CONFIG_RTL8XXXU=m -# CONFIG_RTL8XXXU_UNTESTED is not set -CONFIG_WLAN_VENDOR_RSI=y -CONFIG_RSI_91X=m -CONFIG_RSI_DEBUGFS=y -# CONFIG_RSI_SDIO is not set -CONFIG_RSI_USB=m -CONFIG_RSI_COEX=y -CONFIG_WLAN_VENDOR_ST=y -# CONFIG_CW1200 is not set -CONFIG_WLAN_VENDOR_TI=y -CONFIG_WL1251=m -CONFIG_WL1251_SPI=m -CONFIG_WL1251_SDIO=m -CONFIG_WL12XX=m -CONFIG_WL18XX=m -CONFIG_WLCORE=m -CONFIG_WLCORE_SPI=m -CONFIG_WLCORE_SDIO=m -CONFIG_WILINK_PLATFORM_DATA=y -CONFIG_WLAN_VENDOR_ZYDAS=y -# CONFIG_USB_ZD1201 is not set -CONFIG_ZD1211RW=m -# CONFIG_ZD1211RW_DEBUG is not set -CONFIG_WLAN_VENDOR_QUANTENNA=y -# CONFIG_QTNFMAC_PEARL_PCIE is not set -CONFIG_MAC80211_HWSIM=m -CONFIG_USB_NET_RNDIS_WLAN=m - -# -# WiMAX Wireless Broadband devices -# -CONFIG_WIMAX_I2400M=m -CONFIG_WIMAX_I2400M_USB=m -CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 -# CONFIG_WAN is not set -CONFIG_IEEE802154_DRIVERS=m -CONFIG_IEEE802154_FAKELB=m -CONFIG_IEEE802154_AT86RF230=m -# CONFIG_IEEE802154_AT86RF230_DEBUGFS is not set -CONFIG_IEEE802154_MRF24J40=m -CONFIG_IEEE802154_CC2520=m -CONFIG_IEEE802154_ATUSB=m -CONFIG_IEEE802154_ADF7242=m -# CONFIG_IEEE802154_CA8210 is not set -CONFIG_IEEE802154_MCR20A=m -CONFIG_XEN_NETDEV_FRONTEND=m -CONFIG_XEN_NETDEV_BACKEND=m -# CONFIG_VMXNET3 is not set -# CONFIG_FUJITSU_ES is not set -# CONFIG_NETDEVSIM is not set -CONFIG_NET_FAILOVER=m -# CONFIG_ISDN is not set -# CONFIG_NVM is not set - -# -# Input device support -# -CONFIG_INPUT=y -CONFIG_INPUT_LEDS=y -CONFIG_INPUT_FF_MEMLESS=m -CONFIG_INPUT_POLLDEV=m -CONFIG_INPUT_SPARSEKMAP=m -CONFIG_INPUT_MATRIXKMAP=m - -# -# Userland interfaces -# -CONFIG_INPUT_MOUSEDEV=y -CONFIG_INPUT_MOUSEDEV_PSAUX=y -CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 -CONFIG_INPUT_JOYDEV=m -CONFIG_INPUT_EVDEV=m -# CONFIG_INPUT_EVBUG is not set - -# -# Input Device Drivers -# -CONFIG_INPUT_KEYBOARD=y -# CONFIG_KEYBOARD_ADC is not set -CONFIG_KEYBOARD_ADP5588=m -# CONFIG_KEYBOARD_ADP5589 is not set -CONFIG_KEYBOARD_ATKBD=y -# CONFIG_KEYBOARD_QT1070 is not set -CONFIG_KEYBOARD_QT2160=m -# CONFIG_KEYBOARD_DLINK_DIR685 is not set -# CONFIG_KEYBOARD_LKKBD is not set -CONFIG_KEYBOARD_GPIO=m -# CONFIG_KEYBOARD_GPIO_POLLED is not set -# CONFIG_KEYBOARD_TCA6416 is not set -# CONFIG_KEYBOARD_TCA8418 is not set -# CONFIG_KEYBOARD_MATRIX is not set -CONFIG_KEYBOARD_LM8323=m -# CONFIG_KEYBOARD_LM8333 is not set -CONFIG_KEYBOARD_MAX7359=m -# CONFIG_KEYBOARD_MCS is not set -# CONFIG_KEYBOARD_MPR121 is not set -# CONFIG_KEYBOARD_NEWTON is not set -CONFIG_KEYBOARD_TEGRA=m -CONFIG_KEYBOARD_OPENCORES=m -# CONFIG_KEYBOARD_SAMSUNG is not set -CONFIG_KEYBOARD_STOWAWAY=m -# CONFIG_KEYBOARD_SUNKBD is not set -# CONFIG_KEYBOARD_SUN4I_LRADC is not set -# CONFIG_KEYBOARD_OMAP4 is not set -# CONFIG_KEYBOARD_TM2_TOUCHKEY is not set -# CONFIG_KEYBOARD_XTKBD is not set -# CONFIG_KEYBOARD_CROS_EC is not set -# CONFIG_KEYBOARD_CAP11XX is not set -# CONFIG_KEYBOARD_BCM is not set -CONFIG_INPUT_MOUSE=y -CONFIG_MOUSE_PS2=y -CONFIG_MOUSE_PS2_ALPS=y -CONFIG_MOUSE_PS2_BYD=y -CONFIG_MOUSE_PS2_LOGIPS2PP=y -CONFIG_MOUSE_PS2_SYNAPTICS=y -CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y -CONFIG_MOUSE_PS2_CYPRESS=y -CONFIG_MOUSE_PS2_TRACKPOINT=y -CONFIG_MOUSE_PS2_ELANTECH=y -CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y -CONFIG_MOUSE_PS2_SENTELIC=y -# CONFIG_MOUSE_PS2_TOUCHKIT is not set -CONFIG_MOUSE_PS2_FOCALTECH=y -CONFIG_MOUSE_PS2_SMBUS=y -# CONFIG_MOUSE_SERIAL is not set -# CONFIG_MOUSE_APPLETOUCH is not set -# CONFIG_MOUSE_BCM5974 is not set -# CONFIG_MOUSE_CYAPA is not set -# CONFIG_MOUSE_ELAN_I2C is not set -# CONFIG_MOUSE_VSXXXAA is not set -# CONFIG_MOUSE_GPIO is not set -CONFIG_MOUSE_SYNAPTICS_I2C=m -CONFIG_MOUSE_SYNAPTICS_USB=m -# CONFIG_INPUT_JOYSTICK is not set -CONFIG_INPUT_TABLET=y -CONFIG_TABLET_USB_ACECAD=m -CONFIG_TABLET_USB_AIPTEK=m -CONFIG_TABLET_USB_GTCO=m -CONFIG_TABLET_USB_HANWANG=m -CONFIG_TABLET_USB_KBTAB=m -CONFIG_TABLET_USB_PEGASUS=m -CONFIG_TABLET_SERIAL_WACOM4=m -# CONFIG_INPUT_TOUCHSCREEN is not set -CONFIG_INPUT_MISC=y -# CONFIG_INPUT_AD714X is not set -# CONFIG_INPUT_ATMEL_CAPTOUCH is not set -# CONFIG_INPUT_BMA150 is not set -# CONFIG_INPUT_E3X0_BUTTON is not set -CONFIG_INPUT_PM8941_PWRKEY=m -# CONFIG_INPUT_PM8XXX_VIBRATOR is not set -# CONFIG_INPUT_MMA8450 is not set -# CONFIG_INPUT_GP2A is not set -# CONFIG_INPUT_GPIO_BEEPER is not set -# CONFIG_INPUT_GPIO_DECODER is not set -CONFIG_INPUT_ATI_REMOTE2=m -CONFIG_INPUT_KEYSPAN_REMOTE=m -# CONFIG_INPUT_KXTJ9 is not set -CONFIG_INPUT_POWERMATE=m -CONFIG_INPUT_YEALINK=m -CONFIG_INPUT_CM109=m -# CONFIG_INPUT_REGULATOR_HAPTIC is not set -CONFIG_INPUT_AXP20X_PEK=m -CONFIG_INPUT_UINPUT=m -# CONFIG_INPUT_PCF8574 is not set -# CONFIG_INPUT_PWM_BEEPER is not set -# CONFIG_INPUT_PWM_VIBRA is not set -# CONFIG_INPUT_RK805_PWRKEY is not set -# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set -# CONFIG_INPUT_ADXL34X is not set -# CONFIG_INPUT_IMS_PCU is not set -# CONFIG_INPUT_CMA3000 is not set -CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y -# CONFIG_INPUT_SOC_BUTTON_ARRAY is not set -# CONFIG_INPUT_DRV260X_HAPTICS is not set -# CONFIG_INPUT_DRV2665_HAPTICS is not set -# CONFIG_INPUT_DRV2667_HAPTICS is not set -CONFIG_INPUT_HISI_POWERKEY=m -CONFIG_RMI4_CORE=m -# CONFIG_RMI4_I2C is not set -# CONFIG_RMI4_SPI is not set -# CONFIG_RMI4_SMB is not set -CONFIG_RMI4_F03=y -CONFIG_RMI4_F03_SERIO=m -CONFIG_RMI4_2D_SENSOR=y -CONFIG_RMI4_F11=y -CONFIG_RMI4_F12=y -CONFIG_RMI4_F30=y -# CONFIG_RMI4_F34 is not set -# CONFIG_RMI4_F54 is not set -# CONFIG_RMI4_F55 is not set - -# -# Hardware I/O ports -# -CONFIG_SERIO=y -CONFIG_SERIO_SERPORT=y -# CONFIG_SERIO_PARKBD is not set -# CONFIG_SERIO_AMBAKMI is not set -# CONFIG_SERIO_PCIPS2 is not set -CONFIG_SERIO_LIBPS2=y -# CONFIG_SERIO_RAW is not set -CONFIG_SERIO_ALTERA_PS2=m -# CONFIG_SERIO_PS2MULT is not set -# CONFIG_SERIO_ARC_PS2 is not set -# CONFIG_SERIO_APBPS2 is not set -# CONFIG_SERIO_SUN4I_PS2 is not set -# CONFIG_SERIO_GPIO_PS2 is not set -# CONFIG_USERIO is not set -# CONFIG_GAMEPORT is not set - -# -# Character devices -# -CONFIG_TTY=y -CONFIG_VT=y -CONFIG_CONSOLE_TRANSLATIONS=y -CONFIG_VT_CONSOLE=y -CONFIG_VT_CONSOLE_SLEEP=y -CONFIG_HW_CONSOLE=y -CONFIG_VT_HW_CONSOLE_BINDING=y -CONFIG_UNIX98_PTYS=y -# CONFIG_LEGACY_PTYS is not set -# CONFIG_SERIAL_NONSTANDARD is not set -CONFIG_NOZOMI=m -CONFIG_N_GSM=m -# CONFIG_TRACE_SINK is not set -CONFIG_DEVMEM=y - -# -# Serial drivers -# -CONFIG_SERIAL_EARLYCON=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y -CONFIG_SERIAL_8250_PNP=y -# CONFIG_SERIAL_8250_FINTEK is not set -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_DMA=y -CONFIG_SERIAL_8250_PCI=y -CONFIG_SERIAL_8250_EXAR=y -CONFIG_SERIAL_8250_NR_UARTS=4 -CONFIG_SERIAL_8250_RUNTIME_UARTS=4 -CONFIG_SERIAL_8250_EXTENDED=y -# CONFIG_SERIAL_8250_MANY_PORTS is not set -# CONFIG_SERIAL_8250_ASPEED_VUART is not set -CONFIG_SERIAL_8250_SHARE_IRQ=y -# CONFIG_SERIAL_8250_DETECT_IRQ is not set -# CONFIG_SERIAL_8250_RSA is not set -CONFIG_SERIAL_8250_BCM2835AUX=y -CONFIG_SERIAL_8250_FSL=y -CONFIG_SERIAL_8250_DW=y -# CONFIG_SERIAL_8250_RT288X is not set -CONFIG_SERIAL_8250_MOXA=m -CONFIG_SERIAL_OF_PLATFORM=y - -# -# Non-8250 serial port support -# -CONFIG_SERIAL_AMBA_PL010=y -CONFIG_SERIAL_AMBA_PL010_CONSOLE=y -CONFIG_SERIAL_AMBA_PL011=y -CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -# CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST is not set -CONFIG_SERIAL_MESON=y -CONFIG_SERIAL_MESON_CONSOLE=y -CONFIG_SERIAL_TEGRA=y -# CONFIG_SERIAL_MAX3100 is not set -# CONFIG_SERIAL_MAX310X is not set -# CONFIG_SERIAL_UARTLITE is not set -CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_CORE_CONSOLE=y -# CONFIG_SERIAL_JSM is not set -CONFIG_SERIAL_MSM=y -CONFIG_SERIAL_MSM_CONSOLE=y -CONFIG_SERIAL_QCOM_GENI=m -# CONFIG_SERIAL_SCCNXP is not set -# CONFIG_SERIAL_SC16IS7XX is not set -# CONFIG_SERIAL_ALTERA_JTAGUART is not set -# CONFIG_SERIAL_ALTERA_UART is not set -# CONFIG_SERIAL_IFX6X60 is not set -# CONFIG_SERIAL_XILINX_PS_UART is not set -# CONFIG_SERIAL_ARC is not set -CONFIG_SERIAL_RP2=m -CONFIG_SERIAL_RP2_NR_UARTS=32 -# CONFIG_SERIAL_FSL_LPUART is not set -# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set -CONFIG_SERIAL_MVEBU_UART=y -CONFIG_SERIAL_MVEBU_CONSOLE=y -CONFIG_SERIAL_DEV_BUS=m -CONFIG_TTY_PRINTK=m -# CONFIG_PRINTER is not set -# CONFIG_PPDEV is not set -CONFIG_HVC_DRIVER=y -CONFIG_HVC_IRQ=y -CONFIG_HVC_XEN=y -CONFIG_HVC_XEN_FRONTEND=y -# CONFIG_HVC_DCC is not set -CONFIG_VIRTIO_CONSOLE=m -CONFIG_IPMI_HANDLER=m -CONFIG_IPMI_DMI_DECODE=y -# CONFIG_IPMI_PANIC_EVENT is not set -CONFIG_IPMI_DEVICE_INTERFACE=m -CONFIG_IPMI_SI=m -CONFIG_IPMI_SSIF=m -# CONFIG_IPMI_WATCHDOG is not set -# CONFIG_IPMI_POWEROFF is not set -CONFIG_HW_RANDOM=m -# CONFIG_HW_RANDOM_TIMERIOMEM is not set -CONFIG_HW_RANDOM_BCM2835=m -# CONFIG_HW_RANDOM_OMAP is not set -CONFIG_HW_RANDOM_VIRTIO=m -CONFIG_HW_RANDOM_HISI=m -CONFIG_HW_RANDOM_MSM=m -CONFIG_HW_RANDOM_XGENE=m -CONFIG_HW_RANDOM_MESON=m -CONFIG_HW_RANDOM_CAVIUM=m -# CONFIG_R3964 is not set -# CONFIG_APPLICOM is not set - -# -# PCMCIA character devices -# -# CONFIG_RAW_DRIVER is not set -# CONFIG_TCG_TPM is not set -CONFIG_DEVPORT=y -# CONFIG_XILLYBUS is not set - -# -# I2C support -# -CONFIG_I2C=y -CONFIG_ACPI_I2C_OPREGION=y -CONFIG_I2C_BOARDINFO=y -CONFIG_I2C_COMPAT=y -CONFIG_I2C_CHARDEV=m -CONFIG_I2C_MUX=m - -# -# Multiplexer I2C Chip support -# -# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set -# CONFIG_I2C_MUX_GPIO is not set -# CONFIG_I2C_MUX_GPMUX is not set -# CONFIG_I2C_MUX_LTC4306 is not set -# CONFIG_I2C_MUX_PCA9541 is not set -# CONFIG_I2C_MUX_PCA954x is not set -# CONFIG_I2C_MUX_PINCTRL is not set -# CONFIG_I2C_MUX_REG is not set -# CONFIG_I2C_DEMUX_PINCTRL is not set -# CONFIG_I2C_MUX_MLXCPLD is not set -CONFIG_I2C_HELPER_AUTO=y -CONFIG_I2C_SMBUS=m -CONFIG_I2C_ALGOBIT=m -CONFIG_I2C_ALGOPCA=m - -# -# I2C Hardware Bus support -# - -# -# PC SMBus host controller drivers -# -# CONFIG_I2C_ALI1535 is not set -# CONFIG_I2C_ALI1563 is not set -# CONFIG_I2C_ALI15X3 is not set -# CONFIG_I2C_AMD756 is not set -# CONFIG_I2C_AMD8111 is not set -# CONFIG_I2C_HIX5HD2 is not set -# CONFIG_I2C_I801 is not set -CONFIG_I2C_ISCH=m -# CONFIG_I2C_PIIX4 is not set -# CONFIG_I2C_NFORCE2 is not set -# CONFIG_I2C_SIS5595 is not set -# CONFIG_I2C_SIS630 is not set -# CONFIG_I2C_SIS96X is not set -# CONFIG_I2C_VIA is not set -# CONFIG_I2C_VIAPRO is not set - -# -# ACPI drivers -# -# CONFIG_I2C_SCMI is not set - -# -# I2C system bus drivers (mostly embedded / system-on-chip) -# -CONFIG_I2C_BCM2835=m -# CONFIG_I2C_CADENCE is not set -# CONFIG_I2C_CBUS_GPIO is not set -CONFIG_I2C_DESIGNWARE_CORE=m -CONFIG_I2C_DESIGNWARE_PLATFORM=m -# CONFIG_I2C_DESIGNWARE_SLAVE is not set -# CONFIG_I2C_DESIGNWARE_PCI is not set -# CONFIG_I2C_EMEV2 is not set -# CONFIG_I2C_GPIO is not set -CONFIG_I2C_MESON=m -CONFIG_I2C_MV64XXX=m -# CONFIG_I2C_NOMADIK is not set -CONFIG_I2C_OCORES=m -CONFIG_I2C_PCA_PLATFORM=m -CONFIG_I2C_PXA=m -# CONFIG_I2C_PXA_SLAVE is not set -CONFIG_I2C_QUP=m -CONFIG_I2C_RK3X=m -CONFIG_I2C_SIMTEC=m -CONFIG_I2C_SYNQUACER=m -CONFIG_I2C_TEGRA=m -CONFIG_I2C_TEGRA_BPMP=y -# CONFIG_I2C_VERSATILE is not set -CONFIG_I2C_THUNDERX=m -# CONFIG_I2C_XILINX is not set -CONFIG_I2C_XLP9XX=m - -# -# External I2C/SMBus adapter drivers -# -CONFIG_I2C_DIOLAN_U2C=m -# CONFIG_I2C_PARPORT is not set -# CONFIG_I2C_PARPORT_LIGHT is not set -CONFIG_I2C_ROBOTFUZZ_OSIF=m -CONFIG_I2C_TAOS_EVM=m -CONFIG_I2C_TINY_USB=m -CONFIG_I2C_VIPERBOARD=m - -# -# Other I2C/SMBus bus drivers -# -CONFIG_I2C_CROS_EC_TUNNEL=m -CONFIG_I2C_XGENE_SLIMPRO=m -# CONFIG_I2C_STUB is not set -# CONFIG_I2C_SLAVE is not set -# CONFIG_I2C_DEBUG_CORE is not set -# CONFIG_I2C_DEBUG_ALGO is not set -# CONFIG_I2C_DEBUG_BUS is not set -CONFIG_SPI=y -# CONFIG_SPI_DEBUG is not set -CONFIG_SPI_MASTER=y -CONFIG_SPI_MEM=y - -# -# SPI Master Controller Drivers -# -# CONFIG_SPI_ALTERA is not set -CONFIG_SPI_ARMADA_3700=m -# CONFIG_SPI_AXI_SPI_ENGINE is not set -CONFIG_SPI_BCM2835=m -CONFIG_SPI_BCM2835AUX=m -CONFIG_SPI_BITBANG=m -CONFIG_SPI_BUTTERFLY=m -# CONFIG_SPI_CADENCE is not set -# CONFIG_SPI_DESIGNWARE is not set -# CONFIG_SPI_GPIO is not set -CONFIG_SPI_LM70_LLP=m -# CONFIG_SPI_FSL_SPI is not set -# CONFIG_SPI_MESON_SPICC is not set -CONFIG_SPI_MESON_SPIFC=m -# CONFIG_SPI_OC_TINY is not set -# CONFIG_SPI_ORION is not set -# CONFIG_SPI_PL022 is not set -# CONFIG_SPI_PXA2XX is not set -# CONFIG_SPI_ROCKCHIP is not set -CONFIG_SPI_QUP=m -# CONFIG_SPI_SC18IS602 is not set -# CONFIG_SPI_SUN4I is not set -# CONFIG_SPI_SUN6I is not set -CONFIG_SPI_TEGRA114=m -CONFIG_SPI_TEGRA20_SFLASH=m -CONFIG_SPI_TEGRA20_SLINK=m -CONFIG_SPI_THUNDERX=m -# CONFIG_SPI_XCOMM is not set -# CONFIG_SPI_XILINX is not set -CONFIG_SPI_XLP=m -# CONFIG_SPI_ZYNQMP_GQSPI is not set - -# -# SPI Protocol Masters -# -# CONFIG_SPI_SPIDEV is not set -# CONFIG_SPI_LOOPBACK_TEST is not set -# CONFIG_SPI_TLE62X0 is not set -# CONFIG_SPI_SLAVE is not set -CONFIG_SPMI=y -CONFIG_SPMI_MSM_PMIC_ARB=y -# CONFIG_HSI is not set -CONFIG_PPS=y -# CONFIG_PPS_DEBUG is not set - -# -# PPS clients support -# -# CONFIG_PPS_CLIENT_KTIMER is not set -CONFIG_PPS_CLIENT_LDISC=m -CONFIG_PPS_CLIENT_PARPORT=m -# CONFIG_PPS_CLIENT_GPIO is not set - -# -# PPS generators support -# - -# -# PTP clock support -# -CONFIG_PTP_1588_CLOCK=y - -# -# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks. -# -CONFIG_PINCTRL=y -CONFIG_GENERIC_PINCTRL_GROUPS=y -CONFIG_PINMUX=y -CONFIG_GENERIC_PINMUX_FUNCTIONS=y -CONFIG_PINCONF=y -CONFIG_GENERIC_PINCONF=y -# CONFIG_DEBUG_PINCTRL is not set -CONFIG_PINCTRL_AXP209=m -CONFIG_PINCTRL_AMD=y -# CONFIG_PINCTRL_MCP23S08 is not set -CONFIG_PINCTRL_ROCKCHIP=y -CONFIG_PINCTRL_SINGLE=y -# CONFIG_PINCTRL_SX150X is not set -CONFIG_PINCTRL_MAX77620=y -# CONFIG_PINCTRL_RK805 is not set -CONFIG_PINCTRL_BCM2835=y -CONFIG_PINCTRL_MVEBU=y -CONFIG_PINCTRL_ARMADA_AP806=y -CONFIG_PINCTRL_ARMADA_CP110=y -CONFIG_PINCTRL_ARMADA_37XX=y -CONFIG_PINCTRL_MSM=y -# CONFIG_PINCTRL_APQ8064 is not set -# CONFIG_PINCTRL_APQ8084 is not set -# CONFIG_PINCTRL_IPQ4019 is not set -# CONFIG_PINCTRL_IPQ8064 is not set -# CONFIG_PINCTRL_IPQ8074 is not set -# CONFIG_PINCTRL_MSM8660 is not set -# CONFIG_PINCTRL_MSM8960 is not set -# CONFIG_PINCTRL_MDM9615 is not set -# CONFIG_PINCTRL_MSM8X74 is not set -CONFIG_PINCTRL_MSM8916=y -# CONFIG_PINCTRL_MSM8994 is not set -CONFIG_PINCTRL_MSM8996=y -# CONFIG_PINCTRL_MSM8998 is not set -# CONFIG_PINCTRL_QDF2XXX is not set -CONFIG_PINCTRL_QCOM_SPMI_PMIC=y -CONFIG_PINCTRL_QCOM_SSBI_PMIC=y -# CONFIG_PINCTRL_SDM845 is not set -CONFIG_PINCTRL_SUNXI=y -CONFIG_PINCTRL_SUN8I_H3_R=y -CONFIG_PINCTRL_SUN50I_A64=y -CONFIG_PINCTRL_SUN50I_A64_R=y -CONFIG_PINCTRL_SUN50I_H5=y -CONFIG_PINCTRL_SUN50I_H6=y -CONFIG_PINCTRL_SUN50I_H6_R=y -CONFIG_PINCTRL_TEGRA=y -CONFIG_PINCTRL_TEGRA124=y -CONFIG_PINCTRL_TEGRA210=y -CONFIG_PINCTRL_TEGRA_XUSB=y -CONFIG_PINCTRL_MESON=y -CONFIG_PINCTRL_MESON_GXBB=y -CONFIG_PINCTRL_MESON_GXL=y -CONFIG_PINCTRL_MESON8_PMX=y -CONFIG_PINCTRL_MESON_AXG=y -CONFIG_PINCTRL_MESON_AXG_PMX=y -CONFIG_GPIOLIB=y -CONFIG_GPIOLIB_FASTPATH_LIMIT=512 -CONFIG_OF_GPIO=y -CONFIG_GPIO_ACPI=y -CONFIG_GPIOLIB_IRQCHIP=y -# CONFIG_DEBUG_GPIO is not set -CONFIG_GPIO_SYSFS=y -CONFIG_GPIO_GENERIC=y - -# -# Memory mapped GPIO drivers -# -# CONFIG_GPIO_74XX_MMIO is not set -# CONFIG_GPIO_ALTERA is not set -# CONFIG_GPIO_AMDPT is not set -CONFIG_GPIO_RASPBERRYPI_EXP=m -# CONFIG_GPIO_DWAPB is not set -# CONFIG_GPIO_EXAR is not set -# CONFIG_GPIO_FTGPIO010 is not set -CONFIG_GPIO_GENERIC_PLATFORM=y -# CONFIG_GPIO_GRGPIO is not set -# CONFIG_GPIO_HLWD is not set -CONFIG_GPIO_MB86S7X=m -# CONFIG_GPIO_MOCKUP is not set -CONFIG_GPIO_MVEBU=y -CONFIG_GPIO_PL061=y -# CONFIG_GPIO_SYSCON is not set -CONFIG_GPIO_TEGRA=y -# CONFIG_GPIO_THUNDERX is not set -CONFIG_GPIO_XGENE=y -CONFIG_GPIO_XGENE_SB=m -# CONFIG_GPIO_XILINX is not set -CONFIG_GPIO_XLP=y - -# -# I2C GPIO expanders -# -# CONFIG_GPIO_ADP5588 is not set -# CONFIG_GPIO_ADNP is not set -# CONFIG_GPIO_MAX7300 is not set -# CONFIG_GPIO_MAX732X is not set -CONFIG_GPIO_PCA953X=y -CONFIG_GPIO_PCA953X_IRQ=y -# CONFIG_GPIO_PCF857X is not set -# CONFIG_GPIO_TPIC2810 is not set - -# -# MFD GPIO expanders -# -CONFIG_GPIO_MAX77620=y - -# -# PCI GPIO expanders -# -# CONFIG_GPIO_PCI_IDIO_16 is not set -# CONFIG_GPIO_PCIE_IDIO_24 is not set -# CONFIG_GPIO_RDC321X is not set - -# -# SPI GPIO expanders -# -# CONFIG_GPIO_74X164 is not set -# CONFIG_GPIO_MAX3191X is not set -# CONFIG_GPIO_MAX7301 is not set -# CONFIG_GPIO_MC33880 is not set -# CONFIG_GPIO_PISOSR is not set -# CONFIG_GPIO_XRA1403 is not set - -# -# USB GPIO expanders -# -CONFIG_GPIO_VIPERBOARD=m -CONFIG_W1=m -CONFIG_W1_CON=y - -# -# 1-wire Bus Masters -# -# CONFIG_W1_MASTER_MATROX is not set -CONFIG_W1_MASTER_DS2490=m -CONFIG_W1_MASTER_DS2482=m -# CONFIG_W1_MASTER_DS1WM is not set -CONFIG_W1_MASTER_GPIO=m - -# -# 1-wire Slaves -# -CONFIG_W1_SLAVE_THERM=m -CONFIG_W1_SLAVE_SMEM=m -CONFIG_W1_SLAVE_DS2405=m -CONFIG_W1_SLAVE_DS2408=m -CONFIG_W1_SLAVE_DS2408_READBACK=y -CONFIG_W1_SLAVE_DS2413=m -CONFIG_W1_SLAVE_DS2406=m -CONFIG_W1_SLAVE_DS2423=m -CONFIG_W1_SLAVE_DS2805=m -CONFIG_W1_SLAVE_DS2431=m -CONFIG_W1_SLAVE_DS2433=m -# CONFIG_W1_SLAVE_DS2433_CRC is not set -CONFIG_W1_SLAVE_DS2438=m -CONFIG_W1_SLAVE_DS2760=m -CONFIG_W1_SLAVE_DS2780=m -CONFIG_W1_SLAVE_DS2781=m -CONFIG_W1_SLAVE_DS28E04=m -CONFIG_W1_SLAVE_DS28E17=m -CONFIG_POWER_AVS=y -CONFIG_ROCKCHIP_IODOMAIN=m -CONFIG_POWER_RESET=y -# CONFIG_POWER_RESET_BRCMSTB is not set -# CONFIG_POWER_RESET_GPIO is not set -# CONFIG_POWER_RESET_GPIO_RESTART is not set -CONFIG_POWER_RESET_HISI=y -CONFIG_POWER_RESET_MSM=y -# CONFIG_POWER_RESET_LTC2952 is not set -# CONFIG_POWER_RESET_RESTART is not set -CONFIG_POWER_RESET_VEXPRESS=y -CONFIG_POWER_RESET_XGENE=y -CONFIG_POWER_RESET_SYSCON=y -CONFIG_POWER_RESET_SYSCON_POWEROFF=y -# CONFIG_SYSCON_REBOOT_MODE is not set -CONFIG_POWER_SUPPLY=y -# CONFIG_POWER_SUPPLY_DEBUG is not set -# CONFIG_PDA_POWER is not set -# CONFIG_GENERIC_ADC_BATTERY is not set -# CONFIG_TEST_POWER is not set -# CONFIG_BATTERY_DS2760 is not set -# CONFIG_BATTERY_DS2780 is not set -# CONFIG_BATTERY_DS2781 is not set -# CONFIG_BATTERY_DS2782 is not set -# CONFIG_BATTERY_LEGO_EV3 is not set -# CONFIG_BATTERY_SBS is not set -# CONFIG_CHARGER_SBS is not set -# CONFIG_MANAGER_SBS is not set -CONFIG_BATTERY_BQ27XXX=m -# CONFIG_BATTERY_BQ27XXX_I2C is not set -CONFIG_BATTERY_BQ27XXX_HDQ=m -CONFIG_CHARGER_AXP20X=m -CONFIG_BATTERY_AXP20X=m -CONFIG_AXP20X_POWER=m -CONFIG_AXP288_FUEL_GAUGE=m -# CONFIG_BATTERY_MAX17040 is not set -# CONFIG_BATTERY_MAX17042 is not set -# CONFIG_BATTERY_MAX1721X is not set -# CONFIG_CHARGER_ISP1704 is not set -# CONFIG_CHARGER_MAX8903 is not set -# CONFIG_CHARGER_LP8727 is not set -# CONFIG_CHARGER_GPIO is not set -# CONFIG_CHARGER_MANAGER is not set -# CONFIG_CHARGER_LTC3651 is not set -# CONFIG_CHARGER_DETECTOR_MAX14656 is not set -CONFIG_CHARGER_QCOM_SMBB=m -# CONFIG_CHARGER_BQ2415X is not set -# CONFIG_CHARGER_BQ24190 is not set -# CONFIG_CHARGER_BQ24257 is not set -# CONFIG_CHARGER_BQ24735 is not set -# CONFIG_CHARGER_BQ25890 is not set -# CONFIG_CHARGER_SMB347 is not set -# CONFIG_BATTERY_GAUGE_LTC2941 is not set -# CONFIG_CHARGER_RT9455 is not set -CONFIG_HWMON=y -CONFIG_HWMON_VID=m -# CONFIG_HWMON_DEBUG_CHIP is not set - -# -# Native drivers -# -# CONFIG_SENSORS_AD7314 is not set -CONFIG_SENSORS_AD7414=m -CONFIG_SENSORS_AD7418=m -# CONFIG_SENSORS_ADM1021 is not set -# CONFIG_SENSORS_ADM1025 is not set -# CONFIG_SENSORS_ADM1026 is not set -CONFIG_SENSORS_ADM1029=m -# CONFIG_SENSORS_ADM1031 is not set -CONFIG_SENSORS_ADM9240=m -# CONFIG_SENSORS_ADT7310 is not set -# CONFIG_SENSORS_ADT7410 is not set -CONFIG_SENSORS_ADT7411=m -CONFIG_SENSORS_ADT7462=m -CONFIG_SENSORS_ADT7470=m -CONFIG_SENSORS_ADT7475=m -CONFIG_SENSORS_ASC7621=m -CONFIG_SENSORS_ARM_SCMI=m -# CONFIG_SENSORS_ASPEED is not set -CONFIG_SENSORS_ATXP1=m -CONFIG_SENSORS_DS620=m -# CONFIG_SENSORS_DS1621 is not set -CONFIG_SENSORS_I5K_AMB=m -# CONFIG_SENSORS_F71805F is not set -CONFIG_SENSORS_F71882FG=m -CONFIG_SENSORS_F75375S=m -CONFIG_SENSORS_FTSTEUTATES=m -# CONFIG_SENSORS_GL518SM is not set -# CONFIG_SENSORS_GL520SM is not set -CONFIG_SENSORS_G760A=m -# CONFIG_SENSORS_G762 is not set -# CONFIG_SENSORS_GPIO_FAN is not set -# CONFIG_SENSORS_HIH6130 is not set -CONFIG_SENSORS_IBMAEM=m -CONFIG_SENSORS_IBMPEX=m -# CONFIG_SENSORS_IIO_HWMON is not set -# CONFIG_SENSORS_IT87 is not set -CONFIG_SENSORS_JC42=m -# CONFIG_SENSORS_POWR1220 is not set -CONFIG_SENSORS_LINEAGE=m -# CONFIG_SENSORS_LTC2945 is not set -# CONFIG_SENSORS_LTC2990 is not set -CONFIG_SENSORS_LTC4151=m -CONFIG_SENSORS_LTC4215=m -# CONFIG_SENSORS_LTC4222 is not set -CONFIG_SENSORS_LTC4245=m -# CONFIG_SENSORS_LTC4260 is not set -CONFIG_SENSORS_LTC4261=m -CONFIG_SENSORS_MAX1111=m -CONFIG_SENSORS_MAX16065=m -# CONFIG_SENSORS_MAX1619 is not set -CONFIG_SENSORS_MAX1668=m -# CONFIG_SENSORS_MAX197 is not set -# CONFIG_SENSORS_MAX31722 is not set -# CONFIG_SENSORS_MAX6621 is not set -CONFIG_SENSORS_MAX6639=m -CONFIG_SENSORS_MAX6642=m -CONFIG_SENSORS_MAX6650=m -# CONFIG_SENSORS_MAX6697 is not set -# CONFIG_SENSORS_MAX31790 is not set -# CONFIG_SENSORS_MCP3021 is not set -# CONFIG_SENSORS_TC654 is not set -CONFIG_SENSORS_ADCXX=m -# CONFIG_SENSORS_LM63 is not set -CONFIG_SENSORS_LM70=m -CONFIG_SENSORS_LM73=m -# CONFIG_SENSORS_LM75 is not set -# CONFIG_SENSORS_LM77 is not set -# CONFIG_SENSORS_LM78 is not set -# CONFIG_SENSORS_LM80 is not set -# CONFIG_SENSORS_LM83 is not set -# CONFIG_SENSORS_LM85 is not set -# CONFIG_SENSORS_LM87 is not set -# CONFIG_SENSORS_LM90 is not set -# CONFIG_SENSORS_LM92 is not set -CONFIG_SENSORS_LM93=m -# CONFIG_SENSORS_LM95234 is not set -CONFIG_SENSORS_LM95241=m -CONFIG_SENSORS_LM95245=m -# CONFIG_SENSORS_PC87360 is not set -CONFIG_SENSORS_PC87427=m -CONFIG_SENSORS_NTC_THERMISTOR=m -CONFIG_SENSORS_NCT6683=m -CONFIG_SENSORS_NCT6775=m -# CONFIG_SENSORS_NCT7802 is not set -# CONFIG_SENSORS_NCT7904 is not set -# CONFIG_SENSORS_PCF8591 is not set -# CONFIG_PMBUS is not set -# CONFIG_SENSORS_PWM_FAN is not set -# CONFIG_SENSORS_SHT15 is not set -CONFIG_SENSORS_SHT21=m -# CONFIG_SENSORS_SHT3x is not set -# CONFIG_SENSORS_SHTC1 is not set -# CONFIG_SENSORS_SIS5595 is not set -CONFIG_SENSORS_DME1737=m -CONFIG_SENSORS_EMC1403=m -CONFIG_SENSORS_EMC2103=m -CONFIG_SENSORS_EMC6W201=m -# CONFIG_SENSORS_SMSC47M1 is not set -CONFIG_SENSORS_SMSC47M192=m -# CONFIG_SENSORS_SMSC47B397 is not set -CONFIG_SENSORS_SCH56XX_COMMON=m -CONFIG_SENSORS_SCH5627=m -# CONFIG_SENSORS_SCH5636 is not set -# CONFIG_SENSORS_STTS751 is not set -CONFIG_SENSORS_SMM665=m -# CONFIG_SENSORS_ADC128D818 is not set -CONFIG_SENSORS_ADS1015=m -CONFIG_SENSORS_ADS7828=m -CONFIG_SENSORS_ADS7871=m -CONFIG_SENSORS_AMC6821=m -# CONFIG_SENSORS_INA209 is not set -# CONFIG_SENSORS_INA2XX is not set -# CONFIG_SENSORS_INA3221 is not set -# CONFIG_SENSORS_TC74 is not set -CONFIG_SENSORS_THMC50=m -CONFIG_SENSORS_TMP102=m -# CONFIG_SENSORS_TMP103 is not set -# CONFIG_SENSORS_TMP108 is not set -CONFIG_SENSORS_TMP401=m -CONFIG_SENSORS_TMP421=m -# CONFIG_SENSORS_VEXPRESS is not set -# CONFIG_SENSORS_VIA686A is not set -CONFIG_SENSORS_VT1211=m -CONFIG_SENSORS_VT8231=m -# CONFIG_SENSORS_W83773G is not set -# CONFIG_SENSORS_W83781D is not set -CONFIG_SENSORS_W83791D=m -CONFIG_SENSORS_W83792D=m -CONFIG_SENSORS_W83793=m -CONFIG_SENSORS_W83795=m -# CONFIG_SENSORS_W83795_FANCTRL is not set -# CONFIG_SENSORS_W83L785TS is not set -CONFIG_SENSORS_W83L786NG=m -# CONFIG_SENSORS_W83627HF is not set -CONFIG_SENSORS_W83627EHF=m -CONFIG_SENSORS_XGENE=m - -# -# ACPI drivers -# -# CONFIG_SENSORS_ACPI_POWER is not set -CONFIG_THERMAL=y -# CONFIG_THERMAL_STATISTICS is not set -CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 -CONFIG_THERMAL_HWMON=y -CONFIG_THERMAL_OF=y -# CONFIG_THERMAL_WRITABLE_TRIPS is not set -CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y -# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set -# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set -# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set -CONFIG_THERMAL_GOV_FAIR_SHARE=y -CONFIG_THERMAL_GOV_STEP_WISE=y -# CONFIG_THERMAL_GOV_BANG_BANG is not set -# CONFIG_THERMAL_GOV_USER_SPACE is not set -# CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set -CONFIG_CPU_THERMAL=y -# CONFIG_CLOCK_THERMAL is not set -# CONFIG_DEVFREQ_THERMAL is not set -# CONFIG_THERMAL_EMULATION is not set -CONFIG_HISI_THERMAL=m -# CONFIG_MAX77620_THERMAL is not set -# CONFIG_QORIQ_THERMAL is not set -# CONFIG_ROCKCHIP_THERMAL is not set -CONFIG_ARMADA_THERMAL=m - -# -# ACPI INT340X thermal drivers -# - -# -# Broadcom thermal drivers -# -CONFIG_BCM2835_THERMAL=m - -# -# NVIDIA Tegra thermal drivers -# -CONFIG_TEGRA_SOCTHERM=y -# CONFIG_TEGRA_BPMP_THERMAL is not set -CONFIG_QCOM_SPMI_TEMP_ALARM=m -# CONFIG_GENERIC_ADC_THERMAL is not set - -# -# Qualcomm thermal drivers -# -CONFIG_QCOM_TSENS=m -CONFIG_WATCHDOG=y -CONFIG_WATCHDOG_CORE=y -# CONFIG_WATCHDOG_NOWAYOUT is not set -CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y -CONFIG_WATCHDOG_SYSFS=y - -# -# Watchdog Device Drivers -# -CONFIG_SOFT_WATCHDOG=m -CONFIG_GPIO_WATCHDOG=m -# CONFIG_WDAT_WDT is not set -# CONFIG_XILINX_WATCHDOG is not set -# CONFIG_ZIIRAVE_WATCHDOG is not set -CONFIG_ARM_SP805_WATCHDOG=m -CONFIG_ARM_SBSA_WATCHDOG=m -# CONFIG_CADENCE_WATCHDOG is not set -CONFIG_DW_WATCHDOG=m -CONFIG_SUNXI_WATCHDOG=m -# CONFIG_MAX63XX_WATCHDOG is not set -# CONFIG_MAX77620_WATCHDOG is not set -CONFIG_TEGRA_WATCHDOG=m -CONFIG_QCOM_WDT=m -CONFIG_MESON_GXBB_WATCHDOG=m -CONFIG_MESON_WATCHDOG=m -# CONFIG_ALIM7101_WDT is not set -# CONFIG_I6300ESB_WDT is not set -CONFIG_BCM2835_WDT=m -# CONFIG_MEN_A21_WDT is not set -CONFIG_XEN_WDT=m - -# -# PCI-based Watchdog Cards -# -# CONFIG_PCIPCWATCHDOG is not set -# CONFIG_WDTPCI is not set - -# -# USB-based Watchdog Cards -# -# CONFIG_USBPCWATCHDOG is not set - -# -# Watchdog Pretimeout Governors -# -# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set -CONFIG_SSB_POSSIBLE=y -CONFIG_SSB=m -CONFIG_SSB_SPROM=y -CONFIG_SSB_BLOCKIO=y -CONFIG_SSB_PCIHOST_POSSIBLE=y -CONFIG_SSB_PCIHOST=y -CONFIG_SSB_B43_PCI_BRIDGE=y -CONFIG_SSB_SDIOHOST_POSSIBLE=y -CONFIG_SSB_SDIOHOST=y -# CONFIG_SSB_SILENT is not set -# CONFIG_SSB_DEBUG is not set -CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y -CONFIG_SSB_DRIVER_PCICORE=y -# CONFIG_SSB_DRIVER_GPIO is not set -CONFIG_BCMA_POSSIBLE=y -CONFIG_BCMA=m -CONFIG_BCMA_BLOCKIO=y -CONFIG_BCMA_HOST_PCI_POSSIBLE=y -CONFIG_BCMA_HOST_PCI=y -# CONFIG_BCMA_HOST_SOC is not set -CONFIG_BCMA_DRIVER_PCI=y -# CONFIG_BCMA_DRIVER_GMAC_CMN is not set -# CONFIG_BCMA_DRIVER_GPIO is not set -# CONFIG_BCMA_DEBUG is not set - -# -# Multifunction device drivers -# -CONFIG_MFD_CORE=y -# CONFIG_MFD_ACT8945A is not set -# CONFIG_MFD_SUN4I_GPADC is not set -# CONFIG_MFD_AS3711 is not set -# CONFIG_MFD_AS3722 is not set -# CONFIG_PMIC_ADP5520 is not set -# CONFIG_MFD_AAT2870_CORE is not set -# CONFIG_MFD_ATMEL_FLEXCOM is not set -# CONFIG_MFD_ATMEL_HLCDC is not set -# CONFIG_MFD_BCM590XX is not set -# CONFIG_MFD_BD9571MWV is not set -# CONFIG_MFD_AC100 is not set -CONFIG_MFD_AXP20X=m -# CONFIG_MFD_AXP20X_I2C is not set -CONFIG_MFD_AXP20X_RSB=m -CONFIG_MFD_CROS_EC=y -CONFIG_MFD_CROS_EC_I2C=m -CONFIG_MFD_CROS_EC_SPI=m -# CONFIG_MFD_CROS_EC_CHARDEV is not set -# CONFIG_PMIC_DA903X is not set -# CONFIG_MFD_DA9052_SPI is not set -# CONFIG_MFD_DA9052_I2C is not set -# CONFIG_MFD_DA9055 is not set -# CONFIG_MFD_DA9062 is not set -# CONFIG_MFD_DA9063 is not set -# CONFIG_MFD_DA9150 is not set -# CONFIG_MFD_DLN2 is not set -# CONFIG_MFD_MC13XXX_SPI is not set -# CONFIG_MFD_MC13XXX_I2C is not set -# CONFIG_MFD_HI6421_PMIC is not set -CONFIG_MFD_HI655X_PMIC=m -# CONFIG_HTC_PASIC3 is not set -# CONFIG_HTC_I2CPLD is not set -# CONFIG_LPC_ICH is not set -CONFIG_LPC_SCH=m -# CONFIG_MFD_JANZ_CMODIO is not set -# CONFIG_MFD_KEMPLD is not set -# CONFIG_MFD_88PM800 is not set -# CONFIG_MFD_88PM805 is not set -# CONFIG_MFD_88PM860X is not set -# CONFIG_MFD_MAX14577 is not set -CONFIG_MFD_MAX77620=y -# CONFIG_MFD_MAX77686 is not set -# CONFIG_MFD_MAX77693 is not set -# CONFIG_MFD_MAX77843 is not set -# CONFIG_MFD_MAX8907 is not set -# CONFIG_MFD_MAX8925 is not set -# CONFIG_MFD_MAX8997 is not set -# CONFIG_MFD_MAX8998 is not set -# CONFIG_MFD_MT6397 is not set -# CONFIG_MFD_MENF21BMC is not set -# CONFIG_EZX_PCAP is not set -# CONFIG_MFD_CPCAP is not set -CONFIG_MFD_VIPERBOARD=m -# CONFIG_MFD_RETU is not set -# CONFIG_MFD_PCF50633 is not set -# CONFIG_UCB1400_CORE is not set -CONFIG_MFD_QCOM_RPM=m -CONFIG_MFD_SPMI_PMIC=m -# CONFIG_MFD_RDC321X is not set -# CONFIG_MFD_RT5033 is not set -# CONFIG_MFD_RC5T583 is not set -CONFIG_MFD_RK808=m -# CONFIG_MFD_RN5T618 is not set -# CONFIG_MFD_SEC_CORE is not set -# CONFIG_MFD_SI476X_CORE is not set -# CONFIG_MFD_SM501 is not set -# CONFIG_MFD_SKY81452 is not set -# CONFIG_MFD_SMSC is not set -# CONFIG_ABX500_CORE is not set -# CONFIG_MFD_STMPE is not set -# CONFIG_MFD_SUN6I_PRCM is not set -CONFIG_MFD_SYSCON=y -# CONFIG_MFD_TI_AM335X_TSCADC is not set -# CONFIG_MFD_LP3943 is not set -# CONFIG_MFD_LP8788 is not set -# CONFIG_MFD_TI_LMU is not set -# CONFIG_MFD_PALMAS is not set -# CONFIG_TPS6105X is not set -# CONFIG_TPS65010 is not set -# CONFIG_TPS6507X is not set -# CONFIG_MFD_TPS65086 is not set -# CONFIG_MFD_TPS65090 is not set -# CONFIG_MFD_TPS65217 is not set -# CONFIG_MFD_TPS68470 is not set -# CONFIG_MFD_TI_LP873X is not set -# CONFIG_MFD_TI_LP87565 is not set -# CONFIG_MFD_TPS65218 is not set -# CONFIG_MFD_TPS6586X is not set -# CONFIG_MFD_TPS65910 is not set -# CONFIG_MFD_TPS65912_I2C is not set -# CONFIG_MFD_TPS65912_SPI is not set -# CONFIG_MFD_TPS80031 is not set -# CONFIG_TWL4030_CORE is not set -# CONFIG_TWL6040_CORE is not set -# CONFIG_MFD_WL1273_CORE is not set -# CONFIG_MFD_LM3533 is not set -# CONFIG_MFD_TC3589X is not set -# CONFIG_MFD_VX855 is not set -# CONFIG_MFD_ARIZONA_I2C is not set -# CONFIG_MFD_ARIZONA_SPI is not set -# CONFIG_MFD_WM8400 is not set -# CONFIG_MFD_WM831X_I2C is not set -# CONFIG_MFD_WM831X_SPI is not set -# CONFIG_MFD_WM8350_I2C is not set -# CONFIG_MFD_WM8994 is not set -CONFIG_MFD_VEXPRESS_SYSREG=y -# CONFIG_RAVE_SP_CORE is not set -CONFIG_REGULATOR=y -# CONFIG_REGULATOR_DEBUG is not set -CONFIG_REGULATOR_FIXED_VOLTAGE=m -# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set -# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set -# CONFIG_REGULATOR_88PG86X is not set -# CONFIG_REGULATOR_ACT8865 is not set -# CONFIG_REGULATOR_AD5398 is not set -# CONFIG_REGULATOR_ANATOP is not set -CONFIG_REGULATOR_AXP20X=m -# CONFIG_REGULATOR_DA9210 is not set -# CONFIG_REGULATOR_DA9211 is not set -CONFIG_REGULATOR_FAN53555=m -CONFIG_REGULATOR_GPIO=m -CONFIG_REGULATOR_HI655X=m -# CONFIG_REGULATOR_ISL9305 is not set -# CONFIG_REGULATOR_ISL6271A is not set -# CONFIG_REGULATOR_LP3971 is not set -# CONFIG_REGULATOR_LP3972 is not set -# CONFIG_REGULATOR_LP872X is not set -# CONFIG_REGULATOR_LP8755 is not set -# CONFIG_REGULATOR_LTC3589 is not set -# CONFIG_REGULATOR_LTC3676 is not set -# CONFIG_REGULATOR_MAX1586 is not set -CONFIG_REGULATOR_MAX77620=m -# CONFIG_REGULATOR_MAX8649 is not set -# CONFIG_REGULATOR_MAX8660 is not set -# CONFIG_REGULATOR_MAX8952 is not set -# CONFIG_REGULATOR_MAX8973 is not set -# CONFIG_REGULATOR_MT6311 is not set -# CONFIG_REGULATOR_PFUZE100 is not set -# CONFIG_REGULATOR_PV88060 is not set -# CONFIG_REGULATOR_PV88080 is not set -# CONFIG_REGULATOR_PV88090 is not set -CONFIG_REGULATOR_PWM=m -CONFIG_REGULATOR_QCOM_RPM=m -CONFIG_REGULATOR_QCOM_SMD_RPM=m -CONFIG_REGULATOR_QCOM_SPMI=m -CONFIG_REGULATOR_RK808=m -CONFIG_REGULATOR_SY8106A=m -# CONFIG_REGULATOR_TPS51632 is not set -# CONFIG_REGULATOR_TPS62360 is not set -# CONFIG_REGULATOR_TPS65023 is not set -# CONFIG_REGULATOR_TPS6507X is not set -# CONFIG_REGULATOR_TPS65132 is not set -# CONFIG_REGULATOR_TPS6524X is not set -# CONFIG_REGULATOR_VCTRL is not set -# CONFIG_REGULATOR_VEXPRESS is not set -CONFIG_CEC_CORE=m -CONFIG_RC_CORE=m -CONFIG_RC_MAP=m -CONFIG_LIRC=y -CONFIG_RC_DECODERS=y -CONFIG_IR_NEC_DECODER=m -CONFIG_IR_RC5_DECODER=m -CONFIG_IR_RC6_DECODER=m -CONFIG_IR_JVC_DECODER=m -CONFIG_IR_SONY_DECODER=m -CONFIG_IR_SANYO_DECODER=m -CONFIG_IR_SHARP_DECODER=m -CONFIG_IR_MCE_KBD_DECODER=m -CONFIG_IR_XMP_DECODER=m -CONFIG_IR_IMON_DECODER=m -CONFIG_RC_DEVICES=y -CONFIG_RC_ATI_REMOTE=m -CONFIG_IR_ENE=m -# CONFIG_IR_HIX5HD2 is not set -CONFIG_IR_IMON=m -CONFIG_IR_IMON_RAW=m -CONFIG_IR_MCEUSB=m -# CONFIG_IR_ITE_CIR is not set -# CONFIG_IR_FINTEK is not set -# CONFIG_IR_MESON is not set -# CONFIG_IR_NUVOTON is not set -CONFIG_IR_REDRAT3=m -# CONFIG_IR_SPI is not set -CONFIG_IR_STREAMZAP=m -CONFIG_IR_IGORPLUGUSB=m -CONFIG_IR_IGUANA=m -CONFIG_IR_TTUSBIR=m -CONFIG_RC_LOOPBACK=m -# CONFIG_IR_GPIO_CIR is not set -# CONFIG_IR_GPIO_TX is not set -# CONFIG_IR_PWM_TX is not set -# CONFIG_IR_SUNXI is not set -# CONFIG_IR_SERIAL is not set -# CONFIG_IR_SIR is not set -CONFIG_MEDIA_SUPPORT=m - -# -# Multimedia core support -# -CONFIG_MEDIA_CAMERA_SUPPORT=y -CONFIG_MEDIA_ANALOG_TV_SUPPORT=y -CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y -CONFIG_MEDIA_RADIO_SUPPORT=y -CONFIG_MEDIA_SDR_SUPPORT=y -CONFIG_MEDIA_CEC_SUPPORT=y -# CONFIG_MEDIA_CEC_RC is not set -CONFIG_MEDIA_CONTROLLER=y -# CONFIG_MEDIA_CONTROLLER_DVB is not set -CONFIG_VIDEO_DEV=m -# CONFIG_VIDEO_V4L2_SUBDEV_API is not set -CONFIG_VIDEO_V4L2=m -# CONFIG_VIDEO_ADV_DEBUG is not set -# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set -# CONFIG_VIDEO_PCI_SKELETON is not set -CONFIG_VIDEO_TUNER=m -CONFIG_V4L2_MEM2MEM_DEV=m -CONFIG_V4L2_FWNODE=m -CONFIG_VIDEOBUF_GEN=m -CONFIG_VIDEOBUF_DMA_SG=m -CONFIG_VIDEOBUF_VMALLOC=m -CONFIG_DVB_CORE=m -# CONFIG_DVB_MMAP is not set -CONFIG_DVB_NET=y -CONFIG_TTPCI_EEPROM=m -CONFIG_DVB_MAX_ADAPTERS=16 -CONFIG_DVB_DYNAMIC_MINORS=y -# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set -# CONFIG_DVB_ULE_DEBUG is not set - -# -# Media drivers -# -CONFIG_MEDIA_USB_SUPPORT=y - -# -# Webcam devices -# -CONFIG_USB_VIDEO_CLASS=m -CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y -CONFIG_USB_GSPCA=m -CONFIG_USB_M5602=m -CONFIG_USB_STV06XX=m -CONFIG_USB_GL860=m -CONFIG_USB_GSPCA_BENQ=m -CONFIG_USB_GSPCA_CONEX=m -CONFIG_USB_GSPCA_CPIA1=m -CONFIG_USB_GSPCA_DTCS033=m -CONFIG_USB_GSPCA_ETOMS=m -CONFIG_USB_GSPCA_FINEPIX=m -CONFIG_USB_GSPCA_JEILINJ=m -CONFIG_USB_GSPCA_JL2005BCD=m -CONFIG_USB_GSPCA_KINECT=m -CONFIG_USB_GSPCA_KONICA=m -CONFIG_USB_GSPCA_MARS=m -CONFIG_USB_GSPCA_MR97310A=m -CONFIG_USB_GSPCA_NW80X=m -CONFIG_USB_GSPCA_OV519=m -CONFIG_USB_GSPCA_OV534=m -CONFIG_USB_GSPCA_OV534_9=m -CONFIG_USB_GSPCA_PAC207=m -CONFIG_USB_GSPCA_PAC7302=m -CONFIG_USB_GSPCA_PAC7311=m -CONFIG_USB_GSPCA_SE401=m -CONFIG_USB_GSPCA_SN9C2028=m -CONFIG_USB_GSPCA_SN9C20X=m -CONFIG_USB_GSPCA_SONIXB=m -CONFIG_USB_GSPCA_SONIXJ=m -CONFIG_USB_GSPCA_SPCA500=m -CONFIG_USB_GSPCA_SPCA501=m -CONFIG_USB_GSPCA_SPCA505=m -CONFIG_USB_GSPCA_SPCA506=m -CONFIG_USB_GSPCA_SPCA508=m -CONFIG_USB_GSPCA_SPCA561=m -CONFIG_USB_GSPCA_SPCA1528=m -CONFIG_USB_GSPCA_SQ905=m -CONFIG_USB_GSPCA_SQ905C=m -CONFIG_USB_GSPCA_SQ930X=m -CONFIG_USB_GSPCA_STK014=m -CONFIG_USB_GSPCA_STK1135=m -CONFIG_USB_GSPCA_STV0680=m -CONFIG_USB_GSPCA_SUNPLUS=m -CONFIG_USB_GSPCA_T613=m -CONFIG_USB_GSPCA_TOPRO=m -CONFIG_USB_GSPCA_TOUPTEK=m -CONFIG_USB_GSPCA_TV8532=m -CONFIG_USB_GSPCA_VC032X=m -CONFIG_USB_GSPCA_VICAM=m -CONFIG_USB_GSPCA_XIRLINK_CIT=m -CONFIG_USB_GSPCA_ZC3XX=m -CONFIG_USB_PWC=m -# CONFIG_USB_PWC_DEBUG is not set -CONFIG_USB_PWC_INPUT_EVDEV=y -CONFIG_VIDEO_CPIA2=m -CONFIG_USB_ZR364XX=m -CONFIG_USB_STKWEBCAM=m -CONFIG_USB_S2255=m -CONFIG_VIDEO_USBTV=m - -# -# Analog TV USB devices -# -CONFIG_VIDEO_PVRUSB2=m -CONFIG_VIDEO_PVRUSB2_SYSFS=y -CONFIG_VIDEO_PVRUSB2_DVB=y -# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set -CONFIG_VIDEO_HDPVR=m -CONFIG_VIDEO_USBVISION=m -CONFIG_VIDEO_STK1160_COMMON=m -CONFIG_VIDEO_STK1160=m -CONFIG_VIDEO_GO7007=m -CONFIG_VIDEO_GO7007_USB=m -CONFIG_VIDEO_GO7007_LOADER=m -CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m - -# -# Analog/digital TV USB devices -# -CONFIG_VIDEO_AU0828=m -CONFIG_VIDEO_AU0828_V4L2=y -CONFIG_VIDEO_AU0828_RC=y -CONFIG_VIDEO_CX231XX=m -CONFIG_VIDEO_CX231XX_RC=y -CONFIG_VIDEO_CX231XX_ALSA=m -CONFIG_VIDEO_CX231XX_DVB=m -# CONFIG_VIDEO_TM6000 is not set - -# -# Digital TV USB devices -# -CONFIG_DVB_USB=m -# CONFIG_DVB_USB_DEBUG is not set -CONFIG_DVB_USB_DIB3000MC=m -CONFIG_DVB_USB_A800=m -CONFIG_DVB_USB_DIBUSB_MB=m -CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y -CONFIG_DVB_USB_DIBUSB_MC=m -CONFIG_DVB_USB_DIB0700=m -CONFIG_DVB_USB_UMT_010=m -CONFIG_DVB_USB_CXUSB=m -CONFIG_DVB_USB_M920X=m -CONFIG_DVB_USB_DIGITV=m -CONFIG_DVB_USB_VP7045=m -CONFIG_DVB_USB_VP702X=m -CONFIG_DVB_USB_GP8PSK=m -CONFIG_DVB_USB_NOVA_T_USB2=m -CONFIG_DVB_USB_TTUSB2=m -CONFIG_DVB_USB_DTT200U=m -CONFIG_DVB_USB_OPERA1=m -CONFIG_DVB_USB_AF9005=m -CONFIG_DVB_USB_AF9005_REMOTE=m -CONFIG_DVB_USB_PCTV452E=m -CONFIG_DVB_USB_DW2102=m -CONFIG_DVB_USB_CINERGY_T2=m -CONFIG_DVB_USB_DTV5100=m -CONFIG_DVB_USB_FRIIO=m -CONFIG_DVB_USB_AZ6027=m -CONFIG_DVB_USB_TECHNISAT_USB2=m -CONFIG_DVB_USB_V2=m -CONFIG_DVB_USB_AF9015=m -CONFIG_DVB_USB_AF9035=m -CONFIG_DVB_USB_ANYSEE=m -CONFIG_DVB_USB_AU6610=m -CONFIG_DVB_USB_AZ6007=m -CONFIG_DVB_USB_CE6230=m -CONFIG_DVB_USB_EC168=m -CONFIG_DVB_USB_GL861=m -CONFIG_DVB_USB_LME2510=m -CONFIG_DVB_USB_MXL111SF=m -CONFIG_DVB_USB_RTL28XXU=m -CONFIG_DVB_USB_DVBSKY=m -# CONFIG_DVB_USB_ZD1301 is not set -CONFIG_DVB_TTUSB_BUDGET=m -CONFIG_DVB_TTUSB_DEC=m -CONFIG_SMS_USB_DRV=m -CONFIG_DVB_B2C2_FLEXCOP_USB=m -# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set -CONFIG_DVB_AS102=m - -# -# Webcam, TV (analog/digital) USB devices -# -CONFIG_VIDEO_EM28XX=m -CONFIG_VIDEO_EM28XX_V4L2=m -CONFIG_VIDEO_EM28XX_ALSA=m -CONFIG_VIDEO_EM28XX_DVB=m -CONFIG_VIDEO_EM28XX_RC=m - -# -# Software defined radio USB devices -# -CONFIG_USB_AIRSPY=m -CONFIG_USB_HACKRF=m -CONFIG_USB_MSI2500=m - -# -# USB HDMI CEC adapters -# -CONFIG_USB_PULSE8_CEC=m -CONFIG_USB_RAINSHADOW_CEC=m -CONFIG_MEDIA_PCI_SUPPORT=y - -# -# Media capture support -# -CONFIG_VIDEO_SOLO6X10=m -CONFIG_VIDEO_TW5864=m -CONFIG_VIDEO_TW68=m -CONFIG_VIDEO_TW686X=m - -# -# Media capture/analog TV support -# -CONFIG_VIDEO_IVTV=m -# CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set -CONFIG_VIDEO_IVTV_ALSA=m -CONFIG_VIDEO_FB_IVTV=m -CONFIG_VIDEO_HEXIUM_GEMINI=m -CONFIG_VIDEO_HEXIUM_ORION=m -CONFIG_VIDEO_MXB=m -CONFIG_VIDEO_DT3155=m - -# -# Media capture/analog/hybrid TV support -# -CONFIG_VIDEO_CX18=m -CONFIG_VIDEO_CX18_ALSA=m -CONFIG_VIDEO_CX23885=m -CONFIG_MEDIA_ALTERA_CI=m -# CONFIG_VIDEO_CX25821 is not set -CONFIG_VIDEO_CX88=m -CONFIG_VIDEO_CX88_ALSA=m -CONFIG_VIDEO_CX88_BLACKBIRD=m -CONFIG_VIDEO_CX88_DVB=m -CONFIG_VIDEO_CX88_ENABLE_VP3054=y -CONFIG_VIDEO_CX88_VP3054=m -CONFIG_VIDEO_CX88_MPEG=m -CONFIG_VIDEO_BT848=m -CONFIG_DVB_BT8XX=m -CONFIG_VIDEO_SAA7134=m -CONFIG_VIDEO_SAA7134_ALSA=m -CONFIG_VIDEO_SAA7134_RC=y -CONFIG_VIDEO_SAA7134_DVB=m -# CONFIG_VIDEO_SAA7134_GO7007 is not set -CONFIG_VIDEO_SAA7164=m - -# -# Media digital TV PCI Adapters -# -CONFIG_DVB_AV7110_IR=y -CONFIG_DVB_AV7110=m -CONFIG_DVB_AV7110_OSD=y -CONFIG_DVB_BUDGET_CORE=m -CONFIG_DVB_BUDGET=m -CONFIG_DVB_BUDGET_CI=m -CONFIG_DVB_BUDGET_AV=m -CONFIG_DVB_BUDGET_PATCH=m -CONFIG_DVB_B2C2_FLEXCOP_PCI=m -# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set -CONFIG_DVB_PLUTO2=m -CONFIG_DVB_DM1105=m -CONFIG_DVB_PT1=m -CONFIG_DVB_PT3=m -CONFIG_MANTIS_CORE=m -CONFIG_DVB_MANTIS=m -CONFIG_DVB_HOPPER=m -CONFIG_DVB_NGENE=m -CONFIG_DVB_DDBRIDGE=m -# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set -CONFIG_DVB_SMIPCIE=m -CONFIG_DVB_NETUP_UNIDVB=m -CONFIG_V4L_PLATFORM_DRIVERS=y -CONFIG_VIDEO_CAFE_CCIC=m -CONFIG_VIDEO_CADENCE=y -# CONFIG_SOC_CAMERA is not set -CONFIG_V4L_MEM2MEM_DRIVERS=y -# CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set -# CONFIG_VIDEO_SH_VEU is not set -# CONFIG_VIDEO_ROCKCHIP_RGA is not set -CONFIG_VIDEO_QCOM_VENUS=m -CONFIG_V4L_TEST_DRIVERS=y -CONFIG_VIDEO_VIVID=m -CONFIG_VIDEO_VIVID_CEC=y -CONFIG_VIDEO_VIVID_MAX_DEVS=64 -# CONFIG_VIDEO_VIM2M is not set -# CONFIG_DVB_PLATFORM_DRIVERS is not set -# CONFIG_CEC_PLATFORM_DRIVERS is not set -# CONFIG_SDR_PLATFORM_DRIVERS is not set - -# -# Supported MMC/SDIO adapters -# -CONFIG_SMS_SDIO_DRV=m -CONFIG_RADIO_ADAPTERS=y -CONFIG_RADIO_TEA575X=m -CONFIG_RADIO_SI470X=m -CONFIG_USB_SI470X=m -# CONFIG_I2C_SI470X is not set -# CONFIG_RADIO_SI4713 is not set -CONFIG_USB_MR800=m -# CONFIG_USB_DSBR is not set -# CONFIG_RADIO_MAXIRADIO is not set -CONFIG_RADIO_SHARK=m -CONFIG_RADIO_SHARK2=m -CONFIG_USB_KEENE=m -CONFIG_USB_RAREMONO=m -CONFIG_USB_MA901=m -# CONFIG_RADIO_TEA5764 is not set -# CONFIG_RADIO_SAA7706H is not set -# CONFIG_RADIO_TEF6862 is not set -# CONFIG_RADIO_WL1273 is not set - -# -# Texas Instruments WL128x FM driver (ST based) -# -# CONFIG_RADIO_WL128X is not set - -# -# Supported FireWire (IEEE 1394) Adapters -# -CONFIG_DVB_FIREDTV=m -CONFIG_DVB_FIREDTV_INPUT=y -CONFIG_MEDIA_COMMON_OPTIONS=y - -# -# common driver options -# -CONFIG_VIDEO_CX2341X=m -CONFIG_VIDEO_TVEEPROM=m -CONFIG_CYPRESS_FIRMWARE=m -CONFIG_VIDEOBUF2_CORE=m -CONFIG_VIDEOBUF2_V4L2=m -CONFIG_VIDEOBUF2_MEMOPS=m -CONFIG_VIDEOBUF2_DMA_CONTIG=m -CONFIG_VIDEOBUF2_VMALLOC=m -CONFIG_VIDEOBUF2_DMA_SG=m -CONFIG_VIDEOBUF2_DVB=m -CONFIG_DVB_B2C2_FLEXCOP=m -CONFIG_VIDEO_SAA7146=m -CONFIG_VIDEO_SAA7146_VV=m -CONFIG_SMS_SIANO_MDTV=m -CONFIG_SMS_SIANO_RC=y -# CONFIG_SMS_SIANO_DEBUGFS is not set -CONFIG_VIDEO_V4L2_TPG=m - -# -# Media ancillary drivers (tuners, sensors, i2c, spi, frontends) -# -CONFIG_MEDIA_SUBDRV_AUTOSELECT=y -CONFIG_MEDIA_ATTACH=y -CONFIG_VIDEO_IR_I2C=m - -# -# Audio decoders, processors and mixers -# -CONFIG_VIDEO_TVAUDIO=m -CONFIG_VIDEO_TDA7432=m -CONFIG_VIDEO_TDA9840=m -CONFIG_VIDEO_TEA6415C=m -CONFIG_VIDEO_TEA6420=m -CONFIG_VIDEO_MSP3400=m -CONFIG_VIDEO_CS3308=m -CONFIG_VIDEO_CS5345=m -CONFIG_VIDEO_CS53L32A=m -CONFIG_VIDEO_UDA1342=m -CONFIG_VIDEO_WM8775=m -CONFIG_VIDEO_WM8739=m -CONFIG_VIDEO_VP27SMPX=m -CONFIG_VIDEO_SONY_BTF_MPX=m - -# -# RDS decoders -# -CONFIG_VIDEO_SAA6588=m - -# -# Video decoders -# -CONFIG_VIDEO_SAA711X=m -CONFIG_VIDEO_TVP5150=m -CONFIG_VIDEO_TW2804=m -CONFIG_VIDEO_TW9903=m -CONFIG_VIDEO_TW9906=m - -# -# Video and audio decoders -# -CONFIG_VIDEO_SAA717X=m -CONFIG_VIDEO_CX25840=m - -# -# Video encoders -# -CONFIG_VIDEO_SAA7127=m - -# -# Camera sensor devices -# -CONFIG_VIDEO_OV2640=m -CONFIG_VIDEO_OV7640=m -CONFIG_VIDEO_OV7670=m -CONFIG_VIDEO_MT9V011=m - -# -# Flash devices -# - -# -# Video improvement chips -# -CONFIG_VIDEO_UPD64031A=m -CONFIG_VIDEO_UPD64083=m - -# -# Audio/Video compression chips -# -CONFIG_VIDEO_SAA6752HS=m - -# -# SDR tuner chips -# - -# -# Miscellaneous helper chips -# -CONFIG_VIDEO_M52790=m - -# -# Sensors used on soc_camera driver -# - -# -# Media SPI Adapters -# -CONFIG_CXD2880_SPI_DRV=m -CONFIG_MEDIA_TUNER=m -CONFIG_MEDIA_TUNER_SIMPLE=m -CONFIG_MEDIA_TUNER_TDA18250=m -CONFIG_MEDIA_TUNER_TDA8290=m -CONFIG_MEDIA_TUNER_TDA827X=m -CONFIG_MEDIA_TUNER_TDA18271=m -CONFIG_MEDIA_TUNER_TDA9887=m -CONFIG_MEDIA_TUNER_TEA5761=m -CONFIG_MEDIA_TUNER_TEA5767=m -CONFIG_MEDIA_TUNER_MSI001=m -CONFIG_MEDIA_TUNER_MT20XX=m -CONFIG_MEDIA_TUNER_MT2060=m -CONFIG_MEDIA_TUNER_MT2063=m -CONFIG_MEDIA_TUNER_MT2266=m -CONFIG_MEDIA_TUNER_MT2131=m -CONFIG_MEDIA_TUNER_QT1010=m -CONFIG_MEDIA_TUNER_XC2028=m -CONFIG_MEDIA_TUNER_XC5000=m -CONFIG_MEDIA_TUNER_XC4000=m -CONFIG_MEDIA_TUNER_MXL5005S=m -CONFIG_MEDIA_TUNER_MXL5007T=m -CONFIG_MEDIA_TUNER_MC44S803=m -CONFIG_MEDIA_TUNER_MAX2165=m -CONFIG_MEDIA_TUNER_TDA18218=m -CONFIG_MEDIA_TUNER_FC0011=m -CONFIG_MEDIA_TUNER_FC0012=m -CONFIG_MEDIA_TUNER_FC0013=m -CONFIG_MEDIA_TUNER_TDA18212=m -CONFIG_MEDIA_TUNER_E4000=m -CONFIG_MEDIA_TUNER_FC2580=m -CONFIG_MEDIA_TUNER_M88RS6000T=m -CONFIG_MEDIA_TUNER_TUA9001=m -CONFIG_MEDIA_TUNER_SI2157=m -CONFIG_MEDIA_TUNER_IT913X=m -CONFIG_MEDIA_TUNER_R820T=m -CONFIG_MEDIA_TUNER_MXL301RF=m -CONFIG_MEDIA_TUNER_QM1D1C0042=m -CONFIG_MEDIA_TUNER_QM1D1B0004=m - -# -# Multistandard (satellite) frontends -# -CONFIG_DVB_STB0899=m -CONFIG_DVB_STB6100=m -CONFIG_DVB_STV090x=m -CONFIG_DVB_STV0910=m -CONFIG_DVB_STV6110x=m -CONFIG_DVB_STV6111=m -CONFIG_DVB_MXL5XX=m -CONFIG_DVB_M88DS3103=m - -# -# Multistandard (cable + terrestrial) frontends -# -CONFIG_DVB_DRXK=m -CONFIG_DVB_TDA18271C2DD=m -CONFIG_DVB_SI2165=m -CONFIG_DVB_MN88472=m -CONFIG_DVB_MN88473=m - -# -# DVB-S (satellite) frontends -# -CONFIG_DVB_CX24110=m -CONFIG_DVB_CX24123=m -CONFIG_DVB_MT312=m -CONFIG_DVB_ZL10036=m -CONFIG_DVB_ZL10039=m -CONFIG_DVB_S5H1420=m -CONFIG_DVB_STV0288=m -CONFIG_DVB_STB6000=m -CONFIG_DVB_STV0299=m -CONFIG_DVB_STV6110=m -CONFIG_DVB_STV0900=m -CONFIG_DVB_TDA8083=m -CONFIG_DVB_TDA10086=m -CONFIG_DVB_TDA8261=m -CONFIG_DVB_VES1X93=m -CONFIG_DVB_TUNER_ITD1000=m -CONFIG_DVB_TUNER_CX24113=m -CONFIG_DVB_TDA826X=m -CONFIG_DVB_TUA6100=m -CONFIG_DVB_CX24116=m -CONFIG_DVB_CX24117=m -CONFIG_DVB_CX24120=m -CONFIG_DVB_SI21XX=m -CONFIG_DVB_TS2020=m -CONFIG_DVB_DS3000=m -CONFIG_DVB_MB86A16=m -CONFIG_DVB_TDA10071=m - -# -# DVB-T (terrestrial) frontends -# -CONFIG_DVB_SP8870=m -CONFIG_DVB_SP887X=m -CONFIG_DVB_CX22700=m -CONFIG_DVB_CX22702=m -CONFIG_DVB_DRXD=m -CONFIG_DVB_L64781=m -CONFIG_DVB_TDA1004X=m -CONFIG_DVB_NXT6000=m -CONFIG_DVB_MT352=m -CONFIG_DVB_ZL10353=m -CONFIG_DVB_DIB3000MB=m -CONFIG_DVB_DIB3000MC=m -CONFIG_DVB_DIB7000M=m -CONFIG_DVB_DIB7000P=m -CONFIG_DVB_TDA10048=m -CONFIG_DVB_AF9013=m -CONFIG_DVB_EC100=m -CONFIG_DVB_STV0367=m -CONFIG_DVB_CXD2820R=m -CONFIG_DVB_CXD2841ER=m -CONFIG_DVB_RTL2830=m -CONFIG_DVB_RTL2832=m -CONFIG_DVB_RTL2832_SDR=m -CONFIG_DVB_SI2168=m -CONFIG_DVB_AS102_FE=m -CONFIG_DVB_GP8PSK_FE=m - -# -# DVB-C (cable) frontends -# -CONFIG_DVB_VES1820=m -CONFIG_DVB_TDA10021=m -CONFIG_DVB_TDA10023=m -CONFIG_DVB_STV0297=m - -# -# ATSC (North American/Korean Terrestrial/Cable DTV) frontends -# -CONFIG_DVB_NXT200X=m -CONFIG_DVB_OR51211=m -CONFIG_DVB_OR51132=m -CONFIG_DVB_BCM3510=m -CONFIG_DVB_LGDT330X=m -CONFIG_DVB_LGDT3305=m -CONFIG_DVB_LGDT3306A=m -CONFIG_DVB_LG2160=m -CONFIG_DVB_S5H1409=m -CONFIG_DVB_AU8522=m -CONFIG_DVB_AU8522_DTV=m -CONFIG_DVB_AU8522_V4L=m -CONFIG_DVB_S5H1411=m - -# -# ISDB-T (terrestrial) frontends -# -CONFIG_DVB_S921=m -CONFIG_DVB_DIB8000=m -CONFIG_DVB_MB86A20S=m - -# -# ISDB-S (satellite) & ISDB-T (terrestrial) frontends -# -CONFIG_DVB_TC90522=m - -# -# Digital terrestrial only tuners/PLL -# -CONFIG_DVB_PLL=m -CONFIG_DVB_TUNER_DIB0070=m -CONFIG_DVB_TUNER_DIB0090=m - -# -# SEC control devices for DVB-S -# -CONFIG_DVB_DRX39XYJ=m -CONFIG_DVB_LNBH25=m -CONFIG_DVB_LNBP21=m -CONFIG_DVB_LNBP22=m -CONFIG_DVB_ISL6405=m -CONFIG_DVB_ISL6421=m -CONFIG_DVB_ISL6423=m -CONFIG_DVB_A8293=m -CONFIG_DVB_LGS8GXX=m -CONFIG_DVB_ATBM8830=m -CONFIG_DVB_TDA665x=m -CONFIG_DVB_IX2505V=m -CONFIG_DVB_M88RS2000=m -CONFIG_DVB_AF9033=m -CONFIG_DVB_HORUS3A=m -CONFIG_DVB_ASCOT2E=m -CONFIG_DVB_HELENE=m - -# -# Common Interface (EN50221) controller drivers -# -CONFIG_DVB_CXD2099=m -CONFIG_DVB_SP2=m - -# -# Tools to develop new frontends -# -CONFIG_DVB_DUMMY_FE=m - -# -# Graphics support -# -CONFIG_VGA_ARB=y -CONFIG_VGA_ARB_MAX_GPUS=16 -CONFIG_TEGRA_HOST1X=m -CONFIG_TEGRA_HOST1X_FIREWALL=y -CONFIG_DRM=m -CONFIG_DRM_MIPI_DSI=y -CONFIG_DRM_DP_AUX_CHARDEV=y -# CONFIG_DRM_DEBUG_SELFTEST is not set -CONFIG_DRM_KMS_HELPER=m -CONFIG_DRM_KMS_FB_HELPER=y -CONFIG_DRM_FBDEV_EMULATION=y -CONFIG_DRM_FBDEV_OVERALLOC=100 -CONFIG_DRM_LOAD_EDID_FIRMWARE=y -CONFIG_DRM_TTM=m -CONFIG_DRM_GEM_CMA_HELPER=y -CONFIG_DRM_KMS_CMA_HELPER=y -CONFIG_DRM_VM=y -CONFIG_DRM_SCHED=m - -# -# I2C encoder or helper chips -# -# CONFIG_DRM_I2C_CH7006 is not set -# CONFIG_DRM_I2C_SIL164 is not set -# CONFIG_DRM_I2C_NXP_TDA998X is not set -# CONFIG_DRM_I2C_NXP_TDA9950 is not set -CONFIG_DRM_ARM=y -CONFIG_DRM_HDLCD=m -# CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set -CONFIG_DRM_MALI_DISPLAY=m -CONFIG_DRM_RADEON=m -# CONFIG_DRM_RADEON_USERPTR is not set -CONFIG_DRM_AMDGPU=m -CONFIG_DRM_AMDGPU_SI=y -CONFIG_DRM_AMDGPU_CIK=y -CONFIG_DRM_AMDGPU_USERPTR=y -# CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set - -# -# ACP (Audio CoProcessor) Configuration -# -# CONFIG_DRM_AMD_ACP is not set - -# -# Display Engine Configuration -# -CONFIG_DRM_AMD_DC=y -# CONFIG_DRM_AMD_DC_FBC is not set -# CONFIG_DEBUG_KERNEL_DC is not set - -# -# AMD Library routines -# -CONFIG_CHASH=m -# CONFIG_CHASH_STATS is not set -# CONFIG_CHASH_SELFTEST is not set -CONFIG_DRM_NOUVEAU=m -CONFIG_NOUVEAU_PLATFORM_DRIVER=y -CONFIG_NOUVEAU_DEBUG=5 -CONFIG_NOUVEAU_DEBUG_DEFAULT=3 -# CONFIG_NOUVEAU_DEBUG_MMU is not set -CONFIG_DRM_NOUVEAU_BACKLIGHT=y -CONFIG_DRM_VGEM=m -CONFIG_DRM_UDL=m -CONFIG_DRM_AST=m -# CONFIG_DRM_MGAG200 is not set -CONFIG_DRM_CIRRUS_QEMU=m -# CONFIG_DRM_RCAR_DW_HDMI is not set -# CONFIG_DRM_RCAR_LVDS is not set -# CONFIG_DRM_SUN4I is not set -CONFIG_DRM_QXL=m -CONFIG_DRM_BOCHS=m -CONFIG_DRM_VIRTIO_GPU=m -CONFIG_DRM_MSM=m -# CONFIG_DRM_MSM_REGISTER_LOGGING is not set -# CONFIG_DRM_MSM_GPU_SUDO is not set -CONFIG_DRM_MSM_HDMI_HDCP=y -CONFIG_DRM_MSM_DSI=y -CONFIG_DRM_MSM_DSI_PLL=y -CONFIG_DRM_MSM_DSI_28NM_PHY=y -CONFIG_DRM_MSM_DSI_20NM_PHY=y -CONFIG_DRM_MSM_DSI_28NM_8960_PHY=y -CONFIG_DRM_MSM_DSI_14NM_PHY=y -CONFIG_DRM_MSM_DSI_10NM_PHY=y -CONFIG_DRM_TEGRA=m -# CONFIG_DRM_TEGRA_DEBUG is not set -CONFIG_DRM_TEGRA_STAGING=y -CONFIG_DRM_PANEL=y - -# -# Display Panels -# -CONFIG_DRM_PANEL_ARM_VERSATILE=m -# CONFIG_DRM_PANEL_LVDS is not set -CONFIG_DRM_PANEL_SIMPLE=m -# CONFIG_DRM_PANEL_ILITEK_IL9322 is not set -# CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set -# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set -# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set -# CONFIG_DRM_PANEL_LG_LG4573 is not set -# CONFIG_DRM_PANEL_ORISETECH_OTM8009A is not set -# CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set -# CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set -# CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set -# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set -# CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set -# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set -# CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set -# CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set -# CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set -# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set -CONFIG_DRM_BRIDGE=y -CONFIG_DRM_PANEL_BRIDGE=y - -# -# Display Interface Bridges -# -# CONFIG_DRM_ANALOGIX_ANX78XX is not set -CONFIG_DRM_CDNS_DSI=m -# CONFIG_DRM_DUMB_VGA_DAC is not set -# CONFIG_DRM_LVDS_ENCODER is not set -# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set -# CONFIG_DRM_NXP_PTN3460 is not set -# CONFIG_DRM_PARADE_PS8622 is not set -# CONFIG_DRM_SIL_SII8620 is not set -# CONFIG_DRM_SII902X is not set -# CONFIG_DRM_SII9234 is not set -# CONFIG_DRM_THINE_THC63LVD1024 is not set -# CONFIG_DRM_TOSHIBA_TC358767 is not set -# CONFIG_DRM_TI_TFP410 is not set -CONFIG_DRM_I2C_ADV7511=m -CONFIG_DRM_I2C_ADV7511_AUDIO=y -CONFIG_DRM_I2C_ADV7533=y -CONFIG_DRM_I2C_ADV7511_CEC=y -CONFIG_DRM_DW_HDMI=m -# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set -# CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set -# CONFIG_DRM_DW_HDMI_CEC is not set -CONFIG_DRM_VC4=m -# CONFIG_DRM_VC4_HDMI_CEC is not set -# CONFIG_DRM_ARCPGU is not set -CONFIG_DRM_HISI_HIBMC=m -CONFIG_DRM_HISI_KIRIN=m -CONFIG_HISI_KIRIN_DW_DSI=m -# CONFIG_DRM_MXSFB is not set -CONFIG_DRM_MESON=m -CONFIG_DRM_MESON_DW_HDMI=m -# CONFIG_DRM_TINYDRM is not set -# CONFIG_DRM_PL111 is not set -# CONFIG_DRM_XEN is not set -CONFIG_DRM_LEGACY=y -# CONFIG_DRM_TDFX is not set -# CONFIG_DRM_R128 is not set -# CONFIG_DRM_MGA is not set -CONFIG_DRM_VIA=m -CONFIG_DRM_SAVAGE=m -CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y - -# -# Frame buffer Devices -# -CONFIG_FB=y -CONFIG_FIRMWARE_EDID=y -CONFIG_FB_CMDLINE=y -CONFIG_FB_NOTIFY=y -CONFIG_FB_DDC=m -CONFIG_FB_CFB_FILLRECT=y -CONFIG_FB_CFB_COPYAREA=y -CONFIG_FB_CFB_IMAGEBLIT=y -CONFIG_FB_SYS_FILLRECT=y -CONFIG_FB_SYS_COPYAREA=y -CONFIG_FB_SYS_IMAGEBLIT=y -# CONFIG_FB_FOREIGN_ENDIAN is not set -CONFIG_FB_SYS_FOPS=y -CONFIG_FB_DEFERRED_IO=y -CONFIG_FB_SVGALIB=m -CONFIG_FB_BACKLIGHT=y -CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_TILEBLITTING=y - -# -# Frame buffer hardware drivers -# -# CONFIG_FB_CIRRUS is not set -# CONFIG_FB_PM2 is not set -CONFIG_FB_ARMCLCD=y -# CONFIG_FB_CYBER2000 is not set -# CONFIG_FB_ASILIANT is not set -# CONFIG_FB_IMSTT is not set -# CONFIG_FB_UVESA is not set -CONFIG_FB_EFI=y -# CONFIG_FB_OPENCORES is not set -# CONFIG_FB_S1D13XXX is not set -# CONFIG_FB_NVIDIA is not set -# CONFIG_FB_RIVA is not set -# CONFIG_FB_I740 is not set -# CONFIG_FB_MATROX is not set -# CONFIG_FB_RADEON is not set -# CONFIG_FB_ATY128 is not set -# CONFIG_FB_ATY is not set -CONFIG_FB_S3=m -CONFIG_FB_S3_DDC=y -# CONFIG_FB_SAVAGE is not set -# CONFIG_FB_SIS is not set -# CONFIG_FB_NEOMAGIC is not set -# CONFIG_FB_KYRO is not set -CONFIG_FB_3DFX=m -# CONFIG_FB_3DFX_ACCEL is not set -CONFIG_FB_3DFX_I2C=y -# CONFIG_FB_VOODOO1 is not set -CONFIG_FB_VT8623=m -# CONFIG_FB_TRIDENT is not set -CONFIG_FB_ARK=m -CONFIG_FB_PM3=m -# CONFIG_FB_CARMINE is not set -CONFIG_FB_SMSCUFX=m -CONFIG_FB_UDL=m -# CONFIG_FB_IBM_GXT4500 is not set -# CONFIG_FB_VIRTUAL is not set -CONFIG_XEN_FBDEV_FRONTEND=y -# CONFIG_FB_METRONOME is not set -CONFIG_FB_MB862XX=m -CONFIG_FB_MB862XX_PCI_GDC=y -CONFIG_FB_MB862XX_I2C=y -# CONFIG_FB_BROADSHEET is not set -CONFIG_FB_SIMPLE=y -# CONFIG_FB_SSD1307 is not set -# CONFIG_FB_SM712 is not set -CONFIG_BACKLIGHT_LCD_SUPPORT=y -# CONFIG_LCD_CLASS_DEVICE is not set -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_BACKLIGHT_GENERIC=m -CONFIG_BACKLIGHT_PWM=m -# CONFIG_BACKLIGHT_PM8941_WLED is not set -# CONFIG_BACKLIGHT_ADP8860 is not set -# CONFIG_BACKLIGHT_ADP8870 is not set -# CONFIG_BACKLIGHT_LM3630A is not set -# CONFIG_BACKLIGHT_LM3639 is not set -CONFIG_BACKLIGHT_LP855X=m -# CONFIG_BACKLIGHT_GPIO is not set -# CONFIG_BACKLIGHT_LV5207LP is not set -# CONFIG_BACKLIGHT_BD6107 is not set -# CONFIG_BACKLIGHT_ARCXCNN is not set -CONFIG_VGASTATE=m -CONFIG_VIDEOMODE_HELPERS=y -CONFIG_HDMI=y - -# -# Console display driver support -# -CONFIG_DUMMY_CONSOLE=y -CONFIG_DUMMY_CONSOLE_COLUMNS=80 -CONFIG_DUMMY_CONSOLE_ROWS=25 -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y -CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y -# CONFIG_LOGO is not set -CONFIG_SOUND=m -CONFIG_SOUND_OSS_CORE=y -# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set -CONFIG_SND=m -CONFIG_SND_TIMER=m -CONFIG_SND_PCM=m -CONFIG_SND_PCM_ELD=y -CONFIG_SND_PCM_IEC958=y -CONFIG_SND_DMAENGINE_PCM=m -CONFIG_SND_HWDEP=m -CONFIG_SND_SEQ_DEVICE=m -CONFIG_SND_RAWMIDI=m -CONFIG_SND_JACK=y -CONFIG_SND_JACK_INPUT_DEV=y -CONFIG_SND_OSSEMUL=y -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m -CONFIG_SND_PCM_OSS_PLUGINS=y -CONFIG_SND_PCM_TIMER=y -CONFIG_SND_HRTIMER=m -CONFIG_SND_DYNAMIC_MINORS=y -CONFIG_SND_MAX_CARDS=32 -CONFIG_SND_SUPPORT_OLD_API=y -CONFIG_SND_PROC_FS=y -CONFIG_SND_VERBOSE_PROCFS=y -# CONFIG_SND_VERBOSE_PRINTK is not set -# CONFIG_SND_DEBUG is not set -CONFIG_SND_VMASTER=y -CONFIG_SND_SEQUENCER=m -CONFIG_SND_SEQ_DUMMY=m -# CONFIG_SND_SEQUENCER_OSS is not set -CONFIG_SND_SEQ_HRTIMER_DEFAULT=y -CONFIG_SND_SEQ_MIDI_EVENT=m -CONFIG_SND_SEQ_MIDI=m -CONFIG_SND_SEQ_MIDI_EMUL=m -CONFIG_SND_MPU401_UART=m -CONFIG_SND_OPL3_LIB=m -CONFIG_SND_OPL3_LIB_SEQ=m -CONFIG_SND_AC97_CODEC=m -CONFIG_SND_DRIVERS=y -# CONFIG_SND_DUMMY is not set -CONFIG_SND_ALOOP=m -# CONFIG_SND_VIRMIDI is not set -# CONFIG_SND_MTPAV is not set -CONFIG_SND_MTS64=m -# CONFIG_SND_SERIAL_U16550 is not set -# CONFIG_SND_MPU401 is not set -CONFIG_SND_PORTMAN2X4=m -CONFIG_SND_AC97_POWER_SAVE=y -CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 -CONFIG_SND_PCI=y -CONFIG_SND_AD1889=m -# CONFIG_SND_ATIIXP is not set -# CONFIG_SND_ATIIXP_MODEM is not set -# CONFIG_SND_AU8810 is not set -# CONFIG_SND_AU8820 is not set -# CONFIG_SND_AU8830 is not set -# CONFIG_SND_AW2 is not set -# CONFIG_SND_BT87X is not set -# CONFIG_SND_CA0106 is not set -# CONFIG_SND_CMIPCI is not set -CONFIG_SND_OXYGEN_LIB=m -CONFIG_SND_OXYGEN=m -# CONFIG_SND_CS4281 is not set -# CONFIG_SND_CS46XX is not set -CONFIG_SND_CTXFI=m -CONFIG_SND_DARLA20=m -CONFIG_SND_GINA20=m -CONFIG_SND_LAYLA20=m -CONFIG_SND_DARLA24=m -CONFIG_SND_GINA24=m -CONFIG_SND_LAYLA24=m -CONFIG_SND_MONA=m -CONFIG_SND_MIA=m -CONFIG_SND_ECHO3G=m -CONFIG_SND_INDIGO=m -CONFIG_SND_INDIGOIO=m -CONFIG_SND_INDIGODJ=m -CONFIG_SND_INDIGOIOX=m -CONFIG_SND_INDIGODJX=m -# CONFIG_SND_ENS1370 is not set -# CONFIG_SND_ENS1371 is not set -# CONFIG_SND_FM801 is not set -# CONFIG_SND_HDSP is not set -CONFIG_SND_HDSPM=m -# CONFIG_SND_ICE1724 is not set -# CONFIG_SND_INTEL8X0 is not set -# CONFIG_SND_INTEL8X0M is not set -# CONFIG_SND_KORG1212 is not set -CONFIG_SND_LOLA=m -CONFIG_SND_LX6464ES=m -# CONFIG_SND_MIXART is not set -# CONFIG_SND_NM256 is not set -CONFIG_SND_PCXHR=m -CONFIG_SND_RIPTIDE=m -# CONFIG_SND_RME32 is not set -# CONFIG_SND_RME96 is not set -# CONFIG_SND_RME9652 is not set -# CONFIG_SND_VIA82XX is not set -# CONFIG_SND_VIA82XX_MODEM is not set -CONFIG_SND_VIRTUOSO=m -# CONFIG_SND_VX222 is not set -# CONFIG_SND_YMFPCI is not set - -# -# HD-Audio -# -CONFIG_SND_HDA=m -CONFIG_SND_HDA_INTEL=m -CONFIG_SND_HDA_TEGRA=m -CONFIG_SND_HDA_HWDEP=y -CONFIG_SND_HDA_RECONFIG=y -CONFIG_SND_HDA_INPUT_BEEP=y -CONFIG_SND_HDA_INPUT_BEEP_MODE=1 -CONFIG_SND_HDA_PATCH_LOADER=y -CONFIG_SND_HDA_CODEC_REALTEK=m -CONFIG_SND_HDA_CODEC_ANALOG=m -CONFIG_SND_HDA_CODEC_SIGMATEL=m -CONFIG_SND_HDA_CODEC_VIA=m -CONFIG_SND_HDA_CODEC_HDMI=m -CONFIG_SND_HDA_CODEC_CIRRUS=m -CONFIG_SND_HDA_CODEC_CONEXANT=m -CONFIG_SND_HDA_CODEC_CA0110=m -CONFIG_SND_HDA_CODEC_CA0132=m -CONFIG_SND_HDA_CODEC_CA0132_DSP=y -CONFIG_SND_HDA_CODEC_CMEDIA=m -CONFIG_SND_HDA_CODEC_SI3054=m -CONFIG_SND_HDA_GENERIC=m -CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 -CONFIG_SND_HDA_CORE=m -CONFIG_SND_HDA_DSP_LOADER=y -CONFIG_SND_HDA_PREALLOC_SIZE=2048 -CONFIG_SND_SPI=y -CONFIG_SND_USB=y -CONFIG_SND_USB_AUDIO=m -CONFIG_SND_USB_UA101=m -CONFIG_SND_USB_CAIAQ=m -CONFIG_SND_USB_CAIAQ_INPUT=y -CONFIG_SND_USB_6FIRE=m -CONFIG_SND_USB_HIFACE=m -CONFIG_SND_BCD2000=m -CONFIG_SND_USB_LINE6=m -CONFIG_SND_USB_POD=m -CONFIG_SND_USB_PODHD=m -CONFIG_SND_USB_TONEPORT=m -CONFIG_SND_USB_VARIAX=m -CONFIG_SND_FIREWIRE=y -CONFIG_SND_FIREWIRE_LIB=m -CONFIG_SND_DICE=m -CONFIG_SND_OXFW=m -CONFIG_SND_ISIGHT=m -CONFIG_SND_FIREWORKS=m -CONFIG_SND_BEBOB=m -CONFIG_SND_FIREWIRE_DIGI00X=m -CONFIG_SND_FIREWIRE_TASCAM=m -# CONFIG_SND_FIREWIRE_MOTU is not set -# CONFIG_SND_FIREFACE is not set -CONFIG_SND_SOC=m -CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y -# CONFIG_SND_SOC_AMD_ACP is not set -# CONFIG_SND_ATMEL_SOC is not set -CONFIG_SND_BCM2835_SOC_I2S=m -# CONFIG_SND_DESIGNWARE_I2S is not set - -# -# SoC Audio for Freescale CPUs -# - -# -# Common SoC Audio options for Freescale CPUs: -# -# CONFIG_SND_SOC_FSL_ASRC is not set -# CONFIG_SND_SOC_FSL_SAI is not set -# CONFIG_SND_SOC_FSL_SSI is not set -# CONFIG_SND_SOC_FSL_SPDIF is not set -# CONFIG_SND_SOC_FSL_ESAI is not set -# CONFIG_SND_SOC_IMX_AUDMUX is not set -CONFIG_SND_I2S_HI6210_I2S=m -# CONFIG_SND_KIRKWOOD_SOC is not set -# CONFIG_SND_SOC_IMG is not set -CONFIG_SND_SOC_QCOM=m -CONFIG_SND_SOC_LPASS_CPU=m -CONFIG_SND_SOC_LPASS_PLATFORM=m -CONFIG_SND_SOC_LPASS_APQ8016=m -# CONFIG_SND_SOC_STORM is not set -CONFIG_SND_SOC_APQ8016_SBC=m -CONFIG_SND_SOC_QDSP6_COMMON=m -CONFIG_SND_SOC_QDSP6_CORE=m -CONFIG_SND_SOC_QDSP6_AFE=m -CONFIG_SND_SOC_QDSP6_AFE_DAI=m -CONFIG_SND_SOC_QDSP6_ADM=m -CONFIG_SND_SOC_QDSP6_ROUTING=m -CONFIG_SND_SOC_QDSP6_ASM=m -CONFIG_SND_SOC_QDSP6_ASM_DAI=m -CONFIG_SND_SOC_QDSP6=m -CONFIG_SND_SOC_MSM8996=m -# CONFIG_SND_SOC_ROCKCHIP is not set - -# -# STMicroelectronics STM32 SOC audio support -# - -# -# Allwinner SoC Audio support -# -# CONFIG_SND_SUN4I_CODEC is not set -# CONFIG_SND_SUN8I_CODEC_ANALOG is not set -# CONFIG_SND_SUN4I_I2S is not set -# CONFIG_SND_SUN4I_SPDIF is not set -CONFIG_SND_SOC_TEGRA=m -# CONFIG_SND_SOC_TEGRA20_AC97 is not set -# CONFIG_SND_SOC_TEGRA20_DAS is not set -# CONFIG_SND_SOC_TEGRA20_I2S is not set -CONFIG_SND_SOC_TEGRA20_SPDIF=m -# CONFIG_SND_SOC_TEGRA30_AHUB is not set -# CONFIG_SND_SOC_TEGRA30_I2S is not set -CONFIG_SND_SOC_TEGRA_RT5640=m -CONFIG_SND_SOC_TEGRA_WM8753=m -CONFIG_SND_SOC_TEGRA_WM8903=m -# CONFIG_SND_SOC_TEGRA_WM9712 is not set -CONFIG_SND_SOC_TEGRA_TRIMSLICE=m -CONFIG_SND_SOC_TEGRA_ALC5632=m -CONFIG_SND_SOC_TEGRA_MAX98090=m -CONFIG_SND_SOC_TEGRA_RT5677=m -# CONFIG_SND_SOC_TEGRA_SGTL5000 is not set -# CONFIG_SND_SOC_XTFPGA_I2S is not set -# CONFIG_ZX_TDM is not set -CONFIG_SND_SOC_I2C_AND_SPI=m - -# -# CODEC drivers -# -# CONFIG_SND_SOC_AC97_CODEC is not set -# CONFIG_SND_SOC_ADAU1701 is not set -# CONFIG_SND_SOC_ADAU1761_I2C is not set -# CONFIG_SND_SOC_ADAU1761_SPI is not set -# CONFIG_SND_SOC_ADAU7002 is not set -# CONFIG_SND_SOC_AK4104 is not set -# CONFIG_SND_SOC_AK4458 is not set -# CONFIG_SND_SOC_AK4554 is not set -# CONFIG_SND_SOC_AK4613 is not set -# CONFIG_SND_SOC_AK4642 is not set -# CONFIG_SND_SOC_AK5386 is not set -# CONFIG_SND_SOC_AK5558 is not set -# CONFIG_SND_SOC_ALC5623 is not set -CONFIG_SND_SOC_ALC5632=m -# CONFIG_SND_SOC_BD28623 is not set -# CONFIG_SND_SOC_BT_SCO is not set -# CONFIG_SND_SOC_CS35L32 is not set -# CONFIG_SND_SOC_CS35L33 is not set -# CONFIG_SND_SOC_CS35L34 is not set -# CONFIG_SND_SOC_CS35L35 is not set -# CONFIG_SND_SOC_CS42L42 is not set -# CONFIG_SND_SOC_CS42L51_I2C is not set -# CONFIG_SND_SOC_CS42L52 is not set -# CONFIG_SND_SOC_CS42L56 is not set -# CONFIG_SND_SOC_CS42L73 is not set -# CONFIG_SND_SOC_CS4265 is not set -# CONFIG_SND_SOC_CS4270 is not set -# CONFIG_SND_SOC_CS4271_I2C is not set -# CONFIG_SND_SOC_CS4271_SPI is not set -# CONFIG_SND_SOC_CS42XX8_I2C is not set -# CONFIG_SND_SOC_CS43130 is not set -# CONFIG_SND_SOC_CS4349 is not set -# CONFIG_SND_SOC_CS53L30 is not set -# CONFIG_SND_SOC_DIO2125 is not set -CONFIG_SND_SOC_HDMI_CODEC=m -# CONFIG_SND_SOC_ES7134 is not set -# CONFIG_SND_SOC_ES8316 is not set -# CONFIG_SND_SOC_ES8328_I2C is not set -# CONFIG_SND_SOC_ES8328_SPI is not set -# CONFIG_SND_SOC_GTM601 is not set -# CONFIG_SND_SOC_INNO_RK3036 is not set -CONFIG_SND_SOC_MAX98090=m -# CONFIG_SND_SOC_MAX98504 is not set -# CONFIG_SND_SOC_MAX9867 is not set -# CONFIG_SND_SOC_MAX98927 is not set -# CONFIG_SND_SOC_MAX98373 is not set -# CONFIG_SND_SOC_MAX9860 is not set -# CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set -# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set -# CONFIG_SND_SOC_PCM1681 is not set -# CONFIG_SND_SOC_PCM1789_I2C is not set -# CONFIG_SND_SOC_PCM179X_I2C is not set -# CONFIG_SND_SOC_PCM179X_SPI is not set -# CONFIG_SND_SOC_PCM186X_I2C is not set -# CONFIG_SND_SOC_PCM186X_SPI is not set -# CONFIG_SND_SOC_PCM3168A_I2C is not set -# CONFIG_SND_SOC_PCM3168A_SPI is not set -# CONFIG_SND_SOC_PCM512x_I2C is not set -# CONFIG_SND_SOC_PCM512x_SPI is not set -CONFIG_SND_SOC_RL6231=m -# CONFIG_SND_SOC_RT5616 is not set -# CONFIG_SND_SOC_RT5631 is not set -CONFIG_SND_SOC_RT5640=m -CONFIG_SND_SOC_RT5677=m -CONFIG_SND_SOC_RT5677_SPI=m -# CONFIG_SND_SOC_SGTL5000 is not set -# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set -# CONFIG_SND_SOC_SPDIF is not set -# CONFIG_SND_SOC_SSM2305 is not set -# CONFIG_SND_SOC_SSM2602_SPI is not set -# CONFIG_SND_SOC_SSM2602_I2C is not set -# CONFIG_SND_SOC_SSM4567 is not set -# CONFIG_SND_SOC_STA32X is not set -# CONFIG_SND_SOC_STA350 is not set -# CONFIG_SND_SOC_STI_SAS is not set -# CONFIG_SND_SOC_TAS2552 is not set -# CONFIG_SND_SOC_TAS5086 is not set -# CONFIG_SND_SOC_TAS571X is not set -# CONFIG_SND_SOC_TAS5720 is not set -# CONFIG_SND_SOC_TAS6424 is not set -# CONFIG_SND_SOC_TDA7419 is not set -# CONFIG_SND_SOC_TFA9879 is not set -CONFIG_SND_SOC_TLV320AIC23=m -CONFIG_SND_SOC_TLV320AIC23_I2C=m -# CONFIG_SND_SOC_TLV320AIC23_SPI is not set -# CONFIG_SND_SOC_TLV320AIC31XX is not set -# CONFIG_SND_SOC_TLV320AIC32X4_I2C is not set -# CONFIG_SND_SOC_TLV320AIC32X4_SPI is not set -# CONFIG_SND_SOC_TLV320AIC3X is not set -# CONFIG_SND_SOC_TS3A227E is not set -# CONFIG_SND_SOC_TSCS42XX is not set -# CONFIG_SND_SOC_TSCS454 is not set -# CONFIG_SND_SOC_WM8510 is not set -# CONFIG_SND_SOC_WM8523 is not set -# CONFIG_SND_SOC_WM8524 is not set -# CONFIG_SND_SOC_WM8580 is not set -# CONFIG_SND_SOC_WM8711 is not set -# CONFIG_SND_SOC_WM8728 is not set -# CONFIG_SND_SOC_WM8731 is not set -# CONFIG_SND_SOC_WM8737 is not set -# CONFIG_SND_SOC_WM8741 is not set -# CONFIG_SND_SOC_WM8750 is not set -CONFIG_SND_SOC_WM8753=m -# CONFIG_SND_SOC_WM8770 is not set -# CONFIG_SND_SOC_WM8776 is not set -# CONFIG_SND_SOC_WM8782 is not set -# CONFIG_SND_SOC_WM8804_I2C is not set -# CONFIG_SND_SOC_WM8804_SPI is not set -CONFIG_SND_SOC_WM8903=m -# CONFIG_SND_SOC_WM8960 is not set -# CONFIG_SND_SOC_WM8962 is not set -# CONFIG_SND_SOC_WM8974 is not set -# CONFIG_SND_SOC_WM8978 is not set -# CONFIG_SND_SOC_WM8985 is not set -# CONFIG_SND_SOC_ZX_AUD96P22 is not set -# CONFIG_SND_SOC_MAX9759 is not set -# CONFIG_SND_SOC_MT6351 is not set -# CONFIG_SND_SOC_NAU8540 is not set -# CONFIG_SND_SOC_NAU8810 is not set -# CONFIG_SND_SOC_NAU8824 is not set -# CONFIG_SND_SOC_TPA6130A2 is not set -# CONFIG_SND_SIMPLE_CARD is not set -# CONFIG_SND_SIMPLE_SCU_CARD is not set -# CONFIG_SND_AUDIO_GRAPH_CARD is not set -# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set -# CONFIG_SND_XEN_FRONTEND is not set -CONFIG_AC97_BUS=m - -# -# HID support -# -CONFIG_HID=m -CONFIG_HID_BATTERY_STRENGTH=y -CONFIG_HIDRAW=y -CONFIG_UHID=m -CONFIG_HID_GENERIC=m - -# -# Special HID drivers -# -CONFIG_HID_A4TECH=m -# CONFIG_HID_ACCUTOUCH is not set -CONFIG_HID_ACRUX=m -CONFIG_HID_ACRUX_FF=y -CONFIG_HID_APPLE=m -# CONFIG_HID_APPLEIR is not set -CONFIG_HID_ASUS=m -CONFIG_HID_AUREAL=m -CONFIG_HID_BELKIN=m -CONFIG_HID_BETOP_FF=m -CONFIG_HID_CHERRY=m -CONFIG_HID_CHICONY=m -CONFIG_HID_CORSAIR=m -CONFIG_HID_PRODIKEYS=m -CONFIG_HID_CMEDIA=m -CONFIG_HID_CP2112=m -CONFIG_HID_CYPRESS=m -CONFIG_HID_DRAGONRISE=m -CONFIG_DRAGONRISE_FF=y -CONFIG_HID_EMS_FF=m -# CONFIG_HID_ELAN is not set -CONFIG_HID_ELECOM=m -CONFIG_HID_ELO=m -CONFIG_HID_EZKEY=m -CONFIG_HID_GEMBIRD=m -# CONFIG_HID_GFRM is not set -CONFIG_HID_HOLTEK=m -CONFIG_HOLTEK_FF=y -# CONFIG_HID_GOOGLE_HAMMER is not set -# CONFIG_HID_GT683R is not set -CONFIG_HID_KEYTOUCH=m -CONFIG_HID_KYE=m -CONFIG_HID_UCLOGIC=m -CONFIG_HID_WALTOP=m -CONFIG_HID_GYRATION=m -CONFIG_HID_ICADE=m -# CONFIG_HID_ITE is not set -# CONFIG_HID_JABRA is not set -CONFIG_HID_TWINHAN=m -CONFIG_HID_KENSINGTON=m -CONFIG_HID_LCPOWER=m -CONFIG_HID_LED=m -CONFIG_HID_LENOVO=m -CONFIG_HID_LOGITECH=m -CONFIG_HID_LOGITECH_DJ=m -CONFIG_HID_LOGITECH_HIDPP=m -CONFIG_LOGITECH_FF=y -CONFIG_LOGIRUMBLEPAD2_FF=y -CONFIG_LOGIG940_FF=y -CONFIG_LOGIWHEELS_FF=y -CONFIG_HID_MAGICMOUSE=m -# CONFIG_HID_MAYFLASH is not set -# CONFIG_HID_REDRAGON is not set -CONFIG_HID_MICROSOFT=m -CONFIG_HID_MONTEREY=m -CONFIG_HID_MULTITOUCH=m -# CONFIG_HID_NTI is not set -CONFIG_HID_NTRIG=m -CONFIG_HID_ORTEK=m -CONFIG_HID_PANTHERLORD=m -CONFIG_PANTHERLORD_FF=y -CONFIG_HID_PENMOUNT=m -CONFIG_HID_PETALYNX=m -CONFIG_HID_PICOLCD=m -CONFIG_HID_PICOLCD_FB=y -CONFIG_HID_PICOLCD_BACKLIGHT=y -CONFIG_HID_PICOLCD_LEDS=y -CONFIG_HID_PICOLCD_CIR=y -CONFIG_HID_PLANTRONICS=m -CONFIG_HID_PRIMAX=m -# CONFIG_HID_RETRODE is not set -CONFIG_HID_ROCCAT=m -CONFIG_HID_SAITEK=m -CONFIG_HID_SAMSUNG=m -CONFIG_HID_SONY=m -CONFIG_SONY_FF=y -CONFIG_HID_SPEEDLINK=m -# CONFIG_HID_STEAM is not set -CONFIG_HID_STEELSERIES=m -CONFIG_HID_SUNPLUS=m -CONFIG_HID_RMI=m -CONFIG_HID_GREENASIA=m -CONFIG_GREENASIA_FF=y -CONFIG_HID_SMARTJOYPLUS=m -CONFIG_SMARTJOYPLUS_FF=y -CONFIG_HID_TIVO=m -CONFIG_HID_TOPSEED=m -CONFIG_HID_THINGM=m -CONFIG_HID_THRUSTMASTER=m -CONFIG_THRUSTMASTER_FF=y -# CONFIG_HID_UDRAW_PS3 is not set -CONFIG_HID_WACOM=m -CONFIG_HID_WIIMOTE=m -CONFIG_HID_XINMO=m -CONFIG_HID_ZEROPLUS=m -CONFIG_ZEROPLUS_FF=y -CONFIG_HID_ZYDACRON=m -CONFIG_HID_SENSOR_HUB=m -CONFIG_HID_SENSOR_CUSTOM_SENSOR=m -CONFIG_HID_ALPS=m - -# -# USB HID support -# -CONFIG_USB_HID=m -CONFIG_HID_PID=y -CONFIG_USB_HIDDEV=y - -# -# USB HID Boot Protocol drivers -# -# CONFIG_USB_KBD is not set -# CONFIG_USB_MOUSE is not set - -# -# I2C HID support -# -# CONFIG_I2C_HID is not set -CONFIG_USB_OHCI_LITTLE_ENDIAN=y -CONFIG_USB_SUPPORT=y -CONFIG_USB_COMMON=y -CONFIG_USB_ARCH_HAS_HCD=y -CONFIG_USB=m -CONFIG_USB_PCI=y -CONFIG_USB_ANNOUNCE_NEW_DEVICES=y - -# -# Miscellaneous USB options -# -CONFIG_USB_DEFAULT_PERSIST=y -CONFIG_USB_DYNAMIC_MINORS=y -# CONFIG_USB_OTG is not set -# CONFIG_USB_OTG_WHITELIST is not set -# CONFIG_USB_OTG_BLACKLIST_HUB is not set -CONFIG_USB_LEDS_TRIGGER_USBPORT=m -CONFIG_USB_MON=m -CONFIG_USB_WUSB=m -CONFIG_USB_WUSB_CBAF=m -# CONFIG_USB_WUSB_CBAF_DEBUG is not set - -# -# USB Host Controller Drivers -# -# CONFIG_USB_C67X00_HCD is not set -CONFIG_USB_XHCI_HCD=m -# CONFIG_USB_XHCI_DBGCAP is not set -CONFIG_USB_XHCI_PCI=m -CONFIG_USB_XHCI_PLATFORM=m -CONFIG_USB_XHCI_HISTB=m -# CONFIG_USB_XHCI_MVEBU is not set -CONFIG_USB_XHCI_TEGRA=m -CONFIG_USB_EHCI_HCD=m -CONFIG_USB_EHCI_ROOT_HUB_TT=y -CONFIG_USB_EHCI_TT_NEWSCHED=y -CONFIG_USB_EHCI_PCI=m -CONFIG_USB_EHCI_HCD_ORION=m -CONFIG_USB_EHCI_TEGRA=m -CONFIG_USB_EHCI_HCD_PLATFORM=m -# CONFIG_USB_OXU210HP_HCD is not set -# CONFIG_USB_ISP116X_HCD is not set -# CONFIG_USB_FOTG210_HCD is not set -# CONFIG_USB_MAX3421_HCD is not set -CONFIG_USB_OHCI_HCD=m -CONFIG_USB_OHCI_HCD_PCI=m -# CONFIG_USB_OHCI_HCD_SSB is not set -CONFIG_USB_OHCI_HCD_PLATFORM=m -# CONFIG_USB_UHCI_HCD is not set -CONFIG_USB_U132_HCD=m -# CONFIG_USB_SL811_HCD is not set -# CONFIG_USB_R8A66597_HCD is not set -CONFIG_USB_WHCI_HCD=m -CONFIG_USB_HWA_HCD=m -# CONFIG_USB_HCD_BCMA is not set -# CONFIG_USB_HCD_SSB is not set -# CONFIG_USB_HCD_TEST_MODE is not set - -# -# USB Device Class drivers -# -CONFIG_USB_ACM=m -CONFIG_USB_PRINTER=m -CONFIG_USB_WDM=m -CONFIG_USB_TMC=m - -# -# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may -# - -# -# also be needed; see USB_STORAGE Help for more info -# -CONFIG_USB_STORAGE=m -# CONFIG_USB_STORAGE_DEBUG is not set -CONFIG_USB_STORAGE_REALTEK=m -CONFIG_REALTEK_AUTOPM=y -CONFIG_USB_STORAGE_DATAFAB=m -CONFIG_USB_STORAGE_FREECOM=m -CONFIG_USB_STORAGE_ISD200=m -CONFIG_USB_STORAGE_USBAT=m -CONFIG_USB_STORAGE_SDDR09=m -CONFIG_USB_STORAGE_SDDR55=m -CONFIG_USB_STORAGE_JUMPSHOT=m -CONFIG_USB_STORAGE_ALAUDA=m -CONFIG_USB_STORAGE_ONETOUCH=m -CONFIG_USB_STORAGE_KARMA=m -CONFIG_USB_STORAGE_CYPRESS_ATACB=m -CONFIG_USB_STORAGE_ENE_UB6250=m -CONFIG_USB_UAS=m - -# -# USB Imaging devices -# -CONFIG_USB_MDC800=m -CONFIG_USB_MICROTEK=m -CONFIG_USBIP_CORE=m -CONFIG_USBIP_VHCI_HCD=m -CONFIG_USBIP_VHCI_HC_PORTS=15 -CONFIG_USBIP_VHCI_NR_HCS=8 -CONFIG_USBIP_HOST=m -CONFIG_USBIP_VUDC=m -# CONFIG_USBIP_DEBUG is not set -CONFIG_USB_MUSB_HDRC=m -# CONFIG_USB_MUSB_HOST is not set -# CONFIG_USB_MUSB_GADGET is not set -CONFIG_USB_MUSB_DUAL_ROLE=y - -# -# Platform Glue Layer -# -CONFIG_USB_MUSB_SUNXI=m - -# -# MUSB DMA mode -# -# CONFIG_MUSB_PIO_ONLY is not set -CONFIG_USB_DWC3=m -# CONFIG_USB_DWC3_ULPI is not set -# CONFIG_USB_DWC3_HOST is not set -# CONFIG_USB_DWC3_GADGET is not set -CONFIG_USB_DWC3_DUAL_ROLE=y - -# -# Platform Glue Driver Support -# -CONFIG_USB_DWC3_PCI=m -CONFIG_USB_DWC3_OF_SIMPLE=m -CONFIG_USB_DWC3_QCOM=m -CONFIG_USB_DWC2=m -# CONFIG_USB_DWC2_HOST is not set - -# -# Gadget/Dual-role mode requires USB Gadget support to be enabled -# -# CONFIG_USB_DWC2_PERIPHERAL is not set -CONFIG_USB_DWC2_DUAL_ROLE=y -# CONFIG_USB_DWC2_PCI is not set -# CONFIG_USB_DWC2_DEBUG is not set -# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set -CONFIG_USB_CHIPIDEA=m -CONFIG_USB_CHIPIDEA_OF=m -CONFIG_USB_CHIPIDEA_PCI=m -CONFIG_USB_CHIPIDEA_UDC=y -CONFIG_USB_CHIPIDEA_HOST=y -CONFIG_USB_ISP1760=m -CONFIG_USB_ISP1760_HCD=y -CONFIG_USB_ISP1761_UDC=y -# CONFIG_USB_ISP1760_HOST_ROLE is not set -# CONFIG_USB_ISP1760_GADGET_ROLE is not set -CONFIG_USB_ISP1760_DUAL_ROLE=y - -# -# USB port drivers -# -# CONFIG_USB_USS720 is not set -CONFIG_USB_SERIAL=m -CONFIG_USB_SERIAL_GENERIC=y -CONFIG_USB_SERIAL_SIMPLE=m -CONFIG_USB_SERIAL_AIRCABLE=m -CONFIG_USB_SERIAL_ARK3116=m -CONFIG_USB_SERIAL_BELKIN=m -CONFIG_USB_SERIAL_CH341=m -CONFIG_USB_SERIAL_WHITEHEAT=m -CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -CONFIG_USB_SERIAL_CP210X=m -CONFIG_USB_SERIAL_CYPRESS_M8=m -CONFIG_USB_SERIAL_EMPEG=m -CONFIG_USB_SERIAL_FTDI_SIO=m -CONFIG_USB_SERIAL_VISOR=m -CONFIG_USB_SERIAL_IPAQ=m -CONFIG_USB_SERIAL_IR=m -CONFIG_USB_SERIAL_EDGEPORT=m -CONFIG_USB_SERIAL_EDGEPORT_TI=m -CONFIG_USB_SERIAL_F81232=m -# CONFIG_USB_SERIAL_F8153X is not set -CONFIG_USB_SERIAL_GARMIN=m -CONFIG_USB_SERIAL_IPW=m -CONFIG_USB_SERIAL_IUU=m -CONFIG_USB_SERIAL_KEYSPAN_PDA=m -CONFIG_USB_SERIAL_KEYSPAN=m -CONFIG_USB_SERIAL_KLSI=m -CONFIG_USB_SERIAL_KOBIL_SCT=m -CONFIG_USB_SERIAL_MCT_U232=m -CONFIG_USB_SERIAL_METRO=m -CONFIG_USB_SERIAL_MOS7720=m -CONFIG_USB_SERIAL_MOS7715_PARPORT=y -CONFIG_USB_SERIAL_MOS7840=m -CONFIG_USB_SERIAL_MXUPORT=m -CONFIG_USB_SERIAL_NAVMAN=m -CONFIG_USB_SERIAL_PL2303=m -CONFIG_USB_SERIAL_OTI6858=m -CONFIG_USB_SERIAL_QCAUX=m -CONFIG_USB_SERIAL_QUALCOMM=m -CONFIG_USB_SERIAL_SPCP8X5=m -CONFIG_USB_SERIAL_SAFE=m -# CONFIG_USB_SERIAL_SAFE_PADDED is not set -CONFIG_USB_SERIAL_SIERRAWIRELESS=m -CONFIG_USB_SERIAL_SYMBOL=m -CONFIG_USB_SERIAL_TI=m -CONFIG_USB_SERIAL_CYBERJACK=m -CONFIG_USB_SERIAL_XIRCOM=m -CONFIG_USB_SERIAL_WWAN=m -CONFIG_USB_SERIAL_OPTION=m -CONFIG_USB_SERIAL_OMNINET=m -CONFIG_USB_SERIAL_OPTICON=m -CONFIG_USB_SERIAL_XSENS_MT=m -CONFIG_USB_SERIAL_WISHBONE=m -CONFIG_USB_SERIAL_SSU100=m -CONFIG_USB_SERIAL_QT2=m -# CONFIG_USB_SERIAL_UPD78F0730 is not set -CONFIG_USB_SERIAL_DEBUG=m - -# -# USB Miscellaneous drivers -# -CONFIG_USB_EMI62=m -CONFIG_USB_EMI26=m -CONFIG_USB_ADUTUX=m -CONFIG_USB_SEVSEG=m -CONFIG_USB_RIO500=m -CONFIG_USB_LEGOTOWER=m -CONFIG_USB_LCD=m -CONFIG_USB_CYPRESS_CY7C63=m -CONFIG_USB_CYTHERM=m -CONFIG_USB_IDMOUSE=m -CONFIG_USB_FTDI_ELAN=m -CONFIG_USB_APPLEDISPLAY=m -CONFIG_USB_SISUSBVGA=m -CONFIG_USB_SISUSBVGA_CON=y -CONFIG_USB_LD=m -CONFIG_USB_TRANCEVIBRATOR=m -CONFIG_USB_IOWARRIOR=m -CONFIG_USB_TEST=m -CONFIG_USB_EHSET_TEST_FIXTURE=m -CONFIG_USB_ISIGHTFW=m -CONFIG_USB_YUREX=m -CONFIG_USB_EZUSB_FX2=m -# CONFIG_USB_HUB_USB251XB is not set -CONFIG_USB_HSIC_USB3503=m -# CONFIG_USB_HSIC_USB4604 is not set -# CONFIG_USB_LINK_LAYER_TEST is not set -CONFIG_USB_CHAOSKEY=m -# CONFIG_USB_ATM is not set - -# -# USB Physical Layer drivers -# -CONFIG_USB_PHY=y -CONFIG_NOP_USB_XCEIV=m -# CONFIG_USB_GPIO_VBUS is not set -# CONFIG_USB_ISP1301 is not set -CONFIG_USB_TEGRA_PHY=m -CONFIG_USB_ULPI=y -CONFIG_USB_ULPI_VIEWPORT=y -CONFIG_USB_GADGET=m -# CONFIG_USB_GADGET_DEBUG is not set -# CONFIG_USB_GADGET_DEBUG_FILES is not set -# CONFIG_USB_GADGET_DEBUG_FS is not set -CONFIG_USB_GADGET_VBUS_DRAW=2 -CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 -# CONFIG_U_SERIAL_CONSOLE is not set - -# -# USB Peripheral Controller -# -# CONFIG_USB_FOTG210_UDC is not set -# CONFIG_USB_GR_UDC is not set -# CONFIG_USB_R8A66597 is not set -# CONFIG_USB_PXA27X is not set -# CONFIG_USB_MV_UDC is not set -# CONFIG_USB_MV_U3D is not set -# CONFIG_USB_SNP_UDC_PLAT is not set -# CONFIG_USB_M66592 is not set -# CONFIG_USB_BDC_UDC is not set -# CONFIG_USB_AMD5536UDC is not set -# CONFIG_USB_NET2272 is not set -CONFIG_USB_NET2280=m -# CONFIG_USB_GOKU is not set -# CONFIG_USB_EG20T is not set -# CONFIG_USB_GADGET_XILINX is not set -# CONFIG_USB_DUMMY_HCD is not set -CONFIG_USB_LIBCOMPOSITE=m -CONFIG_USB_F_ACM=m -CONFIG_USB_F_SS_LB=m -CONFIG_USB_U_SERIAL=m -CONFIG_USB_U_ETHER=m -CONFIG_USB_U_AUDIO=m -CONFIG_USB_F_SERIAL=m -CONFIG_USB_F_OBEX=m -CONFIG_USB_F_NCM=m -CONFIG_USB_F_ECM=m -CONFIG_USB_F_PHONET=m -CONFIG_USB_F_EEM=m -CONFIG_USB_F_SUBSET=m -CONFIG_USB_F_RNDIS=m -CONFIG_USB_F_MASS_STORAGE=m -CONFIG_USB_F_FS=m -CONFIG_USB_F_UAC1=m -CONFIG_USB_F_UAC2=m -CONFIG_USB_F_UVC=m -CONFIG_USB_F_MIDI=m -CONFIG_USB_F_HID=m -CONFIG_USB_F_PRINTER=m -CONFIG_USB_CONFIGFS=m -CONFIG_USB_CONFIGFS_SERIAL=y -CONFIG_USB_CONFIGFS_ACM=y -CONFIG_USB_CONFIGFS_OBEX=y -CONFIG_USB_CONFIGFS_NCM=y -CONFIG_USB_CONFIGFS_ECM=y -CONFIG_USB_CONFIGFS_ECM_SUBSET=y -CONFIG_USB_CONFIGFS_RNDIS=y -CONFIG_USB_CONFIGFS_EEM=y -CONFIG_USB_CONFIGFS_PHONET=y -CONFIG_USB_CONFIGFS_MASS_STORAGE=y -CONFIG_USB_CONFIGFS_F_LB_SS=y -CONFIG_USB_CONFIGFS_F_FS=y -CONFIG_USB_CONFIGFS_F_UAC1=y -# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set -CONFIG_USB_CONFIGFS_F_UAC2=y -CONFIG_USB_CONFIGFS_F_MIDI=y -CONFIG_USB_CONFIGFS_F_HID=y -CONFIG_USB_CONFIGFS_F_UVC=y -CONFIG_USB_CONFIGFS_F_PRINTER=y -# CONFIG_USB_CONFIGFS_F_TCM is not set -# CONFIG_USB_ZERO is not set -# CONFIG_USB_AUDIO is not set -CONFIG_USB_ETH=m -CONFIG_USB_ETH_RNDIS=y -# CONFIG_USB_ETH_EEM is not set -# CONFIG_USB_G_NCM is not set -CONFIG_USB_GADGETFS=m -CONFIG_USB_FUNCTIONFS=m -CONFIG_USB_FUNCTIONFS_ETH=y -CONFIG_USB_FUNCTIONFS_RNDIS=y -CONFIG_USB_FUNCTIONFS_GENERIC=y -# CONFIG_USB_MASS_STORAGE is not set -# CONFIG_USB_GADGET_TARGET is not set -CONFIG_USB_G_SERIAL=m -# CONFIG_USB_MIDI_GADGET is not set -# CONFIG_USB_G_PRINTER is not set -# CONFIG_USB_CDC_COMPOSITE is not set -# CONFIG_USB_G_NOKIA is not set -# CONFIG_USB_G_ACM_MS is not set -# CONFIG_USB_G_MULTI is not set -# CONFIG_USB_G_HID is not set -# CONFIG_USB_G_DBGP is not set -# CONFIG_USB_G_WEBCAM is not set -# CONFIG_TYPEC is not set -CONFIG_USB_LED_TRIG=y -CONFIG_USB_ULPI_BUS=m -CONFIG_UWB=m -CONFIG_UWB_HWA=m -CONFIG_UWB_WHCI=m -CONFIG_UWB_I1480U=m -CONFIG_MMC=y -CONFIG_PWRSEQ_EMMC=y -# CONFIG_PWRSEQ_SD8787 is not set -CONFIG_PWRSEQ_SIMPLE=y -CONFIG_MMC_BLOCK=y -CONFIG_MMC_BLOCK_MINORS=256 -CONFIG_SDIO_UART=m -# CONFIG_MMC_TEST is not set - -# -# MMC/SD/SDIO Host Controller Drivers -# -# CONFIG_MMC_DEBUG is not set -CONFIG_MMC_ARMMMCI=m -CONFIG_MMC_QCOM_DML=y -CONFIG_MMC_SDHCI=m -CONFIG_MMC_SDHCI_IO_ACCESSORS=y -CONFIG_MMC_SDHCI_PCI=m -CONFIG_MMC_RICOH_MMC=y -CONFIG_MMC_SDHCI_ACPI=m -CONFIG_MMC_SDHCI_PLTFM=m -CONFIG_MMC_SDHCI_OF_ARASAN=m -# CONFIG_MMC_SDHCI_OF_AT91 is not set -# CONFIG_MMC_SDHCI_CADENCE is not set -CONFIG_MMC_SDHCI_TEGRA=m -# CONFIG_MMC_SDHCI_PXAV3 is not set -CONFIG_MMC_SDHCI_F_SDH30=m -CONFIG_MMC_SDHCI_IPROC=m -CONFIG_MMC_MESON_GX=m -# CONFIG_MMC_MESON_MX_SDIO is not set -CONFIG_MMC_SDHCI_MSM=m -CONFIG_MMC_TIFM_SD=m -CONFIG_MMC_SPI=m -CONFIG_MMC_CB710=m -CONFIG_MMC_VIA_SDMMC=m -CONFIG_MMC_DW=m -CONFIG_MMC_DW_PLTFM=m -# CONFIG_MMC_DW_BLUEFIELD is not set -# CONFIG_MMC_DW_EXYNOS is not set -# CONFIG_MMC_DW_HI3798CV200 is not set -CONFIG_MMC_DW_K3=m -# CONFIG_MMC_DW_PCI is not set -CONFIG_MMC_DW_ROCKCHIP=m -CONFIG_MMC_VUB300=m -CONFIG_MMC_USHC=m -# CONFIG_MMC_USDHI6ROL0 is not set -CONFIG_MMC_REALTEK_PCI=m -CONFIG_MMC_REALTEK_USB=m -CONFIG_MMC_SUNXI=m -CONFIG_MMC_CQHCI=m -CONFIG_MMC_TOSHIBA_PCI=m -CONFIG_MMC_BCM2835=m -# CONFIG_MMC_MTK is not set -CONFIG_MMC_SDHCI_XENON=m -# CONFIG_MMC_SDHCI_OMAP is not set -CONFIG_MEMSTICK=m -# CONFIG_MEMSTICK_DEBUG is not set - -# -# MemoryStick drivers -# -# CONFIG_MEMSTICK_UNSAFE_RESUME is not set -CONFIG_MSPRO_BLOCK=m -# CONFIG_MS_BLOCK is not set - -# -# MemoryStick Host Controller Drivers -# -CONFIG_MEMSTICK_TIFM_MS=m -CONFIG_MEMSTICK_JMICRON_38X=m -CONFIG_MEMSTICK_R592=m -CONFIG_MEMSTICK_REALTEK_PCI=m -CONFIG_MEMSTICK_REALTEK_USB=m -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -# CONFIG_LEDS_CLASS_FLASH is not set -CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y - -# -# LED drivers -# -# CONFIG_LEDS_BCM6328 is not set -# CONFIG_LEDS_BCM6358 is not set -# CONFIG_LEDS_CR0014114 is not set -# CONFIG_LEDS_LM3530 is not set -# CONFIG_LEDS_LM3642 is not set -# CONFIG_LEDS_LM3692X is not set -# CONFIG_LEDS_PCA9532 is not set -CONFIG_LEDS_GPIO=m -CONFIG_LEDS_LP3944=m -# CONFIG_LEDS_LP3952 is not set -# CONFIG_LEDS_LP5521 is not set -# CONFIG_LEDS_LP5523 is not set -# CONFIG_LEDS_LP5562 is not set -# CONFIG_LEDS_LP8501 is not set -# CONFIG_LEDS_LP8860 is not set -CONFIG_LEDS_PCA955X=m -# CONFIG_LEDS_PCA955X_GPIO is not set -# CONFIG_LEDS_PCA963X is not set -CONFIG_LEDS_DAC124S085=m -CONFIG_LEDS_PWM=m -CONFIG_LEDS_REGULATOR=m -CONFIG_LEDS_BD2802=m -CONFIG_LEDS_LT3593=m -# CONFIG_LEDS_TCA6507 is not set -# CONFIG_LEDS_TLC591XX is not set -# CONFIG_LEDS_LM355x is not set -# CONFIG_LEDS_IS31FL319X is not set -# CONFIG_LEDS_IS31FL32XX is not set - -# -# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM) -# -# CONFIG_LEDS_BLINKM is not set -# CONFIG_LEDS_SYSCON is not set -# CONFIG_LEDS_MLXREG is not set -# CONFIG_LEDS_USER is not set - -# -# LED Triggers -# -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=m -CONFIG_LEDS_TRIGGER_ONESHOT=m -CONFIG_LEDS_TRIGGER_DISK=y -CONFIG_LEDS_TRIGGER_MTD=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=m -CONFIG_LEDS_TRIGGER_BACKLIGHT=m -CONFIG_LEDS_TRIGGER_CPU=y -# CONFIG_LEDS_TRIGGER_ACTIVITY is not set -CONFIG_LEDS_TRIGGER_GPIO=m -CONFIG_LEDS_TRIGGER_DEFAULT_ON=m - -# -# iptables trigger is under Netfilter config (LED target) -# -CONFIG_LEDS_TRIGGER_TRANSIENT=m -CONFIG_LEDS_TRIGGER_CAMERA=m -CONFIG_LEDS_TRIGGER_PANIC=y -# CONFIG_LEDS_TRIGGER_NETDEV is not set -CONFIG_ACCESSIBILITY=y -CONFIG_A11Y_BRAILLE_CONSOLE=y -CONFIG_INFINIBAND=m -CONFIG_INFINIBAND_USER_MAD=m -CONFIG_INFINIBAND_USER_ACCESS=m -# CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI is not set -CONFIG_INFINIBAND_USER_MEM=y -CONFIG_INFINIBAND_ON_DEMAND_PAGING=y -CONFIG_INFINIBAND_ADDR_TRANS=y -CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y -CONFIG_INFINIBAND_MTHCA=m -CONFIG_INFINIBAND_MTHCA_DEBUG=y -CONFIG_INFINIBAND_QIB=m -CONFIG_INFINIBAND_CXGB3=m -CONFIG_INFINIBAND_CXGB4=m -CONFIG_INFINIBAND_I40IW=m -CONFIG_MLX4_INFINIBAND=m -CONFIG_MLX5_INFINIBAND=m -CONFIG_INFINIBAND_NES=m -# CONFIG_INFINIBAND_NES_DEBUG is not set -CONFIG_INFINIBAND_OCRDMA=m -# CONFIG_INFINIBAND_HNS is not set -CONFIG_INFINIBAND_IPOIB=m -CONFIG_INFINIBAND_IPOIB_CM=y -CONFIG_INFINIBAND_IPOIB_DEBUG=y -# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set -CONFIG_INFINIBAND_SRP=m -CONFIG_INFINIBAND_SRPT=m -CONFIG_INFINIBAND_ISER=m -CONFIG_INFINIBAND_ISERT=m -CONFIG_INFINIBAND_RDMAVT=m -CONFIG_RDMA_RXE=m -CONFIG_INFINIBAND_QEDR=m -# CONFIG_INFINIBAND_BNXT_RE is not set -CONFIG_EDAC_SUPPORT=y -CONFIG_EDAC=y -CONFIG_EDAC_LEGACY_SYSFS=y -# CONFIG_EDAC_DEBUG is not set -CONFIG_EDAC_THUNDERX=m -CONFIG_EDAC_XGENE=m -CONFIG_RTC_LIB=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_HCTOSYS=y -CONFIG_RTC_HCTOSYS_DEVICE="rtc0" -CONFIG_RTC_SYSTOHC=y -CONFIG_RTC_SYSTOHC_DEVICE="rtc0" -# CONFIG_RTC_DEBUG is not set -CONFIG_RTC_NVMEM=y - -# -# RTC interfaces -# -CONFIG_RTC_INTF_SYSFS=y -CONFIG_RTC_INTF_PROC=y -CONFIG_RTC_INTF_DEV=y -# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set -# CONFIG_RTC_DRV_TEST is not set - -# -# I2C RTC drivers -# -# CONFIG_RTC_DRV_ABB5ZES3 is not set -# CONFIG_RTC_DRV_ABX80X is not set -CONFIG_RTC_DRV_DS1307=y -CONFIG_RTC_DRV_DS1307_HWMON=y -# CONFIG_RTC_DRV_DS1307_CENTURY is not set -# CONFIG_RTC_DRV_DS1374 is not set -# CONFIG_RTC_DRV_DS1672 is not set -# CONFIG_RTC_DRV_HYM8563 is not set -# CONFIG_RTC_DRV_MAX6900 is not set -CONFIG_RTC_DRV_MAX77686=y -CONFIG_RTC_DRV_RK808=m -# CONFIG_RTC_DRV_RS5C372 is not set -# CONFIG_RTC_DRV_ISL1208 is not set -# CONFIG_RTC_DRV_ISL12022 is not set -# CONFIG_RTC_DRV_ISL12026 is not set -# CONFIG_RTC_DRV_X1205 is not set -# CONFIG_RTC_DRV_PCF8523 is not set -# CONFIG_RTC_DRV_PCF85063 is not set -# CONFIG_RTC_DRV_PCF85363 is not set -# CONFIG_RTC_DRV_PCF8563 is not set -# CONFIG_RTC_DRV_PCF8583 is not set -# CONFIG_RTC_DRV_M41T80 is not set -# CONFIG_RTC_DRV_BQ32K is not set -# CONFIG_RTC_DRV_S35390A is not set -# CONFIG_RTC_DRV_FM3130 is not set -# CONFIG_RTC_DRV_RX8010 is not set -# CONFIG_RTC_DRV_RX8581 is not set -# CONFIG_RTC_DRV_RX8025 is not set -# CONFIG_RTC_DRV_EM3027 is not set -# CONFIG_RTC_DRV_RV8803 is not set - -# -# SPI RTC drivers -# -# CONFIG_RTC_DRV_M41T93 is not set -# CONFIG_RTC_DRV_M41T94 is not set -# CONFIG_RTC_DRV_DS1302 is not set -# CONFIG_RTC_DRV_DS1305 is not set -# CONFIG_RTC_DRV_DS1343 is not set -# CONFIG_RTC_DRV_DS1347 is not set -# CONFIG_RTC_DRV_DS1390 is not set -# CONFIG_RTC_DRV_MAX6916 is not set -# CONFIG_RTC_DRV_R9701 is not set -# CONFIG_RTC_DRV_RX4581 is not set -# CONFIG_RTC_DRV_RX6110 is not set -# CONFIG_RTC_DRV_RS5C348 is not set -# CONFIG_RTC_DRV_MAX6902 is not set -# CONFIG_RTC_DRV_PCF2123 is not set -# CONFIG_RTC_DRV_MCP795 is not set -CONFIG_RTC_I2C_AND_SPI=y - -# -# SPI and I2C RTC drivers -# -# CONFIG_RTC_DRV_DS3232 is not set -# CONFIG_RTC_DRV_PCF2127 is not set -# CONFIG_RTC_DRV_RV3029C2 is not set - -# -# Platform RTC drivers -# -# CONFIG_RTC_DRV_DS1286 is not set -# CONFIG_RTC_DRV_DS1511 is not set -# CONFIG_RTC_DRV_DS1553 is not set -# CONFIG_RTC_DRV_DS1685_FAMILY is not set -# CONFIG_RTC_DRV_DS1742 is not set -# CONFIG_RTC_DRV_DS2404 is not set -CONFIG_RTC_DRV_EFI=y -# CONFIG_RTC_DRV_STK17TA8 is not set -# CONFIG_RTC_DRV_M48T86 is not set -# CONFIG_RTC_DRV_M48T35 is not set -# CONFIG_RTC_DRV_M48T59 is not set -# CONFIG_RTC_DRV_MSM6242 is not set -# CONFIG_RTC_DRV_BQ4802 is not set -# CONFIG_RTC_DRV_RP5C01 is not set -# CONFIG_RTC_DRV_V3020 is not set -# CONFIG_RTC_DRV_ZYNQMP is not set -# CONFIG_RTC_DRV_CROS_EC is not set - -# -# on-CPU RTC drivers -# -# CONFIG_RTC_DRV_PL030 is not set -CONFIG_RTC_DRV_PL031=y -CONFIG_RTC_DRV_SUN6I=y -CONFIG_RTC_DRV_MV=m -CONFIG_RTC_DRV_ARMADA38X=m -# CONFIG_RTC_DRV_FTRTC010 is not set -CONFIG_RTC_DRV_PM8XXX=m -CONFIG_RTC_DRV_TEGRA=y -# CONFIG_RTC_DRV_SNVS is not set -CONFIG_RTC_DRV_XGENE=y -# CONFIG_RTC_DRV_R7301 is not set - -# -# HID Sensor RTC drivers -# -# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set -CONFIG_DMADEVICES=y -# CONFIG_DMADEVICES_DEBUG is not set - -# -# DMA Devices -# -CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y -CONFIG_DMA_ENGINE=y -CONFIG_DMA_VIRTUAL_CHANNELS=y -CONFIG_DMA_ACPI=y -CONFIG_DMA_OF=y -# CONFIG_ALTERA_MSGDMA is not set -# CONFIG_AMBA_PL08X is not set -# CONFIG_BCM_SBA_RAID is not set -CONFIG_DMA_BCM2835=y -CONFIG_DMA_SUN6I=m -# CONFIG_DW_AXI_DMAC is not set -# CONFIG_FSL_EDMA is not set -# CONFIG_INTEL_IDMA64 is not set -CONFIG_K3_DMA=m -CONFIG_MV_XOR=y -CONFIG_MV_XOR_V2=y -CONFIG_PL330_DMA=m -CONFIG_TEGRA20_APB_DMA=y -CONFIG_TEGRA210_ADMA=y -CONFIG_XGENE_DMA=m -# CONFIG_XILINX_DMA is not set -# CONFIG_XILINX_ZYNQMP_DMA is not set -CONFIG_QCOM_BAM_DMA=m -CONFIG_QCOM_HIDMA_MGMT=m -CONFIG_QCOM_HIDMA=m -# CONFIG_DW_DMAC is not set -# CONFIG_DW_DMAC_PCI is not set - -# -# DMA Clients -# -CONFIG_ASYNC_TX_DMA=y -# CONFIG_DMATEST is not set -CONFIG_DMA_ENGINE_RAID=y - -# -# DMABUF options -# -CONFIG_SYNC_FILE=y -# CONFIG_SW_SYNC is not set -# CONFIG_AUXDISPLAY is not set -# CONFIG_PANEL is not set -CONFIG_UIO=m -CONFIG_UIO_CIF=m -# CONFIG_UIO_PDRV_GENIRQ is not set -# CONFIG_UIO_DMEM_GENIRQ is not set -CONFIG_UIO_AEC=m -CONFIG_UIO_SERCOS3=m -CONFIG_UIO_PCI_GENERIC=m -CONFIG_UIO_NETX=m -# CONFIG_UIO_PRUSS is not set -CONFIG_UIO_MF624=m -CONFIG_VFIO_IOMMU_TYPE1=m -CONFIG_VFIO_VIRQFD=m -CONFIG_VFIO=m -CONFIG_VFIO_NOIOMMU=y -CONFIG_VFIO_PCI=m -CONFIG_VFIO_PCI_MMAP=y -CONFIG_VFIO_PCI_INTX=y -# CONFIG_VFIO_PLATFORM is not set -# CONFIG_VFIO_MDEV is not set -CONFIG_IRQ_BYPASS_MANAGER=y -CONFIG_VIRT_DRIVERS=y -CONFIG_VIRTIO=m -CONFIG_VIRTIO_MENU=y -CONFIG_VIRTIO_PCI=m -CONFIG_VIRTIO_PCI_LEGACY=y -CONFIG_VIRTIO_BALLOON=m -CONFIG_VIRTIO_INPUT=m -CONFIG_VIRTIO_MMIO=m -# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set - -# -# Microsoft Hyper-V guest support -# - -# -# Xen driver support -# -CONFIG_XEN_BALLOON=y -CONFIG_XEN_SCRUB_PAGES=y -CONFIG_XEN_DEV_EVTCHN=m -CONFIG_XEN_BACKEND=y -CONFIG_XENFS=m -CONFIG_XEN_COMPAT_XENFS=y -CONFIG_XEN_SYS_HYPERVISOR=y -CONFIG_XEN_XENBUS_FRONTEND=y -CONFIG_XEN_GNTDEV=m -CONFIG_XEN_GRANT_DEV_ALLOC=m -CONFIG_SWIOTLB_XEN=y -# CONFIG_XEN_PVCALLS_FRONTEND is not set -# CONFIG_XEN_PVCALLS_BACKEND is not set -CONFIG_XEN_SCSI_BACKEND=m -CONFIG_XEN_PRIVCMD=m -CONFIG_XEN_EFI=y -CONFIG_XEN_AUTO_XLATE=y -CONFIG_STAGING=y -# CONFIG_PRISM2_USB is not set -# CONFIG_COMEDI is not set -# CONFIG_RTL8192U is not set -# CONFIG_RTLLIB is not set -CONFIG_RTL8723BS=m -CONFIG_R8712U=m -CONFIG_R8188EU=m -CONFIG_88EU_AP_MODE=y -# CONFIG_R8822BE is not set -# CONFIG_RTS5208 is not set -# CONFIG_VT6655 is not set -# CONFIG_VT6656 is not set - -# -# IIO staging drivers -# - -# -# Accelerometers -# -# CONFIG_ADIS16203 is not set -# CONFIG_ADIS16240 is not set - -# -# Analog to digital converters -# -# CONFIG_AD7606 is not set -# CONFIG_AD7780 is not set -# CONFIG_AD7816 is not set -# CONFIG_AD7192 is not set -# CONFIG_AD7280 is not set - -# -# Analog digital bi-direction converters -# -# CONFIG_ADT7316 is not set - -# -# Capacitance to digital converters -# -# CONFIG_AD7150 is not set -# CONFIG_AD7152 is not set -# CONFIG_AD7746 is not set - -# -# Direct Digital Synthesis -# -# CONFIG_AD9832 is not set -# CONFIG_AD9834 is not set - -# -# Digital gyroscope sensors -# -# CONFIG_ADIS16060 is not set - -# -# Network Analyzer, Impedance Converters -# -# CONFIG_AD5933 is not set - -# -# Active energy metering IC -# -# CONFIG_ADE7854 is not set - -# -# Resolver to digital converters -# -# CONFIG_AD2S90 is not set -# CONFIG_AD2S1210 is not set -# CONFIG_FB_SM750 is not set -# CONFIG_FB_XGI is not set - -# -# Speakup console speech -# -CONFIG_SPEAKUP=m -CONFIG_SPEAKUP_SYNTH_ACNTSA=m -CONFIG_SPEAKUP_SYNTH_APOLLO=m -CONFIG_SPEAKUP_SYNTH_AUDPTR=m -CONFIG_SPEAKUP_SYNTH_BNS=m -CONFIG_SPEAKUP_SYNTH_DECTLK=m -CONFIG_SPEAKUP_SYNTH_DECEXT=m -CONFIG_SPEAKUP_SYNTH_LTLK=m -CONFIG_SPEAKUP_SYNTH_SOFT=m -CONFIG_SPEAKUP_SYNTH_SPKOUT=m -CONFIG_SPEAKUP_SYNTH_TXPRT=m -CONFIG_SPEAKUP_SYNTH_DUMMY=m -# CONFIG_MFD_NVEC is not set -# CONFIG_STAGING_MEDIA is not set - -# -# Android -# -# CONFIG_STAGING_BOARD is not set -# CONFIG_LTE_GDM724X is not set -# CONFIG_FIREWIRE_SERIAL is not set -# CONFIG_DGNC is not set -# CONFIG_GS_FPGABOOT is not set -# CONFIG_UNISYSSPAR is not set -# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set -# CONFIG_FB_TFT is not set -# CONFIG_WILC1000_SDIO is not set -# CONFIG_WILC1000_SPI is not set -# CONFIG_MOST is not set -# CONFIG_KS7010 is not set -# CONFIG_GREYBUS is not set -CONFIG_BCM_VIDEOCORE=y -# CONFIG_BCM2835_VCHIQ is not set -# CONFIG_SND_BCM2835 is not set -# CONFIG_VIDEO_BCM2835 is not set - -# -# USB Power Delivery and Type-C drivers -# -# CONFIG_PI433 is not set -CONFIG_MTK_MMC=m -# CONFIG_MTK_AEE_KDUMP is not set -# CONFIG_MTK_MMC_CD_POLL is not set -# CONFIG_GOLDFISH is not set -CONFIG_CHROME_PLATFORMS=y -CONFIG_CHROMEOS_TBMC=m -CONFIG_CROS_EC_PROTO=y -CONFIG_CROS_KBD_LED_BACKLIGHT=m -CONFIG_CLKDEV_LOOKUP=y -CONFIG_HAVE_CLK_PREPARE=y -CONFIG_COMMON_CLK=y - -# -# Common Clock Framework -# -CONFIG_COMMON_CLK_VERSATILE=y -CONFIG_CLK_SP810=y -CONFIG_CLK_VEXPRESS_OSC=y -# CONFIG_CLK_HSDK is not set -# CONFIG_COMMON_CLK_MAX77686 is not set -CONFIG_COMMON_CLK_RK808=m -CONFIG_COMMON_CLK_HI655X=m -CONFIG_COMMON_CLK_SCMI=m -# CONFIG_COMMON_CLK_SI5351 is not set -# CONFIG_COMMON_CLK_SI514 is not set -# CONFIG_COMMON_CLK_SI544 is not set -# CONFIG_COMMON_CLK_SI570 is not set -# CONFIG_COMMON_CLK_CDCE706 is not set -# CONFIG_COMMON_CLK_CDCE925 is not set -# CONFIG_COMMON_CLK_CS2000_CP is not set -# CONFIG_CLK_QORIQ is not set -CONFIG_COMMON_CLK_XGENE=y -# CONFIG_COMMON_CLK_PWM is not set -# CONFIG_COMMON_CLK_VC5 is not set -CONFIG_COMMON_CLK_HI3516CV300=y -CONFIG_COMMON_CLK_HI3519=y -CONFIG_COMMON_CLK_HI3660=y -CONFIG_COMMON_CLK_HI3798CV200=y -CONFIG_COMMON_CLK_HI6220=y -CONFIG_RESET_HISI=y -CONFIG_STUB_CLK_HI6220=y -# CONFIG_STUB_CLK_HI3660 is not set -CONFIG_COMMON_CLK_AMLOGIC=y -CONFIG_COMMON_CLK_MESON_AO=y -CONFIG_COMMON_CLK_REGMAP_MESON=y -CONFIG_COMMON_CLK_GXBB=y -CONFIG_COMMON_CLK_AXG=y -CONFIG_ARMADA_37XX_CLK=y -CONFIG_ARMADA_AP806_SYSCON=y -CONFIG_ARMADA_CP110_SYSCON=y -CONFIG_QCOM_GDSC=y -CONFIG_QCOM_RPMCC=y -CONFIG_COMMON_CLK_QCOM=y -CONFIG_QCOM_A53PLL=y -CONFIG_QCOM_CLK_APCS_MSM8916=m -CONFIG_QCOM_CLK_RPM=m -CONFIG_QCOM_CLK_SMD_RPM=m -# CONFIG_APQ_GCC_8084 is not set -# CONFIG_APQ_MMCC_8084 is not set -# CONFIG_IPQ_GCC_4019 is not set -# CONFIG_IPQ_GCC_806X is not set -# CONFIG_IPQ_LCC_806X is not set -# CONFIG_IPQ_GCC_8074 is not set -# CONFIG_MSM_GCC_8660 is not set -CONFIG_MSM_GCC_8916=y -# CONFIG_MSM_GCC_8960 is not set -# CONFIG_MSM_LCC_8960 is not set -# CONFIG_MDM_GCC_9615 is not set -# CONFIG_MDM_LCC_9615 is not set -# CONFIG_MSM_MMCC_8960 is not set -# CONFIG_MSM_GCC_8974 is not set -# CONFIG_MSM_MMCC_8974 is not set -# CONFIG_MSM_GCC_8994 is not set -CONFIG_MSM_GCC_8996=y -CONFIG_MSM_MMCC_8996=y -CONFIG_MSM_GCC_8998=m -CONFIG_SDM_GCC_845=m -CONFIG_SDM_VIDEOCC_845=m -# CONFIG_SPMI_PMIC_CLKDIV is not set -CONFIG_SUNXI_CCU=y -CONFIG_SUN50I_A64_CCU=y -CONFIG_SUN50I_H6_CCU=y -CONFIG_SUN50I_H6_R_CCU=y -# CONFIG_SUN8I_A83T_CCU is not set -CONFIG_SUN8I_H3_CCU=y -CONFIG_SUN8I_DE2_CCU=y -CONFIG_SUN8I_R_CCU=y -CONFIG_CLK_TEGRA_BPMP=y -# CONFIG_HWSPINLOCK is not set - -# -# Clock Source drivers -# -CONFIG_TIMER_OF=y -CONFIG_TIMER_ACPI=y -CONFIG_TIMER_PROBE=y -CONFIG_CLKSRC_MMIO=y -CONFIG_ROCKCHIP_TIMER=y -CONFIG_ARM_ARCH_TIMER=y -CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y -CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND=y -CONFIG_FSL_ERRATUM_A008585=y -CONFIG_HISILICON_ERRATUM_161010101=y -CONFIG_ARM64_ERRATUM_858921=y -CONFIG_ARM_TIMER_SP804=y -CONFIG_CLKSRC_VERSATILE=y -CONFIG_MAILBOX=y -# CONFIG_ARM_MHU is not set -# CONFIG_PLATFORM_MHU is not set -# CONFIG_PL320_MBOX is not set -# CONFIG_ROCKCHIP_MBOX is not set -CONFIG_PCC=y -# CONFIG_ALTERA_MBOX is not set -CONFIG_BCM2835_MBOX=y -# CONFIG_HI3660_MBOX is not set -CONFIG_HI6220_MBOX=y -# CONFIG_MAILBOX_TEST is not set -CONFIG_QCOM_APCS_IPC=m -CONFIG_TEGRA_HSP_MBOX=y -CONFIG_XGENE_SLIMPRO_MBOX=m -CONFIG_IOMMU_API=y -CONFIG_IOMMU_SUPPORT=y - -# -# Generic IOMMU Pagetable Support -# -CONFIG_IOMMU_IO_PGTABLE=y -CONFIG_IOMMU_IO_PGTABLE_LPAE=y -# CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set -# CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set -CONFIG_IOMMU_IOVA=y -CONFIG_OF_IOMMU=y -CONFIG_IOMMU_DMA=y -# CONFIG_ROCKCHIP_IOMMU is not set -CONFIG_TEGRA_IOMMU_SMMU=y -CONFIG_ARM_SMMU=y -CONFIG_ARM_SMMU_V3=y -CONFIG_QCOM_IOMMU=y - -# -# Remoteproc drivers -# -# CONFIG_REMOTEPROC is not set - -# -# Rpmsg drivers -# -CONFIG_RPMSG=m -# CONFIG_RPMSG_CHAR is not set -CONFIG_RPMSG_QCOM_GLINK_NATIVE=m -CONFIG_RPMSG_QCOM_GLINK_RPM=m -# CONFIG_RPMSG_VIRTIO is not set -# CONFIG_SOUNDWIRE is not set - -# -# SOC (System On Chip) specific Drivers -# - -# -# Amlogic SoC drivers -# -CONFIG_MESON_GX_SOCINFO=y -CONFIG_MESON_GX_PM_DOMAINS=y -CONFIG_MESON_MX_SOCINFO=y - -# -# Broadcom SoC drivers -# -CONFIG_RASPBERRYPI_POWER=y -# CONFIG_SOC_BRCMSTB is not set - -# -# i.MX SoC drivers -# - -# -# Qualcomm SoC drivers -# -# CONFIG_QCOM_COMMAND_DB is not set -CONFIG_QCOM_GENI_SE=m -CONFIG_QCOM_GSBI=m -CONFIG_QCOM_MDT_LOADER=m -# CONFIG_QCOM_RMTFS_MEM is not set -CONFIG_QCOM_SMD_RPM=m -CONFIG_QCOM_WCNSS_CTRL=m -CONFIG_QCOM_APR=m -CONFIG_ROCKCHIP_GRF=y -CONFIG_ROCKCHIP_PM_DOMAINS=y -CONFIG_SUNXI_SRAM=y -CONFIG_ARCH_TEGRA_132_SOC=y -CONFIG_ARCH_TEGRA_210_SOC=y -# CONFIG_ARCH_TEGRA_186_SOC is not set -CONFIG_ARCH_TEGRA_194_SOC=y -CONFIG_SOC_TEGRA_FUSE=y -CONFIG_SOC_TEGRA_FLOWCTRL=y -CONFIG_SOC_TEGRA_PMC=y -CONFIG_SOC_TEGRA_POWERGATE_BPMP=y -# CONFIG_SOC_TI is not set - -# -# Xilinx SoC drivers -# -# CONFIG_XILINX_VCU is not set -CONFIG_PM_DEVFREQ=y - -# -# DEVFREQ Governors -# -CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m -# CONFIG_DEVFREQ_GOV_PERFORMANCE is not set -# CONFIG_DEVFREQ_GOV_POWERSAVE is not set -# CONFIG_DEVFREQ_GOV_USERSPACE is not set -# CONFIG_DEVFREQ_GOV_PASSIVE is not set - -# -# DEVFREQ Drivers -# -# CONFIG_ARM_RK3399_DMC_DEVFREQ is not set -# CONFIG_PM_DEVFREQ_EVENT is not set -CONFIG_EXTCON=y - -# -# Extcon Device Drivers -# -# CONFIG_EXTCON_ADC_JACK is not set -# CONFIG_EXTCON_GPIO is not set -# CONFIG_EXTCON_MAX3355 is not set -CONFIG_EXTCON_QCOM_SPMI_MISC=m -# CONFIG_EXTCON_RT8973A is not set -# CONFIG_EXTCON_SM5502 is not set -CONFIG_EXTCON_USB_GPIO=m -# CONFIG_EXTCON_USBC_CROS_EC is not set -CONFIG_MEMORY=y -# CONFIG_ARM_PL172_MPMC is not set -CONFIG_TEGRA_MC=y -CONFIG_IIO=m -CONFIG_IIO_BUFFER=y -# CONFIG_IIO_BUFFER_CB is not set -# CONFIG_IIO_BUFFER_HW_CONSUMER is not set -CONFIG_IIO_KFIFO_BUF=m -CONFIG_IIO_TRIGGERED_BUFFER=m -# CONFIG_IIO_CONFIGFS is not set -CONFIG_IIO_TRIGGER=y -CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 -# CONFIG_IIO_SW_DEVICE is not set -# CONFIG_IIO_SW_TRIGGER is not set - -# -# Accelerometers -# -# CONFIG_ADIS16201 is not set -# CONFIG_ADIS16209 is not set -# CONFIG_ADXL345_I2C is not set -# CONFIG_ADXL345_SPI is not set -# CONFIG_BMA180 is not set -# CONFIG_BMA220 is not set -# CONFIG_BMC150_ACCEL is not set -# CONFIG_DA280 is not set -# CONFIG_DA311 is not set -# CONFIG_DMARD06 is not set -# CONFIG_DMARD09 is not set -# CONFIG_DMARD10 is not set -CONFIG_HID_SENSOR_ACCEL_3D=m -# CONFIG_IIO_CROS_EC_ACCEL_LEGACY is not set -# CONFIG_IIO_ST_ACCEL_3AXIS is not set -# CONFIG_KXSD9 is not set -# CONFIG_KXCJK1013 is not set -# CONFIG_MC3230 is not set -# CONFIG_MMA7455_I2C is not set -# CONFIG_MMA7455_SPI is not set -# CONFIG_MMA7660 is not set -# CONFIG_MMA8452 is not set -# CONFIG_MMA9551 is not set -# CONFIG_MMA9553 is not set -# CONFIG_MXC4005 is not set -# CONFIG_MXC6255 is not set -# CONFIG_SCA3000 is not set -# CONFIG_STK8312 is not set -# CONFIG_STK8BA50 is not set - -# -# Analog to digital converters -# -# CONFIG_AD7266 is not set -# CONFIG_AD7291 is not set -# CONFIG_AD7298 is not set -# CONFIG_AD7476 is not set -# CONFIG_AD7766 is not set -# CONFIG_AD7791 is not set -# CONFIG_AD7793 is not set -# CONFIG_AD7887 is not set -# CONFIG_AD7923 is not set -# CONFIG_AD799X is not set -CONFIG_AXP20X_ADC=m -CONFIG_AXP288_ADC=m -# CONFIG_CC10001_ADC is not set -# CONFIG_ENVELOPE_DETECTOR is not set -# CONFIG_HI8435 is not set -# CONFIG_HX711 is not set -# CONFIG_INA2XX_ADC is not set -# CONFIG_LTC2471 is not set -# CONFIG_LTC2485 is not set -# CONFIG_LTC2497 is not set -# CONFIG_MAX1027 is not set -# CONFIG_MAX11100 is not set -# CONFIG_MAX1118 is not set -# CONFIG_MAX1363 is not set -# CONFIG_MAX9611 is not set -# CONFIG_MCP320X is not set -# CONFIG_MCP3422 is not set -CONFIG_MESON_SARADC=m -# CONFIG_NAU7802 is not set -CONFIG_QCOM_VADC_COMMON=m -CONFIG_QCOM_SPMI_IADC=m -CONFIG_QCOM_SPMI_VADC=m -# CONFIG_ROCKCHIP_SARADC is not set -# CONFIG_SD_ADC_MODULATOR is not set -# CONFIG_TI_ADC081C is not set -# CONFIG_TI_ADC0832 is not set -# CONFIG_TI_ADC084S021 is not set -# CONFIG_TI_ADC12138 is not set -# CONFIG_TI_ADC108S102 is not set -# CONFIG_TI_ADC128S052 is not set -# CONFIG_TI_ADC161S626 is not set -# CONFIG_TI_ADS1015 is not set -# CONFIG_TI_ADS7950 is not set -# CONFIG_TI_ADS8688 is not set -# CONFIG_TI_TLC4541 is not set -# CONFIG_VF610_ADC is not set -CONFIG_VIPERBOARD_ADC=m - -# -# Analog Front Ends -# -# CONFIG_IIO_RESCALE is not set - -# -# Amplifiers -# -# CONFIG_AD8366 is not set - -# -# Chemical Sensors -# -# CONFIG_ATLAS_PH_SENSOR is not set -# CONFIG_CCS811 is not set -# CONFIG_IAQCORE is not set -# CONFIG_VZ89X is not set -# CONFIG_IIO_CROS_EC_SENSORS_CORE is not set - -# -# Hid Sensor IIO Common -# -CONFIG_HID_SENSOR_IIO_COMMON=m -CONFIG_HID_SENSOR_IIO_TRIGGER=m - -# -# SSP Sensor Common -# -# CONFIG_IIO_SSP_SENSORHUB is not set - -# -# Counters -# - -# -# Digital to analog converters -# -# CONFIG_AD5064 is not set -# CONFIG_AD5360 is not set -# CONFIG_AD5380 is not set -# CONFIG_AD5421 is not set -CONFIG_AD5446=m -# CONFIG_AD5449 is not set -# CONFIG_AD5592R is not set -# CONFIG_AD5593R is not set -# CONFIG_AD5504 is not set -# CONFIG_AD5624R_SPI is not set -# CONFIG_LTC2632 is not set -# CONFIG_AD5686_SPI is not set -# CONFIG_AD5696_I2C is not set -# CONFIG_AD5755 is not set -# CONFIG_AD5761 is not set -# CONFIG_AD5764 is not set -# CONFIG_AD5791 is not set -# CONFIG_AD7303 is not set -# CONFIG_AD8801 is not set -# CONFIG_DPOT_DAC is not set -# CONFIG_DS4424 is not set -# CONFIG_M62332 is not set -# CONFIG_MAX517 is not set -# CONFIG_MAX5821 is not set -# CONFIG_MCP4725 is not set -# CONFIG_MCP4922 is not set -# CONFIG_TI_DAC082S085 is not set -# CONFIG_TI_DAC5571 is not set -# CONFIG_VF610_DAC is not set - -# -# IIO dummy driver -# - -# -# Frequency Synthesizers DDS/PLL -# - -# -# Clock Generator/Distribution -# -# CONFIG_AD9523 is not set - -# -# Phase-Locked Loop (PLL) frequency synthesizers -# -# CONFIG_ADF4350 is not set - -# -# Digital gyroscope sensors -# -# CONFIG_ADIS16080 is not set -# CONFIG_ADIS16130 is not set -# CONFIG_ADIS16136 is not set -# CONFIG_ADIS16260 is not set -# CONFIG_ADXRS450 is not set -# CONFIG_BMG160 is not set -CONFIG_HID_SENSOR_GYRO_3D=m -# CONFIG_MPU3050_I2C is not set -# CONFIG_IIO_ST_GYRO_3AXIS is not set -# CONFIG_ITG3200 is not set - -# -# Health Sensors -# - -# -# Heart Rate Monitors -# -# CONFIG_AFE4403 is not set -# CONFIG_AFE4404 is not set -# CONFIG_MAX30100 is not set -# CONFIG_MAX30102 is not set - -# -# Humidity sensors -# -# CONFIG_AM2315 is not set -CONFIG_DHT11=m -# CONFIG_HDC100X is not set -# CONFIG_HID_SENSOR_HUMIDITY is not set -# CONFIG_HTS221 is not set -# CONFIG_HTU21 is not set -# CONFIG_SI7005 is not set -# CONFIG_SI7020 is not set - -# -# Inertial measurement units -# -# CONFIG_ADIS16400 is not set -# CONFIG_ADIS16480 is not set -# CONFIG_BMI160_I2C is not set -# CONFIG_BMI160_SPI is not set -# CONFIG_KMX61 is not set -# CONFIG_INV_MPU6050_I2C is not set -# CONFIG_INV_MPU6050_SPI is not set -# CONFIG_IIO_ST_LSM6DSX is not set - -# -# Light sensors -# -CONFIG_ACPI_ALS=m -# CONFIG_ADJD_S311 is not set -# CONFIG_AL3320A is not set -# CONFIG_APDS9300 is not set -# CONFIG_APDS9960 is not set -# CONFIG_BH1750 is not set -CONFIG_BH1780=m -# CONFIG_CM32181 is not set -# CONFIG_CM3232 is not set -# CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set -# CONFIG_CM36651 is not set -# CONFIG_GP2AP020A00F is not set -# CONFIG_SENSORS_ISL29018 is not set -# CONFIG_SENSORS_ISL29028 is not set -# CONFIG_ISL29125 is not set -CONFIG_HID_SENSOR_ALS=m -CONFIG_HID_SENSOR_PROX=m -# CONFIG_JSA1212 is not set -# CONFIG_RPR0521 is not set -# CONFIG_LTR501 is not set -# CONFIG_LV0104CS is not set -# CONFIG_MAX44000 is not set -# CONFIG_OPT3001 is not set -# CONFIG_PA12203001 is not set -# CONFIG_SI1145 is not set -# CONFIG_STK3310 is not set -# CONFIG_ST_UVIS25 is not set -# CONFIG_TCS3414 is not set -# CONFIG_TCS3472 is not set -# CONFIG_SENSORS_TSL2563 is not set -# CONFIG_TSL2583 is not set -# CONFIG_TSL2772 is not set -# CONFIG_TSL4531 is not set -# CONFIG_US5182D is not set -# CONFIG_VCNL4000 is not set -# CONFIG_VEML6070 is not set -# CONFIG_VL6180 is not set -# CONFIG_ZOPT2201 is not set - -# -# Magnetometer sensors -# -# CONFIG_AK8974 is not set -# CONFIG_AK8975 is not set -# CONFIG_AK09911 is not set -# CONFIG_BMC150_MAGN_I2C is not set -# CONFIG_BMC150_MAGN_SPI is not set -# CONFIG_MAG3110 is not set -CONFIG_HID_SENSOR_MAGNETOMETER_3D=m -# CONFIG_MMC35240 is not set -# CONFIG_IIO_ST_MAGN_3AXIS is not set -# CONFIG_SENSORS_HMC5843_I2C is not set -# CONFIG_SENSORS_HMC5843_SPI is not set - -# -# Multiplexers -# -# CONFIG_IIO_MUX is not set - -# -# Inclinometer sensors -# -CONFIG_HID_SENSOR_INCLINOMETER_3D=m -CONFIG_HID_SENSOR_DEVICE_ROTATION=m - -# -# Triggers - standalone -# -# CONFIG_IIO_INTERRUPT_TRIGGER is not set -# CONFIG_IIO_SYSFS_TRIGGER is not set - -# -# Digital potentiometers -# -# CONFIG_AD5272 is not set -# CONFIG_DS1803 is not set -# CONFIG_MAX5481 is not set -# CONFIG_MAX5487 is not set -# CONFIG_MCP4018 is not set -# CONFIG_MCP4131 is not set -# CONFIG_MCP4531 is not set -# CONFIG_TPL0102 is not set - -# -# Digital potentiostats -# -# CONFIG_LMP91000 is not set - -# -# Pressure sensors -# -# CONFIG_ABP060MG is not set -# CONFIG_BMP280 is not set -CONFIG_HID_SENSOR_PRESS=m -# CONFIG_HP03 is not set -# CONFIG_MPL115_I2C is not set -# CONFIG_MPL115_SPI is not set -# CONFIG_MPL3115 is not set -# CONFIG_MS5611 is not set -# CONFIG_MS5637 is not set -# CONFIG_IIO_ST_PRESS is not set -# CONFIG_T5403 is not set -# CONFIG_HP206C is not set -# CONFIG_ZPA2326 is not set - -# -# Lightning sensors -# -# CONFIG_AS3935 is not set - -# -# Proximity and distance sensors -# -# CONFIG_LIDAR_LITE_V2 is not set -# CONFIG_RFD77402 is not set -# CONFIG_SRF04 is not set -# CONFIG_SX9500 is not set -# CONFIG_SRF08 is not set - -# -# Resolver to digital converters -# -# CONFIG_AD2S1200 is not set - -# -# Temperature sensors -# -# CONFIG_MAXIM_THERMOCOUPLE is not set -# CONFIG_HID_SENSOR_TEMP is not set -# CONFIG_MLX90614 is not set -# CONFIG_MLX90632 is not set -# CONFIG_TMP006 is not set -# CONFIG_TMP007 is not set -# CONFIG_TSYS01 is not set -# CONFIG_TSYS02D is not set -# CONFIG_NTB is not set -# CONFIG_VME_BUS is not set -CONFIG_PWM=y -CONFIG_PWM_SYSFS=y -CONFIG_PWM_BCM2835=m -# CONFIG_PWM_CROS_EC is not set -# CONFIG_PWM_FSL_FTM is not set -# CONFIG_PWM_HIBVT is not set -CONFIG_PWM_MESON=m -# CONFIG_PWM_PCA9685 is not set -CONFIG_PWM_ROCKCHIP=m -CONFIG_PWM_SUN4I=m -CONFIG_PWM_TEGRA=m - -# -# IRQ chip support -# -CONFIG_IRQCHIP=y -CONFIG_ARM_GIC=y -CONFIG_ARM_GIC_MAX_NR=1 -CONFIG_ARM_GIC_V2M=y -CONFIG_ARM_GIC_V3=y -CONFIG_ARM_GIC_V3_ITS=y -CONFIG_ARM_GIC_V3_ITS_PCI=y -CONFIG_HISILICON_IRQ_MBIGEN=y -CONFIG_MVEBU_GICP=y -CONFIG_MVEBU_ICU=y -CONFIG_MVEBU_ODMI=y -CONFIG_MVEBU_PIC=y -CONFIG_PARTITION_PERCPU=y -CONFIG_QCOM_IRQ_COMBINER=y -CONFIG_MESON_IRQ_GPIO=y -# CONFIG_QCOM_PDC is not set -# CONFIG_IPACK_BUS is not set -CONFIG_ARCH_HAS_RESET_CONTROLLER=y -CONFIG_RESET_CONTROLLER=y -CONFIG_RESET_MESON=y -CONFIG_RESET_SIMPLE=y -CONFIG_RESET_SUNXI=y -# CONFIG_RESET_TI_SYSCON is not set -CONFIG_COMMON_RESET_HI3660=y -CONFIG_COMMON_RESET_HI6220=y -CONFIG_RESET_TEGRA_BPMP=y -# CONFIG_FMC is not set - -# -# PHY Subsystem -# -CONFIG_GENERIC_PHY=y -CONFIG_PHY_XGENE=m -CONFIG_PHY_SUN4I_USB=m -# CONFIG_PHY_SUN9I_USB is not set -CONFIG_PHY_MESON8B_USB2=m -CONFIG_PHY_MESON_GXL_USB2=y -CONFIG_PHY_MESON_GXL_USB3=y -# CONFIG_BCM_KONA_USB2_PHY is not set -CONFIG_PHY_HI6220_USB=m -# CONFIG_PHY_HISTB_COMBPHY is not set -# CONFIG_PHY_HISI_INNO_USB2 is not set -CONFIG_PHY_MVEBU_CP110_COMPHY=m -# CONFIG_PHY_PXA_28NM_HSIC is not set -# CONFIG_PHY_PXA_28NM_USB2 is not set -# CONFIG_PHY_CPCAP_USB is not set -# CONFIG_PHY_MAPPHONE_MDM6600 is not set -CONFIG_PHY_QCOM_APQ8064_SATA=m -CONFIG_PHY_QCOM_IPQ806X_SATA=m -CONFIG_PHY_QCOM_QMP=m -CONFIG_PHY_QCOM_QUSB2=m -CONFIG_PHY_QCOM_UFS=m -CONFIG_PHY_QCOM_USB_HS=m -CONFIG_PHY_QCOM_USB_HSIC=m -# CONFIG_PHY_ROCKCHIP_DP is not set -CONFIG_PHY_ROCKCHIP_EMMC=m -CONFIG_PHY_ROCKCHIP_INNO_USB2=m -CONFIG_PHY_ROCKCHIP_PCIE=m -# CONFIG_PHY_ROCKCHIP_TYPEC is not set -# CONFIG_PHY_ROCKCHIP_USB is not set -# CONFIG_PHY_SAMSUNG_USB2 is not set -CONFIG_PHY_TEGRA_XUSB=m -CONFIG_PHY_TUSB1210=m -# CONFIG_POWERCAP is not set -# CONFIG_MCB is not set - -# -# Performance monitor support -# -# CONFIG_ARM_CCI_PMU is not set -# CONFIG_ARM_CCN is not set -CONFIG_ARM_PMU=y -CONFIG_ARM_PMU_ACPI=y -# CONFIG_ARM_DSU_PMU is not set -# CONFIG_HISI_PMU is not set -# CONFIG_QCOM_L2_PMU is not set -# CONFIG_QCOM_L3_PMU is not set -# CONFIG_XGENE_PMU is not set -# CONFIG_ARM_SPE_PMU is not set -CONFIG_RAS=y - -# -# Android -# -# CONFIG_ANDROID is not set -CONFIG_LIBNVDIMM=y -CONFIG_BLK_DEV_PMEM=y -CONFIG_ND_BLK=y -CONFIG_ND_CLAIM=y -CONFIG_ND_BTT=y -CONFIG_BTT=y -CONFIG_OF_PMEM=y -CONFIG_DAX_DRIVER=y -CONFIG_DAX=y -CONFIG_DEV_DAX=m -CONFIG_NVMEM=y -CONFIG_QCOM_QFPROM=m -# CONFIG_ROCKCHIP_EFUSE is not set -CONFIG_NVMEM_SUNXI_SID=m -# CONFIG_MESON_EFUSE is not set -# CONFIG_MESON_MX_EFUSE is not set - -# -# HW tracing support -# -# CONFIG_STM is not set -# CONFIG_INTEL_TH is not set -# CONFIG_FPGA is not set -# CONFIG_FSI is not set -CONFIG_TEE=m - -# -# TEE drivers -# -CONFIG_OPTEE=m -CONFIG_PM_OPP=y -# CONFIG_SIOX is not set -# CONFIG_SLIMBUS is not set - -# -# Firmware Drivers -# -CONFIG_ARM_PSCI_FW=y -# CONFIG_ARM_PSCI_CHECKER is not set -CONFIG_ARM_SCMI_PROTOCOL=y -CONFIG_ARM_SCMI_POWER_DOMAIN=m -# CONFIG_ARM_SCPI_PROTOCOL is not set -# CONFIG_ARM_SDE_INTERFACE is not set -# CONFIG_FIRMWARE_MEMMAP is not set -CONFIG_DMIID=y -CONFIG_DMI_SYSFS=y -CONFIG_RASPBERRYPI_FIRMWARE=y -# CONFIG_FW_CFG_SYSFS is not set -CONFIG_QCOM_SCM=y -CONFIG_QCOM_SCM_64=y -# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set -CONFIG_HAVE_ARM_SMCCC=y -# CONFIG_GOOGLE_FIRMWARE is not set - -# -# EFI (Extensible Firmware Interface) Support -# -CONFIG_EFI_VARS=m -CONFIG_EFI_ESRT=y -CONFIG_EFI_VARS_PSTORE=m -# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set -CONFIG_EFI_PARAMS_FROM_FDT=y -CONFIG_EFI_RUNTIME_WRAPPERS=y -CONFIG_EFI_ARMSTUB=y -# CONFIG_EFI_BOOTLOADER_CONTROL is not set -# CONFIG_EFI_CAPSULE_LOADER is not set -# CONFIG_EFI_TEST is not set -# CONFIG_RESET_ATTACK_MITIGATION is not set -CONFIG_MESON_SM=y - -# -# Tegra firmware driver -# -CONFIG_TEGRA_IVC=y -CONFIG_TEGRA_BPMP=y -CONFIG_ACPI=y -CONFIG_ACPI_GENERIC_GSI=y -CONFIG_ACPI_CCA_REQUIRED=y -# CONFIG_ACPI_DEBUGGER is not set -CONFIG_ACPI_SPCR_TABLE=y -# CONFIG_ACPI_EC_DEBUGFS is not set -CONFIG_ACPI_BUTTON=y -CONFIG_ACPI_FAN=y -CONFIG_ACPI_TAD=m -# CONFIG_ACPI_DOCK is not set -CONFIG_ACPI_PROCESSOR_IDLE=y -CONFIG_ACPI_MCFG=y -CONFIG_ACPI_CPPC_LIB=y -CONFIG_ACPI_PROCESSOR=y -# CONFIG_ACPI_IPMI is not set -CONFIG_ACPI_HOTPLUG_CPU=y -CONFIG_ACPI_THERMAL=y -CONFIG_ACPI_NUMA=y -CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y -CONFIG_ACPI_TABLE_UPGRADE=y -# CONFIG_ACPI_DEBUG is not set -# CONFIG_ACPI_PCI_SLOT is not set -CONFIG_ACPI_CONTAINER=y -# CONFIG_ACPI_HED is not set -# CONFIG_ACPI_CUSTOM_METHOD is not set -# CONFIG_ACPI_BGRT is not set -CONFIG_ACPI_REDUCED_HARDWARE_ONLY=y -CONFIG_ACPI_NFIT=y -CONFIG_HAVE_ACPI_APEI=y -# CONFIG_ACPI_APEI is not set -# CONFIG_PMIC_OPREGION is not set -# CONFIG_ACPI_CONFIGFS is not set -CONFIG_ACPI_IORT=y -CONFIG_ACPI_GTDT=y -CONFIG_ACPI_PPTT=y - -# -# File systems -# -CONFIG_DCACHE_WORD_ACCESS=y -CONFIG_FS_IOMAP=y -# CONFIG_EXT2_FS is not set -# CONFIG_EXT3_FS is not set -CONFIG_EXT4_FS=m -CONFIG_EXT4_USE_FOR_EXT2=y -CONFIG_EXT4_FS_POSIX_ACL=y -CONFIG_EXT4_FS_SECURITY=y -CONFIG_EXT4_ENCRYPTION=y -CONFIG_EXT4_FS_ENCRYPTION=y -# CONFIG_EXT4_DEBUG is not set -CONFIG_JBD2=m -# CONFIG_JBD2_DEBUG is not set -CONFIG_FS_MBCACHE=m -CONFIG_REISERFS_FS=m -# CONFIG_REISERFS_CHECK is not set -# CONFIG_REISERFS_PROC_INFO is not set -CONFIG_REISERFS_FS_XATTR=y -CONFIG_REISERFS_FS_POSIX_ACL=y -CONFIG_REISERFS_FS_SECURITY=y -CONFIG_JFS_FS=m -CONFIG_JFS_POSIX_ACL=y -CONFIG_JFS_SECURITY=y -# CONFIG_JFS_DEBUG is not set -# CONFIG_JFS_STATISTICS is not set -CONFIG_XFS_FS=m -CONFIG_XFS_QUOTA=y -CONFIG_XFS_POSIX_ACL=y -CONFIG_XFS_RT=y -# CONFIG_XFS_ONLINE_SCRUB is not set -# CONFIG_XFS_WARN is not set -# CONFIG_XFS_DEBUG is not set -CONFIG_GFS2_FS=m -CONFIG_GFS2_FS_LOCKING_DLM=y -CONFIG_OCFS2_FS=m -CONFIG_OCFS2_FS_O2CB=m -CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m -CONFIG_OCFS2_FS_STATS=y -CONFIG_OCFS2_DEBUG_MASKLOG=y -# CONFIG_OCFS2_DEBUG_FS is not set -CONFIG_BTRFS_FS=m -CONFIG_BTRFS_FS_POSIX_ACL=y -# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set -# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set -# CONFIG_BTRFS_DEBUG is not set -# CONFIG_BTRFS_ASSERT is not set -# CONFIG_BTRFS_FS_REF_VERIFY is not set -CONFIG_NILFS2_FS=m -CONFIG_F2FS_FS=m -CONFIG_F2FS_STAT_FS=y -CONFIG_F2FS_FS_XATTR=y -CONFIG_F2FS_FS_POSIX_ACL=y -CONFIG_F2FS_FS_SECURITY=y -# CONFIG_F2FS_CHECK_FS is not set -CONFIG_F2FS_FS_ENCRYPTION=y -# CONFIG_F2FS_IO_TRACE is not set -# CONFIG_F2FS_FAULT_INJECTION is not set -CONFIG_FS_DAX=y -CONFIG_FS_POSIX_ACL=y -CONFIG_EXPORTFS=y -CONFIG_EXPORTFS_BLOCK_OPS=y -CONFIG_FILE_LOCKING=y -CONFIG_MANDATORY_FILE_LOCKING=y -CONFIG_FS_ENCRYPTION=m -CONFIG_FSNOTIFY=y -CONFIG_DNOTIFY=y -CONFIG_INOTIFY_USER=y -CONFIG_FANOTIFY=y -CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y -CONFIG_QUOTA=y -CONFIG_QUOTA_NETLINK_INTERFACE=y -CONFIG_PRINT_QUOTA_WARNING=y -# CONFIG_QUOTA_DEBUG is not set -CONFIG_QUOTA_TREE=m -CONFIG_QFMT_V1=m -CONFIG_QFMT_V2=m -CONFIG_QUOTACTL=y -CONFIG_AUTOFS4_FS=m -CONFIG_AUTOFS_FS=m -CONFIG_FUSE_FS=m -CONFIG_CUSE=m -CONFIG_OVERLAY_FS=m -# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set -CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y -# CONFIG_OVERLAY_FS_INDEX is not set -# CONFIG_OVERLAY_FS_XINO_AUTO is not set - -# -# Caches -# -CONFIG_FSCACHE=m -CONFIG_FSCACHE_STATS=y -# CONFIG_FSCACHE_HISTOGRAM is not set -# CONFIG_FSCACHE_DEBUG is not set -# CONFIG_FSCACHE_OBJECT_LIST is not set -CONFIG_CACHEFILES=m -# CONFIG_CACHEFILES_DEBUG is not set -# CONFIG_CACHEFILES_HISTOGRAM is not set - -# -# CD-ROM/DVD Filesystems -# -CONFIG_ISO9660_FS=m -CONFIG_JOLIET=y -CONFIG_ZISOFS=y -CONFIG_UDF_FS=m - -# -# DOS/FAT/NT Filesystems -# -CONFIG_FAT_FS=m -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=m -CONFIG_FAT_DEFAULT_CODEPAGE=437 -CONFIG_FAT_DEFAULT_IOCHARSET="ascii" -CONFIG_FAT_DEFAULT_UTF8=y -CONFIG_NTFS_FS=m -# CONFIG_NTFS_DEBUG is not set -# CONFIG_NTFS_RW is not set - -# -# Pseudo filesystems -# -CONFIG_PROC_FS=y -CONFIG_PROC_KCORE=y -CONFIG_PROC_VMCORE=y -# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set -CONFIG_PROC_SYSCTL=y -CONFIG_PROC_PAGE_MONITOR=y -CONFIG_PROC_CHILDREN=y -CONFIG_KERNFS=y -CONFIG_SYSFS=y -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y -CONFIG_TMPFS_XATTR=y -CONFIG_HUGETLBFS=y -CONFIG_HUGETLB_PAGE=y -CONFIG_MEMFD_CREATE=y -CONFIG_ARCH_HAS_GIGANTIC_PAGE=y -CONFIG_CONFIGFS_FS=m -CONFIG_EFIVAR_FS=m -CONFIG_MISC_FILESYSTEMS=y -# CONFIG_ORANGEFS_FS is not set -CONFIG_ADFS_FS=m -# CONFIG_ADFS_FS_RW is not set -CONFIG_AFFS_FS=m -CONFIG_ECRYPT_FS=m -CONFIG_ECRYPT_FS_MESSAGING=y -CONFIG_HFS_FS=m -CONFIG_HFSPLUS_FS=m -# CONFIG_HFSPLUS_FS_POSIX_ACL is not set -CONFIG_BEFS_FS=m -# CONFIG_BEFS_DEBUG is not set -CONFIG_BFS_FS=m -CONFIG_EFS_FS=m -CONFIG_JFFS2_FS=m -CONFIG_JFFS2_FS_DEBUG=0 -CONFIG_JFFS2_FS_WRITEBUFFER=y -# CONFIG_JFFS2_FS_WBUF_VERIFY is not set -CONFIG_JFFS2_SUMMARY=y -CONFIG_JFFS2_FS_XATTR=y -CONFIG_JFFS2_FS_POSIX_ACL=y -CONFIG_JFFS2_FS_SECURITY=y -CONFIG_JFFS2_COMPRESSION_OPTIONS=y -CONFIG_JFFS2_ZLIB=y -CONFIG_JFFS2_LZO=y -CONFIG_JFFS2_RTIME=y -# CONFIG_JFFS2_RUBIN is not set -# CONFIG_JFFS2_CMODE_NONE is not set -CONFIG_JFFS2_CMODE_PRIORITY=y -# CONFIG_JFFS2_CMODE_SIZE is not set -# CONFIG_JFFS2_CMODE_FAVOURLZO is not set -CONFIG_UBIFS_FS=m -CONFIG_UBIFS_FS_ADVANCED_COMPR=y -CONFIG_UBIFS_FS_LZO=y -CONFIG_UBIFS_FS_ZLIB=y -# CONFIG_UBIFS_ATIME_SUPPORT is not set -# CONFIG_UBIFS_FS_ENCRYPTION is not set -CONFIG_UBIFS_FS_SECURITY=y -# CONFIG_CRAMFS is not set -CONFIG_SQUASHFS=m -CONFIG_SQUASHFS_FILE_CACHE=y -# CONFIG_SQUASHFS_FILE_DIRECT is not set -CONFIG_SQUASHFS_DECOMP_SINGLE=y -# CONFIG_SQUASHFS_DECOMP_MULTI is not set -# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set -CONFIG_SQUASHFS_XATTR=y -CONFIG_SQUASHFS_ZLIB=y -CONFIG_SQUASHFS_LZ4=y -CONFIG_SQUASHFS_LZO=y -CONFIG_SQUASHFS_XZ=y -CONFIG_SQUASHFS_ZSTD=y -# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set -# CONFIG_SQUASHFS_EMBEDDED is not set -CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 -CONFIG_VXFS_FS=m -CONFIG_MINIX_FS=m -CONFIG_OMFS_FS=m -CONFIG_HPFS_FS=m -CONFIG_QNX4FS_FS=m -CONFIG_QNX6FS_FS=m -# CONFIG_QNX6FS_DEBUG is not set -CONFIG_ROMFS_FS=m -# CONFIG_ROMFS_BACKED_BY_BLOCK is not set -# CONFIG_ROMFS_BACKED_BY_MTD is not set -CONFIG_ROMFS_BACKED_BY_BOTH=y -CONFIG_ROMFS_ON_BLOCK=y -CONFIG_ROMFS_ON_MTD=y -CONFIG_PSTORE=y -CONFIG_PSTORE_DEFLATE_COMPRESS=m -# CONFIG_PSTORE_LZO_COMPRESS is not set -# CONFIG_PSTORE_LZ4_COMPRESS is not set -# CONFIG_PSTORE_LZ4HC_COMPRESS is not set -# CONFIG_PSTORE_842_COMPRESS is not set -CONFIG_PSTORE_COMPRESS=y -CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y -CONFIG_PSTORE_COMPRESS_DEFAULT="deflate" -# CONFIG_PSTORE_CONSOLE is not set -# CONFIG_PSTORE_PMSG is not set -# CONFIG_PSTORE_FTRACE is not set -CONFIG_PSTORE_RAM=m -CONFIG_SYSV_FS=m -CONFIG_UFS_FS=m -# CONFIG_UFS_FS_WRITE is not set -# CONFIG_UFS_DEBUG is not set -CONFIG_EXOFS_FS=m -# CONFIG_EXOFS_DEBUG is not set -CONFIG_ORE=m -CONFIG_NETWORK_FILESYSTEMS=y -CONFIG_NFS_FS=m -CONFIG_NFS_V2=m -CONFIG_NFS_V3=m -CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=m -CONFIG_NFS_SWAP=y -CONFIG_NFS_V4_1=y -CONFIG_NFS_V4_2=y -CONFIG_PNFS_FILE_LAYOUT=m -CONFIG_PNFS_BLOCK=m -CONFIG_PNFS_FLEXFILE_LAYOUT=m -CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" -# CONFIG_NFS_V4_1_MIGRATION is not set -CONFIG_NFS_V4_SECURITY_LABEL=y -CONFIG_NFS_FSCACHE=y -# CONFIG_NFS_USE_LEGACY_DNS is not set -CONFIG_NFS_USE_KERNEL_DNS=y -CONFIG_NFS_DEBUG=y -CONFIG_NFSD=m -CONFIG_NFSD_V2_ACL=y -CONFIG_NFSD_V3=y -CONFIG_NFSD_V3_ACL=y -CONFIG_NFSD_V4=y -CONFIG_NFSD_PNFS=y -CONFIG_NFSD_BLOCKLAYOUT=y -# CONFIG_NFSD_SCSILAYOUT is not set -# CONFIG_NFSD_FLEXFILELAYOUT is not set -CONFIG_NFSD_V4_SECURITY_LABEL=y -# CONFIG_NFSD_FAULT_INJECTION is not set -CONFIG_GRACE_PERIOD=m -CONFIG_LOCKD=m -CONFIG_LOCKD_V4=y -CONFIG_NFS_ACL_SUPPORT=m -CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=m -CONFIG_SUNRPC_GSS=m -CONFIG_SUNRPC_BACKCHANNEL=y -CONFIG_SUNRPC_SWAP=y -CONFIG_RPCSEC_GSS_KRB5=m -CONFIG_SUNRPC_DEBUG=y -CONFIG_SUNRPC_XPRT_RDMA=m -CONFIG_CEPH_FS=m -CONFIG_CEPH_FSCACHE=y -CONFIG_CEPH_FS_POSIX_ACL=y -CONFIG_CIFS=m -# CONFIG_CIFS_STATS is not set -CONFIG_CIFS_WEAK_PW_HASH=y -CONFIG_CIFS_UPCALL=y -CONFIG_CIFS_XATTR=y -CONFIG_CIFS_POSIX=y -CONFIG_CIFS_ACL=y -CONFIG_CIFS_DEBUG=y -# CONFIG_CIFS_DEBUG2 is not set -# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set -CONFIG_CIFS_DFS_UPCALL=y -# CONFIG_CIFS_SMB311 is not set -# CONFIG_CIFS_SMB_DIRECT is not set -CONFIG_CIFS_FSCACHE=y -CONFIG_CODA_FS=m -CONFIG_AFS_FS=m -# CONFIG_AFS_DEBUG is not set -CONFIG_AFS_FSCACHE=y -CONFIG_9P_FS=m -CONFIG_9P_FSCACHE=y -CONFIG_9P_FS_POSIX_ACL=y -CONFIG_9P_FS_SECURITY=y -CONFIG_NLS=y -CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=m -CONFIG_NLS_CODEPAGE_737=m -CONFIG_NLS_CODEPAGE_775=m -CONFIG_NLS_CODEPAGE_850=m -CONFIG_NLS_CODEPAGE_852=m -CONFIG_NLS_CODEPAGE_855=m -CONFIG_NLS_CODEPAGE_857=m -CONFIG_NLS_CODEPAGE_860=m -CONFIG_NLS_CODEPAGE_861=m -CONFIG_NLS_CODEPAGE_862=m -CONFIG_NLS_CODEPAGE_863=m -CONFIG_NLS_CODEPAGE_864=m -CONFIG_NLS_CODEPAGE_865=m -CONFIG_NLS_CODEPAGE_866=m -CONFIG_NLS_CODEPAGE_869=m -CONFIG_NLS_CODEPAGE_936=m -CONFIG_NLS_CODEPAGE_950=m -CONFIG_NLS_CODEPAGE_932=m -CONFIG_NLS_CODEPAGE_949=m -CONFIG_NLS_CODEPAGE_874=m -CONFIG_NLS_ISO8859_8=m -CONFIG_NLS_CODEPAGE_1250=m -CONFIG_NLS_CODEPAGE_1251=m -CONFIG_NLS_ASCII=m -CONFIG_NLS_ISO8859_1=m -CONFIG_NLS_ISO8859_2=m -CONFIG_NLS_ISO8859_3=m -CONFIG_NLS_ISO8859_4=m -CONFIG_NLS_ISO8859_5=m -CONFIG_NLS_ISO8859_6=m -CONFIG_NLS_ISO8859_7=m -CONFIG_NLS_ISO8859_9=m -CONFIG_NLS_ISO8859_13=m -CONFIG_NLS_ISO8859_14=m -CONFIG_NLS_ISO8859_15=m -CONFIG_NLS_KOI8_R=m -CONFIG_NLS_KOI8_U=m -CONFIG_NLS_MAC_ROMAN=m -CONFIG_NLS_MAC_CELTIC=m -CONFIG_NLS_MAC_CENTEURO=m -CONFIG_NLS_MAC_CROATIAN=m -CONFIG_NLS_MAC_CYRILLIC=m -CONFIG_NLS_MAC_GAELIC=m -CONFIG_NLS_MAC_GREEK=m -CONFIG_NLS_MAC_ICELAND=m -CONFIG_NLS_MAC_INUIT=m -CONFIG_NLS_MAC_ROMANIAN=m -CONFIG_NLS_MAC_TURKISH=m -CONFIG_NLS_UTF8=m -CONFIG_DLM=m -CONFIG_DLM_DEBUG=y -CONFIG_HAVE_KVM_IRQCHIP=y -CONFIG_HAVE_KVM_IRQFD=y -CONFIG_HAVE_KVM_IRQ_ROUTING=y -CONFIG_HAVE_KVM_EVENTFD=y -CONFIG_KVM_MMIO=y -CONFIG_HAVE_KVM_MSI=y -CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y -CONFIG_KVM_VFIO=y -CONFIG_HAVE_KVM_ARCH_TLB_FLUSH_ALL=y -CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y -CONFIG_HAVE_KVM_IRQ_BYPASS=y -CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE=y -CONFIG_VIRTUALIZATION=y -CONFIG_KVM=y -CONFIG_KVM_ARM_HOST=y -CONFIG_KVM_ARM_PMU=y -CONFIG_KVM_INDIRECT_VECTORS=y -CONFIG_VHOST_NET=m -CONFIG_VHOST_SCSI=m -CONFIG_VHOST_VSOCK=m -CONFIG_VHOST=m -# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set - -# -# Kernel hacking -# - -# -# printk and dmesg options -# -CONFIG_PRINTK_TIME=y -CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 -CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 -CONFIG_BOOT_PRINTK_DELAY=y -CONFIG_DYNAMIC_DEBUG=y - -# -# Compile-time checks and compiler options -# -CONFIG_DEBUG_INFO=y -# CONFIG_DEBUG_INFO_REDUCED is not set -# CONFIG_DEBUG_INFO_SPLIT is not set -# CONFIG_DEBUG_INFO_DWARF4 is not set -# CONFIG_GDB_SCRIPTS is not set -CONFIG_ENABLE_WARN_DEPRECATED=y -CONFIG_ENABLE_MUST_CHECK=y -CONFIG_FRAME_WARN=2048 -CONFIG_STRIP_ASM_SYMS=y -# CONFIG_READABLE_ASM is not set -# CONFIG_UNUSED_SYMBOLS is not set -# CONFIG_PAGE_OWNER is not set -CONFIG_DEBUG_FS=y -# CONFIG_HEADERS_CHECK is not set -# CONFIG_DEBUG_SECTION_MISMATCH is not set -CONFIG_SECTION_MISMATCH_WARN_ONLY=y -CONFIG_ARCH_WANT_FRAME_POINTERS=y -CONFIG_FRAME_POINTER=y -# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set -CONFIG_MAGIC_SYSRQ=y -CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01b6 -CONFIG_MAGIC_SYSRQ_SERIAL=y -CONFIG_DEBUG_KERNEL=y - -# -# Memory Debugging -# -CONFIG_PAGE_EXTENSION=y -# CONFIG_DEBUG_PAGEALLOC is not set -CONFIG_PAGE_POISONING=y -CONFIG_PAGE_POISONING_NO_SANITY=y -# CONFIG_PAGE_POISONING_ZERO is not set -# CONFIG_DEBUG_PAGE_REF is not set -# CONFIG_DEBUG_RODATA_TEST is not set -# CONFIG_DEBUG_OBJECTS is not set -# CONFIG_SLUB_DEBUG_ON is not set -# CONFIG_SLUB_STATS is not set -CONFIG_HAVE_DEBUG_KMEMLEAK=y -# CONFIG_DEBUG_KMEMLEAK is not set -# CONFIG_DEBUG_STACK_USAGE is not set -# CONFIG_DEBUG_VM is not set -CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y -# CONFIG_DEBUG_VIRTUAL is not set -CONFIG_DEBUG_MEMORY_INIT=y -# CONFIG_DEBUG_PER_CPU_MAPS is not set -CONFIG_HAVE_ARCH_KASAN=y -# CONFIG_KASAN is not set -CONFIG_ARCH_HAS_KCOV=y -CONFIG_CC_HAS_SANCOV_TRACE_PC=y -# CONFIG_KCOV is not set -# CONFIG_DEBUG_SHIRQ is not set - -# -# Debug Lockups and Hangs -# -CONFIG_LOCKUP_DETECTOR=y -CONFIG_SOFTLOCKUP_DETECTOR=y -# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set -CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 -CONFIG_DETECT_HUNG_TASK=y -CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 -# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set -CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 -# CONFIG_WQ_WATCHDOG is not set -# CONFIG_PANIC_ON_OOPS is not set -CONFIG_PANIC_ON_OOPS_VALUE=0 -CONFIG_PANIC_TIMEOUT=0 -CONFIG_SCHED_DEBUG=y -CONFIG_SCHED_INFO=y -CONFIG_SCHEDSTATS=y -CONFIG_SCHED_STACK_END_CHECK=y -# CONFIG_DEBUG_TIMEKEEPING is not set - -# -# Lock Debugging (spinlocks, mutexes, etc...) -# -CONFIG_LOCK_DEBUGGING_SUPPORT=y -# CONFIG_PROVE_LOCKING is not set -# CONFIG_LOCK_STAT is not set -# CONFIG_DEBUG_RT_MUTEXES is not set -# CONFIG_DEBUG_SPINLOCK is not set -# CONFIG_DEBUG_MUTEXES is not set -# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set -# CONFIG_DEBUG_RWSEMS is not set -# CONFIG_DEBUG_LOCK_ALLOC is not set -# CONFIG_DEBUG_ATOMIC_SLEEP is not set -# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set -# CONFIG_LOCK_TORTURE_TEST is not set -# CONFIG_WW_MUTEX_SELFTEST is not set -CONFIG_STACKTRACE=y -# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set -# CONFIG_DEBUG_KOBJECT is not set -CONFIG_HAVE_DEBUG_BUGVERBOSE=y -CONFIG_DEBUG_BUGVERBOSE=y -CONFIG_DEBUG_LIST=y -# CONFIG_DEBUG_PI_LIST is not set -# CONFIG_DEBUG_SG is not set -# CONFIG_DEBUG_NOTIFIERS is not set -# CONFIG_DEBUG_CREDENTIALS is not set - -# -# RCU Debugging -# -# CONFIG_RCU_PERF_TEST is not set -# CONFIG_RCU_TORTURE_TEST is not set -CONFIG_RCU_CPU_STALL_TIMEOUT=21 -# CONFIG_RCU_TRACE is not set -# CONFIG_RCU_EQS_DEBUG is not set -# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set -# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set -# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set -CONFIG_NOTIFIER_ERROR_INJECTION=m -CONFIG_PM_NOTIFIER_ERROR_INJECT=m -# CONFIG_NETDEV_NOTIFIER_ERROR_INJECT is not set -# CONFIG_FAULT_INJECTION is not set -# CONFIG_LATENCYTOP is not set -CONFIG_NOP_TRACER=y -CONFIG_HAVE_FUNCTION_TRACER=y -CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y -CONFIG_HAVE_DYNAMIC_FTRACE=y -CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y -CONFIG_HAVE_SYSCALL_TRACEPOINTS=y -CONFIG_HAVE_C_RECORDMCOUNT=y -CONFIG_TRACER_MAX_TRACE=y -CONFIG_TRACE_CLOCK=y -CONFIG_RING_BUFFER=y -CONFIG_EVENT_TRACING=y -CONFIG_CONTEXT_SWITCH_TRACER=y -CONFIG_TRACING=y -CONFIG_GENERIC_TRACER=y -CONFIG_TRACING_SUPPORT=y -CONFIG_FTRACE=y -CONFIG_FUNCTION_TRACER=y -CONFIG_FUNCTION_GRAPH_TRACER=y -# CONFIG_PREEMPTIRQ_EVENTS is not set -# CONFIG_IRQSOFF_TRACER is not set -# CONFIG_SCHED_TRACER is not set -# CONFIG_HWLAT_TRACER is not set -CONFIG_FTRACE_SYSCALLS=y -CONFIG_TRACER_SNAPSHOT=y -# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set -CONFIG_BRANCH_PROFILE_NONE=y -# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set -# CONFIG_PROFILE_ALL_BRANCHES is not set -CONFIG_STACK_TRACER=y -CONFIG_BLK_DEV_IO_TRACE=y -CONFIG_KPROBE_EVENTS=y -CONFIG_UPROBE_EVENTS=y -CONFIG_BPF_EVENTS=y -CONFIG_PROBE_EVENTS=y -CONFIG_DYNAMIC_FTRACE=y -# CONFIG_FUNCTION_PROFILER is not set -CONFIG_FTRACE_MCOUNT_RECORD=y -# CONFIG_FTRACE_STARTUP_TEST is not set -# CONFIG_HIST_TRIGGERS is not set -# CONFIG_TRACEPOINT_BENCHMARK is not set -# CONFIG_RING_BUFFER_BENCHMARK is not set -# CONFIG_RING_BUFFER_STARTUP_TEST is not set -# CONFIG_TRACE_EVAL_MAP_FILE is not set -CONFIG_TRACING_EVENTS_GPIO=y -# CONFIG_DMA_API_DEBUG is not set -CONFIG_RUNTIME_TESTING_MENU=y -# CONFIG_LKDTM is not set -# CONFIG_TEST_LIST_SORT is not set -# CONFIG_TEST_SORT is not set -# CONFIG_KPROBES_SANITY_TEST is not set -# CONFIG_BACKTRACE_SELF_TEST is not set -# CONFIG_RBTREE_TEST is not set -# CONFIG_INTERVAL_TREE_TEST is not set -# CONFIG_PERCPU_TEST is not set -# CONFIG_ATOMIC64_SELFTEST is not set -# CONFIG_ASYNC_RAID6_TEST is not set -# CONFIG_TEST_HEXDUMP is not set -# CONFIG_TEST_STRING_HELPERS is not set -# CONFIG_TEST_KSTRTOX is not set -# CONFIG_TEST_PRINTF is not set -# CONFIG_TEST_BITMAP is not set -# CONFIG_TEST_UUID is not set -# CONFIG_TEST_OVERFLOW is not set -# CONFIG_TEST_RHASHTABLE is not set -# CONFIG_TEST_HASH is not set -# CONFIG_TEST_LKM is not set -CONFIG_TEST_USER_COPY=m -CONFIG_TEST_BPF=m -# CONFIG_FIND_BIT_BENCHMARK is not set -CONFIG_TEST_FIRMWARE=m -# CONFIG_TEST_SYSCTL is not set -# CONFIG_TEST_UDELAY is not set -CONFIG_TEST_STATIC_KEYS=m -# CONFIG_TEST_KMOD is not set -# CONFIG_MEMTEST is not set -CONFIG_BUG_ON_DATA_CORRUPTION=y -# CONFIG_SAMPLES is not set -CONFIG_HAVE_ARCH_KGDB=y -# CONFIG_KGDB is not set -CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y -# CONFIG_UBSAN is not set -CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y -CONFIG_STRICT_DEVMEM=y -CONFIG_IO_STRICT_DEVMEM=y -# CONFIG_ARM64_PTDUMP_DEBUGFS is not set -# CONFIG_PID_IN_CONTEXTIDR is not set -# CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set -# CONFIG_DEBUG_WX is not set -# CONFIG_DEBUG_ALIGN_RODATA is not set -# CONFIG_DEBUG_EFI is not set -# CONFIG_ARM64_RELOC_TEST is not set -# CONFIG_CORESIGHT is not set - -# -# Security options -# -CONFIG_KEYS=y -CONFIG_KEYS_COMPAT=y -# CONFIG_PERSISTENT_KEYRINGS is not set -# CONFIG_BIG_KEYS is not set -# CONFIG_ENCRYPTED_KEYS is not set -# CONFIG_KEY_DH_OPERATIONS is not set -CONFIG_SECURITY_DMESG_RESTRICT=y -CONFIG_SECURITY=y -CONFIG_SECURITYFS=y -CONFIG_SECURITY_NETWORK=y -# CONFIG_SECURITY_INFINIBAND is not set -CONFIG_SECURITY_NETWORK_XFRM=y -CONFIG_SECURITY_PATH=y -CONFIG_LSM_MMAP_MIN_ADDR=32768 -CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y -CONFIG_HARDENED_USERCOPY=y -CONFIG_HARDENED_USERCOPY_FALLBACK=y -# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set -# CONFIG_FORTIFY_SOURCE is not set -# CONFIG_STATIC_USERMODEHELPER is not set -CONFIG_SECURITY_SELINUX=y -# CONFIG_SECURITY_SELINUX_BOOTPARAM is not set -# CONFIG_SECURITY_SELINUX_DISABLE is not set -CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_AVC_STATS=y -CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0 -# CONFIG_SECURITY_SMACK is not set -CONFIG_SECURITY_TOMOYO=y -CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048 -CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024 -# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set -CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init" -CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init" -CONFIG_SECURITY_APPARMOR=y -CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1 -CONFIG_SECURITY_APPARMOR_HASH=y -CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y -# CONFIG_SECURITY_APPARMOR_DEBUG is not set -# CONFIG_SECURITY_LOADPIN is not set -CONFIG_SECURITY_YAMA=y -CONFIG_INTEGRITY=y -CONFIG_INTEGRITY_SIGNATURE=y -CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y -CONFIG_INTEGRITY_TRUSTED_KEYRING=y -CONFIG_INTEGRITY_AUDIT=y -# CONFIG_IMA is not set -# CONFIG_EVM is not set -# CONFIG_DEFAULT_SECURITY_SELINUX is not set -# CONFIG_DEFAULT_SECURITY_TOMOYO is not set -CONFIG_DEFAULT_SECURITY_APPARMOR=y -# CONFIG_DEFAULT_SECURITY_DAC is not set -CONFIG_DEFAULT_SECURITY="apparmor" -CONFIG_XOR_BLOCKS=m -CONFIG_ASYNC_CORE=m -CONFIG_ASYNC_MEMCPY=m -CONFIG_ASYNC_XOR=m -CONFIG_ASYNC_PQ=m -CONFIG_ASYNC_RAID6_RECOV=m -CONFIG_CRYPTO=y - -# -# Crypto core or helper -# -CONFIG_CRYPTO_ALGAPI=y -CONFIG_CRYPTO_ALGAPI2=y -CONFIG_CRYPTO_AEAD=m -CONFIG_CRYPTO_AEAD2=y -CONFIG_CRYPTO_BLKCIPHER=m -CONFIG_CRYPTO_BLKCIPHER2=y -CONFIG_CRYPTO_HASH=y -CONFIG_CRYPTO_HASH2=y -CONFIG_CRYPTO_RNG=m -CONFIG_CRYPTO_RNG2=y -CONFIG_CRYPTO_RNG_DEFAULT=m -CONFIG_CRYPTO_AKCIPHER2=y -CONFIG_CRYPTO_AKCIPHER=y -CONFIG_CRYPTO_KPP2=y -CONFIG_CRYPTO_KPP=m -CONFIG_CRYPTO_ACOMP2=y -CONFIG_CRYPTO_RSA=y -CONFIG_CRYPTO_DH=m -CONFIG_CRYPTO_ECDH=m -CONFIG_CRYPTO_MANAGER=y -CONFIG_CRYPTO_MANAGER2=y -CONFIG_CRYPTO_USER=m -# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set -CONFIG_CRYPTO_GF128MUL=m -CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_NULL2=y -CONFIG_CRYPTO_PCRYPT=m -CONFIG_CRYPTO_WORKQUEUE=y -CONFIG_CRYPTO_CRYPTD=m -# CONFIG_CRYPTO_MCRYPTD is not set -CONFIG_CRYPTO_AUTHENC=m -CONFIG_CRYPTO_TEST=m -CONFIG_CRYPTO_SIMD=m -CONFIG_CRYPTO_ENGINE=m - -# -# Authenticated Encryption with Associated Data -# -CONFIG_CRYPTO_CCM=m -CONFIG_CRYPTO_GCM=m -CONFIG_CRYPTO_CHACHA20POLY1305=m -CONFIG_CRYPTO_AEGIS128=m -CONFIG_CRYPTO_AEGIS128L=m -CONFIG_CRYPTO_AEGIS256=m -CONFIG_CRYPTO_MORUS640=m -CONFIG_CRYPTO_MORUS1280=m -CONFIG_CRYPTO_SEQIV=m -CONFIG_CRYPTO_ECHAINIV=m - -# -# Block modes -# -CONFIG_CRYPTO_CBC=m -CONFIG_CRYPTO_CFB=m -CONFIG_CRYPTO_CTR=m -CONFIG_CRYPTO_CTS=m -CONFIG_CRYPTO_ECB=m -CONFIG_CRYPTO_LRW=m -CONFIG_CRYPTO_PCBC=m -CONFIG_CRYPTO_XTS=m -# CONFIG_CRYPTO_KEYWRAP is not set - -# -# Hash modes -# -CONFIG_CRYPTO_CMAC=m -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_XCBC=m -CONFIG_CRYPTO_VMAC=m - -# -# Digest -# -CONFIG_CRYPTO_CRC32C=m -CONFIG_CRYPTO_CRC32=m -CONFIG_CRYPTO_CRCT10DIF=y -CONFIG_CRYPTO_GHASH=m -CONFIG_CRYPTO_POLY1305=m -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=y -CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_RMD128=m -CONFIG_CRYPTO_RMD160=m -CONFIG_CRYPTO_RMD256=m -CONFIG_CRYPTO_RMD320=m -CONFIG_CRYPTO_SHA1=y -CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_SHA3=m -# CONFIG_CRYPTO_SM3 is not set -CONFIG_CRYPTO_TGR192=m -CONFIG_CRYPTO_WP512=m - -# -# Ciphers -# -CONFIG_CRYPTO_AES=y -# CONFIG_CRYPTO_AES_TI is not set -CONFIG_CRYPTO_ANUBIS=m -CONFIG_CRYPTO_ARC4=m -CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_BLOWFISH_COMMON=m -CONFIG_CRYPTO_CAMELLIA=m -CONFIG_CRYPTO_CAST_COMMON=m -CONFIG_CRYPTO_CAST5=m -CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_DES=m -CONFIG_CRYPTO_FCRYPT=m -CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_SALSA20=m -CONFIG_CRYPTO_CHACHA20=m -CONFIG_CRYPTO_SEED=m -CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_SM4=m -CONFIG_CRYPTO_SPECK=m -CONFIG_CRYPTO_TEA=m -CONFIG_CRYPTO_TWOFISH=m -CONFIG_CRYPTO_TWOFISH_COMMON=m - -# -# Compression -# -CONFIG_CRYPTO_DEFLATE=m -CONFIG_CRYPTO_LZO=y -# CONFIG_CRYPTO_842 is not set -CONFIG_CRYPTO_LZ4=m -CONFIG_CRYPTO_LZ4HC=m -CONFIG_CRYPTO_ZSTD=m - -# -# Random Number Generation -# -CONFIG_CRYPTO_ANSI_CPRNG=m -CONFIG_CRYPTO_DRBG_MENU=m -CONFIG_CRYPTO_DRBG_HMAC=y -# CONFIG_CRYPTO_DRBG_HASH is not set -# CONFIG_CRYPTO_DRBG_CTR is not set -CONFIG_CRYPTO_DRBG=m -CONFIG_CRYPTO_JITTERENTROPY=m -CONFIG_CRYPTO_USER_API=m -CONFIG_CRYPTO_USER_API_HASH=m -CONFIG_CRYPTO_USER_API_SKCIPHER=m -CONFIG_CRYPTO_USER_API_RNG=m -CONFIG_CRYPTO_USER_API_AEAD=m -CONFIG_CRYPTO_HASH_INFO=y -CONFIG_CRYPTO_HW=y -CONFIG_CRYPTO_DEV_MARVELL_CESA=m -# CONFIG_CRYPTO_DEV_CCP is not set -CONFIG_CRYPTO_DEV_CPT=m -CONFIG_CAVIUM_CPT=m -CONFIG_CRYPTO_DEV_NITROX=m -CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m -# CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set -CONFIG_CRYPTO_DEV_QCE=m -# CONFIG_CRYPTO_DEV_ROCKCHIP is not set -CONFIG_CRYPTO_DEV_CHELSIO=m -# CONFIG_CHELSIO_IPSEC_INLINE is not set -CONFIG_CRYPTO_DEV_VIRTIO=m -CONFIG_CRYPTO_DEV_SAFEXCEL=m -# CONFIG_CRYPTO_DEV_CCREE is not set -CONFIG_ASYMMETRIC_KEY_TYPE=y -CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y -CONFIG_X509_CERTIFICATE_PARSER=y -CONFIG_PKCS7_MESSAGE_PARSER=y -# CONFIG_PKCS7_TEST_KEY is not set -# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set - -# -# Certificates for signature checking -# -CONFIG_SYSTEM_TRUSTED_KEYRING=y -CONFIG_SYSTEM_TRUSTED_KEYS="" -# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set -# CONFIG_SECONDARY_TRUSTED_KEYRING is not set -# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set -CONFIG_ARM64_CRYPTO=y -CONFIG_CRYPTO_SHA256_ARM64=m -# CONFIG_CRYPTO_SHA512_ARM64 is not set -CONFIG_CRYPTO_SHA1_ARM64_CE=m -CONFIG_CRYPTO_SHA2_ARM64_CE=m -# CONFIG_CRYPTO_SHA512_ARM64_CE is not set -# CONFIG_CRYPTO_SHA3_ARM64 is not set -# CONFIG_CRYPTO_SM3_ARM64_CE is not set -# CONFIG_CRYPTO_SM4_ARM64_CE is not set -CONFIG_CRYPTO_GHASH_ARM64_CE=m -# CONFIG_CRYPTO_CRCT10DIF_ARM64_CE is not set -CONFIG_CRYPTO_CRC32_ARM64_CE=y -CONFIG_CRYPTO_AES_ARM64=m -CONFIG_CRYPTO_AES_ARM64_CE=m -CONFIG_CRYPTO_AES_ARM64_CE_CCM=m -CONFIG_CRYPTO_AES_ARM64_CE_BLK=m -# CONFIG_CRYPTO_AES_ARM64_NEON_BLK is not set -# CONFIG_CRYPTO_CHACHA20_NEON is not set -# CONFIG_CRYPTO_AES_ARM64_BS is not set -CONFIG_CRYPTO_SPECK_NEON=m -CONFIG_BINARY_PRINTF=y - -# -# Library routines -# -CONFIG_RAID6_PQ=m -CONFIG_BITREVERSE=y -CONFIG_HAVE_ARCH_BITREVERSE=y -CONFIG_RATIONAL=y -CONFIG_GENERIC_STRNCPY_FROM_USER=y -CONFIG_GENERIC_STRNLEN_USER=y -CONFIG_GENERIC_NET_UTILS=y -CONFIG_GENERIC_PCI_IOMAP=y -CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y -CONFIG_ARCH_HAS_FAST_MULTIPLIER=y -# CONFIG_INDIRECT_PIO is not set -CONFIG_CRC_CCITT=m -CONFIG_CRC16=m -CONFIG_CRC_T10DIF=y -CONFIG_CRC_ITU_T=m -CONFIG_CRC32=y -# CONFIG_CRC32_SELFTEST is not set -CONFIG_CRC32_SLICEBY8=y -# CONFIG_CRC32_SLICEBY4 is not set -# CONFIG_CRC32_SARWATE is not set -# CONFIG_CRC32_BIT is not set -# CONFIG_CRC4 is not set -CONFIG_CRC7=m -CONFIG_LIBCRC32C=m -CONFIG_CRC8=m -CONFIG_XXHASH=m -CONFIG_AUDIT_GENERIC=y -CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y -CONFIG_AUDIT_COMPAT_GENERIC=y -# CONFIG_RANDOM32_SELFTEST is not set -CONFIG_ZLIB_INFLATE=y -CONFIG_ZLIB_DEFLATE=m -CONFIG_LZO_COMPRESS=y -CONFIG_LZO_DECOMPRESS=y -CONFIG_LZ4_COMPRESS=m -CONFIG_LZ4HC_COMPRESS=m -CONFIG_LZ4_DECOMPRESS=y -CONFIG_ZSTD_COMPRESS=m -CONFIG_ZSTD_DECOMPRESS=m -CONFIG_XZ_DEC=y -# CONFIG_XZ_DEC_X86 is not set -# CONFIG_XZ_DEC_POWERPC is not set -# CONFIG_XZ_DEC_IA64 is not set -# CONFIG_XZ_DEC_ARM is not set -# CONFIG_XZ_DEC_ARMTHUMB is not set -# CONFIG_XZ_DEC_SPARC is not set -# CONFIG_XZ_DEC_TEST is not set -CONFIG_DECOMPRESS_GZIP=y -CONFIG_DECOMPRESS_BZIP2=y -CONFIG_DECOMPRESS_LZMA=y -CONFIG_DECOMPRESS_XZ=y -CONFIG_DECOMPRESS_LZO=y -CONFIG_DECOMPRESS_LZ4=y -CONFIG_GENERIC_ALLOCATOR=y -CONFIG_REED_SOLOMON=m -CONFIG_REED_SOLOMON_ENC8=y -CONFIG_REED_SOLOMON_DEC8=y -CONFIG_TEXTSEARCH=y -CONFIG_TEXTSEARCH_KMP=m -CONFIG_TEXTSEARCH_BM=m -CONFIG_TEXTSEARCH_FSM=m -CONFIG_BTREE=y -CONFIG_INTERVAL_TREE=y -CONFIG_RADIX_TREE_MULTIORDER=y -CONFIG_ASSOCIATIVE_ARRAY=y -CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT_MAP=y -CONFIG_HAS_DMA=y -CONFIG_NEED_SG_DMA_LENGTH=y -CONFIG_NEED_DMA_MAP_STATE=y -CONFIG_ARCH_DMA_ADDR_T_64BIT=y -CONFIG_HAVE_GENERIC_DMA_COHERENT=y -CONFIG_DMA_DIRECT_OPS=y -CONFIG_DMA_VIRT_OPS=y -CONFIG_SWIOTLB=y -CONFIG_SGL_ALLOC=y -CONFIG_CHECK_SIGNATURE=y -CONFIG_CPU_RMAP=y -CONFIG_DQL=y -CONFIG_GLOB=y -# CONFIG_GLOB_SELFTEST is not set -CONFIG_NLATTR=y -CONFIG_LRU_CACHE=m -CONFIG_CLZ_TAB=y -CONFIG_CORDIC=m -# CONFIG_DDR is not set -CONFIG_IRQ_POLL=y -CONFIG_MPILIB=y -CONFIG_SIGNATURE=y -CONFIG_LIBFDT=y -CONFIG_OID_REGISTRY=y -CONFIG_UCS2_STRING=y -CONFIG_FONT_SUPPORT=y -# CONFIG_FONTS is not set -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y -CONFIG_SG_POOL=y -CONFIG_ARCH_HAS_SG_CHAIN=y -CONFIG_ARCH_HAS_PMEM_API=y -CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y -CONFIG_SBITMAP=y -# CONFIG_STRING_SELFTEST is not set diff --git a/gnu/packages/aux-files/linux-libre/4.18-i686.conf b/gnu/packages/aux-files/linux-libre/4.18-i686.conf deleted file mode 100644 index 859b8b10b6..0000000000 --- a/gnu/packages/aux-files/linux-libre/4.18-i686.conf +++ /dev/null @@ -1,9583 +0,0 @@ -# -# Automatically generated file; DO NOT EDIT. -# Linux/x86 4.18.9-gnu Kernel Configuration -# - -# -# Compiler: gcc (GCC) 7.3.0 -# -# CONFIG_64BIT is not set -CONFIG_X86_32=y -CONFIG_X86=y -CONFIG_INSTRUCTION_DECODER=y -CONFIG_OUTPUT_FORMAT="elf32-i386" -CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" -CONFIG_LOCKDEP_SUPPORT=y -CONFIG_STACKTRACE_SUPPORT=y -CONFIG_MMU=y -CONFIG_ARCH_MMAP_RND_BITS_MIN=8 -CONFIG_ARCH_MMAP_RND_BITS_MAX=16 -CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8 -CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16 -CONFIG_GENERIC_ISA_DMA=y -CONFIG_GENERIC_BUG=y -CONFIG_GENERIC_HWEIGHT=y -CONFIG_ARCH_MAY_HAVE_PC_FDC=y -CONFIG_RWSEM_XCHGADD_ALGORITHM=y -CONFIG_GENERIC_CALIBRATE_DELAY=y -CONFIG_ARCH_HAS_CPU_RELAX=y -CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y -CONFIG_ARCH_HAS_FILTER_PGPROT=y -CONFIG_HAVE_SETUP_PER_CPU_AREA=y -CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y -CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y -CONFIG_ARCH_HIBERNATION_POSSIBLE=y -CONFIG_ARCH_SUSPEND_POSSIBLE=y -CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y -CONFIG_ARCH_WANT_GENERAL_HUGETLB=y -CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y -CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y -CONFIG_HAVE_INTEL_TXT=y -CONFIG_X86_32_SMP=y -CONFIG_ARCH_SUPPORTS_UPROBES=y -CONFIG_FIX_EARLYCON_MEM=y -CONFIG_PGTABLE_LEVELS=3 -CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=70300 -CONFIG_CLANG_VERSION=0 -CONFIG_IRQ_WORK=y -CONFIG_BUILDTIME_EXTABLE_SORT=y -CONFIG_THREAD_INFO_IN_TASK=y - -# -# General setup -# -CONFIG_INIT_ENV_ARG_LIMIT=32 -# CONFIG_COMPILE_TEST is not set -CONFIG_LOCALVERSION="" -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_HAVE_KERNEL_GZIP=y -CONFIG_HAVE_KERNEL_BZIP2=y -CONFIG_HAVE_KERNEL_LZMA=y -CONFIG_HAVE_KERNEL_XZ=y -CONFIG_HAVE_KERNEL_LZO=y -CONFIG_HAVE_KERNEL_LZ4=y -CONFIG_KERNEL_GZIP=y -# CONFIG_KERNEL_BZIP2 is not set -# CONFIG_KERNEL_LZMA is not set -# CONFIG_KERNEL_XZ is not set -# CONFIG_KERNEL_LZO is not set -# CONFIG_KERNEL_LZ4 is not set -CONFIG_DEFAULT_HOSTNAME="(none)" -CONFIG_SWAP=y -CONFIG_SYSVIPC=y -CONFIG_SYSVIPC_SYSCTL=y -CONFIG_POSIX_MQUEUE=y -CONFIG_POSIX_MQUEUE_SYSCTL=y -CONFIG_CROSS_MEMORY_ATTACH=y -CONFIG_USELIB=y -CONFIG_AUDIT=y -CONFIG_HAVE_ARCH_AUDITSYSCALL=y -CONFIG_AUDITSYSCALL=y -CONFIG_AUDIT_WATCH=y -CONFIG_AUDIT_TREE=y - -# -# IRQ subsystem -# -CONFIG_GENERIC_IRQ_PROBE=y -CONFIG_GENERIC_IRQ_SHOW=y -CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y -CONFIG_GENERIC_PENDING_IRQ=y -CONFIG_GENERIC_IRQ_MIGRATION=y -CONFIG_GENERIC_IRQ_CHIP=y -CONFIG_IRQ_DOMAIN=y -CONFIG_IRQ_DOMAIN_HIERARCHY=y -CONFIG_GENERIC_MSI_IRQ=y -CONFIG_GENERIC_MSI_IRQ_DOMAIN=y -CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y -CONFIG_GENERIC_IRQ_RESERVATION_MODE=y -CONFIG_IRQ_FORCED_THREADING=y -CONFIG_SPARSE_IRQ=y -# CONFIG_GENERIC_IRQ_DEBUGFS is not set -CONFIG_CLOCKSOURCE_WATCHDOG=y -CONFIG_ARCH_CLOCKSOURCE_DATA=y -CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y -CONFIG_GENERIC_TIME_VSYSCALL=y -CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y -CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y -CONFIG_GENERIC_CMOS_UPDATE=y - -# -# Timers subsystem -# -CONFIG_TICK_ONESHOT=y -CONFIG_NO_HZ_COMMON=y -# CONFIG_HZ_PERIODIC is not set -CONFIG_NO_HZ_IDLE=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y - -# -# CPU/Task time and stats accounting -# -CONFIG_TICK_CPU_ACCOUNTING=y -# CONFIG_IRQ_TIME_ACCOUNTING is not set -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_BSD_PROCESS_ACCT_V3=y -CONFIG_TASKSTATS=y -CONFIG_TASK_DELAY_ACCT=y -CONFIG_TASK_XACCT=y -CONFIG_TASK_IO_ACCOUNTING=y -CONFIG_CPU_ISOLATION=y - -# -# RCU Subsystem -# -CONFIG_TREE_RCU=y -# CONFIG_RCU_EXPERT is not set -CONFIG_SRCU=y -CONFIG_TREE_SRCU=y -CONFIG_RCU_STALL_COMMON=y -CONFIG_RCU_NEED_SEGCBLIST=y -CONFIG_BUILD_BIN2C=y -# CONFIG_IKCONFIG is not set -CONFIG_LOG_BUF_SHIFT=17 -CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 -CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13 -CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y -CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y -CONFIG_CGROUPS=y -CONFIG_PAGE_COUNTER=y -CONFIG_MEMCG=y -CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_SWAP_ENABLED is not set -CONFIG_BLK_CGROUP=y -# CONFIG_DEBUG_BLK_CGROUP is not set -CONFIG_CGROUP_WRITEBACK=y -CONFIG_CGROUP_SCHED=y -CONFIG_FAIR_GROUP_SCHED=y -CONFIG_CFS_BANDWIDTH=y -# CONFIG_RT_GROUP_SCHED is not set -CONFIG_CGROUP_PIDS=y -# CONFIG_CGROUP_RDMA is not set -CONFIG_CGROUP_FREEZER=y -CONFIG_CGROUP_HUGETLB=y -CONFIG_CPUSETS=y -CONFIG_PROC_PID_CPUSET=y -CONFIG_CGROUP_DEVICE=y -CONFIG_CGROUP_CPUACCT=y -CONFIG_CGROUP_PERF=y -CONFIG_CGROUP_BPF=y -# CONFIG_CGROUP_DEBUG is not set -CONFIG_SOCK_CGROUP_DATA=y -CONFIG_NAMESPACES=y -CONFIG_UTS_NS=y -CONFIG_IPC_NS=y -CONFIG_USER_NS=y -CONFIG_PID_NS=y -CONFIG_NET_NS=y -CONFIG_SCHED_AUTOGROUP=y -# CONFIG_SYSFS_DEPRECATED is not set -CONFIG_RELAY=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="" -CONFIG_RD_GZIP=y -CONFIG_RD_BZIP2=y -CONFIG_RD_LZMA=y -CONFIG_RD_XZ=y -CONFIG_RD_LZO=y -CONFIG_RD_LZ4=y -CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_SYSCTL=y -CONFIG_ANON_INODES=y -CONFIG_HAVE_UID16=y -CONFIG_SYSCTL_EXCEPTION_TRACE=y -CONFIG_HAVE_PCSPKR_PLATFORM=y -CONFIG_BPF=y -CONFIG_EXPERT=y -CONFIG_UID16=y -CONFIG_MULTIUSER=y -CONFIG_SGETMASK_SYSCALL=y -CONFIG_SYSFS_SYSCALL=y -CONFIG_SYSCTL_SYSCALL=y -CONFIG_FHANDLE=y -CONFIG_POSIX_TIMERS=y -CONFIG_PRINTK=y -CONFIG_PRINTK_NMI=y -CONFIG_BUG=y -CONFIG_ELF_CORE=y -CONFIG_PCSPKR_PLATFORM=y -CONFIG_BASE_FULL=y -CONFIG_FUTEX=y -CONFIG_FUTEX_PI=y -CONFIG_EPOLL=y -CONFIG_SIGNALFD=y -CONFIG_TIMERFD=y -CONFIG_EVENTFD=y -CONFIG_SHMEM=y -CONFIG_AIO=y -CONFIG_ADVISE_SYSCALLS=y -CONFIG_MEMBARRIER=y -CONFIG_CHECKPOINT_RESTORE=y -CONFIG_KALLSYMS=y -CONFIG_KALLSYMS_ALL=y -CONFIG_KALLSYMS_BASE_RELATIVE=y -CONFIG_BPF_SYSCALL=y -CONFIG_USERFAULTFD=y -CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y -CONFIG_RSEQ=y -# CONFIG_DEBUG_RSEQ is not set -# CONFIG_EMBEDDED is not set -CONFIG_HAVE_PERF_EVENTS=y -# CONFIG_PC104 is not set - -# -# Kernel Performance Events And Counters -# -CONFIG_PERF_EVENTS=y -# CONFIG_DEBUG_PERF_USE_VMALLOC is not set -CONFIG_VM_EVENT_COUNTERS=y -CONFIG_SLUB_DEBUG=y -# CONFIG_SLUB_MEMCG_SYSFS_ON is not set -# CONFIG_COMPAT_BRK is not set -# CONFIG_SLAB is not set -CONFIG_SLUB=y -# CONFIG_SLOB is not set -CONFIG_SLAB_MERGE_DEFAULT=y -CONFIG_SLAB_FREELIST_RANDOM=y -CONFIG_SLAB_FREELIST_HARDENED=y -CONFIG_SLUB_CPU_PARTIAL=y -CONFIG_SYSTEM_DATA_VERIFICATION=y -CONFIG_PROFILING=y -CONFIG_TRACEPOINTS=y -CONFIG_CRASH_CORE=y -CONFIG_KEXEC_CORE=y -CONFIG_HOTPLUG_SMT=y -CONFIG_OPROFILE=m -# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set -CONFIG_HAVE_OPROFILE=y -CONFIG_OPROFILE_NMI_TIMER=y -CONFIG_KPROBES=y -CONFIG_JUMP_LABEL=y -# CONFIG_STATIC_KEYS_SELFTEST is not set -CONFIG_OPTPROBES=y -CONFIG_KPROBES_ON_FTRACE=y -CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y -CONFIG_ARCH_USE_BUILTIN_BSWAP=y -CONFIG_KRETPROBES=y -CONFIG_USER_RETURN_NOTIFIER=y -CONFIG_HAVE_IOREMAP_PROT=y -CONFIG_HAVE_KPROBES=y -CONFIG_HAVE_KRETPROBES=y -CONFIG_HAVE_OPTPROBES=y -CONFIG_HAVE_KPROBES_ON_FTRACE=y -CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y -CONFIG_HAVE_NMI=y -CONFIG_HAVE_ARCH_TRACEHOOK=y -CONFIG_HAVE_DMA_CONTIGUOUS=y -CONFIG_GENERIC_SMP_IDLE_THREAD=y -CONFIG_ARCH_HAS_FORTIFY_SOURCE=y -CONFIG_ARCH_HAS_SET_MEMORY=y -CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y -CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y -CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y -CONFIG_HAVE_RSEQ=y -CONFIG_HAVE_CLK=y -CONFIG_HAVE_HW_BREAKPOINT=y -CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y -CONFIG_HAVE_USER_RETURN_NOTIFIER=y -CONFIG_HAVE_PERF_EVENTS_NMI=y -CONFIG_HAVE_HARDLOCKUP_DETECTOR_PERF=y -CONFIG_HAVE_PERF_REGS=y -CONFIG_HAVE_PERF_USER_STACK_DUMP=y -CONFIG_HAVE_ARCH_JUMP_LABEL=y -CONFIG_HAVE_RCU_TABLE_FREE=y -CONFIG_HAVE_RCU_TABLE_INVALIDATE=y -CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y -CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y -CONFIG_HAVE_CMPXCHG_LOCAL=y -CONFIG_HAVE_CMPXCHG_DOUBLE=y -CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y -CONFIG_HAVE_ARCH_SECCOMP_FILTER=y -CONFIG_SECCOMP_FILTER=y -CONFIG_PLUGIN_HOSTCC="" -CONFIG_HAVE_GCC_PLUGINS=y -CONFIG_HAVE_STACKPROTECTOR=y -CONFIG_CC_HAS_STACKPROTECTOR_NONE=y -CONFIG_STACKPROTECTOR=y -CONFIG_STACKPROTECTOR_STRONG=y -CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y -CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y -CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y -CONFIG_HAVE_ARCH_HUGE_VMAP=y -CONFIG_HAVE_MOD_ARCH_SPECIFIC=y -CONFIG_MODULES_USE_ELF_REL=y -CONFIG_ARCH_HAS_ELF_RANDOMIZE=y -CONFIG_HAVE_ARCH_MMAP_RND_BITS=y -CONFIG_HAVE_EXIT_THREAD=y -CONFIG_ARCH_MMAP_RND_BITS=8 -CONFIG_HAVE_COPY_THREAD_TLS=y -CONFIG_ISA_BUS_API=y -CONFIG_CLONE_BACKWARDS=y -CONFIG_OLD_SIGSUSPEND3=y -CONFIG_OLD_SIGACTION=y -CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y -CONFIG_STRICT_KERNEL_RWX=y -CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y -CONFIG_STRICT_MODULE_RWX=y -CONFIG_ARCH_HAS_REFCOUNT=y -CONFIG_REFCOUNT_FULL=y - -# -# GCOV-based kernel profiling -# -# CONFIG_GCOV_KERNEL is not set -CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y -CONFIG_RT_MUTEXES=y -CONFIG_BASE_SMALL=0 -CONFIG_MODULES=y -# CONFIG_MODULE_FORCE_LOAD is not set -CONFIG_MODULE_UNLOAD=y -# CONFIG_MODULE_FORCE_UNLOAD is not set -CONFIG_MODVERSIONS=y -CONFIG_MODULE_SRCVERSION_ALL=y -# CONFIG_MODULE_SIG is not set -# CONFIG_MODULE_COMPRESS is not set -CONFIG_MODULES_TREE_LOOKUP=y -CONFIG_BLOCK=y -CONFIG_LBDAF=y -CONFIG_BLK_SCSI_REQUEST=y -CONFIG_BLK_DEV_BSG=y -CONFIG_BLK_DEV_BSGLIB=y -CONFIG_BLK_DEV_INTEGRITY=y -CONFIG_BLK_DEV_ZONED=y -CONFIG_BLK_DEV_THROTTLING=y -# CONFIG_BLK_DEV_THROTTLING_LOW is not set -CONFIG_BLK_CMDLINE_PARSER=y -CONFIG_BLK_WBT=y -# CONFIG_BLK_WBT_SQ is not set -CONFIG_BLK_WBT_MQ=y -CONFIG_BLK_DEBUG_FS=y -# CONFIG_BLK_SED_OPAL is not set - -# -# Partition Types -# -CONFIG_PARTITION_ADVANCED=y -# CONFIG_ACORN_PARTITION is not set -CONFIG_AIX_PARTITION=y -CONFIG_OSF_PARTITION=y -CONFIG_AMIGA_PARTITION=y -CONFIG_ATARI_PARTITION=y -CONFIG_MAC_PARTITION=y -CONFIG_MSDOS_PARTITION=y -CONFIG_BSD_DISKLABEL=y -CONFIG_MINIX_SUBPARTITION=y -CONFIG_SOLARIS_X86_PARTITION=y -CONFIG_UNIXWARE_DISKLABEL=y -CONFIG_LDM_PARTITION=y -# CONFIG_LDM_DEBUG is not set -CONFIG_SGI_PARTITION=y -CONFIG_ULTRIX_PARTITION=y -CONFIG_SUN_PARTITION=y -CONFIG_KARMA_PARTITION=y -CONFIG_EFI_PARTITION=y -CONFIG_SYSV68_PARTITION=y -CONFIG_CMDLINE_PARTITION=y -CONFIG_BLK_MQ_PCI=y -CONFIG_BLK_MQ_VIRTIO=y -CONFIG_BLK_MQ_RDMA=y - -# -# IO Schedulers -# -CONFIG_IOSCHED_NOOP=y -CONFIG_IOSCHED_DEADLINE=y -CONFIG_IOSCHED_CFQ=y -CONFIG_CFQ_GROUP_IOSCHED=y -CONFIG_DEFAULT_DEADLINE=y -# CONFIG_DEFAULT_CFQ is not set -# CONFIG_DEFAULT_NOOP is not set -CONFIG_DEFAULT_IOSCHED="deadline" -CONFIG_MQ_IOSCHED_DEADLINE=m -CONFIG_MQ_IOSCHED_KYBER=m -CONFIG_IOSCHED_BFQ=m -# CONFIG_BFQ_GROUP_IOSCHED is not set -CONFIG_PREEMPT_NOTIFIERS=y -CONFIG_PADATA=y -CONFIG_ASN1=y -CONFIG_INLINE_SPIN_UNLOCK_IRQ=y -CONFIG_INLINE_READ_UNLOCK=y -CONFIG_INLINE_READ_UNLOCK_IRQ=y -CONFIG_INLINE_WRITE_UNLOCK=y -CONFIG_INLINE_WRITE_UNLOCK_IRQ=y -CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y -CONFIG_MUTEX_SPIN_ON_OWNER=y -CONFIG_RWSEM_SPIN_ON_OWNER=y -CONFIG_LOCK_SPIN_ON_OWNER=y -CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y -CONFIG_QUEUED_SPINLOCKS=y -CONFIG_ARCH_USE_QUEUED_RWLOCKS=y -CONFIG_QUEUED_RWLOCKS=y -CONFIG_ARCH_HAS_SYNC_CORE_BEFORE_USERMODE=y -CONFIG_CC_HAS_SANE_STACKPROTECTOR=y -CONFIG_FREEZER=y - -# -# Processor type and features -# -CONFIG_ZONE_DMA=y -CONFIG_SMP=y -CONFIG_X86_FEATURE_NAMES=y -CONFIG_X86_MPPARSE=y -# CONFIG_GOLDFISH is not set -CONFIG_RETPOLINE=y -# CONFIG_INTEL_RDT is not set -# CONFIG_X86_BIGSMP is not set -CONFIG_X86_EXTENDED_PLATFORM=y -# CONFIG_X86_GOLDFISH is not set -CONFIG_X86_INTEL_MID=y -# CONFIG_X86_INTEL_QUARK is not set -CONFIG_X86_INTEL_LPSS=y -CONFIG_X86_AMD_PLATFORM_DEVICE=y -CONFIG_IOSF_MBI=y -CONFIG_IOSF_MBI_DEBUG=y -# CONFIG_X86_RDC321X is not set -# CONFIG_X86_32_NON_STANDARD is not set -CONFIG_X86_32_IRIS=m -CONFIG_SCHED_OMIT_FRAME_POINTER=y -CONFIG_HYPERVISOR_GUEST=y -CONFIG_PARAVIRT=y -# CONFIG_PARAVIRT_DEBUG is not set -CONFIG_PARAVIRT_SPINLOCKS=y -# CONFIG_QUEUED_LOCK_STAT is not set -CONFIG_XEN=y -CONFIG_XEN_PV=y -CONFIG_XEN_PV_SMP=y -CONFIG_XEN_DOM0=y -CONFIG_XEN_PVHVM=y -CONFIG_XEN_PVHVM_SMP=y -CONFIG_XEN_SAVE_RESTORE=y -# CONFIG_XEN_DEBUG_FS is not set -CONFIG_XEN_PVH=y -CONFIG_KVM_GUEST=y -CONFIG_KVM_DEBUG_FS=y -# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set -CONFIG_PARAVIRT_CLOCK=y -CONFIG_NO_BOOTMEM=y -# CONFIG_M486 is not set -# CONFIG_M586 is not set -# CONFIG_M586TSC is not set -# CONFIG_M586MMX is not set -CONFIG_M686=y -# CONFIG_MPENTIUMII is not set -# CONFIG_MPENTIUMIII is not set -# CONFIG_MPENTIUMM is not set -# CONFIG_MPENTIUM4 is not set -# CONFIG_MK6 is not set -# CONFIG_MK7 is not set -# CONFIG_MK8 is not set -# CONFIG_MCRUSOE is not set -# CONFIG_MEFFICEON is not set -# CONFIG_MWINCHIPC6 is not set -# CONFIG_MWINCHIP3D is not set -# CONFIG_MELAN is not set -# CONFIG_MGEODEGX1 is not set -# CONFIG_MGEODE_LX is not set -# CONFIG_MCYRIXIII is not set -# CONFIG_MVIAC3_2 is not set -# CONFIG_MVIAC7 is not set -# CONFIG_MCORE2 is not set -# CONFIG_MATOM is not set -CONFIG_X86_GENERIC=y -CONFIG_X86_INTERNODE_CACHE_SHIFT=6 -CONFIG_X86_L1_CACHE_SHIFT=6 -CONFIG_X86_INTEL_USERCOPY=y -CONFIG_X86_USE_PPRO_CHECKSUM=y -CONFIG_X86_TSC=y -CONFIG_X86_CMPXCHG64=y -CONFIG_X86_CMOV=y -CONFIG_X86_MINIMUM_CPU_FAMILY=6 -CONFIG_X86_DEBUGCTLMSR=y -CONFIG_PROCESSOR_SELECT=y -CONFIG_CPU_SUP_INTEL=y -CONFIG_CPU_SUP_CYRIX_32=y -CONFIG_CPU_SUP_AMD=y -CONFIG_CPU_SUP_CENTAUR=y -CONFIG_CPU_SUP_TRANSMETA_32=y -CONFIG_CPU_SUP_UMC_32=y -CONFIG_HPET_TIMER=y -CONFIG_HPET_EMULATE_RTC=y -CONFIG_APB_TIMER=y -CONFIG_DMI=y -CONFIG_NR_CPUS_RANGE_BEGIN=2 -CONFIG_NR_CPUS_RANGE_END=8 -CONFIG_NR_CPUS_DEFAULT=8 -CONFIG_NR_CPUS=8 -CONFIG_SCHED_SMT=y -CONFIG_SCHED_MC=y -CONFIG_SCHED_MC_PRIO=y -# CONFIG_PREEMPT_NONE is not set -CONFIG_PREEMPT_VOLUNTARY=y -# CONFIG_PREEMPT is not set -CONFIG_X86_LOCAL_APIC=y -CONFIG_X86_IO_APIC=y -CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y -CONFIG_X86_MCE=y -# CONFIG_X86_MCELOG_LEGACY is not set -CONFIG_X86_MCE_INTEL=y -CONFIG_X86_MCE_AMD=y -# CONFIG_X86_ANCIENT_MCE is not set -CONFIG_X86_MCE_THRESHOLD=y -# CONFIG_X86_MCE_INJECT is not set -CONFIG_X86_THERMAL_VECTOR=y - -# -# Performance monitoring -# -CONFIG_PERF_EVENTS_INTEL_UNCORE=y -CONFIG_PERF_EVENTS_INTEL_RAPL=y -CONFIG_PERF_EVENTS_INTEL_CSTATE=y -CONFIG_PERF_EVENTS_AMD_POWER=m -# CONFIG_X86_LEGACY_VM86 is not set -CONFIG_X86_16BIT=y -CONFIG_X86_ESPFIX32=y -# CONFIG_TOSHIBA is not set -CONFIG_I8K=m -CONFIG_X86_REBOOTFIXUPS=y -CONFIG_MICROCODE=y -CONFIG_MICROCODE_INTEL=y -CONFIG_MICROCODE_AMD=y -CONFIG_MICROCODE_OLD_INTERFACE=y -CONFIG_X86_MSR=m -CONFIG_X86_CPUID=m -# CONFIG_NOHIGHMEM is not set -# CONFIG_HIGHMEM4G is not set -CONFIG_HIGHMEM64G=y -CONFIG_VMSPLIT_3G=y -# CONFIG_VMSPLIT_2G is not set -# CONFIG_VMSPLIT_1G is not set -CONFIG_PAGE_OFFSET=0xC0000000 -CONFIG_HIGHMEM=y -CONFIG_X86_PAE=y -CONFIG_ARCH_HAS_MEM_ENCRYPT=y -CONFIG_ARCH_FLATMEM_ENABLE=y -CONFIG_ARCH_SPARSEMEM_ENABLE=y -CONFIG_ARCH_SELECT_MEMORY_MODEL=y -CONFIG_ILLEGAL_POINTER_VALUE=0 -CONFIG_SELECT_MEMORY_MODEL=y -# CONFIG_FLATMEM_MANUAL is not set -CONFIG_SPARSEMEM_MANUAL=y -CONFIG_SPARSEMEM=y -CONFIG_HAVE_MEMORY_PRESENT=y -CONFIG_SPARSEMEM_STATIC=y -CONFIG_HAVE_MEMBLOCK=y -CONFIG_HAVE_MEMBLOCK_NODE_MAP=y -CONFIG_HAVE_GENERIC_GUP=y -CONFIG_ARCH_DISCARD_MEMBLOCK=y -CONFIG_MEMORY_ISOLATION=y -CONFIG_MEMORY_HOTPLUG=y -CONFIG_MEMORY_HOTPLUG_SPARSE=y -# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set -CONFIG_MEMORY_HOTREMOVE=y -CONFIG_SPLIT_PTLOCK_CPUS=4 -CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y -CONFIG_MEMORY_BALLOON=y -CONFIG_BALLOON_COMPACTION=y -CONFIG_COMPACTION=y -CONFIG_MIGRATION=y -CONFIG_PHYS_ADDR_T_64BIT=y -CONFIG_BOUNCE=y -CONFIG_VIRT_TO_BUS=y -CONFIG_MMU_NOTIFIER=y -CONFIG_KSM=y -CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 -CONFIG_TRANSPARENT_HUGEPAGE=y -CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y -# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set -CONFIG_TRANSPARENT_HUGE_PAGECACHE=y -CONFIG_CLEANCACHE=y -CONFIG_FRONTSWAP=y -CONFIG_CMA=y -# CONFIG_CMA_DEBUG is not set -# CONFIG_CMA_DEBUGFS is not set -CONFIG_CMA_AREAS=7 -CONFIG_ZSWAP=y -CONFIG_ZPOOL=y -CONFIG_ZBUD=y -CONFIG_Z3FOLD=m -CONFIG_ZSMALLOC=y -CONFIG_PGTABLE_MAPPING=y -# CONFIG_ZSMALLOC_STAT is not set -CONFIG_GENERIC_EARLY_IOREMAP=y -# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set -CONFIG_IDLE_PAGE_TRACKING=y -CONFIG_FRAME_VECTOR=y -# CONFIG_PERCPU_STATS is not set -# CONFIG_GUP_BENCHMARK is not set -CONFIG_ARCH_HAS_PTE_SPECIAL=y -CONFIG_X86_PMEM_LEGACY_DEVICE=y -CONFIG_X86_PMEM_LEGACY=y -CONFIG_HIGHPTE=y -CONFIG_X86_CHECK_BIOS_CORRUPTION=y -CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y -CONFIG_X86_RESERVE_LOW=64 -# CONFIG_MATH_EMULATION is not set -CONFIG_MTRR=y -CONFIG_MTRR_SANITIZER=y -CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1 -CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 -CONFIG_X86_PAT=y -CONFIG_ARCH_USES_PG_UNCACHED=y -CONFIG_ARCH_RANDOM=y -CONFIG_X86_SMAP=y -CONFIG_X86_INTEL_UMIP=y -CONFIG_EFI=y -CONFIG_EFI_STUB=y -CONFIG_SECCOMP=y -# CONFIG_HZ_100 is not set -CONFIG_HZ_250=y -# CONFIG_HZ_300 is not set -# CONFIG_HZ_1000 is not set -CONFIG_HZ=250 -CONFIG_SCHED_HRTICK=y -CONFIG_KEXEC=y -CONFIG_CRASH_DUMP=y -CONFIG_KEXEC_JUMP=y -CONFIG_PHYSICAL_START=0x1000000 -CONFIG_RELOCATABLE=y -CONFIG_RANDOMIZE_BASE=y -CONFIG_X86_NEED_RELOCS=y -CONFIG_PHYSICAL_ALIGN=0x1000000 -CONFIG_HOTPLUG_CPU=y -# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set -# CONFIG_DEBUG_HOTPLUG_CPU0 is not set -# CONFIG_COMPAT_VDSO is not set -# CONFIG_CMDLINE_BOOL is not set -CONFIG_MODIFY_LDT_SYSCALL=y -CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y -CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y - -# -# Power management and ACPI options -# -CONFIG_SUSPEND=y -CONFIG_SUSPEND_FREEZER=y -# CONFIG_SUSPEND_SKIP_SYNC is not set -CONFIG_HIBERNATE_CALLBACKS=y -CONFIG_HIBERNATION=y -CONFIG_PM_STD_PARTITION="" -CONFIG_PM_SLEEP=y -CONFIG_PM_SLEEP_SMP=y -# CONFIG_PM_AUTOSLEEP is not set -CONFIG_PM_WAKELOCKS=y -CONFIG_PM_WAKELOCKS_LIMIT=100 -CONFIG_PM_WAKELOCKS_GC=y -CONFIG_PM=y -CONFIG_PM_DEBUG=y -CONFIG_PM_ADVANCED_DEBUG=y -# CONFIG_PM_TEST_SUSPEND is not set -CONFIG_PM_SLEEP_DEBUG=y -# CONFIG_DPM_WATCHDOG is not set -CONFIG_PM_TRACE=y -CONFIG_PM_TRACE_RTC=y -CONFIG_PM_CLK=y -CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y -CONFIG_ACPI=y -CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y -CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y -CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y -# CONFIG_ACPI_DEBUGGER is not set -CONFIG_ACPI_SPCR_TABLE=y -CONFIG_ACPI_SLEEP=y -# CONFIG_ACPI_PROCFS_POWER is not set -CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y -CONFIG_ACPI_EC_DEBUGFS=m -CONFIG_ACPI_AC=y -CONFIG_ACPI_BATTERY=y -CONFIG_ACPI_BUTTON=y -CONFIG_ACPI_VIDEO=m -CONFIG_ACPI_FAN=y -CONFIG_ACPI_TAD=m -CONFIG_ACPI_DOCK=y -CONFIG_ACPI_CPU_FREQ_PSS=y -CONFIG_ACPI_PROCESSOR_CSTATE=y -CONFIG_ACPI_PROCESSOR_IDLE=y -CONFIG_ACPI_PROCESSOR=y -CONFIG_ACPI_IPMI=m -CONFIG_ACPI_HOTPLUG_CPU=y -CONFIG_ACPI_PROCESSOR_AGGREGATOR=m -CONFIG_ACPI_THERMAL=y -CONFIG_ACPI_CUSTOM_DSDT_FILE="" -CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y -CONFIG_ACPI_TABLE_UPGRADE=y -# CONFIG_ACPI_DEBUG is not set -CONFIG_ACPI_PCI_SLOT=y -CONFIG_ACPI_CONTAINER=y -CONFIG_ACPI_HOTPLUG_MEMORY=y -CONFIG_ACPI_HOTPLUG_IOAPIC=y -CONFIG_ACPI_SBS=m -CONFIG_ACPI_HED=y -# CONFIG_ACPI_CUSTOM_METHOD is not set -CONFIG_ACPI_BGRT=y -# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set -CONFIG_HAVE_ACPI_APEI=y -CONFIG_HAVE_ACPI_APEI_NMI=y -CONFIG_ACPI_APEI=y -CONFIG_ACPI_APEI_GHES=y -CONFIG_ACPI_APEI_PCIEAER=y -CONFIG_ACPI_APEI_EINJ=m -# CONFIG_ACPI_APEI_ERST_DEBUG is not set -CONFIG_DPTF_POWER=m -CONFIG_ACPI_WATCHDOG=y -CONFIG_ACPI_EXTLOG=m -# CONFIG_PMIC_OPREGION is not set -CONFIG_ACPI_CONFIGFS=m -CONFIG_X86_PM_TIMER=y -CONFIG_SFI=y -CONFIG_X86_APM_BOOT=y -CONFIG_APM=m -# CONFIG_APM_IGNORE_USER_SUSPEND is not set -# CONFIG_APM_DO_ENABLE is not set -# CONFIG_APM_CPU_IDLE is not set -# CONFIG_APM_DISPLAY_BLANK is not set -# CONFIG_APM_ALLOW_INTS is not set - -# -# CPU Frequency scaling -# -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_GOV_ATTR_SET=y -CONFIG_CPU_FREQ_GOV_COMMON=y -CONFIG_CPU_FREQ_STAT=y -CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y -# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set -CONFIG_CPU_FREQ_GOV_PERFORMANCE=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=y -CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_GOV_ONDEMAND=y -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y -CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y - -# -# CPU frequency scaling drivers -# -CONFIG_X86_INTEL_PSTATE=y -CONFIG_X86_PCC_CPUFREQ=y -CONFIG_X86_ACPI_CPUFREQ=y -CONFIG_X86_ACPI_CPUFREQ_CPB=y -CONFIG_X86_SFI_CPUFREQ=m -CONFIG_X86_POWERNOW_K6=m -CONFIG_X86_POWERNOW_K7=m -CONFIG_X86_POWERNOW_K7_ACPI=y -CONFIG_X86_POWERNOW_K8=y -CONFIG_X86_AMD_FREQ_SENSITIVITY=m -CONFIG_X86_GX_SUSPMOD=m -CONFIG_X86_SPEEDSTEP_CENTRINO=y -CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y -CONFIG_X86_SPEEDSTEP_ICH=y -CONFIG_X86_SPEEDSTEP_SMI=y -CONFIG_X86_P4_CLOCKMOD=m -CONFIG_X86_CPUFREQ_NFORCE2=y -CONFIG_X86_LONGRUN=m -CONFIG_X86_LONGHAUL=m -# CONFIG_X86_E_POWERSAVER is not set - -# -# shared options -# -CONFIG_X86_SPEEDSTEP_LIB=y -CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y - -# -# CPU Idle -# -CONFIG_CPU_IDLE=y -CONFIG_CPU_IDLE_GOV_LADDER=y -CONFIG_CPU_IDLE_GOV_MENU=y -CONFIG_INTEL_IDLE=y - -# -# Bus options (PCI etc.) -# -CONFIG_PCI=y -# CONFIG_PCI_GOBIOS is not set -# CONFIG_PCI_GOMMCONFIG is not set -# CONFIG_PCI_GODIRECT is not set -CONFIG_PCI_GOANY=y -CONFIG_PCI_BIOS=y -CONFIG_PCI_DIRECT=y -CONFIG_PCI_MMCONFIG=y -CONFIG_PCI_XEN=y -CONFIG_PCI_DOMAINS=y -# CONFIG_PCI_CNB20LE_QUIRK is not set -CONFIG_PCIEPORTBUS=y -CONFIG_HOTPLUG_PCI_PCIE=y -CONFIG_PCIEAER=y -# CONFIG_PCIEAER_INJECT is not set -# CONFIG_PCIE_ECRC is not set -CONFIG_PCIEASPM=y -CONFIG_PCIEASPM_DEBUG=y -CONFIG_PCIEASPM_DEFAULT=y -# CONFIG_PCIEASPM_POWERSAVE is not set -# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set -# CONFIG_PCIEASPM_PERFORMANCE is not set -CONFIG_PCIE_PME=y -CONFIG_PCIE_DPC=y -CONFIG_PCIE_PTM=y -CONFIG_PCI_MSI=y -CONFIG_PCI_MSI_IRQ_DOMAIN=y -CONFIG_PCI_QUIRKS=y -# CONFIG_PCI_DEBUG is not set -CONFIG_PCI_REALLOC_ENABLE_AUTO=y -CONFIG_PCI_STUB=m -# CONFIG_PCI_PF_STUB is not set -CONFIG_XEN_PCIDEV_FRONTEND=m -CONFIG_PCI_ATS=y -CONFIG_PCI_LOCKLESS_CONFIG=y -CONFIG_PCI_IOV=y -CONFIG_PCI_PRI=y -CONFIG_PCI_PASID=y -CONFIG_PCI_LABEL=y -CONFIG_HOTPLUG_PCI=y -CONFIG_HOTPLUG_PCI_COMPAQ=m -CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM=y -CONFIG_HOTPLUG_PCI_IBM=m -CONFIG_HOTPLUG_PCI_ACPI=y -CONFIG_HOTPLUG_PCI_ACPI_IBM=m -CONFIG_HOTPLUG_PCI_CPCI=y -CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m -CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m -CONFIG_HOTPLUG_PCI_SHPC=y - -# -# PCI controller drivers -# - -# -# Cadence PCIe controllers support -# - -# -# DesignWare PCI Core Support -# -# CONFIG_PCIE_DW_PLAT_HOST is not set - -# -# PCI Endpoint -# -# CONFIG_PCI_ENDPOINT is not set - -# -# PCI switch controller drivers -# -CONFIG_PCI_SW_SWITCHTEC=m -# CONFIG_ISA_BUS is not set -CONFIG_ISA_DMA_API=y -CONFIG_ISA=y -CONFIG_EISA=y -CONFIG_EISA_VLB_PRIMING=y -CONFIG_EISA_PCI_EISA=y -CONFIG_EISA_VIRTUAL_ROOT=y -CONFIG_EISA_NAMES=y -CONFIG_SCx200=m -CONFIG_SCx200HR_TIMER=m -CONFIG_ALIX=y -CONFIG_NET5501=y -CONFIG_GEOS=y -CONFIG_AMD_NB=y -CONFIG_PCCARD=m -CONFIG_PCMCIA=m -CONFIG_PCMCIA_LOAD_CIS=y -CONFIG_CARDBUS=y - -# -# PC-card bridges -# -CONFIG_YENTA=m -CONFIG_YENTA_O2=y -CONFIG_YENTA_RICOH=y -CONFIG_YENTA_TI=y -CONFIG_YENTA_ENE_TUNE=y -CONFIG_YENTA_TOSHIBA=y -CONFIG_PD6729=m -CONFIG_I82092=m -CONFIG_I82365=m -CONFIG_TCIC=m -CONFIG_PCMCIA_PROBE=y -CONFIG_PCCARD_NONSTATIC=y -CONFIG_RAPIDIO=y -CONFIG_RAPIDIO_TSI721=m -CONFIG_RAPIDIO_DISC_TIMEOUT=30 -# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set -CONFIG_RAPIDIO_DMA_ENGINE=y -# CONFIG_RAPIDIO_DEBUG is not set -CONFIG_RAPIDIO_ENUM_BASIC=m -CONFIG_RAPIDIO_CHMAN=m -CONFIG_RAPIDIO_MPORT_CDEV=m - -# -# RapidIO Switch drivers -# -CONFIG_RAPIDIO_TSI57X=m -CONFIG_RAPIDIO_CPS_XX=m -CONFIG_RAPIDIO_TSI568=m -CONFIG_RAPIDIO_CPS_GEN2=m -CONFIG_RAPIDIO_RXS_GEN3=m -# CONFIG_X86_SYSFB is not set - -# -# Executable file formats / Emulations -# -CONFIG_BINFMT_ELF=y -CONFIG_ELFCORE=y -CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y -CONFIG_BINFMT_SCRIPT=y -CONFIG_HAVE_AOUT=y -CONFIG_BINFMT_AOUT=m -CONFIG_BINFMT_MISC=m -CONFIG_COREDUMP=y -CONFIG_COMPAT_32=y -CONFIG_HAVE_ATOMIC_IOMAP=y -CONFIG_NET=y -CONFIG_NET_INGRESS=y -CONFIG_NET_EGRESS=y - -# -# Networking options -# -CONFIG_PACKET=y -CONFIG_PACKET_DIAG=m -CONFIG_UNIX=y -CONFIG_UNIX_DIAG=m -CONFIG_TLS=m -# CONFIG_TLS_DEVICE is not set -CONFIG_XFRM=y -CONFIG_XFRM_OFFLOAD=y -CONFIG_XFRM_ALGO=m -CONFIG_XFRM_USER=m -# CONFIG_XFRM_SUB_POLICY is not set -# CONFIG_XFRM_MIGRATE is not set -CONFIG_XFRM_STATISTICS=y -CONFIG_XFRM_IPCOMP=m -CONFIG_NET_KEY=m -# CONFIG_NET_KEY_MIGRATE is not set -# CONFIG_SMC is not set -# CONFIG_XDP_SOCKETS is not set -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_FIB_TRIE_STATS=y -CONFIG_IP_MULTIPLE_TABLES=y -CONFIG_IP_ROUTE_MULTIPATH=y -CONFIG_IP_ROUTE_VERBOSE=y -CONFIG_IP_ROUTE_CLASSID=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -# CONFIG_IP_PNP_BOOTP is not set -# CONFIG_IP_PNP_RARP is not set -CONFIG_NET_IPIP=m -CONFIG_NET_IPGRE_DEMUX=m -CONFIG_NET_IP_TUNNEL=m -CONFIG_NET_IPGRE=m -CONFIG_NET_IPGRE_BROADCAST=y -CONFIG_IP_MROUTE_COMMON=y -CONFIG_IP_MROUTE=y -# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set -CONFIG_IP_PIMSM_V1=y -CONFIG_IP_PIMSM_V2=y -CONFIG_SYN_COOKIES=y -CONFIG_NET_IPVTI=m -CONFIG_NET_UDP_TUNNEL=m -CONFIG_NET_FOU=m -CONFIG_NET_FOU_IP_TUNNELS=y -CONFIG_INET_AH=m -CONFIG_INET_ESP=m -CONFIG_INET_ESP_OFFLOAD=m -CONFIG_INET_IPCOMP=m -CONFIG_INET_XFRM_TUNNEL=m -CONFIG_INET_TUNNEL=m -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m -CONFIG_INET_XFRM_MODE_BEET=m -CONFIG_INET_DIAG=m -CONFIG_INET_TCP_DIAG=m -CONFIG_INET_UDP_DIAG=m -CONFIG_INET_RAW_DIAG=m -# CONFIG_INET_DIAG_DESTROY is not set -CONFIG_TCP_CONG_ADVANCED=y -CONFIG_TCP_CONG_BIC=m -CONFIG_TCP_CONG_CUBIC=y -CONFIG_TCP_CONG_WESTWOOD=m -CONFIG_TCP_CONG_HTCP=m -CONFIG_TCP_CONG_HSTCP=m -CONFIG_TCP_CONG_HYBLA=m -CONFIG_TCP_CONG_VEGAS=m -CONFIG_TCP_CONG_NV=m -CONFIG_TCP_CONG_SCALABLE=m -CONFIG_TCP_CONG_LP=m -CONFIG_TCP_CONG_VENO=m -CONFIG_TCP_CONG_YEAH=m -CONFIG_TCP_CONG_ILLINOIS=m -CONFIG_TCP_CONG_DCTCP=m -CONFIG_TCP_CONG_CDG=m -CONFIG_TCP_CONG_BBR=m -CONFIG_DEFAULT_CUBIC=y -# CONFIG_DEFAULT_RENO is not set -CONFIG_DEFAULT_TCP_CONG="cubic" -CONFIG_TCP_MD5SIG=y -CONFIG_IPV6=y -CONFIG_IPV6_ROUTER_PREF=y -CONFIG_IPV6_ROUTE_INFO=y -# CONFIG_IPV6_OPTIMISTIC_DAD is not set -CONFIG_INET6_AH=m -CONFIG_INET6_ESP=m -CONFIG_INET6_ESP_OFFLOAD=m -CONFIG_INET6_IPCOMP=m -CONFIG_IPV6_MIP6=m -CONFIG_IPV6_ILA=m -CONFIG_INET6_XFRM_TUNNEL=m -CONFIG_INET6_TUNNEL=m -CONFIG_INET6_XFRM_MODE_TRANSPORT=m -CONFIG_INET6_XFRM_MODE_TUNNEL=m -CONFIG_INET6_XFRM_MODE_BEET=m -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m -CONFIG_IPV6_VTI=m -CONFIG_IPV6_SIT=m -CONFIG_IPV6_SIT_6RD=y -CONFIG_IPV6_NDISC_NODETYPE=y -CONFIG_IPV6_TUNNEL=m -CONFIG_IPV6_GRE=m -CONFIG_IPV6_FOU=m -CONFIG_IPV6_FOU_TUNNEL=m -CONFIG_IPV6_MULTIPLE_TABLES=y -CONFIG_IPV6_SUBTREES=y -CONFIG_IPV6_MROUTE=y -CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y -CONFIG_IPV6_PIMSM_V2=y -# CONFIG_IPV6_SEG6_LWTUNNEL is not set -# CONFIG_IPV6_SEG6_HMAC is not set -CONFIG_NETLABEL=y -CONFIG_NETWORK_SECMARK=y -CONFIG_NET_PTP_CLASSIFY=y -# CONFIG_NETWORK_PHY_TIMESTAMPING is not set -CONFIG_NETFILTER=y -CONFIG_NETFILTER_ADVANCED=y -CONFIG_BRIDGE_NETFILTER=m - -# -# Core Netfilter Configuration -# -CONFIG_NETFILTER_INGRESS=y -CONFIG_NETFILTER_NETLINK=m -CONFIG_NETFILTER_FAMILY_BRIDGE=y -CONFIG_NETFILTER_FAMILY_ARP=y -CONFIG_NETFILTER_NETLINK_ACCT=m -CONFIG_NETFILTER_NETLINK_QUEUE=m -CONFIG_NETFILTER_NETLINK_LOG=m -CONFIG_NF_CONNTRACK=m -CONFIG_NF_LOG_COMMON=m -CONFIG_NF_LOG_NETDEV=m -CONFIG_NETFILTER_CONNCOUNT=m -CONFIG_NF_CONNTRACK_MARK=y -CONFIG_NF_CONNTRACK_SECMARK=y -CONFIG_NF_CONNTRACK_ZONES=y -# CONFIG_NF_CONNTRACK_PROCFS is not set -CONFIG_NF_CONNTRACK_EVENTS=y -CONFIG_NF_CONNTRACK_TIMEOUT=y -CONFIG_NF_CONNTRACK_TIMESTAMP=y -CONFIG_NF_CONNTRACK_LABELS=y -CONFIG_NF_CT_PROTO_DCCP=y -CONFIG_NF_CT_PROTO_GRE=m -CONFIG_NF_CT_PROTO_SCTP=y -CONFIG_NF_CT_PROTO_UDPLITE=y -CONFIG_NF_CONNTRACK_AMANDA=m -CONFIG_NF_CONNTRACK_FTP=m -CONFIG_NF_CONNTRACK_H323=m -CONFIG_NF_CONNTRACK_IRC=m -CONFIG_NF_CONNTRACK_BROADCAST=m -CONFIG_NF_CONNTRACK_NETBIOS_NS=m -CONFIG_NF_CONNTRACK_SNMP=m -CONFIG_NF_CONNTRACK_PPTP=m -CONFIG_NF_CONNTRACK_SANE=m -CONFIG_NF_CONNTRACK_SIP=m -CONFIG_NF_CONNTRACK_TFTP=m -CONFIG_NF_CT_NETLINK=m -CONFIG_NF_CT_NETLINK_TIMEOUT=m -CONFIG_NF_CT_NETLINK_HELPER=m -CONFIG_NETFILTER_NETLINK_GLUE_CT=y -CONFIG_NF_NAT=m -CONFIG_NF_NAT_NEEDED=y -CONFIG_NF_NAT_PROTO_DCCP=y -CONFIG_NF_NAT_PROTO_UDPLITE=y -CONFIG_NF_NAT_PROTO_SCTP=y -CONFIG_NF_NAT_AMANDA=m -CONFIG_NF_NAT_FTP=m -CONFIG_NF_NAT_IRC=m -CONFIG_NF_NAT_SIP=m -CONFIG_NF_NAT_TFTP=m -CONFIG_NF_NAT_REDIRECT=y -CONFIG_NETFILTER_SYNPROXY=m -CONFIG_NF_OSF=m -CONFIG_NF_TABLES=m -CONFIG_NF_TABLES_SET=m -# CONFIG_NF_TABLES_INET is not set -# CONFIG_NF_TABLES_NETDEV is not set -CONFIG_NFT_NUMGEN=m -CONFIG_NFT_CT=m -CONFIG_NFT_FLOW_OFFLOAD=m -CONFIG_NFT_COUNTER=m -CONFIG_NFT_CONNLIMIT=m -CONFIG_NFT_LOG=m -CONFIG_NFT_LIMIT=m -CONFIG_NFT_MASQ=m -CONFIG_NFT_REDIR=m -CONFIG_NFT_NAT=m -CONFIG_NFT_OBJREF=m -CONFIG_NFT_QUEUE=m -CONFIG_NFT_QUOTA=m -CONFIG_NFT_REJECT=m -CONFIG_NFT_COMPAT=m -CONFIG_NFT_HASH=m -CONFIG_NFT_SOCKET=m -CONFIG_NF_FLOW_TABLE_INET=m -CONFIG_NF_FLOW_TABLE=m -CONFIG_NETFILTER_XTABLES=m - -# -# Xtables combined modules -# -CONFIG_NETFILTER_XT_MARK=m -CONFIG_NETFILTER_XT_CONNMARK=m -CONFIG_NETFILTER_XT_SET=m - -# -# Xtables targets -# -CONFIG_NETFILTER_XT_TARGET_AUDIT=m -CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m -CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m -CONFIG_NETFILTER_XT_TARGET_CONNMARK=m -CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m -CONFIG_NETFILTER_XT_TARGET_CT=m -CONFIG_NETFILTER_XT_TARGET_DSCP=m -CONFIG_NETFILTER_XT_TARGET_HL=m -CONFIG_NETFILTER_XT_TARGET_HMARK=m -CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m -CONFIG_NETFILTER_XT_TARGET_LED=m -CONFIG_NETFILTER_XT_TARGET_LOG=m -CONFIG_NETFILTER_XT_TARGET_MARK=m -CONFIG_NETFILTER_XT_NAT=m -CONFIG_NETFILTER_XT_TARGET_NETMAP=m -CONFIG_NETFILTER_XT_TARGET_NFLOG=m -CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m -# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set -CONFIG_NETFILTER_XT_TARGET_RATEEST=m -CONFIG_NETFILTER_XT_TARGET_REDIRECT=m -CONFIG_NETFILTER_XT_TARGET_TEE=m -CONFIG_NETFILTER_XT_TARGET_TPROXY=m -CONFIG_NETFILTER_XT_TARGET_TRACE=m -CONFIG_NETFILTER_XT_TARGET_SECMARK=m -CONFIG_NETFILTER_XT_TARGET_TCPMSS=m -CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m - -# -# Xtables matches -# -CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m -CONFIG_NETFILTER_XT_MATCH_BPF=m -CONFIG_NETFILTER_XT_MATCH_CGROUP=m -CONFIG_NETFILTER_XT_MATCH_CLUSTER=m -CONFIG_NETFILTER_XT_MATCH_COMMENT=m -CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m -CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m -CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m -CONFIG_NETFILTER_XT_MATCH_CONNMARK=m -CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m -CONFIG_NETFILTER_XT_MATCH_CPU=m -CONFIG_NETFILTER_XT_MATCH_DCCP=m -CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m -CONFIG_NETFILTER_XT_MATCH_DSCP=m -CONFIG_NETFILTER_XT_MATCH_ECN=m -CONFIG_NETFILTER_XT_MATCH_ESP=m -CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m -CONFIG_NETFILTER_XT_MATCH_HELPER=m -CONFIG_NETFILTER_XT_MATCH_HL=m -CONFIG_NETFILTER_XT_MATCH_IPCOMP=m -CONFIG_NETFILTER_XT_MATCH_IPRANGE=m -CONFIG_NETFILTER_XT_MATCH_IPVS=m -CONFIG_NETFILTER_XT_MATCH_L2TP=m -CONFIG_NETFILTER_XT_MATCH_LENGTH=m -CONFIG_NETFILTER_XT_MATCH_LIMIT=m -CONFIG_NETFILTER_XT_MATCH_MAC=m -CONFIG_NETFILTER_XT_MATCH_MARK=m -CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m -CONFIG_NETFILTER_XT_MATCH_NFACCT=m -CONFIG_NETFILTER_XT_MATCH_OSF=m -CONFIG_NETFILTER_XT_MATCH_OWNER=m -CONFIG_NETFILTER_XT_MATCH_POLICY=m -CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m -CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m -CONFIG_NETFILTER_XT_MATCH_QUOTA=m -CONFIG_NETFILTER_XT_MATCH_RATEEST=m -CONFIG_NETFILTER_XT_MATCH_REALM=m -CONFIG_NETFILTER_XT_MATCH_RECENT=m -CONFIG_NETFILTER_XT_MATCH_SCTP=m -CONFIG_NETFILTER_XT_MATCH_SOCKET=m -CONFIG_NETFILTER_XT_MATCH_STATE=m -CONFIG_NETFILTER_XT_MATCH_STATISTIC=m -CONFIG_NETFILTER_XT_MATCH_STRING=m -CONFIG_NETFILTER_XT_MATCH_TCPMSS=m -CONFIG_NETFILTER_XT_MATCH_TIME=m -CONFIG_NETFILTER_XT_MATCH_U32=m -CONFIG_IP_SET=m -CONFIG_IP_SET_MAX=256 -CONFIG_IP_SET_BITMAP_IP=m -CONFIG_IP_SET_BITMAP_IPMAC=m -CONFIG_IP_SET_BITMAP_PORT=m -CONFIG_IP_SET_HASH_IP=m -CONFIG_IP_SET_HASH_IPMARK=m -CONFIG_IP_SET_HASH_IPPORT=m -CONFIG_IP_SET_HASH_IPPORTIP=m -CONFIG_IP_SET_HASH_IPPORTNET=m -CONFIG_IP_SET_HASH_IPMAC=m -CONFIG_IP_SET_HASH_MAC=m -CONFIG_IP_SET_HASH_NETPORTNET=m -CONFIG_IP_SET_HASH_NET=m -CONFIG_IP_SET_HASH_NETNET=m -CONFIG_IP_SET_HASH_NETPORT=m -CONFIG_IP_SET_HASH_NETIFACE=m -CONFIG_IP_SET_LIST_SET=m -CONFIG_IP_VS=m -CONFIG_IP_VS_IPV6=y -# CONFIG_IP_VS_DEBUG is not set -CONFIG_IP_VS_TAB_BITS=12 - -# -# IPVS transport protocol load balancing support -# -CONFIG_IP_VS_PROTO_TCP=y -CONFIG_IP_VS_PROTO_UDP=y -CONFIG_IP_VS_PROTO_AH_ESP=y -CONFIG_IP_VS_PROTO_ESP=y -CONFIG_IP_VS_PROTO_AH=y -CONFIG_IP_VS_PROTO_SCTP=y - -# -# IPVS scheduler -# -CONFIG_IP_VS_RR=m -CONFIG_IP_VS_WRR=m -CONFIG_IP_VS_LC=m -CONFIG_IP_VS_WLC=m -CONFIG_IP_VS_FO=m -CONFIG_IP_VS_OVF=m -CONFIG_IP_VS_LBLC=m -CONFIG_IP_VS_LBLCR=m -CONFIG_IP_VS_DH=m -CONFIG_IP_VS_SH=m -CONFIG_IP_VS_MH=m -CONFIG_IP_VS_SED=m -CONFIG_IP_VS_NQ=m - -# -# IPVS SH scheduler -# -CONFIG_IP_VS_SH_TAB_BITS=8 - -# -# IPVS MH scheduler -# -CONFIG_IP_VS_MH_TAB_INDEX=12 - -# -# IPVS application helper -# -CONFIG_IP_VS_FTP=m -CONFIG_IP_VS_NFCT=y -CONFIG_IP_VS_PE_SIP=m - -# -# IP: Netfilter Configuration -# -CONFIG_NF_DEFRAG_IPV4=m -CONFIG_NF_CONNTRACK_IPV4=m -CONFIG_NF_SOCKET_IPV4=m -CONFIG_NF_TPROXY_IPV4=m -# CONFIG_NF_TABLES_IPV4 is not set -# CONFIG_NF_TABLES_ARP is not set -CONFIG_NF_FLOW_TABLE_IPV4=m -CONFIG_NF_DUP_IPV4=m -CONFIG_NF_LOG_ARP=m -CONFIG_NF_LOG_IPV4=m -CONFIG_NF_REJECT_IPV4=m -CONFIG_NF_NAT_IPV4=m -CONFIG_NF_NAT_MASQUERADE_IPV4=y -CONFIG_NF_NAT_SNMP_BASIC=m -CONFIG_NF_NAT_PROTO_GRE=m -CONFIG_NF_NAT_PPTP=m -CONFIG_NF_NAT_H323=m -CONFIG_IP_NF_IPTABLES=m -CONFIG_IP_NF_MATCH_AH=m -CONFIG_IP_NF_MATCH_ECN=m -CONFIG_IP_NF_MATCH_RPFILTER=m -CONFIG_IP_NF_MATCH_TTL=m -CONFIG_IP_NF_FILTER=m -CONFIG_IP_NF_TARGET_REJECT=m -CONFIG_IP_NF_TARGET_SYNPROXY=m -CONFIG_IP_NF_NAT=m -CONFIG_IP_NF_TARGET_MASQUERADE=m -CONFIG_IP_NF_TARGET_NETMAP=m -CONFIG_IP_NF_TARGET_REDIRECT=m -CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_TARGET_CLUSTERIP=m -CONFIG_IP_NF_TARGET_ECN=m -CONFIG_IP_NF_TARGET_TTL=m -CONFIG_IP_NF_RAW=m -CONFIG_IP_NF_SECURITY=m -CONFIG_IP_NF_ARPTABLES=m -CONFIG_IP_NF_ARPFILTER=m -CONFIG_IP_NF_ARP_MANGLE=m - -# -# IPv6: Netfilter Configuration -# -CONFIG_NF_DEFRAG_IPV6=m -CONFIG_NF_CONNTRACK_IPV6=m -CONFIG_NF_SOCKET_IPV6=m -CONFIG_NF_TPROXY_IPV6=m -# CONFIG_NF_TABLES_IPV6 is not set -CONFIG_NF_FLOW_TABLE_IPV6=m -CONFIG_NF_DUP_IPV6=m -CONFIG_NF_REJECT_IPV6=m -CONFIG_NF_LOG_IPV6=m -CONFIG_NF_NAT_IPV6=m -CONFIG_NF_NAT_MASQUERADE_IPV6=y -CONFIG_IP6_NF_IPTABLES=m -CONFIG_IP6_NF_MATCH_AH=m -CONFIG_IP6_NF_MATCH_EUI64=m -CONFIG_IP6_NF_MATCH_FRAG=m -CONFIG_IP6_NF_MATCH_OPTS=m -CONFIG_IP6_NF_MATCH_HL=m -CONFIG_IP6_NF_MATCH_IPV6HEADER=m -CONFIG_IP6_NF_MATCH_MH=m -CONFIG_IP6_NF_MATCH_RPFILTER=m -CONFIG_IP6_NF_MATCH_RT=m -CONFIG_IP6_NF_MATCH_SRH=m -CONFIG_IP6_NF_TARGET_HL=m -CONFIG_IP6_NF_FILTER=m -CONFIG_IP6_NF_TARGET_REJECT=m -CONFIG_IP6_NF_TARGET_SYNPROXY=m -CONFIG_IP6_NF_MANGLE=m -CONFIG_IP6_NF_RAW=m -CONFIG_IP6_NF_SECURITY=m -CONFIG_IP6_NF_NAT=m -CONFIG_IP6_NF_TARGET_MASQUERADE=m -CONFIG_IP6_NF_TARGET_NPT=m - -# -# DECnet: Netfilter Configuration -# -CONFIG_DECNET_NF_GRABULATOR=m -# CONFIG_NF_TABLES_BRIDGE is not set -CONFIG_BRIDGE_NF_EBTABLES=m -CONFIG_BRIDGE_EBT_BROUTE=m -CONFIG_BRIDGE_EBT_T_FILTER=m -CONFIG_BRIDGE_EBT_T_NAT=m -CONFIG_BRIDGE_EBT_802_3=m -CONFIG_BRIDGE_EBT_AMONG=m -CONFIG_BRIDGE_EBT_ARP=m -CONFIG_BRIDGE_EBT_IP=m -CONFIG_BRIDGE_EBT_IP6=m -CONFIG_BRIDGE_EBT_LIMIT=m -CONFIG_BRIDGE_EBT_MARK=m -CONFIG_BRIDGE_EBT_PKTTYPE=m -CONFIG_BRIDGE_EBT_STP=m -CONFIG_BRIDGE_EBT_VLAN=m -CONFIG_BRIDGE_EBT_ARPREPLY=m -CONFIG_BRIDGE_EBT_DNAT=m -CONFIG_BRIDGE_EBT_MARK_T=m -CONFIG_BRIDGE_EBT_REDIRECT=m -CONFIG_BRIDGE_EBT_SNAT=m -CONFIG_BRIDGE_EBT_LOG=m -CONFIG_BRIDGE_EBT_NFLOG=m -# CONFIG_BPFILTER is not set -CONFIG_IP_DCCP=m -CONFIG_INET_DCCP_DIAG=m - -# -# DCCP CCIDs Configuration -# -# CONFIG_IP_DCCP_CCID2_DEBUG is not set -# CONFIG_IP_DCCP_CCID3 is not set - -# -# DCCP Kernel Hacking -# -# CONFIG_IP_DCCP_DEBUG is not set -CONFIG_IP_SCTP=m -# CONFIG_SCTP_DBG_OBJCNT is not set -# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set -CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y -# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set -CONFIG_SCTP_COOKIE_HMAC_MD5=y -CONFIG_SCTP_COOKIE_HMAC_SHA1=y -CONFIG_INET_SCTP_DIAG=m -CONFIG_RDS=m -CONFIG_RDS_RDMA=m -CONFIG_RDS_TCP=m -# CONFIG_RDS_DEBUG is not set -CONFIG_TIPC=m -CONFIG_TIPC_MEDIA_IB=y -CONFIG_TIPC_MEDIA_UDP=y -CONFIG_TIPC_DIAG=m -CONFIG_ATM=m -CONFIG_ATM_CLIP=m -# CONFIG_ATM_CLIP_NO_ICMP is not set -CONFIG_ATM_LANE=m -CONFIG_ATM_MPOA=m -CONFIG_ATM_BR2684=m -# CONFIG_ATM_BR2684_IPFILTER is not set -CONFIG_L2TP=m -CONFIG_L2TP_DEBUGFS=m -CONFIG_L2TP_V3=y -CONFIG_L2TP_IP=m -CONFIG_L2TP_ETH=m -CONFIG_STP=m -CONFIG_GARP=m -CONFIG_MRP=m -CONFIG_BRIDGE=m -CONFIG_BRIDGE_IGMP_SNOOPING=y -CONFIG_BRIDGE_VLAN_FILTERING=y -CONFIG_HAVE_NET_DSA=y -CONFIG_NET_DSA=m -CONFIG_NET_DSA_LEGACY=y -CONFIG_NET_DSA_TAG_BRCM=y -CONFIG_NET_DSA_TAG_BRCM_PREPEND=y -CONFIG_NET_DSA_TAG_DSA=y -CONFIG_NET_DSA_TAG_EDSA=y -CONFIG_NET_DSA_TAG_KSZ=y -CONFIG_NET_DSA_TAG_LAN9303=y -CONFIG_NET_DSA_TAG_MTK=y -CONFIG_NET_DSA_TAG_TRAILER=y -CONFIG_NET_DSA_TAG_QCA=y -CONFIG_VLAN_8021Q=m -CONFIG_VLAN_8021Q_GVRP=y -CONFIG_VLAN_8021Q_MVRP=y -CONFIG_DECNET=m -# CONFIG_DECNET_ROUTER is not set -CONFIG_LLC=m -CONFIG_LLC2=m -CONFIG_ATALK=m -CONFIG_DEV_APPLETALK=m -CONFIG_LTPC=m -CONFIG_COPS=m -CONFIG_COPS_DAYNA=y -CONFIG_COPS_TANGENT=y -CONFIG_IPDDP=m -CONFIG_IPDDP_ENCAP=y -CONFIG_X25=m -CONFIG_LAPB=m -CONFIG_PHONET=m -CONFIG_6LOWPAN=m -# CONFIG_6LOWPAN_DEBUGFS is not set -CONFIG_6LOWPAN_NHC=m -CONFIG_6LOWPAN_NHC_DEST=m -CONFIG_6LOWPAN_NHC_FRAGMENT=m -CONFIG_6LOWPAN_NHC_HOP=m -CONFIG_6LOWPAN_NHC_IPV6=m -CONFIG_6LOWPAN_NHC_MOBILITY=m -CONFIG_6LOWPAN_NHC_ROUTING=m -CONFIG_6LOWPAN_NHC_UDP=m -CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m -CONFIG_6LOWPAN_GHC_UDP=m -CONFIG_6LOWPAN_GHC_ICMPV6=m -CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m -CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m -CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m -CONFIG_IEEE802154=m -CONFIG_IEEE802154_NL802154_EXPERIMENTAL=y -CONFIG_IEEE802154_SOCKET=m -CONFIG_IEEE802154_6LOWPAN=m -CONFIG_MAC802154=m -CONFIG_NET_SCHED=y - -# -# Queueing/Scheduling -# -CONFIG_NET_SCH_CBQ=m -CONFIG_NET_SCH_HTB=m -CONFIG_NET_SCH_HFSC=m -CONFIG_NET_SCH_ATM=m -CONFIG_NET_SCH_PRIO=m -CONFIG_NET_SCH_MULTIQ=m -CONFIG_NET_SCH_RED=m -CONFIG_NET_SCH_SFB=m -CONFIG_NET_SCH_SFQ=m -CONFIG_NET_SCH_TEQL=m -CONFIG_NET_SCH_TBF=m -CONFIG_NET_SCH_CBS=m -CONFIG_NET_SCH_GRED=m -CONFIG_NET_SCH_DSMARK=m -CONFIG_NET_SCH_NETEM=m -CONFIG_NET_SCH_DRR=m -CONFIG_NET_SCH_MQPRIO=m -CONFIG_NET_SCH_CHOKE=m -CONFIG_NET_SCH_QFQ=m -CONFIG_NET_SCH_CODEL=m -CONFIG_NET_SCH_FQ_CODEL=m -CONFIG_NET_SCH_FQ=m -CONFIG_NET_SCH_HHF=m -CONFIG_NET_SCH_PIE=m -CONFIG_NET_SCH_INGRESS=m -CONFIG_NET_SCH_PLUG=m -# CONFIG_NET_SCH_DEFAULT is not set - -# -# Classification -# -CONFIG_NET_CLS=y -CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m -CONFIG_NET_CLS_ROUTE4=m -CONFIG_NET_CLS_FW=m -CONFIG_NET_CLS_U32=m -# CONFIG_CLS_U32_PERF is not set -CONFIG_CLS_U32_MARK=y -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_RSVP6=m -CONFIG_NET_CLS_FLOW=m -CONFIG_NET_CLS_CGROUP=m -CONFIG_NET_CLS_BPF=m -CONFIG_NET_CLS_FLOWER=m -CONFIG_NET_CLS_MATCHALL=m -CONFIG_NET_EMATCH=y -CONFIG_NET_EMATCH_STACK=32 -CONFIG_NET_EMATCH_CMP=m -CONFIG_NET_EMATCH_NBYTE=m -CONFIG_NET_EMATCH_U32=m -CONFIG_NET_EMATCH_META=m -CONFIG_NET_EMATCH_TEXT=m -CONFIG_NET_EMATCH_CANID=m -CONFIG_NET_EMATCH_IPSET=m -CONFIG_NET_EMATCH_IPT=m -CONFIG_NET_CLS_ACT=y -CONFIG_NET_ACT_POLICE=m -CONFIG_NET_ACT_GACT=m -CONFIG_GACT_PROB=y -CONFIG_NET_ACT_MIRRED=m -CONFIG_NET_ACT_SAMPLE=m -CONFIG_NET_ACT_IPT=m -CONFIG_NET_ACT_NAT=m -CONFIG_NET_ACT_PEDIT=m -CONFIG_NET_ACT_SIMP=m -CONFIG_NET_ACT_SKBEDIT=m -CONFIG_NET_ACT_CSUM=m -CONFIG_NET_ACT_VLAN=m -CONFIG_NET_ACT_BPF=m -CONFIG_NET_ACT_CONNMARK=m -CONFIG_NET_ACT_SKBMOD=m -CONFIG_NET_ACT_IFE=m -CONFIG_NET_ACT_TUNNEL_KEY=m -CONFIG_NET_IFE_SKBMARK=m -CONFIG_NET_IFE_SKBPRIO=m -CONFIG_NET_IFE_SKBTCINDEX=m -# CONFIG_NET_CLS_IND is not set -CONFIG_NET_SCH_FIFO=y -CONFIG_DCB=y -CONFIG_DNS_RESOLVER=y -CONFIG_BATMAN_ADV=m -# CONFIG_BATMAN_ADV_BATMAN_V is not set -CONFIG_BATMAN_ADV_BLA=y -CONFIG_BATMAN_ADV_DAT=y -CONFIG_BATMAN_ADV_NC=y -CONFIG_BATMAN_ADV_MCAST=y -CONFIG_BATMAN_ADV_DEBUGFS=y -# CONFIG_BATMAN_ADV_DEBUG is not set -CONFIG_OPENVSWITCH=m -CONFIG_OPENVSWITCH_GRE=m -CONFIG_OPENVSWITCH_VXLAN=m -CONFIG_OPENVSWITCH_GENEVE=m -CONFIG_VSOCKETS=m -CONFIG_VSOCKETS_DIAG=m -CONFIG_VMWARE_VMCI_VSOCKETS=m -CONFIG_VIRTIO_VSOCKETS=m -CONFIG_VIRTIO_VSOCKETS_COMMON=m -CONFIG_HYPERV_VSOCKETS=m -CONFIG_NETLINK_DIAG=m -CONFIG_MPLS=y -CONFIG_NET_MPLS_GSO=m -CONFIG_MPLS_ROUTING=m -CONFIG_MPLS_IPTUNNEL=m -CONFIG_NET_NSH=m -CONFIG_HSR=m -CONFIG_NET_SWITCHDEV=y -CONFIG_NET_L3_MASTER_DEV=y -CONFIG_NET_NCSI=y -CONFIG_RPS=y -CONFIG_RFS_ACCEL=y -CONFIG_XPS=y -CONFIG_CGROUP_NET_PRIO=y -CONFIG_CGROUP_NET_CLASSID=y -CONFIG_NET_RX_BUSY_POLL=y -CONFIG_BQL=y -# CONFIG_BPF_JIT is not set -# CONFIG_BPF_STREAM_PARSER is not set -CONFIG_NET_FLOW_LIMIT=y - -# -# Network testing -# -CONFIG_NET_PKTGEN=m -# CONFIG_NET_DROP_MONITOR is not set -CONFIG_HAMRADIO=y - -# -# Packet Radio protocols -# -CONFIG_AX25=m -CONFIG_AX25_DAMA_SLAVE=y -CONFIG_NETROM=m -CONFIG_ROSE=m - -# -# AX.25 network device drivers -# -CONFIG_MKISS=m -CONFIG_6PACK=m -CONFIG_BPQETHER=m -CONFIG_SCC=m -# CONFIG_SCC_DELAY is not set -# CONFIG_SCC_TRXECHO is not set -CONFIG_BAYCOM_SER_FDX=m -CONFIG_BAYCOM_SER_HDX=m -CONFIG_BAYCOM_PAR=m -CONFIG_BAYCOM_EPP=m -CONFIG_YAM=m -CONFIG_CAN=m -CONFIG_CAN_RAW=m -CONFIG_CAN_BCM=m -CONFIG_CAN_GW=m - -# -# CAN Device Drivers -# -CONFIG_CAN_VCAN=m -CONFIG_CAN_VXCAN=m -CONFIG_CAN_SLCAN=m -CONFIG_CAN_DEV=m -CONFIG_CAN_CALC_BITTIMING=y -CONFIG_CAN_LEDS=y -CONFIG_CAN_JANZ_ICAN3=m -CONFIG_PCH_CAN=m -CONFIG_CAN_C_CAN=m -CONFIG_CAN_C_CAN_PLATFORM=m -CONFIG_CAN_C_CAN_PCI=m -CONFIG_CAN_CC770=m -CONFIG_CAN_CC770_ISA=m -CONFIG_CAN_CC770_PLATFORM=m -CONFIG_CAN_IFI_CANFD=m -CONFIG_CAN_M_CAN=m -CONFIG_CAN_PEAK_PCIEFD=m -CONFIG_CAN_SJA1000=m -CONFIG_CAN_SJA1000_ISA=m -CONFIG_CAN_SJA1000_PLATFORM=m -CONFIG_CAN_EMS_PCMCIA=m -CONFIG_CAN_EMS_PCI=m -CONFIG_CAN_PEAK_PCMCIA=m -CONFIG_CAN_PEAK_PCI=m -CONFIG_CAN_PEAK_PCIEC=y -CONFIG_CAN_KVASER_PCI=m -CONFIG_CAN_PLX_PCI=m -CONFIG_CAN_TSCAN1=m -CONFIG_CAN_SOFTING=m -CONFIG_CAN_SOFTING_CS=m - -# -# CAN SPI interfaces -# -CONFIG_CAN_HI311X=m -CONFIG_CAN_MCP251X=m - -# -# CAN USB interfaces -# -CONFIG_CAN_EMS_USB=m -CONFIG_CAN_ESD_USB2=m -CONFIG_CAN_GS_USB=m -CONFIG_CAN_KVASER_USB=m -CONFIG_CAN_PEAK_USB=m -CONFIG_CAN_8DEV_USB=m -CONFIG_CAN_MCBA_USB=m -# CONFIG_CAN_DEBUG_DEVICES is not set -CONFIG_BT=m -CONFIG_BT_BREDR=y -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_CMTP=m -CONFIG_BT_HIDP=m -CONFIG_BT_HS=y -CONFIG_BT_LE=y -CONFIG_BT_6LOWPAN=m -# CONFIG_BT_LEDS is not set -# CONFIG_BT_SELFTEST is not set -CONFIG_BT_DEBUGFS=y - -# -# Bluetooth device drivers -# -CONFIG_BT_INTEL=m -CONFIG_BT_BCM=m -CONFIG_BT_RTL=m -CONFIG_BT_QCA=m -CONFIG_BT_HCIBTUSB=m -# CONFIG_BT_HCIBTUSB_AUTOSUSPEND is not set -CONFIG_BT_HCIBTUSB_BCM=y -CONFIG_BT_HCIBTUSB_RTL=y -CONFIG_BT_HCIBTSDIO=m -CONFIG_BT_HCIUART=m -CONFIG_BT_HCIUART_SERDEV=y -CONFIG_BT_HCIUART_H4=y -CONFIG_BT_HCIUART_NOKIA=m -CONFIG_BT_HCIUART_BCSP=y -CONFIG_BT_HCIUART_ATH3K=y -CONFIG_BT_HCIUART_LL=y -CONFIG_BT_HCIUART_3WIRE=y -CONFIG_BT_HCIUART_INTEL=y -CONFIG_BT_HCIUART_BCM=y -CONFIG_BT_HCIUART_QCA=y -CONFIG_BT_HCIUART_AG6XX=y -CONFIG_BT_HCIUART_MRVL=y -CONFIG_BT_HCIBCM203X=m -CONFIG_BT_HCIBPA10X=m -CONFIG_BT_HCIBFUSB=m -CONFIG_BT_HCIDTL1=m -CONFIG_BT_HCIBT3C=m -CONFIG_BT_HCIBLUECARD=m -CONFIG_BT_HCIVHCI=m -CONFIG_BT_MRVL=m -CONFIG_BT_MRVL_SDIO=m -CONFIG_BT_ATH3K=m -CONFIG_BT_WILINK=m -CONFIG_BT_HCIRSI=m -CONFIG_AF_RXRPC=m -CONFIG_AF_RXRPC_IPV6=y -# CONFIG_AF_RXRPC_INJECT_LOSS is not set -# CONFIG_AF_RXRPC_DEBUG is not set -# CONFIG_RXKAD is not set -CONFIG_AF_KCM=m -CONFIG_STREAM_PARSER=m -CONFIG_FIB_RULES=y -CONFIG_WIRELESS=y -CONFIG_WIRELESS_EXT=y -CONFIG_WEXT_CORE=y -CONFIG_WEXT_PROC=y -CONFIG_WEXT_SPY=y -CONFIG_WEXT_PRIV=y -CONFIG_CFG80211=m -# CONFIG_NL80211_TESTMODE is not set -# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set -# CONFIG_CFG80211_CERTIFICATION_ONUS is not set -CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y -CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y -CONFIG_CFG80211_DEFAULT_PS=y -CONFIG_CFG80211_DEBUGFS=y -CONFIG_CFG80211_CRDA_SUPPORT=y -CONFIG_CFG80211_WEXT=y -CONFIG_CFG80211_WEXT_EXPORT=y -CONFIG_LIB80211=m -CONFIG_LIB80211_CRYPT_WEP=m -CONFIG_LIB80211_CRYPT_CCMP=m -CONFIG_LIB80211_CRYPT_TKIP=m -# CONFIG_LIB80211_DEBUG is not set -CONFIG_MAC80211=m -CONFIG_MAC80211_HAS_RC=y -CONFIG_MAC80211_RC_MINSTREL=y -CONFIG_MAC80211_RC_MINSTREL_HT=y -CONFIG_MAC80211_RC_MINSTREL_VHT=y -CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y -CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" -CONFIG_MAC80211_MESH=y -CONFIG_MAC80211_LEDS=y -CONFIG_MAC80211_DEBUGFS=y -CONFIG_MAC80211_MESSAGE_TRACING=y -# CONFIG_MAC80211_DEBUG_MENU is not set -CONFIG_MAC80211_STA_HASH_MAX_SIZE=0 -CONFIG_WIMAX=m -CONFIG_WIMAX_DEBUG_LEVEL=8 -CONFIG_RFKILL=y -CONFIG_RFKILL_LEDS=y -CONFIG_RFKILL_INPUT=y -CONFIG_RFKILL_GPIO=m -CONFIG_NET_9P=m -CONFIG_NET_9P_VIRTIO=m -CONFIG_NET_9P_XEN=m -CONFIG_NET_9P_RDMA=m -# CONFIG_NET_9P_DEBUG is not set -CONFIG_CAIF=m -# CONFIG_CAIF_DEBUG is not set -CONFIG_CAIF_NETDEV=m -CONFIG_CAIF_USB=m -CONFIG_CEPH_LIB=m -# CONFIG_CEPH_LIB_PRETTYDEBUG is not set -CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y -CONFIG_NFC=m -CONFIG_NFC_DIGITAL=m -CONFIG_NFC_NCI=m -CONFIG_NFC_NCI_SPI=m -CONFIG_NFC_NCI_UART=m -CONFIG_NFC_HCI=m -CONFIG_NFC_SHDLC=y - -# -# Near Field Communication (NFC) devices -# -CONFIG_NFC_TRF7970A=m -CONFIG_NFC_MEI_PHY=m -CONFIG_NFC_SIM=m -CONFIG_NFC_PORT100=m -CONFIG_NFC_FDP=m -CONFIG_NFC_FDP_I2C=m -CONFIG_NFC_PN544=m -CONFIG_NFC_PN544_I2C=m -CONFIG_NFC_PN544_MEI=m -CONFIG_NFC_PN533=m -CONFIG_NFC_PN533_USB=m -CONFIG_NFC_PN533_I2C=m -CONFIG_NFC_MICROREAD=m -CONFIG_NFC_MICROREAD_I2C=m -CONFIG_NFC_MICROREAD_MEI=m -CONFIG_NFC_MRVL=m -CONFIG_NFC_MRVL_USB=m -CONFIG_NFC_MRVL_UART=m -CONFIG_NFC_MRVL_I2C=m -CONFIG_NFC_MRVL_SPI=m -CONFIG_NFC_ST21NFCA=m -CONFIG_NFC_ST21NFCA_I2C=m -CONFIG_NFC_ST_NCI=m -CONFIG_NFC_ST_NCI_I2C=m -CONFIG_NFC_ST_NCI_SPI=m -CONFIG_NFC_NXP_NCI=m -CONFIG_NFC_NXP_NCI_I2C=m -CONFIG_NFC_S3FWRN5=m -CONFIG_NFC_S3FWRN5_I2C=m -CONFIG_NFC_ST95HF=m -CONFIG_PSAMPLE=m -CONFIG_NET_IFE=m -CONFIG_LWTUNNEL=y -CONFIG_LWTUNNEL_BPF=y -CONFIG_DST_CACHE=y -CONFIG_GRO_CELLS=y -CONFIG_NET_DEVLINK=m -CONFIG_MAY_USE_DEVLINK=m -CONFIG_PAGE_POOL=y -CONFIG_FAILOVER=y -CONFIG_HAVE_EBPF_JIT=y - -# -# Device Drivers -# - -# -# Generic Driver Options -# -CONFIG_UEVENT_HELPER=y -CONFIG_UEVENT_HELPER_PATH="" -CONFIG_DEVTMPFS=y -CONFIG_DEVTMPFS_MOUNT=y -# CONFIG_STANDALONE is not set -CONFIG_PREVENT_FIRMWARE_BUILD=y - -# -# Firmware loader -# -CONFIG_FW_LOADER=y -CONFIG_EXTRA_FIRMWARE="" -CONFIG_FW_LOADER_USER_HELPER=y -# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set -CONFIG_WANT_DEV_COREDUMP=y -CONFIG_ALLOW_DEV_COREDUMP=y -CONFIG_DEV_COREDUMP=y -# CONFIG_DEBUG_DRIVER is not set -# CONFIG_DEBUG_DEVRES is not set -# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set -# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set -CONFIG_SYS_HYPERVISOR=y -CONFIG_GENERIC_CPU_AUTOPROBE=y -CONFIG_GENERIC_CPU_VULNERABILITIES=y -CONFIG_REGMAP=y -CONFIG_REGMAP_I2C=y -CONFIG_REGMAP_SPI=y -CONFIG_REGMAP_SPMI=m -CONFIG_REGMAP_W1=m -CONFIG_REGMAP_MMIO=y -CONFIG_REGMAP_IRQ=y -CONFIG_DMA_SHARED_BUFFER=y -# CONFIG_DMA_FENCE_TRACE is not set -# CONFIG_DMA_CMA is not set - -# -# Bus devices -# -CONFIG_CONNECTOR=y -CONFIG_PROC_EVENTS=y -CONFIG_MTD=m -# CONFIG_MTD_TESTS is not set -CONFIG_MTD_REDBOOT_PARTS=m -CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 -# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set -# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set -CONFIG_MTD_CMDLINE_PARTS=m -CONFIG_MTD_AR7_PARTS=m - -# -# Partition parsers -# - -# -# User Modules And Translation Layers -# -CONFIG_MTD_BLKDEVS=m -CONFIG_MTD_BLOCK=m -CONFIG_MTD_BLOCK_RO=m -CONFIG_FTL=m -CONFIG_NFTL=m -CONFIG_NFTL_RW=y -CONFIG_INFTL=m -CONFIG_RFD_FTL=m -CONFIG_SSFDC=m -CONFIG_SM_FTL=m -CONFIG_MTD_OOPS=m -CONFIG_MTD_SWAP=m -# CONFIG_MTD_PARTITIONED_MASTER is not set - -# -# RAM/ROM/Flash chip drivers -# -CONFIG_MTD_CFI=m -CONFIG_MTD_JEDECPROBE=m -CONFIG_MTD_GEN_PROBE=m -# CONFIG_MTD_CFI_ADV_OPTIONS is not set -CONFIG_MTD_MAP_BANK_WIDTH_1=y -CONFIG_MTD_MAP_BANK_WIDTH_2=y -CONFIG_MTD_MAP_BANK_WIDTH_4=y -CONFIG_MTD_CFI_I1=y -CONFIG_MTD_CFI_I2=y -CONFIG_MTD_CFI_INTELEXT=m -CONFIG_MTD_CFI_AMDSTD=m -CONFIG_MTD_CFI_STAA=m -CONFIG_MTD_CFI_UTIL=m -CONFIG_MTD_RAM=m -CONFIG_MTD_ROM=m -CONFIG_MTD_ABSENT=m - -# -# Mapping drivers for chip access -# -CONFIG_MTD_COMPLEX_MAPPINGS=y -CONFIG_MTD_PHYSMAP=m -# CONFIG_MTD_PHYSMAP_COMPAT is not set -CONFIG_MTD_SBC_GXX=m -CONFIG_MTD_SCx200_DOCFLASH=m -CONFIG_MTD_AMD76XROM=m -CONFIG_MTD_ICHXROM=m -CONFIG_MTD_ESB2ROM=m -CONFIG_MTD_CK804XROM=m -CONFIG_MTD_SCB2_FLASH=m -CONFIG_MTD_NETtel=m -CONFIG_MTD_L440GX=m -CONFIG_MTD_PCI=m -CONFIG_MTD_PCMCIA=m -# CONFIG_MTD_PCMCIA_ANONYMOUS is not set -CONFIG_MTD_GPIO_ADDR=m -CONFIG_MTD_INTEL_VR_NOR=m -CONFIG_MTD_PLATRAM=m -CONFIG_MTD_LATCH_ADDR=m - -# -# Self-contained MTD device drivers -# -CONFIG_MTD_PMC551=m -# CONFIG_MTD_PMC551_BUGFIX is not set -# CONFIG_MTD_PMC551_DEBUG is not set -CONFIG_MTD_DATAFLASH=m -# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set -CONFIG_MTD_DATAFLASH_OTP=y -CONFIG_MTD_M25P80=m -CONFIG_MTD_MCHP23K256=m -CONFIG_MTD_SST25L=m -CONFIG_MTD_SLRAM=m -CONFIG_MTD_PHRAM=m -CONFIG_MTD_MTDRAM=m -CONFIG_MTDRAM_TOTAL_SIZE=4096 -CONFIG_MTDRAM_ERASE_SIZE=128 -CONFIG_MTD_BLOCK2MTD=m - -# -# Disk-On-Chip Device Drivers -# -CONFIG_MTD_DOCG3=m -CONFIG_BCH_CONST_M=14 -CONFIG_BCH_CONST_T=4 -CONFIG_MTD_ONENAND=m -CONFIG_MTD_ONENAND_VERIFY_WRITE=y -CONFIG_MTD_ONENAND_GENERIC=m -# CONFIG_MTD_ONENAND_OTP is not set -CONFIG_MTD_ONENAND_2X_PROGRAM=y -CONFIG_MTD_NAND_ECC=m -# CONFIG_MTD_NAND_ECC_SMC is not set -CONFIG_MTD_NAND=m -CONFIG_MTD_NAND_BCH=m -CONFIG_MTD_NAND_ECC_BCH=y -CONFIG_MTD_SM_COMMON=m -CONFIG_MTD_NAND_DENALI=m -CONFIG_MTD_NAND_DENALI_PCI=m -CONFIG_MTD_NAND_GPIO=m -CONFIG_MTD_NAND_RICOH=m -CONFIG_MTD_NAND_DISKONCHIP=m -# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set -CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 -# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set -CONFIG_MTD_NAND_DOCG4=m -CONFIG_MTD_NAND_CAFE=m -CONFIG_MTD_NAND_CS553X=m -CONFIG_MTD_NAND_NANDSIM=m -CONFIG_MTD_NAND_PLATFORM=m - -# -# LPDDR & LPDDR2 PCM memory drivers -# -CONFIG_MTD_LPDDR=m -CONFIG_MTD_QINFO_PROBE=m -CONFIG_MTD_SPI_NOR=m -CONFIG_MTD_MT81xx_NOR=m -CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y -CONFIG_SPI_INTEL_SPI=m -CONFIG_SPI_INTEL_SPI_PCI=m -CONFIG_SPI_INTEL_SPI_PLATFORM=m -CONFIG_MTD_UBI=m -CONFIG_MTD_UBI_WL_THRESHOLD=4096 -CONFIG_MTD_UBI_BEB_LIMIT=20 -CONFIG_MTD_UBI_FASTMAP=y -CONFIG_MTD_UBI_GLUEBI=m -CONFIG_MTD_UBI_BLOCK=y -# CONFIG_OF is not set -CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y -CONFIG_PARPORT=m -CONFIG_PARPORT_PC=m -CONFIG_PARPORT_SERIAL=m -CONFIG_PARPORT_PC_FIFO=y -# CONFIG_PARPORT_PC_SUPERIO is not set -CONFIG_PARPORT_PC_PCMCIA=m -CONFIG_PARPORT_AX88796=m -CONFIG_PARPORT_1284=y -CONFIG_PARPORT_NOT_PC=y -CONFIG_PNP=y -# CONFIG_PNP_DEBUG_MESSAGES is not set - -# -# Protocols -# -CONFIG_ISAPNP=y -CONFIG_PNPBIOS=y -CONFIG_PNPBIOS_PROC_FS=y -CONFIG_PNPACPI=y -CONFIG_BLK_DEV=y -CONFIG_BLK_DEV_NULL_BLK=m -CONFIG_BLK_DEV_FD=m -CONFIG_CDROM=y -CONFIG_PARIDE=m - -# -# Parallel IDE high-level drivers -# -CONFIG_PARIDE_PD=m -CONFIG_PARIDE_PCD=m -CONFIG_PARIDE_PF=m -CONFIG_PARIDE_PT=m -CONFIG_PARIDE_PG=m - -# -# Parallel IDE protocol modules -# -CONFIG_PARIDE_ATEN=m -CONFIG_PARIDE_BPCK=m -CONFIG_PARIDE_BPCK6=m -CONFIG_PARIDE_COMM=m -CONFIG_PARIDE_DSTR=m -CONFIG_PARIDE_FIT2=m -CONFIG_PARIDE_FIT3=m -CONFIG_PARIDE_EPAT=m -CONFIG_PARIDE_EPATC8=y -CONFIG_PARIDE_EPIA=m -CONFIG_PARIDE_FRIQ=m -CONFIG_PARIDE_FRPW=m -CONFIG_PARIDE_KBIC=m -CONFIG_PARIDE_KTTI=m -CONFIG_PARIDE_ON20=m -CONFIG_PARIDE_ON26=m -CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m -CONFIG_ZRAM=m -# CONFIG_ZRAM_WRITEBACK is not set -# CONFIG_ZRAM_MEMORY_TRACKING is not set -CONFIG_BLK_DEV_DAC960=m -CONFIG_BLK_DEV_UMEM=m -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 -CONFIG_BLK_DEV_CRYPTOLOOP=m -CONFIG_BLK_DEV_DRBD=m -# CONFIG_DRBD_FAULT_INJECTION is not set -CONFIG_BLK_DEV_NBD=m -CONFIG_BLK_DEV_SX8=m -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=16 -CONFIG_BLK_DEV_RAM_SIZE=65536 -CONFIG_CDROM_PKTCDVD=m -CONFIG_CDROM_PKTCDVD_BUFFERS=8 -# CONFIG_CDROM_PKTCDVD_WCACHE is not set -CONFIG_ATA_OVER_ETH=m -CONFIG_XEN_BLKDEV_FRONTEND=y -CONFIG_XEN_BLKDEV_BACKEND=m -CONFIG_VIRTIO_BLK=y -# CONFIG_VIRTIO_BLK_SCSI is not set -CONFIG_BLK_DEV_RBD=m -CONFIG_BLK_DEV_RSXX=m - -# -# NVME Support -# -CONFIG_NVME_CORE=y -CONFIG_BLK_DEV_NVME=y -# CONFIG_NVME_MULTIPATH is not set -CONFIG_NVME_FABRICS=m -CONFIG_NVME_RDMA=m -CONFIG_NVME_FC=m -CONFIG_NVME_TARGET=m -CONFIG_NVME_TARGET_LOOP=m -CONFIG_NVME_TARGET_RDMA=m -CONFIG_NVME_TARGET_FC=m -CONFIG_NVME_TARGET_FCLOOP=m - -# -# Misc devices -# -CONFIG_SENSORS_LIS3LV02D=m -CONFIG_AD525X_DPOT=m -CONFIG_AD525X_DPOT_I2C=m -CONFIG_AD525X_DPOT_SPI=m -CONFIG_DUMMY_IRQ=m -CONFIG_IBM_ASM=m -CONFIG_PHANTOM=m -CONFIG_INTEL_MID_PTI=m -CONFIG_SGI_IOC4=m -CONFIG_TIFM_CORE=m -CONFIG_TIFM_7XX1=m -CONFIG_ICS932S401=m -CONFIG_ENCLOSURE_SERVICES=m -# CONFIG_CS5535_MFGPT is not set -CONFIG_HP_ILO=m -CONFIG_APDS9802ALS=m -CONFIG_ISL29003=m -CONFIG_ISL29020=m -CONFIG_SENSORS_TSL2550=m -CONFIG_SENSORS_BH1770=m -CONFIG_SENSORS_APDS990X=m -CONFIG_HMC6352=m -CONFIG_DS1682=m -CONFIG_VMWARE_BALLOON=m -CONFIG_PCH_PHUB=m -CONFIG_USB_SWITCH_FSA9480=m -CONFIG_LATTICE_ECP3_CONFIG=m -CONFIG_SRAM=y -# CONFIG_PCI_ENDPOINT_TEST is not set -CONFIG_MISC_RTSX=m -CONFIG_C2PORT=m -CONFIG_C2PORT_DURAMAR_2150=m - -# -# EEPROM support -# -CONFIG_EEPROM_AT24=m -CONFIG_EEPROM_AT25=m -CONFIG_EEPROM_LEGACY=m -CONFIG_EEPROM_MAX6875=m -CONFIG_EEPROM_93CX6=m -CONFIG_EEPROM_93XX46=m -CONFIG_EEPROM_IDT_89HPESX=m -CONFIG_CB710_CORE=m -# CONFIG_CB710_DEBUG is not set -CONFIG_CB710_DEBUG_ASSUMPTIONS=y - -# -# Texas Instruments shared transport line discipline -# -CONFIG_TI_ST=m -CONFIG_SENSORS_LIS3_I2C=m -CONFIG_ALTERA_STAPL=m -CONFIG_INTEL_MEI=m -CONFIG_INTEL_MEI_ME=m -CONFIG_INTEL_MEI_TXE=m -CONFIG_VMWARE_VMCI=m - -# -# Intel MIC & related support -# - -# -# Intel MIC Bus Driver -# - -# -# SCIF Bus Driver -# - -# -# VOP Bus Driver -# - -# -# Intel MIC Host Driver -# - -# -# Intel MIC Card Driver -# - -# -# SCIF Driver -# - -# -# Intel MIC Coprocessor State Management (COSM) Drivers -# - -# -# VOP Driver -# -CONFIG_VHOST_RING=m -CONFIG_ECHO=m -CONFIG_MISC_RTSX_PCI=m -CONFIG_MISC_RTSX_USB=m -CONFIG_HAVE_IDE=y -# CONFIG_IDE is not set - -# -# SCSI device support -# -CONFIG_SCSI_MOD=y -CONFIG_RAID_ATTRS=m -CONFIG_SCSI=y -CONFIG_SCSI_DMA=y -CONFIG_SCSI_NETLINK=y -# CONFIG_SCSI_MQ_DEFAULT is not set -CONFIG_SCSI_PROC_FS=y - -# -# SCSI support type (disk, tape, CD-ROM) -# -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_ST=m -CONFIG_CHR_DEV_OSST=m -CONFIG_BLK_DEV_SR=y -# CONFIG_BLK_DEV_SR_VENDOR is not set -CONFIG_CHR_DEV_SG=y -CONFIG_CHR_DEV_SCH=m -CONFIG_SCSI_ENCLOSURE=m -CONFIG_SCSI_CONSTANTS=y -CONFIG_SCSI_LOGGING=y -CONFIG_SCSI_SCAN_ASYNC=y - -# -# SCSI Transports -# -CONFIG_SCSI_SPI_ATTRS=m -CONFIG_SCSI_FC_ATTRS=m -CONFIG_SCSI_ISCSI_ATTRS=m -CONFIG_SCSI_SAS_ATTRS=m -CONFIG_SCSI_SAS_LIBSAS=m -CONFIG_SCSI_SAS_ATA=y -CONFIG_SCSI_SAS_HOST_SMP=y -CONFIG_SCSI_SRP_ATTRS=m -CONFIG_SCSI_LOWLEVEL=y -CONFIG_ISCSI_TCP=m -CONFIG_ISCSI_BOOT_SYSFS=m -CONFIG_SCSI_CXGB3_ISCSI=m -CONFIG_SCSI_CXGB4_ISCSI=m -CONFIG_SCSI_BNX2_ISCSI=m -CONFIG_SCSI_BNX2X_FCOE=m -CONFIG_BE2ISCSI=m -CONFIG_BLK_DEV_3W_XXXX_RAID=m -CONFIG_SCSI_HPSA=m -CONFIG_SCSI_3W_9XXX=m -CONFIG_SCSI_3W_SAS=m -CONFIG_SCSI_ACARD=m -CONFIG_SCSI_AHA152X=m -CONFIG_SCSI_AHA1542=m -CONFIG_SCSI_AHA1740=m -CONFIG_SCSI_AACRAID=m -CONFIG_SCSI_AIC7XXX=m -CONFIG_AIC7XXX_CMDS_PER_DEVICE=8 -CONFIG_AIC7XXX_RESET_DELAY_MS=5000 -# CONFIG_AIC7XXX_DEBUG_ENABLE is not set -CONFIG_AIC7XXX_DEBUG_MASK=0 -CONFIG_AIC7XXX_REG_PRETTY_PRINT=y -CONFIG_SCSI_AIC79XX=m -CONFIG_AIC79XX_CMDS_PER_DEVICE=32 -CONFIG_AIC79XX_RESET_DELAY_MS=5000 -# CONFIG_AIC79XX_DEBUG_ENABLE is not set -CONFIG_AIC79XX_DEBUG_MASK=0 -CONFIG_AIC79XX_REG_PRETTY_PRINT=y -CONFIG_SCSI_AIC94XX=m -# CONFIG_AIC94XX_DEBUG is not set -CONFIG_SCSI_MVSAS=m -# CONFIG_SCSI_MVSAS_DEBUG is not set -# CONFIG_SCSI_MVSAS_TASKLET is not set -CONFIG_SCSI_MVUMI=m -CONFIG_SCSI_DPT_I2O=m -CONFIG_SCSI_ADVANSYS=m -CONFIG_SCSI_ARCMSR=m -CONFIG_SCSI_ESAS2R=m -CONFIG_MEGARAID_NEWGEN=y -CONFIG_MEGARAID_MM=m -CONFIG_MEGARAID_MAILBOX=m -CONFIG_MEGARAID_LEGACY=m -CONFIG_MEGARAID_SAS=m -CONFIG_SCSI_MPT3SAS=m -CONFIG_SCSI_MPT2SAS_MAX_SGE=128 -CONFIG_SCSI_MPT3SAS_MAX_SGE=128 -CONFIG_SCSI_MPT2SAS=m -CONFIG_SCSI_SMARTPQI=m -CONFIG_SCSI_UFSHCD=m -CONFIG_SCSI_UFSHCD_PCI=m -# CONFIG_SCSI_UFS_DWC_TC_PCI is not set -CONFIG_SCSI_UFSHCD_PLATFORM=m -# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set -CONFIG_SCSI_HPTIOP=m -CONFIG_SCSI_BUSLOGIC=m -CONFIG_SCSI_FLASHPOINT=y -CONFIG_VMWARE_PVSCSI=m -CONFIG_XEN_SCSI_FRONTEND=m -CONFIG_HYPERV_STORAGE=m -CONFIG_LIBFC=m -CONFIG_LIBFCOE=m -CONFIG_FCOE=m -CONFIG_FCOE_FNIC=m -CONFIG_SCSI_SNIC=m -# CONFIG_SCSI_SNIC_DEBUG_FS is not set -CONFIG_SCSI_DMX3191D=m -CONFIG_SCSI_GDTH=m -CONFIG_SCSI_ISCI=m -CONFIG_SCSI_GENERIC_NCR5380=m -CONFIG_SCSI_IPS=m -CONFIG_SCSI_INITIO=m -CONFIG_SCSI_INIA100=m -CONFIG_SCSI_PPA=m -CONFIG_SCSI_IMM=m -# CONFIG_SCSI_IZIP_EPP16 is not set -# CONFIG_SCSI_IZIP_SLOW_CTR is not set -CONFIG_SCSI_STEX=m -CONFIG_SCSI_SYM53C8XX_2=m -CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 -CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 -CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 -CONFIG_SCSI_SYM53C8XX_MMIO=y -CONFIG_SCSI_IPR=m -CONFIG_SCSI_IPR_TRACE=y -CONFIG_SCSI_IPR_DUMP=y -CONFIG_SCSI_QLOGIC_FAS=m -CONFIG_SCSI_QLOGIC_1280=m -CONFIG_SCSI_QLA_FC=m -CONFIG_TCM_QLA2XXX=m -# CONFIG_TCM_QLA2XXX_DEBUG is not set -CONFIG_SCSI_QLA_ISCSI=m -CONFIG_QEDI=m -CONFIG_QEDF=m -CONFIG_SCSI_LPFC=m -# CONFIG_SCSI_LPFC_DEBUG_FS is not set -CONFIG_SCSI_SIM710=m -CONFIG_SCSI_DC395x=m -CONFIG_SCSI_AM53C974=m -CONFIG_SCSI_NSP32=m -CONFIG_SCSI_WD719X=m -CONFIG_SCSI_DEBUG=m -CONFIG_SCSI_PMCRAID=m -CONFIG_SCSI_PM8001=m -CONFIG_SCSI_BFA_FC=m -CONFIG_SCSI_VIRTIO=m -CONFIG_SCSI_CHELSIO_FCOE=m -CONFIG_SCSI_LOWLEVEL_PCMCIA=y -CONFIG_PCMCIA_AHA152X=m -CONFIG_PCMCIA_NINJA_SCSI=m -CONFIG_PCMCIA_QLOGIC=m -CONFIG_PCMCIA_SYM53C500=m -CONFIG_SCSI_DH=y -CONFIG_SCSI_DH_RDAC=m -CONFIG_SCSI_DH_HP_SW=m -CONFIG_SCSI_DH_EMC=m -CONFIG_SCSI_DH_ALUA=m -CONFIG_SCSI_OSD_INITIATOR=m -CONFIG_SCSI_OSD_ULD=m -CONFIG_SCSI_OSD_DPRINT_SENSE=1 -# CONFIG_SCSI_OSD_DEBUG is not set -CONFIG_ATA=y -CONFIG_ATA_VERBOSE_ERROR=y -CONFIG_ATA_ACPI=y -CONFIG_SATA_ZPODD=y -CONFIG_SATA_PMP=y - -# -# Controllers with non-SFF native interface -# -CONFIG_SATA_AHCI=m -CONFIG_SATA_MOBILE_LPM_POLICY=0 -CONFIG_SATA_AHCI_PLATFORM=m -CONFIG_SATA_INIC162X=m -CONFIG_SATA_ACARD_AHCI=m -CONFIG_SATA_SIL24=m -CONFIG_ATA_SFF=y - -# -# SFF controllers with custom DMA interface -# -CONFIG_PDC_ADMA=m -CONFIG_SATA_QSTOR=m -CONFIG_SATA_SX4=m -CONFIG_ATA_BMDMA=y - -# -# SATA SFF controllers with BMDMA -# -CONFIG_ATA_PIIX=y -CONFIG_SATA_DWC=m -# CONFIG_SATA_DWC_OLD_DMA is not set -# CONFIG_SATA_DWC_DEBUG is not set -CONFIG_SATA_MV=m -CONFIG_SATA_NV=m -CONFIG_SATA_PROMISE=m -CONFIG_SATA_SIL=m -CONFIG_SATA_SIS=m -CONFIG_SATA_SVW=m -CONFIG_SATA_ULI=m -CONFIG_SATA_VIA=m -CONFIG_SATA_VITESSE=m - -# -# PATA SFF controllers with BMDMA -# -CONFIG_PATA_ALI=m -CONFIG_PATA_AMD=m -CONFIG_PATA_ARTOP=m -CONFIG_PATA_ATIIXP=m -CONFIG_PATA_ATP867X=m -CONFIG_PATA_CMD64X=m -CONFIG_PATA_CS5520=m -CONFIG_PATA_CS5530=m -CONFIG_PATA_CS5535=m -CONFIG_PATA_CS5536=m -CONFIG_PATA_CYPRESS=m -CONFIG_PATA_EFAR=m -CONFIG_PATA_HPT366=m -CONFIG_PATA_HPT37X=m -CONFIG_PATA_HPT3X2N=m -CONFIG_PATA_HPT3X3=m -# CONFIG_PATA_HPT3X3_DMA is not set -CONFIG_PATA_IT8213=m -CONFIG_PATA_IT821X=m -CONFIG_PATA_JMICRON=m -CONFIG_PATA_MARVELL=m -CONFIG_PATA_NETCELL=m -CONFIG_PATA_NINJA32=m -CONFIG_PATA_NS87415=m -CONFIG_PATA_OLDPIIX=m -CONFIG_PATA_OPTIDMA=m -CONFIG_PATA_PDC2027X=m -CONFIG_PATA_PDC_OLD=m -CONFIG_PATA_RADISYS=m -CONFIG_PATA_RDC=m -CONFIG_PATA_SC1200=m -CONFIG_PATA_SCH=m -CONFIG_PATA_SERVERWORKS=m -CONFIG_PATA_SIL680=m -CONFIG_PATA_SIS=y -CONFIG_PATA_TOSHIBA=m -CONFIG_PATA_TRIFLEX=m -CONFIG_PATA_VIA=m -CONFIG_PATA_WINBOND=m - -# -# PIO-only SFF controllers -# -CONFIG_PATA_CMD640_PCI=m -CONFIG_PATA_ISAPNP=m -CONFIG_PATA_MPIIX=m -CONFIG_PATA_NS87410=m -CONFIG_PATA_OPTI=m -CONFIG_PATA_PCMCIA=m -CONFIG_PATA_PLATFORM=m -CONFIG_PATA_QDI=m -CONFIG_PATA_RZ1000=m -CONFIG_PATA_WINBOND_VLB=m - -# -# Generic fallback / legacy drivers -# -CONFIG_PATA_ACPI=m -CONFIG_ATA_GENERIC=y -CONFIG_PATA_LEGACY=m -CONFIG_MD=y -CONFIG_BLK_DEV_MD=y -CONFIG_MD_AUTODETECT=y -CONFIG_MD_LINEAR=m -CONFIG_MD_RAID0=m -CONFIG_MD_RAID1=m -CONFIG_MD_RAID10=m -CONFIG_MD_RAID456=m -CONFIG_MD_MULTIPATH=m -CONFIG_MD_FAULTY=m -CONFIG_MD_CLUSTER=m -CONFIG_BCACHE=m -# CONFIG_BCACHE_DEBUG is not set -# CONFIG_BCACHE_CLOSURES_DEBUG is not set -CONFIG_BLK_DEV_DM_BUILTIN=y -CONFIG_BLK_DEV_DM=y -# CONFIG_DM_MQ_DEFAULT is not set -# CONFIG_DM_DEBUG is not set -CONFIG_DM_BUFIO=m -# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set -CONFIG_DM_BIO_PRISON=m -CONFIG_DM_PERSISTENT_DATA=m -CONFIG_DM_UNSTRIPED=m -CONFIG_DM_CRYPT=m -CONFIG_DM_SNAPSHOT=m -CONFIG_DM_THIN_PROVISIONING=m -CONFIG_DM_CACHE=m -CONFIG_DM_CACHE_SMQ=m -CONFIG_DM_WRITECACHE=m -CONFIG_DM_ERA=m -CONFIG_DM_MIRROR=m -CONFIG_DM_LOG_USERSPACE=m -CONFIG_DM_RAID=m -CONFIG_DM_ZERO=m -CONFIG_DM_MULTIPATH=m -CONFIG_DM_MULTIPATH_QL=m -CONFIG_DM_MULTIPATH_ST=m -CONFIG_DM_DELAY=m -CONFIG_DM_UEVENT=y -CONFIG_DM_FLAKEY=m -CONFIG_DM_VERITY=m -# CONFIG_DM_VERITY_FEC is not set -CONFIG_DM_SWITCH=m -CONFIG_DM_LOG_WRITES=m -CONFIG_DM_INTEGRITY=m -CONFIG_DM_ZONED=m -CONFIG_TARGET_CORE=m -CONFIG_TCM_IBLOCK=m -CONFIG_TCM_FILEIO=m -CONFIG_TCM_PSCSI=m -CONFIG_TCM_USER2=m -CONFIG_LOOPBACK_TARGET=m -CONFIG_TCM_FC=m -CONFIG_ISCSI_TARGET=m -CONFIG_ISCSI_TARGET_CXGB4=m -CONFIG_SBP_TARGET=m -CONFIG_FUSION=y -CONFIG_FUSION_SPI=m -CONFIG_FUSION_FC=m -CONFIG_FUSION_SAS=m -CONFIG_FUSION_MAX_SGE=128 -CONFIG_FUSION_CTL=m -CONFIG_FUSION_LAN=m -CONFIG_FUSION_LOGGING=y - -# -# IEEE 1394 (FireWire) support -# -CONFIG_FIREWIRE=m -CONFIG_FIREWIRE_OHCI=m -CONFIG_FIREWIRE_SBP2=m -CONFIG_FIREWIRE_NET=m -CONFIG_FIREWIRE_NOSY=m -CONFIG_MACINTOSH_DRIVERS=y -CONFIG_MAC_EMUMOUSEBTN=m -CONFIG_NETDEVICES=y -CONFIG_MII=m -CONFIG_NET_CORE=y -CONFIG_BONDING=m -CONFIG_DUMMY=m -CONFIG_EQUALIZER=m -CONFIG_NET_FC=y -CONFIG_IFB=m -CONFIG_NET_TEAM=m -CONFIG_NET_TEAM_MODE_BROADCAST=m -CONFIG_NET_TEAM_MODE_ROUNDROBIN=m -CONFIG_NET_TEAM_MODE_RANDOM=m -CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m -CONFIG_NET_TEAM_MODE_LOADBALANCE=m -CONFIG_MACVLAN=m -CONFIG_MACVTAP=m -CONFIG_IPVLAN=m -CONFIG_IPVTAP=m -CONFIG_VXLAN=m -CONFIG_GENEVE=m -CONFIG_GTP=m -CONFIG_MACSEC=m -CONFIG_NETCONSOLE=m -CONFIG_NETCONSOLE_DYNAMIC=y -CONFIG_NETPOLL=y -CONFIG_NET_POLL_CONTROLLER=y -CONFIG_NTB_NETDEV=m -CONFIG_RIONET=m -CONFIG_RIONET_TX_SIZE=128 -CONFIG_RIONET_RX_SIZE=128 -CONFIG_TUN=y -CONFIG_TAP=m -# CONFIG_TUN_VNET_CROSS_LE is not set -CONFIG_VETH=m -CONFIG_VIRTIO_NET=y -CONFIG_NLMON=m -CONFIG_NET_VRF=m -CONFIG_VSOCKMON=m -CONFIG_SUNGEM_PHY=m -CONFIG_ARCNET=m -CONFIG_ARCNET_1201=m -CONFIG_ARCNET_1051=m -CONFIG_ARCNET_RAW=m -CONFIG_ARCNET_CAP=m -CONFIG_ARCNET_COM90xx=m -CONFIG_ARCNET_COM90xxIO=m -CONFIG_ARCNET_RIM_I=m -CONFIG_ARCNET_COM20020=m -CONFIG_ARCNET_COM20020_ISA=m -CONFIG_ARCNET_COM20020_PCI=m -CONFIG_ARCNET_COM20020_CS=m -CONFIG_ATM_DRIVERS=y -CONFIG_ATM_DUMMY=m -CONFIG_ATM_TCP=m -CONFIG_ATM_LANAI=m -CONFIG_ATM_ENI=m -# CONFIG_ATM_ENI_DEBUG is not set -# CONFIG_ATM_ENI_TUNE_BURST is not set -CONFIG_ATM_FIRESTREAM=m -CONFIG_ATM_ZATM=m -# CONFIG_ATM_ZATM_DEBUG is not set -CONFIG_ATM_NICSTAR=m -# CONFIG_ATM_NICSTAR_USE_SUNI is not set -# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set -CONFIG_ATM_IDT77252=m -# CONFIG_ATM_IDT77252_DEBUG is not set -# CONFIG_ATM_IDT77252_RCV_ALL is not set -CONFIG_ATM_IDT77252_USE_SUNI=y -CONFIG_ATM_AMBASSADOR=m -# CONFIG_ATM_AMBASSADOR_DEBUG is not set -CONFIG_ATM_HORIZON=m -# CONFIG_ATM_HORIZON_DEBUG is not set -CONFIG_ATM_IA=m -# CONFIG_ATM_IA_DEBUG is not set -CONFIG_ATM_FORE200E=m -# CONFIG_ATM_FORE200E_USE_TASKLET is not set -CONFIG_ATM_FORE200E_TX_RETRY=16 -CONFIG_ATM_FORE200E_DEBUG=0 -CONFIG_ATM_HE=m -CONFIG_ATM_HE_USE_SUNI=y -CONFIG_ATM_SOLOS=m - -# -# CAIF transport drivers -# -CONFIG_CAIF_TTY=m -CONFIG_CAIF_SPI_SLAVE=m -# CONFIG_CAIF_SPI_SYNC is not set -CONFIG_CAIF_HSI=m -CONFIG_CAIF_VIRTIO=m - -# -# Distributed Switch Architecture drivers -# -CONFIG_B53=m -CONFIG_B53_SPI_DRIVER=m -CONFIG_B53_MDIO_DRIVER=m -CONFIG_B53_MMAP_DRIVER=m -CONFIG_B53_SRAB_DRIVER=m -# CONFIG_NET_DSA_LOOP is not set -CONFIG_NET_DSA_MT7530=m -CONFIG_NET_DSA_MV88E6060=m -CONFIG_MICROCHIP_KSZ=m -CONFIG_MICROCHIP_KSZ_SPI_DRIVER=m -CONFIG_NET_DSA_MV88E6XXX=m -CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y -# CONFIG_NET_DSA_MV88E6XXX_PTP is not set -CONFIG_NET_DSA_QCA8K=m -CONFIG_NET_DSA_SMSC_LAN9303=m -CONFIG_NET_DSA_SMSC_LAN9303_I2C=m -CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m -CONFIG_ETHERNET=y -CONFIG_MDIO=m -CONFIG_NET_VENDOR_3COM=y -CONFIG_EL3=m -CONFIG_3C515=m -CONFIG_PCMCIA_3C574=m -CONFIG_PCMCIA_3C589=m -CONFIG_VORTEX=m -CONFIG_TYPHOON=m -CONFIG_NET_VENDOR_ADAPTEC=y -CONFIG_ADAPTEC_STARFIRE=m -CONFIG_NET_VENDOR_AGERE=y -CONFIG_ET131X=m -CONFIG_NET_VENDOR_ALACRITECH=y -CONFIG_SLICOSS=m -CONFIG_NET_VENDOR_ALTEON=y -CONFIG_ACENIC=m -# CONFIG_ACENIC_OMIT_TIGON_I is not set -CONFIG_ALTERA_TSE=m -CONFIG_NET_VENDOR_AMAZON=y -CONFIG_ENA_ETHERNET=m -CONFIG_NET_VENDOR_AMD=y -CONFIG_AMD8111_ETH=m -CONFIG_LANCE=m -CONFIG_PCNET32=m -CONFIG_PCMCIA_NMCLAN=m -CONFIG_NI65=m -CONFIG_AMD_XGBE=m -# CONFIG_AMD_XGBE_DCB is not set -CONFIG_AMD_XGBE_HAVE_ECC=y -CONFIG_NET_VENDOR_AQUANTIA=y -CONFIG_NET_VENDOR_ARC=y -CONFIG_NET_VENDOR_ATHEROS=y -CONFIG_ATL2=m -CONFIG_ATL1=m -CONFIG_ATL1E=m -CONFIG_ATL1C=m -CONFIG_ALX=m -CONFIG_NET_VENDOR_AURORA=y -CONFIG_AURORA_NB8800=m -CONFIG_NET_VENDOR_BROADCOM=y -CONFIG_B44=m -CONFIG_B44_PCI_AUTOSELECT=y -CONFIG_B44_PCICORE_AUTOSELECT=y -CONFIG_B44_PCI=y -CONFIG_BNX2=m -CONFIG_CNIC=m -CONFIG_TIGON3=m -CONFIG_TIGON3_HWMON=y -CONFIG_BNX2X=m -CONFIG_BNX2X_SRIOV=y -CONFIG_BNXT=m -CONFIG_BNXT_SRIOV=y -CONFIG_BNXT_FLOWER_OFFLOAD=y -# CONFIG_BNXT_DCB is not set -CONFIG_NET_VENDOR_BROCADE=y -CONFIG_BNA=m -CONFIG_NET_CADENCE=y -CONFIG_MACB=m -CONFIG_MACB_USE_HWSTAMP=y -CONFIG_MACB_PCI=m -CONFIG_NET_VENDOR_CAVIUM=y -CONFIG_NET_VENDOR_CHELSIO=y -CONFIG_CHELSIO_T1=m -CONFIG_CHELSIO_T1_1G=y -CONFIG_CHELSIO_T3=m -CONFIG_CHELSIO_T4=m -CONFIG_CHELSIO_T4_DCB=y -CONFIG_CHELSIO_T4_FCOE=y -CONFIG_CHELSIO_T4VF=m -CONFIG_CHELSIO_LIB=m -CONFIG_NET_VENDOR_CIRRUS=y -CONFIG_CS89x0=m -CONFIG_CS89x0_PLATFORM=y -CONFIG_NET_VENDOR_CISCO=y -CONFIG_ENIC=m -# CONFIG_NET_VENDOR_CORTINA is not set -CONFIG_CX_ECAT=m -CONFIG_DNET=m -CONFIG_NET_VENDOR_DEC=y -CONFIG_NET_TULIP=y -CONFIG_DE2104X=m -CONFIG_DE2104X_DSL=0 -CONFIG_TULIP=m -# CONFIG_TULIP_MWI is not set -# CONFIG_TULIP_MMIO is not set -# CONFIG_TULIP_NAPI is not set -CONFIG_DE4X5=m -CONFIG_WINBOND_840=m -CONFIG_DM9102=m -CONFIG_ULI526X=m -CONFIG_PCMCIA_XIRCOM=m -CONFIG_NET_VENDOR_DLINK=y -CONFIG_DL2K=m -CONFIG_SUNDANCE=m -# CONFIG_SUNDANCE_MMIO is not set -CONFIG_NET_VENDOR_EMULEX=y -CONFIG_BE2NET=m -CONFIG_BE2NET_HWMON=y -CONFIG_NET_VENDOR_EZCHIP=y -CONFIG_NET_VENDOR_FUJITSU=y -CONFIG_PCMCIA_FMVJ18X=m -CONFIG_NET_VENDOR_HP=y -CONFIG_HP100=m -CONFIG_NET_VENDOR_HUAWEI=y -CONFIG_HINIC=m -CONFIG_NET_VENDOR_I825XX=y -CONFIG_NET_VENDOR_INTEL=y -CONFIG_E100=m -CONFIG_E1000=m -CONFIG_E1000E=m -CONFIG_E1000E_HWTS=y -CONFIG_IGB=m -CONFIG_IGB_HWMON=y -CONFIG_IGBVF=m -CONFIG_IXGB=m -CONFIG_IXGBE=m -CONFIG_IXGBE_HWMON=y -CONFIG_IXGBE_DCB=y -CONFIG_IXGBEVF=m -CONFIG_I40E=m -CONFIG_I40E_DCB=y -CONFIG_I40EVF=m -CONFIG_ICE=m -CONFIG_FM10K=m -CONFIG_NET_VENDOR_EXAR=y -CONFIG_S2IO=m -CONFIG_VXGE=m -# CONFIG_VXGE_DEBUG_TRACE_ALL is not set -CONFIG_JME=m -CONFIG_NET_VENDOR_MARVELL=y -CONFIG_MVMDIO=m -CONFIG_SKGE=m -# CONFIG_SKGE_DEBUG is not set -CONFIG_SKGE_GENESIS=y -CONFIG_SKY2=m -# CONFIG_SKY2_DEBUG is not set -CONFIG_NET_VENDOR_MELLANOX=y -CONFIG_MLX4_EN=m -CONFIG_MLX4_EN_DCB=y -CONFIG_MLX4_CORE=m -CONFIG_MLX4_DEBUG=y -CONFIG_MLX4_CORE_GEN2=y -CONFIG_MLX5_CORE=m -# CONFIG_MLX5_FPGA is not set -CONFIG_MLX5_CORE_EN=y -CONFIG_MLX5_MPFS=y -CONFIG_MLX5_ESWITCH=y -CONFIG_MLX5_CORE_EN_DCB=y -# CONFIG_MLX5_CORE_IPOIB is not set -CONFIG_MLXSW_CORE=m -CONFIG_MLXSW_CORE_HWMON=y -CONFIG_MLXSW_CORE_THERMAL=y -CONFIG_MLXSW_PCI=m -CONFIG_MLXSW_I2C=m -CONFIG_MLXSW_SWITCHIB=m -CONFIG_MLXSW_SWITCHX2=m -CONFIG_MLXSW_SPECTRUM=m -CONFIG_MLXSW_SPECTRUM_DCB=y -CONFIG_MLXSW_MINIMAL=m -CONFIG_MLXFW=m -CONFIG_NET_VENDOR_MICREL=y -CONFIG_KS8842=m -CONFIG_KS8851=m -CONFIG_KS8851_MLL=m -CONFIG_KSZ884X_PCI=m -CONFIG_NET_VENDOR_MICROCHIP=y -CONFIG_ENC28J60=m -# CONFIG_ENC28J60_WRITEVERIFY is not set -CONFIG_ENCX24J600=m -CONFIG_LAN743X=m -CONFIG_NET_VENDOR_MICROSEMI=y -CONFIG_MSCC_OCELOT_SWITCH=m -CONFIG_MSCC_OCELOT_SWITCH_OCELOT=m -CONFIG_NET_VENDOR_MYRI=y -CONFIG_MYRI10GE=m -CONFIG_FEALNX=m -CONFIG_NET_VENDOR_NATSEMI=y -CONFIG_NATSEMI=m -CONFIG_NS83820=m -CONFIG_NET_VENDOR_NETRONOME=y -CONFIG_NFP=m -# CONFIG_NFP_APP_FLOWER is not set -CONFIG_NFP_APP_ABM_NIC=y -# CONFIG_NFP_DEBUG is not set -CONFIG_NET_VENDOR_NI=y -CONFIG_NET_VENDOR_8390=y -CONFIG_PCMCIA_AXNET=m -CONFIG_NE2000=m -CONFIG_NE2K_PCI=m -CONFIG_PCMCIA_PCNET=m -CONFIG_ULTRA=m -CONFIG_WD80x3=m -CONFIG_NET_VENDOR_NVIDIA=y -CONFIG_FORCEDETH=m -CONFIG_NET_VENDOR_OKI=y -CONFIG_PCH_GBE=m -CONFIG_ETHOC=m -CONFIG_NET_PACKET_ENGINE=y -CONFIG_HAMACHI=m -CONFIG_YELLOWFIN=m -CONFIG_NET_VENDOR_QLOGIC=y -CONFIG_QLA3XXX=m -CONFIG_QLCNIC=m -CONFIG_QLCNIC_SRIOV=y -CONFIG_QLCNIC_DCB=y -CONFIG_QLCNIC_HWMON=y -CONFIG_QLGE=m -CONFIG_NETXEN_NIC=m -CONFIG_QED=m -CONFIG_QED_LL2=y -CONFIG_QED_SRIOV=y -CONFIG_QEDE=m -CONFIG_QED_ISCSI=y -CONFIG_QED_FCOE=y -CONFIG_QED_OOO=y -CONFIG_NET_VENDOR_QUALCOMM=y -CONFIG_QCOM_EMAC=m -CONFIG_RMNET=m -CONFIG_NET_VENDOR_RDC=y -CONFIG_R6040=m -CONFIG_NET_VENDOR_REALTEK=y -CONFIG_ATP=m -CONFIG_8139CP=m -CONFIG_8139TOO=m -CONFIG_8139TOO_PIO=y -# CONFIG_8139TOO_TUNE_TWISTER is not set -CONFIG_8139TOO_8129=y -# CONFIG_8139_OLD_RX_RESET is not set -CONFIG_R8169=m -CONFIG_NET_VENDOR_RENESAS=y -CONFIG_NET_VENDOR_ROCKER=y -CONFIG_ROCKER=m -CONFIG_NET_VENDOR_SAMSUNG=y -CONFIG_SXGBE_ETH=m -CONFIG_NET_VENDOR_SEEQ=y -CONFIG_NET_VENDOR_SOLARFLARE=y -CONFIG_SFC=m -CONFIG_SFC_MTD=y -CONFIG_SFC_MCDI_MON=y -CONFIG_SFC_SRIOV=y -CONFIG_SFC_MCDI_LOGGING=y -CONFIG_SFC_FALCON=m -CONFIG_SFC_FALCON_MTD=y -CONFIG_NET_VENDOR_SILAN=y -CONFIG_SC92031=m -CONFIG_NET_VENDOR_SIS=y -CONFIG_SIS900=m -CONFIG_SIS190=m -CONFIG_NET_VENDOR_SMSC=y -CONFIG_SMC9194=m -CONFIG_PCMCIA_SMC91C92=m -CONFIG_EPIC100=m -CONFIG_SMSC911X=m -CONFIG_SMSC9420=m -# CONFIG_NET_VENDOR_SOCIONEXT is not set -CONFIG_NET_VENDOR_STMICRO=y -CONFIG_STMMAC_ETH=m -CONFIG_STMMAC_PLATFORM=m -CONFIG_DWMAC_GENERIC=m -# CONFIG_STMMAC_PCI is not set -CONFIG_NET_VENDOR_SUN=y -CONFIG_HAPPYMEAL=m -CONFIG_SUNGEM=m -CONFIG_CASSINI=m -CONFIG_NIU=m -CONFIG_NET_VENDOR_SYNOPSYS=y -CONFIG_DWC_XLGMAC=m -CONFIG_DWC_XLGMAC_PCI=m -CONFIG_NET_VENDOR_TEHUTI=y -CONFIG_TEHUTI=m -CONFIG_NET_VENDOR_TI=y -CONFIG_TI_CPSW_ALE=m -CONFIG_TLAN=m -CONFIG_NET_VENDOR_VIA=y -CONFIG_VIA_RHINE=m -CONFIG_VIA_RHINE_MMIO=y -CONFIG_VIA_VELOCITY=m -CONFIG_NET_VENDOR_WIZNET=y -CONFIG_WIZNET_W5100=m -CONFIG_WIZNET_W5300=m -# CONFIG_WIZNET_BUS_DIRECT is not set -# CONFIG_WIZNET_BUS_INDIRECT is not set -CONFIG_WIZNET_BUS_ANY=y -# CONFIG_WIZNET_W5100_SPI is not set -CONFIG_NET_VENDOR_XIRCOM=y -CONFIG_PCMCIA_XIRC2PS=m -CONFIG_FDDI=y -CONFIG_DEFXX=m -# CONFIG_DEFXX_MMIO is not set -CONFIG_SKFP=m -# CONFIG_HIPPI is not set -CONFIG_NET_SB1000=m -CONFIG_MDIO_DEVICE=y -CONFIG_MDIO_BUS=y -CONFIG_MDIO_BITBANG=m -CONFIG_MDIO_GPIO=m -CONFIG_MDIO_I2C=m -CONFIG_MDIO_MSCC_MIIM=m -CONFIG_PHYLINK=m -CONFIG_PHYLIB=y -CONFIG_SWPHY=y -# CONFIG_LED_TRIGGER_PHY is not set - -# -# MII PHY device drivers -# -CONFIG_SFP=m -CONFIG_AMD_PHY=m -CONFIG_AQUANTIA_PHY=m -CONFIG_ASIX_PHY=m -CONFIG_AT803X_PHY=m -CONFIG_BCM7XXX_PHY=m -CONFIG_BCM87XX_PHY=m -CONFIG_BCM_NET_PHYLIB=m -CONFIG_BROADCOM_PHY=m -CONFIG_CICADA_PHY=m -CONFIG_CORTINA_PHY=m -CONFIG_DAVICOM_PHY=m -CONFIG_DP83822_PHY=m -CONFIG_DP83TC811_PHY=m -CONFIG_DP83848_PHY=m -CONFIG_DP83867_PHY=m -CONFIG_FIXED_PHY=y -CONFIG_ICPLUS_PHY=m -CONFIG_INTEL_XWAY_PHY=m -CONFIG_LSI_ET1011C_PHY=m -CONFIG_LXT_PHY=m -CONFIG_MARVELL_PHY=m -CONFIG_MARVELL_10G_PHY=m -CONFIG_MICREL_PHY=m -CONFIG_MICROCHIP_PHY=m -CONFIG_MICROCHIP_T1_PHY=m -CONFIG_MICROSEMI_PHY=m -CONFIG_NATIONAL_PHY=m -CONFIG_QSEMI_PHY=m -CONFIG_REALTEK_PHY=m -CONFIG_RENESAS_PHY=m -CONFIG_ROCKCHIP_PHY=m -CONFIG_SMSC_PHY=m -CONFIG_STE10XP=m -CONFIG_TERANETICS_PHY=m -CONFIG_VITESSE_PHY=m -CONFIG_XILINX_GMII2RGMII=m -CONFIG_MICREL_KS8995MA=m -CONFIG_PLIP=m -CONFIG_PPP=y -CONFIG_PPP_BSDCOMP=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_FILTER=y -CONFIG_PPP_MPPE=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPPOATM=m -CONFIG_PPPOE=m -CONFIG_PPTP=m -CONFIG_PPPOL2TP=m -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_SLIP=m -CONFIG_SLHC=y -CONFIG_SLIP_COMPRESSED=y -CONFIG_SLIP_SMART=y -CONFIG_SLIP_MODE_SLIP6=y -CONFIG_USB_NET_DRIVERS=m -CONFIG_USB_CATC=m -CONFIG_USB_KAWETH=m -CONFIG_USB_PEGASUS=m -CONFIG_USB_RTL8150=m -CONFIG_USB_RTL8152=m -CONFIG_USB_LAN78XX=m -CONFIG_USB_USBNET=m -CONFIG_USB_NET_AX8817X=m -CONFIG_USB_NET_AX88179_178A=m -CONFIG_USB_NET_CDCETHER=m -CONFIG_USB_NET_CDC_EEM=m -CONFIG_USB_NET_CDC_NCM=m -CONFIG_USB_NET_HUAWEI_CDC_NCM=m -CONFIG_USB_NET_CDC_MBIM=m -CONFIG_USB_NET_DM9601=m -CONFIG_USB_NET_SR9700=m -CONFIG_USB_NET_SR9800=m -CONFIG_USB_NET_SMSC75XX=m -CONFIG_USB_NET_SMSC95XX=m -CONFIG_USB_NET_GL620A=m -CONFIG_USB_NET_NET1080=m -CONFIG_USB_NET_PLUSB=m -CONFIG_USB_NET_MCS7830=m -CONFIG_USB_NET_RNDIS_HOST=m -CONFIG_USB_NET_CDC_SUBSET_ENABLE=m -CONFIG_USB_NET_CDC_SUBSET=m -CONFIG_USB_ALI_M5632=y -CONFIG_USB_AN2720=y -CONFIG_USB_BELKIN=y -CONFIG_USB_ARMLINUX=y -CONFIG_USB_EPSON2888=y -CONFIG_USB_KC2190=y -CONFIG_USB_NET_ZAURUS=m -CONFIG_USB_NET_CX82310_ETH=m -CONFIG_USB_NET_KALMIA=m -CONFIG_USB_NET_QMI_WWAN=m -CONFIG_USB_HSO=m -CONFIG_USB_NET_INT51X1=m -CONFIG_USB_CDC_PHONET=m -CONFIG_USB_IPHETH=m -CONFIG_USB_SIERRA_NET=m -CONFIG_USB_VL600=m -CONFIG_USB_NET_CH9200=m -CONFIG_WLAN=y -# CONFIG_WIRELESS_WDS is not set -CONFIG_WLAN_VENDOR_ADMTEK=y -CONFIG_ADM8211=m -CONFIG_ATH_COMMON=m -CONFIG_WLAN_VENDOR_ATH=y -# CONFIG_ATH_DEBUG is not set -CONFIG_ATH5K=m -# CONFIG_ATH5K_DEBUG is not set -# CONFIG_ATH5K_TRACER is not set -CONFIG_ATH5K_PCI=y -CONFIG_ATH9K_HW=m -CONFIG_ATH9K_COMMON=m -CONFIG_ATH9K_COMMON_DEBUG=y -CONFIG_ATH9K_BTCOEX_SUPPORT=y -CONFIG_ATH9K=m -CONFIG_ATH9K_PCI=y -CONFIG_ATH9K_AHB=y -CONFIG_ATH9K_DEBUGFS=y -CONFIG_ATH9K_STATION_STATISTICS=y -# CONFIG_ATH9K_DYNACK is not set -CONFIG_ATH9K_WOW=y -CONFIG_ATH9K_RFKILL=y -CONFIG_ATH9K_CHANNEL_CONTEXT=y -CONFIG_ATH9K_PCOEM=y -CONFIG_ATH9K_HTC=m -CONFIG_ATH9K_HTC_DEBUGFS=y -CONFIG_ATH9K_HWRNG=y -# CONFIG_ATH9K_COMMON_SPECTRAL is not set -CONFIG_CARL9170=m -CONFIG_CARL9170_LEDS=y -# CONFIG_CARL9170_DEBUGFS is not set -CONFIG_CARL9170_WPC=y -CONFIG_CARL9170_HWRNG=y -CONFIG_ATH6KL=m -CONFIG_ATH6KL_SDIO=m -CONFIG_ATH6KL_USB=m -# CONFIG_ATH6KL_DEBUG is not set -# CONFIG_ATH6KL_TRACING is not set -CONFIG_AR5523=m -CONFIG_WIL6210=m -CONFIG_WIL6210_ISR_COR=y -CONFIG_WIL6210_TRACING=y -CONFIG_WIL6210_DEBUGFS=y -CONFIG_ATH10K=m -CONFIG_ATH10K_CE=y -CONFIG_ATH10K_PCI=m -CONFIG_ATH10K_SDIO=m -CONFIG_ATH10K_USB=m -# CONFIG_ATH10K_DEBUG is not set -CONFIG_ATH10K_DEBUGFS=y -# CONFIG_ATH10K_SPECTRAL is not set -CONFIG_ATH10K_TRACING=y -CONFIG_WCN36XX=m -# CONFIG_WCN36XX_DEBUGFS is not set -CONFIG_WLAN_VENDOR_ATMEL=y -CONFIG_ATMEL=m -CONFIG_PCI_ATMEL=m -CONFIG_PCMCIA_ATMEL=m -CONFIG_AT76C50X_USB=m -CONFIG_WLAN_VENDOR_BROADCOM=y -CONFIG_B43=m -CONFIG_B43_BCMA=y -CONFIG_B43_SSB=y -CONFIG_B43_BUSES_BCMA_AND_SSB=y -# CONFIG_B43_BUSES_BCMA is not set -# CONFIG_B43_BUSES_SSB is not set -CONFIG_B43_PCI_AUTOSELECT=y -CONFIG_B43_PCICORE_AUTOSELECT=y -# CONFIG_B43_SDIO is not set -CONFIG_B43_BCMA_PIO=y -CONFIG_B43_PIO=y -CONFIG_B43_PHY_G=y -CONFIG_B43_PHY_N=y -CONFIG_B43_PHY_LP=y -CONFIG_B43_PHY_HT=y -CONFIG_B43_LEDS=y -CONFIG_B43_HWRNG=y -# CONFIG_B43_DEBUG is not set -CONFIG_B43LEGACY=m -CONFIG_B43LEGACY_PCI_AUTOSELECT=y -CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y -CONFIG_B43LEGACY_LEDS=y -CONFIG_B43LEGACY_HWRNG=y -# CONFIG_B43LEGACY_DEBUG is not set -CONFIG_B43LEGACY_DMA=y -CONFIG_B43LEGACY_PIO=y -CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y -# CONFIG_B43LEGACY_DMA_MODE is not set -# CONFIG_B43LEGACY_PIO_MODE is not set -CONFIG_BRCMUTIL=m -CONFIG_BRCMSMAC=m -CONFIG_BRCMFMAC=m -CONFIG_BRCMFMAC_PROTO_BCDC=y -CONFIG_BRCMFMAC_PROTO_MSGBUF=y -CONFIG_BRCMFMAC_SDIO=y -CONFIG_BRCMFMAC_USB=y -CONFIG_BRCMFMAC_PCIE=y -CONFIG_BRCM_TRACING=y -# CONFIG_BRCMDBG is not set -CONFIG_WLAN_VENDOR_CISCO=y -CONFIG_AIRO=m -CONFIG_AIRO_CS=m -CONFIG_WLAN_VENDOR_INTEL=y -CONFIG_IPW2100=m -CONFIG_IPW2100_MONITOR=y -# CONFIG_IPW2100_DEBUG is not set -CONFIG_IPW2200=m -CONFIG_IPW2200_MONITOR=y -CONFIG_IPW2200_RADIOTAP=y -CONFIG_IPW2200_PROMISCUOUS=y -CONFIG_IPW2200_QOS=y -# CONFIG_IPW2200_DEBUG is not set -CONFIG_LIBIPW=m -# CONFIG_LIBIPW_DEBUG is not set -CONFIG_IWLEGACY=m -CONFIG_IWL4965=m -CONFIG_IWL3945=m - -# -# iwl3945 / iwl4965 Debugging Options -# -# CONFIG_IWLEGACY_DEBUG is not set -CONFIG_IWLEGACY_DEBUGFS=y -CONFIG_IWLWIFI=m -CONFIG_IWLWIFI_LEDS=y -CONFIG_IWLDVM=m -CONFIG_IWLMVM=m -CONFIG_IWLWIFI_OPMODE_MODULAR=y -# CONFIG_IWLWIFI_BCAST_FILTERING is not set -# CONFIG_IWLWIFI_PCIE_RTPM is not set - -# -# Debugging Options -# -# CONFIG_IWLWIFI_DEBUG is not set -CONFIG_IWLWIFI_DEBUGFS=y -CONFIG_IWLWIFI_DEVICE_TRACING=y -CONFIG_WLAN_VENDOR_INTERSIL=y -CONFIG_HOSTAP=m -CONFIG_HOSTAP_FIRMWARE=y -CONFIG_HOSTAP_FIRMWARE_NVRAM=y -CONFIG_HOSTAP_PLX=m -CONFIG_HOSTAP_PCI=m -CONFIG_HOSTAP_CS=m -CONFIG_HERMES=m -# CONFIG_HERMES_PRISM is not set -CONFIG_HERMES_CACHE_FW_ON_INIT=y -CONFIG_PLX_HERMES=m -CONFIG_TMD_HERMES=m -CONFIG_NORTEL_HERMES=m -CONFIG_PCMCIA_HERMES=m -CONFIG_PCMCIA_SPECTRUM=m -CONFIG_ORINOCO_USB=m -CONFIG_P54_COMMON=m -CONFIG_P54_USB=m -CONFIG_P54_PCI=m -CONFIG_P54_SPI=m -# CONFIG_P54_SPI_DEFAULT_EEPROM is not set -CONFIG_P54_LEDS=y -# CONFIG_PRISM54 is not set -CONFIG_WLAN_VENDOR_MARVELL=y -CONFIG_LIBERTAS=m -CONFIG_LIBERTAS_USB=m -CONFIG_LIBERTAS_CS=m -CONFIG_LIBERTAS_SDIO=m -CONFIG_LIBERTAS_SPI=m -# CONFIG_LIBERTAS_DEBUG is not set -CONFIG_LIBERTAS_MESH=y -CONFIG_LIBERTAS_THINFIRM=m -# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set -CONFIG_LIBERTAS_THINFIRM_USB=m -CONFIG_MWIFIEX=m -CONFIG_MWIFIEX_SDIO=m -CONFIG_MWIFIEX_PCIE=m -CONFIG_MWIFIEX_USB=m -CONFIG_MWL8K=m -CONFIG_WLAN_VENDOR_MEDIATEK=y -CONFIG_MT7601U=m -CONFIG_MT76_CORE=m -CONFIG_MT76x2E=m -CONFIG_WLAN_VENDOR_RALINK=y -CONFIG_RT2X00=m -CONFIG_RT2400PCI=m -CONFIG_RT2500PCI=m -CONFIG_RT61PCI=m -CONFIG_RT2800PCI=m -CONFIG_RT2800PCI_RT33XX=y -CONFIG_RT2800PCI_RT35XX=y -CONFIG_RT2800PCI_RT53XX=y -CONFIG_RT2800PCI_RT3290=y -CONFIG_RT2500USB=m -CONFIG_RT73USB=m -CONFIG_RT2800USB=m -CONFIG_RT2800USB_RT33XX=y -CONFIG_RT2800USB_RT35XX=y -CONFIG_RT2800USB_RT3573=y -CONFIG_RT2800USB_RT53XX=y -CONFIG_RT2800USB_RT55XX=y -CONFIG_RT2800USB_UNKNOWN=y -CONFIG_RT2800_LIB=m -CONFIG_RT2800_LIB_MMIO=m -CONFIG_RT2X00_LIB_MMIO=m -CONFIG_RT2X00_LIB_PCI=m -CONFIG_RT2X00_LIB_USB=m -CONFIG_RT2X00_LIB=m -CONFIG_RT2X00_LIB_FIRMWARE=y -CONFIG_RT2X00_LIB_CRYPTO=y -CONFIG_RT2X00_LIB_LEDS=y -# CONFIG_RT2X00_LIB_DEBUGFS is not set -# CONFIG_RT2X00_DEBUG is not set -CONFIG_WLAN_VENDOR_REALTEK=y -CONFIG_RTL8180=m -CONFIG_RTL8187=m -CONFIG_RTL8187_LEDS=y -CONFIG_RTL_CARDS=m -CONFIG_RTL8192CE=m -CONFIG_RTL8192SE=m -CONFIG_RTL8192DE=m -CONFIG_RTL8723AE=m -CONFIG_RTL8723BE=m -CONFIG_RTL8188EE=m -CONFIG_RTL8192EE=m -CONFIG_RTL8821AE=m -CONFIG_RTL8192CU=m -CONFIG_RTLWIFI=m -CONFIG_RTLWIFI_PCI=m -CONFIG_RTLWIFI_USB=m -# CONFIG_RTLWIFI_DEBUG is not set -CONFIG_RTL8192C_COMMON=m -CONFIG_RTL8723_COMMON=m -CONFIG_RTLBTCOEXIST=m -CONFIG_RTL8XXXU=m -CONFIG_RTL8XXXU_UNTESTED=y -CONFIG_WLAN_VENDOR_RSI=y -CONFIG_RSI_91X=m -# CONFIG_RSI_DEBUGFS is not set -CONFIG_RSI_SDIO=m -CONFIG_RSI_USB=m -CONFIG_RSI_COEX=y -CONFIG_WLAN_VENDOR_ST=y -CONFIG_CW1200=m -CONFIG_CW1200_WLAN_SDIO=m -CONFIG_CW1200_WLAN_SPI=m -CONFIG_WLAN_VENDOR_TI=y -CONFIG_WL1251=m -CONFIG_WL1251_SPI=m -CONFIG_WL1251_SDIO=m -CONFIG_WL12XX=m -CONFIG_WL18XX=m -CONFIG_WLCORE=m -CONFIG_WLCORE_SDIO=m -CONFIG_WILINK_PLATFORM_DATA=y -CONFIG_WLAN_VENDOR_ZYDAS=y -CONFIG_USB_ZD1201=m -CONFIG_ZD1211RW=m -# CONFIG_ZD1211RW_DEBUG is not set -CONFIG_WLAN_VENDOR_QUANTENNA=y -CONFIG_QTNFMAC=m -CONFIG_QTNFMAC_PEARL_PCIE=m -CONFIG_PCMCIA_RAYCS=m -CONFIG_PCMCIA_WL3501=m -CONFIG_MAC80211_HWSIM=m -CONFIG_USB_NET_RNDIS_WLAN=m - -# -# WiMAX Wireless Broadband devices -# -CONFIG_WIMAX_I2400M=m -CONFIG_WIMAX_I2400M_USB=m -CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 -CONFIG_WAN=y -CONFIG_HOSTESS_SV11=m -CONFIG_COSA=m -CONFIG_LANMEDIA=m -CONFIG_SEALEVEL_4021=m -CONFIG_HDLC=m -CONFIG_HDLC_RAW=m -CONFIG_HDLC_RAW_ETH=m -CONFIG_HDLC_CISCO=m -CONFIG_HDLC_FR=m -CONFIG_HDLC_PPP=m -CONFIG_HDLC_X25=m -CONFIG_PCI200SYN=m -CONFIG_WANXL=m -CONFIG_PC300TOO=m -CONFIG_N2=m -CONFIG_C101=m -CONFIG_FARSYNC=m -CONFIG_DSCC4=m -CONFIG_DSCC4_PCISYNC=y -CONFIG_DSCC4_PCI_RST=y -CONFIG_DLCI=m -CONFIG_DLCI_MAX=8 -CONFIG_SDLA=m -CONFIG_LAPBETHER=m -CONFIG_X25_ASY=m -CONFIG_SBNI=m -# CONFIG_SBNI_MULTILINE is not set -CONFIG_IEEE802154_DRIVERS=m -CONFIG_IEEE802154_FAKELB=m -CONFIG_IEEE802154_AT86RF230=m -CONFIG_IEEE802154_AT86RF230_DEBUGFS=y -CONFIG_IEEE802154_MRF24J40=m -CONFIG_IEEE802154_CC2520=m -CONFIG_IEEE802154_ATUSB=m -CONFIG_IEEE802154_ADF7242=m -CONFIG_IEEE802154_CA8210=m -# CONFIG_IEEE802154_CA8210_DEBUGFS is not set -CONFIG_IEEE802154_MCR20A=m -CONFIG_XEN_NETDEV_FRONTEND=y -CONFIG_XEN_NETDEV_BACKEND=m -CONFIG_VMXNET3=m -CONFIG_FUJITSU_ES=m -CONFIG_THUNDERBOLT_NET=m -CONFIG_HYPERV_NET=m -CONFIG_NETDEVSIM=m -CONFIG_NET_FAILOVER=y -CONFIG_ISDN=y -CONFIG_ISDN_I4L=m -CONFIG_ISDN_PPP=y -CONFIG_ISDN_PPP_VJ=y -CONFIG_ISDN_MPP=y -CONFIG_IPPP_FILTER=y -CONFIG_ISDN_PPP_BSDCOMP=m -CONFIG_ISDN_AUDIO=y -CONFIG_ISDN_TTY_FAX=y -CONFIG_ISDN_X25=y - -# -# ISDN feature submodules -# -CONFIG_ISDN_DIVERSION=m - -# -# ISDN4Linux hardware drivers -# - -# -# Passive cards -# -CONFIG_ISDN_DRV_HISAX=m - -# -# D-channel protocol features -# -CONFIG_HISAX_EURO=y -CONFIG_DE_AOC=y -# CONFIG_HISAX_NO_SENDCOMPLETE is not set -# CONFIG_HISAX_NO_LLC is not set -# CONFIG_HISAX_NO_KEYPAD is not set -CONFIG_HISAX_1TR6=y -CONFIG_HISAX_NI1=y -CONFIG_HISAX_MAX_CARDS=8 - -# -# HiSax supported cards -# -CONFIG_HISAX_16_0=y -CONFIG_HISAX_16_3=y -CONFIG_HISAX_TELESPCI=y -CONFIG_HISAX_S0BOX=y -CONFIG_HISAX_AVM_A1=y -CONFIG_HISAX_FRITZPCI=y -CONFIG_HISAX_AVM_A1_PCMCIA=y -CONFIG_HISAX_ELSA=y -CONFIG_HISAX_IX1MICROR2=y -CONFIG_HISAX_DIEHLDIVA=y -CONFIG_HISAX_ASUSCOM=y -CONFIG_HISAX_TELEINT=y -CONFIG_HISAX_HFCS=y -CONFIG_HISAX_SEDLBAUER=y -CONFIG_HISAX_SPORTSTER=y -CONFIG_HISAX_MIC=y -CONFIG_HISAX_NETJET=y -CONFIG_HISAX_NETJET_U=y -CONFIG_HISAX_NICCY=y -CONFIG_HISAX_ISURF=y -CONFIG_HISAX_HSTSAPHIR=y -CONFIG_HISAX_BKM_A4T=y -CONFIG_HISAX_SCT_QUADRO=y -CONFIG_HISAX_GAZEL=y -CONFIG_HISAX_HFC_PCI=y -CONFIG_HISAX_W6692=y -CONFIG_HISAX_HFC_SX=y -CONFIG_HISAX_ENTERNOW_PCI=y -# CONFIG_HISAX_DEBUG is not set - -# -# HiSax PCMCIA card service modules -# -CONFIG_HISAX_SEDLBAUER_CS=m -CONFIG_HISAX_ELSA_CS=m -CONFIG_HISAX_AVM_A1_CS=m -CONFIG_HISAX_TELES_CS=m - -# -# HiSax sub driver modules -# -CONFIG_HISAX_ST5481=m -CONFIG_HISAX_HFCUSB=m -CONFIG_HISAX_HFC4S8S=m -CONFIG_HISAX_FRITZ_PCIPNP=m -CONFIG_ISDN_CAPI=m -CONFIG_CAPI_TRACE=y -CONFIG_ISDN_CAPI_CAPI20=m -CONFIG_ISDN_CAPI_MIDDLEWARE=y -CONFIG_ISDN_CAPI_CAPIDRV=m -# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set - -# -# CAPI hardware drivers -# -CONFIG_CAPI_AVM=y -CONFIG_ISDN_DRV_AVMB1_B1ISA=m -CONFIG_ISDN_DRV_AVMB1_B1PCI=m -CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y -CONFIG_ISDN_DRV_AVMB1_T1ISA=m -CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m -CONFIG_ISDN_DRV_AVMB1_AVM_CS=m -CONFIG_ISDN_DRV_AVMB1_T1PCI=m -CONFIG_ISDN_DRV_AVMB1_C4=m -CONFIG_CAPI_EICON=y -CONFIG_ISDN_DIVAS=m -CONFIG_ISDN_DIVAS_BRIPCI=y -CONFIG_ISDN_DIVAS_PRIPCI=y -CONFIG_ISDN_DIVAS_DIVACAPI=m -CONFIG_ISDN_DIVAS_USERIDI=m -CONFIG_ISDN_DIVAS_MAINT=m -CONFIG_ISDN_DRV_GIGASET=m -# CONFIG_GIGASET_CAPI is not set -CONFIG_GIGASET_I4L=y -CONFIG_GIGASET_BASE=m -CONFIG_GIGASET_M105=m -CONFIG_GIGASET_M101=m -# CONFIG_GIGASET_DEBUG is not set -CONFIG_HYSDN=m -CONFIG_HYSDN_CAPI=y -CONFIG_MISDN=m -CONFIG_MISDN_DSP=m -CONFIG_MISDN_L1OIP=m - -# -# mISDN hardware drivers -# -CONFIG_MISDN_HFCPCI=m -CONFIG_MISDN_HFCMULTI=m -CONFIG_MISDN_HFCUSB=m -CONFIG_MISDN_AVMFRITZ=m -CONFIG_MISDN_SPEEDFAX=m -CONFIG_MISDN_INFINEON=m -CONFIG_MISDN_W6692=m -CONFIG_MISDN_NETJET=m -CONFIG_MISDN_IPAC=m -CONFIG_MISDN_ISAR=m -CONFIG_ISDN_HDLC=m -CONFIG_NVM=y -# CONFIG_NVM_DEBUG is not set -CONFIG_NVM_PBLK=m - -# -# Input device support -# -CONFIG_INPUT=y -CONFIG_INPUT_LEDS=m -CONFIG_INPUT_FF_MEMLESS=m -CONFIG_INPUT_POLLDEV=m -CONFIG_INPUT_SPARSEKMAP=m -CONFIG_INPUT_MATRIXKMAP=m - -# -# Userland interfaces -# -CONFIG_INPUT_MOUSEDEV=y -CONFIG_INPUT_MOUSEDEV_PSAUX=y -CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 -CONFIG_INPUT_JOYDEV=m -CONFIG_INPUT_EVDEV=y -# CONFIG_INPUT_EVBUG is not set - -# -# Input Device Drivers -# -CONFIG_INPUT_KEYBOARD=y -CONFIG_KEYBOARD_ADC=m -CONFIG_KEYBOARD_ADP5520=m -CONFIG_KEYBOARD_ADP5588=m -CONFIG_KEYBOARD_ADP5589=m -CONFIG_KEYBOARD_ATKBD=y -CONFIG_KEYBOARD_QT1070=m -CONFIG_KEYBOARD_QT2160=m -CONFIG_KEYBOARD_DLINK_DIR685=m -CONFIG_KEYBOARD_LKKBD=m -CONFIG_KEYBOARD_GPIO=m -CONFIG_KEYBOARD_GPIO_POLLED=m -CONFIG_KEYBOARD_TCA6416=m -CONFIG_KEYBOARD_TCA8418=m -CONFIG_KEYBOARD_MATRIX=m -CONFIG_KEYBOARD_LM8323=m -CONFIG_KEYBOARD_LM8333=m -CONFIG_KEYBOARD_MAX7359=m -CONFIG_KEYBOARD_MCS=m -CONFIG_KEYBOARD_MPR121=m -CONFIG_KEYBOARD_NEWTON=m -CONFIG_KEYBOARD_OPENCORES=m -CONFIG_KEYBOARD_SAMSUNG=m -CONFIG_KEYBOARD_STOWAWAY=m -CONFIG_KEYBOARD_SUNKBD=m -CONFIG_KEYBOARD_TM2_TOUCHKEY=m -CONFIG_KEYBOARD_TWL4030=m -CONFIG_KEYBOARD_XTKBD=m -CONFIG_KEYBOARD_CROS_EC=m -CONFIG_KEYBOARD_MTK_PMIC=m -CONFIG_INPUT_MOUSE=y -CONFIG_MOUSE_PS2=m -CONFIG_MOUSE_PS2_ALPS=y -CONFIG_MOUSE_PS2_BYD=y -CONFIG_MOUSE_PS2_LOGIPS2PP=y -CONFIG_MOUSE_PS2_SYNAPTICS=y -CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y -CONFIG_MOUSE_PS2_CYPRESS=y -CONFIG_MOUSE_PS2_LIFEBOOK=y -CONFIG_MOUSE_PS2_TRACKPOINT=y -CONFIG_MOUSE_PS2_ELANTECH=y -CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y -CONFIG_MOUSE_PS2_SENTELIC=y -CONFIG_MOUSE_PS2_TOUCHKIT=y -CONFIG_MOUSE_PS2_FOCALTECH=y -CONFIG_MOUSE_PS2_VMMOUSE=y -CONFIG_MOUSE_PS2_SMBUS=y -CONFIG_MOUSE_SERIAL=m -CONFIG_MOUSE_APPLETOUCH=m -CONFIG_MOUSE_BCM5974=m -CONFIG_MOUSE_CYAPA=m -CONFIG_MOUSE_ELAN_I2C=m -CONFIG_MOUSE_ELAN_I2C_I2C=y -CONFIG_MOUSE_ELAN_I2C_SMBUS=y -# CONFIG_MOUSE_INPORT is not set -CONFIG_MOUSE_LOGIBM=m -CONFIG_MOUSE_PC110PAD=m -CONFIG_MOUSE_VSXXXAA=m -CONFIG_MOUSE_GPIO=m -CONFIG_MOUSE_SYNAPTICS_I2C=m -CONFIG_MOUSE_SYNAPTICS_USB=m -CONFIG_INPUT_JOYSTICK=y -CONFIG_JOYSTICK_ANALOG=m -CONFIG_JOYSTICK_A3D=m -CONFIG_JOYSTICK_ADI=m -CONFIG_JOYSTICK_COBRA=m -CONFIG_JOYSTICK_GF2K=m -CONFIG_JOYSTICK_GRIP=m -CONFIG_JOYSTICK_GRIP_MP=m -CONFIG_JOYSTICK_GUILLEMOT=m -CONFIG_JOYSTICK_INTERACT=m -CONFIG_JOYSTICK_SIDEWINDER=m -CONFIG_JOYSTICK_TMDC=m -CONFIG_JOYSTICK_IFORCE=m -CONFIG_JOYSTICK_IFORCE_USB=y -CONFIG_JOYSTICK_IFORCE_232=y -CONFIG_JOYSTICK_WARRIOR=m -CONFIG_JOYSTICK_MAGELLAN=m -CONFIG_JOYSTICK_SPACEORB=m -CONFIG_JOYSTICK_SPACEBALL=m -CONFIG_JOYSTICK_STINGER=m -CONFIG_JOYSTICK_TWIDJOY=m -CONFIG_JOYSTICK_ZHENHUA=m -CONFIG_JOYSTICK_DB9=m -CONFIG_JOYSTICK_GAMECON=m -CONFIG_JOYSTICK_TURBOGRAFX=m -CONFIG_JOYSTICK_AS5011=m -CONFIG_JOYSTICK_JOYDUMP=m -CONFIG_JOYSTICK_XPAD=m -CONFIG_JOYSTICK_XPAD_FF=y -CONFIG_JOYSTICK_XPAD_LEDS=y -CONFIG_JOYSTICK_WALKERA0701=m -CONFIG_JOYSTICK_PSXPAD_SPI=m -# CONFIG_JOYSTICK_PSXPAD_SPI_FF is not set -CONFIG_JOYSTICK_PXRC=m -CONFIG_INPUT_TABLET=y -CONFIG_TABLET_USB_ACECAD=m -CONFIG_TABLET_USB_AIPTEK=m -CONFIG_TABLET_USB_GTCO=m -CONFIG_TABLET_USB_HANWANG=m -CONFIG_TABLET_USB_KBTAB=m -CONFIG_TABLET_USB_PEGASUS=m -CONFIG_TABLET_SERIAL_WACOM4=m -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_PROPERTIES=y -CONFIG_TOUCHSCREEN_88PM860X=m -CONFIG_TOUCHSCREEN_ADS7846=m -CONFIG_TOUCHSCREEN_AD7877=m -CONFIG_TOUCHSCREEN_AD7879=m -CONFIG_TOUCHSCREEN_AD7879_I2C=m -CONFIG_TOUCHSCREEN_AD7879_SPI=m -CONFIG_TOUCHSCREEN_ATMEL_MXT=m -# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set -CONFIG_TOUCHSCREEN_AUO_PIXCIR=m -CONFIG_TOUCHSCREEN_BU21013=m -CONFIG_TOUCHSCREEN_CHIPONE_ICN8505=m -CONFIG_TOUCHSCREEN_CY8CTMG110=m -CONFIG_TOUCHSCREEN_CYTTSP_CORE=m -CONFIG_TOUCHSCREEN_CYTTSP_I2C=m -CONFIG_TOUCHSCREEN_CYTTSP_SPI=m -CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m -CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m -CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m -CONFIG_TOUCHSCREEN_DA9034=m -CONFIG_TOUCHSCREEN_DA9052=m -CONFIG_TOUCHSCREEN_DYNAPRO=m -CONFIG_TOUCHSCREEN_HAMPSHIRE=m -CONFIG_TOUCHSCREEN_EETI=m -CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m -CONFIG_TOUCHSCREEN_EXC3000=m -CONFIG_TOUCHSCREEN_FUJITSU=m -CONFIG_TOUCHSCREEN_GOODIX=m -CONFIG_TOUCHSCREEN_HIDEEP=m -CONFIG_TOUCHSCREEN_ILI210X=m -CONFIG_TOUCHSCREEN_S6SY761=m -CONFIG_TOUCHSCREEN_GUNZE=m -CONFIG_TOUCHSCREEN_EKTF2127=m -CONFIG_TOUCHSCREEN_ELAN=m -CONFIG_TOUCHSCREEN_ELO=m -CONFIG_TOUCHSCREEN_WACOM_W8001=m -CONFIG_TOUCHSCREEN_WACOM_I2C=m -CONFIG_TOUCHSCREEN_MAX11801=m -CONFIG_TOUCHSCREEN_MCS5000=m -CONFIG_TOUCHSCREEN_MMS114=m -CONFIG_TOUCHSCREEN_MELFAS_MIP4=m -CONFIG_TOUCHSCREEN_MTOUCH=m -CONFIG_TOUCHSCREEN_INEXIO=m -CONFIG_TOUCHSCREEN_MK712=m -CONFIG_TOUCHSCREEN_HTCPEN=m -CONFIG_TOUCHSCREEN_PENMOUNT=m -CONFIG_TOUCHSCREEN_EDT_FT5X06=m -CONFIG_TOUCHSCREEN_TOUCHRIGHT=m -CONFIG_TOUCHSCREEN_TOUCHWIN=m -CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m -CONFIG_TOUCHSCREEN_UCB1400=m -CONFIG_TOUCHSCREEN_PIXCIR=m -CONFIG_TOUCHSCREEN_WDT87XX_I2C=m -CONFIG_TOUCHSCREEN_WM831X=m -CONFIG_TOUCHSCREEN_WM97XX=m -CONFIG_TOUCHSCREEN_WM9705=y -CONFIG_TOUCHSCREEN_WM9712=y -CONFIG_TOUCHSCREEN_WM9713=y -CONFIG_TOUCHSCREEN_USB_COMPOSITE=m -CONFIG_TOUCHSCREEN_MC13783=m -CONFIG_TOUCHSCREEN_USB_EGALAX=y -CONFIG_TOUCHSCREEN_USB_PANJIT=y -CONFIG_TOUCHSCREEN_USB_3M=y -CONFIG_TOUCHSCREEN_USB_ITM=y -CONFIG_TOUCHSCREEN_USB_ETURBO=y -CONFIG_TOUCHSCREEN_USB_GUNZE=y -CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y -CONFIG_TOUCHSCREEN_USB_IRTOUCH=y -CONFIG_TOUCHSCREEN_USB_IDEALTEK=y -CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y -CONFIG_TOUCHSCREEN_USB_GOTOP=y -CONFIG_TOUCHSCREEN_USB_JASTEC=y -CONFIG_TOUCHSCREEN_USB_ELO=y -CONFIG_TOUCHSCREEN_USB_E2I=y -CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y -CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y -CONFIG_TOUCHSCREEN_USB_NEXIO=y -CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y -CONFIG_TOUCHSCREEN_TOUCHIT213=m -CONFIG_TOUCHSCREEN_TSC_SERIO=m -CONFIG_TOUCHSCREEN_TSC200X_CORE=m -CONFIG_TOUCHSCREEN_TSC2004=m -CONFIG_TOUCHSCREEN_TSC2005=m -CONFIG_TOUCHSCREEN_TSC2007=m -# CONFIG_TOUCHSCREEN_TSC2007_IIO is not set -CONFIG_TOUCHSCREEN_PCAP=m -CONFIG_TOUCHSCREEN_RM_TS=m -CONFIG_TOUCHSCREEN_SILEAD=m -CONFIG_TOUCHSCREEN_SIS_I2C=m -CONFIG_TOUCHSCREEN_ST1232=m -CONFIG_TOUCHSCREEN_STMFTS=m -CONFIG_TOUCHSCREEN_SUR40=m -CONFIG_TOUCHSCREEN_SURFACE3_SPI=m -CONFIG_TOUCHSCREEN_SX8654=m -CONFIG_TOUCHSCREEN_TPS6507X=m -CONFIG_TOUCHSCREEN_ZET6223=m -CONFIG_TOUCHSCREEN_ZFORCE=m -CONFIG_TOUCHSCREEN_ROHM_BU21023=m -CONFIG_INPUT_MISC=y -CONFIG_INPUT_88PM860X_ONKEY=m -CONFIG_INPUT_88PM80X_ONKEY=m -CONFIG_INPUT_AD714X=m -CONFIG_INPUT_AD714X_I2C=m -CONFIG_INPUT_AD714X_SPI=m -CONFIG_INPUT_ARIZONA_HAPTICS=m -CONFIG_INPUT_BMA150=m -CONFIG_INPUT_E3X0_BUTTON=m -CONFIG_INPUT_PCSPKR=m -CONFIG_INPUT_MAX77693_HAPTIC=m -CONFIG_INPUT_MAX8925_ONKEY=m -CONFIG_INPUT_MAX8997_HAPTIC=m -CONFIG_INPUT_MC13783_PWRBUTTON=m -CONFIG_INPUT_MMA8450=m -CONFIG_INPUT_APANEL=m -CONFIG_INPUT_GP2A=m -CONFIG_INPUT_GPIO_BEEPER=m -CONFIG_INPUT_GPIO_DECODER=m -CONFIG_INPUT_WISTRON_BTNS=m -CONFIG_INPUT_ATLAS_BTNS=m -CONFIG_INPUT_ATI_REMOTE2=m -CONFIG_INPUT_KEYSPAN_REMOTE=m -CONFIG_INPUT_KXTJ9=m -# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set -CONFIG_INPUT_POWERMATE=m -CONFIG_INPUT_YEALINK=m -CONFIG_INPUT_CM109=m -CONFIG_INPUT_REGULATOR_HAPTIC=m -CONFIG_INPUT_RETU_PWRBUTTON=m -CONFIG_INPUT_AXP20X_PEK=m -CONFIG_INPUT_TWL4030_PWRBUTTON=m -CONFIG_INPUT_TWL4030_VIBRA=m -CONFIG_INPUT_TWL6040_VIBRA=m -CONFIG_INPUT_UINPUT=y -CONFIG_INPUT_PALMAS_PWRBUTTON=m -CONFIG_INPUT_PCF50633_PMU=m -CONFIG_INPUT_PCF8574=m -CONFIG_INPUT_PWM_BEEPER=m -CONFIG_INPUT_PWM_VIBRA=m -CONFIG_INPUT_GPIO_ROTARY_ENCODER=m -CONFIG_INPUT_DA9052_ONKEY=m -CONFIG_INPUT_DA9055_ONKEY=m -CONFIG_INPUT_DA9063_ONKEY=m -CONFIG_INPUT_WM831X_ON=m -CONFIG_INPUT_PCAP=m -CONFIG_INPUT_ADXL34X=m -CONFIG_INPUT_ADXL34X_I2C=m -CONFIG_INPUT_ADXL34X_SPI=m -CONFIG_INPUT_IMS_PCU=m -CONFIG_INPUT_CMA3000=m -CONFIG_INPUT_CMA3000_I2C=m -CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m -CONFIG_INPUT_IDEAPAD_SLIDEBAR=m -CONFIG_INPUT_SOC_BUTTON_ARRAY=m -CONFIG_INPUT_DRV260X_HAPTICS=m -CONFIG_INPUT_DRV2665_HAPTICS=m -CONFIG_INPUT_DRV2667_HAPTICS=m -CONFIG_INPUT_RAVE_SP_PWRBUTTON=m -CONFIG_RMI4_CORE=m -CONFIG_RMI4_I2C=m -CONFIG_RMI4_SPI=m -CONFIG_RMI4_SMB=m -CONFIG_RMI4_F03=y -CONFIG_RMI4_F03_SERIO=m -CONFIG_RMI4_2D_SENSOR=y -CONFIG_RMI4_F11=y -CONFIG_RMI4_F12=y -CONFIG_RMI4_F30=y -# CONFIG_RMI4_F34 is not set -# CONFIG_RMI4_F54 is not set -CONFIG_RMI4_F55=y - -# -# Hardware I/O ports -# -CONFIG_SERIO=y -CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y -CONFIG_SERIO_I8042=y -CONFIG_SERIO_SERPORT=m -CONFIG_SERIO_CT82C710=m -CONFIG_SERIO_PARKBD=m -CONFIG_SERIO_PCIPS2=m -CONFIG_SERIO_LIBPS2=y -CONFIG_SERIO_RAW=m -CONFIG_SERIO_ALTERA_PS2=m -CONFIG_SERIO_PS2MULT=m -CONFIG_SERIO_ARC_PS2=m -CONFIG_HYPERV_KEYBOARD=m -CONFIG_SERIO_GPIO_PS2=m -CONFIG_USERIO=m -CONFIG_GAMEPORT=m -CONFIG_GAMEPORT_NS558=m -CONFIG_GAMEPORT_L4=m -CONFIG_GAMEPORT_EMU10K1=m -CONFIG_GAMEPORT_FM801=m - -# -# Character devices -# -CONFIG_TTY=y -CONFIG_VT=y -CONFIG_CONSOLE_TRANSLATIONS=y -CONFIG_VT_CONSOLE=y -CONFIG_VT_CONSOLE_SLEEP=y -CONFIG_HW_CONSOLE=y -CONFIG_VT_HW_CONSOLE_BINDING=y -CONFIG_UNIX98_PTYS=y -CONFIG_LEGACY_PTYS=y -CONFIG_LEGACY_PTY_COUNT=0 -CONFIG_SERIAL_NONSTANDARD=y -CONFIG_ROCKETPORT=m -CONFIG_CYCLADES=m -# CONFIG_CYZ_INTR is not set -CONFIG_MOXA_INTELLIO=m -CONFIG_MOXA_SMARTIO=m -CONFIG_SYNCLINK=m -CONFIG_SYNCLINKMP=m -CONFIG_SYNCLINK_GT=m -CONFIG_NOZOMI=m -CONFIG_ISI=m -CONFIG_N_HDLC=m -CONFIG_N_GSM=m -CONFIG_TRACE_ROUTER=m -CONFIG_TRACE_SINK=m -CONFIG_DEVMEM=y -# CONFIG_DEVKMEM is not set - -# -# Serial drivers -# -CONFIG_SERIAL_EARLYCON=y -CONFIG_SERIAL_8250=y -# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set -CONFIG_SERIAL_8250_PNP=y -# CONFIG_SERIAL_8250_FINTEK is not set -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_DMA=y -CONFIG_SERIAL_8250_PCI=y -CONFIG_SERIAL_8250_EXAR=m -CONFIG_SERIAL_8250_CS=m -CONFIG_SERIAL_8250_MEN_MCB=m -CONFIG_SERIAL_8250_NR_UARTS=48 -CONFIG_SERIAL_8250_RUNTIME_UARTS=32 -CONFIG_SERIAL_8250_EXTENDED=y -CONFIG_SERIAL_8250_MANY_PORTS=y -CONFIG_SERIAL_8250_FOURPORT=m -CONFIG_SERIAL_8250_ACCENT=m -CONFIG_SERIAL_8250_BOCA=m -CONFIG_SERIAL_8250_EXAR_ST16C554=m -CONFIG_SERIAL_8250_HUB6=m -CONFIG_SERIAL_8250_SHARE_IRQ=y -# CONFIG_SERIAL_8250_DETECT_IRQ is not set -CONFIG_SERIAL_8250_RSA=y -CONFIG_SERIAL_8250_DW=m -CONFIG_SERIAL_8250_RT288X=y -CONFIG_SERIAL_8250_LPSS=m -CONFIG_SERIAL_8250_MID=m -CONFIG_SERIAL_8250_MOXA=m - -# -# Non-8250 serial port support -# -CONFIG_SERIAL_KGDB_NMI=y -CONFIG_SERIAL_MAX3100=m -CONFIG_SERIAL_MAX310X=y -CONFIG_SERIAL_UARTLITE=m -CONFIG_SERIAL_UARTLITE_NR_UARTS=1 -CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_CORE_CONSOLE=y -CONFIG_CONSOLE_POLL=y -CONFIG_SERIAL_JSM=m -CONFIG_SERIAL_SCCNXP=y -CONFIG_SERIAL_SCCNXP_CONSOLE=y -CONFIG_SERIAL_SC16IS7XX_CORE=m -CONFIG_SERIAL_SC16IS7XX=m -CONFIG_SERIAL_SC16IS7XX_I2C=y -CONFIG_SERIAL_SC16IS7XX_SPI=y -CONFIG_SERIAL_TIMBERDALE=m -CONFIG_SERIAL_ALTERA_JTAGUART=m -CONFIG_SERIAL_ALTERA_UART=m -CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 -CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200 -# CONFIG_SERIAL_IFX6X60 is not set -CONFIG_SERIAL_PCH_UART=m -CONFIG_SERIAL_ARC=m -CONFIG_SERIAL_ARC_NR_PORTS=1 -CONFIG_SERIAL_RP2=m -CONFIG_SERIAL_RP2_NR_UARTS=32 -CONFIG_SERIAL_FSL_LPUART=m -CONFIG_SERIAL_MEN_Z135=m -CONFIG_SERIAL_DEV_BUS=y -CONFIG_SERIAL_DEV_CTRL_TTYPORT=y -CONFIG_TTY_PRINTK=y -CONFIG_PRINTER=m -# CONFIG_LP_CONSOLE is not set -CONFIG_PPDEV=m -CONFIG_HVC_DRIVER=y -CONFIG_HVC_IRQ=y -CONFIG_HVC_XEN=y -CONFIG_HVC_XEN_FRONTEND=y -CONFIG_VIRTIO_CONSOLE=y -CONFIG_IPMI_HANDLER=m -CONFIG_IPMI_DMI_DECODE=y -# CONFIG_IPMI_PANIC_EVENT is not set -CONFIG_IPMI_DEVICE_INTERFACE=m -CONFIG_IPMI_SI=m -CONFIG_IPMI_SSIF=m -CONFIG_IPMI_WATCHDOG=m -CONFIG_IPMI_POWEROFF=m -CONFIG_HW_RANDOM=y -CONFIG_HW_RANDOM_TIMERIOMEM=m -CONFIG_HW_RANDOM_INTEL=m -CONFIG_HW_RANDOM_AMD=m -CONFIG_HW_RANDOM_GEODE=m -CONFIG_HW_RANDOM_VIA=m -CONFIG_HW_RANDOM_VIRTIO=m -CONFIG_NVRAM=m -CONFIG_DTLK=m -CONFIG_R3964=m -CONFIG_APPLICOM=m -CONFIG_SONYPI=m - -# -# PCMCIA character devices -# -CONFIG_SYNCLINK_CS=m -CONFIG_CARDMAN_4000=m -CONFIG_CARDMAN_4040=m -CONFIG_SCR24X=m -CONFIG_IPWIRELESS=m -CONFIG_MWAVE=m -CONFIG_SCx200_GPIO=m -CONFIG_PC8736x_GPIO=m -CONFIG_NSC_GPIO=m -CONFIG_RAW_DRIVER=m -CONFIG_MAX_RAW_DEVS=256 -CONFIG_HPET=y -CONFIG_HPET_MMAP=y -CONFIG_HPET_MMAP_DEFAULT=y -CONFIG_HANGCHECK_TIMER=m -CONFIG_TCG_TPM=y -CONFIG_HW_RANDOM_TPM=y -CONFIG_TCG_TIS_CORE=y -CONFIG_TCG_TIS=y -CONFIG_TCG_TIS_SPI=m -CONFIG_TCG_TIS_I2C_ATMEL=m -CONFIG_TCG_TIS_I2C_INFINEON=m -CONFIG_TCG_TIS_I2C_NUVOTON=m -CONFIG_TCG_NSC=m -CONFIG_TCG_ATMEL=m -CONFIG_TCG_INFINEON=m -CONFIG_TCG_XEN=m -CONFIG_TCG_CRB=y -CONFIG_TCG_VTPM_PROXY=m -CONFIG_TCG_TIS_ST33ZP24=m -CONFIG_TCG_TIS_ST33ZP24_I2C=m -CONFIG_TCG_TIS_ST33ZP24_SPI=m -CONFIG_TELCLOCK=m -CONFIG_DEVPORT=y -CONFIG_XILLYBUS=m -CONFIG_XILLYBUS_PCIE=m - -# -# I2C support -# -CONFIG_I2C=y -CONFIG_ACPI_I2C_OPREGION=y -CONFIG_I2C_BOARDINFO=y -CONFIG_I2C_COMPAT=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_MUX=m - -# -# Multiplexer I2C Chip support -# -CONFIG_I2C_MUX_GPIO=m -CONFIG_I2C_MUX_LTC4306=m -CONFIG_I2C_MUX_PCA9541=m -CONFIG_I2C_MUX_PCA954x=m -CONFIG_I2C_MUX_REG=m -CONFIG_I2C_MUX_MLXCPLD=m -CONFIG_I2C_HELPER_AUTO=y -CONFIG_I2C_SMBUS=m -CONFIG_I2C_ALGOBIT=m -CONFIG_I2C_ALGOPCA=m - -# -# I2C Hardware Bus support -# - -# -# PC SMBus host controller drivers -# -CONFIG_I2C_ALI1535=m -CONFIG_I2C_ALI1563=m -CONFIG_I2C_ALI15X3=m -CONFIG_I2C_AMD756=m -CONFIG_I2C_AMD756_S4882=m -CONFIG_I2C_AMD8111=m -CONFIG_I2C_I801=m -CONFIG_I2C_ISCH=m -CONFIG_I2C_ISMT=m -CONFIG_I2C_PIIX4=m -CONFIG_I2C_CHT_WC=m -CONFIG_I2C_NFORCE2=m -CONFIG_I2C_NFORCE2_S4985=m -CONFIG_I2C_SIS5595=m -CONFIG_I2C_SIS630=m -CONFIG_I2C_SIS96X=m -CONFIG_I2C_VIA=m -CONFIG_I2C_VIAPRO=m - -# -# ACPI drivers -# -CONFIG_I2C_SCMI=m - -# -# I2C system bus drivers (mostly embedded / system-on-chip) -# -CONFIG_I2C_CBUS_GPIO=m -CONFIG_I2C_DESIGNWARE_CORE=y -CONFIG_I2C_DESIGNWARE_PLATFORM=y -# CONFIG_I2C_DESIGNWARE_SLAVE is not set -CONFIG_I2C_DESIGNWARE_PCI=m -CONFIG_I2C_DESIGNWARE_BAYTRAIL=y -CONFIG_I2C_EG20T=m -CONFIG_I2C_EMEV2=m -CONFIG_I2C_GPIO=m -# CONFIG_I2C_GPIO_FAULT_INJECTOR is not set -CONFIG_I2C_KEMPLD=m -CONFIG_I2C_OCORES=m -CONFIG_I2C_PCA_PLATFORM=m -CONFIG_I2C_SIMTEC=m -CONFIG_I2C_XILINX=m - -# -# External I2C/SMBus adapter drivers -# -CONFIG_I2C_DIOLAN_U2C=m -CONFIG_I2C_DLN2=m -CONFIG_I2C_PARPORT=m -CONFIG_I2C_PARPORT_LIGHT=m -CONFIG_I2C_ROBOTFUZZ_OSIF=m -CONFIG_I2C_TAOS_EVM=m -CONFIG_I2C_TINY_USB=m -CONFIG_I2C_VIPERBOARD=m - -# -# Other I2C/SMBus bus drivers -# -CONFIG_I2C_PCA_ISA=m -CONFIG_I2C_CROS_EC_TUNNEL=m -CONFIG_SCx200_ACB=m -CONFIG_I2C_STUB=m -CONFIG_I2C_SLAVE=y -CONFIG_I2C_SLAVE_EEPROM=m -# CONFIG_I2C_DEBUG_CORE is not set -# CONFIG_I2C_DEBUG_ALGO is not set -# CONFIG_I2C_DEBUG_BUS is not set -CONFIG_SPI=y -# CONFIG_SPI_DEBUG is not set -CONFIG_SPI_MASTER=y -CONFIG_SPI_MEM=y - -# -# SPI Master Controller Drivers -# -CONFIG_SPI_ALTERA=m -CONFIG_SPI_AXI_SPI_ENGINE=m -CONFIG_SPI_BITBANG=m -CONFIG_SPI_BUTTERFLY=m -CONFIG_SPI_CADENCE=m -CONFIG_SPI_DESIGNWARE=m -CONFIG_SPI_DW_PCI=m -CONFIG_SPI_DW_MID_DMA=y -CONFIG_SPI_DW_MMIO=m -CONFIG_SPI_DLN2=m -CONFIG_SPI_GPIO=m -CONFIG_SPI_LM70_LLP=m -CONFIG_SPI_OC_TINY=m -CONFIG_SPI_PXA2XX=m -CONFIG_SPI_PXA2XX_PCI=m -CONFIG_SPI_ROCKCHIP=m -CONFIG_SPI_SC18IS602=m -CONFIG_SPI_TOPCLIFF_PCH=m -CONFIG_SPI_XCOMM=m -# CONFIG_SPI_XILINX is not set -CONFIG_SPI_ZYNQMP_GQSPI=m - -# -# SPI Protocol Masters -# -CONFIG_SPI_SPIDEV=m -# CONFIG_SPI_LOOPBACK_TEST is not set -CONFIG_SPI_TLE62X0=m -# CONFIG_SPI_SLAVE is not set -CONFIG_SPMI=m -CONFIG_HSI=m -CONFIG_HSI_BOARDINFO=y - -# -# HSI controllers -# - -# -# HSI clients -# -CONFIG_HSI_CHAR=m -CONFIG_PPS=m -# CONFIG_PPS_DEBUG is not set - -# -# PPS clients support -# -# CONFIG_PPS_CLIENT_KTIMER is not set -CONFIG_PPS_CLIENT_LDISC=m -CONFIG_PPS_CLIENT_PARPORT=m -CONFIG_PPS_CLIENT_GPIO=m - -# -# PPS generators support -# - -# -# PTP clock support -# -CONFIG_PTP_1588_CLOCK=m - -# -# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks. -# -CONFIG_PTP_1588_CLOCK_PCH=m -CONFIG_PTP_1588_CLOCK_KVM=m -CONFIG_PINCTRL=y -CONFIG_PINMUX=y -CONFIG_PINCONF=y -CONFIG_GENERIC_PINCONF=y -# CONFIG_DEBUG_PINCTRL is not set -CONFIG_PINCTRL_AMD=y -CONFIG_PINCTRL_MCP23S08=m -CONFIG_PINCTRL_SX150X=y -CONFIG_PINCTRL_BAYTRAIL=y -CONFIG_PINCTRL_CHERRYVIEW=m -CONFIG_PINCTRL_MERRIFIELD=m -CONFIG_PINCTRL_INTEL=m -CONFIG_PINCTRL_BROXTON=m -CONFIG_PINCTRL_CANNONLAKE=m -CONFIG_PINCTRL_CEDARFORK=m -CONFIG_PINCTRL_DENVERTON=m -CONFIG_PINCTRL_GEMINILAKE=m -CONFIG_PINCTRL_LEWISBURG=m -CONFIG_PINCTRL_SUNRISEPOINT=m -CONFIG_GPIOLIB=y -CONFIG_GPIOLIB_FASTPATH_LIMIT=512 -CONFIG_GPIO_ACPI=y -CONFIG_GPIOLIB_IRQCHIP=y -# CONFIG_DEBUG_GPIO is not set -CONFIG_GPIO_SYSFS=y -CONFIG_GPIO_GENERIC=m -CONFIG_GPIO_MAX730X=m - -# -# Memory mapped GPIO drivers -# -CONFIG_GPIO_AMDPT=m -CONFIG_GPIO_DWAPB=m -CONFIG_GPIO_EXAR=m -CONFIG_GPIO_GENERIC_PLATFORM=m -CONFIG_GPIO_ICH=m -CONFIG_GPIO_LYNXPOINT=y -CONFIG_GPIO_MB86S7X=m -CONFIG_GPIO_MENZ127=m -# CONFIG_GPIO_MOCKUP is not set -CONFIG_GPIO_VX855=m - -# -# Port-mapped I/O GPIO drivers -# -CONFIG_GPIO_F7188X=m -CONFIG_GPIO_IT87=m -CONFIG_GPIO_SCH=m -CONFIG_GPIO_SCH311X=m -CONFIG_GPIO_WINBOND=m -CONFIG_GPIO_WS16C48=m - -# -# I2C GPIO expanders -# -CONFIG_GPIO_ADP5588=m -CONFIG_GPIO_MAX7300=m -CONFIG_GPIO_MAX732X=m -CONFIG_GPIO_PCA953X=m -CONFIG_GPIO_PCF857X=m -CONFIG_GPIO_TPIC2810=m - -# -# MFD GPIO expanders -# -CONFIG_GPIO_ADP5520=m -CONFIG_GPIO_ARIZONA=m -CONFIG_GPIO_BD9571MWV=m -CONFIG_GPIO_CRYSTAL_COVE=m -CONFIG_GPIO_CS5535=m -CONFIG_GPIO_DA9052=m -CONFIG_GPIO_DA9055=m -CONFIG_GPIO_DLN2=m -CONFIG_GPIO_JANZ_TTL=m -CONFIG_GPIO_KEMPLD=m -CONFIG_GPIO_LP3943=m -CONFIG_GPIO_LP873X=m -CONFIG_GPIO_MSIC=y -CONFIG_GPIO_PALMAS=y -CONFIG_GPIO_RC5T583=y -CONFIG_GPIO_TIMBERDALE=y -CONFIG_GPIO_TPS65086=m -CONFIG_GPIO_TPS6586X=y -CONFIG_GPIO_TPS65910=y -CONFIG_GPIO_TPS65912=m -CONFIG_GPIO_TWL4030=m -CONFIG_GPIO_TWL6040=m -CONFIG_GPIO_UCB1400=m -CONFIG_GPIO_WHISKEY_COVE=m -CONFIG_GPIO_WM831X=m -CONFIG_GPIO_WM8350=m -CONFIG_GPIO_WM8994=m - -# -# PCI GPIO expanders -# -CONFIG_GPIO_AMD8111=m -CONFIG_GPIO_INTEL_MID=y -CONFIG_GPIO_MERRIFIELD=m -CONFIG_GPIO_ML_IOH=m -CONFIG_GPIO_PCH=m -CONFIG_GPIO_PCI_IDIO_16=m -CONFIG_GPIO_PCIE_IDIO_24=m -CONFIG_GPIO_RDC321X=m - -# -# SPI GPIO expanders -# -CONFIG_GPIO_MAX3191X=m -CONFIG_GPIO_MAX7301=m -CONFIG_GPIO_MC33880=m -CONFIG_GPIO_PISOSR=m -CONFIG_GPIO_XRA1403=m - -# -# USB GPIO expanders -# -CONFIG_GPIO_VIPERBOARD=m -CONFIG_W1=m -CONFIG_W1_CON=y - -# -# 1-wire Bus Masters -# -CONFIG_W1_MASTER_MATROX=m -CONFIG_W1_MASTER_DS2490=m -CONFIG_W1_MASTER_DS2482=m -CONFIG_W1_MASTER_DS1WM=m -CONFIG_W1_MASTER_GPIO=m - -# -# 1-wire Slaves -# -CONFIG_W1_SLAVE_THERM=m -CONFIG_W1_SLAVE_SMEM=m -CONFIG_W1_SLAVE_DS2405=m -CONFIG_W1_SLAVE_DS2408=m -CONFIG_W1_SLAVE_DS2408_READBACK=y -CONFIG_W1_SLAVE_DS2413=m -CONFIG_W1_SLAVE_DS2406=m -CONFIG_W1_SLAVE_DS2423=m -CONFIG_W1_SLAVE_DS2805=m -CONFIG_W1_SLAVE_DS2431=m -CONFIG_W1_SLAVE_DS2433=m -# CONFIG_W1_SLAVE_DS2433_CRC is not set -CONFIG_W1_SLAVE_DS2438=m -CONFIG_W1_SLAVE_DS2760=m -CONFIG_W1_SLAVE_DS2780=m -CONFIG_W1_SLAVE_DS2781=m -CONFIG_W1_SLAVE_DS28E04=m -CONFIG_W1_SLAVE_DS28E17=m -CONFIG_POWER_AVS=y -CONFIG_POWER_RESET=y -CONFIG_POWER_RESET_RESTART=y -CONFIG_POWER_SUPPLY=y -# CONFIG_POWER_SUPPLY_DEBUG is not set -CONFIG_PDA_POWER=m -CONFIG_GENERIC_ADC_BATTERY=m -CONFIG_MAX8925_POWER=m -CONFIG_WM831X_BACKUP=m -CONFIG_WM831X_POWER=m -CONFIG_WM8350_POWER=m -CONFIG_TEST_POWER=m -CONFIG_BATTERY_88PM860X=m -CONFIG_BATTERY_DS2760=m -CONFIG_BATTERY_DS2780=m -CONFIG_BATTERY_DS2781=m -CONFIG_BATTERY_DS2782=m -CONFIG_BATTERY_SBS=m -CONFIG_CHARGER_SBS=m -CONFIG_MANAGER_SBS=m -CONFIG_BATTERY_BQ27XXX=m -CONFIG_BATTERY_BQ27XXX_I2C=m -CONFIG_BATTERY_BQ27XXX_HDQ=m -# CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set -CONFIG_BATTERY_DA9030=m -CONFIG_BATTERY_DA9052=m -CONFIG_CHARGER_DA9150=m -CONFIG_BATTERY_DA9150=m -CONFIG_CHARGER_AXP20X=m -CONFIG_BATTERY_AXP20X=m -CONFIG_AXP20X_POWER=m -CONFIG_AXP288_CHARGER=m -CONFIG_AXP288_FUEL_GAUGE=m -CONFIG_BATTERY_MAX17040=m -CONFIG_BATTERY_MAX17042=m -CONFIG_BATTERY_MAX1721X=m -CONFIG_BATTERY_TWL4030_MADC=m -CONFIG_CHARGER_88PM860X=m -CONFIG_CHARGER_PCF50633=m -CONFIG_BATTERY_RX51=m -CONFIG_CHARGER_ISP1704=m -CONFIG_CHARGER_MAX8903=m -CONFIG_CHARGER_TWL4030=m -CONFIG_CHARGER_LP8727=m -CONFIG_CHARGER_LP8788=m -CONFIG_CHARGER_GPIO=m -CONFIG_CHARGER_MANAGER=y -CONFIG_CHARGER_LTC3651=m -CONFIG_CHARGER_MAX14577=m -CONFIG_CHARGER_MAX77693=m -CONFIG_CHARGER_MAX8997=m -CONFIG_CHARGER_MAX8998=m -CONFIG_CHARGER_BQ2415X=m -CONFIG_CHARGER_BQ24190=m -CONFIG_CHARGER_BQ24257=m -CONFIG_CHARGER_BQ24735=m -CONFIG_CHARGER_BQ25890=m -CONFIG_CHARGER_SMB347=m -CONFIG_CHARGER_TPS65090=m -CONFIG_BATTERY_GAUGE_LTC2941=m -CONFIG_BATTERY_RT5033=m -CONFIG_CHARGER_RT9455=m -CONFIG_HWMON=y -CONFIG_HWMON_VID=m -# CONFIG_HWMON_DEBUG_CHIP is not set - -# -# Native drivers -# -CONFIG_SENSORS_ABITUGURU=m -CONFIG_SENSORS_ABITUGURU3=m -CONFIG_SENSORS_AD7314=m -CONFIG_SENSORS_AD7414=m -CONFIG_SENSORS_AD7418=m -CONFIG_SENSORS_ADM1021=m -CONFIG_SENSORS_ADM1025=m -CONFIG_SENSORS_ADM1026=m -CONFIG_SENSORS_ADM1029=m -CONFIG_SENSORS_ADM1031=m -CONFIG_SENSORS_ADM9240=m -CONFIG_SENSORS_ADT7X10=m -CONFIG_SENSORS_ADT7310=m -CONFIG_SENSORS_ADT7410=m -CONFIG_SENSORS_ADT7411=m -CONFIG_SENSORS_ADT7462=m -CONFIG_SENSORS_ADT7470=m -CONFIG_SENSORS_ADT7475=m -CONFIG_SENSORS_ASC7621=m -CONFIG_SENSORS_K8TEMP=m -CONFIG_SENSORS_K10TEMP=m -CONFIG_SENSORS_FAM15H_POWER=m -CONFIG_SENSORS_APPLESMC=m -CONFIG_SENSORS_ASB100=m -CONFIG_SENSORS_ASPEED=m -CONFIG_SENSORS_ATXP1=m -CONFIG_SENSORS_DS620=m -CONFIG_SENSORS_DS1621=m -CONFIG_SENSORS_DELL_SMM=m -CONFIG_SENSORS_DA9052_ADC=m -CONFIG_SENSORS_DA9055=m -CONFIG_SENSORS_I5K_AMB=m -CONFIG_SENSORS_F71805F=m -CONFIG_SENSORS_F71882FG=m -CONFIG_SENSORS_F75375S=m -CONFIG_SENSORS_MC13783_ADC=m -CONFIG_SENSORS_FSCHMD=m -CONFIG_SENSORS_FTSTEUTATES=m -CONFIG_SENSORS_GL518SM=m -CONFIG_SENSORS_GL520SM=m -CONFIG_SENSORS_G760A=m -CONFIG_SENSORS_G762=m -CONFIG_SENSORS_HIH6130=m -CONFIG_SENSORS_IBMAEM=m -CONFIG_SENSORS_IBMPEX=m -CONFIG_SENSORS_IIO_HWMON=m -CONFIG_SENSORS_I5500=m -CONFIG_SENSORS_CORETEMP=m -CONFIG_SENSORS_IT87=m -CONFIG_SENSORS_JC42=m -CONFIG_SENSORS_POWR1220=m -CONFIG_SENSORS_LINEAGE=m -CONFIG_SENSORS_LTC2945=m -CONFIG_SENSORS_LTC2990=m -CONFIG_SENSORS_LTC4151=m -CONFIG_SENSORS_LTC4215=m -CONFIG_SENSORS_LTC4222=m -CONFIG_SENSORS_LTC4245=m -CONFIG_SENSORS_LTC4260=m -CONFIG_SENSORS_LTC4261=m -CONFIG_SENSORS_MAX1111=m -CONFIG_SENSORS_MAX16065=m -CONFIG_SENSORS_MAX1619=m -CONFIG_SENSORS_MAX1668=m -CONFIG_SENSORS_MAX197=m -CONFIG_SENSORS_MAX31722=m -CONFIG_SENSORS_MAX6621=m -CONFIG_SENSORS_MAX6639=m -CONFIG_SENSORS_MAX6642=m -CONFIG_SENSORS_MAX6650=m -CONFIG_SENSORS_MAX6697=m -CONFIG_SENSORS_MAX31790=m -CONFIG_SENSORS_MCP3021=m -CONFIG_SENSORS_TC654=m -CONFIG_SENSORS_MENF21BMC_HWMON=m -CONFIG_SENSORS_ADCXX=m -CONFIG_SENSORS_LM63=m -CONFIG_SENSORS_LM70=m -CONFIG_SENSORS_LM73=m -CONFIG_SENSORS_LM75=m -CONFIG_SENSORS_LM77=m -CONFIG_SENSORS_LM78=m -CONFIG_SENSORS_LM80=m -CONFIG_SENSORS_LM83=m -CONFIG_SENSORS_LM85=m -CONFIG_SENSORS_LM87=m -CONFIG_SENSORS_LM90=m -CONFIG_SENSORS_LM92=m -CONFIG_SENSORS_LM93=m -CONFIG_SENSORS_LM95234=m -CONFIG_SENSORS_LM95241=m -CONFIG_SENSORS_LM95245=m -CONFIG_SENSORS_PC87360=m -CONFIG_SENSORS_PC87427=m -CONFIG_SENSORS_NTC_THERMISTOR=m -CONFIG_SENSORS_NCT6683=m -CONFIG_SENSORS_NCT6775=m -CONFIG_SENSORS_NCT7802=m -CONFIG_SENSORS_NCT7904=m -CONFIG_SENSORS_PCF8591=m -CONFIG_PMBUS=m -CONFIG_SENSORS_PMBUS=m -CONFIG_SENSORS_ADM1275=m -CONFIG_SENSORS_IBM_CFFPS=m -CONFIG_SENSORS_IR35221=m -CONFIG_SENSORS_LM25066=m -CONFIG_SENSORS_LTC2978=m -CONFIG_SENSORS_LTC2978_REGULATOR=y -CONFIG_SENSORS_LTC3815=m -CONFIG_SENSORS_MAX16064=m -CONFIG_SENSORS_MAX20751=m -CONFIG_SENSORS_MAX31785=m -CONFIG_SENSORS_MAX34440=m -CONFIG_SENSORS_MAX8688=m -CONFIG_SENSORS_TPS40422=m -CONFIG_SENSORS_TPS53679=m -CONFIG_SENSORS_UCD9000=m -CONFIG_SENSORS_UCD9200=m -CONFIG_SENSORS_ZL6100=m -CONFIG_SENSORS_SHT15=m -CONFIG_SENSORS_SHT21=m -CONFIG_SENSORS_SHT3x=m -CONFIG_SENSORS_SHTC1=m -CONFIG_SENSORS_SIS5595=m -CONFIG_SENSORS_DME1737=m -CONFIG_SENSORS_EMC1403=m -CONFIG_SENSORS_EMC2103=m -CONFIG_SENSORS_EMC6W201=m -CONFIG_SENSORS_SMSC47M1=m -CONFIG_SENSORS_SMSC47M192=m -CONFIG_SENSORS_SMSC47B397=m -CONFIG_SENSORS_SCH56XX_COMMON=m -CONFIG_SENSORS_SCH5627=m -CONFIG_SENSORS_SCH5636=m -CONFIG_SENSORS_STTS751=m -CONFIG_SENSORS_SMM665=m -CONFIG_SENSORS_ADC128D818=m -CONFIG_SENSORS_ADS1015=m -CONFIG_SENSORS_ADS7828=m -CONFIG_SENSORS_ADS7871=m -CONFIG_SENSORS_AMC6821=m -CONFIG_SENSORS_INA209=m -CONFIG_SENSORS_INA2XX=m -CONFIG_SENSORS_INA3221=m -CONFIG_SENSORS_TC74=m -CONFIG_SENSORS_THMC50=m -CONFIG_SENSORS_TMP102=m -CONFIG_SENSORS_TMP103=m -CONFIG_SENSORS_TMP108=m -CONFIG_SENSORS_TMP401=m -CONFIG_SENSORS_TMP421=m -CONFIG_SENSORS_VIA_CPUTEMP=m -CONFIG_SENSORS_VIA686A=m -CONFIG_SENSORS_VT1211=m -CONFIG_SENSORS_VT8231=m -CONFIG_SENSORS_W83773G=m -CONFIG_SENSORS_W83781D=m -CONFIG_SENSORS_W83791D=m -CONFIG_SENSORS_W83792D=m -CONFIG_SENSORS_W83793=m -CONFIG_SENSORS_W83795=m -# CONFIG_SENSORS_W83795_FANCTRL is not set -CONFIG_SENSORS_W83L785TS=m -CONFIG_SENSORS_W83L786NG=m -CONFIG_SENSORS_W83627HF=m -CONFIG_SENSORS_W83627EHF=m -CONFIG_SENSORS_WM831X=m -CONFIG_SENSORS_WM8350=m -CONFIG_SENSORS_XGENE=m - -# -# ACPI drivers -# -CONFIG_SENSORS_ACPI_POWER=m -CONFIG_SENSORS_ATK0110=m -CONFIG_THERMAL=y -# CONFIG_THERMAL_STATISTICS is not set -CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 -CONFIG_THERMAL_HWMON=y -CONFIG_THERMAL_WRITABLE_TRIPS=y -CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y -# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set -# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set -# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set -CONFIG_THERMAL_GOV_FAIR_SHARE=y -CONFIG_THERMAL_GOV_STEP_WISE=y -CONFIG_THERMAL_GOV_BANG_BANG=y -CONFIG_THERMAL_GOV_USER_SPACE=y -CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y -CONFIG_CLOCK_THERMAL=y -CONFIG_DEVFREQ_THERMAL=y -CONFIG_THERMAL_EMULATION=y -CONFIG_INTEL_POWERCLAMP=m -CONFIG_X86_PKG_TEMP_THERMAL=m -CONFIG_INTEL_SOC_DTS_IOSF_CORE=m -CONFIG_INTEL_SOC_DTS_THERMAL=m - -# -# ACPI INT340X thermal drivers -# -CONFIG_INT340X_THERMAL=m -CONFIG_ACPI_THERMAL_REL=m -CONFIG_INT3406_THERMAL=m -CONFIG_INTEL_BXT_PMIC_THERMAL=m -CONFIG_INTEL_PCH_THERMAL=m -CONFIG_GENERIC_ADC_THERMAL=m -CONFIG_WATCHDOG=y -CONFIG_WATCHDOG_CORE=y -# CONFIG_WATCHDOG_NOWAYOUT is not set -CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y -CONFIG_WATCHDOG_SYSFS=y - -# -# Watchdog Device Drivers -# -CONFIG_SOFT_WATCHDOG=m -CONFIG_DA9052_WATCHDOG=m -CONFIG_DA9055_WATCHDOG=m -CONFIG_DA9063_WATCHDOG=m -CONFIG_DA9062_WATCHDOG=m -CONFIG_MENF21BMC_WATCHDOG=m -CONFIG_WDAT_WDT=m -CONFIG_WM831X_WATCHDOG=m -CONFIG_WM8350_WATCHDOG=m -CONFIG_XILINX_WATCHDOG=m -CONFIG_ZIIRAVE_WATCHDOG=m -CONFIG_RAVE_SP_WATCHDOG=m -CONFIG_CADENCE_WATCHDOG=m -CONFIG_DW_WATCHDOG=m -CONFIG_TWL4030_WATCHDOG=m -CONFIG_MAX63XX_WATCHDOG=m -CONFIG_RETU_WATCHDOG=m -CONFIG_ACQUIRE_WDT=m -CONFIG_ADVANTECH_WDT=m -CONFIG_ALIM1535_WDT=m -CONFIG_ALIM7101_WDT=m -CONFIG_EBC_C384_WDT=m -CONFIG_F71808E_WDT=m -CONFIG_SP5100_TCO=m -CONFIG_SBC_FITPC2_WATCHDOG=m -CONFIG_EUROTECH_WDT=m -CONFIG_IB700_WDT=m -CONFIG_IBMASR=m -CONFIG_WAFER_WDT=m -CONFIG_I6300ESB_WDT=m -CONFIG_IE6XX_WDT=m -CONFIG_INTEL_SCU_WATCHDOG=y -CONFIG_INTEL_MID_WATCHDOG=m -CONFIG_ITCO_WDT=m -CONFIG_ITCO_VENDOR_SUPPORT=y -CONFIG_IT8712F_WDT=m -CONFIG_IT87_WDT=m -CONFIG_HP_WATCHDOG=m -CONFIG_KEMPLD_WDT=m -CONFIG_HPWDT_NMI_DECODING=y -CONFIG_SC1200_WDT=m -CONFIG_SCx200_WDT=m -CONFIG_PC87413_WDT=m -CONFIG_NV_TCO=m -CONFIG_60XX_WDT=m -CONFIG_SBC8360_WDT=m -CONFIG_SBC7240_WDT=m -CONFIG_CPU5_WDT=m -CONFIG_SMSC_SCH311X_WDT=m -CONFIG_SMSC37B787_WDT=m -CONFIG_VIA_WDT=m -CONFIG_W83627HF_WDT=m -CONFIG_W83877F_WDT=m -CONFIG_W83977F_WDT=m -CONFIG_MACHZ_WDT=m -CONFIG_SBC_EPX_C3_WATCHDOG=m -CONFIG_INTEL_MEI_WDT=m -CONFIG_NI903X_WDT=m -CONFIG_NIC7018_WDT=m -CONFIG_MEN_A21_WDT=m -CONFIG_XEN_WDT=m - -# -# ISA-based Watchdog Cards -# -CONFIG_PCWATCHDOG=m -CONFIG_MIXCOMWD=m -CONFIG_WDT=m - -# -# PCI-based Watchdog Cards -# -CONFIG_PCIPCWATCHDOG=m -CONFIG_WDTPCI=m - -# -# USB-based Watchdog Cards -# -CONFIG_USBPCWATCHDOG=m - -# -# Watchdog Pretimeout Governors -# -# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set -CONFIG_SSB_POSSIBLE=y -CONFIG_SSB=m -CONFIG_SSB_SPROM=y -CONFIG_SSB_BLOCKIO=y -CONFIG_SSB_PCIHOST_POSSIBLE=y -CONFIG_SSB_PCIHOST=y -CONFIG_SSB_B43_PCI_BRIDGE=y -CONFIG_SSB_PCMCIAHOST_POSSIBLE=y -# CONFIG_SSB_PCMCIAHOST is not set -CONFIG_SSB_SDIOHOST_POSSIBLE=y -CONFIG_SSB_SDIOHOST=y -# CONFIG_SSB_SILENT is not set -# CONFIG_SSB_DEBUG is not set -CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y -CONFIG_SSB_DRIVER_PCICORE=y -CONFIG_SSB_DRIVER_GPIO=y -CONFIG_BCMA_POSSIBLE=y -CONFIG_BCMA=m -CONFIG_BCMA_BLOCKIO=y -CONFIG_BCMA_HOST_PCI_POSSIBLE=y -CONFIG_BCMA_HOST_PCI=y -CONFIG_BCMA_HOST_SOC=y -CONFIG_BCMA_DRIVER_PCI=y -CONFIG_BCMA_SFLASH=y -CONFIG_BCMA_DRIVER_GMAC_CMN=y -CONFIG_BCMA_DRIVER_GPIO=y -# CONFIG_BCMA_DEBUG is not set - -# -# Multifunction device drivers -# -CONFIG_MFD_CORE=y -CONFIG_MFD_CS5535=m -CONFIG_MFD_AS3711=y -CONFIG_PMIC_ADP5520=y -CONFIG_MFD_AAT2870_CORE=y -CONFIG_MFD_BCM590XX=m -CONFIG_MFD_BD9571MWV=m -CONFIG_MFD_AXP20X=m -CONFIG_MFD_AXP20X_I2C=m -CONFIG_MFD_CROS_EC=m -CONFIG_MFD_CROS_EC_I2C=m -CONFIG_MFD_CROS_EC_SPI=m -CONFIG_MFD_CROS_EC_CHARDEV=m -CONFIG_PMIC_DA903X=y -CONFIG_PMIC_DA9052=y -CONFIG_MFD_DA9052_SPI=y -CONFIG_MFD_DA9052_I2C=y -CONFIG_MFD_DA9055=y -CONFIG_MFD_DA9062=m -CONFIG_MFD_DA9063=y -CONFIG_MFD_DA9150=m -CONFIG_MFD_DLN2=m -CONFIG_MFD_MC13XXX=m -CONFIG_MFD_MC13XXX_SPI=m -CONFIG_MFD_MC13XXX_I2C=m -CONFIG_HTC_PASIC3=m -CONFIG_HTC_I2CPLD=y -CONFIG_MFD_INTEL_QUARK_I2C_GPIO=m -CONFIG_LPC_ICH=m -CONFIG_LPC_SCH=m -CONFIG_INTEL_SOC_PMIC=y -CONFIG_INTEL_SOC_PMIC_BXTWC=m -CONFIG_INTEL_SOC_PMIC_CHTWC=y -CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m -CONFIG_MFD_INTEL_LPSS=m -CONFIG_MFD_INTEL_LPSS_ACPI=m -CONFIG_MFD_INTEL_LPSS_PCI=m -CONFIG_MFD_INTEL_MSIC=y -CONFIG_MFD_JANZ_CMODIO=m -CONFIG_MFD_KEMPLD=m -CONFIG_MFD_88PM800=m -CONFIG_MFD_88PM805=m -CONFIG_MFD_88PM860X=y -CONFIG_MFD_MAX14577=y -CONFIG_MFD_MAX77693=y -CONFIG_MFD_MAX77843=y -CONFIG_MFD_MAX8907=m -CONFIG_MFD_MAX8925=y -CONFIG_MFD_MAX8997=y -CONFIG_MFD_MAX8998=y -CONFIG_MFD_MT6397=m -CONFIG_MFD_MENF21BMC=m -CONFIG_EZX_PCAP=y -CONFIG_MFD_VIPERBOARD=m -CONFIG_MFD_RETU=m -CONFIG_MFD_PCF50633=m -CONFIG_PCF50633_ADC=m -CONFIG_PCF50633_GPIO=m -CONFIG_UCB1400_CORE=m -CONFIG_MFD_RDC321X=m -CONFIG_MFD_RT5033=m -CONFIG_MFD_RC5T583=y -CONFIG_MFD_SEC_CORE=y -CONFIG_MFD_SI476X_CORE=m -CONFIG_MFD_SM501=m -CONFIG_MFD_SM501_GPIO=y -CONFIG_MFD_SKY81452=m -CONFIG_MFD_SMSC=y -CONFIG_ABX500_CORE=y -CONFIG_AB3100_CORE=y -CONFIG_AB3100_OTP=m -CONFIG_MFD_SYSCON=y -CONFIG_MFD_TI_AM335X_TSCADC=m -CONFIG_MFD_LP3943=m -CONFIG_MFD_LP8788=y -CONFIG_MFD_TI_LMU=m -CONFIG_MFD_PALMAS=y -CONFIG_TPS6105X=m -CONFIG_TPS65010=m -CONFIG_TPS6507X=m -CONFIG_MFD_TPS65086=m -CONFIG_MFD_TPS65090=y -# CONFIG_MFD_TPS68470 is not set -CONFIG_MFD_TI_LP873X=m -CONFIG_MFD_TPS6586X=y -CONFIG_MFD_TPS65910=y -CONFIG_MFD_TPS65912=y -CONFIG_MFD_TPS65912_I2C=y -CONFIG_MFD_TPS65912_SPI=y -CONFIG_MFD_TPS80031=y -CONFIG_TWL4030_CORE=y -CONFIG_MFD_TWL4030_AUDIO=y -CONFIG_TWL6040_CORE=y -CONFIG_MFD_WL1273_CORE=m -CONFIG_MFD_LM3533=m -CONFIG_MFD_TIMBERDALE=m -CONFIG_MFD_VX855=m -CONFIG_MFD_ARIZONA=y -CONFIG_MFD_ARIZONA_I2C=m -CONFIG_MFD_ARIZONA_SPI=m -CONFIG_MFD_CS47L24=y -CONFIG_MFD_WM5102=y -CONFIG_MFD_WM5110=y -CONFIG_MFD_WM8997=y -CONFIG_MFD_WM8998=y -CONFIG_MFD_WM8400=y -CONFIG_MFD_WM831X=y -CONFIG_MFD_WM831X_I2C=y -CONFIG_MFD_WM831X_SPI=y -CONFIG_MFD_WM8350=y -CONFIG_MFD_WM8350_I2C=y -CONFIG_MFD_WM8994=m -CONFIG_RAVE_SP_CORE=m -CONFIG_REGULATOR=y -# CONFIG_REGULATOR_DEBUG is not set -CONFIG_REGULATOR_FIXED_VOLTAGE=m -CONFIG_REGULATOR_VIRTUAL_CONSUMER=m -CONFIG_REGULATOR_USERSPACE_CONSUMER=m -CONFIG_REGULATOR_88PG86X=m -CONFIG_REGULATOR_88PM800=m -CONFIG_REGULATOR_88PM8607=m -CONFIG_REGULATOR_ACT8865=m -CONFIG_REGULATOR_AD5398=m -CONFIG_REGULATOR_ANATOP=m -CONFIG_REGULATOR_AAT2870=m -CONFIG_REGULATOR_AB3100=m -CONFIG_REGULATOR_ARIZONA_LDO1=m -CONFIG_REGULATOR_ARIZONA_MICSUPP=m -CONFIG_REGULATOR_AS3711=m -CONFIG_REGULATOR_AXP20X=m -CONFIG_REGULATOR_BCM590XX=m -CONFIG_REGULATOR_BD9571MWV=m -CONFIG_REGULATOR_DA903X=m -CONFIG_REGULATOR_DA9052=m -CONFIG_REGULATOR_DA9055=m -CONFIG_REGULATOR_DA9062=m -CONFIG_REGULATOR_DA9063=m -CONFIG_REGULATOR_DA9210=m -CONFIG_REGULATOR_DA9211=m -CONFIG_REGULATOR_FAN53555=m -CONFIG_REGULATOR_GPIO=m -CONFIG_REGULATOR_ISL9305=m -CONFIG_REGULATOR_ISL6271A=m -CONFIG_REGULATOR_LM363X=m -CONFIG_REGULATOR_LP3971=m -CONFIG_REGULATOR_LP3972=m -CONFIG_REGULATOR_LP872X=m -CONFIG_REGULATOR_LP8755=m -CONFIG_REGULATOR_LP8788=m -CONFIG_REGULATOR_LTC3589=m -CONFIG_REGULATOR_LTC3676=m -CONFIG_REGULATOR_MAX14577=m -CONFIG_REGULATOR_MAX1586=m -CONFIG_REGULATOR_MAX8649=m -CONFIG_REGULATOR_MAX8660=m -CONFIG_REGULATOR_MAX8907=m -CONFIG_REGULATOR_MAX8925=m -CONFIG_REGULATOR_MAX8952=m -CONFIG_REGULATOR_MAX8997=m -CONFIG_REGULATOR_MAX8998=m -CONFIG_REGULATOR_MAX77693=m -CONFIG_REGULATOR_MC13XXX_CORE=m -CONFIG_REGULATOR_MC13783=m -CONFIG_REGULATOR_MC13892=m -CONFIG_REGULATOR_MT6311=m -CONFIG_REGULATOR_MT6323=m -CONFIG_REGULATOR_MT6397=m -CONFIG_REGULATOR_PALMAS=m -CONFIG_REGULATOR_PCAP=m -CONFIG_REGULATOR_PCF50633=m -CONFIG_REGULATOR_PFUZE100=m -CONFIG_REGULATOR_PV88060=m -CONFIG_REGULATOR_PV88080=m -CONFIG_REGULATOR_PV88090=m -CONFIG_REGULATOR_PWM=m -CONFIG_REGULATOR_QCOM_SPMI=m -CONFIG_REGULATOR_RC5T583=m -CONFIG_REGULATOR_RT5033=m -CONFIG_REGULATOR_S2MPA01=m -CONFIG_REGULATOR_S2MPS11=m -CONFIG_REGULATOR_S5M8767=m -CONFIG_REGULATOR_SKY81452=m -CONFIG_REGULATOR_TPS51632=m -CONFIG_REGULATOR_TPS6105X=m -CONFIG_REGULATOR_TPS62360=m -CONFIG_REGULATOR_TPS65023=m -CONFIG_REGULATOR_TPS6507X=m -CONFIG_REGULATOR_TPS65086=m -CONFIG_REGULATOR_TPS65090=m -CONFIG_REGULATOR_TPS65132=m -CONFIG_REGULATOR_TPS6524X=m -CONFIG_REGULATOR_TPS6586X=m -CONFIG_REGULATOR_TPS65910=m -CONFIG_REGULATOR_TPS65912=m -CONFIG_REGULATOR_TPS80031=m -CONFIG_REGULATOR_TWL4030=m -CONFIG_REGULATOR_WM831X=m -CONFIG_REGULATOR_WM8350=m -CONFIG_REGULATOR_WM8400=m -CONFIG_REGULATOR_WM8994=m -CONFIG_CEC_CORE=m -CONFIG_CEC_NOTIFIER=y -CONFIG_RC_CORE=m -CONFIG_RC_MAP=m -CONFIG_LIRC=y -CONFIG_RC_DECODERS=y -CONFIG_IR_NEC_DECODER=m -CONFIG_IR_RC5_DECODER=m -CONFIG_IR_RC6_DECODER=m -CONFIG_IR_JVC_DECODER=m -CONFIG_IR_SONY_DECODER=m -CONFIG_IR_SANYO_DECODER=m -CONFIG_IR_SHARP_DECODER=m -CONFIG_IR_MCE_KBD_DECODER=m -CONFIG_IR_XMP_DECODER=m -CONFIG_IR_IMON_DECODER=m -CONFIG_RC_DEVICES=y -CONFIG_RC_ATI_REMOTE=m -CONFIG_IR_ENE=m -CONFIG_IR_IMON=m -CONFIG_IR_IMON_RAW=m -CONFIG_IR_MCEUSB=m -CONFIG_IR_ITE_CIR=m -CONFIG_IR_FINTEK=m -CONFIG_IR_NUVOTON=m -CONFIG_IR_REDRAT3=m -CONFIG_IR_STREAMZAP=m -CONFIG_IR_WINBOND_CIR=m -CONFIG_IR_IGORPLUGUSB=m -CONFIG_IR_IGUANA=m -CONFIG_IR_TTUSBIR=m -CONFIG_RC_LOOPBACK=m -CONFIG_IR_SERIAL=m -CONFIG_IR_SERIAL_TRANSMITTER=y -CONFIG_IR_SIR=m -CONFIG_MEDIA_SUPPORT=m - -# -# Multimedia core support -# -CONFIG_MEDIA_CAMERA_SUPPORT=y -CONFIG_MEDIA_ANALOG_TV_SUPPORT=y -CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y -CONFIG_MEDIA_RADIO_SUPPORT=y -CONFIG_MEDIA_SDR_SUPPORT=y -CONFIG_MEDIA_CEC_SUPPORT=y -# CONFIG_MEDIA_CEC_RC is not set -CONFIG_MEDIA_CONTROLLER=y -# CONFIG_MEDIA_CONTROLLER_DVB is not set -CONFIG_VIDEO_DEV=m -CONFIG_VIDEO_V4L2_SUBDEV_API=y -CONFIG_VIDEO_V4L2=m -# CONFIG_VIDEO_ADV_DEBUG is not set -# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set -# CONFIG_VIDEO_PCI_SKELETON is not set -CONFIG_VIDEO_TUNER=m -CONFIG_V4L2_MEM2MEM_DEV=m -CONFIG_V4L2_FLASH_LED_CLASS=m -CONFIG_V4L2_FWNODE=m -CONFIG_VIDEOBUF_GEN=m -CONFIG_VIDEOBUF_DMA_SG=m -CONFIG_VIDEOBUF_VMALLOC=m -CONFIG_DVB_CORE=m -# CONFIG_DVB_MMAP is not set -CONFIG_DVB_NET=y -CONFIG_TTPCI_EEPROM=m -CONFIG_DVB_MAX_ADAPTERS=8 -CONFIG_DVB_DYNAMIC_MINORS=y -# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set -# CONFIG_DVB_ULE_DEBUG is not set - -# -# Media drivers -# -CONFIG_MEDIA_USB_SUPPORT=y - -# -# Webcam devices -# -CONFIG_USB_VIDEO_CLASS=m -CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y -CONFIG_USB_GSPCA=m -CONFIG_USB_M5602=m -CONFIG_USB_STV06XX=m -CONFIG_USB_GL860=m -CONFIG_USB_GSPCA_BENQ=m -CONFIG_USB_GSPCA_CONEX=m -CONFIG_USB_GSPCA_CPIA1=m -CONFIG_USB_GSPCA_DTCS033=m -CONFIG_USB_GSPCA_ETOMS=m -CONFIG_USB_GSPCA_FINEPIX=m -CONFIG_USB_GSPCA_JEILINJ=m -CONFIG_USB_GSPCA_JL2005BCD=m -CONFIG_USB_GSPCA_KINECT=m -CONFIG_USB_GSPCA_KONICA=m -CONFIG_USB_GSPCA_MARS=m -CONFIG_USB_GSPCA_MR97310A=m -CONFIG_USB_GSPCA_NW80X=m -CONFIG_USB_GSPCA_OV519=m -CONFIG_USB_GSPCA_OV534=m -CONFIG_USB_GSPCA_OV534_9=m -CONFIG_USB_GSPCA_PAC207=m -CONFIG_USB_GSPCA_PAC7302=m -CONFIG_USB_GSPCA_PAC7311=m -CONFIG_USB_GSPCA_SE401=m -CONFIG_USB_GSPCA_SN9C2028=m -CONFIG_USB_GSPCA_SN9C20X=m -CONFIG_USB_GSPCA_SONIXB=m -CONFIG_USB_GSPCA_SONIXJ=m -CONFIG_USB_GSPCA_SPCA500=m -CONFIG_USB_GSPCA_SPCA501=m -CONFIG_USB_GSPCA_SPCA505=m -CONFIG_USB_GSPCA_SPCA506=m -CONFIG_USB_GSPCA_SPCA508=m -CONFIG_USB_GSPCA_SPCA561=m -CONFIG_USB_GSPCA_SPCA1528=m -CONFIG_USB_GSPCA_SQ905=m -CONFIG_USB_GSPCA_SQ905C=m -CONFIG_USB_GSPCA_SQ930X=m -CONFIG_USB_GSPCA_STK014=m -CONFIG_USB_GSPCA_STK1135=m -CONFIG_USB_GSPCA_STV0680=m -CONFIG_USB_GSPCA_SUNPLUS=m -CONFIG_USB_GSPCA_T613=m -CONFIG_USB_GSPCA_TOPRO=m -CONFIG_USB_GSPCA_TOUPTEK=m -CONFIG_USB_GSPCA_TV8532=m -CONFIG_USB_GSPCA_VC032X=m -CONFIG_USB_GSPCA_VICAM=m -CONFIG_USB_GSPCA_XIRLINK_CIT=m -CONFIG_USB_GSPCA_ZC3XX=m -CONFIG_USB_PWC=m -# CONFIG_USB_PWC_DEBUG is not set -CONFIG_USB_PWC_INPUT_EVDEV=y -CONFIG_VIDEO_CPIA2=m -CONFIG_USB_ZR364XX=m -CONFIG_USB_STKWEBCAM=m -CONFIG_USB_S2255=m -CONFIG_VIDEO_USBTV=m - -# -# Analog TV USB devices -# -CONFIG_VIDEO_PVRUSB2=m -CONFIG_VIDEO_PVRUSB2_SYSFS=y -CONFIG_VIDEO_PVRUSB2_DVB=y -# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set -CONFIG_VIDEO_HDPVR=m -CONFIG_VIDEO_USBVISION=m -CONFIG_VIDEO_STK1160_COMMON=m -CONFIG_VIDEO_STK1160=m -CONFIG_VIDEO_GO7007=m -CONFIG_VIDEO_GO7007_USB=m -CONFIG_VIDEO_GO7007_LOADER=m -CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m - -# -# Analog/digital TV USB devices -# -CONFIG_VIDEO_AU0828=m -CONFIG_VIDEO_AU0828_V4L2=y -CONFIG_VIDEO_AU0828_RC=y -CONFIG_VIDEO_CX231XX=m -CONFIG_VIDEO_CX231XX_RC=y -CONFIG_VIDEO_CX231XX_ALSA=m -CONFIG_VIDEO_CX231XX_DVB=m -CONFIG_VIDEO_TM6000=m -CONFIG_VIDEO_TM6000_ALSA=m -CONFIG_VIDEO_TM6000_DVB=m - -# -# Digital TV USB devices -# -CONFIG_DVB_USB=m -# CONFIG_DVB_USB_DEBUG is not set -CONFIG_DVB_USB_DIB3000MC=m -CONFIG_DVB_USB_A800=m -CONFIG_DVB_USB_DIBUSB_MB=m -# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set -CONFIG_DVB_USB_DIBUSB_MC=m -CONFIG_DVB_USB_DIB0700=m -CONFIG_DVB_USB_UMT_010=m -CONFIG_DVB_USB_CXUSB=m -CONFIG_DVB_USB_M920X=m -CONFIG_DVB_USB_DIGITV=m -CONFIG_DVB_USB_VP7045=m -CONFIG_DVB_USB_VP702X=m -CONFIG_DVB_USB_GP8PSK=m -CONFIG_DVB_USB_NOVA_T_USB2=m -CONFIG_DVB_USB_TTUSB2=m -CONFIG_DVB_USB_DTT200U=m -CONFIG_DVB_USB_OPERA1=m -CONFIG_DVB_USB_AF9005=m -CONFIG_DVB_USB_AF9005_REMOTE=m -CONFIG_DVB_USB_PCTV452E=m -CONFIG_DVB_USB_DW2102=m -CONFIG_DVB_USB_CINERGY_T2=m -CONFIG_DVB_USB_DTV5100=m -CONFIG_DVB_USB_FRIIO=m -CONFIG_DVB_USB_AZ6027=m -CONFIG_DVB_USB_TECHNISAT_USB2=m -CONFIG_DVB_USB_V2=m -CONFIG_DVB_USB_AF9015=m -CONFIG_DVB_USB_AF9035=m -CONFIG_DVB_USB_ANYSEE=m -CONFIG_DVB_USB_AU6610=m -CONFIG_DVB_USB_AZ6007=m -CONFIG_DVB_USB_CE6230=m -CONFIG_DVB_USB_EC168=m -CONFIG_DVB_USB_GL861=m -CONFIG_DVB_USB_LME2510=m -CONFIG_DVB_USB_MXL111SF=m -CONFIG_DVB_USB_RTL28XXU=m -CONFIG_DVB_USB_DVBSKY=m -CONFIG_DVB_USB_ZD1301=m -CONFIG_DVB_TTUSB_BUDGET=m -CONFIG_DVB_TTUSB_DEC=m -CONFIG_SMS_USB_DRV=m -CONFIG_DVB_B2C2_FLEXCOP_USB=m -# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set -CONFIG_DVB_AS102=m - -# -# Webcam, TV (analog/digital) USB devices -# -CONFIG_VIDEO_EM28XX=m -CONFIG_VIDEO_EM28XX_V4L2=m -CONFIG_VIDEO_EM28XX_ALSA=m -CONFIG_VIDEO_EM28XX_DVB=m -CONFIG_VIDEO_EM28XX_RC=m - -# -# Software defined radio USB devices -# -CONFIG_USB_AIRSPY=m -CONFIG_USB_HACKRF=m -CONFIG_USB_MSI2500=m - -# -# USB HDMI CEC adapters -# -CONFIG_USB_PULSE8_CEC=m -CONFIG_USB_RAINSHADOW_CEC=m -CONFIG_MEDIA_PCI_SUPPORT=y - -# -# Media capture support -# -CONFIG_VIDEO_MEYE=m -CONFIG_VIDEO_SOLO6X10=m -CONFIG_VIDEO_TW5864=m -CONFIG_VIDEO_TW68=m -CONFIG_VIDEO_TW686X=m - -# -# Media capture/analog TV support -# -CONFIG_VIDEO_IVTV=m -# CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set -CONFIG_VIDEO_IVTV_ALSA=m -CONFIG_VIDEO_FB_IVTV=m -CONFIG_VIDEO_HEXIUM_GEMINI=m -CONFIG_VIDEO_HEXIUM_ORION=m -CONFIG_VIDEO_MXB=m -CONFIG_VIDEO_DT3155=m - -# -# Media capture/analog/hybrid TV support -# -CONFIG_VIDEO_CX18=m -CONFIG_VIDEO_CX18_ALSA=m -CONFIG_VIDEO_CX23885=m -CONFIG_MEDIA_ALTERA_CI=m -CONFIG_VIDEO_CX25821=m -CONFIG_VIDEO_CX25821_ALSA=m -CONFIG_VIDEO_CX88=m -CONFIG_VIDEO_CX88_ALSA=m -CONFIG_VIDEO_CX88_BLACKBIRD=m -CONFIG_VIDEO_CX88_DVB=m -CONFIG_VIDEO_CX88_ENABLE_VP3054=y -CONFIG_VIDEO_CX88_VP3054=m -CONFIG_VIDEO_CX88_MPEG=m -CONFIG_VIDEO_BT848=m -CONFIG_DVB_BT8XX=m -CONFIG_VIDEO_SAA7134=m -CONFIG_VIDEO_SAA7134_ALSA=m -CONFIG_VIDEO_SAA7134_RC=y -CONFIG_VIDEO_SAA7134_DVB=m -CONFIG_VIDEO_SAA7134_GO7007=m -CONFIG_VIDEO_SAA7164=m -CONFIG_VIDEO_COBALT=m - -# -# Media digital TV PCI Adapters -# -CONFIG_DVB_AV7110_IR=y -CONFIG_DVB_AV7110=m -CONFIG_DVB_AV7110_OSD=y -CONFIG_DVB_BUDGET_CORE=m -CONFIG_DVB_BUDGET=m -CONFIG_DVB_BUDGET_CI=m -CONFIG_DVB_BUDGET_AV=m -CONFIG_DVB_BUDGET_PATCH=m -CONFIG_DVB_B2C2_FLEXCOP_PCI=m -# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set -CONFIG_DVB_PLUTO2=m -CONFIG_DVB_DM1105=m -CONFIG_DVB_PT1=m -CONFIG_DVB_PT3=m -CONFIG_MANTIS_CORE=m -CONFIG_DVB_MANTIS=m -CONFIG_DVB_HOPPER=m -CONFIG_DVB_NGENE=m -CONFIG_DVB_DDBRIDGE=m -# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set -CONFIG_DVB_SMIPCIE=m -CONFIG_DVB_NETUP_UNIDVB=m -CONFIG_VIDEO_IPU3_CIO2=m -CONFIG_V4L_PLATFORM_DRIVERS=y -CONFIG_VIDEO_CAFE_CCIC=m -CONFIG_VIDEO_VIA_CAMERA=m -CONFIG_VIDEO_CADENCE=y -CONFIG_VIDEO_CADENCE_CSI2RX=m -CONFIG_VIDEO_CADENCE_CSI2TX=m -CONFIG_SOC_CAMERA=m -CONFIG_SOC_CAMERA_PLATFORM=m -CONFIG_V4L_MEM2MEM_DRIVERS=y -CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m -CONFIG_VIDEO_SH_VEU=m -CONFIG_V4L_TEST_DRIVERS=y -# CONFIG_VIDEO_VIMC is not set -CONFIG_VIDEO_VIVID=m -CONFIG_VIDEO_VIVID_CEC=y -CONFIG_VIDEO_VIVID_MAX_DEVS=64 -CONFIG_VIDEO_VIM2M=m -CONFIG_DVB_PLATFORM_DRIVERS=y -CONFIG_CEC_PLATFORM_DRIVERS=y -CONFIG_SDR_PLATFORM_DRIVERS=y - -# -# Supported MMC/SDIO adapters -# -CONFIG_SMS_SDIO_DRV=m -CONFIG_RADIO_ADAPTERS=y -CONFIG_RADIO_TEA575X=m -CONFIG_RADIO_SI470X=m -CONFIG_USB_SI470X=m -CONFIG_I2C_SI470X=m -CONFIG_RADIO_SI4713=m -CONFIG_USB_SI4713=m -CONFIG_PLATFORM_SI4713=m -CONFIG_I2C_SI4713=m -CONFIG_RADIO_SI476X=m -CONFIG_USB_MR800=m -CONFIG_USB_DSBR=m -CONFIG_RADIO_MAXIRADIO=m -CONFIG_RADIO_SHARK=m -CONFIG_RADIO_SHARK2=m -CONFIG_USB_KEENE=m -CONFIG_USB_RAREMONO=m -CONFIG_USB_MA901=m -CONFIG_RADIO_TEA5764=m -CONFIG_RADIO_SAA7706H=m -CONFIG_RADIO_TEF6862=m -CONFIG_RADIO_TIMBERDALE=m -CONFIG_RADIO_WL1273=m - -# -# Texas Instruments WL128x FM driver (ST based) -# -CONFIG_RADIO_WL128X=m -CONFIG_V4L_RADIO_ISA_DRIVERS=y -CONFIG_RADIO_ISA=m -CONFIG_RADIO_CADET=m -CONFIG_RADIO_RTRACK=m -CONFIG_RADIO_RTRACK2=m -CONFIG_RADIO_AZTECH=m -CONFIG_RADIO_GEMTEK=m -CONFIG_RADIO_MIROPCM20=m -CONFIG_RADIO_SF16FMI=m -CONFIG_RADIO_SF16FMR2=m -CONFIG_RADIO_TERRATEC=m -CONFIG_RADIO_TRUST=m -CONFIG_RADIO_TYPHOON=m -CONFIG_RADIO_ZOLTRIX=m - -# -# Supported FireWire (IEEE 1394) Adapters -# -CONFIG_DVB_FIREDTV=m -CONFIG_DVB_FIREDTV_INPUT=y -CONFIG_MEDIA_COMMON_OPTIONS=y - -# -# common driver options -# -CONFIG_VIDEO_CX2341X=m -CONFIG_VIDEO_TVEEPROM=m -CONFIG_CYPRESS_FIRMWARE=m -CONFIG_VIDEOBUF2_CORE=m -CONFIG_VIDEOBUF2_V4L2=m -CONFIG_VIDEOBUF2_MEMOPS=m -CONFIG_VIDEOBUF2_DMA_CONTIG=m -CONFIG_VIDEOBUF2_VMALLOC=m -CONFIG_VIDEOBUF2_DMA_SG=m -CONFIG_VIDEOBUF2_DVB=m -CONFIG_DVB_B2C2_FLEXCOP=m -CONFIG_VIDEO_SAA7146=m -CONFIG_VIDEO_SAA7146_VV=m -CONFIG_SMS_SIANO_MDTV=m -CONFIG_SMS_SIANO_RC=y -CONFIG_SMS_SIANO_DEBUGFS=y -CONFIG_VIDEO_V4L2_TPG=m - -# -# Media ancillary drivers (tuners, sensors, i2c, spi, frontends) -# -CONFIG_MEDIA_SUBDRV_AUTOSELECT=y -CONFIG_MEDIA_ATTACH=y -CONFIG_VIDEO_IR_I2C=m - -# -# Audio decoders, processors and mixers -# -CONFIG_VIDEO_TVAUDIO=m -CONFIG_VIDEO_TDA7432=m -CONFIG_VIDEO_TDA9840=m -CONFIG_VIDEO_TEA6415C=m -CONFIG_VIDEO_TEA6420=m -CONFIG_VIDEO_MSP3400=m -CONFIG_VIDEO_CS3308=m -CONFIG_VIDEO_CS5345=m -CONFIG_VIDEO_CS53L32A=m -CONFIG_VIDEO_UDA1342=m -CONFIG_VIDEO_WM8775=m -CONFIG_VIDEO_WM8739=m -CONFIG_VIDEO_VP27SMPX=m -CONFIG_VIDEO_SONY_BTF_MPX=m - -# -# RDS decoders -# -CONFIG_VIDEO_SAA6588=m - -# -# Video decoders -# -CONFIG_VIDEO_ADV7604=m -CONFIG_VIDEO_ADV7842=m -CONFIG_VIDEO_BT819=m -CONFIG_VIDEO_BT856=m -CONFIG_VIDEO_BT866=m -CONFIG_VIDEO_KS0127=m -CONFIG_VIDEO_SAA7110=m -CONFIG_VIDEO_SAA711X=m -CONFIG_VIDEO_TVP5150=m -CONFIG_VIDEO_TW2804=m -CONFIG_VIDEO_TW9903=m -CONFIG_VIDEO_TW9906=m -CONFIG_VIDEO_VPX3220=m - -# -# Video and audio decoders -# -CONFIG_VIDEO_SAA717X=m -CONFIG_VIDEO_CX25840=m - -# -# Video encoders -# -CONFIG_VIDEO_SAA7127=m -CONFIG_VIDEO_SAA7185=m -CONFIG_VIDEO_ADV7170=m -CONFIG_VIDEO_ADV7175=m -CONFIG_VIDEO_ADV7511=m - -# -# Camera sensor devices -# -CONFIG_VIDEO_OV2640=m -CONFIG_VIDEO_OV7640=m -CONFIG_VIDEO_OV7670=m -CONFIG_VIDEO_MT9M111=m -CONFIG_VIDEO_MT9V011=m - -# -# Flash devices -# - -# -# Video improvement chips -# -CONFIG_VIDEO_UPD64031A=m -CONFIG_VIDEO_UPD64083=m - -# -# Audio/Video compression chips -# -CONFIG_VIDEO_SAA6752HS=m - -# -# SDR tuner chips -# - -# -# Miscellaneous helper chips -# -CONFIG_VIDEO_M52790=m - -# -# Sensors used on soc_camera driver -# - -# -# soc_camera sensor drivers -# -CONFIG_SOC_CAMERA_MT9M001=m -CONFIG_SOC_CAMERA_MT9M111=m -CONFIG_SOC_CAMERA_MT9T112=m -CONFIG_SOC_CAMERA_MT9V022=m -CONFIG_SOC_CAMERA_OV5642=m -CONFIG_SOC_CAMERA_OV772X=m -CONFIG_SOC_CAMERA_OV9640=m -CONFIG_SOC_CAMERA_OV9740=m -CONFIG_SOC_CAMERA_RJ54N1=m -CONFIG_SOC_CAMERA_TW9910=m - -# -# Media SPI Adapters -# -CONFIG_CXD2880_SPI_DRV=m -CONFIG_MEDIA_TUNER=m -CONFIG_MEDIA_TUNER_SIMPLE=m -CONFIG_MEDIA_TUNER_TDA18250=m -CONFIG_MEDIA_TUNER_TDA8290=m -CONFIG_MEDIA_TUNER_TDA827X=m -CONFIG_MEDIA_TUNER_TDA18271=m -CONFIG_MEDIA_TUNER_TDA9887=m -CONFIG_MEDIA_TUNER_TEA5761=m -CONFIG_MEDIA_TUNER_TEA5767=m -CONFIG_MEDIA_TUNER_MSI001=m -CONFIG_MEDIA_TUNER_MT20XX=m -CONFIG_MEDIA_TUNER_MT2060=m -CONFIG_MEDIA_TUNER_MT2063=m -CONFIG_MEDIA_TUNER_MT2266=m -CONFIG_MEDIA_TUNER_MT2131=m -CONFIG_MEDIA_TUNER_QT1010=m -CONFIG_MEDIA_TUNER_XC2028=m -CONFIG_MEDIA_TUNER_XC5000=m -CONFIG_MEDIA_TUNER_XC4000=m -CONFIG_MEDIA_TUNER_MXL5005S=m -CONFIG_MEDIA_TUNER_MXL5007T=m -CONFIG_MEDIA_TUNER_MC44S803=m -CONFIG_MEDIA_TUNER_MAX2165=m -CONFIG_MEDIA_TUNER_TDA18218=m -CONFIG_MEDIA_TUNER_FC0011=m -CONFIG_MEDIA_TUNER_FC0012=m -CONFIG_MEDIA_TUNER_FC0013=m -CONFIG_MEDIA_TUNER_TDA18212=m -CONFIG_MEDIA_TUNER_E4000=m -CONFIG_MEDIA_TUNER_FC2580=m -CONFIG_MEDIA_TUNER_M88RS6000T=m -CONFIG_MEDIA_TUNER_TUA9001=m -CONFIG_MEDIA_TUNER_SI2157=m -CONFIG_MEDIA_TUNER_IT913X=m -CONFIG_MEDIA_TUNER_R820T=m -CONFIG_MEDIA_TUNER_MXL301RF=m -CONFIG_MEDIA_TUNER_QM1D1C0042=m -CONFIG_MEDIA_TUNER_QM1D1B0004=m - -# -# Multistandard (satellite) frontends -# -CONFIG_DVB_STB0899=m -CONFIG_DVB_STB6100=m -CONFIG_DVB_STV090x=m -CONFIG_DVB_STV0910=m -CONFIG_DVB_STV6110x=m -CONFIG_DVB_STV6111=m -CONFIG_DVB_MXL5XX=m -CONFIG_DVB_M88DS3103=m - -# -# Multistandard (cable + terrestrial) frontends -# -CONFIG_DVB_DRXK=m -CONFIG_DVB_TDA18271C2DD=m -CONFIG_DVB_SI2165=m -CONFIG_DVB_MN88472=m -CONFIG_DVB_MN88473=m - -# -# DVB-S (satellite) frontends -# -CONFIG_DVB_CX24110=m -CONFIG_DVB_CX24123=m -CONFIG_DVB_MT312=m -CONFIG_DVB_ZL10036=m -CONFIG_DVB_ZL10039=m -CONFIG_DVB_S5H1420=m -CONFIG_DVB_STV0288=m -CONFIG_DVB_STB6000=m -CONFIG_DVB_STV0299=m -CONFIG_DVB_STV6110=m -CONFIG_DVB_STV0900=m -CONFIG_DVB_TDA8083=m -CONFIG_DVB_TDA10086=m -CONFIG_DVB_TDA8261=m -CONFIG_DVB_VES1X93=m -CONFIG_DVB_TUNER_ITD1000=m -CONFIG_DVB_TUNER_CX24113=m -CONFIG_DVB_TDA826X=m -CONFIG_DVB_TUA6100=m -CONFIG_DVB_CX24116=m -CONFIG_DVB_CX24117=m -CONFIG_DVB_CX24120=m -CONFIG_DVB_SI21XX=m -CONFIG_DVB_TS2020=m -CONFIG_DVB_DS3000=m -CONFIG_DVB_MB86A16=m -CONFIG_DVB_TDA10071=m - -# -# DVB-T (terrestrial) frontends -# -CONFIG_DVB_SP8870=m -CONFIG_DVB_SP887X=m -CONFIG_DVB_CX22700=m -CONFIG_DVB_CX22702=m -CONFIG_DVB_DRXD=m -CONFIG_DVB_L64781=m -CONFIG_DVB_TDA1004X=m -CONFIG_DVB_NXT6000=m -CONFIG_DVB_MT352=m -CONFIG_DVB_ZL10353=m -CONFIG_DVB_DIB3000MB=m -CONFIG_DVB_DIB3000MC=m -CONFIG_DVB_DIB7000M=m -CONFIG_DVB_DIB7000P=m -CONFIG_DVB_TDA10048=m -CONFIG_DVB_AF9013=m -CONFIG_DVB_EC100=m -CONFIG_DVB_STV0367=m -CONFIG_DVB_CXD2820R=m -CONFIG_DVB_CXD2841ER=m -CONFIG_DVB_RTL2830=m -CONFIG_DVB_RTL2832=m -CONFIG_DVB_RTL2832_SDR=m -CONFIG_DVB_SI2168=m -CONFIG_DVB_AS102_FE=m -CONFIG_DVB_ZD1301_DEMOD=m -CONFIG_DVB_GP8PSK_FE=m - -# -# DVB-C (cable) frontends -# -CONFIG_DVB_VES1820=m -CONFIG_DVB_TDA10021=m -CONFIG_DVB_TDA10023=m -CONFIG_DVB_STV0297=m - -# -# ATSC (North American/Korean Terrestrial/Cable DTV) frontends -# -CONFIG_DVB_NXT200X=m -CONFIG_DVB_OR51211=m -CONFIG_DVB_OR51132=m -CONFIG_DVB_BCM3510=m -CONFIG_DVB_LGDT330X=m -CONFIG_DVB_LGDT3305=m -CONFIG_DVB_LGDT3306A=m -CONFIG_DVB_LG2160=m -CONFIG_DVB_S5H1409=m -CONFIG_DVB_AU8522=m -CONFIG_DVB_AU8522_DTV=m -CONFIG_DVB_AU8522_V4L=m -CONFIG_DVB_S5H1411=m - -# -# ISDB-T (terrestrial) frontends -# -CONFIG_DVB_S921=m -CONFIG_DVB_DIB8000=m -CONFIG_DVB_MB86A20S=m - -# -# ISDB-S (satellite) & ISDB-T (terrestrial) frontends -# -CONFIG_DVB_TC90522=m - -# -# Digital terrestrial only tuners/PLL -# -CONFIG_DVB_PLL=m -CONFIG_DVB_TUNER_DIB0070=m -CONFIG_DVB_TUNER_DIB0090=m - -# -# SEC control devices for DVB-S -# -CONFIG_DVB_DRX39XYJ=m -CONFIG_DVB_LNBH25=m -CONFIG_DVB_LNBP21=m -CONFIG_DVB_LNBP22=m -CONFIG_DVB_ISL6405=m -CONFIG_DVB_ISL6421=m -CONFIG_DVB_ISL6423=m -CONFIG_DVB_A8293=m -CONFIG_DVB_LGS8GXX=m -CONFIG_DVB_ATBM8830=m -CONFIG_DVB_TDA665x=m -CONFIG_DVB_IX2505V=m -CONFIG_DVB_M88RS2000=m -CONFIG_DVB_AF9033=m -CONFIG_DVB_HORUS3A=m -CONFIG_DVB_ASCOT2E=m -CONFIG_DVB_HELENE=m - -# -# Common Interface (EN50221) controller drivers -# -CONFIG_DVB_CXD2099=m -CONFIG_DVB_SP2=m - -# -# Tools to develop new frontends -# -CONFIG_DVB_DUMMY_FE=m - -# -# Graphics support -# -CONFIG_AGP=y -CONFIG_AGP_ALI=m -CONFIG_AGP_ATI=m -CONFIG_AGP_AMD=y -CONFIG_AGP_AMD64=y -CONFIG_AGP_INTEL=y -CONFIG_AGP_NVIDIA=y -CONFIG_AGP_SIS=m -CONFIG_AGP_SWORKS=m -CONFIG_AGP_VIA=y -CONFIG_AGP_EFFICEON=m -CONFIG_INTEL_GTT=y -CONFIG_VGA_ARB=y -CONFIG_VGA_ARB_MAX_GPUS=16 -CONFIG_VGA_SWITCHEROO=y -CONFIG_DRM=m -CONFIG_DRM_MIPI_DSI=y -# CONFIG_DRM_DP_AUX_CHARDEV is not set -# CONFIG_DRM_DEBUG_SELFTEST is not set -CONFIG_DRM_KMS_HELPER=m -CONFIG_DRM_KMS_FB_HELPER=y -CONFIG_DRM_FBDEV_EMULATION=y -CONFIG_DRM_FBDEV_OVERALLOC=100 -CONFIG_DRM_LOAD_EDID_FIRMWARE=y -CONFIG_DRM_TTM=m -CONFIG_DRM_VM=y -CONFIG_DRM_SCHED=m - -# -# I2C encoder or helper chips -# -CONFIG_DRM_I2C_CH7006=m -CONFIG_DRM_I2C_SIL164=m -CONFIG_DRM_I2C_NXP_TDA998X=m -CONFIG_DRM_I2C_NXP_TDA9950=m -CONFIG_DRM_RADEON=m -# CONFIG_DRM_RADEON_USERPTR is not set -CONFIG_DRM_AMDGPU=m -# CONFIG_DRM_AMDGPU_SI is not set -# CONFIG_DRM_AMDGPU_CIK is not set -CONFIG_DRM_AMDGPU_USERPTR=y -# CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set - -# -# ACP (Audio CoProcessor) Configuration -# -# CONFIG_DRM_AMD_ACP is not set - -# -# Display Engine Configuration -# -CONFIG_DRM_AMD_DC=y -# CONFIG_DRM_AMD_DC_FBC is not set -# CONFIG_DRM_AMD_DC_DCN1_0 is not set -# CONFIG_DEBUG_KERNEL_DC is not set - -# -# AMD Library routines -# -CONFIG_CHASH=m -# CONFIG_CHASH_STATS is not set -# CONFIG_CHASH_SELFTEST is not set -CONFIG_DRM_NOUVEAU=m -CONFIG_NOUVEAU_DEBUG=5 -CONFIG_NOUVEAU_DEBUG_DEFAULT=3 -# CONFIG_NOUVEAU_DEBUG_MMU is not set -CONFIG_DRM_NOUVEAU_BACKLIGHT=y -CONFIG_DRM_I915=m -# CONFIG_DRM_I915_ALPHA_SUPPORT is not set -CONFIG_DRM_I915_CAPTURE_ERROR=y -CONFIG_DRM_I915_COMPRESS_ERROR=y -CONFIG_DRM_I915_USERPTR=y - -# -# drm/i915 Debugging -# -# CONFIG_DRM_I915_WERROR is not set -# CONFIG_DRM_I915_DEBUG is not set -# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set -# CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set -# CONFIG_DRM_I915_DEBUG_GUC is not set -# CONFIG_DRM_I915_SELFTEST is not set -# CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set -# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set -CONFIG_DRM_VGEM=m -CONFIG_DRM_VMWGFX=m -CONFIG_DRM_VMWGFX_FBCON=y -CONFIG_DRM_GMA500=m -CONFIG_DRM_GMA600=y -CONFIG_DRM_GMA3600=y -CONFIG_DRM_MEDFIELD=y -CONFIG_DRM_UDL=m -CONFIG_DRM_AST=m -# CONFIG_DRM_MGAG200 is not set -CONFIG_DRM_CIRRUS_QEMU=m -CONFIG_DRM_QXL=m -# CONFIG_DRM_BOCHS is not set -CONFIG_DRM_VIRTIO_GPU=m -CONFIG_DRM_PANEL=y - -# -# Display Panels -# -# CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set -CONFIG_DRM_BRIDGE=y -CONFIG_DRM_PANEL_BRIDGE=y - -# -# Display Interface Bridges -# -CONFIG_DRM_ANALOGIX_ANX78XX=m -CONFIG_DRM_HISI_HIBMC=m -# CONFIG_DRM_TINYDRM is not set -CONFIG_DRM_XEN=y -CONFIG_DRM_XEN_FRONTEND=m -# CONFIG_DRM_LEGACY is not set -CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y - -# -# Frame buffer Devices -# -CONFIG_FB=y -CONFIG_FIRMWARE_EDID=y -CONFIG_FB_CMDLINE=y -CONFIG_FB_NOTIFY=y -CONFIG_FB_DDC=m -CONFIG_FB_BOOT_VESA_SUPPORT=y -CONFIG_FB_CFB_FILLRECT=y -CONFIG_FB_CFB_COPYAREA=y -CONFIG_FB_CFB_IMAGEBLIT=y -CONFIG_FB_SYS_FILLRECT=m -CONFIG_FB_SYS_COPYAREA=m -CONFIG_FB_SYS_IMAGEBLIT=m -# CONFIG_FB_FOREIGN_ENDIAN is not set -CONFIG_FB_SYS_FOPS=m -CONFIG_FB_DEFERRED_IO=y -CONFIG_FB_HECUBA=m -CONFIG_FB_SVGALIB=m -CONFIG_FB_BACKLIGHT=y -CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_TILEBLITTING=y - -# -# Frame buffer hardware drivers -# -CONFIG_FB_CIRRUS=m -CONFIG_FB_PM2=m -CONFIG_FB_PM2_FIFO_DISCONNECT=y -CONFIG_FB_CYBER2000=m -CONFIG_FB_CYBER2000_DDC=y -CONFIG_FB_ARC=m -CONFIG_FB_ASILIANT=y -CONFIG_FB_IMSTT=y -CONFIG_FB_VGA16=m -CONFIG_FB_UVESA=m -CONFIG_FB_VESA=y -CONFIG_FB_EFI=y -CONFIG_FB_N411=m -CONFIG_FB_HGA=m -CONFIG_FB_OPENCORES=m -CONFIG_FB_S1D13XXX=m -# CONFIG_FB_NVIDIA is not set -CONFIG_FB_RIVA=m -CONFIG_FB_RIVA_I2C=y -# CONFIG_FB_RIVA_DEBUG is not set -CONFIG_FB_RIVA_BACKLIGHT=y -CONFIG_FB_I740=m -CONFIG_FB_I810=m -# CONFIG_FB_I810_GTF is not set -CONFIG_FB_LE80578=m -CONFIG_FB_CARILLO_RANCH=m -CONFIG_FB_INTEL=m -# CONFIG_FB_INTEL_DEBUG is not set -CONFIG_FB_INTEL_I2C=y -CONFIG_FB_MATROX=m -CONFIG_FB_MATROX_MILLENIUM=y -CONFIG_FB_MATROX_MYSTIQUE=y -CONFIG_FB_MATROX_G=y -CONFIG_FB_MATROX_I2C=m -CONFIG_FB_MATROX_MAVEN=m -CONFIG_FB_RADEON=m -CONFIG_FB_RADEON_I2C=y -CONFIG_FB_RADEON_BACKLIGHT=y -# CONFIG_FB_RADEON_DEBUG is not set -CONFIG_FB_ATY128=m -CONFIG_FB_ATY128_BACKLIGHT=y -CONFIG_FB_ATY=m -CONFIG_FB_ATY_CT=y -# CONFIG_FB_ATY_GENERIC_LCD is not set -CONFIG_FB_ATY_GX=y -CONFIG_FB_ATY_BACKLIGHT=y -CONFIG_FB_S3=m -CONFIG_FB_S3_DDC=y -CONFIG_FB_SAVAGE=m -CONFIG_FB_SAVAGE_I2C=y -# CONFIG_FB_SAVAGE_ACCEL is not set -CONFIG_FB_SIS=m -CONFIG_FB_SIS_300=y -CONFIG_FB_SIS_315=y -CONFIG_FB_VIA=m -# CONFIG_FB_VIA_DIRECT_PROCFS is not set -CONFIG_FB_VIA_X_COMPATIBILITY=y -CONFIG_FB_NEOMAGIC=m -CONFIG_FB_KYRO=m -CONFIG_FB_3DFX=m -# CONFIG_FB_3DFX_ACCEL is not set -# CONFIG_FB_3DFX_I2C is not set -CONFIG_FB_VOODOO1=m -CONFIG_FB_VT8623=m -CONFIG_FB_TRIDENT=m -CONFIG_FB_ARK=m -CONFIG_FB_PM3=m -CONFIG_FB_CARMINE=m -CONFIG_FB_CARMINE_DRAM_EVAL=y -# CONFIG_CARMINE_DRAM_CUSTOM is not set -CONFIG_FB_GEODE=y -CONFIG_FB_GEODE_LX=m -CONFIG_FB_GEODE_GX=m -CONFIG_FB_GEODE_GX1=m -CONFIG_FB_SM501=m -CONFIG_FB_SMSCUFX=m -CONFIG_FB_UDL=m -CONFIG_FB_IBM_GXT4500=m -# CONFIG_FB_VIRTUAL is not set -CONFIG_XEN_FBDEV_FRONTEND=m -CONFIG_FB_METRONOME=m -CONFIG_FB_MB862XX=m -CONFIG_FB_MB862XX_PCI_GDC=y -CONFIG_FB_MB862XX_I2C=y -CONFIG_FB_BROADSHEET=m -CONFIG_FB_HYPERV=m -CONFIG_FB_SIMPLE=y -CONFIG_FB_SM712=m -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=m -CONFIG_LCD_L4F00242T03=m -CONFIG_LCD_LMS283GF05=m -CONFIG_LCD_LTV350QV=m -CONFIG_LCD_ILI922X=m -CONFIG_LCD_ILI9320=m -CONFIG_LCD_TDO24M=m -CONFIG_LCD_VGG2432A4=m -CONFIG_LCD_PLATFORM=m -CONFIG_LCD_S6E63M0=m -CONFIG_LCD_LD9040=m -CONFIG_LCD_AMS369FG06=m -CONFIG_LCD_LMS501KF03=m -CONFIG_LCD_HX8357=m -CONFIG_LCD_OTM3225A=m -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_BACKLIGHT_GENERIC=m -CONFIG_BACKLIGHT_LM3533=m -CONFIG_BACKLIGHT_CARILLO_RANCH=m -CONFIG_BACKLIGHT_PWM=m -CONFIG_BACKLIGHT_DA903X=m -CONFIG_BACKLIGHT_DA9052=m -CONFIG_BACKLIGHT_MAX8925=m -CONFIG_BACKLIGHT_APPLE=m -CONFIG_BACKLIGHT_PM8941_WLED=m -CONFIG_BACKLIGHT_SAHARA=m -CONFIG_BACKLIGHT_WM831X=m -CONFIG_BACKLIGHT_ADP5520=m -CONFIG_BACKLIGHT_ADP8860=m -CONFIG_BACKLIGHT_ADP8870=m -CONFIG_BACKLIGHT_88PM860X=m -CONFIG_BACKLIGHT_PCF50633=m -CONFIG_BACKLIGHT_AAT2870=m -CONFIG_BACKLIGHT_LM3630A=m -CONFIG_BACKLIGHT_LM3639=m -CONFIG_BACKLIGHT_LP855X=m -CONFIG_BACKLIGHT_LP8788=m -CONFIG_BACKLIGHT_PANDORA=m -CONFIG_BACKLIGHT_SKY81452=m -CONFIG_BACKLIGHT_AS3711=m -CONFIG_BACKLIGHT_GPIO=m -CONFIG_BACKLIGHT_LV5207LP=m -CONFIG_BACKLIGHT_BD6107=m -CONFIG_BACKLIGHT_ARCXCNN=m -CONFIG_BACKLIGHT_RAVE_SP=m -CONFIG_VGASTATE=m -CONFIG_VIDEOMODE_HELPERS=y -CONFIG_HDMI=y - -# -# Console display driver support -# -CONFIG_VGA_CONSOLE=y -# CONFIG_VGACON_SOFT_SCROLLBACK is not set -CONFIG_MDA_CONSOLE=m -CONFIG_DUMMY_CONSOLE=y -CONFIG_DUMMY_CONSOLE_COLUMNS=80 -CONFIG_DUMMY_CONSOLE_ROWS=25 -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y -CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -# CONFIG_LOGO_LINUX_CLUT224 is not set -CONFIG_SOUND=m -CONFIG_SOUND_OSS_CORE=y -# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set -CONFIG_SND=m -CONFIG_SND_TIMER=m -CONFIG_SND_PCM=m -CONFIG_SND_PCM_ELD=y -CONFIG_SND_PCM_IEC958=y -CONFIG_SND_DMAENGINE_PCM=m -CONFIG_SND_HWDEP=m -CONFIG_SND_SEQ_DEVICE=m -CONFIG_SND_RAWMIDI=m -CONFIG_SND_COMPRESS_OFFLOAD=m -CONFIG_SND_JACK=y -CONFIG_SND_JACK_INPUT_DEV=y -CONFIG_SND_OSSEMUL=y -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m -CONFIG_SND_PCM_OSS_PLUGINS=y -CONFIG_SND_PCM_TIMER=y -CONFIG_SND_HRTIMER=m -CONFIG_SND_DYNAMIC_MINORS=y -CONFIG_SND_MAX_CARDS=32 -CONFIG_SND_SUPPORT_OLD_API=y -CONFIG_SND_PROC_FS=y -CONFIG_SND_VERBOSE_PROCFS=y -# CONFIG_SND_VERBOSE_PRINTK is not set -# CONFIG_SND_DEBUG is not set -CONFIG_SND_VMASTER=y -CONFIG_SND_DMA_SGBUF=y -CONFIG_SND_SEQUENCER=m -CONFIG_SND_SEQ_DUMMY=m -# CONFIG_SND_SEQUENCER_OSS is not set -CONFIG_SND_SEQ_HRTIMER_DEFAULT=y -CONFIG_SND_SEQ_MIDI_EVENT=m -CONFIG_SND_SEQ_MIDI=m -CONFIG_SND_SEQ_MIDI_EMUL=m -CONFIG_SND_SEQ_VIRMIDI=m -CONFIG_SND_MPU401_UART=m -CONFIG_SND_OPL3_LIB=m -CONFIG_SND_OPL4_LIB=m -CONFIG_SND_OPL3_LIB_SEQ=m -CONFIG_SND_OPL4_LIB_SEQ=m -CONFIG_SND_VX_LIB=m -CONFIG_SND_AC97_CODEC=m -CONFIG_SND_DRIVERS=y -CONFIG_SND_PCSP=m -CONFIG_SND_DUMMY=m -CONFIG_SND_ALOOP=m -CONFIG_SND_VIRMIDI=m -CONFIG_SND_MTPAV=m -CONFIG_SND_MTS64=m -CONFIG_SND_SERIAL_U16550=m -CONFIG_SND_MPU401=m -CONFIG_SND_PORTMAN2X4=m -CONFIG_SND_AC97_POWER_SAVE=y -CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 -CONFIG_SND_WSS_LIB=m -CONFIG_SND_SB_COMMON=m -CONFIG_SND_SB8_DSP=m -CONFIG_SND_SB16_DSP=m -CONFIG_SND_ISA=y -CONFIG_SND_ADLIB=m -CONFIG_SND_AD1816A=m -CONFIG_SND_AD1848=m -CONFIG_SND_ALS100=m -CONFIG_SND_AZT1605=m -CONFIG_SND_AZT2316=m -CONFIG_SND_AZT2320=m -CONFIG_SND_CMI8328=m -CONFIG_SND_CMI8330=m -CONFIG_SND_CS4231=m -CONFIG_SND_CS4236=m -CONFIG_SND_ES1688=m -CONFIG_SND_ES18XX=m -CONFIG_SND_SC6000=m -CONFIG_SND_GUSCLASSIC=m -CONFIG_SND_GUSEXTREME=m -CONFIG_SND_GUSMAX=m -CONFIG_SND_INTERWAVE=m -CONFIG_SND_INTERWAVE_STB=m -CONFIG_SND_JAZZ16=m -CONFIG_SND_OPL3SA2=m -CONFIG_SND_OPTI92X_AD1848=m -CONFIG_SND_OPTI92X_CS4231=m -CONFIG_SND_OPTI93X=m -CONFIG_SND_MIRO=m -CONFIG_SND_SB8=m -CONFIG_SND_SB16=m -CONFIG_SND_SBAWE=m -CONFIG_SND_SBAWE_SEQ=m -CONFIG_SND_SB16_CSP=y -CONFIG_SND_SSCAPE=m -CONFIG_SND_WAVEFRONT=m -CONFIG_SND_MSND_PINNACLE=m -CONFIG_SND_MSND_CLASSIC=m -CONFIG_SND_PCI=y -CONFIG_SND_AD1889=m -CONFIG_SND_ALS300=m -CONFIG_SND_ALS4000=m -CONFIG_SND_ALI5451=m -CONFIG_SND_ASIHPI=m -CONFIG_SND_ATIIXP=m -CONFIG_SND_ATIIXP_MODEM=m -CONFIG_SND_AU8810=m -CONFIG_SND_AU8820=m -CONFIG_SND_AU8830=m -CONFIG_SND_AW2=m -CONFIG_SND_AZT3328=m -CONFIG_SND_BT87X=m -# CONFIG_SND_BT87X_OVERCLOCK is not set -CONFIG_SND_CA0106=m -CONFIG_SND_CMIPCI=m -CONFIG_SND_OXYGEN_LIB=m -CONFIG_SND_OXYGEN=m -CONFIG_SND_CS4281=m -CONFIG_SND_CS46XX=m -CONFIG_SND_CS46XX_NEW_DSP=y -CONFIG_SND_CS5530=m -CONFIG_SND_CS5535AUDIO=m -CONFIG_SND_CTXFI=m -CONFIG_SND_DARLA20=m -CONFIG_SND_GINA20=m -CONFIG_SND_LAYLA20=m -CONFIG_SND_DARLA24=m -CONFIG_SND_GINA24=m -CONFIG_SND_LAYLA24=m -CONFIG_SND_MONA=m -CONFIG_SND_MIA=m -CONFIG_SND_ECHO3G=m -CONFIG_SND_INDIGO=m -CONFIG_SND_INDIGOIO=m -CONFIG_SND_INDIGODJ=m -CONFIG_SND_INDIGOIOX=m -CONFIG_SND_INDIGODJX=m -CONFIG_SND_EMU10K1=m -CONFIG_SND_EMU10K1_SEQ=m -CONFIG_SND_EMU10K1X=m -CONFIG_SND_ENS1370=m -CONFIG_SND_ENS1371=m -CONFIG_SND_ES1938=m -CONFIG_SND_ES1968=m -CONFIG_SND_ES1968_INPUT=y -CONFIG_SND_ES1968_RADIO=y -CONFIG_SND_FM801=m -CONFIG_SND_FM801_TEA575X_BOOL=y -CONFIG_SND_HDSP=m -CONFIG_SND_HDSPM=m -CONFIG_SND_ICE1712=m -CONFIG_SND_ICE1724=m -CONFIG_SND_INTEL8X0=m -CONFIG_SND_INTEL8X0M=m -CONFIG_SND_KORG1212=m -CONFIG_SND_LOLA=m -CONFIG_SND_LX6464ES=m -CONFIG_SND_MAESTRO3=m -CONFIG_SND_MAESTRO3_INPUT=y -CONFIG_SND_MIXART=m -CONFIG_SND_NM256=m -CONFIG_SND_PCXHR=m -CONFIG_SND_RIPTIDE=m -CONFIG_SND_RME32=m -CONFIG_SND_RME96=m -CONFIG_SND_RME9652=m -CONFIG_SND_SIS7019=m -CONFIG_SND_SONICVIBES=m -CONFIG_SND_TRIDENT=m -CONFIG_SND_VIA82XX=m -CONFIG_SND_VIA82XX_MODEM=m -CONFIG_SND_VIRTUOSO=m -CONFIG_SND_VX222=m -CONFIG_SND_YMFPCI=m - -# -# HD-Audio -# -CONFIG_SND_HDA=m -CONFIG_SND_HDA_INTEL=m -CONFIG_SND_HDA_HWDEP=y -CONFIG_SND_HDA_RECONFIG=y -CONFIG_SND_HDA_INPUT_BEEP=y -CONFIG_SND_HDA_INPUT_BEEP_MODE=0 -CONFIG_SND_HDA_PATCH_LOADER=y -CONFIG_SND_HDA_CODEC_REALTEK=m -CONFIG_SND_HDA_CODEC_ANALOG=m -CONFIG_SND_HDA_CODEC_SIGMATEL=m -CONFIG_SND_HDA_CODEC_VIA=m -CONFIG_SND_HDA_CODEC_HDMI=m -CONFIG_SND_HDA_CODEC_CIRRUS=m -CONFIG_SND_HDA_CODEC_CONEXANT=m -CONFIG_SND_HDA_CODEC_CA0110=m -CONFIG_SND_HDA_CODEC_CA0132=m -CONFIG_SND_HDA_CODEC_CA0132_DSP=y -CONFIG_SND_HDA_CODEC_CMEDIA=m -CONFIG_SND_HDA_CODEC_SI3054=m -CONFIG_SND_HDA_GENERIC=m -CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 -CONFIG_SND_HDA_CORE=m -CONFIG_SND_HDA_DSP_LOADER=y -CONFIG_SND_HDA_I915=y -CONFIG_SND_HDA_EXT_CORE=m -CONFIG_SND_HDA_PREALLOC_SIZE=64 -CONFIG_SND_SPI=y -CONFIG_SND_USB=y -CONFIG_SND_USB_AUDIO=m -CONFIG_SND_USB_UA101=m -CONFIG_SND_USB_USX2Y=m -CONFIG_SND_USB_CAIAQ=m -CONFIG_SND_USB_CAIAQ_INPUT=y -CONFIG_SND_USB_US122L=m -CONFIG_SND_USB_6FIRE=m -CONFIG_SND_USB_HIFACE=m -CONFIG_SND_BCD2000=m -CONFIG_SND_USB_LINE6=m -CONFIG_SND_USB_POD=m -CONFIG_SND_USB_PODHD=m -CONFIG_SND_USB_TONEPORT=m -CONFIG_SND_USB_VARIAX=m -CONFIG_SND_FIREWIRE=y -CONFIG_SND_FIREWIRE_LIB=m -CONFIG_SND_DICE=m -CONFIG_SND_OXFW=m -CONFIG_SND_ISIGHT=m -CONFIG_SND_FIREWORKS=m -CONFIG_SND_BEBOB=m -CONFIG_SND_FIREWIRE_DIGI00X=m -CONFIG_SND_FIREWIRE_TASCAM=m -CONFIG_SND_FIREWIRE_MOTU=m -CONFIG_SND_FIREFACE=m -CONFIG_SND_PCMCIA=y -CONFIG_SND_VXPOCKET=m -CONFIG_SND_PDAUDIOCF=m -CONFIG_SND_SOC=m -CONFIG_SND_SOC_AC97_BUS=y -CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y -CONFIG_SND_SOC_COMPRESS=y -CONFIG_SND_SOC_TOPOLOGY=y -CONFIG_SND_SOC_ACPI=m -CONFIG_SND_SOC_AMD_ACP=m -CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m -CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m -CONFIG_SND_ATMEL_SOC=m -CONFIG_SND_DESIGNWARE_I2S=m -# CONFIG_SND_DESIGNWARE_PCM is not set - -# -# SoC Audio for Freescale CPUs -# - -# -# Common SoC Audio options for Freescale CPUs: -# -CONFIG_SND_SOC_FSL_ASRC=m -CONFIG_SND_SOC_FSL_SAI=m -CONFIG_SND_SOC_FSL_SSI=m -CONFIG_SND_SOC_FSL_SPDIF=m -CONFIG_SND_SOC_FSL_ESAI=m -CONFIG_SND_SOC_IMX_AUDMUX=m -CONFIG_SND_I2S_HI6210_I2S=m -# CONFIG_SND_SOC_IMG is not set -CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y -CONFIG_SND_SST_IPC=m -CONFIG_SND_SST_IPC_PCI=m -CONFIG_SND_SST_IPC_ACPI=m -CONFIG_SND_SOC_INTEL_SST_ACPI=m -CONFIG_SND_SOC_INTEL_SST=m -CONFIG_SND_SOC_INTEL_SST_FIRMWARE=m -CONFIG_SND_SOC_INTEL_HASWELL=m -CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m -CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI=m -CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI=m -CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m -CONFIG_SND_SOC_INTEL_SKYLAKE=m -CONFIG_SND_SOC_ACPI_INTEL_MATCH=m -CONFIG_SND_SOC_INTEL_MACH=y -CONFIG_SND_SOC_INTEL_HASWELL_MACH=m -CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m -CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m -CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m -CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m -CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m -CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m -CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m -CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m -CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m -CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m -CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m -CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m -CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m -CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m -CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m -CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m -CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH=m -CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH=m -CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH=m - -# -# STMicroelectronics STM32 SOC audio support -# -CONFIG_SND_SOC_XTFPGA_I2S=m -CONFIG_ZX_TDM=m -CONFIG_SND_SOC_I2C_AND_SPI=m - -# -# CODEC drivers -# -CONFIG_SND_SOC_AC97_CODEC=m -CONFIG_SND_SOC_ADAU_UTILS=m -CONFIG_SND_SOC_ADAU1701=m -CONFIG_SND_SOC_ADAU17X1=m -CONFIG_SND_SOC_ADAU1761=m -CONFIG_SND_SOC_ADAU1761_I2C=m -CONFIG_SND_SOC_ADAU1761_SPI=m -CONFIG_SND_SOC_ADAU7002=m -CONFIG_SND_SOC_AK4104=m -CONFIG_SND_SOC_AK4458=m -CONFIG_SND_SOC_AK4554=m -CONFIG_SND_SOC_AK4613=m -CONFIG_SND_SOC_AK4642=m -CONFIG_SND_SOC_AK5386=m -CONFIG_SND_SOC_AK5558=m -CONFIG_SND_SOC_ALC5623=m -CONFIG_SND_SOC_BD28623=m -CONFIG_SND_SOC_BT_SCO=m -CONFIG_SND_SOC_CS35L32=m -CONFIG_SND_SOC_CS35L33=m -CONFIG_SND_SOC_CS35L34=m -CONFIG_SND_SOC_CS35L35=m -CONFIG_SND_SOC_CS42L42=m -CONFIG_SND_SOC_CS42L51=m -CONFIG_SND_SOC_CS42L51_I2C=m -CONFIG_SND_SOC_CS42L52=m -CONFIG_SND_SOC_CS42L56=m -CONFIG_SND_SOC_CS42L73=m -CONFIG_SND_SOC_CS4265=m -CONFIG_SND_SOC_CS4270=m -CONFIG_SND_SOC_CS4271=m -CONFIG_SND_SOC_CS4271_I2C=m -CONFIG_SND_SOC_CS4271_SPI=m -CONFIG_SND_SOC_CS42XX8=m -CONFIG_SND_SOC_CS42XX8_I2C=m -CONFIG_SND_SOC_CS43130=m -CONFIG_SND_SOC_CS4349=m -CONFIG_SND_SOC_CS53L30=m -CONFIG_SND_SOC_DA7213=m -CONFIG_SND_SOC_DA7219=m -CONFIG_SND_SOC_DIO2125=m -CONFIG_SND_SOC_DMIC=m -CONFIG_SND_SOC_HDMI_CODEC=m -CONFIG_SND_SOC_ES7134=m -CONFIG_SND_SOC_ES8316=m -CONFIG_SND_SOC_ES8328=m -CONFIG_SND_SOC_ES8328_I2C=m -CONFIG_SND_SOC_ES8328_SPI=m -CONFIG_SND_SOC_GTM601=m -CONFIG_SND_SOC_HDAC_HDMI=m -CONFIG_SND_SOC_INNO_RK3036=m -CONFIG_SND_SOC_MAX98090=m -CONFIG_SND_SOC_MAX98357A=m -CONFIG_SND_SOC_MAX98504=m -CONFIG_SND_SOC_MAX9867=m -CONFIG_SND_SOC_MAX98927=m -CONFIG_SND_SOC_MAX98373=m -CONFIG_SND_SOC_MAX9860=m -CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m -CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m -CONFIG_SND_SOC_PCM1681=m -CONFIG_SND_SOC_PCM1789=m -CONFIG_SND_SOC_PCM1789_I2C=m -CONFIG_SND_SOC_PCM179X=m -CONFIG_SND_SOC_PCM179X_I2C=m -CONFIG_SND_SOC_PCM179X_SPI=m -CONFIG_SND_SOC_PCM186X=m -CONFIG_SND_SOC_PCM186X_I2C=m -CONFIG_SND_SOC_PCM186X_SPI=m -CONFIG_SND_SOC_PCM3168A=m -CONFIG_SND_SOC_PCM3168A_I2C=m -CONFIG_SND_SOC_PCM3168A_SPI=m -CONFIG_SND_SOC_PCM512x=m -CONFIG_SND_SOC_PCM512x_I2C=m -CONFIG_SND_SOC_PCM512x_SPI=m -CONFIG_SND_SOC_RL6231=m -CONFIG_SND_SOC_RL6347A=m -CONFIG_SND_SOC_RT286=m -CONFIG_SND_SOC_RT298=m -CONFIG_SND_SOC_RT5514=m -CONFIG_SND_SOC_RT5514_SPI=m -CONFIG_SND_SOC_RT5616=m -CONFIG_SND_SOC_RT5631=m -CONFIG_SND_SOC_RT5640=m -CONFIG_SND_SOC_RT5645=m -CONFIG_SND_SOC_RT5651=m -CONFIG_SND_SOC_RT5663=m -CONFIG_SND_SOC_RT5670=m -CONFIG_SND_SOC_RT5677=m -CONFIG_SND_SOC_RT5677_SPI=m -CONFIG_SND_SOC_SGTL5000=m -CONFIG_SND_SOC_SI476X=m -CONFIG_SND_SOC_SIGMADSP=m -CONFIG_SND_SOC_SIGMADSP_I2C=m -CONFIG_SND_SOC_SIGMADSP_REGMAP=m -CONFIG_SND_SOC_SIRF_AUDIO_CODEC=m -CONFIG_SND_SOC_SPDIF=m -CONFIG_SND_SOC_SSM2305=m -CONFIG_SND_SOC_SSM2602=m -CONFIG_SND_SOC_SSM2602_SPI=m -CONFIG_SND_SOC_SSM2602_I2C=m -CONFIG_SND_SOC_SSM4567=m -CONFIG_SND_SOC_STA32X=m -CONFIG_SND_SOC_STA350=m -CONFIG_SND_SOC_STI_SAS=m -CONFIG_SND_SOC_TAS2552=m -CONFIG_SND_SOC_TAS5086=m -CONFIG_SND_SOC_TAS571X=m -CONFIG_SND_SOC_TAS5720=m -CONFIG_SND_SOC_TAS6424=m -CONFIG_SND_SOC_TDA7419=m -CONFIG_SND_SOC_TFA9879=m -CONFIG_SND_SOC_TLV320AIC23=m -CONFIG_SND_SOC_TLV320AIC23_I2C=m -CONFIG_SND_SOC_TLV320AIC23_SPI=m -CONFIG_SND_SOC_TLV320AIC31XX=m -CONFIG_SND_SOC_TLV320AIC32X4=m -CONFIG_SND_SOC_TLV320AIC32X4_I2C=m -CONFIG_SND_SOC_TLV320AIC32X4_SPI=m -CONFIG_SND_SOC_TLV320AIC3X=m -CONFIG_SND_SOC_TS3A227E=m -CONFIG_SND_SOC_TSCS42XX=m -CONFIG_SND_SOC_TSCS454=m -CONFIG_SND_SOC_WM8510=m -CONFIG_SND_SOC_WM8523=m -CONFIG_SND_SOC_WM8524=m -CONFIG_SND_SOC_WM8580=m -CONFIG_SND_SOC_WM8711=m -CONFIG_SND_SOC_WM8728=m -CONFIG_SND_SOC_WM8731=m -CONFIG_SND_SOC_WM8737=m -CONFIG_SND_SOC_WM8741=m -CONFIG_SND_SOC_WM8750=m -CONFIG_SND_SOC_WM8753=m -CONFIG_SND_SOC_WM8770=m -CONFIG_SND_SOC_WM8776=m -CONFIG_SND_SOC_WM8782=m -CONFIG_SND_SOC_WM8804=m -CONFIG_SND_SOC_WM8804_I2C=m -CONFIG_SND_SOC_WM8804_SPI=m -CONFIG_SND_SOC_WM8903=m -CONFIG_SND_SOC_WM8960=m -CONFIG_SND_SOC_WM8962=m -CONFIG_SND_SOC_WM8974=m -CONFIG_SND_SOC_WM8978=m -CONFIG_SND_SOC_WM8985=m -CONFIG_SND_SOC_ZX_AUD96P22=m -CONFIG_SND_SOC_MAX9759=m -CONFIG_SND_SOC_MT6351=m -CONFIG_SND_SOC_NAU8540=m -CONFIG_SND_SOC_NAU8810=m -CONFIG_SND_SOC_NAU8824=m -CONFIG_SND_SOC_NAU8825=m -CONFIG_SND_SOC_TPA6130A2=m -CONFIG_SND_SIMPLE_CARD_UTILS=m -CONFIG_SND_SIMPLE_CARD=m -CONFIG_SND_X86=y -CONFIG_HDMI_LPE_AUDIO=m -CONFIG_SND_SYNTH_EMUX=m -CONFIG_SND_XEN_FRONTEND=m -CONFIG_AC97_BUS=m - -# -# HID support -# -CONFIG_HID=m -CONFIG_HID_BATTERY_STRENGTH=y -CONFIG_HIDRAW=y -CONFIG_UHID=m -CONFIG_HID_GENERIC=m - -# -# Special HID drivers -# -CONFIG_HID_A4TECH=m -CONFIG_HID_ACCUTOUCH=m -CONFIG_HID_ACRUX=m -CONFIG_HID_ACRUX_FF=y -CONFIG_HID_APPLE=m -CONFIG_HID_APPLEIR=m -CONFIG_HID_ASUS=m -CONFIG_HID_AUREAL=m -CONFIG_HID_BELKIN=m -CONFIG_HID_BETOP_FF=m -CONFIG_HID_CHERRY=m -CONFIG_HID_CHICONY=m -CONFIG_HID_CORSAIR=m -CONFIG_HID_PRODIKEYS=m -CONFIG_HID_CMEDIA=m -CONFIG_HID_CP2112=m -CONFIG_HID_CYPRESS=m -CONFIG_HID_DRAGONRISE=m -CONFIG_DRAGONRISE_FF=y -CONFIG_HID_EMS_FF=m -CONFIG_HID_ELAN=m -CONFIG_HID_ELECOM=m -CONFIG_HID_ELO=m -CONFIG_HID_EZKEY=m -CONFIG_HID_GEMBIRD=m -CONFIG_HID_GFRM=m -CONFIG_HID_HOLTEK=m -CONFIG_HOLTEK_FF=y -CONFIG_HID_GOOGLE_HAMMER=m -CONFIG_HID_GT683R=m -CONFIG_HID_KEYTOUCH=m -CONFIG_HID_KYE=m -CONFIG_HID_UCLOGIC=m -CONFIG_HID_WALTOP=m -CONFIG_HID_GYRATION=m -CONFIG_HID_ICADE=m -CONFIG_HID_ITE=m -CONFIG_HID_JABRA=m -CONFIG_HID_TWINHAN=m -CONFIG_HID_KENSINGTON=m -CONFIG_HID_LCPOWER=m -CONFIG_HID_LED=m -CONFIG_HID_LENOVO=m -CONFIG_HID_LOGITECH=m -CONFIG_HID_LOGITECH_DJ=m -CONFIG_HID_LOGITECH_HIDPP=m -CONFIG_LOGITECH_FF=y -CONFIG_LOGIRUMBLEPAD2_FF=y -CONFIG_LOGIG940_FF=y -CONFIG_LOGIWHEELS_FF=y -CONFIG_HID_MAGICMOUSE=m -CONFIG_HID_MAYFLASH=m -CONFIG_HID_REDRAGON=m -CONFIG_HID_MICROSOFT=m -CONFIG_HID_MONTEREY=m -CONFIG_HID_MULTITOUCH=m -CONFIG_HID_NTI=m -CONFIG_HID_NTRIG=m -CONFIG_HID_ORTEK=m -CONFIG_HID_PANTHERLORD=m -CONFIG_PANTHERLORD_FF=y -CONFIG_HID_PENMOUNT=m -CONFIG_HID_PETALYNX=m -CONFIG_HID_PICOLCD=m -CONFIG_HID_PICOLCD_FB=y -CONFIG_HID_PICOLCD_BACKLIGHT=y -CONFIG_HID_PICOLCD_LCD=y -CONFIG_HID_PICOLCD_LEDS=y -CONFIG_HID_PICOLCD_CIR=y -CONFIG_HID_PLANTRONICS=m -CONFIG_HID_PRIMAX=m -CONFIG_HID_RETRODE=m -CONFIG_HID_ROCCAT=m -CONFIG_HID_SAITEK=m -CONFIG_HID_SAMSUNG=m -CONFIG_HID_SONY=m -CONFIG_SONY_FF=y -CONFIG_HID_SPEEDLINK=m -CONFIG_HID_STEAM=m -CONFIG_HID_STEELSERIES=m -CONFIG_HID_SUNPLUS=m -CONFIG_HID_RMI=m -CONFIG_HID_GREENASIA=m -CONFIG_GREENASIA_FF=y -CONFIG_HID_HYPERV_MOUSE=m -CONFIG_HID_SMARTJOYPLUS=m -CONFIG_SMARTJOYPLUS_FF=y -CONFIG_HID_TIVO=m -CONFIG_HID_TOPSEED=m -CONFIG_HID_THINGM=m -CONFIG_HID_THRUSTMASTER=m -CONFIG_THRUSTMASTER_FF=y -CONFIG_HID_UDRAW_PS3=m -CONFIG_HID_WACOM=m -CONFIG_HID_WIIMOTE=m -CONFIG_HID_XINMO=m -CONFIG_HID_ZEROPLUS=m -CONFIG_ZEROPLUS_FF=y -CONFIG_HID_ZYDACRON=m -CONFIG_HID_SENSOR_HUB=m -CONFIG_HID_SENSOR_CUSTOM_SENSOR=m -CONFIG_HID_ALPS=m - -# -# USB HID support -# -CONFIG_USB_HID=m -CONFIG_HID_PID=y -CONFIG_USB_HIDDEV=y - -# -# USB HID Boot Protocol drivers -# -CONFIG_USB_KBD=m -CONFIG_USB_MOUSE=m - -# -# I2C HID support -# -CONFIG_I2C_HID=m -CONFIG_USB_OHCI_LITTLE_ENDIAN=y -CONFIG_USB_SUPPORT=y -CONFIG_USB_COMMON=y -CONFIG_USB_ARCH_HAS_HCD=y -CONFIG_USB=y -CONFIG_USB_PCI=y -CONFIG_USB_ANNOUNCE_NEW_DEVICES=y - -# -# Miscellaneous USB options -# -CONFIG_USB_DEFAULT_PERSIST=y -CONFIG_USB_DYNAMIC_MINORS=y -# CONFIG_USB_OTG is not set -# CONFIG_USB_OTG_WHITELIST is not set -# CONFIG_USB_OTG_BLACKLIST_HUB is not set -CONFIG_USB_LEDS_TRIGGER_USBPORT=m -CONFIG_USB_MON=m -CONFIG_USB_WUSB=m -CONFIG_USB_WUSB_CBAF=m -# CONFIG_USB_WUSB_CBAF_DEBUG is not set - -# -# USB Host Controller Drivers -# -CONFIG_USB_C67X00_HCD=m -CONFIG_USB_XHCI_HCD=y -# CONFIG_USB_XHCI_DBGCAP is not set -CONFIG_USB_XHCI_PCI=y -CONFIG_USB_XHCI_PLATFORM=m -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_ROOT_HUB_TT=y -CONFIG_USB_EHCI_TT_NEWSCHED=y -CONFIG_USB_EHCI_PCI=y -CONFIG_USB_EHCI_HCD_PLATFORM=y -CONFIG_USB_OXU210HP_HCD=m -CONFIG_USB_ISP116X_HCD=m -CONFIG_USB_FOTG210_HCD=m -CONFIG_USB_MAX3421_HCD=m -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_OHCI_HCD_PCI=y -CONFIG_USB_OHCI_HCD_PLATFORM=y -CONFIG_USB_UHCI_HCD=y -CONFIG_USB_U132_HCD=m -CONFIG_USB_SL811_HCD=m -CONFIG_USB_SL811_HCD_ISO=y -CONFIG_USB_SL811_CS=m -CONFIG_USB_R8A66597_HCD=m -CONFIG_USB_WHCI_HCD=m -CONFIG_USB_HWA_HCD=m -CONFIG_USB_HCD_BCMA=m -CONFIG_USB_HCD_SSB=m -# CONFIG_USB_HCD_TEST_MODE is not set - -# -# USB Device Class drivers -# -CONFIG_USB_ACM=m -CONFIG_USB_PRINTER=m -CONFIG_USB_WDM=m -CONFIG_USB_TMC=m - -# -# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may -# - -# -# also be needed; see USB_STORAGE Help for more info -# -CONFIG_USB_STORAGE=m -# CONFIG_USB_STORAGE_DEBUG is not set -CONFIG_USB_STORAGE_REALTEK=m -CONFIG_REALTEK_AUTOPM=y -CONFIG_USB_STORAGE_DATAFAB=m -CONFIG_USB_STORAGE_FREECOM=m -CONFIG_USB_STORAGE_ISD200=m -CONFIG_USB_STORAGE_USBAT=m -CONFIG_USB_STORAGE_SDDR09=m -CONFIG_USB_STORAGE_SDDR55=m -CONFIG_USB_STORAGE_JUMPSHOT=m -CONFIG_USB_STORAGE_ALAUDA=m -CONFIG_USB_STORAGE_ONETOUCH=m -CONFIG_USB_STORAGE_KARMA=m -CONFIG_USB_STORAGE_CYPRESS_ATACB=m -CONFIG_USB_STORAGE_ENE_UB6250=m -CONFIG_USB_UAS=m - -# -# USB Imaging devices -# -CONFIG_USB_MDC800=m -CONFIG_USB_MICROTEK=m -CONFIG_USBIP_CORE=m -CONFIG_USBIP_VHCI_HCD=m -CONFIG_USBIP_VHCI_HC_PORTS=8 -CONFIG_USBIP_VHCI_NR_HCS=1 -CONFIG_USBIP_HOST=m -CONFIG_USBIP_VUDC=m -# CONFIG_USBIP_DEBUG is not set -CONFIG_USB_MUSB_HDRC=m -# CONFIG_USB_MUSB_HOST is not set -# CONFIG_USB_MUSB_GADGET is not set -CONFIG_USB_MUSB_DUAL_ROLE=y - -# -# Platform Glue Layer -# - -# -# MUSB DMA mode -# -CONFIG_MUSB_PIO_ONLY=y -CONFIG_USB_DWC3=m -CONFIG_USB_DWC3_ULPI=y -# CONFIG_USB_DWC3_HOST is not set -# CONFIG_USB_DWC3_GADGET is not set -CONFIG_USB_DWC3_DUAL_ROLE=y - -# -# Platform Glue Driver Support -# -CONFIG_USB_DWC3_PCI=m -CONFIG_USB_DWC2=y -CONFIG_USB_DWC2_HOST=y - -# -# Gadget/Dual-role mode requires USB Gadget support to be enabled -# -CONFIG_USB_DWC2_PCI=m -# CONFIG_USB_DWC2_DEBUG is not set -# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set -CONFIG_USB_CHIPIDEA=m -CONFIG_USB_CHIPIDEA_PCI=m -CONFIG_USB_CHIPIDEA_UDC=y -CONFIG_USB_CHIPIDEA_HOST=y -CONFIG_USB_ISP1760=m -CONFIG_USB_ISP1760_HCD=y -CONFIG_USB_ISP1761_UDC=y -# CONFIG_USB_ISP1760_HOST_ROLE is not set -# CONFIG_USB_ISP1760_GADGET_ROLE is not set -CONFIG_USB_ISP1760_DUAL_ROLE=y - -# -# USB port drivers -# -CONFIG_USB_USS720=m -CONFIG_USB_SERIAL=m -CONFIG_USB_SERIAL_GENERIC=y -CONFIG_USB_SERIAL_SIMPLE=m -CONFIG_USB_SERIAL_AIRCABLE=m -CONFIG_USB_SERIAL_ARK3116=m -CONFIG_USB_SERIAL_BELKIN=m -CONFIG_USB_SERIAL_CH341=m -CONFIG_USB_SERIAL_WHITEHEAT=m -CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -CONFIG_USB_SERIAL_CP210X=m -CONFIG_USB_SERIAL_CYPRESS_M8=m -CONFIG_USB_SERIAL_EMPEG=m -CONFIG_USB_SERIAL_FTDI_SIO=m -CONFIG_USB_SERIAL_VISOR=m -CONFIG_USB_SERIAL_IPAQ=m -CONFIG_USB_SERIAL_IR=m -CONFIG_USB_SERIAL_EDGEPORT=m -CONFIG_USB_SERIAL_EDGEPORT_TI=m -CONFIG_USB_SERIAL_F81232=m -CONFIG_USB_SERIAL_F8153X=m -CONFIG_USB_SERIAL_GARMIN=m -CONFIG_USB_SERIAL_IPW=m -CONFIG_USB_SERIAL_IUU=m -CONFIG_USB_SERIAL_KEYSPAN_PDA=m -CONFIG_USB_SERIAL_KEYSPAN=m -CONFIG_USB_SERIAL_KLSI=m -CONFIG_USB_SERIAL_KOBIL_SCT=m -CONFIG_USB_SERIAL_MCT_U232=m -CONFIG_USB_SERIAL_METRO=m -CONFIG_USB_SERIAL_MOS7720=m -CONFIG_USB_SERIAL_MOS7715_PARPORT=y -CONFIG_USB_SERIAL_MOS7840=m -CONFIG_USB_SERIAL_MXUPORT=m -CONFIG_USB_SERIAL_NAVMAN=m -CONFIG_USB_SERIAL_PL2303=m -CONFIG_USB_SERIAL_OTI6858=m -CONFIG_USB_SERIAL_QCAUX=m -CONFIG_USB_SERIAL_QUALCOMM=m -CONFIG_USB_SERIAL_SPCP8X5=m -CONFIG_USB_SERIAL_SAFE=m -# CONFIG_USB_SERIAL_SAFE_PADDED is not set -CONFIG_USB_SERIAL_SIERRAWIRELESS=m -CONFIG_USB_SERIAL_SYMBOL=m -CONFIG_USB_SERIAL_TI=m -CONFIG_USB_SERIAL_CYBERJACK=m -CONFIG_USB_SERIAL_XIRCOM=m -CONFIG_USB_SERIAL_WWAN=m -CONFIG_USB_SERIAL_OPTION=m -CONFIG_USB_SERIAL_OMNINET=m -CONFIG_USB_SERIAL_OPTICON=m -CONFIG_USB_SERIAL_XSENS_MT=m -CONFIG_USB_SERIAL_WISHBONE=m -CONFIG_USB_SERIAL_SSU100=m -CONFIG_USB_SERIAL_QT2=m -CONFIG_USB_SERIAL_UPD78F0730=m -CONFIG_USB_SERIAL_DEBUG=m - -# -# USB Miscellaneous drivers -# -CONFIG_USB_EMI62=m -CONFIG_USB_EMI26=m -CONFIG_USB_ADUTUX=m -CONFIG_USB_SEVSEG=m -CONFIG_USB_RIO500=m -CONFIG_USB_LEGOTOWER=m -CONFIG_USB_LCD=m -CONFIG_USB_CYPRESS_CY7C63=m -CONFIG_USB_CYTHERM=m -CONFIG_USB_IDMOUSE=m -CONFIG_USB_FTDI_ELAN=m -CONFIG_USB_APPLEDISPLAY=m -CONFIG_USB_SISUSBVGA=m -# CONFIG_USB_SISUSBVGA_CON is not set -CONFIG_USB_LD=m -CONFIG_USB_TRANCEVIBRATOR=m -CONFIG_USB_IOWARRIOR=m -CONFIG_USB_TEST=m -CONFIG_USB_EHSET_TEST_FIXTURE=m -CONFIG_USB_ISIGHTFW=m -CONFIG_USB_YUREX=m -CONFIG_USB_EZUSB_FX2=m -CONFIG_USB_HUB_USB251XB=m -CONFIG_USB_HSIC_USB3503=m -CONFIG_USB_HSIC_USB4604=m -CONFIG_USB_LINK_LAYER_TEST=m -CONFIG_USB_CHAOSKEY=m -CONFIG_USB_ATM=m -CONFIG_USB_SPEEDTOUCH=m -CONFIG_USB_CXACRU=m -CONFIG_USB_UEAGLEATM=m -CONFIG_USB_XUSBATM=m - -# -# USB Physical Layer drivers -# -CONFIG_USB_PHY=y -CONFIG_NOP_USB_XCEIV=m -CONFIG_USB_GPIO_VBUS=m -CONFIG_TAHVO_USB=m -CONFIG_TAHVO_USB_HOST_BY_DEFAULT=y -CONFIG_USB_ISP1301=m -CONFIG_USB_GADGET=m -# CONFIG_USB_GADGET_DEBUG is not set -# CONFIG_USB_GADGET_DEBUG_FILES is not set -# CONFIG_USB_GADGET_DEBUG_FS is not set -CONFIG_USB_GADGET_VBUS_DRAW=2 -CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 -# CONFIG_U_SERIAL_CONSOLE is not set - -# -# USB Peripheral Controller -# -CONFIG_USB_FOTG210_UDC=m -CONFIG_USB_GR_UDC=m -CONFIG_USB_R8A66597=m -CONFIG_USB_PXA27X=m -CONFIG_USB_MV_UDC=m -CONFIG_USB_MV_U3D=m -CONFIG_USB_SNP_CORE=m -# CONFIG_USB_M66592 is not set -CONFIG_USB_BDC_UDC=m - -# -# Platform Support -# -CONFIG_USB_BDC_PCI=m -CONFIG_USB_AMD5536UDC=m -CONFIG_USB_NET2272=m -CONFIG_USB_NET2272_DMA=y -CONFIG_USB_NET2280=m -CONFIG_USB_GOKU=m -CONFIG_USB_EG20T=m -# CONFIG_USB_DUMMY_HCD is not set -CONFIG_USB_LIBCOMPOSITE=m -CONFIG_USB_F_ACM=m -CONFIG_USB_F_SS_LB=m -CONFIG_USB_U_SERIAL=m -CONFIG_USB_U_ETHER=m -CONFIG_USB_U_AUDIO=m -CONFIG_USB_F_SERIAL=m -CONFIG_USB_F_OBEX=m -CONFIG_USB_F_NCM=m -CONFIG_USB_F_ECM=m -CONFIG_USB_F_PHONET=m -CONFIG_USB_F_EEM=m -CONFIG_USB_F_SUBSET=m -CONFIG_USB_F_RNDIS=m -CONFIG_USB_F_MASS_STORAGE=m -CONFIG_USB_F_FS=m -CONFIG_USB_F_UAC1=m -CONFIG_USB_F_UAC2=m -CONFIG_USB_F_UVC=m -CONFIG_USB_F_MIDI=m -CONFIG_USB_F_HID=m -CONFIG_USB_F_PRINTER=m -CONFIG_USB_F_TCM=m -CONFIG_USB_CONFIGFS=m -CONFIG_USB_CONFIGFS_SERIAL=y -CONFIG_USB_CONFIGFS_ACM=y -CONFIG_USB_CONFIGFS_OBEX=y -CONFIG_USB_CONFIGFS_NCM=y -CONFIG_USB_CONFIGFS_ECM=y -CONFIG_USB_CONFIGFS_ECM_SUBSET=y -CONFIG_USB_CONFIGFS_RNDIS=y -CONFIG_USB_CONFIGFS_EEM=y -CONFIG_USB_CONFIGFS_PHONET=y -CONFIG_USB_CONFIGFS_MASS_STORAGE=y -CONFIG_USB_CONFIGFS_F_LB_SS=y -CONFIG_USB_CONFIGFS_F_FS=y -CONFIG_USB_CONFIGFS_F_UAC1=y -# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set -CONFIG_USB_CONFIGFS_F_UAC2=y -CONFIG_USB_CONFIGFS_F_MIDI=y -CONFIG_USB_CONFIGFS_F_HID=y -CONFIG_USB_CONFIGFS_F_UVC=y -CONFIG_USB_CONFIGFS_F_PRINTER=y -# CONFIG_USB_CONFIGFS_F_TCM is not set -CONFIG_USB_ZERO=m -CONFIG_USB_AUDIO=m -CONFIG_GADGET_UAC1=y -# CONFIG_GADGET_UAC1_LEGACY is not set -CONFIG_USB_ETH=m -CONFIG_USB_ETH_RNDIS=y -CONFIG_USB_ETH_EEM=y -CONFIG_USB_G_NCM=m -CONFIG_USB_GADGETFS=m -CONFIG_USB_FUNCTIONFS=m -CONFIG_USB_FUNCTIONFS_ETH=y -CONFIG_USB_FUNCTIONFS_RNDIS=y -CONFIG_USB_FUNCTIONFS_GENERIC=y -CONFIG_USB_MASS_STORAGE=m -CONFIG_USB_GADGET_TARGET=m -CONFIG_USB_G_SERIAL=m -CONFIG_USB_MIDI_GADGET=m -CONFIG_USB_G_PRINTER=m -CONFIG_USB_CDC_COMPOSITE=m -CONFIG_USB_G_NOKIA=m -CONFIG_USB_G_ACM_MS=m -# CONFIG_USB_G_MULTI is not set -CONFIG_USB_G_HID=m -CONFIG_USB_G_DBGP=m -# CONFIG_USB_G_DBGP_PRINTK is not set -CONFIG_USB_G_DBGP_SERIAL=y -CONFIG_USB_G_WEBCAM=m -CONFIG_TYPEC=m -CONFIG_TYPEC_TCPM=m -CONFIG_TYPEC_FUSB302=m -CONFIG_TYPEC_UCSI=m -CONFIG_UCSI_ACPI=m -CONFIG_TYPEC_TPS6598X=m - -# -# USB Type-C Multiplexer/DeMultiplexer Switch support -# -CONFIG_TYPEC_MUX_PI3USB30532=m -CONFIG_USB_ROLES_INTEL_XHCI=m -CONFIG_USB_LED_TRIG=y -CONFIG_USB_ULPI_BUS=m -CONFIG_USB_ROLE_SWITCH=m -CONFIG_UWB=m -CONFIG_UWB_HWA=m -CONFIG_UWB_WHCI=m -CONFIG_UWB_I1480U=m -CONFIG_MMC=y -CONFIG_MMC_BLOCK=m -CONFIG_MMC_BLOCK_MINORS=8 -CONFIG_SDIO_UART=m -# CONFIG_MMC_TEST is not set - -# -# MMC/SD/SDIO Host Controller Drivers -# -# CONFIG_MMC_DEBUG is not set -CONFIG_MMC_SDHCI=m -CONFIG_MMC_SDHCI_PCI=m -CONFIG_MMC_RICOH_MMC=y -CONFIG_MMC_SDHCI_ACPI=m -CONFIG_MMC_SDHCI_PLTFM=m -CONFIG_MMC_SDHCI_F_SDH30=m -CONFIG_MMC_WBSD=m -CONFIG_MMC_TIFM_SD=m -CONFIG_MMC_SPI=m -CONFIG_MMC_SDRICOH_CS=m -CONFIG_MMC_CB710=m -CONFIG_MMC_VIA_SDMMC=m -CONFIG_MMC_VUB300=m -CONFIG_MMC_USHC=m -CONFIG_MMC_USDHI6ROL0=m -CONFIG_MMC_REALTEK_PCI=m -CONFIG_MMC_REALTEK_USB=m -CONFIG_MMC_CQHCI=m -CONFIG_MMC_TOSHIBA_PCI=m -CONFIG_MMC_MTK=m -CONFIG_MMC_SDHCI_XENON=m -CONFIG_MEMSTICK=m -# CONFIG_MEMSTICK_DEBUG is not set - -# -# MemoryStick drivers -# -# CONFIG_MEMSTICK_UNSAFE_RESUME is not set -CONFIG_MSPRO_BLOCK=m -CONFIG_MS_BLOCK=m - -# -# MemoryStick Host Controller Drivers -# -CONFIG_MEMSTICK_TIFM_MS=m -CONFIG_MEMSTICK_JMICRON_38X=m -CONFIG_MEMSTICK_R592=m -CONFIG_MEMSTICK_REALTEK_PCI=m -CONFIG_MEMSTICK_REALTEK_USB=m -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_CLASS_FLASH=m -# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set - -# -# LED drivers -# -CONFIG_LEDS_88PM860X=m -CONFIG_LEDS_APU=m -CONFIG_LEDS_AS3645A=m -CONFIG_LEDS_LM3530=m -CONFIG_LEDS_LM3533=m -CONFIG_LEDS_LM3642=m -CONFIG_LEDS_LM3601X=m -CONFIG_LEDS_MT6323=m -CONFIG_LEDS_NET48XX=m -CONFIG_LEDS_WRAP=m -CONFIG_LEDS_PCA9532=m -CONFIG_LEDS_PCA9532_GPIO=y -CONFIG_LEDS_GPIO=m -CONFIG_LEDS_LP3944=m -CONFIG_LEDS_LP3952=m -CONFIG_LEDS_LP55XX_COMMON=m -CONFIG_LEDS_LP5521=m -CONFIG_LEDS_LP5523=m -CONFIG_LEDS_LP5562=m -CONFIG_LEDS_LP8501=m -CONFIG_LEDS_LP8788=m -CONFIG_LEDS_CLEVO_MAIL=m -CONFIG_LEDS_PCA955X=m -# CONFIG_LEDS_PCA955X_GPIO is not set -CONFIG_LEDS_PCA963X=m -CONFIG_LEDS_WM831X_STATUS=m -CONFIG_LEDS_WM8350=m -CONFIG_LEDS_DA903X=m -CONFIG_LEDS_DA9052=m -CONFIG_LEDS_DAC124S085=m -CONFIG_LEDS_PWM=m -CONFIG_LEDS_REGULATOR=m -CONFIG_LEDS_BD2802=m -CONFIG_LEDS_INTEL_SS4200=m -CONFIG_LEDS_LT3593=m -CONFIG_LEDS_ADP5520=m -CONFIG_LEDS_MC13783=m -CONFIG_LEDS_TCA6507=m -CONFIG_LEDS_TLC591XX=m -CONFIG_LEDS_MAX8997=m -CONFIG_LEDS_LM355x=m -CONFIG_LEDS_OT200=m -CONFIG_LEDS_MENF21BMC=m - -# -# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM) -# -CONFIG_LEDS_BLINKM=m -# CONFIG_LEDS_MLXCPLD is not set -# CONFIG_LEDS_MLXREG is not set -CONFIG_LEDS_USER=m -CONFIG_LEDS_NIC78BX=m - -# -# LED Triggers -# -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=m -CONFIG_LEDS_TRIGGER_ONESHOT=m -CONFIG_LEDS_TRIGGER_DISK=y -# CONFIG_LEDS_TRIGGER_MTD is not set -CONFIG_LEDS_TRIGGER_HEARTBEAT=m -CONFIG_LEDS_TRIGGER_BACKLIGHT=m -CONFIG_LEDS_TRIGGER_CPU=y -CONFIG_LEDS_TRIGGER_ACTIVITY=m -CONFIG_LEDS_TRIGGER_GPIO=m -CONFIG_LEDS_TRIGGER_DEFAULT_ON=m - -# -# iptables trigger is under Netfilter config (LED target) -# -CONFIG_LEDS_TRIGGER_TRANSIENT=m -CONFIG_LEDS_TRIGGER_CAMERA=m -CONFIG_LEDS_TRIGGER_PANIC=y -CONFIG_LEDS_TRIGGER_NETDEV=m -# CONFIG_ACCESSIBILITY is not set -CONFIG_INFINIBAND=m -CONFIG_INFINIBAND_USER_MAD=m -CONFIG_INFINIBAND_USER_ACCESS=m -# CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI is not set -CONFIG_INFINIBAND_USER_MEM=y -CONFIG_INFINIBAND_ON_DEMAND_PAGING=y -CONFIG_INFINIBAND_ADDR_TRANS=y -CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y -CONFIG_INFINIBAND_MTHCA=m -# CONFIG_INFINIBAND_MTHCA_DEBUG is not set -CONFIG_INFINIBAND_CXGB3=m -CONFIG_INFINIBAND_CXGB4=m -CONFIG_INFINIBAND_I40IW=m -CONFIG_MLX4_INFINIBAND=m -CONFIG_MLX5_INFINIBAND=m -CONFIG_INFINIBAND_NES=m -# CONFIG_INFINIBAND_NES_DEBUG is not set -CONFIG_INFINIBAND_OCRDMA=m -CONFIG_INFINIBAND_VMWARE_PVRDMA=m -CONFIG_INFINIBAND_USNIC=m -CONFIG_INFINIBAND_IPOIB=m -CONFIG_INFINIBAND_IPOIB_CM=y -# CONFIG_INFINIBAND_IPOIB_DEBUG is not set -CONFIG_INFINIBAND_SRP=m -CONFIG_INFINIBAND_SRPT=m -CONFIG_INFINIBAND_ISER=m -CONFIG_INFINIBAND_ISERT=m -CONFIG_RDMA_RXE=m -CONFIG_INFINIBAND_BNXT_RE=m -CONFIG_EDAC_ATOMIC_SCRUB=y -CONFIG_EDAC_SUPPORT=y -CONFIG_EDAC=y -# CONFIG_EDAC_LEGACY_SYSFS is not set -# CONFIG_EDAC_DEBUG is not set -CONFIG_EDAC_DECODE_MCE=m -CONFIG_EDAC_GHES=y -CONFIG_EDAC_AMD64=m -# CONFIG_EDAC_AMD64_ERROR_INJECTION is not set -CONFIG_EDAC_AMD76X=m -CONFIG_EDAC_E7XXX=m -CONFIG_EDAC_E752X=m -CONFIG_EDAC_I82875P=m -CONFIG_EDAC_I82975X=m -CONFIG_EDAC_I3000=m -CONFIG_EDAC_I3200=m -CONFIG_EDAC_IE31200=m -CONFIG_EDAC_X38=m -CONFIG_EDAC_I5400=m -CONFIG_EDAC_I7CORE=m -CONFIG_EDAC_I82860=m -CONFIG_EDAC_R82600=m -CONFIG_EDAC_I5000=m -CONFIG_EDAC_I5100=m -CONFIG_EDAC_I7300=m -CONFIG_RTC_LIB=y -CONFIG_RTC_MC146818_LIB=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_HCTOSYS=y -CONFIG_RTC_HCTOSYS_DEVICE="rtc0" -CONFIG_RTC_SYSTOHC=y -CONFIG_RTC_SYSTOHC_DEVICE="rtc0" -# CONFIG_RTC_DEBUG is not set -CONFIG_RTC_NVMEM=y - -# -# RTC interfaces -# -CONFIG_RTC_INTF_SYSFS=y -CONFIG_RTC_INTF_PROC=y -CONFIG_RTC_INTF_DEV=y -# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set -# CONFIG_RTC_DRV_TEST is not set - -# -# I2C RTC drivers -# -CONFIG_RTC_DRV_88PM860X=m -CONFIG_RTC_DRV_88PM80X=m -CONFIG_RTC_DRV_ABB5ZES3=m -CONFIG_RTC_DRV_ABX80X=m -CONFIG_RTC_DRV_DS1307=m -CONFIG_RTC_DRV_DS1307_HWMON=y -# CONFIG_RTC_DRV_DS1307_CENTURY is not set -CONFIG_RTC_DRV_DS1374=m -CONFIG_RTC_DRV_DS1374_WDT=y -CONFIG_RTC_DRV_DS1672=m -CONFIG_RTC_DRV_LP8788=m -CONFIG_RTC_DRV_MAX6900=m -CONFIG_RTC_DRV_MAX8907=m -CONFIG_RTC_DRV_MAX8925=m -CONFIG_RTC_DRV_MAX8998=m -CONFIG_RTC_DRV_MAX8997=m -CONFIG_RTC_DRV_RS5C372=m -CONFIG_RTC_DRV_ISL1208=m -CONFIG_RTC_DRV_ISL12022=m -CONFIG_RTC_DRV_X1205=m -CONFIG_RTC_DRV_PCF8523=m -CONFIG_RTC_DRV_PCF85063=m -CONFIG_RTC_DRV_PCF85363=m -CONFIG_RTC_DRV_PCF8563=m -CONFIG_RTC_DRV_PCF8583=m -CONFIG_RTC_DRV_M41T80=m -CONFIG_RTC_DRV_M41T80_WDT=y -CONFIG_RTC_DRV_BQ32K=m -CONFIG_RTC_DRV_PALMAS=m -CONFIG_RTC_DRV_TPS6586X=m -CONFIG_RTC_DRV_TPS65910=m -CONFIG_RTC_DRV_TPS80031=m -CONFIG_RTC_DRV_RC5T583=m -CONFIG_RTC_DRV_S35390A=m -CONFIG_RTC_DRV_FM3130=m -CONFIG_RTC_DRV_RX8010=m -CONFIG_RTC_DRV_RX8581=m -CONFIG_RTC_DRV_RX8025=m -CONFIG_RTC_DRV_EM3027=m -CONFIG_RTC_DRV_RV8803=m -CONFIG_RTC_DRV_S5M=m - -# -# SPI RTC drivers -# -CONFIG_RTC_DRV_M41T93=m -CONFIG_RTC_DRV_M41T94=m -CONFIG_RTC_DRV_DS1302=m -CONFIG_RTC_DRV_DS1305=m -CONFIG_RTC_DRV_DS1343=m -CONFIG_RTC_DRV_DS1347=m -CONFIG_RTC_DRV_DS1390=m -CONFIG_RTC_DRV_MAX6916=m -CONFIG_RTC_DRV_R9701=m -CONFIG_RTC_DRV_RX4581=m -CONFIG_RTC_DRV_RX6110=m -CONFIG_RTC_DRV_RS5C348=m -CONFIG_RTC_DRV_MAX6902=m -CONFIG_RTC_DRV_PCF2123=m -CONFIG_RTC_DRV_MCP795=m -CONFIG_RTC_I2C_AND_SPI=y - -# -# SPI and I2C RTC drivers -# -CONFIG_RTC_DRV_DS3232=m -CONFIG_RTC_DRV_DS3232_HWMON=y -CONFIG_RTC_DRV_PCF2127=m -CONFIG_RTC_DRV_RV3029C2=m -CONFIG_RTC_DRV_RV3029_HWMON=y - -# -# Platform RTC drivers -# -CONFIG_RTC_DRV_CMOS=y -CONFIG_RTC_DRV_VRTC=m -CONFIG_RTC_DRV_DS1286=m -CONFIG_RTC_DRV_DS1511=m -CONFIG_RTC_DRV_DS1553=m -CONFIG_RTC_DRV_DS1685_FAMILY=m -CONFIG_RTC_DRV_DS1685=y -# CONFIG_RTC_DRV_DS1689 is not set -# CONFIG_RTC_DRV_DS17285 is not set -# CONFIG_RTC_DRV_DS17485 is not set -# CONFIG_RTC_DRV_DS17885 is not set -# CONFIG_RTC_DS1685_PROC_REGS is not set -# CONFIG_RTC_DS1685_SYSFS_REGS is not set -CONFIG_RTC_DRV_DS1742=m -CONFIG_RTC_DRV_DS2404=m -CONFIG_RTC_DRV_DA9052=m -CONFIG_RTC_DRV_DA9055=m -CONFIG_RTC_DRV_DA9063=m -CONFIG_RTC_DRV_STK17TA8=m -CONFIG_RTC_DRV_M48T86=m -CONFIG_RTC_DRV_M48T35=m -CONFIG_RTC_DRV_M48T59=m -CONFIG_RTC_DRV_MSM6242=m -CONFIG_RTC_DRV_BQ4802=m -CONFIG_RTC_DRV_RP5C01=m -CONFIG_RTC_DRV_V3020=m -CONFIG_RTC_DRV_WM831X=m -CONFIG_RTC_DRV_WM8350=m -CONFIG_RTC_DRV_PCF50633=m -CONFIG_RTC_DRV_AB3100=m -CONFIG_RTC_DRV_CROS_EC=m - -# -# on-CPU RTC drivers -# -CONFIG_RTC_DRV_FTRTC010=m -CONFIG_RTC_DRV_PCAP=m -CONFIG_RTC_DRV_MC13XXX=m -CONFIG_RTC_DRV_MT6397=m - -# -# HID Sensor RTC drivers -# -CONFIG_RTC_DRV_HID_SENSOR_TIME=m -CONFIG_DMADEVICES=y -# CONFIG_DMADEVICES_DEBUG is not set - -# -# DMA Devices -# -CONFIG_DMA_ENGINE=y -CONFIG_DMA_VIRTUAL_CHANNELS=m -CONFIG_DMA_ACPI=y -CONFIG_ALTERA_MSGDMA=m -CONFIG_INTEL_IDMA64=m -CONFIG_PCH_DMA=m -CONFIG_TIMB_DMA=m -CONFIG_QCOM_HIDMA_MGMT=m -CONFIG_QCOM_HIDMA=m -CONFIG_DW_DMAC_CORE=m -CONFIG_DW_DMAC=m -CONFIG_DW_DMAC_PCI=m -CONFIG_HSU_DMA=m -CONFIG_HSU_DMA_PCI=m - -# -# DMA Clients -# -CONFIG_ASYNC_TX_DMA=y -# CONFIG_DMATEST is not set - -# -# DMABUF options -# -CONFIG_SYNC_FILE=y -# CONFIG_SW_SYNC is not set -CONFIG_AUXDISPLAY=y -CONFIG_HD44780=m -CONFIG_KS0108=m -CONFIG_KS0108_PORT=0x378 -CONFIG_KS0108_DELAY=2 -CONFIG_CFAG12864B=m -CONFIG_CFAG12864B_RATE=20 -CONFIG_IMG_ASCII_LCD=m -CONFIG_PANEL=m -CONFIG_PANEL_PARPORT=0 -CONFIG_PANEL_PROFILE=5 -# CONFIG_PANEL_CHANGE_MESSAGE is not set -CONFIG_CHARLCD=m -CONFIG_UIO=m -CONFIG_UIO_CIF=m -CONFIG_UIO_PDRV_GENIRQ=m -CONFIG_UIO_DMEM_GENIRQ=m -CONFIG_UIO_AEC=m -CONFIG_UIO_SERCOS3=m -CONFIG_UIO_PCI_GENERIC=m -CONFIG_UIO_NETX=m -CONFIG_UIO_PRUSS=m -CONFIG_UIO_MF624=m -CONFIG_UIO_HV_GENERIC=m -CONFIG_VFIO_IOMMU_TYPE1=m -CONFIG_VFIO_VIRQFD=m -CONFIG_VFIO=m -CONFIG_VFIO_NOIOMMU=y -CONFIG_VFIO_PCI=m -CONFIG_VFIO_PCI_VGA=y -CONFIG_VFIO_PCI_MMAP=y -CONFIG_VFIO_PCI_INTX=y -CONFIG_VFIO_PCI_IGD=y -CONFIG_VFIO_MDEV=m -CONFIG_VFIO_MDEV_DEVICE=m -CONFIG_IRQ_BYPASS_MANAGER=m -CONFIG_VIRT_DRIVERS=y -CONFIG_VBOXGUEST=m -CONFIG_VIRTIO=y -CONFIG_VIRTIO_MENU=y -CONFIG_VIRTIO_PCI=y -CONFIG_VIRTIO_PCI_LEGACY=y -CONFIG_VIRTIO_BALLOON=y -CONFIG_VIRTIO_INPUT=m -CONFIG_VIRTIO_MMIO=y -CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y - -# -# Microsoft Hyper-V guest support -# -CONFIG_HYPERV=m -CONFIG_HYPERV_UTILS=m -CONFIG_HYPERV_BALLOON=m - -# -# Xen driver support -# -CONFIG_XEN_BALLOON=y -CONFIG_XEN_SELFBALLOONING=y -CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y -CONFIG_XEN_BALLOON_MEMORY_HOTPLUG_LIMIT=4 -CONFIG_XEN_SCRUB_PAGES=y -CONFIG_XEN_DEV_EVTCHN=m -CONFIG_XEN_BACKEND=y -CONFIG_XENFS=m -CONFIG_XEN_COMPAT_XENFS=y -CONFIG_XEN_SYS_HYPERVISOR=y -CONFIG_XEN_XENBUS_FRONTEND=y -CONFIG_XEN_GNTDEV=m -CONFIG_XEN_GRANT_DEV_ALLOC=m -CONFIG_SWIOTLB_XEN=y -CONFIG_XEN_TMEM=m -CONFIG_XEN_PCIDEV_BACKEND=m -CONFIG_XEN_PVCALLS_FRONTEND=m -# CONFIG_XEN_PVCALLS_BACKEND is not set -CONFIG_XEN_SCSI_BACKEND=m -CONFIG_XEN_PRIVCMD=m -CONFIG_XEN_ACPI_PROCESSOR=y -CONFIG_XEN_HAVE_PVMMU=y -CONFIG_XEN_AUTO_XLATE=y -CONFIG_XEN_ACPI=y -CONFIG_XEN_SYMS=y -CONFIG_XEN_HAVE_VPMU=y -CONFIG_STAGING=y -CONFIG_PRISM2_USB=m -CONFIG_COMEDI=m -# CONFIG_COMEDI_DEBUG is not set -CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048 -CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480 -CONFIG_COMEDI_MISC_DRIVERS=y -CONFIG_COMEDI_BOND=m -CONFIG_COMEDI_TEST=m -CONFIG_COMEDI_PARPORT=m -CONFIG_COMEDI_SERIAL2002=m -CONFIG_COMEDI_SSV_DNP=m -CONFIG_COMEDI_ISA_DRIVERS=y -CONFIG_COMEDI_PCL711=m -CONFIG_COMEDI_PCL724=m -CONFIG_COMEDI_PCL726=m -CONFIG_COMEDI_PCL730=m -CONFIG_COMEDI_PCL812=m -CONFIG_COMEDI_PCL816=m -CONFIG_COMEDI_PCL818=m -CONFIG_COMEDI_PCM3724=m -CONFIG_COMEDI_AMPLC_DIO200_ISA=m -CONFIG_COMEDI_AMPLC_PC236_ISA=m -CONFIG_COMEDI_AMPLC_PC263_ISA=m -CONFIG_COMEDI_RTI800=m -CONFIG_COMEDI_RTI802=m -CONFIG_COMEDI_DAC02=m -CONFIG_COMEDI_DAS16M1=m -CONFIG_COMEDI_DAS08_ISA=m -CONFIG_COMEDI_DAS16=m -CONFIG_COMEDI_DAS800=m -CONFIG_COMEDI_DAS1800=m -CONFIG_COMEDI_DAS6402=m -CONFIG_COMEDI_DT2801=m -CONFIG_COMEDI_DT2811=m -CONFIG_COMEDI_DT2814=m -CONFIG_COMEDI_DT2815=m -CONFIG_COMEDI_DT2817=m -CONFIG_COMEDI_DT282X=m -CONFIG_COMEDI_DMM32AT=m -CONFIG_COMEDI_FL512=m -CONFIG_COMEDI_AIO_AIO12_8=m -CONFIG_COMEDI_AIO_IIRO_16=m -CONFIG_COMEDI_II_PCI20KC=m -CONFIG_COMEDI_C6XDIGIO=m -CONFIG_COMEDI_MPC624=m -CONFIG_COMEDI_ADQ12B=m -CONFIG_COMEDI_NI_AT_A2150=m -CONFIG_COMEDI_NI_AT_AO=m -CONFIG_COMEDI_NI_ATMIO=m -CONFIG_COMEDI_NI_ATMIO16D=m -CONFIG_COMEDI_NI_LABPC_ISA=m -CONFIG_COMEDI_PCMAD=m -CONFIG_COMEDI_PCMDA12=m -CONFIG_COMEDI_PCMMIO=m -CONFIG_COMEDI_PCMUIO=m -CONFIG_COMEDI_MULTIQ3=m -CONFIG_COMEDI_S526=m -CONFIG_COMEDI_PCI_DRIVERS=m -CONFIG_COMEDI_8255_PCI=m -CONFIG_COMEDI_ADDI_WATCHDOG=m -CONFIG_COMEDI_ADDI_APCI_1032=m -CONFIG_COMEDI_ADDI_APCI_1500=m -CONFIG_COMEDI_ADDI_APCI_1516=m -CONFIG_COMEDI_ADDI_APCI_1564=m -CONFIG_COMEDI_ADDI_APCI_16XX=m -CONFIG_COMEDI_ADDI_APCI_2032=m -CONFIG_COMEDI_ADDI_APCI_2200=m -CONFIG_COMEDI_ADDI_APCI_3120=m -CONFIG_COMEDI_ADDI_APCI_3501=m -CONFIG_COMEDI_ADDI_APCI_3XXX=m -CONFIG_COMEDI_ADL_PCI6208=m -CONFIG_COMEDI_ADL_PCI7X3X=m -CONFIG_COMEDI_ADL_PCI8164=m -CONFIG_COMEDI_ADL_PCI9111=m -CONFIG_COMEDI_ADL_PCI9118=m -CONFIG_COMEDI_ADV_PCI1710=m -CONFIG_COMEDI_ADV_PCI1720=m -CONFIG_COMEDI_ADV_PCI1723=m -CONFIG_COMEDI_ADV_PCI1724=m -CONFIG_COMEDI_ADV_PCI1760=m -CONFIG_COMEDI_ADV_PCI_DIO=m -CONFIG_COMEDI_AMPLC_DIO200_PCI=m -CONFIG_COMEDI_AMPLC_PC236_PCI=m -CONFIG_COMEDI_AMPLC_PC263_PCI=m -CONFIG_COMEDI_AMPLC_PCI224=m -CONFIG_COMEDI_AMPLC_PCI230=m -CONFIG_COMEDI_CONTEC_PCI_DIO=m -CONFIG_COMEDI_DAS08_PCI=m -CONFIG_COMEDI_DT3000=m -CONFIG_COMEDI_DYNA_PCI10XX=m -CONFIG_COMEDI_GSC_HPDI=m -CONFIG_COMEDI_MF6X4=m -CONFIG_COMEDI_ICP_MULTI=m -CONFIG_COMEDI_DAQBOARD2000=m -CONFIG_COMEDI_JR3_PCI=m -CONFIG_COMEDI_KE_COUNTER=m -CONFIG_COMEDI_CB_PCIDAS64=m -CONFIG_COMEDI_CB_PCIDAS=m -CONFIG_COMEDI_CB_PCIDDA=m -CONFIG_COMEDI_CB_PCIMDAS=m -CONFIG_COMEDI_CB_PCIMDDA=m -CONFIG_COMEDI_ME4000=m -CONFIG_COMEDI_ME_DAQ=m -CONFIG_COMEDI_NI_6527=m -CONFIG_COMEDI_NI_65XX=m -CONFIG_COMEDI_NI_660X=m -CONFIG_COMEDI_NI_670X=m -CONFIG_COMEDI_NI_LABPC_PCI=m -CONFIG_COMEDI_NI_PCIDIO=m -CONFIG_COMEDI_NI_PCIMIO=m -CONFIG_COMEDI_RTD520=m -CONFIG_COMEDI_S626=m -CONFIG_COMEDI_MITE=m -CONFIG_COMEDI_NI_TIOCMD=m -CONFIG_COMEDI_PCMCIA_DRIVERS=m -CONFIG_COMEDI_CB_DAS16_CS=m -CONFIG_COMEDI_DAS08_CS=m -CONFIG_COMEDI_NI_DAQ_700_CS=m -CONFIG_COMEDI_NI_DAQ_DIO24_CS=m -CONFIG_COMEDI_NI_LABPC_CS=m -CONFIG_COMEDI_NI_MIO_CS=m -CONFIG_COMEDI_QUATECH_DAQP_CS=m -CONFIG_COMEDI_USB_DRIVERS=m -CONFIG_COMEDI_DT9812=m -CONFIG_COMEDI_NI_USB6501=m -CONFIG_COMEDI_USBDUX=m -CONFIG_COMEDI_USBDUXFAST=m -CONFIG_COMEDI_USBDUXSIGMA=m -CONFIG_COMEDI_VMK80XX=m -CONFIG_COMEDI_8254=m -CONFIG_COMEDI_8255=m -CONFIG_COMEDI_8255_SA=m -CONFIG_COMEDI_KCOMEDILIB=m -CONFIG_COMEDI_AMPLC_DIO200=m -CONFIG_COMEDI_AMPLC_PC236=m -CONFIG_COMEDI_DAS08=m -CONFIG_COMEDI_ISADMA=m -CONFIG_COMEDI_NI_LABPC=m -CONFIG_COMEDI_NI_LABPC_ISADMA=m -CONFIG_COMEDI_NI_TIO=m -CONFIG_RTL8192U=m -CONFIG_RTLLIB=m -CONFIG_RTLLIB_CRYPTO_CCMP=m -CONFIG_RTLLIB_CRYPTO_TKIP=m -CONFIG_RTLLIB_CRYPTO_WEP=m -CONFIG_RTL8192E=m -CONFIG_RTL8723BS=m -CONFIG_R8712U=m -CONFIG_R8188EU=m -CONFIG_88EU_AP_MODE=y -CONFIG_R8822BE=m -CONFIG_RTLWIFI_DEBUG_ST=y -CONFIG_RTS5208=m -CONFIG_VT6655=m -CONFIG_VT6656=m - -# -# IIO staging drivers -# - -# -# Accelerometers -# -CONFIG_ADIS16203=m -CONFIG_ADIS16240=m - -# -# Analog to digital converters -# -CONFIG_AD7606=m -CONFIG_AD7606_IFACE_PARALLEL=m -CONFIG_AD7606_IFACE_SPI=m -CONFIG_AD7780=m -CONFIG_AD7816=m -CONFIG_AD7192=m -CONFIG_AD7280=m - -# -# Analog digital bi-direction converters -# -CONFIG_ADT7316=m -CONFIG_ADT7316_SPI=m -CONFIG_ADT7316_I2C=m - -# -# Capacitance to digital converters -# -CONFIG_AD7150=m -CONFIG_AD7152=m -CONFIG_AD7746=m - -# -# Direct Digital Synthesis -# -CONFIG_AD9832=m -CONFIG_AD9834=m - -# -# Digital gyroscope sensors -# -CONFIG_ADIS16060=m - -# -# Network Analyzer, Impedance Converters -# -CONFIG_AD5933=m - -# -# Active energy metering IC -# -CONFIG_ADE7854=m -CONFIG_ADE7854_I2C=m -CONFIG_ADE7854_SPI=m - -# -# Resolver to digital converters -# -CONFIG_AD2S90=m -CONFIG_AD2S1210=m -CONFIG_FB_SM750=m -CONFIG_FB_XGI=m - -# -# Speakup console speech -# -CONFIG_SPEAKUP=m -CONFIG_SPEAKUP_SYNTH_ACNTSA=m -CONFIG_SPEAKUP_SYNTH_ACNTPC=m -CONFIG_SPEAKUP_SYNTH_APOLLO=m -CONFIG_SPEAKUP_SYNTH_AUDPTR=m -CONFIG_SPEAKUP_SYNTH_BNS=m -CONFIG_SPEAKUP_SYNTH_DECTLK=m -CONFIG_SPEAKUP_SYNTH_DECEXT=m -CONFIG_SPEAKUP_SYNTH_DECPC=m -CONFIG_SPEAKUP_SYNTH_DTLK=m -CONFIG_SPEAKUP_SYNTH_KEYPC=m -CONFIG_SPEAKUP_SYNTH_LTLK=m -CONFIG_SPEAKUP_SYNTH_SOFT=m -CONFIG_SPEAKUP_SYNTH_SPKOUT=m -CONFIG_SPEAKUP_SYNTH_TXPRT=m -CONFIG_SPEAKUP_SYNTH_DUMMY=m -CONFIG_STAGING_MEDIA=y -CONFIG_I2C_BCM2048=m -CONFIG_SOC_CAMERA_IMX074=m -CONFIG_SOC_CAMERA_MT9T031=m -CONFIG_VIDEO_ZORAN=m -CONFIG_VIDEO_ZORAN_DC30=m -CONFIG_VIDEO_ZORAN_ZR36060=m -CONFIG_VIDEO_ZORAN_BUZ=m -CONFIG_VIDEO_ZORAN_DC10=m -CONFIG_VIDEO_ZORAN_LML33=m -CONFIG_VIDEO_ZORAN_LML33R10=m -CONFIG_VIDEO_ZORAN_AVS6EYES=m - -# -# Android -# -CONFIG_LTE_GDM724X=m -CONFIG_FIREWIRE_SERIAL=m -CONFIG_FWTTY_MAX_TOTAL_PORTS=64 -CONFIG_FWTTY_MAX_CARD_PORTS=32 -CONFIG_MTD_SPINAND_MT29F=m -CONFIG_MTD_SPINAND_ONDIEECC=y -CONFIG_DGNC=m -CONFIG_GS_FPGABOOT=m -# CONFIG_UNISYSSPAR is not set -CONFIG_FB_TFT=m -CONFIG_FB_TFT_AGM1264K_FL=m -CONFIG_FB_TFT_BD663474=m -CONFIG_FB_TFT_HX8340BN=m -CONFIG_FB_TFT_HX8347D=m -CONFIG_FB_TFT_HX8353D=m -CONFIG_FB_TFT_HX8357D=m -CONFIG_FB_TFT_ILI9163=m -CONFIG_FB_TFT_ILI9320=m -CONFIG_FB_TFT_ILI9325=m -CONFIG_FB_TFT_ILI9340=m -CONFIG_FB_TFT_ILI9341=m -CONFIG_FB_TFT_ILI9481=m -CONFIG_FB_TFT_ILI9486=m -CONFIG_FB_TFT_PCD8544=m -CONFIG_FB_TFT_RA8875=m -CONFIG_FB_TFT_S6D02A1=m -CONFIG_FB_TFT_S6D1121=m -CONFIG_FB_TFT_SH1106=m -CONFIG_FB_TFT_SSD1289=m -CONFIG_FB_TFT_SSD1305=m -CONFIG_FB_TFT_SSD1306=m -CONFIG_FB_TFT_SSD1331=m -CONFIG_FB_TFT_SSD1351=m -CONFIG_FB_TFT_ST7735R=m -CONFIG_FB_TFT_ST7789V=m -CONFIG_FB_TFT_TINYLCD=m -CONFIG_FB_TFT_TLS8204=m -CONFIG_FB_TFT_UC1611=m -CONFIG_FB_TFT_UC1701=m -CONFIG_FB_TFT_UPD161704=m -CONFIG_FB_TFT_WATTEROTT=m -CONFIG_FB_FLEX=m -CONFIG_FB_TFT_FBTFT_DEVICE=m -CONFIG_WILC1000=m -CONFIG_WILC1000_SDIO=m -CONFIG_WILC1000_SPI=m -# CONFIG_WILC1000_HW_OOB_INTR is not set -CONFIG_MOST=m -CONFIG_MOST_CDEV=m -CONFIG_MOST_NET=m -CONFIG_MOST_SOUND=m -CONFIG_MOST_VIDEO=m -CONFIG_MOST_I2C=m -CONFIG_MOST_USB=m -CONFIG_KS7010=m -# CONFIG_GREYBUS is not set - -# -# USB Power Delivery and Type-C drivers -# -CONFIG_TYPEC_TCPCI=m -CONFIG_TYPEC_RT1711H=m -CONFIG_DRM_VBOXVIDEO=m -# CONFIG_PI433 is not set -CONFIG_MTK_MMC=m -# CONFIG_MTK_AEE_KDUMP is not set -# CONFIG_MTK_MMC_CD_POLL is not set -CONFIG_X86_PLATFORM_DEVICES=y -CONFIG_ACER_WMI=m -CONFIG_ACER_WIRELESS=m -CONFIG_ACERHDF=m -CONFIG_ALIENWARE_WMI=m -CONFIG_ASUS_LAPTOP=m -CONFIG_DELL_SMBIOS=m -CONFIG_DELL_SMBIOS_WMI=y -CONFIG_DELL_SMBIOS_SMM=y -CONFIG_DELL_LAPTOP=m -CONFIG_DELL_WMI=m -CONFIG_DELL_WMI_DESCRIPTOR=m -CONFIG_DELL_WMI_AIO=m -CONFIG_DELL_WMI_LED=m -CONFIG_DELL_SMO8800=m -CONFIG_DELL_RBTN=m -CONFIG_FUJITSU_LAPTOP=m -CONFIG_FUJITSU_TABLET=m -CONFIG_AMILO_RFKILL=m -# CONFIG_GPD_POCKET_FAN is not set -CONFIG_TC1100_WMI=m -CONFIG_HP_ACCEL=m -CONFIG_HP_WIRELESS=m -CONFIG_HP_WMI=m -CONFIG_MSI_LAPTOP=m -CONFIG_PANASONIC_LAPTOP=m -CONFIG_COMPAL_LAPTOP=m -CONFIG_SONY_LAPTOP=m -CONFIG_SONYPI_COMPAT=y -CONFIG_IDEAPAD_LAPTOP=m -CONFIG_SURFACE3_WMI=m -CONFIG_THINKPAD_ACPI=m -CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y -CONFIG_THINKPAD_ACPI_DEBUGFACILITIES=y -# CONFIG_THINKPAD_ACPI_DEBUG is not set -# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set -CONFIG_THINKPAD_ACPI_VIDEO=y -CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y -CONFIG_SENSORS_HDAPS=m -CONFIG_INTEL_MENLOW=m -CONFIG_EEEPC_LAPTOP=m -CONFIG_ASUS_WMI=m -CONFIG_ASUS_NB_WMI=m -CONFIG_EEEPC_WMI=m -CONFIG_ASUS_WIRELESS=m -CONFIG_ACPI_WMI=m -CONFIG_WMI_BMOF=m -CONFIG_INTEL_WMI_THUNDERBOLT=m -CONFIG_MSI_WMI=m -CONFIG_PEAQ_WMI=m -CONFIG_TOPSTAR_LAPTOP=m -CONFIG_ACPI_TOSHIBA=m -CONFIG_TOSHIBA_BT_RFKILL=m -CONFIG_TOSHIBA_HAPS=m -CONFIG_TOSHIBA_WMI=m -CONFIG_ACPI_CMPC=m -CONFIG_INTEL_CHT_INT33FE=m -CONFIG_INTEL_INT0002_VGPIO=m -CONFIG_INTEL_HID_EVENT=m -CONFIG_INTEL_VBTN=m -CONFIG_INTEL_SCU_IPC=y -CONFIG_INTEL_SCU_IPC_UTIL=m -CONFIG_INTEL_MID_POWER_BUTTON=m -CONFIG_INTEL_MFLD_THERMAL=m -CONFIG_INTEL_IPS=m -CONFIG_INTEL_PMC_CORE=y -CONFIG_IBM_RTL=m -CONFIG_SAMSUNG_LAPTOP=m -CONFIG_MXM_WMI=m -CONFIG_INTEL_OAKTRAIL=m -CONFIG_SAMSUNG_Q10=m -CONFIG_APPLE_GMUX=m -CONFIG_INTEL_RST=m -CONFIG_INTEL_SMARTCONNECT=m -CONFIG_PVPANIC=m -CONFIG_INTEL_PMC_IPC=m -CONFIG_INTEL_BXTWC_PMIC_TMU=m -CONFIG_SURFACE_PRO3_BUTTON=m -CONFIG_SURFACE_3_BUTTON=m -CONFIG_INTEL_PUNIT_IPC=m -# CONFIG_MLX_PLATFORM is not set -# CONFIG_SILEAD_DMI is not set -CONFIG_INTEL_CHTDC_TI_PWRBTN=m -CONFIG_PMC_ATOM=y -CONFIG_CHROME_PLATFORMS=y -CONFIG_CHROMEOS_LAPTOP=m -CONFIG_CHROMEOS_PSTORE=m -CONFIG_CHROMEOS_TBMC=m -CONFIG_CROS_EC_CTL=m -CONFIG_CROS_EC_LPC=m -# CONFIG_CROS_EC_LPC_MEC is not set -CONFIG_CROS_EC_PROTO=y -CONFIG_CROS_KBD_LED_BACKLIGHT=m -# CONFIG_MELLANOX_PLATFORM is not set -CONFIG_CLKDEV_LOOKUP=y -CONFIG_HAVE_CLK_PREPARE=y -CONFIG_COMMON_CLK=y - -# -# Common Clock Framework -# -CONFIG_COMMON_CLK_WM831X=m -CONFIG_COMMON_CLK_SI5351=m -CONFIG_COMMON_CLK_SI544=m -CONFIG_COMMON_CLK_CDCE706=m -CONFIG_COMMON_CLK_CS2000_CP=m -CONFIG_COMMON_CLK_S2MPS11=m -CONFIG_CLK_TWL6040=m -CONFIG_COMMON_CLK_PALMAS=m -CONFIG_COMMON_CLK_PWM=m -# CONFIG_HWSPINLOCK is not set - -# -# Clock Source drivers -# -CONFIG_CLKSRC_I8253=y -CONFIG_CLKEVT_I8253=y -CONFIG_I8253_LOCK=y -CONFIG_CLKBLD_I8253=y -CONFIG_DW_APB_TIMER=y -CONFIG_MAILBOX=y -CONFIG_PCC=y -CONFIG_ALTERA_MBOX=m -CONFIG_IOMMU_API=y -CONFIG_IOMMU_SUPPORT=y - -# -# Generic IOMMU Pagetable Support -# -CONFIG_IOMMU_IOVA=y -CONFIG_DMAR_TABLE=y -CONFIG_INTEL_IOMMU=y -CONFIG_INTEL_IOMMU_SVM=y -# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set -CONFIG_INTEL_IOMMU_FLOPPY_WA=y - -# -# Remoteproc drivers -# -CONFIG_REMOTEPROC=m - -# -# Rpmsg drivers -# -CONFIG_RPMSG=m -# CONFIG_RPMSG_CHAR is not set -CONFIG_RPMSG_QCOM_GLINK_NATIVE=m -CONFIG_RPMSG_QCOM_GLINK_RPM=m -CONFIG_RPMSG_VIRTIO=m -# CONFIG_SOUNDWIRE is not set - -# -# SOC (System On Chip) specific Drivers -# - -# -# Amlogic SoC drivers -# - -# -# Broadcom SoC drivers -# - -# -# i.MX SoC drivers -# - -# -# Qualcomm SoC drivers -# -CONFIG_SOC_TI=y - -# -# Xilinx SoC drivers -# -# CONFIG_XILINX_VCU is not set -CONFIG_PM_DEVFREQ=y - -# -# DEVFREQ Governors -# -CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y -CONFIG_DEVFREQ_GOV_PERFORMANCE=y -CONFIG_DEVFREQ_GOV_POWERSAVE=y -CONFIG_DEVFREQ_GOV_USERSPACE=y -CONFIG_DEVFREQ_GOV_PASSIVE=m - -# -# DEVFREQ Drivers -# -CONFIG_PM_DEVFREQ_EVENT=y -CONFIG_EXTCON=y - -# -# Extcon Device Drivers -# -CONFIG_EXTCON_ADC_JACK=m -CONFIG_EXTCON_ARIZONA=m -CONFIG_EXTCON_AXP288=m -CONFIG_EXTCON_GPIO=m -CONFIG_EXTCON_INTEL_INT3496=m -CONFIG_EXTCON_INTEL_CHT_WC=m -CONFIG_EXTCON_MAX14577=m -CONFIG_EXTCON_MAX3355=m -CONFIG_EXTCON_MAX77693=m -CONFIG_EXTCON_MAX77843=m -CONFIG_EXTCON_MAX8997=m -CONFIG_EXTCON_PALMAS=m -CONFIG_EXTCON_RT8973A=m -CONFIG_EXTCON_SM5502=m -CONFIG_EXTCON_USB_GPIO=m -CONFIG_EXTCON_USBC_CROS_EC=m -CONFIG_MEMORY=y -CONFIG_IIO=m -CONFIG_IIO_BUFFER=y -CONFIG_IIO_BUFFER_CB=m -CONFIG_IIO_BUFFER_HW_CONSUMER=m -CONFIG_IIO_KFIFO_BUF=m -CONFIG_IIO_TRIGGERED_BUFFER=m -CONFIG_IIO_CONFIGFS=m -CONFIG_IIO_TRIGGER=y -CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 -CONFIG_IIO_SW_DEVICE=m -CONFIG_IIO_SW_TRIGGER=m -CONFIG_IIO_TRIGGERED_EVENT=m - -# -# Accelerometers -# -CONFIG_ADIS16201=m -CONFIG_ADIS16209=m -CONFIG_BMA180=m -CONFIG_BMA220=m -CONFIG_BMC150_ACCEL=m -CONFIG_BMC150_ACCEL_I2C=m -CONFIG_BMC150_ACCEL_SPI=m -CONFIG_DA280=m -CONFIG_DA311=m -CONFIG_DMARD09=m -CONFIG_DMARD10=m -CONFIG_HID_SENSOR_ACCEL_3D=m -CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m -CONFIG_IIO_ST_ACCEL_3AXIS=m -CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m -CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m -CONFIG_KXSD9=m -CONFIG_KXSD9_SPI=m -CONFIG_KXSD9_I2C=m -CONFIG_KXCJK1013=m -CONFIG_MC3230=m -CONFIG_MMA7455=m -CONFIG_MMA7455_I2C=m -CONFIG_MMA7455_SPI=m -CONFIG_MMA7660=m -CONFIG_MMA8452=m -CONFIG_MMA9551_CORE=m -CONFIG_MMA9551=m -CONFIG_MMA9553=m -CONFIG_MXC4005=m -CONFIG_MXC6255=m -CONFIG_SCA3000=m -CONFIG_STK8312=m -CONFIG_STK8BA50=m - -# -# Analog to digital converters -# -CONFIG_AD_SIGMA_DELTA=m -CONFIG_AD7266=m -CONFIG_AD7291=m -CONFIG_AD7298=m -CONFIG_AD7476=m -CONFIG_AD7766=m -CONFIG_AD7791=m -CONFIG_AD7793=m -CONFIG_AD7887=m -CONFIG_AD7923=m -CONFIG_AD799X=m -CONFIG_AXP20X_ADC=m -CONFIG_AXP288_ADC=m -CONFIG_CC10001_ADC=m -CONFIG_DA9150_GPADC=m -CONFIG_DLN2_ADC=m -CONFIG_HI8435=m -CONFIG_HX711=m -CONFIG_INA2XX_ADC=m -CONFIG_LP8788_ADC=m -CONFIG_LTC2471=m -CONFIG_LTC2485=m -CONFIG_LTC2497=m -CONFIG_MAX1027=m -CONFIG_MAX11100=m -CONFIG_MAX1118=m -CONFIG_MAX1363=m -CONFIG_MAX9611=m -CONFIG_MCP320X=m -CONFIG_MCP3422=m -CONFIG_MEN_Z188_ADC=m -CONFIG_NAU7802=m -CONFIG_PALMAS_GPADC=m -CONFIG_QCOM_VADC_COMMON=m -CONFIG_QCOM_SPMI_IADC=m -CONFIG_QCOM_SPMI_VADC=m -CONFIG_TI_ADC081C=m -CONFIG_TI_ADC0832=m -CONFIG_TI_ADC084S021=m -CONFIG_TI_ADC12138=m -CONFIG_TI_ADC108S102=m -CONFIG_TI_ADC128S052=m -CONFIG_TI_ADC161S626=m -CONFIG_TI_ADS1015=m -CONFIG_TI_ADS7950=m -CONFIG_TI_AM335X_ADC=m -CONFIG_TI_TLC4541=m -CONFIG_TWL4030_MADC=m -CONFIG_TWL6030_GPADC=m -CONFIG_VIPERBOARD_ADC=m - -# -# Analog Front Ends -# - -# -# Amplifiers -# -CONFIG_AD8366=m - -# -# Chemical Sensors -# -CONFIG_ATLAS_PH_SENSOR=m -CONFIG_CCS811=m -CONFIG_IAQCORE=m -CONFIG_VZ89X=m -CONFIG_IIO_CROS_EC_SENSORS_CORE=m -CONFIG_IIO_CROS_EC_SENSORS=m - -# -# Hid Sensor IIO Common -# -CONFIG_HID_SENSOR_IIO_COMMON=m -CONFIG_HID_SENSOR_IIO_TRIGGER=m -CONFIG_IIO_MS_SENSORS_I2C=m - -# -# SSP Sensor Common -# -CONFIG_IIO_SSP_SENSORS_COMMONS=m -CONFIG_IIO_SSP_SENSORHUB=m -CONFIG_IIO_ST_SENSORS_I2C=m -CONFIG_IIO_ST_SENSORS_SPI=m -CONFIG_IIO_ST_SENSORS_CORE=m - -# -# Counters -# - -# -# Digital to analog converters -# -CONFIG_AD5064=m -CONFIG_AD5360=m -CONFIG_AD5380=m -CONFIG_AD5421=m -CONFIG_AD5446=m -CONFIG_AD5449=m -CONFIG_AD5592R_BASE=m -CONFIG_AD5592R=m -CONFIG_AD5593R=m -CONFIG_AD5504=m -CONFIG_AD5624R_SPI=m -CONFIG_LTC2632=m -CONFIG_AD5686=m -CONFIG_AD5686_SPI=m -CONFIG_AD5696_I2C=m -CONFIG_AD5755=m -CONFIG_AD5761=m -CONFIG_AD5764=m -CONFIG_AD5791=m -CONFIG_AD7303=m -CONFIG_AD8801=m -CONFIG_DS4424=m -CONFIG_M62332=m -CONFIG_MAX517=m -CONFIG_MCP4725=m -CONFIG_MCP4922=m -CONFIG_TI_DAC082S085=m -CONFIG_TI_DAC5571=m - -# -# IIO dummy driver -# -CONFIG_IIO_SIMPLE_DUMMY=m -# CONFIG_IIO_SIMPLE_DUMMY_EVENTS is not set -# CONFIG_IIO_SIMPLE_DUMMY_BUFFER is not set - -# -# Frequency Synthesizers DDS/PLL -# - -# -# Clock Generator/Distribution -# -CONFIG_AD9523=m - -# -# Phase-Locked Loop (PLL) frequency synthesizers -# -CONFIG_ADF4350=m - -# -# Digital gyroscope sensors -# -CONFIG_ADIS16080=m -CONFIG_ADIS16130=m -CONFIG_ADIS16136=m -CONFIG_ADIS16260=m -CONFIG_ADXRS450=m -CONFIG_BMG160=m -CONFIG_BMG160_I2C=m -CONFIG_BMG160_SPI=m -CONFIG_HID_SENSOR_GYRO_3D=m -CONFIG_MPU3050=m -CONFIG_MPU3050_I2C=m -CONFIG_IIO_ST_GYRO_3AXIS=m -CONFIG_IIO_ST_GYRO_I2C_3AXIS=m -CONFIG_IIO_ST_GYRO_SPI_3AXIS=m -CONFIG_ITG3200=m - -# -# Health Sensors -# - -# -# Heart Rate Monitors -# -CONFIG_AFE4403=m -CONFIG_AFE4404=m -CONFIG_MAX30100=m -CONFIG_MAX30102=m - -# -# Humidity sensors -# -CONFIG_AM2315=m -CONFIG_DHT11=m -CONFIG_HDC100X=m -CONFIG_HID_SENSOR_HUMIDITY=m -CONFIG_HTS221=m -CONFIG_HTS221_I2C=m -CONFIG_HTS221_SPI=m -CONFIG_HTU21=m -CONFIG_SI7005=m -CONFIG_SI7020=m - -# -# Inertial measurement units -# -CONFIG_ADIS16400=m -CONFIG_ADIS16480=m -CONFIG_BMI160=m -CONFIG_BMI160_I2C=m -CONFIG_BMI160_SPI=m -CONFIG_KMX61=m -CONFIG_INV_MPU6050_IIO=m -CONFIG_INV_MPU6050_I2C=m -CONFIG_INV_MPU6050_SPI=m -CONFIG_IIO_ST_LSM6DSX=m -CONFIG_IIO_ST_LSM6DSX_I2C=m -CONFIG_IIO_ST_LSM6DSX_SPI=m -CONFIG_IIO_ADIS_LIB=m -CONFIG_IIO_ADIS_LIB_BUFFER=y - -# -# Light sensors -# -CONFIG_ACPI_ALS=m -CONFIG_ADJD_S311=m -CONFIG_AL3320A=m -CONFIG_APDS9300=m -CONFIG_APDS9960=m -CONFIG_BH1750=m -CONFIG_BH1780=m -CONFIG_CM32181=m -CONFIG_CM3232=m -CONFIG_CM3323=m -CONFIG_CM36651=m -CONFIG_IIO_CROS_EC_LIGHT_PROX=m -CONFIG_GP2AP020A00F=m -CONFIG_SENSORS_ISL29018=m -CONFIG_SENSORS_ISL29028=m -CONFIG_ISL29125=m -CONFIG_HID_SENSOR_ALS=m -CONFIG_HID_SENSOR_PROX=m -CONFIG_JSA1212=m -CONFIG_RPR0521=m -CONFIG_SENSORS_LM3533=m -CONFIG_LTR501=m -CONFIG_LV0104CS=m -CONFIG_MAX44000=m -CONFIG_OPT3001=m -CONFIG_PA12203001=m -CONFIG_SI1145=m -CONFIG_STK3310=m -CONFIG_ST_UVIS25=m -CONFIG_ST_UVIS25_I2C=m -CONFIG_ST_UVIS25_SPI=m -CONFIG_TCS3414=m -CONFIG_TCS3472=m -CONFIG_SENSORS_TSL2563=m -CONFIG_TSL2583=m -CONFIG_TSL2772=m -CONFIG_TSL4531=m -CONFIG_US5182D=m -CONFIG_VCNL4000=m -CONFIG_VEML6070=m -CONFIG_VL6180=m -CONFIG_ZOPT2201=m - -# -# Magnetometer sensors -# -CONFIG_AK8975=m -CONFIG_AK09911=m -CONFIG_BMC150_MAGN=m -CONFIG_BMC150_MAGN_I2C=m -CONFIG_BMC150_MAGN_SPI=m -CONFIG_MAG3110=m -CONFIG_HID_SENSOR_MAGNETOMETER_3D=m -CONFIG_MMC35240=m -CONFIG_IIO_ST_MAGN_3AXIS=m -CONFIG_IIO_ST_MAGN_I2C_3AXIS=m -CONFIG_IIO_ST_MAGN_SPI_3AXIS=m -CONFIG_SENSORS_HMC5843=m -CONFIG_SENSORS_HMC5843_I2C=m -CONFIG_SENSORS_HMC5843_SPI=m - -# -# Multiplexers -# - -# -# Inclinometer sensors -# -CONFIG_HID_SENSOR_INCLINOMETER_3D=m -CONFIG_HID_SENSOR_DEVICE_ROTATION=m - -# -# Triggers - standalone -# -CONFIG_IIO_HRTIMER_TRIGGER=m -CONFIG_IIO_INTERRUPT_TRIGGER=m -CONFIG_IIO_TIGHTLOOP_TRIGGER=m -CONFIG_IIO_SYSFS_TRIGGER=m - -# -# Digital potentiometers -# -CONFIG_AD5272=m -CONFIG_DS1803=m -CONFIG_MAX5481=m -CONFIG_MAX5487=m -CONFIG_MCP4018=m -CONFIG_MCP4131=m -CONFIG_MCP4531=m -CONFIG_TPL0102=m - -# -# Digital potentiostats -# -CONFIG_LMP91000=m - -# -# Pressure sensors -# -CONFIG_ABP060MG=m -CONFIG_BMP280=m -CONFIG_BMP280_I2C=m -CONFIG_BMP280_SPI=m -CONFIG_IIO_CROS_EC_BARO=m -CONFIG_HID_SENSOR_PRESS=m -CONFIG_HP03=m -CONFIG_MPL115=m -CONFIG_MPL115_I2C=m -CONFIG_MPL115_SPI=m -CONFIG_MPL3115=m -CONFIG_MS5611=m -CONFIG_MS5611_I2C=m -CONFIG_MS5611_SPI=m -CONFIG_MS5637=m -CONFIG_IIO_ST_PRESS=m -CONFIG_IIO_ST_PRESS_I2C=m -CONFIG_IIO_ST_PRESS_SPI=m -CONFIG_T5403=m -CONFIG_HP206C=m -CONFIG_ZPA2326=m -CONFIG_ZPA2326_I2C=m -CONFIG_ZPA2326_SPI=m - -# -# Lightning sensors -# -CONFIG_AS3935=m - -# -# Proximity and distance sensors -# -CONFIG_LIDAR_LITE_V2=m -CONFIG_RFD77402=m -CONFIG_SRF04=m -CONFIG_SX9500=m -CONFIG_SRF08=m - -# -# Resolver to digital converters -# -CONFIG_AD2S1200=m - -# -# Temperature sensors -# -CONFIG_MAXIM_THERMOCOUPLE=m -CONFIG_HID_SENSOR_TEMP=m -CONFIG_MLX90614=m -CONFIG_MLX90632=m -CONFIG_TMP006=m -CONFIG_TMP007=m -CONFIG_TSYS01=m -CONFIG_TSYS02D=m -CONFIG_NTB=m -CONFIG_NTB_IDT=m -CONFIG_NTB_SWITCHTEC=m -CONFIG_NTB_PINGPONG=m -CONFIG_NTB_TOOL=m -CONFIG_NTB_PERF=m -CONFIG_NTB_TRANSPORT=m -CONFIG_VME_BUS=y - -# -# VME Bridge Drivers -# -CONFIG_VME_CA91CX42=m -CONFIG_VME_TSI148=m -# CONFIG_VME_FAKE is not set - -# -# VME Board Drivers -# -CONFIG_VMIVME_7805=m - -# -# VME Device Drivers -# -CONFIG_VME_USER=m -CONFIG_PWM=y -CONFIG_PWM_SYSFS=y -CONFIG_PWM_CRC=y -CONFIG_PWM_CROS_EC=m -CONFIG_PWM_LP3943=m -CONFIG_PWM_LPSS=m -CONFIG_PWM_LPSS_PCI=m -CONFIG_PWM_LPSS_PLATFORM=m -CONFIG_PWM_PCA9685=m -CONFIG_PWM_TWL=m -CONFIG_PWM_TWL_LED=m - -# -# IRQ chip support -# -CONFIG_ARM_GIC_MAX_NR=1 -CONFIG_IPACK_BUS=m -CONFIG_BOARD_TPCI200=m -CONFIG_SERIAL_IPOCTAL=m -CONFIG_RESET_CONTROLLER=y -CONFIG_RESET_TI_SYSCON=m -CONFIG_FMC=m -CONFIG_FMC_FAKEDEV=m -CONFIG_FMC_TRIVIAL=m -CONFIG_FMC_WRITE_EEPROM=m -CONFIG_FMC_CHARDEV=m - -# -# PHY Subsystem -# -CONFIG_GENERIC_PHY=y -CONFIG_BCM_KONA_USB2_PHY=m -CONFIG_PHY_PXA_28NM_HSIC=m -CONFIG_PHY_PXA_28NM_USB2=m -CONFIG_PHY_CPCAP_USB=m -CONFIG_PHY_QCOM_USB_HS=m -CONFIG_PHY_QCOM_USB_HSIC=m -CONFIG_PHY_SAMSUNG_USB2=m -CONFIG_PHY_TUSB1210=m -CONFIG_POWERCAP=y -CONFIG_INTEL_RAPL=m -CONFIG_MCB=m -CONFIG_MCB_PCI=m -CONFIG_MCB_LPC=m - -# -# Performance monitor support -# -CONFIG_RAS=y -CONFIG_THUNDERBOLT=m - -# -# Android -# -# CONFIG_ANDROID is not set -CONFIG_LIBNVDIMM=y -CONFIG_BLK_DEV_PMEM=m -CONFIG_ND_BLK=m -CONFIG_ND_CLAIM=y -CONFIG_ND_BTT=m -CONFIG_BTT=y -CONFIG_DAX_DRIVER=y -CONFIG_DAX=y -CONFIG_DEV_DAX=m -CONFIG_NVMEM=y -CONFIG_RAVE_SP_EEPROM=m - -# -# HW tracing support -# -CONFIG_STM=m -CONFIG_STM_DUMMY=m -CONFIG_STM_SOURCE_CONSOLE=m -CONFIG_STM_SOURCE_HEARTBEAT=m -CONFIG_STM_SOURCE_FTRACE=m -CONFIG_INTEL_TH=m -CONFIG_INTEL_TH_PCI=m -CONFIG_INTEL_TH_ACPI=m -CONFIG_INTEL_TH_GTH=m -CONFIG_INTEL_TH_STH=m -CONFIG_INTEL_TH_MSU=m -CONFIG_INTEL_TH_PTI=m -# CONFIG_INTEL_TH_DEBUG is not set -CONFIG_FPGA=m -CONFIG_ALTERA_PR_IP_CORE=m -CONFIG_FPGA_MGR_ALTERA_PS_SPI=m -CONFIG_FPGA_MGR_ALTERA_CVP=m -CONFIG_FPGA_MGR_XILINX_SPI=m -CONFIG_FPGA_MGR_MACHXO2_SPI=m -CONFIG_FPGA_BRIDGE=m -CONFIG_XILINX_PR_DECOUPLER=m -CONFIG_FPGA_REGION=m -CONFIG_PM_OPP=y -# CONFIG_SIOX is not set -# CONFIG_SLIMBUS is not set - -# -# Firmware Drivers -# -CONFIG_EDD=y -CONFIG_EDD_OFF=y -CONFIG_FIRMWARE_MEMMAP=y -CONFIG_DELL_RBU=m -CONFIG_DCDBAS=m -CONFIG_DMIID=y -CONFIG_DMI_SYSFS=m -CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y -CONFIG_ISCSI_IBFT_FIND=y -CONFIG_ISCSI_IBFT=m -CONFIG_FW_CFG_SYSFS=m -# CONFIG_FW_CFG_SYSFS_CMDLINE is not set -# CONFIG_GOOGLE_FIRMWARE is not set - -# -# EFI (Extensible Firmware Interface) Support -# -CONFIG_EFI_VARS=y -CONFIG_EFI_ESRT=y -CONFIG_EFI_VARS_PSTORE=m -# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set -CONFIG_EFI_RUNTIME_MAP=y -# CONFIG_EFI_FAKE_MEMMAP is not set -CONFIG_EFI_RUNTIME_WRAPPERS=y -CONFIG_EFI_BOOTLOADER_CONTROL=m -CONFIG_EFI_CAPSULE_LOADER=y -CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH=y -# CONFIG_EFI_TEST is not set -CONFIG_APPLE_PROPERTIES=y -CONFIG_RESET_ATTACK_MITIGATION=y -CONFIG_UEFI_CPER=y -CONFIG_UEFI_CPER_X86=y -CONFIG_EFI_DEV_PATH_PARSER=y - -# -# Tegra firmware driver -# - -# -# File systems -# -CONFIG_DCACHE_WORD_ACCESS=y -CONFIG_FS_IOMAP=y -# CONFIG_EXT2_FS is not set -# CONFIG_EXT3_FS is not set -CONFIG_EXT4_FS=y -CONFIG_EXT4_USE_FOR_EXT2=y -CONFIG_EXT4_FS_POSIX_ACL=y -CONFIG_EXT4_FS_SECURITY=y -# CONFIG_EXT4_ENCRYPTION is not set -# CONFIG_EXT4_DEBUG is not set -CONFIG_JBD2=y -# CONFIG_JBD2_DEBUG is not set -CONFIG_FS_MBCACHE=y -CONFIG_REISERFS_FS=m -# CONFIG_REISERFS_CHECK is not set -# CONFIG_REISERFS_PROC_INFO is not set -CONFIG_REISERFS_FS_XATTR=y -CONFIG_REISERFS_FS_POSIX_ACL=y -CONFIG_REISERFS_FS_SECURITY=y -CONFIG_JFS_FS=m -CONFIG_JFS_POSIX_ACL=y -CONFIG_JFS_SECURITY=y -# CONFIG_JFS_DEBUG is not set -CONFIG_JFS_STATISTICS=y -CONFIG_XFS_FS=m -CONFIG_XFS_QUOTA=y -CONFIG_XFS_POSIX_ACL=y -CONFIG_XFS_RT=y -# CONFIG_XFS_ONLINE_SCRUB is not set -# CONFIG_XFS_WARN is not set -# CONFIG_XFS_DEBUG is not set -CONFIG_GFS2_FS=m -CONFIG_GFS2_FS_LOCKING_DLM=y -CONFIG_OCFS2_FS=m -CONFIG_OCFS2_FS_O2CB=m -CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m -CONFIG_OCFS2_FS_STATS=y -CONFIG_OCFS2_DEBUG_MASKLOG=y -# CONFIG_OCFS2_DEBUG_FS is not set -CONFIG_BTRFS_FS=m -CONFIG_BTRFS_FS_POSIX_ACL=y -# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set -# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set -# CONFIG_BTRFS_DEBUG is not set -# CONFIG_BTRFS_ASSERT is not set -# CONFIG_BTRFS_FS_REF_VERIFY is not set -CONFIG_NILFS2_FS=m -CONFIG_F2FS_FS=m -CONFIG_F2FS_STAT_FS=y -CONFIG_F2FS_FS_XATTR=y -CONFIG_F2FS_FS_POSIX_ACL=y -CONFIG_F2FS_FS_SECURITY=y -# CONFIG_F2FS_CHECK_FS is not set -# CONFIG_F2FS_FS_ENCRYPTION is not set -# CONFIG_F2FS_IO_TRACE is not set -# CONFIG_F2FS_FAULT_INJECTION is not set -CONFIG_FS_DAX=y -CONFIG_FS_POSIX_ACL=y -CONFIG_EXPORTFS=y -# CONFIG_EXPORTFS_BLOCK_OPS is not set -CONFIG_FILE_LOCKING=y -CONFIG_MANDATORY_FILE_LOCKING=y -CONFIG_FS_ENCRYPTION=m -CONFIG_FSNOTIFY=y -CONFIG_DNOTIFY=y -CONFIG_INOTIFY_USER=y -CONFIG_FANOTIFY=y -CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y -CONFIG_QUOTA=y -CONFIG_QUOTA_NETLINK_INTERFACE=y -# CONFIG_PRINT_QUOTA_WARNING is not set -# CONFIG_QUOTA_DEBUG is not set -CONFIG_QUOTA_TREE=m -CONFIG_QFMT_V1=m -CONFIG_QFMT_V2=m -CONFIG_QUOTACTL=y -CONFIG_AUTOFS4_FS=m -CONFIG_AUTOFS_FS=m -CONFIG_FUSE_FS=y -CONFIG_CUSE=m -CONFIG_OVERLAY_FS=m -# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set -# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set -# CONFIG_OVERLAY_FS_INDEX is not set -# CONFIG_OVERLAY_FS_XINO_AUTO is not set - -# -# Caches -# -CONFIG_FSCACHE=m -CONFIG_FSCACHE_STATS=y -# CONFIG_FSCACHE_HISTOGRAM is not set -# CONFIG_FSCACHE_DEBUG is not set -# CONFIG_FSCACHE_OBJECT_LIST is not set -CONFIG_CACHEFILES=m -# CONFIG_CACHEFILES_DEBUG is not set -# CONFIG_CACHEFILES_HISTOGRAM is not set - -# -# CD-ROM/DVD Filesystems -# -CONFIG_ISO9660_FS=m -CONFIG_JOLIET=y -CONFIG_ZISOFS=y -CONFIG_UDF_FS=m - -# -# DOS/FAT/NT Filesystems -# -CONFIG_FAT_FS=y -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=y -CONFIG_FAT_DEFAULT_CODEPAGE=437 -CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" -# CONFIG_FAT_DEFAULT_UTF8 is not set -CONFIG_NTFS_FS=m -# CONFIG_NTFS_DEBUG is not set -# CONFIG_NTFS_RW is not set - -# -# Pseudo filesystems -# -CONFIG_PROC_FS=y -CONFIG_PROC_KCORE=y -CONFIG_PROC_VMCORE=y -# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set -CONFIG_PROC_SYSCTL=y -CONFIG_PROC_PAGE_MONITOR=y -CONFIG_PROC_CHILDREN=y -CONFIG_KERNFS=y -CONFIG_SYSFS=y -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y -CONFIG_TMPFS_XATTR=y -CONFIG_HUGETLBFS=y -CONFIG_HUGETLB_PAGE=y -CONFIG_MEMFD_CREATE=y -CONFIG_CONFIGFS_FS=m -CONFIG_EFIVAR_FS=y -CONFIG_MISC_FILESYSTEMS=y -CONFIG_ORANGEFS_FS=m -CONFIG_ADFS_FS=m -# CONFIG_ADFS_FS_RW is not set -CONFIG_AFFS_FS=m -CONFIG_ECRYPT_FS=y -CONFIG_ECRYPT_FS_MESSAGING=y -CONFIG_HFS_FS=m -CONFIG_HFSPLUS_FS=m -CONFIG_HFSPLUS_FS_POSIX_ACL=y -CONFIG_BEFS_FS=m -# CONFIG_BEFS_DEBUG is not set -CONFIG_BFS_FS=m -CONFIG_EFS_FS=m -CONFIG_JFFS2_FS=m -CONFIG_JFFS2_FS_DEBUG=0 -CONFIG_JFFS2_FS_WRITEBUFFER=y -# CONFIG_JFFS2_FS_WBUF_VERIFY is not set -# CONFIG_JFFS2_SUMMARY is not set -CONFIG_JFFS2_FS_XATTR=y -CONFIG_JFFS2_FS_POSIX_ACL=y -CONFIG_JFFS2_FS_SECURITY=y -CONFIG_JFFS2_COMPRESSION_OPTIONS=y -CONFIG_JFFS2_ZLIB=y -CONFIG_JFFS2_LZO=y -CONFIG_JFFS2_RTIME=y -# CONFIG_JFFS2_RUBIN is not set -# CONFIG_JFFS2_CMODE_NONE is not set -# CONFIG_JFFS2_CMODE_PRIORITY is not set -# CONFIG_JFFS2_CMODE_SIZE is not set -CONFIG_JFFS2_CMODE_FAVOURLZO=y -CONFIG_UBIFS_FS=m -# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set -CONFIG_UBIFS_FS_LZO=y -CONFIG_UBIFS_FS_ZLIB=y -CONFIG_UBIFS_ATIME_SUPPORT=y -CONFIG_UBIFS_FS_ENCRYPTION=y -CONFIG_UBIFS_FS_SECURITY=y -CONFIG_CRAMFS=m -CONFIG_CRAMFS_BLOCKDEV=y -# CONFIG_CRAMFS_MTD is not set -CONFIG_SQUASHFS=m -# CONFIG_SQUASHFS_FILE_CACHE is not set -CONFIG_SQUASHFS_FILE_DIRECT=y -# CONFIG_SQUASHFS_DECOMP_SINGLE is not set -# CONFIG_SQUASHFS_DECOMP_MULTI is not set -CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y -CONFIG_SQUASHFS_XATTR=y -CONFIG_SQUASHFS_ZLIB=y -CONFIG_SQUASHFS_LZ4=y -CONFIG_SQUASHFS_LZO=y -CONFIG_SQUASHFS_XZ=y -# CONFIG_SQUASHFS_ZSTD is not set -# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set -# CONFIG_SQUASHFS_EMBEDDED is not set -CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 -CONFIG_VXFS_FS=m -CONFIG_MINIX_FS=m -CONFIG_OMFS_FS=m -CONFIG_HPFS_FS=m -CONFIG_QNX4FS_FS=m -CONFIG_QNX6FS_FS=m -# CONFIG_QNX6FS_DEBUG is not set -CONFIG_ROMFS_FS=m -CONFIG_ROMFS_BACKED_BY_BLOCK=y -# CONFIG_ROMFS_BACKED_BY_MTD is not set -# CONFIG_ROMFS_BACKED_BY_BOTH is not set -CONFIG_ROMFS_ON_BLOCK=y -CONFIG_PSTORE=y -CONFIG_PSTORE_DEFLATE_COMPRESS=m -# CONFIG_PSTORE_LZO_COMPRESS is not set -# CONFIG_PSTORE_LZ4_COMPRESS is not set -# CONFIG_PSTORE_LZ4HC_COMPRESS is not set -# CONFIG_PSTORE_842_COMPRESS is not set -CONFIG_PSTORE_COMPRESS=y -CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y -CONFIG_PSTORE_COMPRESS_DEFAULT="deflate" -# CONFIG_PSTORE_CONSOLE is not set -# CONFIG_PSTORE_PMSG is not set -# CONFIG_PSTORE_FTRACE is not set -CONFIG_PSTORE_RAM=m -CONFIG_SYSV_FS=m -CONFIG_UFS_FS=m -# CONFIG_UFS_FS_WRITE is not set -# CONFIG_UFS_DEBUG is not set -CONFIG_EXOFS_FS=m -# CONFIG_EXOFS_DEBUG is not set -CONFIG_ORE=m -CONFIG_NETWORK_FILESYSTEMS=y -CONFIG_NFS_FS=m -CONFIG_NFS_V2=m -CONFIG_NFS_V3=m -CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=m -CONFIG_NFS_SWAP=y -CONFIG_NFS_V4_1=y -CONFIG_NFS_V4_2=y -CONFIG_PNFS_FILE_LAYOUT=m -CONFIG_PNFS_BLOCK=m -CONFIG_PNFS_FLEXFILE_LAYOUT=m -CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" -CONFIG_NFS_V4_1_MIGRATION=y -CONFIG_NFS_V4_SECURITY_LABEL=y -CONFIG_NFS_FSCACHE=y -# CONFIG_NFS_USE_LEGACY_DNS is not set -CONFIG_NFS_USE_KERNEL_DNS=y -CONFIG_NFS_DEBUG=y -CONFIG_NFSD=m -CONFIG_NFSD_V2_ACL=y -CONFIG_NFSD_V3=y -CONFIG_NFSD_V3_ACL=y -CONFIG_NFSD_V4=y -# CONFIG_NFSD_BLOCKLAYOUT is not set -# CONFIG_NFSD_SCSILAYOUT is not set -# CONFIG_NFSD_FLEXFILELAYOUT is not set -CONFIG_NFSD_V4_SECURITY_LABEL=y -# CONFIG_NFSD_FAULT_INJECTION is not set -CONFIG_GRACE_PERIOD=m -CONFIG_LOCKD=m -CONFIG_LOCKD_V4=y -CONFIG_NFS_ACL_SUPPORT=m -CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=m -CONFIG_SUNRPC_GSS=m -CONFIG_SUNRPC_BACKCHANNEL=y -CONFIG_SUNRPC_SWAP=y -CONFIG_RPCSEC_GSS_KRB5=m -CONFIG_SUNRPC_DEBUG=y -CONFIG_SUNRPC_XPRT_RDMA=m -CONFIG_CEPH_FS=m -CONFIG_CEPH_FSCACHE=y -CONFIG_CEPH_FS_POSIX_ACL=y -CONFIG_CIFS=m -CONFIG_CIFS_STATS=y -# CONFIG_CIFS_STATS2 is not set -CONFIG_CIFS_WEAK_PW_HASH=y -CONFIG_CIFS_UPCALL=y -CONFIG_CIFS_XATTR=y -CONFIG_CIFS_POSIX=y -CONFIG_CIFS_ACL=y -CONFIG_CIFS_DEBUG=y -# CONFIG_CIFS_DEBUG2 is not set -# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set -CONFIG_CIFS_DFS_UPCALL=y -CONFIG_CIFS_SMB311=y -# CONFIG_CIFS_SMB_DIRECT is not set -CONFIG_CIFS_FSCACHE=y -CONFIG_CODA_FS=m -CONFIG_AFS_FS=m -# CONFIG_AFS_DEBUG is not set -CONFIG_AFS_FSCACHE=y -CONFIG_9P_FS=m -CONFIG_9P_FSCACHE=y -CONFIG_9P_FS_POSIX_ACL=y -CONFIG_9P_FS_SECURITY=y -CONFIG_NLS=y -CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_737=m -CONFIG_NLS_CODEPAGE_775=m -CONFIG_NLS_CODEPAGE_850=m -CONFIG_NLS_CODEPAGE_852=m -CONFIG_NLS_CODEPAGE_855=m -CONFIG_NLS_CODEPAGE_857=m -CONFIG_NLS_CODEPAGE_860=m -CONFIG_NLS_CODEPAGE_861=m -CONFIG_NLS_CODEPAGE_862=m -CONFIG_NLS_CODEPAGE_863=m -CONFIG_NLS_CODEPAGE_864=m -CONFIG_NLS_CODEPAGE_865=m -CONFIG_NLS_CODEPAGE_866=m -CONFIG_NLS_CODEPAGE_869=m -CONFIG_NLS_CODEPAGE_936=m -CONFIG_NLS_CODEPAGE_950=m -CONFIG_NLS_CODEPAGE_932=m -CONFIG_NLS_CODEPAGE_949=m -CONFIG_NLS_CODEPAGE_874=m -CONFIG_NLS_ISO8859_8=m -CONFIG_NLS_CODEPAGE_1250=m -CONFIG_NLS_CODEPAGE_1251=m -CONFIG_NLS_ASCII=m -CONFIG_NLS_ISO8859_1=m -CONFIG_NLS_ISO8859_2=m -CONFIG_NLS_ISO8859_3=m -CONFIG_NLS_ISO8859_4=m -CONFIG_NLS_ISO8859_5=m -CONFIG_NLS_ISO8859_6=m -CONFIG_NLS_ISO8859_7=m -CONFIG_NLS_ISO8859_9=m -CONFIG_NLS_ISO8859_13=m -CONFIG_NLS_ISO8859_14=m -CONFIG_NLS_ISO8859_15=m -CONFIG_NLS_KOI8_R=m -CONFIG_NLS_KOI8_U=m -CONFIG_NLS_MAC_ROMAN=m -CONFIG_NLS_MAC_CELTIC=m -CONFIG_NLS_MAC_CENTEURO=m -CONFIG_NLS_MAC_CROATIAN=m -CONFIG_NLS_MAC_CYRILLIC=m -CONFIG_NLS_MAC_GAELIC=m -CONFIG_NLS_MAC_GREEK=m -CONFIG_NLS_MAC_ICELAND=m -CONFIG_NLS_MAC_INUIT=m -CONFIG_NLS_MAC_ROMANIAN=m -CONFIG_NLS_MAC_TURKISH=m -CONFIG_NLS_UTF8=m -CONFIG_DLM=m -# CONFIG_DLM_DEBUG is not set - -# -# Kernel hacking -# -CONFIG_TRACE_IRQFLAGS_SUPPORT=y - -# -# printk and dmesg options -# -CONFIG_PRINTK_TIME=y -CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 -CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 -CONFIG_BOOT_PRINTK_DELAY=y -CONFIG_DYNAMIC_DEBUG=y - -# -# Compile-time checks and compiler options -# -# CONFIG_DEBUG_INFO is not set -# CONFIG_ENABLE_WARN_DEPRECATED is not set -# CONFIG_ENABLE_MUST_CHECK is not set -CONFIG_FRAME_WARN=1024 -# CONFIG_STRIP_ASM_SYMS is not set -# CONFIG_READABLE_ASM is not set -CONFIG_UNUSED_SYMBOLS=y -# CONFIG_PAGE_OWNER is not set -CONFIG_DEBUG_FS=y -# CONFIG_HEADERS_CHECK is not set -# CONFIG_DEBUG_SECTION_MISMATCH is not set -CONFIG_SECTION_MISMATCH_WARN_ONLY=y -CONFIG_FRAME_POINTER=y -# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set -CONFIG_MAGIC_SYSRQ=y -CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1 -CONFIG_MAGIC_SYSRQ_SERIAL=y -CONFIG_DEBUG_KERNEL=y - -# -# Memory Debugging -# -CONFIG_PAGE_EXTENSION=y -# CONFIG_DEBUG_PAGEALLOC is not set -# CONFIG_PAGE_POISONING is not set -# CONFIG_DEBUG_PAGE_REF is not set -# CONFIG_DEBUG_RODATA_TEST is not set -# CONFIG_DEBUG_OBJECTS is not set -# CONFIG_SLUB_DEBUG_ON is not set -# CONFIG_SLUB_STATS is not set -CONFIG_HAVE_DEBUG_KMEMLEAK=y -# CONFIG_DEBUG_KMEMLEAK is not set -# CONFIG_DEBUG_STACK_USAGE is not set -# CONFIG_DEBUG_VM is not set -CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y -# CONFIG_DEBUG_VIRTUAL is not set -# CONFIG_DEBUG_MEMORY_INIT is not set -CONFIG_MEMORY_NOTIFIER_ERROR_INJECT=m -# CONFIG_DEBUG_PER_CPU_MAPS is not set -# CONFIG_DEBUG_HIGHMEM is not set -CONFIG_HAVE_DEBUG_STACKOVERFLOW=y -# CONFIG_DEBUG_STACKOVERFLOW is not set -CONFIG_CC_HAS_SANCOV_TRACE_PC=y -# CONFIG_DEBUG_SHIRQ is not set - -# -# Debug Lockups and Hangs -# -CONFIG_LOCKUP_DETECTOR=y -CONFIG_SOFTLOCKUP_DETECTOR=y -# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set -CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 -CONFIG_HARDLOCKUP_DETECTOR_PERF=y -CONFIG_HARDLOCKUP_DETECTOR=y -# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set -CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0 -CONFIG_DETECT_HUNG_TASK=y -CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 -# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set -CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 -# CONFIG_WQ_WATCHDOG is not set -# CONFIG_PANIC_ON_OOPS is not set -CONFIG_PANIC_ON_OOPS_VALUE=0 -CONFIG_PANIC_TIMEOUT=0 -CONFIG_SCHED_DEBUG=y -CONFIG_SCHED_INFO=y -CONFIG_SCHEDSTATS=y -CONFIG_SCHED_STACK_END_CHECK=y -# CONFIG_DEBUG_TIMEKEEPING is not set - -# -# Lock Debugging (spinlocks, mutexes, etc...) -# -CONFIG_LOCK_DEBUGGING_SUPPORT=y -# CONFIG_PROVE_LOCKING is not set -# CONFIG_LOCK_STAT is not set -# CONFIG_DEBUG_RT_MUTEXES is not set -# CONFIG_DEBUG_SPINLOCK is not set -# CONFIG_DEBUG_MUTEXES is not set -# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set -# CONFIG_DEBUG_RWSEMS is not set -# CONFIG_DEBUG_LOCK_ALLOC is not set -# CONFIG_DEBUG_ATOMIC_SLEEP is not set -# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set -CONFIG_LOCK_TORTURE_TEST=m -CONFIG_WW_MUTEX_SELFTEST=m -CONFIG_STACKTRACE=y -# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set -# CONFIG_DEBUG_KOBJECT is not set -CONFIG_DEBUG_BUGVERBOSE=y -# CONFIG_DEBUG_LIST is not set -# CONFIG_DEBUG_PI_LIST is not set -# CONFIG_DEBUG_SG is not set -# CONFIG_DEBUG_NOTIFIERS is not set -# CONFIG_DEBUG_CREDENTIALS is not set - -# -# RCU Debugging -# -CONFIG_TORTURE_TEST=m -# CONFIG_RCU_PERF_TEST is not set -# CONFIG_RCU_TORTURE_TEST is not set -CONFIG_RCU_CPU_STALL_TIMEOUT=60 -# CONFIG_RCU_TRACE is not set -# CONFIG_RCU_EQS_DEBUG is not set -# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set -# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set -# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set -CONFIG_NOTIFIER_ERROR_INJECTION=m -CONFIG_PM_NOTIFIER_ERROR_INJECT=m -CONFIG_NETDEV_NOTIFIER_ERROR_INJECT=m -CONFIG_FUNCTION_ERROR_INJECTION=y -# CONFIG_FAULT_INJECTION is not set -# CONFIG_LATENCYTOP is not set -CONFIG_USER_STACKTRACE_SUPPORT=y -CONFIG_NOP_TRACER=y -CONFIG_HAVE_FUNCTION_TRACER=y -CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y -CONFIG_HAVE_DYNAMIC_FTRACE=y -CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y -CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y -CONFIG_HAVE_SYSCALL_TRACEPOINTS=y -CONFIG_HAVE_FENTRY=y -CONFIG_HAVE_C_RECORDMCOUNT=y -CONFIG_TRACER_MAX_TRACE=y -CONFIG_TRACE_CLOCK=y -CONFIG_RING_BUFFER=y -CONFIG_EVENT_TRACING=y -CONFIG_CONTEXT_SWITCH_TRACER=y -CONFIG_RING_BUFFER_ALLOW_SWAP=y -CONFIG_TRACING=y -CONFIG_GENERIC_TRACER=y -CONFIG_TRACING_SUPPORT=y -CONFIG_FTRACE=y -CONFIG_FUNCTION_TRACER=y -CONFIG_FUNCTION_GRAPH_TRACER=y -# CONFIG_PREEMPTIRQ_EVENTS is not set -# CONFIG_IRQSOFF_TRACER is not set -CONFIG_SCHED_TRACER=y -# CONFIG_HWLAT_TRACER is not set -CONFIG_FTRACE_SYSCALLS=y -CONFIG_TRACER_SNAPSHOT=y -# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set -CONFIG_BRANCH_PROFILE_NONE=y -# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set -CONFIG_STACK_TRACER=y -CONFIG_BLK_DEV_IO_TRACE=y -CONFIG_KPROBE_EVENTS=y -# CONFIG_UPROBE_EVENTS is not set -CONFIG_BPF_EVENTS=y -CONFIG_PROBE_EVENTS=y -CONFIG_DYNAMIC_FTRACE=y -CONFIG_DYNAMIC_FTRACE_WITH_REGS=y -CONFIG_FUNCTION_PROFILER=y -# CONFIG_BPF_KPROBE_OVERRIDE is not set -CONFIG_FTRACE_MCOUNT_RECORD=y -# CONFIG_FTRACE_STARTUP_TEST is not set -CONFIG_MMIOTRACE=y -# CONFIG_HIST_TRIGGERS is not set -# CONFIG_MMIOTRACE_TEST is not set -# CONFIG_TRACEPOINT_BENCHMARK is not set -# CONFIG_RING_BUFFER_BENCHMARK is not set -# CONFIG_RING_BUFFER_STARTUP_TEST is not set -# CONFIG_TRACE_EVAL_MAP_FILE is not set -CONFIG_TRACING_EVENTS_GPIO=y -# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set -# CONFIG_DMA_API_DEBUG is not set -CONFIG_RUNTIME_TESTING_MENU=y -# CONFIG_LKDTM is not set -# CONFIG_TEST_LIST_SORT is not set -# CONFIG_TEST_SORT is not set -# CONFIG_KPROBES_SANITY_TEST is not set -# CONFIG_BACKTRACE_SELF_TEST is not set -CONFIG_RBTREE_TEST=m -CONFIG_INTERVAL_TREE_TEST=m -CONFIG_PERCPU_TEST=m -# CONFIG_ATOMIC64_SELFTEST is not set -CONFIG_ASYNC_RAID6_TEST=m -CONFIG_TEST_HEXDUMP=m -CONFIG_TEST_STRING_HELPERS=m -CONFIG_TEST_KSTRTOX=m -CONFIG_TEST_PRINTF=m -CONFIG_TEST_BITMAP=m -CONFIG_TEST_UUID=m -CONFIG_TEST_OVERFLOW=m -# CONFIG_TEST_RHASHTABLE is not set -CONFIG_TEST_HASH=m -CONFIG_TEST_PARMAN=m -CONFIG_TEST_LKM=m -CONFIG_TEST_USER_COPY=m -CONFIG_TEST_BPF=m -CONFIG_FIND_BIT_BENCHMARK=m -CONFIG_TEST_FIRMWARE=m -# CONFIG_TEST_SYSCTL is not set -CONFIG_TEST_UDELAY=m -CONFIG_TEST_STATIC_KEYS=m -# CONFIG_TEST_KMOD is not set -CONFIG_MEMTEST=y -# CONFIG_BUG_ON_DATA_CORRUPTION is not set -# CONFIG_SAMPLES is not set -CONFIG_HAVE_ARCH_KGDB=y -CONFIG_KGDB=y -CONFIG_KGDB_SERIAL_CONSOLE=y -# CONFIG_KGDB_TESTS is not set -CONFIG_KGDB_LOW_LEVEL_TRAP=y -CONFIG_KGDB_KDB=y -CONFIG_KDB_DEFAULT_ENABLE=0x1 -CONFIG_KDB_KEYBOARD=y -CONFIG_KDB_CONTINUE_CATASTROPHIC=0 -CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y -# CONFIG_UBSAN is not set -CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y -CONFIG_STRICT_DEVMEM=y -CONFIG_IO_STRICT_DEVMEM=y -CONFIG_EARLY_PRINTK_USB=y -# CONFIG_X86_VERBOSE_BOOTUP is not set -CONFIG_EARLY_PRINTK=y -CONFIG_EARLY_PRINTK_DBGP=y -CONFIG_EARLY_PRINTK_EFI=y -# CONFIG_EARLY_PRINTK_USB_XDBC is not set -# CONFIG_X86_PTDUMP is not set -# CONFIG_EFI_PGT_DUMP is not set -# CONFIG_DEBUG_WX is not set -CONFIG_DOUBLEFAULT=y -# CONFIG_DEBUG_TLBFLUSH is not set -CONFIG_HAVE_MMIOTRACE_SUPPORT=y -# CONFIG_X86_DECODER_SELFTEST is not set -CONFIG_IO_DELAY_TYPE_0X80=0 -CONFIG_IO_DELAY_TYPE_0XED=1 -CONFIG_IO_DELAY_TYPE_UDELAY=2 -CONFIG_IO_DELAY_TYPE_NONE=3 -# CONFIG_IO_DELAY_0X80 is not set -CONFIG_IO_DELAY_0XED=y -# CONFIG_IO_DELAY_UDELAY is not set -# CONFIG_IO_DELAY_NONE is not set -CONFIG_DEFAULT_IO_DELAY_TYPE=1 -# CONFIG_DEBUG_BOOT_PARAMS is not set -# CONFIG_CPA_DEBUG is not set -CONFIG_OPTIMIZE_INLINING=y -# CONFIG_DEBUG_ENTRY is not set -# CONFIG_DEBUG_NMI_SELFTEST is not set -CONFIG_X86_DEBUG_FPU=y -CONFIG_PUNIT_ATOM_DEBUG=m -CONFIG_UNWINDER_FRAME_POINTER=y -# CONFIG_UNWINDER_GUESS is not set - -# -# Security options -# -CONFIG_KEYS=y -CONFIG_PERSISTENT_KEYRINGS=y -CONFIG_BIG_KEYS=y -CONFIG_TRUSTED_KEYS=y -CONFIG_ENCRYPTED_KEYS=y -CONFIG_KEY_DH_OPERATIONS=y -# CONFIG_SECURITY_DMESG_RESTRICT is not set -CONFIG_SECURITY=y -CONFIG_SECURITY_WRITABLE_HOOKS=y -CONFIG_SECURITYFS=y -CONFIG_SECURITY_NETWORK=y -# CONFIG_SECURITY_INFINIBAND is not set -CONFIG_SECURITY_NETWORK_XFRM=y -CONFIG_SECURITY_PATH=y -CONFIG_INTEL_TXT=y -CONFIG_LSM_MMAP_MIN_ADDR=0 -CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y -CONFIG_HARDENED_USERCOPY=y -CONFIG_HARDENED_USERCOPY_FALLBACK=y -# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set -CONFIG_FORTIFY_SOURCE=y -# CONFIG_STATIC_USERMODEHELPER is not set -CONFIG_SECURITY_SELINUX=y -CONFIG_SECURITY_SELINUX_BOOTPARAM=y -CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 -CONFIG_SECURITY_SELINUX_DISABLE=y -CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_AVC_STATS=y -CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 -CONFIG_SECURITY_SMACK=y -# CONFIG_SECURITY_SMACK_BRINGUP is not set -CONFIG_SECURITY_SMACK_NETFILTER=y -# CONFIG_SECURITY_SMACK_APPEND_SIGNALS is not set -CONFIG_SECURITY_TOMOYO=y -CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048 -CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024 -# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set -CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init" -CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init" -CONFIG_SECURITY_APPARMOR=y -CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1 -CONFIG_SECURITY_APPARMOR_HASH=y -CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y -# CONFIG_SECURITY_APPARMOR_DEBUG is not set -# CONFIG_SECURITY_LOADPIN is not set -CONFIG_SECURITY_YAMA=y -CONFIG_INTEGRITY=y -CONFIG_INTEGRITY_SIGNATURE=y -CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y -CONFIG_INTEGRITY_TRUSTED_KEYRING=y -CONFIG_INTEGRITY_AUDIT=y -CONFIG_IMA=y -CONFIG_IMA_MEASURE_PCR_IDX=10 -CONFIG_IMA_LSM_RULES=y -# CONFIG_IMA_TEMPLATE is not set -CONFIG_IMA_NG_TEMPLATE=y -# CONFIG_IMA_SIG_TEMPLATE is not set -CONFIG_IMA_DEFAULT_TEMPLATE="ima-ng" -CONFIG_IMA_DEFAULT_HASH_SHA1=y -# CONFIG_IMA_DEFAULT_HASH_SHA256 is not set -CONFIG_IMA_DEFAULT_HASH="sha1" -# CONFIG_IMA_WRITE_POLICY is not set -# CONFIG_IMA_READ_POLICY is not set -CONFIG_IMA_APPRAISE=y -CONFIG_IMA_APPRAISE_BOOTPARAM=y -CONFIG_IMA_TRUSTED_KEYRING=y -CONFIG_IMA_BLACKLIST_KEYRING=y -# CONFIG_IMA_LOAD_X509 is not set -CONFIG_EVM=y -CONFIG_EVM_ATTR_FSUUID=y -CONFIG_EVM_EXTRA_SMACK_XATTRS=y -# CONFIG_EVM_ADD_XATTRS is not set -# CONFIG_EVM_LOAD_X509 is not set -# CONFIG_DEFAULT_SECURITY_SELINUX is not set -# CONFIG_DEFAULT_SECURITY_SMACK is not set -# CONFIG_DEFAULT_SECURITY_TOMOYO is not set -CONFIG_DEFAULT_SECURITY_APPARMOR=y -# CONFIG_DEFAULT_SECURITY_DAC is not set -CONFIG_DEFAULT_SECURITY="apparmor" -CONFIG_XOR_BLOCKS=m -CONFIG_ASYNC_CORE=m -CONFIG_ASYNC_MEMCPY=m -CONFIG_ASYNC_XOR=m -CONFIG_ASYNC_PQ=m -CONFIG_ASYNC_RAID6_RECOV=m -CONFIG_CRYPTO=y - -# -# Crypto core or helper -# -CONFIG_CRYPTO_ALGAPI=y -CONFIG_CRYPTO_ALGAPI2=y -CONFIG_CRYPTO_AEAD=y -CONFIG_CRYPTO_AEAD2=y -CONFIG_CRYPTO_BLKCIPHER=y -CONFIG_CRYPTO_BLKCIPHER2=y -CONFIG_CRYPTO_HASH=y -CONFIG_CRYPTO_HASH2=y -CONFIG_CRYPTO_RNG=y -CONFIG_CRYPTO_RNG2=y -CONFIG_CRYPTO_RNG_DEFAULT=y -CONFIG_CRYPTO_AKCIPHER2=y -CONFIG_CRYPTO_AKCIPHER=y -CONFIG_CRYPTO_KPP2=y -CONFIG_CRYPTO_KPP=y -CONFIG_CRYPTO_ACOMP2=y -CONFIG_CRYPTO_RSA=y -CONFIG_CRYPTO_DH=y -CONFIG_CRYPTO_ECDH=m -CONFIG_CRYPTO_MANAGER=y -CONFIG_CRYPTO_MANAGER2=y -CONFIG_CRYPTO_USER=m -CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y -CONFIG_CRYPTO_GF128MUL=y -CONFIG_CRYPTO_NULL=y -CONFIG_CRYPTO_NULL2=y -CONFIG_CRYPTO_PCRYPT=m -CONFIG_CRYPTO_WORKQUEUE=y -CONFIG_CRYPTO_CRYPTD=m -CONFIG_CRYPTO_MCRYPTD=m -CONFIG_CRYPTO_AUTHENC=m -CONFIG_CRYPTO_TEST=m -CONFIG_CRYPTO_SIMD=m -CONFIG_CRYPTO_GLUE_HELPER_X86=m -CONFIG_CRYPTO_ENGINE=m - -# -# Authenticated Encryption with Associated Data -# -CONFIG_CRYPTO_CCM=m -CONFIG_CRYPTO_GCM=y -CONFIG_CRYPTO_CHACHA20POLY1305=m -CONFIG_CRYPTO_AEGIS128=m -CONFIG_CRYPTO_AEGIS128L=m -CONFIG_CRYPTO_AEGIS256=m -CONFIG_CRYPTO_MORUS640=m -CONFIG_CRYPTO_MORUS1280=m -CONFIG_CRYPTO_SEQIV=y -CONFIG_CRYPTO_ECHAINIV=m - -# -# Block modes -# -CONFIG_CRYPTO_CBC=y -CONFIG_CRYPTO_CFB=m -CONFIG_CRYPTO_CTR=y -CONFIG_CRYPTO_CTS=m -CONFIG_CRYPTO_ECB=y -CONFIG_CRYPTO_LRW=m -CONFIG_CRYPTO_PCBC=m -CONFIG_CRYPTO_XTS=m -CONFIG_CRYPTO_KEYWRAP=m - -# -# Hash modes -# -CONFIG_CRYPTO_CMAC=m -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_XCBC=m -CONFIG_CRYPTO_VMAC=m - -# -# Digest -# -CONFIG_CRYPTO_CRC32C=y -CONFIG_CRYPTO_CRC32C_INTEL=y -CONFIG_CRYPTO_CRC32=m -CONFIG_CRYPTO_CRC32_PCLMUL=m -CONFIG_CRYPTO_CRCT10DIF=y -CONFIG_CRYPTO_GHASH=y -CONFIG_CRYPTO_POLY1305=m -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=y -CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_RMD128=m -CONFIG_CRYPTO_RMD160=m -CONFIG_CRYPTO_RMD256=m -CONFIG_CRYPTO_RMD320=m -CONFIG_CRYPTO_SHA1=y -CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_SHA3=m -CONFIG_CRYPTO_SM3=m -CONFIG_CRYPTO_TGR192=m -CONFIG_CRYPTO_WP512=m - -# -# Ciphers -# -CONFIG_CRYPTO_AES=y -CONFIG_CRYPTO_AES_TI=m -CONFIG_CRYPTO_AES_586=m -CONFIG_CRYPTO_AES_NI_INTEL=m -CONFIG_CRYPTO_ANUBIS=m -CONFIG_CRYPTO_ARC4=m -CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_BLOWFISH_COMMON=m -CONFIG_CRYPTO_CAMELLIA=m -CONFIG_CRYPTO_CAST_COMMON=m -CONFIG_CRYPTO_CAST5=m -CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_DES=m -CONFIG_CRYPTO_FCRYPT=m -CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_SALSA20=m -CONFIG_CRYPTO_CHACHA20=m -CONFIG_CRYPTO_SEED=m -CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_SERPENT_SSE2_586=m -CONFIG_CRYPTO_SM4=m -CONFIG_CRYPTO_SPECK=m -CONFIG_CRYPTO_TEA=m -CONFIG_CRYPTO_TWOFISH=m -CONFIG_CRYPTO_TWOFISH_COMMON=m -CONFIG_CRYPTO_TWOFISH_586=m - -# -# Compression -# -CONFIG_CRYPTO_DEFLATE=m -CONFIG_CRYPTO_LZO=y -CONFIG_CRYPTO_842=m -CONFIG_CRYPTO_LZ4=m -CONFIG_CRYPTO_LZ4HC=m -CONFIG_CRYPTO_ZSTD=m - -# -# Random Number Generation -# -CONFIG_CRYPTO_ANSI_CPRNG=m -CONFIG_CRYPTO_DRBG_MENU=y -CONFIG_CRYPTO_DRBG_HMAC=y -CONFIG_CRYPTO_DRBG_HASH=y -CONFIG_CRYPTO_DRBG_CTR=y -CONFIG_CRYPTO_DRBG=y -CONFIG_CRYPTO_JITTERENTROPY=y -CONFIG_CRYPTO_USER_API=m -CONFIG_CRYPTO_USER_API_HASH=m -CONFIG_CRYPTO_USER_API_SKCIPHER=m -CONFIG_CRYPTO_USER_API_RNG=m -CONFIG_CRYPTO_USER_API_AEAD=m -CONFIG_CRYPTO_HASH_INFO=y -CONFIG_CRYPTO_HW=y -CONFIG_CRYPTO_DEV_PADLOCK=y -CONFIG_CRYPTO_DEV_PADLOCK_AES=m -CONFIG_CRYPTO_DEV_PADLOCK_SHA=m -CONFIG_CRYPTO_DEV_GEODE=m -CONFIG_CRYPTO_DEV_CCP=y -CONFIG_CRYPTO_DEV_CCP_DD=m -CONFIG_CRYPTO_DEV_SP_CCP=y -CONFIG_CRYPTO_DEV_CCP_CRYPTO=m -CONFIG_CRYPTO_DEV_QAT=m -CONFIG_CRYPTO_DEV_QAT_DH895xCC=m -CONFIG_CRYPTO_DEV_QAT_C3XXX=m -CONFIG_CRYPTO_DEV_QAT_C62X=m -CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m -CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m -CONFIG_CRYPTO_DEV_QAT_C62XVF=m -CONFIG_CRYPTO_DEV_CHELSIO=m -# CONFIG_CHELSIO_IPSEC_INLINE is not set -# CONFIG_CRYPTO_DEV_CHELSIO_TLS is not set -CONFIG_CRYPTO_DEV_VIRTIO=m -CONFIG_ASYMMETRIC_KEY_TYPE=y -CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y -CONFIG_X509_CERTIFICATE_PARSER=y -CONFIG_PKCS7_MESSAGE_PARSER=y -# CONFIG_PKCS7_TEST_KEY is not set -# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set - -# -# Certificates for signature checking -# -CONFIG_SYSTEM_TRUSTED_KEYRING=y -CONFIG_SYSTEM_TRUSTED_KEYS="" -# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set -# CONFIG_SECONDARY_TRUSTED_KEYRING is not set -# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set -CONFIG_HAVE_KVM=y -CONFIG_HAVE_KVM_IRQCHIP=y -CONFIG_HAVE_KVM_IRQFD=y -CONFIG_HAVE_KVM_IRQ_ROUTING=y -CONFIG_HAVE_KVM_EVENTFD=y -CONFIG_KVM_MMIO=y -CONFIG_KVM_ASYNC_PF=y -CONFIG_HAVE_KVM_MSI=y -CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y -CONFIG_KVM_VFIO=y -CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y -CONFIG_HAVE_KVM_IRQ_BYPASS=y -CONFIG_VIRTUALIZATION=y -CONFIG_KVM=m -CONFIG_KVM_INTEL=m -CONFIG_KVM_AMD=m -# CONFIG_KVM_MMU_AUDIT is not set -CONFIG_VHOST_NET=m -CONFIG_VHOST_SCSI=m -CONFIG_VHOST_VSOCK=m -CONFIG_VHOST=m -# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set -CONFIG_BINARY_PRINTF=y - -# -# Library routines -# -CONFIG_RAID6_PQ=m -CONFIG_BITREVERSE=y -CONFIG_RATIONAL=y -CONFIG_GENERIC_STRNCPY_FROM_USER=y -CONFIG_GENERIC_STRNLEN_USER=y -CONFIG_GENERIC_NET_UTILS=y -CONFIG_GENERIC_FIND_FIRST_BIT=y -CONFIG_GENERIC_PCI_IOMAP=y -CONFIG_GENERIC_IOMAP=y -CONFIG_ARCH_HAS_FAST_MULTIPLIER=y -CONFIG_CRC_CCITT=y -CONFIG_CRC16=y -CONFIG_CRC_T10DIF=y -CONFIG_CRC_ITU_T=m -CONFIG_CRC32=y -# CONFIG_CRC32_SELFTEST is not set -CONFIG_CRC32_SLICEBY8=y -# CONFIG_CRC32_SLICEBY4 is not set -# CONFIG_CRC32_SARWATE is not set -# CONFIG_CRC32_BIT is not set -# CONFIG_CRC4 is not set -CONFIG_CRC7=m -CONFIG_LIBCRC32C=m -CONFIG_CRC8=m -CONFIG_XXHASH=m -CONFIG_AUDIT_GENERIC=y -# CONFIG_RANDOM32_SELFTEST is not set -CONFIG_842_COMPRESS=m -CONFIG_842_DECOMPRESS=m -CONFIG_ZLIB_INFLATE=y -CONFIG_ZLIB_DEFLATE=y -CONFIG_LZO_COMPRESS=y -CONFIG_LZO_DECOMPRESS=y -CONFIG_LZ4_COMPRESS=m -CONFIG_LZ4HC_COMPRESS=m -CONFIG_LZ4_DECOMPRESS=y -CONFIG_ZSTD_COMPRESS=m -CONFIG_ZSTD_DECOMPRESS=m -CONFIG_XZ_DEC=y -CONFIG_XZ_DEC_X86=y -CONFIG_XZ_DEC_POWERPC=y -CONFIG_XZ_DEC_IA64=y -CONFIG_XZ_DEC_ARM=y -CONFIG_XZ_DEC_ARMTHUMB=y -CONFIG_XZ_DEC_SPARC=y -CONFIG_XZ_DEC_BCJ=y -CONFIG_XZ_DEC_TEST=m -CONFIG_DECOMPRESS_GZIP=y -CONFIG_DECOMPRESS_BZIP2=y -CONFIG_DECOMPRESS_LZMA=y -CONFIG_DECOMPRESS_XZ=y -CONFIG_DECOMPRESS_LZO=y -CONFIG_DECOMPRESS_LZ4=y -CONFIG_GENERIC_ALLOCATOR=y -CONFIG_REED_SOLOMON=m -CONFIG_REED_SOLOMON_ENC8=y -CONFIG_REED_SOLOMON_DEC8=y -CONFIG_REED_SOLOMON_DEC16=y -CONFIG_BCH=m -CONFIG_BCH_CONST_PARAMS=y -CONFIG_TEXTSEARCH=y -CONFIG_TEXTSEARCH_KMP=m -CONFIG_TEXTSEARCH_BM=m -CONFIG_TEXTSEARCH_FSM=m -CONFIG_BTREE=y -CONFIG_INTERVAL_TREE=y -CONFIG_RADIX_TREE_MULTIORDER=y -CONFIG_ASSOCIATIVE_ARRAY=y -CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT_MAP=y -CONFIG_HAS_DMA=y -CONFIG_NEED_SG_DMA_LENGTH=y -CONFIG_NEED_DMA_MAP_STATE=y -CONFIG_ARCH_DMA_ADDR_T_64BIT=y -CONFIG_HAVE_GENERIC_DMA_COHERENT=y -CONFIG_DMA_DIRECT_OPS=y -CONFIG_DMA_VIRT_OPS=y -CONFIG_SWIOTLB=y -CONFIG_SGL_ALLOC=y -CONFIG_CHECK_SIGNATURE=y -CONFIG_CPU_RMAP=y -CONFIG_DQL=y -CONFIG_GLOB=y -# CONFIG_GLOB_SELFTEST is not set -CONFIG_NLATTR=y -CONFIG_LRU_CACHE=m -CONFIG_CLZ_TAB=y -CONFIG_CORDIC=m -CONFIG_DDR=y -CONFIG_IRQ_POLL=y -CONFIG_MPILIB=y -CONFIG_SIGNATURE=y -CONFIG_OID_REGISTRY=y -CONFIG_UCS2_STRING=y -CONFIG_FONT_SUPPORT=y -# CONFIG_FONTS is not set -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y -CONFIG_SG_POOL=y -CONFIG_ARCH_HAS_SG_CHAIN=y -CONFIG_SBITMAP=y -CONFIG_PARMAN=m -# CONFIG_STRING_SELFTEST is not set diff --git a/gnu/packages/aux-files/linux-libre/4.18-x86_64.conf b/gnu/packages/aux-files/linux-libre/4.18-x86_64.conf deleted file mode 100644 index 2a66c483d6..0000000000 --- a/gnu/packages/aux-files/linux-libre/4.18-x86_64.conf +++ /dev/null @@ -1,9485 +0,0 @@ -# -# Automatically generated file; DO NOT EDIT. -# Linux/x86 4.18.9-gnu Kernel Configuration -# - -# -# Compiler: gcc (GCC) 7.3.0 -# -CONFIG_64BIT=y -CONFIG_X86_64=y -CONFIG_X86=y -CONFIG_INSTRUCTION_DECODER=y -CONFIG_OUTPUT_FORMAT="elf64-x86-64" -CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig" -CONFIG_LOCKDEP_SUPPORT=y -CONFIG_STACKTRACE_SUPPORT=y -CONFIG_MMU=y -CONFIG_ARCH_MMAP_RND_BITS_MIN=28 -CONFIG_ARCH_MMAP_RND_BITS_MAX=32 -CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8 -CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16 -CONFIG_GENERIC_ISA_DMA=y -CONFIG_GENERIC_BUG=y -CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y -CONFIG_GENERIC_HWEIGHT=y -CONFIG_ARCH_MAY_HAVE_PC_FDC=y -CONFIG_RWSEM_XCHGADD_ALGORITHM=y -CONFIG_GENERIC_CALIBRATE_DELAY=y -CONFIG_ARCH_HAS_CPU_RELAX=y -CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y -CONFIG_ARCH_HAS_FILTER_PGPROT=y -CONFIG_HAVE_SETUP_PER_CPU_AREA=y -CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y -CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y -CONFIG_ARCH_HIBERNATION_POSSIBLE=y -CONFIG_ARCH_SUSPEND_POSSIBLE=y -CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y -CONFIG_ARCH_WANT_GENERAL_HUGETLB=y -CONFIG_ZONE_DMA32=y -CONFIG_AUDIT_ARCH=y -CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y -CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y -CONFIG_HAVE_INTEL_TXT=y -CONFIG_X86_64_SMP=y -CONFIG_ARCH_SUPPORTS_UPROBES=y -CONFIG_FIX_EARLYCON_MEM=y -CONFIG_PGTABLE_LEVELS=4 -CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=70300 -CONFIG_CLANG_VERSION=0 -CONFIG_IRQ_WORK=y -CONFIG_BUILDTIME_EXTABLE_SORT=y -CONFIG_THREAD_INFO_IN_TASK=y - -# -# General setup -# -CONFIG_INIT_ENV_ARG_LIMIT=32 -# CONFIG_COMPILE_TEST is not set -CONFIG_LOCALVERSION="" -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_HAVE_KERNEL_GZIP=y -CONFIG_HAVE_KERNEL_BZIP2=y -CONFIG_HAVE_KERNEL_LZMA=y -CONFIG_HAVE_KERNEL_XZ=y -CONFIG_HAVE_KERNEL_LZO=y -CONFIG_HAVE_KERNEL_LZ4=y -CONFIG_KERNEL_GZIP=y -# CONFIG_KERNEL_BZIP2 is not set -# CONFIG_KERNEL_LZMA is not set -# CONFIG_KERNEL_XZ is not set -# CONFIG_KERNEL_LZO is not set -# CONFIG_KERNEL_LZ4 is not set -CONFIG_DEFAULT_HOSTNAME="(none)" -CONFIG_SWAP=y -CONFIG_SYSVIPC=y -CONFIG_SYSVIPC_SYSCTL=y -CONFIG_POSIX_MQUEUE=y -CONFIG_POSIX_MQUEUE_SYSCTL=y -CONFIG_CROSS_MEMORY_ATTACH=y -CONFIG_USELIB=y -CONFIG_AUDIT=y -CONFIG_HAVE_ARCH_AUDITSYSCALL=y -CONFIG_AUDITSYSCALL=y -CONFIG_AUDIT_WATCH=y -CONFIG_AUDIT_TREE=y - -# -# IRQ subsystem -# -CONFIG_GENERIC_IRQ_PROBE=y -CONFIG_GENERIC_IRQ_SHOW=y -CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y -CONFIG_GENERIC_PENDING_IRQ=y -CONFIG_GENERIC_IRQ_MIGRATION=y -CONFIG_GENERIC_IRQ_CHIP=y -CONFIG_IRQ_DOMAIN=y -CONFIG_IRQ_DOMAIN_HIERARCHY=y -CONFIG_GENERIC_MSI_IRQ=y -CONFIG_GENERIC_MSI_IRQ_DOMAIN=y -CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y -CONFIG_GENERIC_IRQ_RESERVATION_MODE=y -CONFIG_IRQ_FORCED_THREADING=y -CONFIG_SPARSE_IRQ=y -# CONFIG_GENERIC_IRQ_DEBUGFS is not set -CONFIG_CLOCKSOURCE_WATCHDOG=y -CONFIG_ARCH_CLOCKSOURCE_DATA=y -CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y -CONFIG_GENERIC_TIME_VSYSCALL=y -CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y -CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y -CONFIG_GENERIC_CMOS_UPDATE=y - -# -# Timers subsystem -# -CONFIG_TICK_ONESHOT=y -CONFIG_NO_HZ_COMMON=y -# CONFIG_HZ_PERIODIC is not set -CONFIG_NO_HZ_IDLE=y -# CONFIG_NO_HZ_FULL is not set -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y - -# -# CPU/Task time and stats accounting -# -CONFIG_TICK_CPU_ACCOUNTING=y -# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set -# CONFIG_IRQ_TIME_ACCOUNTING is not set -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_BSD_PROCESS_ACCT_V3=y -CONFIG_TASKSTATS=y -CONFIG_TASK_DELAY_ACCT=y -CONFIG_TASK_XACCT=y -CONFIG_TASK_IO_ACCOUNTING=y -CONFIG_CPU_ISOLATION=y - -# -# RCU Subsystem -# -CONFIG_TREE_RCU=y -# CONFIG_RCU_EXPERT is not set -CONFIG_SRCU=y -CONFIG_TREE_SRCU=y -CONFIG_RCU_STALL_COMMON=y -CONFIG_RCU_NEED_SEGCBLIST=y -CONFIG_BUILD_BIN2C=y -# CONFIG_IKCONFIG is not set -CONFIG_LOG_BUF_SHIFT=18 -CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 -CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13 -CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y -CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y -CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y -CONFIG_ARCH_SUPPORTS_INT128=y -CONFIG_NUMA_BALANCING=y -CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y -CONFIG_CGROUPS=y -CONFIG_PAGE_COUNTER=y -CONFIG_MEMCG=y -CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_SWAP_ENABLED is not set -CONFIG_BLK_CGROUP=y -# CONFIG_DEBUG_BLK_CGROUP is not set -CONFIG_CGROUP_WRITEBACK=y -CONFIG_CGROUP_SCHED=y -CONFIG_FAIR_GROUP_SCHED=y -CONFIG_CFS_BANDWIDTH=y -# CONFIG_RT_GROUP_SCHED is not set -CONFIG_CGROUP_PIDS=y -# CONFIG_CGROUP_RDMA is not set -CONFIG_CGROUP_FREEZER=y -CONFIG_CGROUP_HUGETLB=y -CONFIG_CPUSETS=y -CONFIG_PROC_PID_CPUSET=y -CONFIG_CGROUP_DEVICE=y -CONFIG_CGROUP_CPUACCT=y -CONFIG_CGROUP_PERF=y -CONFIG_CGROUP_BPF=y -# CONFIG_CGROUP_DEBUG is not set -CONFIG_SOCK_CGROUP_DATA=y -CONFIG_NAMESPACES=y -CONFIG_UTS_NS=y -CONFIG_IPC_NS=y -CONFIG_USER_NS=y -CONFIG_PID_NS=y -CONFIG_NET_NS=y -CONFIG_SCHED_AUTOGROUP=y -# CONFIG_SYSFS_DEPRECATED is not set -CONFIG_RELAY=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="" -CONFIG_RD_GZIP=y -CONFIG_RD_BZIP2=y -CONFIG_RD_LZMA=y -CONFIG_RD_XZ=y -CONFIG_RD_LZO=y -CONFIG_RD_LZ4=y -CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_SYSCTL=y -CONFIG_ANON_INODES=y -CONFIG_HAVE_UID16=y -CONFIG_SYSCTL_EXCEPTION_TRACE=y -CONFIG_HAVE_PCSPKR_PLATFORM=y -CONFIG_BPF=y -CONFIG_EXPERT=y -CONFIG_UID16=y -CONFIG_MULTIUSER=y -CONFIG_SGETMASK_SYSCALL=y -CONFIG_SYSFS_SYSCALL=y -CONFIG_SYSCTL_SYSCALL=y -CONFIG_FHANDLE=y -CONFIG_POSIX_TIMERS=y -CONFIG_PRINTK=y -CONFIG_PRINTK_NMI=y -CONFIG_BUG=y -CONFIG_ELF_CORE=y -CONFIG_PCSPKR_PLATFORM=y -CONFIG_BASE_FULL=y -CONFIG_FUTEX=y -CONFIG_FUTEX_PI=y -CONFIG_EPOLL=y -CONFIG_SIGNALFD=y -CONFIG_TIMERFD=y -CONFIG_EVENTFD=y -CONFIG_SHMEM=y -CONFIG_AIO=y -CONFIG_ADVISE_SYSCALLS=y -CONFIG_MEMBARRIER=y -CONFIG_CHECKPOINT_RESTORE=y -CONFIG_KALLSYMS=y -CONFIG_KALLSYMS_ALL=y -CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y -CONFIG_KALLSYMS_BASE_RELATIVE=y -CONFIG_BPF_SYSCALL=y -CONFIG_USERFAULTFD=y -CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y -CONFIG_RSEQ=y -# CONFIG_DEBUG_RSEQ is not set -# CONFIG_EMBEDDED is not set -CONFIG_HAVE_PERF_EVENTS=y -# CONFIG_PC104 is not set - -# -# Kernel Performance Events And Counters -# -CONFIG_PERF_EVENTS=y -# CONFIG_DEBUG_PERF_USE_VMALLOC is not set -CONFIG_VM_EVENT_COUNTERS=y -CONFIG_SLUB_DEBUG=y -# CONFIG_SLUB_MEMCG_SYSFS_ON is not set -# CONFIG_COMPAT_BRK is not set -# CONFIG_SLAB is not set -CONFIG_SLUB=y -# CONFIG_SLOB is not set -CONFIG_SLAB_MERGE_DEFAULT=y -CONFIG_SLAB_FREELIST_RANDOM=y -CONFIG_SLAB_FREELIST_HARDENED=y -CONFIG_SLUB_CPU_PARTIAL=y -CONFIG_SYSTEM_DATA_VERIFICATION=y -CONFIG_PROFILING=y -CONFIG_TRACEPOINTS=y -CONFIG_CRASH_CORE=y -CONFIG_KEXEC_CORE=y -CONFIG_HOTPLUG_SMT=y -CONFIG_OPROFILE=m -# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set -CONFIG_HAVE_OPROFILE=y -CONFIG_OPROFILE_NMI_TIMER=y -CONFIG_KPROBES=y -CONFIG_JUMP_LABEL=y -# CONFIG_STATIC_KEYS_SELFTEST is not set -CONFIG_OPTPROBES=y -CONFIG_KPROBES_ON_FTRACE=y -CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y -CONFIG_ARCH_USE_BUILTIN_BSWAP=y -CONFIG_KRETPROBES=y -CONFIG_USER_RETURN_NOTIFIER=y -CONFIG_HAVE_IOREMAP_PROT=y -CONFIG_HAVE_KPROBES=y -CONFIG_HAVE_KRETPROBES=y -CONFIG_HAVE_OPTPROBES=y -CONFIG_HAVE_KPROBES_ON_FTRACE=y -CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y -CONFIG_HAVE_NMI=y -CONFIG_HAVE_ARCH_TRACEHOOK=y -CONFIG_HAVE_DMA_CONTIGUOUS=y -CONFIG_GENERIC_SMP_IDLE_THREAD=y -CONFIG_ARCH_HAS_FORTIFY_SOURCE=y -CONFIG_ARCH_HAS_SET_MEMORY=y -CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y -CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y -CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y -CONFIG_HAVE_RSEQ=y -CONFIG_HAVE_CLK=y -CONFIG_HAVE_HW_BREAKPOINT=y -CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y -CONFIG_HAVE_USER_RETURN_NOTIFIER=y -CONFIG_HAVE_PERF_EVENTS_NMI=y -CONFIG_HAVE_HARDLOCKUP_DETECTOR_PERF=y -CONFIG_HAVE_PERF_REGS=y -CONFIG_HAVE_PERF_USER_STACK_DUMP=y -CONFIG_HAVE_ARCH_JUMP_LABEL=y -CONFIG_HAVE_RCU_TABLE_FREE=y -CONFIG_HAVE_RCU_TABLE_INVALIDATE=y -CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y -CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y -CONFIG_HAVE_CMPXCHG_LOCAL=y -CONFIG_HAVE_CMPXCHG_DOUBLE=y -CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y -CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y -CONFIG_HAVE_ARCH_SECCOMP_FILTER=y -CONFIG_SECCOMP_FILTER=y -CONFIG_PLUGIN_HOSTCC="" -CONFIG_HAVE_GCC_PLUGINS=y -CONFIG_HAVE_STACKPROTECTOR=y -CONFIG_CC_HAS_STACKPROTECTOR_NONE=y -CONFIG_STACKPROTECTOR=y -CONFIG_STACKPROTECTOR_STRONG=y -CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y -CONFIG_HAVE_CONTEXT_TRACKING=y -CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y -CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y -CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y -CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD=y -CONFIG_HAVE_ARCH_HUGE_VMAP=y -CONFIG_HAVE_ARCH_SOFT_DIRTY=y -CONFIG_HAVE_MOD_ARCH_SPECIFIC=y -CONFIG_MODULES_USE_ELF_RELA=y -CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y -CONFIG_ARCH_HAS_ELF_RANDOMIZE=y -CONFIG_HAVE_ARCH_MMAP_RND_BITS=y -CONFIG_HAVE_EXIT_THREAD=y -CONFIG_ARCH_MMAP_RND_BITS=28 -CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y -CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8 -CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES=y -CONFIG_HAVE_COPY_THREAD_TLS=y -CONFIG_HAVE_STACK_VALIDATION=y -CONFIG_HAVE_RELIABLE_STACKTRACE=y -CONFIG_ISA_BUS_API=y -CONFIG_OLD_SIGSUSPEND3=y -CONFIG_COMPAT_OLD_SIGACTION=y -CONFIG_COMPAT_32BIT_TIME=y -CONFIG_HAVE_ARCH_VMAP_STACK=y -CONFIG_VMAP_STACK=y -CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y -CONFIG_STRICT_KERNEL_RWX=y -CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y -CONFIG_STRICT_MODULE_RWX=y -CONFIG_ARCH_HAS_REFCOUNT=y -CONFIG_REFCOUNT_FULL=y - -# -# GCOV-based kernel profiling -# -# CONFIG_GCOV_KERNEL is not set -CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y -CONFIG_RT_MUTEXES=y -CONFIG_BASE_SMALL=0 -CONFIG_MODULES=y -# CONFIG_MODULE_FORCE_LOAD is not set -CONFIG_MODULE_UNLOAD=y -# CONFIG_MODULE_FORCE_UNLOAD is not set -CONFIG_MODVERSIONS=y -CONFIG_MODULE_SRCVERSION_ALL=y -# CONFIG_MODULE_SIG is not set -# CONFIG_MODULE_COMPRESS is not set -CONFIG_MODULES_TREE_LOOKUP=y -CONFIG_BLOCK=y -CONFIG_BLK_SCSI_REQUEST=y -CONFIG_BLK_DEV_BSG=y -CONFIG_BLK_DEV_BSGLIB=y -CONFIG_BLK_DEV_INTEGRITY=y -CONFIG_BLK_DEV_ZONED=y -CONFIG_BLK_DEV_THROTTLING=y -# CONFIG_BLK_DEV_THROTTLING_LOW is not set -CONFIG_BLK_CMDLINE_PARSER=y -CONFIG_BLK_WBT=y -# CONFIG_BLK_WBT_SQ is not set -CONFIG_BLK_WBT_MQ=y -CONFIG_BLK_DEBUG_FS=y -# CONFIG_BLK_SED_OPAL is not set - -# -# Partition Types -# -CONFIG_PARTITION_ADVANCED=y -# CONFIG_ACORN_PARTITION is not set -CONFIG_AIX_PARTITION=y -CONFIG_OSF_PARTITION=y -CONFIG_AMIGA_PARTITION=y -CONFIG_ATARI_PARTITION=y -CONFIG_MAC_PARTITION=y -CONFIG_MSDOS_PARTITION=y -CONFIG_BSD_DISKLABEL=y -CONFIG_MINIX_SUBPARTITION=y -CONFIG_SOLARIS_X86_PARTITION=y -CONFIG_UNIXWARE_DISKLABEL=y -CONFIG_LDM_PARTITION=y -# CONFIG_LDM_DEBUG is not set -CONFIG_SGI_PARTITION=y -CONFIG_ULTRIX_PARTITION=y -CONFIG_SUN_PARTITION=y -CONFIG_KARMA_PARTITION=y -CONFIG_EFI_PARTITION=y -CONFIG_SYSV68_PARTITION=y -CONFIG_CMDLINE_PARTITION=y -CONFIG_BLOCK_COMPAT=y -CONFIG_BLK_MQ_PCI=y -CONFIG_BLK_MQ_VIRTIO=y -CONFIG_BLK_MQ_RDMA=y - -# -# IO Schedulers -# -CONFIG_IOSCHED_NOOP=y -CONFIG_IOSCHED_DEADLINE=y -CONFIG_IOSCHED_CFQ=y -CONFIG_CFQ_GROUP_IOSCHED=y -CONFIG_DEFAULT_DEADLINE=y -# CONFIG_DEFAULT_CFQ is not set -# CONFIG_DEFAULT_NOOP is not set -CONFIG_DEFAULT_IOSCHED="deadline" -CONFIG_MQ_IOSCHED_DEADLINE=m -CONFIG_MQ_IOSCHED_KYBER=m -CONFIG_IOSCHED_BFQ=m -# CONFIG_BFQ_GROUP_IOSCHED is not set -CONFIG_PREEMPT_NOTIFIERS=y -CONFIG_PADATA=y -CONFIG_ASN1=y -CONFIG_INLINE_SPIN_UNLOCK_IRQ=y -CONFIG_INLINE_READ_UNLOCK=y -CONFIG_INLINE_READ_UNLOCK_IRQ=y -CONFIG_INLINE_WRITE_UNLOCK=y -CONFIG_INLINE_WRITE_UNLOCK_IRQ=y -CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y -CONFIG_MUTEX_SPIN_ON_OWNER=y -CONFIG_RWSEM_SPIN_ON_OWNER=y -CONFIG_LOCK_SPIN_ON_OWNER=y -CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y -CONFIG_QUEUED_SPINLOCKS=y -CONFIG_ARCH_USE_QUEUED_RWLOCKS=y -CONFIG_QUEUED_RWLOCKS=y -CONFIG_ARCH_HAS_SYNC_CORE_BEFORE_USERMODE=y -CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y -CONFIG_CC_HAS_SANE_STACKPROTECTOR=y -CONFIG_FREEZER=y - -# -# Processor type and features -# -# CONFIG_ZONE_DMA is not set -CONFIG_SMP=y -CONFIG_X86_FEATURE_NAMES=y -CONFIG_X86_X2APIC=y -CONFIG_X86_MPPARSE=y -# CONFIG_GOLDFISH is not set -CONFIG_RETPOLINE=y -# CONFIG_INTEL_RDT is not set -CONFIG_X86_EXTENDED_PLATFORM=y -CONFIG_X86_NUMACHIP=y -# CONFIG_X86_VSMP is not set -# CONFIG_X86_UV is not set -# CONFIG_X86_GOLDFISH is not set -# CONFIG_X86_INTEL_MID is not set -CONFIG_X86_INTEL_LPSS=y -CONFIG_X86_AMD_PLATFORM_DEVICE=y -CONFIG_IOSF_MBI=y -CONFIG_IOSF_MBI_DEBUG=y -CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y -CONFIG_SCHED_OMIT_FRAME_POINTER=y -CONFIG_HYPERVISOR_GUEST=y -CONFIG_PARAVIRT=y -# CONFIG_PARAVIRT_DEBUG is not set -CONFIG_PARAVIRT_SPINLOCKS=y -# CONFIG_QUEUED_LOCK_STAT is not set -CONFIG_XEN=y -CONFIG_XEN_PV=y -CONFIG_XEN_PV_SMP=y -CONFIG_XEN_DOM0=y -CONFIG_XEN_PVHVM=y -CONFIG_XEN_PVHVM_SMP=y -CONFIG_XEN_512GB=y -CONFIG_XEN_SAVE_RESTORE=y -# CONFIG_XEN_DEBUG_FS is not set -CONFIG_XEN_PVH=y -CONFIG_KVM_GUEST=y -CONFIG_KVM_DEBUG_FS=y -# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set -CONFIG_PARAVIRT_CLOCK=y -CONFIG_JAILHOUSE_GUEST=y -CONFIG_NO_BOOTMEM=y -# CONFIG_MK8 is not set -# CONFIG_MPSC is not set -# CONFIG_MCORE2 is not set -# CONFIG_MATOM is not set -CONFIG_GENERIC_CPU=y -CONFIG_X86_INTERNODE_CACHE_SHIFT=6 -CONFIG_X86_L1_CACHE_SHIFT=6 -CONFIG_X86_TSC=y -CONFIG_X86_CMPXCHG64=y -CONFIG_X86_CMOV=y -CONFIG_X86_MINIMUM_CPU_FAMILY=64 -CONFIG_X86_DEBUGCTLMSR=y -CONFIG_PROCESSOR_SELECT=y -CONFIG_CPU_SUP_INTEL=y -CONFIG_CPU_SUP_AMD=y -CONFIG_CPU_SUP_CENTAUR=y -CONFIG_HPET_TIMER=y -CONFIG_HPET_EMULATE_RTC=y -CONFIG_DMI=y -CONFIG_GART_IOMMU=y -CONFIG_CALGARY_IOMMU=y -CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y -# CONFIG_MAXSMP is not set -CONFIG_NR_CPUS_RANGE_BEGIN=2 -CONFIG_NR_CPUS_RANGE_END=512 -CONFIG_NR_CPUS_DEFAULT=64 -CONFIG_NR_CPUS=256 -CONFIG_SCHED_SMT=y -CONFIG_SCHED_MC=y -CONFIG_SCHED_MC_PRIO=y -# CONFIG_PREEMPT_NONE is not set -CONFIG_PREEMPT_VOLUNTARY=y -# CONFIG_PREEMPT is not set -CONFIG_X86_LOCAL_APIC=y -CONFIG_X86_IO_APIC=y -CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y -CONFIG_X86_MCE=y -# CONFIG_X86_MCELOG_LEGACY is not set -CONFIG_X86_MCE_INTEL=y -CONFIG_X86_MCE_AMD=y -CONFIG_X86_MCE_THRESHOLD=y -# CONFIG_X86_MCE_INJECT is not set -CONFIG_X86_THERMAL_VECTOR=y - -# -# Performance monitoring -# -CONFIG_PERF_EVENTS_INTEL_UNCORE=y -CONFIG_PERF_EVENTS_INTEL_RAPL=y -CONFIG_PERF_EVENTS_INTEL_CSTATE=y -CONFIG_PERF_EVENTS_AMD_POWER=m -CONFIG_X86_16BIT=y -CONFIG_X86_ESPFIX64=y -CONFIG_X86_VSYSCALL_EMULATION=y -CONFIG_I8K=m -CONFIG_MICROCODE=y -CONFIG_MICROCODE_INTEL=y -CONFIG_MICROCODE_AMD=y -CONFIG_MICROCODE_OLD_INTERFACE=y -CONFIG_X86_MSR=m -CONFIG_X86_CPUID=m -# CONFIG_X86_5LEVEL is not set -CONFIG_X86_DIRECT_GBPAGES=y -CONFIG_ARCH_HAS_MEM_ENCRYPT=y -# CONFIG_AMD_MEM_ENCRYPT is not set -CONFIG_NUMA=y -CONFIG_AMD_NUMA=y -CONFIG_X86_64_ACPI_NUMA=y -CONFIG_NODES_SPAN_OTHER_NODES=y -# CONFIG_NUMA_EMU is not set -CONFIG_NODES_SHIFT=6 -CONFIG_ARCH_SPARSEMEM_ENABLE=y -CONFIG_ARCH_SPARSEMEM_DEFAULT=y -CONFIG_ARCH_SELECT_MEMORY_MODEL=y -CONFIG_ARCH_MEMORY_PROBE=y -CONFIG_ARCH_PROC_KCORE_TEXT=y -CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 -CONFIG_SELECT_MEMORY_MODEL=y -CONFIG_SPARSEMEM_MANUAL=y -CONFIG_SPARSEMEM=y -CONFIG_NEED_MULTIPLE_NODES=y -CONFIG_HAVE_MEMORY_PRESENT=y -CONFIG_SPARSEMEM_EXTREME=y -CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y -CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y -CONFIG_SPARSEMEM_VMEMMAP=y -CONFIG_HAVE_MEMBLOCK=y -CONFIG_HAVE_MEMBLOCK_NODE_MAP=y -CONFIG_HAVE_GENERIC_GUP=y -CONFIG_ARCH_DISCARD_MEMBLOCK=y -CONFIG_MEMORY_ISOLATION=y -CONFIG_HAVE_BOOTMEM_INFO_NODE=y -CONFIG_MEMORY_HOTPLUG=y -CONFIG_MEMORY_HOTPLUG_SPARSE=y -# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set -CONFIG_MEMORY_HOTREMOVE=y -CONFIG_SPLIT_PTLOCK_CPUS=4 -CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y -CONFIG_MEMORY_BALLOON=y -CONFIG_BALLOON_COMPACTION=y -CONFIG_COMPACTION=y -CONFIG_MIGRATION=y -CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y -CONFIG_ARCH_ENABLE_THP_MIGRATION=y -CONFIG_PHYS_ADDR_T_64BIT=y -CONFIG_VIRT_TO_BUS=y -CONFIG_MMU_NOTIFIER=y -CONFIG_KSM=y -CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 -CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y -CONFIG_MEMORY_FAILURE=y -CONFIG_HWPOISON_INJECT=m -CONFIG_TRANSPARENT_HUGEPAGE=y -CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y -# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set -CONFIG_ARCH_WANTS_THP_SWAP=y -CONFIG_THP_SWAP=y -CONFIG_TRANSPARENT_HUGE_PAGECACHE=y -CONFIG_CLEANCACHE=y -CONFIG_FRONTSWAP=y -CONFIG_CMA=y -# CONFIG_CMA_DEBUG is not set -# CONFIG_CMA_DEBUGFS is not set -CONFIG_CMA_AREAS=7 -CONFIG_MEM_SOFT_DIRTY=y -CONFIG_ZSWAP=y -CONFIG_ZPOOL=y -CONFIG_ZBUD=y -CONFIG_Z3FOLD=m -CONFIG_ZSMALLOC=y -CONFIG_PGTABLE_MAPPING=y -# CONFIG_ZSMALLOC_STAT is not set -CONFIG_GENERIC_EARLY_IOREMAP=y -# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set -CONFIG_IDLE_PAGE_TRACKING=y -CONFIG_ARCH_HAS_ZONE_DEVICE=y -CONFIG_ZONE_DEVICE=y -CONFIG_ARCH_HAS_HMM=y -CONFIG_DEV_PAGEMAP_OPS=y -# CONFIG_HMM_MIRROR is not set -# CONFIG_DEVICE_PRIVATE is not set -# CONFIG_DEVICE_PUBLIC is not set -CONFIG_FRAME_VECTOR=y -CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y -CONFIG_ARCH_HAS_PKEYS=y -# CONFIG_PERCPU_STATS is not set -# CONFIG_GUP_BENCHMARK is not set -CONFIG_ARCH_HAS_PTE_SPECIAL=y -CONFIG_X86_PMEM_LEGACY_DEVICE=y -CONFIG_X86_PMEM_LEGACY=y -CONFIG_X86_CHECK_BIOS_CORRUPTION=y -CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y -CONFIG_X86_RESERVE_LOW=64 -CONFIG_MTRR=y -CONFIG_MTRR_SANITIZER=y -CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1 -CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 -CONFIG_X86_PAT=y -CONFIG_ARCH_USES_PG_UNCACHED=y -CONFIG_ARCH_RANDOM=y -CONFIG_X86_SMAP=y -CONFIG_X86_INTEL_UMIP=y -CONFIG_X86_INTEL_MPX=y -CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y -CONFIG_EFI=y -CONFIG_EFI_STUB=y -CONFIG_EFI_MIXED=y -CONFIG_SECCOMP=y -# CONFIG_HZ_100 is not set -CONFIG_HZ_250=y -# CONFIG_HZ_300 is not set -# CONFIG_HZ_1000 is not set -CONFIG_HZ=250 -CONFIG_SCHED_HRTICK=y -CONFIG_KEXEC=y -CONFIG_KEXEC_FILE=y -CONFIG_ARCH_HAS_KEXEC_PURGATORY=y -CONFIG_KEXEC_VERIFY_SIG=y -CONFIG_CRASH_DUMP=y -CONFIG_KEXEC_JUMP=y -CONFIG_PHYSICAL_START=0x1000000 -CONFIG_RELOCATABLE=y -CONFIG_RANDOMIZE_BASE=y -CONFIG_X86_NEED_RELOCS=y -CONFIG_PHYSICAL_ALIGN=0x1000000 -CONFIG_DYNAMIC_MEMORY_LAYOUT=y -CONFIG_RANDOMIZE_MEMORY=y -CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa -CONFIG_HOTPLUG_CPU=y -# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set -# CONFIG_DEBUG_HOTPLUG_CPU0 is not set -# CONFIG_COMPAT_VDSO is not set -CONFIG_LEGACY_VSYSCALL_EMULATE=y -# CONFIG_LEGACY_VSYSCALL_NONE is not set -# CONFIG_CMDLINE_BOOL is not set -CONFIG_MODIFY_LDT_SYSCALL=y -CONFIG_HAVE_LIVEPATCH=y -CONFIG_LIVEPATCH=y -CONFIG_ARCH_HAS_ADD_PAGES=y -CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y -CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y -CONFIG_USE_PERCPU_NUMA_NODE_ID=y - -# -# Power management and ACPI options -# -CONFIG_ARCH_HIBERNATION_HEADER=y -CONFIG_SUSPEND=y -CONFIG_SUSPEND_FREEZER=y -# CONFIG_SUSPEND_SKIP_SYNC is not set -CONFIG_HIBERNATE_CALLBACKS=y -CONFIG_HIBERNATION=y -CONFIG_PM_STD_PARTITION="" -CONFIG_PM_SLEEP=y -CONFIG_PM_SLEEP_SMP=y -# CONFIG_PM_AUTOSLEEP is not set -CONFIG_PM_WAKELOCKS=y -CONFIG_PM_WAKELOCKS_LIMIT=100 -CONFIG_PM_WAKELOCKS_GC=y -CONFIG_PM=y -CONFIG_PM_DEBUG=y -CONFIG_PM_ADVANCED_DEBUG=y -# CONFIG_PM_TEST_SUSPEND is not set -CONFIG_PM_SLEEP_DEBUG=y -# CONFIG_DPM_WATCHDOG is not set -CONFIG_PM_TRACE=y -CONFIG_PM_TRACE_RTC=y -CONFIG_PM_CLK=y -CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y -CONFIG_ACPI=y -CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y -CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y -CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y -# CONFIG_ACPI_DEBUGGER is not set -CONFIG_ACPI_SPCR_TABLE=y -CONFIG_ACPI_LPIT=y -CONFIG_ACPI_SLEEP=y -# CONFIG_ACPI_PROCFS_POWER is not set -CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y -CONFIG_ACPI_EC_DEBUGFS=m -CONFIG_ACPI_AC=y -CONFIG_ACPI_BATTERY=y -CONFIG_ACPI_BUTTON=y -CONFIG_ACPI_VIDEO=m -CONFIG_ACPI_FAN=y -CONFIG_ACPI_TAD=m -CONFIG_ACPI_DOCK=y -CONFIG_ACPI_CPU_FREQ_PSS=y -CONFIG_ACPI_PROCESSOR_CSTATE=y -CONFIG_ACPI_PROCESSOR_IDLE=y -CONFIG_ACPI_CPPC_LIB=y -CONFIG_ACPI_PROCESSOR=y -CONFIG_ACPI_IPMI=m -CONFIG_ACPI_HOTPLUG_CPU=y -CONFIG_ACPI_PROCESSOR_AGGREGATOR=m -CONFIG_ACPI_THERMAL=y -CONFIG_ACPI_NUMA=y -CONFIG_ACPI_CUSTOM_DSDT_FILE="" -CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y -CONFIG_ACPI_TABLE_UPGRADE=y -# CONFIG_ACPI_DEBUG is not set -CONFIG_ACPI_PCI_SLOT=y -CONFIG_ACPI_CONTAINER=y -CONFIG_ACPI_HOTPLUG_MEMORY=y -CONFIG_ACPI_HOTPLUG_IOAPIC=y -CONFIG_ACPI_SBS=m -CONFIG_ACPI_HED=y -# CONFIG_ACPI_CUSTOM_METHOD is not set -CONFIG_ACPI_BGRT=y -# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set -CONFIG_ACPI_NFIT=m -CONFIG_HAVE_ACPI_APEI=y -CONFIG_HAVE_ACPI_APEI_NMI=y -CONFIG_ACPI_APEI=y -CONFIG_ACPI_APEI_GHES=y -CONFIG_ACPI_APEI_PCIEAER=y -CONFIG_ACPI_APEI_MEMORY_FAILURE=y -CONFIG_ACPI_APEI_EINJ=m -# CONFIG_ACPI_APEI_ERST_DEBUG is not set -CONFIG_DPTF_POWER=m -CONFIG_ACPI_WATCHDOG=y -CONFIG_ACPI_EXTLOG=m -# CONFIG_PMIC_OPREGION is not set -CONFIG_ACPI_CONFIGFS=m -CONFIG_X86_PM_TIMER=y -CONFIG_SFI=y - -# -# CPU Frequency scaling -# -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_GOV_ATTR_SET=y -CONFIG_CPU_FREQ_GOV_COMMON=y -CONFIG_CPU_FREQ_STAT=y -CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y -# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set -CONFIG_CPU_FREQ_GOV_PERFORMANCE=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=y -CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_GOV_ONDEMAND=y -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y -CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y - -# -# CPU frequency scaling drivers -# -CONFIG_X86_INTEL_PSTATE=y -CONFIG_X86_PCC_CPUFREQ=y -CONFIG_X86_ACPI_CPUFREQ=y -CONFIG_X86_ACPI_CPUFREQ_CPB=y -CONFIG_X86_POWERNOW_K8=y -CONFIG_X86_AMD_FREQ_SENSITIVITY=m -CONFIG_X86_SPEEDSTEP_CENTRINO=y -CONFIG_X86_P4_CLOCKMOD=m - -# -# shared options -# -CONFIG_X86_SPEEDSTEP_LIB=m - -# -# CPU Idle -# -CONFIG_CPU_IDLE=y -CONFIG_CPU_IDLE_GOV_LADDER=y -CONFIG_CPU_IDLE_GOV_MENU=y -CONFIG_INTEL_IDLE=y - -# -# Bus options (PCI etc.) -# -CONFIG_PCI=y -CONFIG_PCI_DIRECT=y -CONFIG_PCI_MMCONFIG=y -CONFIG_PCI_XEN=y -CONFIG_PCI_DOMAINS=y -CONFIG_MMCONF_FAM10H=y -# CONFIG_PCI_CNB20LE_QUIRK is not set -CONFIG_PCIEPORTBUS=y -CONFIG_HOTPLUG_PCI_PCIE=y -CONFIG_PCIEAER=y -# CONFIG_PCIEAER_INJECT is not set -# CONFIG_PCIE_ECRC is not set -CONFIG_PCIEASPM=y -CONFIG_PCIEASPM_DEBUG=y -CONFIG_PCIEASPM_DEFAULT=y -# CONFIG_PCIEASPM_POWERSAVE is not set -# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set -# CONFIG_PCIEASPM_PERFORMANCE is not set -CONFIG_PCIE_PME=y -CONFIG_PCIE_DPC=y -CONFIG_PCIE_PTM=y -CONFIG_PCI_MSI=y -CONFIG_PCI_MSI_IRQ_DOMAIN=y -CONFIG_PCI_QUIRKS=y -# CONFIG_PCI_DEBUG is not set -CONFIG_PCI_REALLOC_ENABLE_AUTO=y -CONFIG_PCI_STUB=m -# CONFIG_PCI_PF_STUB is not set -CONFIG_XEN_PCIDEV_FRONTEND=m -CONFIG_PCI_ATS=y -CONFIG_PCI_LOCKLESS_CONFIG=y -CONFIG_PCI_IOV=y -CONFIG_PCI_PRI=y -CONFIG_PCI_PASID=y -CONFIG_PCI_LABEL=y -CONFIG_PCI_HYPERV=m -CONFIG_HOTPLUG_PCI=y -CONFIG_HOTPLUG_PCI_ACPI=y -CONFIG_HOTPLUG_PCI_ACPI_IBM=m -CONFIG_HOTPLUG_PCI_CPCI=y -CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m -CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m -CONFIG_HOTPLUG_PCI_SHPC=y - -# -# PCI controller drivers -# - -# -# Cadence PCIe controllers support -# -# CONFIG_VMD is not set - -# -# DesignWare PCI Core Support -# -# CONFIG_PCIE_DW_PLAT_HOST is not set - -# -# PCI Endpoint -# -# CONFIG_PCI_ENDPOINT is not set - -# -# PCI switch controller drivers -# -CONFIG_PCI_SW_SWITCHTEC=m -# CONFIG_ISA_BUS is not set -CONFIG_ISA_DMA_API=y -CONFIG_AMD_NB=y -CONFIG_PCCARD=m -CONFIG_PCMCIA=m -CONFIG_PCMCIA_LOAD_CIS=y -CONFIG_CARDBUS=y - -# -# PC-card bridges -# -CONFIG_YENTA=m -CONFIG_YENTA_O2=y -CONFIG_YENTA_RICOH=y -CONFIG_YENTA_TI=y -CONFIG_YENTA_ENE_TUNE=y -CONFIG_YENTA_TOSHIBA=y -CONFIG_PD6729=m -CONFIG_I82092=m -CONFIG_PCCARD_NONSTATIC=y -CONFIG_RAPIDIO=y -CONFIG_RAPIDIO_TSI721=m -CONFIG_RAPIDIO_DISC_TIMEOUT=30 -# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set -CONFIG_RAPIDIO_DMA_ENGINE=y -# CONFIG_RAPIDIO_DEBUG is not set -CONFIG_RAPIDIO_ENUM_BASIC=m -CONFIG_RAPIDIO_CHMAN=m -CONFIG_RAPIDIO_MPORT_CDEV=m - -# -# RapidIO Switch drivers -# -CONFIG_RAPIDIO_TSI57X=m -CONFIG_RAPIDIO_CPS_XX=m -CONFIG_RAPIDIO_TSI568=m -CONFIG_RAPIDIO_CPS_GEN2=m -CONFIG_RAPIDIO_RXS_GEN3=m -# CONFIG_X86_SYSFB is not set - -# -# Executable file formats / Emulations -# -CONFIG_BINFMT_ELF=y -CONFIG_COMPAT_BINFMT_ELF=y -CONFIG_ELFCORE=y -CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y -CONFIG_BINFMT_SCRIPT=y -CONFIG_BINFMT_MISC=m -CONFIG_COREDUMP=y -CONFIG_IA32_EMULATION=y -# CONFIG_IA32_AOUT is not set -CONFIG_X86_X32=y -CONFIG_COMPAT_32=y -CONFIG_COMPAT=y -CONFIG_COMPAT_FOR_U64_ALIGNMENT=y -CONFIG_SYSVIPC_COMPAT=y -CONFIG_X86_DEV_DMA_OPS=y -CONFIG_NET=y -CONFIG_COMPAT_NETLINK_MESSAGES=y -CONFIG_NET_INGRESS=y -CONFIG_NET_EGRESS=y - -# -# Networking options -# -CONFIG_PACKET=y -CONFIG_PACKET_DIAG=m -CONFIG_UNIX=y -CONFIG_UNIX_DIAG=m -CONFIG_TLS=m -# CONFIG_TLS_DEVICE is not set -CONFIG_XFRM=y -CONFIG_XFRM_OFFLOAD=y -CONFIG_XFRM_ALGO=m -CONFIG_XFRM_USER=m -# CONFIG_XFRM_SUB_POLICY is not set -# CONFIG_XFRM_MIGRATE is not set -CONFIG_XFRM_STATISTICS=y -CONFIG_XFRM_IPCOMP=m -CONFIG_NET_KEY=m -# CONFIG_NET_KEY_MIGRATE is not set -# CONFIG_SMC is not set -# CONFIG_XDP_SOCKETS is not set -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_FIB_TRIE_STATS=y -CONFIG_IP_MULTIPLE_TABLES=y -CONFIG_IP_ROUTE_MULTIPATH=y -CONFIG_IP_ROUTE_VERBOSE=y -CONFIG_IP_ROUTE_CLASSID=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -# CONFIG_IP_PNP_BOOTP is not set -# CONFIG_IP_PNP_RARP is not set -CONFIG_NET_IPIP=m -CONFIG_NET_IPGRE_DEMUX=m -CONFIG_NET_IP_TUNNEL=m -CONFIG_NET_IPGRE=m -CONFIG_NET_IPGRE_BROADCAST=y -CONFIG_IP_MROUTE_COMMON=y -CONFIG_IP_MROUTE=y -# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set -CONFIG_IP_PIMSM_V1=y -CONFIG_IP_PIMSM_V2=y -CONFIG_SYN_COOKIES=y -CONFIG_NET_IPVTI=m -CONFIG_NET_UDP_TUNNEL=m -CONFIG_NET_FOU=m -CONFIG_NET_FOU_IP_TUNNELS=y -CONFIG_INET_AH=m -CONFIG_INET_ESP=m -CONFIG_INET_ESP_OFFLOAD=m -CONFIG_INET_IPCOMP=m -CONFIG_INET_XFRM_TUNNEL=m -CONFIG_INET_TUNNEL=m -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m -CONFIG_INET_XFRM_MODE_BEET=m -CONFIG_INET_DIAG=m -CONFIG_INET_TCP_DIAG=m -CONFIG_INET_UDP_DIAG=m -CONFIG_INET_RAW_DIAG=m -# CONFIG_INET_DIAG_DESTROY is not set -CONFIG_TCP_CONG_ADVANCED=y -CONFIG_TCP_CONG_BIC=m -CONFIG_TCP_CONG_CUBIC=y -CONFIG_TCP_CONG_WESTWOOD=m -CONFIG_TCP_CONG_HTCP=m -CONFIG_TCP_CONG_HSTCP=m -CONFIG_TCP_CONG_HYBLA=m -CONFIG_TCP_CONG_VEGAS=m -CONFIG_TCP_CONG_NV=m -CONFIG_TCP_CONG_SCALABLE=m -CONFIG_TCP_CONG_LP=m -CONFIG_TCP_CONG_VENO=m -CONFIG_TCP_CONG_YEAH=m -CONFIG_TCP_CONG_ILLINOIS=m -CONFIG_TCP_CONG_DCTCP=m -CONFIG_TCP_CONG_CDG=m -CONFIG_TCP_CONG_BBR=m -CONFIG_DEFAULT_CUBIC=y -# CONFIG_DEFAULT_RENO is not set -CONFIG_DEFAULT_TCP_CONG="cubic" -CONFIG_TCP_MD5SIG=y -CONFIG_IPV6=y -CONFIG_IPV6_ROUTER_PREF=y -CONFIG_IPV6_ROUTE_INFO=y -# CONFIG_IPV6_OPTIMISTIC_DAD is not set -CONFIG_INET6_AH=m -CONFIG_INET6_ESP=m -CONFIG_INET6_ESP_OFFLOAD=m -CONFIG_INET6_IPCOMP=m -CONFIG_IPV6_MIP6=m -CONFIG_IPV6_ILA=m -CONFIG_INET6_XFRM_TUNNEL=m -CONFIG_INET6_TUNNEL=m -CONFIG_INET6_XFRM_MODE_TRANSPORT=m -CONFIG_INET6_XFRM_MODE_TUNNEL=m -CONFIG_INET6_XFRM_MODE_BEET=m -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m -CONFIG_IPV6_VTI=m -CONFIG_IPV6_SIT=m -CONFIG_IPV6_SIT_6RD=y -CONFIG_IPV6_NDISC_NODETYPE=y -CONFIG_IPV6_TUNNEL=m -CONFIG_IPV6_GRE=m -CONFIG_IPV6_FOU=m -CONFIG_IPV6_FOU_TUNNEL=m -CONFIG_IPV6_MULTIPLE_TABLES=y -CONFIG_IPV6_SUBTREES=y -CONFIG_IPV6_MROUTE=y -CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y -CONFIG_IPV6_PIMSM_V2=y -# CONFIG_IPV6_SEG6_LWTUNNEL is not set -# CONFIG_IPV6_SEG6_HMAC is not set -CONFIG_NETLABEL=y -CONFIG_NETWORK_SECMARK=y -CONFIG_NET_PTP_CLASSIFY=y -# CONFIG_NETWORK_PHY_TIMESTAMPING is not set -CONFIG_NETFILTER=y -CONFIG_NETFILTER_ADVANCED=y -CONFIG_BRIDGE_NETFILTER=m - -# -# Core Netfilter Configuration -# -CONFIG_NETFILTER_INGRESS=y -CONFIG_NETFILTER_NETLINK=m -CONFIG_NETFILTER_FAMILY_BRIDGE=y -CONFIG_NETFILTER_FAMILY_ARP=y -CONFIG_NETFILTER_NETLINK_ACCT=m -CONFIG_NETFILTER_NETLINK_QUEUE=m -CONFIG_NETFILTER_NETLINK_LOG=m -CONFIG_NF_CONNTRACK=m -CONFIG_NF_LOG_COMMON=m -CONFIG_NF_LOG_NETDEV=m -CONFIG_NETFILTER_CONNCOUNT=m -CONFIG_NF_CONNTRACK_MARK=y -CONFIG_NF_CONNTRACK_SECMARK=y -CONFIG_NF_CONNTRACK_ZONES=y -# CONFIG_NF_CONNTRACK_PROCFS is not set -CONFIG_NF_CONNTRACK_EVENTS=y -CONFIG_NF_CONNTRACK_TIMEOUT=y -CONFIG_NF_CONNTRACK_TIMESTAMP=y -CONFIG_NF_CONNTRACK_LABELS=y -CONFIG_NF_CT_PROTO_DCCP=y -CONFIG_NF_CT_PROTO_GRE=m -CONFIG_NF_CT_PROTO_SCTP=y -CONFIG_NF_CT_PROTO_UDPLITE=y -CONFIG_NF_CONNTRACK_AMANDA=m -CONFIG_NF_CONNTRACK_FTP=m -CONFIG_NF_CONNTRACK_H323=m -CONFIG_NF_CONNTRACK_IRC=m -CONFIG_NF_CONNTRACK_BROADCAST=m -CONFIG_NF_CONNTRACK_NETBIOS_NS=m -CONFIG_NF_CONNTRACK_SNMP=m -CONFIG_NF_CONNTRACK_PPTP=m -CONFIG_NF_CONNTRACK_SANE=m -CONFIG_NF_CONNTRACK_SIP=m -CONFIG_NF_CONNTRACK_TFTP=m -CONFIG_NF_CT_NETLINK=m -CONFIG_NF_CT_NETLINK_TIMEOUT=m -CONFIG_NF_CT_NETLINK_HELPER=m -CONFIG_NETFILTER_NETLINK_GLUE_CT=y -CONFIG_NF_NAT=m -CONFIG_NF_NAT_NEEDED=y -CONFIG_NF_NAT_PROTO_DCCP=y -CONFIG_NF_NAT_PROTO_UDPLITE=y -CONFIG_NF_NAT_PROTO_SCTP=y -CONFIG_NF_NAT_AMANDA=m -CONFIG_NF_NAT_FTP=m -CONFIG_NF_NAT_IRC=m -CONFIG_NF_NAT_SIP=m -CONFIG_NF_NAT_TFTP=m -CONFIG_NF_NAT_REDIRECT=y -CONFIG_NETFILTER_SYNPROXY=m -CONFIG_NF_OSF=m -CONFIG_NF_TABLES=m -CONFIG_NF_TABLES_SET=m -# CONFIG_NF_TABLES_INET is not set -# CONFIG_NF_TABLES_NETDEV is not set -CONFIG_NFT_NUMGEN=m -CONFIG_NFT_CT=m -CONFIG_NFT_FLOW_OFFLOAD=m -CONFIG_NFT_COUNTER=m -CONFIG_NFT_CONNLIMIT=m -CONFIG_NFT_LOG=m -CONFIG_NFT_LIMIT=m -CONFIG_NFT_MASQ=m -CONFIG_NFT_REDIR=m -CONFIG_NFT_NAT=m -CONFIG_NFT_OBJREF=m -CONFIG_NFT_QUEUE=m -CONFIG_NFT_QUOTA=m -CONFIG_NFT_REJECT=m -CONFIG_NFT_COMPAT=m -CONFIG_NFT_HASH=m -CONFIG_NFT_SOCKET=m -CONFIG_NF_FLOW_TABLE_INET=m -CONFIG_NF_FLOW_TABLE=m -CONFIG_NETFILTER_XTABLES=m - -# -# Xtables combined modules -# -CONFIG_NETFILTER_XT_MARK=m -CONFIG_NETFILTER_XT_CONNMARK=m -CONFIG_NETFILTER_XT_SET=m - -# -# Xtables targets -# -CONFIG_NETFILTER_XT_TARGET_AUDIT=m -CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m -CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m -CONFIG_NETFILTER_XT_TARGET_CONNMARK=m -CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m -CONFIG_NETFILTER_XT_TARGET_CT=m -CONFIG_NETFILTER_XT_TARGET_DSCP=m -CONFIG_NETFILTER_XT_TARGET_HL=m -CONFIG_NETFILTER_XT_TARGET_HMARK=m -CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m -CONFIG_NETFILTER_XT_TARGET_LED=m -CONFIG_NETFILTER_XT_TARGET_LOG=m -CONFIG_NETFILTER_XT_TARGET_MARK=m -CONFIG_NETFILTER_XT_NAT=m -CONFIG_NETFILTER_XT_TARGET_NETMAP=m -CONFIG_NETFILTER_XT_TARGET_NFLOG=m -CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m -# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set -CONFIG_NETFILTER_XT_TARGET_RATEEST=m -CONFIG_NETFILTER_XT_TARGET_REDIRECT=m -CONFIG_NETFILTER_XT_TARGET_TEE=m -CONFIG_NETFILTER_XT_TARGET_TPROXY=m -CONFIG_NETFILTER_XT_TARGET_TRACE=m -CONFIG_NETFILTER_XT_TARGET_SECMARK=m -CONFIG_NETFILTER_XT_TARGET_TCPMSS=m -CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m - -# -# Xtables matches -# -CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m -CONFIG_NETFILTER_XT_MATCH_BPF=m -CONFIG_NETFILTER_XT_MATCH_CGROUP=m -CONFIG_NETFILTER_XT_MATCH_CLUSTER=m -CONFIG_NETFILTER_XT_MATCH_COMMENT=m -CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m -CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m -CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m -CONFIG_NETFILTER_XT_MATCH_CONNMARK=m -CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m -CONFIG_NETFILTER_XT_MATCH_CPU=m -CONFIG_NETFILTER_XT_MATCH_DCCP=m -CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m -CONFIG_NETFILTER_XT_MATCH_DSCP=m -CONFIG_NETFILTER_XT_MATCH_ECN=m -CONFIG_NETFILTER_XT_MATCH_ESP=m -CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m -CONFIG_NETFILTER_XT_MATCH_HELPER=m -CONFIG_NETFILTER_XT_MATCH_HL=m -CONFIG_NETFILTER_XT_MATCH_IPCOMP=m -CONFIG_NETFILTER_XT_MATCH_IPRANGE=m -CONFIG_NETFILTER_XT_MATCH_IPVS=m -CONFIG_NETFILTER_XT_MATCH_L2TP=m -CONFIG_NETFILTER_XT_MATCH_LENGTH=m -CONFIG_NETFILTER_XT_MATCH_LIMIT=m -CONFIG_NETFILTER_XT_MATCH_MAC=m -CONFIG_NETFILTER_XT_MATCH_MARK=m -CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m -CONFIG_NETFILTER_XT_MATCH_NFACCT=m -CONFIG_NETFILTER_XT_MATCH_OSF=m -CONFIG_NETFILTER_XT_MATCH_OWNER=m -CONFIG_NETFILTER_XT_MATCH_POLICY=m -CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m -CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m -CONFIG_NETFILTER_XT_MATCH_QUOTA=m -CONFIG_NETFILTER_XT_MATCH_RATEEST=m -CONFIG_NETFILTER_XT_MATCH_REALM=m -CONFIG_NETFILTER_XT_MATCH_RECENT=m -CONFIG_NETFILTER_XT_MATCH_SCTP=m -CONFIG_NETFILTER_XT_MATCH_SOCKET=m -CONFIG_NETFILTER_XT_MATCH_STATE=m -CONFIG_NETFILTER_XT_MATCH_STATISTIC=m -CONFIG_NETFILTER_XT_MATCH_STRING=m -CONFIG_NETFILTER_XT_MATCH_TCPMSS=m -CONFIG_NETFILTER_XT_MATCH_TIME=m -CONFIG_NETFILTER_XT_MATCH_U32=m -CONFIG_IP_SET=m -CONFIG_IP_SET_MAX=256 -CONFIG_IP_SET_BITMAP_IP=m -CONFIG_IP_SET_BITMAP_IPMAC=m -CONFIG_IP_SET_BITMAP_PORT=m -CONFIG_IP_SET_HASH_IP=m -CONFIG_IP_SET_HASH_IPMARK=m -CONFIG_IP_SET_HASH_IPPORT=m -CONFIG_IP_SET_HASH_IPPORTIP=m -CONFIG_IP_SET_HASH_IPPORTNET=m -CONFIG_IP_SET_HASH_IPMAC=m -CONFIG_IP_SET_HASH_MAC=m -CONFIG_IP_SET_HASH_NETPORTNET=m -CONFIG_IP_SET_HASH_NET=m -CONFIG_IP_SET_HASH_NETNET=m -CONFIG_IP_SET_HASH_NETPORT=m -CONFIG_IP_SET_HASH_NETIFACE=m -CONFIG_IP_SET_LIST_SET=m -CONFIG_IP_VS=m -CONFIG_IP_VS_IPV6=y -# CONFIG_IP_VS_DEBUG is not set -CONFIG_IP_VS_TAB_BITS=12 - -# -# IPVS transport protocol load balancing support -# -CONFIG_IP_VS_PROTO_TCP=y -CONFIG_IP_VS_PROTO_UDP=y -CONFIG_IP_VS_PROTO_AH_ESP=y -CONFIG_IP_VS_PROTO_ESP=y -CONFIG_IP_VS_PROTO_AH=y -CONFIG_IP_VS_PROTO_SCTP=y - -# -# IPVS scheduler -# -CONFIG_IP_VS_RR=m -CONFIG_IP_VS_WRR=m -CONFIG_IP_VS_LC=m -CONFIG_IP_VS_WLC=m -CONFIG_IP_VS_FO=m -CONFIG_IP_VS_OVF=m -CONFIG_IP_VS_LBLC=m -CONFIG_IP_VS_LBLCR=m -CONFIG_IP_VS_DH=m -CONFIG_IP_VS_SH=m -CONFIG_IP_VS_MH=m -CONFIG_IP_VS_SED=m -CONFIG_IP_VS_NQ=m - -# -# IPVS SH scheduler -# -CONFIG_IP_VS_SH_TAB_BITS=8 - -# -# IPVS MH scheduler -# -CONFIG_IP_VS_MH_TAB_INDEX=12 - -# -# IPVS application helper -# -CONFIG_IP_VS_FTP=m -CONFIG_IP_VS_NFCT=y -CONFIG_IP_VS_PE_SIP=m - -# -# IP: Netfilter Configuration -# -CONFIG_NF_DEFRAG_IPV4=m -CONFIG_NF_CONNTRACK_IPV4=m -CONFIG_NF_SOCKET_IPV4=m -CONFIG_NF_TPROXY_IPV4=m -# CONFIG_NF_TABLES_IPV4 is not set -# CONFIG_NF_TABLES_ARP is not set -CONFIG_NF_FLOW_TABLE_IPV4=m -CONFIG_NF_DUP_IPV4=m -CONFIG_NF_LOG_ARP=m -CONFIG_NF_LOG_IPV4=m -CONFIG_NF_REJECT_IPV4=m -CONFIG_NF_NAT_IPV4=m -CONFIG_NF_NAT_MASQUERADE_IPV4=y -CONFIG_NF_NAT_SNMP_BASIC=m -CONFIG_NF_NAT_PROTO_GRE=m -CONFIG_NF_NAT_PPTP=m -CONFIG_NF_NAT_H323=m -CONFIG_IP_NF_IPTABLES=m -CONFIG_IP_NF_MATCH_AH=m -CONFIG_IP_NF_MATCH_ECN=m -CONFIG_IP_NF_MATCH_RPFILTER=m -CONFIG_IP_NF_MATCH_TTL=m -CONFIG_IP_NF_FILTER=m -CONFIG_IP_NF_TARGET_REJECT=m -CONFIG_IP_NF_TARGET_SYNPROXY=m -CONFIG_IP_NF_NAT=m -CONFIG_IP_NF_TARGET_MASQUERADE=m -CONFIG_IP_NF_TARGET_NETMAP=m -CONFIG_IP_NF_TARGET_REDIRECT=m -CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_TARGET_CLUSTERIP=m -CONFIG_IP_NF_TARGET_ECN=m -CONFIG_IP_NF_TARGET_TTL=m -CONFIG_IP_NF_RAW=m -CONFIG_IP_NF_SECURITY=m -CONFIG_IP_NF_ARPTABLES=m -CONFIG_IP_NF_ARPFILTER=m -CONFIG_IP_NF_ARP_MANGLE=m - -# -# IPv6: Netfilter Configuration -# -CONFIG_NF_DEFRAG_IPV6=m -CONFIG_NF_CONNTRACK_IPV6=m -CONFIG_NF_SOCKET_IPV6=m -CONFIG_NF_TPROXY_IPV6=m -# CONFIG_NF_TABLES_IPV6 is not set -CONFIG_NF_FLOW_TABLE_IPV6=m -CONFIG_NF_DUP_IPV6=m -CONFIG_NF_REJECT_IPV6=m -CONFIG_NF_LOG_IPV6=m -CONFIG_NF_NAT_IPV6=m -CONFIG_NF_NAT_MASQUERADE_IPV6=y -CONFIG_IP6_NF_IPTABLES=m -CONFIG_IP6_NF_MATCH_AH=m -CONFIG_IP6_NF_MATCH_EUI64=m -CONFIG_IP6_NF_MATCH_FRAG=m -CONFIG_IP6_NF_MATCH_OPTS=m -CONFIG_IP6_NF_MATCH_HL=m -CONFIG_IP6_NF_MATCH_IPV6HEADER=m -CONFIG_IP6_NF_MATCH_MH=m -CONFIG_IP6_NF_MATCH_RPFILTER=m -CONFIG_IP6_NF_MATCH_RT=m -CONFIG_IP6_NF_MATCH_SRH=m -CONFIG_IP6_NF_TARGET_HL=m -CONFIG_IP6_NF_FILTER=m -CONFIG_IP6_NF_TARGET_REJECT=m -CONFIG_IP6_NF_TARGET_SYNPROXY=m -CONFIG_IP6_NF_MANGLE=m -CONFIG_IP6_NF_RAW=m -CONFIG_IP6_NF_SECURITY=m -CONFIG_IP6_NF_NAT=m -CONFIG_IP6_NF_TARGET_MASQUERADE=m -CONFIG_IP6_NF_TARGET_NPT=m - -# -# DECnet: Netfilter Configuration -# -CONFIG_DECNET_NF_GRABULATOR=m -# CONFIG_NF_TABLES_BRIDGE is not set -CONFIG_BRIDGE_NF_EBTABLES=m -CONFIG_BRIDGE_EBT_BROUTE=m -CONFIG_BRIDGE_EBT_T_FILTER=m -CONFIG_BRIDGE_EBT_T_NAT=m -CONFIG_BRIDGE_EBT_802_3=m -CONFIG_BRIDGE_EBT_AMONG=m -CONFIG_BRIDGE_EBT_ARP=m -CONFIG_BRIDGE_EBT_IP=m -CONFIG_BRIDGE_EBT_IP6=m -CONFIG_BRIDGE_EBT_LIMIT=m -CONFIG_BRIDGE_EBT_MARK=m -CONFIG_BRIDGE_EBT_PKTTYPE=m -CONFIG_BRIDGE_EBT_STP=m -CONFIG_BRIDGE_EBT_VLAN=m -CONFIG_BRIDGE_EBT_ARPREPLY=m -CONFIG_BRIDGE_EBT_DNAT=m -CONFIG_BRIDGE_EBT_MARK_T=m -CONFIG_BRIDGE_EBT_REDIRECT=m -CONFIG_BRIDGE_EBT_SNAT=m -CONFIG_BRIDGE_EBT_LOG=m -CONFIG_BRIDGE_EBT_NFLOG=m -# CONFIG_BPFILTER is not set -CONFIG_IP_DCCP=m -CONFIG_INET_DCCP_DIAG=m - -# -# DCCP CCIDs Configuration -# -# CONFIG_IP_DCCP_CCID2_DEBUG is not set -# CONFIG_IP_DCCP_CCID3 is not set - -# -# DCCP Kernel Hacking -# -# CONFIG_IP_DCCP_DEBUG is not set -CONFIG_IP_SCTP=m -# CONFIG_SCTP_DBG_OBJCNT is not set -# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set -CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y -# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set -CONFIG_SCTP_COOKIE_HMAC_MD5=y -CONFIG_SCTP_COOKIE_HMAC_SHA1=y -CONFIG_INET_SCTP_DIAG=m -CONFIG_RDS=m -CONFIG_RDS_RDMA=m -CONFIG_RDS_TCP=m -# CONFIG_RDS_DEBUG is not set -CONFIG_TIPC=m -CONFIG_TIPC_MEDIA_IB=y -CONFIG_TIPC_MEDIA_UDP=y -CONFIG_TIPC_DIAG=m -CONFIG_ATM=m -CONFIG_ATM_CLIP=m -# CONFIG_ATM_CLIP_NO_ICMP is not set -CONFIG_ATM_LANE=m -CONFIG_ATM_MPOA=m -CONFIG_ATM_BR2684=m -# CONFIG_ATM_BR2684_IPFILTER is not set -CONFIG_L2TP=m -CONFIG_L2TP_DEBUGFS=m -CONFIG_L2TP_V3=y -CONFIG_L2TP_IP=m -CONFIG_L2TP_ETH=m -CONFIG_STP=m -CONFIG_GARP=m -CONFIG_MRP=m -CONFIG_BRIDGE=m -CONFIG_BRIDGE_IGMP_SNOOPING=y -CONFIG_BRIDGE_VLAN_FILTERING=y -CONFIG_HAVE_NET_DSA=y -CONFIG_NET_DSA=m -CONFIG_NET_DSA_LEGACY=y -CONFIG_NET_DSA_TAG_BRCM=y -CONFIG_NET_DSA_TAG_BRCM_PREPEND=y -CONFIG_NET_DSA_TAG_DSA=y -CONFIG_NET_DSA_TAG_EDSA=y -CONFIG_NET_DSA_TAG_KSZ=y -CONFIG_NET_DSA_TAG_LAN9303=y -CONFIG_NET_DSA_TAG_MTK=y -CONFIG_NET_DSA_TAG_TRAILER=y -CONFIG_NET_DSA_TAG_QCA=y -CONFIG_VLAN_8021Q=m -CONFIG_VLAN_8021Q_GVRP=y -CONFIG_VLAN_8021Q_MVRP=y -CONFIG_DECNET=m -# CONFIG_DECNET_ROUTER is not set -CONFIG_LLC=m -CONFIG_LLC2=m -CONFIG_ATALK=m -CONFIG_DEV_APPLETALK=m -CONFIG_IPDDP=m -CONFIG_IPDDP_ENCAP=y -CONFIG_X25=m -CONFIG_LAPB=m -CONFIG_PHONET=m -CONFIG_6LOWPAN=m -# CONFIG_6LOWPAN_DEBUGFS is not set -CONFIG_6LOWPAN_NHC=m -CONFIG_6LOWPAN_NHC_DEST=m -CONFIG_6LOWPAN_NHC_FRAGMENT=m -CONFIG_6LOWPAN_NHC_HOP=m -CONFIG_6LOWPAN_NHC_IPV6=m -CONFIG_6LOWPAN_NHC_MOBILITY=m -CONFIG_6LOWPAN_NHC_ROUTING=m -CONFIG_6LOWPAN_NHC_UDP=m -CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m -CONFIG_6LOWPAN_GHC_UDP=m -CONFIG_6LOWPAN_GHC_ICMPV6=m -CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m -CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m -CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m -CONFIG_IEEE802154=m -CONFIG_IEEE802154_NL802154_EXPERIMENTAL=y -CONFIG_IEEE802154_SOCKET=m -CONFIG_IEEE802154_6LOWPAN=m -CONFIG_MAC802154=m -CONFIG_NET_SCHED=y - -# -# Queueing/Scheduling -# -CONFIG_NET_SCH_CBQ=m -CONFIG_NET_SCH_HTB=m -CONFIG_NET_SCH_HFSC=m -CONFIG_NET_SCH_ATM=m -CONFIG_NET_SCH_PRIO=m -CONFIG_NET_SCH_MULTIQ=m -CONFIG_NET_SCH_RED=m -CONFIG_NET_SCH_SFB=m -CONFIG_NET_SCH_SFQ=m -CONFIG_NET_SCH_TEQL=m -CONFIG_NET_SCH_TBF=m -CONFIG_NET_SCH_CBS=m -CONFIG_NET_SCH_GRED=m -CONFIG_NET_SCH_DSMARK=m -CONFIG_NET_SCH_NETEM=m -CONFIG_NET_SCH_DRR=m -CONFIG_NET_SCH_MQPRIO=m -CONFIG_NET_SCH_CHOKE=m -CONFIG_NET_SCH_QFQ=m -CONFIG_NET_SCH_CODEL=m -CONFIG_NET_SCH_FQ_CODEL=m -CONFIG_NET_SCH_FQ=m -CONFIG_NET_SCH_HHF=m -CONFIG_NET_SCH_PIE=m -CONFIG_NET_SCH_INGRESS=m -CONFIG_NET_SCH_PLUG=m -# CONFIG_NET_SCH_DEFAULT is not set - -# -# Classification -# -CONFIG_NET_CLS=y -CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m -CONFIG_NET_CLS_ROUTE4=m -CONFIG_NET_CLS_FW=m -CONFIG_NET_CLS_U32=m -# CONFIG_CLS_U32_PERF is not set -CONFIG_CLS_U32_MARK=y -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_RSVP6=m -CONFIG_NET_CLS_FLOW=m -CONFIG_NET_CLS_CGROUP=m -CONFIG_NET_CLS_BPF=m -CONFIG_NET_CLS_FLOWER=m -CONFIG_NET_CLS_MATCHALL=m -CONFIG_NET_EMATCH=y -CONFIG_NET_EMATCH_STACK=32 -CONFIG_NET_EMATCH_CMP=m -CONFIG_NET_EMATCH_NBYTE=m -CONFIG_NET_EMATCH_U32=m -CONFIG_NET_EMATCH_META=m -CONFIG_NET_EMATCH_TEXT=m -CONFIG_NET_EMATCH_CANID=m -CONFIG_NET_EMATCH_IPSET=m -CONFIG_NET_EMATCH_IPT=m -CONFIG_NET_CLS_ACT=y -CONFIG_NET_ACT_POLICE=m -CONFIG_NET_ACT_GACT=m -CONFIG_GACT_PROB=y -CONFIG_NET_ACT_MIRRED=m -CONFIG_NET_ACT_SAMPLE=m -CONFIG_NET_ACT_IPT=m -CONFIG_NET_ACT_NAT=m -CONFIG_NET_ACT_PEDIT=m -CONFIG_NET_ACT_SIMP=m -CONFIG_NET_ACT_SKBEDIT=m -CONFIG_NET_ACT_CSUM=m -CONFIG_NET_ACT_VLAN=m -CONFIG_NET_ACT_BPF=m -CONFIG_NET_ACT_CONNMARK=m -CONFIG_NET_ACT_SKBMOD=m -CONFIG_NET_ACT_IFE=m -CONFIG_NET_ACT_TUNNEL_KEY=m -CONFIG_NET_IFE_SKBMARK=m -CONFIG_NET_IFE_SKBPRIO=m -CONFIG_NET_IFE_SKBTCINDEX=m -# CONFIG_NET_CLS_IND is not set -CONFIG_NET_SCH_FIFO=y -CONFIG_DCB=y -CONFIG_DNS_RESOLVER=y -CONFIG_BATMAN_ADV=m -# CONFIG_BATMAN_ADV_BATMAN_V is not set -CONFIG_BATMAN_ADV_BLA=y -CONFIG_BATMAN_ADV_DAT=y -CONFIG_BATMAN_ADV_NC=y -CONFIG_BATMAN_ADV_MCAST=y -CONFIG_BATMAN_ADV_DEBUGFS=y -# CONFIG_BATMAN_ADV_DEBUG is not set -CONFIG_OPENVSWITCH=m -CONFIG_OPENVSWITCH_GRE=m -CONFIG_OPENVSWITCH_VXLAN=m -CONFIG_OPENVSWITCH_GENEVE=m -CONFIG_VSOCKETS=m -CONFIG_VSOCKETS_DIAG=m -CONFIG_VMWARE_VMCI_VSOCKETS=m -CONFIG_VIRTIO_VSOCKETS=m -CONFIG_VIRTIO_VSOCKETS_COMMON=m -CONFIG_HYPERV_VSOCKETS=m -CONFIG_NETLINK_DIAG=m -CONFIG_MPLS=y -CONFIG_NET_MPLS_GSO=m -CONFIG_MPLS_ROUTING=m -CONFIG_MPLS_IPTUNNEL=m -CONFIG_NET_NSH=m -CONFIG_HSR=m -CONFIG_NET_SWITCHDEV=y -CONFIG_NET_L3_MASTER_DEV=y -CONFIG_NET_NCSI=y -CONFIG_RPS=y -CONFIG_RFS_ACCEL=y -CONFIG_XPS=y -CONFIG_CGROUP_NET_PRIO=y -CONFIG_CGROUP_NET_CLASSID=y -CONFIG_NET_RX_BUSY_POLL=y -CONFIG_BQL=y -# CONFIG_BPF_JIT is not set -# CONFIG_BPF_STREAM_PARSER is not set -CONFIG_NET_FLOW_LIMIT=y - -# -# Network testing -# -CONFIG_NET_PKTGEN=m -# CONFIG_NET_DROP_MONITOR is not set -CONFIG_HAMRADIO=y - -# -# Packet Radio protocols -# -CONFIG_AX25=m -CONFIG_AX25_DAMA_SLAVE=y -CONFIG_NETROM=m -CONFIG_ROSE=m - -# -# AX.25 network device drivers -# -CONFIG_MKISS=m -CONFIG_6PACK=m -CONFIG_BPQETHER=m -CONFIG_BAYCOM_SER_FDX=m -CONFIG_BAYCOM_SER_HDX=m -CONFIG_BAYCOM_PAR=m -CONFIG_YAM=m -CONFIG_CAN=m -CONFIG_CAN_RAW=m -CONFIG_CAN_BCM=m -CONFIG_CAN_GW=m - -# -# CAN Device Drivers -# -CONFIG_CAN_VCAN=m -CONFIG_CAN_VXCAN=m -CONFIG_CAN_SLCAN=m -CONFIG_CAN_DEV=m -CONFIG_CAN_CALC_BITTIMING=y -CONFIG_CAN_LEDS=y -CONFIG_CAN_JANZ_ICAN3=m -CONFIG_CAN_C_CAN=m -CONFIG_CAN_C_CAN_PLATFORM=m -CONFIG_CAN_C_CAN_PCI=m -CONFIG_CAN_CC770=m -CONFIG_CAN_CC770_ISA=m -CONFIG_CAN_CC770_PLATFORM=m -CONFIG_CAN_IFI_CANFD=m -CONFIG_CAN_M_CAN=m -CONFIG_CAN_PEAK_PCIEFD=m -CONFIG_CAN_SJA1000=m -CONFIG_CAN_SJA1000_ISA=m -CONFIG_CAN_SJA1000_PLATFORM=m -CONFIG_CAN_EMS_PCMCIA=m -CONFIG_CAN_EMS_PCI=m -CONFIG_CAN_PEAK_PCMCIA=m -CONFIG_CAN_PEAK_PCI=m -CONFIG_CAN_PEAK_PCIEC=y -CONFIG_CAN_KVASER_PCI=m -CONFIG_CAN_PLX_PCI=m -CONFIG_CAN_SOFTING=m -CONFIG_CAN_SOFTING_CS=m - -# -# CAN SPI interfaces -# -CONFIG_CAN_HI311X=m -CONFIG_CAN_MCP251X=m - -# -# CAN USB interfaces -# -CONFIG_CAN_EMS_USB=m -CONFIG_CAN_ESD_USB2=m -CONFIG_CAN_GS_USB=m -CONFIG_CAN_KVASER_USB=m -CONFIG_CAN_PEAK_USB=m -CONFIG_CAN_8DEV_USB=m -CONFIG_CAN_MCBA_USB=m -# CONFIG_CAN_DEBUG_DEVICES is not set -CONFIG_BT=m -CONFIG_BT_BREDR=y -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_CMTP=m -CONFIG_BT_HIDP=m -CONFIG_BT_HS=y -CONFIG_BT_LE=y -CONFIG_BT_6LOWPAN=m -# CONFIG_BT_LEDS is not set -# CONFIG_BT_SELFTEST is not set -CONFIG_BT_DEBUGFS=y - -# -# Bluetooth device drivers -# -CONFIG_BT_INTEL=m -CONFIG_BT_BCM=m -CONFIG_BT_RTL=m -CONFIG_BT_QCA=m -CONFIG_BT_HCIBTUSB=m -# CONFIG_BT_HCIBTUSB_AUTOSUSPEND is not set -CONFIG_BT_HCIBTUSB_BCM=y -CONFIG_BT_HCIBTUSB_RTL=y -CONFIG_BT_HCIBTSDIO=m -CONFIG_BT_HCIUART=m -CONFIG_BT_HCIUART_SERDEV=y -CONFIG_BT_HCIUART_H4=y -CONFIG_BT_HCIUART_NOKIA=m -CONFIG_BT_HCIUART_BCSP=y -CONFIG_BT_HCIUART_ATH3K=y -CONFIG_BT_HCIUART_LL=y -CONFIG_BT_HCIUART_3WIRE=y -CONFIG_BT_HCIUART_INTEL=y -CONFIG_BT_HCIUART_BCM=y -CONFIG_BT_HCIUART_QCA=y -CONFIG_BT_HCIUART_AG6XX=y -CONFIG_BT_HCIUART_MRVL=y -CONFIG_BT_HCIBCM203X=m -CONFIG_BT_HCIBPA10X=m -CONFIG_BT_HCIBFUSB=m -CONFIG_BT_HCIDTL1=m -CONFIG_BT_HCIBT3C=m -CONFIG_BT_HCIBLUECARD=m -CONFIG_BT_HCIVHCI=m -CONFIG_BT_MRVL=m -CONFIG_BT_MRVL_SDIO=m -CONFIG_BT_ATH3K=m -CONFIG_BT_WILINK=m -CONFIG_BT_HCIRSI=m -CONFIG_AF_RXRPC=m -CONFIG_AF_RXRPC_IPV6=y -# CONFIG_AF_RXRPC_INJECT_LOSS is not set -# CONFIG_AF_RXRPC_DEBUG is not set -# CONFIG_RXKAD is not set -CONFIG_AF_KCM=m -CONFIG_STREAM_PARSER=m -CONFIG_FIB_RULES=y -CONFIG_WIRELESS=y -CONFIG_WIRELESS_EXT=y -CONFIG_WEXT_CORE=y -CONFIG_WEXT_PROC=y -CONFIG_WEXT_SPY=y -CONFIG_WEXT_PRIV=y -CONFIG_CFG80211=m -# CONFIG_NL80211_TESTMODE is not set -# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set -# CONFIG_CFG80211_CERTIFICATION_ONUS is not set -CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y -CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y -CONFIG_CFG80211_DEFAULT_PS=y -CONFIG_CFG80211_DEBUGFS=y -CONFIG_CFG80211_CRDA_SUPPORT=y -CONFIG_CFG80211_WEXT=y -CONFIG_CFG80211_WEXT_EXPORT=y -CONFIG_LIB80211=m -CONFIG_LIB80211_CRYPT_WEP=m -CONFIG_LIB80211_CRYPT_CCMP=m -CONFIG_LIB80211_CRYPT_TKIP=m -# CONFIG_LIB80211_DEBUG is not set -CONFIG_MAC80211=m -CONFIG_MAC80211_HAS_RC=y -CONFIG_MAC80211_RC_MINSTREL=y -CONFIG_MAC80211_RC_MINSTREL_HT=y -CONFIG_MAC80211_RC_MINSTREL_VHT=y -CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y -CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" -CONFIG_MAC80211_MESH=y -CONFIG_MAC80211_LEDS=y -CONFIG_MAC80211_DEBUGFS=y -CONFIG_MAC80211_MESSAGE_TRACING=y -# CONFIG_MAC80211_DEBUG_MENU is not set -CONFIG_MAC80211_STA_HASH_MAX_SIZE=0 -CONFIG_WIMAX=m -CONFIG_WIMAX_DEBUG_LEVEL=8 -CONFIG_RFKILL=y -CONFIG_RFKILL_LEDS=y -CONFIG_RFKILL_INPUT=y -CONFIG_RFKILL_GPIO=m -CONFIG_NET_9P=m -CONFIG_NET_9P_VIRTIO=m -CONFIG_NET_9P_XEN=m -CONFIG_NET_9P_RDMA=m -# CONFIG_NET_9P_DEBUG is not set -CONFIG_CAIF=m -# CONFIG_CAIF_DEBUG is not set -CONFIG_CAIF_NETDEV=m -CONFIG_CAIF_USB=m -CONFIG_CEPH_LIB=m -# CONFIG_CEPH_LIB_PRETTYDEBUG is not set -CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y -CONFIG_NFC=m -CONFIG_NFC_DIGITAL=m -CONFIG_NFC_NCI=m -CONFIG_NFC_NCI_SPI=m -CONFIG_NFC_NCI_UART=m -CONFIG_NFC_HCI=m -CONFIG_NFC_SHDLC=y - -# -# Near Field Communication (NFC) devices -# -CONFIG_NFC_TRF7970A=m -CONFIG_NFC_MEI_PHY=m -CONFIG_NFC_SIM=m -CONFIG_NFC_PORT100=m -CONFIG_NFC_FDP=m -CONFIG_NFC_FDP_I2C=m -CONFIG_NFC_PN544=m -CONFIG_NFC_PN544_I2C=m -CONFIG_NFC_PN544_MEI=m -CONFIG_NFC_PN533=m -CONFIG_NFC_PN533_USB=m -CONFIG_NFC_PN533_I2C=m -CONFIG_NFC_MICROREAD=m -CONFIG_NFC_MICROREAD_I2C=m -CONFIG_NFC_MICROREAD_MEI=m -CONFIG_NFC_MRVL=m -CONFIG_NFC_MRVL_USB=m -CONFIG_NFC_MRVL_UART=m -CONFIG_NFC_MRVL_I2C=m -CONFIG_NFC_MRVL_SPI=m -CONFIG_NFC_ST21NFCA=m -CONFIG_NFC_ST21NFCA_I2C=m -CONFIG_NFC_ST_NCI=m -CONFIG_NFC_ST_NCI_I2C=m -CONFIG_NFC_ST_NCI_SPI=m -CONFIG_NFC_NXP_NCI=m -CONFIG_NFC_NXP_NCI_I2C=m -CONFIG_NFC_S3FWRN5=m -CONFIG_NFC_S3FWRN5_I2C=m -CONFIG_NFC_ST95HF=m -CONFIG_PSAMPLE=m -CONFIG_NET_IFE=m -CONFIG_LWTUNNEL=y -CONFIG_LWTUNNEL_BPF=y -CONFIG_DST_CACHE=y -CONFIG_GRO_CELLS=y -CONFIG_NET_DEVLINK=m -CONFIG_MAY_USE_DEVLINK=m -CONFIG_PAGE_POOL=y -CONFIG_FAILOVER=y -CONFIG_HAVE_EBPF_JIT=y - -# -# Device Drivers -# - -# -# Generic Driver Options -# -CONFIG_UEVENT_HELPER=y -CONFIG_UEVENT_HELPER_PATH="" -CONFIG_DEVTMPFS=y -CONFIG_DEVTMPFS_MOUNT=y -# CONFIG_STANDALONE is not set -CONFIG_PREVENT_FIRMWARE_BUILD=y - -# -# Firmware loader -# -CONFIG_FW_LOADER=y -CONFIG_EXTRA_FIRMWARE="" -CONFIG_FW_LOADER_USER_HELPER=y -# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set -CONFIG_WANT_DEV_COREDUMP=y -CONFIG_ALLOW_DEV_COREDUMP=y -CONFIG_DEV_COREDUMP=y -# CONFIG_DEBUG_DRIVER is not set -# CONFIG_DEBUG_DEVRES is not set -# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set -# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set -CONFIG_SYS_HYPERVISOR=y -CONFIG_GENERIC_CPU_AUTOPROBE=y -CONFIG_GENERIC_CPU_VULNERABILITIES=y -CONFIG_REGMAP=y -CONFIG_REGMAP_I2C=y -CONFIG_REGMAP_SPI=y -CONFIG_REGMAP_SPMI=m -CONFIG_REGMAP_W1=m -CONFIG_REGMAP_MMIO=y -CONFIG_REGMAP_IRQ=y -CONFIG_DMA_SHARED_BUFFER=y -# CONFIG_DMA_FENCE_TRACE is not set -# CONFIG_DMA_CMA is not set - -# -# Bus devices -# -CONFIG_CONNECTOR=y -CONFIG_PROC_EVENTS=y -CONFIG_MTD=m -# CONFIG_MTD_TESTS is not set -CONFIG_MTD_REDBOOT_PARTS=m -CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 -# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set -# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set -CONFIG_MTD_CMDLINE_PARTS=m -CONFIG_MTD_AR7_PARTS=m - -# -# Partition parsers -# - -# -# User Modules And Translation Layers -# -CONFIG_MTD_BLKDEVS=m -CONFIG_MTD_BLOCK=m -CONFIG_MTD_BLOCK_RO=m -CONFIG_FTL=m -CONFIG_NFTL=m -CONFIG_NFTL_RW=y -CONFIG_INFTL=m -CONFIG_RFD_FTL=m -CONFIG_SSFDC=m -CONFIG_SM_FTL=m -CONFIG_MTD_OOPS=m -CONFIG_MTD_SWAP=m -# CONFIG_MTD_PARTITIONED_MASTER is not set - -# -# RAM/ROM/Flash chip drivers -# -CONFIG_MTD_CFI=m -CONFIG_MTD_JEDECPROBE=m -CONFIG_MTD_GEN_PROBE=m -# CONFIG_MTD_CFI_ADV_OPTIONS is not set -CONFIG_MTD_MAP_BANK_WIDTH_1=y -CONFIG_MTD_MAP_BANK_WIDTH_2=y -CONFIG_MTD_MAP_BANK_WIDTH_4=y -CONFIG_MTD_CFI_I1=y -CONFIG_MTD_CFI_I2=y -CONFIG_MTD_CFI_INTELEXT=m -CONFIG_MTD_CFI_AMDSTD=m -CONFIG_MTD_CFI_STAA=m -CONFIG_MTD_CFI_UTIL=m -CONFIG_MTD_RAM=m -CONFIG_MTD_ROM=m -CONFIG_MTD_ABSENT=m - -# -# Mapping drivers for chip access -# -CONFIG_MTD_COMPLEX_MAPPINGS=y -CONFIG_MTD_PHYSMAP=m -# CONFIG_MTD_PHYSMAP_COMPAT is not set -CONFIG_MTD_SBC_GXX=m -CONFIG_MTD_AMD76XROM=m -CONFIG_MTD_ICHXROM=m -CONFIG_MTD_ESB2ROM=m -CONFIG_MTD_CK804XROM=m -CONFIG_MTD_SCB2_FLASH=m -CONFIG_MTD_NETtel=m -CONFIG_MTD_L440GX=m -CONFIG_MTD_PCI=m -CONFIG_MTD_PCMCIA=m -# CONFIG_MTD_PCMCIA_ANONYMOUS is not set -CONFIG_MTD_GPIO_ADDR=m -CONFIG_MTD_INTEL_VR_NOR=m -CONFIG_MTD_PLATRAM=m -CONFIG_MTD_LATCH_ADDR=m - -# -# Self-contained MTD device drivers -# -CONFIG_MTD_PMC551=m -# CONFIG_MTD_PMC551_BUGFIX is not set -# CONFIG_MTD_PMC551_DEBUG is not set -CONFIG_MTD_DATAFLASH=m -# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set -CONFIG_MTD_DATAFLASH_OTP=y -CONFIG_MTD_M25P80=m -CONFIG_MTD_MCHP23K256=m -CONFIG_MTD_SST25L=m -CONFIG_MTD_SLRAM=m -CONFIG_MTD_PHRAM=m -CONFIG_MTD_MTDRAM=m -CONFIG_MTDRAM_TOTAL_SIZE=4096 -CONFIG_MTDRAM_ERASE_SIZE=128 -CONFIG_MTD_BLOCK2MTD=m - -# -# Disk-On-Chip Device Drivers -# -CONFIG_MTD_DOCG3=m -CONFIG_BCH_CONST_M=14 -CONFIG_BCH_CONST_T=4 -CONFIG_MTD_ONENAND=m -CONFIG_MTD_ONENAND_VERIFY_WRITE=y -CONFIG_MTD_ONENAND_GENERIC=m -# CONFIG_MTD_ONENAND_OTP is not set -CONFIG_MTD_ONENAND_2X_PROGRAM=y -CONFIG_MTD_NAND_ECC=m -# CONFIG_MTD_NAND_ECC_SMC is not set -CONFIG_MTD_NAND=m -CONFIG_MTD_NAND_BCH=m -CONFIG_MTD_NAND_ECC_BCH=y -CONFIG_MTD_SM_COMMON=m -CONFIG_MTD_NAND_DENALI=m -CONFIG_MTD_NAND_DENALI_PCI=m -CONFIG_MTD_NAND_GPIO=m -CONFIG_MTD_NAND_RICOH=m -CONFIG_MTD_NAND_DISKONCHIP=m -# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set -CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 -# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set -CONFIG_MTD_NAND_DOCG4=m -CONFIG_MTD_NAND_CAFE=m -CONFIG_MTD_NAND_NANDSIM=m -CONFIG_MTD_NAND_PLATFORM=m - -# -# LPDDR & LPDDR2 PCM memory drivers -# -CONFIG_MTD_LPDDR=m -CONFIG_MTD_QINFO_PROBE=m -CONFIG_MTD_SPI_NOR=m -CONFIG_MTD_MT81xx_NOR=m -CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y -CONFIG_SPI_INTEL_SPI=m -CONFIG_SPI_INTEL_SPI_PCI=m -CONFIG_SPI_INTEL_SPI_PLATFORM=m -CONFIG_MTD_UBI=m -CONFIG_MTD_UBI_WL_THRESHOLD=4096 -CONFIG_MTD_UBI_BEB_LIMIT=20 -CONFIG_MTD_UBI_FASTMAP=y -CONFIG_MTD_UBI_GLUEBI=m -CONFIG_MTD_UBI_BLOCK=y -# CONFIG_OF is not set -CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y -CONFIG_PARPORT=m -CONFIG_PARPORT_PC=m -CONFIG_PARPORT_SERIAL=m -CONFIG_PARPORT_PC_FIFO=y -# CONFIG_PARPORT_PC_SUPERIO is not set -CONFIG_PARPORT_PC_PCMCIA=m -CONFIG_PARPORT_AX88796=m -CONFIG_PARPORT_1284=y -CONFIG_PARPORT_NOT_PC=y -CONFIG_PNP=y -# CONFIG_PNP_DEBUG_MESSAGES is not set - -# -# Protocols -# -CONFIG_PNPACPI=y -CONFIG_BLK_DEV=y -CONFIG_BLK_DEV_NULL_BLK=m -CONFIG_BLK_DEV_FD=m -CONFIG_CDROM=y -CONFIG_PARIDE=m - -# -# Parallel IDE high-level drivers -# -CONFIG_PARIDE_PD=m -CONFIG_PARIDE_PCD=m -CONFIG_PARIDE_PF=m -CONFIG_PARIDE_PT=m -CONFIG_PARIDE_PG=m - -# -# Parallel IDE protocol modules -# -CONFIG_PARIDE_ATEN=m -CONFIG_PARIDE_BPCK=m -CONFIG_PARIDE_COMM=m -CONFIG_PARIDE_DSTR=m -CONFIG_PARIDE_FIT2=m -CONFIG_PARIDE_FIT3=m -CONFIG_PARIDE_EPAT=m -CONFIG_PARIDE_EPATC8=y -CONFIG_PARIDE_EPIA=m -CONFIG_PARIDE_FRIQ=m -CONFIG_PARIDE_FRPW=m -CONFIG_PARIDE_KBIC=m -CONFIG_PARIDE_KTTI=m -CONFIG_PARIDE_ON20=m -CONFIG_PARIDE_ON26=m -CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m -CONFIG_ZRAM=m -# CONFIG_ZRAM_WRITEBACK is not set -# CONFIG_ZRAM_MEMORY_TRACKING is not set -CONFIG_BLK_DEV_DAC960=m -CONFIG_BLK_DEV_UMEM=m -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 -CONFIG_BLK_DEV_CRYPTOLOOP=m -CONFIG_BLK_DEV_DRBD=m -# CONFIG_DRBD_FAULT_INJECTION is not set -CONFIG_BLK_DEV_NBD=m -CONFIG_BLK_DEV_SKD=m -CONFIG_BLK_DEV_SX8=m -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=16 -CONFIG_BLK_DEV_RAM_SIZE=65536 -CONFIG_CDROM_PKTCDVD=m -CONFIG_CDROM_PKTCDVD_BUFFERS=8 -# CONFIG_CDROM_PKTCDVD_WCACHE is not set -CONFIG_ATA_OVER_ETH=m -CONFIG_XEN_BLKDEV_FRONTEND=y -CONFIG_XEN_BLKDEV_BACKEND=m -CONFIG_VIRTIO_BLK=y -# CONFIG_VIRTIO_BLK_SCSI is not set -CONFIG_BLK_DEV_RBD=m -CONFIG_BLK_DEV_RSXX=m - -# -# NVME Support -# -CONFIG_NVME_CORE=y -CONFIG_BLK_DEV_NVME=y -# CONFIG_NVME_MULTIPATH is not set -CONFIG_NVME_FABRICS=m -CONFIG_NVME_RDMA=m -CONFIG_NVME_FC=m -CONFIG_NVME_TARGET=m -CONFIG_NVME_TARGET_LOOP=m -CONFIG_NVME_TARGET_RDMA=m -CONFIG_NVME_TARGET_FC=m -CONFIG_NVME_TARGET_FCLOOP=m - -# -# Misc devices -# -CONFIG_SENSORS_LIS3LV02D=m -CONFIG_AD525X_DPOT=m -CONFIG_AD525X_DPOT_I2C=m -CONFIG_AD525X_DPOT_SPI=m -CONFIG_DUMMY_IRQ=m -CONFIG_IBM_ASM=m -CONFIG_PHANTOM=m -CONFIG_SGI_IOC4=m -CONFIG_TIFM_CORE=m -CONFIG_TIFM_7XX1=m -CONFIG_ICS932S401=m -CONFIG_ENCLOSURE_SERVICES=m -CONFIG_HP_ILO=m -CONFIG_APDS9802ALS=m -CONFIG_ISL29003=m -CONFIG_ISL29020=m -CONFIG_SENSORS_TSL2550=m -CONFIG_SENSORS_BH1770=m -CONFIG_SENSORS_APDS990X=m -CONFIG_HMC6352=m -CONFIG_DS1682=m -CONFIG_VMWARE_BALLOON=m -CONFIG_USB_SWITCH_FSA9480=m -CONFIG_LATTICE_ECP3_CONFIG=m -CONFIG_SRAM=y -# CONFIG_PCI_ENDPOINT_TEST is not set -CONFIG_MISC_RTSX=m -CONFIG_C2PORT=m -CONFIG_C2PORT_DURAMAR_2150=m - -# -# EEPROM support -# -CONFIG_EEPROM_AT24=m -CONFIG_EEPROM_AT25=m -CONFIG_EEPROM_LEGACY=m -CONFIG_EEPROM_MAX6875=m -CONFIG_EEPROM_93CX6=m -CONFIG_EEPROM_93XX46=m -CONFIG_EEPROM_IDT_89HPESX=m -CONFIG_CB710_CORE=m -# CONFIG_CB710_DEBUG is not set -CONFIG_CB710_DEBUG_ASSUMPTIONS=y - -# -# Texas Instruments shared transport line discipline -# -CONFIG_TI_ST=m -CONFIG_SENSORS_LIS3_I2C=m -CONFIG_ALTERA_STAPL=m -CONFIG_INTEL_MEI=m -CONFIG_INTEL_MEI_ME=m -CONFIG_INTEL_MEI_TXE=m -CONFIG_VMWARE_VMCI=m - -# -# Intel MIC & related support -# - -# -# Intel MIC Bus Driver -# -CONFIG_INTEL_MIC_BUS=m - -# -# SCIF Bus Driver -# -CONFIG_SCIF_BUS=m - -# -# VOP Bus Driver -# -CONFIG_VOP_BUS=m - -# -# Intel MIC Host Driver -# -CONFIG_INTEL_MIC_HOST=m - -# -# Intel MIC Card Driver -# -CONFIG_INTEL_MIC_CARD=m - -# -# SCIF Driver -# -CONFIG_SCIF=m - -# -# Intel MIC Coprocessor State Management (COSM) Drivers -# -CONFIG_MIC_COSM=m - -# -# VOP Driver -# -CONFIG_VOP=m -CONFIG_VHOST_RING=m -CONFIG_GENWQE=m -CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0 -CONFIG_ECHO=m -CONFIG_MISC_RTSX_PCI=m -CONFIG_MISC_RTSX_USB=m -CONFIG_HAVE_IDE=y -# CONFIG_IDE is not set - -# -# SCSI device support -# -CONFIG_SCSI_MOD=y -CONFIG_RAID_ATTRS=m -CONFIG_SCSI=y -CONFIG_SCSI_DMA=y -CONFIG_SCSI_NETLINK=y -# CONFIG_SCSI_MQ_DEFAULT is not set -CONFIG_SCSI_PROC_FS=y - -# -# SCSI support type (disk, tape, CD-ROM) -# -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_ST=m -CONFIG_CHR_DEV_OSST=m -CONFIG_BLK_DEV_SR=y -# CONFIG_BLK_DEV_SR_VENDOR is not set -CONFIG_CHR_DEV_SG=y -CONFIG_CHR_DEV_SCH=m -CONFIG_SCSI_ENCLOSURE=m -CONFIG_SCSI_CONSTANTS=y -CONFIG_SCSI_LOGGING=y -CONFIG_SCSI_SCAN_ASYNC=y - -# -# SCSI Transports -# -CONFIG_SCSI_SPI_ATTRS=m -CONFIG_SCSI_FC_ATTRS=m -CONFIG_SCSI_ISCSI_ATTRS=m -CONFIG_SCSI_SAS_ATTRS=m -CONFIG_SCSI_SAS_LIBSAS=m -CONFIG_SCSI_SAS_ATA=y -CONFIG_SCSI_SAS_HOST_SMP=y -CONFIG_SCSI_SRP_ATTRS=m -CONFIG_SCSI_LOWLEVEL=y -CONFIG_ISCSI_TCP=m -CONFIG_ISCSI_BOOT_SYSFS=m -CONFIG_SCSI_CXGB3_ISCSI=m -CONFIG_SCSI_CXGB4_ISCSI=m -CONFIG_SCSI_BNX2_ISCSI=m -CONFIG_SCSI_BNX2X_FCOE=m -CONFIG_BE2ISCSI=m -CONFIG_BLK_DEV_3W_XXXX_RAID=m -CONFIG_SCSI_HPSA=m -CONFIG_SCSI_3W_9XXX=m -CONFIG_SCSI_3W_SAS=m -CONFIG_SCSI_ACARD=m -CONFIG_SCSI_AACRAID=m -CONFIG_SCSI_AIC7XXX=m -CONFIG_AIC7XXX_CMDS_PER_DEVICE=8 -CONFIG_AIC7XXX_RESET_DELAY_MS=5000 -# CONFIG_AIC7XXX_DEBUG_ENABLE is not set -CONFIG_AIC7XXX_DEBUG_MASK=0 -CONFIG_AIC7XXX_REG_PRETTY_PRINT=y -CONFIG_SCSI_AIC79XX=m -CONFIG_AIC79XX_CMDS_PER_DEVICE=32 -CONFIG_AIC79XX_RESET_DELAY_MS=5000 -# CONFIG_AIC79XX_DEBUG_ENABLE is not set -CONFIG_AIC79XX_DEBUG_MASK=0 -CONFIG_AIC79XX_REG_PRETTY_PRINT=y -CONFIG_SCSI_AIC94XX=m -# CONFIG_AIC94XX_DEBUG is not set -CONFIG_SCSI_MVSAS=m -# CONFIG_SCSI_MVSAS_DEBUG is not set -# CONFIG_SCSI_MVSAS_TASKLET is not set -CONFIG_SCSI_MVUMI=m -CONFIG_SCSI_DPT_I2O=m -CONFIG_SCSI_ADVANSYS=m -CONFIG_SCSI_ARCMSR=m -CONFIG_SCSI_ESAS2R=m -CONFIG_MEGARAID_NEWGEN=y -CONFIG_MEGARAID_MM=m -CONFIG_MEGARAID_MAILBOX=m -CONFIG_MEGARAID_LEGACY=m -CONFIG_MEGARAID_SAS=m -CONFIG_SCSI_MPT3SAS=m -CONFIG_SCSI_MPT2SAS_MAX_SGE=128 -CONFIG_SCSI_MPT3SAS_MAX_SGE=128 -CONFIG_SCSI_MPT2SAS=m -CONFIG_SCSI_SMARTPQI=m -CONFIG_SCSI_UFSHCD=m -CONFIG_SCSI_UFSHCD_PCI=m -# CONFIG_SCSI_UFS_DWC_TC_PCI is not set -CONFIG_SCSI_UFSHCD_PLATFORM=m -# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set -CONFIG_SCSI_HPTIOP=m -CONFIG_SCSI_BUSLOGIC=m -CONFIG_SCSI_FLASHPOINT=y -CONFIG_VMWARE_PVSCSI=m -CONFIG_XEN_SCSI_FRONTEND=m -CONFIG_HYPERV_STORAGE=m -CONFIG_LIBFC=m -CONFIG_LIBFCOE=m -CONFIG_FCOE=m -CONFIG_FCOE_FNIC=m -CONFIG_SCSI_SNIC=m -# CONFIG_SCSI_SNIC_DEBUG_FS is not set -CONFIG_SCSI_DMX3191D=m -CONFIG_SCSI_GDTH=m -CONFIG_SCSI_ISCI=m -CONFIG_SCSI_IPS=m -CONFIG_SCSI_INITIO=m -CONFIG_SCSI_INIA100=m -CONFIG_SCSI_PPA=m -CONFIG_SCSI_IMM=m -# CONFIG_SCSI_IZIP_EPP16 is not set -# CONFIG_SCSI_IZIP_SLOW_CTR is not set -CONFIG_SCSI_STEX=m -CONFIG_SCSI_SYM53C8XX_2=m -CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 -CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 -CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 -CONFIG_SCSI_SYM53C8XX_MMIO=y -CONFIG_SCSI_IPR=m -CONFIG_SCSI_IPR_TRACE=y -CONFIG_SCSI_IPR_DUMP=y -CONFIG_SCSI_QLOGIC_1280=m -CONFIG_SCSI_QLA_FC=m -CONFIG_TCM_QLA2XXX=m -# CONFIG_TCM_QLA2XXX_DEBUG is not set -CONFIG_SCSI_QLA_ISCSI=m -CONFIG_QEDI=m -CONFIG_QEDF=m -CONFIG_SCSI_LPFC=m -# CONFIG_SCSI_LPFC_DEBUG_FS is not set -CONFIG_SCSI_DC395x=m -CONFIG_SCSI_AM53C974=m -CONFIG_SCSI_WD719X=m -CONFIG_SCSI_DEBUG=m -CONFIG_SCSI_PMCRAID=m -CONFIG_SCSI_PM8001=m -CONFIG_SCSI_BFA_FC=m -CONFIG_SCSI_VIRTIO=m -CONFIG_SCSI_CHELSIO_FCOE=m -CONFIG_SCSI_LOWLEVEL_PCMCIA=y -CONFIG_PCMCIA_AHA152X=m -CONFIG_PCMCIA_QLOGIC=m -CONFIG_PCMCIA_SYM53C500=m -CONFIG_SCSI_DH=y -CONFIG_SCSI_DH_RDAC=m -CONFIG_SCSI_DH_HP_SW=m -CONFIG_SCSI_DH_EMC=m -CONFIG_SCSI_DH_ALUA=m -CONFIG_SCSI_OSD_INITIATOR=m -CONFIG_SCSI_OSD_ULD=m -CONFIG_SCSI_OSD_DPRINT_SENSE=1 -# CONFIG_SCSI_OSD_DEBUG is not set -CONFIG_ATA=y -CONFIG_ATA_VERBOSE_ERROR=y -CONFIG_ATA_ACPI=y -CONFIG_SATA_ZPODD=y -CONFIG_SATA_PMP=y - -# -# Controllers with non-SFF native interface -# -CONFIG_SATA_AHCI=m -CONFIG_SATA_MOBILE_LPM_POLICY=0 -CONFIG_SATA_AHCI_PLATFORM=m -CONFIG_SATA_INIC162X=m -CONFIG_SATA_ACARD_AHCI=m -CONFIG_SATA_SIL24=m -CONFIG_ATA_SFF=y - -# -# SFF controllers with custom DMA interface -# -CONFIG_PDC_ADMA=m -CONFIG_SATA_QSTOR=m -CONFIG_SATA_SX4=m -CONFIG_ATA_BMDMA=y - -# -# SATA SFF controllers with BMDMA -# -CONFIG_ATA_PIIX=y -CONFIG_SATA_DWC=m -# CONFIG_SATA_DWC_OLD_DMA is not set -# CONFIG_SATA_DWC_DEBUG is not set -CONFIG_SATA_MV=m -CONFIG_SATA_NV=m -CONFIG_SATA_PROMISE=m -CONFIG_SATA_SIL=m -CONFIG_SATA_SIS=m -CONFIG_SATA_SVW=m -CONFIG_SATA_ULI=m -CONFIG_SATA_VIA=m -CONFIG_SATA_VITESSE=m - -# -# PATA SFF controllers with BMDMA -# -CONFIG_PATA_ALI=m -CONFIG_PATA_AMD=m -CONFIG_PATA_ARTOP=m -CONFIG_PATA_ATIIXP=m -CONFIG_PATA_ATP867X=m -CONFIG_PATA_CMD64X=m -CONFIG_PATA_CYPRESS=m -CONFIG_PATA_EFAR=m -CONFIG_PATA_HPT366=m -CONFIG_PATA_HPT37X=m -CONFIG_PATA_HPT3X2N=m -CONFIG_PATA_HPT3X3=m -# CONFIG_PATA_HPT3X3_DMA is not set -CONFIG_PATA_IT8213=m -CONFIG_PATA_IT821X=m -CONFIG_PATA_JMICRON=m -CONFIG_PATA_MARVELL=m -CONFIG_PATA_NETCELL=m -CONFIG_PATA_NINJA32=m -CONFIG_PATA_NS87415=m -CONFIG_PATA_OLDPIIX=m -CONFIG_PATA_OPTIDMA=m -CONFIG_PATA_PDC2027X=m -CONFIG_PATA_PDC_OLD=m -CONFIG_PATA_RADISYS=m -CONFIG_PATA_RDC=m -CONFIG_PATA_SCH=m -CONFIG_PATA_SERVERWORKS=m -CONFIG_PATA_SIL680=m -CONFIG_PATA_SIS=y -CONFIG_PATA_TOSHIBA=m -CONFIG_PATA_TRIFLEX=m -CONFIG_PATA_VIA=m -CONFIG_PATA_WINBOND=m - -# -# PIO-only SFF controllers -# -CONFIG_PATA_CMD640_PCI=m -CONFIG_PATA_MPIIX=m -CONFIG_PATA_NS87410=m -CONFIG_PATA_OPTI=m -CONFIG_PATA_PCMCIA=m -CONFIG_PATA_PLATFORM=m -CONFIG_PATA_RZ1000=m - -# -# Generic fallback / legacy drivers -# -CONFIG_PATA_ACPI=m -CONFIG_ATA_GENERIC=y -CONFIG_PATA_LEGACY=m -CONFIG_MD=y -CONFIG_BLK_DEV_MD=y -CONFIG_MD_AUTODETECT=y -CONFIG_MD_LINEAR=m -CONFIG_MD_RAID0=m -CONFIG_MD_RAID1=m -CONFIG_MD_RAID10=m -CONFIG_MD_RAID456=m -CONFIG_MD_MULTIPATH=m -CONFIG_MD_FAULTY=m -CONFIG_MD_CLUSTER=m -CONFIG_BCACHE=m -# CONFIG_BCACHE_DEBUG is not set -# CONFIG_BCACHE_CLOSURES_DEBUG is not set -CONFIG_BLK_DEV_DM_BUILTIN=y -CONFIG_BLK_DEV_DM=y -# CONFIG_DM_MQ_DEFAULT is not set -# CONFIG_DM_DEBUG is not set -CONFIG_DM_BUFIO=m -# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set -CONFIG_DM_BIO_PRISON=m -CONFIG_DM_PERSISTENT_DATA=m -CONFIG_DM_UNSTRIPED=m -CONFIG_DM_CRYPT=m -CONFIG_DM_SNAPSHOT=m -CONFIG_DM_THIN_PROVISIONING=m -CONFIG_DM_CACHE=m -CONFIG_DM_CACHE_SMQ=m -CONFIG_DM_WRITECACHE=m -CONFIG_DM_ERA=m -CONFIG_DM_MIRROR=m -CONFIG_DM_LOG_USERSPACE=m -CONFIG_DM_RAID=m -CONFIG_DM_ZERO=m -CONFIG_DM_MULTIPATH=m -CONFIG_DM_MULTIPATH_QL=m -CONFIG_DM_MULTIPATH_ST=m -CONFIG_DM_DELAY=m -CONFIG_DM_UEVENT=y -CONFIG_DM_FLAKEY=m -CONFIG_DM_VERITY=m -# CONFIG_DM_VERITY_FEC is not set -CONFIG_DM_SWITCH=m -CONFIG_DM_LOG_WRITES=m -CONFIG_DM_INTEGRITY=m -CONFIG_DM_ZONED=m -CONFIG_TARGET_CORE=m -CONFIG_TCM_IBLOCK=m -CONFIG_TCM_FILEIO=m -CONFIG_TCM_PSCSI=m -CONFIG_TCM_USER2=m -CONFIG_LOOPBACK_TARGET=m -CONFIG_TCM_FC=m -CONFIG_ISCSI_TARGET=m -CONFIG_ISCSI_TARGET_CXGB4=m -CONFIG_SBP_TARGET=m -CONFIG_FUSION=y -CONFIG_FUSION_SPI=m -CONFIG_FUSION_FC=m -CONFIG_FUSION_SAS=m -CONFIG_FUSION_MAX_SGE=128 -CONFIG_FUSION_CTL=m -CONFIG_FUSION_LAN=m -CONFIG_FUSION_LOGGING=y - -# -# IEEE 1394 (FireWire) support -# -CONFIG_FIREWIRE=m -CONFIG_FIREWIRE_OHCI=m -CONFIG_FIREWIRE_SBP2=m -CONFIG_FIREWIRE_NET=m -CONFIG_FIREWIRE_NOSY=m -CONFIG_MACINTOSH_DRIVERS=y -CONFIG_MAC_EMUMOUSEBTN=m -CONFIG_NETDEVICES=y -CONFIG_MII=m -CONFIG_NET_CORE=y -CONFIG_BONDING=m -CONFIG_DUMMY=m -CONFIG_EQUALIZER=m -CONFIG_NET_FC=y -CONFIG_IFB=m -CONFIG_NET_TEAM=m -CONFIG_NET_TEAM_MODE_BROADCAST=m -CONFIG_NET_TEAM_MODE_ROUNDROBIN=m -CONFIG_NET_TEAM_MODE_RANDOM=m -CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m -CONFIG_NET_TEAM_MODE_LOADBALANCE=m -CONFIG_MACVLAN=m -CONFIG_MACVTAP=m -CONFIG_IPVLAN=m -CONFIG_IPVTAP=m -CONFIG_VXLAN=m -CONFIG_GENEVE=m -CONFIG_GTP=m -CONFIG_MACSEC=m -CONFIG_NETCONSOLE=m -CONFIG_NETCONSOLE_DYNAMIC=y -CONFIG_NETPOLL=y -CONFIG_NET_POLL_CONTROLLER=y -CONFIG_NTB_NETDEV=m -CONFIG_RIONET=m -CONFIG_RIONET_TX_SIZE=128 -CONFIG_RIONET_RX_SIZE=128 -CONFIG_TUN=y -CONFIG_TAP=m -# CONFIG_TUN_VNET_CROSS_LE is not set -CONFIG_VETH=m -CONFIG_VIRTIO_NET=y -CONFIG_NLMON=m -CONFIG_NET_VRF=m -CONFIG_VSOCKMON=m -CONFIG_SUNGEM_PHY=m -CONFIG_ARCNET=m -CONFIG_ARCNET_1201=m -CONFIG_ARCNET_1051=m -CONFIG_ARCNET_RAW=m -CONFIG_ARCNET_CAP=m -CONFIG_ARCNET_COM90xx=m -CONFIG_ARCNET_COM90xxIO=m -CONFIG_ARCNET_RIM_I=m -CONFIG_ARCNET_COM20020=m -CONFIG_ARCNET_COM20020_PCI=m -CONFIG_ARCNET_COM20020_CS=m -CONFIG_ATM_DRIVERS=y -CONFIG_ATM_DUMMY=m -CONFIG_ATM_TCP=m -CONFIG_ATM_LANAI=m -CONFIG_ATM_ENI=m -# CONFIG_ATM_ENI_DEBUG is not set -# CONFIG_ATM_ENI_TUNE_BURST is not set -CONFIG_ATM_FIRESTREAM=m -CONFIG_ATM_ZATM=m -# CONFIG_ATM_ZATM_DEBUG is not set -CONFIG_ATM_NICSTAR=m -# CONFIG_ATM_NICSTAR_USE_SUNI is not set -# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set -CONFIG_ATM_IDT77252=m -# CONFIG_ATM_IDT77252_DEBUG is not set -# CONFIG_ATM_IDT77252_RCV_ALL is not set -CONFIG_ATM_IDT77252_USE_SUNI=y -CONFIG_ATM_AMBASSADOR=m -# CONFIG_ATM_AMBASSADOR_DEBUG is not set -CONFIG_ATM_HORIZON=m -# CONFIG_ATM_HORIZON_DEBUG is not set -CONFIG_ATM_IA=m -# CONFIG_ATM_IA_DEBUG is not set -CONFIG_ATM_FORE200E=m -# CONFIG_ATM_FORE200E_USE_TASKLET is not set -CONFIG_ATM_FORE200E_TX_RETRY=16 -CONFIG_ATM_FORE200E_DEBUG=0 -CONFIG_ATM_HE=m -CONFIG_ATM_HE_USE_SUNI=y -CONFIG_ATM_SOLOS=m - -# -# CAIF transport drivers -# -CONFIG_CAIF_TTY=m -CONFIG_CAIF_SPI_SLAVE=m -# CONFIG_CAIF_SPI_SYNC is not set -CONFIG_CAIF_HSI=m -CONFIG_CAIF_VIRTIO=m - -# -# Distributed Switch Architecture drivers -# -CONFIG_B53=m -CONFIG_B53_SPI_DRIVER=m -CONFIG_B53_MDIO_DRIVER=m -CONFIG_B53_MMAP_DRIVER=m -CONFIG_B53_SRAB_DRIVER=m -# CONFIG_NET_DSA_LOOP is not set -CONFIG_NET_DSA_MT7530=m -CONFIG_NET_DSA_MV88E6060=m -CONFIG_MICROCHIP_KSZ=m -CONFIG_MICROCHIP_KSZ_SPI_DRIVER=m -CONFIG_NET_DSA_MV88E6XXX=m -CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y -# CONFIG_NET_DSA_MV88E6XXX_PTP is not set -CONFIG_NET_DSA_QCA8K=m -CONFIG_NET_DSA_SMSC_LAN9303=m -CONFIG_NET_DSA_SMSC_LAN9303_I2C=m -CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m -CONFIG_ETHERNET=y -CONFIG_MDIO=m -CONFIG_NET_VENDOR_3COM=y -CONFIG_PCMCIA_3C574=m -CONFIG_PCMCIA_3C589=m -CONFIG_VORTEX=m -CONFIG_TYPHOON=m -CONFIG_NET_VENDOR_ADAPTEC=y -CONFIG_ADAPTEC_STARFIRE=m -CONFIG_NET_VENDOR_AGERE=y -CONFIG_ET131X=m -CONFIG_NET_VENDOR_ALACRITECH=y -CONFIG_SLICOSS=m -CONFIG_NET_VENDOR_ALTEON=y -CONFIG_ACENIC=m -# CONFIG_ACENIC_OMIT_TIGON_I is not set -CONFIG_ALTERA_TSE=m -CONFIG_NET_VENDOR_AMAZON=y -CONFIG_ENA_ETHERNET=m -CONFIG_NET_VENDOR_AMD=y -CONFIG_AMD8111_ETH=m -CONFIG_PCNET32=m -CONFIG_PCMCIA_NMCLAN=m -CONFIG_AMD_XGBE=m -# CONFIG_AMD_XGBE_DCB is not set -CONFIG_AMD_XGBE_HAVE_ECC=y -CONFIG_NET_VENDOR_AQUANTIA=y -CONFIG_AQTION=m -CONFIG_NET_VENDOR_ARC=y -CONFIG_NET_VENDOR_ATHEROS=y -CONFIG_ATL2=m -CONFIG_ATL1=m -CONFIG_ATL1E=m -CONFIG_ATL1C=m -CONFIG_ALX=m -CONFIG_NET_VENDOR_AURORA=y -CONFIG_AURORA_NB8800=m -CONFIG_NET_VENDOR_BROADCOM=y -CONFIG_B44=m -CONFIG_B44_PCI_AUTOSELECT=y -CONFIG_B44_PCICORE_AUTOSELECT=y -CONFIG_B44_PCI=y -CONFIG_BNX2=m -CONFIG_CNIC=m -CONFIG_TIGON3=m -CONFIG_TIGON3_HWMON=y -CONFIG_BNX2X=m -CONFIG_BNX2X_SRIOV=y -CONFIG_BNXT=m -CONFIG_BNXT_SRIOV=y -CONFIG_BNXT_FLOWER_OFFLOAD=y -# CONFIG_BNXT_DCB is not set -CONFIG_NET_VENDOR_BROCADE=y -CONFIG_BNA=m -CONFIG_NET_CADENCE=y -CONFIG_MACB=m -CONFIG_MACB_USE_HWSTAMP=y -CONFIG_MACB_PCI=m -CONFIG_NET_VENDOR_CAVIUM=y -CONFIG_THUNDER_NIC_PF=m -CONFIG_THUNDER_NIC_VF=m -CONFIG_THUNDER_NIC_BGX=m -CONFIG_THUNDER_NIC_RGX=m -CONFIG_CAVIUM_PTP=m -CONFIG_LIQUIDIO=m -CONFIG_LIQUIDIO_VF=m -CONFIG_NET_VENDOR_CHELSIO=y -CONFIG_CHELSIO_T1=m -CONFIG_CHELSIO_T1_1G=y -CONFIG_CHELSIO_T3=m -CONFIG_CHELSIO_T4=m -CONFIG_CHELSIO_T4_DCB=y -CONFIG_CHELSIO_T4_FCOE=y -CONFIG_CHELSIO_T4VF=m -CONFIG_CHELSIO_LIB=m -CONFIG_NET_VENDOR_CISCO=y -CONFIG_ENIC=m -# CONFIG_NET_VENDOR_CORTINA is not set -CONFIG_CX_ECAT=m -CONFIG_DNET=m -CONFIG_NET_VENDOR_DEC=y -CONFIG_NET_TULIP=y -CONFIG_DE2104X=m -CONFIG_DE2104X_DSL=0 -CONFIG_TULIP=m -# CONFIG_TULIP_MWI is not set -# CONFIG_TULIP_MMIO is not set -# CONFIG_TULIP_NAPI is not set -CONFIG_DE4X5=m -CONFIG_WINBOND_840=m -CONFIG_DM9102=m -CONFIG_ULI526X=m -CONFIG_PCMCIA_XIRCOM=m -CONFIG_NET_VENDOR_DLINK=y -CONFIG_DL2K=m -CONFIG_SUNDANCE=m -# CONFIG_SUNDANCE_MMIO is not set -CONFIG_NET_VENDOR_EMULEX=y -CONFIG_BE2NET=m -CONFIG_BE2NET_HWMON=y -CONFIG_NET_VENDOR_EZCHIP=y -CONFIG_NET_VENDOR_FUJITSU=y -CONFIG_PCMCIA_FMVJ18X=m -CONFIG_NET_VENDOR_HP=y -CONFIG_HP100=m -CONFIG_NET_VENDOR_HUAWEI=y -CONFIG_HINIC=m -CONFIG_NET_VENDOR_I825XX=y -CONFIG_NET_VENDOR_INTEL=y -CONFIG_E100=m -CONFIG_E1000=m -CONFIG_E1000E=m -CONFIG_E1000E_HWTS=y -CONFIG_IGB=m -CONFIG_IGB_HWMON=y -CONFIG_IGB_DCA=y -CONFIG_IGBVF=m -CONFIG_IXGB=m -CONFIG_IXGBE=m -CONFIG_IXGBE_HWMON=y -CONFIG_IXGBE_DCA=y -CONFIG_IXGBE_DCB=y -CONFIG_IXGBEVF=m -CONFIG_I40E=m -CONFIG_I40E_DCB=y -CONFIG_I40EVF=m -CONFIG_ICE=m -CONFIG_FM10K=m -CONFIG_NET_VENDOR_EXAR=y -CONFIG_S2IO=m -CONFIG_VXGE=m -# CONFIG_VXGE_DEBUG_TRACE_ALL is not set -CONFIG_JME=m -CONFIG_NET_VENDOR_MARVELL=y -CONFIG_MVMDIO=m -CONFIG_SKGE=m -# CONFIG_SKGE_DEBUG is not set -CONFIG_SKGE_GENESIS=y -CONFIG_SKY2=m -# CONFIG_SKY2_DEBUG is not set -CONFIG_NET_VENDOR_MELLANOX=y -CONFIG_MLX4_EN=m -CONFIG_MLX4_EN_DCB=y -CONFIG_MLX4_CORE=m -CONFIG_MLX4_DEBUG=y -CONFIG_MLX4_CORE_GEN2=y -CONFIG_MLX5_CORE=m -# CONFIG_MLX5_FPGA is not set -CONFIG_MLX5_CORE_EN=y -CONFIG_MLX5_MPFS=y -CONFIG_MLX5_ESWITCH=y -CONFIG_MLX5_CORE_EN_DCB=y -# CONFIG_MLX5_CORE_IPOIB is not set -CONFIG_MLXSW_CORE=m -CONFIG_MLXSW_CORE_HWMON=y -CONFIG_MLXSW_CORE_THERMAL=y -CONFIG_MLXSW_PCI=m -CONFIG_MLXSW_I2C=m -CONFIG_MLXSW_SWITCHIB=m -CONFIG_MLXSW_SWITCHX2=m -CONFIG_MLXSW_SPECTRUM=m -CONFIG_MLXSW_SPECTRUM_DCB=y -CONFIG_MLXSW_MINIMAL=m -CONFIG_MLXFW=m -CONFIG_NET_VENDOR_MICREL=y -CONFIG_KS8842=m -CONFIG_KS8851=m -CONFIG_KS8851_MLL=m -CONFIG_KSZ884X_PCI=m -CONFIG_NET_VENDOR_MICROCHIP=y -CONFIG_ENC28J60=m -# CONFIG_ENC28J60_WRITEVERIFY is not set -CONFIG_ENCX24J600=m -CONFIG_LAN743X=m -CONFIG_NET_VENDOR_MICROSEMI=y -CONFIG_MSCC_OCELOT_SWITCH=m -CONFIG_MSCC_OCELOT_SWITCH_OCELOT=m -CONFIG_NET_VENDOR_MYRI=y -CONFIG_MYRI10GE=m -CONFIG_MYRI10GE_DCA=y -CONFIG_FEALNX=m -CONFIG_NET_VENDOR_NATSEMI=y -CONFIG_NATSEMI=m -CONFIG_NS83820=m -CONFIG_NET_VENDOR_NETRONOME=y -CONFIG_NFP=m -# CONFIG_NFP_APP_FLOWER is not set -CONFIG_NFP_APP_ABM_NIC=y -# CONFIG_NFP_DEBUG is not set -CONFIG_NET_VENDOR_NI=y -CONFIG_NET_VENDOR_8390=y -CONFIG_PCMCIA_AXNET=m -CONFIG_NE2K_PCI=m -CONFIG_PCMCIA_PCNET=m -CONFIG_NET_VENDOR_NVIDIA=y -CONFIG_FORCEDETH=m -CONFIG_NET_VENDOR_OKI=y -CONFIG_ETHOC=m -CONFIG_NET_PACKET_ENGINE=y -CONFIG_HAMACHI=m -CONFIG_YELLOWFIN=m -CONFIG_NET_VENDOR_QLOGIC=y -CONFIG_QLA3XXX=m -CONFIG_QLCNIC=m -CONFIG_QLCNIC_SRIOV=y -CONFIG_QLCNIC_DCB=y -CONFIG_QLCNIC_HWMON=y -CONFIG_QLGE=m -CONFIG_NETXEN_NIC=m -CONFIG_QED=m -CONFIG_QED_LL2=y -CONFIG_QED_SRIOV=y -CONFIG_QEDE=m -CONFIG_QED_RDMA=y -CONFIG_QED_ISCSI=y -CONFIG_QED_FCOE=y -CONFIG_QED_OOO=y -CONFIG_NET_VENDOR_QUALCOMM=y -CONFIG_QCOM_EMAC=m -CONFIG_RMNET=m -CONFIG_NET_VENDOR_RDC=y -CONFIG_R6040=m -CONFIG_NET_VENDOR_REALTEK=y -CONFIG_ATP=m -CONFIG_8139CP=m -CONFIG_8139TOO=m -CONFIG_8139TOO_PIO=y -# CONFIG_8139TOO_TUNE_TWISTER is not set -CONFIG_8139TOO_8129=y -# CONFIG_8139_OLD_RX_RESET is not set -CONFIG_R8169=m -CONFIG_NET_VENDOR_RENESAS=y -CONFIG_NET_VENDOR_ROCKER=y -CONFIG_ROCKER=m -CONFIG_NET_VENDOR_SAMSUNG=y -CONFIG_SXGBE_ETH=m -CONFIG_NET_VENDOR_SEEQ=y -CONFIG_NET_VENDOR_SOLARFLARE=y -CONFIG_SFC=m -CONFIG_SFC_MTD=y -CONFIG_SFC_MCDI_MON=y -CONFIG_SFC_SRIOV=y -CONFIG_SFC_MCDI_LOGGING=y -CONFIG_SFC_FALCON=m -CONFIG_SFC_FALCON_MTD=y -CONFIG_NET_VENDOR_SILAN=y -CONFIG_SC92031=m -CONFIG_NET_VENDOR_SIS=y -CONFIG_SIS900=m -CONFIG_SIS190=m -CONFIG_NET_VENDOR_SMSC=y -CONFIG_PCMCIA_SMC91C92=m -CONFIG_EPIC100=m -CONFIG_SMSC911X=m -CONFIG_SMSC9420=m -# CONFIG_NET_VENDOR_SOCIONEXT is not set -CONFIG_NET_VENDOR_STMICRO=y -CONFIG_STMMAC_ETH=m -CONFIG_STMMAC_PLATFORM=m -CONFIG_DWMAC_GENERIC=m -# CONFIG_STMMAC_PCI is not set -CONFIG_NET_VENDOR_SUN=y -CONFIG_HAPPYMEAL=m -CONFIG_SUNGEM=m -CONFIG_CASSINI=m -CONFIG_NIU=m -CONFIG_NET_VENDOR_SYNOPSYS=y -CONFIG_DWC_XLGMAC=m -CONFIG_DWC_XLGMAC_PCI=m -CONFIG_NET_VENDOR_TEHUTI=y -CONFIG_TEHUTI=m -CONFIG_NET_VENDOR_TI=y -CONFIG_TI_CPSW_ALE=m -CONFIG_TLAN=m -CONFIG_NET_VENDOR_VIA=y -CONFIG_VIA_RHINE=m -CONFIG_VIA_RHINE_MMIO=y -CONFIG_VIA_VELOCITY=m -CONFIG_NET_VENDOR_WIZNET=y -CONFIG_WIZNET_W5100=m -CONFIG_WIZNET_W5300=m -# CONFIG_WIZNET_BUS_DIRECT is not set -# CONFIG_WIZNET_BUS_INDIRECT is not set -CONFIG_WIZNET_BUS_ANY=y -# CONFIG_WIZNET_W5100_SPI is not set -CONFIG_NET_VENDOR_XIRCOM=y -CONFIG_PCMCIA_XIRC2PS=m -CONFIG_FDDI=y -CONFIG_DEFXX=m -# CONFIG_DEFXX_MMIO is not set -CONFIG_SKFP=m -# CONFIG_HIPPI is not set -CONFIG_NET_SB1000=m -CONFIG_MDIO_DEVICE=y -CONFIG_MDIO_BUS=y -CONFIG_MDIO_BITBANG=m -CONFIG_MDIO_CAVIUM=m -CONFIG_MDIO_GPIO=m -CONFIG_MDIO_I2C=m -CONFIG_MDIO_MSCC_MIIM=m -CONFIG_MDIO_THUNDER=m -CONFIG_PHYLINK=m -CONFIG_PHYLIB=y -CONFIG_SWPHY=y -# CONFIG_LED_TRIGGER_PHY is not set - -# -# MII PHY device drivers -# -CONFIG_SFP=m -CONFIG_AMD_PHY=m -CONFIG_AQUANTIA_PHY=m -CONFIG_ASIX_PHY=m -CONFIG_AT803X_PHY=m -CONFIG_BCM7XXX_PHY=m -CONFIG_BCM87XX_PHY=m -CONFIG_BCM_NET_PHYLIB=m -CONFIG_BROADCOM_PHY=m -CONFIG_CICADA_PHY=m -CONFIG_CORTINA_PHY=m -CONFIG_DAVICOM_PHY=m -CONFIG_DP83822_PHY=m -CONFIG_DP83TC811_PHY=m -CONFIG_DP83848_PHY=m -CONFIG_DP83867_PHY=m -CONFIG_FIXED_PHY=y -CONFIG_ICPLUS_PHY=m -CONFIG_INTEL_XWAY_PHY=m -CONFIG_LSI_ET1011C_PHY=m -CONFIG_LXT_PHY=m -CONFIG_MARVELL_PHY=m -CONFIG_MARVELL_10G_PHY=m -CONFIG_MICREL_PHY=m -CONFIG_MICROCHIP_PHY=m -CONFIG_MICROCHIP_T1_PHY=m -CONFIG_MICROSEMI_PHY=m -CONFIG_NATIONAL_PHY=m -CONFIG_QSEMI_PHY=m -CONFIG_REALTEK_PHY=m -CONFIG_RENESAS_PHY=m -CONFIG_ROCKCHIP_PHY=m -CONFIG_SMSC_PHY=m -CONFIG_STE10XP=m -CONFIG_TERANETICS_PHY=m -CONFIG_VITESSE_PHY=m -CONFIG_XILINX_GMII2RGMII=m -CONFIG_MICREL_KS8995MA=m -CONFIG_PLIP=m -CONFIG_PPP=y -CONFIG_PPP_BSDCOMP=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_FILTER=y -CONFIG_PPP_MPPE=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPPOATM=m -CONFIG_PPPOE=m -CONFIG_PPTP=m -CONFIG_PPPOL2TP=m -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_SLIP=m -CONFIG_SLHC=y -CONFIG_SLIP_COMPRESSED=y -CONFIG_SLIP_SMART=y -CONFIG_SLIP_MODE_SLIP6=y -CONFIG_USB_NET_DRIVERS=m -CONFIG_USB_CATC=m -CONFIG_USB_KAWETH=m -CONFIG_USB_PEGASUS=m -CONFIG_USB_RTL8150=m -CONFIG_USB_RTL8152=m -CONFIG_USB_LAN78XX=m -CONFIG_USB_USBNET=m -CONFIG_USB_NET_AX8817X=m -CONFIG_USB_NET_AX88179_178A=m -CONFIG_USB_NET_CDCETHER=m -CONFIG_USB_NET_CDC_EEM=m -CONFIG_USB_NET_CDC_NCM=m -CONFIG_USB_NET_HUAWEI_CDC_NCM=m -CONFIG_USB_NET_CDC_MBIM=m -CONFIG_USB_NET_DM9601=m -CONFIG_USB_NET_SR9700=m -CONFIG_USB_NET_SR9800=m -CONFIG_USB_NET_SMSC75XX=m -CONFIG_USB_NET_SMSC95XX=m -CONFIG_USB_NET_GL620A=m -CONFIG_USB_NET_NET1080=m -CONFIG_USB_NET_PLUSB=m -CONFIG_USB_NET_MCS7830=m -CONFIG_USB_NET_RNDIS_HOST=m -CONFIG_USB_NET_CDC_SUBSET_ENABLE=m -CONFIG_USB_NET_CDC_SUBSET=m -CONFIG_USB_ALI_M5632=y -CONFIG_USB_AN2720=y -CONFIG_USB_BELKIN=y -CONFIG_USB_ARMLINUX=y -CONFIG_USB_EPSON2888=y -CONFIG_USB_KC2190=y -CONFIG_USB_NET_ZAURUS=m -CONFIG_USB_NET_CX82310_ETH=m -CONFIG_USB_NET_KALMIA=m -CONFIG_USB_NET_QMI_WWAN=m -CONFIG_USB_HSO=m -CONFIG_USB_NET_INT51X1=m -CONFIG_USB_CDC_PHONET=m -CONFIG_USB_IPHETH=m -CONFIG_USB_SIERRA_NET=m -CONFIG_USB_VL600=m -CONFIG_USB_NET_CH9200=m -CONFIG_WLAN=y -# CONFIG_WIRELESS_WDS is not set -CONFIG_WLAN_VENDOR_ADMTEK=y -CONFIG_ADM8211=m -CONFIG_ATH_COMMON=m -CONFIG_WLAN_VENDOR_ATH=y -# CONFIG_ATH_DEBUG is not set -CONFIG_ATH5K=m -# CONFIG_ATH5K_DEBUG is not set -# CONFIG_ATH5K_TRACER is not set -CONFIG_ATH5K_PCI=y -CONFIG_ATH9K_HW=m -CONFIG_ATH9K_COMMON=m -CONFIG_ATH9K_COMMON_DEBUG=y -CONFIG_ATH9K_BTCOEX_SUPPORT=y -CONFIG_ATH9K=m -CONFIG_ATH9K_PCI=y -CONFIG_ATH9K_AHB=y -CONFIG_ATH9K_DEBUGFS=y -CONFIG_ATH9K_STATION_STATISTICS=y -# CONFIG_ATH9K_DYNACK is not set -CONFIG_ATH9K_WOW=y -CONFIG_ATH9K_RFKILL=y -CONFIG_ATH9K_CHANNEL_CONTEXT=y -CONFIG_ATH9K_PCOEM=y -CONFIG_ATH9K_HTC=m -CONFIG_ATH9K_HTC_DEBUGFS=y -CONFIG_ATH9K_HWRNG=y -# CONFIG_ATH9K_COMMON_SPECTRAL is not set -CONFIG_CARL9170=m -CONFIG_CARL9170_LEDS=y -# CONFIG_CARL9170_DEBUGFS is not set -CONFIG_CARL9170_WPC=y -CONFIG_CARL9170_HWRNG=y -CONFIG_ATH6KL=m -CONFIG_ATH6KL_SDIO=m -CONFIG_ATH6KL_USB=m -# CONFIG_ATH6KL_DEBUG is not set -# CONFIG_ATH6KL_TRACING is not set -CONFIG_AR5523=m -CONFIG_WIL6210=m -CONFIG_WIL6210_ISR_COR=y -CONFIG_WIL6210_TRACING=y -CONFIG_WIL6210_DEBUGFS=y -CONFIG_ATH10K=m -CONFIG_ATH10K_CE=y -CONFIG_ATH10K_PCI=m -CONFIG_ATH10K_SDIO=m -CONFIG_ATH10K_USB=m -# CONFIG_ATH10K_DEBUG is not set -CONFIG_ATH10K_DEBUGFS=y -# CONFIG_ATH10K_SPECTRAL is not set -CONFIG_ATH10K_TRACING=y -CONFIG_WCN36XX=m -# CONFIG_WCN36XX_DEBUGFS is not set -CONFIG_WLAN_VENDOR_ATMEL=y -CONFIG_ATMEL=m -CONFIG_PCI_ATMEL=m -CONFIG_PCMCIA_ATMEL=m -CONFIG_AT76C50X_USB=m -CONFIG_WLAN_VENDOR_BROADCOM=y -CONFIG_B43=m -CONFIG_B43_BCMA=y -CONFIG_B43_SSB=y -CONFIG_B43_BUSES_BCMA_AND_SSB=y -# CONFIG_B43_BUSES_BCMA is not set -# CONFIG_B43_BUSES_SSB is not set -CONFIG_B43_PCI_AUTOSELECT=y -CONFIG_B43_PCICORE_AUTOSELECT=y -# CONFIG_B43_SDIO is not set -CONFIG_B43_BCMA_PIO=y -CONFIG_B43_PIO=y -CONFIG_B43_PHY_G=y -CONFIG_B43_PHY_N=y -CONFIG_B43_PHY_LP=y -CONFIG_B43_PHY_HT=y -CONFIG_B43_LEDS=y -CONFIG_B43_HWRNG=y -# CONFIG_B43_DEBUG is not set -CONFIG_B43LEGACY=m -CONFIG_B43LEGACY_PCI_AUTOSELECT=y -CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y -CONFIG_B43LEGACY_LEDS=y -CONFIG_B43LEGACY_HWRNG=y -# CONFIG_B43LEGACY_DEBUG is not set -CONFIG_B43LEGACY_DMA=y -CONFIG_B43LEGACY_PIO=y -CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y -# CONFIG_B43LEGACY_DMA_MODE is not set -# CONFIG_B43LEGACY_PIO_MODE is not set -CONFIG_BRCMUTIL=m -CONFIG_BRCMSMAC=m -CONFIG_BRCMFMAC=m -CONFIG_BRCMFMAC_PROTO_BCDC=y -CONFIG_BRCMFMAC_PROTO_MSGBUF=y -CONFIG_BRCMFMAC_SDIO=y -CONFIG_BRCMFMAC_USB=y -CONFIG_BRCMFMAC_PCIE=y -CONFIG_BRCM_TRACING=y -# CONFIG_BRCMDBG is not set -CONFIG_WLAN_VENDOR_CISCO=y -CONFIG_AIRO=m -CONFIG_AIRO_CS=m -CONFIG_WLAN_VENDOR_INTEL=y -CONFIG_IPW2100=m -CONFIG_IPW2100_MONITOR=y -# CONFIG_IPW2100_DEBUG is not set -CONFIG_IPW2200=m -CONFIG_IPW2200_MONITOR=y -CONFIG_IPW2200_RADIOTAP=y -CONFIG_IPW2200_PROMISCUOUS=y -CONFIG_IPW2200_QOS=y -# CONFIG_IPW2200_DEBUG is not set -CONFIG_LIBIPW=m -# CONFIG_LIBIPW_DEBUG is not set -CONFIG_IWLEGACY=m -CONFIG_IWL4965=m -CONFIG_IWL3945=m - -# -# iwl3945 / iwl4965 Debugging Options -# -# CONFIG_IWLEGACY_DEBUG is not set -CONFIG_IWLEGACY_DEBUGFS=y -CONFIG_IWLWIFI=m -CONFIG_IWLWIFI_LEDS=y -CONFIG_IWLDVM=m -CONFIG_IWLMVM=m -CONFIG_IWLWIFI_OPMODE_MODULAR=y -# CONFIG_IWLWIFI_BCAST_FILTERING is not set -# CONFIG_IWLWIFI_PCIE_RTPM is not set - -# -# Debugging Options -# -# CONFIG_IWLWIFI_DEBUG is not set -CONFIG_IWLWIFI_DEBUGFS=y -CONFIG_IWLWIFI_DEVICE_TRACING=y -CONFIG_WLAN_VENDOR_INTERSIL=y -CONFIG_HOSTAP=m -CONFIG_HOSTAP_FIRMWARE=y -CONFIG_HOSTAP_FIRMWARE_NVRAM=y -CONFIG_HOSTAP_PLX=m -CONFIG_HOSTAP_PCI=m -CONFIG_HOSTAP_CS=m -CONFIG_HERMES=m -# CONFIG_HERMES_PRISM is not set -CONFIG_HERMES_CACHE_FW_ON_INIT=y -CONFIG_PLX_HERMES=m -CONFIG_TMD_HERMES=m -CONFIG_NORTEL_HERMES=m -CONFIG_PCMCIA_HERMES=m -CONFIG_PCMCIA_SPECTRUM=m -CONFIG_ORINOCO_USB=m -CONFIG_P54_COMMON=m -CONFIG_P54_USB=m -CONFIG_P54_PCI=m -CONFIG_P54_SPI=m -# CONFIG_P54_SPI_DEFAULT_EEPROM is not set -CONFIG_P54_LEDS=y -# CONFIG_PRISM54 is not set -CONFIG_WLAN_VENDOR_MARVELL=y -CONFIG_LIBERTAS=m -CONFIG_LIBERTAS_USB=m -CONFIG_LIBERTAS_CS=m -CONFIG_LIBERTAS_SDIO=m -CONFIG_LIBERTAS_SPI=m -# CONFIG_LIBERTAS_DEBUG is not set -CONFIG_LIBERTAS_MESH=y -CONFIG_LIBERTAS_THINFIRM=m -# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set -CONFIG_LIBERTAS_THINFIRM_USB=m -CONFIG_MWIFIEX=m -CONFIG_MWIFIEX_SDIO=m -CONFIG_MWIFIEX_PCIE=m -CONFIG_MWIFIEX_USB=m -CONFIG_MWL8K=m -CONFIG_WLAN_VENDOR_MEDIATEK=y -CONFIG_MT7601U=m -CONFIG_MT76_CORE=m -CONFIG_MT76x2E=m -CONFIG_WLAN_VENDOR_RALINK=y -CONFIG_RT2X00=m -CONFIG_RT2400PCI=m -CONFIG_RT2500PCI=m -CONFIG_RT61PCI=m -CONFIG_RT2800PCI=m -CONFIG_RT2800PCI_RT33XX=y -CONFIG_RT2800PCI_RT35XX=y -CONFIG_RT2800PCI_RT53XX=y -CONFIG_RT2800PCI_RT3290=y -CONFIG_RT2500USB=m -CONFIG_RT73USB=m -CONFIG_RT2800USB=m -CONFIG_RT2800USB_RT33XX=y -CONFIG_RT2800USB_RT35XX=y -CONFIG_RT2800USB_RT3573=y -CONFIG_RT2800USB_RT53XX=y -CONFIG_RT2800USB_RT55XX=y -CONFIG_RT2800USB_UNKNOWN=y -CONFIG_RT2800_LIB=m -CONFIG_RT2800_LIB_MMIO=m -CONFIG_RT2X00_LIB_MMIO=m -CONFIG_RT2X00_LIB_PCI=m -CONFIG_RT2X00_LIB_USB=m -CONFIG_RT2X00_LIB=m -CONFIG_RT2X00_LIB_FIRMWARE=y -CONFIG_RT2X00_LIB_CRYPTO=y -CONFIG_RT2X00_LIB_LEDS=y -# CONFIG_RT2X00_LIB_DEBUGFS is not set -# CONFIG_RT2X00_DEBUG is not set -CONFIG_WLAN_VENDOR_REALTEK=y -CONFIG_RTL8180=m -CONFIG_RTL8187=m -CONFIG_RTL8187_LEDS=y -CONFIG_RTL_CARDS=m -CONFIG_RTL8192CE=m -CONFIG_RTL8192SE=m -CONFIG_RTL8192DE=m -CONFIG_RTL8723AE=m -CONFIG_RTL8723BE=m -CONFIG_RTL8188EE=m -CONFIG_RTL8192EE=m -CONFIG_RTL8821AE=m -CONFIG_RTL8192CU=m -CONFIG_RTLWIFI=m -CONFIG_RTLWIFI_PCI=m -CONFIG_RTLWIFI_USB=m -# CONFIG_RTLWIFI_DEBUG is not set -CONFIG_RTL8192C_COMMON=m -CONFIG_RTL8723_COMMON=m -CONFIG_RTLBTCOEXIST=m -CONFIG_RTL8XXXU=m -CONFIG_RTL8XXXU_UNTESTED=y -CONFIG_WLAN_VENDOR_RSI=y -CONFIG_RSI_91X=m -# CONFIG_RSI_DEBUGFS is not set -CONFIG_RSI_SDIO=m -CONFIG_RSI_USB=m -CONFIG_RSI_COEX=y -CONFIG_WLAN_VENDOR_ST=y -CONFIG_CW1200=m -CONFIG_CW1200_WLAN_SDIO=m -CONFIG_CW1200_WLAN_SPI=m -CONFIG_WLAN_VENDOR_TI=y -CONFIG_WL1251=m -CONFIG_WL1251_SPI=m -CONFIG_WL1251_SDIO=m -CONFIG_WL12XX=m -CONFIG_WL18XX=m -CONFIG_WLCORE=m -CONFIG_WLCORE_SDIO=m -CONFIG_WILINK_PLATFORM_DATA=y -CONFIG_WLAN_VENDOR_ZYDAS=y -CONFIG_USB_ZD1201=m -CONFIG_ZD1211RW=m -# CONFIG_ZD1211RW_DEBUG is not set -CONFIG_WLAN_VENDOR_QUANTENNA=y -CONFIG_QTNFMAC=m -CONFIG_QTNFMAC_PEARL_PCIE=m -CONFIG_PCMCIA_RAYCS=m -CONFIG_PCMCIA_WL3501=m -CONFIG_MAC80211_HWSIM=m -CONFIG_USB_NET_RNDIS_WLAN=m - -# -# WiMAX Wireless Broadband devices -# -CONFIG_WIMAX_I2400M=m -CONFIG_WIMAX_I2400M_USB=m -CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 -CONFIG_WAN=y -CONFIG_LANMEDIA=m -CONFIG_HDLC=m -CONFIG_HDLC_RAW=m -CONFIG_HDLC_RAW_ETH=m -CONFIG_HDLC_CISCO=m -CONFIG_HDLC_FR=m -CONFIG_HDLC_PPP=m -CONFIG_HDLC_X25=m -CONFIG_PCI200SYN=m -CONFIG_WANXL=m -CONFIG_PC300TOO=m -CONFIG_FARSYNC=m -CONFIG_DSCC4=m -CONFIG_DSCC4_PCISYNC=y -CONFIG_DSCC4_PCI_RST=y -CONFIG_DLCI=m -CONFIG_DLCI_MAX=8 -CONFIG_LAPBETHER=m -CONFIG_X25_ASY=m -CONFIG_SBNI=m -# CONFIG_SBNI_MULTILINE is not set -CONFIG_IEEE802154_DRIVERS=m -CONFIG_IEEE802154_FAKELB=m -CONFIG_IEEE802154_AT86RF230=m -CONFIG_IEEE802154_AT86RF230_DEBUGFS=y -CONFIG_IEEE802154_MRF24J40=m -CONFIG_IEEE802154_CC2520=m -CONFIG_IEEE802154_ATUSB=m -CONFIG_IEEE802154_ADF7242=m -CONFIG_IEEE802154_CA8210=m -# CONFIG_IEEE802154_CA8210_DEBUGFS is not set -CONFIG_IEEE802154_MCR20A=m -CONFIG_XEN_NETDEV_FRONTEND=y -CONFIG_XEN_NETDEV_BACKEND=m -CONFIG_VMXNET3=m -CONFIG_FUJITSU_ES=m -CONFIG_THUNDERBOLT_NET=m -CONFIG_HYPERV_NET=m -CONFIG_NETDEVSIM=m -CONFIG_NET_FAILOVER=y -CONFIG_ISDN=y -CONFIG_ISDN_I4L=m -CONFIG_ISDN_PPP=y -CONFIG_ISDN_PPP_VJ=y -CONFIG_ISDN_MPP=y -CONFIG_IPPP_FILTER=y -CONFIG_ISDN_PPP_BSDCOMP=m -CONFIG_ISDN_AUDIO=y -CONFIG_ISDN_TTY_FAX=y -CONFIG_ISDN_X25=y - -# -# ISDN feature submodules -# -CONFIG_ISDN_DIVERSION=m - -# -# ISDN4Linux hardware drivers -# - -# -# Passive cards -# -CONFIG_ISDN_DRV_HISAX=m - -# -# D-channel protocol features -# -CONFIG_HISAX_EURO=y -CONFIG_DE_AOC=y -# CONFIG_HISAX_NO_SENDCOMPLETE is not set -# CONFIG_HISAX_NO_LLC is not set -# CONFIG_HISAX_NO_KEYPAD is not set -CONFIG_HISAX_1TR6=y -CONFIG_HISAX_NI1=y -CONFIG_HISAX_MAX_CARDS=8 - -# -# HiSax supported cards -# -CONFIG_HISAX_16_3=y -CONFIG_HISAX_TELESPCI=y -CONFIG_HISAX_S0BOX=y -CONFIG_HISAX_FRITZPCI=y -CONFIG_HISAX_AVM_A1_PCMCIA=y -CONFIG_HISAX_ELSA=y -CONFIG_HISAX_DIEHLDIVA=y -CONFIG_HISAX_SEDLBAUER=y -CONFIG_HISAX_NETJET=y -CONFIG_HISAX_NETJET_U=y -CONFIG_HISAX_NICCY=y -CONFIG_HISAX_BKM_A4T=y -CONFIG_HISAX_SCT_QUADRO=y -CONFIG_HISAX_GAZEL=y -CONFIG_HISAX_HFC_PCI=y -CONFIG_HISAX_W6692=y -CONFIG_HISAX_HFC_SX=y -CONFIG_HISAX_ENTERNOW_PCI=y -# CONFIG_HISAX_DEBUG is not set - -# -# HiSax PCMCIA card service modules -# -CONFIG_HISAX_SEDLBAUER_CS=m -CONFIG_HISAX_ELSA_CS=m -CONFIG_HISAX_AVM_A1_CS=m -CONFIG_HISAX_TELES_CS=m - -# -# HiSax sub driver modules -# -CONFIG_HISAX_ST5481=m -CONFIG_HISAX_HFCUSB=m -CONFIG_HISAX_HFC4S8S=m -CONFIG_HISAX_FRITZ_PCIPNP=m -CONFIG_ISDN_CAPI=m -CONFIG_CAPI_TRACE=y -CONFIG_ISDN_CAPI_CAPI20=m -CONFIG_ISDN_CAPI_MIDDLEWARE=y -CONFIG_ISDN_CAPI_CAPIDRV=m -# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set - -# -# CAPI hardware drivers -# -CONFIG_CAPI_AVM=y -CONFIG_ISDN_DRV_AVMB1_B1PCI=m -CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y -CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m -CONFIG_ISDN_DRV_AVMB1_AVM_CS=m -CONFIG_ISDN_DRV_AVMB1_T1PCI=m -CONFIG_ISDN_DRV_AVMB1_C4=m -CONFIG_CAPI_EICON=y -CONFIG_ISDN_DIVAS=m -CONFIG_ISDN_DIVAS_BRIPCI=y -CONFIG_ISDN_DIVAS_PRIPCI=y -CONFIG_ISDN_DIVAS_DIVACAPI=m -CONFIG_ISDN_DIVAS_USERIDI=m -CONFIG_ISDN_DIVAS_MAINT=m -CONFIG_ISDN_DRV_GIGASET=m -# CONFIG_GIGASET_CAPI is not set -CONFIG_GIGASET_I4L=y -CONFIG_GIGASET_BASE=m -CONFIG_GIGASET_M105=m -CONFIG_GIGASET_M101=m -# CONFIG_GIGASET_DEBUG is not set -CONFIG_HYSDN=m -CONFIG_HYSDN_CAPI=y -CONFIG_MISDN=m -CONFIG_MISDN_DSP=m -CONFIG_MISDN_L1OIP=m - -# -# mISDN hardware drivers -# -CONFIG_MISDN_HFCPCI=m -CONFIG_MISDN_HFCMULTI=m -CONFIG_MISDN_HFCUSB=m -CONFIG_MISDN_AVMFRITZ=m -CONFIG_MISDN_SPEEDFAX=m -CONFIG_MISDN_INFINEON=m -CONFIG_MISDN_W6692=m -CONFIG_MISDN_NETJET=m -CONFIG_MISDN_IPAC=m -CONFIG_MISDN_ISAR=m -CONFIG_ISDN_HDLC=m -CONFIG_NVM=y -# CONFIG_NVM_DEBUG is not set -CONFIG_NVM_PBLK=m - -# -# Input device support -# -CONFIG_INPUT=y -CONFIG_INPUT_LEDS=m -CONFIG_INPUT_FF_MEMLESS=m -CONFIG_INPUT_POLLDEV=m -CONFIG_INPUT_SPARSEKMAP=m -CONFIG_INPUT_MATRIXKMAP=m - -# -# Userland interfaces -# -CONFIG_INPUT_MOUSEDEV=y -CONFIG_INPUT_MOUSEDEV_PSAUX=y -CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 -CONFIG_INPUT_JOYDEV=m -CONFIG_INPUT_EVDEV=y -# CONFIG_INPUT_EVBUG is not set - -# -# Input Device Drivers -# -CONFIG_INPUT_KEYBOARD=y -CONFIG_KEYBOARD_ADC=m -CONFIG_KEYBOARD_ADP5520=m -CONFIG_KEYBOARD_ADP5588=m -CONFIG_KEYBOARD_ADP5589=m -CONFIG_KEYBOARD_ATKBD=y -CONFIG_KEYBOARD_QT1070=m -CONFIG_KEYBOARD_QT2160=m -CONFIG_KEYBOARD_DLINK_DIR685=m -CONFIG_KEYBOARD_LKKBD=m -CONFIG_KEYBOARD_GPIO=m -CONFIG_KEYBOARD_GPIO_POLLED=m -CONFIG_KEYBOARD_TCA6416=m -CONFIG_KEYBOARD_TCA8418=m -CONFIG_KEYBOARD_MATRIX=m -CONFIG_KEYBOARD_LM8323=m -CONFIG_KEYBOARD_LM8333=m -CONFIG_KEYBOARD_MAX7359=m -CONFIG_KEYBOARD_MCS=m -CONFIG_KEYBOARD_MPR121=m -CONFIG_KEYBOARD_NEWTON=m -CONFIG_KEYBOARD_OPENCORES=m -CONFIG_KEYBOARD_SAMSUNG=m -CONFIG_KEYBOARD_STOWAWAY=m -CONFIG_KEYBOARD_SUNKBD=m -CONFIG_KEYBOARD_TM2_TOUCHKEY=m -CONFIG_KEYBOARD_TWL4030=m -CONFIG_KEYBOARD_XTKBD=m -CONFIG_KEYBOARD_CROS_EC=m -CONFIG_KEYBOARD_MTK_PMIC=m -CONFIG_INPUT_MOUSE=y -CONFIG_MOUSE_PS2=m -CONFIG_MOUSE_PS2_ALPS=y -CONFIG_MOUSE_PS2_BYD=y -CONFIG_MOUSE_PS2_LOGIPS2PP=y -CONFIG_MOUSE_PS2_SYNAPTICS=y -CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y -CONFIG_MOUSE_PS2_CYPRESS=y -CONFIG_MOUSE_PS2_LIFEBOOK=y -CONFIG_MOUSE_PS2_TRACKPOINT=y -CONFIG_MOUSE_PS2_ELANTECH=y -CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y -CONFIG_MOUSE_PS2_SENTELIC=y -CONFIG_MOUSE_PS2_TOUCHKIT=y -CONFIG_MOUSE_PS2_FOCALTECH=y -CONFIG_MOUSE_PS2_VMMOUSE=y -CONFIG_MOUSE_PS2_SMBUS=y -CONFIG_MOUSE_SERIAL=m -CONFIG_MOUSE_APPLETOUCH=m -CONFIG_MOUSE_BCM5974=m -CONFIG_MOUSE_CYAPA=m -CONFIG_MOUSE_ELAN_I2C=m -CONFIG_MOUSE_ELAN_I2C_I2C=y -CONFIG_MOUSE_ELAN_I2C_SMBUS=y -CONFIG_MOUSE_VSXXXAA=m -CONFIG_MOUSE_GPIO=m -CONFIG_MOUSE_SYNAPTICS_I2C=m -CONFIG_MOUSE_SYNAPTICS_USB=m -CONFIG_INPUT_JOYSTICK=y -CONFIG_JOYSTICK_ANALOG=m -CONFIG_JOYSTICK_A3D=m -CONFIG_JOYSTICK_ADI=m -CONFIG_JOYSTICK_COBRA=m -CONFIG_JOYSTICK_GF2K=m -CONFIG_JOYSTICK_GRIP=m -CONFIG_JOYSTICK_GRIP_MP=m -CONFIG_JOYSTICK_GUILLEMOT=m -CONFIG_JOYSTICK_INTERACT=m -CONFIG_JOYSTICK_SIDEWINDER=m -CONFIG_JOYSTICK_TMDC=m -CONFIG_JOYSTICK_IFORCE=m -CONFIG_JOYSTICK_IFORCE_USB=y -CONFIG_JOYSTICK_IFORCE_232=y -CONFIG_JOYSTICK_WARRIOR=m -CONFIG_JOYSTICK_MAGELLAN=m -CONFIG_JOYSTICK_SPACEORB=m -CONFIG_JOYSTICK_SPACEBALL=m -CONFIG_JOYSTICK_STINGER=m -CONFIG_JOYSTICK_TWIDJOY=m -CONFIG_JOYSTICK_ZHENHUA=m -CONFIG_JOYSTICK_DB9=m -CONFIG_JOYSTICK_GAMECON=m -CONFIG_JOYSTICK_TURBOGRAFX=m -CONFIG_JOYSTICK_AS5011=m -CONFIG_JOYSTICK_JOYDUMP=m -CONFIG_JOYSTICK_XPAD=m -CONFIG_JOYSTICK_XPAD_FF=y -CONFIG_JOYSTICK_XPAD_LEDS=y -CONFIG_JOYSTICK_WALKERA0701=m -CONFIG_JOYSTICK_PSXPAD_SPI=m -# CONFIG_JOYSTICK_PSXPAD_SPI_FF is not set -CONFIG_JOYSTICK_PXRC=m -CONFIG_INPUT_TABLET=y -CONFIG_TABLET_USB_ACECAD=m -CONFIG_TABLET_USB_AIPTEK=m -CONFIG_TABLET_USB_GTCO=m -CONFIG_TABLET_USB_HANWANG=m -CONFIG_TABLET_USB_KBTAB=m -CONFIG_TABLET_USB_PEGASUS=m -CONFIG_TABLET_SERIAL_WACOM4=m -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_PROPERTIES=y -CONFIG_TOUCHSCREEN_88PM860X=m -CONFIG_TOUCHSCREEN_ADS7846=m -CONFIG_TOUCHSCREEN_AD7877=m -CONFIG_TOUCHSCREEN_AD7879=m -CONFIG_TOUCHSCREEN_AD7879_I2C=m -CONFIG_TOUCHSCREEN_AD7879_SPI=m -CONFIG_TOUCHSCREEN_ATMEL_MXT=m -# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set -CONFIG_TOUCHSCREEN_AUO_PIXCIR=m -CONFIG_TOUCHSCREEN_BU21013=m -CONFIG_TOUCHSCREEN_CHIPONE_ICN8505=m -CONFIG_TOUCHSCREEN_CY8CTMG110=m -CONFIG_TOUCHSCREEN_CYTTSP_CORE=m -CONFIG_TOUCHSCREEN_CYTTSP_I2C=m -CONFIG_TOUCHSCREEN_CYTTSP_SPI=m -CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m -CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m -CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m -CONFIG_TOUCHSCREEN_DA9034=m -CONFIG_TOUCHSCREEN_DA9052=m -CONFIG_TOUCHSCREEN_DYNAPRO=m -CONFIG_TOUCHSCREEN_HAMPSHIRE=m -CONFIG_TOUCHSCREEN_EETI=m -CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m -CONFIG_TOUCHSCREEN_EXC3000=m -CONFIG_TOUCHSCREEN_FUJITSU=m -CONFIG_TOUCHSCREEN_GOODIX=m -CONFIG_TOUCHSCREEN_HIDEEP=m -CONFIG_TOUCHSCREEN_ILI210X=m -CONFIG_TOUCHSCREEN_S6SY761=m -CONFIG_TOUCHSCREEN_GUNZE=m -CONFIG_TOUCHSCREEN_EKTF2127=m -CONFIG_TOUCHSCREEN_ELAN=m -CONFIG_TOUCHSCREEN_ELO=m -CONFIG_TOUCHSCREEN_WACOM_W8001=m -CONFIG_TOUCHSCREEN_WACOM_I2C=m -CONFIG_TOUCHSCREEN_MAX11801=m -CONFIG_TOUCHSCREEN_MCS5000=m -CONFIG_TOUCHSCREEN_MMS114=m -CONFIG_TOUCHSCREEN_MELFAS_MIP4=m -CONFIG_TOUCHSCREEN_MTOUCH=m -CONFIG_TOUCHSCREEN_INEXIO=m -CONFIG_TOUCHSCREEN_MK712=m -CONFIG_TOUCHSCREEN_PENMOUNT=m -CONFIG_TOUCHSCREEN_EDT_FT5X06=m -CONFIG_TOUCHSCREEN_TOUCHRIGHT=m -CONFIG_TOUCHSCREEN_TOUCHWIN=m -CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m -CONFIG_TOUCHSCREEN_UCB1400=m -CONFIG_TOUCHSCREEN_PIXCIR=m -CONFIG_TOUCHSCREEN_WDT87XX_I2C=m -CONFIG_TOUCHSCREEN_WM831X=m -CONFIG_TOUCHSCREEN_WM97XX=m -CONFIG_TOUCHSCREEN_WM9705=y -CONFIG_TOUCHSCREEN_WM9712=y -CONFIG_TOUCHSCREEN_WM9713=y -CONFIG_TOUCHSCREEN_USB_COMPOSITE=m -CONFIG_TOUCHSCREEN_MC13783=m -CONFIG_TOUCHSCREEN_USB_EGALAX=y -CONFIG_TOUCHSCREEN_USB_PANJIT=y -CONFIG_TOUCHSCREEN_USB_3M=y -CONFIG_TOUCHSCREEN_USB_ITM=y -CONFIG_TOUCHSCREEN_USB_ETURBO=y -CONFIG_TOUCHSCREEN_USB_GUNZE=y -CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y -CONFIG_TOUCHSCREEN_USB_IRTOUCH=y -CONFIG_TOUCHSCREEN_USB_IDEALTEK=y -CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y -CONFIG_TOUCHSCREEN_USB_GOTOP=y -CONFIG_TOUCHSCREEN_USB_JASTEC=y -CONFIG_TOUCHSCREEN_USB_ELO=y -CONFIG_TOUCHSCREEN_USB_E2I=y -CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y -CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y -CONFIG_TOUCHSCREEN_USB_NEXIO=y -CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y -CONFIG_TOUCHSCREEN_TOUCHIT213=m -CONFIG_TOUCHSCREEN_TSC_SERIO=m -CONFIG_TOUCHSCREEN_TSC200X_CORE=m -CONFIG_TOUCHSCREEN_TSC2004=m -CONFIG_TOUCHSCREEN_TSC2005=m -CONFIG_TOUCHSCREEN_TSC2007=m -# CONFIG_TOUCHSCREEN_TSC2007_IIO is not set -CONFIG_TOUCHSCREEN_PCAP=m -CONFIG_TOUCHSCREEN_RM_TS=m -CONFIG_TOUCHSCREEN_SILEAD=m -CONFIG_TOUCHSCREEN_SIS_I2C=m -CONFIG_TOUCHSCREEN_ST1232=m -CONFIG_TOUCHSCREEN_STMFTS=m -CONFIG_TOUCHSCREEN_SUR40=m -CONFIG_TOUCHSCREEN_SURFACE3_SPI=m -CONFIG_TOUCHSCREEN_SX8654=m -CONFIG_TOUCHSCREEN_TPS6507X=m -CONFIG_TOUCHSCREEN_ZET6223=m -CONFIG_TOUCHSCREEN_ZFORCE=m -CONFIG_TOUCHSCREEN_ROHM_BU21023=m -CONFIG_INPUT_MISC=y -CONFIG_INPUT_88PM860X_ONKEY=m -CONFIG_INPUT_88PM80X_ONKEY=m -CONFIG_INPUT_AD714X=m -CONFIG_INPUT_AD714X_I2C=m -CONFIG_INPUT_AD714X_SPI=m -CONFIG_INPUT_ARIZONA_HAPTICS=m -CONFIG_INPUT_BMA150=m -CONFIG_INPUT_E3X0_BUTTON=m -CONFIG_INPUT_PCSPKR=m -CONFIG_INPUT_MAX77693_HAPTIC=m -CONFIG_INPUT_MAX8925_ONKEY=m -CONFIG_INPUT_MAX8997_HAPTIC=m -CONFIG_INPUT_MC13783_PWRBUTTON=m -CONFIG_INPUT_MMA8450=m -CONFIG_INPUT_APANEL=m -CONFIG_INPUT_GP2A=m -CONFIG_INPUT_GPIO_BEEPER=m -CONFIG_INPUT_GPIO_DECODER=m -CONFIG_INPUT_ATLAS_BTNS=m -CONFIG_INPUT_ATI_REMOTE2=m -CONFIG_INPUT_KEYSPAN_REMOTE=m -CONFIG_INPUT_KXTJ9=m -# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set -CONFIG_INPUT_POWERMATE=m -CONFIG_INPUT_YEALINK=m -CONFIG_INPUT_CM109=m -CONFIG_INPUT_REGULATOR_HAPTIC=m -CONFIG_INPUT_RETU_PWRBUTTON=m -CONFIG_INPUT_AXP20X_PEK=m -CONFIG_INPUT_TWL4030_PWRBUTTON=m -CONFIG_INPUT_TWL4030_VIBRA=m -CONFIG_INPUT_TWL6040_VIBRA=m -CONFIG_INPUT_UINPUT=y -CONFIG_INPUT_PALMAS_PWRBUTTON=m -CONFIG_INPUT_PCF50633_PMU=m -CONFIG_INPUT_PCF8574=m -CONFIG_INPUT_PWM_BEEPER=m -CONFIG_INPUT_PWM_VIBRA=m -CONFIG_INPUT_GPIO_ROTARY_ENCODER=m -CONFIG_INPUT_DA9052_ONKEY=m -CONFIG_INPUT_DA9055_ONKEY=m -CONFIG_INPUT_DA9063_ONKEY=m -CONFIG_INPUT_WM831X_ON=m -CONFIG_INPUT_PCAP=m -CONFIG_INPUT_ADXL34X=m -CONFIG_INPUT_ADXL34X_I2C=m -CONFIG_INPUT_ADXL34X_SPI=m -CONFIG_INPUT_IMS_PCU=m -CONFIG_INPUT_CMA3000=m -CONFIG_INPUT_CMA3000_I2C=m -CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m -CONFIG_INPUT_IDEAPAD_SLIDEBAR=m -CONFIG_INPUT_SOC_BUTTON_ARRAY=m -CONFIG_INPUT_DRV260X_HAPTICS=m -CONFIG_INPUT_DRV2665_HAPTICS=m -CONFIG_INPUT_DRV2667_HAPTICS=m -CONFIG_INPUT_RAVE_SP_PWRBUTTON=m -CONFIG_RMI4_CORE=m -CONFIG_RMI4_I2C=m -CONFIG_RMI4_SPI=m -CONFIG_RMI4_SMB=m -CONFIG_RMI4_F03=y -CONFIG_RMI4_F03_SERIO=m -CONFIG_RMI4_2D_SENSOR=y -CONFIG_RMI4_F11=y -CONFIG_RMI4_F12=y -CONFIG_RMI4_F30=y -# CONFIG_RMI4_F34 is not set -# CONFIG_RMI4_F54 is not set -CONFIG_RMI4_F55=y - -# -# Hardware I/O ports -# -CONFIG_SERIO=y -CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y -CONFIG_SERIO_I8042=y -CONFIG_SERIO_SERPORT=m -CONFIG_SERIO_CT82C710=m -CONFIG_SERIO_PARKBD=m -CONFIG_SERIO_PCIPS2=m -CONFIG_SERIO_LIBPS2=y -CONFIG_SERIO_RAW=m -CONFIG_SERIO_ALTERA_PS2=m -CONFIG_SERIO_PS2MULT=m -CONFIG_SERIO_ARC_PS2=m -CONFIG_HYPERV_KEYBOARD=m -CONFIG_SERIO_GPIO_PS2=m -CONFIG_USERIO=m -CONFIG_GAMEPORT=m -CONFIG_GAMEPORT_NS558=m -CONFIG_GAMEPORT_L4=m -CONFIG_GAMEPORT_EMU10K1=m -CONFIG_GAMEPORT_FM801=m - -# -# Character devices -# -CONFIG_TTY=y -CONFIG_VT=y -CONFIG_CONSOLE_TRANSLATIONS=y -CONFIG_VT_CONSOLE=y -CONFIG_VT_CONSOLE_SLEEP=y -CONFIG_HW_CONSOLE=y -CONFIG_VT_HW_CONSOLE_BINDING=y -CONFIG_UNIX98_PTYS=y -CONFIG_LEGACY_PTYS=y -CONFIG_LEGACY_PTY_COUNT=0 -CONFIG_SERIAL_NONSTANDARD=y -CONFIG_ROCKETPORT=m -CONFIG_CYCLADES=m -# CONFIG_CYZ_INTR is not set -CONFIG_MOXA_INTELLIO=m -CONFIG_MOXA_SMARTIO=m -CONFIG_SYNCLINK=m -CONFIG_SYNCLINKMP=m -CONFIG_SYNCLINK_GT=m -CONFIG_NOZOMI=m -CONFIG_ISI=m -CONFIG_N_HDLC=m -CONFIG_N_GSM=m -CONFIG_TRACE_ROUTER=m -CONFIG_TRACE_SINK=m -CONFIG_DEVMEM=y -# CONFIG_DEVKMEM is not set - -# -# Serial drivers -# -CONFIG_SERIAL_EARLYCON=y -CONFIG_SERIAL_8250=y -# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set -CONFIG_SERIAL_8250_PNP=y -# CONFIG_SERIAL_8250_FINTEK is not set -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_DMA=y -CONFIG_SERIAL_8250_PCI=y -CONFIG_SERIAL_8250_EXAR=m -CONFIG_SERIAL_8250_CS=m -CONFIG_SERIAL_8250_MEN_MCB=m -CONFIG_SERIAL_8250_NR_UARTS=48 -CONFIG_SERIAL_8250_RUNTIME_UARTS=32 -CONFIG_SERIAL_8250_EXTENDED=y -CONFIG_SERIAL_8250_MANY_PORTS=y -CONFIG_SERIAL_8250_SHARE_IRQ=y -# CONFIG_SERIAL_8250_DETECT_IRQ is not set -CONFIG_SERIAL_8250_RSA=y -CONFIG_SERIAL_8250_DW=m -CONFIG_SERIAL_8250_RT288X=y -CONFIG_SERIAL_8250_LPSS=m -CONFIG_SERIAL_8250_MID=m -CONFIG_SERIAL_8250_MOXA=m - -# -# Non-8250 serial port support -# -CONFIG_SERIAL_KGDB_NMI=y -CONFIG_SERIAL_MAX3100=m -CONFIG_SERIAL_MAX310X=y -CONFIG_SERIAL_UARTLITE=m -CONFIG_SERIAL_UARTLITE_NR_UARTS=1 -CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_CORE_CONSOLE=y -CONFIG_CONSOLE_POLL=y -CONFIG_SERIAL_JSM=m -CONFIG_SERIAL_SCCNXP=y -CONFIG_SERIAL_SCCNXP_CONSOLE=y -CONFIG_SERIAL_SC16IS7XX_CORE=m -CONFIG_SERIAL_SC16IS7XX=m -CONFIG_SERIAL_SC16IS7XX_I2C=y -CONFIG_SERIAL_SC16IS7XX_SPI=y -CONFIG_SERIAL_ALTERA_JTAGUART=m -CONFIG_SERIAL_ALTERA_UART=m -CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 -CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200 -# CONFIG_SERIAL_IFX6X60 is not set -CONFIG_SERIAL_ARC=m -CONFIG_SERIAL_ARC_NR_PORTS=1 -CONFIG_SERIAL_RP2=m -CONFIG_SERIAL_RP2_NR_UARTS=32 -CONFIG_SERIAL_FSL_LPUART=m -CONFIG_SERIAL_MEN_Z135=m -CONFIG_SERIAL_DEV_BUS=y -CONFIG_SERIAL_DEV_CTRL_TTYPORT=y -CONFIG_TTY_PRINTK=y -CONFIG_PRINTER=m -# CONFIG_LP_CONSOLE is not set -CONFIG_PPDEV=m -CONFIG_HVC_DRIVER=y -CONFIG_HVC_IRQ=y -CONFIG_HVC_XEN=y -CONFIG_HVC_XEN_FRONTEND=y -CONFIG_VIRTIO_CONSOLE=y -CONFIG_IPMI_HANDLER=m -CONFIG_IPMI_DMI_DECODE=y -# CONFIG_IPMI_PANIC_EVENT is not set -CONFIG_IPMI_DEVICE_INTERFACE=m -CONFIG_IPMI_SI=m -CONFIG_IPMI_SSIF=m -CONFIG_IPMI_WATCHDOG=m -CONFIG_IPMI_POWEROFF=m -CONFIG_HW_RANDOM=y -CONFIG_HW_RANDOM_TIMERIOMEM=m -CONFIG_HW_RANDOM_INTEL=m -CONFIG_HW_RANDOM_AMD=m -CONFIG_HW_RANDOM_VIA=m -CONFIG_HW_RANDOM_VIRTIO=m -CONFIG_NVRAM=m -CONFIG_R3964=m -CONFIG_APPLICOM=m - -# -# PCMCIA character devices -# -CONFIG_SYNCLINK_CS=m -CONFIG_CARDMAN_4000=m -CONFIG_CARDMAN_4040=m -CONFIG_SCR24X=m -CONFIG_IPWIRELESS=m -CONFIG_MWAVE=m -CONFIG_RAW_DRIVER=m -CONFIG_MAX_RAW_DEVS=256 -CONFIG_HPET=y -CONFIG_HPET_MMAP=y -CONFIG_HPET_MMAP_DEFAULT=y -CONFIG_HANGCHECK_TIMER=m -CONFIG_TCG_TPM=y -CONFIG_HW_RANDOM_TPM=y -CONFIG_TCG_TIS_CORE=y -CONFIG_TCG_TIS=y -CONFIG_TCG_TIS_SPI=m -CONFIG_TCG_TIS_I2C_ATMEL=m -CONFIG_TCG_TIS_I2C_INFINEON=m -CONFIG_TCG_TIS_I2C_NUVOTON=m -CONFIG_TCG_NSC=m -CONFIG_TCG_ATMEL=m -CONFIG_TCG_INFINEON=m -CONFIG_TCG_XEN=m -CONFIG_TCG_CRB=y -CONFIG_TCG_VTPM_PROXY=m -CONFIG_TCG_TIS_ST33ZP24=m -CONFIG_TCG_TIS_ST33ZP24_I2C=m -CONFIG_TCG_TIS_ST33ZP24_SPI=m -CONFIG_TELCLOCK=m -CONFIG_DEVPORT=y -CONFIG_XILLYBUS=m -CONFIG_XILLYBUS_PCIE=m - -# -# I2C support -# -CONFIG_I2C=y -CONFIG_ACPI_I2C_OPREGION=y -CONFIG_I2C_BOARDINFO=y -CONFIG_I2C_COMPAT=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_MUX=m - -# -# Multiplexer I2C Chip support -# -CONFIG_I2C_MUX_GPIO=m -CONFIG_I2C_MUX_LTC4306=m -CONFIG_I2C_MUX_PCA9541=m -CONFIG_I2C_MUX_PCA954x=m -CONFIG_I2C_MUX_REG=m -CONFIG_I2C_MUX_MLXCPLD=m -CONFIG_I2C_HELPER_AUTO=y -CONFIG_I2C_SMBUS=m -CONFIG_I2C_ALGOBIT=m -CONFIG_I2C_ALGOPCA=m - -# -# I2C Hardware Bus support -# - -# -# PC SMBus host controller drivers -# -CONFIG_I2C_ALI1535=m -CONFIG_I2C_ALI1563=m -CONFIG_I2C_ALI15X3=m -CONFIG_I2C_AMD756=m -CONFIG_I2C_AMD756_S4882=m -CONFIG_I2C_AMD8111=m -CONFIG_I2C_I801=m -CONFIG_I2C_ISCH=m -CONFIG_I2C_ISMT=m -CONFIG_I2C_PIIX4=m -CONFIG_I2C_CHT_WC=m -CONFIG_I2C_NFORCE2=m -CONFIG_I2C_NFORCE2_S4985=m -CONFIG_I2C_SIS5595=m -CONFIG_I2C_SIS630=m -CONFIG_I2C_SIS96X=m -CONFIG_I2C_VIA=m -CONFIG_I2C_VIAPRO=m - -# -# ACPI drivers -# -CONFIG_I2C_SCMI=m - -# -# I2C system bus drivers (mostly embedded / system-on-chip) -# -CONFIG_I2C_CBUS_GPIO=m -CONFIG_I2C_DESIGNWARE_CORE=y -CONFIG_I2C_DESIGNWARE_PLATFORM=y -# CONFIG_I2C_DESIGNWARE_SLAVE is not set -CONFIG_I2C_DESIGNWARE_PCI=m -CONFIG_I2C_DESIGNWARE_BAYTRAIL=y -CONFIG_I2C_EMEV2=m -CONFIG_I2C_GPIO=m -# CONFIG_I2C_GPIO_FAULT_INJECTOR is not set -CONFIG_I2C_KEMPLD=m -CONFIG_I2C_OCORES=m -CONFIG_I2C_PCA_PLATFORM=m -CONFIG_I2C_SIMTEC=m -CONFIG_I2C_XILINX=m - -# -# External I2C/SMBus adapter drivers -# -CONFIG_I2C_DIOLAN_U2C=m -CONFIG_I2C_DLN2=m -CONFIG_I2C_PARPORT=m -CONFIG_I2C_PARPORT_LIGHT=m -CONFIG_I2C_ROBOTFUZZ_OSIF=m -CONFIG_I2C_TAOS_EVM=m -CONFIG_I2C_TINY_USB=m -CONFIG_I2C_VIPERBOARD=m - -# -# Other I2C/SMBus bus drivers -# -CONFIG_I2C_MLXCPLD=m -CONFIG_I2C_CROS_EC_TUNNEL=m -CONFIG_I2C_STUB=m -CONFIG_I2C_SLAVE=y -CONFIG_I2C_SLAVE_EEPROM=m -# CONFIG_I2C_DEBUG_CORE is not set -# CONFIG_I2C_DEBUG_ALGO is not set -# CONFIG_I2C_DEBUG_BUS is not set -CONFIG_SPI=y -# CONFIG_SPI_DEBUG is not set -CONFIG_SPI_MASTER=y -CONFIG_SPI_MEM=y - -# -# SPI Master Controller Drivers -# -CONFIG_SPI_ALTERA=m -CONFIG_SPI_AXI_SPI_ENGINE=m -CONFIG_SPI_BITBANG=m -CONFIG_SPI_BUTTERFLY=m -CONFIG_SPI_CADENCE=m -CONFIG_SPI_DESIGNWARE=m -CONFIG_SPI_DW_PCI=m -CONFIG_SPI_DW_MID_DMA=y -CONFIG_SPI_DW_MMIO=m -CONFIG_SPI_DLN2=m -CONFIG_SPI_GPIO=m -CONFIG_SPI_LM70_LLP=m -CONFIG_SPI_OC_TINY=m -CONFIG_SPI_PXA2XX=m -CONFIG_SPI_PXA2XX_PCI=m -CONFIG_SPI_ROCKCHIP=m -CONFIG_SPI_SC18IS602=m -CONFIG_SPI_XCOMM=m -# CONFIG_SPI_XILINX is not set -CONFIG_SPI_ZYNQMP_GQSPI=m - -# -# SPI Protocol Masters -# -CONFIG_SPI_SPIDEV=m -# CONFIG_SPI_LOOPBACK_TEST is not set -CONFIG_SPI_TLE62X0=m -# CONFIG_SPI_SLAVE is not set -CONFIG_SPMI=m -CONFIG_HSI=m -CONFIG_HSI_BOARDINFO=y - -# -# HSI controllers -# - -# -# HSI clients -# -CONFIG_HSI_CHAR=m -CONFIG_PPS=m -# CONFIG_PPS_DEBUG is not set - -# -# PPS clients support -# -# CONFIG_PPS_CLIENT_KTIMER is not set -CONFIG_PPS_CLIENT_LDISC=m -CONFIG_PPS_CLIENT_PARPORT=m -CONFIG_PPS_CLIENT_GPIO=m - -# -# PPS generators support -# - -# -# PTP clock support -# -CONFIG_PTP_1588_CLOCK=m - -# -# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks. -# -CONFIG_PTP_1588_CLOCK_KVM=m -CONFIG_PINCTRL=y -CONFIG_PINMUX=y -CONFIG_PINCONF=y -CONFIG_GENERIC_PINCONF=y -# CONFIG_DEBUG_PINCTRL is not set -CONFIG_PINCTRL_AMD=y -CONFIG_PINCTRL_MCP23S08=m -CONFIG_PINCTRL_SX150X=y -CONFIG_PINCTRL_BAYTRAIL=y -CONFIG_PINCTRL_CHERRYVIEW=m -CONFIG_PINCTRL_INTEL=m -CONFIG_PINCTRL_BROXTON=m -CONFIG_PINCTRL_CANNONLAKE=m -CONFIG_PINCTRL_CEDARFORK=m -CONFIG_PINCTRL_DENVERTON=m -CONFIG_PINCTRL_GEMINILAKE=m -CONFIG_PINCTRL_LEWISBURG=m -CONFIG_PINCTRL_SUNRISEPOINT=m -CONFIG_GPIOLIB=y -CONFIG_GPIOLIB_FASTPATH_LIMIT=512 -CONFIG_GPIO_ACPI=y -CONFIG_GPIOLIB_IRQCHIP=y -# CONFIG_DEBUG_GPIO is not set -CONFIG_GPIO_SYSFS=y -CONFIG_GPIO_GENERIC=m -CONFIG_GPIO_MAX730X=m - -# -# Memory mapped GPIO drivers -# -CONFIG_GPIO_AMDPT=m -CONFIG_GPIO_DWAPB=m -CONFIG_GPIO_EXAR=m -CONFIG_GPIO_GENERIC_PLATFORM=m -CONFIG_GPIO_ICH=m -CONFIG_GPIO_LYNXPOINT=y -CONFIG_GPIO_MB86S7X=m -CONFIG_GPIO_MENZ127=m -# CONFIG_GPIO_MOCKUP is not set -CONFIG_GPIO_VX855=m - -# -# Port-mapped I/O GPIO drivers -# -CONFIG_GPIO_F7188X=m -CONFIG_GPIO_IT87=m -CONFIG_GPIO_SCH=m -CONFIG_GPIO_SCH311X=m -CONFIG_GPIO_WINBOND=m -CONFIG_GPIO_WS16C48=m - -# -# I2C GPIO expanders -# -CONFIG_GPIO_ADP5588=m -CONFIG_GPIO_MAX7300=m -CONFIG_GPIO_MAX732X=m -CONFIG_GPIO_PCA953X=m -CONFIG_GPIO_PCF857X=m -CONFIG_GPIO_TPIC2810=m - -# -# MFD GPIO expanders -# -CONFIG_GPIO_ADP5520=m -CONFIG_GPIO_ARIZONA=m -CONFIG_GPIO_BD9571MWV=m -CONFIG_GPIO_CRYSTAL_COVE=m -CONFIG_GPIO_DA9052=m -CONFIG_GPIO_DA9055=m -CONFIG_GPIO_DLN2=m -CONFIG_GPIO_JANZ_TTL=m -CONFIG_GPIO_KEMPLD=m -CONFIG_GPIO_LP3943=m -CONFIG_GPIO_LP873X=m -CONFIG_GPIO_PALMAS=y -CONFIG_GPIO_RC5T583=y -CONFIG_GPIO_TPS65086=m -CONFIG_GPIO_TPS6586X=y -CONFIG_GPIO_TPS65910=y -CONFIG_GPIO_TPS65912=m -CONFIG_GPIO_TWL4030=m -CONFIG_GPIO_TWL6040=m -CONFIG_GPIO_UCB1400=m -CONFIG_GPIO_WHISKEY_COVE=m -CONFIG_GPIO_WM831X=m -CONFIG_GPIO_WM8350=m -CONFIG_GPIO_WM8994=m - -# -# PCI GPIO expanders -# -CONFIG_GPIO_AMD8111=m -CONFIG_GPIO_ML_IOH=m -CONFIG_GPIO_PCI_IDIO_16=m -CONFIG_GPIO_PCIE_IDIO_24=m -CONFIG_GPIO_RDC321X=m - -# -# SPI GPIO expanders -# -CONFIG_GPIO_MAX3191X=m -CONFIG_GPIO_MAX7301=m -CONFIG_GPIO_MC33880=m -CONFIG_GPIO_PISOSR=m -CONFIG_GPIO_XRA1403=m - -# -# USB GPIO expanders -# -CONFIG_GPIO_VIPERBOARD=m -CONFIG_W1=m -CONFIG_W1_CON=y - -# -# 1-wire Bus Masters -# -CONFIG_W1_MASTER_MATROX=m -CONFIG_W1_MASTER_DS2490=m -CONFIG_W1_MASTER_DS2482=m -CONFIG_W1_MASTER_DS1WM=m -CONFIG_W1_MASTER_GPIO=m - -# -# 1-wire Slaves -# -CONFIG_W1_SLAVE_THERM=m -CONFIG_W1_SLAVE_SMEM=m -CONFIG_W1_SLAVE_DS2405=m -CONFIG_W1_SLAVE_DS2408=m -CONFIG_W1_SLAVE_DS2408_READBACK=y -CONFIG_W1_SLAVE_DS2413=m -CONFIG_W1_SLAVE_DS2406=m -CONFIG_W1_SLAVE_DS2423=m -CONFIG_W1_SLAVE_DS2805=m -CONFIG_W1_SLAVE_DS2431=m -CONFIG_W1_SLAVE_DS2433=m -# CONFIG_W1_SLAVE_DS2433_CRC is not set -CONFIG_W1_SLAVE_DS2438=m -CONFIG_W1_SLAVE_DS2760=m -CONFIG_W1_SLAVE_DS2780=m -CONFIG_W1_SLAVE_DS2781=m -CONFIG_W1_SLAVE_DS28E04=m -CONFIG_W1_SLAVE_DS28E17=m -CONFIG_POWER_AVS=y -CONFIG_POWER_RESET=y -CONFIG_POWER_RESET_RESTART=y -CONFIG_POWER_SUPPLY=y -# CONFIG_POWER_SUPPLY_DEBUG is not set -CONFIG_PDA_POWER=m -CONFIG_GENERIC_ADC_BATTERY=m -CONFIG_MAX8925_POWER=m -CONFIG_WM831X_BACKUP=m -CONFIG_WM831X_POWER=m -CONFIG_WM8350_POWER=m -CONFIG_TEST_POWER=m -CONFIG_BATTERY_88PM860X=m -CONFIG_BATTERY_DS2760=m -CONFIG_BATTERY_DS2780=m -CONFIG_BATTERY_DS2781=m -CONFIG_BATTERY_DS2782=m -CONFIG_BATTERY_SBS=m -CONFIG_CHARGER_SBS=m -CONFIG_MANAGER_SBS=m -CONFIG_BATTERY_BQ27XXX=m -CONFIG_BATTERY_BQ27XXX_I2C=m -CONFIG_BATTERY_BQ27XXX_HDQ=m -# CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set -CONFIG_BATTERY_DA9030=m -CONFIG_BATTERY_DA9052=m -CONFIG_CHARGER_DA9150=m -CONFIG_BATTERY_DA9150=m -CONFIG_CHARGER_AXP20X=m -CONFIG_BATTERY_AXP20X=m -CONFIG_AXP20X_POWER=m -CONFIG_AXP288_CHARGER=m -CONFIG_AXP288_FUEL_GAUGE=m -CONFIG_BATTERY_MAX17040=m -CONFIG_BATTERY_MAX17042=m -CONFIG_BATTERY_MAX1721X=m -CONFIG_BATTERY_TWL4030_MADC=m -CONFIG_CHARGER_88PM860X=m -CONFIG_CHARGER_PCF50633=m -CONFIG_BATTERY_RX51=m -CONFIG_CHARGER_ISP1704=m -CONFIG_CHARGER_MAX8903=m -CONFIG_CHARGER_TWL4030=m -CONFIG_CHARGER_LP8727=m -CONFIG_CHARGER_LP8788=m -CONFIG_CHARGER_GPIO=m -CONFIG_CHARGER_MANAGER=y -CONFIG_CHARGER_LTC3651=m -CONFIG_CHARGER_MAX14577=m -CONFIG_CHARGER_MAX77693=m -CONFIG_CHARGER_MAX8997=m -CONFIG_CHARGER_MAX8998=m -CONFIG_CHARGER_BQ2415X=m -CONFIG_CHARGER_BQ24190=m -CONFIG_CHARGER_BQ24257=m -CONFIG_CHARGER_BQ24735=m -CONFIG_CHARGER_BQ25890=m -CONFIG_CHARGER_SMB347=m -CONFIG_CHARGER_TPS65090=m -CONFIG_BATTERY_GAUGE_LTC2941=m -CONFIG_BATTERY_RT5033=m -CONFIG_CHARGER_RT9455=m -CONFIG_HWMON=y -CONFIG_HWMON_VID=m -# CONFIG_HWMON_DEBUG_CHIP is not set - -# -# Native drivers -# -CONFIG_SENSORS_ABITUGURU=m -CONFIG_SENSORS_ABITUGURU3=m -CONFIG_SENSORS_AD7314=m -CONFIG_SENSORS_AD7414=m -CONFIG_SENSORS_AD7418=m -CONFIG_SENSORS_ADM1021=m -CONFIG_SENSORS_ADM1025=m -CONFIG_SENSORS_ADM1026=m -CONFIG_SENSORS_ADM1029=m -CONFIG_SENSORS_ADM1031=m -CONFIG_SENSORS_ADM9240=m -CONFIG_SENSORS_ADT7X10=m -CONFIG_SENSORS_ADT7310=m -CONFIG_SENSORS_ADT7410=m -CONFIG_SENSORS_ADT7411=m -CONFIG_SENSORS_ADT7462=m -CONFIG_SENSORS_ADT7470=m -CONFIG_SENSORS_ADT7475=m -CONFIG_SENSORS_ASC7621=m -CONFIG_SENSORS_K8TEMP=m -CONFIG_SENSORS_K10TEMP=m -CONFIG_SENSORS_FAM15H_POWER=m -CONFIG_SENSORS_APPLESMC=m -CONFIG_SENSORS_ASB100=m -CONFIG_SENSORS_ASPEED=m -CONFIG_SENSORS_ATXP1=m -CONFIG_SENSORS_DS620=m -CONFIG_SENSORS_DS1621=m -CONFIG_SENSORS_DELL_SMM=m -CONFIG_SENSORS_DA9052_ADC=m -CONFIG_SENSORS_DA9055=m -CONFIG_SENSORS_I5K_AMB=m -CONFIG_SENSORS_F71805F=m -CONFIG_SENSORS_F71882FG=m -CONFIG_SENSORS_F75375S=m -CONFIG_SENSORS_MC13783_ADC=m -CONFIG_SENSORS_FSCHMD=m -CONFIG_SENSORS_FTSTEUTATES=m -CONFIG_SENSORS_GL518SM=m -CONFIG_SENSORS_GL520SM=m -CONFIG_SENSORS_G760A=m -CONFIG_SENSORS_G762=m -CONFIG_SENSORS_HIH6130=m -CONFIG_SENSORS_IBMAEM=m -CONFIG_SENSORS_IBMPEX=m -CONFIG_SENSORS_IIO_HWMON=m -CONFIG_SENSORS_I5500=m -CONFIG_SENSORS_CORETEMP=m -CONFIG_SENSORS_IT87=m -CONFIG_SENSORS_JC42=m -CONFIG_SENSORS_POWR1220=m -CONFIG_SENSORS_LINEAGE=m -CONFIG_SENSORS_LTC2945=m -CONFIG_SENSORS_LTC2990=m -CONFIG_SENSORS_LTC4151=m -CONFIG_SENSORS_LTC4215=m -CONFIG_SENSORS_LTC4222=m -CONFIG_SENSORS_LTC4245=m -CONFIG_SENSORS_LTC4260=m -CONFIG_SENSORS_LTC4261=m -CONFIG_SENSORS_MAX1111=m -CONFIG_SENSORS_MAX16065=m -CONFIG_SENSORS_MAX1619=m -CONFIG_SENSORS_MAX1668=m -CONFIG_SENSORS_MAX197=m -CONFIG_SENSORS_MAX31722=m -CONFIG_SENSORS_MAX6621=m -CONFIG_SENSORS_MAX6639=m -CONFIG_SENSORS_MAX6642=m -CONFIG_SENSORS_MAX6650=m -CONFIG_SENSORS_MAX6697=m -CONFIG_SENSORS_MAX31790=m -CONFIG_SENSORS_MCP3021=m -CONFIG_SENSORS_TC654=m -CONFIG_SENSORS_MENF21BMC_HWMON=m -CONFIG_SENSORS_ADCXX=m -CONFIG_SENSORS_LM63=m -CONFIG_SENSORS_LM70=m -CONFIG_SENSORS_LM73=m -CONFIG_SENSORS_LM75=m -CONFIG_SENSORS_LM77=m -CONFIG_SENSORS_LM78=m -CONFIG_SENSORS_LM80=m -CONFIG_SENSORS_LM83=m -CONFIG_SENSORS_LM85=m -CONFIG_SENSORS_LM87=m -CONFIG_SENSORS_LM90=m -CONFIG_SENSORS_LM92=m -CONFIG_SENSORS_LM93=m -CONFIG_SENSORS_LM95234=m -CONFIG_SENSORS_LM95241=m -CONFIG_SENSORS_LM95245=m -CONFIG_SENSORS_PC87360=m -CONFIG_SENSORS_PC87427=m -CONFIG_SENSORS_NTC_THERMISTOR=m -CONFIG_SENSORS_NCT6683=m -CONFIG_SENSORS_NCT6775=m -CONFIG_SENSORS_NCT7802=m -CONFIG_SENSORS_NCT7904=m -CONFIG_SENSORS_PCF8591=m -CONFIG_PMBUS=m -CONFIG_SENSORS_PMBUS=m -CONFIG_SENSORS_ADM1275=m -CONFIG_SENSORS_IBM_CFFPS=m -CONFIG_SENSORS_IR35221=m -CONFIG_SENSORS_LM25066=m -CONFIG_SENSORS_LTC2978=m -CONFIG_SENSORS_LTC2978_REGULATOR=y -CONFIG_SENSORS_LTC3815=m -CONFIG_SENSORS_MAX16064=m -CONFIG_SENSORS_MAX20751=m -CONFIG_SENSORS_MAX31785=m -CONFIG_SENSORS_MAX34440=m -CONFIG_SENSORS_MAX8688=m -CONFIG_SENSORS_TPS40422=m -CONFIG_SENSORS_TPS53679=m -CONFIG_SENSORS_UCD9000=m -CONFIG_SENSORS_UCD9200=m -CONFIG_SENSORS_ZL6100=m -CONFIG_SENSORS_SHT15=m -CONFIG_SENSORS_SHT21=m -CONFIG_SENSORS_SHT3x=m -CONFIG_SENSORS_SHTC1=m -CONFIG_SENSORS_SIS5595=m -CONFIG_SENSORS_DME1737=m -CONFIG_SENSORS_EMC1403=m -CONFIG_SENSORS_EMC2103=m -CONFIG_SENSORS_EMC6W201=m -CONFIG_SENSORS_SMSC47M1=m -CONFIG_SENSORS_SMSC47M192=m -CONFIG_SENSORS_SMSC47B397=m -CONFIG_SENSORS_SCH56XX_COMMON=m -CONFIG_SENSORS_SCH5627=m -CONFIG_SENSORS_SCH5636=m -CONFIG_SENSORS_STTS751=m -CONFIG_SENSORS_SMM665=m -CONFIG_SENSORS_ADC128D818=m -CONFIG_SENSORS_ADS1015=m -CONFIG_SENSORS_ADS7828=m -CONFIG_SENSORS_ADS7871=m -CONFIG_SENSORS_AMC6821=m -CONFIG_SENSORS_INA209=m -CONFIG_SENSORS_INA2XX=m -CONFIG_SENSORS_INA3221=m -CONFIG_SENSORS_TC74=m -CONFIG_SENSORS_THMC50=m -CONFIG_SENSORS_TMP102=m -CONFIG_SENSORS_TMP103=m -CONFIG_SENSORS_TMP108=m -CONFIG_SENSORS_TMP401=m -CONFIG_SENSORS_TMP421=m -CONFIG_SENSORS_VIA_CPUTEMP=m -CONFIG_SENSORS_VIA686A=m -CONFIG_SENSORS_VT1211=m -CONFIG_SENSORS_VT8231=m -CONFIG_SENSORS_W83773G=m -CONFIG_SENSORS_W83781D=m -CONFIG_SENSORS_W83791D=m -CONFIG_SENSORS_W83792D=m -CONFIG_SENSORS_W83793=m -CONFIG_SENSORS_W83795=m -# CONFIG_SENSORS_W83795_FANCTRL is not set -CONFIG_SENSORS_W83L785TS=m -CONFIG_SENSORS_W83L786NG=m -CONFIG_SENSORS_W83627HF=m -CONFIG_SENSORS_W83627EHF=m -CONFIG_SENSORS_WM831X=m -CONFIG_SENSORS_WM8350=m -CONFIG_SENSORS_XGENE=m - -# -# ACPI drivers -# -CONFIG_SENSORS_ACPI_POWER=m -CONFIG_SENSORS_ATK0110=m -CONFIG_THERMAL=y -# CONFIG_THERMAL_STATISTICS is not set -CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 -CONFIG_THERMAL_HWMON=y -CONFIG_THERMAL_WRITABLE_TRIPS=y -CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y -# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set -# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set -# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set -CONFIG_THERMAL_GOV_FAIR_SHARE=y -CONFIG_THERMAL_GOV_STEP_WISE=y -CONFIG_THERMAL_GOV_BANG_BANG=y -CONFIG_THERMAL_GOV_USER_SPACE=y -CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y -CONFIG_CLOCK_THERMAL=y -CONFIG_DEVFREQ_THERMAL=y -CONFIG_THERMAL_EMULATION=y -CONFIG_INTEL_POWERCLAMP=m -CONFIG_X86_PKG_TEMP_THERMAL=m -CONFIG_INTEL_SOC_DTS_IOSF_CORE=m -CONFIG_INTEL_SOC_DTS_THERMAL=m - -# -# ACPI INT340X thermal drivers -# -CONFIG_INT340X_THERMAL=m -CONFIG_ACPI_THERMAL_REL=m -CONFIG_INT3406_THERMAL=m -CONFIG_INTEL_BXT_PMIC_THERMAL=m -CONFIG_INTEL_PCH_THERMAL=m -CONFIG_GENERIC_ADC_THERMAL=m -CONFIG_WATCHDOG=y -CONFIG_WATCHDOG_CORE=y -# CONFIG_WATCHDOG_NOWAYOUT is not set -CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y -CONFIG_WATCHDOG_SYSFS=y - -# -# Watchdog Device Drivers -# -CONFIG_SOFT_WATCHDOG=m -CONFIG_DA9052_WATCHDOG=m -CONFIG_DA9055_WATCHDOG=m -CONFIG_DA9063_WATCHDOG=m -CONFIG_DA9062_WATCHDOG=m -CONFIG_MENF21BMC_WATCHDOG=m -CONFIG_WDAT_WDT=m -CONFIG_WM831X_WATCHDOG=m -CONFIG_WM8350_WATCHDOG=m -CONFIG_XILINX_WATCHDOG=m -CONFIG_ZIIRAVE_WATCHDOG=m -CONFIG_RAVE_SP_WATCHDOG=m -CONFIG_CADENCE_WATCHDOG=m -CONFIG_DW_WATCHDOG=m -CONFIG_TWL4030_WATCHDOG=m -CONFIG_MAX63XX_WATCHDOG=m -CONFIG_RETU_WATCHDOG=m -CONFIG_ACQUIRE_WDT=m -CONFIG_ADVANTECH_WDT=m -CONFIG_ALIM1535_WDT=m -CONFIG_ALIM7101_WDT=m -CONFIG_EBC_C384_WDT=m -CONFIG_F71808E_WDT=m -CONFIG_SP5100_TCO=m -CONFIG_SBC_FITPC2_WATCHDOG=m -CONFIG_EUROTECH_WDT=m -CONFIG_IB700_WDT=m -CONFIG_IBMASR=m -CONFIG_WAFER_WDT=m -CONFIG_I6300ESB_WDT=m -CONFIG_IE6XX_WDT=m -CONFIG_ITCO_WDT=m -CONFIG_ITCO_VENDOR_SUPPORT=y -CONFIG_IT8712F_WDT=m -CONFIG_IT87_WDT=m -CONFIG_HP_WATCHDOG=m -CONFIG_KEMPLD_WDT=m -CONFIG_HPWDT_NMI_DECODING=y -CONFIG_SC1200_WDT=m -CONFIG_PC87413_WDT=m -CONFIG_NV_TCO=m -CONFIG_60XX_WDT=m -CONFIG_CPU5_WDT=m -CONFIG_SMSC_SCH311X_WDT=m -CONFIG_SMSC37B787_WDT=m -CONFIG_VIA_WDT=m -CONFIG_W83627HF_WDT=m -CONFIG_W83877F_WDT=m -CONFIG_W83977F_WDT=m -CONFIG_MACHZ_WDT=m -CONFIG_SBC_EPX_C3_WATCHDOG=m -CONFIG_INTEL_MEI_WDT=m -CONFIG_NI903X_WDT=m -CONFIG_NIC7018_WDT=m -CONFIG_MEN_A21_WDT=m -CONFIG_XEN_WDT=m - -# -# PCI-based Watchdog Cards -# -CONFIG_PCIPCWATCHDOG=m -CONFIG_WDTPCI=m - -# -# USB-based Watchdog Cards -# -CONFIG_USBPCWATCHDOG=m - -# -# Watchdog Pretimeout Governors -# -# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set -CONFIG_SSB_POSSIBLE=y -CONFIG_SSB=m -CONFIG_SSB_SPROM=y -CONFIG_SSB_BLOCKIO=y -CONFIG_SSB_PCIHOST_POSSIBLE=y -CONFIG_SSB_PCIHOST=y -CONFIG_SSB_B43_PCI_BRIDGE=y -CONFIG_SSB_PCMCIAHOST_POSSIBLE=y -# CONFIG_SSB_PCMCIAHOST is not set -CONFIG_SSB_SDIOHOST_POSSIBLE=y -CONFIG_SSB_SDIOHOST=y -# CONFIG_SSB_SILENT is not set -# CONFIG_SSB_DEBUG is not set -CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y -CONFIG_SSB_DRIVER_PCICORE=y -CONFIG_SSB_DRIVER_GPIO=y -CONFIG_BCMA_POSSIBLE=y -CONFIG_BCMA=m -CONFIG_BCMA_BLOCKIO=y -CONFIG_BCMA_HOST_PCI_POSSIBLE=y -CONFIG_BCMA_HOST_PCI=y -CONFIG_BCMA_HOST_SOC=y -CONFIG_BCMA_DRIVER_PCI=y -CONFIG_BCMA_SFLASH=y -CONFIG_BCMA_DRIVER_GMAC_CMN=y -CONFIG_BCMA_DRIVER_GPIO=y -# CONFIG_BCMA_DEBUG is not set - -# -# Multifunction device drivers -# -CONFIG_MFD_CORE=y -CONFIG_MFD_AS3711=y -CONFIG_PMIC_ADP5520=y -CONFIG_MFD_AAT2870_CORE=y -CONFIG_MFD_BCM590XX=m -CONFIG_MFD_BD9571MWV=m -CONFIG_MFD_AXP20X=m -CONFIG_MFD_AXP20X_I2C=m -CONFIG_MFD_CROS_EC=m -CONFIG_MFD_CROS_EC_I2C=m -CONFIG_MFD_CROS_EC_SPI=m -CONFIG_MFD_CROS_EC_CHARDEV=m -CONFIG_PMIC_DA903X=y -CONFIG_PMIC_DA9052=y -CONFIG_MFD_DA9052_SPI=y -CONFIG_MFD_DA9052_I2C=y -CONFIG_MFD_DA9055=y -CONFIG_MFD_DA9062=m -CONFIG_MFD_DA9063=y -CONFIG_MFD_DA9150=m -CONFIG_MFD_DLN2=m -CONFIG_MFD_MC13XXX=m -CONFIG_MFD_MC13XXX_SPI=m -CONFIG_MFD_MC13XXX_I2C=m -CONFIG_HTC_PASIC3=m -CONFIG_HTC_I2CPLD=y -CONFIG_MFD_INTEL_QUARK_I2C_GPIO=m -CONFIG_LPC_ICH=m -CONFIG_LPC_SCH=m -CONFIG_INTEL_SOC_PMIC=y -CONFIG_INTEL_SOC_PMIC_BXTWC=m -CONFIG_INTEL_SOC_PMIC_CHTWC=y -CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m -CONFIG_MFD_INTEL_LPSS=m -CONFIG_MFD_INTEL_LPSS_ACPI=m -CONFIG_MFD_INTEL_LPSS_PCI=m -CONFIG_MFD_JANZ_CMODIO=m -CONFIG_MFD_KEMPLD=m -CONFIG_MFD_88PM800=m -CONFIG_MFD_88PM805=m -CONFIG_MFD_88PM860X=y -CONFIG_MFD_MAX14577=y -CONFIG_MFD_MAX77693=y -CONFIG_MFD_MAX77843=y -CONFIG_MFD_MAX8907=m -CONFIG_MFD_MAX8925=y -CONFIG_MFD_MAX8997=y -CONFIG_MFD_MAX8998=y -CONFIG_MFD_MT6397=m -CONFIG_MFD_MENF21BMC=m -CONFIG_EZX_PCAP=y -CONFIG_MFD_VIPERBOARD=m -CONFIG_MFD_RETU=m -CONFIG_MFD_PCF50633=m -CONFIG_PCF50633_ADC=m -CONFIG_PCF50633_GPIO=m -CONFIG_UCB1400_CORE=m -CONFIG_MFD_RDC321X=m -CONFIG_MFD_RT5033=m -CONFIG_MFD_RC5T583=y -CONFIG_MFD_SEC_CORE=y -CONFIG_MFD_SI476X_CORE=m -CONFIG_MFD_SM501=m -CONFIG_MFD_SM501_GPIO=y -CONFIG_MFD_SKY81452=m -CONFIG_MFD_SMSC=y -CONFIG_ABX500_CORE=y -CONFIG_AB3100_CORE=y -CONFIG_AB3100_OTP=m -CONFIG_MFD_SYSCON=y -CONFIG_MFD_TI_AM335X_TSCADC=m -CONFIG_MFD_LP3943=m -CONFIG_MFD_LP8788=y -CONFIG_MFD_TI_LMU=m -CONFIG_MFD_PALMAS=y -CONFIG_TPS6105X=m -CONFIG_TPS65010=m -CONFIG_TPS6507X=m -CONFIG_MFD_TPS65086=m -CONFIG_MFD_TPS65090=y -# CONFIG_MFD_TPS68470 is not set -CONFIG_MFD_TI_LP873X=m -CONFIG_MFD_TPS6586X=y -CONFIG_MFD_TPS65910=y -CONFIG_MFD_TPS65912=y -CONFIG_MFD_TPS65912_I2C=y -CONFIG_MFD_TPS65912_SPI=y -CONFIG_MFD_TPS80031=y -CONFIG_TWL4030_CORE=y -CONFIG_MFD_TWL4030_AUDIO=y -CONFIG_TWL6040_CORE=y -CONFIG_MFD_WL1273_CORE=m -CONFIG_MFD_LM3533=m -CONFIG_MFD_VX855=m -CONFIG_MFD_ARIZONA=y -CONFIG_MFD_ARIZONA_I2C=m -CONFIG_MFD_ARIZONA_SPI=m -CONFIG_MFD_CS47L24=y -CONFIG_MFD_WM5102=y -CONFIG_MFD_WM5110=y -CONFIG_MFD_WM8997=y -CONFIG_MFD_WM8998=y -CONFIG_MFD_WM8400=y -CONFIG_MFD_WM831X=y -CONFIG_MFD_WM831X_I2C=y -CONFIG_MFD_WM831X_SPI=y -CONFIG_MFD_WM8350=y -CONFIG_MFD_WM8350_I2C=y -CONFIG_MFD_WM8994=m -CONFIG_RAVE_SP_CORE=m -CONFIG_REGULATOR=y -# CONFIG_REGULATOR_DEBUG is not set -CONFIG_REGULATOR_FIXED_VOLTAGE=m -CONFIG_REGULATOR_VIRTUAL_CONSUMER=m -CONFIG_REGULATOR_USERSPACE_CONSUMER=m -CONFIG_REGULATOR_88PG86X=m -CONFIG_REGULATOR_88PM800=m -CONFIG_REGULATOR_88PM8607=m -CONFIG_REGULATOR_ACT8865=m -CONFIG_REGULATOR_AD5398=m -CONFIG_REGULATOR_ANATOP=m -CONFIG_REGULATOR_AAT2870=m -CONFIG_REGULATOR_AB3100=m -CONFIG_REGULATOR_ARIZONA_LDO1=m -CONFIG_REGULATOR_ARIZONA_MICSUPP=m -CONFIG_REGULATOR_AS3711=m -CONFIG_REGULATOR_AXP20X=m -CONFIG_REGULATOR_BCM590XX=m -CONFIG_REGULATOR_BD9571MWV=m -CONFIG_REGULATOR_DA903X=m -CONFIG_REGULATOR_DA9052=m -CONFIG_REGULATOR_DA9055=m -CONFIG_REGULATOR_DA9062=m -CONFIG_REGULATOR_DA9063=m -CONFIG_REGULATOR_DA9210=m -CONFIG_REGULATOR_DA9211=m -CONFIG_REGULATOR_FAN53555=m -CONFIG_REGULATOR_GPIO=m -CONFIG_REGULATOR_ISL9305=m -CONFIG_REGULATOR_ISL6271A=m -CONFIG_REGULATOR_LM363X=m -CONFIG_REGULATOR_LP3971=m -CONFIG_REGULATOR_LP3972=m -CONFIG_REGULATOR_LP872X=m -CONFIG_REGULATOR_LP8755=m -CONFIG_REGULATOR_LP8788=m -CONFIG_REGULATOR_LTC3589=m -CONFIG_REGULATOR_LTC3676=m -CONFIG_REGULATOR_MAX14577=m -CONFIG_REGULATOR_MAX1586=m -CONFIG_REGULATOR_MAX8649=m -CONFIG_REGULATOR_MAX8660=m -CONFIG_REGULATOR_MAX8907=m -CONFIG_REGULATOR_MAX8925=m -CONFIG_REGULATOR_MAX8952=m -CONFIG_REGULATOR_MAX8997=m -CONFIG_REGULATOR_MAX8998=m -CONFIG_REGULATOR_MAX77693=m -CONFIG_REGULATOR_MC13XXX_CORE=m -CONFIG_REGULATOR_MC13783=m -CONFIG_REGULATOR_MC13892=m -CONFIG_REGULATOR_MT6311=m -CONFIG_REGULATOR_MT6323=m -CONFIG_REGULATOR_MT6397=m -CONFIG_REGULATOR_PALMAS=m -CONFIG_REGULATOR_PCAP=m -CONFIG_REGULATOR_PCF50633=m -CONFIG_REGULATOR_PFUZE100=m -CONFIG_REGULATOR_PV88060=m -CONFIG_REGULATOR_PV88080=m -CONFIG_REGULATOR_PV88090=m -CONFIG_REGULATOR_PWM=m -CONFIG_REGULATOR_QCOM_SPMI=m -CONFIG_REGULATOR_RC5T583=m -CONFIG_REGULATOR_RT5033=m -CONFIG_REGULATOR_S2MPA01=m -CONFIG_REGULATOR_S2MPS11=m -CONFIG_REGULATOR_S5M8767=m -CONFIG_REGULATOR_SKY81452=m -CONFIG_REGULATOR_TPS51632=m -CONFIG_REGULATOR_TPS6105X=m -CONFIG_REGULATOR_TPS62360=m -CONFIG_REGULATOR_TPS65023=m -CONFIG_REGULATOR_TPS6507X=m -CONFIG_REGULATOR_TPS65086=m -CONFIG_REGULATOR_TPS65090=m -CONFIG_REGULATOR_TPS65132=m -CONFIG_REGULATOR_TPS6524X=m -CONFIG_REGULATOR_TPS6586X=m -CONFIG_REGULATOR_TPS65910=m -CONFIG_REGULATOR_TPS65912=m -CONFIG_REGULATOR_TPS80031=m -CONFIG_REGULATOR_TWL4030=m -CONFIG_REGULATOR_WM831X=m -CONFIG_REGULATOR_WM8350=m -CONFIG_REGULATOR_WM8400=m -CONFIG_REGULATOR_WM8994=m -CONFIG_CEC_CORE=m -CONFIG_CEC_NOTIFIER=y -CONFIG_RC_CORE=m -CONFIG_RC_MAP=m -CONFIG_LIRC=y -CONFIG_RC_DECODERS=y -CONFIG_IR_NEC_DECODER=m -CONFIG_IR_RC5_DECODER=m -CONFIG_IR_RC6_DECODER=m -CONFIG_IR_JVC_DECODER=m -CONFIG_IR_SONY_DECODER=m -CONFIG_IR_SANYO_DECODER=m -CONFIG_IR_SHARP_DECODER=m -CONFIG_IR_MCE_KBD_DECODER=m -CONFIG_IR_XMP_DECODER=m -CONFIG_IR_IMON_DECODER=m -CONFIG_RC_DEVICES=y -CONFIG_RC_ATI_REMOTE=m -CONFIG_IR_ENE=m -CONFIG_IR_IMON=m -CONFIG_IR_IMON_RAW=m -CONFIG_IR_MCEUSB=m -CONFIG_IR_ITE_CIR=m -CONFIG_IR_FINTEK=m -CONFIG_IR_NUVOTON=m -CONFIG_IR_REDRAT3=m -CONFIG_IR_STREAMZAP=m -CONFIG_IR_WINBOND_CIR=m -CONFIG_IR_IGORPLUGUSB=m -CONFIG_IR_IGUANA=m -CONFIG_IR_TTUSBIR=m -CONFIG_RC_LOOPBACK=m -CONFIG_IR_SERIAL=m -CONFIG_IR_SERIAL_TRANSMITTER=y -CONFIG_IR_SIR=m -CONFIG_MEDIA_SUPPORT=m - -# -# Multimedia core support -# -CONFIG_MEDIA_CAMERA_SUPPORT=y -CONFIG_MEDIA_ANALOG_TV_SUPPORT=y -CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y -CONFIG_MEDIA_RADIO_SUPPORT=y -CONFIG_MEDIA_SDR_SUPPORT=y -CONFIG_MEDIA_CEC_SUPPORT=y -# CONFIG_MEDIA_CEC_RC is not set -CONFIG_MEDIA_CONTROLLER=y -# CONFIG_MEDIA_CONTROLLER_DVB is not set -CONFIG_VIDEO_DEV=m -CONFIG_VIDEO_V4L2_SUBDEV_API=y -CONFIG_VIDEO_V4L2=m -# CONFIG_VIDEO_ADV_DEBUG is not set -# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set -# CONFIG_VIDEO_PCI_SKELETON is not set -CONFIG_VIDEO_TUNER=m -CONFIG_V4L2_MEM2MEM_DEV=m -CONFIG_V4L2_FLASH_LED_CLASS=m -CONFIG_V4L2_FWNODE=m -CONFIG_VIDEOBUF_GEN=m -CONFIG_VIDEOBUF_DMA_SG=m -CONFIG_VIDEOBUF_VMALLOC=m -CONFIG_DVB_CORE=m -# CONFIG_DVB_MMAP is not set -CONFIG_DVB_NET=y -CONFIG_TTPCI_EEPROM=m -CONFIG_DVB_MAX_ADAPTERS=8 -CONFIG_DVB_DYNAMIC_MINORS=y -# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set -# CONFIG_DVB_ULE_DEBUG is not set - -# -# Media drivers -# -CONFIG_MEDIA_USB_SUPPORT=y - -# -# Webcam devices -# -CONFIG_USB_VIDEO_CLASS=m -CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y -CONFIG_USB_GSPCA=m -CONFIG_USB_M5602=m -CONFIG_USB_STV06XX=m -CONFIG_USB_GL860=m -CONFIG_USB_GSPCA_BENQ=m -CONFIG_USB_GSPCA_CONEX=m -CONFIG_USB_GSPCA_CPIA1=m -CONFIG_USB_GSPCA_DTCS033=m -CONFIG_USB_GSPCA_ETOMS=m -CONFIG_USB_GSPCA_FINEPIX=m -CONFIG_USB_GSPCA_JEILINJ=m -CONFIG_USB_GSPCA_JL2005BCD=m -CONFIG_USB_GSPCA_KINECT=m -CONFIG_USB_GSPCA_KONICA=m -CONFIG_USB_GSPCA_MARS=m -CONFIG_USB_GSPCA_MR97310A=m -CONFIG_USB_GSPCA_NW80X=m -CONFIG_USB_GSPCA_OV519=m -CONFIG_USB_GSPCA_OV534=m -CONFIG_USB_GSPCA_OV534_9=m -CONFIG_USB_GSPCA_PAC207=m -CONFIG_USB_GSPCA_PAC7302=m -CONFIG_USB_GSPCA_PAC7311=m -CONFIG_USB_GSPCA_SE401=m -CONFIG_USB_GSPCA_SN9C2028=m -CONFIG_USB_GSPCA_SN9C20X=m -CONFIG_USB_GSPCA_SONIXB=m -CONFIG_USB_GSPCA_SONIXJ=m -CONFIG_USB_GSPCA_SPCA500=m -CONFIG_USB_GSPCA_SPCA501=m -CONFIG_USB_GSPCA_SPCA505=m -CONFIG_USB_GSPCA_SPCA506=m -CONFIG_USB_GSPCA_SPCA508=m -CONFIG_USB_GSPCA_SPCA561=m -CONFIG_USB_GSPCA_SPCA1528=m -CONFIG_USB_GSPCA_SQ905=m -CONFIG_USB_GSPCA_SQ905C=m -CONFIG_USB_GSPCA_SQ930X=m -CONFIG_USB_GSPCA_STK014=m -CONFIG_USB_GSPCA_STK1135=m -CONFIG_USB_GSPCA_STV0680=m -CONFIG_USB_GSPCA_SUNPLUS=m -CONFIG_USB_GSPCA_T613=m -CONFIG_USB_GSPCA_TOPRO=m -CONFIG_USB_GSPCA_TOUPTEK=m -CONFIG_USB_GSPCA_TV8532=m -CONFIG_USB_GSPCA_VC032X=m -CONFIG_USB_GSPCA_VICAM=m -CONFIG_USB_GSPCA_XIRLINK_CIT=m -CONFIG_USB_GSPCA_ZC3XX=m -CONFIG_USB_PWC=m -# CONFIG_USB_PWC_DEBUG is not set -CONFIG_USB_PWC_INPUT_EVDEV=y -CONFIG_VIDEO_CPIA2=m -CONFIG_USB_ZR364XX=m -CONFIG_USB_STKWEBCAM=m -CONFIG_USB_S2255=m -CONFIG_VIDEO_USBTV=m - -# -# Analog TV USB devices -# -CONFIG_VIDEO_PVRUSB2=m -CONFIG_VIDEO_PVRUSB2_SYSFS=y -CONFIG_VIDEO_PVRUSB2_DVB=y -# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set -CONFIG_VIDEO_HDPVR=m -CONFIG_VIDEO_USBVISION=m -CONFIG_VIDEO_STK1160_COMMON=m -CONFIG_VIDEO_STK1160=m -CONFIG_VIDEO_GO7007=m -CONFIG_VIDEO_GO7007_USB=m -CONFIG_VIDEO_GO7007_LOADER=m -CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m - -# -# Analog/digital TV USB devices -# -CONFIG_VIDEO_AU0828=m -CONFIG_VIDEO_AU0828_V4L2=y -CONFIG_VIDEO_AU0828_RC=y -CONFIG_VIDEO_CX231XX=m -CONFIG_VIDEO_CX231XX_RC=y -CONFIG_VIDEO_CX231XX_ALSA=m -CONFIG_VIDEO_CX231XX_DVB=m -CONFIG_VIDEO_TM6000=m -CONFIG_VIDEO_TM6000_ALSA=m -CONFIG_VIDEO_TM6000_DVB=m - -# -# Digital TV USB devices -# -CONFIG_DVB_USB=m -# CONFIG_DVB_USB_DEBUG is not set -CONFIG_DVB_USB_DIB3000MC=m -CONFIG_DVB_USB_A800=m -CONFIG_DVB_USB_DIBUSB_MB=m -# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set -CONFIG_DVB_USB_DIBUSB_MC=m -CONFIG_DVB_USB_DIB0700=m -CONFIG_DVB_USB_UMT_010=m -CONFIG_DVB_USB_CXUSB=m -CONFIG_DVB_USB_M920X=m -CONFIG_DVB_USB_DIGITV=m -CONFIG_DVB_USB_VP7045=m -CONFIG_DVB_USB_VP702X=m -CONFIG_DVB_USB_GP8PSK=m -CONFIG_DVB_USB_NOVA_T_USB2=m -CONFIG_DVB_USB_TTUSB2=m -CONFIG_DVB_USB_DTT200U=m -CONFIG_DVB_USB_OPERA1=m -CONFIG_DVB_USB_AF9005=m -CONFIG_DVB_USB_AF9005_REMOTE=m -CONFIG_DVB_USB_PCTV452E=m -CONFIG_DVB_USB_DW2102=m -CONFIG_DVB_USB_CINERGY_T2=m -CONFIG_DVB_USB_DTV5100=m -CONFIG_DVB_USB_FRIIO=m -CONFIG_DVB_USB_AZ6027=m -CONFIG_DVB_USB_TECHNISAT_USB2=m -CONFIG_DVB_USB_V2=m -CONFIG_DVB_USB_AF9015=m -CONFIG_DVB_USB_AF9035=m -CONFIG_DVB_USB_ANYSEE=m -CONFIG_DVB_USB_AU6610=m -CONFIG_DVB_USB_AZ6007=m -CONFIG_DVB_USB_CE6230=m -CONFIG_DVB_USB_EC168=m -CONFIG_DVB_USB_GL861=m -CONFIG_DVB_USB_LME2510=m -CONFIG_DVB_USB_MXL111SF=m -CONFIG_DVB_USB_RTL28XXU=m -CONFIG_DVB_USB_DVBSKY=m -CONFIG_DVB_USB_ZD1301=m -CONFIG_DVB_TTUSB_BUDGET=m -CONFIG_DVB_TTUSB_DEC=m -CONFIG_SMS_USB_DRV=m -CONFIG_DVB_B2C2_FLEXCOP_USB=m -# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set -CONFIG_DVB_AS102=m - -# -# Webcam, TV (analog/digital) USB devices -# -CONFIG_VIDEO_EM28XX=m -CONFIG_VIDEO_EM28XX_V4L2=m -CONFIG_VIDEO_EM28XX_ALSA=m -CONFIG_VIDEO_EM28XX_DVB=m -CONFIG_VIDEO_EM28XX_RC=m - -# -# Software defined radio USB devices -# -CONFIG_USB_AIRSPY=m -CONFIG_USB_HACKRF=m -CONFIG_USB_MSI2500=m - -# -# USB HDMI CEC adapters -# -CONFIG_USB_PULSE8_CEC=m -CONFIG_USB_RAINSHADOW_CEC=m -CONFIG_MEDIA_PCI_SUPPORT=y - -# -# Media capture support -# -CONFIG_VIDEO_MEYE=m -CONFIG_VIDEO_SOLO6X10=m -CONFIG_VIDEO_TW5864=m -CONFIG_VIDEO_TW68=m -CONFIG_VIDEO_TW686X=m - -# -# Media capture/analog TV support -# -CONFIG_VIDEO_IVTV=m -# CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set -CONFIG_VIDEO_IVTV_ALSA=m -CONFIG_VIDEO_FB_IVTV=m -CONFIG_VIDEO_HEXIUM_GEMINI=m -CONFIG_VIDEO_HEXIUM_ORION=m -CONFIG_VIDEO_MXB=m -CONFIG_VIDEO_DT3155=m - -# -# Media capture/analog/hybrid TV support -# -CONFIG_VIDEO_CX18=m -CONFIG_VIDEO_CX18_ALSA=m -CONFIG_VIDEO_CX23885=m -CONFIG_MEDIA_ALTERA_CI=m -CONFIG_VIDEO_CX25821=m -CONFIG_VIDEO_CX25821_ALSA=m -CONFIG_VIDEO_CX88=m -CONFIG_VIDEO_CX88_ALSA=m -CONFIG_VIDEO_CX88_BLACKBIRD=m -CONFIG_VIDEO_CX88_DVB=m -CONFIG_VIDEO_CX88_ENABLE_VP3054=y -CONFIG_VIDEO_CX88_VP3054=m -CONFIG_VIDEO_CX88_MPEG=m -CONFIG_VIDEO_BT848=m -CONFIG_DVB_BT8XX=m -CONFIG_VIDEO_SAA7134=m -CONFIG_VIDEO_SAA7134_ALSA=m -CONFIG_VIDEO_SAA7134_RC=y -CONFIG_VIDEO_SAA7134_DVB=m -CONFIG_VIDEO_SAA7134_GO7007=m -CONFIG_VIDEO_SAA7164=m -CONFIG_VIDEO_COBALT=m - -# -# Media digital TV PCI Adapters -# -CONFIG_DVB_AV7110_IR=y -CONFIG_DVB_AV7110=m -CONFIG_DVB_AV7110_OSD=y -CONFIG_DVB_BUDGET_CORE=m -CONFIG_DVB_BUDGET=m -CONFIG_DVB_BUDGET_CI=m -CONFIG_DVB_BUDGET_AV=m -CONFIG_DVB_BUDGET_PATCH=m -CONFIG_DVB_B2C2_FLEXCOP_PCI=m -# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set -CONFIG_DVB_PLUTO2=m -CONFIG_DVB_DM1105=m -CONFIG_DVB_PT1=m -CONFIG_DVB_PT3=m -CONFIG_MANTIS_CORE=m -CONFIG_DVB_MANTIS=m -CONFIG_DVB_HOPPER=m -CONFIG_DVB_NGENE=m -CONFIG_DVB_DDBRIDGE=m -# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set -CONFIG_DVB_SMIPCIE=m -CONFIG_DVB_NETUP_UNIDVB=m -CONFIG_VIDEO_IPU3_CIO2=m -CONFIG_V4L_PLATFORM_DRIVERS=y -CONFIG_VIDEO_CAFE_CCIC=m -CONFIG_VIDEO_VIA_CAMERA=m -CONFIG_VIDEO_CADENCE=y -CONFIG_VIDEO_CADENCE_CSI2RX=m -CONFIG_VIDEO_CADENCE_CSI2TX=m -CONFIG_SOC_CAMERA=m -CONFIG_SOC_CAMERA_PLATFORM=m -CONFIG_V4L_MEM2MEM_DRIVERS=y -CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m -CONFIG_VIDEO_SH_VEU=m -CONFIG_V4L_TEST_DRIVERS=y -# CONFIG_VIDEO_VIMC is not set -CONFIG_VIDEO_VIVID=m -CONFIG_VIDEO_VIVID_CEC=y -CONFIG_VIDEO_VIVID_MAX_DEVS=64 -CONFIG_VIDEO_VIM2M=m -CONFIG_DVB_PLATFORM_DRIVERS=y -CONFIG_CEC_PLATFORM_DRIVERS=y -CONFIG_SDR_PLATFORM_DRIVERS=y - -# -# Supported MMC/SDIO adapters -# -CONFIG_SMS_SDIO_DRV=m -CONFIG_RADIO_ADAPTERS=y -CONFIG_RADIO_TEA575X=m -CONFIG_RADIO_SI470X=m -CONFIG_USB_SI470X=m -CONFIG_I2C_SI470X=m -CONFIG_RADIO_SI4713=m -CONFIG_USB_SI4713=m -CONFIG_PLATFORM_SI4713=m -CONFIG_I2C_SI4713=m -CONFIG_RADIO_SI476X=m -CONFIG_USB_MR800=m -CONFIG_USB_DSBR=m -CONFIG_RADIO_MAXIRADIO=m -CONFIG_RADIO_SHARK=m -CONFIG_RADIO_SHARK2=m -CONFIG_USB_KEENE=m -CONFIG_USB_RAREMONO=m -CONFIG_USB_MA901=m -CONFIG_RADIO_TEA5764=m -CONFIG_RADIO_SAA7706H=m -CONFIG_RADIO_TEF6862=m -CONFIG_RADIO_WL1273=m - -# -# Texas Instruments WL128x FM driver (ST based) -# -CONFIG_RADIO_WL128X=m - -# -# Supported FireWire (IEEE 1394) Adapters -# -CONFIG_DVB_FIREDTV=m -CONFIG_DVB_FIREDTV_INPUT=y -CONFIG_MEDIA_COMMON_OPTIONS=y - -# -# common driver options -# -CONFIG_VIDEO_CX2341X=m -CONFIG_VIDEO_TVEEPROM=m -CONFIG_CYPRESS_FIRMWARE=m -CONFIG_VIDEOBUF2_CORE=m -CONFIG_VIDEOBUF2_V4L2=m -CONFIG_VIDEOBUF2_MEMOPS=m -CONFIG_VIDEOBUF2_DMA_CONTIG=m -CONFIG_VIDEOBUF2_VMALLOC=m -CONFIG_VIDEOBUF2_DMA_SG=m -CONFIG_VIDEOBUF2_DVB=m -CONFIG_DVB_B2C2_FLEXCOP=m -CONFIG_VIDEO_SAA7146=m -CONFIG_VIDEO_SAA7146_VV=m -CONFIG_SMS_SIANO_MDTV=m -CONFIG_SMS_SIANO_RC=y -CONFIG_SMS_SIANO_DEBUGFS=y -CONFIG_VIDEO_V4L2_TPG=m - -# -# Media ancillary drivers (tuners, sensors, i2c, spi, frontends) -# -CONFIG_MEDIA_SUBDRV_AUTOSELECT=y -CONFIG_MEDIA_ATTACH=y -CONFIG_VIDEO_IR_I2C=m - -# -# Audio decoders, processors and mixers -# -CONFIG_VIDEO_TVAUDIO=m -CONFIG_VIDEO_TDA7432=m -CONFIG_VIDEO_TDA9840=m -CONFIG_VIDEO_TEA6415C=m -CONFIG_VIDEO_TEA6420=m -CONFIG_VIDEO_MSP3400=m -CONFIG_VIDEO_CS3308=m -CONFIG_VIDEO_CS5345=m -CONFIG_VIDEO_CS53L32A=m -CONFIG_VIDEO_UDA1342=m -CONFIG_VIDEO_WM8775=m -CONFIG_VIDEO_WM8739=m -CONFIG_VIDEO_VP27SMPX=m -CONFIG_VIDEO_SONY_BTF_MPX=m - -# -# RDS decoders -# -CONFIG_VIDEO_SAA6588=m - -# -# Video decoders -# -CONFIG_VIDEO_ADV7604=m -CONFIG_VIDEO_ADV7842=m -CONFIG_VIDEO_BT819=m -CONFIG_VIDEO_BT856=m -CONFIG_VIDEO_BT866=m -CONFIG_VIDEO_KS0127=m -CONFIG_VIDEO_SAA7110=m -CONFIG_VIDEO_SAA711X=m -CONFIG_VIDEO_TVP5150=m -CONFIG_VIDEO_TW2804=m -CONFIG_VIDEO_TW9903=m -CONFIG_VIDEO_TW9906=m -CONFIG_VIDEO_VPX3220=m - -# -# Video and audio decoders -# -CONFIG_VIDEO_SAA717X=m -CONFIG_VIDEO_CX25840=m - -# -# Video encoders -# -CONFIG_VIDEO_SAA7127=m -CONFIG_VIDEO_SAA7185=m -CONFIG_VIDEO_ADV7170=m -CONFIG_VIDEO_ADV7175=m -CONFIG_VIDEO_ADV7511=m - -# -# Camera sensor devices -# -CONFIG_VIDEO_OV2640=m -CONFIG_VIDEO_OV7640=m -CONFIG_VIDEO_OV7670=m -CONFIG_VIDEO_MT9M111=m -CONFIG_VIDEO_MT9V011=m - -# -# Flash devices -# - -# -# Video improvement chips -# -CONFIG_VIDEO_UPD64031A=m -CONFIG_VIDEO_UPD64083=m - -# -# Audio/Video compression chips -# -CONFIG_VIDEO_SAA6752HS=m - -# -# SDR tuner chips -# - -# -# Miscellaneous helper chips -# -CONFIG_VIDEO_M52790=m - -# -# Sensors used on soc_camera driver -# - -# -# soc_camera sensor drivers -# -CONFIG_SOC_CAMERA_MT9M001=m -CONFIG_SOC_CAMERA_MT9M111=m -CONFIG_SOC_CAMERA_MT9T112=m -CONFIG_SOC_CAMERA_MT9V022=m -CONFIG_SOC_CAMERA_OV5642=m -CONFIG_SOC_CAMERA_OV772X=m -CONFIG_SOC_CAMERA_OV9640=m -CONFIG_SOC_CAMERA_OV9740=m -CONFIG_SOC_CAMERA_RJ54N1=m -CONFIG_SOC_CAMERA_TW9910=m - -# -# Media SPI Adapters -# -CONFIG_CXD2880_SPI_DRV=m -CONFIG_MEDIA_TUNER=m -CONFIG_MEDIA_TUNER_SIMPLE=m -CONFIG_MEDIA_TUNER_TDA18250=m -CONFIG_MEDIA_TUNER_TDA8290=m -CONFIG_MEDIA_TUNER_TDA827X=m -CONFIG_MEDIA_TUNER_TDA18271=m -CONFIG_MEDIA_TUNER_TDA9887=m -CONFIG_MEDIA_TUNER_TEA5761=m -CONFIG_MEDIA_TUNER_TEA5767=m -CONFIG_MEDIA_TUNER_MSI001=m -CONFIG_MEDIA_TUNER_MT20XX=m -CONFIG_MEDIA_TUNER_MT2060=m -CONFIG_MEDIA_TUNER_MT2063=m -CONFIG_MEDIA_TUNER_MT2266=m -CONFIG_MEDIA_TUNER_MT2131=m -CONFIG_MEDIA_TUNER_QT1010=m -CONFIG_MEDIA_TUNER_XC2028=m -CONFIG_MEDIA_TUNER_XC5000=m -CONFIG_MEDIA_TUNER_XC4000=m -CONFIG_MEDIA_TUNER_MXL5005S=m -CONFIG_MEDIA_TUNER_MXL5007T=m -CONFIG_MEDIA_TUNER_MC44S803=m -CONFIG_MEDIA_TUNER_MAX2165=m -CONFIG_MEDIA_TUNER_TDA18218=m -CONFIG_MEDIA_TUNER_FC0011=m -CONFIG_MEDIA_TUNER_FC0012=m -CONFIG_MEDIA_TUNER_FC0013=m -CONFIG_MEDIA_TUNER_TDA18212=m -CONFIG_MEDIA_TUNER_E4000=m -CONFIG_MEDIA_TUNER_FC2580=m -CONFIG_MEDIA_TUNER_M88RS6000T=m -CONFIG_MEDIA_TUNER_TUA9001=m -CONFIG_MEDIA_TUNER_SI2157=m -CONFIG_MEDIA_TUNER_IT913X=m -CONFIG_MEDIA_TUNER_R820T=m -CONFIG_MEDIA_TUNER_MXL301RF=m -CONFIG_MEDIA_TUNER_QM1D1C0042=m -CONFIG_MEDIA_TUNER_QM1D1B0004=m - -# -# Multistandard (satellite) frontends -# -CONFIG_DVB_STB0899=m -CONFIG_DVB_STB6100=m -CONFIG_DVB_STV090x=m -CONFIG_DVB_STV0910=m -CONFIG_DVB_STV6110x=m -CONFIG_DVB_STV6111=m -CONFIG_DVB_MXL5XX=m -CONFIG_DVB_M88DS3103=m - -# -# Multistandard (cable + terrestrial) frontends -# -CONFIG_DVB_DRXK=m -CONFIG_DVB_TDA18271C2DD=m -CONFIG_DVB_SI2165=m -CONFIG_DVB_MN88472=m -CONFIG_DVB_MN88473=m - -# -# DVB-S (satellite) frontends -# -CONFIG_DVB_CX24110=m -CONFIG_DVB_CX24123=m -CONFIG_DVB_MT312=m -CONFIG_DVB_ZL10036=m -CONFIG_DVB_ZL10039=m -CONFIG_DVB_S5H1420=m -CONFIG_DVB_STV0288=m -CONFIG_DVB_STB6000=m -CONFIG_DVB_STV0299=m -CONFIG_DVB_STV6110=m -CONFIG_DVB_STV0900=m -CONFIG_DVB_TDA8083=m -CONFIG_DVB_TDA10086=m -CONFIG_DVB_TDA8261=m -CONFIG_DVB_VES1X93=m -CONFIG_DVB_TUNER_ITD1000=m -CONFIG_DVB_TUNER_CX24113=m -CONFIG_DVB_TDA826X=m -CONFIG_DVB_TUA6100=m -CONFIG_DVB_CX24116=m -CONFIG_DVB_CX24117=m -CONFIG_DVB_CX24120=m -CONFIG_DVB_SI21XX=m -CONFIG_DVB_TS2020=m -CONFIG_DVB_DS3000=m -CONFIG_DVB_MB86A16=m -CONFIG_DVB_TDA10071=m - -# -# DVB-T (terrestrial) frontends -# -CONFIG_DVB_SP8870=m -CONFIG_DVB_SP887X=m -CONFIG_DVB_CX22700=m -CONFIG_DVB_CX22702=m -CONFIG_DVB_DRXD=m -CONFIG_DVB_L64781=m -CONFIG_DVB_TDA1004X=m -CONFIG_DVB_NXT6000=m -CONFIG_DVB_MT352=m -CONFIG_DVB_ZL10353=m -CONFIG_DVB_DIB3000MB=m -CONFIG_DVB_DIB3000MC=m -CONFIG_DVB_DIB7000M=m -CONFIG_DVB_DIB7000P=m -CONFIG_DVB_TDA10048=m -CONFIG_DVB_AF9013=m -CONFIG_DVB_EC100=m -CONFIG_DVB_STV0367=m -CONFIG_DVB_CXD2820R=m -CONFIG_DVB_CXD2841ER=m -CONFIG_DVB_RTL2830=m -CONFIG_DVB_RTL2832=m -CONFIG_DVB_RTL2832_SDR=m -CONFIG_DVB_SI2168=m -CONFIG_DVB_AS102_FE=m -CONFIG_DVB_ZD1301_DEMOD=m -CONFIG_DVB_GP8PSK_FE=m - -# -# DVB-C (cable) frontends -# -CONFIG_DVB_VES1820=m -CONFIG_DVB_TDA10021=m -CONFIG_DVB_TDA10023=m -CONFIG_DVB_STV0297=m - -# -# ATSC (North American/Korean Terrestrial/Cable DTV) frontends -# -CONFIG_DVB_NXT200X=m -CONFIG_DVB_OR51211=m -CONFIG_DVB_OR51132=m -CONFIG_DVB_BCM3510=m -CONFIG_DVB_LGDT330X=m -CONFIG_DVB_LGDT3305=m -CONFIG_DVB_LGDT3306A=m -CONFIG_DVB_LG2160=m -CONFIG_DVB_S5H1409=m -CONFIG_DVB_AU8522=m -CONFIG_DVB_AU8522_DTV=m -CONFIG_DVB_AU8522_V4L=m -CONFIG_DVB_S5H1411=m - -# -# ISDB-T (terrestrial) frontends -# -CONFIG_DVB_S921=m -CONFIG_DVB_DIB8000=m -CONFIG_DVB_MB86A20S=m - -# -# ISDB-S (satellite) & ISDB-T (terrestrial) frontends -# -CONFIG_DVB_TC90522=m - -# -# Digital terrestrial only tuners/PLL -# -CONFIG_DVB_PLL=m -CONFIG_DVB_TUNER_DIB0070=m -CONFIG_DVB_TUNER_DIB0090=m - -# -# SEC control devices for DVB-S -# -CONFIG_DVB_DRX39XYJ=m -CONFIG_DVB_LNBH25=m -CONFIG_DVB_LNBP21=m -CONFIG_DVB_LNBP22=m -CONFIG_DVB_ISL6405=m -CONFIG_DVB_ISL6421=m -CONFIG_DVB_ISL6423=m -CONFIG_DVB_A8293=m -CONFIG_DVB_LGS8GXX=m -CONFIG_DVB_ATBM8830=m -CONFIG_DVB_TDA665x=m -CONFIG_DVB_IX2505V=m -CONFIG_DVB_M88RS2000=m -CONFIG_DVB_AF9033=m -CONFIG_DVB_HORUS3A=m -CONFIG_DVB_ASCOT2E=m -CONFIG_DVB_HELENE=m - -# -# Common Interface (EN50221) controller drivers -# -CONFIG_DVB_CXD2099=m -CONFIG_DVB_SP2=m - -# -# Tools to develop new frontends -# -CONFIG_DVB_DUMMY_FE=m - -# -# Graphics support -# -CONFIG_AGP=y -CONFIG_AGP_AMD64=y -CONFIG_AGP_INTEL=y -CONFIG_AGP_SIS=m -CONFIG_AGP_VIA=y -CONFIG_INTEL_GTT=y -CONFIG_VGA_ARB=y -CONFIG_VGA_ARB_MAX_GPUS=16 -CONFIG_VGA_SWITCHEROO=y -CONFIG_DRM=m -CONFIG_DRM_MIPI_DSI=y -# CONFIG_DRM_DP_AUX_CHARDEV is not set -# CONFIG_DRM_DEBUG_SELFTEST is not set -CONFIG_DRM_KMS_HELPER=m -CONFIG_DRM_KMS_FB_HELPER=y -CONFIG_DRM_FBDEV_EMULATION=y -CONFIG_DRM_FBDEV_OVERALLOC=100 -CONFIG_DRM_LOAD_EDID_FIRMWARE=y -CONFIG_DRM_TTM=m -CONFIG_DRM_VM=y -CONFIG_DRM_SCHED=m - -# -# I2C encoder or helper chips -# -CONFIG_DRM_I2C_CH7006=m -CONFIG_DRM_I2C_SIL164=m -CONFIG_DRM_I2C_NXP_TDA998X=m -CONFIG_DRM_I2C_NXP_TDA9950=m -CONFIG_DRM_RADEON=m -# CONFIG_DRM_RADEON_USERPTR is not set -CONFIG_DRM_AMDGPU=m -# CONFIG_DRM_AMDGPU_SI is not set -# CONFIG_DRM_AMDGPU_CIK is not set -CONFIG_DRM_AMDGPU_USERPTR=y -# CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set - -# -# ACP (Audio CoProcessor) Configuration -# -# CONFIG_DRM_AMD_ACP is not set - -# -# Display Engine Configuration -# -CONFIG_DRM_AMD_DC=y -# CONFIG_DRM_AMD_DC_FBC is not set -# CONFIG_DRM_AMD_DC_DCN1_0 is not set -# CONFIG_DEBUG_KERNEL_DC is not set - -# -# AMD Library routines -# -CONFIG_CHASH=m -# CONFIG_CHASH_STATS is not set -# CONFIG_CHASH_SELFTEST is not set -CONFIG_DRM_NOUVEAU=m -CONFIG_NOUVEAU_DEBUG=5 -CONFIG_NOUVEAU_DEBUG_DEFAULT=3 -# CONFIG_NOUVEAU_DEBUG_MMU is not set -CONFIG_DRM_NOUVEAU_BACKLIGHT=y -CONFIG_DRM_I915=m -# CONFIG_DRM_I915_ALPHA_SUPPORT is not set -CONFIG_DRM_I915_CAPTURE_ERROR=y -CONFIG_DRM_I915_COMPRESS_ERROR=y -CONFIG_DRM_I915_USERPTR=y -# CONFIG_DRM_I915_GVT is not set - -# -# drm/i915 Debugging -# -# CONFIG_DRM_I915_WERROR is not set -# CONFIG_DRM_I915_DEBUG is not set -# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set -# CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set -# CONFIG_DRM_I915_DEBUG_GUC is not set -# CONFIG_DRM_I915_SELFTEST is not set -# CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set -# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set -CONFIG_DRM_VGEM=m -CONFIG_DRM_VMWGFX=m -CONFIG_DRM_VMWGFX_FBCON=y -CONFIG_DRM_GMA500=m -CONFIG_DRM_GMA600=y -CONFIG_DRM_GMA3600=y -CONFIG_DRM_UDL=m -CONFIG_DRM_AST=m -# CONFIG_DRM_MGAG200 is not set -CONFIG_DRM_CIRRUS_QEMU=m -CONFIG_DRM_QXL=m -# CONFIG_DRM_BOCHS is not set -CONFIG_DRM_VIRTIO_GPU=m -CONFIG_DRM_PANEL=y - -# -# Display Panels -# -# CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set -CONFIG_DRM_BRIDGE=y -CONFIG_DRM_PANEL_BRIDGE=y - -# -# Display Interface Bridges -# -CONFIG_DRM_ANALOGIX_ANX78XX=m -CONFIG_HSA_AMD=m -CONFIG_DRM_HISI_HIBMC=m -# CONFIG_DRM_TINYDRM is not set -CONFIG_DRM_XEN=y -CONFIG_DRM_XEN_FRONTEND=m -# CONFIG_DRM_LEGACY is not set -CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y - -# -# Frame buffer Devices -# -CONFIG_FB=y -CONFIG_FIRMWARE_EDID=y -CONFIG_FB_CMDLINE=y -CONFIG_FB_NOTIFY=y -CONFIG_FB_DDC=m -CONFIG_FB_BOOT_VESA_SUPPORT=y -CONFIG_FB_CFB_FILLRECT=y -CONFIG_FB_CFB_COPYAREA=y -CONFIG_FB_CFB_IMAGEBLIT=y -CONFIG_FB_SYS_FILLRECT=m -CONFIG_FB_SYS_COPYAREA=m -CONFIG_FB_SYS_IMAGEBLIT=m -# CONFIG_FB_FOREIGN_ENDIAN is not set -CONFIG_FB_SYS_FOPS=m -CONFIG_FB_DEFERRED_IO=y -CONFIG_FB_HECUBA=m -CONFIG_FB_SVGALIB=m -CONFIG_FB_BACKLIGHT=y -CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_TILEBLITTING=y - -# -# Frame buffer hardware drivers -# -CONFIG_FB_CIRRUS=m -CONFIG_FB_PM2=m -CONFIG_FB_PM2_FIFO_DISCONNECT=y -CONFIG_FB_CYBER2000=m -CONFIG_FB_CYBER2000_DDC=y -CONFIG_FB_ARC=m -CONFIG_FB_ASILIANT=y -CONFIG_FB_IMSTT=y -CONFIG_FB_VGA16=m -CONFIG_FB_UVESA=m -CONFIG_FB_VESA=y -CONFIG_FB_EFI=y -CONFIG_FB_N411=m -CONFIG_FB_HGA=m -CONFIG_FB_OPENCORES=m -CONFIG_FB_S1D13XXX=m -# CONFIG_FB_NVIDIA is not set -CONFIG_FB_RIVA=m -CONFIG_FB_RIVA_I2C=y -# CONFIG_FB_RIVA_DEBUG is not set -CONFIG_FB_RIVA_BACKLIGHT=y -CONFIG_FB_I740=m -CONFIG_FB_LE80578=m -CONFIG_FB_CARILLO_RANCH=m -CONFIG_FB_INTEL=m -# CONFIG_FB_INTEL_DEBUG is not set -CONFIG_FB_INTEL_I2C=y -CONFIG_FB_MATROX=m -CONFIG_FB_MATROX_MILLENIUM=y -CONFIG_FB_MATROX_MYSTIQUE=y -CONFIG_FB_MATROX_G=y -CONFIG_FB_MATROX_I2C=m -CONFIG_FB_MATROX_MAVEN=m -CONFIG_FB_RADEON=m -CONFIG_FB_RADEON_I2C=y -CONFIG_FB_RADEON_BACKLIGHT=y -# CONFIG_FB_RADEON_DEBUG is not set -CONFIG_FB_ATY128=m -CONFIG_FB_ATY128_BACKLIGHT=y -CONFIG_FB_ATY=m -CONFIG_FB_ATY_CT=y -# CONFIG_FB_ATY_GENERIC_LCD is not set -CONFIG_FB_ATY_GX=y -CONFIG_FB_ATY_BACKLIGHT=y -CONFIG_FB_S3=m -CONFIG_FB_S3_DDC=y -CONFIG_FB_SAVAGE=m -CONFIG_FB_SAVAGE_I2C=y -# CONFIG_FB_SAVAGE_ACCEL is not set -CONFIG_FB_SIS=m -CONFIG_FB_SIS_300=y -CONFIG_FB_SIS_315=y -CONFIG_FB_VIA=m -# CONFIG_FB_VIA_DIRECT_PROCFS is not set -CONFIG_FB_VIA_X_COMPATIBILITY=y -CONFIG_FB_NEOMAGIC=m -CONFIG_FB_KYRO=m -CONFIG_FB_3DFX=m -# CONFIG_FB_3DFX_ACCEL is not set -# CONFIG_FB_3DFX_I2C is not set -CONFIG_FB_VOODOO1=m -CONFIG_FB_VT8623=m -CONFIG_FB_TRIDENT=m -CONFIG_FB_ARK=m -CONFIG_FB_PM3=m -CONFIG_FB_CARMINE=m -CONFIG_FB_CARMINE_DRAM_EVAL=y -# CONFIG_CARMINE_DRAM_CUSTOM is not set -CONFIG_FB_SM501=m -CONFIG_FB_SMSCUFX=m -CONFIG_FB_UDL=m -CONFIG_FB_IBM_GXT4500=m -# CONFIG_FB_VIRTUAL is not set -CONFIG_XEN_FBDEV_FRONTEND=m -CONFIG_FB_METRONOME=m -CONFIG_FB_MB862XX=m -CONFIG_FB_MB862XX_PCI_GDC=y -CONFIG_FB_MB862XX_I2C=y -CONFIG_FB_BROADSHEET=m -CONFIG_FB_HYPERV=m -CONFIG_FB_SIMPLE=y -CONFIG_FB_SM712=m -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=m -CONFIG_LCD_L4F00242T03=m -CONFIG_LCD_LMS283GF05=m -CONFIG_LCD_LTV350QV=m -CONFIG_LCD_ILI922X=m -CONFIG_LCD_ILI9320=m -CONFIG_LCD_TDO24M=m -CONFIG_LCD_VGG2432A4=m -CONFIG_LCD_PLATFORM=m -CONFIG_LCD_S6E63M0=m -CONFIG_LCD_LD9040=m -CONFIG_LCD_AMS369FG06=m -CONFIG_LCD_LMS501KF03=m -CONFIG_LCD_HX8357=m -CONFIG_LCD_OTM3225A=m -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_BACKLIGHT_GENERIC=m -CONFIG_BACKLIGHT_LM3533=m -CONFIG_BACKLIGHT_CARILLO_RANCH=m -CONFIG_BACKLIGHT_PWM=m -CONFIG_BACKLIGHT_DA903X=m -CONFIG_BACKLIGHT_DA9052=m -CONFIG_BACKLIGHT_MAX8925=m -CONFIG_BACKLIGHT_APPLE=m -CONFIG_BACKLIGHT_PM8941_WLED=m -CONFIG_BACKLIGHT_SAHARA=m -CONFIG_BACKLIGHT_WM831X=m -CONFIG_BACKLIGHT_ADP5520=m -CONFIG_BACKLIGHT_ADP8860=m -CONFIG_BACKLIGHT_ADP8870=m -CONFIG_BACKLIGHT_88PM860X=m -CONFIG_BACKLIGHT_PCF50633=m -CONFIG_BACKLIGHT_AAT2870=m -CONFIG_BACKLIGHT_LM3630A=m -CONFIG_BACKLIGHT_LM3639=m -CONFIG_BACKLIGHT_LP855X=m -CONFIG_BACKLIGHT_LP8788=m -CONFIG_BACKLIGHT_PANDORA=m -CONFIG_BACKLIGHT_SKY81452=m -CONFIG_BACKLIGHT_AS3711=m -CONFIG_BACKLIGHT_GPIO=m -CONFIG_BACKLIGHT_LV5207LP=m -CONFIG_BACKLIGHT_BD6107=m -CONFIG_BACKLIGHT_ARCXCNN=m -CONFIG_BACKLIGHT_RAVE_SP=m -CONFIG_VGASTATE=m -CONFIG_VIDEOMODE_HELPERS=y -CONFIG_HDMI=y - -# -# Console display driver support -# -CONFIG_VGA_CONSOLE=y -# CONFIG_VGACON_SOFT_SCROLLBACK is not set -CONFIG_DUMMY_CONSOLE=y -CONFIG_DUMMY_CONSOLE_COLUMNS=80 -CONFIG_DUMMY_CONSOLE_ROWS=25 -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y -CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -# CONFIG_LOGO_LINUX_CLUT224 is not set -CONFIG_SOUND=m -CONFIG_SOUND_OSS_CORE=y -# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set -CONFIG_SND=m -CONFIG_SND_TIMER=m -CONFIG_SND_PCM=m -CONFIG_SND_PCM_ELD=y -CONFIG_SND_PCM_IEC958=y -CONFIG_SND_DMAENGINE_PCM=m -CONFIG_SND_HWDEP=m -CONFIG_SND_SEQ_DEVICE=m -CONFIG_SND_RAWMIDI=m -CONFIG_SND_COMPRESS_OFFLOAD=m -CONFIG_SND_JACK=y -CONFIG_SND_JACK_INPUT_DEV=y -CONFIG_SND_OSSEMUL=y -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m -CONFIG_SND_PCM_OSS_PLUGINS=y -CONFIG_SND_PCM_TIMER=y -CONFIG_SND_HRTIMER=m -CONFIG_SND_DYNAMIC_MINORS=y -CONFIG_SND_MAX_CARDS=32 -CONFIG_SND_SUPPORT_OLD_API=y -CONFIG_SND_PROC_FS=y -CONFIG_SND_VERBOSE_PROCFS=y -# CONFIG_SND_VERBOSE_PRINTK is not set -# CONFIG_SND_DEBUG is not set -CONFIG_SND_VMASTER=y -CONFIG_SND_DMA_SGBUF=y -CONFIG_SND_SEQUENCER=m -CONFIG_SND_SEQ_DUMMY=m -# CONFIG_SND_SEQUENCER_OSS is not set -CONFIG_SND_SEQ_HRTIMER_DEFAULT=y -CONFIG_SND_SEQ_MIDI_EVENT=m -CONFIG_SND_SEQ_MIDI=m -CONFIG_SND_SEQ_MIDI_EMUL=m -CONFIG_SND_SEQ_VIRMIDI=m -CONFIG_SND_MPU401_UART=m -CONFIG_SND_OPL3_LIB=m -CONFIG_SND_OPL3_LIB_SEQ=m -CONFIG_SND_VX_LIB=m -CONFIG_SND_AC97_CODEC=m -CONFIG_SND_DRIVERS=y -CONFIG_SND_PCSP=m -CONFIG_SND_DUMMY=m -CONFIG_SND_ALOOP=m -CONFIG_SND_VIRMIDI=m -CONFIG_SND_MTPAV=m -CONFIG_SND_MTS64=m -CONFIG_SND_SERIAL_U16550=m -CONFIG_SND_MPU401=m -CONFIG_SND_PORTMAN2X4=m -CONFIG_SND_AC97_POWER_SAVE=y -CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 -CONFIG_SND_SB_COMMON=m -CONFIG_SND_PCI=y -CONFIG_SND_AD1889=m -CONFIG_SND_ALS4000=m -CONFIG_SND_ASIHPI=m -CONFIG_SND_ATIIXP=m -CONFIG_SND_ATIIXP_MODEM=m -CONFIG_SND_AU8810=m -CONFIG_SND_AU8820=m -CONFIG_SND_AU8830=m -CONFIG_SND_AW2=m -CONFIG_SND_BT87X=m -# CONFIG_SND_BT87X_OVERCLOCK is not set -CONFIG_SND_CA0106=m -CONFIG_SND_CMIPCI=m -CONFIG_SND_OXYGEN_LIB=m -CONFIG_SND_OXYGEN=m -CONFIG_SND_CS4281=m -CONFIG_SND_CS46XX=m -CONFIG_SND_CS46XX_NEW_DSP=y -CONFIG_SND_CTXFI=m -CONFIG_SND_DARLA20=m -CONFIG_SND_GINA20=m -CONFIG_SND_LAYLA20=m -CONFIG_SND_DARLA24=m -CONFIG_SND_GINA24=m -CONFIG_SND_LAYLA24=m -CONFIG_SND_MONA=m -CONFIG_SND_MIA=m -CONFIG_SND_ECHO3G=m -CONFIG_SND_INDIGO=m -CONFIG_SND_INDIGOIO=m -CONFIG_SND_INDIGODJ=m -CONFIG_SND_INDIGOIOX=m -CONFIG_SND_INDIGODJX=m -CONFIG_SND_ENS1370=m -CONFIG_SND_ENS1371=m -CONFIG_SND_FM801=m -CONFIG_SND_FM801_TEA575X_BOOL=y -CONFIG_SND_HDSP=m -CONFIG_SND_HDSPM=m -CONFIG_SND_ICE1724=m -CONFIG_SND_INTEL8X0=m -CONFIG_SND_INTEL8X0M=m -CONFIG_SND_KORG1212=m -CONFIG_SND_LOLA=m -CONFIG_SND_LX6464ES=m -CONFIG_SND_MIXART=m -CONFIG_SND_NM256=m -CONFIG_SND_PCXHR=m -CONFIG_SND_RIPTIDE=m -CONFIG_SND_RME32=m -CONFIG_SND_RME96=m -CONFIG_SND_RME9652=m -CONFIG_SND_VIA82XX=m -CONFIG_SND_VIA82XX_MODEM=m -CONFIG_SND_VIRTUOSO=m -CONFIG_SND_VX222=m -CONFIG_SND_YMFPCI=m - -# -# HD-Audio -# -CONFIG_SND_HDA=m -CONFIG_SND_HDA_INTEL=m -CONFIG_SND_HDA_HWDEP=y -CONFIG_SND_HDA_RECONFIG=y -CONFIG_SND_HDA_INPUT_BEEP=y -CONFIG_SND_HDA_INPUT_BEEP_MODE=0 -CONFIG_SND_HDA_PATCH_LOADER=y -CONFIG_SND_HDA_CODEC_REALTEK=m -CONFIG_SND_HDA_CODEC_ANALOG=m -CONFIG_SND_HDA_CODEC_SIGMATEL=m -CONFIG_SND_HDA_CODEC_VIA=m -CONFIG_SND_HDA_CODEC_HDMI=m -CONFIG_SND_HDA_CODEC_CIRRUS=m -CONFIG_SND_HDA_CODEC_CONEXANT=m -CONFIG_SND_HDA_CODEC_CA0110=m -CONFIG_SND_HDA_CODEC_CA0132=m -CONFIG_SND_HDA_CODEC_CA0132_DSP=y -CONFIG_SND_HDA_CODEC_CMEDIA=m -CONFIG_SND_HDA_CODEC_SI3054=m -CONFIG_SND_HDA_GENERIC=m -CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 -CONFIG_SND_HDA_CORE=m -CONFIG_SND_HDA_DSP_LOADER=y -CONFIG_SND_HDA_I915=y -CONFIG_SND_HDA_EXT_CORE=m -CONFIG_SND_HDA_PREALLOC_SIZE=64 -CONFIG_SND_SPI=y -CONFIG_SND_USB=y -CONFIG_SND_USB_AUDIO=m -CONFIG_SND_USB_UA101=m -CONFIG_SND_USB_USX2Y=m -CONFIG_SND_USB_CAIAQ=m -CONFIG_SND_USB_CAIAQ_INPUT=y -CONFIG_SND_USB_US122L=m -CONFIG_SND_USB_6FIRE=m -CONFIG_SND_USB_HIFACE=m -CONFIG_SND_BCD2000=m -CONFIG_SND_USB_LINE6=m -CONFIG_SND_USB_POD=m -CONFIG_SND_USB_PODHD=m -CONFIG_SND_USB_TONEPORT=m -CONFIG_SND_USB_VARIAX=m -CONFIG_SND_FIREWIRE=y -CONFIG_SND_FIREWIRE_LIB=m -CONFIG_SND_DICE=m -CONFIG_SND_OXFW=m -CONFIG_SND_ISIGHT=m -CONFIG_SND_FIREWORKS=m -CONFIG_SND_BEBOB=m -CONFIG_SND_FIREWIRE_DIGI00X=m -CONFIG_SND_FIREWIRE_TASCAM=m -CONFIG_SND_FIREWIRE_MOTU=m -CONFIG_SND_FIREFACE=m -CONFIG_SND_PCMCIA=y -CONFIG_SND_VXPOCKET=m -CONFIG_SND_PDAUDIOCF=m -CONFIG_SND_SOC=m -CONFIG_SND_SOC_AC97_BUS=y -CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y -CONFIG_SND_SOC_COMPRESS=y -CONFIG_SND_SOC_TOPOLOGY=y -CONFIG_SND_SOC_ACPI=m -CONFIG_SND_SOC_AMD_ACP=m -CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m -CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m -CONFIG_SND_ATMEL_SOC=m -CONFIG_SND_DESIGNWARE_I2S=m -# CONFIG_SND_DESIGNWARE_PCM is not set - -# -# SoC Audio for Freescale CPUs -# - -# -# Common SoC Audio options for Freescale CPUs: -# -CONFIG_SND_SOC_FSL_ASRC=m -CONFIG_SND_SOC_FSL_SAI=m -CONFIG_SND_SOC_FSL_SSI=m -CONFIG_SND_SOC_FSL_SPDIF=m -CONFIG_SND_SOC_FSL_ESAI=m -CONFIG_SND_SOC_IMX_AUDMUX=m -CONFIG_SND_I2S_HI6210_I2S=m -# CONFIG_SND_SOC_IMG is not set -CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y -CONFIG_SND_SST_IPC=m -CONFIG_SND_SST_IPC_PCI=m -CONFIG_SND_SST_IPC_ACPI=m -CONFIG_SND_SOC_INTEL_SST_ACPI=m -CONFIG_SND_SOC_INTEL_SST=m -CONFIG_SND_SOC_INTEL_SST_FIRMWARE=m -CONFIG_SND_SOC_INTEL_HASWELL=m -CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m -CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI=m -CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI=m -CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m -CONFIG_SND_SOC_INTEL_SKYLAKE=m -CONFIG_SND_SOC_ACPI_INTEL_MATCH=m -CONFIG_SND_SOC_INTEL_MACH=y -CONFIG_SND_SOC_INTEL_HASWELL_MACH=m -CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m -CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m -CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m -CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m -CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m -CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m -CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m -CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m -CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m -CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m -CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m -CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m -CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m -CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m -CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m -CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m -CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH=m -CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH=m -CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH=m - -# -# STMicroelectronics STM32 SOC audio support -# -CONFIG_SND_SOC_XTFPGA_I2S=m -CONFIG_ZX_TDM=m -CONFIG_SND_SOC_I2C_AND_SPI=m - -# -# CODEC drivers -# -CONFIG_SND_SOC_AC97_CODEC=m -CONFIG_SND_SOC_ADAU_UTILS=m -CONFIG_SND_SOC_ADAU1701=m -CONFIG_SND_SOC_ADAU17X1=m -CONFIG_SND_SOC_ADAU1761=m -CONFIG_SND_SOC_ADAU1761_I2C=m -CONFIG_SND_SOC_ADAU1761_SPI=m -CONFIG_SND_SOC_ADAU7002=m -CONFIG_SND_SOC_AK4104=m -CONFIG_SND_SOC_AK4458=m -CONFIG_SND_SOC_AK4554=m -CONFIG_SND_SOC_AK4613=m -CONFIG_SND_SOC_AK4642=m -CONFIG_SND_SOC_AK5386=m -CONFIG_SND_SOC_AK5558=m -CONFIG_SND_SOC_ALC5623=m -CONFIG_SND_SOC_BD28623=m -CONFIG_SND_SOC_BT_SCO=m -CONFIG_SND_SOC_CS35L32=m -CONFIG_SND_SOC_CS35L33=m -CONFIG_SND_SOC_CS35L34=m -CONFIG_SND_SOC_CS35L35=m -CONFIG_SND_SOC_CS42L42=m -CONFIG_SND_SOC_CS42L51=m -CONFIG_SND_SOC_CS42L51_I2C=m -CONFIG_SND_SOC_CS42L52=m -CONFIG_SND_SOC_CS42L56=m -CONFIG_SND_SOC_CS42L73=m -CONFIG_SND_SOC_CS4265=m -CONFIG_SND_SOC_CS4270=m -CONFIG_SND_SOC_CS4271=m -CONFIG_SND_SOC_CS4271_I2C=m -CONFIG_SND_SOC_CS4271_SPI=m -CONFIG_SND_SOC_CS42XX8=m -CONFIG_SND_SOC_CS42XX8_I2C=m -CONFIG_SND_SOC_CS43130=m -CONFIG_SND_SOC_CS4349=m -CONFIG_SND_SOC_CS53L30=m -CONFIG_SND_SOC_DA7213=m -CONFIG_SND_SOC_DA7219=m -CONFIG_SND_SOC_DIO2125=m -CONFIG_SND_SOC_DMIC=m -CONFIG_SND_SOC_HDMI_CODEC=m -CONFIG_SND_SOC_ES7134=m -CONFIG_SND_SOC_ES8316=m -CONFIG_SND_SOC_ES8328=m -CONFIG_SND_SOC_ES8328_I2C=m -CONFIG_SND_SOC_ES8328_SPI=m -CONFIG_SND_SOC_GTM601=m -CONFIG_SND_SOC_HDAC_HDMI=m -CONFIG_SND_SOC_INNO_RK3036=m -CONFIG_SND_SOC_MAX98090=m -CONFIG_SND_SOC_MAX98357A=m -CONFIG_SND_SOC_MAX98504=m -CONFIG_SND_SOC_MAX9867=m -CONFIG_SND_SOC_MAX98927=m -CONFIG_SND_SOC_MAX98373=m -CONFIG_SND_SOC_MAX9860=m -CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m -CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m -CONFIG_SND_SOC_PCM1681=m -CONFIG_SND_SOC_PCM1789=m -CONFIG_SND_SOC_PCM1789_I2C=m -CONFIG_SND_SOC_PCM179X=m -CONFIG_SND_SOC_PCM179X_I2C=m -CONFIG_SND_SOC_PCM179X_SPI=m -CONFIG_SND_SOC_PCM186X=m -CONFIG_SND_SOC_PCM186X_I2C=m -CONFIG_SND_SOC_PCM186X_SPI=m -CONFIG_SND_SOC_PCM3168A=m -CONFIG_SND_SOC_PCM3168A_I2C=m -CONFIG_SND_SOC_PCM3168A_SPI=m -CONFIG_SND_SOC_PCM512x=m -CONFIG_SND_SOC_PCM512x_I2C=m -CONFIG_SND_SOC_PCM512x_SPI=m -CONFIG_SND_SOC_RL6231=m -CONFIG_SND_SOC_RL6347A=m -CONFIG_SND_SOC_RT286=m -CONFIG_SND_SOC_RT298=m -CONFIG_SND_SOC_RT5514=m -CONFIG_SND_SOC_RT5514_SPI=m -CONFIG_SND_SOC_RT5616=m -CONFIG_SND_SOC_RT5631=m -CONFIG_SND_SOC_RT5640=m -CONFIG_SND_SOC_RT5645=m -CONFIG_SND_SOC_RT5651=m -CONFIG_SND_SOC_RT5663=m -CONFIG_SND_SOC_RT5670=m -CONFIG_SND_SOC_RT5677=m -CONFIG_SND_SOC_RT5677_SPI=m -CONFIG_SND_SOC_SGTL5000=m -CONFIG_SND_SOC_SI476X=m -CONFIG_SND_SOC_SIGMADSP=m -CONFIG_SND_SOC_SIGMADSP_I2C=m -CONFIG_SND_SOC_SIGMADSP_REGMAP=m -CONFIG_SND_SOC_SIRF_AUDIO_CODEC=m -CONFIG_SND_SOC_SPDIF=m -CONFIG_SND_SOC_SSM2305=m -CONFIG_SND_SOC_SSM2602=m -CONFIG_SND_SOC_SSM2602_SPI=m -CONFIG_SND_SOC_SSM2602_I2C=m -CONFIG_SND_SOC_SSM4567=m -CONFIG_SND_SOC_STA32X=m -CONFIG_SND_SOC_STA350=m -CONFIG_SND_SOC_STI_SAS=m -CONFIG_SND_SOC_TAS2552=m -CONFIG_SND_SOC_TAS5086=m -CONFIG_SND_SOC_TAS571X=m -CONFIG_SND_SOC_TAS5720=m -CONFIG_SND_SOC_TAS6424=m -CONFIG_SND_SOC_TDA7419=m -CONFIG_SND_SOC_TFA9879=m -CONFIG_SND_SOC_TLV320AIC23=m -CONFIG_SND_SOC_TLV320AIC23_I2C=m -CONFIG_SND_SOC_TLV320AIC23_SPI=m -CONFIG_SND_SOC_TLV320AIC31XX=m -CONFIG_SND_SOC_TLV320AIC32X4=m -CONFIG_SND_SOC_TLV320AIC32X4_I2C=m -CONFIG_SND_SOC_TLV320AIC32X4_SPI=m -CONFIG_SND_SOC_TLV320AIC3X=m -CONFIG_SND_SOC_TS3A227E=m -CONFIG_SND_SOC_TSCS42XX=m -CONFIG_SND_SOC_TSCS454=m -CONFIG_SND_SOC_WM8510=m -CONFIG_SND_SOC_WM8523=m -CONFIG_SND_SOC_WM8524=m -CONFIG_SND_SOC_WM8580=m -CONFIG_SND_SOC_WM8711=m -CONFIG_SND_SOC_WM8728=m -CONFIG_SND_SOC_WM8731=m -CONFIG_SND_SOC_WM8737=m -CONFIG_SND_SOC_WM8741=m -CONFIG_SND_SOC_WM8750=m -CONFIG_SND_SOC_WM8753=m -CONFIG_SND_SOC_WM8770=m -CONFIG_SND_SOC_WM8776=m -CONFIG_SND_SOC_WM8782=m -CONFIG_SND_SOC_WM8804=m -CONFIG_SND_SOC_WM8804_I2C=m -CONFIG_SND_SOC_WM8804_SPI=m -CONFIG_SND_SOC_WM8903=m -CONFIG_SND_SOC_WM8960=m -CONFIG_SND_SOC_WM8962=m -CONFIG_SND_SOC_WM8974=m -CONFIG_SND_SOC_WM8978=m -CONFIG_SND_SOC_WM8985=m -CONFIG_SND_SOC_ZX_AUD96P22=m -CONFIG_SND_SOC_MAX9759=m -CONFIG_SND_SOC_MT6351=m -CONFIG_SND_SOC_NAU8540=m -CONFIG_SND_SOC_NAU8810=m -CONFIG_SND_SOC_NAU8824=m -CONFIG_SND_SOC_NAU8825=m -CONFIG_SND_SOC_TPA6130A2=m -CONFIG_SND_SIMPLE_CARD_UTILS=m -CONFIG_SND_SIMPLE_CARD=m -CONFIG_SND_X86=y -CONFIG_HDMI_LPE_AUDIO=m -CONFIG_SND_XEN_FRONTEND=m -CONFIG_AC97_BUS=m - -# -# HID support -# -CONFIG_HID=m -CONFIG_HID_BATTERY_STRENGTH=y -CONFIG_HIDRAW=y -CONFIG_UHID=m -CONFIG_HID_GENERIC=m - -# -# Special HID drivers -# -CONFIG_HID_A4TECH=m -CONFIG_HID_ACCUTOUCH=m -CONFIG_HID_ACRUX=m -CONFIG_HID_ACRUX_FF=y -CONFIG_HID_APPLE=m -CONFIG_HID_APPLEIR=m -CONFIG_HID_ASUS=m -CONFIG_HID_AUREAL=m -CONFIG_HID_BELKIN=m -CONFIG_HID_BETOP_FF=m -CONFIG_HID_CHERRY=m -CONFIG_HID_CHICONY=m -CONFIG_HID_CORSAIR=m -CONFIG_HID_PRODIKEYS=m -CONFIG_HID_CMEDIA=m -CONFIG_HID_CP2112=m -CONFIG_HID_CYPRESS=m -CONFIG_HID_DRAGONRISE=m -CONFIG_DRAGONRISE_FF=y -CONFIG_HID_EMS_FF=m -CONFIG_HID_ELAN=m -CONFIG_HID_ELECOM=m -CONFIG_HID_ELO=m -CONFIG_HID_EZKEY=m -CONFIG_HID_GEMBIRD=m -CONFIG_HID_GFRM=m -CONFIG_HID_HOLTEK=m -CONFIG_HOLTEK_FF=y -CONFIG_HID_GOOGLE_HAMMER=m -CONFIG_HID_GT683R=m -CONFIG_HID_KEYTOUCH=m -CONFIG_HID_KYE=m -CONFIG_HID_UCLOGIC=m -CONFIG_HID_WALTOP=m -CONFIG_HID_GYRATION=m -CONFIG_HID_ICADE=m -CONFIG_HID_ITE=m -CONFIG_HID_JABRA=m -CONFIG_HID_TWINHAN=m -CONFIG_HID_KENSINGTON=m -CONFIG_HID_LCPOWER=m -CONFIG_HID_LED=m -CONFIG_HID_LENOVO=m -CONFIG_HID_LOGITECH=m -CONFIG_HID_LOGITECH_DJ=m -CONFIG_HID_LOGITECH_HIDPP=m -CONFIG_LOGITECH_FF=y -CONFIG_LOGIRUMBLEPAD2_FF=y -CONFIG_LOGIG940_FF=y -CONFIG_LOGIWHEELS_FF=y -CONFIG_HID_MAGICMOUSE=m -CONFIG_HID_MAYFLASH=m -CONFIG_HID_REDRAGON=m -CONFIG_HID_MICROSOFT=m -CONFIG_HID_MONTEREY=m -CONFIG_HID_MULTITOUCH=m -CONFIG_HID_NTI=m -CONFIG_HID_NTRIG=m -CONFIG_HID_ORTEK=m -CONFIG_HID_PANTHERLORD=m -CONFIG_PANTHERLORD_FF=y -CONFIG_HID_PENMOUNT=m -CONFIG_HID_PETALYNX=m -CONFIG_HID_PICOLCD=m -CONFIG_HID_PICOLCD_FB=y -CONFIG_HID_PICOLCD_BACKLIGHT=y -CONFIG_HID_PICOLCD_LCD=y -CONFIG_HID_PICOLCD_LEDS=y -CONFIG_HID_PICOLCD_CIR=y -CONFIG_HID_PLANTRONICS=m -CONFIG_HID_PRIMAX=m -CONFIG_HID_RETRODE=m -CONFIG_HID_ROCCAT=m -CONFIG_HID_SAITEK=m -CONFIG_HID_SAMSUNG=m -CONFIG_HID_SONY=m -CONFIG_SONY_FF=y -CONFIG_HID_SPEEDLINK=m -CONFIG_HID_STEAM=m -CONFIG_HID_STEELSERIES=m -CONFIG_HID_SUNPLUS=m -CONFIG_HID_RMI=m -CONFIG_HID_GREENASIA=m -CONFIG_GREENASIA_FF=y -CONFIG_HID_HYPERV_MOUSE=m -CONFIG_HID_SMARTJOYPLUS=m -CONFIG_SMARTJOYPLUS_FF=y -CONFIG_HID_TIVO=m -CONFIG_HID_TOPSEED=m -CONFIG_HID_THINGM=m -CONFIG_HID_THRUSTMASTER=m -CONFIG_THRUSTMASTER_FF=y -CONFIG_HID_UDRAW_PS3=m -CONFIG_HID_WACOM=m -CONFIG_HID_WIIMOTE=m -CONFIG_HID_XINMO=m -CONFIG_HID_ZEROPLUS=m -CONFIG_ZEROPLUS_FF=y -CONFIG_HID_ZYDACRON=m -CONFIG_HID_SENSOR_HUB=m -CONFIG_HID_SENSOR_CUSTOM_SENSOR=m -CONFIG_HID_ALPS=m - -# -# USB HID support -# -CONFIG_USB_HID=m -CONFIG_HID_PID=y -CONFIG_USB_HIDDEV=y - -# -# USB HID Boot Protocol drivers -# -CONFIG_USB_KBD=m -CONFIG_USB_MOUSE=m - -# -# I2C HID support -# -CONFIG_I2C_HID=m - -# -# Intel ISH HID support -# -CONFIG_INTEL_ISH_HID=m -CONFIG_USB_OHCI_LITTLE_ENDIAN=y -CONFIG_USB_SUPPORT=y -CONFIG_USB_COMMON=y -CONFIG_USB_ARCH_HAS_HCD=y -CONFIG_USB=y -CONFIG_USB_PCI=y -CONFIG_USB_ANNOUNCE_NEW_DEVICES=y - -# -# Miscellaneous USB options -# -CONFIG_USB_DEFAULT_PERSIST=y -CONFIG_USB_DYNAMIC_MINORS=y -# CONFIG_USB_OTG is not set -# CONFIG_USB_OTG_WHITELIST is not set -# CONFIG_USB_OTG_BLACKLIST_HUB is not set -CONFIG_USB_LEDS_TRIGGER_USBPORT=m -CONFIG_USB_MON=m -CONFIG_USB_WUSB=m -CONFIG_USB_WUSB_CBAF=m -# CONFIG_USB_WUSB_CBAF_DEBUG is not set - -# -# USB Host Controller Drivers -# -CONFIG_USB_C67X00_HCD=m -CONFIG_USB_XHCI_HCD=y -# CONFIG_USB_XHCI_DBGCAP is not set -CONFIG_USB_XHCI_PCI=y -CONFIG_USB_XHCI_PLATFORM=m -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_ROOT_HUB_TT=y -CONFIG_USB_EHCI_TT_NEWSCHED=y -CONFIG_USB_EHCI_PCI=y -CONFIG_USB_EHCI_HCD_PLATFORM=y -CONFIG_USB_OXU210HP_HCD=m -CONFIG_USB_ISP116X_HCD=m -CONFIG_USB_FOTG210_HCD=m -CONFIG_USB_MAX3421_HCD=m -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_OHCI_HCD_PCI=y -CONFIG_USB_OHCI_HCD_PLATFORM=y -CONFIG_USB_UHCI_HCD=y -CONFIG_USB_U132_HCD=m -CONFIG_USB_SL811_HCD=m -CONFIG_USB_SL811_HCD_ISO=y -CONFIG_USB_SL811_CS=m -CONFIG_USB_R8A66597_HCD=m -CONFIG_USB_WHCI_HCD=m -CONFIG_USB_HWA_HCD=m -CONFIG_USB_HCD_BCMA=m -CONFIG_USB_HCD_SSB=m -# CONFIG_USB_HCD_TEST_MODE is not set - -# -# USB Device Class drivers -# -CONFIG_USB_ACM=m -CONFIG_USB_PRINTER=m -CONFIG_USB_WDM=m -CONFIG_USB_TMC=m - -# -# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may -# - -# -# also be needed; see USB_STORAGE Help for more info -# -CONFIG_USB_STORAGE=m -# CONFIG_USB_STORAGE_DEBUG is not set -CONFIG_USB_STORAGE_REALTEK=m -CONFIG_REALTEK_AUTOPM=y -CONFIG_USB_STORAGE_DATAFAB=m -CONFIG_USB_STORAGE_FREECOM=m -CONFIG_USB_STORAGE_ISD200=m -CONFIG_USB_STORAGE_USBAT=m -CONFIG_USB_STORAGE_SDDR09=m -CONFIG_USB_STORAGE_SDDR55=m -CONFIG_USB_STORAGE_JUMPSHOT=m -CONFIG_USB_STORAGE_ALAUDA=m -CONFIG_USB_STORAGE_ONETOUCH=m -CONFIG_USB_STORAGE_KARMA=m -CONFIG_USB_STORAGE_CYPRESS_ATACB=m -CONFIG_USB_STORAGE_ENE_UB6250=m -CONFIG_USB_UAS=m - -# -# USB Imaging devices -# -CONFIG_USB_MDC800=m -CONFIG_USB_MICROTEK=m -CONFIG_USBIP_CORE=m -CONFIG_USBIP_VHCI_HCD=m -CONFIG_USBIP_VHCI_HC_PORTS=8 -CONFIG_USBIP_VHCI_NR_HCS=1 -CONFIG_USBIP_HOST=m -CONFIG_USBIP_VUDC=m -# CONFIG_USBIP_DEBUG is not set -CONFIG_USB_MUSB_HDRC=m -# CONFIG_USB_MUSB_HOST is not set -# CONFIG_USB_MUSB_GADGET is not set -CONFIG_USB_MUSB_DUAL_ROLE=y - -# -# Platform Glue Layer -# - -# -# MUSB DMA mode -# -CONFIG_MUSB_PIO_ONLY=y -CONFIG_USB_DWC3=m -CONFIG_USB_DWC3_ULPI=y -# CONFIG_USB_DWC3_HOST is not set -# CONFIG_USB_DWC3_GADGET is not set -CONFIG_USB_DWC3_DUAL_ROLE=y - -# -# Platform Glue Driver Support -# -CONFIG_USB_DWC3_PCI=m -CONFIG_USB_DWC2=y -CONFIG_USB_DWC2_HOST=y - -# -# Gadget/Dual-role mode requires USB Gadget support to be enabled -# -CONFIG_USB_DWC2_PCI=m -# CONFIG_USB_DWC2_DEBUG is not set -# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set -CONFIG_USB_CHIPIDEA=m -CONFIG_USB_CHIPIDEA_PCI=m -CONFIG_USB_CHIPIDEA_UDC=y -CONFIG_USB_CHIPIDEA_HOST=y -CONFIG_USB_ISP1760=m -CONFIG_USB_ISP1760_HCD=y -CONFIG_USB_ISP1761_UDC=y -# CONFIG_USB_ISP1760_HOST_ROLE is not set -# CONFIG_USB_ISP1760_GADGET_ROLE is not set -CONFIG_USB_ISP1760_DUAL_ROLE=y - -# -# USB port drivers -# -CONFIG_USB_USS720=m -CONFIG_USB_SERIAL=m -CONFIG_USB_SERIAL_GENERIC=y -CONFIG_USB_SERIAL_SIMPLE=m -CONFIG_USB_SERIAL_AIRCABLE=m -CONFIG_USB_SERIAL_ARK3116=m -CONFIG_USB_SERIAL_BELKIN=m -CONFIG_USB_SERIAL_CH341=m -CONFIG_USB_SERIAL_WHITEHEAT=m -CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -CONFIG_USB_SERIAL_CP210X=m -CONFIG_USB_SERIAL_CYPRESS_M8=m -CONFIG_USB_SERIAL_EMPEG=m -CONFIG_USB_SERIAL_FTDI_SIO=m -CONFIG_USB_SERIAL_VISOR=m -CONFIG_USB_SERIAL_IPAQ=m -CONFIG_USB_SERIAL_IR=m -CONFIG_USB_SERIAL_EDGEPORT=m -CONFIG_USB_SERIAL_EDGEPORT_TI=m -CONFIG_USB_SERIAL_F81232=m -CONFIG_USB_SERIAL_F8153X=m -CONFIG_USB_SERIAL_GARMIN=m -CONFIG_USB_SERIAL_IPW=m -CONFIG_USB_SERIAL_IUU=m -CONFIG_USB_SERIAL_KEYSPAN_PDA=m -CONFIG_USB_SERIAL_KEYSPAN=m -CONFIG_USB_SERIAL_KLSI=m -CONFIG_USB_SERIAL_KOBIL_SCT=m -CONFIG_USB_SERIAL_MCT_U232=m -CONFIG_USB_SERIAL_METRO=m -CONFIG_USB_SERIAL_MOS7720=m -CONFIG_USB_SERIAL_MOS7715_PARPORT=y -CONFIG_USB_SERIAL_MOS7840=m -CONFIG_USB_SERIAL_MXUPORT=m -CONFIG_USB_SERIAL_NAVMAN=m -CONFIG_USB_SERIAL_PL2303=m -CONFIG_USB_SERIAL_OTI6858=m -CONFIG_USB_SERIAL_QCAUX=m -CONFIG_USB_SERIAL_QUALCOMM=m -CONFIG_USB_SERIAL_SPCP8X5=m -CONFIG_USB_SERIAL_SAFE=m -# CONFIG_USB_SERIAL_SAFE_PADDED is not set -CONFIG_USB_SERIAL_SIERRAWIRELESS=m -CONFIG_USB_SERIAL_SYMBOL=m -CONFIG_USB_SERIAL_TI=m -CONFIG_USB_SERIAL_CYBERJACK=m -CONFIG_USB_SERIAL_XIRCOM=m -CONFIG_USB_SERIAL_WWAN=m -CONFIG_USB_SERIAL_OPTION=m -CONFIG_USB_SERIAL_OMNINET=m -CONFIG_USB_SERIAL_OPTICON=m -CONFIG_USB_SERIAL_XSENS_MT=m -CONFIG_USB_SERIAL_WISHBONE=m -CONFIG_USB_SERIAL_SSU100=m -CONFIG_USB_SERIAL_QT2=m -CONFIG_USB_SERIAL_UPD78F0730=m -CONFIG_USB_SERIAL_DEBUG=m - -# -# USB Miscellaneous drivers -# -CONFIG_USB_EMI62=m -CONFIG_USB_EMI26=m -CONFIG_USB_ADUTUX=m -CONFIG_USB_SEVSEG=m -CONFIG_USB_RIO500=m -CONFIG_USB_LEGOTOWER=m -CONFIG_USB_LCD=m -CONFIG_USB_CYPRESS_CY7C63=m -CONFIG_USB_CYTHERM=m -CONFIG_USB_IDMOUSE=m -CONFIG_USB_FTDI_ELAN=m -CONFIG_USB_APPLEDISPLAY=m -CONFIG_USB_SISUSBVGA=m -# CONFIG_USB_SISUSBVGA_CON is not set -CONFIG_USB_LD=m -CONFIG_USB_TRANCEVIBRATOR=m -CONFIG_USB_IOWARRIOR=m -CONFIG_USB_TEST=m -CONFIG_USB_EHSET_TEST_FIXTURE=m -CONFIG_USB_ISIGHTFW=m -CONFIG_USB_YUREX=m -CONFIG_USB_EZUSB_FX2=m -CONFIG_USB_HUB_USB251XB=m -CONFIG_USB_HSIC_USB3503=m -CONFIG_USB_HSIC_USB4604=m -CONFIG_USB_LINK_LAYER_TEST=m -CONFIG_USB_CHAOSKEY=m -CONFIG_USB_ATM=m -CONFIG_USB_SPEEDTOUCH=m -CONFIG_USB_CXACRU=m -CONFIG_USB_UEAGLEATM=m -CONFIG_USB_XUSBATM=m - -# -# USB Physical Layer drivers -# -CONFIG_USB_PHY=y -CONFIG_NOP_USB_XCEIV=m -CONFIG_USB_GPIO_VBUS=m -CONFIG_TAHVO_USB=m -CONFIG_TAHVO_USB_HOST_BY_DEFAULT=y -CONFIG_USB_ISP1301=m -CONFIG_USB_GADGET=m -# CONFIG_USB_GADGET_DEBUG is not set -# CONFIG_USB_GADGET_DEBUG_FILES is not set -# CONFIG_USB_GADGET_DEBUG_FS is not set -CONFIG_USB_GADGET_VBUS_DRAW=2 -CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 -# CONFIG_U_SERIAL_CONSOLE is not set - -# -# USB Peripheral Controller -# -CONFIG_USB_FOTG210_UDC=m -CONFIG_USB_GR_UDC=m -CONFIG_USB_R8A66597=m -CONFIG_USB_PXA27X=m -CONFIG_USB_MV_UDC=m -CONFIG_USB_MV_U3D=m -CONFIG_USB_SNP_CORE=m -# CONFIG_USB_M66592 is not set -CONFIG_USB_BDC_UDC=m - -# -# Platform Support -# -CONFIG_USB_BDC_PCI=m -CONFIG_USB_AMD5536UDC=m -CONFIG_USB_NET2272=m -CONFIG_USB_NET2272_DMA=y -CONFIG_USB_NET2280=m -CONFIG_USB_GOKU=m -CONFIG_USB_EG20T=m -# CONFIG_USB_DUMMY_HCD is not set -CONFIG_USB_LIBCOMPOSITE=m -CONFIG_USB_F_ACM=m -CONFIG_USB_F_SS_LB=m -CONFIG_USB_U_SERIAL=m -CONFIG_USB_U_ETHER=m -CONFIG_USB_U_AUDIO=m -CONFIG_USB_F_SERIAL=m -CONFIG_USB_F_OBEX=m -CONFIG_USB_F_NCM=m -CONFIG_USB_F_ECM=m -CONFIG_USB_F_PHONET=m -CONFIG_USB_F_EEM=m -CONFIG_USB_F_SUBSET=m -CONFIG_USB_F_RNDIS=m -CONFIG_USB_F_MASS_STORAGE=m -CONFIG_USB_F_FS=m -CONFIG_USB_F_UAC1=m -CONFIG_USB_F_UAC2=m -CONFIG_USB_F_UVC=m -CONFIG_USB_F_MIDI=m -CONFIG_USB_F_HID=m -CONFIG_USB_F_PRINTER=m -CONFIG_USB_F_TCM=m -CONFIG_USB_CONFIGFS=m -CONFIG_USB_CONFIGFS_SERIAL=y -CONFIG_USB_CONFIGFS_ACM=y -CONFIG_USB_CONFIGFS_OBEX=y -CONFIG_USB_CONFIGFS_NCM=y -CONFIG_USB_CONFIGFS_ECM=y -CONFIG_USB_CONFIGFS_ECM_SUBSET=y -CONFIG_USB_CONFIGFS_RNDIS=y -CONFIG_USB_CONFIGFS_EEM=y -CONFIG_USB_CONFIGFS_PHONET=y -CONFIG_USB_CONFIGFS_MASS_STORAGE=y -CONFIG_USB_CONFIGFS_F_LB_SS=y -CONFIG_USB_CONFIGFS_F_FS=y -CONFIG_USB_CONFIGFS_F_UAC1=y -# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set -CONFIG_USB_CONFIGFS_F_UAC2=y -CONFIG_USB_CONFIGFS_F_MIDI=y -CONFIG_USB_CONFIGFS_F_HID=y -CONFIG_USB_CONFIGFS_F_UVC=y -CONFIG_USB_CONFIGFS_F_PRINTER=y -# CONFIG_USB_CONFIGFS_F_TCM is not set -CONFIG_USB_ZERO=m -CONFIG_USB_AUDIO=m -CONFIG_GADGET_UAC1=y -# CONFIG_GADGET_UAC1_LEGACY is not set -CONFIG_USB_ETH=m -CONFIG_USB_ETH_RNDIS=y -CONFIG_USB_ETH_EEM=y -CONFIG_USB_G_NCM=m -CONFIG_USB_GADGETFS=m -CONFIG_USB_FUNCTIONFS=m -CONFIG_USB_FUNCTIONFS_ETH=y -CONFIG_USB_FUNCTIONFS_RNDIS=y -CONFIG_USB_FUNCTIONFS_GENERIC=y -CONFIG_USB_MASS_STORAGE=m -CONFIG_USB_GADGET_TARGET=m -CONFIG_USB_G_SERIAL=m -CONFIG_USB_MIDI_GADGET=m -CONFIG_USB_G_PRINTER=m -CONFIG_USB_CDC_COMPOSITE=m -CONFIG_USB_G_NOKIA=m -CONFIG_USB_G_ACM_MS=m -# CONFIG_USB_G_MULTI is not set -CONFIG_USB_G_HID=m -CONFIG_USB_G_DBGP=m -# CONFIG_USB_G_DBGP_PRINTK is not set -CONFIG_USB_G_DBGP_SERIAL=y -CONFIG_USB_G_WEBCAM=m -CONFIG_TYPEC=m -CONFIG_TYPEC_TCPM=m -CONFIG_TYPEC_FUSB302=m -CONFIG_TYPEC_UCSI=m -CONFIG_UCSI_ACPI=m -CONFIG_TYPEC_TPS6598X=m - -# -# USB Type-C Multiplexer/DeMultiplexer Switch support -# -CONFIG_TYPEC_MUX_PI3USB30532=m -CONFIG_USB_ROLES_INTEL_XHCI=m -CONFIG_USB_LED_TRIG=y -CONFIG_USB_ULPI_BUS=m -CONFIG_USB_ROLE_SWITCH=m -CONFIG_UWB=m -CONFIG_UWB_HWA=m -CONFIG_UWB_WHCI=m -CONFIG_UWB_I1480U=m -CONFIG_MMC=y -CONFIG_MMC_BLOCK=m -CONFIG_MMC_BLOCK_MINORS=8 -CONFIG_SDIO_UART=m -# CONFIG_MMC_TEST is not set - -# -# MMC/SD/SDIO Host Controller Drivers -# -# CONFIG_MMC_DEBUG is not set -CONFIG_MMC_SDHCI=m -CONFIG_MMC_SDHCI_PCI=m -CONFIG_MMC_RICOH_MMC=y -CONFIG_MMC_SDHCI_ACPI=m -CONFIG_MMC_SDHCI_PLTFM=m -CONFIG_MMC_SDHCI_F_SDH30=m -CONFIG_MMC_WBSD=m -CONFIG_MMC_TIFM_SD=m -CONFIG_MMC_SPI=m -CONFIG_MMC_SDRICOH_CS=m -CONFIG_MMC_CB710=m -CONFIG_MMC_VIA_SDMMC=m -CONFIG_MMC_VUB300=m -CONFIG_MMC_USHC=m -CONFIG_MMC_USDHI6ROL0=m -CONFIG_MMC_REALTEK_PCI=m -CONFIG_MMC_REALTEK_USB=m -CONFIG_MMC_CQHCI=m -CONFIG_MMC_TOSHIBA_PCI=m -CONFIG_MMC_MTK=m -CONFIG_MMC_SDHCI_XENON=m -CONFIG_MEMSTICK=m -# CONFIG_MEMSTICK_DEBUG is not set - -# -# MemoryStick drivers -# -# CONFIG_MEMSTICK_UNSAFE_RESUME is not set -CONFIG_MSPRO_BLOCK=m -CONFIG_MS_BLOCK=m - -# -# MemoryStick Host Controller Drivers -# -CONFIG_MEMSTICK_TIFM_MS=m -CONFIG_MEMSTICK_JMICRON_38X=m -CONFIG_MEMSTICK_R592=m -CONFIG_MEMSTICK_REALTEK_PCI=m -CONFIG_MEMSTICK_REALTEK_USB=m -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_CLASS_FLASH=m -# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set - -# -# LED drivers -# -CONFIG_LEDS_88PM860X=m -CONFIG_LEDS_APU=m -CONFIG_LEDS_AS3645A=m -CONFIG_LEDS_LM3530=m -CONFIG_LEDS_LM3533=m -CONFIG_LEDS_LM3642=m -CONFIG_LEDS_LM3601X=m -CONFIG_LEDS_MT6323=m -CONFIG_LEDS_PCA9532=m -CONFIG_LEDS_PCA9532_GPIO=y -CONFIG_LEDS_GPIO=m -CONFIG_LEDS_LP3944=m -CONFIG_LEDS_LP3952=m -CONFIG_LEDS_LP55XX_COMMON=m -CONFIG_LEDS_LP5521=m -CONFIG_LEDS_LP5523=m -CONFIG_LEDS_LP5562=m -CONFIG_LEDS_LP8501=m -CONFIG_LEDS_LP8788=m -CONFIG_LEDS_CLEVO_MAIL=m -CONFIG_LEDS_PCA955X=m -# CONFIG_LEDS_PCA955X_GPIO is not set -CONFIG_LEDS_PCA963X=m -CONFIG_LEDS_WM831X_STATUS=m -CONFIG_LEDS_WM8350=m -CONFIG_LEDS_DA903X=m -CONFIG_LEDS_DA9052=m -CONFIG_LEDS_DAC124S085=m -CONFIG_LEDS_PWM=m -CONFIG_LEDS_REGULATOR=m -CONFIG_LEDS_BD2802=m -CONFIG_LEDS_INTEL_SS4200=m -CONFIG_LEDS_LT3593=m -CONFIG_LEDS_ADP5520=m -CONFIG_LEDS_MC13783=m -CONFIG_LEDS_TCA6507=m -CONFIG_LEDS_TLC591XX=m -CONFIG_LEDS_MAX8997=m -CONFIG_LEDS_LM355x=m -CONFIG_LEDS_MENF21BMC=m - -# -# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM) -# -CONFIG_LEDS_BLINKM=m -CONFIG_LEDS_MLXCPLD=m -CONFIG_LEDS_MLXREG=m -CONFIG_LEDS_USER=m -CONFIG_LEDS_NIC78BX=m - -# -# LED Triggers -# -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=m -CONFIG_LEDS_TRIGGER_ONESHOT=m -CONFIG_LEDS_TRIGGER_DISK=y -# CONFIG_LEDS_TRIGGER_MTD is not set -CONFIG_LEDS_TRIGGER_HEARTBEAT=m -CONFIG_LEDS_TRIGGER_BACKLIGHT=m -CONFIG_LEDS_TRIGGER_CPU=y -CONFIG_LEDS_TRIGGER_ACTIVITY=m -CONFIG_LEDS_TRIGGER_GPIO=m -CONFIG_LEDS_TRIGGER_DEFAULT_ON=m - -# -# iptables trigger is under Netfilter config (LED target) -# -CONFIG_LEDS_TRIGGER_TRANSIENT=m -CONFIG_LEDS_TRIGGER_CAMERA=m -CONFIG_LEDS_TRIGGER_PANIC=y -CONFIG_LEDS_TRIGGER_NETDEV=m -# CONFIG_ACCESSIBILITY is not set -CONFIG_INFINIBAND=m -CONFIG_INFINIBAND_USER_MAD=m -CONFIG_INFINIBAND_USER_ACCESS=m -# CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI is not set -CONFIG_INFINIBAND_USER_MEM=y -CONFIG_INFINIBAND_ON_DEMAND_PAGING=y -CONFIG_INFINIBAND_ADDR_TRANS=y -CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y -CONFIG_INFINIBAND_MTHCA=m -# CONFIG_INFINIBAND_MTHCA_DEBUG is not set -CONFIG_INFINIBAND_QIB=m -CONFIG_INFINIBAND_QIB_DCA=y -CONFIG_INFINIBAND_CXGB3=m -CONFIG_INFINIBAND_CXGB4=m -CONFIG_INFINIBAND_I40IW=m -CONFIG_MLX4_INFINIBAND=m -CONFIG_MLX5_INFINIBAND=m -CONFIG_INFINIBAND_NES=m -# CONFIG_INFINIBAND_NES_DEBUG is not set -CONFIG_INFINIBAND_OCRDMA=m -CONFIG_INFINIBAND_VMWARE_PVRDMA=m -CONFIG_INFINIBAND_USNIC=m -CONFIG_INFINIBAND_IPOIB=m -CONFIG_INFINIBAND_IPOIB_CM=y -# CONFIG_INFINIBAND_IPOIB_DEBUG is not set -CONFIG_INFINIBAND_SRP=m -CONFIG_INFINIBAND_SRPT=m -CONFIG_INFINIBAND_ISER=m -CONFIG_INFINIBAND_ISERT=m -CONFIG_INFINIBAND_OPA_VNIC=m -CONFIG_INFINIBAND_RDMAVT=m -CONFIG_RDMA_RXE=m -CONFIG_INFINIBAND_HFI1=m -# CONFIG_HFI1_DEBUG_SDMA_ORDER is not set -# CONFIG_SDMA_VERBOSITY is not set -CONFIG_INFINIBAND_QEDR=m -CONFIG_INFINIBAND_BNXT_RE=m -CONFIG_EDAC_ATOMIC_SCRUB=y -CONFIG_EDAC_SUPPORT=y -CONFIG_EDAC=y -# CONFIG_EDAC_LEGACY_SYSFS is not set -# CONFIG_EDAC_DEBUG is not set -CONFIG_EDAC_DECODE_MCE=m -CONFIG_EDAC_GHES=y -CONFIG_EDAC_AMD64=m -# CONFIG_EDAC_AMD64_ERROR_INJECTION is not set -CONFIG_EDAC_E752X=m -CONFIG_EDAC_I82975X=m -CONFIG_EDAC_I3000=m -CONFIG_EDAC_I3200=m -CONFIG_EDAC_IE31200=m -CONFIG_EDAC_X38=m -CONFIG_EDAC_I5400=m -CONFIG_EDAC_I7CORE=m -CONFIG_EDAC_I5000=m -CONFIG_EDAC_I5100=m -CONFIG_EDAC_I7300=m -CONFIG_EDAC_SBRIDGE=m -CONFIG_EDAC_SKX=m -CONFIG_EDAC_PND2=m -CONFIG_RTC_LIB=y -CONFIG_RTC_MC146818_LIB=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_HCTOSYS=y -CONFIG_RTC_HCTOSYS_DEVICE="rtc0" -CONFIG_RTC_SYSTOHC=y -CONFIG_RTC_SYSTOHC_DEVICE="rtc0" -# CONFIG_RTC_DEBUG is not set -CONFIG_RTC_NVMEM=y - -# -# RTC interfaces -# -CONFIG_RTC_INTF_SYSFS=y -CONFIG_RTC_INTF_PROC=y -CONFIG_RTC_INTF_DEV=y -# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set -# CONFIG_RTC_DRV_TEST is not set - -# -# I2C RTC drivers -# -CONFIG_RTC_DRV_88PM860X=m -CONFIG_RTC_DRV_88PM80X=m -CONFIG_RTC_DRV_ABB5ZES3=m -CONFIG_RTC_DRV_ABX80X=m -CONFIG_RTC_DRV_DS1307=m -CONFIG_RTC_DRV_DS1307_HWMON=y -# CONFIG_RTC_DRV_DS1307_CENTURY is not set -CONFIG_RTC_DRV_DS1374=m -CONFIG_RTC_DRV_DS1374_WDT=y -CONFIG_RTC_DRV_DS1672=m -CONFIG_RTC_DRV_LP8788=m -CONFIG_RTC_DRV_MAX6900=m -CONFIG_RTC_DRV_MAX8907=m -CONFIG_RTC_DRV_MAX8925=m -CONFIG_RTC_DRV_MAX8998=m -CONFIG_RTC_DRV_MAX8997=m -CONFIG_RTC_DRV_RS5C372=m -CONFIG_RTC_DRV_ISL1208=m -CONFIG_RTC_DRV_ISL12022=m -CONFIG_RTC_DRV_X1205=m -CONFIG_RTC_DRV_PCF8523=m -CONFIG_RTC_DRV_PCF85063=m -CONFIG_RTC_DRV_PCF85363=m -CONFIG_RTC_DRV_PCF8563=m -CONFIG_RTC_DRV_PCF8583=m -CONFIG_RTC_DRV_M41T80=m -CONFIG_RTC_DRV_M41T80_WDT=y -CONFIG_RTC_DRV_BQ32K=m -CONFIG_RTC_DRV_PALMAS=m -CONFIG_RTC_DRV_TPS6586X=m -CONFIG_RTC_DRV_TPS65910=m -CONFIG_RTC_DRV_TPS80031=m -CONFIG_RTC_DRV_RC5T583=m -CONFIG_RTC_DRV_S35390A=m -CONFIG_RTC_DRV_FM3130=m -CONFIG_RTC_DRV_RX8010=m -CONFIG_RTC_DRV_RX8581=m -CONFIG_RTC_DRV_RX8025=m -CONFIG_RTC_DRV_EM3027=m -CONFIG_RTC_DRV_RV8803=m -CONFIG_RTC_DRV_S5M=m - -# -# SPI RTC drivers -# -CONFIG_RTC_DRV_M41T93=m -CONFIG_RTC_DRV_M41T94=m -CONFIG_RTC_DRV_DS1302=m -CONFIG_RTC_DRV_DS1305=m -CONFIG_RTC_DRV_DS1343=m -CONFIG_RTC_DRV_DS1347=m -CONFIG_RTC_DRV_DS1390=m -CONFIG_RTC_DRV_MAX6916=m -CONFIG_RTC_DRV_R9701=m -CONFIG_RTC_DRV_RX4581=m -CONFIG_RTC_DRV_RX6110=m -CONFIG_RTC_DRV_RS5C348=m -CONFIG_RTC_DRV_MAX6902=m -CONFIG_RTC_DRV_PCF2123=m -CONFIG_RTC_DRV_MCP795=m -CONFIG_RTC_I2C_AND_SPI=y - -# -# SPI and I2C RTC drivers -# -CONFIG_RTC_DRV_DS3232=m -CONFIG_RTC_DRV_DS3232_HWMON=y -CONFIG_RTC_DRV_PCF2127=m -CONFIG_RTC_DRV_RV3029C2=m -CONFIG_RTC_DRV_RV3029_HWMON=y - -# -# Platform RTC drivers -# -CONFIG_RTC_DRV_CMOS=y -CONFIG_RTC_DRV_DS1286=m -CONFIG_RTC_DRV_DS1511=m -CONFIG_RTC_DRV_DS1553=m -CONFIG_RTC_DRV_DS1685_FAMILY=m -CONFIG_RTC_DRV_DS1685=y -# CONFIG_RTC_DRV_DS1689 is not set -# CONFIG_RTC_DRV_DS17285 is not set -# CONFIG_RTC_DRV_DS17485 is not set -# CONFIG_RTC_DRV_DS17885 is not set -# CONFIG_RTC_DS1685_PROC_REGS is not set -# CONFIG_RTC_DS1685_SYSFS_REGS is not set -CONFIG_RTC_DRV_DS1742=m -CONFIG_RTC_DRV_DS2404=m -CONFIG_RTC_DRV_DA9052=m -CONFIG_RTC_DRV_DA9055=m -CONFIG_RTC_DRV_DA9063=m -CONFIG_RTC_DRV_STK17TA8=m -CONFIG_RTC_DRV_M48T86=m -CONFIG_RTC_DRV_M48T35=m -CONFIG_RTC_DRV_M48T59=m -CONFIG_RTC_DRV_MSM6242=m -CONFIG_RTC_DRV_BQ4802=m -CONFIG_RTC_DRV_RP5C01=m -CONFIG_RTC_DRV_V3020=m -CONFIG_RTC_DRV_WM831X=m -CONFIG_RTC_DRV_WM8350=m -CONFIG_RTC_DRV_PCF50633=m -CONFIG_RTC_DRV_AB3100=m -CONFIG_RTC_DRV_CROS_EC=m - -# -# on-CPU RTC drivers -# -CONFIG_RTC_DRV_FTRTC010=m -CONFIG_RTC_DRV_PCAP=m -CONFIG_RTC_DRV_MC13XXX=m -CONFIG_RTC_DRV_MT6397=m - -# -# HID Sensor RTC drivers -# -CONFIG_RTC_DRV_HID_SENSOR_TIME=m -CONFIG_DMADEVICES=y -# CONFIG_DMADEVICES_DEBUG is not set - -# -# DMA Devices -# -CONFIG_DMA_ENGINE=y -CONFIG_DMA_VIRTUAL_CHANNELS=m -CONFIG_DMA_ACPI=y -CONFIG_ALTERA_MSGDMA=m -CONFIG_INTEL_IDMA64=m -CONFIG_INTEL_IOATDMA=m -CONFIG_INTEL_MIC_X100_DMA=m -CONFIG_QCOM_HIDMA_MGMT=m -CONFIG_QCOM_HIDMA=m -CONFIG_DW_DMAC_CORE=m -CONFIG_DW_DMAC=m -CONFIG_DW_DMAC_PCI=m -CONFIG_HSU_DMA=m - -# -# DMA Clients -# -CONFIG_ASYNC_TX_DMA=y -# CONFIG_DMATEST is not set -CONFIG_DMA_ENGINE_RAID=y - -# -# DMABUF options -# -CONFIG_SYNC_FILE=y -# CONFIG_SW_SYNC is not set -CONFIG_DCA=m -CONFIG_AUXDISPLAY=y -CONFIG_HD44780=m -CONFIG_KS0108=m -CONFIG_KS0108_PORT=0x378 -CONFIG_KS0108_DELAY=2 -CONFIG_CFAG12864B=m -CONFIG_CFAG12864B_RATE=20 -CONFIG_IMG_ASCII_LCD=m -CONFIG_PANEL=m -CONFIG_PANEL_PARPORT=0 -CONFIG_PANEL_PROFILE=5 -# CONFIG_PANEL_CHANGE_MESSAGE is not set -CONFIG_CHARLCD=m -CONFIG_UIO=m -CONFIG_UIO_CIF=m -CONFIG_UIO_PDRV_GENIRQ=m -CONFIG_UIO_DMEM_GENIRQ=m -CONFIG_UIO_AEC=m -CONFIG_UIO_SERCOS3=m -CONFIG_UIO_PCI_GENERIC=m -CONFIG_UIO_NETX=m -CONFIG_UIO_PRUSS=m -CONFIG_UIO_MF624=m -CONFIG_UIO_HV_GENERIC=m -CONFIG_VFIO_IOMMU_TYPE1=m -CONFIG_VFIO_VIRQFD=m -CONFIG_VFIO=m -CONFIG_VFIO_NOIOMMU=y -CONFIG_VFIO_PCI=m -CONFIG_VFIO_PCI_VGA=y -CONFIG_VFIO_PCI_MMAP=y -CONFIG_VFIO_PCI_INTX=y -CONFIG_VFIO_PCI_IGD=y -CONFIG_VFIO_MDEV=m -CONFIG_VFIO_MDEV_DEVICE=m -CONFIG_IRQ_BYPASS_MANAGER=m -CONFIG_VIRT_DRIVERS=y -CONFIG_VBOXGUEST=m -CONFIG_VIRTIO=y -CONFIG_VIRTIO_MENU=y -CONFIG_VIRTIO_PCI=y -CONFIG_VIRTIO_PCI_LEGACY=y -CONFIG_VIRTIO_BALLOON=y -CONFIG_VIRTIO_INPUT=m -CONFIG_VIRTIO_MMIO=y -CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y - -# -# Microsoft Hyper-V guest support -# -CONFIG_HYPERV=m -CONFIG_HYPERV_TSCPAGE=y -CONFIG_HYPERV_UTILS=m -CONFIG_HYPERV_BALLOON=m - -# -# Xen driver support -# -CONFIG_XEN_BALLOON=y -CONFIG_XEN_SELFBALLOONING=y -CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y -CONFIG_XEN_BALLOON_MEMORY_HOTPLUG_LIMIT=512 -CONFIG_XEN_SCRUB_PAGES=y -CONFIG_XEN_DEV_EVTCHN=m -CONFIG_XEN_BACKEND=y -CONFIG_XENFS=m -CONFIG_XEN_COMPAT_XENFS=y -CONFIG_XEN_SYS_HYPERVISOR=y -CONFIG_XEN_XENBUS_FRONTEND=y -CONFIG_XEN_GNTDEV=m -CONFIG_XEN_GRANT_DEV_ALLOC=m -CONFIG_SWIOTLB_XEN=y -CONFIG_XEN_TMEM=m -CONFIG_XEN_PCIDEV_BACKEND=m -CONFIG_XEN_PVCALLS_FRONTEND=m -# CONFIG_XEN_PVCALLS_BACKEND is not set -CONFIG_XEN_SCSI_BACKEND=m -CONFIG_XEN_PRIVCMD=m -CONFIG_XEN_ACPI_PROCESSOR=y -CONFIG_XEN_MCE_LOG=y -CONFIG_XEN_HAVE_PVMMU=y -CONFIG_XEN_EFI=y -CONFIG_XEN_AUTO_XLATE=y -CONFIG_XEN_ACPI=y -CONFIG_XEN_SYMS=y -CONFIG_XEN_HAVE_VPMU=y -CONFIG_STAGING=y -CONFIG_PRISM2_USB=m -CONFIG_COMEDI=m -# CONFIG_COMEDI_DEBUG is not set -CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048 -CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480 -CONFIG_COMEDI_MISC_DRIVERS=y -CONFIG_COMEDI_BOND=m -CONFIG_COMEDI_TEST=m -CONFIG_COMEDI_PARPORT=m -CONFIG_COMEDI_SERIAL2002=m -CONFIG_COMEDI_ISA_DRIVERS=y -CONFIG_COMEDI_PCL711=m -CONFIG_COMEDI_PCL724=m -CONFIG_COMEDI_PCL726=m -CONFIG_COMEDI_PCL730=m -CONFIG_COMEDI_PCL812=m -CONFIG_COMEDI_PCL816=m -CONFIG_COMEDI_PCL818=m -CONFIG_COMEDI_PCM3724=m -CONFIG_COMEDI_AMPLC_DIO200_ISA=m -CONFIG_COMEDI_AMPLC_PC236_ISA=m -CONFIG_COMEDI_AMPLC_PC263_ISA=m -CONFIG_COMEDI_RTI800=m -CONFIG_COMEDI_RTI802=m -CONFIG_COMEDI_DAC02=m -CONFIG_COMEDI_DAS16M1=m -CONFIG_COMEDI_DAS08_ISA=m -CONFIG_COMEDI_DAS16=m -CONFIG_COMEDI_DAS800=m -CONFIG_COMEDI_DAS1800=m -CONFIG_COMEDI_DAS6402=m -CONFIG_COMEDI_DT2801=m -CONFIG_COMEDI_DT2811=m -CONFIG_COMEDI_DT2814=m -CONFIG_COMEDI_DT2815=m -CONFIG_COMEDI_DT2817=m -CONFIG_COMEDI_DT282X=m -CONFIG_COMEDI_DMM32AT=m -CONFIG_COMEDI_FL512=m -CONFIG_COMEDI_AIO_AIO12_8=m -CONFIG_COMEDI_AIO_IIRO_16=m -CONFIG_COMEDI_II_PCI20KC=m -CONFIG_COMEDI_C6XDIGIO=m -CONFIG_COMEDI_MPC624=m -CONFIG_COMEDI_ADQ12B=m -CONFIG_COMEDI_NI_AT_A2150=m -CONFIG_COMEDI_NI_AT_AO=m -CONFIG_COMEDI_NI_ATMIO=m -CONFIG_COMEDI_NI_ATMIO16D=m -CONFIG_COMEDI_NI_LABPC_ISA=m -CONFIG_COMEDI_PCMAD=m -CONFIG_COMEDI_PCMDA12=m -CONFIG_COMEDI_PCMMIO=m -CONFIG_COMEDI_PCMUIO=m -CONFIG_COMEDI_MULTIQ3=m -CONFIG_COMEDI_S526=m -CONFIG_COMEDI_PCI_DRIVERS=m -CONFIG_COMEDI_8255_PCI=m -CONFIG_COMEDI_ADDI_WATCHDOG=m -CONFIG_COMEDI_ADDI_APCI_1032=m -CONFIG_COMEDI_ADDI_APCI_1500=m -CONFIG_COMEDI_ADDI_APCI_1516=m -CONFIG_COMEDI_ADDI_APCI_1564=m -CONFIG_COMEDI_ADDI_APCI_16XX=m -CONFIG_COMEDI_ADDI_APCI_2032=m -CONFIG_COMEDI_ADDI_APCI_2200=m -CONFIG_COMEDI_ADDI_APCI_3120=m -CONFIG_COMEDI_ADDI_APCI_3501=m -CONFIG_COMEDI_ADDI_APCI_3XXX=m -CONFIG_COMEDI_ADL_PCI6208=m -CONFIG_COMEDI_ADL_PCI7X3X=m -CONFIG_COMEDI_ADL_PCI8164=m -CONFIG_COMEDI_ADL_PCI9111=m -CONFIG_COMEDI_ADL_PCI9118=m -CONFIG_COMEDI_ADV_PCI1710=m -CONFIG_COMEDI_ADV_PCI1720=m -CONFIG_COMEDI_ADV_PCI1723=m -CONFIG_COMEDI_ADV_PCI1724=m -CONFIG_COMEDI_ADV_PCI1760=m -CONFIG_COMEDI_ADV_PCI_DIO=m -CONFIG_COMEDI_AMPLC_DIO200_PCI=m -CONFIG_COMEDI_AMPLC_PC236_PCI=m -CONFIG_COMEDI_AMPLC_PC263_PCI=m -CONFIG_COMEDI_AMPLC_PCI224=m -CONFIG_COMEDI_AMPLC_PCI230=m -CONFIG_COMEDI_CONTEC_PCI_DIO=m -CONFIG_COMEDI_DAS08_PCI=m -CONFIG_COMEDI_DT3000=m -CONFIG_COMEDI_DYNA_PCI10XX=m -CONFIG_COMEDI_GSC_HPDI=m -CONFIG_COMEDI_MF6X4=m -CONFIG_COMEDI_ICP_MULTI=m -CONFIG_COMEDI_DAQBOARD2000=m -CONFIG_COMEDI_JR3_PCI=m -CONFIG_COMEDI_KE_COUNTER=m -CONFIG_COMEDI_CB_PCIDAS64=m -CONFIG_COMEDI_CB_PCIDAS=m -CONFIG_COMEDI_CB_PCIDDA=m -CONFIG_COMEDI_CB_PCIMDAS=m -CONFIG_COMEDI_CB_PCIMDDA=m -CONFIG_COMEDI_ME4000=m -CONFIG_COMEDI_ME_DAQ=m -CONFIG_COMEDI_NI_6527=m -CONFIG_COMEDI_NI_65XX=m -CONFIG_COMEDI_NI_660X=m -CONFIG_COMEDI_NI_670X=m -CONFIG_COMEDI_NI_LABPC_PCI=m -CONFIG_COMEDI_NI_PCIDIO=m -CONFIG_COMEDI_NI_PCIMIO=m -CONFIG_COMEDI_RTD520=m -CONFIG_COMEDI_S626=m -CONFIG_COMEDI_MITE=m -CONFIG_COMEDI_NI_TIOCMD=m -CONFIG_COMEDI_PCMCIA_DRIVERS=m -CONFIG_COMEDI_CB_DAS16_CS=m -CONFIG_COMEDI_DAS08_CS=m -CONFIG_COMEDI_NI_DAQ_700_CS=m -CONFIG_COMEDI_NI_DAQ_DIO24_CS=m -CONFIG_COMEDI_NI_LABPC_CS=m -CONFIG_COMEDI_NI_MIO_CS=m -CONFIG_COMEDI_QUATECH_DAQP_CS=m -CONFIG_COMEDI_USB_DRIVERS=m -CONFIG_COMEDI_DT9812=m -CONFIG_COMEDI_NI_USB6501=m -CONFIG_COMEDI_USBDUX=m -CONFIG_COMEDI_USBDUXFAST=m -CONFIG_COMEDI_USBDUXSIGMA=m -CONFIG_COMEDI_VMK80XX=m -CONFIG_COMEDI_8254=m -CONFIG_COMEDI_8255=m -CONFIG_COMEDI_8255_SA=m -CONFIG_COMEDI_KCOMEDILIB=m -CONFIG_COMEDI_AMPLC_DIO200=m -CONFIG_COMEDI_AMPLC_PC236=m -CONFIG_COMEDI_DAS08=m -CONFIG_COMEDI_ISADMA=m -CONFIG_COMEDI_NI_LABPC=m -CONFIG_COMEDI_NI_LABPC_ISADMA=m -CONFIG_COMEDI_NI_TIO=m -CONFIG_RTL8192U=m -CONFIG_RTLLIB=m -CONFIG_RTLLIB_CRYPTO_CCMP=m -CONFIG_RTLLIB_CRYPTO_TKIP=m -CONFIG_RTLLIB_CRYPTO_WEP=m -CONFIG_RTL8192E=m -CONFIG_RTL8723BS=m -CONFIG_R8712U=m -CONFIG_R8188EU=m -CONFIG_88EU_AP_MODE=y -CONFIG_R8822BE=m -CONFIG_RTLWIFI_DEBUG_ST=y -CONFIG_RTS5208=m -CONFIG_VT6655=m -CONFIG_VT6656=m - -# -# IIO staging drivers -# - -# -# Accelerometers -# -CONFIG_ADIS16203=m -CONFIG_ADIS16240=m - -# -# Analog to digital converters -# -CONFIG_AD7606=m -CONFIG_AD7606_IFACE_PARALLEL=m -CONFIG_AD7606_IFACE_SPI=m -CONFIG_AD7780=m -CONFIG_AD7816=m -CONFIG_AD7192=m -CONFIG_AD7280=m - -# -# Analog digital bi-direction converters -# -CONFIG_ADT7316=m -CONFIG_ADT7316_SPI=m -CONFIG_ADT7316_I2C=m - -# -# Capacitance to digital converters -# -CONFIG_AD7150=m -CONFIG_AD7152=m -CONFIG_AD7746=m - -# -# Direct Digital Synthesis -# -CONFIG_AD9832=m -CONFIG_AD9834=m - -# -# Digital gyroscope sensors -# -CONFIG_ADIS16060=m - -# -# Network Analyzer, Impedance Converters -# -CONFIG_AD5933=m - -# -# Active energy metering IC -# -CONFIG_ADE7854=m -CONFIG_ADE7854_I2C=m -CONFIG_ADE7854_SPI=m - -# -# Resolver to digital converters -# -CONFIG_AD2S90=m -CONFIG_AD2S1210=m -CONFIG_FB_SM750=m -CONFIG_FB_XGI=m - -# -# Speakup console speech -# -CONFIG_SPEAKUP=m -CONFIG_SPEAKUP_SYNTH_ACNTSA=m -CONFIG_SPEAKUP_SYNTH_APOLLO=m -CONFIG_SPEAKUP_SYNTH_AUDPTR=m -CONFIG_SPEAKUP_SYNTH_BNS=m -CONFIG_SPEAKUP_SYNTH_DECTLK=m -CONFIG_SPEAKUP_SYNTH_DECEXT=m -CONFIG_SPEAKUP_SYNTH_LTLK=m -CONFIG_SPEAKUP_SYNTH_SOFT=m -CONFIG_SPEAKUP_SYNTH_SPKOUT=m -CONFIG_SPEAKUP_SYNTH_TXPRT=m -CONFIG_SPEAKUP_SYNTH_DUMMY=m -CONFIG_STAGING_MEDIA=y -CONFIG_I2C_BCM2048=m -CONFIG_SOC_CAMERA_IMX074=m -CONFIG_SOC_CAMERA_MT9T031=m -CONFIG_VIDEO_ZORAN=m -CONFIG_VIDEO_ZORAN_DC30=m -CONFIG_VIDEO_ZORAN_ZR36060=m -CONFIG_VIDEO_ZORAN_BUZ=m -CONFIG_VIDEO_ZORAN_DC10=m -CONFIG_VIDEO_ZORAN_LML33=m -CONFIG_VIDEO_ZORAN_LML33R10=m -CONFIG_VIDEO_ZORAN_AVS6EYES=m - -# -# Android -# -CONFIG_LTE_GDM724X=m -CONFIG_FIREWIRE_SERIAL=m -CONFIG_FWTTY_MAX_TOTAL_PORTS=64 -CONFIG_FWTTY_MAX_CARD_PORTS=32 -CONFIG_MTD_SPINAND_MT29F=m -CONFIG_MTD_SPINAND_ONDIEECC=y -CONFIG_DGNC=m -CONFIG_GS_FPGABOOT=m -CONFIG_CRYPTO_SKEIN=y -CONFIG_UNISYSSPAR=y -CONFIG_UNISYS_VISORNIC=m -CONFIG_UNISYS_VISORINPUT=m -CONFIG_UNISYS_VISORHBA=m -CONFIG_FB_TFT=m -CONFIG_FB_TFT_AGM1264K_FL=m -CONFIG_FB_TFT_BD663474=m -CONFIG_FB_TFT_HX8340BN=m -CONFIG_FB_TFT_HX8347D=m -CONFIG_FB_TFT_HX8353D=m -CONFIG_FB_TFT_HX8357D=m -CONFIG_FB_TFT_ILI9163=m -CONFIG_FB_TFT_ILI9320=m -CONFIG_FB_TFT_ILI9325=m -CONFIG_FB_TFT_ILI9340=m -CONFIG_FB_TFT_ILI9341=m -CONFIG_FB_TFT_ILI9481=m -CONFIG_FB_TFT_ILI9486=m -CONFIG_FB_TFT_PCD8544=m -CONFIG_FB_TFT_RA8875=m -CONFIG_FB_TFT_S6D02A1=m -CONFIG_FB_TFT_S6D1121=m -CONFIG_FB_TFT_SH1106=m -CONFIG_FB_TFT_SSD1289=m -CONFIG_FB_TFT_SSD1305=m -CONFIG_FB_TFT_SSD1306=m -CONFIG_FB_TFT_SSD1331=m -CONFIG_FB_TFT_SSD1351=m -CONFIG_FB_TFT_ST7735R=m -CONFIG_FB_TFT_ST7789V=m -CONFIG_FB_TFT_TINYLCD=m -CONFIG_FB_TFT_TLS8204=m -CONFIG_FB_TFT_UC1611=m -CONFIG_FB_TFT_UC1701=m -CONFIG_FB_TFT_UPD161704=m -CONFIG_FB_TFT_WATTEROTT=m -CONFIG_FB_FLEX=m -CONFIG_FB_TFT_FBTFT_DEVICE=m -CONFIG_WILC1000=m -CONFIG_WILC1000_SDIO=m -CONFIG_WILC1000_SPI=m -# CONFIG_WILC1000_HW_OOB_INTR is not set -CONFIG_MOST=m -CONFIG_MOST_CDEV=m -CONFIG_MOST_NET=m -CONFIG_MOST_SOUND=m -CONFIG_MOST_VIDEO=m -CONFIG_MOST_I2C=m -CONFIG_MOST_USB=m -CONFIG_KS7010=m -# CONFIG_GREYBUS is not set - -# -# USB Power Delivery and Type-C drivers -# -CONFIG_TYPEC_TCPCI=m -CONFIG_TYPEC_RT1711H=m -CONFIG_DRM_VBOXVIDEO=m -# CONFIG_PI433 is not set -CONFIG_MTK_MMC=m -# CONFIG_MTK_AEE_KDUMP is not set -# CONFIG_MTK_MMC_CD_POLL is not set -CONFIG_X86_PLATFORM_DEVICES=y -CONFIG_ACER_WMI=m -CONFIG_ACER_WIRELESS=m -CONFIG_ACERHDF=m -CONFIG_ALIENWARE_WMI=m -CONFIG_ASUS_LAPTOP=m -CONFIG_DELL_SMBIOS=m -CONFIG_DELL_SMBIOS_WMI=y -CONFIG_DELL_SMBIOS_SMM=y -CONFIG_DELL_LAPTOP=m -CONFIG_DELL_WMI=m -CONFIG_DELL_WMI_DESCRIPTOR=m -CONFIG_DELL_WMI_AIO=m -CONFIG_DELL_WMI_LED=m -CONFIG_DELL_SMO8800=m -CONFIG_DELL_RBTN=m -CONFIG_FUJITSU_LAPTOP=m -CONFIG_FUJITSU_TABLET=m -CONFIG_AMILO_RFKILL=m -CONFIG_GPD_POCKET_FAN=m -CONFIG_HP_ACCEL=m -CONFIG_HP_WIRELESS=m -CONFIG_HP_WMI=m -CONFIG_MSI_LAPTOP=m -CONFIG_PANASONIC_LAPTOP=m -CONFIG_COMPAL_LAPTOP=m -CONFIG_SONY_LAPTOP=m -CONFIG_SONYPI_COMPAT=y -CONFIG_IDEAPAD_LAPTOP=m -CONFIG_SURFACE3_WMI=m -CONFIG_THINKPAD_ACPI=m -CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y -CONFIG_THINKPAD_ACPI_DEBUGFACILITIES=y -# CONFIG_THINKPAD_ACPI_DEBUG is not set -# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set -CONFIG_THINKPAD_ACPI_VIDEO=y -CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y -CONFIG_SENSORS_HDAPS=m -CONFIG_INTEL_MENLOW=m -CONFIG_EEEPC_LAPTOP=m -CONFIG_ASUS_WMI=m -CONFIG_ASUS_NB_WMI=m -CONFIG_EEEPC_WMI=m -CONFIG_ASUS_WIRELESS=m -CONFIG_ACPI_WMI=m -CONFIG_WMI_BMOF=m -CONFIG_INTEL_WMI_THUNDERBOLT=m -CONFIG_MSI_WMI=m -CONFIG_PEAQ_WMI=m -CONFIG_TOPSTAR_LAPTOP=m -CONFIG_ACPI_TOSHIBA=m -CONFIG_TOSHIBA_BT_RFKILL=m -CONFIG_TOSHIBA_HAPS=m -CONFIG_TOSHIBA_WMI=m -CONFIG_ACPI_CMPC=m -CONFIG_INTEL_CHT_INT33FE=m -CONFIG_INTEL_INT0002_VGPIO=m -CONFIG_INTEL_HID_EVENT=m -CONFIG_INTEL_VBTN=m -CONFIG_INTEL_IPS=m -CONFIG_INTEL_PMC_CORE=y -CONFIG_IBM_RTL=m -CONFIG_SAMSUNG_LAPTOP=m -CONFIG_MXM_WMI=m -CONFIG_INTEL_OAKTRAIL=m -CONFIG_SAMSUNG_Q10=m -CONFIG_APPLE_GMUX=m -CONFIG_INTEL_RST=m -CONFIG_INTEL_SMARTCONNECT=m -CONFIG_PVPANIC=m -CONFIG_INTEL_PMC_IPC=m -CONFIG_INTEL_BXTWC_PMIC_TMU=m -CONFIG_SURFACE_PRO3_BUTTON=m -CONFIG_SURFACE_3_BUTTON=m -CONFIG_INTEL_PUNIT_IPC=m -CONFIG_INTEL_TELEMETRY=m -# CONFIG_MLX_PLATFORM is not set -# CONFIG_INTEL_TURBO_MAX_3 is not set -# CONFIG_SILEAD_DMI is not set -CONFIG_INTEL_CHTDC_TI_PWRBTN=m -CONFIG_PMC_ATOM=y -CONFIG_CHROME_PLATFORMS=y -CONFIG_CHROMEOS_LAPTOP=m -CONFIG_CHROMEOS_PSTORE=m -CONFIG_CHROMEOS_TBMC=m -CONFIG_CROS_EC_CTL=m -CONFIG_CROS_EC_LPC=m -# CONFIG_CROS_EC_LPC_MEC is not set -CONFIG_CROS_EC_PROTO=y -CONFIG_CROS_KBD_LED_BACKLIGHT=m -# CONFIG_MELLANOX_PLATFORM is not set -CONFIG_CLKDEV_LOOKUP=y -CONFIG_HAVE_CLK_PREPARE=y -CONFIG_COMMON_CLK=y - -# -# Common Clock Framework -# -CONFIG_COMMON_CLK_WM831X=m -CONFIG_COMMON_CLK_SI5351=m -CONFIG_COMMON_CLK_SI544=m -CONFIG_COMMON_CLK_CDCE706=m -CONFIG_COMMON_CLK_CS2000_CP=m -CONFIG_COMMON_CLK_S2MPS11=m -CONFIG_CLK_TWL6040=m -CONFIG_COMMON_CLK_PALMAS=m -CONFIG_COMMON_CLK_PWM=m -# CONFIG_HWSPINLOCK is not set - -# -# Clock Source drivers -# -CONFIG_CLKEVT_I8253=y -CONFIG_I8253_LOCK=y -CONFIG_CLKBLD_I8253=y -CONFIG_MAILBOX=y -CONFIG_PCC=y -CONFIG_ALTERA_MBOX=m -CONFIG_IOMMU_API=y -CONFIG_IOMMU_SUPPORT=y - -# -# Generic IOMMU Pagetable Support -# -CONFIG_IOMMU_IOVA=y -CONFIG_AMD_IOMMU=y -CONFIG_AMD_IOMMU_V2=m -CONFIG_DMAR_TABLE=y -CONFIG_INTEL_IOMMU=y -CONFIG_INTEL_IOMMU_SVM=y -# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set -CONFIG_INTEL_IOMMU_FLOPPY_WA=y -CONFIG_IRQ_REMAP=y - -# -# Remoteproc drivers -# -CONFIG_REMOTEPROC=m - -# -# Rpmsg drivers -# -CONFIG_RPMSG=m -# CONFIG_RPMSG_CHAR is not set -CONFIG_RPMSG_QCOM_GLINK_NATIVE=m -CONFIG_RPMSG_QCOM_GLINK_RPM=m -CONFIG_RPMSG_VIRTIO=m -# CONFIG_SOUNDWIRE is not set - -# -# SOC (System On Chip) specific Drivers -# - -# -# Amlogic SoC drivers -# - -# -# Broadcom SoC drivers -# - -# -# i.MX SoC drivers -# - -# -# Qualcomm SoC drivers -# -CONFIG_SOC_TI=y - -# -# Xilinx SoC drivers -# -CONFIG_XILINX_VCU=m -CONFIG_PM_DEVFREQ=y - -# -# DEVFREQ Governors -# -CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y -CONFIG_DEVFREQ_GOV_PERFORMANCE=y -CONFIG_DEVFREQ_GOV_POWERSAVE=y -CONFIG_DEVFREQ_GOV_USERSPACE=y -CONFIG_DEVFREQ_GOV_PASSIVE=m - -# -# DEVFREQ Drivers -# -CONFIG_PM_DEVFREQ_EVENT=y -CONFIG_EXTCON=y - -# -# Extcon Device Drivers -# -CONFIG_EXTCON_ADC_JACK=m -CONFIG_EXTCON_ARIZONA=m -CONFIG_EXTCON_AXP288=m -CONFIG_EXTCON_GPIO=m -CONFIG_EXTCON_INTEL_INT3496=m -CONFIG_EXTCON_INTEL_CHT_WC=m -CONFIG_EXTCON_MAX14577=m -CONFIG_EXTCON_MAX3355=m -CONFIG_EXTCON_MAX77693=m -CONFIG_EXTCON_MAX77843=m -CONFIG_EXTCON_MAX8997=m -CONFIG_EXTCON_PALMAS=m -CONFIG_EXTCON_RT8973A=m -CONFIG_EXTCON_SM5502=m -CONFIG_EXTCON_USB_GPIO=m -CONFIG_EXTCON_USBC_CROS_EC=m -CONFIG_MEMORY=y -CONFIG_IIO=m -CONFIG_IIO_BUFFER=y -CONFIG_IIO_BUFFER_CB=m -CONFIG_IIO_BUFFER_HW_CONSUMER=m -CONFIG_IIO_KFIFO_BUF=m -CONFIG_IIO_TRIGGERED_BUFFER=m -CONFIG_IIO_CONFIGFS=m -CONFIG_IIO_TRIGGER=y -CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 -CONFIG_IIO_SW_DEVICE=m -CONFIG_IIO_SW_TRIGGER=m -CONFIG_IIO_TRIGGERED_EVENT=m - -# -# Accelerometers -# -CONFIG_ADIS16201=m -CONFIG_ADIS16209=m -CONFIG_BMA180=m -CONFIG_BMA220=m -CONFIG_BMC150_ACCEL=m -CONFIG_BMC150_ACCEL_I2C=m -CONFIG_BMC150_ACCEL_SPI=m -CONFIG_DA280=m -CONFIG_DA311=m -CONFIG_DMARD09=m -CONFIG_DMARD10=m -CONFIG_HID_SENSOR_ACCEL_3D=m -CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m -CONFIG_IIO_ST_ACCEL_3AXIS=m -CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m -CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m -CONFIG_KXSD9=m -CONFIG_KXSD9_SPI=m -CONFIG_KXSD9_I2C=m -CONFIG_KXCJK1013=m -CONFIG_MC3230=m -CONFIG_MMA7455=m -CONFIG_MMA7455_I2C=m -CONFIG_MMA7455_SPI=m -CONFIG_MMA7660=m -CONFIG_MMA8452=m -CONFIG_MMA9551_CORE=m -CONFIG_MMA9551=m -CONFIG_MMA9553=m -CONFIG_MXC4005=m -CONFIG_MXC6255=m -CONFIG_SCA3000=m -CONFIG_STK8312=m -CONFIG_STK8BA50=m - -# -# Analog to digital converters -# -CONFIG_AD_SIGMA_DELTA=m -CONFIG_AD7266=m -CONFIG_AD7291=m -CONFIG_AD7298=m -CONFIG_AD7476=m -CONFIG_AD7766=m -CONFIG_AD7791=m -CONFIG_AD7793=m -CONFIG_AD7887=m -CONFIG_AD7923=m -CONFIG_AD799X=m -CONFIG_AXP20X_ADC=m -CONFIG_AXP288_ADC=m -CONFIG_CC10001_ADC=m -CONFIG_DA9150_GPADC=m -CONFIG_DLN2_ADC=m -CONFIG_HI8435=m -CONFIG_HX711=m -CONFIG_INA2XX_ADC=m -CONFIG_LP8788_ADC=m -CONFIG_LTC2471=m -CONFIG_LTC2485=m -CONFIG_LTC2497=m -CONFIG_MAX1027=m -CONFIG_MAX11100=m -CONFIG_MAX1118=m -CONFIG_MAX1363=m -CONFIG_MAX9611=m -CONFIG_MCP320X=m -CONFIG_MCP3422=m -CONFIG_MEN_Z188_ADC=m -CONFIG_NAU7802=m -CONFIG_PALMAS_GPADC=m -CONFIG_QCOM_VADC_COMMON=m -CONFIG_QCOM_SPMI_IADC=m -CONFIG_QCOM_SPMI_VADC=m -CONFIG_TI_ADC081C=m -CONFIG_TI_ADC0832=m -CONFIG_TI_ADC084S021=m -CONFIG_TI_ADC12138=m -CONFIG_TI_ADC108S102=m -CONFIG_TI_ADC128S052=m -CONFIG_TI_ADC161S626=m -CONFIG_TI_ADS1015=m -CONFIG_TI_ADS7950=m -CONFIG_TI_AM335X_ADC=m -CONFIG_TI_TLC4541=m -CONFIG_TWL4030_MADC=m -CONFIG_TWL6030_GPADC=m -CONFIG_VIPERBOARD_ADC=m - -# -# Analog Front Ends -# - -# -# Amplifiers -# -CONFIG_AD8366=m - -# -# Chemical Sensors -# -CONFIG_ATLAS_PH_SENSOR=m -CONFIG_CCS811=m -CONFIG_IAQCORE=m -CONFIG_VZ89X=m -CONFIG_IIO_CROS_EC_SENSORS_CORE=m -CONFIG_IIO_CROS_EC_SENSORS=m - -# -# Hid Sensor IIO Common -# -CONFIG_HID_SENSOR_IIO_COMMON=m -CONFIG_HID_SENSOR_IIO_TRIGGER=m -CONFIG_IIO_MS_SENSORS_I2C=m - -# -# SSP Sensor Common -# -CONFIG_IIO_SSP_SENSORS_COMMONS=m -CONFIG_IIO_SSP_SENSORHUB=m -CONFIG_IIO_ST_SENSORS_I2C=m -CONFIG_IIO_ST_SENSORS_SPI=m -CONFIG_IIO_ST_SENSORS_CORE=m - -# -# Counters -# - -# -# Digital to analog converters -# -CONFIG_AD5064=m -CONFIG_AD5360=m -CONFIG_AD5380=m -CONFIG_AD5421=m -CONFIG_AD5446=m -CONFIG_AD5449=m -CONFIG_AD5592R_BASE=m -CONFIG_AD5592R=m -CONFIG_AD5593R=m -CONFIG_AD5504=m -CONFIG_AD5624R_SPI=m -CONFIG_LTC2632=m -CONFIG_AD5686=m -CONFIG_AD5686_SPI=m -CONFIG_AD5696_I2C=m -CONFIG_AD5755=m -CONFIG_AD5761=m -CONFIG_AD5764=m -CONFIG_AD5791=m -CONFIG_AD7303=m -CONFIG_AD8801=m -CONFIG_DS4424=m -CONFIG_M62332=m -CONFIG_MAX517=m -CONFIG_MCP4725=m -CONFIG_MCP4922=m -CONFIG_TI_DAC082S085=m -CONFIG_TI_DAC5571=m - -# -# IIO dummy driver -# -CONFIG_IIO_SIMPLE_DUMMY=m -# CONFIG_IIO_SIMPLE_DUMMY_EVENTS is not set -# CONFIG_IIO_SIMPLE_DUMMY_BUFFER is not set - -# -# Frequency Synthesizers DDS/PLL -# - -# -# Clock Generator/Distribution -# -CONFIG_AD9523=m - -# -# Phase-Locked Loop (PLL) frequency synthesizers -# -CONFIG_ADF4350=m - -# -# Digital gyroscope sensors -# -CONFIG_ADIS16080=m -CONFIG_ADIS16130=m -CONFIG_ADIS16136=m -CONFIG_ADIS16260=m -CONFIG_ADXRS450=m -CONFIG_BMG160=m -CONFIG_BMG160_I2C=m -CONFIG_BMG160_SPI=m -CONFIG_HID_SENSOR_GYRO_3D=m -CONFIG_MPU3050=m -CONFIG_MPU3050_I2C=m -CONFIG_IIO_ST_GYRO_3AXIS=m -CONFIG_IIO_ST_GYRO_I2C_3AXIS=m -CONFIG_IIO_ST_GYRO_SPI_3AXIS=m -CONFIG_ITG3200=m - -# -# Health Sensors -# - -# -# Heart Rate Monitors -# -CONFIG_AFE4403=m -CONFIG_AFE4404=m -CONFIG_MAX30100=m -CONFIG_MAX30102=m - -# -# Humidity sensors -# -CONFIG_AM2315=m -CONFIG_DHT11=m -CONFIG_HDC100X=m -CONFIG_HID_SENSOR_HUMIDITY=m -CONFIG_HTS221=m -CONFIG_HTS221_I2C=m -CONFIG_HTS221_SPI=m -CONFIG_HTU21=m -CONFIG_SI7005=m -CONFIG_SI7020=m - -# -# Inertial measurement units -# -CONFIG_ADIS16400=m -CONFIG_ADIS16480=m -CONFIG_BMI160=m -CONFIG_BMI160_I2C=m -CONFIG_BMI160_SPI=m -CONFIG_KMX61=m -CONFIG_INV_MPU6050_IIO=m -CONFIG_INV_MPU6050_I2C=m -CONFIG_INV_MPU6050_SPI=m -CONFIG_IIO_ST_LSM6DSX=m -CONFIG_IIO_ST_LSM6DSX_I2C=m -CONFIG_IIO_ST_LSM6DSX_SPI=m -CONFIG_IIO_ADIS_LIB=m -CONFIG_IIO_ADIS_LIB_BUFFER=y - -# -# Light sensors -# -CONFIG_ACPI_ALS=m -CONFIG_ADJD_S311=m -CONFIG_AL3320A=m -CONFIG_APDS9300=m -CONFIG_APDS9960=m -CONFIG_BH1750=m -CONFIG_BH1780=m -CONFIG_CM32181=m -CONFIG_CM3232=m -CONFIG_CM3323=m -CONFIG_CM36651=m -CONFIG_IIO_CROS_EC_LIGHT_PROX=m -CONFIG_GP2AP020A00F=m -CONFIG_SENSORS_ISL29018=m -CONFIG_SENSORS_ISL29028=m -CONFIG_ISL29125=m -CONFIG_HID_SENSOR_ALS=m -CONFIG_HID_SENSOR_PROX=m -CONFIG_JSA1212=m -CONFIG_RPR0521=m -CONFIG_SENSORS_LM3533=m -CONFIG_LTR501=m -CONFIG_LV0104CS=m -CONFIG_MAX44000=m -CONFIG_OPT3001=m -CONFIG_PA12203001=m -CONFIG_SI1145=m -CONFIG_STK3310=m -CONFIG_ST_UVIS25=m -CONFIG_ST_UVIS25_I2C=m -CONFIG_ST_UVIS25_SPI=m -CONFIG_TCS3414=m -CONFIG_TCS3472=m -CONFIG_SENSORS_TSL2563=m -CONFIG_TSL2583=m -CONFIG_TSL2772=m -CONFIG_TSL4531=m -CONFIG_US5182D=m -CONFIG_VCNL4000=m -CONFIG_VEML6070=m -CONFIG_VL6180=m -CONFIG_ZOPT2201=m - -# -# Magnetometer sensors -# -CONFIG_AK8975=m -CONFIG_AK09911=m -CONFIG_BMC150_MAGN=m -CONFIG_BMC150_MAGN_I2C=m -CONFIG_BMC150_MAGN_SPI=m -CONFIG_MAG3110=m -CONFIG_HID_SENSOR_MAGNETOMETER_3D=m -CONFIG_MMC35240=m -CONFIG_IIO_ST_MAGN_3AXIS=m -CONFIG_IIO_ST_MAGN_I2C_3AXIS=m -CONFIG_IIO_ST_MAGN_SPI_3AXIS=m -CONFIG_SENSORS_HMC5843=m -CONFIG_SENSORS_HMC5843_I2C=m -CONFIG_SENSORS_HMC5843_SPI=m - -# -# Multiplexers -# - -# -# Inclinometer sensors -# -CONFIG_HID_SENSOR_INCLINOMETER_3D=m -CONFIG_HID_SENSOR_DEVICE_ROTATION=m - -# -# Triggers - standalone -# -CONFIG_IIO_HRTIMER_TRIGGER=m -CONFIG_IIO_INTERRUPT_TRIGGER=m -CONFIG_IIO_TIGHTLOOP_TRIGGER=m -CONFIG_IIO_SYSFS_TRIGGER=m - -# -# Digital potentiometers -# -CONFIG_AD5272=m -CONFIG_DS1803=m -CONFIG_MAX5481=m -CONFIG_MAX5487=m -CONFIG_MCP4018=m -CONFIG_MCP4131=m -CONFIG_MCP4531=m -CONFIG_TPL0102=m - -# -# Digital potentiostats -# -CONFIG_LMP91000=m - -# -# Pressure sensors -# -CONFIG_ABP060MG=m -CONFIG_BMP280=m -CONFIG_BMP280_I2C=m -CONFIG_BMP280_SPI=m -CONFIG_IIO_CROS_EC_BARO=m -CONFIG_HID_SENSOR_PRESS=m -CONFIG_HP03=m -CONFIG_MPL115=m -CONFIG_MPL115_I2C=m -CONFIG_MPL115_SPI=m -CONFIG_MPL3115=m -CONFIG_MS5611=m -CONFIG_MS5611_I2C=m -CONFIG_MS5611_SPI=m -CONFIG_MS5637=m -CONFIG_IIO_ST_PRESS=m -CONFIG_IIO_ST_PRESS_I2C=m -CONFIG_IIO_ST_PRESS_SPI=m -CONFIG_T5403=m -CONFIG_HP206C=m -CONFIG_ZPA2326=m -CONFIG_ZPA2326_I2C=m -CONFIG_ZPA2326_SPI=m - -# -# Lightning sensors -# -CONFIG_AS3935=m - -# -# Proximity and distance sensors -# -CONFIG_LIDAR_LITE_V2=m -CONFIG_RFD77402=m -CONFIG_SRF04=m -CONFIG_SX9500=m -CONFIG_SRF08=m - -# -# Resolver to digital converters -# -CONFIG_AD2S1200=m - -# -# Temperature sensors -# -CONFIG_MAXIM_THERMOCOUPLE=m -CONFIG_HID_SENSOR_TEMP=m -CONFIG_MLX90614=m -CONFIG_MLX90632=m -CONFIG_TMP006=m -CONFIG_TMP007=m -CONFIG_TSYS01=m -CONFIG_TSYS02D=m -CONFIG_NTB=m -CONFIG_NTB_AMD=m -CONFIG_NTB_IDT=m -CONFIG_NTB_INTEL=m -CONFIG_NTB_SWITCHTEC=m -CONFIG_NTB_PINGPONG=m -CONFIG_NTB_TOOL=m -CONFIG_NTB_PERF=m -CONFIG_NTB_TRANSPORT=m -CONFIG_VME_BUS=y - -# -# VME Bridge Drivers -# -CONFIG_VME_CA91CX42=m -CONFIG_VME_TSI148=m -# CONFIG_VME_FAKE is not set - -# -# VME Board Drivers -# -CONFIG_VMIVME_7805=m - -# -# VME Device Drivers -# -CONFIG_VME_USER=m -CONFIG_PWM=y -CONFIG_PWM_SYSFS=y -CONFIG_PWM_CRC=y -CONFIG_PWM_CROS_EC=m -CONFIG_PWM_LP3943=m -CONFIG_PWM_LPSS=m -CONFIG_PWM_LPSS_PCI=m -CONFIG_PWM_LPSS_PLATFORM=m -CONFIG_PWM_PCA9685=m -CONFIG_PWM_TWL=m -CONFIG_PWM_TWL_LED=m - -# -# IRQ chip support -# -CONFIG_ARM_GIC_MAX_NR=1 -CONFIG_IPACK_BUS=m -CONFIG_BOARD_TPCI200=m -CONFIG_SERIAL_IPOCTAL=m -CONFIG_RESET_CONTROLLER=y -CONFIG_RESET_TI_SYSCON=m -CONFIG_FMC=m -CONFIG_FMC_FAKEDEV=m -CONFIG_FMC_TRIVIAL=m -CONFIG_FMC_WRITE_EEPROM=m -CONFIG_FMC_CHARDEV=m - -# -# PHY Subsystem -# -CONFIG_GENERIC_PHY=y -CONFIG_BCM_KONA_USB2_PHY=m -CONFIG_PHY_PXA_28NM_HSIC=m -CONFIG_PHY_PXA_28NM_USB2=m -CONFIG_PHY_CPCAP_USB=m -CONFIG_PHY_QCOM_USB_HS=m -CONFIG_PHY_QCOM_USB_HSIC=m -CONFIG_PHY_SAMSUNG_USB2=m -CONFIG_PHY_TUSB1210=m -CONFIG_POWERCAP=y -CONFIG_INTEL_RAPL=m -CONFIG_MCB=m -CONFIG_MCB_PCI=m -CONFIG_MCB_LPC=m - -# -# Performance monitor support -# -CONFIG_RAS=y -# CONFIG_RAS_CEC is not set -CONFIG_THUNDERBOLT=m - -# -# Android -# -# CONFIG_ANDROID is not set -CONFIG_LIBNVDIMM=y -CONFIG_BLK_DEV_PMEM=m -CONFIG_ND_BLK=m -CONFIG_ND_CLAIM=y -CONFIG_ND_BTT=m -CONFIG_BTT=y -CONFIG_ND_PFN=m -CONFIG_NVDIMM_PFN=y -CONFIG_NVDIMM_DAX=y -CONFIG_DAX_DRIVER=y -CONFIG_DAX=y -CONFIG_DEV_DAX=m -CONFIG_DEV_DAX_PMEM=m -CONFIG_NVMEM=y -CONFIG_RAVE_SP_EEPROM=m - -# -# HW tracing support -# -CONFIG_STM=m -CONFIG_STM_DUMMY=m -CONFIG_STM_SOURCE_CONSOLE=m -CONFIG_STM_SOURCE_HEARTBEAT=m -CONFIG_STM_SOURCE_FTRACE=m -CONFIG_INTEL_TH=m -CONFIG_INTEL_TH_PCI=m -CONFIG_INTEL_TH_ACPI=m -CONFIG_INTEL_TH_GTH=m -CONFIG_INTEL_TH_STH=m -CONFIG_INTEL_TH_MSU=m -CONFIG_INTEL_TH_PTI=m -# CONFIG_INTEL_TH_DEBUG is not set -CONFIG_FPGA=m -CONFIG_ALTERA_PR_IP_CORE=m -CONFIG_FPGA_MGR_ALTERA_PS_SPI=m -CONFIG_FPGA_MGR_ALTERA_CVP=m -CONFIG_FPGA_MGR_XILINX_SPI=m -CONFIG_FPGA_MGR_MACHXO2_SPI=m -CONFIG_FPGA_BRIDGE=m -CONFIG_XILINX_PR_DECOUPLER=m -CONFIG_FPGA_REGION=m -CONFIG_PM_OPP=y -CONFIG_UNISYS_VISORBUS=m -# CONFIG_SIOX is not set -# CONFIG_SLIMBUS is not set - -# -# Firmware Drivers -# -CONFIG_EDD=y -CONFIG_EDD_OFF=y -CONFIG_FIRMWARE_MEMMAP=y -CONFIG_DELL_RBU=m -CONFIG_DCDBAS=m -CONFIG_DMIID=y -CONFIG_DMI_SYSFS=m -CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y -CONFIG_ISCSI_IBFT_FIND=y -CONFIG_ISCSI_IBFT=m -CONFIG_FW_CFG_SYSFS=m -# CONFIG_FW_CFG_SYSFS_CMDLINE is not set -# CONFIG_GOOGLE_FIRMWARE is not set - -# -# EFI (Extensible Firmware Interface) Support -# -CONFIG_EFI_VARS=y -CONFIG_EFI_ESRT=y -CONFIG_EFI_VARS_PSTORE=m -# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set -CONFIG_EFI_RUNTIME_MAP=y -# CONFIG_EFI_FAKE_MEMMAP is not set -CONFIG_EFI_RUNTIME_WRAPPERS=y -CONFIG_EFI_BOOTLOADER_CONTROL=m -# CONFIG_EFI_CAPSULE_LOADER is not set -# CONFIG_EFI_TEST is not set -CONFIG_APPLE_PROPERTIES=y -CONFIG_RESET_ATTACK_MITIGATION=y -CONFIG_UEFI_CPER=y -CONFIG_UEFI_CPER_X86=y -CONFIG_EFI_DEV_PATH_PARSER=y - -# -# Tegra firmware driver -# - -# -# File systems -# -CONFIG_DCACHE_WORD_ACCESS=y -CONFIG_FS_IOMAP=y -# CONFIG_EXT2_FS is not set -# CONFIG_EXT3_FS is not set -CONFIG_EXT4_FS=y -CONFIG_EXT4_USE_FOR_EXT2=y -CONFIG_EXT4_FS_POSIX_ACL=y -CONFIG_EXT4_FS_SECURITY=y -# CONFIG_EXT4_ENCRYPTION is not set -# CONFIG_EXT4_DEBUG is not set -CONFIG_JBD2=y -# CONFIG_JBD2_DEBUG is not set -CONFIG_FS_MBCACHE=y -CONFIG_REISERFS_FS=m -# CONFIG_REISERFS_CHECK is not set -# CONFIG_REISERFS_PROC_INFO is not set -CONFIG_REISERFS_FS_XATTR=y -CONFIG_REISERFS_FS_POSIX_ACL=y -CONFIG_REISERFS_FS_SECURITY=y -CONFIG_JFS_FS=m -CONFIG_JFS_POSIX_ACL=y -CONFIG_JFS_SECURITY=y -# CONFIG_JFS_DEBUG is not set -CONFIG_JFS_STATISTICS=y -CONFIG_XFS_FS=m -CONFIG_XFS_QUOTA=y -CONFIG_XFS_POSIX_ACL=y -CONFIG_XFS_RT=y -# CONFIG_XFS_ONLINE_SCRUB is not set -# CONFIG_XFS_WARN is not set -# CONFIG_XFS_DEBUG is not set -CONFIG_GFS2_FS=m -CONFIG_GFS2_FS_LOCKING_DLM=y -CONFIG_OCFS2_FS=m -CONFIG_OCFS2_FS_O2CB=m -CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m -CONFIG_OCFS2_FS_STATS=y -CONFIG_OCFS2_DEBUG_MASKLOG=y -# CONFIG_OCFS2_DEBUG_FS is not set -CONFIG_BTRFS_FS=m -CONFIG_BTRFS_FS_POSIX_ACL=y -# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set -# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set -# CONFIG_BTRFS_DEBUG is not set -# CONFIG_BTRFS_ASSERT is not set -# CONFIG_BTRFS_FS_REF_VERIFY is not set -CONFIG_NILFS2_FS=m -CONFIG_F2FS_FS=m -CONFIG_F2FS_STAT_FS=y -CONFIG_F2FS_FS_XATTR=y -CONFIG_F2FS_FS_POSIX_ACL=y -CONFIG_F2FS_FS_SECURITY=y -# CONFIG_F2FS_CHECK_FS is not set -# CONFIG_F2FS_FS_ENCRYPTION is not set -# CONFIG_F2FS_IO_TRACE is not set -# CONFIG_F2FS_FAULT_INJECTION is not set -CONFIG_FS_DAX=y -CONFIG_FS_DAX_PMD=y -CONFIG_FS_POSIX_ACL=y -CONFIG_EXPORTFS=y -# CONFIG_EXPORTFS_BLOCK_OPS is not set -CONFIG_FILE_LOCKING=y -CONFIG_MANDATORY_FILE_LOCKING=y -CONFIG_FS_ENCRYPTION=m -CONFIG_FSNOTIFY=y -CONFIG_DNOTIFY=y -CONFIG_INOTIFY_USER=y -CONFIG_FANOTIFY=y -CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y -CONFIG_QUOTA=y -CONFIG_QUOTA_NETLINK_INTERFACE=y -# CONFIG_PRINT_QUOTA_WARNING is not set -# CONFIG_QUOTA_DEBUG is not set -CONFIG_QUOTA_TREE=m -CONFIG_QFMT_V1=m -CONFIG_QFMT_V2=m -CONFIG_QUOTACTL=y -CONFIG_QUOTACTL_COMPAT=y -CONFIG_AUTOFS4_FS=m -CONFIG_AUTOFS_FS=m -CONFIG_FUSE_FS=y -CONFIG_CUSE=m -CONFIG_OVERLAY_FS=m -# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set -# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set -# CONFIG_OVERLAY_FS_INDEX is not set -# CONFIG_OVERLAY_FS_XINO_AUTO is not set - -# -# Caches -# -CONFIG_FSCACHE=m -CONFIG_FSCACHE_STATS=y -# CONFIG_FSCACHE_HISTOGRAM is not set -# CONFIG_FSCACHE_DEBUG is not set -# CONFIG_FSCACHE_OBJECT_LIST is not set -CONFIG_CACHEFILES=m -# CONFIG_CACHEFILES_DEBUG is not set -# CONFIG_CACHEFILES_HISTOGRAM is not set - -# -# CD-ROM/DVD Filesystems -# -CONFIG_ISO9660_FS=m -CONFIG_JOLIET=y -CONFIG_ZISOFS=y -CONFIG_UDF_FS=m - -# -# DOS/FAT/NT Filesystems -# -CONFIG_FAT_FS=y -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=y -CONFIG_FAT_DEFAULT_CODEPAGE=437 -CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" -# CONFIG_FAT_DEFAULT_UTF8 is not set -CONFIG_NTFS_FS=m -# CONFIG_NTFS_DEBUG is not set -# CONFIG_NTFS_RW is not set - -# -# Pseudo filesystems -# -CONFIG_PROC_FS=y -CONFIG_PROC_KCORE=y -CONFIG_PROC_VMCORE=y -# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set -CONFIG_PROC_SYSCTL=y -CONFIG_PROC_PAGE_MONITOR=y -CONFIG_PROC_CHILDREN=y -CONFIG_KERNFS=y -CONFIG_SYSFS=y -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y -CONFIG_TMPFS_XATTR=y -CONFIG_HUGETLBFS=y -CONFIG_HUGETLB_PAGE=y -CONFIG_MEMFD_CREATE=y -CONFIG_ARCH_HAS_GIGANTIC_PAGE=y -CONFIG_CONFIGFS_FS=m -CONFIG_EFIVAR_FS=y -CONFIG_MISC_FILESYSTEMS=y -CONFIG_ORANGEFS_FS=m -CONFIG_ADFS_FS=m -# CONFIG_ADFS_FS_RW is not set -CONFIG_AFFS_FS=m -CONFIG_ECRYPT_FS=y -CONFIG_ECRYPT_FS_MESSAGING=y -CONFIG_HFS_FS=m -CONFIG_HFSPLUS_FS=m -CONFIG_HFSPLUS_FS_POSIX_ACL=y -CONFIG_BEFS_FS=m -# CONFIG_BEFS_DEBUG is not set -CONFIG_BFS_FS=m -CONFIG_EFS_FS=m -CONFIG_JFFS2_FS=m -CONFIG_JFFS2_FS_DEBUG=0 -CONFIG_JFFS2_FS_WRITEBUFFER=y -# CONFIG_JFFS2_FS_WBUF_VERIFY is not set -# CONFIG_JFFS2_SUMMARY is not set -CONFIG_JFFS2_FS_XATTR=y -CONFIG_JFFS2_FS_POSIX_ACL=y -CONFIG_JFFS2_FS_SECURITY=y -CONFIG_JFFS2_COMPRESSION_OPTIONS=y -CONFIG_JFFS2_ZLIB=y -CONFIG_JFFS2_LZO=y -CONFIG_JFFS2_RTIME=y -# CONFIG_JFFS2_RUBIN is not set -# CONFIG_JFFS2_CMODE_NONE is not set -# CONFIG_JFFS2_CMODE_PRIORITY is not set -# CONFIG_JFFS2_CMODE_SIZE is not set -CONFIG_JFFS2_CMODE_FAVOURLZO=y -CONFIG_UBIFS_FS=m -# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set -CONFIG_UBIFS_FS_LZO=y -CONFIG_UBIFS_FS_ZLIB=y -CONFIG_UBIFS_ATIME_SUPPORT=y -CONFIG_UBIFS_FS_ENCRYPTION=y -CONFIG_UBIFS_FS_SECURITY=y -CONFIG_CRAMFS=m -CONFIG_CRAMFS_BLOCKDEV=y -# CONFIG_CRAMFS_MTD is not set -CONFIG_SQUASHFS=m -# CONFIG_SQUASHFS_FILE_CACHE is not set -CONFIG_SQUASHFS_FILE_DIRECT=y -# CONFIG_SQUASHFS_DECOMP_SINGLE is not set -# CONFIG_SQUASHFS_DECOMP_MULTI is not set -CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y -CONFIG_SQUASHFS_XATTR=y -CONFIG_SQUASHFS_ZLIB=y -CONFIG_SQUASHFS_LZ4=y -CONFIG_SQUASHFS_LZO=y -CONFIG_SQUASHFS_XZ=y -# CONFIG_SQUASHFS_ZSTD is not set -# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set -# CONFIG_SQUASHFS_EMBEDDED is not set -CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 -CONFIG_VXFS_FS=m -CONFIG_MINIX_FS=m -CONFIG_OMFS_FS=m -CONFIG_HPFS_FS=m -CONFIG_QNX4FS_FS=m -CONFIG_QNX6FS_FS=m -# CONFIG_QNX6FS_DEBUG is not set -CONFIG_ROMFS_FS=m -CONFIG_ROMFS_BACKED_BY_BLOCK=y -# CONFIG_ROMFS_BACKED_BY_MTD is not set -# CONFIG_ROMFS_BACKED_BY_BOTH is not set -CONFIG_ROMFS_ON_BLOCK=y -CONFIG_PSTORE=y -CONFIG_PSTORE_DEFLATE_COMPRESS=m -# CONFIG_PSTORE_LZO_COMPRESS is not set -# CONFIG_PSTORE_LZ4_COMPRESS is not set -# CONFIG_PSTORE_LZ4HC_COMPRESS is not set -# CONFIG_PSTORE_842_COMPRESS is not set -CONFIG_PSTORE_COMPRESS=y -CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y -CONFIG_PSTORE_COMPRESS_DEFAULT="deflate" -# CONFIG_PSTORE_CONSOLE is not set -# CONFIG_PSTORE_PMSG is not set -# CONFIG_PSTORE_FTRACE is not set -CONFIG_PSTORE_RAM=m -CONFIG_SYSV_FS=m -CONFIG_UFS_FS=m -# CONFIG_UFS_FS_WRITE is not set -# CONFIG_UFS_DEBUG is not set -CONFIG_EXOFS_FS=m -# CONFIG_EXOFS_DEBUG is not set -CONFIG_ORE=m -CONFIG_NETWORK_FILESYSTEMS=y -CONFIG_NFS_FS=m -CONFIG_NFS_V2=m -CONFIG_NFS_V3=m -CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=m -CONFIG_NFS_SWAP=y -CONFIG_NFS_V4_1=y -CONFIG_NFS_V4_2=y -CONFIG_PNFS_FILE_LAYOUT=m -CONFIG_PNFS_BLOCK=m -CONFIG_PNFS_FLEXFILE_LAYOUT=m -CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" -CONFIG_NFS_V4_1_MIGRATION=y -CONFIG_NFS_V4_SECURITY_LABEL=y -CONFIG_NFS_FSCACHE=y -# CONFIG_NFS_USE_LEGACY_DNS is not set -CONFIG_NFS_USE_KERNEL_DNS=y -CONFIG_NFS_DEBUG=y -CONFIG_NFSD=m -CONFIG_NFSD_V2_ACL=y -CONFIG_NFSD_V3=y -CONFIG_NFSD_V3_ACL=y -CONFIG_NFSD_V4=y -# CONFIG_NFSD_BLOCKLAYOUT is not set -# CONFIG_NFSD_SCSILAYOUT is not set -# CONFIG_NFSD_FLEXFILELAYOUT is not set -CONFIG_NFSD_V4_SECURITY_LABEL=y -# CONFIG_NFSD_FAULT_INJECTION is not set -CONFIG_GRACE_PERIOD=m -CONFIG_LOCKD=m -CONFIG_LOCKD_V4=y -CONFIG_NFS_ACL_SUPPORT=m -CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=m -CONFIG_SUNRPC_GSS=m -CONFIG_SUNRPC_BACKCHANNEL=y -CONFIG_SUNRPC_SWAP=y -CONFIG_RPCSEC_GSS_KRB5=m -CONFIG_SUNRPC_DEBUG=y -CONFIG_SUNRPC_XPRT_RDMA=m -CONFIG_CEPH_FS=m -CONFIG_CEPH_FSCACHE=y -CONFIG_CEPH_FS_POSIX_ACL=y -CONFIG_CIFS=m -CONFIG_CIFS_STATS=y -# CONFIG_CIFS_STATS2 is not set -CONFIG_CIFS_WEAK_PW_HASH=y -CONFIG_CIFS_UPCALL=y -CONFIG_CIFS_XATTR=y -CONFIG_CIFS_POSIX=y -CONFIG_CIFS_ACL=y -CONFIG_CIFS_DEBUG=y -# CONFIG_CIFS_DEBUG2 is not set -# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set -CONFIG_CIFS_DFS_UPCALL=y -CONFIG_CIFS_SMB311=y -# CONFIG_CIFS_SMB_DIRECT is not set -CONFIG_CIFS_FSCACHE=y -CONFIG_CODA_FS=m -CONFIG_AFS_FS=m -# CONFIG_AFS_DEBUG is not set -CONFIG_AFS_FSCACHE=y -CONFIG_9P_FS=m -CONFIG_9P_FSCACHE=y -CONFIG_9P_FS_POSIX_ACL=y -CONFIG_9P_FS_SECURITY=y -CONFIG_NLS=y -CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_737=m -CONFIG_NLS_CODEPAGE_775=m -CONFIG_NLS_CODEPAGE_850=m -CONFIG_NLS_CODEPAGE_852=m -CONFIG_NLS_CODEPAGE_855=m -CONFIG_NLS_CODEPAGE_857=m -CONFIG_NLS_CODEPAGE_860=m -CONFIG_NLS_CODEPAGE_861=m -CONFIG_NLS_CODEPAGE_862=m -CONFIG_NLS_CODEPAGE_863=m -CONFIG_NLS_CODEPAGE_864=m -CONFIG_NLS_CODEPAGE_865=m -CONFIG_NLS_CODEPAGE_866=m -CONFIG_NLS_CODEPAGE_869=m -CONFIG_NLS_CODEPAGE_936=m -CONFIG_NLS_CODEPAGE_950=m -CONFIG_NLS_CODEPAGE_932=m -CONFIG_NLS_CODEPAGE_949=m -CONFIG_NLS_CODEPAGE_874=m -CONFIG_NLS_ISO8859_8=m -CONFIG_NLS_CODEPAGE_1250=m -CONFIG_NLS_CODEPAGE_1251=m -CONFIG_NLS_ASCII=m -CONFIG_NLS_ISO8859_1=m -CONFIG_NLS_ISO8859_2=m -CONFIG_NLS_ISO8859_3=m -CONFIG_NLS_ISO8859_4=m -CONFIG_NLS_ISO8859_5=m -CONFIG_NLS_ISO8859_6=m -CONFIG_NLS_ISO8859_7=m -CONFIG_NLS_ISO8859_9=m -CONFIG_NLS_ISO8859_13=m -CONFIG_NLS_ISO8859_14=m -CONFIG_NLS_ISO8859_15=m -CONFIG_NLS_KOI8_R=m -CONFIG_NLS_KOI8_U=m -CONFIG_NLS_MAC_ROMAN=m -CONFIG_NLS_MAC_CELTIC=m -CONFIG_NLS_MAC_CENTEURO=m -CONFIG_NLS_MAC_CROATIAN=m -CONFIG_NLS_MAC_CYRILLIC=m -CONFIG_NLS_MAC_GAELIC=m -CONFIG_NLS_MAC_GREEK=m -CONFIG_NLS_MAC_ICELAND=m -CONFIG_NLS_MAC_INUIT=m -CONFIG_NLS_MAC_ROMANIAN=m -CONFIG_NLS_MAC_TURKISH=m -CONFIG_NLS_UTF8=m -CONFIG_DLM=m -# CONFIG_DLM_DEBUG is not set - -# -# Kernel hacking -# -CONFIG_TRACE_IRQFLAGS_SUPPORT=y - -# -# printk and dmesg options -# -CONFIG_PRINTK_TIME=y -CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 -CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 -CONFIG_BOOT_PRINTK_DELAY=y -CONFIG_DYNAMIC_DEBUG=y - -# -# Compile-time checks and compiler options -# -# CONFIG_DEBUG_INFO is not set -# CONFIG_ENABLE_WARN_DEPRECATED is not set -# CONFIG_ENABLE_MUST_CHECK is not set -CONFIG_FRAME_WARN=1024 -# CONFIG_STRIP_ASM_SYMS is not set -# CONFIG_READABLE_ASM is not set -CONFIG_UNUSED_SYMBOLS=y -# CONFIG_PAGE_OWNER is not set -CONFIG_DEBUG_FS=y -# CONFIG_HEADERS_CHECK is not set -# CONFIG_DEBUG_SECTION_MISMATCH is not set -CONFIG_SECTION_MISMATCH_WARN_ONLY=y -CONFIG_FRAME_POINTER=y -CONFIG_STACK_VALIDATION=y -# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set -CONFIG_MAGIC_SYSRQ=y -CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1 -CONFIG_MAGIC_SYSRQ_SERIAL=y -CONFIG_DEBUG_KERNEL=y - -# -# Memory Debugging -# -# CONFIG_PAGE_EXTENSION is not set -# CONFIG_DEBUG_PAGEALLOC is not set -# CONFIG_PAGE_POISONING is not set -# CONFIG_DEBUG_PAGE_REF is not set -# CONFIG_DEBUG_RODATA_TEST is not set -# CONFIG_DEBUG_OBJECTS is not set -# CONFIG_SLUB_DEBUG_ON is not set -# CONFIG_SLUB_STATS is not set -CONFIG_HAVE_DEBUG_KMEMLEAK=y -# CONFIG_DEBUG_KMEMLEAK is not set -# CONFIG_DEBUG_STACK_USAGE is not set -# CONFIG_DEBUG_VM is not set -CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y -# CONFIG_DEBUG_VIRTUAL is not set -# CONFIG_DEBUG_MEMORY_INIT is not set -CONFIG_MEMORY_NOTIFIER_ERROR_INJECT=m -# CONFIG_DEBUG_PER_CPU_MAPS is not set -CONFIG_HAVE_DEBUG_STACKOVERFLOW=y -# CONFIG_DEBUG_STACKOVERFLOW is not set -CONFIG_HAVE_ARCH_KASAN=y -# CONFIG_KASAN is not set -CONFIG_ARCH_HAS_KCOV=y -CONFIG_CC_HAS_SANCOV_TRACE_PC=y -# CONFIG_KCOV is not set -# CONFIG_DEBUG_SHIRQ is not set - -# -# Debug Lockups and Hangs -# -CONFIG_LOCKUP_DETECTOR=y -CONFIG_SOFTLOCKUP_DETECTOR=y -# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set -CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 -CONFIG_HARDLOCKUP_DETECTOR_PERF=y -CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y -CONFIG_HARDLOCKUP_DETECTOR=y -# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set -CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0 -CONFIG_DETECT_HUNG_TASK=y -CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 -# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set -CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 -# CONFIG_WQ_WATCHDOG is not set -# CONFIG_PANIC_ON_OOPS is not set -CONFIG_PANIC_ON_OOPS_VALUE=0 -CONFIG_PANIC_TIMEOUT=0 -CONFIG_SCHED_DEBUG=y -CONFIG_SCHED_INFO=y -CONFIG_SCHEDSTATS=y -CONFIG_SCHED_STACK_END_CHECK=y -# CONFIG_DEBUG_TIMEKEEPING is not set - -# -# Lock Debugging (spinlocks, mutexes, etc...) -# -CONFIG_LOCK_DEBUGGING_SUPPORT=y -# CONFIG_PROVE_LOCKING is not set -# CONFIG_LOCK_STAT is not set -# CONFIG_DEBUG_RT_MUTEXES is not set -# CONFIG_DEBUG_SPINLOCK is not set -# CONFIG_DEBUG_MUTEXES is not set -# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set -# CONFIG_DEBUG_RWSEMS is not set -# CONFIG_DEBUG_LOCK_ALLOC is not set -# CONFIG_DEBUG_ATOMIC_SLEEP is not set -# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set -CONFIG_LOCK_TORTURE_TEST=m -CONFIG_WW_MUTEX_SELFTEST=m -CONFIG_STACKTRACE=y -# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set -# CONFIG_DEBUG_KOBJECT is not set -CONFIG_DEBUG_BUGVERBOSE=y -# CONFIG_DEBUG_LIST is not set -# CONFIG_DEBUG_PI_LIST is not set -# CONFIG_DEBUG_SG is not set -# CONFIG_DEBUG_NOTIFIERS is not set -# CONFIG_DEBUG_CREDENTIALS is not set - -# -# RCU Debugging -# -CONFIG_TORTURE_TEST=m -# CONFIG_RCU_PERF_TEST is not set -# CONFIG_RCU_TORTURE_TEST is not set -CONFIG_RCU_CPU_STALL_TIMEOUT=60 -# CONFIG_RCU_TRACE is not set -# CONFIG_RCU_EQS_DEBUG is not set -# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set -# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set -# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set -CONFIG_NOTIFIER_ERROR_INJECTION=m -CONFIG_PM_NOTIFIER_ERROR_INJECT=m -CONFIG_NETDEV_NOTIFIER_ERROR_INJECT=m -CONFIG_FUNCTION_ERROR_INJECTION=y -# CONFIG_FAULT_INJECTION is not set -# CONFIG_LATENCYTOP is not set -CONFIG_USER_STACKTRACE_SUPPORT=y -CONFIG_NOP_TRACER=y -CONFIG_HAVE_FUNCTION_TRACER=y -CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y -CONFIG_HAVE_DYNAMIC_FTRACE=y -CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y -CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y -CONFIG_HAVE_SYSCALL_TRACEPOINTS=y -CONFIG_HAVE_FENTRY=y -CONFIG_HAVE_C_RECORDMCOUNT=y -CONFIG_TRACER_MAX_TRACE=y -CONFIG_TRACE_CLOCK=y -CONFIG_RING_BUFFER=y -CONFIG_EVENT_TRACING=y -CONFIG_CONTEXT_SWITCH_TRACER=y -CONFIG_RING_BUFFER_ALLOW_SWAP=y -CONFIG_TRACING=y -CONFIG_GENERIC_TRACER=y -CONFIG_TRACING_SUPPORT=y -CONFIG_FTRACE=y -CONFIG_FUNCTION_TRACER=y -CONFIG_FUNCTION_GRAPH_TRACER=y -# CONFIG_PREEMPTIRQ_EVENTS is not set -# CONFIG_IRQSOFF_TRACER is not set -CONFIG_SCHED_TRACER=y -# CONFIG_HWLAT_TRACER is not set -CONFIG_FTRACE_SYSCALLS=y -CONFIG_TRACER_SNAPSHOT=y -# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set -CONFIG_BRANCH_PROFILE_NONE=y -# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set -CONFIG_STACK_TRACER=y -CONFIG_BLK_DEV_IO_TRACE=y -CONFIG_KPROBE_EVENTS=y -# CONFIG_UPROBE_EVENTS is not set -CONFIG_BPF_EVENTS=y -CONFIG_PROBE_EVENTS=y -CONFIG_DYNAMIC_FTRACE=y -CONFIG_DYNAMIC_FTRACE_WITH_REGS=y -CONFIG_FUNCTION_PROFILER=y -# CONFIG_BPF_KPROBE_OVERRIDE is not set -CONFIG_FTRACE_MCOUNT_RECORD=y -# CONFIG_FTRACE_STARTUP_TEST is not set -CONFIG_MMIOTRACE=y -# CONFIG_HIST_TRIGGERS is not set -# CONFIG_MMIOTRACE_TEST is not set -# CONFIG_TRACEPOINT_BENCHMARK is not set -# CONFIG_RING_BUFFER_BENCHMARK is not set -# CONFIG_RING_BUFFER_STARTUP_TEST is not set -# CONFIG_TRACE_EVAL_MAP_FILE is not set -CONFIG_TRACING_EVENTS_GPIO=y -# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set -# CONFIG_DMA_API_DEBUG is not set -CONFIG_RUNTIME_TESTING_MENU=y -# CONFIG_LKDTM is not set -# CONFIG_TEST_LIST_SORT is not set -# CONFIG_TEST_SORT is not set -# CONFIG_KPROBES_SANITY_TEST is not set -# CONFIG_BACKTRACE_SELF_TEST is not set -CONFIG_RBTREE_TEST=m -CONFIG_INTERVAL_TREE_TEST=m -CONFIG_PERCPU_TEST=m -# CONFIG_ATOMIC64_SELFTEST is not set -CONFIG_ASYNC_RAID6_TEST=m -CONFIG_TEST_HEXDUMP=m -CONFIG_TEST_STRING_HELPERS=m -CONFIG_TEST_KSTRTOX=m -CONFIG_TEST_PRINTF=m -CONFIG_TEST_BITMAP=m -CONFIG_TEST_UUID=m -CONFIG_TEST_OVERFLOW=m -# CONFIG_TEST_RHASHTABLE is not set -CONFIG_TEST_HASH=m -CONFIG_TEST_PARMAN=m -CONFIG_TEST_LKM=m -CONFIG_TEST_USER_COPY=m -CONFIG_TEST_BPF=m -CONFIG_FIND_BIT_BENCHMARK=m -CONFIG_TEST_FIRMWARE=m -# CONFIG_TEST_SYSCTL is not set -CONFIG_TEST_UDELAY=m -CONFIG_TEST_STATIC_KEYS=m -# CONFIG_TEST_KMOD is not set -CONFIG_MEMTEST=y -# CONFIG_BUG_ON_DATA_CORRUPTION is not set -# CONFIG_SAMPLES is not set -CONFIG_HAVE_ARCH_KGDB=y -CONFIG_KGDB=y -CONFIG_KGDB_SERIAL_CONSOLE=y -# CONFIG_KGDB_TESTS is not set -CONFIG_KGDB_LOW_LEVEL_TRAP=y -CONFIG_KGDB_KDB=y -CONFIG_KDB_DEFAULT_ENABLE=0x1 -CONFIG_KDB_KEYBOARD=y -CONFIG_KDB_CONTINUE_CATASTROPHIC=0 -CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y -# CONFIG_UBSAN is not set -CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y -CONFIG_STRICT_DEVMEM=y -CONFIG_IO_STRICT_DEVMEM=y -CONFIG_EARLY_PRINTK_USB=y -# CONFIG_X86_VERBOSE_BOOTUP is not set -CONFIG_EARLY_PRINTK=y -CONFIG_EARLY_PRINTK_DBGP=y -CONFIG_EARLY_PRINTK_EFI=y -# CONFIG_EARLY_PRINTK_USB_XDBC is not set -# CONFIG_X86_PTDUMP is not set -# CONFIG_EFI_PGT_DUMP is not set -# CONFIG_DEBUG_WX is not set -CONFIG_DOUBLEFAULT=y -# CONFIG_DEBUG_TLBFLUSH is not set -# CONFIG_IOMMU_DEBUG is not set -CONFIG_HAVE_MMIOTRACE_SUPPORT=y -# CONFIG_X86_DECODER_SELFTEST is not set -CONFIG_IO_DELAY_TYPE_0X80=0 -CONFIG_IO_DELAY_TYPE_0XED=1 -CONFIG_IO_DELAY_TYPE_UDELAY=2 -CONFIG_IO_DELAY_TYPE_NONE=3 -# CONFIG_IO_DELAY_0X80 is not set -CONFIG_IO_DELAY_0XED=y -# CONFIG_IO_DELAY_UDELAY is not set -# CONFIG_IO_DELAY_NONE is not set -CONFIG_DEFAULT_IO_DELAY_TYPE=1 -# CONFIG_DEBUG_BOOT_PARAMS is not set -# CONFIG_CPA_DEBUG is not set -CONFIG_OPTIMIZE_INLINING=y -# CONFIG_DEBUG_ENTRY is not set -# CONFIG_DEBUG_NMI_SELFTEST is not set -CONFIG_X86_DEBUG_FPU=y -CONFIG_PUNIT_ATOM_DEBUG=m -# CONFIG_UNWINDER_ORC is not set -CONFIG_UNWINDER_FRAME_POINTER=y -# CONFIG_UNWINDER_GUESS is not set - -# -# Security options -# -CONFIG_KEYS=y -CONFIG_KEYS_COMPAT=y -CONFIG_PERSISTENT_KEYRINGS=y -CONFIG_BIG_KEYS=y -CONFIG_TRUSTED_KEYS=y -CONFIG_ENCRYPTED_KEYS=y -CONFIG_KEY_DH_OPERATIONS=y -# CONFIG_SECURITY_DMESG_RESTRICT is not set -CONFIG_SECURITY=y -CONFIG_SECURITY_WRITABLE_HOOKS=y -CONFIG_SECURITYFS=y -CONFIG_SECURITY_NETWORK=y -CONFIG_PAGE_TABLE_ISOLATION=y -# CONFIG_SECURITY_INFINIBAND is not set -CONFIG_SECURITY_NETWORK_XFRM=y -CONFIG_SECURITY_PATH=y -CONFIG_INTEL_TXT=y -CONFIG_LSM_MMAP_MIN_ADDR=0 -CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y -CONFIG_HARDENED_USERCOPY=y -CONFIG_HARDENED_USERCOPY_FALLBACK=y -# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set -CONFIG_FORTIFY_SOURCE=y -# CONFIG_STATIC_USERMODEHELPER is not set -CONFIG_SECURITY_SELINUX=y -CONFIG_SECURITY_SELINUX_BOOTPARAM=y -CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 -CONFIG_SECURITY_SELINUX_DISABLE=y -CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_AVC_STATS=y -CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 -CONFIG_SECURITY_SMACK=y -# CONFIG_SECURITY_SMACK_BRINGUP is not set -CONFIG_SECURITY_SMACK_NETFILTER=y -# CONFIG_SECURITY_SMACK_APPEND_SIGNALS is not set -CONFIG_SECURITY_TOMOYO=y -CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048 -CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024 -# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set -CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init" -CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init" -CONFIG_SECURITY_APPARMOR=y -CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1 -CONFIG_SECURITY_APPARMOR_HASH=y -CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y -# CONFIG_SECURITY_APPARMOR_DEBUG is not set -# CONFIG_SECURITY_LOADPIN is not set -CONFIG_SECURITY_YAMA=y -CONFIG_INTEGRITY=y -CONFIG_INTEGRITY_SIGNATURE=y -CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y -CONFIG_INTEGRITY_TRUSTED_KEYRING=y -CONFIG_INTEGRITY_AUDIT=y -CONFIG_IMA=y -CONFIG_IMA_MEASURE_PCR_IDX=10 -CONFIG_IMA_LSM_RULES=y -# CONFIG_IMA_TEMPLATE is not set -CONFIG_IMA_NG_TEMPLATE=y -# CONFIG_IMA_SIG_TEMPLATE is not set -CONFIG_IMA_DEFAULT_TEMPLATE="ima-ng" -CONFIG_IMA_DEFAULT_HASH_SHA1=y -# CONFIG_IMA_DEFAULT_HASH_SHA256 is not set -# CONFIG_IMA_DEFAULT_HASH_SHA512 is not set -CONFIG_IMA_DEFAULT_HASH="sha1" -# CONFIG_IMA_WRITE_POLICY is not set -# CONFIG_IMA_READ_POLICY is not set -CONFIG_IMA_APPRAISE=y -CONFIG_IMA_APPRAISE_BOOTPARAM=y -CONFIG_IMA_TRUSTED_KEYRING=y -CONFIG_IMA_BLACKLIST_KEYRING=y -# CONFIG_IMA_LOAD_X509 is not set -CONFIG_EVM=y -CONFIG_EVM_ATTR_FSUUID=y -CONFIG_EVM_EXTRA_SMACK_XATTRS=y -# CONFIG_EVM_ADD_XATTRS is not set -# CONFIG_EVM_LOAD_X509 is not set -# CONFIG_DEFAULT_SECURITY_SELINUX is not set -# CONFIG_DEFAULT_SECURITY_SMACK is not set -# CONFIG_DEFAULT_SECURITY_TOMOYO is not set -CONFIG_DEFAULT_SECURITY_APPARMOR=y -# CONFIG_DEFAULT_SECURITY_DAC is not set -CONFIG_DEFAULT_SECURITY="apparmor" -CONFIG_XOR_BLOCKS=m -CONFIG_ASYNC_CORE=m -CONFIG_ASYNC_MEMCPY=m -CONFIG_ASYNC_XOR=m -CONFIG_ASYNC_PQ=m -CONFIG_ASYNC_RAID6_RECOV=m -CONFIG_CRYPTO=y - -# -# Crypto core or helper -# -CONFIG_CRYPTO_ALGAPI=y -CONFIG_CRYPTO_ALGAPI2=y -CONFIG_CRYPTO_AEAD=y -CONFIG_CRYPTO_AEAD2=y -CONFIG_CRYPTO_BLKCIPHER=y -CONFIG_CRYPTO_BLKCIPHER2=y -CONFIG_CRYPTO_HASH=y -CONFIG_CRYPTO_HASH2=y -CONFIG_CRYPTO_RNG=y -CONFIG_CRYPTO_RNG2=y -CONFIG_CRYPTO_RNG_DEFAULT=y -CONFIG_CRYPTO_AKCIPHER2=y -CONFIG_CRYPTO_AKCIPHER=y -CONFIG_CRYPTO_KPP2=y -CONFIG_CRYPTO_KPP=y -CONFIG_CRYPTO_ACOMP2=y -CONFIG_CRYPTO_RSA=y -CONFIG_CRYPTO_DH=y -CONFIG_CRYPTO_ECDH=m -CONFIG_CRYPTO_MANAGER=y -CONFIG_CRYPTO_MANAGER2=y -CONFIG_CRYPTO_USER=m -CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y -CONFIG_CRYPTO_GF128MUL=y -CONFIG_CRYPTO_NULL=y -CONFIG_CRYPTO_NULL2=y -CONFIG_CRYPTO_PCRYPT=m -CONFIG_CRYPTO_WORKQUEUE=y -CONFIG_CRYPTO_CRYPTD=m -CONFIG_CRYPTO_MCRYPTD=m -CONFIG_CRYPTO_AUTHENC=m -CONFIG_CRYPTO_TEST=m -CONFIG_CRYPTO_SIMD=m -CONFIG_CRYPTO_GLUE_HELPER_X86=m -CONFIG_CRYPTO_ENGINE=m - -# -# Authenticated Encryption with Associated Data -# -CONFIG_CRYPTO_CCM=m -CONFIG_CRYPTO_GCM=y -CONFIG_CRYPTO_CHACHA20POLY1305=m -CONFIG_CRYPTO_AEGIS128=m -CONFIG_CRYPTO_AEGIS128L=m -CONFIG_CRYPTO_AEGIS256=m -CONFIG_CRYPTO_AEGIS128_AESNI_SSE2=m -CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2=m -CONFIG_CRYPTO_AEGIS256_AESNI_SSE2=m -CONFIG_CRYPTO_MORUS640=m -CONFIG_CRYPTO_MORUS640_GLUE=m -CONFIG_CRYPTO_MORUS640_SSE2=m -CONFIG_CRYPTO_MORUS1280=m -CONFIG_CRYPTO_MORUS1280_GLUE=m -CONFIG_CRYPTO_MORUS1280_SSE2=m -CONFIG_CRYPTO_MORUS1280_AVX2=m -CONFIG_CRYPTO_SEQIV=y -CONFIG_CRYPTO_ECHAINIV=m - -# -# Block modes -# -CONFIG_CRYPTO_CBC=y -CONFIG_CRYPTO_CFB=m -CONFIG_CRYPTO_CTR=y -CONFIG_CRYPTO_CTS=m -CONFIG_CRYPTO_ECB=y -CONFIG_CRYPTO_LRW=m -CONFIG_CRYPTO_PCBC=m -CONFIG_CRYPTO_XTS=m -CONFIG_CRYPTO_KEYWRAP=m - -# -# Hash modes -# -CONFIG_CRYPTO_CMAC=m -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_XCBC=m -CONFIG_CRYPTO_VMAC=m - -# -# Digest -# -CONFIG_CRYPTO_CRC32C=y -CONFIG_CRYPTO_CRC32C_INTEL=y -CONFIG_CRYPTO_CRC32=m -CONFIG_CRYPTO_CRC32_PCLMUL=m -CONFIG_CRYPTO_CRCT10DIF=y -CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m -CONFIG_CRYPTO_GHASH=y -CONFIG_CRYPTO_POLY1305=m -CONFIG_CRYPTO_POLY1305_X86_64=m -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=y -CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_RMD128=m -CONFIG_CRYPTO_RMD160=m -CONFIG_CRYPTO_RMD256=m -CONFIG_CRYPTO_RMD320=m -CONFIG_CRYPTO_SHA1=y -CONFIG_CRYPTO_SHA1_SSSE3=m -CONFIG_CRYPTO_SHA256_SSSE3=m -CONFIG_CRYPTO_SHA512_SSSE3=m -CONFIG_CRYPTO_SHA1_MB=m -CONFIG_CRYPTO_SHA256_MB=m -CONFIG_CRYPTO_SHA512_MB=m -CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_SHA512=y -CONFIG_CRYPTO_SHA3=m -CONFIG_CRYPTO_SM3=m -CONFIG_CRYPTO_TGR192=m -CONFIG_CRYPTO_WP512=m -CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m - -# -# Ciphers -# -CONFIG_CRYPTO_AES=y -CONFIG_CRYPTO_AES_TI=m -CONFIG_CRYPTO_AES_X86_64=m -CONFIG_CRYPTO_AES_NI_INTEL=m -CONFIG_CRYPTO_ANUBIS=m -CONFIG_CRYPTO_ARC4=m -CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_BLOWFISH_COMMON=m -CONFIG_CRYPTO_BLOWFISH_X86_64=m -CONFIG_CRYPTO_CAMELLIA=m -CONFIG_CRYPTO_CAMELLIA_X86_64=m -CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m -CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m -CONFIG_CRYPTO_CAST_COMMON=m -CONFIG_CRYPTO_CAST5=m -CONFIG_CRYPTO_CAST5_AVX_X86_64=m -CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_CAST6_AVX_X86_64=m -CONFIG_CRYPTO_DES=m -CONFIG_CRYPTO_DES3_EDE_X86_64=m -CONFIG_CRYPTO_FCRYPT=m -CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_SALSA20=m -CONFIG_CRYPTO_CHACHA20=m -CONFIG_CRYPTO_CHACHA20_X86_64=m -CONFIG_CRYPTO_SEED=m -CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m -CONFIG_CRYPTO_SERPENT_AVX_X86_64=m -CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m -CONFIG_CRYPTO_SM4=m -CONFIG_CRYPTO_SPECK=m -CONFIG_CRYPTO_TEA=m -CONFIG_CRYPTO_TWOFISH=m -CONFIG_CRYPTO_TWOFISH_COMMON=m -CONFIG_CRYPTO_TWOFISH_X86_64=m -CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m -CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m - -# -# Compression -# -CONFIG_CRYPTO_DEFLATE=m -CONFIG_CRYPTO_LZO=y -CONFIG_CRYPTO_842=m -CONFIG_CRYPTO_LZ4=m -CONFIG_CRYPTO_LZ4HC=m -CONFIG_CRYPTO_ZSTD=m - -# -# Random Number Generation -# -CONFIG_CRYPTO_ANSI_CPRNG=m -CONFIG_CRYPTO_DRBG_MENU=y -CONFIG_CRYPTO_DRBG_HMAC=y -CONFIG_CRYPTO_DRBG_HASH=y -CONFIG_CRYPTO_DRBG_CTR=y -CONFIG_CRYPTO_DRBG=y -CONFIG_CRYPTO_JITTERENTROPY=y -CONFIG_CRYPTO_USER_API=m -CONFIG_CRYPTO_USER_API_HASH=m -CONFIG_CRYPTO_USER_API_SKCIPHER=m -CONFIG_CRYPTO_USER_API_RNG=m -CONFIG_CRYPTO_USER_API_AEAD=m -CONFIG_CRYPTO_HASH_INFO=y -CONFIG_CRYPTO_HW=y -CONFIG_CRYPTO_DEV_PADLOCK=y -CONFIG_CRYPTO_DEV_PADLOCK_AES=m -CONFIG_CRYPTO_DEV_PADLOCK_SHA=m -CONFIG_CRYPTO_DEV_CCP=y -CONFIG_CRYPTO_DEV_CCP_DD=m -CONFIG_CRYPTO_DEV_SP_CCP=y -CONFIG_CRYPTO_DEV_CCP_CRYPTO=m -CONFIG_CRYPTO_DEV_SP_PSP=y -CONFIG_CRYPTO_DEV_QAT=m -CONFIG_CRYPTO_DEV_QAT_DH895xCC=m -CONFIG_CRYPTO_DEV_QAT_C3XXX=m -CONFIG_CRYPTO_DEV_QAT_C62X=m -CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m -CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m -CONFIG_CRYPTO_DEV_QAT_C62XVF=m -CONFIG_CRYPTO_DEV_NITROX=m -CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m -CONFIG_CRYPTO_DEV_CHELSIO=m -# CONFIG_CHELSIO_IPSEC_INLINE is not set -# CONFIG_CRYPTO_DEV_CHELSIO_TLS is not set -CONFIG_CRYPTO_DEV_VIRTIO=m -CONFIG_ASYMMETRIC_KEY_TYPE=y -CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y -CONFIG_X509_CERTIFICATE_PARSER=y -CONFIG_PKCS7_MESSAGE_PARSER=y -# CONFIG_PKCS7_TEST_KEY is not set -# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set - -# -# Certificates for signature checking -# -CONFIG_SYSTEM_TRUSTED_KEYRING=y -CONFIG_SYSTEM_TRUSTED_KEYS="" -# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set -# CONFIG_SECONDARY_TRUSTED_KEYRING is not set -# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set -CONFIG_HAVE_KVM=y -CONFIG_HAVE_KVM_IRQCHIP=y -CONFIG_HAVE_KVM_IRQFD=y -CONFIG_HAVE_KVM_IRQ_ROUTING=y -CONFIG_HAVE_KVM_EVENTFD=y -CONFIG_KVM_MMIO=y -CONFIG_KVM_ASYNC_PF=y -CONFIG_HAVE_KVM_MSI=y -CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y -CONFIG_KVM_VFIO=y -CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y -CONFIG_KVM_COMPAT=y -CONFIG_HAVE_KVM_IRQ_BYPASS=y -CONFIG_VIRTUALIZATION=y -CONFIG_KVM=m -CONFIG_KVM_INTEL=m -CONFIG_KVM_AMD=m -CONFIG_KVM_AMD_SEV=y -# CONFIG_KVM_MMU_AUDIT is not set -CONFIG_VHOST_NET=m -CONFIG_VHOST_SCSI=m -CONFIG_VHOST_VSOCK=m -CONFIG_VHOST=m -# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set -CONFIG_BINARY_PRINTF=y - -# -# Library routines -# -CONFIG_RAID6_PQ=m -CONFIG_BITREVERSE=y -CONFIG_RATIONAL=y -CONFIG_GENERIC_STRNCPY_FROM_USER=y -CONFIG_GENERIC_STRNLEN_USER=y -CONFIG_GENERIC_NET_UTILS=y -CONFIG_GENERIC_FIND_FIRST_BIT=y -CONFIG_GENERIC_PCI_IOMAP=y -CONFIG_GENERIC_IOMAP=y -CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y -CONFIG_ARCH_HAS_FAST_MULTIPLIER=y -CONFIG_CRC_CCITT=y -CONFIG_CRC16=y -CONFIG_CRC_T10DIF=y -CONFIG_CRC_ITU_T=m -CONFIG_CRC32=y -# CONFIG_CRC32_SELFTEST is not set -CONFIG_CRC32_SLICEBY8=y -# CONFIG_CRC32_SLICEBY4 is not set -# CONFIG_CRC32_SARWATE is not set -# CONFIG_CRC32_BIT is not set -# CONFIG_CRC4 is not set -CONFIG_CRC7=m -CONFIG_LIBCRC32C=m -CONFIG_CRC8=m -CONFIG_XXHASH=m -# CONFIG_RANDOM32_SELFTEST is not set -CONFIG_842_COMPRESS=m -CONFIG_842_DECOMPRESS=m -CONFIG_ZLIB_INFLATE=y -CONFIG_ZLIB_DEFLATE=y -CONFIG_LZO_COMPRESS=y -CONFIG_LZO_DECOMPRESS=y -CONFIG_LZ4_COMPRESS=m -CONFIG_LZ4HC_COMPRESS=m -CONFIG_LZ4_DECOMPRESS=y -CONFIG_ZSTD_COMPRESS=m -CONFIG_ZSTD_DECOMPRESS=m -CONFIG_XZ_DEC=y -CONFIG_XZ_DEC_X86=y -CONFIG_XZ_DEC_POWERPC=y -CONFIG_XZ_DEC_IA64=y -CONFIG_XZ_DEC_ARM=y -CONFIG_XZ_DEC_ARMTHUMB=y -CONFIG_XZ_DEC_SPARC=y -CONFIG_XZ_DEC_BCJ=y -CONFIG_XZ_DEC_TEST=m -CONFIG_DECOMPRESS_GZIP=y -CONFIG_DECOMPRESS_BZIP2=y -CONFIG_DECOMPRESS_LZMA=y -CONFIG_DECOMPRESS_XZ=y -CONFIG_DECOMPRESS_LZO=y -CONFIG_DECOMPRESS_LZ4=y -CONFIG_GENERIC_ALLOCATOR=y -CONFIG_REED_SOLOMON=m -CONFIG_REED_SOLOMON_ENC8=y -CONFIG_REED_SOLOMON_DEC8=y -CONFIG_REED_SOLOMON_DEC16=y -CONFIG_BCH=m -CONFIG_BCH_CONST_PARAMS=y -CONFIG_TEXTSEARCH=y -CONFIG_TEXTSEARCH_KMP=m -CONFIG_TEXTSEARCH_BM=m -CONFIG_TEXTSEARCH_FSM=m -CONFIG_BTREE=y -CONFIG_INTERVAL_TREE=y -CONFIG_RADIX_TREE_MULTIORDER=y -CONFIG_ASSOCIATIVE_ARRAY=y -CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT_MAP=y -CONFIG_HAS_DMA=y -CONFIG_NEED_SG_DMA_LENGTH=y -CONFIG_NEED_DMA_MAP_STATE=y -CONFIG_ARCH_DMA_ADDR_T_64BIT=y -CONFIG_DMA_DIRECT_OPS=y -CONFIG_DMA_VIRT_OPS=y -CONFIG_SWIOTLB=y -CONFIG_SGL_ALLOC=y -CONFIG_IOMMU_HELPER=y -CONFIG_CHECK_SIGNATURE=y -CONFIG_CPU_RMAP=y -CONFIG_DQL=y -CONFIG_GLOB=y -# CONFIG_GLOB_SELFTEST is not set -CONFIG_NLATTR=y -CONFIG_LRU_CACHE=m -CONFIG_CLZ_TAB=y -CONFIG_CORDIC=m -CONFIG_DDR=y -CONFIG_IRQ_POLL=y -CONFIG_MPILIB=y -CONFIG_SIGNATURE=y -CONFIG_OID_REGISTRY=y -CONFIG_UCS2_STRING=y -CONFIG_FONT_SUPPORT=y -# CONFIG_FONTS is not set -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y -CONFIG_SG_POOL=y -CONFIG_ARCH_HAS_SG_CHAIN=y -CONFIG_ARCH_HAS_PMEM_API=y -CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y -CONFIG_ARCH_HAS_UACCESS_MCSAFE=y -CONFIG_SBITMAP=y -CONFIG_PARMAN=m -# CONFIG_STRING_SELFTEST is not set diff --git a/gnu/packages/aux-files/linux-libre/4.19-arm.conf b/gnu/packages/aux-files/linux-libre/4.19-arm.conf new file mode 100644 index 0000000000..184f73276f --- /dev/null +++ b/gnu/packages/aux-files/linux-libre/4.19-arm.conf @@ -0,0 +1,8569 @@ +# +# Automatically generated file; DO NOT EDIT. +# Linux/arm 4.19.0-gnu Kernel Configuration +# +CONFIG_CC_IS_GCC=y +CONFIG_GCC_VERSION=70300 +CONFIG_CLANG_VERSION=0 +CONFIG_IRQ_WORK=y +CONFIG_BUILDTIME_EXTABLE_SORT=y + +# +# General setup +# +CONFIG_INIT_ENV_ARG_LIMIT=32 +# CONFIG_COMPILE_TEST is not set +CONFIG_LOCALVERSION="" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_BUILD_SALT="" +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_LZMA=y +CONFIG_HAVE_KERNEL_XZ=y +CONFIG_HAVE_KERNEL_LZO=y +CONFIG_HAVE_KERNEL_LZ4=y +# CONFIG_KERNEL_GZIP is not set +# CONFIG_KERNEL_LZMA is not set +CONFIG_KERNEL_XZ=y +# CONFIG_KERNEL_LZO is not set +# CONFIG_KERNEL_LZ4 is not set +CONFIG_DEFAULT_HOSTNAME="(none)" +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +CONFIG_POSIX_MQUEUE_SYSCTL=y +CONFIG_CROSS_MEMORY_ATTACH=y +# CONFIG_USELIB is not set +CONFIG_AUDIT=y +CONFIG_HAVE_ARCH_AUDITSYSCALL=y +CONFIG_AUDITSYSCALL=y +CONFIG_AUDIT_WATCH=y +CONFIG_AUDIT_TREE=y + +# +# IRQ subsystem +# +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_IRQ_SHOW_LEVEL=y +CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_CHIP=y +CONFIG_IRQ_DOMAIN=y +CONFIG_IRQ_DOMAIN_HIERARCHY=y +CONFIG_GENERIC_MSI_IRQ=y +CONFIG_GENERIC_MSI_IRQ_DOMAIN=y +CONFIG_HANDLE_DOMAIN_IRQ=y +CONFIG_IRQ_FORCED_THREADING=y +CONFIG_SPARSE_IRQ=y +# CONFIG_GENERIC_IRQ_DEBUGFS is not set +CONFIG_GENERIC_IRQ_MULTI_HANDLER=y +CONFIG_ARCH_CLOCKSOURCE_DATA=y +CONFIG_GENERIC_TIME_VSYSCALL=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_ARCH_HAS_TICK_BROADCAST=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y + +# +# Timers subsystem +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ_COMMON=y +# CONFIG_HZ_PERIODIC is not set +CONFIG_NO_HZ_IDLE=y +# CONFIG_NO_HZ_FULL is not set +# CONFIG_NO_HZ is not set +CONFIG_HIGH_RES_TIMERS=y +# CONFIG_PREEMPT_NONE is not set +CONFIG_PREEMPT_VOLUNTARY=y +# CONFIG_PREEMPT is not set + +# +# CPU/Task time and stats accounting +# +CONFIG_TICK_CPU_ACCOUNTING=y +# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set +# CONFIG_IRQ_TIME_ACCOUNTING is not set +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_BSD_PROCESS_ACCT_V3=y +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y +CONFIG_CPU_ISOLATION=y + +# +# RCU Subsystem +# +CONFIG_TREE_RCU=y +# CONFIG_RCU_EXPERT is not set +CONFIG_SRCU=y +CONFIG_TREE_SRCU=y +CONFIG_RCU_STALL_COMMON=y +CONFIG_RCU_NEED_SEGCBLIST=y +CONFIG_BUILD_BIN2C=y +# CONFIG_IKCONFIG is not set +CONFIG_LOG_BUF_SHIFT=17 +CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 +CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13 +CONFIG_GENERIC_SCHED_CLOCK=y +CONFIG_CGROUPS=y +CONFIG_PAGE_COUNTER=y +CONFIG_MEMCG=y +CONFIG_MEMCG_SWAP=y +# CONFIG_MEMCG_SWAP_ENABLED is not set +CONFIG_MEMCG_KMEM=y +CONFIG_BLK_CGROUP=y +# CONFIG_DEBUG_BLK_CGROUP is not set +CONFIG_CGROUP_WRITEBACK=y +CONFIG_CGROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +CONFIG_CFS_BANDWIDTH=y +# CONFIG_RT_GROUP_SCHED is not set +CONFIG_CGROUP_PIDS=y +# CONFIG_CGROUP_RDMA is not set +CONFIG_CGROUP_FREEZER=y +CONFIG_CPUSETS=y +CONFIG_PROC_PID_CPUSET=y +CONFIG_CGROUP_DEVICE=y +CONFIG_CGROUP_CPUACCT=y +CONFIG_CGROUP_PERF=y +# CONFIG_CGROUP_BPF is not set +# CONFIG_CGROUP_DEBUG is not set +CONFIG_SOCK_CGROUP_DATA=y +CONFIG_NAMESPACES=y +CONFIG_UTS_NS=y +CONFIG_IPC_NS=y +CONFIG_USER_NS=y +CONFIG_PID_NS=y +CONFIG_NET_NS=y +CONFIG_CHECKPOINT_RESTORE=y +CONFIG_SCHED_AUTOGROUP=y +# CONFIG_SYSFS_DEPRECATED is not set +CONFIG_RELAY=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +CONFIG_RD_BZIP2=y +CONFIG_RD_LZMA=y +CONFIG_RD_XZ=y +CONFIG_RD_LZO=y +CONFIG_RD_LZ4=y +CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +CONFIG_HAVE_UID16=y +CONFIG_BPF=y +CONFIG_EXPERT=y +CONFIG_UID16=y +CONFIG_MULTIUSER=y +# CONFIG_SGETMASK_SYSCALL is not set +# CONFIG_SYSFS_SYSCALL is not set +# CONFIG_SYSCTL_SYSCALL is not set +CONFIG_FHANDLE=y +CONFIG_POSIX_TIMERS=y +CONFIG_PRINTK=y +CONFIG_PRINTK_NMI=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_FUTEX_PI=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +CONFIG_ADVISE_SYSCALLS=y +CONFIG_MEMBARRIER=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +CONFIG_KALLSYMS_BASE_RELATIVE=y +CONFIG_BPF_SYSCALL=y +# CONFIG_BPF_JIT_ALWAYS_ON is not set +CONFIG_USERFAULTFD=y +CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y +CONFIG_RSEQ=y +# CONFIG_DEBUG_RSEQ is not set +# CONFIG_EMBEDDED is not set +CONFIG_HAVE_PERF_EVENTS=y +CONFIG_PERF_USE_VMALLOC=y +# CONFIG_PC104 is not set + +# +# Kernel Performance Events And Counters +# +CONFIG_PERF_EVENTS=y +# CONFIG_DEBUG_PERF_USE_VMALLOC is not set +CONFIG_VM_EVENT_COUNTERS=y +# CONFIG_COMPAT_BRK is not set +CONFIG_SLAB=y +# CONFIG_SLUB is not set +# CONFIG_SLOB is not set +CONFIG_SLAB_MERGE_DEFAULT=y +CONFIG_SLAB_FREELIST_RANDOM=y +CONFIG_SYSTEM_DATA_VERIFICATION=y +CONFIG_PROFILING=y +CONFIG_TRACEPOINTS=y +CONFIG_ARM=y +CONFIG_ARM_HAS_SG_CHAIN=y +CONFIG_ARM_DMA_USE_IOMMU=y +CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8 +CONFIG_MIGHT_HAVE_PCI=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_HAVE_PROC_CPU=y +CONFIG_NO_IOPORT_MAP=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_ARCH_HAS_BANDGAP=y +CONFIG_FIX_EARLYCON_MEM=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ARCH_SUPPORTS_UPROBES=y +CONFIG_FIQ=y +CONFIG_ARM_PATCH_PHYS_VIRT=y +CONFIG_GENERIC_BUG=y +CONFIG_PGTABLE_LEVELS=2 + +# +# System Type +# +CONFIG_MMU=y +CONFIG_ARCH_MMAP_RND_BITS_MIN=8 +CONFIG_ARCH_MMAP_RND_BITS_MAX=16 +CONFIG_ARCH_MULTIPLATFORM=y +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_IOP13XX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_DOVE is not set +# CONFIG_ARCH_KS8695 is not set +# CONFIG_ARCH_W90X900 is not set +# CONFIG_ARCH_LPC32XX is not set +# CONFIG_ARCH_PXA is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C24XX is not set +# CONFIG_ARCH_DAVINCI is not set +# CONFIG_ARCH_OMAP1 is not set + +# +# Multiple platform selection +# + +# +# CPU Core family selection +# +# CONFIG_ARCH_MULTI_V6 is not set +CONFIG_ARCH_MULTI_V7=y +CONFIG_ARCH_MULTI_V6_V7=y +CONFIG_ARCH_VIRT=y +# CONFIG_ARCH_ACTIONS is not set +# CONFIG_ARCH_ALPINE is not set +# CONFIG_ARCH_ARTPEC is not set +# CONFIG_ARCH_AT91 is not set +CONFIG_ARCH_BCM=y + +# +# IPROC architected SoCs +# +# CONFIG_ARCH_BCM_CYGNUS is not set +# CONFIG_ARCH_BCM_HR2 is not set +# CONFIG_ARCH_BCM_NSP is not set +# CONFIG_ARCH_BCM_5301X is not set + +# +# KONA architected SoCs +# +# CONFIG_ARCH_BCM_281XX is not set +# CONFIG_ARCH_BCM_21664 is not set +# CONFIG_ARCH_BCM_23550 is not set + +# +# Other Architectures +# +CONFIG_ARCH_BCM2835=y +# CONFIG_ARCH_BCM_53573 is not set +# CONFIG_ARCH_BCM_63XX is not set +# CONFIG_ARCH_BRCMSTB is not set +# CONFIG_ARCH_BERLIN is not set +# CONFIG_ARCH_DIGICOLOR is not set +CONFIG_ARCH_EXYNOS=y +CONFIG_S5P_DEV_MFC=y +# CONFIG_ARCH_EXYNOS3 is not set +CONFIG_ARCH_EXYNOS4=y +CONFIG_ARCH_EXYNOS5=y + +# +# EXYNOS SoCs +# +CONFIG_CPU_EXYNOS4210=y +CONFIG_SOC_EXYNOS4412=y +CONFIG_SOC_EXYNOS5250=y +CONFIG_SOC_EXYNOS5260=y +CONFIG_SOC_EXYNOS5410=y +CONFIG_SOC_EXYNOS5420=y +CONFIG_SOC_EXYNOS5800=y +CONFIG_EXYNOS5420_MCPM=y +CONFIG_EXYNOS_CPU_SUSPEND=y +CONFIG_PLAT_SAMSUNG=y + +# +# Samsung Common options +# + +# +# Boot options +# + +# +# Power management +# +# CONFIG_SAMSUNG_PM_CHECK is not set +CONFIG_ARCH_HIGHBANK=y +# CONFIG_ARCH_HISI is not set +CONFIG_ARCH_MXC=y +CONFIG_MXC_TZIC=y +CONFIG_HAVE_IMX_ANATOP=y +CONFIG_HAVE_IMX_GPC=y +CONFIG_HAVE_IMX_MMDC=y +CONFIG_HAVE_IMX_SRC=y + +# +# Device tree only +# + +# +# Cortex-A platforms +# +CONFIG_SOC_IMX5=y +# CONFIG_SOC_IMX50 is not set +CONFIG_SOC_IMX51=y +CONFIG_SOC_IMX53=y +CONFIG_SOC_IMX6=y +CONFIG_SOC_IMX6Q=y +# CONFIG_SOC_IMX6SL is not set +# CONFIG_SOC_IMX6SLL is not set +# CONFIG_SOC_IMX6SX is not set +# CONFIG_SOC_IMX6UL is not set +# CONFIG_SOC_LS1021A is not set + +# +# Cortex-A/Cortex-M asymmetric multiprocessing platforms +# +# CONFIG_SOC_IMX7D is not set +# CONFIG_SOC_VF610 is not set +# CONFIG_ARCH_KEYSTONE is not set +# CONFIG_ARCH_MEDIATEK is not set +# CONFIG_ARCH_MESON is not set +# CONFIG_ARCH_MMP is not set +CONFIG_ARCH_MVEBU=y +CONFIG_MACH_MVEBU_ANY=y +CONFIG_MACH_MVEBU_V7=y +CONFIG_MACH_ARMADA_370=y +CONFIG_MACH_ARMADA_375=y +CONFIG_MACH_ARMADA_38X=y +CONFIG_MACH_ARMADA_39X=y +CONFIG_MACH_ARMADA_XP=y +# CONFIG_MACH_DOVE is not set +# CONFIG_ARCH_NPCM is not set +CONFIG_ARCH_OMAP=y + +# +# TI OMAP Common Features +# + +# +# OMAP Feature Selections +# +CONFIG_POWER_AVS_OMAP=y +CONFIG_POWER_AVS_OMAP_CLASS3=y +CONFIG_OMAP_RESET_CLOCKS=y +CONFIG_OMAP_32K_TIMER=y +# CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set +CONFIG_MACH_OMAP_GENERIC=y + +# +# TI OMAP/AM/DM/DRA Family +# +CONFIG_ARCH_OMAP3=y +CONFIG_ARCH_OMAP4=y +CONFIG_SOC_OMAP5=y +CONFIG_SOC_AM33XX=y +# CONFIG_SOC_AM43XX is not set +CONFIG_SOC_DRA7XX=y +CONFIG_ARCH_OMAP2PLUS=y +CONFIG_OMAP_INTERCONNECT_BARRIER=y + +# +# TI OMAP2/3/4 Specific Features +# +CONFIG_ARCH_OMAP2PLUS_TYPICAL=y +CONFIG_SOC_HAS_OMAP2_SDRC=y +CONFIG_SOC_HAS_REALTIME_COUNTER=y +CONFIG_SOC_OMAP3430=y +CONFIG_SOC_TI81XX=y +CONFIG_OMAP_PACKAGE_CBB=y + +# +# OMAP Legacy Platform Data Board Type +# +CONFIG_MACH_OMAP3517EVM=y +CONFIG_MACH_OMAP3_PANDORA=y +# CONFIG_OMAP3_SDRC_AC_TIMING is not set +# CONFIG_OMAP5_ERRATA_801819 is not set +# CONFIG_ARCH_SIRF is not set +# CONFIG_ARCH_QCOM is not set +# CONFIG_ARCH_REALVIEW is not set +CONFIG_ARCH_ROCKCHIP=y +# CONFIG_ARCH_S5PV210 is not set +# CONFIG_ARCH_RENESAS is not set +CONFIG_ARCH_SOCFPGA=y +# CONFIG_SOCFPGA_SUSPEND is not set +# CONFIG_PLAT_SPEAR is not set +# CONFIG_ARCH_STI is not set +# CONFIG_ARCH_STM32 is not set +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN4I=y +CONFIG_MACH_SUN5I=y +CONFIG_MACH_SUN6I=y +CONFIG_MACH_SUN7I=y +CONFIG_MACH_SUN8I=y +CONFIG_MACH_SUN9I=y +CONFIG_ARCH_SUNXI_MC_SMP=y +# CONFIG_ARCH_TANGO is not set +CONFIG_ARCH_TEGRA=y +# CONFIG_ARCH_UNIPHIER is not set +# CONFIG_ARCH_U8500 is not set +CONFIG_ARCH_VEXPRESS=y +CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y +# CONFIG_ARCH_VEXPRESS_DCSCB is not set +# CONFIG_ARCH_VEXPRESS_SPC is not set +# CONFIG_ARCH_VEXPRESS_TC2_PM is not set +CONFIG_ARCH_VT8500=y +CONFIG_ARCH_WM8850=y +# CONFIG_ARCH_ZX is not set +# CONFIG_ARCH_ZYNQ is not set +CONFIG_PLAT_ORION=y +CONFIG_PLAT_VERSATILE=y +CONFIG_ARCH_SUPPORTS_FIRMWARE=y +CONFIG_ARCH_SUPPORTS_TRUSTED_FOUNDATIONS=y + +# +# Firmware options +# +CONFIG_TRUSTED_FOUNDATIONS=y + +# +# Processor Type +# +CONFIG_CPU_PJ4B=y +CONFIG_CPU_V7=y +CONFIG_CPU_THUMB_CAPABLE=y +CONFIG_CPU_32v6K=y +CONFIG_CPU_32v7=y +CONFIG_CPU_ABRT_EV7=y +CONFIG_CPU_PABRT_V7=y +CONFIG_CPU_CACHE_V7=y +CONFIG_CPU_CACHE_VIPT=y +CONFIG_CPU_COPY_V6=y +CONFIG_CPU_TLB_V7=y +CONFIG_CPU_HAS_ASID=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +# CONFIG_ARM_LPAE is not set +CONFIG_ARM_THUMB=y +CONFIG_ARM_THUMBEE=y +CONFIG_ARM_VIRT_EXT=y +CONFIG_SWP_EMULATE=y +# CONFIG_CPU_BIG_ENDIAN is not set +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_BPREDICT_DISABLE is not set +CONFIG_CPU_SPECTRE=y +CONFIG_HARDEN_BRANCH_PREDICTOR=y +CONFIG_KUSER_HELPERS=y +CONFIG_VDSO=y +CONFIG_OUTER_CACHE=y +CONFIG_OUTER_CACHE_SYNC=y +CONFIG_CACHE_FEROCEON_L2=y +# CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set +CONFIG_MIGHT_HAVE_CACHE_L2X0=y +CONFIG_CACHE_L2X0=y +# CONFIG_CACHE_L2X0_PMU is not set +CONFIG_PL310_ERRATA_588369=y +CONFIG_PL310_ERRATA_727915=y +CONFIG_PL310_ERRATA_753970=y +CONFIG_PL310_ERRATA_769419=y +CONFIG_ARM_L1_CACHE_SHIFT_6=y +CONFIG_ARM_L1_CACHE_SHIFT=6 +CONFIG_ARM_DMA_MEM_BUFFERABLE=y +CONFIG_ARM_HEAVY_MB=y +CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y +CONFIG_DEBUG_ALIGN_RODATA=y +CONFIG_IWMMXT=y +CONFIG_PJ4B_ERRATA_4742=y +CONFIG_ARM_ERRATA_430973=y +CONFIG_ARM_ERRATA_643719=y +CONFIG_ARM_ERRATA_720789=y +CONFIG_ARM_ERRATA_754322=y +CONFIG_ARM_ERRATA_754327=y +CONFIG_ARM_ERRATA_764369=y +CONFIG_ARM_ERRATA_775420=y +CONFIG_ARM_ERRATA_798181=y +CONFIG_ARM_ERRATA_773022=y +# CONFIG_ARM_ERRATA_818325_852422 is not set +# CONFIG_ARM_ERRATA_821420 is not set +# CONFIG_ARM_ERRATA_825619 is not set +# CONFIG_ARM_ERRATA_852421 is not set +# CONFIG_ARM_ERRATA_852423 is not set + +# +# Bus support +# +CONFIG_PCI=y +CONFIG_PCI_DOMAINS=y +CONFIG_PCI_DOMAINS_GENERIC=y +CONFIG_PCI_SYSCALL=y +CONFIG_PCIEPORTBUS=y +CONFIG_PCIEAER=y +CONFIG_PCIEAER_INJECT=m +# CONFIG_PCIE_ECRC is not set +CONFIG_PCIEASPM=y +# CONFIG_PCIEASPM_DEBUG is not set +CONFIG_PCIEASPM_DEFAULT=y +# CONFIG_PCIEASPM_POWERSAVE is not set +# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set +# CONFIG_PCIEASPM_PERFORMANCE is not set +CONFIG_PCIE_PME=y +CONFIG_PCIE_DPC=y +CONFIG_PCIE_PTM=y +CONFIG_PCI_MSI=y +CONFIG_PCI_MSI_IRQ_DOMAIN=y +CONFIG_PCI_QUIRKS=y +# CONFIG_PCI_DEBUG is not set +CONFIG_PCI_STUB=m +CONFIG_PCI_ECAM=y +# CONFIG_PCI_IOV is not set +# CONFIG_PCI_PRI is not set +# CONFIG_PCI_PASID is not set +CONFIG_PCI_LABEL=y +# CONFIG_HOTPLUG_PCI is not set + +# +# PCI controller drivers +# +CONFIG_PCI_MVEBU=y + +# +# Cadence PCIe controllers support +# +# CONFIG_PCIE_CADENCE_HOST is not set +# CONFIG_PCI_FTPCI100 is not set +CONFIG_PCI_TEGRA=y +CONFIG_PCI_HOST_COMMON=y +CONFIG_PCI_HOST_GENERIC=y +# CONFIG_PCIE_XILINX is not set +# CONFIG_PCI_V3_SEMI is not set +# CONFIG_PCIE_ALTERA is not set +CONFIG_PCIE_ROCKCHIP=y +CONFIG_PCIE_ROCKCHIP_HOST=m + +# +# DesignWare PCI Core Support +# +CONFIG_PCIE_DW=y +CONFIG_PCIE_DW_HOST=y +CONFIG_PCI_DRA7XX=y +CONFIG_PCI_DRA7XX_HOST=y +# CONFIG_PCIE_DW_PLAT_HOST is not set +CONFIG_PCI_IMX6=y +# CONFIG_PCI_LAYERSCAPE is not set +# CONFIG_PCIE_ARMADA_8K is not set + +# +# PCI Endpoint +# +# CONFIG_PCI_ENDPOINT is not set + +# +# PCI switch controller drivers +# +# CONFIG_PCI_SW_SWITCHTEC is not set +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +CONFIG_HAVE_SMP=y +CONFIG_SMP=y +CONFIG_SMP_ON_UP=y +CONFIG_ARM_CPU_TOPOLOGY=y +# CONFIG_SCHED_MC is not set +# CONFIG_SCHED_SMT is not set +CONFIG_HAVE_ARM_SCU=y +CONFIG_HAVE_ARM_ARCH_TIMER=y +CONFIG_HAVE_ARM_TWD=y +CONFIG_MCPM=y +# CONFIG_BIG_LITTLE is not set +CONFIG_VMSPLIT_3G=y +# CONFIG_VMSPLIT_3G_OPT is not set +# CONFIG_VMSPLIT_2G is not set +# CONFIG_VMSPLIT_1G is not set +CONFIG_PAGE_OFFSET=0xC0000000 +CONFIG_NR_CPUS=8 +CONFIG_HOTPLUG_CPU=y +CONFIG_ARM_PSCI=y +CONFIG_ARCH_NR_GPIO=2048 +CONFIG_HZ_FIXED=0 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_200 is not set +CONFIG_HZ_250=y +# CONFIG_HZ_300 is not set +# CONFIG_HZ_500 is not set +# CONFIG_HZ_1000 is not set +CONFIG_HZ=250 +CONFIG_SCHED_HRTICK=y +# CONFIG_THUMB2_KERNEL is not set +CONFIG_ARM_PATCH_IDIV=y +CONFIG_AEABI=y +# CONFIG_OABI_COMPAT is not set +CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y +CONFIG_HAVE_ARCH_PFN_VALID=y +CONFIG_HIGHMEM=y +CONFIG_HIGHPTE=y +CONFIG_CPU_SW_DOMAIN_PAN=y +CONFIG_HW_PERF_EVENTS=y +CONFIG_ARCH_WANT_GENERAL_HUGETLB=y +# CONFIG_ARM_MODULE_PLTS is not set +CONFIG_FORCE_MAX_ZONEORDER=12 +CONFIG_ALIGNMENT_TRAP=y +# CONFIG_UACCESS_WITH_MEMCPY is not set +CONFIG_SECCOMP=y +CONFIG_PARAVIRT=y +# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set +CONFIG_XEN_DOM0=y +CONFIG_XEN=y + +# +# Boot options +# +CONFIG_USE_OF=y +CONFIG_ATAGS=y +# CONFIG_DEPRECATED_PARAM_STRUCT is not set +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_ARM_APPENDED_DTB=y +CONFIG_ARM_ATAG_DTB_COMPAT=y +CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y +# CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set +CONFIG_CMDLINE="" +CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y +# CONFIG_CRASH_DUMP is not set +CONFIG_AUTO_ZRELADDR=y +CONFIG_EFI_STUB=y +CONFIG_EFI=y +CONFIG_DMI=y + +# +# CPU Power Management +# + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_GOV_ATTR_SET=y +CONFIG_CPU_FREQ_GOV_COMMON=y +CONFIG_CPU_FREQ_STAT=y +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=m +CONFIG_CPU_FREQ_GOV_USERSPACE=m +CONFIG_CPU_FREQ_GOV_ONDEMAND=m +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m +CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y + +# +# CPU frequency scaling drivers +# +CONFIG_CPUFREQ_DT=m +CONFIG_CPUFREQ_DT_PLATDEV=y +CONFIG_ARM_ARMADA_37XX_CPUFREQ=m +# CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set +CONFIG_ARM_HIGHBANK_CPUFREQ=m +CONFIG_ARM_IMX6Q_CPUFREQ=m +CONFIG_ARM_OMAP2PLUS_CPUFREQ=y +CONFIG_ARM_SCMI_CPUFREQ=m +CONFIG_ARM_TEGRA20_CPUFREQ=y +CONFIG_ARM_TEGRA124_CPUFREQ=m +# CONFIG_ARM_TI_CPUFREQ is not set +# CONFIG_QORIQ_CPUFREQ is not set + +# +# CPU Idle +# +# CONFIG_CPU_IDLE is not set +CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_VFP=y +CONFIG_VFPv3=y +CONFIG_NEON=y +# CONFIG_KERNEL_MODE_NEON is not set + +# +# Power management options +# +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +# CONFIG_SUSPEND_SKIP_SYNC is not set +CONFIG_HIBERNATE_CALLBACKS=y +CONFIG_HIBERNATION=y +CONFIG_PM_STD_PARTITION="" +CONFIG_PM_SLEEP=y +CONFIG_PM_SLEEP_SMP=y +# CONFIG_PM_AUTOSLEEP is not set +# CONFIG_PM_WAKELOCKS is not set +CONFIG_PM=y +CONFIG_PM_DEBUG=y +CONFIG_PM_ADVANCED_DEBUG=y +# CONFIG_PM_TEST_SUSPEND is not set +CONFIG_PM_SLEEP_DEBUG=y +CONFIG_APM_EMULATION=y +CONFIG_PM_CLK=y +CONFIG_PM_GENERIC_DOMAINS=y +# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set +CONFIG_PM_GENERIC_DOMAINS_SLEEP=y +CONFIG_PM_GENERIC_DOMAINS_OF=y +CONFIG_CPU_PM=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_ARM_CPU_SUSPEND=y +CONFIG_ARCH_HIBERNATION_POSSIBLE=y + +# +# Firmware Drivers +# +CONFIG_ARM_PSCI_FW=y +CONFIG_ARM_SCMI_PROTOCOL=y +CONFIG_ARM_SCMI_POWER_DOMAIN=m +# CONFIG_ARM_SCPI_PROTOCOL is not set +# CONFIG_FIRMWARE_MEMMAP is not set +CONFIG_DMIID=y +CONFIG_DMI_SYSFS=y +CONFIG_RASPBERRYPI_FIRMWARE=y +CONFIG_HAVE_ARM_SMCCC=y +# CONFIG_GOOGLE_FIRMWARE is not set + +# +# EFI (Extensible Firmware Interface) Support +# +CONFIG_EFI_VARS=m +CONFIG_EFI_ESRT=y +CONFIG_EFI_PARAMS_FROM_FDT=y +CONFIG_EFI_RUNTIME_WRAPPERS=y +CONFIG_EFI_ARMSTUB=y +CONFIG_EFI_ARMSTUB_DTB_LOADER=y +# CONFIG_EFI_BOOTLOADER_CONTROL is not set +# CONFIG_EFI_CAPSULE_LOADER is not set +# CONFIG_EFI_TEST is not set +CONFIG_RESET_ATTACK_MITIGATION=y + +# +# Tegra firmware driver +# +# CONFIG_TEGRA_IVC is not set +# CONFIG_ARM_CRYPTO is not set +# CONFIG_VIRTUALIZATION is not set + +# +# General architecture-dependent options +# +CONFIG_CRASH_CORE=y +CONFIG_KEXEC_CORE=y +CONFIG_OPROFILE=m +CONFIG_HAVE_OPROFILE=y +CONFIG_KPROBES=y +CONFIG_JUMP_LABEL=y +# CONFIG_STATIC_KEYS_SELFTEST is not set +CONFIG_OPTPROBES=y +CONFIG_UPROBES=y +CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_ARCH_USE_BUILTIN_BSWAP=y +CONFIG_KRETPROBES=y +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_OPTPROBES=y +CONFIG_HAVE_NMI=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_DMA_CONTIGUOUS=y +CONFIG_GENERIC_SMP_IDLE_THREAD=y +CONFIG_GENERIC_IDLE_POLL_SETUP=y +CONFIG_ARCH_HAS_FORTIFY_SOURCE=y +CONFIG_ARCH_HAS_SET_MEMORY=y +CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_RSEQ=y +CONFIG_HAVE_CLK=y +CONFIG_HAVE_HW_BREAKPOINT=y +CONFIG_HAVE_PERF_REGS=y +CONFIG_HAVE_PERF_USER_STACK_DUMP=y +CONFIG_HAVE_ARCH_JUMP_LABEL=y +CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y +CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_SECCOMP_FILTER=y +CONFIG_HAVE_STACKPROTECTOR=y +CONFIG_CC_HAS_STACKPROTECTOR_NONE=y +CONFIG_STACKPROTECTOR=y +CONFIG_STACKPROTECTOR_STRONG=y +CONFIG_HAVE_CONTEXT_TRACKING=y +CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y +CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_MOD_ARCH_SPECIFIC=y +CONFIG_MODULES_USE_ELF_REL=y +CONFIG_ARCH_HAS_ELF_RANDOMIZE=y +CONFIG_HAVE_ARCH_MMAP_RND_BITS=y +CONFIG_HAVE_EXIT_THREAD=y +CONFIG_ARCH_MMAP_RND_BITS=8 +CONFIG_CLONE_BACKWARDS=y +CONFIG_OLD_SIGSUSPEND3=y +CONFIG_OLD_SIGACTION=y +CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y +CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y +CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y +CONFIG_STRICT_KERNEL_RWX=y +CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y +CONFIG_STRICT_MODULE_RWX=y +CONFIG_ARCH_HAS_PHYS_TO_DMA=y +CONFIG_REFCOUNT_FULL=y + +# +# GCOV-based kernel profiling +# +# CONFIG_GCOV_KERNEL is not set +CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y +CONFIG_PLUGIN_HOSTCC="" +CONFIG_HAVE_GCC_PLUGINS=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +CONFIG_MODULE_FORCE_LOAD=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_MODVERSIONS=y +# CONFIG_MODULE_SRCVERSION_ALL is not set +# CONFIG_MODULE_SIG is not set +# CONFIG_MODULE_COMPRESS is not set +# CONFIG_TRIM_UNUSED_KSYMS is not set +CONFIG_MODULES_TREE_LOOKUP=y +CONFIG_BLOCK=y +CONFIG_LBDAF=y +CONFIG_BLK_SCSI_REQUEST=y +CONFIG_BLK_DEV_BSG=y +CONFIG_BLK_DEV_BSGLIB=y +CONFIG_BLK_DEV_INTEGRITY=y +# CONFIG_BLK_DEV_ZONED is not set +CONFIG_BLK_DEV_THROTTLING=y +# CONFIG_BLK_DEV_THROTTLING_LOW is not set +# CONFIG_BLK_CMDLINE_PARSER is not set +CONFIG_BLK_WBT=y +# CONFIG_BLK_CGROUP_IOLATENCY is not set +# CONFIG_BLK_WBT_SQ is not set +CONFIG_BLK_WBT_MQ=y +CONFIG_BLK_DEBUG_FS=y +# CONFIG_BLK_SED_OPAL is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_AIX_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +# CONFIG_MAC_PARTITION is not set +CONFIG_MSDOS_PARTITION=y +# CONFIG_BSD_DISKLABEL is not set +# CONFIG_MINIX_SUBPARTITION is not set +# CONFIG_SOLARIS_X86_PARTITION is not set +# CONFIG_UNIXWARE_DISKLABEL is not set +# CONFIG_LDM_PARTITION is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +CONFIG_KARMA_PARTITION=y +CONFIG_EFI_PARTITION=y +# CONFIG_SYSV68_PARTITION is not set +# CONFIG_CMDLINE_PARTITION is not set +CONFIG_BLK_MQ_PCI=y +CONFIG_BLK_MQ_VIRTIO=y +CONFIG_BLK_MQ_RDMA=y + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +CONFIG_CFQ_GROUP_IOSCHED=y +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" +CONFIG_MQ_IOSCHED_DEADLINE=y +CONFIG_MQ_IOSCHED_KYBER=m +CONFIG_IOSCHED_BFQ=m +CONFIG_BFQ_GROUP_IOSCHED=y +CONFIG_PADATA=y +CONFIG_ASN1=y +CONFIG_INLINE_SPIN_UNLOCK_IRQ=y +CONFIG_INLINE_READ_UNLOCK=y +CONFIG_INLINE_READ_UNLOCK_IRQ=y +CONFIG_INLINE_WRITE_UNLOCK=y +CONFIG_INLINE_WRITE_UNLOCK_IRQ=y +CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y +CONFIG_MUTEX_SPIN_ON_OWNER=y +CONFIG_RWSEM_SPIN_ON_OWNER=y +CONFIG_LOCK_SPIN_ON_OWNER=y +CONFIG_FREEZER=y + +# +# Executable file formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_ELF_FDPIC is not set +CONFIG_ELFCORE=y +CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y +CONFIG_BINFMT_SCRIPT=y +# CONFIG_BINFMT_FLAT is not set +CONFIG_BINFMT_MISC=m +CONFIG_COREDUMP=y + +# +# Memory Management options +# +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_HAVE_MEMBLOCK=y +CONFIG_NO_BOOTMEM=y +CONFIG_MEMORY_ISOLATION=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_MEMORY_BALLOON=y +CONFIG_BALLOON_COMPACTION=y +CONFIG_COMPACTION=y +CONFIG_MIGRATION=y +CONFIG_BOUNCE=y +CONFIG_MMU_NOTIFIER=y +CONFIG_KSM=y +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +# CONFIG_CLEANCACHE is not set +CONFIG_FRONTSWAP=y +CONFIG_CMA=y +# CONFIG_CMA_DEBUG is not set +# CONFIG_CMA_DEBUGFS is not set +CONFIG_CMA_AREAS=7 +CONFIG_ZSWAP=y +CONFIG_ZPOOL=y +CONFIG_ZBUD=y +# CONFIG_Z3FOLD is not set +CONFIG_ZSMALLOC=m +# CONFIG_PGTABLE_MAPPING is not set +# CONFIG_ZSMALLOC_STAT is not set +CONFIG_GENERIC_EARLY_IOREMAP=y +# CONFIG_IDLE_PAGE_TRACKING is not set +CONFIG_FRAME_VECTOR=y +# CONFIG_PERCPU_STATS is not set +# CONFIG_GUP_BENCHMARK is not set +CONFIG_NET=y +CONFIG_NET_INGRESS=y +CONFIG_NET_EGRESS=y + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_PACKET_DIAG=m +CONFIG_UNIX=y +CONFIG_UNIX_DIAG=m +# CONFIG_TLS is not set +CONFIG_XFRM=y +CONFIG_XFRM_ALGO=m +CONFIG_XFRM_USER=m +CONFIG_XFRM_INTERFACE=m +CONFIG_XFRM_SUB_POLICY=y +CONFIG_XFRM_MIGRATE=y +# CONFIG_XFRM_STATISTICS is not set +CONFIG_XFRM_IPCOMP=m +CONFIG_NET_KEY=m +CONFIG_NET_KEY_MIGRATE=y +# CONFIG_SMC is not set +# CONFIG_XDP_SOCKETS is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_IP_FIB_TRIE_STATS=y +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_ROUTE_MULTIPATH=y +CONFIG_IP_ROUTE_VERBOSE=y +CONFIG_IP_ROUTE_CLASSID=y +# CONFIG_IP_PNP is not set +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE_DEMUX=m +CONFIG_NET_IP_TUNNEL=m +CONFIG_NET_IPGRE=m +CONFIG_NET_IPGRE_BROADCAST=y +CONFIG_IP_MROUTE_COMMON=y +CONFIG_IP_MROUTE=y +CONFIG_IP_MROUTE_MULTIPLE_TABLES=y +CONFIG_IP_PIMSM_V1=y +CONFIG_IP_PIMSM_V2=y +CONFIG_SYN_COOKIES=y +CONFIG_NET_IPVTI=m +CONFIG_NET_UDP_TUNNEL=m +CONFIG_NET_FOU=m +CONFIG_NET_FOU_IP_TUNNELS=y +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +# CONFIG_INET_ESP_OFFLOAD is not set +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=m +CONFIG_INET_XFRM_MODE_TUNNEL=m +CONFIG_INET_XFRM_MODE_BEET=m +CONFIG_INET_DIAG=m +CONFIG_INET_TCP_DIAG=m +CONFIG_INET_UDP_DIAG=m +# CONFIG_INET_RAW_DIAG is not set +CONFIG_INET_DIAG_DESTROY=y +CONFIG_TCP_CONG_ADVANCED=y +CONFIG_TCP_CONG_BIC=m +CONFIG_TCP_CONG_CUBIC=y +CONFIG_TCP_CONG_WESTWOOD=m +CONFIG_TCP_CONG_HTCP=m +CONFIG_TCP_CONG_HSTCP=m +CONFIG_TCP_CONG_HYBLA=m +CONFIG_TCP_CONG_VEGAS=m +CONFIG_TCP_CONG_NV=m +CONFIG_TCP_CONG_SCALABLE=m +CONFIG_TCP_CONG_LP=m +CONFIG_TCP_CONG_VENO=m +CONFIG_TCP_CONG_YEAH=m +CONFIG_TCP_CONG_ILLINOIS=m +CONFIG_TCP_CONG_DCTCP=m +CONFIG_TCP_CONG_CDG=m +CONFIG_TCP_CONG_BBR=m +CONFIG_DEFAULT_CUBIC=y +# CONFIG_DEFAULT_RENO is not set +CONFIG_DEFAULT_TCP_CONG="cubic" +CONFIG_TCP_MD5SIG=y +CONFIG_IPV6=y +CONFIG_IPV6_ROUTER_PREF=y +CONFIG_IPV6_ROUTE_INFO=y +CONFIG_IPV6_OPTIMISTIC_DAD=y +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +# CONFIG_INET6_ESP_OFFLOAD is not set +CONFIG_INET6_IPCOMP=m +CONFIG_IPV6_MIP6=y +CONFIG_IPV6_ILA=m +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=m +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m +CONFIG_IPV6_VTI=m +CONFIG_IPV6_SIT=m +CONFIG_IPV6_SIT_6RD=y +CONFIG_IPV6_NDISC_NODETYPE=y +CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_GRE=m +CONFIG_IPV6_FOU=m +CONFIG_IPV6_FOU_TUNNEL=m +CONFIG_IPV6_MULTIPLE_TABLES=y +CONFIG_IPV6_SUBTREES=y +CONFIG_IPV6_MROUTE=y +CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y +CONFIG_IPV6_PIMSM_V2=y +# CONFIG_IPV6_SEG6_LWTUNNEL is not set +# CONFIG_IPV6_SEG6_HMAC is not set +# CONFIG_NETLABEL is not set +CONFIG_NETWORK_SECMARK=y +CONFIG_NET_PTP_CLASSIFY=y +# CONFIG_NETWORK_PHY_TIMESTAMPING is not set +CONFIG_NETFILTER=y +CONFIG_NETFILTER_ADVANCED=y +CONFIG_BRIDGE_NETFILTER=m + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_INGRESS=y +CONFIG_NETFILTER_NETLINK=m +CONFIG_NETFILTER_FAMILY_BRIDGE=y +CONFIG_NETFILTER_FAMILY_ARP=y +CONFIG_NETFILTER_NETLINK_ACCT=m +CONFIG_NETFILTER_NETLINK_QUEUE=m +CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NETFILTER_NETLINK_OSF=m +CONFIG_NF_CONNTRACK=m +CONFIG_NF_LOG_COMMON=m +# CONFIG_NF_LOG_NETDEV is not set +CONFIG_NETFILTER_CONNCOUNT=m +CONFIG_NF_CONNTRACK_MARK=y +CONFIG_NF_CONNTRACK_SECMARK=y +CONFIG_NF_CONNTRACK_ZONES=y +CONFIG_NF_CONNTRACK_PROCFS=y +CONFIG_NF_CONNTRACK_EVENTS=y +CONFIG_NF_CONNTRACK_TIMEOUT=y +CONFIG_NF_CONNTRACK_TIMESTAMP=y +CONFIG_NF_CONNTRACK_LABELS=y +CONFIG_NF_CT_PROTO_DCCP=y +CONFIG_NF_CT_PROTO_GRE=m +CONFIG_NF_CT_PROTO_SCTP=y +CONFIG_NF_CT_PROTO_UDPLITE=y +CONFIG_NF_CONNTRACK_AMANDA=m +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_H323=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_BROADCAST=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_SNMP=m +CONFIG_NF_CONNTRACK_PPTP=m +CONFIG_NF_CONNTRACK_SANE=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CONNTRACK_TFTP=m +CONFIG_NF_CT_NETLINK=m +CONFIG_NF_CT_NETLINK_TIMEOUT=m +CONFIG_NF_CT_NETLINK_HELPER=m +CONFIG_NETFILTER_NETLINK_GLUE_CT=y +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_NF_NAT_PROTO_DCCP=y +CONFIG_NF_NAT_PROTO_UDPLITE=y +CONFIG_NF_NAT_PROTO_SCTP=y +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_SIP=m +CONFIG_NF_NAT_TFTP=m +CONFIG_NF_NAT_REDIRECT=y +CONFIG_NETFILTER_SYNPROXY=m +CONFIG_NF_TABLES=m +CONFIG_NF_TABLES_SET=m +# CONFIG_NF_TABLES_INET is not set +# CONFIG_NF_TABLES_NETDEV is not set +CONFIG_NFT_NUMGEN=m +CONFIG_NFT_CT=m +CONFIG_NFT_FLOW_OFFLOAD=m +CONFIG_NFT_COUNTER=m +CONFIG_NFT_CONNLIMIT=m +CONFIG_NFT_LOG=m +CONFIG_NFT_LIMIT=m +CONFIG_NFT_MASQ=m +CONFIG_NFT_REDIR=m +CONFIG_NFT_NAT=m +CONFIG_NFT_TUNNEL=m +# CONFIG_NFT_OBJREF is not set +CONFIG_NFT_QUEUE=m +CONFIG_NFT_QUOTA=m +CONFIG_NFT_REJECT=m +CONFIG_NFT_COMPAT=m +CONFIG_NFT_HASH=m +CONFIG_NFT_SOCKET=m +CONFIG_NFT_OSF=m +CONFIG_NFT_TPROXY=m +CONFIG_NF_FLOW_TABLE_INET=m +CONFIG_NF_FLOW_TABLE=m +CONFIG_NETFILTER_XTABLES=m + +# +# Xtables combined modules +# +CONFIG_NETFILTER_XT_MARK=m +CONFIG_NETFILTER_XT_CONNMARK=m +CONFIG_NETFILTER_XT_SET=m + +# +# Xtables targets +# +CONFIG_NETFILTER_XT_TARGET_AUDIT=m +CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m +CONFIG_NETFILTER_XT_TARGET_CT=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m +CONFIG_NETFILTER_XT_TARGET_HL=m +CONFIG_NETFILTER_XT_TARGET_HMARK=m +CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m +CONFIG_NETFILTER_XT_TARGET_LED=m +CONFIG_NETFILTER_XT_TARGET_LOG=m +CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_NAT=m +CONFIG_NETFILTER_XT_TARGET_NETMAP=m +CONFIG_NETFILTER_XT_TARGET_NFLOG=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set +CONFIG_NETFILTER_XT_TARGET_RATEEST=m +CONFIG_NETFILTER_XT_TARGET_REDIRECT=m +CONFIG_NETFILTER_XT_TARGET_TEE=m +CONFIG_NETFILTER_XT_TARGET_TPROXY=m +CONFIG_NETFILTER_XT_TARGET_TRACE=m +CONFIG_NETFILTER_XT_TARGET_SECMARK=m +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m +CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m + +# +# Xtables matches +# +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m +CONFIG_NETFILTER_XT_MATCH_BPF=m +CONFIG_NETFILTER_XT_MATCH_CGROUP=m +CONFIG_NETFILTER_XT_MATCH_CLUSTER=m +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_NETFILTER_XT_MATCH_CPU=m +CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m +CONFIG_NETFILTER_XT_MATCH_DSCP=m +CONFIG_NETFILTER_XT_MATCH_ECN=m +CONFIG_NETFILTER_XT_MATCH_ESP=m +CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m +CONFIG_NETFILTER_XT_MATCH_HELPER=m +CONFIG_NETFILTER_XT_MATCH_HL=m +CONFIG_NETFILTER_XT_MATCH_IPCOMP=m +CONFIG_NETFILTER_XT_MATCH_IPRANGE=m +CONFIG_NETFILTER_XT_MATCH_IPVS=m +CONFIG_NETFILTER_XT_MATCH_L2TP=m +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +CONFIG_NETFILTER_XT_MATCH_NFACCT=m +CONFIG_NETFILTER_XT_MATCH_OSF=m +CONFIG_NETFILTER_XT_MATCH_OWNER=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m +CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_QUOTA=m +CONFIG_NETFILTER_XT_MATCH_RATEEST=m +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_RECENT=m +CONFIG_NETFILTER_XT_MATCH_SCTP=m +CONFIG_NETFILTER_XT_MATCH_SOCKET=m +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STATISTIC=m +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m +CONFIG_NETFILTER_XT_MATCH_TIME=m +CONFIG_NETFILTER_XT_MATCH_U32=m +CONFIG_IP_SET=m +CONFIG_IP_SET_MAX=256 +CONFIG_IP_SET_BITMAP_IP=m +CONFIG_IP_SET_BITMAP_IPMAC=m +CONFIG_IP_SET_BITMAP_PORT=m +CONFIG_IP_SET_HASH_IP=m +CONFIG_IP_SET_HASH_IPMARK=m +CONFIG_IP_SET_HASH_IPPORT=m +CONFIG_IP_SET_HASH_IPPORTIP=m +CONFIG_IP_SET_HASH_IPPORTNET=m +# CONFIG_IP_SET_HASH_IPMAC is not set +CONFIG_IP_SET_HASH_MAC=m +CONFIG_IP_SET_HASH_NETPORTNET=m +CONFIG_IP_SET_HASH_NET=m +CONFIG_IP_SET_HASH_NETNET=m +CONFIG_IP_SET_HASH_NETPORT=m +CONFIG_IP_SET_HASH_NETIFACE=m +CONFIG_IP_SET_LIST_SET=m +CONFIG_IP_VS=m +CONFIG_IP_VS_IPV6=y +# CONFIG_IP_VS_DEBUG is not set +CONFIG_IP_VS_TAB_BITS=12 + +# +# IPVS transport protocol load balancing support +# +CONFIG_IP_VS_PROTO_TCP=y +CONFIG_IP_VS_PROTO_UDP=y +CONFIG_IP_VS_PROTO_AH_ESP=y +CONFIG_IP_VS_PROTO_ESP=y +CONFIG_IP_VS_PROTO_AH=y +CONFIG_IP_VS_PROTO_SCTP=y + +# +# IPVS scheduler +# +CONFIG_IP_VS_RR=m +CONFIG_IP_VS_WRR=m +CONFIG_IP_VS_LC=m +CONFIG_IP_VS_WLC=m +CONFIG_IP_VS_FO=m +CONFIG_IP_VS_OVF=m +CONFIG_IP_VS_LBLC=m +CONFIG_IP_VS_LBLCR=m +CONFIG_IP_VS_DH=m +CONFIG_IP_VS_SH=m +CONFIG_IP_VS_MH=m +CONFIG_IP_VS_SED=m +CONFIG_IP_VS_NQ=m + +# +# IPVS SH scheduler +# +CONFIG_IP_VS_SH_TAB_BITS=8 + +# +# IPVS MH scheduler +# +CONFIG_IP_VS_MH_TAB_INDEX=12 + +# +# IPVS application helper +# +CONFIG_IP_VS_FTP=m +CONFIG_IP_VS_NFCT=y +CONFIG_IP_VS_PE_SIP=m + +# +# IP: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_SOCKET_IPV4=m +CONFIG_NF_TPROXY_IPV4=m +# CONFIG_NF_TABLES_IPV4 is not set +# CONFIG_NF_TABLES_ARP is not set +CONFIG_NF_FLOW_TABLE_IPV4=m +CONFIG_NF_DUP_IPV4=m +CONFIG_NF_LOG_ARP=m +CONFIG_NF_LOG_IPV4=m +CONFIG_NF_REJECT_IPV4=m +CONFIG_NF_NAT_IPV4=m +CONFIG_NF_NAT_MASQUERADE_IPV4=y +CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NF_NAT_PROTO_GRE=m +CONFIG_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_RPFILTER=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_SYNPROXY=m +CONFIG_IP_NF_NAT=m +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_SECURITY=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m + +# +# IPv6: Netfilter Configuration +# +CONFIG_NF_SOCKET_IPV6=m +CONFIG_NF_TPROXY_IPV6=m +# CONFIG_NF_TABLES_IPV6 is not set +CONFIG_NF_FLOW_TABLE_IPV6=m +CONFIG_NF_DUP_IPV6=m +CONFIG_NF_REJECT_IPV6=m +CONFIG_NF_LOG_IPV6=m +CONFIG_NF_NAT_IPV6=m +CONFIG_NF_NAT_MASQUERADE_IPV6=y +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_MH=m +CONFIG_IP6_NF_MATCH_RPFILTER=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_MATCH_SRH=m +CONFIG_IP6_NF_TARGET_HL=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_TARGET_SYNPROXY=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_RAW=m +CONFIG_IP6_NF_SECURITY=m +CONFIG_IP6_NF_NAT=m +CONFIG_IP6_NF_TARGET_MASQUERADE=m +CONFIG_IP6_NF_TARGET_NPT=m +CONFIG_NF_DEFRAG_IPV6=m +# CONFIG_NF_TABLES_BRIDGE is not set +CONFIG_BRIDGE_NF_EBTABLES=m +CONFIG_BRIDGE_EBT_BROUTE=m +CONFIG_BRIDGE_EBT_T_FILTER=m +CONFIG_BRIDGE_EBT_T_NAT=m +CONFIG_BRIDGE_EBT_802_3=m +CONFIG_BRIDGE_EBT_AMONG=m +CONFIG_BRIDGE_EBT_ARP=m +CONFIG_BRIDGE_EBT_IP=m +CONFIG_BRIDGE_EBT_IP6=m +CONFIG_BRIDGE_EBT_LIMIT=m +CONFIG_BRIDGE_EBT_MARK=m +CONFIG_BRIDGE_EBT_PKTTYPE=m +CONFIG_BRIDGE_EBT_STP=m +CONFIG_BRIDGE_EBT_VLAN=m +CONFIG_BRIDGE_EBT_ARPREPLY=m +CONFIG_BRIDGE_EBT_DNAT=m +CONFIG_BRIDGE_EBT_MARK_T=m +CONFIG_BRIDGE_EBT_REDIRECT=m +CONFIG_BRIDGE_EBT_SNAT=m +CONFIG_BRIDGE_EBT_LOG=m +CONFIG_BRIDGE_EBT_NFLOG=m +# CONFIG_BPFILTER is not set +CONFIG_IP_DCCP=m +CONFIG_INET_DCCP_DIAG=m + +# +# DCCP CCIDs Configuration +# +# CONFIG_IP_DCCP_CCID2_DEBUG is not set +CONFIG_IP_DCCP_CCID3=y +# CONFIG_IP_DCCP_CCID3_DEBUG is not set +CONFIG_IP_DCCP_TFRC_LIB=y + +# +# DCCP Kernel Hacking +# +# CONFIG_IP_DCCP_DEBUG is not set +CONFIG_IP_SCTP=m +# CONFIG_SCTP_DBG_OBJCNT is not set +CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y +# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set +# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set +CONFIG_SCTP_COOKIE_HMAC_MD5=y +CONFIG_SCTP_COOKIE_HMAC_SHA1=y +CONFIG_INET_SCTP_DIAG=m +CONFIG_RDS=m +CONFIG_RDS_RDMA=m +CONFIG_RDS_TCP=m +# CONFIG_RDS_DEBUG is not set +CONFIG_TIPC=m +CONFIG_TIPC_MEDIA_IB=y +CONFIG_TIPC_MEDIA_UDP=y +CONFIG_TIPC_DIAG=m +CONFIG_ATM=m +CONFIG_ATM_CLIP=m +# CONFIG_ATM_CLIP_NO_ICMP is not set +CONFIG_ATM_LANE=m +CONFIG_ATM_MPOA=m +CONFIG_ATM_BR2684=m +# CONFIG_ATM_BR2684_IPFILTER is not set +CONFIG_L2TP=m +CONFIG_L2TP_DEBUGFS=m +CONFIG_L2TP_V3=y +CONFIG_L2TP_IP=m +CONFIG_L2TP_ETH=m +CONFIG_STP=m +CONFIG_GARP=m +CONFIG_MRP=m +CONFIG_BRIDGE=m +CONFIG_BRIDGE_IGMP_SNOOPING=y +CONFIG_BRIDGE_VLAN_FILTERING=y +CONFIG_HAVE_NET_DSA=y +CONFIG_NET_DSA=m +CONFIG_NET_DSA_LEGACY=y +CONFIG_NET_DSA_TAG_BRCM=y +CONFIG_NET_DSA_TAG_BRCM_PREPEND=y +CONFIG_NET_DSA_TAG_DSA=y +CONFIG_NET_DSA_TAG_EDSA=y +CONFIG_NET_DSA_TAG_TRAILER=y +CONFIG_VLAN_8021Q=m +CONFIG_VLAN_8021Q_GVRP=y +CONFIG_VLAN_8021Q_MVRP=y +# CONFIG_DECNET is not set +CONFIG_LLC=m +CONFIG_LLC2=m +CONFIG_ATALK=m +CONFIG_DEV_APPLETALK=m +CONFIG_IPDDP=m +CONFIG_IPDDP_ENCAP=y +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +CONFIG_PHONET=m +CONFIG_6LOWPAN=m +# CONFIG_6LOWPAN_DEBUGFS is not set +CONFIG_6LOWPAN_NHC=m +CONFIG_6LOWPAN_NHC_DEST=m +CONFIG_6LOWPAN_NHC_FRAGMENT=m +CONFIG_6LOWPAN_NHC_HOP=m +CONFIG_6LOWPAN_NHC_IPV6=m +CONFIG_6LOWPAN_NHC_MOBILITY=m +CONFIG_6LOWPAN_NHC_ROUTING=m +CONFIG_6LOWPAN_NHC_UDP=m +CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m +CONFIG_6LOWPAN_GHC_UDP=m +CONFIG_6LOWPAN_GHC_ICMPV6=m +CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m +CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m +CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m +CONFIG_IEEE802154=m +# CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set +CONFIG_IEEE802154_SOCKET=m +CONFIG_IEEE802154_6LOWPAN=m +CONFIG_MAC802154=m +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +CONFIG_NET_SCH_CBQ=m +CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_HFSC=m +CONFIG_NET_SCH_ATM=m +CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_MULTIQ=m +CONFIG_NET_SCH_RED=m +CONFIG_NET_SCH_SFB=m +CONFIG_NET_SCH_SFQ=m +CONFIG_NET_SCH_TEQL=m +CONFIG_NET_SCH_TBF=m +CONFIG_NET_SCH_CBS=m +CONFIG_NET_SCH_ETF=m +CONFIG_NET_SCH_GRED=m +CONFIG_NET_SCH_DSMARK=m +CONFIG_NET_SCH_NETEM=m +CONFIG_NET_SCH_DRR=m +CONFIG_NET_SCH_MQPRIO=m +CONFIG_NET_SCH_SKBPRIO=m +CONFIG_NET_SCH_CHOKE=m +CONFIG_NET_SCH_QFQ=m +CONFIG_NET_SCH_CODEL=m +CONFIG_NET_SCH_FQ_CODEL=m +CONFIG_NET_SCH_CAKE=m +CONFIG_NET_SCH_FQ=m +CONFIG_NET_SCH_HHF=m +CONFIG_NET_SCH_PIE=m +CONFIG_NET_SCH_INGRESS=m +CONFIG_NET_SCH_PLUG=m +# CONFIG_NET_SCH_DEFAULT is not set + +# +# Classification +# +CONFIG_NET_CLS=y +CONFIG_NET_CLS_BASIC=m +CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_CLS_ROUTE4=m +CONFIG_NET_CLS_FW=m +CONFIG_NET_CLS_U32=m +CONFIG_CLS_U32_PERF=y +CONFIG_CLS_U32_MARK=y +CONFIG_NET_CLS_RSVP=m +CONFIG_NET_CLS_RSVP6=m +CONFIG_NET_CLS_FLOW=m +CONFIG_NET_CLS_CGROUP=m +CONFIG_NET_CLS_BPF=m +CONFIG_NET_CLS_FLOWER=m +CONFIG_NET_CLS_MATCHALL=m +CONFIG_NET_EMATCH=y +CONFIG_NET_EMATCH_STACK=32 +CONFIG_NET_EMATCH_CMP=m +CONFIG_NET_EMATCH_NBYTE=m +CONFIG_NET_EMATCH_U32=m +CONFIG_NET_EMATCH_META=m +CONFIG_NET_EMATCH_TEXT=m +CONFIG_NET_EMATCH_CANID=m +CONFIG_NET_EMATCH_IPSET=m +CONFIG_NET_EMATCH_IPT=m +CONFIG_NET_CLS_ACT=y +CONFIG_NET_ACT_POLICE=m +CONFIG_NET_ACT_GACT=m +CONFIG_GACT_PROB=y +CONFIG_NET_ACT_MIRRED=m +# CONFIG_NET_ACT_SAMPLE is not set +CONFIG_NET_ACT_IPT=m +CONFIG_NET_ACT_NAT=m +CONFIG_NET_ACT_PEDIT=m +CONFIG_NET_ACT_SIMP=m +CONFIG_NET_ACT_SKBEDIT=m +CONFIG_NET_ACT_CSUM=m +CONFIG_NET_ACT_VLAN=m +CONFIG_NET_ACT_BPF=m +CONFIG_NET_ACT_CONNMARK=m +CONFIG_NET_ACT_SKBMOD=m +CONFIG_NET_ACT_IFE=m +CONFIG_NET_ACT_TUNNEL_KEY=m +CONFIG_NET_IFE_SKBMARK=m +CONFIG_NET_IFE_SKBPRIO=m +CONFIG_NET_IFE_SKBTCINDEX=m +CONFIG_NET_CLS_IND=y +CONFIG_NET_SCH_FIFO=y +CONFIG_DCB=y +CONFIG_DNS_RESOLVER=m +CONFIG_BATMAN_ADV=m +# CONFIG_BATMAN_ADV_BATMAN_V is not set +CONFIG_BATMAN_ADV_BLA=y +CONFIG_BATMAN_ADV_DAT=y +CONFIG_BATMAN_ADV_NC=y +CONFIG_BATMAN_ADV_MCAST=y +CONFIG_BATMAN_ADV_DEBUGFS=y +# CONFIG_BATMAN_ADV_DEBUG is not set +CONFIG_OPENVSWITCH=m +CONFIG_OPENVSWITCH_GRE=m +CONFIG_OPENVSWITCH_VXLAN=m +CONFIG_OPENVSWITCH_GENEVE=m +CONFIG_VSOCKETS=m +CONFIG_VSOCKETS_DIAG=m +CONFIG_VIRTIO_VSOCKETS=m +CONFIG_VIRTIO_VSOCKETS_COMMON=m +CONFIG_NETLINK_DIAG=m +CONFIG_MPLS=y +CONFIG_NET_MPLS_GSO=y +CONFIG_MPLS_ROUTING=m +CONFIG_MPLS_IPTUNNEL=m +CONFIG_NET_NSH=m +# CONFIG_HSR is not set +CONFIG_NET_SWITCHDEV=y +CONFIG_NET_L3_MASTER_DEV=y +# CONFIG_NET_NCSI is not set +CONFIG_RPS=y +CONFIG_RFS_ACCEL=y +CONFIG_XPS=y +CONFIG_CGROUP_NET_PRIO=y +CONFIG_CGROUP_NET_CLASSID=y +CONFIG_NET_RX_BUSY_POLL=y +CONFIG_BQL=y +CONFIG_BPF_JIT=y +# CONFIG_BPF_STREAM_PARSER is not set +CONFIG_NET_FLOW_LIMIT=y + +# +# Network testing +# +CONFIG_NET_PKTGEN=m +CONFIG_NET_DROP_MONITOR=m +# CONFIG_HAMRADIO is not set +CONFIG_CAN=m +CONFIG_CAN_RAW=m +CONFIG_CAN_BCM=m +CONFIG_CAN_GW=m + +# +# CAN Device Drivers +# +CONFIG_CAN_VCAN=m +# CONFIG_CAN_VXCAN is not set +CONFIG_CAN_SLCAN=m +CONFIG_CAN_DEV=m +CONFIG_CAN_CALC_BITTIMING=y +# CONFIG_CAN_FLEXCAN is not set +# CONFIG_CAN_GRCAN is not set +CONFIG_CAN_SUN4I=m +# CONFIG_CAN_TI_HECC is not set +# CONFIG_CAN_C_CAN is not set +# CONFIG_CAN_CC770 is not set +# CONFIG_CAN_IFI_CANFD is not set +# CONFIG_CAN_M_CAN is not set +# CONFIG_CAN_PEAK_PCIEFD is not set +# CONFIG_CAN_RCAR is not set +# CONFIG_CAN_RCAR_CANFD is not set +CONFIG_CAN_SJA1000=m +CONFIG_CAN_SJA1000_ISA=m +# CONFIG_CAN_SJA1000_PLATFORM is not set +CONFIG_CAN_EMS_PCI=m +CONFIG_CAN_PEAK_PCI=m +CONFIG_CAN_PEAK_PCIEC=y +CONFIG_CAN_KVASER_PCI=m +CONFIG_CAN_PLX_PCI=m +CONFIG_CAN_SOFTING=m + +# +# CAN SPI interfaces +# +# CONFIG_CAN_HI311X is not set +# CONFIG_CAN_MCP251X is not set + +# +# CAN USB interfaces +# +CONFIG_CAN_8DEV_USB=m +CONFIG_CAN_EMS_USB=m +CONFIG_CAN_ESD_USB2=m +CONFIG_CAN_GS_USB=m +CONFIG_CAN_KVASER_USB=m +# CONFIG_CAN_MCBA_USB is not set +CONFIG_CAN_PEAK_USB=m +CONFIG_CAN_UCAN=m +# CONFIG_CAN_DEBUG_DEVICES is not set +CONFIG_BT=m +CONFIG_BT_BREDR=y +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=m +CONFIG_BT_HS=y +CONFIG_BT_LE=y +CONFIG_BT_6LOWPAN=m +# CONFIG_BT_LEDS is not set +# CONFIG_BT_SELFTEST is not set +CONFIG_BT_DEBUGFS=y + +# +# Bluetooth device drivers +# +CONFIG_BT_INTEL=m +CONFIG_BT_BCM=m +CONFIG_BT_RTL=m +CONFIG_BT_HCIBTUSB=m +# CONFIG_BT_HCIBTUSB_AUTOSUSPEND is not set +CONFIG_BT_HCIBTUSB_BCM=y +CONFIG_BT_HCIBTUSB_RTL=y +CONFIG_BT_HCIBTSDIO=m +# CONFIG_BT_HCIUART is not set +# CONFIG_BT_HCIBCM203X is not set +# CONFIG_BT_HCIBPA10X is not set +# CONFIG_BT_HCIBFUSB is not set +# CONFIG_BT_HCIVHCI is not set +CONFIG_BT_MRVL=m +CONFIG_BT_MRVL_SDIO=m +CONFIG_BT_ATH3K=m +CONFIG_BT_WILINK=m +CONFIG_BT_HCIRSI=m +CONFIG_AF_RXRPC=m +CONFIG_AF_RXRPC_IPV6=y +# CONFIG_AF_RXRPC_INJECT_LOSS is not set +# CONFIG_AF_RXRPC_DEBUG is not set +CONFIG_RXKAD=y +# CONFIG_AF_KCM is not set +CONFIG_FIB_RULES=y +CONFIG_WIRELESS=y +CONFIG_WIRELESS_EXT=y +CONFIG_WEXT_CORE=y +CONFIG_WEXT_PROC=y +CONFIG_WEXT_SPY=y +CONFIG_WEXT_PRIV=y +CONFIG_CFG80211=m +# CONFIG_NL80211_TESTMODE is not set +# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set +# CONFIG_CFG80211_CERTIFICATION_ONUS is not set +CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y +CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y +CONFIG_CFG80211_DEFAULT_PS=y +# CONFIG_CFG80211_DEBUGFS is not set +CONFIG_CFG80211_CRDA_SUPPORT=y +CONFIG_CFG80211_WEXT=y +CONFIG_CFG80211_WEXT_EXPORT=y +CONFIG_LIB80211=m +CONFIG_LIB80211_CRYPT_WEP=m +CONFIG_LIB80211_CRYPT_CCMP=m +CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set +CONFIG_MAC80211=m +CONFIG_MAC80211_HAS_RC=y +CONFIG_MAC80211_RC_MINSTREL=y +CONFIG_MAC80211_RC_MINSTREL_HT=y +# CONFIG_MAC80211_RC_MINSTREL_VHT is not set +CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y +CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" +CONFIG_MAC80211_MESH=y +CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUGFS is not set +# CONFIG_MAC80211_MESSAGE_TRACING is not set +# CONFIG_MAC80211_DEBUG_MENU is not set +CONFIG_MAC80211_STA_HASH_MAX_SIZE=0 +CONFIG_WIMAX=m +CONFIG_WIMAX_DEBUG_LEVEL=8 +CONFIG_RFKILL=m +CONFIG_RFKILL_LEDS=y +CONFIG_RFKILL_INPUT=y +# CONFIG_RFKILL_GPIO is not set +CONFIG_NET_9P=m +CONFIG_NET_9P_VIRTIO=m +# CONFIG_NET_9P_XEN is not set +CONFIG_NET_9P_RDMA=m +# CONFIG_NET_9P_DEBUG is not set +# CONFIG_CAIF is not set +CONFIG_CEPH_LIB=m +# CONFIG_CEPH_LIB_PRETTYDEBUG is not set +# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set +CONFIG_NFC=m +CONFIG_NFC_DIGITAL=m +# CONFIG_NFC_NCI is not set +# CONFIG_NFC_HCI is not set + +# +# Near Field Communication (NFC) devices +# +# CONFIG_NFC_TRF7970A is not set +CONFIG_NFC_SIM=m +CONFIG_NFC_PORT100=m +CONFIG_NFC_PN533=m +CONFIG_NFC_PN533_USB=m +# CONFIG_NFC_PN533_I2C is not set +# CONFIG_NFC_ST95HF is not set +# CONFIG_PSAMPLE is not set +CONFIG_NET_IFE=m +CONFIG_LWTUNNEL=y +CONFIG_LWTUNNEL_BPF=y +CONFIG_DST_CACHE=y +CONFIG_GRO_CELLS=y +CONFIG_NET_DEVLINK=m +CONFIG_MAY_USE_DEVLINK=m +CONFIG_PAGE_POOL=y +CONFIG_FAILOVER=m +CONFIG_HAVE_EBPF_JIT=y + +# +# Device Drivers +# +CONFIG_ARM_AMBA=y +CONFIG_TEGRA_AHB=y + +# +# Generic Driver Options +# +# CONFIG_UEVENT_HELPER is not set +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y + +# +# Firmware loader +# +CONFIG_FW_LOADER=y +CONFIG_EXTRA_FIRMWARE="" +CONFIG_FW_LOADER_USER_HELPER=y +# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set +CONFIG_WANT_DEV_COREDUMP=y +CONFIG_ALLOW_DEV_COREDUMP=y +CONFIG_DEV_COREDUMP=y +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set +# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set +CONFIG_SYS_HYPERVISOR=y +CONFIG_GENERIC_CPU_AUTOPROBE=y +CONFIG_SOC_BUS=y +CONFIG_REGMAP=y +CONFIG_REGMAP_AC97=m +CONFIG_REGMAP_I2C=y +CONFIG_REGMAP_SPI=y +CONFIG_REGMAP_W1=m +CONFIG_REGMAP_MMIO=y +CONFIG_REGMAP_IRQ=y +CONFIG_DMA_SHARED_BUFFER=y +# CONFIG_DMA_FENCE_TRACE is not set +CONFIG_DMA_CMA=y + +# +# Default contiguous memory area size: +# +CONFIG_CMA_SIZE_MBYTES=16 +CONFIG_CMA_SIZE_SEL_MBYTES=y +# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set +# CONFIG_CMA_SIZE_SEL_MIN is not set +# CONFIG_CMA_SIZE_SEL_MAX is not set +CONFIG_CMA_ALIGNMENT=8 +CONFIG_GENERIC_ARCH_TOPOLOGY=y + +# +# Bus devices +# +CONFIG_ARM_CCI=y +CONFIG_ARM_CCI400_COMMON=y +CONFIG_ARM_CCI400_PORT_CTRL=y +# CONFIG_BRCMSTB_GISB_ARB is not set +# CONFIG_IMX_WEIM is not set +CONFIG_MVEBU_MBUS=y +CONFIG_OMAP_INTERCONNECT=y +CONFIG_OMAP_OCP2SCP=m +# CONFIG_SIMPLE_PM_BUS is not set +CONFIG_SUN50I_DE2_BUS=y +CONFIG_SUNXI_RSB=y +# CONFIG_TEGRA_GMI is not set +CONFIG_TI_SYSC=y +CONFIG_VEXPRESS_CONFIG=y +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=y +CONFIG_GNSS=m +CONFIG_MTD=y +# CONFIG_MTD_TESTS is not set +# CONFIG_MTD_REDBOOT_PARTS is not set +# CONFIG_MTD_CMDLINE_PARTS is not set +# CONFIG_MTD_AFS_PARTS is not set +CONFIG_MTD_OF_PARTS=m +CONFIG_MTD_AR7_PARTS=m + +# +# Partition parsers +# + +# +# User Modules And Translation Layers +# +CONFIG_MTD_BLKDEVS=m +CONFIG_MTD_BLOCK=m +CONFIG_MTD_BLOCK_RO=m +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +CONFIG_RFD_FTL=m +CONFIG_SSFDC=m +# CONFIG_SM_FTL is not set +CONFIG_MTD_OOPS=m +CONFIG_MTD_SWAP=m +# CONFIG_MTD_PARTITIONED_MASTER is not set + +# +# RAM/ROM/Flash chip drivers +# +# CONFIG_MTD_CFI is not set +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +CONFIG_MTD_RAM=m +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +CONFIG_MTD_PHYSMAP=m +# CONFIG_MTD_PHYSMAP_COMPAT is not set +# CONFIG_MTD_PHYSMAP_OF is not set +CONFIG_MTD_INTEL_VR_NOR=m +CONFIG_MTD_PLATRAM=m + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_PMC551 is not set +CONFIG_MTD_DATAFLASH=m +# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set +# CONFIG_MTD_DATAFLASH_OTP is not set +CONFIG_MTD_M25P80=m +# CONFIG_MTD_MCHP23K256 is not set +CONFIG_MTD_SST25L=m +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOCG3 is not set +CONFIG_MTD_NAND_CORE=m +CONFIG_MTD_ONENAND=y +CONFIG_MTD_ONENAND_VERIFY_WRITE=y +# CONFIG_MTD_ONENAND_GENERIC is not set +CONFIG_MTD_ONENAND_OMAP2=m +# CONFIG_MTD_ONENAND_SAMSUNG is not set +# CONFIG_MTD_ONENAND_OTP is not set +CONFIG_MTD_ONENAND_2X_PROGRAM=y +CONFIG_MTD_NAND_ECC=y +# CONFIG_MTD_NAND_ECC_SMC is not set +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_BCH=y +CONFIG_MTD_NAND_ECC_BCH=y +CONFIG_MTD_SM_COMMON=m +# CONFIG_MTD_NAND_DENALI_PCI is not set +# CONFIG_MTD_NAND_DENALI_DT is not set +# CONFIG_MTD_NAND_GPIO is not set +CONFIG_MTD_NAND_OMAP2=m +# CONFIG_MTD_NAND_OMAP_BCH is not set +CONFIG_MTD_NAND_RICOH=m +# CONFIG_MTD_NAND_DISKONCHIP is not set +# CONFIG_MTD_NAND_DOCG4 is not set +CONFIG_MTD_NAND_CAFE=m +CONFIG_MTD_NAND_MARVELL=m +CONFIG_MTD_NAND_NANDSIM=m +CONFIG_MTD_NAND_GPMI_NAND=m +# CONFIG_MTD_NAND_BRCMNAND is not set +# CONFIG_MTD_NAND_PLATFORM is not set +CONFIG_MTD_NAND_ORION=m +CONFIG_MTD_NAND_MXC=m +CONFIG_MTD_NAND_SUNXI=m +CONFIG_MTD_NAND_TEGRA=m +CONFIG_MTD_SPI_NAND=m + +# +# LPDDR & LPDDR2 PCM memory drivers +# +CONFIG_MTD_LPDDR=m +CONFIG_MTD_QINFO_PROBE=m +# CONFIG_MTD_LPDDR2_NVM is not set +CONFIG_MTD_SPI_NOR=m +# CONFIG_MTD_MT81xx_NOR is not set +CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y +# CONFIG_SPI_CADENCE_QUADSPI is not set +# CONFIG_SPI_FSL_QUADSPI is not set +CONFIG_MTD_UBI=m +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MTD_UBI_BEB_LIMIT=20 +# CONFIG_MTD_UBI_FASTMAP is not set +# CONFIG_MTD_UBI_GLUEBI is not set +CONFIG_MTD_UBI_BLOCK=y +CONFIG_DTC=y +CONFIG_OF=y +# CONFIG_OF_UNITTEST is not set +CONFIG_OF_FLATTREE=y +CONFIG_OF_EARLY_FLATTREE=y +CONFIG_OF_KOBJ=y +CONFIG_OF_DYNAMIC=y +CONFIG_OF_ADDRESS=y +CONFIG_OF_IRQ=y +CONFIG_OF_NET=y +CONFIG_OF_MDIO=y +CONFIG_OF_RESERVED_MEM=y +CONFIG_OF_RESOLVE=y +CONFIG_OF_OVERLAY=y +CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y +CONFIG_PARPORT=m +# CONFIG_PARPORT_PC is not set +# CONFIG_PARPORT_AX88796 is not set +CONFIG_PARPORT_1284=y +CONFIG_PARPORT_NOT_PC=y +CONFIG_BLK_DEV=y +CONFIG_BLK_DEV_NULL_BLK=m +CONFIG_CDROM=m +CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m +CONFIG_ZRAM=m +# CONFIG_ZRAM_WRITEBACK is not set +# CONFIG_ZRAM_MEMORY_TRACKING is not set +# CONFIG_BLK_DEV_DAC960 is not set +# CONFIG_BLK_DEV_UMEM is not set +CONFIG_BLK_DEV_LOOP=m +CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +CONFIG_BLK_DEV_DRBD=m +# CONFIG_DRBD_FAULT_INJECTION is not set +CONFIG_BLK_DEV_NBD=m +# CONFIG_BLK_DEV_SX8 is not set +CONFIG_BLK_DEV_RAM=m +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=16384 +# CONFIG_CDROM_PKTCDVD is not set +CONFIG_ATA_OVER_ETH=m +CONFIG_XEN_BLKDEV_FRONTEND=m +CONFIG_XEN_BLKDEV_BACKEND=m +CONFIG_VIRTIO_BLK=m +# CONFIG_VIRTIO_BLK_SCSI is not set +CONFIG_BLK_DEV_RBD=m +# CONFIG_BLK_DEV_RSXX is not set + +# +# NVME Support +# +CONFIG_NVME_CORE=y +CONFIG_BLK_DEV_NVME=y +# CONFIG_NVME_MULTIPATH is not set +CONFIG_NVME_FABRICS=m +CONFIG_NVME_RDMA=m +# CONFIG_NVME_FC is not set +CONFIG_NVME_TARGET=m +# CONFIG_NVME_TARGET_LOOP is not set +CONFIG_NVME_TARGET_RDMA=m +# CONFIG_NVME_TARGET_FC is not set + +# +# Misc devices +# +CONFIG_SENSORS_LIS3LV02D=m +CONFIG_AD525X_DPOT=m +CONFIG_AD525X_DPOT_I2C=m +CONFIG_AD525X_DPOT_SPI=m +# CONFIG_DUMMY_IRQ is not set +# CONFIG_PHANTOM is not set +CONFIG_SGI_IOC4=m +CONFIG_TIFM_CORE=m +CONFIG_TIFM_7XX1=m +CONFIG_ICS932S401=m +CONFIG_ENCLOSURE_SERVICES=m +# CONFIG_HP_ILO is not set +CONFIG_APDS9802ALS=m +CONFIG_ISL29003=m +CONFIG_ISL29020=m +CONFIG_SENSORS_TSL2550=m +CONFIG_SENSORS_BH1770=m +CONFIG_SENSORS_APDS990X=m +CONFIG_HMC6352=m +CONFIG_DS1682=m +# CONFIG_USB_SWITCH_FSA9480 is not set +# CONFIG_LATTICE_ECP3_CONFIG is not set +CONFIG_SRAM=y +CONFIG_SRAM_EXEC=y +CONFIG_VEXPRESS_SYSCFG=y +# CONFIG_PCI_ENDPOINT_TEST is not set +CONFIG_MISC_RTSX=m +CONFIG_C2PORT=m + +# +# EEPROM support +# +CONFIG_EEPROM_AT24=m +CONFIG_EEPROM_AT25=m +CONFIG_EEPROM_LEGACY=m +CONFIG_EEPROM_MAX6875=m +CONFIG_EEPROM_93CX6=m +# CONFIG_EEPROM_93XX46 is not set +# CONFIG_EEPROM_IDT_89HPESX is not set +CONFIG_CB710_CORE=m +# CONFIG_CB710_DEBUG is not set +CONFIG_CB710_DEBUG_ASSUMPTIONS=y + +# +# Texas Instruments shared transport line discipline +# +CONFIG_TI_ST=m +# CONFIG_SENSORS_LIS3_SPI is not set +CONFIG_SENSORS_LIS3_I2C=m +CONFIG_ALTERA_STAPL=m + +# +# Intel MIC & related support +# + +# +# Intel MIC Bus Driver +# + +# +# SCIF Bus Driver +# + +# +# VOP Bus Driver +# + +# +# Intel MIC Host Driver +# + +# +# Intel MIC Card Driver +# + +# +# SCIF Driver +# + +# +# Intel MIC Coprocessor State Management (COSM) Drivers +# + +# +# VOP Driver +# +# CONFIG_ECHO is not set +CONFIG_MISC_RTSX_PCI=m +CONFIG_MISC_RTSX_USB=m +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set + +# +# SCSI device support +# +CONFIG_SCSI_MOD=m +CONFIG_RAID_ATTRS=m +CONFIG_SCSI=m +CONFIG_SCSI_DMA=y +CONFIG_SCSI_NETLINK=y +# CONFIG_SCSI_MQ_DEFAULT is not set +# CONFIG_SCSI_PROC_FS is not set + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=m +CONFIG_CHR_DEV_ST=m +CONFIG_CHR_DEV_OSST=m +CONFIG_BLK_DEV_SR=m +CONFIG_BLK_DEV_SR_VENDOR=y +CONFIG_CHR_DEV_SG=m +CONFIG_CHR_DEV_SCH=m +CONFIG_SCSI_ENCLOSURE=m +CONFIG_SCSI_CONSTANTS=y +CONFIG_SCSI_LOGGING=y +CONFIG_SCSI_SCAN_ASYNC=y + +# +# SCSI Transports +# +CONFIG_SCSI_SPI_ATTRS=m +CONFIG_SCSI_FC_ATTRS=m +CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_SAS_ATTRS=m +CONFIG_SCSI_SAS_LIBSAS=m +CONFIG_SCSI_SAS_ATA=y +CONFIG_SCSI_SAS_HOST_SMP=y +CONFIG_SCSI_SRP_ATTRS=m +CONFIG_SCSI_LOWLEVEL=y +CONFIG_ISCSI_TCP=m +CONFIG_ISCSI_BOOT_SYSFS=m +CONFIG_SCSI_CXGB3_ISCSI=m +CONFIG_SCSI_CXGB4_ISCSI=m +CONFIG_SCSI_BNX2_ISCSI=m +CONFIG_SCSI_BNX2X_FCOE=m +CONFIG_BE2ISCSI=m +# CONFIG_BLK_DEV_3W_XXXX_RAID is not set +CONFIG_SCSI_HPSA=m +# CONFIG_SCSI_3W_9XXX is not set +CONFIG_SCSI_3W_SAS=m +CONFIG_SCSI_ACARD=m +# CONFIG_SCSI_AACRAID is not set +# CONFIG_SCSI_AIC7XXX is not set +# CONFIG_SCSI_AIC79XX is not set +# CONFIG_SCSI_AIC94XX is not set +CONFIG_SCSI_MVSAS=m +# CONFIG_SCSI_MVSAS_DEBUG is not set +# CONFIG_SCSI_MVSAS_TASKLET is not set +CONFIG_SCSI_MVUMI=m +CONFIG_SCSI_ADVANSYS=m +# CONFIG_SCSI_ARCMSR is not set +CONFIG_SCSI_ESAS2R=m +# CONFIG_MEGARAID_NEWGEN is not set +# CONFIG_MEGARAID_LEGACY is not set +# CONFIG_MEGARAID_SAS is not set +CONFIG_SCSI_MPT3SAS=m +CONFIG_SCSI_MPT2SAS_MAX_SGE=128 +CONFIG_SCSI_MPT3SAS_MAX_SGE=128 +CONFIG_SCSI_MPT2SAS=m +CONFIG_SCSI_SMARTPQI=m +CONFIG_SCSI_UFSHCD=m +CONFIG_SCSI_UFSHCD_PCI=m +# CONFIG_SCSI_UFS_DWC_TC_PCI is not set +# CONFIG_SCSI_UFSHCD_PLATFORM is not set +# CONFIG_SCSI_HPTIOP is not set +CONFIG_XEN_SCSI_FRONTEND=m +CONFIG_LIBFC=m +CONFIG_LIBFCOE=m +CONFIG_FCOE=m +CONFIG_SCSI_SNIC=m +# CONFIG_SCSI_SNIC_DEBUG_FS is not set +CONFIG_SCSI_DMX3191D=m +# CONFIG_SCSI_IPS is not set +# CONFIG_SCSI_INITIO is not set +# CONFIG_SCSI_INIA100 is not set +CONFIG_SCSI_STEX=m +# CONFIG_SCSI_SYM53C8XX_2 is not set +# CONFIG_SCSI_IPR is not set +# CONFIG_SCSI_QLOGIC_1280 is not set +# CONFIG_SCSI_QLA_FC is not set +# CONFIG_SCSI_QLA_ISCSI is not set +# CONFIG_QEDI is not set +# CONFIG_QEDF is not set +CONFIG_SCSI_LPFC=m +# CONFIG_SCSI_LPFC_DEBUG_FS is not set +# CONFIG_SCSI_DC395x is not set +CONFIG_SCSI_AM53C974=m +# CONFIG_SCSI_NSP32 is not set +CONFIG_SCSI_WD719X=m +# CONFIG_SCSI_DEBUG is not set +CONFIG_SCSI_PMCRAID=m +CONFIG_SCSI_PM8001=m +CONFIG_SCSI_BFA_FC=m +CONFIG_SCSI_VIRTIO=m +CONFIG_SCSI_CHELSIO_FCOE=m +CONFIG_SCSI_DH=y +CONFIG_SCSI_DH_RDAC=m +CONFIG_SCSI_DH_HP_SW=m +CONFIG_SCSI_DH_EMC=m +CONFIG_SCSI_DH_ALUA=m +CONFIG_SCSI_OSD_INITIATOR=m +CONFIG_SCSI_OSD_ULD=m +CONFIG_SCSI_OSD_DPRINT_SENSE=1 +# CONFIG_SCSI_OSD_DEBUG is not set +CONFIG_HAVE_PATA_PLATFORM=y +CONFIG_ATA=m +CONFIG_ATA_VERBOSE_ERROR=y +CONFIG_SATA_PMP=y + +# +# Controllers with non-SFF native interface +# +CONFIG_SATA_AHCI=m +CONFIG_SATA_MOBILE_LPM_POLICY=0 +CONFIG_SATA_AHCI_PLATFORM=m +# CONFIG_AHCI_DM816 is not set +CONFIG_AHCI_IMX=m +# CONFIG_AHCI_CEVA is not set +CONFIG_AHCI_MVEBU=m +CONFIG_AHCI_SUNXI=m +CONFIG_AHCI_TEGRA=m +# CONFIG_AHCI_QORIQ is not set +# CONFIG_SATA_INIC162X is not set +CONFIG_SATA_ACARD_AHCI=m +CONFIG_SATA_SIL24=m +CONFIG_ATA_SFF=y + +# +# SFF controllers with custom DMA interface +# +CONFIG_PDC_ADMA=m +CONFIG_SATA_QSTOR=m +CONFIG_SATA_SX4=m +CONFIG_ATA_BMDMA=y + +# +# SATA SFF controllers with BMDMA +# +CONFIG_ATA_PIIX=m +# CONFIG_SATA_DWC is not set +CONFIG_SATA_HIGHBANK=m +CONFIG_SATA_MV=m +CONFIG_SATA_NV=m +CONFIG_SATA_PROMISE=m +CONFIG_SATA_SIL=m +CONFIG_SATA_SIS=m +CONFIG_SATA_SVW=m +CONFIG_SATA_ULI=m +CONFIG_SATA_VIA=m +CONFIG_SATA_VITESSE=m + +# +# PATA SFF controllers with BMDMA +# +# CONFIG_PATA_ALI is not set +# CONFIG_PATA_AMD is not set +CONFIG_PATA_ARTOP=m +# CONFIG_PATA_ATIIXP is not set +CONFIG_PATA_ATP867X=m +CONFIG_PATA_CMD64X=m +# CONFIG_PATA_CYPRESS is not set +# CONFIG_PATA_EFAR is not set +# CONFIG_PATA_HPT366 is not set +# CONFIG_PATA_HPT37X is not set +# CONFIG_PATA_HPT3X2N is not set +# CONFIG_PATA_HPT3X3 is not set +CONFIG_PATA_IMX=m +CONFIG_PATA_IT8213=m +CONFIG_PATA_IT821X=m +CONFIG_PATA_JMICRON=m +CONFIG_PATA_MARVELL=m +# CONFIG_PATA_NETCELL is not set +CONFIG_PATA_NINJA32=m +# CONFIG_PATA_NS87415 is not set +# CONFIG_PATA_OLDPIIX is not set +# CONFIG_PATA_OPTIDMA is not set +# CONFIG_PATA_PDC2027X is not set +# CONFIG_PATA_PDC_OLD is not set +# CONFIG_PATA_RADISYS is not set +CONFIG_PATA_RDC=m +CONFIG_PATA_SCH=m +# CONFIG_PATA_SERVERWORKS is not set +# CONFIG_PATA_SIL680 is not set +CONFIG_PATA_SIS=m +CONFIG_PATA_TOSHIBA=m +# CONFIG_PATA_TRIFLEX is not set +# CONFIG_PATA_VIA is not set +# CONFIG_PATA_WINBOND is not set + +# +# PIO-only SFF controllers +# +# CONFIG_PATA_CMD640_PCI is not set +# CONFIG_PATA_MPIIX is not set +# CONFIG_PATA_NS87410 is not set +# CONFIG_PATA_OPTI is not set +CONFIG_PATA_PLATFORM=m +CONFIG_PATA_OF_PLATFORM=m +# CONFIG_PATA_RZ1000 is not set + +# +# Generic fallback / legacy drivers +# +CONFIG_ATA_GENERIC=m +# CONFIG_PATA_LEGACY is not set +CONFIG_MD=y +CONFIG_BLK_DEV_MD=m +CONFIG_MD_LINEAR=m +CONFIG_MD_RAID0=m +CONFIG_MD_RAID1=m +CONFIG_MD_RAID10=m +CONFIG_MD_RAID456=m +CONFIG_MD_MULTIPATH=m +CONFIG_MD_FAULTY=m +# CONFIG_MD_CLUSTER is not set +CONFIG_BCACHE=m +# CONFIG_BCACHE_DEBUG is not set +# CONFIG_BCACHE_CLOSURES_DEBUG is not set +CONFIG_BLK_DEV_DM_BUILTIN=y +CONFIG_BLK_DEV_DM=m +# CONFIG_DM_MQ_DEFAULT is not set +# CONFIG_DM_DEBUG is not set +CONFIG_DM_BUFIO=m +# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set +CONFIG_DM_BIO_PRISON=m +CONFIG_DM_PERSISTENT_DATA=m +CONFIG_DM_UNSTRIPED=m +CONFIG_DM_CRYPT=m +CONFIG_DM_SNAPSHOT=m +CONFIG_DM_THIN_PROVISIONING=m +CONFIG_DM_CACHE=m +CONFIG_DM_CACHE_SMQ=m +# CONFIG_DM_WRITECACHE is not set +CONFIG_DM_ERA=m +CONFIG_DM_MIRROR=m +CONFIG_DM_LOG_USERSPACE=m +CONFIG_DM_RAID=m +CONFIG_DM_ZERO=m +CONFIG_DM_MULTIPATH=m +CONFIG_DM_MULTIPATH_QL=m +CONFIG_DM_MULTIPATH_ST=m +CONFIG_DM_DELAY=m +CONFIG_DM_UEVENT=y +CONFIG_DM_FLAKEY=m +CONFIG_DM_VERITY=m +# CONFIG_DM_VERITY_FEC is not set +CONFIG_DM_SWITCH=m +CONFIG_DM_LOG_WRITES=m +# CONFIG_DM_INTEGRITY is not set +CONFIG_TARGET_CORE=m +CONFIG_TCM_IBLOCK=m +CONFIG_TCM_FILEIO=m +CONFIG_TCM_PSCSI=m +CONFIG_TCM_USER2=m +CONFIG_LOOPBACK_TARGET=m +CONFIG_TCM_FC=m +CONFIG_ISCSI_TARGET=m +CONFIG_ISCSI_TARGET_CXGB4=m +CONFIG_SBP_TARGET=m +CONFIG_FUSION=y +CONFIG_FUSION_SPI=m +CONFIG_FUSION_FC=m +CONFIG_FUSION_SAS=m +CONFIG_FUSION_MAX_SGE=128 +CONFIG_FUSION_CTL=m +# CONFIG_FUSION_LOGGING is not set + +# +# IEEE 1394 (FireWire) support +# +CONFIG_FIREWIRE=m +CONFIG_FIREWIRE_OHCI=m +CONFIG_FIREWIRE_SBP2=m +CONFIG_FIREWIRE_NET=m +CONFIG_FIREWIRE_NOSY=m +CONFIG_NETDEVICES=y +CONFIG_MII=m +CONFIG_NET_CORE=y +CONFIG_BONDING=m +CONFIG_DUMMY=m +CONFIG_EQUALIZER=m +# CONFIG_NET_FC is not set +CONFIG_IFB=m +CONFIG_NET_TEAM=m +CONFIG_NET_TEAM_MODE_BROADCAST=m +CONFIG_NET_TEAM_MODE_ROUNDROBIN=m +CONFIG_NET_TEAM_MODE_RANDOM=m +CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m +CONFIG_NET_TEAM_MODE_LOADBALANCE=m +CONFIG_MACVLAN=m +CONFIG_MACVTAP=m +CONFIG_IPVLAN=m +# CONFIG_IPVTAP is not set +CONFIG_VXLAN=m +CONFIG_GENEVE=m +CONFIG_GTP=m +CONFIG_MACSEC=m +CONFIG_NETCONSOLE=m +CONFIG_NETCONSOLE_DYNAMIC=y +CONFIG_NETPOLL=y +CONFIG_NET_POLL_CONTROLLER=y +CONFIG_TUN=m +CONFIG_TAP=m +# CONFIG_TUN_VNET_CROSS_LE is not set +CONFIG_VETH=m +CONFIG_VIRTIO_NET=m +CONFIG_NLMON=m +CONFIG_NET_VRF=m +# CONFIG_ARCNET is not set +CONFIG_ATM_DRIVERS=y +CONFIG_ATM_DUMMY=m +# CONFIG_ATM_TCP is not set +# CONFIG_ATM_LANAI is not set +# CONFIG_ATM_ENI is not set +CONFIG_ATM_NICSTAR=m +CONFIG_ATM_NICSTAR_USE_SUNI=y +CONFIG_ATM_NICSTAR_USE_IDT77105=y +# CONFIG_ATM_IDT77252 is not set +CONFIG_ATM_IA=m +# CONFIG_ATM_IA_DEBUG is not set +CONFIG_ATM_FORE200E=m +# CONFIG_ATM_FORE200E_USE_TASKLET is not set +CONFIG_ATM_FORE200E_TX_RETRY=16 +CONFIG_ATM_FORE200E_DEBUG=0 +# CONFIG_ATM_HE is not set +CONFIG_ATM_SOLOS=m + +# +# CAIF transport drivers +# + +# +# Distributed Switch Architecture drivers +# +CONFIG_B53=m +# CONFIG_B53_SPI_DRIVER is not set +CONFIG_B53_MDIO_DRIVER=m +# CONFIG_B53_MMAP_DRIVER is not set +# CONFIG_B53_SRAB_DRIVER is not set +CONFIG_NET_DSA_BCM_SF2=m +# CONFIG_NET_DSA_LOOP is not set +# CONFIG_NET_DSA_MT7530 is not set +CONFIG_NET_DSA_MV88E6060=m +# CONFIG_MICROCHIP_KSZ is not set +CONFIG_NET_DSA_MV88E6XXX=m +CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y +# CONFIG_NET_DSA_MV88E6XXX_PTP is not set +# CONFIG_NET_DSA_QCA8K is not set +CONFIG_NET_DSA_REALTEK_SMI=m +# CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set +# CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set +CONFIG_NET_DSA_VITESSE_VSC73XX=m +CONFIG_ETHERNET=y +CONFIG_MDIO=m +CONFIG_NET_VENDOR_3COM=y +CONFIG_TYPHOON=m +CONFIG_NET_VENDOR_ADAPTEC=y +CONFIG_ADAPTEC_STARFIRE=m +CONFIG_NET_VENDOR_AGERE=y +CONFIG_ET131X=m +CONFIG_NET_VENDOR_ALACRITECH=y +# CONFIG_SLICOSS is not set +CONFIG_NET_VENDOR_ALLWINNER=y +CONFIG_SUN4I_EMAC=m +CONFIG_NET_VENDOR_ALTEON=y +CONFIG_ACENIC=m +# CONFIG_ACENIC_OMIT_TIGON_I is not set +# CONFIG_ALTERA_TSE is not set +CONFIG_NET_VENDOR_AMAZON=y +CONFIG_NET_VENDOR_AMD=y +# CONFIG_AMD8111_ETH is not set +CONFIG_PCNET32=m +CONFIG_NET_VENDOR_AQUANTIA=y +# CONFIG_NET_VENDOR_ARC is not set +CONFIG_NET_VENDOR_ATHEROS=y +CONFIG_ATL2=m +CONFIG_ATL1=m +CONFIG_ATL1E=m +CONFIG_ATL1C=m +CONFIG_ALX=m +# CONFIG_NET_VENDOR_AURORA is not set +CONFIG_NET_VENDOR_BROADCOM=y +# CONFIG_B44 is not set +# CONFIG_BCMGENET is not set +CONFIG_BNX2=m +CONFIG_CNIC=m +CONFIG_TIGON3=m +CONFIG_TIGON3_HWMON=y +CONFIG_BNX2X=m +# CONFIG_SYSTEMPORT is not set +CONFIG_BNXT=m +CONFIG_BNXT_FLOWER_OFFLOAD=y +# CONFIG_BNXT_DCB is not set +CONFIG_BNXT_HWMON=y +CONFIG_NET_VENDOR_BROCADE=y +CONFIG_BNA=m +CONFIG_NET_VENDOR_CADENCE=y +# CONFIG_MACB is not set +CONFIG_NET_CALXEDA_XGMAC=m +CONFIG_NET_VENDOR_CAVIUM=y +CONFIG_NET_VENDOR_CHELSIO=y +CONFIG_CHELSIO_T1=m +CONFIG_CHELSIO_T1_1G=y +CONFIG_CHELSIO_T3=m +CONFIG_CHELSIO_T4=m +CONFIG_CHELSIO_T4_DCB=y +CONFIG_CHELSIO_T4_FCOE=y +CONFIG_CHELSIO_T4VF=m +CONFIG_CHELSIO_LIB=m +CONFIG_NET_VENDOR_CIRRUS=y +# CONFIG_CS89x0 is not set +CONFIG_NET_VENDOR_CISCO=y +CONFIG_ENIC=m +CONFIG_NET_VENDOR_CORTINA=y +CONFIG_GEMINI_ETHERNET=m +# CONFIG_DM9000 is not set +# CONFIG_DNET is not set +CONFIG_NET_VENDOR_DEC=y +CONFIG_NET_TULIP=y +CONFIG_DE2104X=m +CONFIG_DE2104X_DSL=0 +CONFIG_TULIP=m +# CONFIG_TULIP_MWI is not set +# CONFIG_TULIP_MMIO is not set +CONFIG_TULIP_NAPI=y +CONFIG_TULIP_NAPI_HW_MITIGATION=y +CONFIG_WINBOND_840=m +CONFIG_DM9102=m +CONFIG_ULI526X=m +CONFIG_NET_VENDOR_DLINK=y +CONFIG_DL2K=m +CONFIG_SUNDANCE=m +# CONFIG_SUNDANCE_MMIO is not set +CONFIG_NET_VENDOR_EMULEX=y +CONFIG_BE2NET=m +CONFIG_BE2NET_HWMON=y +CONFIG_BE2NET_BE2=y +CONFIG_BE2NET_BE3=y +CONFIG_BE2NET_LANCER=y +CONFIG_BE2NET_SKYHAWK=y +CONFIG_NET_VENDOR_EZCHIP=y +# CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set +CONFIG_NET_VENDOR_FARADAY=y +# CONFIG_FTMAC100 is not set +# CONFIG_FTGMAC100 is not set +CONFIG_NET_VENDOR_FREESCALE=y +CONFIG_FEC=y +# CONFIG_FSL_PQ_MDIO is not set +# CONFIG_FSL_XGMAC_MDIO is not set +# CONFIG_GIANFAR is not set +CONFIG_NET_VENDOR_HISILICON=y +# CONFIG_HIX5HD2_GMAC is not set +# CONFIG_HISI_FEMAC is not set +# CONFIG_HIP04_ETH is not set +# CONFIG_HNS is not set +# CONFIG_HNS_DSAF is not set +# CONFIG_HNS_ENET is not set +# CONFIG_HNS3 is not set +CONFIG_NET_VENDOR_HP=y +# CONFIG_HP100 is not set +CONFIG_NET_VENDOR_HUAWEI=y +CONFIG_NET_VENDOR_I825XX=y +CONFIG_NET_VENDOR_INTEL=y +CONFIG_E100=m +CONFIG_E1000=m +CONFIG_E1000E=m +CONFIG_IGB=m +CONFIG_IGB_HWMON=y +CONFIG_IGBVF=m +CONFIG_IXGB=m +CONFIG_IXGBE=m +CONFIG_IXGBE_HWMON=y +CONFIG_IXGBE_DCB=y +CONFIG_IXGBEVF=m +CONFIG_I40E=m +CONFIG_I40E_DCB=y +CONFIG_I40EVF=m +# CONFIG_ICE is not set +# CONFIG_FM10K is not set +CONFIG_JME=m +CONFIG_NET_VENDOR_MARVELL=y +# CONFIG_MV643XX_ETH is not set +CONFIG_MVMDIO=m +# CONFIG_MVNETA_BM_ENABLE is not set +CONFIG_MVNETA=m +CONFIG_MVPP2=m +CONFIG_SKGE=m +# CONFIG_SKGE_DEBUG is not set +CONFIG_SKGE_GENESIS=y +CONFIG_SKY2=m +# CONFIG_SKY2_DEBUG is not set +CONFIG_NET_VENDOR_MELLANOX=y +CONFIG_MLX4_EN=m +CONFIG_MLX4_EN_DCB=y +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +CONFIG_MLX4_CORE_GEN2=y +CONFIG_MLX5_CORE=m +# CONFIG_MLX5_FPGA is not set +CONFIG_MLX5_CORE_EN=y +CONFIG_MLX5_EN_ARFS=y +CONFIG_MLX5_EN_RXNFC=y +CONFIG_MLX5_MPFS=y +CONFIG_MLX5_ESWITCH=y +CONFIG_MLX5_CORE_EN_DCB=y +# CONFIG_MLX5_CORE_IPOIB is not set +# CONFIG_MLXSW_CORE is not set +# CONFIG_MLXFW is not set +CONFIG_NET_VENDOR_MICREL=y +# CONFIG_KS8842 is not set +# CONFIG_KS8851 is not set +# CONFIG_KS8851_MLL is not set +CONFIG_KSZ884X_PCI=m +CONFIG_NET_VENDOR_MICROCHIP=y +CONFIG_ENC28J60=m +# CONFIG_ENC28J60_WRITEVERIFY is not set +# CONFIG_ENCX24J600 is not set +# CONFIG_LAN743X is not set +CONFIG_NET_VENDOR_MICROSEMI=y +# CONFIG_MSCC_OCELOT_SWITCH is not set +CONFIG_NET_VENDOR_MYRI=y +CONFIG_MYRI10GE=m +CONFIG_FEALNX=m +CONFIG_NET_VENDOR_NATSEMI=y +CONFIG_NATSEMI=m +CONFIG_NS83820=m +CONFIG_NET_VENDOR_NETERION=y +CONFIG_S2IO=m +CONFIG_VXGE=m +# CONFIG_VXGE_DEBUG_TRACE_ALL is not set +CONFIG_NET_VENDOR_NETRONOME=y +CONFIG_NFP=m +# CONFIG_NFP_APP_FLOWER is not set +CONFIG_NFP_APP_ABM_NIC=y +# CONFIG_NFP_DEBUG is not set +CONFIG_NET_VENDOR_NI=y +CONFIG_NET_VENDOR_8390=y +# CONFIG_AX88796 is not set +CONFIG_NE2K_PCI=m +CONFIG_NET_VENDOR_NVIDIA=y +# CONFIG_FORCEDETH is not set +CONFIG_NET_VENDOR_OKI=y +# CONFIG_ETHOC is not set +CONFIG_NET_VENDOR_PACKET_ENGINES=y +CONFIG_HAMACHI=m +CONFIG_YELLOWFIN=m +CONFIG_NET_VENDOR_QLOGIC=y +CONFIG_QLA3XXX=m +CONFIG_QLCNIC=m +CONFIG_QLCNIC_DCB=y +CONFIG_QLCNIC_HWMON=y +CONFIG_QLGE=m +CONFIG_NETXEN_NIC=m +CONFIG_QED=m +CONFIG_QEDE=m +CONFIG_NET_VENDOR_QUALCOMM=y +# CONFIG_QCA7000_SPI is not set +# CONFIG_QCOM_EMAC is not set +CONFIG_RMNET=m +CONFIG_NET_VENDOR_RDC=y +CONFIG_R6040=m +CONFIG_NET_VENDOR_REALTEK=y +CONFIG_8139CP=m +CONFIG_8139TOO=m +# CONFIG_8139TOO_PIO is not set +CONFIG_8139TOO_TUNE_TWISTER=y +CONFIG_8139TOO_8129=y +# CONFIG_8139_OLD_RX_RESET is not set +CONFIG_R8169=m +CONFIG_NET_VENDOR_RENESAS=y +CONFIG_NET_VENDOR_ROCKER=y +# CONFIG_ROCKER is not set +CONFIG_NET_VENDOR_SAMSUNG=y +# CONFIG_SXGBE_ETH is not set +# CONFIG_NET_VENDOR_SEEQ is not set +CONFIG_NET_VENDOR_SOLARFLARE=y +CONFIG_SFC=m +CONFIG_SFC_MTD=y +CONFIG_SFC_MCDI_MON=y +CONFIG_SFC_MCDI_LOGGING=y +CONFIG_SFC_FALCON=m +CONFIG_SFC_FALCON_MTD=y +CONFIG_NET_VENDOR_SILAN=y +CONFIG_SC92031=m +CONFIG_NET_VENDOR_SIS=y +# CONFIG_SIS900 is not set +CONFIG_SIS190=m +CONFIG_NET_VENDOR_SMSC=y +CONFIG_SMC91X=m +CONFIG_EPIC100=m +CONFIG_SMC911X=m +CONFIG_SMSC911X=m +CONFIG_SMSC9420=m +CONFIG_NET_VENDOR_SOCIONEXT=y +CONFIG_NET_VENDOR_STMICRO=y +CONFIG_STMMAC_ETH=m +CONFIG_STMMAC_PLATFORM=m +# CONFIG_DWMAC_DWC_QOS_ETH is not set +CONFIG_DWMAC_GENERIC=m +CONFIG_DWMAC_ROCKCHIP=m +CONFIG_DWMAC_SOCFPGA=m +CONFIG_DWMAC_SUNXI=m +CONFIG_DWMAC_SUN8I=m +# CONFIG_STMMAC_PCI is not set +CONFIG_NET_VENDOR_SUN=y +# CONFIG_HAPPYMEAL is not set +# CONFIG_SUNGEM is not set +CONFIG_CASSINI=m +CONFIG_NIU=m +CONFIG_NET_VENDOR_SYNOPSYS=y +# CONFIG_DWC_XLGMAC is not set +CONFIG_NET_VENDOR_TEHUTI=y +CONFIG_TEHUTI=m +CONFIG_NET_VENDOR_TI=y +CONFIG_TI_DAVINCI_EMAC=m +CONFIG_TI_DAVINCI_MDIO=m +CONFIG_TI_DAVINCI_CPDMA=m +CONFIG_TI_CPSW_PHY_SEL=y +CONFIG_TI_CPSW_ALE=m +CONFIG_TI_CPSW=m +# CONFIG_TI_CPTS is not set +CONFIG_TLAN=m +CONFIG_NET_VENDOR_VIA=y +# CONFIG_VIA_RHINE is not set +CONFIG_VIA_VELOCITY=m +CONFIG_NET_VENDOR_WIZNET=y +# CONFIG_WIZNET_W5100 is not set +# CONFIG_WIZNET_W5300 is not set +CONFIG_FDDI=y +CONFIG_DEFXX=m +# CONFIG_DEFXX_MMIO is not set +CONFIG_SKFP=m +# CONFIG_HIPPI is not set +CONFIG_MDIO_DEVICE=y +CONFIG_MDIO_BUS=y +CONFIG_MDIO_BCM_UNIMAC=m +# CONFIG_MDIO_BITBANG is not set +CONFIG_MDIO_BUS_MUX=m +# CONFIG_MDIO_BUS_MUX_GPIO is not set +# CONFIG_MDIO_BUS_MUX_MMIOREG is not set +# CONFIG_MDIO_HISI_FEMAC is not set +CONFIG_MDIO_I2C=m +# CONFIG_MDIO_MSCC_MIIM is not set +CONFIG_MDIO_SUN4I=y +CONFIG_PHYLINK=m +CONFIG_PHYLIB=y +CONFIG_SWPHY=y +# CONFIG_LED_TRIGGER_PHY is not set + +# +# MII PHY device drivers +# +CONFIG_SFP=m +CONFIG_AMD_PHY=m +CONFIG_AQUANTIA_PHY=m +CONFIG_ASIX_PHY=m +CONFIG_AT803X_PHY=m +CONFIG_BCM7XXX_PHY=m +CONFIG_BCM87XX_PHY=m +CONFIG_BCM_NET_PHYLIB=m +CONFIG_BROADCOM_PHY=m +CONFIG_CICADA_PHY=m +# CONFIG_CORTINA_PHY is not set +CONFIG_DAVICOM_PHY=m +CONFIG_DP83822_PHY=m +CONFIG_DP83TC811_PHY=m +CONFIG_DP83848_PHY=m +CONFIG_DP83867_PHY=m +CONFIG_FIXED_PHY=y +CONFIG_ICPLUS_PHY=m +# CONFIG_INTEL_XWAY_PHY is not set +CONFIG_LSI_ET1011C_PHY=m +CONFIG_LXT_PHY=m +CONFIG_MARVELL_PHY=m +# CONFIG_MARVELL_10G_PHY is not set +CONFIG_MICREL_PHY=m +CONFIG_MICROCHIP_PHY=m +CONFIG_MICROCHIP_T1_PHY=m +CONFIG_MICROSEMI_PHY=m +CONFIG_NATIONAL_PHY=m +CONFIG_QSEMI_PHY=m +CONFIG_REALTEK_PHY=m +CONFIG_RENESAS_PHY=m +CONFIG_ROCKCHIP_PHY=m +CONFIG_SMSC_PHY=m +CONFIG_STE10XP=m +CONFIG_TERANETICS_PHY=m +CONFIG_VITESSE_PHY=m +# CONFIG_XILINX_GMII2RGMII is not set +# CONFIG_MICREL_KS8995MA is not set +# CONFIG_PLIP is not set +CONFIG_PPP=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_FILTER=y +CONFIG_PPP_MPPE=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPPOATM=m +CONFIG_PPPOE=m +CONFIG_PPTP=m +CONFIG_PPPOL2TP=m +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_SLIP=m +CONFIG_SLHC=m +CONFIG_SLIP_COMPRESSED=y +CONFIG_SLIP_SMART=y +CONFIG_SLIP_MODE_SLIP6=y + +# +# Host-side USB support is needed for USB Network Adapter support +# +CONFIG_USB_NET_DRIVERS=m +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_RTL8152=m +CONFIG_USB_LAN78XX=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_AX88179_178A=m +CONFIG_USB_NET_CDCETHER=m +CONFIG_USB_NET_CDC_EEM=m +CONFIG_USB_NET_CDC_NCM=m +CONFIG_USB_NET_HUAWEI_CDC_NCM=m +CONFIG_USB_NET_CDC_MBIM=m +CONFIG_USB_NET_DM9601=m +CONFIG_USB_NET_SR9700=m +CONFIG_USB_NET_SR9800=m +CONFIG_USB_NET_SMSC75XX=m +CONFIG_USB_NET_SMSC95XX=m +CONFIG_USB_NET_GL620A=m +CONFIG_USB_NET_NET1080=m +CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_MCS7830=m +CONFIG_USB_NET_RNDIS_HOST=m +CONFIG_USB_NET_CDC_SUBSET_ENABLE=m +CONFIG_USB_NET_CDC_SUBSET=m +CONFIG_USB_ALI_M5632=y +CONFIG_USB_AN2720=y +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +CONFIG_USB_EPSON2888=y +CONFIG_USB_KC2190=y +CONFIG_USB_NET_ZAURUS=m +CONFIG_USB_NET_CX82310_ETH=m +CONFIG_USB_NET_KALMIA=m +CONFIG_USB_NET_QMI_WWAN=m +CONFIG_USB_HSO=m +CONFIG_USB_NET_INT51X1=m +CONFIG_USB_CDC_PHONET=m +CONFIG_USB_IPHETH=m +CONFIG_USB_SIERRA_NET=m +CONFIG_USB_VL600=m +CONFIG_USB_NET_CH9200=m +CONFIG_WLAN=y +# CONFIG_WIRELESS_WDS is not set +CONFIG_WLAN_VENDOR_ADMTEK=y +CONFIG_ADM8211=m +CONFIG_ATH_COMMON=m +CONFIG_WLAN_VENDOR_ATH=y +# CONFIG_ATH_DEBUG is not set +CONFIG_ATH5K=m +# CONFIG_ATH5K_DEBUG is not set +# CONFIG_ATH5K_TRACER is not set +CONFIG_ATH5K_PCI=y +CONFIG_ATH9K_HW=m +CONFIG_ATH9K_COMMON=m +CONFIG_ATH9K_BTCOEX_SUPPORT=y +CONFIG_ATH9K=m +CONFIG_ATH9K_PCI=y +# CONFIG_ATH9K_AHB is not set +# CONFIG_ATH9K_DEBUGFS is not set +# CONFIG_ATH9K_DYNACK is not set +# CONFIG_ATH9K_WOW is not set +CONFIG_ATH9K_RFKILL=y +# CONFIG_ATH9K_CHANNEL_CONTEXT is not set +CONFIG_ATH9K_PCOEM=y +CONFIG_ATH9K_HTC=m +# CONFIG_ATH9K_HTC_DEBUGFS is not set +# CONFIG_ATH9K_HWRNG is not set +CONFIG_CARL9170=m +CONFIG_CARL9170_LEDS=y +CONFIG_CARL9170_WPC=y +# CONFIG_CARL9170_HWRNG is not set +CONFIG_ATH6KL=m +CONFIG_ATH6KL_SDIO=m +CONFIG_ATH6KL_USB=m +# CONFIG_ATH6KL_DEBUG is not set +# CONFIG_ATH6KL_TRACING is not set +CONFIG_AR5523=m +CONFIG_WIL6210=m +CONFIG_WIL6210_ISR_COR=y +CONFIG_WIL6210_TRACING=y +CONFIG_WIL6210_DEBUGFS=y +CONFIG_ATH10K=m +CONFIG_ATH10K_CE=y +CONFIG_ATH10K_PCI=m +# CONFIG_ATH10K_AHB is not set +# CONFIG_ATH10K_SDIO is not set +CONFIG_ATH10K_USB=m +# CONFIG_ATH10K_DEBUG is not set +# CONFIG_ATH10K_DEBUGFS is not set +# CONFIG_ATH10K_TRACING is not set +# CONFIG_WCN36XX is not set +CONFIG_WLAN_VENDOR_ATMEL=y +# CONFIG_ATMEL is not set +CONFIG_AT76C50X_USB=m +CONFIG_WLAN_VENDOR_BROADCOM=y +CONFIG_B43=m +CONFIG_B43_BCMA=y +CONFIG_B43_SSB=y +CONFIG_B43_BUSES_BCMA_AND_SSB=y +# CONFIG_B43_BUSES_BCMA is not set +# CONFIG_B43_BUSES_SSB is not set +CONFIG_B43_PCI_AUTOSELECT=y +CONFIG_B43_PCICORE_AUTOSELECT=y +CONFIG_B43_SDIO=y +CONFIG_B43_BCMA_PIO=y +CONFIG_B43_PIO=y +CONFIG_B43_PHY_G=y +CONFIG_B43_PHY_N=y +CONFIG_B43_PHY_LP=y +CONFIG_B43_PHY_HT=y +CONFIG_B43_LEDS=y +CONFIG_B43_HWRNG=y +# CONFIG_B43_DEBUG is not set +CONFIG_B43LEGACY=m +CONFIG_B43LEGACY_PCI_AUTOSELECT=y +CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y +CONFIG_B43LEGACY_LEDS=y +CONFIG_B43LEGACY_HWRNG=y +CONFIG_B43LEGACY_DEBUG=y +CONFIG_B43LEGACY_DMA=y +CONFIG_B43LEGACY_PIO=y +CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y +# CONFIG_B43LEGACY_DMA_MODE is not set +# CONFIG_B43LEGACY_PIO_MODE is not set +CONFIG_BRCMUTIL=m +CONFIG_BRCMSMAC=m +CONFIG_BRCMFMAC=m +CONFIG_BRCMFMAC_PROTO_BCDC=y +CONFIG_BRCMFMAC_PROTO_MSGBUF=y +CONFIG_BRCMFMAC_SDIO=y +CONFIG_BRCMFMAC_USB=y +CONFIG_BRCMFMAC_PCIE=y +# CONFIG_BRCM_TRACING is not set +# CONFIG_BRCMDBG is not set +CONFIG_WLAN_VENDOR_CISCO=y +CONFIG_WLAN_VENDOR_INTEL=y +# CONFIG_IPW2100 is not set +CONFIG_IPW2200=m +CONFIG_IPW2200_MONITOR=y +CONFIG_IPW2200_RADIOTAP=y +CONFIG_IPW2200_PROMISCUOUS=y +CONFIG_IPW2200_QOS=y +# CONFIG_IPW2200_DEBUG is not set +CONFIG_LIBIPW=m +# CONFIG_LIBIPW_DEBUG is not set +CONFIG_IWLEGACY=m +CONFIG_IWL4965=m +CONFIG_IWL3945=m + +# +# iwl3945 / iwl4965 Debugging Options +# +# CONFIG_IWLEGACY_DEBUG is not set +CONFIG_IWLWIFI=m +CONFIG_IWLWIFI_LEDS=y +CONFIG_IWLDVM=m +CONFIG_IWLMVM=m +CONFIG_IWLWIFI_OPMODE_MODULAR=y +# CONFIG_IWLWIFI_BCAST_FILTERING is not set +# CONFIG_IWLWIFI_PCIE_RTPM is not set + +# +# Debugging Options +# +# CONFIG_IWLWIFI_DEBUG is not set +# CONFIG_IWLWIFI_DEVICE_TRACING is not set +CONFIG_WLAN_VENDOR_INTERSIL=y +CONFIG_HOSTAP=m +CONFIG_HOSTAP_FIRMWARE=y +# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set +CONFIG_HOSTAP_PLX=m +CONFIG_HOSTAP_PCI=m +# CONFIG_HERMES is not set +CONFIG_P54_COMMON=m +CONFIG_P54_USB=m +CONFIG_P54_PCI=m +# CONFIG_P54_SPI is not set +CONFIG_P54_LEDS=y +# CONFIG_PRISM54 is not set +CONFIG_WLAN_VENDOR_MARVELL=y +CONFIG_LIBERTAS=m +CONFIG_LIBERTAS_USB=m +CONFIG_LIBERTAS_SDIO=m +# CONFIG_LIBERTAS_SPI is not set +# CONFIG_LIBERTAS_DEBUG is not set +CONFIG_LIBERTAS_MESH=y +CONFIG_LIBERTAS_THINFIRM=m +# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set +CONFIG_LIBERTAS_THINFIRM_USB=m +# CONFIG_MWIFIEX is not set +CONFIG_MWL8K=m +CONFIG_WLAN_VENDOR_MEDIATEK=y +CONFIG_MT7601U=m +CONFIG_MT76_CORE=m +CONFIG_MT76_USB=m +CONFIG_MT76x2_COMMON=m +CONFIG_MT76x0U=m +CONFIG_MT76x2E=m +CONFIG_MT76x2U=m +CONFIG_WLAN_VENDOR_RALINK=y +CONFIG_RT2X00=m +CONFIG_RT2400PCI=m +CONFIG_RT2500PCI=m +CONFIG_RT61PCI=m +CONFIG_RT2800PCI=m +CONFIG_RT2800PCI_RT33XX=y +CONFIG_RT2800PCI_RT35XX=y +CONFIG_RT2800PCI_RT53XX=y +CONFIG_RT2800PCI_RT3290=y +CONFIG_RT2500USB=m +CONFIG_RT73USB=m +CONFIG_RT2800USB=m +CONFIG_RT2800USB_RT33XX=y +CONFIG_RT2800USB_RT35XX=y +CONFIG_RT2800USB_RT3573=y +CONFIG_RT2800USB_RT53XX=y +CONFIG_RT2800USB_RT55XX=y +# CONFIG_RT2800USB_UNKNOWN is not set +CONFIG_RT2800_LIB=m +CONFIG_RT2800_LIB_MMIO=m +CONFIG_RT2X00_LIB_MMIO=m +CONFIG_RT2X00_LIB_PCI=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_CRYPTO=y +CONFIG_RT2X00_LIB_LEDS=y +# CONFIG_RT2X00_DEBUG is not set +CONFIG_WLAN_VENDOR_REALTEK=y +CONFIG_RTL8180=m +CONFIG_RTL8187=m +CONFIG_RTL8187_LEDS=y +CONFIG_RTL_CARDS=m +CONFIG_RTL8192CE=m +CONFIG_RTL8192SE=m +CONFIG_RTL8192DE=m +CONFIG_RTL8723AE=m +CONFIG_RTL8723BE=m +CONFIG_RTL8188EE=m +CONFIG_RTL8192EE=m +CONFIG_RTL8821AE=m +CONFIG_RTL8192CU=m +CONFIG_RTLWIFI=m +CONFIG_RTLWIFI_PCI=m +CONFIG_RTLWIFI_USB=m +# CONFIG_RTLWIFI_DEBUG is not set +CONFIG_RTL8192C_COMMON=m +CONFIG_RTL8723_COMMON=m +CONFIG_RTLBTCOEXIST=m +CONFIG_RTL8XXXU=m +# CONFIG_RTL8XXXU_UNTESTED is not set +CONFIG_WLAN_VENDOR_RSI=y +CONFIG_RSI_91X=m +CONFIG_RSI_DEBUGFS=y +# CONFIG_RSI_SDIO is not set +CONFIG_RSI_USB=m +CONFIG_RSI_COEX=y +CONFIG_WLAN_VENDOR_ST=y +# CONFIG_CW1200 is not set +CONFIG_WLAN_VENDOR_TI=y +CONFIG_WL1251=m +CONFIG_WL1251_SPI=m +CONFIG_WL1251_SDIO=m +CONFIG_WL12XX=m +CONFIG_WL18XX=m +CONFIG_WLCORE=m +CONFIG_WLCORE_SPI=m +CONFIG_WLCORE_SDIO=m +CONFIG_WILINK_PLATFORM_DATA=y +CONFIG_WLAN_VENDOR_ZYDAS=y +# CONFIG_USB_ZD1201 is not set +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set +CONFIG_WLAN_VENDOR_QUANTENNA=y +# CONFIG_QTNFMAC_PEARL_PCIE is not set +CONFIG_MAC80211_HWSIM=m +CONFIG_USB_NET_RNDIS_WLAN=m + +# +# WiMAX Wireless Broadband devices +# +CONFIG_WIMAX_I2400M=m +CONFIG_WIMAX_I2400M_USB=m +CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 +# CONFIG_WAN is not set +CONFIG_IEEE802154_DRIVERS=m +CONFIG_IEEE802154_FAKELB=m +CONFIG_IEEE802154_AT86RF230=m +# CONFIG_IEEE802154_AT86RF230_DEBUGFS is not set +CONFIG_IEEE802154_MRF24J40=m +CONFIG_IEEE802154_CC2520=m +CONFIG_IEEE802154_ATUSB=m +CONFIG_IEEE802154_ADF7242=m +# CONFIG_IEEE802154_CA8210 is not set +# CONFIG_IEEE802154_MCR20A is not set +# CONFIG_IEEE802154_HWSIM is not set +CONFIG_XEN_NETDEV_FRONTEND=m +CONFIG_XEN_NETDEV_BACKEND=m +# CONFIG_VMXNET3 is not set +CONFIG_NETDEVSIM=m +CONFIG_NET_FAILOVER=m +# CONFIG_ISDN is not set +# CONFIG_NVM is not set + +# +# Input device support +# +CONFIG_INPUT=y +CONFIG_INPUT_LEDS=y +CONFIG_INPUT_FF_MEMLESS=m +CONFIG_INPUT_POLLDEV=m +CONFIG_INPUT_SPARSEKMAP=m +CONFIG_INPUT_MATRIXKMAP=m + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +CONFIG_INPUT_JOYDEV=m +CONFIG_INPUT_EVDEV=m +# CONFIG_INPUT_EVBUG is not set +# CONFIG_INPUT_APMPOWER is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ADC is not set +CONFIG_KEYBOARD_ADP5588=m +# CONFIG_KEYBOARD_ADP5589 is not set +CONFIG_KEYBOARD_ATKBD=y +# CONFIG_KEYBOARD_QT1070 is not set +CONFIG_KEYBOARD_QT2160=m +# CONFIG_KEYBOARD_DLINK_DIR685 is not set +# CONFIG_KEYBOARD_LKKBD is not set +CONFIG_KEYBOARD_GPIO=y +# CONFIG_KEYBOARD_GPIO_POLLED is not set +# CONFIG_KEYBOARD_TCA6416 is not set +# CONFIG_KEYBOARD_TCA8418 is not set +# CONFIG_KEYBOARD_MATRIX is not set +CONFIG_KEYBOARD_LM8323=m +# CONFIG_KEYBOARD_LM8333 is not set +CONFIG_KEYBOARD_MAX7359=m +# CONFIG_KEYBOARD_MCS is not set +# CONFIG_KEYBOARD_MPR121 is not set +CONFIG_KEYBOARD_IMX=m +# CONFIG_KEYBOARD_NEWTON is not set +CONFIG_KEYBOARD_TEGRA=m +CONFIG_KEYBOARD_OPENCORES=m +# CONFIG_KEYBOARD_SAMSUNG is not set +CONFIG_KEYBOARD_STOWAWAY=m +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_STMPE is not set +CONFIG_KEYBOARD_SUN4I_LRADC=m +CONFIG_KEYBOARD_OMAP4=m +# CONFIG_KEYBOARD_TM2_TOUCHKEY is not set +CONFIG_KEYBOARD_TWL4030=m +# CONFIG_KEYBOARD_XTKBD is not set +CONFIG_KEYBOARD_CROS_EC=m +# CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_BCM is not set +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=m +CONFIG_MOUSE_PS2_ALPS=y +CONFIG_MOUSE_PS2_BYD=y +CONFIG_MOUSE_PS2_LOGIPS2PP=y +CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y +CONFIG_MOUSE_PS2_CYPRESS=y +CONFIG_MOUSE_PS2_TRACKPOINT=y +CONFIG_MOUSE_PS2_ELANTECH=y +CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y +CONFIG_MOUSE_PS2_SENTELIC=y +# CONFIG_MOUSE_PS2_TOUCHKIT is not set +CONFIG_MOUSE_PS2_FOCALTECH=y +CONFIG_MOUSE_PS2_SMBUS=y +# CONFIG_MOUSE_SERIAL is not set +CONFIG_MOUSE_APPLETOUCH=m +# CONFIG_MOUSE_BCM5974 is not set +# CONFIG_MOUSE_CYAPA is not set +CONFIG_MOUSE_ELAN_I2C=m +CONFIG_MOUSE_ELAN_I2C_I2C=y +# CONFIG_MOUSE_ELAN_I2C_SMBUS is not set +# CONFIG_MOUSE_VSXXXAA is not set +# CONFIG_MOUSE_GPIO is not set +CONFIG_MOUSE_SYNAPTICS_I2C=m +CONFIG_MOUSE_SYNAPTICS_USB=m +# CONFIG_INPUT_JOYSTICK is not set +CONFIG_INPUT_TABLET=y +CONFIG_TABLET_USB_ACECAD=m +CONFIG_TABLET_USB_AIPTEK=m +CONFIG_TABLET_USB_GTCO=m +CONFIG_TABLET_USB_HANWANG=m +CONFIG_TABLET_USB_KBTAB=m +CONFIG_TABLET_USB_PEGASUS=m +CONFIG_TABLET_SERIAL_WACOM4=m +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_PROPERTIES=y +CONFIG_TOUCHSCREEN_ADS7846=m +CONFIG_TOUCHSCREEN_AD7877=m +CONFIG_TOUCHSCREEN_AD7879=m +CONFIG_TOUCHSCREEN_AD7879_I2C=m +# CONFIG_TOUCHSCREEN_AD7879_SPI is not set +CONFIG_TOUCHSCREEN_ADC=m +# CONFIG_TOUCHSCREEN_AR1021_I2C is not set +CONFIG_TOUCHSCREEN_ATMEL_MXT=m +# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set +# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set +# CONFIG_TOUCHSCREEN_BU21013 is not set +# CONFIG_TOUCHSCREEN_BU21029 is not set +# CONFIG_TOUCHSCREEN_CHIPONE_ICN8318 is not set +# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set +# CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set +# CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set +# CONFIG_TOUCHSCREEN_DA9052 is not set +CONFIG_TOUCHSCREEN_DYNAPRO=m +CONFIG_TOUCHSCREEN_HAMPSHIRE=m +# CONFIG_TOUCHSCREEN_EETI is not set +# CONFIG_TOUCHSCREEN_EGALAX is not set +# CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set +CONFIG_TOUCHSCREEN_EXC3000=m +CONFIG_TOUCHSCREEN_FUJITSU=m +CONFIG_TOUCHSCREEN_GOODIX=m +CONFIG_TOUCHSCREEN_HIDEEP=m +# CONFIG_TOUCHSCREEN_ILI210X is not set +CONFIG_TOUCHSCREEN_S6SY761=m +CONFIG_TOUCHSCREEN_GUNZE=m +# CONFIG_TOUCHSCREEN_EKTF2127 is not set +# CONFIG_TOUCHSCREEN_ELAN is not set +CONFIG_TOUCHSCREEN_ELO=m +CONFIG_TOUCHSCREEN_WACOM_W8001=m +# CONFIG_TOUCHSCREEN_WACOM_I2C is not set +# CONFIG_TOUCHSCREEN_MAX11801 is not set +CONFIG_TOUCHSCREEN_MCS5000=m +# CONFIG_TOUCHSCREEN_MMS114 is not set +# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set +CONFIG_TOUCHSCREEN_MTOUCH=m +# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set +CONFIG_TOUCHSCREEN_INEXIO=m +CONFIG_TOUCHSCREEN_MK712=m +CONFIG_TOUCHSCREEN_PENMOUNT=m +# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set +CONFIG_TOUCHSCREEN_TOUCHRIGHT=m +CONFIG_TOUCHSCREEN_TOUCHWIN=m +CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m +# CONFIG_TOUCHSCREEN_PIXCIR is not set +# CONFIG_TOUCHSCREEN_WDT87XX_I2C is not set +CONFIG_TOUCHSCREEN_WM97XX=m +CONFIG_TOUCHSCREEN_WM9705=y +CONFIG_TOUCHSCREEN_WM9712=y +CONFIG_TOUCHSCREEN_WM9713=y +CONFIG_TOUCHSCREEN_USB_COMPOSITE=m +CONFIG_TOUCHSCREEN_MC13783=m +CONFIG_TOUCHSCREEN_USB_EGALAX=y +CONFIG_TOUCHSCREEN_USB_PANJIT=y +CONFIG_TOUCHSCREEN_USB_3M=y +CONFIG_TOUCHSCREEN_USB_ITM=y +CONFIG_TOUCHSCREEN_USB_ETURBO=y +CONFIG_TOUCHSCREEN_USB_GUNZE=y +CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y +CONFIG_TOUCHSCREEN_USB_IRTOUCH=y +CONFIG_TOUCHSCREEN_USB_IDEALTEK=y +CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y +CONFIG_TOUCHSCREEN_USB_GOTOP=y +CONFIG_TOUCHSCREEN_USB_JASTEC=y +CONFIG_TOUCHSCREEN_USB_ELO=y +CONFIG_TOUCHSCREEN_USB_E2I=y +CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y +CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y +CONFIG_TOUCHSCREEN_USB_NEXIO=y +CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y +CONFIG_TOUCHSCREEN_TOUCHIT213=m +# CONFIG_TOUCHSCREEN_TS4800 is not set +# CONFIG_TOUCHSCREEN_TSC_SERIO is not set +CONFIG_TOUCHSCREEN_TSC200X_CORE=m +# CONFIG_TOUCHSCREEN_TSC2004 is not set +CONFIG_TOUCHSCREEN_TSC2005=m +CONFIG_TOUCHSCREEN_TSC2007=m +# CONFIG_TOUCHSCREEN_TSC2007_IIO is not set +# CONFIG_TOUCHSCREEN_RM_TS is not set +# CONFIG_TOUCHSCREEN_SILEAD is not set +# CONFIG_TOUCHSCREEN_SIS_I2C is not set +# CONFIG_TOUCHSCREEN_ST1232 is not set +# CONFIG_TOUCHSCREEN_STMFTS is not set +CONFIG_TOUCHSCREEN_STMPE=m +CONFIG_TOUCHSCREEN_SUN4I=m +CONFIG_TOUCHSCREEN_SUR40=m +# CONFIG_TOUCHSCREEN_SURFACE3_SPI is not set +# CONFIG_TOUCHSCREEN_SX8654 is not set +CONFIG_TOUCHSCREEN_TPS6507X=m +# CONFIG_TOUCHSCREEN_ZET6223 is not set +# CONFIG_TOUCHSCREEN_ZFORCE is not set +# CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set +CONFIG_INPUT_MISC=y +# CONFIG_INPUT_AD714X is not set +# CONFIG_INPUT_ATMEL_CAPTOUCH is not set +# CONFIG_INPUT_BMA150 is not set +# CONFIG_INPUT_E3X0_BUTTON is not set +# CONFIG_INPUT_MC13783_PWRBUTTON is not set +CONFIG_INPUT_MMA8450=m +# CONFIG_INPUT_GP2A is not set +# CONFIG_INPUT_GPIO_BEEPER is not set +# CONFIG_INPUT_GPIO_DECODER is not set +CONFIG_INPUT_ATI_REMOTE2=m +CONFIG_INPUT_KEYSPAN_REMOTE=m +# CONFIG_INPUT_KXTJ9 is not set +CONFIG_INPUT_POWERMATE=m +CONFIG_INPUT_YEALINK=m +CONFIG_INPUT_CM109=m +# CONFIG_INPUT_REGULATOR_HAPTIC is not set +CONFIG_INPUT_AXP20X_PEK=m +CONFIG_INPUT_TWL4030_PWRBUTTON=m +CONFIG_INPUT_TWL4030_VIBRA=m +CONFIG_INPUT_TWL6040_VIBRA=m +CONFIG_INPUT_UINPUT=m +# CONFIG_INPUT_PALMAS_PWRBUTTON is not set +# CONFIG_INPUT_PCF8574 is not set +# CONFIG_INPUT_PWM_BEEPER is not set +# CONFIG_INPUT_PWM_VIBRA is not set +CONFIG_INPUT_RK805_PWRKEY=m +# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set +# CONFIG_INPUT_DA9052_ONKEY is not set +# CONFIG_INPUT_ADXL34X is not set +# CONFIG_INPUT_IMS_PCU is not set +# CONFIG_INPUT_CMA3000 is not set +CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y +# CONFIG_INPUT_SOC_BUTTON_ARRAY is not set +# CONFIG_INPUT_DRV260X_HAPTICS is not set +# CONFIG_INPUT_DRV2665_HAPTICS is not set +# CONFIG_INPUT_DRV2667_HAPTICS is not set +CONFIG_RMI4_CORE=m +# CONFIG_RMI4_I2C is not set +# CONFIG_RMI4_SPI is not set +# CONFIG_RMI4_SMB is not set +CONFIG_RMI4_F03=y +CONFIG_RMI4_F03_SERIO=m +CONFIG_RMI4_2D_SENSOR=y +CONFIG_RMI4_F11=y +CONFIG_RMI4_F12=y +CONFIG_RMI4_F30=y +# CONFIG_RMI4_F34 is not set +# CONFIG_RMI4_F54 is not set +# CONFIG_RMI4_F55 is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_SERPORT=y +# CONFIG_SERIO_PARKBD is not set +CONFIG_SERIO_AMBAKMI=m +# CONFIG_SERIO_PCIPS2 is not set +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set +CONFIG_SERIO_ALTERA_PS2=m +# CONFIG_SERIO_PS2MULT is not set +# CONFIG_SERIO_ARC_PS2 is not set +# CONFIG_SERIO_APBPS2 is not set +CONFIG_SERIO_SUN4I_PS2=m +CONFIG_SERIO_GPIO_PS2=m +# CONFIG_USERIO is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_TTY=y +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_VT_CONSOLE_SLEEP=y +CONFIG_HW_CONSOLE=y +CONFIG_VT_HW_CONSOLE_BINDING=y +CONFIG_UNIX98_PTYS=y +# CONFIG_LEGACY_PTYS is not set +# CONFIG_SERIAL_NONSTANDARD is not set +CONFIG_NOZOMI=m +CONFIG_N_GSM=m +# CONFIG_TRACE_SINK is not set +CONFIG_DEVMEM=y +# CONFIG_DEVKMEM is not set + +# +# Serial drivers +# +CONFIG_SERIAL_EARLYCON=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y +# CONFIG_SERIAL_8250_FINTEK is not set +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_DMA=y +CONFIG_SERIAL_8250_PCI=y +CONFIG_SERIAL_8250_EXAR=y +CONFIG_SERIAL_8250_NR_UARTS=4 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +# CONFIG_SERIAL_8250_EXTENDED is not set +# CONFIG_SERIAL_8250_ASPEED_VUART is not set +CONFIG_SERIAL_8250_FSL=y +CONFIG_SERIAL_8250_DW=y +# CONFIG_SERIAL_8250_EM is not set +# CONFIG_SERIAL_8250_RT288X is not set +# CONFIG_SERIAL_8250_OMAP is not set +CONFIG_SERIAL_8250_MOXA=m +CONFIG_SERIAL_OF_PLATFORM=y + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_AMBA_PL010=y +CONFIG_SERIAL_AMBA_PL010_CONSOLE=y +CONFIG_SERIAL_AMBA_PL011=y +CONFIG_SERIAL_AMBA_PL011_CONSOLE=y +# CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST is not set +CONFIG_SERIAL_SAMSUNG=y +CONFIG_SERIAL_SAMSUNG_UARTS_4=y +CONFIG_SERIAL_SAMSUNG_UARTS=4 +CONFIG_SERIAL_SAMSUNG_CONSOLE=y +CONFIG_SERIAL_TEGRA=y +# CONFIG_SERIAL_MAX3100 is not set +# CONFIG_SERIAL_MAX310X is not set +CONFIG_SERIAL_IMX=y +CONFIG_SERIAL_IMX_CONSOLE=y +# CONFIG_SERIAL_UARTLITE is not set +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +# CONFIG_SERIAL_JSM is not set +CONFIG_SERIAL_VT8500=y +CONFIG_SERIAL_VT8500_CONSOLE=y +CONFIG_SERIAL_OMAP=y +CONFIG_SERIAL_OMAP_CONSOLE=y +# CONFIG_SERIAL_SCCNXP is not set +# CONFIG_SERIAL_SC16IS7XX is not set +# CONFIG_SERIAL_BCM63XX is not set +# CONFIG_SERIAL_ALTERA_JTAGUART is not set +# CONFIG_SERIAL_ALTERA_UART is not set +# CONFIG_SERIAL_IFX6X60 is not set +# CONFIG_SERIAL_XILINX_PS_UART is not set +CONFIG_SERIAL_ARC=y +CONFIG_SERIAL_ARC_CONSOLE=y +CONFIG_SERIAL_ARC_NR_PORTS=1 +CONFIG_SERIAL_RP2=m +CONFIG_SERIAL_RP2_NR_UARTS=32 +# CONFIG_SERIAL_FSL_LPUART is not set +# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set +# CONFIG_SERIAL_ST_ASC is not set +# CONFIG_SERIAL_MVEBU_UART is not set +CONFIG_SERIAL_MCTRL_GPIO=y +# CONFIG_SERIAL_DEV_BUS is not set +CONFIG_TTY_PRINTK=m +# CONFIG_PRINTER is not set +# CONFIG_PPDEV is not set +CONFIG_HVC_DRIVER=y +CONFIG_HVC_IRQ=y +CONFIG_HVC_XEN=y +CONFIG_HVC_XEN_FRONTEND=y +# CONFIG_HVC_DCC is not set +CONFIG_VIRTIO_CONSOLE=m +# CONFIG_IPMI_HANDLER is not set +CONFIG_HW_RANDOM=m +# CONFIG_HW_RANDOM_TIMERIOMEM is not set +CONFIG_HW_RANDOM_BCM2835=m +CONFIG_HW_RANDOM_OMAP=m +CONFIG_HW_RANDOM_OMAP3_ROM=m +CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_HW_RANDOM_IMX_RNGC=m +CONFIG_HW_RANDOM_EXYNOS=m +# CONFIG_R3964 is not set +# CONFIG_APPLICOM is not set +# CONFIG_RAW_DRIVER is not set +CONFIG_TCG_TPM=y +# CONFIG_TCG_TIS is not set +# CONFIG_TCG_TIS_SPI is not set +# CONFIG_TCG_TIS_I2C_ATMEL is not set +# CONFIG_TCG_TIS_I2C_INFINEON is not set +# CONFIG_TCG_TIS_I2C_NUVOTON is not set +# CONFIG_TCG_XEN is not set +# CONFIG_TCG_VTPM_PROXY is not set +# CONFIG_TCG_TIS_ST33ZP24_I2C is not set +# CONFIG_TCG_TIS_ST33ZP24_SPI is not set +CONFIG_DEVPORT=y +# CONFIG_XILLYBUS is not set + +# +# I2C support +# +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y +CONFIG_I2C_CHARDEV=m +CONFIG_I2C_MUX=y + +# +# Multiplexer I2C Chip support +# +CONFIG_I2C_ARB_GPIO_CHALLENGE=m +# CONFIG_I2C_MUX_GPIO is not set +# CONFIG_I2C_MUX_GPMUX is not set +# CONFIG_I2C_MUX_LTC4306 is not set +# CONFIG_I2C_MUX_PCA9541 is not set +CONFIG_I2C_MUX_PCA954x=m +# CONFIG_I2C_MUX_PINCTRL is not set +# CONFIG_I2C_MUX_REG is not set +# CONFIG_I2C_DEMUX_PINCTRL is not set +# CONFIG_I2C_MUX_MLXCPLD is not set +CONFIG_I2C_HELPER_AUTO=y +CONFIG_I2C_SMBUS=m +CONFIG_I2C_ALGOBIT=y +CONFIG_I2C_ALGOPCA=m + +# +# I2C Hardware Bus support +# + +# +# PC SMBus host controller drivers +# +# CONFIG_I2C_ALI1535 is not set +# CONFIG_I2C_ALI1563 is not set +# CONFIG_I2C_ALI15X3 is not set +# CONFIG_I2C_AMD756 is not set +# CONFIG_I2C_AMD8111 is not set +# CONFIG_I2C_I801 is not set +CONFIG_I2C_ISCH=m +# CONFIG_I2C_PIIX4 is not set +# CONFIG_I2C_NFORCE2 is not set +# CONFIG_I2C_SIS5595 is not set +# CONFIG_I2C_SIS630 is not set +# CONFIG_I2C_SIS96X is not set +# CONFIG_I2C_VIA is not set +# CONFIG_I2C_VIAPRO is not set + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +CONFIG_I2C_ALTERA=m +CONFIG_I2C_BCM2835=m +# CONFIG_I2C_CBUS_GPIO is not set +# CONFIG_I2C_DESIGNWARE_PLATFORM is not set +# CONFIG_I2C_DESIGNWARE_PCI is not set +# CONFIG_I2C_EMEV2 is not set +CONFIG_I2C_EXYNOS5=m +CONFIG_I2C_GPIO=y +# CONFIG_I2C_GPIO_FAULT_INJECTOR is not set +CONFIG_I2C_IMX=m +# CONFIG_I2C_IMX_LPI2C is not set +CONFIG_I2C_MV64XXX=m +# CONFIG_I2C_NOMADIK is not set +CONFIG_I2C_OCORES=m +CONFIG_I2C_OMAP=y +CONFIG_I2C_PCA_PLATFORM=m +# CONFIG_I2C_PXA is not set +CONFIG_I2C_RK3X=m +CONFIG_HAVE_S3C2410_I2C=y +CONFIG_I2C_S3C2410=y +CONFIG_I2C_SIMTEC=m +CONFIG_I2C_SUN6I_P2WI=m +CONFIG_I2C_TEGRA=y +CONFIG_I2C_VERSATILE=m +# CONFIG_I2C_WMT is not set +# CONFIG_I2C_XILINX is not set + +# +# External I2C/SMBus adapter drivers +# +CONFIG_I2C_DIOLAN_U2C=m +# CONFIG_I2C_PARPORT is not set +# CONFIG_I2C_PARPORT_LIGHT is not set +CONFIG_I2C_ROBOTFUZZ_OSIF=m +CONFIG_I2C_TAOS_EVM=m +CONFIG_I2C_TINY_USB=m +CONFIG_I2C_VIPERBOARD=m + +# +# Other I2C/SMBus bus drivers +# +CONFIG_I2C_CROS_EC_TUNNEL=m +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_SLAVE is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +CONFIG_SPI=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y +CONFIG_SPI_MEM=y + +# +# SPI Master Controller Drivers +# +# CONFIG_SPI_ALTERA is not set +# CONFIG_SPI_ARMADA_3700 is not set +# CONFIG_SPI_AXI_SPI_ENGINE is not set +CONFIG_SPI_BCM2835=m +CONFIG_SPI_BCM2835AUX=m +# CONFIG_SPI_BCM_QSPI is not set +CONFIG_SPI_BITBANG=y +CONFIG_SPI_BUTTERFLY=m +# CONFIG_SPI_CADENCE is not set +# CONFIG_SPI_DESIGNWARE is not set +# CONFIG_SPI_FSL_LPSPI is not set +CONFIG_SPI_GPIO=y +CONFIG_SPI_IMX=m +CONFIG_SPI_LM70_LLP=m +# CONFIG_SPI_FSL_SPI is not set +# CONFIG_SPI_OC_TINY is not set +CONFIG_SPI_OMAP24XX=m +CONFIG_SPI_TI_QSPI=m +CONFIG_SPI_ORION=m +CONFIG_SPI_PL022=m +# CONFIG_SPI_PXA2XX is not set +CONFIG_SPI_ROCKCHIP=m +# CONFIG_SPI_S3C64XX is not set +# CONFIG_SPI_SC18IS602 is not set +CONFIG_SPI_SUN4I=m +CONFIG_SPI_SUN6I=m +CONFIG_SPI_TEGRA114=m +CONFIG_SPI_TEGRA20_SFLASH=m +# CONFIG_SPI_TEGRA20_SLINK is not set +# CONFIG_SPI_XCOMM is not set +# CONFIG_SPI_XILINX is not set +# CONFIG_SPI_ZYNQMP_GQSPI is not set + +# +# SPI Protocol Masters +# +CONFIG_SPI_SPIDEV=y +# CONFIG_SPI_LOOPBACK_TEST is not set +# CONFIG_SPI_TLE62X0 is not set +# CONFIG_SPI_SLAVE is not set +# CONFIG_SPMI is not set +CONFIG_HSI=m +CONFIG_HSI_BOARDINFO=y + +# +# HSI controllers +# +CONFIG_OMAP_SSI=m + +# +# HSI clients +# +CONFIG_NOKIA_MODEM=m +CONFIG_CMT_SPEECH=m +CONFIG_SSI_PROTOCOL=m +# CONFIG_HSI_CHAR is not set +CONFIG_PPS=y +# CONFIG_PPS_DEBUG is not set + +# +# PPS clients support +# +# CONFIG_PPS_CLIENT_KTIMER is not set +CONFIG_PPS_CLIENT_LDISC=m +CONFIG_PPS_CLIENT_PARPORT=m +# CONFIG_PPS_CLIENT_GPIO is not set + +# +# PPS generators support +# + +# +# PTP clock support +# +CONFIG_PTP_1588_CLOCK=y + +# +# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks. +# +CONFIG_PINCTRL=y +CONFIG_GENERIC_PINCTRL_GROUPS=y +CONFIG_PINMUX=y +CONFIG_GENERIC_PINMUX_FUNCTIONS=y +CONFIG_PINCONF=y +CONFIG_GENERIC_PINCONF=y +# CONFIG_DEBUG_PINCTRL is not set +CONFIG_PINCTRL_AS3722=y +CONFIG_PINCTRL_AXP209=m +# CONFIG_PINCTRL_AMD is not set +CONFIG_PINCTRL_MCP23S08=m +CONFIG_PINCTRL_ROCKCHIP=y +CONFIG_PINCTRL_SINGLE=y +# CONFIG_PINCTRL_SX150X is not set +CONFIG_PINCTRL_PALMAS=y +CONFIG_PINCTRL_RK805=m +CONFIG_PINCTRL_BCM2835=y +CONFIG_PINCTRL_IMX=y +CONFIG_PINCTRL_IMX51=y +CONFIG_PINCTRL_IMX53=y +CONFIG_PINCTRL_IMX6Q=y +CONFIG_PINCTRL_MVEBU=y +CONFIG_PINCTRL_ARMADA_370=y +CONFIG_PINCTRL_ARMADA_375=y +CONFIG_PINCTRL_ARMADA_38X=y +CONFIG_PINCTRL_ARMADA_39X=y +CONFIG_PINCTRL_ARMADA_XP=y +CONFIG_PINCTRL_SAMSUNG=y +CONFIG_PINCTRL_EXYNOS=y +CONFIG_PINCTRL_EXYNOS_ARM=y +CONFIG_PINCTRL_SUNXI=y +CONFIG_PINCTRL_SUN4I_A10=y +CONFIG_PINCTRL_SUN5I=y +CONFIG_PINCTRL_SUN6I_A31=y +CONFIG_PINCTRL_SUN6I_A31_R=y +CONFIG_PINCTRL_SUN8I_A23=y +CONFIG_PINCTRL_SUN8I_A33=y +CONFIG_PINCTRL_SUN8I_A83T=y +CONFIG_PINCTRL_SUN8I_A83T_R=y +CONFIG_PINCTRL_SUN8I_A23_R=y +CONFIG_PINCTRL_SUN8I_H3=y +CONFIG_PINCTRL_SUN8I_H3_R=y +CONFIG_PINCTRL_SUN8I_V3S=y +CONFIG_PINCTRL_SUN9I_A80=y +CONFIG_PINCTRL_SUN9I_A80_R=y +CONFIG_PINCTRL_TEGRA=y +CONFIG_PINCTRL_TEGRA124=y +CONFIG_PINCTRL_TEGRA_XUSB=y +CONFIG_PINCTRL_TI_IODELAY=y +CONFIG_PINCTRL_WMT=y +CONFIG_PINCTRL_WM8850=y +CONFIG_PINCTRL_MADERA=m +CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y +CONFIG_GPIOLIB=y +CONFIG_GPIOLIB_FASTPATH_LIMIT=512 +CONFIG_OF_GPIO=y +CONFIG_GPIOLIB_IRQCHIP=y +# CONFIG_DEBUG_GPIO is not set +CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_GENERIC=y + +# +# Memory mapped GPIO drivers +# +# CONFIG_GPIO_74XX_MMIO is not set +# CONFIG_GPIO_ALTERA is not set +CONFIG_GPIO_RASPBERRYPI_EXP=m +# CONFIG_GPIO_DWAPB is not set +# CONFIG_GPIO_EXAR is not set +# CONFIG_GPIO_FTGPIO010 is not set +CONFIG_GPIO_GENERIC_PLATFORM=y +# CONFIG_GPIO_GRGPIO is not set +# CONFIG_GPIO_HLWD is not set +CONFIG_GPIO_MB86S7X=m +# CONFIG_GPIO_MOCKUP is not set +# CONFIG_GPIO_MPC8XXX is not set +CONFIG_GPIO_MVEBU=y +CONFIG_GPIO_MXC=y +CONFIG_GPIO_OMAP=y +CONFIG_GPIO_PL061=y +# CONFIG_GPIO_SYSCON is not set +CONFIG_GPIO_TEGRA=y +# CONFIG_GPIO_TS4800 is not set +# CONFIG_GPIO_XILINX is not set +# CONFIG_GPIO_ZEVIO is not set + +# +# I2C GPIO expanders +# +# CONFIG_GPIO_ADP5588 is not set +# CONFIG_GPIO_ADNP is not set +# CONFIG_GPIO_MAX7300 is not set +# CONFIG_GPIO_MAX732X is not set +CONFIG_GPIO_PCA953X=m +CONFIG_GPIO_PCF857X=m +# CONFIG_GPIO_TPIC2810 is not set +# CONFIG_GPIO_TS4900 is not set + +# +# MFD GPIO expanders +# +CONFIG_GPIO_BD9571MWV=m +CONFIG_GPIO_DA9052=m +# CONFIG_HTC_EGPIO is not set +CONFIG_GPIO_MADERA=m +CONFIG_GPIO_PALMAS=y +# CONFIG_GPIO_STMPE is not set +CONFIG_GPIO_TWL4030=y +CONFIG_GPIO_TWL6040=y + +# +# PCI GPIO expanders +# +# CONFIG_GPIO_PCI_IDIO_16 is not set +# CONFIG_GPIO_PCIE_IDIO_24 is not set +# CONFIG_GPIO_RDC321X is not set + +# +# SPI GPIO expanders +# +# CONFIG_GPIO_74X164 is not set +CONFIG_GPIO_MAX3191X=m +# CONFIG_GPIO_MAX7301 is not set +# CONFIG_GPIO_MC33880 is not set +# CONFIG_GPIO_PISOSR is not set +# CONFIG_GPIO_XRA1403 is not set + +# +# USB GPIO expanders +# +CONFIG_GPIO_VIPERBOARD=m +CONFIG_W1=m +CONFIG_W1_CON=y + +# +# 1-wire Bus Masters +# +# CONFIG_W1_MASTER_MATROX is not set +CONFIG_W1_MASTER_DS2490=m +CONFIG_W1_MASTER_DS2482=m +# CONFIG_W1_MASTER_MXC is not set +# CONFIG_W1_MASTER_DS1WM is not set +CONFIG_W1_MASTER_GPIO=m +CONFIG_HDQ_MASTER_OMAP=m + +# +# 1-wire Slaves +# +CONFIG_W1_SLAVE_THERM=m +CONFIG_W1_SLAVE_SMEM=m +# CONFIG_W1_SLAVE_DS2405 is not set +# CONFIG_W1_SLAVE_DS2408 is not set +# CONFIG_W1_SLAVE_DS2413 is not set +# CONFIG_W1_SLAVE_DS2406 is not set +# CONFIG_W1_SLAVE_DS2423 is not set +CONFIG_W1_SLAVE_DS2805=m +CONFIG_W1_SLAVE_DS2431=m +CONFIG_W1_SLAVE_DS2433=m +# CONFIG_W1_SLAVE_DS2433_CRC is not set +# CONFIG_W1_SLAVE_DS2438 is not set +# CONFIG_W1_SLAVE_DS2780 is not set +# CONFIG_W1_SLAVE_DS2781 is not set +# CONFIG_W1_SLAVE_DS28E04 is not set +CONFIG_W1_SLAVE_DS28E17=m +CONFIG_POWER_AVS=y +CONFIG_ROCKCHIP_IODOMAIN=m +CONFIG_POWER_RESET=y +CONFIG_POWER_RESET_AS3722=y +# CONFIG_POWER_RESET_BRCMKONA is not set +# CONFIG_POWER_RESET_BRCMSTB is not set +CONFIG_POWER_RESET_GPIO=y +CONFIG_POWER_RESET_GPIO_RESTART=y +# CONFIG_POWER_RESET_LTC2952 is not set +# CONFIG_POWER_RESET_QNAP is not set +CONFIG_POWER_RESET_RESTART=y +# CONFIG_POWER_RESET_VERSATILE is not set +CONFIG_POWER_RESET_VEXPRESS=y +CONFIG_POWER_RESET_SYSCON=y +CONFIG_POWER_RESET_SYSCON_POWEROFF=y +# CONFIG_SYSCON_REBOOT_MODE is not set +CONFIG_POWER_SUPPLY=y +# CONFIG_POWER_SUPPLY_DEBUG is not set +# CONFIG_PDA_POWER is not set +# CONFIG_APM_POWER is not set +# CONFIG_GENERIC_ADC_BATTERY is not set +# CONFIG_TEST_POWER is not set +CONFIG_CHARGER_ADP5061=m +# CONFIG_BATTERY_DS2760 is not set +# CONFIG_BATTERY_DS2780 is not set +# CONFIG_BATTERY_DS2781 is not set +# CONFIG_BATTERY_DS2782 is not set +# CONFIG_BATTERY_LEGO_EV3 is not set +CONFIG_BATTERY_SBS=m +# CONFIG_CHARGER_SBS is not set +CONFIG_MANAGER_SBS=m +CONFIG_BATTERY_BQ27XXX=m +CONFIG_BATTERY_BQ27XXX_I2C=m +CONFIG_BATTERY_BQ27XXX_HDQ=m +# CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set +# CONFIG_BATTERY_DA9052 is not set +CONFIG_CHARGER_AXP20X=m +CONFIG_BATTERY_AXP20X=m +CONFIG_AXP20X_POWER=m +CONFIG_AXP288_FUEL_GAUGE=m +# CONFIG_BATTERY_MAX17040 is not set +# CONFIG_BATTERY_MAX17042 is not set +CONFIG_BATTERY_MAX1721X=m +CONFIG_BATTERY_TWL4030_MADC=m +CONFIG_BATTERY_RX51=m +CONFIG_CHARGER_ISP1704=m +# CONFIG_CHARGER_MAX8903 is not set +CONFIG_CHARGER_TWL4030=m +# CONFIG_CHARGER_LP8727 is not set +CONFIG_CHARGER_GPIO=m +# CONFIG_CHARGER_MANAGER is not set +# CONFIG_CHARGER_LTC3651 is not set +# CONFIG_CHARGER_DETECTOR_MAX14656 is not set +CONFIG_CHARGER_BQ2415X=m +# CONFIG_CHARGER_BQ24190 is not set +# CONFIG_CHARGER_BQ24257 is not set +# CONFIG_CHARGER_BQ24735 is not set +# CONFIG_CHARGER_BQ25890 is not set +# CONFIG_CHARGER_SMB347 is not set +# CONFIG_BATTERY_GAUGE_LTC2941 is not set +# CONFIG_CHARGER_RT9455 is not set +CONFIG_CHARGER_CROS_USBPD=m +CONFIG_HWMON=y +CONFIG_HWMON_VID=m +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Native drivers +# +# CONFIG_SENSORS_AD7314 is not set +CONFIG_SENSORS_AD7414=m +CONFIG_SENSORS_AD7418=m +# CONFIG_SENSORS_ADM1021 is not set +# CONFIG_SENSORS_ADM1025 is not set +# CONFIG_SENSORS_ADM1026 is not set +CONFIG_SENSORS_ADM1029=m +# CONFIG_SENSORS_ADM1031 is not set +CONFIG_SENSORS_ADM9240=m +# CONFIG_SENSORS_ADT7310 is not set +# CONFIG_SENSORS_ADT7410 is not set +CONFIG_SENSORS_ADT7411=m +CONFIG_SENSORS_ADT7462=m +CONFIG_SENSORS_ADT7470=m +CONFIG_SENSORS_ADT7475=m +CONFIG_SENSORS_ASC7621=m +CONFIG_SENSORS_ARM_SCMI=m +# CONFIG_SENSORS_ASPEED is not set +CONFIG_SENSORS_ATXP1=m +CONFIG_SENSORS_DS620=m +# CONFIG_SENSORS_DS1621 is not set +# CONFIG_SENSORS_DA9052_ADC is not set +CONFIG_SENSORS_I5K_AMB=m +# CONFIG_SENSORS_F71805F is not set +CONFIG_SENSORS_F71882FG=m +CONFIG_SENSORS_F75375S=m +CONFIG_SENSORS_MC13783_ADC=m +CONFIG_SENSORS_FTSTEUTATES=m +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM is not set +CONFIG_SENSORS_G760A=m +CONFIG_SENSORS_G762=m +CONFIG_SENSORS_GPIO_FAN=m +# CONFIG_SENSORS_HIH6130 is not set +# CONFIG_SENSORS_IIO_HWMON is not set +# CONFIG_SENSORS_IT87 is not set +CONFIG_SENSORS_JC42=m +# CONFIG_SENSORS_POWR1220 is not set +CONFIG_SENSORS_LINEAGE=m +# CONFIG_SENSORS_LTC2945 is not set +# CONFIG_SENSORS_LTC2990 is not set +CONFIG_SENSORS_LTC4151=m +CONFIG_SENSORS_LTC4215=m +# CONFIG_SENSORS_LTC4222 is not set +CONFIG_SENSORS_LTC4245=m +# CONFIG_SENSORS_LTC4260 is not set +CONFIG_SENSORS_LTC4261=m +CONFIG_SENSORS_MAX1111=m +CONFIG_SENSORS_MAX16065=m +# CONFIG_SENSORS_MAX1619 is not set +CONFIG_SENSORS_MAX1668=m +# CONFIG_SENSORS_MAX197 is not set +# CONFIG_SENSORS_MAX31722 is not set +CONFIG_SENSORS_MAX6621=m +CONFIG_SENSORS_MAX6639=m +CONFIG_SENSORS_MAX6642=m +CONFIG_SENSORS_MAX6650=m +# CONFIG_SENSORS_MAX6697 is not set +# CONFIG_SENSORS_MAX31790 is not set +# CONFIG_SENSORS_MCP3021 is not set +# CONFIG_SENSORS_TC654 is not set +CONFIG_SENSORS_ADCXX=m +# CONFIG_SENSORS_LM63 is not set +CONFIG_SENSORS_LM70=m +CONFIG_SENSORS_LM73=m +# CONFIG_SENSORS_LM75 is not set +# CONFIG_SENSORS_LM77 is not set +# CONFIG_SENSORS_LM78 is not set +# CONFIG_SENSORS_LM80 is not set +# CONFIG_SENSORS_LM83 is not set +# CONFIG_SENSORS_LM85 is not set +# CONFIG_SENSORS_LM87 is not set +# CONFIG_SENSORS_LM90 is not set +# CONFIG_SENSORS_LM92 is not set +CONFIG_SENSORS_LM93=m +# CONFIG_SENSORS_LM95234 is not set +CONFIG_SENSORS_LM95241=m +CONFIG_SENSORS_LM95245=m +# CONFIG_SENSORS_PC87360 is not set +CONFIG_SENSORS_PC87427=m +CONFIG_SENSORS_NTC_THERMISTOR=m +CONFIG_SENSORS_NCT6683=m +CONFIG_SENSORS_NCT6775=m +# CONFIG_SENSORS_NCT7802 is not set +# CONFIG_SENSORS_NCT7904 is not set +# CONFIG_SENSORS_NPCM7XX is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_PMBUS is not set +CONFIG_SENSORS_PWM_FAN=m +CONFIG_SENSORS_RASPBERRYPI_HWMON=m +# CONFIG_SENSORS_SHT15 is not set +CONFIG_SENSORS_SHT21=m +# CONFIG_SENSORS_SHT3x is not set +# CONFIG_SENSORS_SHTC1 is not set +# CONFIG_SENSORS_SIS5595 is not set +CONFIG_SENSORS_DME1737=m +CONFIG_SENSORS_EMC1403=m +CONFIG_SENSORS_EMC2103=m +CONFIG_SENSORS_EMC6W201=m +# CONFIG_SENSORS_SMSC47M1 is not set +CONFIG_SENSORS_SMSC47M192=m +# CONFIG_SENSORS_SMSC47B397 is not set +CONFIG_SENSORS_SCH56XX_COMMON=m +CONFIG_SENSORS_SCH5627=m +# CONFIG_SENSORS_SCH5636 is not set +# CONFIG_SENSORS_STTS751 is not set +CONFIG_SENSORS_SMM665=m +# CONFIG_SENSORS_ADC128D818 is not set +CONFIG_SENSORS_ADS1015=m +CONFIG_SENSORS_ADS7828=m +CONFIG_SENSORS_ADS7871=m +CONFIG_SENSORS_AMC6821=m +# CONFIG_SENSORS_INA209 is not set +# CONFIG_SENSORS_INA2XX is not set +# CONFIG_SENSORS_INA3221 is not set +# CONFIG_SENSORS_TC74 is not set +CONFIG_SENSORS_THMC50=m +CONFIG_SENSORS_TMP102=m +# CONFIG_SENSORS_TMP103 is not set +# CONFIG_SENSORS_TMP108 is not set +CONFIG_SENSORS_TMP401=m +CONFIG_SENSORS_TMP421=m +# CONFIG_SENSORS_VEXPRESS is not set +# CONFIG_SENSORS_VIA686A is not set +CONFIG_SENSORS_VT1211=m +CONFIG_SENSORS_VT8231=m +CONFIG_SENSORS_W83773G=m +# CONFIG_SENSORS_W83781D is not set +CONFIG_SENSORS_W83791D=m +CONFIG_SENSORS_W83792D=m +CONFIG_SENSORS_W83793=m +CONFIG_SENSORS_W83795=m +# CONFIG_SENSORS_W83795_FANCTRL is not set +# CONFIG_SENSORS_W83L785TS is not set +CONFIG_SENSORS_W83L786NG=m +# CONFIG_SENSORS_W83627HF is not set +CONFIG_SENSORS_W83627EHF=m +CONFIG_THERMAL=y +# CONFIG_THERMAL_STATISTICS is not set +CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 +CONFIG_THERMAL_HWMON=y +CONFIG_THERMAL_OF=y +# CONFIG_THERMAL_WRITABLE_TRIPS is not set +CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y +# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set +# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set +CONFIG_THERMAL_GOV_FAIR_SHARE=y +CONFIG_THERMAL_GOV_STEP_WISE=y +# CONFIG_THERMAL_GOV_BANG_BANG is not set +# CONFIG_THERMAL_GOV_USER_SPACE is not set +# CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set +CONFIG_CPU_THERMAL=y +# CONFIG_CLOCK_THERMAL is not set +# CONFIG_DEVFREQ_THERMAL is not set +# CONFIG_THERMAL_EMULATION is not set +# CONFIG_IMX_THERMAL is not set +# CONFIG_QORIQ_THERMAL is not set +CONFIG_ROCKCHIP_THERMAL=m +CONFIG_ARMADA_THERMAL=y + +# +# ACPI INT340X thermal drivers +# + +# +# Broadcom thermal drivers +# +CONFIG_BCM2835_THERMAL=m + +# +# Texas Instruments thermal drivers +# +CONFIG_TI_SOC_THERMAL=m +CONFIG_TI_THERMAL=y +# CONFIG_OMAP3_THERMAL is not set +CONFIG_OMAP4_THERMAL=y +CONFIG_OMAP5_THERMAL=y +CONFIG_DRA752_THERMAL=y + +# +# Samsung thermal drivers +# +CONFIG_EXYNOS_THERMAL=y + +# +# NVIDIA Tegra thermal drivers +# +CONFIG_TEGRA_SOCTHERM=y +# CONFIG_GENERIC_ADC_THERMAL is not set +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_CORE=y +# CONFIG_WATCHDOG_NOWAYOUT is not set +CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y +CONFIG_WATCHDOG_SYSFS=y + +# +# Watchdog Device Drivers +# +CONFIG_SOFT_WATCHDOG=m +CONFIG_DA9052_WATCHDOG=m +# CONFIG_GPIO_WATCHDOG is not set +# CONFIG_XILINX_WATCHDOG is not set +# CONFIG_ZIIRAVE_WATCHDOG is not set +CONFIG_ARM_SP805_WATCHDOG=m +# CONFIG_CADENCE_WATCHDOG is not set +CONFIG_FTWDT010_WATCHDOG=m +CONFIG_HAVE_S3C2410_WATCHDOG=y +CONFIG_S3C2410_WATCHDOG=m +CONFIG_DW_WATCHDOG=m +CONFIG_OMAP_WATCHDOG=m +CONFIG_ORION_WATCHDOG=m +CONFIG_SUNXI_WATCHDOG=m +CONFIG_TWL4030_WATCHDOG=m +# CONFIG_TS4800_WATCHDOG is not set +# CONFIG_MAX63XX_WATCHDOG is not set +CONFIG_IMX2_WDT=m +CONFIG_TEGRA_WATCHDOG=m +# CONFIG_ALIM7101_WDT is not set +# CONFIG_I6300ESB_WDT is not set +CONFIG_BCM2835_WDT=m +# CONFIG_MEN_A21_WDT is not set +CONFIG_XEN_WDT=m + +# +# PCI-based Watchdog Cards +# +# CONFIG_PCIPCWATCHDOG is not set +# CONFIG_WDTPCI is not set + +# +# USB-based Watchdog Cards +# +# CONFIG_USBPCWATCHDOG is not set + +# +# Watchdog Pretimeout Governors +# +# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set +CONFIG_SSB_POSSIBLE=y +CONFIG_SSB=m +CONFIG_SSB_SPROM=y +CONFIG_SSB_BLOCKIO=y +CONFIG_SSB_PCIHOST_POSSIBLE=y +CONFIG_SSB_PCIHOST=y +CONFIG_SSB_B43_PCI_BRIDGE=y +CONFIG_SSB_SDIOHOST_POSSIBLE=y +CONFIG_SSB_SDIOHOST=y +CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y +CONFIG_SSB_DRIVER_PCICORE=y +# CONFIG_SSB_DRIVER_GPIO is not set +CONFIG_BCMA_POSSIBLE=y +CONFIG_BCMA=m +CONFIG_BCMA_BLOCKIO=y +CONFIG_BCMA_HOST_PCI_POSSIBLE=y +CONFIG_BCMA_HOST_PCI=y +# CONFIG_BCMA_HOST_SOC is not set +CONFIG_BCMA_DRIVER_PCI=y +# CONFIG_BCMA_DRIVER_GMAC_CMN is not set +# CONFIG_BCMA_DRIVER_GPIO is not set +# CONFIG_BCMA_DEBUG is not set + +# +# Multifunction device drivers +# +CONFIG_MFD_CORE=y +# CONFIG_MFD_ALTERA_A10SR is not set +# CONFIG_MFD_ACT8945A is not set +# CONFIG_MFD_SUN4I_GPADC is not set +# CONFIG_MFD_AS3711 is not set +CONFIG_MFD_AS3722=y +# CONFIG_PMIC_ADP5520 is not set +# CONFIG_MFD_AAT2870_CORE is not set +# CONFIG_MFD_ATMEL_FLEXCOM is not set +# CONFIG_MFD_ATMEL_HLCDC is not set +# CONFIG_MFD_BCM590XX is not set +CONFIG_MFD_BD9571MWV=m +# CONFIG_MFD_AC100 is not set +CONFIG_MFD_AXP20X=y +CONFIG_MFD_AXP20X_I2C=y +# CONFIG_MFD_AXP20X_RSB is not set +CONFIG_MFD_CROS_EC=m +CONFIG_MFD_CROS_EC_CHARDEV=m +CONFIG_MFD_MADERA=m +CONFIG_MFD_MADERA_I2C=m +CONFIG_MFD_MADERA_SPI=m +# CONFIG_MFD_CS47L35 is not set +# CONFIG_MFD_CS47L85 is not set +# CONFIG_MFD_CS47L90 is not set +# CONFIG_MFD_ASIC3 is not set +# CONFIG_PMIC_DA903X is not set +CONFIG_PMIC_DA9052=y +CONFIG_MFD_DA9052_SPI=y +CONFIG_MFD_DA9052_I2C=y +# CONFIG_MFD_DA9055 is not set +# CONFIG_MFD_DA9062 is not set +# CONFIG_MFD_DA9063 is not set +# CONFIG_MFD_DA9150 is not set +# CONFIG_MFD_DLN2 is not set +# CONFIG_MFD_EXYNOS_LPASS is not set +CONFIG_MFD_MC13XXX=m +CONFIG_MFD_MC13XXX_SPI=m +CONFIG_MFD_MC13XXX_I2C=m +# CONFIG_MFD_HI6421_PMIC is not set +# CONFIG_HTC_PASIC3 is not set +# CONFIG_HTC_I2CPLD is not set +# CONFIG_LPC_ICH is not set +CONFIG_LPC_SCH=m +# CONFIG_MFD_JANZ_CMODIO is not set +# CONFIG_MFD_KEMPLD is not set +# CONFIG_MFD_88PM800 is not set +# CONFIG_MFD_88PM805 is not set +# CONFIG_MFD_88PM860X is not set +# CONFIG_MFD_MAX14577 is not set +# CONFIG_MFD_MAX77620 is not set +CONFIG_MFD_MAX77686=y +# CONFIG_MFD_MAX77693 is not set +# CONFIG_MFD_MAX77843 is not set +# CONFIG_MFD_MAX8907 is not set +# CONFIG_MFD_MAX8925 is not set +# CONFIG_MFD_MAX8997 is not set +# CONFIG_MFD_MAX8998 is not set +# CONFIG_MFD_MT6397 is not set +# CONFIG_MFD_MENF21BMC is not set +# CONFIG_EZX_PCAP is not set +# CONFIG_MFD_CPCAP is not set +CONFIG_MFD_VIPERBOARD=m +# CONFIG_MFD_RETU is not set +# CONFIG_MFD_PCF50633 is not set +# CONFIG_UCB1400_CORE is not set +# CONFIG_MFD_PM8XXX is not set +# CONFIG_MFD_RDC321X is not set +# CONFIG_MFD_RT5033 is not set +# CONFIG_MFD_RC5T583 is not set +CONFIG_MFD_RK808=y +# CONFIG_MFD_RN5T618 is not set +CONFIG_MFD_SEC_CORE=y +# CONFIG_MFD_SI476X_CORE is not set +# CONFIG_MFD_SM501 is not set +# CONFIG_MFD_SKY81452 is not set +# CONFIG_MFD_SMSC is not set +# CONFIG_ABX500_CORE is not set +CONFIG_MFD_STMPE=y + +# +# STMicroelectronics STMPE Interface Drivers +# +CONFIG_STMPE_I2C=y +# CONFIG_STMPE_SPI is not set +CONFIG_MFD_SUN6I_PRCM=y +CONFIG_MFD_SYSCON=y +CONFIG_MFD_TI_AM335X_TSCADC=m +# CONFIG_MFD_LP3943 is not set +# CONFIG_MFD_LP8788 is not set +# CONFIG_MFD_TI_LMU is not set +CONFIG_MFD_OMAP_USB_HOST=y +CONFIG_MFD_PALMAS=y +# CONFIG_TPS6105X is not set +# CONFIG_TPS65010 is not set +# CONFIG_TPS6507X is not set +# CONFIG_MFD_TPS65086 is not set +# CONFIG_MFD_TPS65090 is not set +# CONFIG_MFD_TPS65217 is not set +# CONFIG_MFD_TI_LP873X is not set +# CONFIG_MFD_TI_LP87565 is not set +# CONFIG_MFD_TPS65218 is not set +# CONFIG_MFD_TPS6586X is not set +# CONFIG_MFD_TPS65910 is not set +# CONFIG_MFD_TPS65912_I2C is not set +# CONFIG_MFD_TPS65912_SPI is not set +# CONFIG_MFD_TPS80031 is not set +CONFIG_TWL4030_CORE=y +CONFIG_TWL4030_POWER=y +CONFIG_MFD_TWL4030_AUDIO=y +CONFIG_TWL6040_CORE=y +# CONFIG_MFD_WL1273_CORE is not set +# CONFIG_MFD_LM3533 is not set +# CONFIG_MFD_TC3589X is not set +# CONFIG_MFD_T7L66XB is not set +# CONFIG_MFD_TC6387XB is not set +# CONFIG_MFD_TC6393XB is not set +# CONFIG_MFD_VX855 is not set +# CONFIG_MFD_ARIZONA_I2C is not set +# CONFIG_MFD_ARIZONA_SPI is not set +# CONFIG_MFD_WM8400 is not set +# CONFIG_MFD_WM831X_I2C is not set +# CONFIG_MFD_WM831X_SPI is not set +# CONFIG_MFD_WM8350_I2C is not set +# CONFIG_MFD_WM8994 is not set +CONFIG_MFD_ROHM_BD718XX=m +CONFIG_MFD_VEXPRESS_SYSREG=y +CONFIG_REGULATOR=y +# CONFIG_REGULATOR_DEBUG is not set +CONFIG_REGULATOR_FIXED_VOLTAGE=y +# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set +# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set +# CONFIG_REGULATOR_88PG86X is not set +CONFIG_REGULATOR_ACT8865=m +# CONFIG_REGULATOR_AD5398 is not set +CONFIG_REGULATOR_ANATOP=m +CONFIG_REGULATOR_AS3722=y +CONFIG_REGULATOR_AXP20X=m +CONFIG_REGULATOR_BD718XX=m +CONFIG_REGULATOR_BD9571MWV=m +CONFIG_REGULATOR_DA9052=m +# CONFIG_REGULATOR_DA9210 is not set +# CONFIG_REGULATOR_DA9211 is not set +CONFIG_REGULATOR_FAN53555=m +CONFIG_REGULATOR_GPIO=m +# CONFIG_REGULATOR_ISL9305 is not set +# CONFIG_REGULATOR_ISL6271A is not set +# CONFIG_REGULATOR_LP3971 is not set +# CONFIG_REGULATOR_LP3972 is not set +# CONFIG_REGULATOR_LP872X is not set +# CONFIG_REGULATOR_LP8755 is not set +# CONFIG_REGULATOR_LTC3589 is not set +# CONFIG_REGULATOR_LTC3676 is not set +# CONFIG_REGULATOR_MAX1586 is not set +# CONFIG_REGULATOR_MAX8649 is not set +# CONFIG_REGULATOR_MAX8660 is not set +# CONFIG_REGULATOR_MAX8952 is not set +# CONFIG_REGULATOR_MAX8973 is not set +CONFIG_REGULATOR_MAX77686=m +# CONFIG_REGULATOR_MAX77802 is not set +CONFIG_REGULATOR_MC13XXX_CORE=m +CONFIG_REGULATOR_MC13783=m +CONFIG_REGULATOR_MC13892=m +# CONFIG_REGULATOR_MT6311 is not set +CONFIG_REGULATOR_PALMAS=y +CONFIG_REGULATOR_PBIAS=m +CONFIG_REGULATOR_PFUZE100=m +# CONFIG_REGULATOR_PV88060 is not set +# CONFIG_REGULATOR_PV88080 is not set +# CONFIG_REGULATOR_PV88090 is not set +# CONFIG_REGULATOR_PWM is not set +CONFIG_REGULATOR_RK808=m +CONFIG_REGULATOR_S2MPA01=m +CONFIG_REGULATOR_S2MPS11=m +CONFIG_REGULATOR_S5M8767=m +CONFIG_REGULATOR_TI_ABB=m +CONFIG_REGULATOR_SY8106A=m +# CONFIG_REGULATOR_TPS51632 is not set +# CONFIG_REGULATOR_TPS62360 is not set +# CONFIG_REGULATOR_TPS65023 is not set +# CONFIG_REGULATOR_TPS6507X is not set +# CONFIG_REGULATOR_TPS65132 is not set +# CONFIG_REGULATOR_TPS6524X is not set +CONFIG_REGULATOR_TWL4030=y +# CONFIG_REGULATOR_VCTRL is not set +CONFIG_REGULATOR_VEXPRESS=m +CONFIG_CEC_CORE=m +CONFIG_CEC_NOTIFIER=y +CONFIG_RC_CORE=y +CONFIG_RC_MAP=m +CONFIG_LIRC=y +# CONFIG_BPF_LIRC_MODE2 is not set +CONFIG_RC_DECODERS=y +CONFIG_IR_NEC_DECODER=m +CONFIG_IR_RC5_DECODER=m +CONFIG_IR_RC6_DECODER=m +CONFIG_IR_JVC_DECODER=m +CONFIG_IR_SONY_DECODER=m +CONFIG_IR_SANYO_DECODER=m +CONFIG_IR_SHARP_DECODER=m +CONFIG_IR_MCE_KBD_DECODER=m +CONFIG_IR_XMP_DECODER=m +CONFIG_IR_IMON_DECODER=m +CONFIG_RC_DEVICES=y +CONFIG_RC_ATI_REMOTE=m +# CONFIG_IR_HIX5HD2 is not set +CONFIG_IR_IMON=m +CONFIG_IR_IMON_RAW=m +CONFIG_IR_MCEUSB=m +CONFIG_IR_REDRAT3=m +# CONFIG_IR_SPI is not set +CONFIG_IR_STREAMZAP=m +CONFIG_IR_IGORPLUGUSB=m +CONFIG_IR_IGUANA=m +CONFIG_IR_TTUSBIR=m +# CONFIG_IR_RX51 is not set +CONFIG_RC_LOOPBACK=m +CONFIG_IR_GPIO_CIR=m +CONFIG_IR_GPIO_TX=m +CONFIG_IR_PWM_TX=m +CONFIG_IR_SUNXI=m +# CONFIG_IR_SERIAL is not set +# CONFIG_IR_SIR is not set +CONFIG_MEDIA_SUPPORT=y + +# +# Multimedia core support +# +CONFIG_MEDIA_CAMERA_SUPPORT=y +CONFIG_MEDIA_ANALOG_TV_SUPPORT=y +CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y +CONFIG_MEDIA_RADIO_SUPPORT=y +CONFIG_MEDIA_SDR_SUPPORT=y +CONFIG_MEDIA_CEC_SUPPORT=y +# CONFIG_MEDIA_CEC_RC is not set +CONFIG_MEDIA_CONTROLLER=y +# CONFIG_MEDIA_CONTROLLER_DVB is not set +CONFIG_VIDEO_DEV=y +CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_VIDEO_V4L2=y +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +# CONFIG_VIDEO_PCI_SKELETON is not set +CONFIG_VIDEO_TUNER=m +CONFIG_V4L2_MEM2MEM_DEV=m +CONFIG_V4L2_FWNODE=m +CONFIG_VIDEOBUF_GEN=m +CONFIG_VIDEOBUF_DMA_SG=m +CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_DVB_CORE=y +# CONFIG_DVB_MMAP is not set +CONFIG_DVB_NET=y +CONFIG_TTPCI_EEPROM=m +CONFIG_DVB_MAX_ADAPTERS=8 +CONFIG_DVB_DYNAMIC_MINORS=y +# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set +# CONFIG_DVB_ULE_DEBUG is not set + +# +# Media drivers +# +CONFIG_MEDIA_USB_SUPPORT=y + +# +# Webcam devices +# +CONFIG_USB_VIDEO_CLASS=m +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +CONFIG_USB_GSPCA=m +CONFIG_USB_M5602=m +CONFIG_USB_STV06XX=m +CONFIG_USB_GL860=m +CONFIG_USB_GSPCA_BENQ=m +CONFIG_USB_GSPCA_CONEX=m +CONFIG_USB_GSPCA_CPIA1=m +CONFIG_USB_GSPCA_DTCS033=m +CONFIG_USB_GSPCA_ETOMS=m +CONFIG_USB_GSPCA_FINEPIX=m +CONFIG_USB_GSPCA_JEILINJ=m +CONFIG_USB_GSPCA_JL2005BCD=m +CONFIG_USB_GSPCA_KINECT=m +CONFIG_USB_GSPCA_KONICA=m +CONFIG_USB_GSPCA_MARS=m +CONFIG_USB_GSPCA_MR97310A=m +CONFIG_USB_GSPCA_NW80X=m +CONFIG_USB_GSPCA_OV519=m +CONFIG_USB_GSPCA_OV534=m +CONFIG_USB_GSPCA_OV534_9=m +CONFIG_USB_GSPCA_PAC207=m +CONFIG_USB_GSPCA_PAC7302=m +CONFIG_USB_GSPCA_PAC7311=m +CONFIG_USB_GSPCA_SE401=m +CONFIG_USB_GSPCA_SN9C2028=m +CONFIG_USB_GSPCA_SN9C20X=m +CONFIG_USB_GSPCA_SONIXB=m +CONFIG_USB_GSPCA_SONIXJ=m +CONFIG_USB_GSPCA_SPCA500=m +CONFIG_USB_GSPCA_SPCA501=m +CONFIG_USB_GSPCA_SPCA505=m +CONFIG_USB_GSPCA_SPCA506=m +CONFIG_USB_GSPCA_SPCA508=m +CONFIG_USB_GSPCA_SPCA561=m +CONFIG_USB_GSPCA_SPCA1528=m +CONFIG_USB_GSPCA_SQ905=m +CONFIG_USB_GSPCA_SQ905C=m +CONFIG_USB_GSPCA_SQ930X=m +CONFIG_USB_GSPCA_STK014=m +CONFIG_USB_GSPCA_STK1135=m +CONFIG_USB_GSPCA_STV0680=m +CONFIG_USB_GSPCA_SUNPLUS=m +CONFIG_USB_GSPCA_T613=m +CONFIG_USB_GSPCA_TOPRO=m +CONFIG_USB_GSPCA_TOUPTEK=m +CONFIG_USB_GSPCA_TV8532=m +CONFIG_USB_GSPCA_VC032X=m +CONFIG_USB_GSPCA_VICAM=m +CONFIG_USB_GSPCA_XIRLINK_CIT=m +CONFIG_USB_GSPCA_ZC3XX=m +CONFIG_USB_PWC=m +# CONFIG_USB_PWC_DEBUG is not set +CONFIG_USB_PWC_INPUT_EVDEV=y +CONFIG_VIDEO_CPIA2=m +CONFIG_USB_ZR364XX=m +CONFIG_USB_STKWEBCAM=m +CONFIG_USB_S2255=m +CONFIG_VIDEO_USBTV=m + +# +# Analog TV USB devices +# +CONFIG_VIDEO_PVRUSB2=m +CONFIG_VIDEO_PVRUSB2_SYSFS=y +CONFIG_VIDEO_PVRUSB2_DVB=y +# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set +CONFIG_VIDEO_HDPVR=m +CONFIG_VIDEO_USBVISION=m +CONFIG_VIDEO_STK1160_COMMON=m +CONFIG_VIDEO_STK1160=m +CONFIG_VIDEO_GO7007=m +CONFIG_VIDEO_GO7007_USB=m +CONFIG_VIDEO_GO7007_LOADER=m +CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m + +# +# Analog/digital TV USB devices +# +CONFIG_VIDEO_AU0828=m +CONFIG_VIDEO_AU0828_V4L2=y +CONFIG_VIDEO_AU0828_RC=y +CONFIG_VIDEO_CX231XX=m +CONFIG_VIDEO_CX231XX_RC=y +CONFIG_VIDEO_CX231XX_ALSA=m +CONFIG_VIDEO_CX231XX_DVB=m +# CONFIG_VIDEO_TM6000 is not set + +# +# Digital TV USB devices +# +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_DIB3000MC=m +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_DIBUSB_MB=m +CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIB0700=m +CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_CXUSB=m +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_VP7045=m +CONFIG_DVB_USB_VP702X=m +CONFIG_DVB_USB_GP8PSK=m +CONFIG_DVB_USB_NOVA_T_USB2=m +CONFIG_DVB_USB_TTUSB2=m +CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_USB_OPERA1=m +CONFIG_DVB_USB_AF9005=m +CONFIG_DVB_USB_AF9005_REMOTE=m +CONFIG_DVB_USB_PCTV452E=m +CONFIG_DVB_USB_DW2102=m +CONFIG_DVB_USB_CINERGY_T2=m +CONFIG_DVB_USB_DTV5100=m +CONFIG_DVB_USB_AZ6027=m +CONFIG_DVB_USB_TECHNISAT_USB2=m +CONFIG_DVB_USB_V2=m +CONFIG_DVB_USB_AF9015=m +CONFIG_DVB_USB_AF9035=m +CONFIG_DVB_USB_ANYSEE=m +CONFIG_DVB_USB_AU6610=m +CONFIG_DVB_USB_AZ6007=m +CONFIG_DVB_USB_CE6230=m +CONFIG_DVB_USB_EC168=m +CONFIG_DVB_USB_GL861=m +CONFIG_DVB_USB_LME2510=m +CONFIG_DVB_USB_MXL111SF=m +CONFIG_DVB_USB_RTL28XXU=m +CONFIG_DVB_USB_DVBSKY=m +# CONFIG_DVB_USB_ZD1301 is not set +CONFIG_DVB_TTUSB_BUDGET=m +CONFIG_DVB_TTUSB_DEC=m +CONFIG_SMS_USB_DRV=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set +CONFIG_DVB_AS102=m + +# +# Webcam, TV (analog/digital) USB devices +# +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_V4L2=m +CONFIG_VIDEO_EM28XX_ALSA=m +CONFIG_VIDEO_EM28XX_DVB=m +CONFIG_VIDEO_EM28XX_RC=m + +# +# Software defined radio USB devices +# +CONFIG_USB_AIRSPY=m +CONFIG_USB_HACKRF=m +CONFIG_USB_MSI2500=m + +# +# USB HDMI CEC adapters +# +CONFIG_USB_PULSE8_CEC=m +CONFIG_USB_RAINSHADOW_CEC=m +CONFIG_MEDIA_PCI_SUPPORT=y + +# +# Media capture support +# +CONFIG_VIDEO_SOLO6X10=m +CONFIG_VIDEO_TW5864=m +CONFIG_VIDEO_TW68=m +CONFIG_VIDEO_TW686X=m + +# +# Media capture/analog TV support +# +CONFIG_VIDEO_IVTV=m +# CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set +CONFIG_VIDEO_IVTV_ALSA=m +CONFIG_VIDEO_FB_IVTV=m +CONFIG_VIDEO_HEXIUM_GEMINI=m +CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_MXB=m +CONFIG_VIDEO_DT3155=m + +# +# Media capture/analog/hybrid TV support +# +CONFIG_VIDEO_CX18=m +CONFIG_VIDEO_CX18_ALSA=m +CONFIG_VIDEO_CX23885=m +CONFIG_MEDIA_ALTERA_CI=m +# CONFIG_VIDEO_CX25821 is not set +CONFIG_VIDEO_CX88=m +CONFIG_VIDEO_CX88_ALSA=m +CONFIG_VIDEO_CX88_BLACKBIRD=m +CONFIG_VIDEO_CX88_DVB=m +CONFIG_VIDEO_CX88_ENABLE_VP3054=y +CONFIG_VIDEO_CX88_VP3054=m +CONFIG_VIDEO_CX88_MPEG=m +CONFIG_VIDEO_BT848=m +CONFIG_DVB_BT8XX=m +CONFIG_VIDEO_SAA7134=m +CONFIG_VIDEO_SAA7134_ALSA=m +CONFIG_VIDEO_SAA7134_RC=y +CONFIG_VIDEO_SAA7134_DVB=m +# CONFIG_VIDEO_SAA7134_GO7007 is not set +CONFIG_VIDEO_SAA7164=m + +# +# Media digital TV PCI Adapters +# +CONFIG_DVB_AV7110_IR=y +CONFIG_DVB_AV7110=m +CONFIG_DVB_AV7110_OSD=y +CONFIG_DVB_BUDGET_CORE=m +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +CONFIG_DVB_BUDGET_AV=m +CONFIG_DVB_BUDGET_PATCH=m +CONFIG_DVB_B2C2_FLEXCOP_PCI=m +# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set +CONFIG_DVB_PLUTO2=m +CONFIG_DVB_DM1105=m +CONFIG_DVB_PT1=m +CONFIG_DVB_PT3=m +CONFIG_MANTIS_CORE=m +CONFIG_DVB_MANTIS=m +CONFIG_DVB_HOPPER=m +CONFIG_DVB_NGENE=m +CONFIG_DVB_DDBRIDGE=m +# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set +CONFIG_DVB_SMIPCIE=m +CONFIG_DVB_NETUP_UNIDVB=m +CONFIG_V4L_PLATFORM_DRIVERS=y +CONFIG_VIDEO_CAFE_CCIC=m +CONFIG_VIDEO_CADENCE=y +CONFIG_VIDEO_CADENCE_CSI2RX=m +CONFIG_VIDEO_CADENCE_CSI2TX=m +# CONFIG_VIDEO_MUX is not set +CONFIG_VIDEO_OMAP3=m +# CONFIG_VIDEO_OMAP3_DEBUG is not set +# CONFIG_SOC_CAMERA is not set +# CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS is not set +# CONFIG_VIDEO_XILINX is not set +# CONFIG_VIDEO_TI_CAL is not set +CONFIG_V4L_MEM2MEM_DRIVERS=y +# CONFIG_VIDEO_CODA is not set +# CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set +# CONFIG_VIDEO_SAMSUNG_S5P_G2D is not set +# CONFIG_VIDEO_SAMSUNG_S5P_JPEG is not set +# CONFIG_VIDEO_SAMSUNG_S5P_MFC is not set +# CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC is not set +# CONFIG_VIDEO_SH_VEU is not set +CONFIG_VIDEO_ROCKCHIP_RGA=m +CONFIG_VIDEO_TI_VPE=m +# CONFIG_VIDEO_TI_VPE_DEBUG is not set +CONFIG_VIDEO_TI_VPDMA=m +CONFIG_VIDEO_TI_SC=m +CONFIG_VIDEO_TI_CSC=m +CONFIG_V4L_TEST_DRIVERS=y +# CONFIG_VIDEO_VIMC is not set +CONFIG_VIDEO_VIVID=m +CONFIG_VIDEO_VIVID_CEC=y +CONFIG_VIDEO_VIVID_MAX_DEVS=64 +# CONFIG_VIDEO_VIM2M is not set +# CONFIG_VIDEO_VICODEC is not set +# CONFIG_DVB_PLATFORM_DRIVERS is not set +# CONFIG_CEC_PLATFORM_DRIVERS is not set +# CONFIG_SDR_PLATFORM_DRIVERS is not set + +# +# Supported MMC/SDIO adapters +# +CONFIG_SMS_SDIO_DRV=m +CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_TEA575X=m +CONFIG_RADIO_SI470X=y +CONFIG_USB_SI470X=m +# CONFIG_I2C_SI470X is not set +CONFIG_RADIO_SI4713=m +# CONFIG_USB_SI4713 is not set +# CONFIG_PLATFORM_SI4713 is not set +CONFIG_I2C_SI4713=m +CONFIG_USB_MR800=m +# CONFIG_USB_DSBR is not set +# CONFIG_RADIO_MAXIRADIO is not set +CONFIG_RADIO_SHARK=m +CONFIG_RADIO_SHARK2=m +CONFIG_USB_KEENE=m +CONFIG_USB_RAREMONO=m +CONFIG_USB_MA901=m +# CONFIG_RADIO_TEA5764 is not set +# CONFIG_RADIO_SAA7706H is not set +# CONFIG_RADIO_TEF6862 is not set +# CONFIG_RADIO_WL1273 is not set + +# +# Texas Instruments WL128x FM driver (ST based) +# +CONFIG_RADIO_WL128X=m + +# +# Supported FireWire (IEEE 1394) Adapters +# +CONFIG_DVB_FIREDTV=m +CONFIG_DVB_FIREDTV_INPUT=y +CONFIG_MEDIA_COMMON_OPTIONS=y + +# +# common driver options +# +CONFIG_VIDEO_CX2341X=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_CYPRESS_FIRMWARE=m +CONFIG_VIDEOBUF2_CORE=m +CONFIG_VIDEOBUF2_V4L2=m +CONFIG_VIDEOBUF2_MEMOPS=m +CONFIG_VIDEOBUF2_DMA_CONTIG=m +CONFIG_VIDEOBUF2_VMALLOC=m +CONFIG_VIDEOBUF2_DMA_SG=m +CONFIG_VIDEOBUF2_DVB=m +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_SMS_SIANO_MDTV=m +CONFIG_SMS_SIANO_RC=y +# CONFIG_SMS_SIANO_DEBUGFS is not set +CONFIG_VIDEO_V4L2_TPG=m + +# +# Media ancillary drivers (tuners, sensors, i2c, spi, frontends) +# +CONFIG_MEDIA_SUBDRV_AUTOSELECT=y +CONFIG_MEDIA_ATTACH=y +CONFIG_VIDEO_IR_I2C=y + +# +# Audio decoders, processors and mixers +# +CONFIG_VIDEO_TVAUDIO=m +CONFIG_VIDEO_TDA7432=m +CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TEA6415C=m +CONFIG_VIDEO_TEA6420=m +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_CS3308=m +CONFIG_VIDEO_CS5345=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_UDA1342=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_VP27SMPX=m +CONFIG_VIDEO_SONY_BTF_MPX=m + +# +# RDS decoders +# +CONFIG_VIDEO_SAA6588=m + +# +# Video decoders +# +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_TW2804=m +CONFIG_VIDEO_TW9903=m +CONFIG_VIDEO_TW9906=m + +# +# Video and audio decoders +# +CONFIG_VIDEO_SAA717X=m +CONFIG_VIDEO_CX25840=m + +# +# Video encoders +# +CONFIG_VIDEO_SAA7127=m + +# +# Camera sensor devices +# +CONFIG_VIDEO_OV2640=m +CONFIG_VIDEO_OV7640=m +CONFIG_VIDEO_OV7670=m +CONFIG_VIDEO_MT9V011=m + +# +# Flash devices +# + +# +# Video improvement chips +# +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m + +# +# Audio/Video compression chips +# +CONFIG_VIDEO_SAA6752HS=m + +# +# SDR tuner chips +# + +# +# Miscellaneous helper chips +# +CONFIG_VIDEO_M52790=m + +# +# Sensors used on soc_camera driver +# + +# +# Media SPI Adapters +# +# CONFIG_CXD2880_SPI_DRV is not set +CONFIG_MEDIA_TUNER=y +CONFIG_MEDIA_TUNER_SIMPLE=y +CONFIG_MEDIA_TUNER_TDA18250=m +CONFIG_MEDIA_TUNER_TDA8290=y +CONFIG_MEDIA_TUNER_TDA827X=y +CONFIG_MEDIA_TUNER_TDA18271=y +CONFIG_MEDIA_TUNER_TDA9887=y +CONFIG_MEDIA_TUNER_TEA5761=y +CONFIG_MEDIA_TUNER_TEA5767=y +CONFIG_MEDIA_TUNER_MSI001=m +CONFIG_MEDIA_TUNER_MT20XX=y +CONFIG_MEDIA_TUNER_MT2060=m +CONFIG_MEDIA_TUNER_MT2063=m +CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_MT2131=m +CONFIG_MEDIA_TUNER_QT1010=m +CONFIG_MEDIA_TUNER_XC2028=y +CONFIG_MEDIA_TUNER_XC5000=y +CONFIG_MEDIA_TUNER_XC4000=y +CONFIG_MEDIA_TUNER_MXL5005S=m +CONFIG_MEDIA_TUNER_MXL5007T=m +CONFIG_MEDIA_TUNER_MC44S803=y +CONFIG_MEDIA_TUNER_MAX2165=m +CONFIG_MEDIA_TUNER_TDA18218=m +CONFIG_MEDIA_TUNER_FC0011=m +CONFIG_MEDIA_TUNER_FC0012=m +CONFIG_MEDIA_TUNER_FC0013=m +CONFIG_MEDIA_TUNER_TDA18212=m +CONFIG_MEDIA_TUNER_E4000=m +CONFIG_MEDIA_TUNER_FC2580=m +CONFIG_MEDIA_TUNER_M88RS6000T=m +CONFIG_MEDIA_TUNER_TUA9001=m +CONFIG_MEDIA_TUNER_SI2157=m +CONFIG_MEDIA_TUNER_IT913X=m +CONFIG_MEDIA_TUNER_R820T=m +CONFIG_MEDIA_TUNER_MXL301RF=m +CONFIG_MEDIA_TUNER_QM1D1C0042=m +CONFIG_MEDIA_TUNER_QM1D1B0004=m + +# +# Multistandard (satellite) frontends +# +CONFIG_DVB_STB0899=m +CONFIG_DVB_STB6100=m +CONFIG_DVB_STV090x=m +CONFIG_DVB_STV0910=m +CONFIG_DVB_STV6110x=m +CONFIG_DVB_STV6111=m +CONFIG_DVB_MXL5XX=m +CONFIG_DVB_M88DS3103=m + +# +# Multistandard (cable + terrestrial) frontends +# +CONFIG_DVB_DRXK=m +CONFIG_DVB_TDA18271C2DD=m +CONFIG_DVB_SI2165=m +CONFIG_DVB_MN88472=m +CONFIG_DVB_MN88473=m + +# +# DVB-S (satellite) frontends +# +CONFIG_DVB_CX24110=m +CONFIG_DVB_CX24123=m +CONFIG_DVB_MT312=m +CONFIG_DVB_ZL10036=m +CONFIG_DVB_ZL10039=m +CONFIG_DVB_S5H1420=m +CONFIG_DVB_STV0288=m +CONFIG_DVB_STB6000=m +CONFIG_DVB_STV0299=m +CONFIG_DVB_STV6110=m +CONFIG_DVB_STV0900=m +CONFIG_DVB_TDA8083=m +CONFIG_DVB_TDA10086=m +CONFIG_DVB_TDA8261=m +CONFIG_DVB_VES1X93=m +CONFIG_DVB_TUNER_ITD1000=m +CONFIG_DVB_TUNER_CX24113=m +CONFIG_DVB_TDA826X=m +CONFIG_DVB_TUA6100=m +CONFIG_DVB_CX24116=m +CONFIG_DVB_CX24117=m +CONFIG_DVB_CX24120=m +CONFIG_DVB_SI21XX=m +CONFIG_DVB_TS2020=m +CONFIG_DVB_DS3000=m +CONFIG_DVB_MB86A16=m +CONFIG_DVB_TDA10071=m + +# +# DVB-T (terrestrial) frontends +# +CONFIG_DVB_SP8870=m +CONFIG_DVB_SP887X=m +CONFIG_DVB_CX22700=m +CONFIG_DVB_CX22702=m +CONFIG_DVB_DRXD=m +CONFIG_DVB_L64781=m +CONFIG_DVB_TDA1004X=m +CONFIG_DVB_NXT6000=m +CONFIG_DVB_MT352=m +CONFIG_DVB_ZL10353=m +CONFIG_DVB_DIB3000MB=m +CONFIG_DVB_DIB3000MC=m +CONFIG_DVB_DIB7000M=m +CONFIG_DVB_DIB7000P=m +CONFIG_DVB_TDA10048=m +CONFIG_DVB_AF9013=m +CONFIG_DVB_EC100=m +CONFIG_DVB_STV0367=m +CONFIG_DVB_CXD2820R=m +CONFIG_DVB_CXD2841ER=m +CONFIG_DVB_RTL2830=m +CONFIG_DVB_RTL2832=m +CONFIG_DVB_RTL2832_SDR=m +CONFIG_DVB_SI2168=m +CONFIG_DVB_AS102_FE=m +CONFIG_DVB_GP8PSK_FE=m + +# +# DVB-C (cable) frontends +# +CONFIG_DVB_VES1820=m +CONFIG_DVB_TDA10021=m +CONFIG_DVB_TDA10023=m +CONFIG_DVB_STV0297=m + +# +# ATSC (North American/Korean Terrestrial/Cable DTV) frontends +# +CONFIG_DVB_NXT200X=m +CONFIG_DVB_OR51211=m +CONFIG_DVB_OR51132=m +CONFIG_DVB_BCM3510=m +CONFIG_DVB_LGDT330X=m +CONFIG_DVB_LGDT3305=m +CONFIG_DVB_LGDT3306A=m +CONFIG_DVB_LG2160=m +CONFIG_DVB_S5H1409=m +CONFIG_DVB_AU8522=m +CONFIG_DVB_AU8522_DTV=m +CONFIG_DVB_AU8522_V4L=m +CONFIG_DVB_S5H1411=m + +# +# ISDB-T (terrestrial) frontends +# +CONFIG_DVB_S921=m +CONFIG_DVB_DIB8000=m +CONFIG_DVB_MB86A20S=m + +# +# ISDB-S (satellite) & ISDB-T (terrestrial) frontends +# +CONFIG_DVB_TC90522=m + +# +# Digital terrestrial only tuners/PLL +# +CONFIG_DVB_PLL=m +CONFIG_DVB_TUNER_DIB0070=m +CONFIG_DVB_TUNER_DIB0090=m + +# +# SEC control devices for DVB-S +# +CONFIG_DVB_DRX39XYJ=m +CONFIG_DVB_LNBH25=m +CONFIG_DVB_LNBP21=m +CONFIG_DVB_LNBP22=m +CONFIG_DVB_ISL6405=m +CONFIG_DVB_ISL6421=m +CONFIG_DVB_ISL6423=m +CONFIG_DVB_A8293=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m +CONFIG_DVB_TDA665x=m +CONFIG_DVB_IX2505V=m +CONFIG_DVB_M88RS2000=m +CONFIG_DVB_AF9033=m +CONFIG_DVB_HORUS3A=m +CONFIG_DVB_ASCOT2E=m +CONFIG_DVB_HELENE=m + +# +# Common Interface (EN50221) controller drivers +# +CONFIG_DVB_CXD2099=m +CONFIG_DVB_SP2=m + +# +# Tools to develop new frontends +# +CONFIG_DVB_DUMMY_FE=m + +# +# Graphics support +# +CONFIG_VGA_ARB=y +CONFIG_VGA_ARB_MAX_GPUS=16 +# CONFIG_TEGRA_HOST1X is not set +CONFIG_IMX_IPUV3_CORE=m +CONFIG_DRM=m +CONFIG_DRM_MIPI_DSI=y +# CONFIG_DRM_DP_AUX_CHARDEV is not set +# CONFIG_DRM_DEBUG_SELFTEST is not set +CONFIG_DRM_KMS_HELPER=m +CONFIG_DRM_KMS_FB_HELPER=y +CONFIG_DRM_FBDEV_EMULATION=y +CONFIG_DRM_FBDEV_OVERALLOC=100 +CONFIG_DRM_LOAD_EDID_FIRMWARE=y +# CONFIG_DRM_DP_CEC is not set +CONFIG_DRM_TTM=m +CONFIG_DRM_GEM_CMA_HELPER=y +CONFIG_DRM_KMS_CMA_HELPER=y +CONFIG_DRM_VM=y +CONFIG_DRM_SCHED=m + +# +# I2C encoder or helper chips +# +# CONFIG_DRM_I2C_CH7006 is not set +# CONFIG_DRM_I2C_SIL164 is not set +CONFIG_DRM_I2C_NXP_TDA998X=m +CONFIG_DRM_I2C_NXP_TDA9950=m +# CONFIG_DRM_HDLCD is not set +# CONFIG_DRM_MALI_DISPLAY is not set +# CONFIG_DRM_RADEON is not set +# CONFIG_DRM_AMDGPU is not set + +# +# ACP (Audio CoProcessor) Configuration +# + +# +# AMD Library routines +# +# CONFIG_DRM_NOUVEAU is not set +CONFIG_DRM_VGEM=m +# CONFIG_DRM_VKMS is not set +CONFIG_DRM_EXYNOS=m + +# +# CRTCs +# +CONFIG_DRM_EXYNOS_FIMD=y +# CONFIG_DRM_EXYNOS5433_DECON is not set +# CONFIG_DRM_EXYNOS7_DECON is not set +CONFIG_DRM_EXYNOS_MIXER=y +# CONFIG_DRM_EXYNOS_VIDI is not set + +# +# Encoders and Bridges +# +# CONFIG_DRM_EXYNOS_DPI is not set +CONFIG_DRM_EXYNOS_DSI=y +CONFIG_DRM_EXYNOS_DP=y +CONFIG_DRM_EXYNOS_HDMI=y + +# +# Sub-drivers +# +# CONFIG_DRM_EXYNOS_G2D is not set +# CONFIG_DRM_EXYNOS_FIMC is not set +# CONFIG_DRM_EXYNOS_ROTATOR is not set +# CONFIG_DRM_EXYNOS_SCALER is not set +# CONFIG_DRM_EXYNOS_GSC is not set +CONFIG_DRM_ROCKCHIP=m +CONFIG_ROCKCHIP_ANALOGIX_DP=y +# CONFIG_ROCKCHIP_CDN_DP is not set +CONFIG_ROCKCHIP_DW_HDMI=y +CONFIG_ROCKCHIP_DW_MIPI_DSI=y +# CONFIG_ROCKCHIP_INNO_HDMI is not set +CONFIG_ROCKCHIP_LVDS=y +CONFIG_DRM_UDL=m +# CONFIG_DRM_AST is not set +# CONFIG_DRM_MGAG200 is not set +CONFIG_DRM_CIRRUS_QEMU=m +# CONFIG_DRM_ARMADA is not set +# CONFIG_DRM_RCAR_DW_HDMI is not set +# CONFIG_DRM_RCAR_LVDS is not set +# CONFIG_DRM_SUN4I is not set +CONFIG_DRM_OMAP=m +CONFIG_OMAP2_DSS_INIT=y +CONFIG_OMAP_DSS_BASE=m +CONFIG_OMAP2_DSS=m +# CONFIG_OMAP2_DSS_DEBUG is not set +# CONFIG_OMAP2_DSS_DEBUGFS is not set +CONFIG_OMAP2_DSS_DPI=y +CONFIG_OMAP2_DSS_VENC=y +CONFIG_OMAP2_DSS_HDMI_COMMON=y +CONFIG_OMAP4_DSS_HDMI=y +CONFIG_OMAP4_DSS_HDMI_CEC=y +CONFIG_OMAP5_DSS_HDMI=y +CONFIG_OMAP2_DSS_SDI=y +CONFIG_OMAP2_DSS_DSI=y +CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0 +CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET=y + +# +# OMAPDRM External Display Device Drivers +# +# CONFIG_DRM_OMAP_ENCODER_OPA362 is not set +# CONFIG_DRM_OMAP_ENCODER_TFP410 is not set +CONFIG_DRM_OMAP_ENCODER_TPD12S015=m +# CONFIG_DRM_OMAP_CONNECTOR_DVI is not set +CONFIG_DRM_OMAP_CONNECTOR_HDMI=m +CONFIG_DRM_OMAP_CONNECTOR_ANALOG_TV=m +# CONFIG_DRM_OMAP_PANEL_DPI is not set +# CONFIG_DRM_OMAP_PANEL_DSI_CM is not set +CONFIG_DRM_OMAP_PANEL_SONY_ACX565AKM=m +# CONFIG_DRM_OMAP_PANEL_LGPHILIPS_LB035Q02 is not set +# CONFIG_DRM_OMAP_PANEL_SHARP_LS037V7DW01 is not set +CONFIG_DRM_OMAP_PANEL_TPO_TD028TTEC1=m +CONFIG_DRM_OMAP_PANEL_TPO_TD043MTEA1=m +# CONFIG_DRM_OMAP_PANEL_NEC_NL8048HL11 is not set +CONFIG_DRM_TILCDC=m +CONFIG_DRM_QXL=m +CONFIG_DRM_BOCHS=m +CONFIG_DRM_VIRTIO_GPU=m +# CONFIG_DRM_FSL_DCU is not set +# CONFIG_DRM_TEGRA is not set +# CONFIG_DRM_STM is not set +CONFIG_DRM_PANEL=y + +# +# Display Panels +# +CONFIG_DRM_PANEL_ARM_VERSATILE=m +# CONFIG_DRM_PANEL_LVDS is not set +CONFIG_DRM_PANEL_SIMPLE=m +CONFIG_DRM_PANEL_ILITEK_IL9322=m +CONFIG_DRM_PANEL_ILITEK_ILI9881C=m +# CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set +# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set +# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set +# CONFIG_DRM_PANEL_LG_LG4573 is not set +# CONFIG_DRM_PANEL_ORISETECH_OTM8009A is not set +# CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set +CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m +# CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set +# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set +# CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set +# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set +# CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set +# CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set +# CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set +# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set +CONFIG_DRM_BRIDGE=y +CONFIG_DRM_PANEL_BRIDGE=y + +# +# Display Interface Bridges +# +# CONFIG_DRM_ANALOGIX_ANX78XX is not set +CONFIG_DRM_CDNS_DSI=m +# CONFIG_DRM_DUMB_VGA_DAC is not set +# CONFIG_DRM_LVDS_ENCODER is not set +# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set +# CONFIG_DRM_NXP_PTN3460 is not set +# CONFIG_DRM_PARADE_PS8622 is not set +# CONFIG_DRM_SIL_SII8620 is not set +# CONFIG_DRM_SII902X is not set +# CONFIG_DRM_SII9234 is not set +# CONFIG_DRM_THINE_THC63LVD1024 is not set +# CONFIG_DRM_TOSHIBA_TC358767 is not set +# CONFIG_DRM_TI_TFP410 is not set +CONFIG_DRM_ANALOGIX_DP=m +# CONFIG_DRM_I2C_ADV7511 is not set +CONFIG_DRM_DW_HDMI=m +# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set +# CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set +CONFIG_DRM_DW_HDMI_CEC=m +# CONFIG_DRM_STI is not set +CONFIG_DRM_IMX=m +# CONFIG_DRM_IMX_PARALLEL_DISPLAY is not set +# CONFIG_DRM_IMX_TVE is not set +CONFIG_DRM_IMX_LDB=m +CONFIG_DRM_IMX_HDMI=m +CONFIG_DRM_V3D=m +CONFIG_DRM_VC4=m +# CONFIG_DRM_VC4_HDMI_CEC is not set +CONFIG_DRM_ETNAVIV=m +CONFIG_DRM_ETNAVIV_THERMAL=y +# CONFIG_DRM_ARCPGU is not set +# CONFIG_DRM_HISI_HIBMC is not set +# CONFIG_DRM_MXSFB is not set +# CONFIG_DRM_TINYDRM is not set +# CONFIG_DRM_PL111 is not set +# CONFIG_DRM_TVE200 is not set +# CONFIG_DRM_XEN is not set +CONFIG_DRM_LEGACY=y +# CONFIG_DRM_TDFX is not set +# CONFIG_DRM_R128 is not set +# CONFIG_DRM_MGA is not set +CONFIG_DRM_VIA=m +CONFIG_DRM_SAVAGE=m +CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y + +# +# Frame buffer Devices +# +CONFIG_FB=y +CONFIG_FIRMWARE_EDID=y +CONFIG_FB_CMDLINE=y +CONFIG_FB_NOTIFY=y +CONFIG_FB_DDC=m +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +CONFIG_FB_SYS_FILLRECT=y +CONFIG_FB_SYS_COPYAREA=y +CONFIG_FB_SYS_IMAGEBLIT=y +# CONFIG_FB_FOREIGN_ENDIAN is not set +CONFIG_FB_SYS_FOPS=y +CONFIG_FB_DEFERRED_IO=y +CONFIG_FB_SVGALIB=m +CONFIG_FB_BACKLIGHT=y +CONFIG_FB_MODE_HELPERS=y +CONFIG_FB_TILEBLITTING=y + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_CIRRUS is not set +# CONFIG_FB_PM2 is not set +CONFIG_FB_ARMCLCD=y +CONFIG_PLAT_VERSATILE_CLCD=y +# CONFIG_FB_IMX is not set +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_ASILIANT is not set +# CONFIG_FB_IMSTT is not set +# CONFIG_FB_UVESA is not set +CONFIG_FB_EFI=y +# CONFIG_FB_OPENCORES is not set +# CONFIG_FB_S1D13XXX is not set +CONFIG_FB_NVIDIA=m +# CONFIG_FB_NVIDIA_I2C is not set +# CONFIG_FB_NVIDIA_DEBUG is not set +CONFIG_FB_NVIDIA_BACKLIGHT=y +CONFIG_FB_RIVA=m +# CONFIG_FB_RIVA_I2C is not set +# CONFIG_FB_RIVA_DEBUG is not set +CONFIG_FB_RIVA_BACKLIGHT=y +# CONFIG_FB_I740 is not set +# CONFIG_FB_MATROX is not set +# CONFIG_FB_RADEON is not set +# CONFIG_FB_ATY128 is not set +# CONFIG_FB_ATY is not set +CONFIG_FB_S3=m +CONFIG_FB_S3_DDC=y +# CONFIG_FB_SAVAGE is not set +# CONFIG_FB_SIS is not set +# CONFIG_FB_NEOMAGIC is not set +# CONFIG_FB_KYRO is not set +CONFIG_FB_3DFX=m +# CONFIG_FB_3DFX_ACCEL is not set +CONFIG_FB_3DFX_I2C=y +# CONFIG_FB_VOODOO1 is not set +CONFIG_FB_VT8623=m +# CONFIG_FB_TRIDENT is not set +CONFIG_FB_ARK=m +CONFIG_FB_PM3=m +# CONFIG_FB_CARMINE is not set +CONFIG_FB_VT8500=y +CONFIG_FB_WM8505=y +# CONFIG_FB_WMT_GE_ROPS is not set +CONFIG_FB_SMSCUFX=m +CONFIG_FB_UDL=m +# CONFIG_FB_IBM_GXT4500 is not set +# CONFIG_FB_DA8XX is not set +# CONFIG_FB_VIRTUAL is not set +CONFIG_XEN_FBDEV_FRONTEND=y +# CONFIG_FB_METRONOME is not set +CONFIG_FB_MB862XX=m +CONFIG_FB_MB862XX_PCI_GDC=y +CONFIG_FB_MB862XX_I2C=y +CONFIG_FB_MX3=y +# CONFIG_FB_BROADSHEET is not set +# CONFIG_FB_MXS is not set +CONFIG_FB_SIMPLE=y +# CONFIG_FB_SSD1307 is not set +# CONFIG_FB_SM712 is not set +CONFIG_BACKLIGHT_LCD_SUPPORT=y +# CONFIG_LCD_CLASS_DEVICE is not set +CONFIG_BACKLIGHT_CLASS_DEVICE=y +# CONFIG_BACKLIGHT_GENERIC is not set +CONFIG_BACKLIGHT_PWM=m +# CONFIG_BACKLIGHT_DA9052 is not set +# CONFIG_BACKLIGHT_PM8941_WLED is not set +# CONFIG_BACKLIGHT_ADP8860 is not set +# CONFIG_BACKLIGHT_ADP8870 is not set +# CONFIG_BACKLIGHT_LM3630A is not set +# CONFIG_BACKLIGHT_LM3639 is not set +# CONFIG_BACKLIGHT_LP855X is not set +CONFIG_BACKLIGHT_PANDORA=m +CONFIG_BACKLIGHT_GPIO=m +# CONFIG_BACKLIGHT_LV5207LP is not set +# CONFIG_BACKLIGHT_BD6107 is not set +# CONFIG_BACKLIGHT_ARCXCNN is not set +CONFIG_VGASTATE=m +CONFIG_VIDEOMODE_HELPERS=y +CONFIG_HDMI=y + +# +# Console display driver support +# +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set +# CONFIG_LOGO is not set +CONFIG_SOUND=m +CONFIG_SOUND_OSS_CORE=y +# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +CONFIG_SND_PCM_ELD=y +CONFIG_SND_PCM_IEC958=y +CONFIG_SND_DMAENGINE_PCM=m +CONFIG_SND_HWDEP=m +CONFIG_SND_SEQ_DEVICE=m +CONFIG_SND_RAWMIDI=m +CONFIG_SND_JACK=y +CONFIG_SND_JACK_INPUT_DEV=y +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y +CONFIG_SND_PCM_TIMER=y +CONFIG_SND_HRTIMER=m +CONFIG_SND_DYNAMIC_MINORS=y +CONFIG_SND_MAX_CARDS=32 +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_PROC_FS=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set +CONFIG_SND_VMASTER=y +CONFIG_SND_SEQUENCER=m +CONFIG_SND_SEQ_DUMMY=m +# CONFIG_SND_SEQUENCER_OSS is not set +CONFIG_SND_SEQ_HRTIMER_DEFAULT=y +CONFIG_SND_SEQ_MIDI_EVENT=m +CONFIG_SND_SEQ_MIDI=m +CONFIG_SND_SEQ_MIDI_EMUL=m +CONFIG_SND_MPU401_UART=m +CONFIG_SND_OPL3_LIB=m +CONFIG_SND_OPL3_LIB_SEQ=m +CONFIG_SND_AC97_CODEC=m +CONFIG_SND_DRIVERS=y +# CONFIG_SND_DUMMY is not set +CONFIG_SND_ALOOP=m +# CONFIG_SND_VIRMIDI is not set +# CONFIG_SND_MTPAV is not set +CONFIG_SND_MTS64=m +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set +CONFIG_SND_PORTMAN2X4=m +CONFIG_SND_AC97_POWER_SAVE=y +CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 +CONFIG_SND_PCI=y +CONFIG_SND_AD1889=m +# CONFIG_SND_ATIIXP is not set +# CONFIG_SND_ATIIXP_MODEM is not set +# CONFIG_SND_AU8810 is not set +# CONFIG_SND_AU8820 is not set +# CONFIG_SND_AU8830 is not set +# CONFIG_SND_AW2 is not set +# CONFIG_SND_BT87X is not set +# CONFIG_SND_CA0106 is not set +# CONFIG_SND_CMIPCI is not set +CONFIG_SND_OXYGEN_LIB=m +CONFIG_SND_OXYGEN=m +# CONFIG_SND_CS4281 is not set +# CONFIG_SND_CS46XX is not set +CONFIG_SND_CTXFI=m +CONFIG_SND_DARLA20=m +CONFIG_SND_GINA20=m +CONFIG_SND_LAYLA20=m +CONFIG_SND_DARLA24=m +CONFIG_SND_GINA24=m +CONFIG_SND_LAYLA24=m +CONFIG_SND_MONA=m +CONFIG_SND_MIA=m +CONFIG_SND_ECHO3G=m +CONFIG_SND_INDIGO=m +CONFIG_SND_INDIGOIO=m +CONFIG_SND_INDIGODJ=m +CONFIG_SND_INDIGOIOX=m +CONFIG_SND_INDIGODJX=m +# CONFIG_SND_ENS1370 is not set +# CONFIG_SND_ENS1371 is not set +# CONFIG_SND_FM801 is not set +# CONFIG_SND_HDSP is not set +CONFIG_SND_HDSPM=m +# CONFIG_SND_ICE1724 is not set +# CONFIG_SND_INTEL8X0 is not set +# CONFIG_SND_INTEL8X0M is not set +# CONFIG_SND_KORG1212 is not set +CONFIG_SND_LOLA=m +# CONFIG_SND_MIXART is not set +# CONFIG_SND_NM256 is not set +CONFIG_SND_PCXHR=m +CONFIG_SND_RIPTIDE=m +# CONFIG_SND_RME32 is not set +# CONFIG_SND_RME96 is not set +# CONFIG_SND_RME9652 is not set +# CONFIG_SND_VIA82XX is not set +# CONFIG_SND_VIA82XX_MODEM is not set +CONFIG_SND_VIRTUOSO=m +# CONFIG_SND_VX222 is not set +# CONFIG_SND_YMFPCI is not set + +# +# HD-Audio +# +CONFIG_SND_HDA=m +# CONFIG_SND_HDA_INTEL is not set +CONFIG_SND_HDA_TEGRA=m +CONFIG_SND_HDA_HWDEP=y +CONFIG_SND_HDA_RECONFIG=y +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_INPUT_BEEP_MODE=1 +CONFIG_SND_HDA_PATCH_LOADER=y +CONFIG_SND_HDA_CODEC_REALTEK=m +CONFIG_SND_HDA_CODEC_ANALOG=m +CONFIG_SND_HDA_CODEC_SIGMATEL=m +CONFIG_SND_HDA_CODEC_VIA=m +CONFIG_SND_HDA_CODEC_HDMI=m +CONFIG_SND_HDA_CODEC_CIRRUS=m +CONFIG_SND_HDA_CODEC_CONEXANT=m +CONFIG_SND_HDA_CODEC_CA0110=m +CONFIG_SND_HDA_CODEC_CA0132=m +CONFIG_SND_HDA_CODEC_CA0132_DSP=y +CONFIG_SND_HDA_CODEC_CMEDIA=m +CONFIG_SND_HDA_CODEC_SI3054=m +CONFIG_SND_HDA_GENERIC=m +CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 +CONFIG_SND_HDA_CORE=m +CONFIG_SND_HDA_DSP_LOADER=y +CONFIG_SND_HDA_PREALLOC_SIZE=2048 +CONFIG_SND_ARM=y +# CONFIG_SND_ARMAACI is not set +CONFIG_SND_SPI=y +CONFIG_SND_USB=y +CONFIG_SND_USB_AUDIO=m +CONFIG_SND_USB_UA101=m +CONFIG_SND_USB_CAIAQ=m +CONFIG_SND_USB_CAIAQ_INPUT=y +CONFIG_SND_USB_6FIRE=m +CONFIG_SND_USB_HIFACE=m +CONFIG_SND_BCD2000=m +CONFIG_SND_USB_LINE6=m +CONFIG_SND_USB_POD=m +CONFIG_SND_USB_PODHD=m +CONFIG_SND_USB_TONEPORT=m +CONFIG_SND_USB_VARIAX=m +CONFIG_SND_FIREWIRE=y +CONFIG_SND_FIREWIRE_LIB=m +CONFIG_SND_DICE=m +CONFIG_SND_OXFW=m +CONFIG_SND_ISIGHT=m +CONFIG_SND_FIREWORKS=m +CONFIG_SND_BEBOB=m +CONFIG_SND_FIREWIRE_DIGI00X=m +CONFIG_SND_FIREWIRE_TASCAM=m +# CONFIG_SND_FIREWIRE_MOTU is not set +# CONFIG_SND_FIREFACE is not set +CONFIG_SND_SOC=m +CONFIG_SND_SOC_AC97_BUS=y +CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y +# CONFIG_SND_SOC_AMD_ACP is not set +# CONFIG_SND_ATMEL_SOC is not set +CONFIG_SND_BCM2835_SOC_I2S=m +# CONFIG_SND_EDMA_SOC is not set +CONFIG_SND_DAVINCI_SOC_MCASP=m +# CONFIG_SND_DESIGNWARE_I2S is not set + +# +# SoC Audio for Freescale CPUs +# + +# +# Common SoC Audio options for Freescale CPUs: +# +# CONFIG_SND_SOC_FSL_ASRC is not set +# CONFIG_SND_SOC_FSL_SAI is not set +CONFIG_SND_SOC_FSL_SSI=m +CONFIG_SND_SOC_FSL_SPDIF=m +# CONFIG_SND_SOC_FSL_ESAI is not set +CONFIG_SND_SOC_FSL_UTILS=m +CONFIG_SND_SOC_IMX_PCM_DMA=m +CONFIG_SND_SOC_IMX_AUDMUX=m +CONFIG_SND_IMX_SOC=m +CONFIG_SND_SOC_IMX_SSI=m +CONFIG_SND_SOC_IMX_PCM_FIQ=m + +# +# SoC Audio support for Freescale i.MX boards: +# +CONFIG_SND_SOC_EUKREA_TLV320=m +CONFIG_SND_SOC_IMX_ES8328=m +CONFIG_SND_SOC_IMX_SGTL5000=m +CONFIG_SND_SOC_IMX_SPDIF=m +CONFIG_SND_SOC_IMX_MC13783=m +# CONFIG_SND_SOC_FSL_ASOC_CARD is not set +# CONFIG_SND_I2S_HI6210_I2S is not set +CONFIG_SND_OMAP_SOC=m +CONFIG_SND_SDMA_SOC=m +CONFIG_SND_OMAP_SOC_DMIC=m +CONFIG_SND_OMAP_SOC_MCBSP=m +CONFIG_SND_OMAP_SOC_MCPDM=m +# CONFIG_SND_OMAP_SOC_HDMI_AUDIO is not set +CONFIG_SND_OMAP_SOC_RX51=m +CONFIG_SND_OMAP_SOC_AM3517EVM=m +CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m +CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m +CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m +# CONFIG_SND_KIRKWOOD_SOC is not set +# CONFIG_SND_SOC_IMG is not set +CONFIG_SND_SOC_ROCKCHIP=m +CONFIG_SND_SOC_ROCKCHIP_I2S=m +# CONFIG_SND_SOC_ROCKCHIP_PDM is not set +CONFIG_SND_SOC_ROCKCHIP_SPDIF=m +CONFIG_SND_SOC_ROCKCHIP_MAX98090=m +CONFIG_SND_SOC_ROCKCHIP_RT5645=m +# CONFIG_SND_SOC_RK3288_HDMI_ANALOG is not set +# CONFIG_SND_SOC_RK3399_GRU_SOUND is not set +# CONFIG_SND_SOC_SAMSUNG is not set + +# +# STMicroelectronics STM32 SOC audio support +# + +# +# Allwinner SoC Audio support +# +CONFIG_SND_SUN4I_CODEC=m +# CONFIG_SND_SUN8I_CODEC is not set +# CONFIG_SND_SUN8I_CODEC_ANALOG is not set +# CONFIG_SND_SUN4I_I2S is not set +CONFIG_SND_SUN4I_SPDIF=m +CONFIG_SND_SOC_TEGRA=m +CONFIG_SND_SOC_TEGRA20_AC97=m +CONFIG_SND_SOC_TEGRA20_DAS=m +CONFIG_SND_SOC_TEGRA20_I2S=m +CONFIG_SND_SOC_TEGRA20_SPDIF=m +CONFIG_SND_SOC_TEGRA30_AHUB=m +CONFIG_SND_SOC_TEGRA30_I2S=m +CONFIG_SND_SOC_TEGRA_RT5640=m +CONFIG_SND_SOC_TEGRA_WM8753=m +CONFIG_SND_SOC_TEGRA_WM8903=m +CONFIG_SND_SOC_TEGRA_WM9712=m +CONFIG_SND_SOC_TEGRA_TRIMSLICE=m +CONFIG_SND_SOC_TEGRA_ALC5632=m +CONFIG_SND_SOC_TEGRA_MAX98090=m +CONFIG_SND_SOC_TEGRA_RT5677=m +# CONFIG_SND_SOC_TEGRA_SGTL5000 is not set +# CONFIG_SND_SOC_XTFPGA_I2S is not set +# CONFIG_ZX_TDM is not set +CONFIG_SND_SOC_I2C_AND_SPI=m + +# +# CODEC drivers +# +# CONFIG_SND_SOC_AC97_CODEC is not set +# CONFIG_SND_SOC_ADAU1701 is not set +# CONFIG_SND_SOC_ADAU1761_I2C is not set +# CONFIG_SND_SOC_ADAU1761_SPI is not set +# CONFIG_SND_SOC_ADAU7002 is not set +# CONFIG_SND_SOC_AK4104 is not set +# CONFIG_SND_SOC_AK4458 is not set +# CONFIG_SND_SOC_AK4554 is not set +# CONFIG_SND_SOC_AK4613 is not set +# CONFIG_SND_SOC_AK4642 is not set +# CONFIG_SND_SOC_AK5386 is not set +# CONFIG_SND_SOC_AK5558 is not set +# CONFIG_SND_SOC_ALC5623 is not set +CONFIG_SND_SOC_ALC5632=m +# CONFIG_SND_SOC_BD28623 is not set +# CONFIG_SND_SOC_BT_SCO is not set +# CONFIG_SND_SOC_CS35L32 is not set +# CONFIG_SND_SOC_CS35L33 is not set +# CONFIG_SND_SOC_CS35L34 is not set +# CONFIG_SND_SOC_CS35L35 is not set +# CONFIG_SND_SOC_CS42L42 is not set +# CONFIG_SND_SOC_CS42L51_I2C is not set +# CONFIG_SND_SOC_CS42L52 is not set +# CONFIG_SND_SOC_CS42L56 is not set +# CONFIG_SND_SOC_CS42L73 is not set +# CONFIG_SND_SOC_CS4265 is not set +# CONFIG_SND_SOC_CS4270 is not set +# CONFIG_SND_SOC_CS4271_I2C is not set +# CONFIG_SND_SOC_CS4271_SPI is not set +# CONFIG_SND_SOC_CS42XX8_I2C is not set +# CONFIG_SND_SOC_CS43130 is not set +# CONFIG_SND_SOC_CS4349 is not set +# CONFIG_SND_SOC_CS53L30 is not set +CONFIG_SND_SOC_DMIC=m +CONFIG_SND_SOC_HDMI_CODEC=m +# CONFIG_SND_SOC_ES7134 is not set +# CONFIG_SND_SOC_ES7241 is not set +# CONFIG_SND_SOC_ES8316 is not set +CONFIG_SND_SOC_ES8328=m +CONFIG_SND_SOC_ES8328_I2C=m +CONFIG_SND_SOC_ES8328_SPI=m +# CONFIG_SND_SOC_GTM601 is not set +# CONFIG_SND_SOC_INNO_RK3036 is not set +CONFIG_SND_SOC_MAX98090=m +# CONFIG_SND_SOC_MAX98504 is not set +# CONFIG_SND_SOC_MAX9867 is not set +# CONFIG_SND_SOC_MAX98927 is not set +# CONFIG_SND_SOC_MAX98373 is not set +# CONFIG_SND_SOC_MAX9860 is not set +# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set +# CONFIG_SND_SOC_PCM1681 is not set +# CONFIG_SND_SOC_PCM1789_I2C is not set +# CONFIG_SND_SOC_PCM179X_I2C is not set +# CONFIG_SND_SOC_PCM179X_SPI is not set +# CONFIG_SND_SOC_PCM186X_I2C is not set +# CONFIG_SND_SOC_PCM186X_SPI is not set +# CONFIG_SND_SOC_PCM3168A_I2C is not set +# CONFIG_SND_SOC_PCM3168A_SPI is not set +# CONFIG_SND_SOC_PCM512x_I2C is not set +# CONFIG_SND_SOC_PCM512x_SPI is not set +CONFIG_SND_SOC_RL6231=m +# CONFIG_SND_SOC_RT5616 is not set +# CONFIG_SND_SOC_RT5631 is not set +CONFIG_SND_SOC_RT5640=m +CONFIG_SND_SOC_RT5645=m +CONFIG_SND_SOC_RT5677=m +CONFIG_SND_SOC_RT5677_SPI=m +CONFIG_SND_SOC_SGTL5000=m +# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set +# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set +# CONFIG_SND_SOC_SPDIF is not set +# CONFIG_SND_SOC_SSM2305 is not set +# CONFIG_SND_SOC_SSM2602_SPI is not set +# CONFIG_SND_SOC_SSM2602_I2C is not set +# CONFIG_SND_SOC_SSM4567 is not set +# CONFIG_SND_SOC_STA32X is not set +# CONFIG_SND_SOC_STA350 is not set +# CONFIG_SND_SOC_STI_SAS is not set +# CONFIG_SND_SOC_TAS2552 is not set +# CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TAS571X is not set +# CONFIG_SND_SOC_TAS5720 is not set +# CONFIG_SND_SOC_TAS6424 is not set +# CONFIG_SND_SOC_TDA7419 is not set +# CONFIG_SND_SOC_TFA9879 is not set +CONFIG_SND_SOC_TLV320AIC23=m +CONFIG_SND_SOC_TLV320AIC23_I2C=m +# CONFIG_SND_SOC_TLV320AIC23_SPI is not set +# CONFIG_SND_SOC_TLV320AIC31XX is not set +# CONFIG_SND_SOC_TLV320AIC32X4_I2C is not set +# CONFIG_SND_SOC_TLV320AIC32X4_SPI is not set +CONFIG_SND_SOC_TLV320AIC3X=m +CONFIG_SND_SOC_TS3A227E=m +# CONFIG_SND_SOC_TSCS42XX is not set +# CONFIG_SND_SOC_TSCS454 is not set +CONFIG_SND_SOC_TWL4030=m +CONFIG_SND_SOC_TWL6040=m +# CONFIG_SND_SOC_WM8510 is not set +# CONFIG_SND_SOC_WM8523 is not set +# CONFIG_SND_SOC_WM8524 is not set +# CONFIG_SND_SOC_WM8580 is not set +# CONFIG_SND_SOC_WM8711 is not set +# CONFIG_SND_SOC_WM8728 is not set +# CONFIG_SND_SOC_WM8731 is not set +# CONFIG_SND_SOC_WM8737 is not set +# CONFIG_SND_SOC_WM8741 is not set +# CONFIG_SND_SOC_WM8750 is not set +CONFIG_SND_SOC_WM8753=m +# CONFIG_SND_SOC_WM8770 is not set +# CONFIG_SND_SOC_WM8776 is not set +# CONFIG_SND_SOC_WM8782 is not set +# CONFIG_SND_SOC_WM8804_I2C is not set +# CONFIG_SND_SOC_WM8804_SPI is not set +CONFIG_SND_SOC_WM8903=m +# CONFIG_SND_SOC_WM8960 is not set +# CONFIG_SND_SOC_WM8962 is not set +# CONFIG_SND_SOC_WM8974 is not set +# CONFIG_SND_SOC_WM8978 is not set +# CONFIG_SND_SOC_WM8985 is not set +CONFIG_SND_SOC_WM9712=m +# CONFIG_SND_SOC_ZX_AUD96P22 is not set +# CONFIG_SND_SOC_MAX9759 is not set +CONFIG_SND_SOC_MC13783=m +# CONFIG_SND_SOC_MT6351 is not set +# CONFIG_SND_SOC_NAU8540 is not set +# CONFIG_SND_SOC_NAU8810 is not set +# CONFIG_SND_SOC_NAU8824 is not set +CONFIG_SND_SOC_TPA6130A2=m +CONFIG_SND_SIMPLE_CARD_UTILS=m +CONFIG_SND_SIMPLE_CARD=m +# CONFIG_SND_SIMPLE_SCU_CARD is not set +# CONFIG_SND_AUDIO_GRAPH_CARD is not set +# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set +# CONFIG_SND_XEN_FRONTEND is not set +CONFIG_AC97_BUS=m + +# +# HID support +# +CONFIG_HID=m +CONFIG_HID_BATTERY_STRENGTH=y +CONFIG_HIDRAW=y +CONFIG_UHID=m +CONFIG_HID_GENERIC=m + +# +# Special HID drivers +# +CONFIG_HID_A4TECH=m +# CONFIG_HID_ACCUTOUCH is not set +CONFIG_HID_ACRUX=m +CONFIG_HID_ACRUX_FF=y +CONFIG_HID_APPLE=m +# CONFIG_HID_APPLEIR is not set +CONFIG_HID_ASUS=m +CONFIG_HID_AUREAL=m +CONFIG_HID_BELKIN=m +CONFIG_HID_BETOP_FF=m +CONFIG_HID_CHERRY=m +CONFIG_HID_CHICONY=m +CONFIG_HID_CORSAIR=m +# CONFIG_HID_COUGAR is not set +CONFIG_HID_PRODIKEYS=m +CONFIG_HID_CMEDIA=m +CONFIG_HID_CP2112=m +CONFIG_HID_CYPRESS=m +CONFIG_HID_DRAGONRISE=m +CONFIG_DRAGONRISE_FF=y +CONFIG_HID_EMS_FF=m +# CONFIG_HID_ELAN is not set +CONFIG_HID_ELECOM=m +CONFIG_HID_ELO=m +CONFIG_HID_EZKEY=m +CONFIG_HID_GEMBIRD=m +# CONFIG_HID_GFRM is not set +CONFIG_HID_HOLTEK=m +CONFIG_HOLTEK_FF=y +# CONFIG_HID_GOOGLE_HAMMER is not set +# CONFIG_HID_GT683R is not set +CONFIG_HID_KEYTOUCH=m +CONFIG_HID_KYE=m +CONFIG_HID_UCLOGIC=m +CONFIG_HID_WALTOP=m +CONFIG_HID_GYRATION=m +CONFIG_HID_ICADE=m +# CONFIG_HID_ITE is not set +CONFIG_HID_JABRA=m +CONFIG_HID_TWINHAN=m +CONFIG_HID_KENSINGTON=m +CONFIG_HID_LCPOWER=m +CONFIG_HID_LED=m +CONFIG_HID_LENOVO=m +CONFIG_HID_LOGITECH=m +CONFIG_HID_LOGITECH_DJ=m +CONFIG_HID_LOGITECH_HIDPP=m +CONFIG_LOGITECH_FF=y +CONFIG_LOGIRUMBLEPAD2_FF=y +CONFIG_LOGIG940_FF=y +CONFIG_LOGIWHEELS_FF=y +CONFIG_HID_MAGICMOUSE=m +# CONFIG_HID_MAYFLASH is not set +# CONFIG_HID_REDRAGON is not set +CONFIG_HID_MICROSOFT=m +CONFIG_HID_MONTEREY=m +CONFIG_HID_MULTITOUCH=m +# CONFIG_HID_NTI is not set +CONFIG_HID_NTRIG=m +CONFIG_HID_ORTEK=m +CONFIG_HID_PANTHERLORD=m +CONFIG_PANTHERLORD_FF=y +CONFIG_HID_PENMOUNT=m +CONFIG_HID_PETALYNX=m +CONFIG_HID_PICOLCD=m +CONFIG_HID_PICOLCD_FB=y +CONFIG_HID_PICOLCD_BACKLIGHT=y +CONFIG_HID_PICOLCD_LEDS=y +CONFIG_HID_PICOLCD_CIR=y +CONFIG_HID_PLANTRONICS=m +CONFIG_HID_PRIMAX=m +# CONFIG_HID_RETRODE is not set +CONFIG_HID_ROCCAT=m +CONFIG_HID_SAITEK=m +CONFIG_HID_SAMSUNG=m +CONFIG_HID_SONY=m +CONFIG_SONY_FF=y +CONFIG_HID_SPEEDLINK=m +# CONFIG_HID_STEAM is not set +CONFIG_HID_STEELSERIES=m +CONFIG_HID_SUNPLUS=m +CONFIG_HID_RMI=m +CONFIG_HID_GREENASIA=m +CONFIG_GREENASIA_FF=y +CONFIG_HID_SMARTJOYPLUS=m +CONFIG_SMARTJOYPLUS_FF=y +CONFIG_HID_TIVO=m +CONFIG_HID_TOPSEED=m +CONFIG_HID_THINGM=m +CONFIG_HID_THRUSTMASTER=m +CONFIG_THRUSTMASTER_FF=y +# CONFIG_HID_UDRAW_PS3 is not set +CONFIG_HID_WACOM=m +CONFIG_HID_WIIMOTE=m +CONFIG_HID_XINMO=m +CONFIG_HID_ZEROPLUS=m +CONFIG_ZEROPLUS_FF=y +CONFIG_HID_ZYDACRON=m +CONFIG_HID_SENSOR_HUB=m +CONFIG_HID_SENSOR_CUSTOM_SENSOR=m +CONFIG_HID_ALPS=m + +# +# USB HID support +# +CONFIG_USB_HID=m +CONFIG_HID_PID=y +CONFIG_USB_HIDDEV=y + +# +# USB HID Boot Protocol drivers +# +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set + +# +# I2C HID support +# +# CONFIG_I2C_HID is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +CONFIG_USB_SUPPORT=y +CONFIG_USB_COMMON=y +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB=m +CONFIG_USB_PCI=y +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y + +# +# Miscellaneous USB options +# +CONFIG_USB_DEFAULT_PERSIST=y +CONFIG_USB_DYNAMIC_MINORS=y +# CONFIG_USB_OTG is not set +# CONFIG_USB_OTG_WHITELIST is not set +# CONFIG_USB_OTG_BLACKLIST_HUB is not set +CONFIG_USB_LEDS_TRIGGER_USBPORT=m +CONFIG_USB_MON=m +CONFIG_USB_WUSB=m +CONFIG_USB_WUSB_CBAF=m +# CONFIG_USB_WUSB_CBAF_DEBUG is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_C67X00_HCD is not set +CONFIG_USB_XHCI_HCD=m +# CONFIG_USB_XHCI_DBGCAP is not set +CONFIG_USB_XHCI_PCI=m +CONFIG_USB_XHCI_PLATFORM=m +CONFIG_USB_XHCI_MVEBU=m +CONFIG_USB_XHCI_TEGRA=m +CONFIG_USB_EHCI_HCD=m +CONFIG_USB_EHCI_ROOT_HUB_TT=y +CONFIG_USB_EHCI_TT_NEWSCHED=y +CONFIG_USB_EHCI_PCI=m +CONFIG_USB_EHCI_MXC=m +CONFIG_USB_EHCI_HCD_OMAP=m +CONFIG_USB_EHCI_HCD_ORION=m +CONFIG_USB_EHCI_TEGRA=m +CONFIG_USB_EHCI_EXYNOS=m +CONFIG_USB_EHCI_HCD_PLATFORM=m +# CONFIG_USB_OXU210HP_HCD is not set +# CONFIG_USB_ISP116X_HCD is not set +# CONFIG_USB_FOTG210_HCD is not set +# CONFIG_USB_MAX3421_HCD is not set +CONFIG_USB_OHCI_HCD=m +CONFIG_USB_OHCI_HCD_OMAP3=m +CONFIG_USB_OHCI_HCD_PCI=m +# CONFIG_USB_OHCI_HCD_SSB is not set +CONFIG_USB_OHCI_EXYNOS=m +CONFIG_USB_OHCI_HCD_PLATFORM=m +# CONFIG_USB_UHCI_HCD is not set +CONFIG_USB_UHCI_SUPPORT_NON_PCI_HC=y +CONFIG_USB_UHCI_PLATFORM=y +CONFIG_USB_U132_HCD=m +# CONFIG_USB_SL811_HCD is not set +# CONFIG_USB_R8A66597_HCD is not set +CONFIG_USB_WHCI_HCD=m +CONFIG_USB_HWA_HCD=m +# CONFIG_USB_IMX21_HCD is not set +# CONFIG_USB_HCD_BCMA is not set +# CONFIG_USB_HCD_SSB is not set +# CONFIG_USB_HCD_TEST_MODE is not set + +# +# USB Device Class drivers +# +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m +CONFIG_USB_WDM=m +CONFIG_USB_TMC=m + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may +# + +# +# also be needed; see USB_STORAGE Help for more info +# +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +CONFIG_USB_STORAGE_REALTEK=m +CONFIG_REALTEK_AUTOPM=y +CONFIG_USB_STORAGE_DATAFAB=m +CONFIG_USB_STORAGE_FREECOM=m +CONFIG_USB_STORAGE_ISD200=m +CONFIG_USB_STORAGE_USBAT=m +CONFIG_USB_STORAGE_SDDR09=m +CONFIG_USB_STORAGE_SDDR55=m +CONFIG_USB_STORAGE_JUMPSHOT=m +CONFIG_USB_STORAGE_ALAUDA=m +CONFIG_USB_STORAGE_ONETOUCH=m +CONFIG_USB_STORAGE_KARMA=m +CONFIG_USB_STORAGE_CYPRESS_ATACB=m +CONFIG_USB_STORAGE_ENE_UB6250=m +CONFIG_USB_UAS=m + +# +# USB Imaging devices +# +CONFIG_USB_MDC800=m +CONFIG_USB_MICROTEK=m +# CONFIG_USBIP_CORE is not set +CONFIG_USB_MUSB_HDRC=m +# CONFIG_USB_MUSB_HOST is not set +# CONFIG_USB_MUSB_GADGET is not set +CONFIG_USB_MUSB_DUAL_ROLE=y + +# +# Platform Glue Layer +# +CONFIG_USB_MUSB_SUNXI=m +CONFIG_USB_MUSB_TUSB6010=m +CONFIG_USB_MUSB_OMAP2PLUS=m +CONFIG_USB_MUSB_AM35X=m +CONFIG_USB_MUSB_DSPS=m +CONFIG_USB_MUSB_AM335X_CHILD=m + +# +# MUSB DMA mode +# +# CONFIG_MUSB_PIO_ONLY is not set +CONFIG_USB_INVENTRA_DMA=y +CONFIG_USB_TI_CPPI41_DMA=y +CONFIG_USB_TUSB_OMAP_DMA=y +CONFIG_USB_DWC3=m +# CONFIG_USB_DWC3_ULPI is not set +# CONFIG_USB_DWC3_HOST is not set +# CONFIG_USB_DWC3_GADGET is not set +CONFIG_USB_DWC3_DUAL_ROLE=y + +# +# Platform Glue Driver Support +# +CONFIG_USB_DWC3_OMAP=m +CONFIG_USB_DWC3_EXYNOS=m +CONFIG_USB_DWC3_HAPS=m +CONFIG_USB_DWC3_OF_SIMPLE=m +CONFIG_USB_DWC2=m +# CONFIG_USB_DWC2_HOST is not set + +# +# Gadget/Dual-role mode requires USB Gadget support to be enabled +# +# CONFIG_USB_DWC2_PERIPHERAL is not set +CONFIG_USB_DWC2_DUAL_ROLE=y +# CONFIG_USB_DWC2_PCI is not set +# CONFIG_USB_DWC2_DEBUG is not set +# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set +CONFIG_USB_CHIPIDEA=m +CONFIG_USB_CHIPIDEA_OF=m +CONFIG_USB_CHIPIDEA_PCI=m +CONFIG_USB_CHIPIDEA_UDC=y +CONFIG_USB_CHIPIDEA_HOST=y +# CONFIG_USB_ISP1760 is not set + +# +# USB port drivers +# +# CONFIG_USB_USS720 is not set +CONFIG_USB_SERIAL=m +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_SIMPLE=m +CONFIG_USB_SERIAL_AIRCABLE=m +CONFIG_USB_SERIAL_ARK3116=m +CONFIG_USB_SERIAL_BELKIN=m +CONFIG_USB_SERIAL_CH341=m +CONFIG_USB_SERIAL_WHITEHEAT=m +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +CONFIG_USB_SERIAL_CP210X=m +CONFIG_USB_SERIAL_CYPRESS_M8=m +CONFIG_USB_SERIAL_EMPEG=m +CONFIG_USB_SERIAL_FTDI_SIO=m +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +CONFIG_USB_SERIAL_EDGEPORT_TI=m +CONFIG_USB_SERIAL_F81232=m +# CONFIG_USB_SERIAL_F8153X is not set +CONFIG_USB_SERIAL_GARMIN=m +CONFIG_USB_SERIAL_IPW=m +CONFIG_USB_SERIAL_IUU=m +CONFIG_USB_SERIAL_KEYSPAN_PDA=m +CONFIG_USB_SERIAL_KEYSPAN=m +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_KOBIL_SCT=m +CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_METRO=m +CONFIG_USB_SERIAL_MOS7720=m +CONFIG_USB_SERIAL_MOS7715_PARPORT=y +CONFIG_USB_SERIAL_MOS7840=m +CONFIG_USB_SERIAL_MXUPORT=m +CONFIG_USB_SERIAL_NAVMAN=m +CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_OTI6858=m +CONFIG_USB_SERIAL_QCAUX=m +CONFIG_USB_SERIAL_QUALCOMM=m +CONFIG_USB_SERIAL_SPCP8X5=m +CONFIG_USB_SERIAL_SAFE=m +# CONFIG_USB_SERIAL_SAFE_PADDED is not set +CONFIG_USB_SERIAL_SIERRAWIRELESS=m +CONFIG_USB_SERIAL_SYMBOL=m +CONFIG_USB_SERIAL_TI=m +CONFIG_USB_SERIAL_CYBERJACK=m +CONFIG_USB_SERIAL_XIRCOM=m +CONFIG_USB_SERIAL_WWAN=m +CONFIG_USB_SERIAL_OPTION=m +CONFIG_USB_SERIAL_OMNINET=m +CONFIG_USB_SERIAL_OPTICON=m +CONFIG_USB_SERIAL_XSENS_MT=m +CONFIG_USB_SERIAL_WISHBONE=m +CONFIG_USB_SERIAL_SSU100=m +CONFIG_USB_SERIAL_QT2=m +# CONFIG_USB_SERIAL_UPD78F0730 is not set +CONFIG_USB_SERIAL_DEBUG=m + +# +# USB Miscellaneous drivers +# +CONFIG_USB_EMI62=m +CONFIG_USB_EMI26=m +CONFIG_USB_ADUTUX=m +CONFIG_USB_SEVSEG=m +CONFIG_USB_RIO500=m +CONFIG_USB_LEGOTOWER=m +CONFIG_USB_LCD=m +CONFIG_USB_CYPRESS_CY7C63=m +CONFIG_USB_CYTHERM=m +CONFIG_USB_IDMOUSE=m +CONFIG_USB_FTDI_ELAN=m +CONFIG_USB_APPLEDISPLAY=m +CONFIG_USB_SISUSBVGA=m +CONFIG_USB_SISUSBVGA_CON=y +CONFIG_USB_LD=m +CONFIG_USB_TRANCEVIBRATOR=m +CONFIG_USB_IOWARRIOR=m +CONFIG_USB_TEST=m +CONFIG_USB_EHSET_TEST_FIXTURE=m +CONFIG_USB_ISIGHTFW=m +CONFIG_USB_YUREX=m +CONFIG_USB_EZUSB_FX2=m +# CONFIG_USB_HUB_USB251XB is not set +CONFIG_USB_HSIC_USB3503=m +# CONFIG_USB_HSIC_USB4604 is not set +# CONFIG_USB_LINK_LAYER_TEST is not set +CONFIG_USB_CHAOSKEY=m +# CONFIG_USB_ATM is not set + +# +# USB Physical Layer drivers +# +CONFIG_USB_PHY=y +CONFIG_NOP_USB_XCEIV=m +CONFIG_AM335X_CONTROL_USB=m +CONFIG_AM335X_PHY_USB=m +CONFIG_TWL6030_USB=m +# CONFIG_USB_GPIO_VBUS is not set +# CONFIG_USB_ISP1301 is not set +CONFIG_USB_MXS_PHY=m +CONFIG_USB_TEGRA_PHY=m +CONFIG_USB_ULPI=y +CONFIG_USB_ULPI_VIEWPORT=y +CONFIG_USB_GADGET=m +# CONFIG_USB_GADGET_DEBUG is not set +# CONFIG_USB_GADGET_DEBUG_FILES is not set +# CONFIG_USB_GADGET_DEBUG_FS is not set +CONFIG_USB_GADGET_VBUS_DRAW=2 +CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 +# CONFIG_U_SERIAL_CONSOLE is not set + +# +# USB Peripheral Controller +# +# CONFIG_USB_FSL_USB2 is not set +# CONFIG_USB_FUSB300 is not set +# CONFIG_USB_FOTG210_UDC is not set +# CONFIG_USB_GR_UDC is not set +# CONFIG_USB_R8A66597 is not set +# CONFIG_USB_PXA27X is not set +# CONFIG_USB_MV_UDC is not set +# CONFIG_USB_MV_U3D is not set +# CONFIG_USB_SNP_UDC_PLAT is not set +# CONFIG_USB_M66592 is not set +# CONFIG_USB_BDC_UDC is not set +# CONFIG_USB_AMD5536UDC is not set +# CONFIG_USB_NET2272 is not set +CONFIG_USB_NET2280=m +# CONFIG_USB_GOKU is not set +# CONFIG_USB_EG20T is not set +# CONFIG_USB_GADGET_XILINX is not set +# CONFIG_USB_DUMMY_HCD is not set +CONFIG_USB_LIBCOMPOSITE=m +CONFIG_USB_F_ACM=m +CONFIG_USB_F_SS_LB=m +CONFIG_USB_U_SERIAL=m +CONFIG_USB_U_ETHER=m +CONFIG_USB_U_AUDIO=m +CONFIG_USB_F_SERIAL=m +CONFIG_USB_F_OBEX=m +CONFIG_USB_F_NCM=m +CONFIG_USB_F_ECM=m +CONFIG_USB_F_PHONET=m +CONFIG_USB_F_EEM=m +CONFIG_USB_F_SUBSET=m +CONFIG_USB_F_RNDIS=m +CONFIG_USB_F_MASS_STORAGE=m +CONFIG_USB_F_FS=m +CONFIG_USB_F_UAC1=m +CONFIG_USB_F_UAC2=m +CONFIG_USB_F_UVC=m +CONFIG_USB_F_MIDI=m +CONFIG_USB_F_HID=m +CONFIG_USB_F_PRINTER=m +CONFIG_USB_CONFIGFS=m +CONFIG_USB_CONFIGFS_SERIAL=y +CONFIG_USB_CONFIGFS_ACM=y +CONFIG_USB_CONFIGFS_OBEX=y +CONFIG_USB_CONFIGFS_NCM=y +CONFIG_USB_CONFIGFS_ECM=y +CONFIG_USB_CONFIGFS_ECM_SUBSET=y +CONFIG_USB_CONFIGFS_RNDIS=y +CONFIG_USB_CONFIGFS_EEM=y +CONFIG_USB_CONFIGFS_PHONET=y +CONFIG_USB_CONFIGFS_MASS_STORAGE=y +CONFIG_USB_CONFIGFS_F_LB_SS=y +CONFIG_USB_CONFIGFS_F_FS=y +CONFIG_USB_CONFIGFS_F_UAC1=y +# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set +CONFIG_USB_CONFIGFS_F_UAC2=y +CONFIG_USB_CONFIGFS_F_MIDI=y +CONFIG_USB_CONFIGFS_F_HID=y +CONFIG_USB_CONFIGFS_F_UVC=y +CONFIG_USB_CONFIGFS_F_PRINTER=y +# CONFIG_USB_CONFIGFS_F_TCM is not set +# CONFIG_USB_ZERO is not set +# CONFIG_USB_AUDIO is not set +CONFIG_USB_ETH=m +CONFIG_USB_ETH_RNDIS=y +# CONFIG_USB_ETH_EEM is not set +# CONFIG_USB_G_NCM is not set +CONFIG_USB_GADGETFS=m +CONFIG_USB_FUNCTIONFS=m +CONFIG_USB_FUNCTIONFS_ETH=y +CONFIG_USB_FUNCTIONFS_RNDIS=y +CONFIG_USB_FUNCTIONFS_GENERIC=y +# CONFIG_USB_MASS_STORAGE is not set +# CONFIG_USB_GADGET_TARGET is not set +CONFIG_USB_G_SERIAL=m +# CONFIG_USB_MIDI_GADGET is not set +# CONFIG_USB_G_PRINTER is not set +# CONFIG_USB_CDC_COMPOSITE is not set +CONFIG_USB_G_NOKIA=m +# CONFIG_USB_G_ACM_MS is not set +# CONFIG_USB_G_MULTI is not set +# CONFIG_USB_G_HID is not set +# CONFIG_USB_G_DBGP is not set +# CONFIG_USB_G_WEBCAM is not set +CONFIG_TYPEC=m +# CONFIG_TYPEC_TCPM is not set +CONFIG_TYPEC_UCSI=m +# CONFIG_TYPEC_TPS6598X is not set + +# +# USB Type-C Multiplexer/DeMultiplexer Switch support +# +# CONFIG_TYPEC_MUX_PI3USB30532 is not set + +# +# USB Type-C Alternate Mode drivers +# +# CONFIG_TYPEC_DP_ALTMODE is not set +CONFIG_USB_LED_TRIG=y +CONFIG_USB_ULPI_BUS=m +CONFIG_UWB=m +CONFIG_UWB_HWA=m +CONFIG_UWB_WHCI=m +CONFIG_UWB_I1480U=m +CONFIG_MMC=y +CONFIG_PWRSEQ_EMMC=y +# CONFIG_PWRSEQ_SD8787 is not set +CONFIG_PWRSEQ_SIMPLE=y +CONFIG_MMC_BLOCK=y +CONFIG_MMC_BLOCK_MINORS=256 +CONFIG_SDIO_UART=m +# CONFIG_MMC_TEST is not set + +# +# MMC/SD/SDIO Host Controller Drivers +# +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_ARMMMCI=m +CONFIG_MMC_SDHCI=m +CONFIG_MMC_SDHCI_IO_ACCESSORS=y +CONFIG_MMC_SDHCI_PCI=m +CONFIG_MMC_RICOH_MMC=y +CONFIG_MMC_SDHCI_PLTFM=m +# CONFIG_MMC_SDHCI_OF_ARASAN is not set +# CONFIG_MMC_SDHCI_OF_AT91 is not set +# CONFIG_MMC_SDHCI_OF_ESDHC is not set +# CONFIG_MMC_SDHCI_OF_DWCMSHC is not set +# CONFIG_MMC_SDHCI_CADENCE is not set +CONFIG_MMC_SDHCI_ESDHC_IMX=m +CONFIG_MMC_SDHCI_TEGRA=m +CONFIG_MMC_SDHCI_S3C=m +CONFIG_MMC_SDHCI_PXAV3=m +# CONFIG_MMC_SDHCI_S3C_DMA is not set +# CONFIG_MMC_SDHCI_F_SDH30 is not set +CONFIG_MMC_SDHCI_IPROC=m +CONFIG_MMC_OMAP=m +CONFIG_MMC_OMAP_HS=m +# CONFIG_MMC_MXC is not set +CONFIG_MMC_TIFM_SD=m +CONFIG_MMC_MVSDIO=m +CONFIG_MMC_SPI=m +CONFIG_MMC_CB710=m +CONFIG_MMC_VIA_SDMMC=m +CONFIG_MMC_DW=m +CONFIG_MMC_DW_PLTFM=m +# CONFIG_MMC_DW_BLUEFIELD is not set +CONFIG_MMC_DW_EXYNOS=m +# CONFIG_MMC_DW_HI3798CV200 is not set +# CONFIG_MMC_DW_K3 is not set +# CONFIG_MMC_DW_PCI is not set +CONFIG_MMC_DW_ROCKCHIP=m +CONFIG_MMC_VUB300=m +CONFIG_MMC_USHC=m +CONFIG_MMC_WMT=m +# CONFIG_MMC_USDHI6ROL0 is not set +CONFIG_MMC_REALTEK_PCI=m +CONFIG_MMC_REALTEK_USB=m +CONFIG_MMC_SUNXI=m +CONFIG_MMC_CQHCI=m +CONFIG_MMC_TOSHIBA_PCI=m +CONFIG_MMC_BCM2835=m +# CONFIG_MMC_MTK is not set +# CONFIG_MMC_SDHCI_XENON is not set +# CONFIG_MMC_SDHCI_OMAP is not set +CONFIG_MEMSTICK=m +# CONFIG_MEMSTICK_DEBUG is not set + +# +# MemoryStick drivers +# +# CONFIG_MEMSTICK_UNSAFE_RESUME is not set +CONFIG_MSPRO_BLOCK=m +# CONFIG_MS_BLOCK is not set + +# +# MemoryStick Host Controller Drivers +# +CONFIG_MEMSTICK_TIFM_MS=m +CONFIG_MEMSTICK_JMICRON_38X=m +CONFIG_MEMSTICK_R592=m +CONFIG_MEMSTICK_REALTEK_PCI=m +CONFIG_MEMSTICK_REALTEK_USB=m +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +# CONFIG_LEDS_CLASS_FLASH is not set +# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set + +# +# LED drivers +# +# CONFIG_LEDS_BCM6328 is not set +# CONFIG_LEDS_BCM6358 is not set +# CONFIG_LEDS_CR0014114 is not set +# CONFIG_LEDS_LM3530 is not set +# CONFIG_LEDS_LM3642 is not set +# CONFIG_LEDS_LM3692X is not set +# CONFIG_LEDS_PCA9532 is not set +CONFIG_LEDS_GPIO=m +CONFIG_LEDS_LP3944=m +# CONFIG_LEDS_LP3952 is not set +CONFIG_LEDS_LP55XX_COMMON=m +# CONFIG_LEDS_LP5521 is not set +CONFIG_LEDS_LP5523=m +# CONFIG_LEDS_LP5562 is not set +# CONFIG_LEDS_LP8501 is not set +# CONFIG_LEDS_LP8860 is not set +CONFIG_LEDS_PCA955X=m +# CONFIG_LEDS_PCA955X_GPIO is not set +# CONFIG_LEDS_PCA963X is not set +CONFIG_LEDS_DA9052=m +CONFIG_LEDS_DAC124S085=m +CONFIG_LEDS_PWM=m +CONFIG_LEDS_REGULATOR=m +CONFIG_LEDS_BD2802=m +CONFIG_LEDS_LT3593=m +CONFIG_LEDS_MC13783=m +CONFIG_LEDS_NS2=y +CONFIG_LEDS_TCA6507=m +# CONFIG_LEDS_TLC591XX is not set +# CONFIG_LEDS_LM355x is not set +# CONFIG_LEDS_IS31FL319X is not set +# CONFIG_LEDS_IS31FL32XX is not set + +# +# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM) +# +# CONFIG_LEDS_BLINKM is not set +# CONFIG_LEDS_SYSCON is not set +# CONFIG_LEDS_MLXREG is not set +# CONFIG_LEDS_USER is not set + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=m +CONFIG_LEDS_TRIGGER_ONESHOT=m +CONFIG_LEDS_TRIGGER_DISK=y +CONFIG_LEDS_TRIGGER_MTD=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=m +CONFIG_LEDS_TRIGGER_BACKLIGHT=m +CONFIG_LEDS_TRIGGER_CPU=y +CONFIG_LEDS_TRIGGER_ACTIVITY=m +CONFIG_LEDS_TRIGGER_GPIO=m +CONFIG_LEDS_TRIGGER_DEFAULT_ON=m + +# +# iptables trigger is under Netfilter config (LED target) +# +CONFIG_LEDS_TRIGGER_TRANSIENT=m +CONFIG_LEDS_TRIGGER_CAMERA=m +CONFIG_LEDS_TRIGGER_PANIC=y +CONFIG_LEDS_TRIGGER_NETDEV=m +CONFIG_ACCESSIBILITY=y +CONFIG_A11Y_BRAILLE_CONSOLE=y +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +# CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI is not set +CONFIG_INFINIBAND_USER_MEM=y +CONFIG_INFINIBAND_ON_DEMAND_PAGING=y +CONFIG_INFINIBAND_ADDR_TRANS=y +CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y +CONFIG_INFINIBAND_MTHCA=m +CONFIG_INFINIBAND_MTHCA_DEBUG=y +CONFIG_INFINIBAND_CXGB3=m +CONFIG_INFINIBAND_CXGB4=m +CONFIG_INFINIBAND_I40IW=m +CONFIG_MLX4_INFINIBAND=m +CONFIG_MLX5_INFINIBAND=m +CONFIG_INFINIBAND_NES=m +# CONFIG_INFINIBAND_NES_DEBUG is not set +CONFIG_INFINIBAND_OCRDMA=m +CONFIG_INFINIBAND_IPOIB=m +CONFIG_INFINIBAND_IPOIB_CM=y +CONFIG_INFINIBAND_IPOIB_DEBUG=y +# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set +CONFIG_INFINIBAND_SRP=m +CONFIG_INFINIBAND_SRPT=m +CONFIG_INFINIBAND_ISER=m +CONFIG_INFINIBAND_ISERT=m +CONFIG_RDMA_RXE=m +# CONFIG_INFINIBAND_BNXT_RE is not set +CONFIG_EDAC_ATOMIC_SCRUB=y +CONFIG_EDAC_SUPPORT=y +# CONFIG_EDAC is not set +CONFIG_RTC_LIB=y +CONFIG_RTC_MC146818_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +CONFIG_RTC_SYSTOHC=y +CONFIG_RTC_SYSTOHC_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set +CONFIG_RTC_NVMEM=y + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set +# CONFIG_RTC_DRV_TEST is not set + +# +# I2C RTC drivers +# +# CONFIG_RTC_DRV_ABB5ZES3 is not set +# CONFIG_RTC_DRV_ABX80X is not set +CONFIG_RTC_DRV_AS3722=y +CONFIG_RTC_DRV_DS1307=y +# CONFIG_RTC_DRV_DS1307_CENTURY is not set +# CONFIG_RTC_DRV_DS1374 is not set +# CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_HYM8563 is not set +# CONFIG_RTC_DRV_MAX6900 is not set +CONFIG_RTC_DRV_MAX77686=y +CONFIG_RTC_DRV_RK808=y +# CONFIG_RTC_DRV_RS5C372 is not set +# CONFIG_RTC_DRV_ISL1208 is not set +# CONFIG_RTC_DRV_ISL12022 is not set +# CONFIG_RTC_DRV_ISL12026 is not set +# CONFIG_RTC_DRV_X1205 is not set +CONFIG_RTC_DRV_PCF8523=y +# CONFIG_RTC_DRV_PCF85063 is not set +# CONFIG_RTC_DRV_PCF85363 is not set +CONFIG_RTC_DRV_PCF8563=y +# CONFIG_RTC_DRV_PCF8583 is not set +# CONFIG_RTC_DRV_M41T80 is not set +# CONFIG_RTC_DRV_BQ32K is not set +CONFIG_RTC_DRV_TWL4030=y +CONFIG_RTC_DRV_PALMAS=y +# CONFIG_RTC_DRV_S35390A is not set +# CONFIG_RTC_DRV_FM3130 is not set +# CONFIG_RTC_DRV_RX8010 is not set +# CONFIG_RTC_DRV_RX8581 is not set +# CONFIG_RTC_DRV_RX8025 is not set +# CONFIG_RTC_DRV_EM3027 is not set +# CONFIG_RTC_DRV_RV8803 is not set +CONFIG_RTC_DRV_S5M=y + +# +# SPI RTC drivers +# +# CONFIG_RTC_DRV_M41T93 is not set +# CONFIG_RTC_DRV_M41T94 is not set +# CONFIG_RTC_DRV_DS1302 is not set +# CONFIG_RTC_DRV_DS1305 is not set +# CONFIG_RTC_DRV_DS1343 is not set +# CONFIG_RTC_DRV_DS1347 is not set +# CONFIG_RTC_DRV_DS1390 is not set +# CONFIG_RTC_DRV_MAX6916 is not set +# CONFIG_RTC_DRV_R9701 is not set +# CONFIG_RTC_DRV_RX4581 is not set +# CONFIG_RTC_DRV_RX6110 is not set +# CONFIG_RTC_DRV_RS5C348 is not set +# CONFIG_RTC_DRV_MAX6902 is not set +# CONFIG_RTC_DRV_PCF2123 is not set +# CONFIG_RTC_DRV_MCP795 is not set +CONFIG_RTC_I2C_AND_SPI=y + +# +# SPI and I2C RTC drivers +# +# CONFIG_RTC_DRV_DS3232 is not set +# CONFIG_RTC_DRV_PCF2127 is not set +# CONFIG_RTC_DRV_RV3029C2 is not set + +# +# Platform RTC drivers +# +CONFIG_RTC_DRV_CMOS=m +# CONFIG_RTC_DRV_DS1286 is not set +# CONFIG_RTC_DRV_DS1511 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_DS1685_FAMILY is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_DS2404 is not set +CONFIG_RTC_DRV_DA9052=y +CONFIG_RTC_DRV_EFI=y +# CONFIG_RTC_DRV_STK17TA8 is not set +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_M48T35 is not set +# CONFIG_RTC_DRV_M48T59 is not set +# CONFIG_RTC_DRV_MSM6242 is not set +# CONFIG_RTC_DRV_BQ4802 is not set +# CONFIG_RTC_DRV_RP5C01 is not set +# CONFIG_RTC_DRV_V3020 is not set +# CONFIG_RTC_DRV_ZYNQMP is not set +CONFIG_RTC_DRV_CROS_EC=m + +# +# on-CPU RTC drivers +# +CONFIG_RTC_DRV_IMXDI=y +CONFIG_RTC_DRV_OMAP=y +CONFIG_HAVE_S3C_RTC=y +# CONFIG_RTC_DRV_S3C is not set +CONFIG_RTC_DRV_PL030=y +CONFIG_RTC_DRV_PL031=y +CONFIG_RTC_DRV_VT8500=y +CONFIG_RTC_DRV_SUN6I=y +CONFIG_RTC_DRV_SUNXI=y +CONFIG_RTC_DRV_MV=y +CONFIG_RTC_DRV_ARMADA38X=y +# CONFIG_RTC_DRV_FTRTC010 is not set +CONFIG_RTC_DRV_MC13XXX=m +CONFIG_RTC_DRV_TEGRA=y +CONFIG_RTC_DRV_MXC=y +CONFIG_RTC_DRV_MXC_V2=m +CONFIG_RTC_DRV_SNVS=y +# CONFIG_RTC_DRV_R7301 is not set + +# +# HID Sensor RTC drivers +# +# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set +CONFIG_DMADEVICES=y +# CONFIG_DMADEVICES_DEBUG is not set + +# +# DMA Devices +# +CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y +CONFIG_DMA_ENGINE=y +CONFIG_DMA_VIRTUAL_CHANNELS=y +CONFIG_DMA_OF=y +CONFIG_ALTERA_MSGDMA=m +CONFIG_AMBA_PL08X=y +# CONFIG_AXI_DMAC is not set +CONFIG_DMA_BCM2835=y +CONFIG_DMA_SUN4I=y +CONFIG_DMA_SUN6I=m +# CONFIG_DW_AXI_DMAC is not set +# CONFIG_FSL_EDMA is not set +CONFIG_IMX_DMA=y +CONFIG_IMX_SDMA=y +# CONFIG_INTEL_IDMA64 is not set +CONFIG_MV_XOR=y +CONFIG_MXS_DMA=y +CONFIG_MX3_IPU=y +CONFIG_MX3_IPU_IRQS=4 +# CONFIG_NBPFAXI_DMA is not set +CONFIG_PL330_DMA=y +CONFIG_TEGRA20_APB_DMA=y +# CONFIG_QCOM_HIDMA_MGMT is not set +# CONFIG_QCOM_HIDMA is not set +# CONFIG_DW_DMAC is not set +# CONFIG_DW_DMAC_PCI is not set +CONFIG_TI_CPPI41=m +CONFIG_TI_EDMA=y +CONFIG_DMA_OMAP=y +CONFIG_TI_DMA_CROSSBAR=y + +# +# DMA Clients +# +CONFIG_ASYNC_TX_DMA=y +# CONFIG_DMATEST is not set +CONFIG_DMA_ENGINE_RAID=y + +# +# DMABUF options +# +CONFIG_SYNC_FILE=y +# CONFIG_SW_SYNC is not set +# CONFIG_AUXDISPLAY is not set +# CONFIG_PANEL is not set +CONFIG_UIO=m +CONFIG_UIO_CIF=m +# CONFIG_UIO_PDRV_GENIRQ is not set +# CONFIG_UIO_DMEM_GENIRQ is not set +CONFIG_UIO_AEC=m +CONFIG_UIO_SERCOS3=m +CONFIG_UIO_PCI_GENERIC=m +CONFIG_UIO_NETX=m +# CONFIG_UIO_PRUSS is not set +CONFIG_UIO_MF624=m +# CONFIG_VFIO is not set +CONFIG_VIRT_DRIVERS=y +CONFIG_VIRTIO=m +CONFIG_VIRTIO_MENU=y +CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_PCI_LEGACY=y +CONFIG_VIRTIO_BALLOON=m +CONFIG_VIRTIO_INPUT=m +CONFIG_VIRTIO_MMIO=m +# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set + +# +# Microsoft Hyper-V guest support +# + +# +# Xen driver support +# +CONFIG_XEN_BALLOON=y +CONFIG_XEN_SCRUB_PAGES_DEFAULT=y +CONFIG_XEN_DEV_EVTCHN=m +CONFIG_XEN_BACKEND=y +CONFIG_XENFS=m +CONFIG_XEN_COMPAT_XENFS=y +CONFIG_XEN_SYS_HYPERVISOR=y +CONFIG_XEN_XENBUS_FRONTEND=y +CONFIG_XEN_GNTDEV=m +CONFIG_XEN_GRANT_DEV_ALLOC=m +# CONFIG_XEN_GRANT_DMA_ALLOC is not set +CONFIG_SWIOTLB_XEN=y +CONFIG_XEN_PVCALLS_FRONTEND=m +# CONFIG_XEN_PVCALLS_BACKEND is not set +CONFIG_XEN_SCSI_BACKEND=m +CONFIG_XEN_PRIVCMD=m +CONFIG_XEN_EFI=y +CONFIG_XEN_AUTO_XLATE=y +CONFIG_STAGING=y +# CONFIG_PRISM2_USB is not set +# CONFIG_COMEDI is not set +# CONFIG_RTL8192U is not set +# CONFIG_RTLLIB is not set +# CONFIG_RTL8723BS is not set +CONFIG_R8712U=m +CONFIG_R8188EU=m +CONFIG_88EU_AP_MODE=y +CONFIG_R8822BE=m +CONFIG_RTLWIFI_DEBUG_ST=y +# CONFIG_RTS5208 is not set +# CONFIG_VT6655 is not set +# CONFIG_VT6656 is not set + +# +# IIO staging drivers +# + +# +# Accelerometers +# +# CONFIG_ADIS16203 is not set +# CONFIG_ADIS16240 is not set + +# +# Analog to digital converters +# +# CONFIG_AD7606 is not set +# CONFIG_AD7780 is not set +# CONFIG_AD7816 is not set +# CONFIG_AD7192 is not set +# CONFIG_AD7280 is not set + +# +# Analog digital bi-direction converters +# +# CONFIG_ADT7316 is not set + +# +# Capacitance to digital converters +# +# CONFIG_AD7150 is not set +# CONFIG_AD7152 is not set +# CONFIG_AD7746 is not set + +# +# Direct Digital Synthesis +# +# CONFIG_AD9832 is not set +# CONFIG_AD9834 is not set + +# +# Network Analyzer, Impedance Converters +# +# CONFIG_AD5933 is not set + +# +# Active energy metering IC +# +# CONFIG_ADE7854 is not set + +# +# Resolver to digital converters +# +# CONFIG_AD2S90 is not set +# CONFIG_AD2S1210 is not set +# CONFIG_FB_SM750 is not set +# CONFIG_FB_XGI is not set + +# +# Speakup console speech +# +CONFIG_SPEAKUP=m +CONFIG_SPEAKUP_SYNTH_ACNTSA=m +CONFIG_SPEAKUP_SYNTH_APOLLO=m +CONFIG_SPEAKUP_SYNTH_AUDPTR=m +CONFIG_SPEAKUP_SYNTH_BNS=m +CONFIG_SPEAKUP_SYNTH_DECTLK=m +CONFIG_SPEAKUP_SYNTH_DECEXT=m +CONFIG_SPEAKUP_SYNTH_LTLK=m +CONFIG_SPEAKUP_SYNTH_SOFT=m +CONFIG_SPEAKUP_SYNTH_SPKOUT=m +CONFIG_SPEAKUP_SYNTH_TXPRT=m +CONFIG_SPEAKUP_SYNTH_DUMMY=m +# CONFIG_MFD_NVEC is not set +# CONFIG_STAGING_MEDIA is not set + +# +# Android +# +# CONFIG_STAGING_BOARD is not set +# CONFIG_LTE_GDM724X is not set +# CONFIG_FIREWIRE_SERIAL is not set +# CONFIG_MTD_SPINAND_MT29F is not set +# CONFIG_DGNC is not set +# CONFIG_GS_FPGABOOT is not set +# CONFIG_UNISYSSPAR is not set +# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set +# CONFIG_FB_TFT is not set +# CONFIG_WILC1000_SDIO is not set +# CONFIG_WILC1000_SPI is not set +# CONFIG_MOST is not set +# CONFIG_KS7010 is not set +# CONFIG_GREYBUS is not set +CONFIG_BCM_VIDEOCORE=y +# CONFIG_BCM2835_VCHIQ is not set +# CONFIG_SND_BCM2835 is not set +# CONFIG_VIDEO_BCM2835 is not set +CONFIG_PI433=m +CONFIG_MTK_MMC=m +# CONFIG_MTK_AEE_KDUMP is not set +# CONFIG_MTK_MMC_CD_POLL is not set + +# +# Gasket devices +# +# CONFIG_XIL_AXIS_FIFO is not set +CONFIG_EROFS_FS=m +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS_XATTR=y +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +# CONFIG_EROFS_FS_USE_VM_MAP_RAM is not set +# CONFIG_EROFS_FAULT_INJECTION is not set +# CONFIG_EROFS_FS_ZIP is not set +# CONFIG_GOLDFISH is not set +CONFIG_CHROME_PLATFORMS=y +CONFIG_CROS_EC_CTL=m +CONFIG_CROS_EC_I2C=m +CONFIG_CROS_EC_SPI=m +CONFIG_CROS_EC_PROTO=y +# CONFIG_MELLANOX_PLATFORM is not set +CONFIG_CLKDEV_LOOKUP=y +CONFIG_HAVE_CLK_PREPARE=y +CONFIG_COMMON_CLK=y + +# +# Common Clock Framework +# +CONFIG_ICST=y +CONFIG_COMMON_CLK_VERSATILE=y +CONFIG_CLK_SP810=y +CONFIG_CLK_VEXPRESS_OSC=y +# CONFIG_CLK_HSDK is not set +CONFIG_COMMON_CLK_MAX77686=m +CONFIG_COMMON_CLK_MAX9485=m +CONFIG_COMMON_CLK_RK808=m +CONFIG_COMMON_CLK_SCMI=m +# CONFIG_COMMON_CLK_SI5351 is not set +# CONFIG_COMMON_CLK_SI514 is not set +# CONFIG_COMMON_CLK_SI544 is not set +# CONFIG_COMMON_CLK_SI570 is not set +# CONFIG_COMMON_CLK_CDCE706 is not set +# CONFIG_COMMON_CLK_CDCE925 is not set +# CONFIG_COMMON_CLK_CS2000_CP is not set +CONFIG_COMMON_CLK_S2MPS11=m +CONFIG_CLK_TWL6040=m +# CONFIG_CLK_QORIQ is not set +CONFIG_COMMON_CLK_PALMAS=m +# CONFIG_COMMON_CLK_PWM is not set +# CONFIG_COMMON_CLK_VC5 is not set +CONFIG_MVEBU_CLK_COMMON=y +CONFIG_MVEBU_CLK_CPU=y +CONFIG_MVEBU_CLK_COREDIV=y +CONFIG_ARMADA_370_CLK=y +CONFIG_ARMADA_375_CLK=y +CONFIG_ARMADA_38X_CLK=y +CONFIG_ARMADA_39X_CLK=y +CONFIG_ARMADA_XP_CLK=y +CONFIG_COMMON_CLK_SAMSUNG=y +CONFIG_EXYNOS_AUDSS_CLK_CON=y +CONFIG_SUNXI_CCU=y +CONFIG_SUN4I_A10_CCU=y +CONFIG_SUN5I_CCU=y +CONFIG_SUN6I_A31_CCU=y +CONFIG_SUN8I_A23_CCU=y +CONFIG_SUN8I_A33_CCU=y +CONFIG_SUN8I_A83T_CCU=y +CONFIG_SUN8I_H3_CCU=y +CONFIG_SUN8I_V3S_CCU=y +# CONFIG_SUN8I_DE2_CCU is not set +CONFIG_SUN8I_R40_CCU=y +CONFIG_SUN9I_A80_CCU=y +CONFIG_SUN8I_R_CCU=y +CONFIG_TEGRA_CLK_EMC=y +CONFIG_COMMON_CLK_TI_ADPLL=y +# CONFIG_HWSPINLOCK is not set + +# +# Clock Source drivers +# +CONFIG_TIMER_OF=y +CONFIG_TIMER_PROBE=y +CONFIG_OMAP_DM_TIMER=y +CONFIG_CLKSRC_MMIO=y +CONFIG_BCM2835_TIMER=y +CONFIG_DW_APB_TIMER=y +CONFIG_DW_APB_TIMER_OF=y +CONFIG_ROCKCHIP_TIMER=y +CONFIG_ARMADA_370_XP_TIMER=y +CONFIG_SUN4I_TIMER=y +CONFIG_SUN5I_HSTIMER=y +CONFIG_TEGRA_TIMER=y +CONFIG_VT8500_TIMER=y +CONFIG_CLKSRC_TI_32K=y +CONFIG_ARM_ARCH_TIMER=y +CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y +CONFIG_ARM_GLOBAL_TIMER=y +CONFIG_ARM_TIMER_SP804=y +CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK=y +CONFIG_CLKSRC_EXYNOS_MCT=y +CONFIG_CLKSRC_SAMSUNG_PWM=y +CONFIG_CLKSRC_VERSATILE=y +CONFIG_CLKSRC_IMX_GPT=y +CONFIG_MAILBOX=y +# CONFIG_ARM_MHU is not set +CONFIG_IMX_MBOX=m +# CONFIG_PLATFORM_MHU is not set +CONFIG_PL320_MBOX=y +CONFIG_OMAP2PLUS_MBOX=y +CONFIG_OMAP_MBOX_KFIFO_SIZE=256 +# CONFIG_ROCKCHIP_MBOX is not set +# CONFIG_ALTERA_MBOX is not set +CONFIG_BCM2835_MBOX=y +# CONFIG_MAILBOX_TEST is not set +# CONFIG_TEGRA_HSP_MBOX is not set +CONFIG_IOMMU_API=y +CONFIG_IOMMU_SUPPORT=y + +# +# Generic IOMMU Pagetable Support +# +# CONFIG_IOMMU_IO_PGTABLE_LPAE is not set +# CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set +# CONFIG_IOMMU_DEBUGFS is not set +# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set +CONFIG_OF_IOMMU=y +CONFIG_OMAP_IOMMU=y +# CONFIG_OMAP_IOMMU_DEBUG is not set +CONFIG_ROCKCHIP_IOMMU=y +CONFIG_TEGRA_IOMMU_SMMU=y +# CONFIG_EXYNOS_IOMMU is not set +# CONFIG_ARM_SMMU is not set + +# +# Remoteproc drivers +# +# CONFIG_REMOTEPROC is not set + +# +# Rpmsg drivers +# +# CONFIG_RPMSG_QCOM_GLINK_RPM is not set +# CONFIG_RPMSG_VIRTIO is not set +# CONFIG_SOUNDWIRE is not set + +# +# SOC (System On Chip) specific Drivers +# + +# +# Amlogic SoC drivers +# + +# +# Broadcom SoC drivers +# +CONFIG_RASPBERRYPI_POWER=y +# CONFIG_SOC_BRCMSTB is not set + +# +# NXP/Freescale QorIQ SoC drivers +# + +# +# i.MX SoC drivers +# + +# +# Qualcomm SoC drivers +# +CONFIG_ROCKCHIP_GRF=y +CONFIG_ROCKCHIP_PM_DOMAINS=y +CONFIG_SOC_SAMSUNG=y +CONFIG_EXYNOS_PMU=y +CONFIG_EXYNOS_PMU_ARM_DRIVERS=y +CONFIG_EXYNOS_PM_DOMAINS=y +CONFIG_SUNXI_SRAM=y +# CONFIG_ARCH_TEGRA_2x_SOC is not set +# CONFIG_ARCH_TEGRA_3x_SOC is not set +# CONFIG_ARCH_TEGRA_114_SOC is not set +CONFIG_ARCH_TEGRA_124_SOC=y +CONFIG_SOC_TEGRA_FUSE=y +CONFIG_SOC_TEGRA_FLOWCTRL=y +CONFIG_SOC_TEGRA_PMC=y +# CONFIG_SOC_TI is not set + +# +# Xilinx SoC drivers +# +# CONFIG_XILINX_VCU is not set +CONFIG_PM_DEVFREQ=y + +# +# DEVFREQ Governors +# +CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m +# CONFIG_DEVFREQ_GOV_PERFORMANCE is not set +# CONFIG_DEVFREQ_GOV_POWERSAVE is not set +# CONFIG_DEVFREQ_GOV_USERSPACE is not set +# CONFIG_DEVFREQ_GOV_PASSIVE is not set + +# +# DEVFREQ Drivers +# +# CONFIG_ARM_EXYNOS_BUS_DEVFREQ is not set +CONFIG_ARM_TEGRA_DEVFREQ=m +# CONFIG_ARM_RK3399_DMC_DEVFREQ is not set +# CONFIG_PM_DEVFREQ_EVENT is not set +CONFIG_EXTCON=y + +# +# Extcon Device Drivers +# +# CONFIG_EXTCON_ADC_JACK is not set +# CONFIG_EXTCON_GPIO is not set +# CONFIG_EXTCON_MAX3355 is not set +CONFIG_EXTCON_PALMAS=m +# CONFIG_EXTCON_RT8973A is not set +# CONFIG_EXTCON_SM5502 is not set +CONFIG_EXTCON_USB_GPIO=m +CONFIG_EXTCON_USBC_CROS_EC=m +CONFIG_MEMORY=y +# CONFIG_ARM_PL172_MPMC is not set +CONFIG_TI_EMIF=m +CONFIG_OMAP_GPMC=y +# CONFIG_OMAP_GPMC_DEBUG is not set +CONFIG_TI_EMIF_SRAM=m +CONFIG_MVEBU_DEVBUS=y +CONFIG_SAMSUNG_MC=y +CONFIG_EXYNOS_SROM=y +CONFIG_TEGRA_MC=y +CONFIG_TEGRA124_EMC=y +CONFIG_IIO=m +CONFIG_IIO_BUFFER=y +CONFIG_IIO_BUFFER_CB=m +# CONFIG_IIO_BUFFER_HW_CONSUMER is not set +CONFIG_IIO_KFIFO_BUF=m +CONFIG_IIO_TRIGGERED_BUFFER=m +# CONFIG_IIO_CONFIGFS is not set +CONFIG_IIO_TRIGGER=y +CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 +# CONFIG_IIO_SW_DEVICE is not set +# CONFIG_IIO_SW_TRIGGER is not set + +# +# Accelerometers +# +# CONFIG_ADIS16201 is not set +# CONFIG_ADIS16209 is not set +# CONFIG_ADXL345_I2C is not set +# CONFIG_ADXL345_SPI is not set +# CONFIG_BMA180 is not set +# CONFIG_BMA220 is not set +# CONFIG_BMC150_ACCEL is not set +# CONFIG_DA280 is not set +# CONFIG_DA311 is not set +# CONFIG_DMARD06 is not set +# CONFIG_DMARD09 is not set +# CONFIG_DMARD10 is not set +CONFIG_HID_SENSOR_ACCEL_3D=m +CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m +CONFIG_IIO_ST_ACCEL_3AXIS=m +CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m +CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m +# CONFIG_KXSD9 is not set +# CONFIG_KXCJK1013 is not set +# CONFIG_MC3230 is not set +# CONFIG_MMA7455_I2C is not set +# CONFIG_MMA7455_SPI is not set +# CONFIG_MMA7660 is not set +CONFIG_MMA8452=m +# CONFIG_MMA9551 is not set +# CONFIG_MMA9553 is not set +# CONFIG_MXC4005 is not set +# CONFIG_MXC6255 is not set +# CONFIG_SCA3000 is not set +# CONFIG_STK8312 is not set +# CONFIG_STK8BA50 is not set + +# +# Analog to digital converters +# +# CONFIG_AD7266 is not set +# CONFIG_AD7291 is not set +# CONFIG_AD7298 is not set +# CONFIG_AD7476 is not set +# CONFIG_AD7766 is not set +# CONFIG_AD7791 is not set +# CONFIG_AD7793 is not set +# CONFIG_AD7887 is not set +# CONFIG_AD7923 is not set +# CONFIG_AD799X is not set +CONFIG_AXP20X_ADC=m +CONFIG_AXP288_ADC=m +# CONFIG_CC10001_ADC is not set +# CONFIG_ENVELOPE_DETECTOR is not set +CONFIG_EXYNOS_ADC=m +# CONFIG_HI8435 is not set +# CONFIG_HX711 is not set +# CONFIG_INA2XX_ADC is not set +# CONFIG_IMX7D_ADC is not set +CONFIG_LTC2471=m +# CONFIG_LTC2485 is not set +# CONFIG_LTC2497 is not set +# CONFIG_MAX1027 is not set +# CONFIG_MAX11100 is not set +# CONFIG_MAX1118 is not set +# CONFIG_MAX1363 is not set +# CONFIG_MAX9611 is not set +# CONFIG_MCP320X is not set +# CONFIG_MCP3422 is not set +# CONFIG_NAU7802 is not set +# CONFIG_PALMAS_GPADC is not set +CONFIG_ROCKCHIP_SARADC=m +CONFIG_SD_ADC_MODULATOR=m +# CONFIG_SUN4I_GPADC is not set +# CONFIG_TI_ADC081C is not set +# CONFIG_TI_ADC0832 is not set +# CONFIG_TI_ADC084S021 is not set +# CONFIG_TI_ADC12138 is not set +# CONFIG_TI_ADC108S102 is not set +# CONFIG_TI_ADC128S052 is not set +# CONFIG_TI_ADC161S626 is not set +# CONFIG_TI_ADS1015 is not set +# CONFIG_TI_ADS7950 is not set +# CONFIG_TI_ADS8688 is not set +CONFIG_TI_AM335X_ADC=m +# CONFIG_TI_TLC4541 is not set +CONFIG_TWL4030_MADC=m +# CONFIG_TWL6030_GPADC is not set +# CONFIG_VF610_ADC is not set +CONFIG_VIPERBOARD_ADC=m + +# +# Analog Front Ends +# +# CONFIG_IIO_RESCALE is not set + +# +# Amplifiers +# +# CONFIG_AD8366 is not set + +# +# Chemical Sensors +# +# CONFIG_ATLAS_PH_SENSOR is not set +# CONFIG_BME680 is not set +CONFIG_CCS811=m +# CONFIG_IAQCORE is not set +# CONFIG_VZ89X is not set +# CONFIG_IIO_CROS_EC_SENSORS_CORE is not set + +# +# Hid Sensor IIO Common +# +CONFIG_HID_SENSOR_IIO_COMMON=m +CONFIG_HID_SENSOR_IIO_TRIGGER=m + +# +# SSP Sensor Common +# +# CONFIG_IIO_SSP_SENSORHUB is not set +CONFIG_IIO_ST_SENSORS_I2C=m +CONFIG_IIO_ST_SENSORS_SPI=m +CONFIG_IIO_ST_SENSORS_CORE=m + +# +# Counters +# + +# +# Digital to analog converters +# +# CONFIG_AD5064 is not set +# CONFIG_AD5360 is not set +# CONFIG_AD5380 is not set +# CONFIG_AD5421 is not set +# CONFIG_AD5446 is not set +# CONFIG_AD5449 is not set +# CONFIG_AD5592R is not set +# CONFIG_AD5593R is not set +# CONFIG_AD5504 is not set +# CONFIG_AD5624R_SPI is not set +# CONFIG_LTC2632 is not set +# CONFIG_AD5686_SPI is not set +# CONFIG_AD5696_I2C is not set +# CONFIG_AD5755 is not set +# CONFIG_AD5758 is not set +# CONFIG_AD5761 is not set +# CONFIG_AD5764 is not set +# CONFIG_AD5791 is not set +# CONFIG_AD7303 is not set +# CONFIG_AD8801 is not set +# CONFIG_DPOT_DAC is not set +# CONFIG_DS4424 is not set +# CONFIG_M62332 is not set +# CONFIG_MAX517 is not set +# CONFIG_MAX5821 is not set +# CONFIG_MCP4725 is not set +# CONFIG_MCP4922 is not set +# CONFIG_TI_DAC082S085 is not set +# CONFIG_TI_DAC5571 is not set +# CONFIG_VF610_DAC is not set + +# +# IIO dummy driver +# + +# +# Frequency Synthesizers DDS/PLL +# + +# +# Clock Generator/Distribution +# +# CONFIG_AD9523 is not set + +# +# Phase-Locked Loop (PLL) frequency synthesizers +# +# CONFIG_ADF4350 is not set + +# +# Digital gyroscope sensors +# +# CONFIG_ADIS16080 is not set +# CONFIG_ADIS16130 is not set +# CONFIG_ADIS16136 is not set +# CONFIG_ADIS16260 is not set +# CONFIG_ADXRS450 is not set +# CONFIG_BMG160 is not set +CONFIG_HID_SENSOR_GYRO_3D=m +# CONFIG_MPU3050_I2C is not set +# CONFIG_IIO_ST_GYRO_3AXIS is not set +# CONFIG_ITG3200 is not set + +# +# Health Sensors +# + +# +# Heart Rate Monitors +# +# CONFIG_AFE4403 is not set +# CONFIG_AFE4404 is not set +# CONFIG_MAX30100 is not set +# CONFIG_MAX30102 is not set + +# +# Humidity sensors +# +# CONFIG_AM2315 is not set +# CONFIG_DHT11 is not set +# CONFIG_HDC100X is not set +# CONFIG_HID_SENSOR_HUMIDITY is not set +# CONFIG_HTS221 is not set +# CONFIG_HTU21 is not set +# CONFIG_SI7005 is not set +# CONFIG_SI7020 is not set + +# +# Inertial measurement units +# +# CONFIG_ADIS16400 is not set +# CONFIG_ADIS16480 is not set +# CONFIG_BMI160_I2C is not set +# CONFIG_BMI160_SPI is not set +# CONFIG_KMX61 is not set +# CONFIG_INV_MPU6050_I2C is not set +# CONFIG_INV_MPU6050_SPI is not set +# CONFIG_IIO_ST_LSM6DSX is not set + +# +# Light sensors +# +# CONFIG_ADJD_S311 is not set +# CONFIG_AL3320A is not set +# CONFIG_APDS9300 is not set +# CONFIG_APDS9960 is not set +# CONFIG_BH1750 is not set +CONFIG_BH1780=m +# CONFIG_CM32181 is not set +# CONFIG_CM3232 is not set +# CONFIG_CM3323 is not set +# CONFIG_CM3605 is not set +# CONFIG_CM36651 is not set +# CONFIG_GP2AP020A00F is not set +# CONFIG_SENSORS_ISL29018 is not set +# CONFIG_SENSORS_ISL29028 is not set +# CONFIG_ISL29125 is not set +CONFIG_HID_SENSOR_ALS=m +CONFIG_HID_SENSOR_PROX=m +# CONFIG_JSA1212 is not set +# CONFIG_RPR0521 is not set +# CONFIG_LTR501 is not set +# CONFIG_LV0104CS is not set +# CONFIG_MAX44000 is not set +# CONFIG_OPT3001 is not set +# CONFIG_PA12203001 is not set +# CONFIG_SI1133 is not set +# CONFIG_SI1145 is not set +# CONFIG_STK3310 is not set +# CONFIG_ST_UVIS25 is not set +# CONFIG_TCS3414 is not set +# CONFIG_TCS3472 is not set +CONFIG_SENSORS_TSL2563=m +# CONFIG_TSL2583 is not set +# CONFIG_TSL2772 is not set +# CONFIG_TSL4531 is not set +# CONFIG_US5182D is not set +# CONFIG_VCNL4000 is not set +# CONFIG_VEML6070 is not set +# CONFIG_VL6180 is not set +# CONFIG_ZOPT2201 is not set + +# +# Magnetometer sensors +# +# CONFIG_AK8974 is not set +# CONFIG_AK8975 is not set +# CONFIG_AK09911 is not set +# CONFIG_BMC150_MAGN_I2C is not set +# CONFIG_BMC150_MAGN_SPI is not set +# CONFIG_MAG3110 is not set +CONFIG_HID_SENSOR_MAGNETOMETER_3D=m +# CONFIG_MMC35240 is not set +# CONFIG_IIO_ST_MAGN_3AXIS is not set +# CONFIG_SENSORS_HMC5843_I2C is not set +# CONFIG_SENSORS_HMC5843_SPI is not set + +# +# Multiplexers +# +# CONFIG_IIO_MUX is not set + +# +# Inclinometer sensors +# +CONFIG_HID_SENSOR_INCLINOMETER_3D=m +CONFIG_HID_SENSOR_DEVICE_ROTATION=m + +# +# Triggers - standalone +# +# CONFIG_IIO_INTERRUPT_TRIGGER is not set +# CONFIG_IIO_SYSFS_TRIGGER is not set + +# +# Digital potentiometers +# +# CONFIG_AD5272 is not set +# CONFIG_DS1803 is not set +# CONFIG_MAX5481 is not set +# CONFIG_MAX5487 is not set +# CONFIG_MCP4018 is not set +# CONFIG_MCP4131 is not set +# CONFIG_MCP4531 is not set +# CONFIG_TPL0102 is not set + +# +# Digital potentiostats +# +# CONFIG_LMP91000 is not set + +# +# Pressure sensors +# +# CONFIG_ABP060MG is not set +# CONFIG_BMP280 is not set +CONFIG_HID_SENSOR_PRESS=m +# CONFIG_HP03 is not set +# CONFIG_MPL115_I2C is not set +# CONFIG_MPL115_SPI is not set +# CONFIG_MPL3115 is not set +# CONFIG_MS5611 is not set +# CONFIG_MS5637 is not set +# CONFIG_IIO_ST_PRESS is not set +# CONFIG_T5403 is not set +# CONFIG_HP206C is not set +# CONFIG_ZPA2326 is not set + +# +# Lightning sensors +# +# CONFIG_AS3935 is not set + +# +# Proximity and distance sensors +# +# CONFIG_ISL29501 is not set +# CONFIG_LIDAR_LITE_V2 is not set +# CONFIG_RFD77402 is not set +# CONFIG_SRF04 is not set +# CONFIG_SX9500 is not set +# CONFIG_SRF08 is not set + +# +# Resolver to digital converters +# +# CONFIG_AD2S1200 is not set + +# +# Temperature sensors +# +# CONFIG_MAXIM_THERMOCOUPLE is not set +# CONFIG_HID_SENSOR_TEMP is not set +# CONFIG_MLX90614 is not set +# CONFIG_MLX90632 is not set +# CONFIG_TMP006 is not set +# CONFIG_TMP007 is not set +# CONFIG_TSYS01 is not set +# CONFIG_TSYS02D is not set +# CONFIG_NTB is not set +# CONFIG_VME_BUS is not set +CONFIG_PWM=y +CONFIG_PWM_SYSFS=y +CONFIG_PWM_BCM2835=m +# CONFIG_PWM_CROS_EC is not set +# CONFIG_PWM_FSL_FTM is not set +CONFIG_PWM_IMX=m +CONFIG_PWM_OMAP_DMTIMER=m +# CONFIG_PWM_PCA9685 is not set +CONFIG_PWM_ROCKCHIP=m +CONFIG_PWM_SAMSUNG=m +# CONFIG_PWM_STMPE is not set +CONFIG_PWM_SUN4I=m +CONFIG_PWM_TEGRA=m +CONFIG_PWM_TIECAP=m +CONFIG_PWM_TIEHRPWM=m +CONFIG_PWM_TIPWMSS=y +CONFIG_PWM_TWL=m +CONFIG_PWM_TWL_LED=m +CONFIG_PWM_VT8500=m + +# +# IRQ chip support +# +CONFIG_IRQCHIP=y +CONFIG_ARM_GIC=y +CONFIG_ARM_GIC_MAX_NR=1 +CONFIG_ARM_GIC_V2M=y +CONFIG_GIC_NON_BANKED=y +CONFIG_ARM_GIC_V3=y +CONFIG_ARM_GIC_V3_ITS=y +CONFIG_ARM_GIC_V3_ITS_PCI=y +CONFIG_ARMADA_370_XP_IRQ=y +CONFIG_OMAP_IRQCHIP=y +# CONFIG_TS4800_IRQ is not set +CONFIG_IRQ_CROSSBAR=y +CONFIG_PARTITION_PERCPU=y +# CONFIG_IPACK_BUS is not set +CONFIG_ARCH_HAS_RESET_CONTROLLER=y +CONFIG_RESET_CONTROLLER=y +CONFIG_RESET_SIMPLE=y +CONFIG_RESET_SUNXI=y +# CONFIG_RESET_TI_SYSCON is not set +# CONFIG_FMC is not set + +# +# PHY Subsystem +# +CONFIG_GENERIC_PHY=y +CONFIG_PHY_SUN4I_USB=m +CONFIG_PHY_SUN9I_USB=m +# CONFIG_BCM_KONA_USB2_PHY is not set +CONFIG_ARMADA375_USBCLUSTER_PHY=y +CONFIG_PHY_MVEBU_CP110_COMPHY=m +# CONFIG_PHY_PXA_28NM_HSIC is not set +# CONFIG_PHY_PXA_28NM_USB2 is not set +# CONFIG_PHY_CPCAP_USB is not set +# CONFIG_PHY_MAPPHONE_MDM6600 is not set +CONFIG_PHY_QCOM_USB_HS=m +CONFIG_PHY_QCOM_USB_HSIC=m +CONFIG_PHY_ROCKCHIP_DP=m +CONFIG_PHY_ROCKCHIP_EMMC=m +# CONFIG_PHY_ROCKCHIP_INNO_USB2 is not set +# CONFIG_PHY_ROCKCHIP_PCIE is not set +# CONFIG_PHY_ROCKCHIP_TYPEC is not set +CONFIG_PHY_ROCKCHIP_USB=m +CONFIG_PHY_EXYNOS_DP_VIDEO=m +CONFIG_PHY_EXYNOS_MIPI_VIDEO=m +# CONFIG_PHY_EXYNOS_PCIE is not set +CONFIG_PHY_SAMSUNG_USB2=m +CONFIG_PHY_EXYNOS4210_USB2=y +CONFIG_PHY_EXYNOS4X12_USB2=y +CONFIG_PHY_EXYNOS5250_USB2=y +CONFIG_PHY_EXYNOS5_USBDRD=m +CONFIG_PHY_EXYNOS5250_SATA=m +CONFIG_PHY_TEGRA_XUSB=m +# CONFIG_PHY_DM816X_USB is not set +CONFIG_OMAP_CONTROL_PHY=m +CONFIG_OMAP_USB2=m +CONFIG_TI_PIPE3=m +CONFIG_PHY_TUSB1210=m +CONFIG_TWL4030_USB=m +# CONFIG_POWERCAP is not set +# CONFIG_MCB is not set + +# +# Performance monitor support +# +# CONFIG_ARM_CCI_PMU is not set +# CONFIG_ARM_CCN is not set +CONFIG_ARM_PMU=y +CONFIG_RAS=y + +# +# Android +# +# CONFIG_ANDROID is not set +CONFIG_DAX=m +CONFIG_NVMEM=y +# CONFIG_NVMEM_IMX_IIM is not set +# CONFIG_NVMEM_IMX_OCOTP is not set +CONFIG_ROCKCHIP_EFUSE=m +CONFIG_NVMEM_SUNXI_SID=m +# CONFIG_NVMEM_SNVS_LPGPR is not set + +# +# HW tracing support +# +# CONFIG_STM is not set +# CONFIG_INTEL_TH is not set +# CONFIG_FPGA is not set +# CONFIG_FSI is not set +# CONFIG_TEE is not set +CONFIG_PM_OPP=y +# CONFIG_SIOX is not set +# CONFIG_SLIMBUS is not set + +# +# File systems +# +CONFIG_DCACHE_WORD_ACCESS=y +CONFIG_FS_IOMAP=y +# CONFIG_EXT2_FS is not set +# CONFIG_EXT3_FS is not set +CONFIG_EXT4_FS=y +CONFIG_EXT4_USE_FOR_EXT2=y +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y +# CONFIG_EXT4_ENCRYPTION is not set +# CONFIG_EXT4_DEBUG is not set +CONFIG_JBD2=y +# CONFIG_JBD2_DEBUG is not set +CONFIG_FS_MBCACHE=y +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +CONFIG_REISERFS_FS_XATTR=y +CONFIG_REISERFS_FS_POSIX_ACL=y +CONFIG_REISERFS_FS_SECURITY=y +CONFIG_JFS_FS=m +CONFIG_JFS_POSIX_ACL=y +CONFIG_JFS_SECURITY=y +# CONFIG_JFS_DEBUG is not set +# CONFIG_JFS_STATISTICS is not set +CONFIG_XFS_FS=m +CONFIG_XFS_QUOTA=y +CONFIG_XFS_POSIX_ACL=y +CONFIG_XFS_RT=y +# CONFIG_XFS_ONLINE_SCRUB is not set +# CONFIG_XFS_WARN is not set +# CONFIG_XFS_DEBUG is not set +CONFIG_GFS2_FS=m +CONFIG_GFS2_FS_LOCKING_DLM=y +CONFIG_OCFS2_FS=m +CONFIG_OCFS2_FS_O2CB=m +CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m +CONFIG_OCFS2_FS_STATS=y +CONFIG_OCFS2_DEBUG_MASKLOG=y +# CONFIG_OCFS2_DEBUG_FS is not set +CONFIG_BTRFS_FS=m +CONFIG_BTRFS_FS_POSIX_ACL=y +# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set +# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set +# CONFIG_BTRFS_DEBUG is not set +# CONFIG_BTRFS_ASSERT is not set +# CONFIG_BTRFS_FS_REF_VERIFY is not set +CONFIG_NILFS2_FS=m +CONFIG_F2FS_FS=m +CONFIG_F2FS_STAT_FS=y +CONFIG_F2FS_FS_XATTR=y +CONFIG_F2FS_FS_POSIX_ACL=y +CONFIG_F2FS_FS_SECURITY=y +# CONFIG_F2FS_CHECK_FS is not set +CONFIG_F2FS_FS_ENCRYPTION=y +# CONFIG_F2FS_IO_TRACE is not set +# CONFIG_F2FS_FAULT_INJECTION is not set +CONFIG_FS_POSIX_ACL=y +CONFIG_EXPORTFS=y +CONFIG_EXPORTFS_BLOCK_OPS=y +CONFIG_FILE_LOCKING=y +CONFIG_MANDATORY_FILE_LOCKING=y +CONFIG_FS_ENCRYPTION=m +CONFIG_FSNOTIFY=y +CONFIG_DNOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_FANOTIFY=y +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y +CONFIG_QUOTA=y +CONFIG_QUOTA_NETLINK_INTERFACE=y +CONFIG_PRINT_QUOTA_WARNING=y +# CONFIG_QUOTA_DEBUG is not set +CONFIG_QUOTA_TREE=m +CONFIG_QFMT_V1=m +CONFIG_QFMT_V2=m +CONFIG_QUOTACTL=y +CONFIG_AUTOFS4_FS=m +CONFIG_AUTOFS_FS=m +CONFIG_FUSE_FS=m +CONFIG_CUSE=m +CONFIG_OVERLAY_FS=m +# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set +# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set +# CONFIG_OVERLAY_FS_INDEX is not set +# CONFIG_OVERLAY_FS_XINO_AUTO is not set +# CONFIG_OVERLAY_FS_METACOPY is not set + +# +# Caches +# +CONFIG_FSCACHE=m +CONFIG_FSCACHE_STATS=y +# CONFIG_FSCACHE_HISTOGRAM is not set +# CONFIG_FSCACHE_DEBUG is not set +# CONFIG_FSCACHE_OBJECT_LIST is not set +CONFIG_CACHEFILES=m +# CONFIG_CACHEFILES_DEBUG is not set +# CONFIG_CACHEFILES_HISTOGRAM is not set + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=m + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_FAT_DEFAULT_UTF8 is not set +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +# CONFIG_NTFS_RW is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_PROC_CHILDREN=y +CONFIG_KERNFS=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_TMPFS_XATTR=y +CONFIG_MEMFD_CREATE=y +CONFIG_CONFIGFS_FS=m +CONFIG_EFIVAR_FS=m +CONFIG_MISC_FILESYSTEMS=y +# CONFIG_ORANGEFS_FS is not set +CONFIG_ADFS_FS=m +# CONFIG_ADFS_FS_RW is not set +CONFIG_AFFS_FS=m +CONFIG_ECRYPT_FS=m +CONFIG_ECRYPT_FS_MESSAGING=y +CONFIG_HFS_FS=m +CONFIG_HFSPLUS_FS=m +CONFIG_BEFS_FS=m +# CONFIG_BEFS_DEBUG is not set +CONFIG_BFS_FS=m +CONFIG_EFS_FS=m +CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +CONFIG_JFFS2_SUMMARY=y +CONFIG_JFFS2_FS_XATTR=y +CONFIG_JFFS2_FS_POSIX_ACL=y +CONFIG_JFFS2_FS_SECURITY=y +CONFIG_JFFS2_COMPRESSION_OPTIONS=y +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_LZO=y +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +# CONFIG_JFFS2_CMODE_NONE is not set +CONFIG_JFFS2_CMODE_PRIORITY=y +# CONFIG_JFFS2_CMODE_SIZE is not set +# CONFIG_JFFS2_CMODE_FAVOURLZO is not set +CONFIG_UBIFS_FS=m +CONFIG_UBIFS_FS_ADVANCED_COMPR=y +CONFIG_UBIFS_FS_LZO=y +CONFIG_UBIFS_FS_ZLIB=y +# CONFIG_UBIFS_ATIME_SUPPORT is not set +CONFIG_UBIFS_FS_XATTR=y +# CONFIG_UBIFS_FS_ENCRYPTION is not set +CONFIG_UBIFS_FS_SECURITY=y +# CONFIG_CRAMFS is not set +CONFIG_SQUASHFS=m +CONFIG_SQUASHFS_FILE_CACHE=y +# CONFIG_SQUASHFS_FILE_DIRECT is not set +CONFIG_SQUASHFS_DECOMP_SINGLE=y +# CONFIG_SQUASHFS_DECOMP_MULTI is not set +# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set +CONFIG_SQUASHFS_XATTR=y +CONFIG_SQUASHFS_ZLIB=y +# CONFIG_SQUASHFS_LZ4 is not set +CONFIG_SQUASHFS_LZO=y +CONFIG_SQUASHFS_XZ=y +# CONFIG_SQUASHFS_ZSTD is not set +# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +CONFIG_VXFS_FS=m +CONFIG_MINIX_FS=m +CONFIG_OMFS_FS=m +CONFIG_HPFS_FS=m +CONFIG_QNX4FS_FS=m +CONFIG_QNX6FS_FS=m +# CONFIG_QNX6FS_DEBUG is not set +CONFIG_ROMFS_FS=m +# CONFIG_ROMFS_BACKED_BY_BLOCK is not set +# CONFIG_ROMFS_BACKED_BY_MTD is not set +CONFIG_ROMFS_BACKED_BY_BOTH=y +CONFIG_ROMFS_ON_BLOCK=y +CONFIG_ROMFS_ON_MTD=y +# CONFIG_PSTORE is not set +CONFIG_SYSV_FS=m +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG is not set +CONFIG_EXOFS_FS=m +# CONFIG_EXOFS_DEBUG is not set +CONFIG_ORE=m +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=m +CONFIG_NFS_V2=m +CONFIG_NFS_V3=m +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=m +CONFIG_NFS_SWAP=y +CONFIG_NFS_V4_1=y +CONFIG_NFS_V4_2=y +CONFIG_PNFS_FILE_LAYOUT=m +CONFIG_PNFS_BLOCK=m +CONFIG_PNFS_FLEXFILE_LAYOUT=m +CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" +# CONFIG_NFS_V4_1_MIGRATION is not set +CONFIG_NFS_V4_SECURITY_LABEL=y +CONFIG_NFS_FSCACHE=y +# CONFIG_NFS_USE_LEGACY_DNS is not set +CONFIG_NFS_USE_KERNEL_DNS=y +CONFIG_NFS_DEBUG=y +CONFIG_NFSD=m +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3=y +CONFIG_NFSD_V3_ACL=y +CONFIG_NFSD_V4=y +CONFIG_NFSD_PNFS=y +CONFIG_NFSD_BLOCKLAYOUT=y +# CONFIG_NFSD_SCSILAYOUT is not set +# CONFIG_NFSD_FLEXFILELAYOUT is not set +CONFIG_NFSD_V4_SECURITY_LABEL=y +# CONFIG_NFSD_FAULT_INJECTION is not set +CONFIG_GRACE_PERIOD=m +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_NFS_ACL_SUPPORT=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=m +CONFIG_SUNRPC_GSS=m +CONFIG_SUNRPC_BACKCHANNEL=y +CONFIG_SUNRPC_SWAP=y +CONFIG_RPCSEC_GSS_KRB5=m +CONFIG_SUNRPC_DEBUG=y +CONFIG_SUNRPC_XPRT_RDMA=m +CONFIG_CEPH_FS=m +CONFIG_CEPH_FSCACHE=y +CONFIG_CEPH_FS_POSIX_ACL=y +CONFIG_CIFS=m +# CONFIG_CIFS_STATS2 is not set +CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y +CONFIG_CIFS_WEAK_PW_HASH=y +CONFIG_CIFS_UPCALL=y +CONFIG_CIFS_XATTR=y +CONFIG_CIFS_POSIX=y +CONFIG_CIFS_ACL=y +CONFIG_CIFS_DEBUG=y +# CONFIG_CIFS_DEBUG2 is not set +# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set +CONFIG_CIFS_DFS_UPCALL=y +# CONFIG_CIFS_SMB_DIRECT is not set +CONFIG_CIFS_FSCACHE=y +CONFIG_CODA_FS=m +CONFIG_AFS_FS=m +# CONFIG_AFS_DEBUG is not set +CONFIG_AFS_FSCACHE=y +CONFIG_9P_FS=m +CONFIG_9P_FSCACHE=y +CONFIG_9P_FS_POSIX_ACL=y +CONFIG_9P_FS_SECURITY=y +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="utf8" +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=m +CONFIG_NLS_ISO8859_1=m +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_MAC_ROMAN=m +CONFIG_NLS_MAC_CELTIC=m +CONFIG_NLS_MAC_CENTEURO=m +CONFIG_NLS_MAC_CROATIAN=m +CONFIG_NLS_MAC_CYRILLIC=m +CONFIG_NLS_MAC_GAELIC=m +CONFIG_NLS_MAC_GREEK=m +CONFIG_NLS_MAC_ICELAND=m +CONFIG_NLS_MAC_INUIT=m +CONFIG_NLS_MAC_ROMANIAN=m +CONFIG_NLS_MAC_TURKISH=m +CONFIG_NLS_UTF8=m +CONFIG_DLM=m +CONFIG_DLM_DEBUG=y + +# +# Security options +# +CONFIG_KEYS=y +# CONFIG_PERSISTENT_KEYRINGS is not set +# CONFIG_BIG_KEYS is not set +# CONFIG_TRUSTED_KEYS is not set +# CONFIG_ENCRYPTED_KEYS is not set +# CONFIG_KEY_DH_OPERATIONS is not set +CONFIG_SECURITY_DMESG_RESTRICT=y +CONFIG_SECURITY=y +CONFIG_SECURITYFS=y +CONFIG_SECURITY_NETWORK=y +# CONFIG_SECURITY_INFINIBAND is not set +CONFIG_SECURITY_NETWORK_XFRM=y +CONFIG_SECURITY_PATH=y +CONFIG_LSM_MMAP_MIN_ADDR=32768 +CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y +CONFIG_HARDENED_USERCOPY=y +CONFIG_HARDENED_USERCOPY_FALLBACK=y +# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set +CONFIG_FORTIFY_SOURCE=y +# CONFIG_STATIC_USERMODEHELPER is not set +CONFIG_SECURITY_SELINUX=y +# CONFIG_SECURITY_SELINUX_BOOTPARAM is not set +# CONFIG_SECURITY_SELINUX_DISABLE is not set +CONFIG_SECURITY_SELINUX_DEVELOP=y +CONFIG_SECURITY_SELINUX_AVC_STATS=y +CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0 +# CONFIG_SECURITY_SMACK is not set +CONFIG_SECURITY_TOMOYO=y +CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048 +CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024 +# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set +CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init" +CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init" +CONFIG_SECURITY_APPARMOR=y +CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1 +CONFIG_SECURITY_APPARMOR_HASH=y +CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y +# CONFIG_SECURITY_APPARMOR_DEBUG is not set +# CONFIG_SECURITY_LOADPIN is not set +CONFIG_SECURITY_YAMA=y +CONFIG_INTEGRITY=y +CONFIG_INTEGRITY_SIGNATURE=y +CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y +CONFIG_INTEGRITY_TRUSTED_KEYRING=y +CONFIG_INTEGRITY_AUDIT=y +CONFIG_IMA=y +CONFIG_IMA_MEASURE_PCR_IDX=10 +CONFIG_IMA_LSM_RULES=y +# CONFIG_IMA_TEMPLATE is not set +CONFIG_IMA_NG_TEMPLATE=y +# CONFIG_IMA_SIG_TEMPLATE is not set +CONFIG_IMA_DEFAULT_TEMPLATE="ima-ng" +# CONFIG_IMA_DEFAULT_HASH_SHA1 is not set +CONFIG_IMA_DEFAULT_HASH_SHA256=y +CONFIG_IMA_DEFAULT_HASH="sha256" +# CONFIG_IMA_WRITE_POLICY is not set +# CONFIG_IMA_READ_POLICY is not set +CONFIG_IMA_APPRAISE=y +# CONFIG_IMA_APPRAISE_BUILD_POLICY is not set +CONFIG_IMA_APPRAISE_BOOTPARAM=y +CONFIG_IMA_TRUSTED_KEYRING=y +# CONFIG_IMA_BLACKLIST_KEYRING is not set +# CONFIG_IMA_LOAD_X509 is not set +# CONFIG_EVM is not set +# CONFIG_DEFAULT_SECURITY_SELINUX is not set +# CONFIG_DEFAULT_SECURITY_TOMOYO is not set +CONFIG_DEFAULT_SECURITY_APPARMOR=y +# CONFIG_DEFAULT_SECURITY_DAC is not set +CONFIG_DEFAULT_SECURITY="apparmor" +CONFIG_XOR_BLOCKS=m +CONFIG_ASYNC_CORE=m +CONFIG_ASYNC_MEMCPY=m +CONFIG_ASYNC_XOR=m +CONFIG_ASYNC_PQ=m +CONFIG_ASYNC_RAID6_RECOV=m +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD=m +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_BLKCIPHER=m +CONFIG_CRYPTO_BLKCIPHER2=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG=m +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_RNG_DEFAULT=m +CONFIG_CRYPTO_AKCIPHER2=y +CONFIG_CRYPTO_AKCIPHER=y +CONFIG_CRYPTO_KPP2=y +CONFIG_CRYPTO_KPP=m +CONFIG_CRYPTO_ACOMP2=y +CONFIG_CRYPTO_RSA=y +# CONFIG_CRYPTO_DH is not set +CONFIG_CRYPTO_ECDH=m +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_USER=m +# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set +CONFIG_CRYPTO_GF128MUL=m +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_NULL2=y +CONFIG_CRYPTO_PCRYPT=m +CONFIG_CRYPTO_WORKQUEUE=y +# CONFIG_CRYPTO_CRYPTD is not set +# CONFIG_CRYPTO_MCRYPTD is not set +CONFIG_CRYPTO_AUTHENC=m +CONFIG_CRYPTO_TEST=m +CONFIG_CRYPTO_ENGINE=m + +# +# Authenticated Encryption with Associated Data +# +CONFIG_CRYPTO_CCM=m +CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_CHACHA20POLY1305=m +CONFIG_CRYPTO_AEGIS128=m +CONFIG_CRYPTO_AEGIS128L=m +CONFIG_CRYPTO_AEGIS256=m +CONFIG_CRYPTO_MORUS640=m +CONFIG_CRYPTO_MORUS1280=m +CONFIG_CRYPTO_SEQIV=m +CONFIG_CRYPTO_ECHAINIV=m + +# +# Block modes +# +CONFIG_CRYPTO_CBC=m +CONFIG_CRYPTO_CFB=m +CONFIG_CRYPTO_CTR=m +CONFIG_CRYPTO_CTS=m +CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_XTS=m +# CONFIG_CRYPTO_KEYWRAP is not set + +# +# Hash modes +# +CONFIG_CRYPTO_CMAC=m +CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_VMAC=m + +# +# Digest +# +CONFIG_CRYPTO_CRC32C=y +CONFIG_CRYPTO_CRC32=m +CONFIG_CRYPTO_CRCT10DIF=y +CONFIG_CRYPTO_GHASH=m +CONFIG_CRYPTO_POLY1305=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_RMD128=m +CONFIG_CRYPTO_RMD160=m +CONFIG_CRYPTO_RMD256=m +CONFIG_CRYPTO_RMD320=m +CONFIG_CRYPTO_SHA1=y +CONFIG_CRYPTO_SHA256=y +CONFIG_CRYPTO_SHA512=m +# CONFIG_CRYPTO_SHA3 is not set +# CONFIG_CRYPTO_SM3 is not set +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_WP512=m + +# +# Ciphers +# +CONFIG_CRYPTO_AES=y +# CONFIG_CRYPTO_AES_TI is not set +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_BLOWFISH_COMMON=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_CAST_COMMON=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_SALSA20=m +CONFIG_CRYPTO_CHACHA20=m +CONFIG_CRYPTO_SEED=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_SM4=m +CONFIG_CRYPTO_SPECK=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=m + +# +# Compression +# +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_LZO=y +# CONFIG_CRYPTO_842 is not set +CONFIG_CRYPTO_LZ4=m +CONFIG_CRYPTO_LZ4HC=m +CONFIG_CRYPTO_ZSTD=m + +# +# Random Number Generation +# +CONFIG_CRYPTO_ANSI_CPRNG=m +CONFIG_CRYPTO_DRBG_MENU=m +CONFIG_CRYPTO_DRBG_HMAC=y +# CONFIG_CRYPTO_DRBG_HASH is not set +# CONFIG_CRYPTO_DRBG_CTR is not set +CONFIG_CRYPTO_DRBG=m +CONFIG_CRYPTO_JITTERENTROPY=m +CONFIG_CRYPTO_USER_API=m +CONFIG_CRYPTO_USER_API_HASH=m +CONFIG_CRYPTO_USER_API_SKCIPHER=m +CONFIG_CRYPTO_USER_API_RNG=m +CONFIG_CRYPTO_USER_API_AEAD=m +CONFIG_CRYPTO_HASH_INFO=y +CONFIG_CRYPTO_HW=y +CONFIG_CRYPTO_DEV_MARVELL_CESA=m +# CONFIG_CRYPTO_DEV_FSL_CAAM is not set +# CONFIG_CRYPTO_DEV_OMAP is not set +# CONFIG_CRYPTO_DEV_SAHARA is not set +# CONFIG_CRYPTO_DEV_MXC_SCC is not set +# CONFIG_CRYPTO_DEV_EXYNOS_RNG is not set +# CONFIG_CRYPTO_DEV_S5P is not set +# CONFIG_CRYPTO_DEV_MXS_DCP is not set +CONFIG_CRYPTO_DEV_SUN4I_SS=m +# CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG is not set +# CONFIG_CRYPTO_DEV_ROCKCHIP is not set +CONFIG_CRYPTO_DEV_CHELSIO=m +CONFIG_CRYPTO_DEV_VIRTIO=m +# CONFIG_CRYPTO_DEV_CCREE is not set +CONFIG_ASYMMETRIC_KEY_TYPE=y +CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y +CONFIG_X509_CERTIFICATE_PARSER=y +CONFIG_PKCS7_MESSAGE_PARSER=y +# CONFIG_PKCS7_TEST_KEY is not set +# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set + +# +# Certificates for signature checking +# +CONFIG_SYSTEM_TRUSTED_KEYRING=y +CONFIG_SYSTEM_TRUSTED_KEYS="" +# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set +# CONFIG_SECONDARY_TRUSTED_KEYRING is not set +# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set +CONFIG_BINARY_PRINTF=y + +# +# Library routines +# +CONFIG_RAID6_PQ=m +CONFIG_BITREVERSE=y +CONFIG_HAVE_ARCH_BITREVERSE=y +CONFIG_RATIONAL=y +CONFIG_GENERIC_STRNCPY_FROM_USER=y +CONFIG_GENERIC_STRNLEN_USER=y +CONFIG_GENERIC_NET_UTILS=y +CONFIG_GENERIC_PCI_IOMAP=y +CONFIG_STMP_DEVICE=y +CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y +CONFIG_CRC_CCITT=m +CONFIG_CRC16=y +CONFIG_CRC_T10DIF=y +CONFIG_CRC_ITU_T=m +CONFIG_CRC32=y +# CONFIG_CRC32_SELFTEST is not set +CONFIG_CRC32_SLICEBY8=y +# CONFIG_CRC32_SLICEBY4 is not set +# CONFIG_CRC32_SARWATE is not set +# CONFIG_CRC32_BIT is not set +CONFIG_CRC64=m +# CONFIG_CRC4 is not set +CONFIG_CRC7=m +CONFIG_LIBCRC32C=m +CONFIG_CRC8=m +CONFIG_XXHASH=m +CONFIG_AUDIT_GENERIC=y +# CONFIG_RANDOM32_SELFTEST is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=m +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y +CONFIG_LZ4_COMPRESS=m +CONFIG_LZ4HC_COMPRESS=m +CONFIG_LZ4_DECOMPRESS=y +CONFIG_ZSTD_COMPRESS=m +CONFIG_ZSTD_DECOMPRESS=m +CONFIG_XZ_DEC=y +# CONFIG_XZ_DEC_X86 is not set +# CONFIG_XZ_DEC_POWERPC is not set +# CONFIG_XZ_DEC_IA64 is not set +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_ARMTHUMB=y +# CONFIG_XZ_DEC_SPARC is not set +CONFIG_XZ_DEC_BCJ=y +# CONFIG_XZ_DEC_TEST is not set +CONFIG_DECOMPRESS_GZIP=y +CONFIG_DECOMPRESS_BZIP2=y +CONFIG_DECOMPRESS_LZMA=y +CONFIG_DECOMPRESS_XZ=y +CONFIG_DECOMPRESS_LZO=y +CONFIG_DECOMPRESS_LZ4=y +CONFIG_GENERIC_ALLOCATOR=y +CONFIG_REED_SOLOMON=m +CONFIG_REED_SOLOMON_DEC16=y +CONFIG_BCH=y +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m +CONFIG_ASSOCIATIVE_ARRAY=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_DMA=y +CONFIG_NEED_SG_DMA_LENGTH=y +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_ARCH_DMA_ADDR_T_64BIT=y +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_DMA_DIRECT_OPS=y +CONFIG_DMA_VIRT_OPS=y +CONFIG_SWIOTLB=y +CONFIG_SGL_ALLOC=y +CONFIG_CHECK_SIGNATURE=y +CONFIG_CPU_RMAP=y +CONFIG_DQL=y +CONFIG_GLOB=y +# CONFIG_GLOB_SELFTEST is not set +CONFIG_NLATTR=y +CONFIG_LRU_CACHE=m +CONFIG_CLZ_TAB=y +CONFIG_CORDIC=m +CONFIG_DDR=y +CONFIG_IRQ_POLL=y +CONFIG_MPILIB=y +CONFIG_SIGNATURE=y +CONFIG_LIBFDT=y +CONFIG_OID_REGISTRY=y +CONFIG_UCS2_STRING=y +CONFIG_FONT_SUPPORT=y +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +CONFIG_SG_SPLIT=y +CONFIG_SG_POOL=y +CONFIG_ARCH_HAS_SG_CHAIN=y +CONFIG_SBITMAP=y +# CONFIG_STRING_SELFTEST is not set + +# +# Kernel hacking +# + +# +# printk and dmesg options +# +CONFIG_PRINTK_TIME=y +CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 +CONFIG_CONSOLE_LOGLEVEL_QUIET=4 +CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 +CONFIG_BOOT_PRINTK_DELAY=y +CONFIG_DYNAMIC_DEBUG=y + +# +# Compile-time checks and compiler options +# +CONFIG_DEBUG_INFO=y +# CONFIG_DEBUG_INFO_REDUCED is not set +# CONFIG_DEBUG_INFO_SPLIT is not set +# CONFIG_DEBUG_INFO_DWARF4 is not set +# CONFIG_GDB_SCRIPTS is not set +CONFIG_ENABLE_MUST_CHECK=y +CONFIG_FRAME_WARN=1024 +CONFIG_STRIP_ASM_SYMS=y +# CONFIG_READABLE_ASM is not set +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_PAGE_OWNER is not set +CONFIG_DEBUG_FS=y +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_SECTION_MISMATCH is not set +CONFIG_SECTION_MISMATCH_WARN_ONLY=y +CONFIG_FRAME_POINTER=y +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +CONFIG_MAGIC_SYSRQ=y +CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01b6 +CONFIG_MAGIC_SYSRQ_SERIAL=y +CONFIG_DEBUG_KERNEL=y + +# +# Memory Debugging +# +CONFIG_PAGE_EXTENSION=y +CONFIG_PAGE_POISONING=y +CONFIG_PAGE_POISONING_NO_SANITY=y +# CONFIG_PAGE_POISONING_ZERO is not set +# CONFIG_DEBUG_PAGE_REF is not set +# CONFIG_DEBUG_RODATA_TEST is not set +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_DEBUG_SLAB is not set +CONFIG_HAVE_DEBUG_KMEMLEAK=y +# CONFIG_DEBUG_KMEMLEAK is not set +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_DEBUG_VM is not set +CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y +# CONFIG_DEBUG_VIRTUAL is not set +CONFIG_DEBUG_MEMORY_INIT=y +# CONFIG_DEBUG_PER_CPU_MAPS is not set +# CONFIG_DEBUG_HIGHMEM is not set +CONFIG_ARCH_HAS_KCOV=y +CONFIG_CC_HAS_SANCOV_TRACE_PC=y +# CONFIG_KCOV is not set +# CONFIG_DEBUG_SHIRQ is not set + +# +# Debug Lockups and Hangs +# +CONFIG_LOCKUP_DETECTOR=y +CONFIG_SOFTLOCKUP_DETECTOR=y +# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 +CONFIG_DETECT_HUNG_TASK=y +CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 +# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 +# CONFIG_WQ_WATCHDOG is not set +# CONFIG_PANIC_ON_OOPS is not set +CONFIG_PANIC_ON_OOPS_VALUE=0 +CONFIG_PANIC_TIMEOUT=0 +CONFIG_SCHED_DEBUG=y +CONFIG_SCHED_INFO=y +CONFIG_SCHEDSTATS=y +CONFIG_SCHED_STACK_END_CHECK=y +# CONFIG_DEBUG_TIMEKEEPING is not set + +# +# Lock Debugging (spinlocks, mutexes, etc...) +# +CONFIG_LOCK_DEBUGGING_SUPPORT=y +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set +# CONFIG_DEBUG_RWSEMS is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_DEBUG_ATOMIC_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_LOCK_TORTURE_TEST is not set +# CONFIG_WW_MUTEX_SELFTEST is not set +CONFIG_STACKTRACE=y +# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set +# CONFIG_DEBUG_KOBJECT is not set +CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_DEBUG_LIST=y +# CONFIG_DEBUG_PI_LIST is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +# CONFIG_DEBUG_CREDENTIALS is not set + +# +# RCU Debugging +# +# CONFIG_RCU_PERF_TEST is not set +# CONFIG_RCU_TORTURE_TEST is not set +CONFIG_RCU_CPU_STALL_TIMEOUT=21 +# CONFIG_RCU_TRACE is not set +# CONFIG_RCU_EQS_DEBUG is not set +# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set +CONFIG_NOTIFIER_ERROR_INJECTION=m +CONFIG_PM_NOTIFIER_ERROR_INJECT=m +# CONFIG_OF_RECONFIG_NOTIFIER_ERROR_INJECT is not set +# CONFIG_NETDEV_NOTIFIER_ERROR_INJECT is not set +# CONFIG_FAULT_INJECTION is not set +# CONFIG_LATENCYTOP is not set +CONFIG_NOP_TRACER=y +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_TRACER_MAX_TRACE=y +CONFIG_TRACE_CLOCK=y +CONFIG_RING_BUFFER=y +CONFIG_EVENT_TRACING=y +CONFIG_CONTEXT_SWITCH_TRACER=y +CONFIG_RING_BUFFER_ALLOW_SWAP=y +CONFIG_TRACING=y +CONFIG_GENERIC_TRACER=y +CONFIG_TRACING_SUPPORT=y +CONFIG_FTRACE=y +CONFIG_FUNCTION_TRACER=y +CONFIG_FUNCTION_GRAPH_TRACER=y +# CONFIG_PREEMPTIRQ_EVENTS is not set +# CONFIG_IRQSOFF_TRACER is not set +# CONFIG_SCHED_TRACER is not set +# CONFIG_HWLAT_TRACER is not set +CONFIG_FTRACE_SYSCALLS=y +CONFIG_TRACER_SNAPSHOT=y +# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set +CONFIG_BRANCH_PROFILE_NONE=y +# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set +CONFIG_STACK_TRACER=y +CONFIG_BLK_DEV_IO_TRACE=y +CONFIG_KPROBE_EVENTS=y +CONFIG_UPROBE_EVENTS=y +CONFIG_BPF_EVENTS=y +CONFIG_PROBE_EVENTS=y +CONFIG_DYNAMIC_FTRACE=y +CONFIG_DYNAMIC_FTRACE_WITH_REGS=y +# CONFIG_FUNCTION_PROFILER is not set +CONFIG_FTRACE_MCOUNT_RECORD=y +# CONFIG_FTRACE_STARTUP_TEST is not set +# CONFIG_TRACEPOINT_BENCHMARK is not set +# CONFIG_RING_BUFFER_BENCHMARK is not set +# CONFIG_RING_BUFFER_STARTUP_TEST is not set +# CONFIG_PREEMPTIRQ_DELAY_TEST is not set +# CONFIG_TRACE_EVAL_MAP_FILE is not set +CONFIG_TRACING_EVENTS_GPIO=y +# CONFIG_DMA_API_DEBUG is not set +CONFIG_RUNTIME_TESTING_MENU=y +# CONFIG_LKDTM is not set +# CONFIG_TEST_LIST_SORT is not set +# CONFIG_TEST_SORT is not set +# CONFIG_KPROBES_SANITY_TEST is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_RBTREE_TEST is not set +# CONFIG_INTERVAL_TREE_TEST is not set +# CONFIG_PERCPU_TEST is not set +# CONFIG_ATOMIC64_SELFTEST is not set +# CONFIG_ASYNC_RAID6_TEST is not set +# CONFIG_TEST_HEXDUMP is not set +# CONFIG_TEST_STRING_HELPERS is not set +# CONFIG_TEST_KSTRTOX is not set +# CONFIG_TEST_PRINTF is not set +# CONFIG_TEST_BITMAP is not set +# CONFIG_TEST_BITFIELD is not set +# CONFIG_TEST_UUID is not set +# CONFIG_TEST_OVERFLOW is not set +# CONFIG_TEST_RHASHTABLE is not set +# CONFIG_TEST_HASH is not set +# CONFIG_TEST_IDA is not set +# CONFIG_TEST_LKM is not set +CONFIG_TEST_USER_COPY=m +CONFIG_TEST_BPF=m +CONFIG_FIND_BIT_BENCHMARK=m +CONFIG_TEST_FIRMWARE=m +# CONFIG_TEST_SYSCTL is not set +# CONFIG_TEST_UDELAY is not set +CONFIG_TEST_STATIC_KEYS=m +# CONFIG_TEST_KMOD is not set +# CONFIG_MEMTEST is not set +CONFIG_BUG_ON_DATA_CORRUPTION=y +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set +# CONFIG_UBSAN is not set +CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y +CONFIG_STRICT_DEVMEM=y +CONFIG_IO_STRICT_DEVMEM=y +CONFIG_ARM_PTDUMP_CORE=y +# CONFIG_ARM_PTDUMP_DEBUGFS is not set +CONFIG_DEBUG_WX=y +CONFIG_ARM_UNWIND=y +CONFIG_OLD_MCOUNT=y +# CONFIG_DEBUG_USER is not set +# CONFIG_DEBUG_LL is not set +CONFIG_DEBUG_IMX_UART_PORT=1 +CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" +CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" +# CONFIG_ARM_KPROBES_TEST is not set +# CONFIG_PID_IN_CONTEXTIDR is not set +# CONFIG_CORESIGHT is not set diff --git a/gnu/packages/aux-files/linux-libre/4.19-arm64.conf b/gnu/packages/aux-files/linux-libre/4.19-arm64.conf new file mode 100644 index 0000000000..ba6fa177b7 --- /dev/null +++ b/gnu/packages/aux-files/linux-libre/4.19-arm64.conf @@ -0,0 +1,8303 @@ +# +# Automatically generated file; DO NOT EDIT. +# Linux/arm64 4.19.0-gnu Kernel Configuration +# +CONFIG_CC_IS_GCC=y +CONFIG_GCC_VERSION=70300 +CONFIG_CLANG_VERSION=0 +CONFIG_IRQ_WORK=y +CONFIG_BUILDTIME_EXTABLE_SORT=y +CONFIG_THREAD_INFO_IN_TASK=y + +# +# General setup +# +CONFIG_INIT_ENV_ARG_LIMIT=32 +# CONFIG_COMPILE_TEST is not set +CONFIG_LOCALVERSION="" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_BUILD_SALT="" +CONFIG_DEFAULT_HOSTNAME="(none)" +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +CONFIG_POSIX_MQUEUE_SYSCTL=y +CONFIG_CROSS_MEMORY_ATTACH=y +# CONFIG_USELIB is not set +CONFIG_AUDIT=y +CONFIG_HAVE_ARCH_AUDITSYSCALL=y +CONFIG_AUDITSYSCALL=y +CONFIG_AUDIT_WATCH=y +CONFIG_AUDIT_TREE=y + +# +# IRQ subsystem +# +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_IRQ_SHOW_LEVEL=y +CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y +CONFIG_GENERIC_IRQ_MIGRATION=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_CHIP=y +CONFIG_IRQ_DOMAIN=y +CONFIG_IRQ_DOMAIN_HIERARCHY=y +CONFIG_GENERIC_MSI_IRQ=y +CONFIG_GENERIC_MSI_IRQ_DOMAIN=y +CONFIG_HANDLE_DOMAIN_IRQ=y +CONFIG_IRQ_FORCED_THREADING=y +CONFIG_SPARSE_IRQ=y +# CONFIG_GENERIC_IRQ_DEBUGFS is not set +CONFIG_GENERIC_IRQ_MULTI_HANDLER=y +CONFIG_ARCH_CLOCKSOURCE_DATA=y +CONFIG_GENERIC_TIME_VSYSCALL=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_ARCH_HAS_TICK_BROADCAST=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y + +# +# Timers subsystem +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ_COMMON=y +# CONFIG_HZ_PERIODIC is not set +CONFIG_NO_HZ_IDLE=y +# CONFIG_NO_HZ_FULL is not set +# CONFIG_NO_HZ is not set +CONFIG_HIGH_RES_TIMERS=y +# CONFIG_PREEMPT_NONE is not set +CONFIG_PREEMPT_VOLUNTARY=y +# CONFIG_PREEMPT is not set + +# +# CPU/Task time and stats accounting +# +CONFIG_TICK_CPU_ACCOUNTING=y +# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set +# CONFIG_IRQ_TIME_ACCOUNTING is not set +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_BSD_PROCESS_ACCT_V3=y +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y +CONFIG_CPU_ISOLATION=y + +# +# RCU Subsystem +# +CONFIG_TREE_RCU=y +# CONFIG_RCU_EXPERT is not set +CONFIG_SRCU=y +CONFIG_TREE_SRCU=y +CONFIG_RCU_STALL_COMMON=y +CONFIG_RCU_NEED_SEGCBLIST=y +CONFIG_BUILD_BIN2C=y +# CONFIG_IKCONFIG is not set +CONFIG_LOG_BUF_SHIFT=17 +CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 +CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13 +CONFIG_GENERIC_SCHED_CLOCK=y +CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y +CONFIG_ARCH_SUPPORTS_INT128=y +CONFIG_NUMA_BALANCING=y +CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y +CONFIG_CGROUPS=y +CONFIG_PAGE_COUNTER=y +CONFIG_MEMCG=y +CONFIG_MEMCG_SWAP=y +# CONFIG_MEMCG_SWAP_ENABLED is not set +CONFIG_MEMCG_KMEM=y +CONFIG_BLK_CGROUP=y +# CONFIG_DEBUG_BLK_CGROUP is not set +CONFIG_CGROUP_WRITEBACK=y +CONFIG_CGROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +CONFIG_CFS_BANDWIDTH=y +# CONFIG_RT_GROUP_SCHED is not set +CONFIG_CGROUP_PIDS=y +# CONFIG_CGROUP_RDMA is not set +CONFIG_CGROUP_FREEZER=y +# CONFIG_CGROUP_HUGETLB is not set +CONFIG_CPUSETS=y +CONFIG_PROC_PID_CPUSET=y +CONFIG_CGROUP_DEVICE=y +CONFIG_CGROUP_CPUACCT=y +CONFIG_CGROUP_PERF=y +CONFIG_CGROUP_BPF=y +# CONFIG_CGROUP_DEBUG is not set +CONFIG_SOCK_CGROUP_DATA=y +CONFIG_NAMESPACES=y +CONFIG_UTS_NS=y +CONFIG_IPC_NS=y +CONFIG_USER_NS=y +CONFIG_PID_NS=y +CONFIG_NET_NS=y +CONFIG_CHECKPOINT_RESTORE=y +CONFIG_SCHED_AUTOGROUP=y +# CONFIG_SYSFS_DEPRECATED is not set +CONFIG_RELAY=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +CONFIG_RD_BZIP2=y +CONFIG_RD_LZMA=y +CONFIG_RD_XZ=y +CONFIG_RD_LZO=y +CONFIG_RD_LZ4=y +CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +CONFIG_HAVE_UID16=y +CONFIG_SYSCTL_EXCEPTION_TRACE=y +CONFIG_BPF=y +CONFIG_EXPERT=y +CONFIG_UID16=y +CONFIG_MULTIUSER=y +# CONFIG_SGETMASK_SYSCALL is not set +# CONFIG_SYSFS_SYSCALL is not set +# CONFIG_SYSCTL_SYSCALL is not set +CONFIG_FHANDLE=y +CONFIG_POSIX_TIMERS=y +CONFIG_PRINTK=y +CONFIG_PRINTK_NMI=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_FUTEX_PI=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +CONFIG_ADVISE_SYSCALLS=y +CONFIG_MEMBARRIER=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +CONFIG_KALLSYMS_BASE_RELATIVE=y +CONFIG_BPF_SYSCALL=y +# CONFIG_BPF_JIT_ALWAYS_ON is not set +CONFIG_USERFAULTFD=y +CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y +CONFIG_RSEQ=y +# CONFIG_DEBUG_RSEQ is not set +# CONFIG_EMBEDDED is not set +CONFIG_HAVE_PERF_EVENTS=y +# CONFIG_PC104 is not set + +# +# Kernel Performance Events And Counters +# +CONFIG_PERF_EVENTS=y +# CONFIG_DEBUG_PERF_USE_VMALLOC is not set +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_SLUB_DEBUG=y +# CONFIG_SLUB_MEMCG_SYSFS_ON is not set +# CONFIG_COMPAT_BRK is not set +# CONFIG_SLAB is not set +CONFIG_SLUB=y +# CONFIG_SLOB is not set +CONFIG_SLAB_MERGE_DEFAULT=y +CONFIG_SLAB_FREELIST_RANDOM=y +CONFIG_SLAB_FREELIST_HARDENED=y +CONFIG_SLUB_CPU_PARTIAL=y +CONFIG_SYSTEM_DATA_VERIFICATION=y +CONFIG_PROFILING=y +CONFIG_TRACEPOINTS=y +CONFIG_ARM64=y +CONFIG_64BIT=y +CONFIG_MMU=y +CONFIG_ARM64_PAGE_SHIFT=12 +CONFIG_ARM64_CONT_SHIFT=4 +CONFIG_ARCH_MMAP_RND_BITS_MIN=18 +CONFIG_ARCH_MMAP_RND_BITS_MAX=33 +CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11 +CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16 +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CSUM=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ZONE_DMA32=y +CONFIG_HAVE_GENERIC_GUP=y +CONFIG_SMP=y +CONFIG_KERNEL_MODE_NEON=y +CONFIG_FIX_EARLYCON_MEM=y +CONFIG_PGTABLE_LEVELS=4 +CONFIG_ARCH_SUPPORTS_UPROBES=y +CONFIG_ARCH_PROC_KCORE_TEXT=y + +# +# Platform selection +# +# CONFIG_ARCH_ACTIONS is not set +CONFIG_ARCH_SUNXI=y +# CONFIG_ARCH_ALPINE is not set +CONFIG_ARCH_BCM2835=y +# CONFIG_ARCH_BCM_IPROC is not set +# CONFIG_ARCH_BERLIN is not set +# CONFIG_ARCH_BRCMSTB is not set +# CONFIG_ARCH_EXYNOS is not set +# CONFIG_ARCH_K3 is not set +# CONFIG_ARCH_LAYERSCAPE is not set +# CONFIG_ARCH_LG1K is not set +CONFIG_ARCH_HISI=y +# CONFIG_ARCH_MEDIATEK is not set +CONFIG_ARCH_MESON=y +CONFIG_ARCH_MVEBU=y +CONFIG_ARCH_QCOM=y +# CONFIG_ARCH_REALTEK is not set +CONFIG_ARCH_ROCKCHIP=y +CONFIG_ARCH_SEATTLE=y +CONFIG_ARCH_SYNQUACER=y +# CONFIG_ARCH_RENESAS is not set +# CONFIG_ARCH_STRATIX10 is not set +CONFIG_ARCH_TEGRA=y +# CONFIG_ARCH_SPRD is not set +CONFIG_ARCH_THUNDER=y +CONFIG_ARCH_THUNDER2=y +# CONFIG_ARCH_UNIPHIER is not set +CONFIG_ARCH_VEXPRESS=y +CONFIG_ARCH_XGENE=y +# CONFIG_ARCH_ZX is not set +# CONFIG_ARCH_ZYNQMP is not set + +# +# Bus support +# +CONFIG_PCI=y +CONFIG_PCI_DOMAINS=y +CONFIG_PCI_DOMAINS_GENERIC=y +CONFIG_PCI_SYSCALL=y +CONFIG_PCIEPORTBUS=y +CONFIG_HOTPLUG_PCI_PCIE=y +CONFIG_PCIEAER=y +CONFIG_PCIEAER_INJECT=m +# CONFIG_PCIE_ECRC is not set +CONFIG_PCIEASPM=y +# CONFIG_PCIEASPM_DEBUG is not set +CONFIG_PCIEASPM_DEFAULT=y +# CONFIG_PCIEASPM_POWERSAVE is not set +# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set +# CONFIG_PCIEASPM_PERFORMANCE is not set +CONFIG_PCIE_PME=y +CONFIG_PCIE_DPC=y +CONFIG_PCIE_PTM=y +CONFIG_PCI_MSI=y +CONFIG_PCI_MSI_IRQ_DOMAIN=y +CONFIG_PCI_QUIRKS=y +# CONFIG_PCI_DEBUG is not set +CONFIG_PCI_REALLOC_ENABLE_AUTO=y +CONFIG_PCI_STUB=m +# CONFIG_PCI_PF_STUB is not set +CONFIG_PCI_ATS=y +CONFIG_PCI_ECAM=y +CONFIG_PCI_IOV=y +# CONFIG_PCI_PRI is not set +# CONFIG_PCI_PASID is not set +CONFIG_PCI_LABEL=y +CONFIG_HOTPLUG_PCI=y +CONFIG_HOTPLUG_PCI_ACPI=y +CONFIG_HOTPLUG_PCI_ACPI_IBM=m +CONFIG_HOTPLUG_PCI_CPCI=y +CONFIG_HOTPLUG_PCI_SHPC=y + +# +# PCI controller drivers +# +CONFIG_PCI_AARDVARK=y + +# +# Cadence PCIe controllers support +# +# CONFIG_PCIE_CADENCE_HOST is not set +# CONFIG_PCI_FTPCI100 is not set +CONFIG_PCI_TEGRA=y +CONFIG_PCI_HOST_COMMON=y +CONFIG_PCI_HOST_GENERIC=y +# CONFIG_PCIE_XILINX is not set +CONFIG_PCI_XGENE=y +CONFIG_PCI_XGENE_MSI=y +CONFIG_PCI_HOST_THUNDER_PEM=y +CONFIG_PCI_HOST_THUNDER_ECAM=y +CONFIG_PCIE_ROCKCHIP=y +CONFIG_PCIE_ROCKCHIP_HOST=m + +# +# DesignWare PCI Core Support +# +CONFIG_PCIE_DW=y +CONFIG_PCIE_DW_HOST=y +# CONFIG_PCIE_DW_PLAT_HOST is not set +CONFIG_PCI_HISI=y +CONFIG_PCIE_QCOM=y +CONFIG_PCIE_ARMADA_8K=y +CONFIG_PCIE_KIRIN=y +# CONFIG_PCIE_HISI_STB is not set + +# +# PCI Endpoint +# +# CONFIG_PCI_ENDPOINT is not set + +# +# PCI switch controller drivers +# +# CONFIG_PCI_SW_SWITCHTEC is not set + +# +# Kernel Features +# + +# +# ARM errata workarounds via the alternatives framework +# +CONFIG_ARM64_ERRATUM_826319=y +CONFIG_ARM64_ERRATUM_827319=y +CONFIG_ARM64_ERRATUM_824069=y +CONFIG_ARM64_ERRATUM_819472=y +CONFIG_ARM64_ERRATUM_832075=y +CONFIG_ARM64_ERRATUM_834220=y +CONFIG_ARM64_ERRATUM_845719=y +# CONFIG_ARM64_ERRATUM_843419 is not set +CONFIG_ARM64_ERRATUM_1024718=y +CONFIG_CAVIUM_ERRATUM_22375=y +CONFIG_CAVIUM_ERRATUM_23144=y +CONFIG_CAVIUM_ERRATUM_23154=y +CONFIG_CAVIUM_ERRATUM_27456=y +CONFIG_CAVIUM_ERRATUM_30115=y +CONFIG_QCOM_FALKOR_ERRATUM_1003=y +CONFIG_QCOM_FALKOR_ERRATUM_1009=y +CONFIG_QCOM_QDF2400_ERRATUM_0065=y +CONFIG_SOCIONEXT_SYNQUACER_PREITS=y +CONFIG_HISILICON_ERRATUM_161600802=y +CONFIG_QCOM_FALKOR_ERRATUM_E1041=y +CONFIG_ARM64_4K_PAGES=y +# CONFIG_ARM64_16K_PAGES is not set +# CONFIG_ARM64_64K_PAGES is not set +# CONFIG_ARM64_VA_BITS_39 is not set +CONFIG_ARM64_VA_BITS_48=y +CONFIG_ARM64_VA_BITS=48 +CONFIG_ARM64_PA_BITS_48=y +CONFIG_ARM64_PA_BITS=48 +# CONFIG_CPU_BIG_ENDIAN is not set +CONFIG_SCHED_MC=y +# CONFIG_SCHED_SMT is not set +CONFIG_NR_CPUS=256 +CONFIG_HOTPLUG_CPU=y +CONFIG_NUMA=y +CONFIG_NODES_SHIFT=2 +CONFIG_USE_PERCPU_NUMA_NODE_ID=y +CONFIG_HAVE_SETUP_PER_CPU_AREA=y +CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y +CONFIG_HOLES_IN_ZONE=y +# CONFIG_HZ_100 is not set +CONFIG_HZ_250=y +# CONFIG_HZ_300 is not set +# CONFIG_HZ_1000 is not set +CONFIG_HZ=250 +CONFIG_SCHED_HRTICK=y +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y +CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y +CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_ARCH_SPARSEMEM_DEFAULT=y +CONFIG_ARCH_SELECT_MEMORY_MODEL=y +CONFIG_HAVE_ARCH_PFN_VALID=y +CONFIG_HW_PERF_EVENTS=y +CONFIG_SYS_SUPPORTS_HUGETLBFS=y +CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y +CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y +CONFIG_SECCOMP=y +CONFIG_PARAVIRT=y +# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set +CONFIG_KEXEC=y +CONFIG_CRASH_DUMP=y +CONFIG_XEN_DOM0=y +CONFIG_XEN=y +CONFIG_FORCE_MAX_ZONEORDER=11 +CONFIG_UNMAP_KERNEL_AT_EL0=y +CONFIG_HARDEN_BRANCH_PREDICTOR=y +CONFIG_HARDEN_EL2_VECTORS=y +CONFIG_ARM64_SSBD=y +CONFIG_ARMV8_DEPRECATED=y +CONFIG_SWP_EMULATION=y +CONFIG_CP15_BARRIER_EMULATION=y +CONFIG_SETEND_EMULATION=y +# CONFIG_ARM64_SW_TTBR0_PAN is not set + +# +# ARMv8.1 architectural features +# +CONFIG_ARM64_HW_AFDBM=y +CONFIG_ARM64_PAN=y +# CONFIG_ARM64_LSE_ATOMICS is not set +CONFIG_ARM64_VHE=y + +# +# ARMv8.2 architectural features +# +CONFIG_ARM64_UAO=y +CONFIG_ARM64_PMEM=y +CONFIG_ARM64_RAS_EXTN=y +CONFIG_ARM64_SVE=y +CONFIG_ARM64_MODULE_PLTS=y +CONFIG_RELOCATABLE=y +CONFIG_RANDOMIZE_BASE=y +CONFIG_RANDOMIZE_MODULE_REGION_FULL=y + +# +# Boot options +# +CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y +CONFIG_CMDLINE="" +# CONFIG_CMDLINE_FORCE is not set +CONFIG_EFI_STUB=y +CONFIG_EFI=y +CONFIG_DMI=y +CONFIG_COMPAT=y +CONFIG_SYSVIPC_COMPAT=y + +# +# Power management options +# +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +# CONFIG_SUSPEND_SKIP_SYNC is not set +CONFIG_HIBERNATE_CALLBACKS=y +CONFIG_HIBERNATION=y +CONFIG_PM_STD_PARTITION="" +CONFIG_PM_SLEEP=y +CONFIG_PM_SLEEP_SMP=y +# CONFIG_PM_AUTOSLEEP is not set +# CONFIG_PM_WAKELOCKS is not set +CONFIG_PM=y +CONFIG_PM_DEBUG=y +CONFIG_PM_ADVANCED_DEBUG=y +# CONFIG_PM_TEST_SUSPEND is not set +CONFIG_PM_SLEEP_DEBUG=y +# CONFIG_DPM_WATCHDOG is not set +CONFIG_PM_CLK=y +CONFIG_PM_GENERIC_DOMAINS=y +# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set +CONFIG_PM_GENERIC_DOMAINS_SLEEP=y +CONFIG_PM_GENERIC_DOMAINS_OF=y +CONFIG_CPU_PM=y +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_HIBERNATION_HEADER=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y + +# +# CPU Power Management +# + +# +# CPU Idle +# +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_IDLE_GOV_MENU=y +CONFIG_DT_IDLE_STATES=y + +# +# ARM CPU Idle Drivers +# +CONFIG_ARM_CPUIDLE=y + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_GOV_ATTR_SET=y +CONFIG_CPU_FREQ_GOV_COMMON=y +CONFIG_CPU_FREQ_STAT=y +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=m +CONFIG_CPU_FREQ_GOV_USERSPACE=m +CONFIG_CPU_FREQ_GOV_ONDEMAND=m +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m +CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y + +# +# CPU frequency scaling drivers +# +CONFIG_CPUFREQ_DT=m +CONFIG_CPUFREQ_DT_PLATDEV=y +CONFIG_ACPI_CPPC_CPUFREQ=m +# CONFIG_ARM_ARMADA_37XX_CPUFREQ is not set +# CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set +CONFIG_ARM_SCMI_CPUFREQ=m +CONFIG_ARM_TEGRA20_CPUFREQ=y +CONFIG_ARM_TEGRA124_CPUFREQ=m +# CONFIG_ARM_TEGRA186_CPUFREQ is not set +# CONFIG_QORIQ_CPUFREQ is not set + +# +# Firmware Drivers +# +CONFIG_ARM_PSCI_FW=y +# CONFIG_ARM_PSCI_CHECKER is not set +CONFIG_ARM_SCMI_PROTOCOL=y +CONFIG_ARM_SCMI_POWER_DOMAIN=m +# CONFIG_ARM_SCPI_PROTOCOL is not set +# CONFIG_ARM_SDE_INTERFACE is not set +# CONFIG_FIRMWARE_MEMMAP is not set +CONFIG_DMIID=y +CONFIG_DMI_SYSFS=y +CONFIG_RASPBERRYPI_FIRMWARE=y +# CONFIG_FW_CFG_SYSFS is not set +CONFIG_QCOM_SCM=y +CONFIG_QCOM_SCM_64=y +# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set +CONFIG_HAVE_ARM_SMCCC=y +# CONFIG_GOOGLE_FIRMWARE is not set + +# +# EFI (Extensible Firmware Interface) Support +# +CONFIG_EFI_VARS=m +CONFIG_EFI_ESRT=y +CONFIG_EFI_VARS_PSTORE=m +# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set +CONFIG_EFI_PARAMS_FROM_FDT=y +CONFIG_EFI_RUNTIME_WRAPPERS=y +CONFIG_EFI_ARMSTUB=y +CONFIG_EFI_ARMSTUB_DTB_LOADER=y +# CONFIG_EFI_BOOTLOADER_CONTROL is not set +# CONFIG_EFI_CAPSULE_LOADER is not set +# CONFIG_EFI_TEST is not set +# CONFIG_RESET_ATTACK_MITIGATION is not set +CONFIG_MESON_SM=y + +# +# Tegra firmware driver +# +CONFIG_TEGRA_IVC=y +CONFIG_TEGRA_BPMP=y +CONFIG_ARCH_SUPPORTS_ACPI=y +CONFIG_ACPI=y +CONFIG_ACPI_GENERIC_GSI=y +CONFIG_ACPI_CCA_REQUIRED=y +# CONFIG_ACPI_DEBUGGER is not set +CONFIG_ACPI_SPCR_TABLE=y +# CONFIG_ACPI_EC_DEBUGFS is not set +CONFIG_ACPI_BUTTON=y +CONFIG_ACPI_FAN=y +CONFIG_ACPI_TAD=m +# CONFIG_ACPI_DOCK is not set +CONFIG_ACPI_PROCESSOR_IDLE=y +CONFIG_ACPI_MCFG=y +CONFIG_ACPI_CPPC_LIB=y +CONFIG_ACPI_PROCESSOR=y +# CONFIG_ACPI_IPMI is not set +CONFIG_ACPI_HOTPLUG_CPU=y +CONFIG_ACPI_THERMAL=y +CONFIG_ACPI_NUMA=y +CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y +CONFIG_ACPI_TABLE_UPGRADE=y +# CONFIG_ACPI_DEBUG is not set +# CONFIG_ACPI_PCI_SLOT is not set +CONFIG_ACPI_CONTAINER=y +# CONFIG_ACPI_HED is not set +# CONFIG_ACPI_CUSTOM_METHOD is not set +# CONFIG_ACPI_BGRT is not set +CONFIG_ACPI_REDUCED_HARDWARE_ONLY=y +CONFIG_ACPI_NFIT=y +CONFIG_HAVE_ACPI_APEI=y +# CONFIG_ACPI_APEI is not set +# CONFIG_PMIC_OPREGION is not set +# CONFIG_ACPI_CONFIGFS is not set +CONFIG_ACPI_IORT=y +CONFIG_ACPI_GTDT=y +CONFIG_ACPI_PPTT=y +CONFIG_HAVE_KVM_IRQCHIP=y +CONFIG_HAVE_KVM_IRQFD=y +CONFIG_HAVE_KVM_IRQ_ROUTING=y +CONFIG_HAVE_KVM_EVENTFD=y +CONFIG_KVM_MMIO=y +CONFIG_HAVE_KVM_MSI=y +CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y +CONFIG_KVM_VFIO=y +CONFIG_HAVE_KVM_ARCH_TLB_FLUSH_ALL=y +CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y +CONFIG_HAVE_KVM_IRQ_BYPASS=y +CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE=y +CONFIG_IRQ_BYPASS_MANAGER=y +CONFIG_VIRTUALIZATION=y +CONFIG_KVM=y +CONFIG_KVM_ARM_HOST=y +CONFIG_KVM_ARM_PMU=y +CONFIG_KVM_INDIRECT_VECTORS=y +CONFIG_VHOST_NET=m +CONFIG_VHOST_SCSI=m +CONFIG_VHOST_VSOCK=m +CONFIG_VHOST=m +# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set +CONFIG_ARM64_CRYPTO=y +CONFIG_CRYPTO_SHA256_ARM64=m +# CONFIG_CRYPTO_SHA512_ARM64 is not set +CONFIG_CRYPTO_SHA1_ARM64_CE=m +CONFIG_CRYPTO_SHA2_ARM64_CE=m +# CONFIG_CRYPTO_SHA512_ARM64_CE is not set +# CONFIG_CRYPTO_SHA3_ARM64 is not set +# CONFIG_CRYPTO_SM3_ARM64_CE is not set +# CONFIG_CRYPTO_SM4_ARM64_CE is not set +CONFIG_CRYPTO_GHASH_ARM64_CE=m +# CONFIG_CRYPTO_CRCT10DIF_ARM64_CE is not set +CONFIG_CRYPTO_CRC32_ARM64_CE=y +CONFIG_CRYPTO_AES_ARM64=m +CONFIG_CRYPTO_AES_ARM64_CE=m +CONFIG_CRYPTO_AES_ARM64_CE_CCM=m +CONFIG_CRYPTO_AES_ARM64_CE_BLK=m +# CONFIG_CRYPTO_AES_ARM64_NEON_BLK is not set +# CONFIG_CRYPTO_CHACHA20_NEON is not set +# CONFIG_CRYPTO_AES_ARM64_BS is not set +CONFIG_CRYPTO_SPECK_NEON=m + +# +# General architecture-dependent options +# +CONFIG_CRASH_CORE=y +CONFIG_KEXEC_CORE=y +CONFIG_KPROBES=y +CONFIG_JUMP_LABEL=y +# CONFIG_STATIC_KEYS_SELFTEST is not set +CONFIG_UPROBES=y +CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_KRETPROBES=y +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_NMI=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_DMA_CONTIGUOUS=y +CONFIG_GENERIC_SMP_IDLE_THREAD=y +CONFIG_GENERIC_IDLE_POLL_SETUP=y +CONFIG_ARCH_HAS_FORTIFY_SOURCE=y +CONFIG_ARCH_HAS_SET_MEMORY=y +CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_RSEQ=y +CONFIG_HAVE_CLK=y +CONFIG_HAVE_HW_BREAKPOINT=y +CONFIG_HAVE_PERF_REGS=y +CONFIG_HAVE_PERF_USER_STACK_DUMP=y +CONFIG_HAVE_ARCH_JUMP_LABEL=y +CONFIG_HAVE_RCU_TABLE_FREE=y +CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y +CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y +CONFIG_HAVE_CMPXCHG_LOCAL=y +CONFIG_HAVE_CMPXCHG_DOUBLE=y +CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y +CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_SECCOMP_FILTER=y +CONFIG_HAVE_STACKPROTECTOR=y +CONFIG_CC_HAS_STACKPROTECTOR_NONE=y +CONFIG_STACKPROTECTOR=y +CONFIG_STACKPROTECTOR_STRONG=y +CONFIG_HAVE_CONTEXT_TRACKING=y +CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y +CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y +CONFIG_HAVE_ARCH_HUGE_VMAP=y +CONFIG_HAVE_MOD_ARCH_SPECIFIC=y +CONFIG_MODULES_USE_ELF_RELA=y +CONFIG_ARCH_HAS_ELF_RANDOMIZE=y +CONFIG_HAVE_ARCH_MMAP_RND_BITS=y +CONFIG_ARCH_MMAP_RND_BITS=18 +CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y +CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11 +CONFIG_CLONE_BACKWARDS=y +CONFIG_OLD_SIGSUSPEND3=y +CONFIG_COMPAT_OLD_SIGACTION=y +CONFIG_COMPAT_32BIT_TIME=y +CONFIG_HAVE_ARCH_VMAP_STACK=y +CONFIG_VMAP_STACK=y +CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y +CONFIG_STRICT_KERNEL_RWX=y +CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y +CONFIG_STRICT_MODULE_RWX=y +CONFIG_REFCOUNT_FULL=y +CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y + +# +# GCOV-based kernel profiling +# +# CONFIG_GCOV_KERNEL is not set +CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y +CONFIG_PLUGIN_HOSTCC="" +CONFIG_HAVE_GCC_PLUGINS=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +CONFIG_MODULE_FORCE_LOAD=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_MODVERSIONS=y +# CONFIG_MODULE_SRCVERSION_ALL is not set +# CONFIG_MODULE_SIG is not set +# CONFIG_MODULE_COMPRESS is not set +# CONFIG_TRIM_UNUSED_KSYMS is not set +CONFIG_MODULES_TREE_LOOKUP=y +CONFIG_BLOCK=y +CONFIG_BLK_SCSI_REQUEST=y +CONFIG_BLK_DEV_BSG=y +CONFIG_BLK_DEV_BSGLIB=y +CONFIG_BLK_DEV_INTEGRITY=y +# CONFIG_BLK_DEV_ZONED is not set +CONFIG_BLK_DEV_THROTTLING=y +# CONFIG_BLK_DEV_THROTTLING_LOW is not set +# CONFIG_BLK_CMDLINE_PARSER is not set +CONFIG_BLK_WBT=y +# CONFIG_BLK_CGROUP_IOLATENCY is not set +# CONFIG_BLK_WBT_SQ is not set +CONFIG_BLK_WBT_MQ=y +CONFIG_BLK_DEBUG_FS=y +CONFIG_BLK_SED_OPAL=y + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_AIX_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +# CONFIG_MAC_PARTITION is not set +CONFIG_MSDOS_PARTITION=y +# CONFIG_BSD_DISKLABEL is not set +# CONFIG_MINIX_SUBPARTITION is not set +# CONFIG_SOLARIS_X86_PARTITION is not set +# CONFIG_UNIXWARE_DISKLABEL is not set +# CONFIG_LDM_PARTITION is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +CONFIG_KARMA_PARTITION=y +CONFIG_EFI_PARTITION=y +# CONFIG_SYSV68_PARTITION is not set +# CONFIG_CMDLINE_PARTITION is not set +CONFIG_BLOCK_COMPAT=y +CONFIG_BLK_MQ_PCI=y +CONFIG_BLK_MQ_VIRTIO=y +CONFIG_BLK_MQ_RDMA=y + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +CONFIG_CFQ_GROUP_IOSCHED=y +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" +CONFIG_MQ_IOSCHED_DEADLINE=y +CONFIG_MQ_IOSCHED_KYBER=m +CONFIG_IOSCHED_BFQ=m +CONFIG_BFQ_GROUP_IOSCHED=y +CONFIG_PREEMPT_NOTIFIERS=y +CONFIG_PADATA=y +CONFIG_ASN1=y +CONFIG_ARCH_INLINE_SPIN_TRYLOCK=y +CONFIG_ARCH_INLINE_SPIN_TRYLOCK_BH=y +CONFIG_ARCH_INLINE_SPIN_LOCK=y +CONFIG_ARCH_INLINE_SPIN_LOCK_BH=y +CONFIG_ARCH_INLINE_SPIN_LOCK_IRQ=y +CONFIG_ARCH_INLINE_SPIN_LOCK_IRQSAVE=y +CONFIG_ARCH_INLINE_SPIN_UNLOCK=y +CONFIG_ARCH_INLINE_SPIN_UNLOCK_BH=y +CONFIG_ARCH_INLINE_SPIN_UNLOCK_IRQ=y +CONFIG_ARCH_INLINE_SPIN_UNLOCK_IRQRESTORE=y +CONFIG_ARCH_INLINE_READ_LOCK=y +CONFIG_ARCH_INLINE_READ_LOCK_BH=y +CONFIG_ARCH_INLINE_READ_LOCK_IRQ=y +CONFIG_ARCH_INLINE_READ_LOCK_IRQSAVE=y +CONFIG_ARCH_INLINE_READ_UNLOCK=y +CONFIG_ARCH_INLINE_READ_UNLOCK_BH=y +CONFIG_ARCH_INLINE_READ_UNLOCK_IRQ=y +CONFIG_ARCH_INLINE_READ_UNLOCK_IRQRESTORE=y +CONFIG_ARCH_INLINE_WRITE_LOCK=y +CONFIG_ARCH_INLINE_WRITE_LOCK_BH=y +CONFIG_ARCH_INLINE_WRITE_LOCK_IRQ=y +CONFIG_ARCH_INLINE_WRITE_LOCK_IRQSAVE=y +CONFIG_ARCH_INLINE_WRITE_UNLOCK=y +CONFIG_ARCH_INLINE_WRITE_UNLOCK_BH=y +CONFIG_ARCH_INLINE_WRITE_UNLOCK_IRQ=y +CONFIG_ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE=y +CONFIG_INLINE_SPIN_TRYLOCK=y +CONFIG_INLINE_SPIN_TRYLOCK_BH=y +CONFIG_INLINE_SPIN_LOCK=y +CONFIG_INLINE_SPIN_LOCK_BH=y +CONFIG_INLINE_SPIN_LOCK_IRQ=y +CONFIG_INLINE_SPIN_LOCK_IRQSAVE=y +CONFIG_INLINE_SPIN_UNLOCK_BH=y +CONFIG_INLINE_SPIN_UNLOCK_IRQ=y +CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE=y +CONFIG_INLINE_READ_LOCK=y +CONFIG_INLINE_READ_LOCK_BH=y +CONFIG_INLINE_READ_LOCK_IRQ=y +CONFIG_INLINE_READ_LOCK_IRQSAVE=y +CONFIG_INLINE_READ_UNLOCK=y +CONFIG_INLINE_READ_UNLOCK_BH=y +CONFIG_INLINE_READ_UNLOCK_IRQ=y +CONFIG_INLINE_READ_UNLOCK_IRQRESTORE=y +CONFIG_INLINE_WRITE_LOCK=y +CONFIG_INLINE_WRITE_LOCK_BH=y +CONFIG_INLINE_WRITE_LOCK_IRQ=y +CONFIG_INLINE_WRITE_LOCK_IRQSAVE=y +CONFIG_INLINE_WRITE_UNLOCK=y +CONFIG_INLINE_WRITE_UNLOCK_BH=y +CONFIG_INLINE_WRITE_UNLOCK_IRQ=y +CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE=y +CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y +CONFIG_MUTEX_SPIN_ON_OWNER=y +CONFIG_RWSEM_SPIN_ON_OWNER=y +CONFIG_LOCK_SPIN_ON_OWNER=y +CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y +CONFIG_QUEUED_SPINLOCKS=y +CONFIG_ARCH_USE_QUEUED_RWLOCKS=y +CONFIG_QUEUED_RWLOCKS=y +CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y +CONFIG_FREEZER=y + +# +# Executable file formats +# +CONFIG_BINFMT_ELF=y +CONFIG_COMPAT_BINFMT_ELF=y +CONFIG_ELFCORE=y +CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y +CONFIG_BINFMT_SCRIPT=y +CONFIG_BINFMT_MISC=m +CONFIG_COREDUMP=y + +# +# Memory Management options +# +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_SPARSEMEM_MANUAL=y +CONFIG_SPARSEMEM=y +CONFIG_NEED_MULTIPLE_NODES=y +CONFIG_HAVE_MEMORY_PRESENT=y +CONFIG_SPARSEMEM_EXTREME=y +CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y +CONFIG_SPARSEMEM_VMEMMAP=y +CONFIG_HAVE_MEMBLOCK=y +CONFIG_HAVE_MEMBLOCK_NODE_MAP=y +CONFIG_NO_BOOTMEM=y +CONFIG_MEMORY_ISOLATION=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_MEMORY_BALLOON=y +CONFIG_BALLOON_COMPACTION=y +CONFIG_COMPACTION=y +CONFIG_MIGRATION=y +CONFIG_PHYS_ADDR_T_64BIT=y +CONFIG_MMU_NOTIFIER=y +CONFIG_KSM=y +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y +CONFIG_MEMORY_FAILURE=y +CONFIG_HWPOISON_INJECT=m +CONFIG_TRANSPARENT_HUGEPAGE=y +CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y +# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set +CONFIG_TRANSPARENT_HUGE_PAGECACHE=y +# CONFIG_CLEANCACHE is not set +CONFIG_FRONTSWAP=y +CONFIG_CMA=y +# CONFIG_CMA_DEBUG is not set +# CONFIG_CMA_DEBUGFS is not set +CONFIG_CMA_AREAS=7 +CONFIG_ZSWAP=y +CONFIG_ZPOOL=y +CONFIG_ZBUD=y +# CONFIG_Z3FOLD is not set +CONFIG_ZSMALLOC=m +# CONFIG_PGTABLE_MAPPING is not set +# CONFIG_ZSMALLOC_STAT is not set +CONFIG_GENERIC_EARLY_IOREMAP=y +# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set +# CONFIG_IDLE_PAGE_TRACKING is not set +CONFIG_FRAME_VECTOR=y +# CONFIG_PERCPU_STATS is not set +# CONFIG_GUP_BENCHMARK is not set +CONFIG_ARCH_HAS_PTE_SPECIAL=y +CONFIG_NET=y +CONFIG_COMPAT_NETLINK_MESSAGES=y +CONFIG_NET_INGRESS=y +CONFIG_NET_EGRESS=y + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_PACKET_DIAG=m +CONFIG_UNIX=y +CONFIG_UNIX_DIAG=m +# CONFIG_TLS is not set +CONFIG_XFRM=y +CONFIG_XFRM_OFFLOAD=y +CONFIG_XFRM_ALGO=m +CONFIG_XFRM_USER=m +CONFIG_XFRM_INTERFACE=m +CONFIG_XFRM_SUB_POLICY=y +CONFIG_XFRM_MIGRATE=y +# CONFIG_XFRM_STATISTICS is not set +CONFIG_XFRM_IPCOMP=m +CONFIG_NET_KEY=m +CONFIG_NET_KEY_MIGRATE=y +# CONFIG_SMC is not set +# CONFIG_XDP_SOCKETS is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_IP_FIB_TRIE_STATS=y +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_ROUTE_MULTIPATH=y +CONFIG_IP_ROUTE_VERBOSE=y +CONFIG_IP_ROUTE_CLASSID=y +# CONFIG_IP_PNP is not set +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE_DEMUX=m +CONFIG_NET_IP_TUNNEL=m +CONFIG_NET_IPGRE=m +CONFIG_NET_IPGRE_BROADCAST=y +CONFIG_IP_MROUTE_COMMON=y +CONFIG_IP_MROUTE=y +CONFIG_IP_MROUTE_MULTIPLE_TABLES=y +CONFIG_IP_PIMSM_V1=y +CONFIG_IP_PIMSM_V2=y +CONFIG_SYN_COOKIES=y +CONFIG_NET_IPVTI=m +CONFIG_NET_UDP_TUNNEL=m +CONFIG_NET_FOU=m +CONFIG_NET_FOU_IP_TUNNELS=y +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +CONFIG_INET_ESP_OFFLOAD=m +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=m +CONFIG_INET_XFRM_MODE_TUNNEL=m +CONFIG_INET_XFRM_MODE_BEET=m +CONFIG_INET_DIAG=m +CONFIG_INET_TCP_DIAG=m +CONFIG_INET_UDP_DIAG=m +# CONFIG_INET_RAW_DIAG is not set +CONFIG_INET_DIAG_DESTROY=y +CONFIG_TCP_CONG_ADVANCED=y +CONFIG_TCP_CONG_BIC=m +CONFIG_TCP_CONG_CUBIC=y +CONFIG_TCP_CONG_WESTWOOD=m +CONFIG_TCP_CONG_HTCP=m +CONFIG_TCP_CONG_HSTCP=m +CONFIG_TCP_CONG_HYBLA=m +CONFIG_TCP_CONG_VEGAS=m +CONFIG_TCP_CONG_NV=m +CONFIG_TCP_CONG_SCALABLE=m +CONFIG_TCP_CONG_LP=m +CONFIG_TCP_CONG_VENO=m +CONFIG_TCP_CONG_YEAH=m +CONFIG_TCP_CONG_ILLINOIS=m +CONFIG_TCP_CONG_DCTCP=m +CONFIG_TCP_CONG_CDG=m +CONFIG_TCP_CONG_BBR=m +CONFIG_DEFAULT_CUBIC=y +# CONFIG_DEFAULT_RENO is not set +CONFIG_DEFAULT_TCP_CONG="cubic" +CONFIG_TCP_MD5SIG=y +CONFIG_IPV6=y +CONFIG_IPV6_ROUTER_PREF=y +CONFIG_IPV6_ROUTE_INFO=y +CONFIG_IPV6_OPTIMISTIC_DAD=y +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_ESP_OFFLOAD=m +CONFIG_INET6_IPCOMP=m +CONFIG_IPV6_MIP6=y +CONFIG_IPV6_ILA=m +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=m +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m +CONFIG_IPV6_VTI=m +CONFIG_IPV6_SIT=m +CONFIG_IPV6_SIT_6RD=y +CONFIG_IPV6_NDISC_NODETYPE=y +CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_GRE=m +CONFIG_IPV6_FOU=m +CONFIG_IPV6_FOU_TUNNEL=m +CONFIG_IPV6_MULTIPLE_TABLES=y +CONFIG_IPV6_SUBTREES=y +CONFIG_IPV6_MROUTE=y +CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y +CONFIG_IPV6_PIMSM_V2=y +CONFIG_IPV6_SEG6_LWTUNNEL=y +CONFIG_IPV6_SEG6_HMAC=y +CONFIG_IPV6_SEG6_BPF=y +# CONFIG_NETLABEL is not set +CONFIG_NETWORK_SECMARK=y +CONFIG_NET_PTP_CLASSIFY=y +# CONFIG_NETWORK_PHY_TIMESTAMPING is not set +CONFIG_NETFILTER=y +CONFIG_NETFILTER_ADVANCED=y +CONFIG_BRIDGE_NETFILTER=m + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_INGRESS=y +CONFIG_NETFILTER_NETLINK=m +CONFIG_NETFILTER_FAMILY_BRIDGE=y +CONFIG_NETFILTER_FAMILY_ARP=y +CONFIG_NETFILTER_NETLINK_ACCT=m +CONFIG_NETFILTER_NETLINK_QUEUE=m +CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NETFILTER_NETLINK_OSF=m +CONFIG_NF_CONNTRACK=m +CONFIG_NF_LOG_COMMON=m +CONFIG_NF_LOG_NETDEV=m +CONFIG_NETFILTER_CONNCOUNT=m +CONFIG_NF_CONNTRACK_MARK=y +CONFIG_NF_CONNTRACK_SECMARK=y +CONFIG_NF_CONNTRACK_ZONES=y +CONFIG_NF_CONNTRACK_PROCFS=y +CONFIG_NF_CONNTRACK_EVENTS=y +CONFIG_NF_CONNTRACK_TIMEOUT=y +CONFIG_NF_CONNTRACK_TIMESTAMP=y +CONFIG_NF_CONNTRACK_LABELS=y +CONFIG_NF_CT_PROTO_DCCP=y +CONFIG_NF_CT_PROTO_GRE=m +CONFIG_NF_CT_PROTO_SCTP=y +CONFIG_NF_CT_PROTO_UDPLITE=y +CONFIG_NF_CONNTRACK_AMANDA=m +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_H323=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_BROADCAST=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_SNMP=m +CONFIG_NF_CONNTRACK_PPTP=m +CONFIG_NF_CONNTRACK_SANE=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CONNTRACK_TFTP=m +CONFIG_NF_CT_NETLINK=m +CONFIG_NF_CT_NETLINK_TIMEOUT=m +CONFIG_NF_CT_NETLINK_HELPER=m +CONFIG_NETFILTER_NETLINK_GLUE_CT=y +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_NF_NAT_PROTO_DCCP=y +CONFIG_NF_NAT_PROTO_UDPLITE=y +CONFIG_NF_NAT_PROTO_SCTP=y +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_SIP=m +CONFIG_NF_NAT_TFTP=m +CONFIG_NF_NAT_REDIRECT=y +CONFIG_NETFILTER_SYNPROXY=m +CONFIG_NF_TABLES=m +CONFIG_NF_TABLES_SET=m +# CONFIG_NF_TABLES_INET is not set +# CONFIG_NF_TABLES_NETDEV is not set +CONFIG_NFT_NUMGEN=m +CONFIG_NFT_CT=m +CONFIG_NFT_COUNTER=m +CONFIG_NFT_CONNLIMIT=m +CONFIG_NFT_LOG=m +CONFIG_NFT_LIMIT=m +CONFIG_NFT_MASQ=m +CONFIG_NFT_REDIR=m +CONFIG_NFT_NAT=m +CONFIG_NFT_TUNNEL=m +CONFIG_NFT_OBJREF=m +CONFIG_NFT_QUEUE=m +CONFIG_NFT_QUOTA=m +CONFIG_NFT_REJECT=m +CONFIG_NFT_COMPAT=m +CONFIG_NFT_HASH=m +CONFIG_NFT_SOCKET=m +CONFIG_NFT_OSF=m +CONFIG_NFT_TPROXY=m +# CONFIG_NF_FLOW_TABLE is not set +CONFIG_NETFILTER_XTABLES=m + +# +# Xtables combined modules +# +CONFIG_NETFILTER_XT_MARK=m +CONFIG_NETFILTER_XT_CONNMARK=m +CONFIG_NETFILTER_XT_SET=m + +# +# Xtables targets +# +CONFIG_NETFILTER_XT_TARGET_AUDIT=m +CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m +CONFIG_NETFILTER_XT_TARGET_CT=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m +CONFIG_NETFILTER_XT_TARGET_HL=m +CONFIG_NETFILTER_XT_TARGET_HMARK=m +CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m +CONFIG_NETFILTER_XT_TARGET_LED=m +CONFIG_NETFILTER_XT_TARGET_LOG=m +CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_NAT=m +CONFIG_NETFILTER_XT_TARGET_NETMAP=m +CONFIG_NETFILTER_XT_TARGET_NFLOG=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set +CONFIG_NETFILTER_XT_TARGET_RATEEST=m +CONFIG_NETFILTER_XT_TARGET_REDIRECT=m +CONFIG_NETFILTER_XT_TARGET_TEE=m +CONFIG_NETFILTER_XT_TARGET_TPROXY=m +CONFIG_NETFILTER_XT_TARGET_TRACE=m +CONFIG_NETFILTER_XT_TARGET_SECMARK=m +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m +CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m + +# +# Xtables matches +# +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m +CONFIG_NETFILTER_XT_MATCH_BPF=m +CONFIG_NETFILTER_XT_MATCH_CGROUP=m +CONFIG_NETFILTER_XT_MATCH_CLUSTER=m +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_NETFILTER_XT_MATCH_CPU=m +CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m +CONFIG_NETFILTER_XT_MATCH_DSCP=m +CONFIG_NETFILTER_XT_MATCH_ECN=m +CONFIG_NETFILTER_XT_MATCH_ESP=m +CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m +CONFIG_NETFILTER_XT_MATCH_HELPER=m +CONFIG_NETFILTER_XT_MATCH_HL=m +CONFIG_NETFILTER_XT_MATCH_IPCOMP=m +CONFIG_NETFILTER_XT_MATCH_IPRANGE=m +CONFIG_NETFILTER_XT_MATCH_IPVS=m +CONFIG_NETFILTER_XT_MATCH_L2TP=m +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +CONFIG_NETFILTER_XT_MATCH_NFACCT=m +CONFIG_NETFILTER_XT_MATCH_OSF=m +CONFIG_NETFILTER_XT_MATCH_OWNER=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m +CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_QUOTA=m +CONFIG_NETFILTER_XT_MATCH_RATEEST=m +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_RECENT=m +CONFIG_NETFILTER_XT_MATCH_SCTP=m +CONFIG_NETFILTER_XT_MATCH_SOCKET=m +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STATISTIC=m +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m +CONFIG_NETFILTER_XT_MATCH_TIME=m +CONFIG_NETFILTER_XT_MATCH_U32=m +CONFIG_IP_SET=m +CONFIG_IP_SET_MAX=256 +CONFIG_IP_SET_BITMAP_IP=m +CONFIG_IP_SET_BITMAP_IPMAC=m +CONFIG_IP_SET_BITMAP_PORT=m +CONFIG_IP_SET_HASH_IP=m +CONFIG_IP_SET_HASH_IPMARK=m +CONFIG_IP_SET_HASH_IPPORT=m +CONFIG_IP_SET_HASH_IPPORTIP=m +CONFIG_IP_SET_HASH_IPPORTNET=m +CONFIG_IP_SET_HASH_IPMAC=m +CONFIG_IP_SET_HASH_MAC=m +CONFIG_IP_SET_HASH_NETPORTNET=m +CONFIG_IP_SET_HASH_NET=m +CONFIG_IP_SET_HASH_NETNET=m +CONFIG_IP_SET_HASH_NETPORT=m +CONFIG_IP_SET_HASH_NETIFACE=m +CONFIG_IP_SET_LIST_SET=m +CONFIG_IP_VS=m +CONFIG_IP_VS_IPV6=y +# CONFIG_IP_VS_DEBUG is not set +CONFIG_IP_VS_TAB_BITS=12 + +# +# IPVS transport protocol load balancing support +# +CONFIG_IP_VS_PROTO_TCP=y +CONFIG_IP_VS_PROTO_UDP=y +CONFIG_IP_VS_PROTO_AH_ESP=y +CONFIG_IP_VS_PROTO_ESP=y +CONFIG_IP_VS_PROTO_AH=y +CONFIG_IP_VS_PROTO_SCTP=y + +# +# IPVS scheduler +# +CONFIG_IP_VS_RR=m +CONFIG_IP_VS_WRR=m +CONFIG_IP_VS_LC=m +CONFIG_IP_VS_WLC=m +CONFIG_IP_VS_FO=m +CONFIG_IP_VS_OVF=m +CONFIG_IP_VS_LBLC=m +CONFIG_IP_VS_LBLCR=m +CONFIG_IP_VS_DH=m +CONFIG_IP_VS_SH=m +CONFIG_IP_VS_MH=m +CONFIG_IP_VS_SED=m +CONFIG_IP_VS_NQ=m + +# +# IPVS SH scheduler +# +CONFIG_IP_VS_SH_TAB_BITS=8 + +# +# IPVS MH scheduler +# +CONFIG_IP_VS_MH_TAB_INDEX=12 + +# +# IPVS application helper +# +CONFIG_IP_VS_FTP=m +CONFIG_IP_VS_NFCT=y +CONFIG_IP_VS_PE_SIP=m + +# +# IP: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_SOCKET_IPV4=m +CONFIG_NF_TPROXY_IPV4=m +# CONFIG_NF_TABLES_IPV4 is not set +# CONFIG_NF_TABLES_ARP is not set +CONFIG_NF_DUP_IPV4=m +CONFIG_NF_LOG_ARP=m +CONFIG_NF_LOG_IPV4=m +CONFIG_NF_REJECT_IPV4=m +CONFIG_NF_NAT_IPV4=m +CONFIG_NF_NAT_MASQUERADE_IPV4=y +CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NF_NAT_PROTO_GRE=m +CONFIG_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_RPFILTER=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_SYNPROXY=m +CONFIG_IP_NF_NAT=m +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_SECURITY=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m + +# +# IPv6: Netfilter Configuration +# +CONFIG_NF_SOCKET_IPV6=m +CONFIG_NF_TPROXY_IPV6=m +# CONFIG_NF_TABLES_IPV6 is not set +CONFIG_NF_DUP_IPV6=m +CONFIG_NF_REJECT_IPV6=m +CONFIG_NF_LOG_IPV6=m +CONFIG_NF_NAT_IPV6=m +CONFIG_NF_NAT_MASQUERADE_IPV6=y +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_MH=m +CONFIG_IP6_NF_MATCH_RPFILTER=m +CONFIG_IP6_NF_MATCH_RT=m +# CONFIG_IP6_NF_MATCH_SRH is not set +CONFIG_IP6_NF_TARGET_HL=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_TARGET_SYNPROXY=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_RAW=m +CONFIG_IP6_NF_SECURITY=m +CONFIG_IP6_NF_NAT=m +CONFIG_IP6_NF_TARGET_MASQUERADE=m +CONFIG_IP6_NF_TARGET_NPT=m +CONFIG_NF_DEFRAG_IPV6=m +# CONFIG_NF_TABLES_BRIDGE is not set +CONFIG_BRIDGE_NF_EBTABLES=m +CONFIG_BRIDGE_EBT_BROUTE=m +CONFIG_BRIDGE_EBT_T_FILTER=m +CONFIG_BRIDGE_EBT_T_NAT=m +CONFIG_BRIDGE_EBT_802_3=m +CONFIG_BRIDGE_EBT_AMONG=m +CONFIG_BRIDGE_EBT_ARP=m +CONFIG_BRIDGE_EBT_IP=m +CONFIG_BRIDGE_EBT_IP6=m +CONFIG_BRIDGE_EBT_LIMIT=m +CONFIG_BRIDGE_EBT_MARK=m +CONFIG_BRIDGE_EBT_PKTTYPE=m +CONFIG_BRIDGE_EBT_STP=m +CONFIG_BRIDGE_EBT_VLAN=m +CONFIG_BRIDGE_EBT_ARPREPLY=m +CONFIG_BRIDGE_EBT_DNAT=m +CONFIG_BRIDGE_EBT_MARK_T=m +CONFIG_BRIDGE_EBT_REDIRECT=m +CONFIG_BRIDGE_EBT_SNAT=m +CONFIG_BRIDGE_EBT_LOG=m +CONFIG_BRIDGE_EBT_NFLOG=m +# CONFIG_BPFILTER is not set +CONFIG_IP_DCCP=m +CONFIG_INET_DCCP_DIAG=m + +# +# DCCP CCIDs Configuration +# +# CONFIG_IP_DCCP_CCID2_DEBUG is not set +CONFIG_IP_DCCP_CCID3=y +# CONFIG_IP_DCCP_CCID3_DEBUG is not set +CONFIG_IP_DCCP_TFRC_LIB=y + +# +# DCCP Kernel Hacking +# +# CONFIG_IP_DCCP_DEBUG is not set +CONFIG_IP_SCTP=m +# CONFIG_SCTP_DBG_OBJCNT is not set +CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y +# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set +# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set +CONFIG_SCTP_COOKIE_HMAC_MD5=y +CONFIG_SCTP_COOKIE_HMAC_SHA1=y +CONFIG_INET_SCTP_DIAG=m +CONFIG_RDS=m +CONFIG_RDS_RDMA=m +CONFIG_RDS_TCP=m +# CONFIG_RDS_DEBUG is not set +CONFIG_TIPC=m +CONFIG_TIPC_MEDIA_IB=y +CONFIG_TIPC_MEDIA_UDP=y +CONFIG_TIPC_DIAG=m +CONFIG_ATM=m +CONFIG_ATM_CLIP=m +# CONFIG_ATM_CLIP_NO_ICMP is not set +CONFIG_ATM_LANE=m +CONFIG_ATM_MPOA=m +CONFIG_ATM_BR2684=m +# CONFIG_ATM_BR2684_IPFILTER is not set +CONFIG_L2TP=m +CONFIG_L2TP_DEBUGFS=m +CONFIG_L2TP_V3=y +CONFIG_L2TP_IP=m +CONFIG_L2TP_ETH=m +CONFIG_STP=m +CONFIG_GARP=m +CONFIG_MRP=m +CONFIG_BRIDGE=m +CONFIG_BRIDGE_IGMP_SNOOPING=y +CONFIG_BRIDGE_VLAN_FILTERING=y +CONFIG_HAVE_NET_DSA=y +CONFIG_NET_DSA=m +CONFIG_NET_DSA_LEGACY=y +CONFIG_NET_DSA_TAG_DSA=y +CONFIG_NET_DSA_TAG_EDSA=y +CONFIG_NET_DSA_TAG_TRAILER=y +CONFIG_VLAN_8021Q=m +CONFIG_VLAN_8021Q_GVRP=y +CONFIG_VLAN_8021Q_MVRP=y +# CONFIG_DECNET is not set +CONFIG_LLC=m +CONFIG_LLC2=m +CONFIG_ATALK=m +CONFIG_DEV_APPLETALK=m +CONFIG_IPDDP=m +CONFIG_IPDDP_ENCAP=y +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +CONFIG_PHONET=m +CONFIG_6LOWPAN=m +# CONFIG_6LOWPAN_DEBUGFS is not set +CONFIG_6LOWPAN_NHC=m +CONFIG_6LOWPAN_NHC_DEST=m +CONFIG_6LOWPAN_NHC_FRAGMENT=m +CONFIG_6LOWPAN_NHC_HOP=m +CONFIG_6LOWPAN_NHC_IPV6=m +CONFIG_6LOWPAN_NHC_MOBILITY=m +CONFIG_6LOWPAN_NHC_ROUTING=m +CONFIG_6LOWPAN_NHC_UDP=m +CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m +CONFIG_6LOWPAN_GHC_UDP=m +CONFIG_6LOWPAN_GHC_ICMPV6=m +CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m +CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m +CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m +CONFIG_IEEE802154=m +# CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set +CONFIG_IEEE802154_SOCKET=m +CONFIG_IEEE802154_6LOWPAN=m +CONFIG_MAC802154=m +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +CONFIG_NET_SCH_CBQ=m +CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_HFSC=m +CONFIG_NET_SCH_ATM=m +CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_MULTIQ=m +CONFIG_NET_SCH_RED=m +CONFIG_NET_SCH_SFB=m +CONFIG_NET_SCH_SFQ=m +CONFIG_NET_SCH_TEQL=m +CONFIG_NET_SCH_TBF=m +# CONFIG_NET_SCH_CBS is not set +CONFIG_NET_SCH_ETF=m +CONFIG_NET_SCH_GRED=m +CONFIG_NET_SCH_DSMARK=m +CONFIG_NET_SCH_NETEM=m +CONFIG_NET_SCH_DRR=m +CONFIG_NET_SCH_MQPRIO=m +CONFIG_NET_SCH_SKBPRIO=m +CONFIG_NET_SCH_CHOKE=m +CONFIG_NET_SCH_QFQ=m +CONFIG_NET_SCH_CODEL=m +CONFIG_NET_SCH_FQ_CODEL=m +CONFIG_NET_SCH_CAKE=m +CONFIG_NET_SCH_FQ=m +CONFIG_NET_SCH_HHF=m +CONFIG_NET_SCH_PIE=m +CONFIG_NET_SCH_INGRESS=m +CONFIG_NET_SCH_PLUG=m +# CONFIG_NET_SCH_DEFAULT is not set + +# +# Classification +# +CONFIG_NET_CLS=y +CONFIG_NET_CLS_BASIC=m +CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_CLS_ROUTE4=m +CONFIG_NET_CLS_FW=m +CONFIG_NET_CLS_U32=m +CONFIG_CLS_U32_PERF=y +CONFIG_CLS_U32_MARK=y +CONFIG_NET_CLS_RSVP=m +CONFIG_NET_CLS_RSVP6=m +CONFIG_NET_CLS_FLOW=m +CONFIG_NET_CLS_CGROUP=m +CONFIG_NET_CLS_BPF=m +CONFIG_NET_CLS_FLOWER=m +CONFIG_NET_CLS_MATCHALL=m +CONFIG_NET_EMATCH=y +CONFIG_NET_EMATCH_STACK=32 +CONFIG_NET_EMATCH_CMP=m +CONFIG_NET_EMATCH_NBYTE=m +CONFIG_NET_EMATCH_U32=m +CONFIG_NET_EMATCH_META=m +CONFIG_NET_EMATCH_TEXT=m +CONFIG_NET_EMATCH_CANID=m +CONFIG_NET_EMATCH_IPSET=m +CONFIG_NET_EMATCH_IPT=m +CONFIG_NET_CLS_ACT=y +CONFIG_NET_ACT_POLICE=m +CONFIG_NET_ACT_GACT=m +CONFIG_GACT_PROB=y +CONFIG_NET_ACT_MIRRED=m +CONFIG_NET_ACT_SAMPLE=m +CONFIG_NET_ACT_IPT=m +CONFIG_NET_ACT_NAT=m +CONFIG_NET_ACT_PEDIT=m +CONFIG_NET_ACT_SIMP=m +CONFIG_NET_ACT_SKBEDIT=m +CONFIG_NET_ACT_CSUM=m +CONFIG_NET_ACT_VLAN=m +CONFIG_NET_ACT_BPF=m +CONFIG_NET_ACT_CONNMARK=m +CONFIG_NET_ACT_SKBMOD=m +CONFIG_NET_ACT_IFE=m +CONFIG_NET_ACT_TUNNEL_KEY=m +CONFIG_NET_IFE_SKBMARK=m +CONFIG_NET_IFE_SKBPRIO=m +CONFIG_NET_IFE_SKBTCINDEX=m +CONFIG_NET_CLS_IND=y +CONFIG_NET_SCH_FIFO=y +CONFIG_DCB=y +CONFIG_DNS_RESOLVER=m +CONFIG_BATMAN_ADV=m +# CONFIG_BATMAN_ADV_BATMAN_V is not set +CONFIG_BATMAN_ADV_BLA=y +CONFIG_BATMAN_ADV_DAT=y +CONFIG_BATMAN_ADV_NC=y +CONFIG_BATMAN_ADV_MCAST=y +CONFIG_BATMAN_ADV_DEBUGFS=y +# CONFIG_BATMAN_ADV_DEBUG is not set +CONFIG_OPENVSWITCH=m +CONFIG_OPENVSWITCH_GRE=m +CONFIG_OPENVSWITCH_VXLAN=m +CONFIG_OPENVSWITCH_GENEVE=m +CONFIG_VSOCKETS=m +CONFIG_VSOCKETS_DIAG=m +CONFIG_VIRTIO_VSOCKETS=m +CONFIG_VIRTIO_VSOCKETS_COMMON=m +CONFIG_NETLINK_DIAG=m +CONFIG_MPLS=y +CONFIG_NET_MPLS_GSO=y +CONFIG_MPLS_ROUTING=m +CONFIG_MPLS_IPTUNNEL=m +CONFIG_NET_NSH=m +# CONFIG_HSR is not set +CONFIG_NET_SWITCHDEV=y +CONFIG_NET_L3_MASTER_DEV=y +# CONFIG_QRTR is not set +# CONFIG_NET_NCSI is not set +CONFIG_RPS=y +CONFIG_RFS_ACCEL=y +CONFIG_XPS=y +CONFIG_CGROUP_NET_PRIO=y +CONFIG_CGROUP_NET_CLASSID=y +CONFIG_NET_RX_BUSY_POLL=y +CONFIG_BQL=y +CONFIG_BPF_JIT=y +# CONFIG_BPF_STREAM_PARSER is not set +CONFIG_NET_FLOW_LIMIT=y + +# +# Network testing +# +CONFIG_NET_PKTGEN=m +CONFIG_NET_DROP_MONITOR=m +# CONFIG_HAMRADIO is not set +CONFIG_CAN=m +CONFIG_CAN_RAW=m +CONFIG_CAN_BCM=m +CONFIG_CAN_GW=m + +# +# CAN Device Drivers +# +CONFIG_CAN_VCAN=m +# CONFIG_CAN_VXCAN is not set +CONFIG_CAN_SLCAN=m +CONFIG_CAN_DEV=m +CONFIG_CAN_CALC_BITTIMING=y +# CONFIG_CAN_GRCAN is not set +# CONFIG_CAN_XILINXCAN is not set +# CONFIG_CAN_C_CAN is not set +# CONFIG_CAN_CC770 is not set +# CONFIG_CAN_IFI_CANFD is not set +# CONFIG_CAN_M_CAN is not set +# CONFIG_CAN_PEAK_PCIEFD is not set +CONFIG_CAN_SJA1000=m +CONFIG_CAN_SJA1000_ISA=m +# CONFIG_CAN_SJA1000_PLATFORM is not set +CONFIG_CAN_EMS_PCI=m +CONFIG_CAN_PEAK_PCI=m +CONFIG_CAN_PEAK_PCIEC=y +CONFIG_CAN_KVASER_PCI=m +CONFIG_CAN_PLX_PCI=m +CONFIG_CAN_SOFTING=m + +# +# CAN SPI interfaces +# +# CONFIG_CAN_HI311X is not set +# CONFIG_CAN_MCP251X is not set + +# +# CAN USB interfaces +# +CONFIG_CAN_8DEV_USB=m +CONFIG_CAN_EMS_USB=m +CONFIG_CAN_ESD_USB2=m +CONFIG_CAN_GS_USB=m +CONFIG_CAN_KVASER_USB=m +# CONFIG_CAN_MCBA_USB is not set +CONFIG_CAN_PEAK_USB=m +CONFIG_CAN_UCAN=m +# CONFIG_CAN_DEBUG_DEVICES is not set +CONFIG_BT=m +CONFIG_BT_BREDR=y +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=m +CONFIG_BT_HS=y +CONFIG_BT_LE=y +CONFIG_BT_6LOWPAN=m +CONFIG_BT_LEDS=y +# CONFIG_BT_SELFTEST is not set +CONFIG_BT_DEBUGFS=y + +# +# Bluetooth device drivers +# +CONFIG_BT_INTEL=m +CONFIG_BT_BCM=m +CONFIG_BT_RTL=m +CONFIG_BT_QCA=m +CONFIG_BT_HCIBTUSB=m +# CONFIG_BT_HCIBTUSB_AUTOSUSPEND is not set +CONFIG_BT_HCIBTUSB_BCM=y +CONFIG_BT_HCIBTUSB_RTL=y +CONFIG_BT_HCIBTSDIO=m +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_SERDEV=y +CONFIG_BT_HCIUART_H4=y +# CONFIG_BT_HCIUART_NOKIA is not set +# CONFIG_BT_HCIUART_BCSP is not set +CONFIG_BT_HCIUART_ATH3K=y +CONFIG_BT_HCIUART_LL=y +CONFIG_BT_HCIUART_3WIRE=y +CONFIG_BT_HCIUART_INTEL=y +CONFIG_BT_HCIUART_RTL=y +CONFIG_BT_HCIUART_QCA=y +CONFIG_BT_HCIUART_AG6XX=y +CONFIG_BT_HCIUART_MRVL=y +# CONFIG_BT_HCIBCM203X is not set +# CONFIG_BT_HCIBPA10X is not set +# CONFIG_BT_HCIBFUSB is not set +# CONFIG_BT_HCIVHCI is not set +CONFIG_BT_MRVL=m +CONFIG_BT_MRVL_SDIO=m +CONFIG_BT_ATH3K=m +CONFIG_BT_WILINK=m +CONFIG_BT_MTKUART=m +CONFIG_BT_QCOMSMD=m +CONFIG_BT_HCIRSI=m +CONFIG_AF_RXRPC=m +CONFIG_AF_RXRPC_IPV6=y +# CONFIG_AF_RXRPC_INJECT_LOSS is not set +# CONFIG_AF_RXRPC_DEBUG is not set +CONFIG_RXKAD=y +# CONFIG_AF_KCM is not set +CONFIG_FIB_RULES=y +CONFIG_WIRELESS=y +CONFIG_WIRELESS_EXT=y +CONFIG_WEXT_CORE=y +CONFIG_WEXT_PROC=y +CONFIG_WEXT_SPY=y +CONFIG_WEXT_PRIV=y +CONFIG_CFG80211=m +# CONFIG_NL80211_TESTMODE is not set +# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set +# CONFIG_CFG80211_CERTIFICATION_ONUS is not set +CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y +CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y +CONFIG_CFG80211_DEFAULT_PS=y +# CONFIG_CFG80211_DEBUGFS is not set +CONFIG_CFG80211_CRDA_SUPPORT=y +CONFIG_CFG80211_WEXT=y +CONFIG_CFG80211_WEXT_EXPORT=y +CONFIG_LIB80211=m +CONFIG_LIB80211_CRYPT_WEP=m +CONFIG_LIB80211_CRYPT_CCMP=m +CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set +CONFIG_MAC80211=m +CONFIG_MAC80211_HAS_RC=y +CONFIG_MAC80211_RC_MINSTREL=y +CONFIG_MAC80211_RC_MINSTREL_HT=y +# CONFIG_MAC80211_RC_MINSTREL_VHT is not set +CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y +CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" +CONFIG_MAC80211_MESH=y +CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUGFS is not set +# CONFIG_MAC80211_MESSAGE_TRACING is not set +# CONFIG_MAC80211_DEBUG_MENU is not set +CONFIG_MAC80211_STA_HASH_MAX_SIZE=0 +CONFIG_WIMAX=m +CONFIG_WIMAX_DEBUG_LEVEL=8 +CONFIG_RFKILL=m +CONFIG_RFKILL_LEDS=y +CONFIG_RFKILL_INPUT=y +# CONFIG_RFKILL_GPIO is not set +CONFIG_NET_9P=m +CONFIG_NET_9P_VIRTIO=m +# CONFIG_NET_9P_XEN is not set +CONFIG_NET_9P_RDMA=m +# CONFIG_NET_9P_DEBUG is not set +# CONFIG_CAIF is not set +CONFIG_CEPH_LIB=m +# CONFIG_CEPH_LIB_PRETTYDEBUG is not set +# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set +CONFIG_NFC=m +CONFIG_NFC_DIGITAL=m +# CONFIG_NFC_NCI is not set +# CONFIG_NFC_HCI is not set + +# +# Near Field Communication (NFC) devices +# +# CONFIG_NFC_TRF7970A is not set +CONFIG_NFC_SIM=m +CONFIG_NFC_PORT100=m +CONFIG_NFC_PN533=m +CONFIG_NFC_PN533_USB=m +# CONFIG_NFC_PN533_I2C is not set +# CONFIG_NFC_ST95HF is not set +CONFIG_PSAMPLE=m +CONFIG_NET_IFE=m +CONFIG_LWTUNNEL=y +CONFIG_LWTUNNEL_BPF=y +CONFIG_DST_CACHE=y +CONFIG_GRO_CELLS=y +CONFIG_NET_DEVLINK=m +CONFIG_MAY_USE_DEVLINK=m +CONFIG_PAGE_POOL=y +CONFIG_FAILOVER=m +CONFIG_HAVE_EBPF_JIT=y + +# +# Device Drivers +# +CONFIG_ARM_AMBA=y +CONFIG_TEGRA_AHB=y + +# +# Generic Driver Options +# +# CONFIG_UEVENT_HELPER is not set +CONFIG_DEVTMPFS=y +# CONFIG_DEVTMPFS_MOUNT is not set +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y + +# +# Firmware loader +# +CONFIG_FW_LOADER=y +CONFIG_EXTRA_FIRMWARE="" +CONFIG_FW_LOADER_USER_HELPER=y +# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set +CONFIG_WANT_DEV_COREDUMP=y +CONFIG_ALLOW_DEV_COREDUMP=y +CONFIG_DEV_COREDUMP=y +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set +# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set +CONFIG_SYS_HYPERVISOR=y +CONFIG_GENERIC_CPU_AUTOPROBE=y +CONFIG_SOC_BUS=y +CONFIG_REGMAP=y +CONFIG_REGMAP_I2C=y +CONFIG_REGMAP_SPI=y +CONFIG_REGMAP_SPMI=y +CONFIG_REGMAP_MMIO=y +CONFIG_REGMAP_IRQ=y +CONFIG_DMA_SHARED_BUFFER=y +# CONFIG_DMA_FENCE_TRACE is not set +CONFIG_DMA_CMA=y + +# +# Default contiguous memory area size: +# +CONFIG_CMA_SIZE_MBYTES=64 +CONFIG_CMA_SIZE_SEL_MBYTES=y +# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set +# CONFIG_CMA_SIZE_SEL_MIN is not set +# CONFIG_CMA_SIZE_SEL_MAX is not set +CONFIG_CMA_ALIGNMENT=8 +CONFIG_GENERIC_ARCH_TOPOLOGY=y + +# +# Bus devices +# +# CONFIG_BRCMSTB_GISB_ARB is not set +# CONFIG_HISILICON_LPC is not set +CONFIG_QCOM_EBI2=y +# CONFIG_SIMPLE_PM_BUS is not set +CONFIG_SUN50I_DE2_BUS=y +CONFIG_SUNXI_RSB=y +CONFIG_TEGRA_ACONNECT=y +# CONFIG_TEGRA_GMI is not set +CONFIG_VEXPRESS_CONFIG=y +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=y +CONFIG_GNSS=m +CONFIG_GNSS_SERIAL=m +CONFIG_GNSS_SIRF_SERIAL=m +CONFIG_GNSS_UBX_SERIAL=m +CONFIG_MTD=m +# CONFIG_MTD_TESTS is not set +# CONFIG_MTD_REDBOOT_PARTS is not set +# CONFIG_MTD_CMDLINE_PARTS is not set +# CONFIG_MTD_AFS_PARTS is not set +CONFIG_MTD_OF_PARTS=m +CONFIG_MTD_AR7_PARTS=m + +# +# Partition parsers +# + +# +# User Modules And Translation Layers +# +CONFIG_MTD_BLKDEVS=m +CONFIG_MTD_BLOCK=m +CONFIG_MTD_BLOCK_RO=m +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +CONFIG_RFD_FTL=m +CONFIG_SSFDC=m +# CONFIG_SM_FTL is not set +CONFIG_MTD_OOPS=m +CONFIG_MTD_SWAP=m +# CONFIG_MTD_PARTITIONED_MASTER is not set + +# +# RAM/ROM/Flash chip drivers +# +# CONFIG_MTD_CFI is not set +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +CONFIG_MTD_RAM=m +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PHYSMAP is not set +# CONFIG_MTD_PHYSMAP_OF is not set +CONFIG_MTD_INTEL_VR_NOR=m +CONFIG_MTD_PLATRAM=m + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_PMC551 is not set +CONFIG_MTD_DATAFLASH=m +# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set +# CONFIG_MTD_DATAFLASH_OTP is not set +CONFIG_MTD_M25P80=m +# CONFIG_MTD_MCHP23K256 is not set +CONFIG_MTD_SST25L=m +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOCG3 is not set +CONFIG_MTD_NAND_CORE=m +CONFIG_MTD_ONENAND=m +CONFIG_MTD_ONENAND_VERIFY_WRITE=y +# CONFIG_MTD_ONENAND_GENERIC is not set +# CONFIG_MTD_ONENAND_OTP is not set +CONFIG_MTD_ONENAND_2X_PROGRAM=y +# CONFIG_MTD_NAND is not set +CONFIG_MTD_SPI_NAND=m + +# +# LPDDR & LPDDR2 PCM memory drivers +# +CONFIG_MTD_LPDDR=m +CONFIG_MTD_QINFO_PROBE=m +CONFIG_MTD_SPI_NOR=m +# CONFIG_MTD_MT81xx_NOR is not set +CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y +# CONFIG_SPI_CADENCE_QUADSPI is not set +CONFIG_SPI_HISI_SFC=m +CONFIG_MTD_UBI=m +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MTD_UBI_BEB_LIMIT=20 +# CONFIG_MTD_UBI_FASTMAP is not set +# CONFIG_MTD_UBI_GLUEBI is not set +CONFIG_MTD_UBI_BLOCK=y +CONFIG_DTC=y +CONFIG_OF=y +# CONFIG_OF_UNITTEST is not set +CONFIG_OF_FLATTREE=y +CONFIG_OF_EARLY_FLATTREE=y +CONFIG_OF_KOBJ=y +CONFIG_OF_ADDRESS=y +CONFIG_OF_IRQ=y +CONFIG_OF_NET=y +CONFIG_OF_MDIO=m +CONFIG_OF_RESERVED_MEM=y +# CONFIG_OF_OVERLAY is not set +CONFIG_OF_NUMA=y +CONFIG_PARPORT=m +# CONFIG_PARPORT_AX88796 is not set +CONFIG_PARPORT_1284=y +CONFIG_PARPORT_NOT_PC=y +CONFIG_PNP=y +# CONFIG_PNP_DEBUG_MESSAGES is not set + +# +# Protocols +# +CONFIG_PNPACPI=y +CONFIG_BLK_DEV=y +CONFIG_BLK_DEV_NULL_BLK=m +CONFIG_CDROM=m +CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m +CONFIG_ZRAM=m +# CONFIG_ZRAM_WRITEBACK is not set +# CONFIG_ZRAM_MEMORY_TRACKING is not set +# CONFIG_BLK_DEV_DAC960 is not set +# CONFIG_BLK_DEV_UMEM is not set +CONFIG_BLK_DEV_LOOP=m +CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +CONFIG_BLK_DEV_DRBD=m +# CONFIG_DRBD_FAULT_INJECTION is not set +CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_SKD=m +# CONFIG_BLK_DEV_SX8 is not set +CONFIG_BLK_DEV_RAM=m +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=16384 +# CONFIG_CDROM_PKTCDVD is not set +CONFIG_ATA_OVER_ETH=m +CONFIG_XEN_BLKDEV_FRONTEND=m +CONFIG_XEN_BLKDEV_BACKEND=m +CONFIG_VIRTIO_BLK=m +# CONFIG_VIRTIO_BLK_SCSI is not set +CONFIG_BLK_DEV_RBD=m +# CONFIG_BLK_DEV_RSXX is not set + +# +# NVME Support +# +CONFIG_NVME_CORE=m +CONFIG_BLK_DEV_NVME=m +CONFIG_NVME_MULTIPATH=y +CONFIG_NVME_FABRICS=m +CONFIG_NVME_RDMA=m +CONFIG_NVME_FC=m +CONFIG_NVME_TARGET=m +# CONFIG_NVME_TARGET_LOOP is not set +CONFIG_NVME_TARGET_RDMA=m +CONFIG_NVME_TARGET_FC=m +# CONFIG_NVME_TARGET_FCLOOP is not set + +# +# Misc devices +# +CONFIG_SENSORS_LIS3LV02D=m +CONFIG_AD525X_DPOT=m +CONFIG_AD525X_DPOT_I2C=m +CONFIG_AD525X_DPOT_SPI=m +# CONFIG_DUMMY_IRQ is not set +# CONFIG_PHANTOM is not set +CONFIG_SGI_IOC4=m +CONFIG_TIFM_CORE=m +CONFIG_TIFM_7XX1=m +CONFIG_ICS932S401=m +CONFIG_ENCLOSURE_SERVICES=m +# CONFIG_HP_ILO is not set +CONFIG_QCOM_COINCELL=m +CONFIG_APDS9802ALS=m +CONFIG_ISL29003=m +CONFIG_ISL29020=m +CONFIG_SENSORS_TSL2550=m +CONFIG_SENSORS_BH1770=m +CONFIG_SENSORS_APDS990X=m +CONFIG_HMC6352=m +CONFIG_DS1682=m +# CONFIG_USB_SWITCH_FSA9480 is not set +# CONFIG_LATTICE_ECP3_CONFIG is not set +CONFIG_SRAM=y +CONFIG_VEXPRESS_SYSCFG=y +# CONFIG_PCI_ENDPOINT_TEST is not set +CONFIG_MISC_RTSX=m +CONFIG_C2PORT=m + +# +# EEPROM support +# +CONFIG_EEPROM_AT24=m +CONFIG_EEPROM_AT25=m +CONFIG_EEPROM_LEGACY=m +CONFIG_EEPROM_MAX6875=m +CONFIG_EEPROM_93CX6=m +# CONFIG_EEPROM_93XX46 is not set +# CONFIG_EEPROM_IDT_89HPESX is not set +CONFIG_CB710_CORE=m +# CONFIG_CB710_DEBUG is not set +CONFIG_CB710_DEBUG_ASSUMPTIONS=y + +# +# Texas Instruments shared transport line discipline +# +CONFIG_TI_ST=m +CONFIG_SENSORS_LIS3_I2C=m +CONFIG_ALTERA_STAPL=m + +# +# Intel MIC & related support +# + +# +# Intel MIC Bus Driver +# + +# +# SCIF Bus Driver +# + +# +# VOP Bus Driver +# + +# +# Intel MIC Host Driver +# + +# +# Intel MIC Card Driver +# + +# +# SCIF Driver +# + +# +# Intel MIC Coprocessor State Management (COSM) Drivers +# + +# +# VOP Driver +# +# CONFIG_GENWQE is not set +# CONFIG_ECHO is not set +CONFIG_MISC_RTSX_PCI=m +CONFIG_MISC_RTSX_USB=m + +# +# SCSI device support +# +CONFIG_SCSI_MOD=m +CONFIG_RAID_ATTRS=m +CONFIG_SCSI=m +CONFIG_SCSI_DMA=y +CONFIG_SCSI_NETLINK=y +# CONFIG_SCSI_MQ_DEFAULT is not set +# CONFIG_SCSI_PROC_FS is not set + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=m +CONFIG_CHR_DEV_ST=m +CONFIG_CHR_DEV_OSST=m +CONFIG_BLK_DEV_SR=m +CONFIG_BLK_DEV_SR_VENDOR=y +CONFIG_CHR_DEV_SG=m +CONFIG_CHR_DEV_SCH=m +CONFIG_SCSI_ENCLOSURE=m +CONFIG_SCSI_CONSTANTS=y +CONFIG_SCSI_LOGGING=y +CONFIG_SCSI_SCAN_ASYNC=y + +# +# SCSI Transports +# +CONFIG_SCSI_SPI_ATTRS=m +CONFIG_SCSI_FC_ATTRS=m +CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_SAS_ATTRS=m +CONFIG_SCSI_SAS_LIBSAS=m +CONFIG_SCSI_SAS_ATA=y +CONFIG_SCSI_SAS_HOST_SMP=y +CONFIG_SCSI_SRP_ATTRS=m +CONFIG_SCSI_LOWLEVEL=y +CONFIG_ISCSI_TCP=m +CONFIG_ISCSI_BOOT_SYSFS=m +CONFIG_SCSI_CXGB3_ISCSI=m +CONFIG_SCSI_CXGB4_ISCSI=m +CONFIG_SCSI_BNX2_ISCSI=m +CONFIG_SCSI_BNX2X_FCOE=m +CONFIG_BE2ISCSI=m +CONFIG_BLK_DEV_3W_XXXX_RAID=m +CONFIG_SCSI_HPSA=m +CONFIG_SCSI_3W_9XXX=m +CONFIG_SCSI_3W_SAS=m +CONFIG_SCSI_ACARD=m +CONFIG_SCSI_AACRAID=m +CONFIG_SCSI_AIC7XXX=m +CONFIG_AIC7XXX_CMDS_PER_DEVICE=32 +CONFIG_AIC7XXX_RESET_DELAY_MS=15000 +CONFIG_AIC7XXX_DEBUG_ENABLE=y +CONFIG_AIC7XXX_DEBUG_MASK=0 +CONFIG_AIC7XXX_REG_PRETTY_PRINT=y +CONFIG_SCSI_AIC79XX=m +CONFIG_AIC79XX_CMDS_PER_DEVICE=32 +CONFIG_AIC79XX_RESET_DELAY_MS=15000 +CONFIG_AIC79XX_DEBUG_ENABLE=y +CONFIG_AIC79XX_DEBUG_MASK=0 +CONFIG_AIC79XX_REG_PRETTY_PRINT=y +CONFIG_SCSI_AIC94XX=m +# CONFIG_AIC94XX_DEBUG is not set +CONFIG_SCSI_HISI_SAS=m +CONFIG_SCSI_HISI_SAS_PCI=m +CONFIG_SCSI_MVSAS=m +# CONFIG_SCSI_MVSAS_DEBUG is not set +# CONFIG_SCSI_MVSAS_TASKLET is not set +CONFIG_SCSI_MVUMI=m +CONFIG_SCSI_ADVANSYS=m +# CONFIG_SCSI_ARCMSR is not set +CONFIG_SCSI_ESAS2R=m +# CONFIG_MEGARAID_NEWGEN is not set +# CONFIG_MEGARAID_LEGACY is not set +CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_MPT3SAS=m +CONFIG_SCSI_MPT2SAS_MAX_SGE=128 +CONFIG_SCSI_MPT3SAS_MAX_SGE=128 +CONFIG_SCSI_MPT2SAS=m +CONFIG_SCSI_SMARTPQI=m +CONFIG_SCSI_UFSHCD=m +CONFIG_SCSI_UFSHCD_PCI=m +# CONFIG_SCSI_UFS_DWC_TC_PCI is not set +# CONFIG_SCSI_UFSHCD_PLATFORM is not set +CONFIG_SCSI_HPTIOP=m +CONFIG_XEN_SCSI_FRONTEND=m +CONFIG_LIBFC=m +CONFIG_LIBFCOE=m +CONFIG_FCOE=m +CONFIG_SCSI_SNIC=m +# CONFIG_SCSI_SNIC_DEBUG_FS is not set +CONFIG_SCSI_DMX3191D=m +# CONFIG_SCSI_IPS is not set +# CONFIG_SCSI_INITIO is not set +# CONFIG_SCSI_INIA100 is not set +CONFIG_SCSI_STEX=m +CONFIG_SCSI_SYM53C8XX_2=m +CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 +CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 +CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 +CONFIG_SCSI_SYM53C8XX_MMIO=y +# CONFIG_SCSI_IPR is not set +# CONFIG_SCSI_QLOGIC_1280 is not set +CONFIG_SCSI_QLA_FC=m +CONFIG_TCM_QLA2XXX=m +# CONFIG_TCM_QLA2XXX_DEBUG is not set +CONFIG_SCSI_QLA_ISCSI=m +# CONFIG_QEDI is not set +# CONFIG_QEDF is not set +CONFIG_SCSI_LPFC=m +# CONFIG_SCSI_LPFC_DEBUG_FS is not set +# CONFIG_SCSI_DC395x is not set +# CONFIG_SCSI_AM53C974 is not set +CONFIG_SCSI_WD719X=m +# CONFIG_SCSI_DEBUG is not set +CONFIG_SCSI_PMCRAID=m +CONFIG_SCSI_PM8001=m +CONFIG_SCSI_BFA_FC=m +CONFIG_SCSI_VIRTIO=m +CONFIG_SCSI_CHELSIO_FCOE=m +CONFIG_SCSI_LOWLEVEL_PCMCIA=y +CONFIG_SCSI_DH=y +CONFIG_SCSI_DH_RDAC=m +CONFIG_SCSI_DH_HP_SW=m +CONFIG_SCSI_DH_EMC=m +CONFIG_SCSI_DH_ALUA=m +CONFIG_SCSI_OSD_INITIATOR=m +CONFIG_SCSI_OSD_ULD=m +CONFIG_SCSI_OSD_DPRINT_SENSE=1 +# CONFIG_SCSI_OSD_DEBUG is not set +CONFIG_HAVE_PATA_PLATFORM=y +CONFIG_ATA=m +CONFIG_ATA_VERBOSE_ERROR=y +CONFIG_ATA_ACPI=y +CONFIG_SATA_ZPODD=y +CONFIG_SATA_PMP=y + +# +# Controllers with non-SFF native interface +# +CONFIG_SATA_AHCI=m +CONFIG_SATA_MOBILE_LPM_POLICY=0 +CONFIG_SATA_AHCI_PLATFORM=m +# CONFIG_AHCI_CEVA is not set +CONFIG_AHCI_MVEBU=m +# CONFIG_AHCI_SUNXI is not set +CONFIG_AHCI_TEGRA=m +CONFIG_AHCI_XGENE=m +# CONFIG_AHCI_QORIQ is not set +CONFIG_SATA_AHCI_SEATTLE=m +# CONFIG_SATA_INIC162X is not set +CONFIG_SATA_ACARD_AHCI=m +CONFIG_SATA_SIL24=m +CONFIG_ATA_SFF=y + +# +# SFF controllers with custom DMA interface +# +CONFIG_PDC_ADMA=m +CONFIG_SATA_QSTOR=m +CONFIG_SATA_SX4=m +CONFIG_ATA_BMDMA=y + +# +# SATA SFF controllers with BMDMA +# +CONFIG_ATA_PIIX=m +# CONFIG_SATA_DWC is not set +CONFIG_SATA_MV=m +CONFIG_SATA_NV=m +CONFIG_SATA_PROMISE=m +CONFIG_SATA_SIL=m +CONFIG_SATA_SIS=m +CONFIG_SATA_SVW=m +CONFIG_SATA_ULI=m +CONFIG_SATA_VIA=m +CONFIG_SATA_VITESSE=m + +# +# PATA SFF controllers with BMDMA +# +# CONFIG_PATA_ALI is not set +# CONFIG_PATA_AMD is not set +CONFIG_PATA_ARTOP=m +# CONFIG_PATA_ATIIXP is not set +CONFIG_PATA_ATP867X=m +CONFIG_PATA_CMD64X=m +# CONFIG_PATA_CYPRESS is not set +# CONFIG_PATA_EFAR is not set +# CONFIG_PATA_HPT366 is not set +# CONFIG_PATA_HPT37X is not set +# CONFIG_PATA_HPT3X2N is not set +# CONFIG_PATA_HPT3X3 is not set +CONFIG_PATA_IT8213=m +CONFIG_PATA_IT821X=m +CONFIG_PATA_JMICRON=m +CONFIG_PATA_MARVELL=m +# CONFIG_PATA_NETCELL is not set +CONFIG_PATA_NINJA32=m +# CONFIG_PATA_NS87415 is not set +# CONFIG_PATA_OLDPIIX is not set +# CONFIG_PATA_OPTIDMA is not set +# CONFIG_PATA_PDC2027X is not set +# CONFIG_PATA_PDC_OLD is not set +# CONFIG_PATA_RADISYS is not set +CONFIG_PATA_RDC=m +CONFIG_PATA_SCH=m +# CONFIG_PATA_SERVERWORKS is not set +# CONFIG_PATA_SIL680 is not set +CONFIG_PATA_SIS=m +CONFIG_PATA_TOSHIBA=m +# CONFIG_PATA_TRIFLEX is not set +# CONFIG_PATA_VIA is not set +# CONFIG_PATA_WINBOND is not set + +# +# PIO-only SFF controllers +# +# CONFIG_PATA_CMD640_PCI is not set +# CONFIG_PATA_MPIIX is not set +# CONFIG_PATA_NS87410 is not set +# CONFIG_PATA_OPTI is not set +# CONFIG_PATA_PLATFORM is not set +# CONFIG_PATA_RZ1000 is not set + +# +# Generic fallback / legacy drivers +# +# CONFIG_PATA_ACPI is not set +CONFIG_ATA_GENERIC=m +# CONFIG_PATA_LEGACY is not set +CONFIG_MD=y +CONFIG_BLK_DEV_MD=m +CONFIG_MD_LINEAR=m +CONFIG_MD_RAID0=m +CONFIG_MD_RAID1=m +CONFIG_MD_RAID10=m +CONFIG_MD_RAID456=m +CONFIG_MD_MULTIPATH=m +CONFIG_MD_FAULTY=m +# CONFIG_MD_CLUSTER is not set +CONFIG_BCACHE=m +# CONFIG_BCACHE_DEBUG is not set +# CONFIG_BCACHE_CLOSURES_DEBUG is not set +CONFIG_BLK_DEV_DM_BUILTIN=y +CONFIG_BLK_DEV_DM=m +# CONFIG_DM_MQ_DEFAULT is not set +# CONFIG_DM_DEBUG is not set +CONFIG_DM_BUFIO=m +# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set +CONFIG_DM_BIO_PRISON=m +CONFIG_DM_PERSISTENT_DATA=m +# CONFIG_DM_UNSTRIPED is not set +CONFIG_DM_CRYPT=m +CONFIG_DM_SNAPSHOT=m +CONFIG_DM_THIN_PROVISIONING=m +CONFIG_DM_CACHE=m +CONFIG_DM_CACHE_SMQ=m +CONFIG_DM_WRITECACHE=m +CONFIG_DM_ERA=m +CONFIG_DM_MIRROR=m +CONFIG_DM_LOG_USERSPACE=m +CONFIG_DM_RAID=m +CONFIG_DM_ZERO=m +CONFIG_DM_MULTIPATH=m +CONFIG_DM_MULTIPATH_QL=m +CONFIG_DM_MULTIPATH_ST=m +CONFIG_DM_DELAY=m +CONFIG_DM_UEVENT=y +CONFIG_DM_FLAKEY=m +CONFIG_DM_VERITY=m +# CONFIG_DM_VERITY_FEC is not set +CONFIG_DM_SWITCH=m +CONFIG_DM_LOG_WRITES=m +# CONFIG_DM_INTEGRITY is not set +CONFIG_TARGET_CORE=m +CONFIG_TCM_IBLOCK=m +CONFIG_TCM_FILEIO=m +CONFIG_TCM_PSCSI=m +CONFIG_TCM_USER2=m +CONFIG_LOOPBACK_TARGET=m +CONFIG_TCM_FC=m +CONFIG_ISCSI_TARGET=m +CONFIG_ISCSI_TARGET_CXGB4=m +CONFIG_SBP_TARGET=m +CONFIG_FUSION=y +CONFIG_FUSION_SPI=m +CONFIG_FUSION_FC=m +CONFIG_FUSION_SAS=m +CONFIG_FUSION_MAX_SGE=128 +CONFIG_FUSION_CTL=m +# CONFIG_FUSION_LOGGING is not set + +# +# IEEE 1394 (FireWire) support +# +CONFIG_FIREWIRE=m +CONFIG_FIREWIRE_OHCI=m +CONFIG_FIREWIRE_SBP2=m +CONFIG_FIREWIRE_NET=m +CONFIG_FIREWIRE_NOSY=m +CONFIG_NETDEVICES=y +CONFIG_MII=m +CONFIG_NET_CORE=y +CONFIG_BONDING=m +CONFIG_DUMMY=m +CONFIG_EQUALIZER=m +# CONFIG_NET_FC is not set +CONFIG_IFB=m +CONFIG_NET_TEAM=m +CONFIG_NET_TEAM_MODE_BROADCAST=m +CONFIG_NET_TEAM_MODE_ROUNDROBIN=m +CONFIG_NET_TEAM_MODE_RANDOM=m +CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m +CONFIG_NET_TEAM_MODE_LOADBALANCE=m +CONFIG_MACVLAN=m +CONFIG_MACVTAP=m +CONFIG_IPVLAN=m +CONFIG_IPVTAP=m +CONFIG_VXLAN=m +CONFIG_GENEVE=m +CONFIG_GTP=m +CONFIG_MACSEC=m +CONFIG_NETCONSOLE=m +CONFIG_NETCONSOLE_DYNAMIC=y +CONFIG_NETPOLL=y +CONFIG_NET_POLL_CONTROLLER=y +CONFIG_TUN=m +CONFIG_TAP=m +# CONFIG_TUN_VNET_CROSS_LE is not set +CONFIG_VETH=m +CONFIG_VIRTIO_NET=m +CONFIG_NLMON=m +CONFIG_NET_VRF=m +# CONFIG_VSOCKMON is not set +# CONFIG_ARCNET is not set +CONFIG_ATM_DRIVERS=y +CONFIG_ATM_DUMMY=m +# CONFIG_ATM_TCP is not set +# CONFIG_ATM_LANAI is not set +# CONFIG_ATM_ENI is not set +CONFIG_ATM_NICSTAR=m +CONFIG_ATM_NICSTAR_USE_SUNI=y +CONFIG_ATM_NICSTAR_USE_IDT77105=y +# CONFIG_ATM_IDT77252 is not set +CONFIG_ATM_IA=m +# CONFIG_ATM_IA_DEBUG is not set +CONFIG_ATM_FORE200E=m +# CONFIG_ATM_FORE200E_USE_TASKLET is not set +CONFIG_ATM_FORE200E_TX_RETRY=16 +CONFIG_ATM_FORE200E_DEBUG=0 +# CONFIG_ATM_HE is not set +CONFIG_ATM_SOLOS=m + +# +# CAIF transport drivers +# + +# +# Distributed Switch Architecture drivers +# +# CONFIG_B53 is not set +# CONFIG_NET_DSA_BCM_SF2 is not set +# CONFIG_NET_DSA_LOOP is not set +# CONFIG_NET_DSA_MT7530 is not set +CONFIG_NET_DSA_MV88E6060=m +# CONFIG_MICROCHIP_KSZ is not set +CONFIG_NET_DSA_MV88E6XXX=m +CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y +# CONFIG_NET_DSA_MV88E6XXX_PTP is not set +# CONFIG_NET_DSA_QCA8K is not set +CONFIG_NET_DSA_REALTEK_SMI=m +# CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set +# CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set +CONFIG_NET_DSA_VITESSE_VSC73XX=m +CONFIG_ETHERNET=y +CONFIG_MDIO=m +CONFIG_NET_VENDOR_3COM=y +CONFIG_VORTEX=m +CONFIG_TYPHOON=m +CONFIG_NET_VENDOR_ADAPTEC=y +CONFIG_ADAPTEC_STARFIRE=m +CONFIG_NET_VENDOR_AGERE=y +CONFIG_ET131X=m +CONFIG_NET_VENDOR_ALACRITECH=y +# CONFIG_SLICOSS is not set +CONFIG_NET_VENDOR_ALLWINNER=y +# CONFIG_SUN4I_EMAC is not set +CONFIG_NET_VENDOR_ALTEON=y +CONFIG_ACENIC=m +# CONFIG_ACENIC_OMIT_TIGON_I is not set +# CONFIG_ALTERA_TSE is not set +CONFIG_NET_VENDOR_AMAZON=y +CONFIG_NET_VENDOR_AMD=y +# CONFIG_AMD8111_ETH is not set +CONFIG_PCNET32=m +CONFIG_AMD_XGBE=m +# CONFIG_AMD_XGBE_DCB is not set +CONFIG_NET_XGENE=m +CONFIG_NET_XGENE_V2=m +CONFIG_NET_VENDOR_AQUANTIA=y +# CONFIG_NET_VENDOR_ARC is not set +CONFIG_NET_VENDOR_ATHEROS=y +CONFIG_ATL2=m +CONFIG_ATL1=m +CONFIG_ATL1E=m +CONFIG_ATL1C=m +CONFIG_ALX=m +# CONFIG_NET_VENDOR_AURORA is not set +CONFIG_NET_VENDOR_BROADCOM=y +# CONFIG_B44 is not set +# CONFIG_BCMGENET is not set +CONFIG_BNX2=m +CONFIG_CNIC=m +CONFIG_TIGON3=m +CONFIG_TIGON3_HWMON=y +CONFIG_BNX2X=m +CONFIG_BNX2X_SRIOV=y +# CONFIG_SYSTEMPORT is not set +CONFIG_BNXT=m +CONFIG_BNXT_SRIOV=y +CONFIG_BNXT_FLOWER_OFFLOAD=y +# CONFIG_BNXT_DCB is not set +CONFIG_BNXT_HWMON=y +CONFIG_NET_VENDOR_BROCADE=y +CONFIG_BNA=m +CONFIG_NET_VENDOR_CADENCE=y +# CONFIG_MACB is not set +CONFIG_NET_VENDOR_CAVIUM=y +CONFIG_THUNDER_NIC_PF=m +CONFIG_THUNDER_NIC_VF=m +CONFIG_THUNDER_NIC_BGX=m +CONFIG_THUNDER_NIC_RGX=m +CONFIG_CAVIUM_PTP=y +CONFIG_LIQUIDIO=m +# CONFIG_LIQUIDIO_VF is not set +CONFIG_NET_VENDOR_CHELSIO=y +CONFIG_CHELSIO_T1=m +CONFIG_CHELSIO_T1_1G=y +CONFIG_CHELSIO_T3=m +CONFIG_CHELSIO_T4=m +CONFIG_CHELSIO_T4_DCB=y +CONFIG_CHELSIO_T4_FCOE=y +CONFIG_CHELSIO_T4VF=m +CONFIG_CHELSIO_LIB=m +CONFIG_NET_VENDOR_CISCO=y +CONFIG_ENIC=m +CONFIG_NET_VENDOR_CORTINA=y +# CONFIG_GEMINI_ETHERNET is not set +# CONFIG_DNET is not set +CONFIG_NET_VENDOR_DEC=y +CONFIG_NET_TULIP=y +CONFIG_DE2104X=m +CONFIG_DE2104X_DSL=0 +CONFIG_TULIP=m +# CONFIG_TULIP_MWI is not set +# CONFIG_TULIP_MMIO is not set +CONFIG_TULIP_NAPI=y +CONFIG_TULIP_NAPI_HW_MITIGATION=y +CONFIG_WINBOND_840=m +CONFIG_DM9102=m +CONFIG_ULI526X=m +CONFIG_NET_VENDOR_DLINK=y +CONFIG_DL2K=m +CONFIG_SUNDANCE=m +# CONFIG_SUNDANCE_MMIO is not set +CONFIG_NET_VENDOR_EMULEX=y +CONFIG_BE2NET=m +CONFIG_BE2NET_HWMON=y +CONFIG_BE2NET_BE2=y +CONFIG_BE2NET_BE3=y +CONFIG_BE2NET_LANCER=y +CONFIG_BE2NET_SKYHAWK=y +CONFIG_NET_VENDOR_EZCHIP=y +# CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set +CONFIG_NET_VENDOR_HISILICON=y +CONFIG_HIX5HD2_GMAC=m +CONFIG_HISI_FEMAC=m +CONFIG_HIP04_ETH=m +CONFIG_HNS_MDIO=m +CONFIG_HNS=m +CONFIG_HNS_DSAF=m +CONFIG_HNS_ENET=m +# CONFIG_HNS3 is not set +CONFIG_NET_VENDOR_HP=y +# CONFIG_HP100 is not set +CONFIG_NET_VENDOR_HUAWEI=y +CONFIG_HINIC=m +CONFIG_NET_VENDOR_I825XX=y +CONFIG_NET_VENDOR_INTEL=y +CONFIG_E100=m +CONFIG_E1000=m +CONFIG_E1000E=m +CONFIG_IGB=m +CONFIG_IGB_HWMON=y +CONFIG_IGBVF=m +CONFIG_IXGB=m +CONFIG_IXGBE=m +CONFIG_IXGBE_HWMON=y +CONFIG_IXGBE_DCB=y +CONFIG_IXGBEVF=m +CONFIG_I40E=m +CONFIG_I40E_DCB=y +CONFIG_I40EVF=m +CONFIG_ICE=m +# CONFIG_FM10K is not set +CONFIG_JME=m +CONFIG_NET_VENDOR_MARVELL=y +CONFIG_MVMDIO=m +CONFIG_MVNETA=m +CONFIG_MVPP2=m +CONFIG_SKGE=m +# CONFIG_SKGE_DEBUG is not set +CONFIG_SKGE_GENESIS=y +CONFIG_SKY2=m +# CONFIG_SKY2_DEBUG is not set +CONFIG_NET_VENDOR_MELLANOX=y +CONFIG_MLX4_EN=m +CONFIG_MLX4_EN_DCB=y +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +CONFIG_MLX4_CORE_GEN2=y +CONFIG_MLX5_CORE=m +# CONFIG_MLX5_FPGA is not set +CONFIG_MLX5_CORE_EN=y +CONFIG_MLX5_EN_ARFS=y +CONFIG_MLX5_EN_RXNFC=y +CONFIG_MLX5_MPFS=y +CONFIG_MLX5_ESWITCH=y +CONFIG_MLX5_CORE_EN_DCB=y +# CONFIG_MLX5_CORE_IPOIB is not set +# CONFIG_MLXSW_CORE is not set +# CONFIG_MLXFW is not set +CONFIG_NET_VENDOR_MICREL=y +# CONFIG_KS8842 is not set +# CONFIG_KS8851 is not set +# CONFIG_KS8851_MLL is not set +CONFIG_KSZ884X_PCI=m +CONFIG_NET_VENDOR_MICROCHIP=y +# CONFIG_ENC28J60 is not set +# CONFIG_ENCX24J600 is not set +# CONFIG_LAN743X is not set +CONFIG_NET_VENDOR_MICROSEMI=y +CONFIG_MSCC_OCELOT_SWITCH=m +CONFIG_MSCC_OCELOT_SWITCH_OCELOT=m +CONFIG_NET_VENDOR_MYRI=y +CONFIG_MYRI10GE=m +CONFIG_FEALNX=m +CONFIG_NET_VENDOR_NATSEMI=y +CONFIG_NATSEMI=m +CONFIG_NS83820=m +CONFIG_NET_VENDOR_NETERION=y +CONFIG_S2IO=m +CONFIG_VXGE=m +# CONFIG_VXGE_DEBUG_TRACE_ALL is not set +CONFIG_NET_VENDOR_NETRONOME=y +CONFIG_NFP=m +CONFIG_NFP_APP_FLOWER=y +CONFIG_NFP_APP_ABM_NIC=y +# CONFIG_NFP_DEBUG is not set +CONFIG_NET_VENDOR_NI=y +CONFIG_NET_VENDOR_8390=y +CONFIG_NE2K_PCI=m +CONFIG_NET_VENDOR_NVIDIA=y +# CONFIG_FORCEDETH is not set +CONFIG_NET_VENDOR_OKI=y +# CONFIG_ETHOC is not set +CONFIG_NET_VENDOR_PACKET_ENGINES=y +CONFIG_HAMACHI=m +CONFIG_YELLOWFIN=m +CONFIG_NET_VENDOR_QLOGIC=y +CONFIG_QLA3XXX=m +CONFIG_QLCNIC=m +CONFIG_QLCNIC_SRIOV=y +CONFIG_QLCNIC_DCB=y +CONFIG_QLCNIC_HWMON=y +CONFIG_QLGE=m +CONFIG_NETXEN_NIC=m +CONFIG_QED=m +CONFIG_QED_LL2=y +CONFIG_QED_SRIOV=y +CONFIG_QEDE=m +CONFIG_QED_RDMA=y +CONFIG_QED_OOO=y +CONFIG_NET_VENDOR_QUALCOMM=y +# CONFIG_QCA7000_SPI is not set +# CONFIG_QCA7000_UART is not set +CONFIG_QCOM_EMAC=m +# CONFIG_RMNET is not set +CONFIG_NET_VENDOR_RDC=y +CONFIG_R6040=m +CONFIG_NET_VENDOR_REALTEK=y +CONFIG_8139CP=m +CONFIG_8139TOO=m +# CONFIG_8139TOO_PIO is not set +CONFIG_8139TOO_TUNE_TWISTER=y +CONFIG_8139TOO_8129=y +# CONFIG_8139_OLD_RX_RESET is not set +CONFIG_R8169=m +CONFIG_NET_VENDOR_RENESAS=y +CONFIG_NET_VENDOR_ROCKER=y +# CONFIG_ROCKER is not set +CONFIG_NET_VENDOR_SAMSUNG=y +# CONFIG_SXGBE_ETH is not set +# CONFIG_NET_VENDOR_SEEQ is not set +CONFIG_NET_VENDOR_SOLARFLARE=y +CONFIG_SFC=m +CONFIG_SFC_MTD=y +CONFIG_SFC_MCDI_MON=y +CONFIG_SFC_SRIOV=y +CONFIG_SFC_MCDI_LOGGING=y +CONFIG_SFC_FALCON=m +CONFIG_SFC_FALCON_MTD=y +CONFIG_NET_VENDOR_SILAN=y +CONFIG_SC92031=m +CONFIG_NET_VENDOR_SIS=y +# CONFIG_SIS900 is not set +CONFIG_SIS190=m +CONFIG_NET_VENDOR_SMSC=y +CONFIG_SMC91X=m +CONFIG_EPIC100=m +CONFIG_SMSC911X=m +CONFIG_SMSC9420=m +CONFIG_NET_VENDOR_SOCIONEXT=y +CONFIG_SNI_NETSEC=m +CONFIG_NET_VENDOR_STMICRO=y +CONFIG_STMMAC_ETH=m +CONFIG_STMMAC_PLATFORM=m +# CONFIG_DWMAC_DWC_QOS_ETH is not set +CONFIG_DWMAC_GENERIC=m +CONFIG_DWMAC_IPQ806X=m +CONFIG_DWMAC_MESON=m +CONFIG_DWMAC_ROCKCHIP=m +CONFIG_DWMAC_SUNXI=m +CONFIG_DWMAC_SUN8I=m +# CONFIG_STMMAC_PCI is not set +CONFIG_NET_VENDOR_SUN=y +# CONFIG_HAPPYMEAL is not set +# CONFIG_SUNGEM is not set +CONFIG_CASSINI=m +CONFIG_NIU=m +CONFIG_NET_VENDOR_SYNOPSYS=y +# CONFIG_DWC_XLGMAC is not set +CONFIG_NET_VENDOR_TEHUTI=y +CONFIG_TEHUTI=m +CONFIG_NET_VENDOR_TI=y +# CONFIG_TI_CPSW_ALE is not set +CONFIG_TLAN=m +CONFIG_NET_VENDOR_VIA=y +# CONFIG_VIA_RHINE is not set +CONFIG_VIA_VELOCITY=m +CONFIG_NET_VENDOR_WIZNET=y +# CONFIG_WIZNET_W5100 is not set +# CONFIG_WIZNET_W5300 is not set +CONFIG_FDDI=y +CONFIG_DEFXX=m +# CONFIG_DEFXX_MMIO is not set +CONFIG_SKFP=m +# CONFIG_HIPPI is not set +# CONFIG_NET_SB1000 is not set +CONFIG_MDIO_DEVICE=m +CONFIG_MDIO_BUS=m +# CONFIG_MDIO_BCM_UNIMAC is not set +# CONFIG_MDIO_BITBANG is not set +CONFIG_MDIO_BUS_MUX=m +# CONFIG_MDIO_BUS_MUX_GPIO is not set +CONFIG_MDIO_BUS_MUX_MMIOREG=m +CONFIG_MDIO_CAVIUM=m +CONFIG_MDIO_HISI_FEMAC=m +CONFIG_MDIO_MSCC_MIIM=m +# CONFIG_MDIO_OCTEON is not set +# CONFIG_MDIO_SUN4I is not set +CONFIG_MDIO_THUNDER=m +CONFIG_MDIO_XGENE=m +CONFIG_PHYLINK=m +CONFIG_PHYLIB=m +CONFIG_SWPHY=y +# CONFIG_LED_TRIGGER_PHY is not set + +# +# MII PHY device drivers +# +# CONFIG_SFP is not set +CONFIG_AMD_PHY=m +CONFIG_AQUANTIA_PHY=m +CONFIG_ASIX_PHY=m +CONFIG_AT803X_PHY=m +# CONFIG_BCM7XXX_PHY is not set +CONFIG_BCM87XX_PHY=m +CONFIG_BCM_NET_PHYLIB=m +CONFIG_BROADCOM_PHY=m +CONFIG_CICADA_PHY=m +# CONFIG_CORTINA_PHY is not set +CONFIG_DAVICOM_PHY=m +# CONFIG_DP83822_PHY is not set +CONFIG_DP83TC811_PHY=m +CONFIG_DP83848_PHY=m +CONFIG_DP83867_PHY=m +CONFIG_FIXED_PHY=m +CONFIG_ICPLUS_PHY=m +# CONFIG_INTEL_XWAY_PHY is not set +CONFIG_LSI_ET1011C_PHY=m +CONFIG_LXT_PHY=m +CONFIG_MARVELL_PHY=m +CONFIG_MARVELL_10G_PHY=m +CONFIG_MESON_GXL_PHY=m +CONFIG_MICREL_PHY=m +CONFIG_MICROCHIP_PHY=m +CONFIG_MICROCHIP_T1_PHY=m +CONFIG_MICROSEMI_PHY=m +CONFIG_NATIONAL_PHY=m +CONFIG_QSEMI_PHY=m +CONFIG_REALTEK_PHY=m +# CONFIG_RENESAS_PHY is not set +# CONFIG_ROCKCHIP_PHY is not set +CONFIG_SMSC_PHY=m +CONFIG_STE10XP=m +CONFIG_TERANETICS_PHY=m +CONFIG_VITESSE_PHY=m +# CONFIG_XILINX_GMII2RGMII is not set +# CONFIG_MICREL_KS8995MA is not set +# CONFIG_PLIP is not set +CONFIG_PPP=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_FILTER=y +CONFIG_PPP_MPPE=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPPOATM=m +CONFIG_PPPOE=m +CONFIG_PPTP=m +CONFIG_PPPOL2TP=m +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_SLIP=m +CONFIG_SLHC=m +CONFIG_SLIP_COMPRESSED=y +CONFIG_SLIP_SMART=y +CONFIG_SLIP_MODE_SLIP6=y + +# +# Host-side USB support is needed for USB Network Adapter support +# +CONFIG_USB_NET_DRIVERS=m +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_RTL8152=m +CONFIG_USB_LAN78XX=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_AX88179_178A=m +CONFIG_USB_NET_CDCETHER=m +CONFIG_USB_NET_CDC_EEM=m +CONFIG_USB_NET_CDC_NCM=m +CONFIG_USB_NET_HUAWEI_CDC_NCM=m +CONFIG_USB_NET_CDC_MBIM=m +CONFIG_USB_NET_DM9601=m +CONFIG_USB_NET_SR9700=m +CONFIG_USB_NET_SR9800=m +CONFIG_USB_NET_SMSC75XX=m +CONFIG_USB_NET_SMSC95XX=m +CONFIG_USB_NET_GL620A=m +CONFIG_USB_NET_NET1080=m +CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_MCS7830=m +CONFIG_USB_NET_RNDIS_HOST=m +CONFIG_USB_NET_CDC_SUBSET_ENABLE=m +CONFIG_USB_NET_CDC_SUBSET=m +CONFIG_USB_ALI_M5632=y +CONFIG_USB_AN2720=y +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +CONFIG_USB_EPSON2888=y +CONFIG_USB_KC2190=y +CONFIG_USB_NET_ZAURUS=m +CONFIG_USB_NET_CX82310_ETH=m +CONFIG_USB_NET_KALMIA=m +CONFIG_USB_NET_QMI_WWAN=m +CONFIG_USB_HSO=m +CONFIG_USB_NET_INT51X1=m +CONFIG_USB_CDC_PHONET=m +CONFIG_USB_IPHETH=m +CONFIG_USB_SIERRA_NET=m +CONFIG_USB_VL600=m +CONFIG_USB_NET_CH9200=m +CONFIG_WLAN=y +# CONFIG_WIRELESS_WDS is not set +CONFIG_WLAN_VENDOR_ADMTEK=y +CONFIG_ADM8211=m +CONFIG_ATH_COMMON=m +CONFIG_WLAN_VENDOR_ATH=y +# CONFIG_ATH_DEBUG is not set +CONFIG_ATH5K=m +# CONFIG_ATH5K_DEBUG is not set +# CONFIG_ATH5K_TRACER is not set +CONFIG_ATH5K_PCI=y +CONFIG_ATH9K_HW=m +CONFIG_ATH9K_COMMON=m +CONFIG_ATH9K_BTCOEX_SUPPORT=y +CONFIG_ATH9K=m +CONFIG_ATH9K_PCI=y +# CONFIG_ATH9K_AHB is not set +# CONFIG_ATH9K_DEBUGFS is not set +# CONFIG_ATH9K_DYNACK is not set +# CONFIG_ATH9K_WOW is not set +CONFIG_ATH9K_RFKILL=y +# CONFIG_ATH9K_CHANNEL_CONTEXT is not set +CONFIG_ATH9K_PCOEM=y +CONFIG_ATH9K_HTC=m +# CONFIG_ATH9K_HTC_DEBUGFS is not set +# CONFIG_ATH9K_HWRNG is not set +CONFIG_CARL9170=m +CONFIG_CARL9170_LEDS=y +CONFIG_CARL9170_WPC=y +# CONFIG_CARL9170_HWRNG is not set +CONFIG_ATH6KL=m +CONFIG_ATH6KL_SDIO=m +CONFIG_ATH6KL_USB=m +# CONFIG_ATH6KL_DEBUG is not set +# CONFIG_ATH6KL_TRACING is not set +CONFIG_AR5523=m +CONFIG_WIL6210=m +CONFIG_WIL6210_ISR_COR=y +CONFIG_WIL6210_TRACING=y +CONFIG_WIL6210_DEBUGFS=y +CONFIG_ATH10K=m +CONFIG_ATH10K_CE=y +CONFIG_ATH10K_PCI=m +# CONFIG_ATH10K_AHB is not set +# CONFIG_ATH10K_SDIO is not set +# CONFIG_ATH10K_USB is not set +# CONFIG_ATH10K_SNOC is not set +# CONFIG_ATH10K_DEBUG is not set +# CONFIG_ATH10K_DEBUGFS is not set +# CONFIG_ATH10K_TRACING is not set +CONFIG_WCN36XX=m +# CONFIG_WCN36XX_DEBUGFS is not set +CONFIG_WLAN_VENDOR_ATMEL=y +# CONFIG_ATMEL is not set +CONFIG_AT76C50X_USB=m +CONFIG_WLAN_VENDOR_BROADCOM=y +CONFIG_B43=m +CONFIG_B43_BCMA=y +CONFIG_B43_SSB=y +CONFIG_B43_BUSES_BCMA_AND_SSB=y +# CONFIG_B43_BUSES_BCMA is not set +# CONFIG_B43_BUSES_SSB is not set +CONFIG_B43_PCI_AUTOSELECT=y +CONFIG_B43_PCICORE_AUTOSELECT=y +CONFIG_B43_SDIO=y +CONFIG_B43_BCMA_PIO=y +CONFIG_B43_PIO=y +CONFIG_B43_PHY_G=y +CONFIG_B43_PHY_N=y +CONFIG_B43_PHY_LP=y +CONFIG_B43_PHY_HT=y +CONFIG_B43_LEDS=y +CONFIG_B43_HWRNG=y +# CONFIG_B43_DEBUG is not set +CONFIG_B43LEGACY=m +CONFIG_B43LEGACY_PCI_AUTOSELECT=y +CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y +CONFIG_B43LEGACY_LEDS=y +CONFIG_B43LEGACY_HWRNG=y +CONFIG_B43LEGACY_DEBUG=y +CONFIG_B43LEGACY_DMA=y +CONFIG_B43LEGACY_PIO=y +CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y +# CONFIG_B43LEGACY_DMA_MODE is not set +# CONFIG_B43LEGACY_PIO_MODE is not set +CONFIG_BRCMUTIL=m +CONFIG_BRCMSMAC=m +CONFIG_BRCMFMAC=m +CONFIG_BRCMFMAC_PROTO_BCDC=y +CONFIG_BRCMFMAC_PROTO_MSGBUF=y +CONFIG_BRCMFMAC_SDIO=y +CONFIG_BRCMFMAC_USB=y +CONFIG_BRCMFMAC_PCIE=y +# CONFIG_BRCM_TRACING is not set +# CONFIG_BRCMDBG is not set +CONFIG_WLAN_VENDOR_CISCO=y +CONFIG_WLAN_VENDOR_INTEL=y +# CONFIG_IPW2100 is not set +CONFIG_IPW2200=m +CONFIG_IPW2200_MONITOR=y +CONFIG_IPW2200_RADIOTAP=y +CONFIG_IPW2200_PROMISCUOUS=y +CONFIG_IPW2200_QOS=y +# CONFIG_IPW2200_DEBUG is not set +CONFIG_LIBIPW=m +# CONFIG_LIBIPW_DEBUG is not set +CONFIG_IWLEGACY=m +CONFIG_IWL4965=m +CONFIG_IWL3945=m + +# +# iwl3945 / iwl4965 Debugging Options +# +# CONFIG_IWLEGACY_DEBUG is not set +CONFIG_IWLWIFI=m +CONFIG_IWLWIFI_LEDS=y +CONFIG_IWLDVM=m +CONFIG_IWLMVM=m +CONFIG_IWLWIFI_OPMODE_MODULAR=y +# CONFIG_IWLWIFI_BCAST_FILTERING is not set +# CONFIG_IWLWIFI_PCIE_RTPM is not set + +# +# Debugging Options +# +# CONFIG_IWLWIFI_DEBUG is not set +# CONFIG_IWLWIFI_DEVICE_TRACING is not set +CONFIG_WLAN_VENDOR_INTERSIL=y +CONFIG_HOSTAP=m +CONFIG_HOSTAP_FIRMWARE=y +# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set +CONFIG_HOSTAP_PLX=m +CONFIG_HOSTAP_PCI=m +# CONFIG_HERMES is not set +CONFIG_P54_COMMON=m +CONFIG_P54_USB=m +CONFIG_P54_PCI=m +# CONFIG_P54_SPI is not set +CONFIG_P54_LEDS=y +# CONFIG_PRISM54 is not set +CONFIG_WLAN_VENDOR_MARVELL=y +CONFIG_LIBERTAS=m +CONFIG_LIBERTAS_USB=m +CONFIG_LIBERTAS_SDIO=m +# CONFIG_LIBERTAS_SPI is not set +# CONFIG_LIBERTAS_DEBUG is not set +CONFIG_LIBERTAS_MESH=y +CONFIG_LIBERTAS_THINFIRM=m +# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set +CONFIG_LIBERTAS_THINFIRM_USB=m +# CONFIG_MWIFIEX is not set +CONFIG_MWL8K=m +CONFIG_WLAN_VENDOR_MEDIATEK=y +CONFIG_MT7601U=m +CONFIG_MT76_CORE=m +CONFIG_MT76_USB=m +CONFIG_MT76x2_COMMON=m +CONFIG_MT76x0U=m +# CONFIG_MT76x2E is not set +CONFIG_MT76x2U=m +CONFIG_WLAN_VENDOR_RALINK=y +CONFIG_RT2X00=m +CONFIG_RT2400PCI=m +CONFIG_RT2500PCI=m +CONFIG_RT61PCI=m +CONFIG_RT2800PCI=m +CONFIG_RT2800PCI_RT33XX=y +CONFIG_RT2800PCI_RT35XX=y +CONFIG_RT2800PCI_RT53XX=y +CONFIG_RT2800PCI_RT3290=y +CONFIG_RT2500USB=m +CONFIG_RT73USB=m +CONFIG_RT2800USB=m +CONFIG_RT2800USB_RT33XX=y +CONFIG_RT2800USB_RT35XX=y +CONFIG_RT2800USB_RT3573=y +CONFIG_RT2800USB_RT53XX=y +CONFIG_RT2800USB_RT55XX=y +# CONFIG_RT2800USB_UNKNOWN is not set +CONFIG_RT2800_LIB=m +CONFIG_RT2800_LIB_MMIO=m +CONFIG_RT2X00_LIB_MMIO=m +CONFIG_RT2X00_LIB_PCI=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_CRYPTO=y +CONFIG_RT2X00_LIB_LEDS=y +# CONFIG_RT2X00_DEBUG is not set +CONFIG_WLAN_VENDOR_REALTEK=y +CONFIG_RTL8180=m +CONFIG_RTL8187=m +CONFIG_RTL8187_LEDS=y +CONFIG_RTL_CARDS=m +CONFIG_RTL8192CE=m +CONFIG_RTL8192SE=m +CONFIG_RTL8192DE=m +CONFIG_RTL8723AE=m +CONFIG_RTL8723BE=m +CONFIG_RTL8188EE=m +CONFIG_RTL8192EE=m +CONFIG_RTL8821AE=m +CONFIG_RTL8192CU=m +CONFIG_RTLWIFI=m +CONFIG_RTLWIFI_PCI=m +CONFIG_RTLWIFI_USB=m +# CONFIG_RTLWIFI_DEBUG is not set +CONFIG_RTL8192C_COMMON=m +CONFIG_RTL8723_COMMON=m +CONFIG_RTLBTCOEXIST=m +CONFIG_RTL8XXXU=m +# CONFIG_RTL8XXXU_UNTESTED is not set +CONFIG_WLAN_VENDOR_RSI=y +CONFIG_RSI_91X=m +CONFIG_RSI_DEBUGFS=y +# CONFIG_RSI_SDIO is not set +CONFIG_RSI_USB=m +CONFIG_RSI_COEX=y +CONFIG_WLAN_VENDOR_ST=y +# CONFIG_CW1200 is not set +CONFIG_WLAN_VENDOR_TI=y +CONFIG_WL1251=m +CONFIG_WL1251_SPI=m +CONFIG_WL1251_SDIO=m +CONFIG_WL12XX=m +CONFIG_WL18XX=m +CONFIG_WLCORE=m +CONFIG_WLCORE_SPI=m +CONFIG_WLCORE_SDIO=m +CONFIG_WILINK_PLATFORM_DATA=y +CONFIG_WLAN_VENDOR_ZYDAS=y +# CONFIG_USB_ZD1201 is not set +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set +CONFIG_WLAN_VENDOR_QUANTENNA=y +# CONFIG_QTNFMAC_PEARL_PCIE is not set +CONFIG_MAC80211_HWSIM=m +CONFIG_USB_NET_RNDIS_WLAN=m + +# +# WiMAX Wireless Broadband devices +# +CONFIG_WIMAX_I2400M=m +CONFIG_WIMAX_I2400M_USB=m +CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 +# CONFIG_WAN is not set +CONFIG_IEEE802154_DRIVERS=m +CONFIG_IEEE802154_FAKELB=m +CONFIG_IEEE802154_AT86RF230=m +# CONFIG_IEEE802154_AT86RF230_DEBUGFS is not set +CONFIG_IEEE802154_MRF24J40=m +CONFIG_IEEE802154_CC2520=m +CONFIG_IEEE802154_ATUSB=m +CONFIG_IEEE802154_ADF7242=m +# CONFIG_IEEE802154_CA8210 is not set +CONFIG_IEEE802154_MCR20A=m +# CONFIG_IEEE802154_HWSIM is not set +CONFIG_XEN_NETDEV_FRONTEND=m +CONFIG_XEN_NETDEV_BACKEND=m +# CONFIG_VMXNET3 is not set +# CONFIG_FUJITSU_ES is not set +# CONFIG_NETDEVSIM is not set +CONFIG_NET_FAILOVER=m +# CONFIG_ISDN is not set +# CONFIG_NVM is not set + +# +# Input device support +# +CONFIG_INPUT=y +CONFIG_INPUT_LEDS=y +CONFIG_INPUT_FF_MEMLESS=m +CONFIG_INPUT_POLLDEV=m +CONFIG_INPUT_SPARSEKMAP=m +CONFIG_INPUT_MATRIXKMAP=m + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +CONFIG_INPUT_JOYDEV=m +CONFIG_INPUT_EVDEV=m +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ADC is not set +CONFIG_KEYBOARD_ADP5588=m +# CONFIG_KEYBOARD_ADP5589 is not set +CONFIG_KEYBOARD_ATKBD=y +# CONFIG_KEYBOARD_QT1070 is not set +CONFIG_KEYBOARD_QT2160=m +# CONFIG_KEYBOARD_DLINK_DIR685 is not set +# CONFIG_KEYBOARD_LKKBD is not set +CONFIG_KEYBOARD_GPIO=m +# CONFIG_KEYBOARD_GPIO_POLLED is not set +# CONFIG_KEYBOARD_TCA6416 is not set +# CONFIG_KEYBOARD_TCA8418 is not set +# CONFIG_KEYBOARD_MATRIX is not set +CONFIG_KEYBOARD_LM8323=m +# CONFIG_KEYBOARD_LM8333 is not set +CONFIG_KEYBOARD_MAX7359=m +# CONFIG_KEYBOARD_MCS is not set +# CONFIG_KEYBOARD_MPR121 is not set +# CONFIG_KEYBOARD_NEWTON is not set +CONFIG_KEYBOARD_TEGRA=m +CONFIG_KEYBOARD_OPENCORES=m +# CONFIG_KEYBOARD_SAMSUNG is not set +CONFIG_KEYBOARD_STOWAWAY=m +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_SUN4I_LRADC is not set +# CONFIG_KEYBOARD_OMAP4 is not set +# CONFIG_KEYBOARD_TM2_TOUCHKEY is not set +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_KEYBOARD_CROS_EC is not set +# CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_BCM is not set +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=y +CONFIG_MOUSE_PS2_ALPS=y +CONFIG_MOUSE_PS2_BYD=y +CONFIG_MOUSE_PS2_LOGIPS2PP=y +CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y +CONFIG_MOUSE_PS2_CYPRESS=y +CONFIG_MOUSE_PS2_TRACKPOINT=y +CONFIG_MOUSE_PS2_ELANTECH=y +CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y +CONFIG_MOUSE_PS2_SENTELIC=y +# CONFIG_MOUSE_PS2_TOUCHKIT is not set +CONFIG_MOUSE_PS2_FOCALTECH=y +CONFIG_MOUSE_PS2_SMBUS=y +# CONFIG_MOUSE_SERIAL is not set +# CONFIG_MOUSE_APPLETOUCH is not set +# CONFIG_MOUSE_BCM5974 is not set +# CONFIG_MOUSE_CYAPA is not set +# CONFIG_MOUSE_ELAN_I2C is not set +# CONFIG_MOUSE_VSXXXAA is not set +# CONFIG_MOUSE_GPIO is not set +CONFIG_MOUSE_SYNAPTICS_I2C=m +CONFIG_MOUSE_SYNAPTICS_USB=m +# CONFIG_INPUT_JOYSTICK is not set +CONFIG_INPUT_TABLET=y +CONFIG_TABLET_USB_ACECAD=m +CONFIG_TABLET_USB_AIPTEK=m +CONFIG_TABLET_USB_GTCO=m +CONFIG_TABLET_USB_HANWANG=m +CONFIG_TABLET_USB_KBTAB=m +CONFIG_TABLET_USB_PEGASUS=m +CONFIG_TABLET_SERIAL_WACOM4=m +# CONFIG_INPUT_TOUCHSCREEN is not set +CONFIG_INPUT_MISC=y +# CONFIG_INPUT_AD714X is not set +# CONFIG_INPUT_ATMEL_CAPTOUCH is not set +# CONFIG_INPUT_BMA150 is not set +# CONFIG_INPUT_E3X0_BUTTON is not set +CONFIG_INPUT_PM8941_PWRKEY=m +# CONFIG_INPUT_PM8XXX_VIBRATOR is not set +# CONFIG_INPUT_MMA8450 is not set +# CONFIG_INPUT_GP2A is not set +# CONFIG_INPUT_GPIO_BEEPER is not set +# CONFIG_INPUT_GPIO_DECODER is not set +CONFIG_INPUT_ATI_REMOTE2=m +CONFIG_INPUT_KEYSPAN_REMOTE=m +# CONFIG_INPUT_KXTJ9 is not set +CONFIG_INPUT_POWERMATE=m +CONFIG_INPUT_YEALINK=m +CONFIG_INPUT_CM109=m +# CONFIG_INPUT_REGULATOR_HAPTIC is not set +CONFIG_INPUT_AXP20X_PEK=m +CONFIG_INPUT_UINPUT=m +# CONFIG_INPUT_PCF8574 is not set +# CONFIG_INPUT_PWM_BEEPER is not set +# CONFIG_INPUT_PWM_VIBRA is not set +# CONFIG_INPUT_RK805_PWRKEY is not set +# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set +# CONFIG_INPUT_ADXL34X is not set +# CONFIG_INPUT_IMS_PCU is not set +# CONFIG_INPUT_CMA3000 is not set +CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y +# CONFIG_INPUT_SOC_BUTTON_ARRAY is not set +# CONFIG_INPUT_DRV260X_HAPTICS is not set +# CONFIG_INPUT_DRV2665_HAPTICS is not set +# CONFIG_INPUT_DRV2667_HAPTICS is not set +CONFIG_INPUT_HISI_POWERKEY=m +CONFIG_RMI4_CORE=m +# CONFIG_RMI4_I2C is not set +# CONFIG_RMI4_SPI is not set +# CONFIG_RMI4_SMB is not set +CONFIG_RMI4_F03=y +CONFIG_RMI4_F03_SERIO=m +CONFIG_RMI4_2D_SENSOR=y +CONFIG_RMI4_F11=y +CONFIG_RMI4_F12=y +CONFIG_RMI4_F30=y +# CONFIG_RMI4_F34 is not set +# CONFIG_RMI4_F54 is not set +# CONFIG_RMI4_F55 is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_SERPORT=y +# CONFIG_SERIO_PARKBD is not set +# CONFIG_SERIO_AMBAKMI is not set +# CONFIG_SERIO_PCIPS2 is not set +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set +CONFIG_SERIO_ALTERA_PS2=m +# CONFIG_SERIO_PS2MULT is not set +# CONFIG_SERIO_ARC_PS2 is not set +# CONFIG_SERIO_APBPS2 is not set +# CONFIG_SERIO_SUN4I_PS2 is not set +# CONFIG_SERIO_GPIO_PS2 is not set +# CONFIG_USERIO is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_TTY=y +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_VT_CONSOLE_SLEEP=y +CONFIG_HW_CONSOLE=y +CONFIG_VT_HW_CONSOLE_BINDING=y +CONFIG_UNIX98_PTYS=y +# CONFIG_LEGACY_PTYS is not set +# CONFIG_SERIAL_NONSTANDARD is not set +CONFIG_NOZOMI=m +CONFIG_N_GSM=m +# CONFIG_TRACE_SINK is not set +CONFIG_DEVMEM=y + +# +# Serial drivers +# +CONFIG_SERIAL_EARLYCON=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y +CONFIG_SERIAL_8250_PNP=y +# CONFIG_SERIAL_8250_FINTEK is not set +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_DMA=y +CONFIG_SERIAL_8250_PCI=y +CONFIG_SERIAL_8250_EXAR=y +CONFIG_SERIAL_8250_NR_UARTS=4 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +CONFIG_SERIAL_8250_EXTENDED=y +# CONFIG_SERIAL_8250_MANY_PORTS is not set +# CONFIG_SERIAL_8250_ASPEED_VUART is not set +CONFIG_SERIAL_8250_SHARE_IRQ=y +# CONFIG_SERIAL_8250_DETECT_IRQ is not set +# CONFIG_SERIAL_8250_RSA is not set +CONFIG_SERIAL_8250_BCM2835AUX=y +CONFIG_SERIAL_8250_FSL=y +CONFIG_SERIAL_8250_DW=y +# CONFIG_SERIAL_8250_RT288X is not set +CONFIG_SERIAL_8250_MOXA=m +CONFIG_SERIAL_OF_PLATFORM=y + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_AMBA_PL010=y +CONFIG_SERIAL_AMBA_PL010_CONSOLE=y +CONFIG_SERIAL_AMBA_PL011=y +CONFIG_SERIAL_AMBA_PL011_CONSOLE=y +# CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST is not set +CONFIG_SERIAL_MESON=y +CONFIG_SERIAL_MESON_CONSOLE=y +CONFIG_SERIAL_TEGRA=y +# CONFIG_SERIAL_MAX3100 is not set +# CONFIG_SERIAL_MAX310X is not set +# CONFIG_SERIAL_UARTLITE is not set +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +# CONFIG_SERIAL_JSM is not set +CONFIG_SERIAL_MSM=y +CONFIG_SERIAL_MSM_CONSOLE=y +CONFIG_SERIAL_QCOM_GENI=m +# CONFIG_SERIAL_SCCNXP is not set +# CONFIG_SERIAL_SC16IS7XX is not set +# CONFIG_SERIAL_ALTERA_JTAGUART is not set +# CONFIG_SERIAL_ALTERA_UART is not set +# CONFIG_SERIAL_IFX6X60 is not set +# CONFIG_SERIAL_XILINX_PS_UART is not set +# CONFIG_SERIAL_ARC is not set +CONFIG_SERIAL_RP2=m +CONFIG_SERIAL_RP2_NR_UARTS=32 +# CONFIG_SERIAL_FSL_LPUART is not set +# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set +CONFIG_SERIAL_MVEBU_UART=y +CONFIG_SERIAL_MVEBU_CONSOLE=y +CONFIG_SERIAL_DEV_BUS=m +CONFIG_TTY_PRINTK=m +# CONFIG_PRINTER is not set +# CONFIG_PPDEV is not set +CONFIG_HVC_DRIVER=y +CONFIG_HVC_IRQ=y +CONFIG_HVC_XEN=y +CONFIG_HVC_XEN_FRONTEND=y +# CONFIG_HVC_DCC is not set +CONFIG_VIRTIO_CONSOLE=m +CONFIG_IPMI_HANDLER=m +CONFIG_IPMI_DMI_DECODE=y +# CONFIG_IPMI_PANIC_EVENT is not set +CONFIG_IPMI_DEVICE_INTERFACE=m +CONFIG_IPMI_SI=m +CONFIG_IPMI_SSIF=m +# CONFIG_IPMI_WATCHDOG is not set +# CONFIG_IPMI_POWEROFF is not set +CONFIG_HW_RANDOM=m +# CONFIG_HW_RANDOM_TIMERIOMEM is not set +CONFIG_HW_RANDOM_BCM2835=m +# CONFIG_HW_RANDOM_OMAP is not set +CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_HW_RANDOM_HISI=m +CONFIG_HW_RANDOM_XGENE=m +CONFIG_HW_RANDOM_MESON=m +CONFIG_HW_RANDOM_CAVIUM=m +# CONFIG_R3964 is not set +# CONFIG_APPLICOM is not set + +# +# PCMCIA character devices +# +# CONFIG_RAW_DRIVER is not set +# CONFIG_TCG_TPM is not set +CONFIG_DEVPORT=y +# CONFIG_XILLYBUS is not set + +# +# I2C support +# +CONFIG_I2C=y +CONFIG_ACPI_I2C_OPREGION=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y +CONFIG_I2C_CHARDEV=m +CONFIG_I2C_MUX=m + +# +# Multiplexer I2C Chip support +# +# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set +# CONFIG_I2C_MUX_GPIO is not set +# CONFIG_I2C_MUX_GPMUX is not set +# CONFIG_I2C_MUX_LTC4306 is not set +# CONFIG_I2C_MUX_PCA9541 is not set +# CONFIG_I2C_MUX_PCA954x is not set +# CONFIG_I2C_MUX_PINCTRL is not set +# CONFIG_I2C_MUX_REG is not set +# CONFIG_I2C_DEMUX_PINCTRL is not set +# CONFIG_I2C_MUX_MLXCPLD is not set +CONFIG_I2C_HELPER_AUTO=y +CONFIG_I2C_SMBUS=m +CONFIG_I2C_ALGOBIT=m +CONFIG_I2C_ALGOPCA=m + +# +# I2C Hardware Bus support +# + +# +# PC SMBus host controller drivers +# +# CONFIG_I2C_ALI1535 is not set +# CONFIG_I2C_ALI1563 is not set +# CONFIG_I2C_ALI15X3 is not set +# CONFIG_I2C_AMD756 is not set +# CONFIG_I2C_AMD8111 is not set +# CONFIG_I2C_HIX5HD2 is not set +# CONFIG_I2C_I801 is not set +CONFIG_I2C_ISCH=m +# CONFIG_I2C_PIIX4 is not set +# CONFIG_I2C_NFORCE2 is not set +# CONFIG_I2C_SIS5595 is not set +# CONFIG_I2C_SIS630 is not set +# CONFIG_I2C_SIS96X is not set +# CONFIG_I2C_VIA is not set +# CONFIG_I2C_VIAPRO is not set + +# +# ACPI drivers +# +# CONFIG_I2C_SCMI is not set + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +CONFIG_I2C_BCM2835=m +# CONFIG_I2C_CADENCE is not set +# CONFIG_I2C_CBUS_GPIO is not set +CONFIG_I2C_DESIGNWARE_CORE=m +CONFIG_I2C_DESIGNWARE_PLATFORM=m +# CONFIG_I2C_DESIGNWARE_SLAVE is not set +# CONFIG_I2C_DESIGNWARE_PCI is not set +# CONFIG_I2C_EMEV2 is not set +# CONFIG_I2C_GPIO is not set +CONFIG_I2C_MESON=m +CONFIG_I2C_MV64XXX=m +# CONFIG_I2C_NOMADIK is not set +CONFIG_I2C_OCORES=m +CONFIG_I2C_PCA_PLATFORM=m +CONFIG_I2C_PXA=m +# CONFIG_I2C_PXA_SLAVE is not set +CONFIG_I2C_QCOM_GENI=m +CONFIG_I2C_QUP=m +CONFIG_I2C_RK3X=m +CONFIG_I2C_SIMTEC=m +CONFIG_I2C_SYNQUACER=m +CONFIG_I2C_TEGRA=m +CONFIG_I2C_TEGRA_BPMP=y +# CONFIG_I2C_VERSATILE is not set +CONFIG_I2C_THUNDERX=m +# CONFIG_I2C_XILINX is not set +CONFIG_I2C_XLP9XX=m + +# +# External I2C/SMBus adapter drivers +# +CONFIG_I2C_DIOLAN_U2C=m +# CONFIG_I2C_PARPORT is not set +# CONFIG_I2C_PARPORT_LIGHT is not set +CONFIG_I2C_ROBOTFUZZ_OSIF=m +CONFIG_I2C_TAOS_EVM=m +CONFIG_I2C_TINY_USB=m +CONFIG_I2C_VIPERBOARD=m + +# +# Other I2C/SMBus bus drivers +# +CONFIG_I2C_CROS_EC_TUNNEL=m +CONFIG_I2C_XGENE_SLIMPRO=m +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_SLAVE is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +CONFIG_SPI=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y +CONFIG_SPI_MEM=y + +# +# SPI Master Controller Drivers +# +# CONFIG_SPI_ALTERA is not set +CONFIG_SPI_ARMADA_3700=m +# CONFIG_SPI_AXI_SPI_ENGINE is not set +CONFIG_SPI_BCM2835=m +CONFIG_SPI_BCM2835AUX=m +CONFIG_SPI_BITBANG=m +CONFIG_SPI_BUTTERFLY=m +# CONFIG_SPI_CADENCE is not set +# CONFIG_SPI_DESIGNWARE is not set +# CONFIG_SPI_GPIO is not set +CONFIG_SPI_LM70_LLP=m +# CONFIG_SPI_FSL_SPI is not set +# CONFIG_SPI_MESON_SPICC is not set +CONFIG_SPI_MESON_SPIFC=m +# CONFIG_SPI_OC_TINY is not set +# CONFIG_SPI_ORION is not set +# CONFIG_SPI_PL022 is not set +# CONFIG_SPI_PXA2XX is not set +# CONFIG_SPI_ROCKCHIP is not set +CONFIG_SPI_QUP=m +# CONFIG_SPI_SC18IS602 is not set +# CONFIG_SPI_SUN4I is not set +# CONFIG_SPI_SUN6I is not set +CONFIG_SPI_TEGRA114=m +CONFIG_SPI_TEGRA20_SFLASH=m +CONFIG_SPI_TEGRA20_SLINK=m +CONFIG_SPI_THUNDERX=m +# CONFIG_SPI_XCOMM is not set +# CONFIG_SPI_XILINX is not set +CONFIG_SPI_XLP=m +# CONFIG_SPI_ZYNQMP_GQSPI is not set + +# +# SPI Protocol Masters +# +# CONFIG_SPI_SPIDEV is not set +# CONFIG_SPI_LOOPBACK_TEST is not set +# CONFIG_SPI_TLE62X0 is not set +# CONFIG_SPI_SLAVE is not set +CONFIG_SPMI=y +CONFIG_SPMI_MSM_PMIC_ARB=y +# CONFIG_HSI is not set +CONFIG_PPS=y +# CONFIG_PPS_DEBUG is not set + +# +# PPS clients support +# +# CONFIG_PPS_CLIENT_KTIMER is not set +CONFIG_PPS_CLIENT_LDISC=m +CONFIG_PPS_CLIENT_PARPORT=m +# CONFIG_PPS_CLIENT_GPIO is not set + +# +# PPS generators support +# + +# +# PTP clock support +# +CONFIG_PTP_1588_CLOCK=y + +# +# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks. +# +CONFIG_PINCTRL=y +CONFIG_GENERIC_PINCTRL_GROUPS=y +CONFIG_PINMUX=y +CONFIG_GENERIC_PINMUX_FUNCTIONS=y +CONFIG_PINCONF=y +CONFIG_GENERIC_PINCONF=y +# CONFIG_DEBUG_PINCTRL is not set +CONFIG_PINCTRL_AXP209=m +CONFIG_PINCTRL_AMD=y +# CONFIG_PINCTRL_MCP23S08 is not set +CONFIG_PINCTRL_ROCKCHIP=y +CONFIG_PINCTRL_SINGLE=y +# CONFIG_PINCTRL_SX150X is not set +CONFIG_PINCTRL_MAX77620=y +# CONFIG_PINCTRL_RK805 is not set +CONFIG_PINCTRL_BCM2835=y +CONFIG_PINCTRL_MVEBU=y +CONFIG_PINCTRL_ARMADA_AP806=y +CONFIG_PINCTRL_ARMADA_CP110=y +CONFIG_PINCTRL_ARMADA_37XX=y +CONFIG_PINCTRL_MSM=y +# CONFIG_PINCTRL_APQ8064 is not set +# CONFIG_PINCTRL_APQ8084 is not set +# CONFIG_PINCTRL_IPQ4019 is not set +# CONFIG_PINCTRL_IPQ8064 is not set +# CONFIG_PINCTRL_IPQ8074 is not set +# CONFIG_PINCTRL_MSM8660 is not set +# CONFIG_PINCTRL_MSM8960 is not set +# CONFIG_PINCTRL_MDM9615 is not set +# CONFIG_PINCTRL_MSM8X74 is not set +CONFIG_PINCTRL_MSM8916=y +# CONFIG_PINCTRL_MSM8994 is not set +CONFIG_PINCTRL_MSM8996=y +# CONFIG_PINCTRL_MSM8998 is not set +# CONFIG_PINCTRL_QDF2XXX is not set +CONFIG_PINCTRL_QCOM_SPMI_PMIC=y +CONFIG_PINCTRL_QCOM_SSBI_PMIC=y +# CONFIG_PINCTRL_SDM845 is not set +CONFIG_PINCTRL_SUNXI=y +CONFIG_PINCTRL_SUN8I_H3_R=y +CONFIG_PINCTRL_SUN50I_A64=y +CONFIG_PINCTRL_SUN50I_A64_R=y +CONFIG_PINCTRL_SUN50I_H5=y +CONFIG_PINCTRL_SUN50I_H6=y +CONFIG_PINCTRL_SUN50I_H6_R=y +CONFIG_PINCTRL_TEGRA=y +CONFIG_PINCTRL_TEGRA124=y +CONFIG_PINCTRL_TEGRA210=y +CONFIG_PINCTRL_TEGRA_XUSB=y +CONFIG_PINCTRL_MESON=y +CONFIG_PINCTRL_MESON_GXBB=y +CONFIG_PINCTRL_MESON_GXL=y +CONFIG_PINCTRL_MESON8_PMX=y +CONFIG_PINCTRL_MESON_AXG=y +CONFIG_PINCTRL_MESON_AXG_PMX=y +CONFIG_PINCTRL_MADERA=m +CONFIG_GPIOLIB=y +CONFIG_GPIOLIB_FASTPATH_LIMIT=512 +CONFIG_OF_GPIO=y +CONFIG_GPIO_ACPI=y +CONFIG_GPIOLIB_IRQCHIP=y +# CONFIG_DEBUG_GPIO is not set +CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_GENERIC=y + +# +# Memory mapped GPIO drivers +# +# CONFIG_GPIO_74XX_MMIO is not set +# CONFIG_GPIO_ALTERA is not set +# CONFIG_GPIO_AMDPT is not set +CONFIG_GPIO_RASPBERRYPI_EXP=m +# CONFIG_GPIO_DWAPB is not set +# CONFIG_GPIO_EXAR is not set +# CONFIG_GPIO_FTGPIO010 is not set +CONFIG_GPIO_GENERIC_PLATFORM=y +# CONFIG_GPIO_GRGPIO is not set +# CONFIG_GPIO_HLWD is not set +CONFIG_GPIO_MB86S7X=m +# CONFIG_GPIO_MOCKUP is not set +CONFIG_GPIO_MVEBU=y +CONFIG_GPIO_PL061=y +# CONFIG_GPIO_SYSCON is not set +CONFIG_GPIO_TEGRA=y +# CONFIG_GPIO_THUNDERX is not set +CONFIG_GPIO_XGENE=y +CONFIG_GPIO_XGENE_SB=m +# CONFIG_GPIO_XILINX is not set +CONFIG_GPIO_XLP=y + +# +# I2C GPIO expanders +# +# CONFIG_GPIO_ADP5588 is not set +# CONFIG_GPIO_ADNP is not set +# CONFIG_GPIO_MAX7300 is not set +# CONFIG_GPIO_MAX732X is not set +CONFIG_GPIO_PCA953X=y +CONFIG_GPIO_PCA953X_IRQ=y +# CONFIG_GPIO_PCF857X is not set +# CONFIG_GPIO_TPIC2810 is not set + +# +# MFD GPIO expanders +# +CONFIG_GPIO_MADERA=m +CONFIG_GPIO_MAX77620=y + +# +# PCI GPIO expanders +# +# CONFIG_GPIO_PCI_IDIO_16 is not set +# CONFIG_GPIO_PCIE_IDIO_24 is not set +# CONFIG_GPIO_RDC321X is not set + +# +# SPI GPIO expanders +# +# CONFIG_GPIO_74X164 is not set +# CONFIG_GPIO_MAX3191X is not set +# CONFIG_GPIO_MAX7301 is not set +# CONFIG_GPIO_MC33880 is not set +# CONFIG_GPIO_PISOSR is not set +# CONFIG_GPIO_XRA1403 is not set + +# +# USB GPIO expanders +# +CONFIG_GPIO_VIPERBOARD=m +CONFIG_W1=m +CONFIG_W1_CON=y + +# +# 1-wire Bus Masters +# +# CONFIG_W1_MASTER_MATROX is not set +CONFIG_W1_MASTER_DS2490=m +CONFIG_W1_MASTER_DS2482=m +# CONFIG_W1_MASTER_DS1WM is not set +CONFIG_W1_MASTER_GPIO=m + +# +# 1-wire Slaves +# +CONFIG_W1_SLAVE_THERM=m +CONFIG_W1_SLAVE_SMEM=m +CONFIG_W1_SLAVE_DS2405=m +CONFIG_W1_SLAVE_DS2408=m +CONFIG_W1_SLAVE_DS2408_READBACK=y +CONFIG_W1_SLAVE_DS2413=m +CONFIG_W1_SLAVE_DS2406=m +CONFIG_W1_SLAVE_DS2423=m +CONFIG_W1_SLAVE_DS2805=m +CONFIG_W1_SLAVE_DS2431=m +CONFIG_W1_SLAVE_DS2433=m +# CONFIG_W1_SLAVE_DS2433_CRC is not set +CONFIG_W1_SLAVE_DS2438=m +CONFIG_W1_SLAVE_DS2780=m +CONFIG_W1_SLAVE_DS2781=m +CONFIG_W1_SLAVE_DS28E04=m +CONFIG_W1_SLAVE_DS28E17=m +CONFIG_POWER_AVS=y +CONFIG_ROCKCHIP_IODOMAIN=m +CONFIG_POWER_RESET=y +# CONFIG_POWER_RESET_BRCMSTB is not set +# CONFIG_POWER_RESET_GPIO is not set +# CONFIG_POWER_RESET_GPIO_RESTART is not set +CONFIG_POWER_RESET_HISI=y +CONFIG_POWER_RESET_MSM=y +CONFIG_POWER_RESET_QCOM_PON=m +# CONFIG_POWER_RESET_LTC2952 is not set +# CONFIG_POWER_RESET_RESTART is not set +CONFIG_POWER_RESET_VEXPRESS=y +CONFIG_POWER_RESET_XGENE=y +CONFIG_POWER_RESET_SYSCON=y +CONFIG_POWER_RESET_SYSCON_POWEROFF=y +CONFIG_REBOOT_MODE=m +# CONFIG_SYSCON_REBOOT_MODE is not set +CONFIG_POWER_SUPPLY=y +# CONFIG_POWER_SUPPLY_DEBUG is not set +# CONFIG_PDA_POWER is not set +# CONFIG_GENERIC_ADC_BATTERY is not set +# CONFIG_TEST_POWER is not set +CONFIG_CHARGER_ADP5061=m +# CONFIG_BATTERY_DS2760 is not set +# CONFIG_BATTERY_DS2780 is not set +# CONFIG_BATTERY_DS2781 is not set +# CONFIG_BATTERY_DS2782 is not set +# CONFIG_BATTERY_LEGO_EV3 is not set +# CONFIG_BATTERY_SBS is not set +# CONFIG_CHARGER_SBS is not set +# CONFIG_MANAGER_SBS is not set +CONFIG_BATTERY_BQ27XXX=m +# CONFIG_BATTERY_BQ27XXX_I2C is not set +CONFIG_BATTERY_BQ27XXX_HDQ=m +CONFIG_CHARGER_AXP20X=m +CONFIG_BATTERY_AXP20X=m +CONFIG_AXP20X_POWER=m +CONFIG_AXP288_FUEL_GAUGE=m +# CONFIG_BATTERY_MAX17040 is not set +# CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_MAX1721X is not set +# CONFIG_CHARGER_ISP1704 is not set +# CONFIG_CHARGER_MAX8903 is not set +# CONFIG_CHARGER_LP8727 is not set +# CONFIG_CHARGER_GPIO is not set +# CONFIG_CHARGER_MANAGER is not set +# CONFIG_CHARGER_LTC3651 is not set +# CONFIG_CHARGER_DETECTOR_MAX14656 is not set +CONFIG_CHARGER_QCOM_SMBB=m +# CONFIG_CHARGER_BQ2415X is not set +# CONFIG_CHARGER_BQ24190 is not set +# CONFIG_CHARGER_BQ24257 is not set +# CONFIG_CHARGER_BQ24735 is not set +# CONFIG_CHARGER_BQ25890 is not set +# CONFIG_CHARGER_SMB347 is not set +# CONFIG_BATTERY_GAUGE_LTC2941 is not set +# CONFIG_CHARGER_RT9455 is not set +CONFIG_CHARGER_CROS_USBPD=m +CONFIG_HWMON=y +CONFIG_HWMON_VID=m +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Native drivers +# +# CONFIG_SENSORS_AD7314 is not set +CONFIG_SENSORS_AD7414=m +CONFIG_SENSORS_AD7418=m +# CONFIG_SENSORS_ADM1021 is not set +# CONFIG_SENSORS_ADM1025 is not set +# CONFIG_SENSORS_ADM1026 is not set +CONFIG_SENSORS_ADM1029=m +# CONFIG_SENSORS_ADM1031 is not set +CONFIG_SENSORS_ADM9240=m +# CONFIG_SENSORS_ADT7310 is not set +# CONFIG_SENSORS_ADT7410 is not set +CONFIG_SENSORS_ADT7411=m +CONFIG_SENSORS_ADT7462=m +CONFIG_SENSORS_ADT7470=m +CONFIG_SENSORS_ADT7475=m +CONFIG_SENSORS_ASC7621=m +CONFIG_SENSORS_ARM_SCMI=m +# CONFIG_SENSORS_ASPEED is not set +CONFIG_SENSORS_ATXP1=m +CONFIG_SENSORS_DS620=m +# CONFIG_SENSORS_DS1621 is not set +CONFIG_SENSORS_I5K_AMB=m +# CONFIG_SENSORS_F71805F is not set +CONFIG_SENSORS_F71882FG=m +CONFIG_SENSORS_F75375S=m +CONFIG_SENSORS_FTSTEUTATES=m +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM is not set +CONFIG_SENSORS_G760A=m +# CONFIG_SENSORS_G762 is not set +# CONFIG_SENSORS_GPIO_FAN is not set +# CONFIG_SENSORS_HIH6130 is not set +CONFIG_SENSORS_IBMAEM=m +CONFIG_SENSORS_IBMPEX=m +# CONFIG_SENSORS_IIO_HWMON is not set +# CONFIG_SENSORS_IT87 is not set +CONFIG_SENSORS_JC42=m +# CONFIG_SENSORS_POWR1220 is not set +CONFIG_SENSORS_LINEAGE=m +# CONFIG_SENSORS_LTC2945 is not set +# CONFIG_SENSORS_LTC2990 is not set +CONFIG_SENSORS_LTC4151=m +CONFIG_SENSORS_LTC4215=m +# CONFIG_SENSORS_LTC4222 is not set +CONFIG_SENSORS_LTC4245=m +# CONFIG_SENSORS_LTC4260 is not set +CONFIG_SENSORS_LTC4261=m +CONFIG_SENSORS_MAX1111=m +CONFIG_SENSORS_MAX16065=m +# CONFIG_SENSORS_MAX1619 is not set +CONFIG_SENSORS_MAX1668=m +# CONFIG_SENSORS_MAX197 is not set +# CONFIG_SENSORS_MAX31722 is not set +# CONFIG_SENSORS_MAX6621 is not set +CONFIG_SENSORS_MAX6639=m +CONFIG_SENSORS_MAX6642=m +CONFIG_SENSORS_MAX6650=m +# CONFIG_SENSORS_MAX6697 is not set +# CONFIG_SENSORS_MAX31790 is not set +# CONFIG_SENSORS_MCP3021 is not set +# CONFIG_SENSORS_TC654 is not set +CONFIG_SENSORS_ADCXX=m +# CONFIG_SENSORS_LM63 is not set +CONFIG_SENSORS_LM70=m +CONFIG_SENSORS_LM73=m +# CONFIG_SENSORS_LM75 is not set +# CONFIG_SENSORS_LM77 is not set +# CONFIG_SENSORS_LM78 is not set +# CONFIG_SENSORS_LM80 is not set +# CONFIG_SENSORS_LM83 is not set +# CONFIG_SENSORS_LM85 is not set +# CONFIG_SENSORS_LM87 is not set +# CONFIG_SENSORS_LM90 is not set +# CONFIG_SENSORS_LM92 is not set +CONFIG_SENSORS_LM93=m +# CONFIG_SENSORS_LM95234 is not set +CONFIG_SENSORS_LM95241=m +CONFIG_SENSORS_LM95245=m +# CONFIG_SENSORS_PC87360 is not set +CONFIG_SENSORS_PC87427=m +CONFIG_SENSORS_NTC_THERMISTOR=m +CONFIG_SENSORS_NCT6683=m +CONFIG_SENSORS_NCT6775=m +# CONFIG_SENSORS_NCT7802 is not set +# CONFIG_SENSORS_NCT7904 is not set +# CONFIG_SENSORS_NPCM7XX is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_PMBUS is not set +# CONFIG_SENSORS_PWM_FAN is not set +CONFIG_SENSORS_RASPBERRYPI_HWMON=m +# CONFIG_SENSORS_SHT15 is not set +CONFIG_SENSORS_SHT21=m +# CONFIG_SENSORS_SHT3x is not set +# CONFIG_SENSORS_SHTC1 is not set +# CONFIG_SENSORS_SIS5595 is not set +CONFIG_SENSORS_DME1737=m +CONFIG_SENSORS_EMC1403=m +CONFIG_SENSORS_EMC2103=m +CONFIG_SENSORS_EMC6W201=m +# CONFIG_SENSORS_SMSC47M1 is not set +CONFIG_SENSORS_SMSC47M192=m +# CONFIG_SENSORS_SMSC47B397 is not set +CONFIG_SENSORS_SCH56XX_COMMON=m +CONFIG_SENSORS_SCH5627=m +# CONFIG_SENSORS_SCH5636 is not set +# CONFIG_SENSORS_STTS751 is not set +CONFIG_SENSORS_SMM665=m +# CONFIG_SENSORS_ADC128D818 is not set +CONFIG_SENSORS_ADS1015=m +CONFIG_SENSORS_ADS7828=m +CONFIG_SENSORS_ADS7871=m +CONFIG_SENSORS_AMC6821=m +# CONFIG_SENSORS_INA209 is not set +# CONFIG_SENSORS_INA2XX is not set +# CONFIG_SENSORS_INA3221 is not set +# CONFIG_SENSORS_TC74 is not set +CONFIG_SENSORS_THMC50=m +CONFIG_SENSORS_TMP102=m +# CONFIG_SENSORS_TMP103 is not set +# CONFIG_SENSORS_TMP108 is not set +CONFIG_SENSORS_TMP401=m +CONFIG_SENSORS_TMP421=m +# CONFIG_SENSORS_VEXPRESS is not set +# CONFIG_SENSORS_VIA686A is not set +CONFIG_SENSORS_VT1211=m +CONFIG_SENSORS_VT8231=m +# CONFIG_SENSORS_W83773G is not set +# CONFIG_SENSORS_W83781D is not set +CONFIG_SENSORS_W83791D=m +CONFIG_SENSORS_W83792D=m +CONFIG_SENSORS_W83793=m +CONFIG_SENSORS_W83795=m +# CONFIG_SENSORS_W83795_FANCTRL is not set +# CONFIG_SENSORS_W83L785TS is not set +CONFIG_SENSORS_W83L786NG=m +# CONFIG_SENSORS_W83627HF is not set +CONFIG_SENSORS_W83627EHF=m +CONFIG_SENSORS_XGENE=m + +# +# ACPI drivers +# +# CONFIG_SENSORS_ACPI_POWER is not set +CONFIG_THERMAL=y +# CONFIG_THERMAL_STATISTICS is not set +CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 +CONFIG_THERMAL_HWMON=y +CONFIG_THERMAL_OF=y +# CONFIG_THERMAL_WRITABLE_TRIPS is not set +CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y +# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set +# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set +CONFIG_THERMAL_GOV_FAIR_SHARE=y +CONFIG_THERMAL_GOV_STEP_WISE=y +# CONFIG_THERMAL_GOV_BANG_BANG is not set +# CONFIG_THERMAL_GOV_USER_SPACE is not set +# CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set +CONFIG_CPU_THERMAL=y +# CONFIG_CLOCK_THERMAL is not set +# CONFIG_DEVFREQ_THERMAL is not set +# CONFIG_THERMAL_EMULATION is not set +CONFIG_HISI_THERMAL=m +# CONFIG_MAX77620_THERMAL is not set +# CONFIG_QORIQ_THERMAL is not set +# CONFIG_ROCKCHIP_THERMAL is not set +CONFIG_ARMADA_THERMAL=m + +# +# ACPI INT340X thermal drivers +# + +# +# Broadcom thermal drivers +# +CONFIG_BCM2835_THERMAL=m + +# +# NVIDIA Tegra thermal drivers +# +CONFIG_TEGRA_SOCTHERM=y +# CONFIG_TEGRA_BPMP_THERMAL is not set +CONFIG_QCOM_SPMI_TEMP_ALARM=m +# CONFIG_GENERIC_ADC_THERMAL is not set + +# +# Qualcomm thermal drivers +# +CONFIG_QCOM_TSENS=m +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_CORE=y +# CONFIG_WATCHDOG_NOWAYOUT is not set +CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y +CONFIG_WATCHDOG_SYSFS=y + +# +# Watchdog Device Drivers +# +CONFIG_SOFT_WATCHDOG=m +CONFIG_GPIO_WATCHDOG=m +# CONFIG_WDAT_WDT is not set +# CONFIG_XILINX_WATCHDOG is not set +# CONFIG_ZIIRAVE_WATCHDOG is not set +CONFIG_ARM_SP805_WATCHDOG=m +CONFIG_ARM_SBSA_WATCHDOG=m +# CONFIG_CADENCE_WATCHDOG is not set +CONFIG_DW_WATCHDOG=m +CONFIG_SUNXI_WATCHDOG=m +# CONFIG_MAX63XX_WATCHDOG is not set +# CONFIG_MAX77620_WATCHDOG is not set +CONFIG_TEGRA_WATCHDOG=m +CONFIG_QCOM_WDT=m +CONFIG_MESON_GXBB_WATCHDOG=m +CONFIG_MESON_WATCHDOG=m +# CONFIG_ALIM7101_WDT is not set +# CONFIG_I6300ESB_WDT is not set +CONFIG_BCM2835_WDT=m +# CONFIG_MEN_A21_WDT is not set +CONFIG_XEN_WDT=m + +# +# PCI-based Watchdog Cards +# +# CONFIG_PCIPCWATCHDOG is not set +# CONFIG_WDTPCI is not set + +# +# USB-based Watchdog Cards +# +# CONFIG_USBPCWATCHDOG is not set + +# +# Watchdog Pretimeout Governors +# +# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set +CONFIG_SSB_POSSIBLE=y +CONFIG_SSB=m +CONFIG_SSB_SPROM=y +CONFIG_SSB_BLOCKIO=y +CONFIG_SSB_PCIHOST_POSSIBLE=y +CONFIG_SSB_PCIHOST=y +CONFIG_SSB_B43_PCI_BRIDGE=y +CONFIG_SSB_SDIOHOST_POSSIBLE=y +CONFIG_SSB_SDIOHOST=y +CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y +CONFIG_SSB_DRIVER_PCICORE=y +# CONFIG_SSB_DRIVER_GPIO is not set +CONFIG_BCMA_POSSIBLE=y +CONFIG_BCMA=m +CONFIG_BCMA_BLOCKIO=y +CONFIG_BCMA_HOST_PCI_POSSIBLE=y +CONFIG_BCMA_HOST_PCI=y +# CONFIG_BCMA_HOST_SOC is not set +CONFIG_BCMA_DRIVER_PCI=y +# CONFIG_BCMA_DRIVER_GMAC_CMN is not set +# CONFIG_BCMA_DRIVER_GPIO is not set +# CONFIG_BCMA_DEBUG is not set + +# +# Multifunction device drivers +# +CONFIG_MFD_CORE=y +# CONFIG_MFD_ACT8945A is not set +# CONFIG_MFD_SUN4I_GPADC is not set +# CONFIG_MFD_AS3711 is not set +# CONFIG_MFD_AS3722 is not set +# CONFIG_PMIC_ADP5520 is not set +# CONFIG_MFD_AAT2870_CORE is not set +# CONFIG_MFD_ATMEL_FLEXCOM is not set +# CONFIG_MFD_ATMEL_HLCDC is not set +# CONFIG_MFD_BCM590XX is not set +# CONFIG_MFD_BD9571MWV is not set +# CONFIG_MFD_AC100 is not set +CONFIG_MFD_AXP20X=m +# CONFIG_MFD_AXP20X_I2C is not set +CONFIG_MFD_AXP20X_RSB=m +CONFIG_MFD_CROS_EC=y +# CONFIG_MFD_CROS_EC_CHARDEV is not set +CONFIG_MFD_MADERA=m +CONFIG_MFD_MADERA_I2C=m +CONFIG_MFD_MADERA_SPI=m +# CONFIG_MFD_CS47L35 is not set +# CONFIG_MFD_CS47L85 is not set +# CONFIG_MFD_CS47L90 is not set +# CONFIG_PMIC_DA903X is not set +# CONFIG_MFD_DA9052_SPI is not set +# CONFIG_MFD_DA9052_I2C is not set +# CONFIG_MFD_DA9055 is not set +# CONFIG_MFD_DA9062 is not set +# CONFIG_MFD_DA9063 is not set +# CONFIG_MFD_DA9150 is not set +# CONFIG_MFD_DLN2 is not set +# CONFIG_MFD_MC13XXX_SPI is not set +# CONFIG_MFD_MC13XXX_I2C is not set +# CONFIG_MFD_HI6421_PMIC is not set +CONFIG_MFD_HI655X_PMIC=m +# CONFIG_HTC_PASIC3 is not set +# CONFIG_HTC_I2CPLD is not set +# CONFIG_LPC_ICH is not set +CONFIG_LPC_SCH=m +# CONFIG_MFD_JANZ_CMODIO is not set +# CONFIG_MFD_KEMPLD is not set +# CONFIG_MFD_88PM800 is not set +# CONFIG_MFD_88PM805 is not set +# CONFIG_MFD_88PM860X is not set +# CONFIG_MFD_MAX14577 is not set +CONFIG_MFD_MAX77620=y +# CONFIG_MFD_MAX77686 is not set +# CONFIG_MFD_MAX77693 is not set +# CONFIG_MFD_MAX77843 is not set +# CONFIG_MFD_MAX8907 is not set +# CONFIG_MFD_MAX8925 is not set +# CONFIG_MFD_MAX8997 is not set +# CONFIG_MFD_MAX8998 is not set +# CONFIG_MFD_MT6397 is not set +# CONFIG_MFD_MENF21BMC is not set +# CONFIG_EZX_PCAP is not set +# CONFIG_MFD_CPCAP is not set +CONFIG_MFD_VIPERBOARD=m +# CONFIG_MFD_RETU is not set +# CONFIG_MFD_PCF50633 is not set +# CONFIG_UCB1400_CORE is not set +CONFIG_MFD_QCOM_RPM=m +CONFIG_MFD_SPMI_PMIC=m +# CONFIG_MFD_RDC321X is not set +# CONFIG_MFD_RT5033 is not set +# CONFIG_MFD_RC5T583 is not set +CONFIG_MFD_RK808=m +# CONFIG_MFD_RN5T618 is not set +# CONFIG_MFD_SEC_CORE is not set +# CONFIG_MFD_SI476X_CORE is not set +# CONFIG_MFD_SM501 is not set +# CONFIG_MFD_SKY81452 is not set +# CONFIG_MFD_SMSC is not set +# CONFIG_ABX500_CORE is not set +# CONFIG_MFD_STMPE is not set +# CONFIG_MFD_SUN6I_PRCM is not set +CONFIG_MFD_SYSCON=y +# CONFIG_MFD_TI_AM335X_TSCADC is not set +# CONFIG_MFD_LP3943 is not set +# CONFIG_MFD_LP8788 is not set +# CONFIG_MFD_TI_LMU is not set +# CONFIG_MFD_PALMAS is not set +# CONFIG_TPS6105X is not set +# CONFIG_TPS65010 is not set +# CONFIG_TPS6507X is not set +# CONFIG_MFD_TPS65086 is not set +# CONFIG_MFD_TPS65090 is not set +# CONFIG_MFD_TPS65217 is not set +# CONFIG_MFD_TPS68470 is not set +# CONFIG_MFD_TI_LP873X is not set +# CONFIG_MFD_TI_LP87565 is not set +# CONFIG_MFD_TPS65218 is not set +# CONFIG_MFD_TPS6586X is not set +# CONFIG_MFD_TPS65910 is not set +# CONFIG_MFD_TPS65912_I2C is not set +# CONFIG_MFD_TPS65912_SPI is not set +# CONFIG_MFD_TPS80031 is not set +# CONFIG_TWL4030_CORE is not set +# CONFIG_TWL6040_CORE is not set +# CONFIG_MFD_WL1273_CORE is not set +# CONFIG_MFD_LM3533 is not set +# CONFIG_MFD_TC3589X is not set +# CONFIG_MFD_VX855 is not set +# CONFIG_MFD_ARIZONA_I2C is not set +# CONFIG_MFD_ARIZONA_SPI is not set +# CONFIG_MFD_WM8400 is not set +# CONFIG_MFD_WM831X_I2C is not set +# CONFIG_MFD_WM831X_SPI is not set +# CONFIG_MFD_WM8350_I2C is not set +# CONFIG_MFD_WM8994 is not set +CONFIG_MFD_ROHM_BD718XX=m +CONFIG_MFD_VEXPRESS_SYSREG=y +# CONFIG_RAVE_SP_CORE is not set +CONFIG_REGULATOR=y +# CONFIG_REGULATOR_DEBUG is not set +CONFIG_REGULATOR_FIXED_VOLTAGE=m +# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set +# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set +# CONFIG_REGULATOR_88PG86X is not set +# CONFIG_REGULATOR_ACT8865 is not set +# CONFIG_REGULATOR_AD5398 is not set +# CONFIG_REGULATOR_ANATOP is not set +CONFIG_REGULATOR_AXP20X=m +CONFIG_REGULATOR_BD718XX=m +# CONFIG_REGULATOR_DA9210 is not set +# CONFIG_REGULATOR_DA9211 is not set +CONFIG_REGULATOR_FAN53555=m +CONFIG_REGULATOR_GPIO=m +CONFIG_REGULATOR_HI655X=m +# CONFIG_REGULATOR_ISL9305 is not set +# CONFIG_REGULATOR_ISL6271A is not set +# CONFIG_REGULATOR_LP3971 is not set +# CONFIG_REGULATOR_LP3972 is not set +# CONFIG_REGULATOR_LP872X is not set +# CONFIG_REGULATOR_LP8755 is not set +# CONFIG_REGULATOR_LTC3589 is not set +# CONFIG_REGULATOR_LTC3676 is not set +# CONFIG_REGULATOR_MAX1586 is not set +CONFIG_REGULATOR_MAX77620=m +# CONFIG_REGULATOR_MAX8649 is not set +# CONFIG_REGULATOR_MAX8660 is not set +# CONFIG_REGULATOR_MAX8952 is not set +# CONFIG_REGULATOR_MAX8973 is not set +# CONFIG_REGULATOR_MT6311 is not set +# CONFIG_REGULATOR_PFUZE100 is not set +# CONFIG_REGULATOR_PV88060 is not set +# CONFIG_REGULATOR_PV88080 is not set +# CONFIG_REGULATOR_PV88090 is not set +CONFIG_REGULATOR_PWM=m +CONFIG_REGULATOR_QCOM_RPM=m +CONFIG_REGULATOR_QCOM_SMD_RPM=m +CONFIG_REGULATOR_QCOM_SPMI=m +CONFIG_REGULATOR_RK808=m +CONFIG_REGULATOR_SY8106A=m +# CONFIG_REGULATOR_TPS51632 is not set +# CONFIG_REGULATOR_TPS62360 is not set +# CONFIG_REGULATOR_TPS65023 is not set +# CONFIG_REGULATOR_TPS6507X is not set +# CONFIG_REGULATOR_TPS65132 is not set +# CONFIG_REGULATOR_TPS6524X is not set +# CONFIG_REGULATOR_VCTRL is not set +# CONFIG_REGULATOR_VEXPRESS is not set +CONFIG_CEC_CORE=m +CONFIG_RC_CORE=m +CONFIG_RC_MAP=m +CONFIG_LIRC=y +CONFIG_RC_DECODERS=y +CONFIG_IR_NEC_DECODER=m +CONFIG_IR_RC5_DECODER=m +CONFIG_IR_RC6_DECODER=m +CONFIG_IR_JVC_DECODER=m +CONFIG_IR_SONY_DECODER=m +CONFIG_IR_SANYO_DECODER=m +CONFIG_IR_SHARP_DECODER=m +CONFIG_IR_MCE_KBD_DECODER=m +CONFIG_IR_XMP_DECODER=m +CONFIG_IR_IMON_DECODER=m +CONFIG_RC_DEVICES=y +CONFIG_RC_ATI_REMOTE=m +CONFIG_IR_ENE=m +# CONFIG_IR_HIX5HD2 is not set +CONFIG_IR_IMON=m +CONFIG_IR_IMON_RAW=m +CONFIG_IR_MCEUSB=m +# CONFIG_IR_ITE_CIR is not set +# CONFIG_IR_FINTEK is not set +# CONFIG_IR_MESON is not set +# CONFIG_IR_NUVOTON is not set +CONFIG_IR_REDRAT3=m +# CONFIG_IR_SPI is not set +CONFIG_IR_STREAMZAP=m +CONFIG_IR_IGORPLUGUSB=m +CONFIG_IR_IGUANA=m +CONFIG_IR_TTUSBIR=m +CONFIG_RC_LOOPBACK=m +# CONFIG_IR_GPIO_CIR is not set +# CONFIG_IR_GPIO_TX is not set +# CONFIG_IR_PWM_TX is not set +# CONFIG_IR_SUNXI is not set +# CONFIG_IR_SERIAL is not set +# CONFIG_IR_SIR is not set +CONFIG_MEDIA_SUPPORT=m + +# +# Multimedia core support +# +CONFIG_MEDIA_CAMERA_SUPPORT=y +CONFIG_MEDIA_ANALOG_TV_SUPPORT=y +CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y +CONFIG_MEDIA_RADIO_SUPPORT=y +CONFIG_MEDIA_SDR_SUPPORT=y +CONFIG_MEDIA_CEC_SUPPORT=y +# CONFIG_MEDIA_CEC_RC is not set +CONFIG_MEDIA_CONTROLLER=y +# CONFIG_MEDIA_CONTROLLER_DVB is not set +CONFIG_VIDEO_DEV=m +# CONFIG_VIDEO_V4L2_SUBDEV_API is not set +CONFIG_VIDEO_V4L2=m +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +# CONFIG_VIDEO_PCI_SKELETON is not set +CONFIG_VIDEO_TUNER=m +CONFIG_V4L2_MEM2MEM_DEV=m +CONFIG_V4L2_FWNODE=m +CONFIG_VIDEOBUF_GEN=m +CONFIG_VIDEOBUF_DMA_SG=m +CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_DVB_CORE=m +# CONFIG_DVB_MMAP is not set +CONFIG_DVB_NET=y +CONFIG_TTPCI_EEPROM=m +CONFIG_DVB_MAX_ADAPTERS=16 +CONFIG_DVB_DYNAMIC_MINORS=y +# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set +# CONFIG_DVB_ULE_DEBUG is not set + +# +# Media drivers +# +CONFIG_MEDIA_USB_SUPPORT=y + +# +# Webcam devices +# +CONFIG_USB_VIDEO_CLASS=m +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +CONFIG_USB_GSPCA=m +CONFIG_USB_M5602=m +CONFIG_USB_STV06XX=m +CONFIG_USB_GL860=m +CONFIG_USB_GSPCA_BENQ=m +CONFIG_USB_GSPCA_CONEX=m +CONFIG_USB_GSPCA_CPIA1=m +CONFIG_USB_GSPCA_DTCS033=m +CONFIG_USB_GSPCA_ETOMS=m +CONFIG_USB_GSPCA_FINEPIX=m +CONFIG_USB_GSPCA_JEILINJ=m +CONFIG_USB_GSPCA_JL2005BCD=m +CONFIG_USB_GSPCA_KINECT=m +CONFIG_USB_GSPCA_KONICA=m +CONFIG_USB_GSPCA_MARS=m +CONFIG_USB_GSPCA_MR97310A=m +CONFIG_USB_GSPCA_NW80X=m +CONFIG_USB_GSPCA_OV519=m +CONFIG_USB_GSPCA_OV534=m +CONFIG_USB_GSPCA_OV534_9=m +CONFIG_USB_GSPCA_PAC207=m +CONFIG_USB_GSPCA_PAC7302=m +CONFIG_USB_GSPCA_PAC7311=m +CONFIG_USB_GSPCA_SE401=m +CONFIG_USB_GSPCA_SN9C2028=m +CONFIG_USB_GSPCA_SN9C20X=m +CONFIG_USB_GSPCA_SONIXB=m +CONFIG_USB_GSPCA_SONIXJ=m +CONFIG_USB_GSPCA_SPCA500=m +CONFIG_USB_GSPCA_SPCA501=m +CONFIG_USB_GSPCA_SPCA505=m +CONFIG_USB_GSPCA_SPCA506=m +CONFIG_USB_GSPCA_SPCA508=m +CONFIG_USB_GSPCA_SPCA561=m +CONFIG_USB_GSPCA_SPCA1528=m +CONFIG_USB_GSPCA_SQ905=m +CONFIG_USB_GSPCA_SQ905C=m +CONFIG_USB_GSPCA_SQ930X=m +CONFIG_USB_GSPCA_STK014=m +CONFIG_USB_GSPCA_STK1135=m +CONFIG_USB_GSPCA_STV0680=m +CONFIG_USB_GSPCA_SUNPLUS=m +CONFIG_USB_GSPCA_T613=m +CONFIG_USB_GSPCA_TOPRO=m +CONFIG_USB_GSPCA_TOUPTEK=m +CONFIG_USB_GSPCA_TV8532=m +CONFIG_USB_GSPCA_VC032X=m +CONFIG_USB_GSPCA_VICAM=m +CONFIG_USB_GSPCA_XIRLINK_CIT=m +CONFIG_USB_GSPCA_ZC3XX=m +CONFIG_USB_PWC=m +# CONFIG_USB_PWC_DEBUG is not set +CONFIG_USB_PWC_INPUT_EVDEV=y +CONFIG_VIDEO_CPIA2=m +CONFIG_USB_ZR364XX=m +CONFIG_USB_STKWEBCAM=m +CONFIG_USB_S2255=m +CONFIG_VIDEO_USBTV=m + +# +# Analog TV USB devices +# +CONFIG_VIDEO_PVRUSB2=m +CONFIG_VIDEO_PVRUSB2_SYSFS=y +CONFIG_VIDEO_PVRUSB2_DVB=y +# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set +CONFIG_VIDEO_HDPVR=m +CONFIG_VIDEO_USBVISION=m +CONFIG_VIDEO_STK1160_COMMON=m +CONFIG_VIDEO_STK1160=m +CONFIG_VIDEO_GO7007=m +CONFIG_VIDEO_GO7007_USB=m +CONFIG_VIDEO_GO7007_LOADER=m +CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m + +# +# Analog/digital TV USB devices +# +CONFIG_VIDEO_AU0828=m +CONFIG_VIDEO_AU0828_V4L2=y +CONFIG_VIDEO_AU0828_RC=y +CONFIG_VIDEO_CX231XX=m +CONFIG_VIDEO_CX231XX_RC=y +CONFIG_VIDEO_CX231XX_ALSA=m +CONFIG_VIDEO_CX231XX_DVB=m +# CONFIG_VIDEO_TM6000 is not set + +# +# Digital TV USB devices +# +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_DIB3000MC=m +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_DIBUSB_MB=m +CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIB0700=m +CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_CXUSB=m +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_VP7045=m +CONFIG_DVB_USB_VP702X=m +CONFIG_DVB_USB_GP8PSK=m +CONFIG_DVB_USB_NOVA_T_USB2=m +CONFIG_DVB_USB_TTUSB2=m +CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_USB_OPERA1=m +CONFIG_DVB_USB_AF9005=m +CONFIG_DVB_USB_AF9005_REMOTE=m +CONFIG_DVB_USB_PCTV452E=m +CONFIG_DVB_USB_DW2102=m +CONFIG_DVB_USB_CINERGY_T2=m +CONFIG_DVB_USB_DTV5100=m +CONFIG_DVB_USB_AZ6027=m +CONFIG_DVB_USB_TECHNISAT_USB2=m +CONFIG_DVB_USB_V2=m +CONFIG_DVB_USB_AF9015=m +CONFIG_DVB_USB_AF9035=m +CONFIG_DVB_USB_ANYSEE=m +CONFIG_DVB_USB_AU6610=m +CONFIG_DVB_USB_AZ6007=m +CONFIG_DVB_USB_CE6230=m +CONFIG_DVB_USB_EC168=m +CONFIG_DVB_USB_GL861=m +CONFIG_DVB_USB_LME2510=m +CONFIG_DVB_USB_MXL111SF=m +CONFIG_DVB_USB_RTL28XXU=m +CONFIG_DVB_USB_DVBSKY=m +# CONFIG_DVB_USB_ZD1301 is not set +CONFIG_DVB_TTUSB_BUDGET=m +CONFIG_DVB_TTUSB_DEC=m +CONFIG_SMS_USB_DRV=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set +CONFIG_DVB_AS102=m + +# +# Webcam, TV (analog/digital) USB devices +# +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_V4L2=m +CONFIG_VIDEO_EM28XX_ALSA=m +CONFIG_VIDEO_EM28XX_DVB=m +CONFIG_VIDEO_EM28XX_RC=m + +# +# Software defined radio USB devices +# +CONFIG_USB_AIRSPY=m +CONFIG_USB_HACKRF=m +CONFIG_USB_MSI2500=m + +# +# USB HDMI CEC adapters +# +CONFIG_USB_PULSE8_CEC=m +CONFIG_USB_RAINSHADOW_CEC=m +CONFIG_MEDIA_PCI_SUPPORT=y + +# +# Media capture support +# +CONFIG_VIDEO_SOLO6X10=m +CONFIG_VIDEO_TW5864=m +CONFIG_VIDEO_TW68=m +CONFIG_VIDEO_TW686X=m + +# +# Media capture/analog TV support +# +CONFIG_VIDEO_IVTV=m +# CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set +CONFIG_VIDEO_IVTV_ALSA=m +CONFIG_VIDEO_FB_IVTV=m +CONFIG_VIDEO_HEXIUM_GEMINI=m +CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_MXB=m +CONFIG_VIDEO_DT3155=m + +# +# Media capture/analog/hybrid TV support +# +CONFIG_VIDEO_CX18=m +CONFIG_VIDEO_CX18_ALSA=m +CONFIG_VIDEO_CX23885=m +CONFIG_MEDIA_ALTERA_CI=m +# CONFIG_VIDEO_CX25821 is not set +CONFIG_VIDEO_CX88=m +CONFIG_VIDEO_CX88_ALSA=m +CONFIG_VIDEO_CX88_BLACKBIRD=m +CONFIG_VIDEO_CX88_DVB=m +CONFIG_VIDEO_CX88_ENABLE_VP3054=y +CONFIG_VIDEO_CX88_VP3054=m +CONFIG_VIDEO_CX88_MPEG=m +CONFIG_VIDEO_BT848=m +CONFIG_DVB_BT8XX=m +CONFIG_VIDEO_SAA7134=m +CONFIG_VIDEO_SAA7134_ALSA=m +CONFIG_VIDEO_SAA7134_RC=y +CONFIG_VIDEO_SAA7134_DVB=m +# CONFIG_VIDEO_SAA7134_GO7007 is not set +CONFIG_VIDEO_SAA7164=m + +# +# Media digital TV PCI Adapters +# +CONFIG_DVB_AV7110_IR=y +CONFIG_DVB_AV7110=m +CONFIG_DVB_AV7110_OSD=y +CONFIG_DVB_BUDGET_CORE=m +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +CONFIG_DVB_BUDGET_AV=m +CONFIG_DVB_BUDGET_PATCH=m +CONFIG_DVB_B2C2_FLEXCOP_PCI=m +# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set +CONFIG_DVB_PLUTO2=m +CONFIG_DVB_DM1105=m +CONFIG_DVB_PT1=m +CONFIG_DVB_PT3=m +CONFIG_MANTIS_CORE=m +CONFIG_DVB_MANTIS=m +CONFIG_DVB_HOPPER=m +CONFIG_DVB_NGENE=m +CONFIG_DVB_DDBRIDGE=m +# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set +CONFIG_DVB_SMIPCIE=m +CONFIG_DVB_NETUP_UNIDVB=m +CONFIG_V4L_PLATFORM_DRIVERS=y +CONFIG_VIDEO_CAFE_CCIC=m +CONFIG_VIDEO_CADENCE=y +# CONFIG_SOC_CAMERA is not set +CONFIG_V4L_MEM2MEM_DRIVERS=y +# CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set +# CONFIG_VIDEO_SH_VEU is not set +# CONFIG_VIDEO_ROCKCHIP_RGA is not set +CONFIG_VIDEO_QCOM_VENUS=m +CONFIG_V4L_TEST_DRIVERS=y +CONFIG_VIDEO_VIVID=m +CONFIG_VIDEO_VIVID_CEC=y +CONFIG_VIDEO_VIVID_MAX_DEVS=64 +# CONFIG_VIDEO_VIM2M is not set +# CONFIG_DVB_PLATFORM_DRIVERS is not set +# CONFIG_CEC_PLATFORM_DRIVERS is not set +# CONFIG_SDR_PLATFORM_DRIVERS is not set + +# +# Supported MMC/SDIO adapters +# +CONFIG_SMS_SDIO_DRV=m +CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_TEA575X=m +CONFIG_RADIO_SI470X=m +CONFIG_USB_SI470X=m +# CONFIG_I2C_SI470X is not set +# CONFIG_RADIO_SI4713 is not set +CONFIG_USB_MR800=m +# CONFIG_USB_DSBR is not set +# CONFIG_RADIO_MAXIRADIO is not set +CONFIG_RADIO_SHARK=m +CONFIG_RADIO_SHARK2=m +CONFIG_USB_KEENE=m +CONFIG_USB_RAREMONO=m +CONFIG_USB_MA901=m +# CONFIG_RADIO_TEA5764 is not set +# CONFIG_RADIO_SAA7706H is not set +# CONFIG_RADIO_TEF6862 is not set +# CONFIG_RADIO_WL1273 is not set + +# +# Texas Instruments WL128x FM driver (ST based) +# +# CONFIG_RADIO_WL128X is not set + +# +# Supported FireWire (IEEE 1394) Adapters +# +CONFIG_DVB_FIREDTV=m +CONFIG_DVB_FIREDTV_INPUT=y +CONFIG_MEDIA_COMMON_OPTIONS=y + +# +# common driver options +# +CONFIG_VIDEO_CX2341X=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_CYPRESS_FIRMWARE=m +CONFIG_VIDEOBUF2_CORE=m +CONFIG_VIDEOBUF2_V4L2=m +CONFIG_VIDEOBUF2_MEMOPS=m +CONFIG_VIDEOBUF2_DMA_CONTIG=m +CONFIG_VIDEOBUF2_VMALLOC=m +CONFIG_VIDEOBUF2_DMA_SG=m +CONFIG_VIDEOBUF2_DVB=m +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_SMS_SIANO_MDTV=m +CONFIG_SMS_SIANO_RC=y +# CONFIG_SMS_SIANO_DEBUGFS is not set +CONFIG_VIDEO_V4L2_TPG=m + +# +# Media ancillary drivers (tuners, sensors, i2c, spi, frontends) +# +CONFIG_MEDIA_SUBDRV_AUTOSELECT=y +CONFIG_MEDIA_ATTACH=y +CONFIG_VIDEO_IR_I2C=m + +# +# Audio decoders, processors and mixers +# +CONFIG_VIDEO_TVAUDIO=m +CONFIG_VIDEO_TDA7432=m +CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TEA6415C=m +CONFIG_VIDEO_TEA6420=m +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_CS3308=m +CONFIG_VIDEO_CS5345=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_UDA1342=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_VP27SMPX=m +CONFIG_VIDEO_SONY_BTF_MPX=m + +# +# RDS decoders +# +CONFIG_VIDEO_SAA6588=m + +# +# Video decoders +# +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_TW2804=m +CONFIG_VIDEO_TW9903=m +CONFIG_VIDEO_TW9906=m + +# +# Video and audio decoders +# +CONFIG_VIDEO_SAA717X=m +CONFIG_VIDEO_CX25840=m + +# +# Video encoders +# +CONFIG_VIDEO_SAA7127=m + +# +# Camera sensor devices +# +CONFIG_VIDEO_OV2640=m +CONFIG_VIDEO_OV7640=m +CONFIG_VIDEO_OV7670=m +CONFIG_VIDEO_MT9V011=m + +# +# Flash devices +# + +# +# Video improvement chips +# +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m + +# +# Audio/Video compression chips +# +CONFIG_VIDEO_SAA6752HS=m + +# +# SDR tuner chips +# + +# +# Miscellaneous helper chips +# +CONFIG_VIDEO_M52790=m + +# +# Sensors used on soc_camera driver +# + +# +# Media SPI Adapters +# +CONFIG_CXD2880_SPI_DRV=m +CONFIG_MEDIA_TUNER=m +CONFIG_MEDIA_TUNER_SIMPLE=m +CONFIG_MEDIA_TUNER_TDA18250=m +CONFIG_MEDIA_TUNER_TDA8290=m +CONFIG_MEDIA_TUNER_TDA827X=m +CONFIG_MEDIA_TUNER_TDA18271=m +CONFIG_MEDIA_TUNER_TDA9887=m +CONFIG_MEDIA_TUNER_TEA5761=m +CONFIG_MEDIA_TUNER_TEA5767=m +CONFIG_MEDIA_TUNER_MSI001=m +CONFIG_MEDIA_TUNER_MT20XX=m +CONFIG_MEDIA_TUNER_MT2060=m +CONFIG_MEDIA_TUNER_MT2063=m +CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_MT2131=m +CONFIG_MEDIA_TUNER_QT1010=m +CONFIG_MEDIA_TUNER_XC2028=m +CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_XC4000=m +CONFIG_MEDIA_TUNER_MXL5005S=m +CONFIG_MEDIA_TUNER_MXL5007T=m +CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m +CONFIG_MEDIA_TUNER_TDA18218=m +CONFIG_MEDIA_TUNER_FC0011=m +CONFIG_MEDIA_TUNER_FC0012=m +CONFIG_MEDIA_TUNER_FC0013=m +CONFIG_MEDIA_TUNER_TDA18212=m +CONFIG_MEDIA_TUNER_E4000=m +CONFIG_MEDIA_TUNER_FC2580=m +CONFIG_MEDIA_TUNER_M88RS6000T=m +CONFIG_MEDIA_TUNER_TUA9001=m +CONFIG_MEDIA_TUNER_SI2157=m +CONFIG_MEDIA_TUNER_IT913X=m +CONFIG_MEDIA_TUNER_R820T=m +CONFIG_MEDIA_TUNER_MXL301RF=m +CONFIG_MEDIA_TUNER_QM1D1C0042=m +CONFIG_MEDIA_TUNER_QM1D1B0004=m + +# +# Multistandard (satellite) frontends +# +CONFIG_DVB_STB0899=m +CONFIG_DVB_STB6100=m +CONFIG_DVB_STV090x=m +CONFIG_DVB_STV0910=m +CONFIG_DVB_STV6110x=m +CONFIG_DVB_STV6111=m +CONFIG_DVB_MXL5XX=m +CONFIG_DVB_M88DS3103=m + +# +# Multistandard (cable + terrestrial) frontends +# +CONFIG_DVB_DRXK=m +CONFIG_DVB_TDA18271C2DD=m +CONFIG_DVB_SI2165=m +CONFIG_DVB_MN88472=m +CONFIG_DVB_MN88473=m + +# +# DVB-S (satellite) frontends +# +CONFIG_DVB_CX24110=m +CONFIG_DVB_CX24123=m +CONFIG_DVB_MT312=m +CONFIG_DVB_ZL10036=m +CONFIG_DVB_ZL10039=m +CONFIG_DVB_S5H1420=m +CONFIG_DVB_STV0288=m +CONFIG_DVB_STB6000=m +CONFIG_DVB_STV0299=m +CONFIG_DVB_STV6110=m +CONFIG_DVB_STV0900=m +CONFIG_DVB_TDA8083=m +CONFIG_DVB_TDA10086=m +CONFIG_DVB_TDA8261=m +CONFIG_DVB_VES1X93=m +CONFIG_DVB_TUNER_ITD1000=m +CONFIG_DVB_TUNER_CX24113=m +CONFIG_DVB_TDA826X=m +CONFIG_DVB_TUA6100=m +CONFIG_DVB_CX24116=m +CONFIG_DVB_CX24117=m +CONFIG_DVB_CX24120=m +CONFIG_DVB_SI21XX=m +CONFIG_DVB_TS2020=m +CONFIG_DVB_DS3000=m +CONFIG_DVB_MB86A16=m +CONFIG_DVB_TDA10071=m + +# +# DVB-T (terrestrial) frontends +# +CONFIG_DVB_SP8870=m +CONFIG_DVB_SP887X=m +CONFIG_DVB_CX22700=m +CONFIG_DVB_CX22702=m +CONFIG_DVB_DRXD=m +CONFIG_DVB_L64781=m +CONFIG_DVB_TDA1004X=m +CONFIG_DVB_NXT6000=m +CONFIG_DVB_MT352=m +CONFIG_DVB_ZL10353=m +CONFIG_DVB_DIB3000MB=m +CONFIG_DVB_DIB3000MC=m +CONFIG_DVB_DIB7000M=m +CONFIG_DVB_DIB7000P=m +CONFIG_DVB_TDA10048=m +CONFIG_DVB_AF9013=m +CONFIG_DVB_EC100=m +CONFIG_DVB_STV0367=m +CONFIG_DVB_CXD2820R=m +CONFIG_DVB_CXD2841ER=m +CONFIG_DVB_RTL2830=m +CONFIG_DVB_RTL2832=m +CONFIG_DVB_RTL2832_SDR=m +CONFIG_DVB_SI2168=m +CONFIG_DVB_AS102_FE=m +CONFIG_DVB_GP8PSK_FE=m + +# +# DVB-C (cable) frontends +# +CONFIG_DVB_VES1820=m +CONFIG_DVB_TDA10021=m +CONFIG_DVB_TDA10023=m +CONFIG_DVB_STV0297=m + +# +# ATSC (North American/Korean Terrestrial/Cable DTV) frontends +# +CONFIG_DVB_NXT200X=m +CONFIG_DVB_OR51211=m +CONFIG_DVB_OR51132=m +CONFIG_DVB_BCM3510=m +CONFIG_DVB_LGDT330X=m +CONFIG_DVB_LGDT3305=m +CONFIG_DVB_LGDT3306A=m +CONFIG_DVB_LG2160=m +CONFIG_DVB_S5H1409=m +CONFIG_DVB_AU8522=m +CONFIG_DVB_AU8522_DTV=m +CONFIG_DVB_AU8522_V4L=m +CONFIG_DVB_S5H1411=m + +# +# ISDB-T (terrestrial) frontends +# +CONFIG_DVB_S921=m +CONFIG_DVB_DIB8000=m +CONFIG_DVB_MB86A20S=m + +# +# ISDB-S (satellite) & ISDB-T (terrestrial) frontends +# +CONFIG_DVB_TC90522=m + +# +# Digital terrestrial only tuners/PLL +# +CONFIG_DVB_PLL=m +CONFIG_DVB_TUNER_DIB0070=m +CONFIG_DVB_TUNER_DIB0090=m + +# +# SEC control devices for DVB-S +# +CONFIG_DVB_DRX39XYJ=m +CONFIG_DVB_LNBH25=m +CONFIG_DVB_LNBP21=m +CONFIG_DVB_LNBP22=m +CONFIG_DVB_ISL6405=m +CONFIG_DVB_ISL6421=m +CONFIG_DVB_ISL6423=m +CONFIG_DVB_A8293=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m +CONFIG_DVB_TDA665x=m +CONFIG_DVB_IX2505V=m +CONFIG_DVB_M88RS2000=m +CONFIG_DVB_AF9033=m +CONFIG_DVB_HORUS3A=m +CONFIG_DVB_ASCOT2E=m +CONFIG_DVB_HELENE=m + +# +# Common Interface (EN50221) controller drivers +# +CONFIG_DVB_CXD2099=m +CONFIG_DVB_SP2=m + +# +# Tools to develop new frontends +# +CONFIG_DVB_DUMMY_FE=m + +# +# Graphics support +# +CONFIG_VGA_ARB=y +CONFIG_VGA_ARB_MAX_GPUS=16 +CONFIG_TEGRA_HOST1X=m +CONFIG_TEGRA_HOST1X_FIREWALL=y +CONFIG_DRM=m +CONFIG_DRM_MIPI_DSI=y +CONFIG_DRM_DP_AUX_CHARDEV=y +# CONFIG_DRM_DEBUG_SELFTEST is not set +CONFIG_DRM_KMS_HELPER=m +CONFIG_DRM_KMS_FB_HELPER=y +CONFIG_DRM_FBDEV_EMULATION=y +CONFIG_DRM_FBDEV_OVERALLOC=100 +CONFIG_DRM_LOAD_EDID_FIRMWARE=y +# CONFIG_DRM_DP_CEC is not set +CONFIG_DRM_TTM=m +CONFIG_DRM_GEM_CMA_HELPER=y +CONFIG_DRM_KMS_CMA_HELPER=y +CONFIG_DRM_VM=y +CONFIG_DRM_SCHED=m + +# +# I2C encoder or helper chips +# +# CONFIG_DRM_I2C_CH7006 is not set +# CONFIG_DRM_I2C_SIL164 is not set +# CONFIG_DRM_I2C_NXP_TDA998X is not set +# CONFIG_DRM_I2C_NXP_TDA9950 is not set +CONFIG_DRM_ARM=y +CONFIG_DRM_HDLCD=m +# CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set +CONFIG_DRM_MALI_DISPLAY=m +CONFIG_DRM_RADEON=m +# CONFIG_DRM_RADEON_USERPTR is not set +CONFIG_DRM_AMDGPU=m +CONFIG_DRM_AMDGPU_SI=y +CONFIG_DRM_AMDGPU_CIK=y +CONFIG_DRM_AMDGPU_USERPTR=y +# CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set + +# +# ACP (Audio CoProcessor) Configuration +# +# CONFIG_DRM_AMD_ACP is not set + +# +# Display Engine Configuration +# +CONFIG_DRM_AMD_DC=y +# CONFIG_DEBUG_KERNEL_DC is not set + +# +# AMD Library routines +# +CONFIG_CHASH=m +# CONFIG_CHASH_STATS is not set +# CONFIG_CHASH_SELFTEST is not set +CONFIG_DRM_NOUVEAU=m +CONFIG_NOUVEAU_PLATFORM_DRIVER=y +CONFIG_NOUVEAU_DEBUG=5 +CONFIG_NOUVEAU_DEBUG_DEFAULT=3 +# CONFIG_NOUVEAU_DEBUG_MMU is not set +CONFIG_DRM_NOUVEAU_BACKLIGHT=y +CONFIG_DRM_VGEM=m +# CONFIG_DRM_VKMS is not set +CONFIG_DRM_UDL=m +CONFIG_DRM_AST=m +# CONFIG_DRM_MGAG200 is not set +CONFIG_DRM_CIRRUS_QEMU=m +# CONFIG_DRM_RCAR_DW_HDMI is not set +# CONFIG_DRM_RCAR_LVDS is not set +# CONFIG_DRM_SUN4I is not set +CONFIG_DRM_QXL=m +CONFIG_DRM_BOCHS=m +CONFIG_DRM_VIRTIO_GPU=m +CONFIG_DRM_MSM=m +# CONFIG_DRM_MSM_REGISTER_LOGGING is not set +# CONFIG_DRM_MSM_GPU_SUDO is not set +CONFIG_DRM_MSM_HDMI_HDCP=y +CONFIG_DRM_MSM_DSI=y +CONFIG_DRM_MSM_DSI_PLL=y +CONFIG_DRM_MSM_DSI_28NM_PHY=y +CONFIG_DRM_MSM_DSI_20NM_PHY=y +CONFIG_DRM_MSM_DSI_28NM_8960_PHY=y +CONFIG_DRM_MSM_DSI_14NM_PHY=y +CONFIG_DRM_MSM_DSI_10NM_PHY=y +CONFIG_DRM_TEGRA=m +# CONFIG_DRM_TEGRA_DEBUG is not set +CONFIG_DRM_TEGRA_STAGING=y +CONFIG_DRM_PANEL=y + +# +# Display Panels +# +CONFIG_DRM_PANEL_ARM_VERSATILE=m +# CONFIG_DRM_PANEL_LVDS is not set +CONFIG_DRM_PANEL_SIMPLE=m +# CONFIG_DRM_PANEL_ILITEK_IL9322 is not set +# CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set +# CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set +# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set +# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set +# CONFIG_DRM_PANEL_LG_LG4573 is not set +# CONFIG_DRM_PANEL_ORISETECH_OTM8009A is not set +# CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set +# CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set +# CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set +# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set +# CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set +# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set +# CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set +# CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set +# CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set +# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set +CONFIG_DRM_BRIDGE=y +CONFIG_DRM_PANEL_BRIDGE=y + +# +# Display Interface Bridges +# +# CONFIG_DRM_ANALOGIX_ANX78XX is not set +CONFIG_DRM_CDNS_DSI=m +# CONFIG_DRM_DUMB_VGA_DAC is not set +# CONFIG_DRM_LVDS_ENCODER is not set +# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set +# CONFIG_DRM_NXP_PTN3460 is not set +# CONFIG_DRM_PARADE_PS8622 is not set +# CONFIG_DRM_SIL_SII8620 is not set +# CONFIG_DRM_SII902X is not set +# CONFIG_DRM_SII9234 is not set +# CONFIG_DRM_THINE_THC63LVD1024 is not set +# CONFIG_DRM_TOSHIBA_TC358767 is not set +# CONFIG_DRM_TI_TFP410 is not set +CONFIG_DRM_I2C_ADV7511=m +CONFIG_DRM_I2C_ADV7511_AUDIO=y +CONFIG_DRM_I2C_ADV7533=y +CONFIG_DRM_I2C_ADV7511_CEC=y +CONFIG_DRM_DW_HDMI=m +# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set +# CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set +# CONFIG_DRM_DW_HDMI_CEC is not set +CONFIG_DRM_VC4=m +# CONFIG_DRM_VC4_HDMI_CEC is not set +# CONFIG_DRM_ARCPGU is not set +CONFIG_DRM_HISI_HIBMC=m +CONFIG_DRM_HISI_KIRIN=m +CONFIG_HISI_KIRIN_DW_DSI=m +# CONFIG_DRM_MXSFB is not set +CONFIG_DRM_MESON=m +CONFIG_DRM_MESON_DW_HDMI=m +# CONFIG_DRM_TINYDRM is not set +# CONFIG_DRM_PL111 is not set +# CONFIG_DRM_XEN is not set +CONFIG_DRM_LEGACY=y +# CONFIG_DRM_TDFX is not set +# CONFIG_DRM_R128 is not set +# CONFIG_DRM_MGA is not set +CONFIG_DRM_VIA=m +CONFIG_DRM_SAVAGE=m +CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y + +# +# Frame buffer Devices +# +CONFIG_FB=y +CONFIG_FIRMWARE_EDID=y +CONFIG_FB_CMDLINE=y +CONFIG_FB_NOTIFY=y +CONFIG_FB_DDC=m +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +CONFIG_FB_SYS_FILLRECT=y +CONFIG_FB_SYS_COPYAREA=y +CONFIG_FB_SYS_IMAGEBLIT=y +# CONFIG_FB_FOREIGN_ENDIAN is not set +CONFIG_FB_SYS_FOPS=y +CONFIG_FB_DEFERRED_IO=y +CONFIG_FB_SVGALIB=m +CONFIG_FB_BACKLIGHT=y +CONFIG_FB_MODE_HELPERS=y +CONFIG_FB_TILEBLITTING=y + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_CIRRUS is not set +# CONFIG_FB_PM2 is not set +CONFIG_FB_ARMCLCD=y +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_ASILIANT is not set +# CONFIG_FB_IMSTT is not set +# CONFIG_FB_UVESA is not set +CONFIG_FB_EFI=y +# CONFIG_FB_OPENCORES is not set +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_NVIDIA is not set +# CONFIG_FB_RIVA is not set +# CONFIG_FB_I740 is not set +# CONFIG_FB_MATROX is not set +# CONFIG_FB_RADEON is not set +# CONFIG_FB_ATY128 is not set +# CONFIG_FB_ATY is not set +CONFIG_FB_S3=m +CONFIG_FB_S3_DDC=y +# CONFIG_FB_SAVAGE is not set +# CONFIG_FB_SIS is not set +# CONFIG_FB_NEOMAGIC is not set +# CONFIG_FB_KYRO is not set +CONFIG_FB_3DFX=m +# CONFIG_FB_3DFX_ACCEL is not set +CONFIG_FB_3DFX_I2C=y +# CONFIG_FB_VOODOO1 is not set +CONFIG_FB_VT8623=m +# CONFIG_FB_TRIDENT is not set +CONFIG_FB_ARK=m +CONFIG_FB_PM3=m +# CONFIG_FB_CARMINE is not set +CONFIG_FB_SMSCUFX=m +CONFIG_FB_UDL=m +# CONFIG_FB_IBM_GXT4500 is not set +# CONFIG_FB_VIRTUAL is not set +CONFIG_XEN_FBDEV_FRONTEND=y +# CONFIG_FB_METRONOME is not set +CONFIG_FB_MB862XX=m +CONFIG_FB_MB862XX_PCI_GDC=y +CONFIG_FB_MB862XX_I2C=y +# CONFIG_FB_BROADSHEET is not set +CONFIG_FB_SIMPLE=y +# CONFIG_FB_SSD1307 is not set +# CONFIG_FB_SM712 is not set +CONFIG_BACKLIGHT_LCD_SUPPORT=y +# CONFIG_LCD_CLASS_DEVICE is not set +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_BACKLIGHT_GENERIC=m +CONFIG_BACKLIGHT_PWM=m +# CONFIG_BACKLIGHT_PM8941_WLED is not set +# CONFIG_BACKLIGHT_ADP8860 is not set +# CONFIG_BACKLIGHT_ADP8870 is not set +# CONFIG_BACKLIGHT_LM3630A is not set +# CONFIG_BACKLIGHT_LM3639 is not set +CONFIG_BACKLIGHT_LP855X=m +# CONFIG_BACKLIGHT_GPIO is not set +# CONFIG_BACKLIGHT_LV5207LP is not set +# CONFIG_BACKLIGHT_BD6107 is not set +# CONFIG_BACKLIGHT_ARCXCNN is not set +CONFIG_VGASTATE=m +CONFIG_VIDEOMODE_HELPERS=y +CONFIG_HDMI=y + +# +# Console display driver support +# +CONFIG_DUMMY_CONSOLE=y +CONFIG_DUMMY_CONSOLE_COLUMNS=80 +CONFIG_DUMMY_CONSOLE_ROWS=25 +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set +# CONFIG_LOGO is not set +CONFIG_SOUND=m +CONFIG_SOUND_OSS_CORE=y +# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +CONFIG_SND_PCM_ELD=y +CONFIG_SND_PCM_IEC958=y +CONFIG_SND_DMAENGINE_PCM=m +CONFIG_SND_HWDEP=m +CONFIG_SND_SEQ_DEVICE=m +CONFIG_SND_RAWMIDI=m +CONFIG_SND_JACK=y +CONFIG_SND_JACK_INPUT_DEV=y +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y +CONFIG_SND_PCM_TIMER=y +CONFIG_SND_HRTIMER=m +CONFIG_SND_DYNAMIC_MINORS=y +CONFIG_SND_MAX_CARDS=32 +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_PROC_FS=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set +CONFIG_SND_VMASTER=y +CONFIG_SND_SEQUENCER=m +CONFIG_SND_SEQ_DUMMY=m +# CONFIG_SND_SEQUENCER_OSS is not set +CONFIG_SND_SEQ_HRTIMER_DEFAULT=y +CONFIG_SND_SEQ_MIDI_EVENT=m +CONFIG_SND_SEQ_MIDI=m +CONFIG_SND_SEQ_MIDI_EMUL=m +CONFIG_SND_MPU401_UART=m +CONFIG_SND_OPL3_LIB=m +CONFIG_SND_OPL3_LIB_SEQ=m +CONFIG_SND_AC97_CODEC=m +CONFIG_SND_DRIVERS=y +# CONFIG_SND_DUMMY is not set +CONFIG_SND_ALOOP=m +# CONFIG_SND_VIRMIDI is not set +# CONFIG_SND_MTPAV is not set +CONFIG_SND_MTS64=m +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set +CONFIG_SND_PORTMAN2X4=m +CONFIG_SND_AC97_POWER_SAVE=y +CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 +CONFIG_SND_PCI=y +CONFIG_SND_AD1889=m +# CONFIG_SND_ATIIXP is not set +# CONFIG_SND_ATIIXP_MODEM is not set +# CONFIG_SND_AU8810 is not set +# CONFIG_SND_AU8820 is not set +# CONFIG_SND_AU8830 is not set +# CONFIG_SND_AW2 is not set +# CONFIG_SND_BT87X is not set +# CONFIG_SND_CA0106 is not set +# CONFIG_SND_CMIPCI is not set +CONFIG_SND_OXYGEN_LIB=m +CONFIG_SND_OXYGEN=m +# CONFIG_SND_CS4281 is not set +# CONFIG_SND_CS46XX is not set +CONFIG_SND_CTXFI=m +CONFIG_SND_DARLA20=m +CONFIG_SND_GINA20=m +CONFIG_SND_LAYLA20=m +CONFIG_SND_DARLA24=m +CONFIG_SND_GINA24=m +CONFIG_SND_LAYLA24=m +CONFIG_SND_MONA=m +CONFIG_SND_MIA=m +CONFIG_SND_ECHO3G=m +CONFIG_SND_INDIGO=m +CONFIG_SND_INDIGOIO=m +CONFIG_SND_INDIGODJ=m +CONFIG_SND_INDIGOIOX=m +CONFIG_SND_INDIGODJX=m +# CONFIG_SND_ENS1370 is not set +# CONFIG_SND_ENS1371 is not set +# CONFIG_SND_FM801 is not set +# CONFIG_SND_HDSP is not set +CONFIG_SND_HDSPM=m +# CONFIG_SND_ICE1724 is not set +# CONFIG_SND_INTEL8X0 is not set +# CONFIG_SND_INTEL8X0M is not set +# CONFIG_SND_KORG1212 is not set +CONFIG_SND_LOLA=m +CONFIG_SND_LX6464ES=m +# CONFIG_SND_MIXART is not set +# CONFIG_SND_NM256 is not set +CONFIG_SND_PCXHR=m +CONFIG_SND_RIPTIDE=m +# CONFIG_SND_RME32 is not set +# CONFIG_SND_RME96 is not set +# CONFIG_SND_RME9652 is not set +# CONFIG_SND_VIA82XX is not set +# CONFIG_SND_VIA82XX_MODEM is not set +CONFIG_SND_VIRTUOSO=m +# CONFIG_SND_VX222 is not set +# CONFIG_SND_YMFPCI is not set + +# +# HD-Audio +# +CONFIG_SND_HDA=m +CONFIG_SND_HDA_INTEL=m +CONFIG_SND_HDA_TEGRA=m +CONFIG_SND_HDA_HWDEP=y +CONFIG_SND_HDA_RECONFIG=y +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_INPUT_BEEP_MODE=1 +CONFIG_SND_HDA_PATCH_LOADER=y +CONFIG_SND_HDA_CODEC_REALTEK=m +CONFIG_SND_HDA_CODEC_ANALOG=m +CONFIG_SND_HDA_CODEC_SIGMATEL=m +CONFIG_SND_HDA_CODEC_VIA=m +CONFIG_SND_HDA_CODEC_HDMI=m +CONFIG_SND_HDA_CODEC_CIRRUS=m +CONFIG_SND_HDA_CODEC_CONEXANT=m +CONFIG_SND_HDA_CODEC_CA0110=m +CONFIG_SND_HDA_CODEC_CA0132=m +CONFIG_SND_HDA_CODEC_CA0132_DSP=y +CONFIG_SND_HDA_CODEC_CMEDIA=m +CONFIG_SND_HDA_CODEC_SI3054=m +CONFIG_SND_HDA_GENERIC=m +CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 +CONFIG_SND_HDA_CORE=m +CONFIG_SND_HDA_DSP_LOADER=y +CONFIG_SND_HDA_PREALLOC_SIZE=2048 +CONFIG_SND_SPI=y +CONFIG_SND_USB=y +CONFIG_SND_USB_AUDIO=m +CONFIG_SND_USB_UA101=m +CONFIG_SND_USB_CAIAQ=m +CONFIG_SND_USB_CAIAQ_INPUT=y +CONFIG_SND_USB_6FIRE=m +CONFIG_SND_USB_HIFACE=m +CONFIG_SND_BCD2000=m +CONFIG_SND_USB_LINE6=m +CONFIG_SND_USB_POD=m +CONFIG_SND_USB_PODHD=m +CONFIG_SND_USB_TONEPORT=m +CONFIG_SND_USB_VARIAX=m +CONFIG_SND_FIREWIRE=y +CONFIG_SND_FIREWIRE_LIB=m +CONFIG_SND_DICE=m +CONFIG_SND_OXFW=m +CONFIG_SND_ISIGHT=m +CONFIG_SND_FIREWORKS=m +CONFIG_SND_BEBOB=m +CONFIG_SND_FIREWIRE_DIGI00X=m +CONFIG_SND_FIREWIRE_TASCAM=m +# CONFIG_SND_FIREWIRE_MOTU is not set +# CONFIG_SND_FIREFACE is not set +CONFIG_SND_SOC=m +CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y +# CONFIG_SND_SOC_AMD_ACP is not set +# CONFIG_SND_ATMEL_SOC is not set +CONFIG_SND_BCM2835_SOC_I2S=m +# CONFIG_SND_DESIGNWARE_I2S is not set + +# +# SoC Audio for Freescale CPUs +# + +# +# Common SoC Audio options for Freescale CPUs: +# +# CONFIG_SND_SOC_FSL_ASRC is not set +# CONFIG_SND_SOC_FSL_SAI is not set +# CONFIG_SND_SOC_FSL_SSI is not set +# CONFIG_SND_SOC_FSL_SPDIF is not set +# CONFIG_SND_SOC_FSL_ESAI is not set +# CONFIG_SND_SOC_IMX_AUDMUX is not set +CONFIG_SND_I2S_HI6210_I2S=m +# CONFIG_SND_KIRKWOOD_SOC is not set +# CONFIG_SND_SOC_IMG is not set + +# +# ASoC support for Amlogic platforms +# +# CONFIG_SND_MESON_AXG_FRDDR is not set +# CONFIG_SND_MESON_AXG_TODDR is not set +# CONFIG_SND_MESON_AXG_TDMIN is not set +# CONFIG_SND_MESON_AXG_TDMOUT is not set +# CONFIG_SND_MESON_AXG_SOUND_CARD is not set +# CONFIG_SND_MESON_AXG_SPDIFOUT is not set +CONFIG_SND_SOC_QCOM=m +CONFIG_SND_SOC_LPASS_CPU=m +CONFIG_SND_SOC_LPASS_PLATFORM=m +CONFIG_SND_SOC_LPASS_APQ8016=m +# CONFIG_SND_SOC_STORM is not set +CONFIG_SND_SOC_APQ8016_SBC=m +CONFIG_SND_SOC_QCOM_COMMON=m +CONFIG_SND_SOC_QDSP6_COMMON=m +CONFIG_SND_SOC_QDSP6_CORE=m +CONFIG_SND_SOC_QDSP6_AFE=m +CONFIG_SND_SOC_QDSP6_AFE_DAI=m +CONFIG_SND_SOC_QDSP6_ADM=m +CONFIG_SND_SOC_QDSP6_ROUTING=m +CONFIG_SND_SOC_QDSP6_ASM=m +CONFIG_SND_SOC_QDSP6_ASM_DAI=m +CONFIG_SND_SOC_QDSP6=m +CONFIG_SND_SOC_MSM8996=m +CONFIG_SND_SOC_SDM845=m +# CONFIG_SND_SOC_ROCKCHIP is not set + +# +# STMicroelectronics STM32 SOC audio support +# + +# +# Allwinner SoC Audio support +# +# CONFIG_SND_SUN4I_CODEC is not set +# CONFIG_SND_SUN8I_CODEC_ANALOG is not set +# CONFIG_SND_SUN4I_I2S is not set +# CONFIG_SND_SUN4I_SPDIF is not set +CONFIG_SND_SOC_TEGRA=m +# CONFIG_SND_SOC_TEGRA20_AC97 is not set +# CONFIG_SND_SOC_TEGRA20_DAS is not set +# CONFIG_SND_SOC_TEGRA20_I2S is not set +CONFIG_SND_SOC_TEGRA20_SPDIF=m +# CONFIG_SND_SOC_TEGRA30_AHUB is not set +# CONFIG_SND_SOC_TEGRA30_I2S is not set +CONFIG_SND_SOC_TEGRA_RT5640=m +CONFIG_SND_SOC_TEGRA_WM8753=m +CONFIG_SND_SOC_TEGRA_WM8903=m +# CONFIG_SND_SOC_TEGRA_WM9712 is not set +CONFIG_SND_SOC_TEGRA_TRIMSLICE=m +CONFIG_SND_SOC_TEGRA_ALC5632=m +CONFIG_SND_SOC_TEGRA_MAX98090=m +CONFIG_SND_SOC_TEGRA_RT5677=m +# CONFIG_SND_SOC_TEGRA_SGTL5000 is not set +# CONFIG_SND_SOC_XTFPGA_I2S is not set +# CONFIG_ZX_TDM is not set +CONFIG_SND_SOC_I2C_AND_SPI=m + +# +# CODEC drivers +# +# CONFIG_SND_SOC_AC97_CODEC is not set +# CONFIG_SND_SOC_ADAU1701 is not set +# CONFIG_SND_SOC_ADAU1761_I2C is not set +# CONFIG_SND_SOC_ADAU1761_SPI is not set +# CONFIG_SND_SOC_ADAU7002 is not set +# CONFIG_SND_SOC_AK4104 is not set +# CONFIG_SND_SOC_AK4458 is not set +# CONFIG_SND_SOC_AK4554 is not set +# CONFIG_SND_SOC_AK4613 is not set +# CONFIG_SND_SOC_AK4642 is not set +# CONFIG_SND_SOC_AK5386 is not set +# CONFIG_SND_SOC_AK5558 is not set +# CONFIG_SND_SOC_ALC5623 is not set +CONFIG_SND_SOC_ALC5632=m +# CONFIG_SND_SOC_BD28623 is not set +# CONFIG_SND_SOC_BT_SCO is not set +# CONFIG_SND_SOC_CS35L32 is not set +# CONFIG_SND_SOC_CS35L33 is not set +# CONFIG_SND_SOC_CS35L34 is not set +# CONFIG_SND_SOC_CS35L35 is not set +# CONFIG_SND_SOC_CS42L42 is not set +# CONFIG_SND_SOC_CS42L51_I2C is not set +# CONFIG_SND_SOC_CS42L52 is not set +# CONFIG_SND_SOC_CS42L56 is not set +# CONFIG_SND_SOC_CS42L73 is not set +# CONFIG_SND_SOC_CS4265 is not set +# CONFIG_SND_SOC_CS4270 is not set +# CONFIG_SND_SOC_CS4271_I2C is not set +# CONFIG_SND_SOC_CS4271_SPI is not set +# CONFIG_SND_SOC_CS42XX8_I2C is not set +# CONFIG_SND_SOC_CS43130 is not set +# CONFIG_SND_SOC_CS4349 is not set +# CONFIG_SND_SOC_CS53L30 is not set +CONFIG_SND_SOC_HDMI_CODEC=m +# CONFIG_SND_SOC_ES7134 is not set +# CONFIG_SND_SOC_ES7241 is not set +# CONFIG_SND_SOC_ES8316 is not set +# CONFIG_SND_SOC_ES8328_I2C is not set +# CONFIG_SND_SOC_ES8328_SPI is not set +# CONFIG_SND_SOC_GTM601 is not set +# CONFIG_SND_SOC_INNO_RK3036 is not set +CONFIG_SND_SOC_MAX98090=m +# CONFIG_SND_SOC_MAX98504 is not set +# CONFIG_SND_SOC_MAX9867 is not set +# CONFIG_SND_SOC_MAX98927 is not set +# CONFIG_SND_SOC_MAX98373 is not set +# CONFIG_SND_SOC_MAX9860 is not set +# CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set +# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set +# CONFIG_SND_SOC_PCM1681 is not set +# CONFIG_SND_SOC_PCM1789_I2C is not set +# CONFIG_SND_SOC_PCM179X_I2C is not set +# CONFIG_SND_SOC_PCM179X_SPI is not set +# CONFIG_SND_SOC_PCM186X_I2C is not set +# CONFIG_SND_SOC_PCM186X_SPI is not set +# CONFIG_SND_SOC_PCM3168A_I2C is not set +# CONFIG_SND_SOC_PCM3168A_SPI is not set +# CONFIG_SND_SOC_PCM512x_I2C is not set +# CONFIG_SND_SOC_PCM512x_SPI is not set +CONFIG_SND_SOC_RL6231=m +# CONFIG_SND_SOC_RT5616 is not set +# CONFIG_SND_SOC_RT5631 is not set +CONFIG_SND_SOC_RT5640=m +CONFIG_SND_SOC_RT5677=m +CONFIG_SND_SOC_RT5677_SPI=m +# CONFIG_SND_SOC_SGTL5000 is not set +# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set +# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set +# CONFIG_SND_SOC_SPDIF is not set +# CONFIG_SND_SOC_SSM2305 is not set +# CONFIG_SND_SOC_SSM2602_SPI is not set +# CONFIG_SND_SOC_SSM2602_I2C is not set +# CONFIG_SND_SOC_SSM4567 is not set +# CONFIG_SND_SOC_STA32X is not set +# CONFIG_SND_SOC_STA350 is not set +# CONFIG_SND_SOC_STI_SAS is not set +# CONFIG_SND_SOC_TAS2552 is not set +# CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TAS571X is not set +# CONFIG_SND_SOC_TAS5720 is not set +# CONFIG_SND_SOC_TAS6424 is not set +# CONFIG_SND_SOC_TDA7419 is not set +# CONFIG_SND_SOC_TFA9879 is not set +CONFIG_SND_SOC_TLV320AIC23=m +CONFIG_SND_SOC_TLV320AIC23_I2C=m +# CONFIG_SND_SOC_TLV320AIC23_SPI is not set +# CONFIG_SND_SOC_TLV320AIC31XX is not set +# CONFIG_SND_SOC_TLV320AIC32X4_I2C is not set +# CONFIG_SND_SOC_TLV320AIC32X4_SPI is not set +# CONFIG_SND_SOC_TLV320AIC3X is not set +# CONFIG_SND_SOC_TS3A227E is not set +# CONFIG_SND_SOC_TSCS42XX is not set +# CONFIG_SND_SOC_TSCS454 is not set +# CONFIG_SND_SOC_WM8510 is not set +# CONFIG_SND_SOC_WM8523 is not set +# CONFIG_SND_SOC_WM8524 is not set +# CONFIG_SND_SOC_WM8580 is not set +# CONFIG_SND_SOC_WM8711 is not set +# CONFIG_SND_SOC_WM8728 is not set +# CONFIG_SND_SOC_WM8731 is not set +# CONFIG_SND_SOC_WM8737 is not set +# CONFIG_SND_SOC_WM8741 is not set +# CONFIG_SND_SOC_WM8750 is not set +CONFIG_SND_SOC_WM8753=m +# CONFIG_SND_SOC_WM8770 is not set +# CONFIG_SND_SOC_WM8776 is not set +# CONFIG_SND_SOC_WM8782 is not set +# CONFIG_SND_SOC_WM8804_I2C is not set +# CONFIG_SND_SOC_WM8804_SPI is not set +CONFIG_SND_SOC_WM8903=m +# CONFIG_SND_SOC_WM8960 is not set +# CONFIG_SND_SOC_WM8962 is not set +# CONFIG_SND_SOC_WM8974 is not set +# CONFIG_SND_SOC_WM8978 is not set +# CONFIG_SND_SOC_WM8985 is not set +# CONFIG_SND_SOC_ZX_AUD96P22 is not set +# CONFIG_SND_SOC_MAX9759 is not set +# CONFIG_SND_SOC_MT6351 is not set +# CONFIG_SND_SOC_NAU8540 is not set +# CONFIG_SND_SOC_NAU8810 is not set +# CONFIG_SND_SOC_NAU8824 is not set +# CONFIG_SND_SOC_TPA6130A2 is not set +# CONFIG_SND_SIMPLE_CARD is not set +# CONFIG_SND_SIMPLE_SCU_CARD is not set +# CONFIG_SND_AUDIO_GRAPH_CARD is not set +# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set +# CONFIG_SND_XEN_FRONTEND is not set +CONFIG_AC97_BUS=m + +# +# HID support +# +CONFIG_HID=m +CONFIG_HID_BATTERY_STRENGTH=y +CONFIG_HIDRAW=y +CONFIG_UHID=m +CONFIG_HID_GENERIC=m + +# +# Special HID drivers +# +CONFIG_HID_A4TECH=m +# CONFIG_HID_ACCUTOUCH is not set +CONFIG_HID_ACRUX=m +CONFIG_HID_ACRUX_FF=y +CONFIG_HID_APPLE=m +# CONFIG_HID_APPLEIR is not set +CONFIG_HID_ASUS=m +CONFIG_HID_AUREAL=m +CONFIG_HID_BELKIN=m +CONFIG_HID_BETOP_FF=m +CONFIG_HID_CHERRY=m +CONFIG_HID_CHICONY=m +CONFIG_HID_CORSAIR=m +CONFIG_HID_COUGAR=m +CONFIG_HID_PRODIKEYS=m +CONFIG_HID_CMEDIA=m +CONFIG_HID_CP2112=m +CONFIG_HID_CYPRESS=m +CONFIG_HID_DRAGONRISE=m +CONFIG_DRAGONRISE_FF=y +CONFIG_HID_EMS_FF=m +# CONFIG_HID_ELAN is not set +CONFIG_HID_ELECOM=m +CONFIG_HID_ELO=m +CONFIG_HID_EZKEY=m +CONFIG_HID_GEMBIRD=m +# CONFIG_HID_GFRM is not set +CONFIG_HID_HOLTEK=m +CONFIG_HOLTEK_FF=y +# CONFIG_HID_GOOGLE_HAMMER is not set +# CONFIG_HID_GT683R is not set +CONFIG_HID_KEYTOUCH=m +CONFIG_HID_KYE=m +CONFIG_HID_UCLOGIC=m +CONFIG_HID_WALTOP=m +CONFIG_HID_GYRATION=m +CONFIG_HID_ICADE=m +# CONFIG_HID_ITE is not set +# CONFIG_HID_JABRA is not set +CONFIG_HID_TWINHAN=m +CONFIG_HID_KENSINGTON=m +CONFIG_HID_LCPOWER=m +CONFIG_HID_LED=m +CONFIG_HID_LENOVO=m +CONFIG_HID_LOGITECH=m +CONFIG_HID_LOGITECH_DJ=m +CONFIG_HID_LOGITECH_HIDPP=m +CONFIG_LOGITECH_FF=y +CONFIG_LOGIRUMBLEPAD2_FF=y +CONFIG_LOGIG940_FF=y +CONFIG_LOGIWHEELS_FF=y +CONFIG_HID_MAGICMOUSE=m +# CONFIG_HID_MAYFLASH is not set +# CONFIG_HID_REDRAGON is not set +CONFIG_HID_MICROSOFT=m +CONFIG_HID_MONTEREY=m +CONFIG_HID_MULTITOUCH=m +# CONFIG_HID_NTI is not set +CONFIG_HID_NTRIG=m +CONFIG_HID_ORTEK=m +CONFIG_HID_PANTHERLORD=m +CONFIG_PANTHERLORD_FF=y +CONFIG_HID_PENMOUNT=m +CONFIG_HID_PETALYNX=m +CONFIG_HID_PICOLCD=m +CONFIG_HID_PICOLCD_FB=y +CONFIG_HID_PICOLCD_BACKLIGHT=y +CONFIG_HID_PICOLCD_LEDS=y +CONFIG_HID_PICOLCD_CIR=y +CONFIG_HID_PLANTRONICS=m +CONFIG_HID_PRIMAX=m +# CONFIG_HID_RETRODE is not set +CONFIG_HID_ROCCAT=m +CONFIG_HID_SAITEK=m +CONFIG_HID_SAMSUNG=m +CONFIG_HID_SONY=m +CONFIG_SONY_FF=y +CONFIG_HID_SPEEDLINK=m +# CONFIG_HID_STEAM is not set +CONFIG_HID_STEELSERIES=m +CONFIG_HID_SUNPLUS=m +CONFIG_HID_RMI=m +CONFIG_HID_GREENASIA=m +CONFIG_GREENASIA_FF=y +CONFIG_HID_SMARTJOYPLUS=m +CONFIG_SMARTJOYPLUS_FF=y +CONFIG_HID_TIVO=m +CONFIG_HID_TOPSEED=m +CONFIG_HID_THINGM=m +CONFIG_HID_THRUSTMASTER=m +CONFIG_THRUSTMASTER_FF=y +# CONFIG_HID_UDRAW_PS3 is not set +CONFIG_HID_WACOM=m +CONFIG_HID_WIIMOTE=m +CONFIG_HID_XINMO=m +CONFIG_HID_ZEROPLUS=m +CONFIG_ZEROPLUS_FF=y +CONFIG_HID_ZYDACRON=m +CONFIG_HID_SENSOR_HUB=m +CONFIG_HID_SENSOR_CUSTOM_SENSOR=m +CONFIG_HID_ALPS=m + +# +# USB HID support +# +CONFIG_USB_HID=m +CONFIG_HID_PID=y +CONFIG_USB_HIDDEV=y + +# +# USB HID Boot Protocol drivers +# +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set + +# +# I2C HID support +# +# CONFIG_I2C_HID is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +CONFIG_USB_SUPPORT=y +CONFIG_USB_COMMON=y +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB=m +CONFIG_USB_PCI=y +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y + +# +# Miscellaneous USB options +# +CONFIG_USB_DEFAULT_PERSIST=y +CONFIG_USB_DYNAMIC_MINORS=y +# CONFIG_USB_OTG is not set +# CONFIG_USB_OTG_WHITELIST is not set +# CONFIG_USB_OTG_BLACKLIST_HUB is not set +CONFIG_USB_LEDS_TRIGGER_USBPORT=m +CONFIG_USB_MON=m +CONFIG_USB_WUSB=m +CONFIG_USB_WUSB_CBAF=m +# CONFIG_USB_WUSB_CBAF_DEBUG is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_C67X00_HCD is not set +CONFIG_USB_XHCI_HCD=m +# CONFIG_USB_XHCI_DBGCAP is not set +CONFIG_USB_XHCI_PCI=m +CONFIG_USB_XHCI_PLATFORM=m +CONFIG_USB_XHCI_HISTB=m +# CONFIG_USB_XHCI_MVEBU is not set +CONFIG_USB_XHCI_TEGRA=m +CONFIG_USB_EHCI_HCD=m +CONFIG_USB_EHCI_ROOT_HUB_TT=y +CONFIG_USB_EHCI_TT_NEWSCHED=y +CONFIG_USB_EHCI_PCI=m +CONFIG_USB_EHCI_HCD_ORION=m +CONFIG_USB_EHCI_TEGRA=m +CONFIG_USB_EHCI_HCD_PLATFORM=m +# CONFIG_USB_OXU210HP_HCD is not set +# CONFIG_USB_ISP116X_HCD is not set +# CONFIG_USB_FOTG210_HCD is not set +# CONFIG_USB_MAX3421_HCD is not set +CONFIG_USB_OHCI_HCD=m +CONFIG_USB_OHCI_HCD_PCI=m +# CONFIG_USB_OHCI_HCD_SSB is not set +CONFIG_USB_OHCI_HCD_PLATFORM=m +# CONFIG_USB_UHCI_HCD is not set +CONFIG_USB_U132_HCD=m +# CONFIG_USB_SL811_HCD is not set +# CONFIG_USB_R8A66597_HCD is not set +CONFIG_USB_WHCI_HCD=m +CONFIG_USB_HWA_HCD=m +# CONFIG_USB_HCD_BCMA is not set +# CONFIG_USB_HCD_SSB is not set +# CONFIG_USB_HCD_TEST_MODE is not set + +# +# USB Device Class drivers +# +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m +CONFIG_USB_WDM=m +CONFIG_USB_TMC=m + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may +# + +# +# also be needed; see USB_STORAGE Help for more info +# +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +CONFIG_USB_STORAGE_REALTEK=m +CONFIG_REALTEK_AUTOPM=y +CONFIG_USB_STORAGE_DATAFAB=m +CONFIG_USB_STORAGE_FREECOM=m +CONFIG_USB_STORAGE_ISD200=m +CONFIG_USB_STORAGE_USBAT=m +CONFIG_USB_STORAGE_SDDR09=m +CONFIG_USB_STORAGE_SDDR55=m +CONFIG_USB_STORAGE_JUMPSHOT=m +CONFIG_USB_STORAGE_ALAUDA=m +CONFIG_USB_STORAGE_ONETOUCH=m +CONFIG_USB_STORAGE_KARMA=m +CONFIG_USB_STORAGE_CYPRESS_ATACB=m +CONFIG_USB_STORAGE_ENE_UB6250=m +CONFIG_USB_UAS=m + +# +# USB Imaging devices +# +CONFIG_USB_MDC800=m +CONFIG_USB_MICROTEK=m +CONFIG_USBIP_CORE=m +CONFIG_USBIP_VHCI_HCD=m +CONFIG_USBIP_VHCI_HC_PORTS=15 +CONFIG_USBIP_VHCI_NR_HCS=8 +CONFIG_USBIP_HOST=m +CONFIG_USBIP_VUDC=m +# CONFIG_USBIP_DEBUG is not set +CONFIG_USB_MUSB_HDRC=m +# CONFIG_USB_MUSB_HOST is not set +# CONFIG_USB_MUSB_GADGET is not set +CONFIG_USB_MUSB_DUAL_ROLE=y + +# +# Platform Glue Layer +# +CONFIG_USB_MUSB_SUNXI=m + +# +# MUSB DMA mode +# +# CONFIG_MUSB_PIO_ONLY is not set +CONFIG_USB_DWC3=m +# CONFIG_USB_DWC3_ULPI is not set +# CONFIG_USB_DWC3_HOST is not set +# CONFIG_USB_DWC3_GADGET is not set +CONFIG_USB_DWC3_DUAL_ROLE=y + +# +# Platform Glue Driver Support +# +CONFIG_USB_DWC3_PCI=m +CONFIG_USB_DWC3_HAPS=m +CONFIG_USB_DWC3_OF_SIMPLE=m +CONFIG_USB_DWC3_QCOM=m +CONFIG_USB_DWC2=m +# CONFIG_USB_DWC2_HOST is not set + +# +# Gadget/Dual-role mode requires USB Gadget support to be enabled +# +# CONFIG_USB_DWC2_PERIPHERAL is not set +CONFIG_USB_DWC2_DUAL_ROLE=y +# CONFIG_USB_DWC2_PCI is not set +# CONFIG_USB_DWC2_DEBUG is not set +# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set +CONFIG_USB_CHIPIDEA=m +CONFIG_USB_CHIPIDEA_OF=m +CONFIG_USB_CHIPIDEA_PCI=m +CONFIG_USB_CHIPIDEA_UDC=y +CONFIG_USB_CHIPIDEA_HOST=y +CONFIG_USB_ISP1760=m +CONFIG_USB_ISP1760_HCD=y +CONFIG_USB_ISP1761_UDC=y +# CONFIG_USB_ISP1760_HOST_ROLE is not set +# CONFIG_USB_ISP1760_GADGET_ROLE is not set +CONFIG_USB_ISP1760_DUAL_ROLE=y + +# +# USB port drivers +# +# CONFIG_USB_USS720 is not set +CONFIG_USB_SERIAL=m +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_SIMPLE=m +CONFIG_USB_SERIAL_AIRCABLE=m +CONFIG_USB_SERIAL_ARK3116=m +CONFIG_USB_SERIAL_BELKIN=m +CONFIG_USB_SERIAL_CH341=m +CONFIG_USB_SERIAL_WHITEHEAT=m +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +CONFIG_USB_SERIAL_CP210X=m +CONFIG_USB_SERIAL_CYPRESS_M8=m +CONFIG_USB_SERIAL_EMPEG=m +CONFIG_USB_SERIAL_FTDI_SIO=m +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +CONFIG_USB_SERIAL_EDGEPORT_TI=m +CONFIG_USB_SERIAL_F81232=m +# CONFIG_USB_SERIAL_F8153X is not set +CONFIG_USB_SERIAL_GARMIN=m +CONFIG_USB_SERIAL_IPW=m +CONFIG_USB_SERIAL_IUU=m +CONFIG_USB_SERIAL_KEYSPAN_PDA=m +CONFIG_USB_SERIAL_KEYSPAN=m +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_KOBIL_SCT=m +CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_METRO=m +CONFIG_USB_SERIAL_MOS7720=m +CONFIG_USB_SERIAL_MOS7715_PARPORT=y +CONFIG_USB_SERIAL_MOS7840=m +CONFIG_USB_SERIAL_MXUPORT=m +CONFIG_USB_SERIAL_NAVMAN=m +CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_OTI6858=m +CONFIG_USB_SERIAL_QCAUX=m +CONFIG_USB_SERIAL_QUALCOMM=m +CONFIG_USB_SERIAL_SPCP8X5=m +CONFIG_USB_SERIAL_SAFE=m +# CONFIG_USB_SERIAL_SAFE_PADDED is not set +CONFIG_USB_SERIAL_SIERRAWIRELESS=m +CONFIG_USB_SERIAL_SYMBOL=m +CONFIG_USB_SERIAL_TI=m +CONFIG_USB_SERIAL_CYBERJACK=m +CONFIG_USB_SERIAL_XIRCOM=m +CONFIG_USB_SERIAL_WWAN=m +CONFIG_USB_SERIAL_OPTION=m +CONFIG_USB_SERIAL_OMNINET=m +CONFIG_USB_SERIAL_OPTICON=m +CONFIG_USB_SERIAL_XSENS_MT=m +CONFIG_USB_SERIAL_WISHBONE=m +CONFIG_USB_SERIAL_SSU100=m +CONFIG_USB_SERIAL_QT2=m +# CONFIG_USB_SERIAL_UPD78F0730 is not set +CONFIG_USB_SERIAL_DEBUG=m + +# +# USB Miscellaneous drivers +# +CONFIG_USB_EMI62=m +CONFIG_USB_EMI26=m +CONFIG_USB_ADUTUX=m +CONFIG_USB_SEVSEG=m +CONFIG_USB_RIO500=m +CONFIG_USB_LEGOTOWER=m +CONFIG_USB_LCD=m +CONFIG_USB_CYPRESS_CY7C63=m +CONFIG_USB_CYTHERM=m +CONFIG_USB_IDMOUSE=m +CONFIG_USB_FTDI_ELAN=m +CONFIG_USB_APPLEDISPLAY=m +CONFIG_USB_SISUSBVGA=m +CONFIG_USB_SISUSBVGA_CON=y +CONFIG_USB_LD=m +CONFIG_USB_TRANCEVIBRATOR=m +CONFIG_USB_IOWARRIOR=m +CONFIG_USB_TEST=m +CONFIG_USB_EHSET_TEST_FIXTURE=m +CONFIG_USB_ISIGHTFW=m +CONFIG_USB_YUREX=m +CONFIG_USB_EZUSB_FX2=m +# CONFIG_USB_HUB_USB251XB is not set +CONFIG_USB_HSIC_USB3503=m +# CONFIG_USB_HSIC_USB4604 is not set +# CONFIG_USB_LINK_LAYER_TEST is not set +CONFIG_USB_CHAOSKEY=m +# CONFIG_USB_ATM is not set + +# +# USB Physical Layer drivers +# +CONFIG_USB_PHY=y +CONFIG_NOP_USB_XCEIV=m +# CONFIG_USB_GPIO_VBUS is not set +# CONFIG_USB_ISP1301 is not set +CONFIG_USB_TEGRA_PHY=m +CONFIG_USB_ULPI=y +CONFIG_USB_ULPI_VIEWPORT=y +CONFIG_USB_GADGET=m +# CONFIG_USB_GADGET_DEBUG is not set +# CONFIG_USB_GADGET_DEBUG_FILES is not set +# CONFIG_USB_GADGET_DEBUG_FS is not set +CONFIG_USB_GADGET_VBUS_DRAW=2 +CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 +# CONFIG_U_SERIAL_CONSOLE is not set + +# +# USB Peripheral Controller +# +# CONFIG_USB_FOTG210_UDC is not set +# CONFIG_USB_GR_UDC is not set +# CONFIG_USB_R8A66597 is not set +# CONFIG_USB_PXA27X is not set +# CONFIG_USB_MV_UDC is not set +# CONFIG_USB_MV_U3D is not set +# CONFIG_USB_SNP_UDC_PLAT is not set +# CONFIG_USB_M66592 is not set +# CONFIG_USB_BDC_UDC is not set +# CONFIG_USB_AMD5536UDC is not set +# CONFIG_USB_NET2272 is not set +CONFIG_USB_NET2280=m +# CONFIG_USB_GOKU is not set +# CONFIG_USB_EG20T is not set +# CONFIG_USB_GADGET_XILINX is not set +# CONFIG_USB_DUMMY_HCD is not set +CONFIG_USB_LIBCOMPOSITE=m +CONFIG_USB_F_ACM=m +CONFIG_USB_F_SS_LB=m +CONFIG_USB_U_SERIAL=m +CONFIG_USB_U_ETHER=m +CONFIG_USB_U_AUDIO=m +CONFIG_USB_F_SERIAL=m +CONFIG_USB_F_OBEX=m +CONFIG_USB_F_NCM=m +CONFIG_USB_F_ECM=m +CONFIG_USB_F_PHONET=m +CONFIG_USB_F_EEM=m +CONFIG_USB_F_SUBSET=m +CONFIG_USB_F_RNDIS=m +CONFIG_USB_F_MASS_STORAGE=m +CONFIG_USB_F_FS=m +CONFIG_USB_F_UAC1=m +CONFIG_USB_F_UAC2=m +CONFIG_USB_F_UVC=m +CONFIG_USB_F_MIDI=m +CONFIG_USB_F_HID=m +CONFIG_USB_F_PRINTER=m +CONFIG_USB_CONFIGFS=m +CONFIG_USB_CONFIGFS_SERIAL=y +CONFIG_USB_CONFIGFS_ACM=y +CONFIG_USB_CONFIGFS_OBEX=y +CONFIG_USB_CONFIGFS_NCM=y +CONFIG_USB_CONFIGFS_ECM=y +CONFIG_USB_CONFIGFS_ECM_SUBSET=y +CONFIG_USB_CONFIGFS_RNDIS=y +CONFIG_USB_CONFIGFS_EEM=y +CONFIG_USB_CONFIGFS_PHONET=y +CONFIG_USB_CONFIGFS_MASS_STORAGE=y +CONFIG_USB_CONFIGFS_F_LB_SS=y +CONFIG_USB_CONFIGFS_F_FS=y +CONFIG_USB_CONFIGFS_F_UAC1=y +# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set +CONFIG_USB_CONFIGFS_F_UAC2=y +CONFIG_USB_CONFIGFS_F_MIDI=y +CONFIG_USB_CONFIGFS_F_HID=y +CONFIG_USB_CONFIGFS_F_UVC=y +CONFIG_USB_CONFIGFS_F_PRINTER=y +# CONFIG_USB_CONFIGFS_F_TCM is not set +# CONFIG_USB_ZERO is not set +# CONFIG_USB_AUDIO is not set +CONFIG_USB_ETH=m +CONFIG_USB_ETH_RNDIS=y +# CONFIG_USB_ETH_EEM is not set +# CONFIG_USB_G_NCM is not set +CONFIG_USB_GADGETFS=m +CONFIG_USB_FUNCTIONFS=m +CONFIG_USB_FUNCTIONFS_ETH=y +CONFIG_USB_FUNCTIONFS_RNDIS=y +CONFIG_USB_FUNCTIONFS_GENERIC=y +# CONFIG_USB_MASS_STORAGE is not set +# CONFIG_USB_GADGET_TARGET is not set +CONFIG_USB_G_SERIAL=m +# CONFIG_USB_MIDI_GADGET is not set +# CONFIG_USB_G_PRINTER is not set +# CONFIG_USB_CDC_COMPOSITE is not set +# CONFIG_USB_G_NOKIA is not set +# CONFIG_USB_G_ACM_MS is not set +# CONFIG_USB_G_MULTI is not set +# CONFIG_USB_G_HID is not set +# CONFIG_USB_G_DBGP is not set +# CONFIG_USB_G_WEBCAM is not set +# CONFIG_TYPEC is not set +CONFIG_USB_LED_TRIG=y +CONFIG_USB_ULPI_BUS=m +CONFIG_UWB=m +CONFIG_UWB_HWA=m +CONFIG_UWB_WHCI=m +CONFIG_UWB_I1480U=m +CONFIG_MMC=y +CONFIG_PWRSEQ_EMMC=y +# CONFIG_PWRSEQ_SD8787 is not set +CONFIG_PWRSEQ_SIMPLE=y +CONFIG_MMC_BLOCK=y +CONFIG_MMC_BLOCK_MINORS=256 +CONFIG_SDIO_UART=m +# CONFIG_MMC_TEST is not set + +# +# MMC/SD/SDIO Host Controller Drivers +# +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_ARMMMCI=m +CONFIG_MMC_QCOM_DML=y +CONFIG_MMC_SDHCI=m +CONFIG_MMC_SDHCI_IO_ACCESSORS=y +CONFIG_MMC_SDHCI_PCI=m +CONFIG_MMC_RICOH_MMC=y +CONFIG_MMC_SDHCI_ACPI=m +CONFIG_MMC_SDHCI_PLTFM=m +CONFIG_MMC_SDHCI_OF_ARASAN=m +# CONFIG_MMC_SDHCI_OF_AT91 is not set +# CONFIG_MMC_SDHCI_OF_DWCMSHC is not set +# CONFIG_MMC_SDHCI_CADENCE is not set +CONFIG_MMC_SDHCI_TEGRA=m +# CONFIG_MMC_SDHCI_PXAV3 is not set +CONFIG_MMC_SDHCI_F_SDH30=m +CONFIG_MMC_SDHCI_IPROC=m +CONFIG_MMC_MESON_GX=m +# CONFIG_MMC_MESON_MX_SDIO is not set +CONFIG_MMC_SDHCI_MSM=m +CONFIG_MMC_TIFM_SD=m +CONFIG_MMC_SPI=m +CONFIG_MMC_CB710=m +CONFIG_MMC_VIA_SDMMC=m +CONFIG_MMC_DW=m +CONFIG_MMC_DW_PLTFM=m +# CONFIG_MMC_DW_BLUEFIELD is not set +# CONFIG_MMC_DW_EXYNOS is not set +# CONFIG_MMC_DW_HI3798CV200 is not set +CONFIG_MMC_DW_K3=m +# CONFIG_MMC_DW_PCI is not set +CONFIG_MMC_DW_ROCKCHIP=m +CONFIG_MMC_VUB300=m +CONFIG_MMC_USHC=m +# CONFIG_MMC_USDHI6ROL0 is not set +CONFIG_MMC_REALTEK_PCI=m +CONFIG_MMC_REALTEK_USB=m +CONFIG_MMC_SUNXI=m +CONFIG_MMC_CQHCI=m +CONFIG_MMC_TOSHIBA_PCI=m +CONFIG_MMC_BCM2835=m +# CONFIG_MMC_MTK is not set +CONFIG_MMC_SDHCI_XENON=m +# CONFIG_MMC_SDHCI_OMAP is not set +CONFIG_MEMSTICK=m +# CONFIG_MEMSTICK_DEBUG is not set + +# +# MemoryStick drivers +# +# CONFIG_MEMSTICK_UNSAFE_RESUME is not set +CONFIG_MSPRO_BLOCK=m +# CONFIG_MS_BLOCK is not set + +# +# MemoryStick Host Controller Drivers +# +CONFIG_MEMSTICK_TIFM_MS=m +CONFIG_MEMSTICK_JMICRON_38X=m +CONFIG_MEMSTICK_R592=m +CONFIG_MEMSTICK_REALTEK_PCI=m +CONFIG_MEMSTICK_REALTEK_USB=m +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +# CONFIG_LEDS_CLASS_FLASH is not set +CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y + +# +# LED drivers +# +# CONFIG_LEDS_BCM6328 is not set +# CONFIG_LEDS_BCM6358 is not set +# CONFIG_LEDS_CR0014114 is not set +# CONFIG_LEDS_LM3530 is not set +# CONFIG_LEDS_LM3642 is not set +# CONFIG_LEDS_LM3692X is not set +# CONFIG_LEDS_PCA9532 is not set +CONFIG_LEDS_GPIO=m +CONFIG_LEDS_LP3944=m +# CONFIG_LEDS_LP3952 is not set +# CONFIG_LEDS_LP5521 is not set +# CONFIG_LEDS_LP5523 is not set +# CONFIG_LEDS_LP5562 is not set +# CONFIG_LEDS_LP8501 is not set +# CONFIG_LEDS_LP8860 is not set +CONFIG_LEDS_PCA955X=m +# CONFIG_LEDS_PCA955X_GPIO is not set +# CONFIG_LEDS_PCA963X is not set +CONFIG_LEDS_DAC124S085=m +CONFIG_LEDS_PWM=m +CONFIG_LEDS_REGULATOR=m +CONFIG_LEDS_BD2802=m +CONFIG_LEDS_LT3593=m +# CONFIG_LEDS_TCA6507 is not set +# CONFIG_LEDS_TLC591XX is not set +# CONFIG_LEDS_LM355x is not set +# CONFIG_LEDS_IS31FL319X is not set +# CONFIG_LEDS_IS31FL32XX is not set + +# +# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM) +# +# CONFIG_LEDS_BLINKM is not set +# CONFIG_LEDS_SYSCON is not set +# CONFIG_LEDS_MLXREG is not set +# CONFIG_LEDS_USER is not set + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=m +CONFIG_LEDS_TRIGGER_ONESHOT=m +CONFIG_LEDS_TRIGGER_DISK=y +CONFIG_LEDS_TRIGGER_MTD=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=m +CONFIG_LEDS_TRIGGER_BACKLIGHT=m +CONFIG_LEDS_TRIGGER_CPU=y +# CONFIG_LEDS_TRIGGER_ACTIVITY is not set +CONFIG_LEDS_TRIGGER_GPIO=m +CONFIG_LEDS_TRIGGER_DEFAULT_ON=m + +# +# iptables trigger is under Netfilter config (LED target) +# +CONFIG_LEDS_TRIGGER_TRANSIENT=m +CONFIG_LEDS_TRIGGER_CAMERA=m +CONFIG_LEDS_TRIGGER_PANIC=y +# CONFIG_LEDS_TRIGGER_NETDEV is not set +CONFIG_ACCESSIBILITY=y +CONFIG_A11Y_BRAILLE_CONSOLE=y +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +# CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI is not set +CONFIG_INFINIBAND_USER_MEM=y +CONFIG_INFINIBAND_ON_DEMAND_PAGING=y +CONFIG_INFINIBAND_ADDR_TRANS=y +CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y +CONFIG_INFINIBAND_MTHCA=m +CONFIG_INFINIBAND_MTHCA_DEBUG=y +CONFIG_INFINIBAND_QIB=m +CONFIG_INFINIBAND_CXGB3=m +CONFIG_INFINIBAND_CXGB4=m +CONFIG_INFINIBAND_I40IW=m +CONFIG_MLX4_INFINIBAND=m +CONFIG_MLX5_INFINIBAND=m +CONFIG_INFINIBAND_NES=m +# CONFIG_INFINIBAND_NES_DEBUG is not set +CONFIG_INFINIBAND_OCRDMA=m +# CONFIG_INFINIBAND_HNS is not set +CONFIG_INFINIBAND_IPOIB=m +CONFIG_INFINIBAND_IPOIB_CM=y +CONFIG_INFINIBAND_IPOIB_DEBUG=y +# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set +CONFIG_INFINIBAND_SRP=m +CONFIG_INFINIBAND_SRPT=m +CONFIG_INFINIBAND_ISER=m +CONFIG_INFINIBAND_ISERT=m +CONFIG_INFINIBAND_RDMAVT=m +CONFIG_RDMA_RXE=m +CONFIG_INFINIBAND_QEDR=m +# CONFIG_INFINIBAND_BNXT_RE is not set +CONFIG_EDAC_SUPPORT=y +CONFIG_EDAC=y +CONFIG_EDAC_LEGACY_SYSFS=y +# CONFIG_EDAC_DEBUG is not set +CONFIG_EDAC_THUNDERX=m +CONFIG_EDAC_XGENE=m +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +CONFIG_RTC_SYSTOHC=y +CONFIG_RTC_SYSTOHC_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set +CONFIG_RTC_NVMEM=y + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set +# CONFIG_RTC_DRV_TEST is not set + +# +# I2C RTC drivers +# +# CONFIG_RTC_DRV_ABB5ZES3 is not set +# CONFIG_RTC_DRV_ABX80X is not set +CONFIG_RTC_DRV_DS1307=y +# CONFIG_RTC_DRV_DS1307_CENTURY is not set +# CONFIG_RTC_DRV_DS1374 is not set +# CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_HYM8563 is not set +# CONFIG_RTC_DRV_MAX6900 is not set +CONFIG_RTC_DRV_MAX77686=y +CONFIG_RTC_DRV_RK808=m +# CONFIG_RTC_DRV_RS5C372 is not set +# CONFIG_RTC_DRV_ISL1208 is not set +# CONFIG_RTC_DRV_ISL12022 is not set +# CONFIG_RTC_DRV_ISL12026 is not set +# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_PCF8523 is not set +# CONFIG_RTC_DRV_PCF85063 is not set +# CONFIG_RTC_DRV_PCF85363 is not set +# CONFIG_RTC_DRV_PCF8563 is not set +# CONFIG_RTC_DRV_PCF8583 is not set +# CONFIG_RTC_DRV_M41T80 is not set +# CONFIG_RTC_DRV_BQ32K is not set +# CONFIG_RTC_DRV_S35390A is not set +# CONFIG_RTC_DRV_FM3130 is not set +# CONFIG_RTC_DRV_RX8010 is not set +# CONFIG_RTC_DRV_RX8581 is not set +# CONFIG_RTC_DRV_RX8025 is not set +# CONFIG_RTC_DRV_EM3027 is not set +# CONFIG_RTC_DRV_RV8803 is not set + +# +# SPI RTC drivers +# +# CONFIG_RTC_DRV_M41T93 is not set +# CONFIG_RTC_DRV_M41T94 is not set +# CONFIG_RTC_DRV_DS1302 is not set +# CONFIG_RTC_DRV_DS1305 is not set +# CONFIG_RTC_DRV_DS1343 is not set +# CONFIG_RTC_DRV_DS1347 is not set +# CONFIG_RTC_DRV_DS1390 is not set +# CONFIG_RTC_DRV_MAX6916 is not set +# CONFIG_RTC_DRV_R9701 is not set +# CONFIG_RTC_DRV_RX4581 is not set +# CONFIG_RTC_DRV_RX6110 is not set +# CONFIG_RTC_DRV_RS5C348 is not set +# CONFIG_RTC_DRV_MAX6902 is not set +# CONFIG_RTC_DRV_PCF2123 is not set +# CONFIG_RTC_DRV_MCP795 is not set +CONFIG_RTC_I2C_AND_SPI=y + +# +# SPI and I2C RTC drivers +# +# CONFIG_RTC_DRV_DS3232 is not set +# CONFIG_RTC_DRV_PCF2127 is not set +# CONFIG_RTC_DRV_RV3029C2 is not set + +# +# Platform RTC drivers +# +# CONFIG_RTC_DRV_DS1286 is not set +# CONFIG_RTC_DRV_DS1511 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_DS1685_FAMILY is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_DS2404 is not set +CONFIG_RTC_DRV_EFI=y +# CONFIG_RTC_DRV_STK17TA8 is not set +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_M48T35 is not set +# CONFIG_RTC_DRV_M48T59 is not set +# CONFIG_RTC_DRV_MSM6242 is not set +# CONFIG_RTC_DRV_BQ4802 is not set +# CONFIG_RTC_DRV_RP5C01 is not set +# CONFIG_RTC_DRV_V3020 is not set +# CONFIG_RTC_DRV_ZYNQMP is not set +# CONFIG_RTC_DRV_CROS_EC is not set + +# +# on-CPU RTC drivers +# +# CONFIG_RTC_DRV_PL030 is not set +CONFIG_RTC_DRV_PL031=y +CONFIG_RTC_DRV_SUN6I=y +CONFIG_RTC_DRV_MV=m +CONFIG_RTC_DRV_ARMADA38X=m +# CONFIG_RTC_DRV_FTRTC010 is not set +CONFIG_RTC_DRV_PM8XXX=m +CONFIG_RTC_DRV_TEGRA=y +# CONFIG_RTC_DRV_SNVS is not set +CONFIG_RTC_DRV_XGENE=y +# CONFIG_RTC_DRV_R7301 is not set + +# +# HID Sensor RTC drivers +# +# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set +CONFIG_DMADEVICES=y +# CONFIG_DMADEVICES_DEBUG is not set + +# +# DMA Devices +# +CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y +CONFIG_DMA_ENGINE=y +CONFIG_DMA_VIRTUAL_CHANNELS=y +CONFIG_DMA_ACPI=y +CONFIG_DMA_OF=y +# CONFIG_ALTERA_MSGDMA is not set +# CONFIG_AMBA_PL08X is not set +# CONFIG_BCM_SBA_RAID is not set +CONFIG_DMA_BCM2835=y +CONFIG_DMA_SUN6I=m +# CONFIG_DW_AXI_DMAC is not set +# CONFIG_FSL_EDMA is not set +# CONFIG_INTEL_IDMA64 is not set +CONFIG_K3_DMA=m +CONFIG_MV_XOR=y +CONFIG_MV_XOR_V2=y +CONFIG_PL330_DMA=m +CONFIG_TEGRA20_APB_DMA=y +CONFIG_TEGRA210_ADMA=y +CONFIG_XGENE_DMA=m +# CONFIG_XILINX_DMA is not set +# CONFIG_XILINX_ZYNQMP_DMA is not set +CONFIG_QCOM_BAM_DMA=m +CONFIG_QCOM_HIDMA_MGMT=m +CONFIG_QCOM_HIDMA=m +# CONFIG_DW_DMAC is not set +# CONFIG_DW_DMAC_PCI is not set + +# +# DMA Clients +# +CONFIG_ASYNC_TX_DMA=y +# CONFIG_DMATEST is not set +CONFIG_DMA_ENGINE_RAID=y + +# +# DMABUF options +# +CONFIG_SYNC_FILE=y +# CONFIG_SW_SYNC is not set +# CONFIG_AUXDISPLAY is not set +# CONFIG_PANEL is not set +CONFIG_UIO=m +CONFIG_UIO_CIF=m +# CONFIG_UIO_PDRV_GENIRQ is not set +# CONFIG_UIO_DMEM_GENIRQ is not set +CONFIG_UIO_AEC=m +CONFIG_UIO_SERCOS3=m +CONFIG_UIO_PCI_GENERIC=m +CONFIG_UIO_NETX=m +# CONFIG_UIO_PRUSS is not set +CONFIG_UIO_MF624=m +CONFIG_VFIO_IOMMU_TYPE1=m +CONFIG_VFIO_VIRQFD=m +CONFIG_VFIO=m +CONFIG_VFIO_NOIOMMU=y +CONFIG_VFIO_PCI=m +CONFIG_VFIO_PCI_MMAP=y +CONFIG_VFIO_PCI_INTX=y +# CONFIG_VFIO_PLATFORM is not set +# CONFIG_VFIO_MDEV is not set +CONFIG_VIRT_DRIVERS=y +CONFIG_VIRTIO=m +CONFIG_VIRTIO_MENU=y +CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_PCI_LEGACY=y +CONFIG_VIRTIO_BALLOON=m +CONFIG_VIRTIO_INPUT=m +CONFIG_VIRTIO_MMIO=m +# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set + +# +# Microsoft Hyper-V guest support +# + +# +# Xen driver support +# +CONFIG_XEN_BALLOON=y +CONFIG_XEN_SCRUB_PAGES_DEFAULT=y +CONFIG_XEN_DEV_EVTCHN=m +CONFIG_XEN_BACKEND=y +CONFIG_XENFS=m +CONFIG_XEN_COMPAT_XENFS=y +CONFIG_XEN_SYS_HYPERVISOR=y +CONFIG_XEN_XENBUS_FRONTEND=y +CONFIG_XEN_GNTDEV=m +CONFIG_XEN_GRANT_DEV_ALLOC=m +# CONFIG_XEN_GRANT_DMA_ALLOC is not set +CONFIG_SWIOTLB_XEN=y +# CONFIG_XEN_PVCALLS_FRONTEND is not set +# CONFIG_XEN_PVCALLS_BACKEND is not set +CONFIG_XEN_SCSI_BACKEND=m +CONFIG_XEN_PRIVCMD=m +CONFIG_XEN_EFI=y +CONFIG_XEN_AUTO_XLATE=y +CONFIG_STAGING=y +# CONFIG_PRISM2_USB is not set +# CONFIG_COMEDI is not set +# CONFIG_RTL8192U is not set +# CONFIG_RTLLIB is not set +CONFIG_RTL8723BS=m +CONFIG_R8712U=m +CONFIG_R8188EU=m +CONFIG_88EU_AP_MODE=y +# CONFIG_R8822BE is not set +# CONFIG_RTS5208 is not set +# CONFIG_VT6655 is not set +# CONFIG_VT6656 is not set + +# +# IIO staging drivers +# + +# +# Accelerometers +# +# CONFIG_ADIS16203 is not set +# CONFIG_ADIS16240 is not set + +# +# Analog to digital converters +# +# CONFIG_AD7606 is not set +# CONFIG_AD7780 is not set +# CONFIG_AD7816 is not set +# CONFIG_AD7192 is not set +# CONFIG_AD7280 is not set + +# +# Analog digital bi-direction converters +# +# CONFIG_ADT7316 is not set + +# +# Capacitance to digital converters +# +# CONFIG_AD7150 is not set +# CONFIG_AD7152 is not set +# CONFIG_AD7746 is not set + +# +# Direct Digital Synthesis +# +# CONFIG_AD9832 is not set +# CONFIG_AD9834 is not set + +# +# Network Analyzer, Impedance Converters +# +# CONFIG_AD5933 is not set + +# +# Active energy metering IC +# +# CONFIG_ADE7854 is not set + +# +# Resolver to digital converters +# +# CONFIG_AD2S90 is not set +# CONFIG_AD2S1210 is not set +# CONFIG_FB_SM750 is not set +# CONFIG_FB_XGI is not set + +# +# Speakup console speech +# +CONFIG_SPEAKUP=m +CONFIG_SPEAKUP_SYNTH_ACNTSA=m +CONFIG_SPEAKUP_SYNTH_APOLLO=m +CONFIG_SPEAKUP_SYNTH_AUDPTR=m +CONFIG_SPEAKUP_SYNTH_BNS=m +CONFIG_SPEAKUP_SYNTH_DECTLK=m +CONFIG_SPEAKUP_SYNTH_DECEXT=m +CONFIG_SPEAKUP_SYNTH_LTLK=m +CONFIG_SPEAKUP_SYNTH_SOFT=m +CONFIG_SPEAKUP_SYNTH_SPKOUT=m +CONFIG_SPEAKUP_SYNTH_TXPRT=m +CONFIG_SPEAKUP_SYNTH_DUMMY=m +# CONFIG_MFD_NVEC is not set +# CONFIG_STAGING_MEDIA is not set + +# +# Android +# +# CONFIG_STAGING_BOARD is not set +# CONFIG_LTE_GDM724X is not set +# CONFIG_FIREWIRE_SERIAL is not set +# CONFIG_DGNC is not set +# CONFIG_GS_FPGABOOT is not set +# CONFIG_UNISYSSPAR is not set +# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set +# CONFIG_FB_TFT is not set +# CONFIG_WILC1000_SDIO is not set +# CONFIG_WILC1000_SPI is not set +# CONFIG_MOST is not set +# CONFIG_KS7010 is not set +# CONFIG_GREYBUS is not set +CONFIG_BCM_VIDEOCORE=y +# CONFIG_BCM2835_VCHIQ is not set +# CONFIG_SND_BCM2835 is not set +# CONFIG_VIDEO_BCM2835 is not set +# CONFIG_PI433 is not set +CONFIG_MTK_MMC=m +# CONFIG_MTK_AEE_KDUMP is not set +# CONFIG_MTK_MMC_CD_POLL is not set + +# +# Gasket devices +# +# CONFIG_STAGING_GASKET_FRAMEWORK is not set +# CONFIG_XIL_AXIS_FIFO is not set +CONFIG_EROFS_FS=m +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS_XATTR=y +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +# CONFIG_EROFS_FS_USE_VM_MAP_RAM is not set +# CONFIG_EROFS_FAULT_INJECTION is not set +# CONFIG_EROFS_FS_ZIP is not set +# CONFIG_GOLDFISH is not set +CONFIG_CHROME_PLATFORMS=y +CONFIG_CHROMEOS_TBMC=m +CONFIG_CROS_EC_I2C=m +CONFIG_CROS_EC_SPI=m +CONFIG_CROS_EC_PROTO=y +CONFIG_CROS_KBD_LED_BACKLIGHT=m +CONFIG_CLKDEV_LOOKUP=y +CONFIG_HAVE_CLK_PREPARE=y +CONFIG_COMMON_CLK=y + +# +# Common Clock Framework +# +CONFIG_COMMON_CLK_VERSATILE=y +CONFIG_CLK_SP810=y +CONFIG_CLK_VEXPRESS_OSC=y +# CONFIG_CLK_HSDK is not set +# CONFIG_COMMON_CLK_MAX77686 is not set +CONFIG_COMMON_CLK_MAX9485=m +CONFIG_COMMON_CLK_RK808=m +CONFIG_COMMON_CLK_HI655X=m +CONFIG_COMMON_CLK_SCMI=m +# CONFIG_COMMON_CLK_SI5351 is not set +# CONFIG_COMMON_CLK_SI514 is not set +# CONFIG_COMMON_CLK_SI544 is not set +# CONFIG_COMMON_CLK_SI570 is not set +# CONFIG_COMMON_CLK_CDCE706 is not set +# CONFIG_COMMON_CLK_CDCE925 is not set +# CONFIG_COMMON_CLK_CS2000_CP is not set +# CONFIG_CLK_QORIQ is not set +CONFIG_COMMON_CLK_XGENE=y +# CONFIG_COMMON_CLK_PWM is not set +# CONFIG_COMMON_CLK_VC5 is not set +CONFIG_COMMON_CLK_HI3516CV300=y +CONFIG_COMMON_CLK_HI3519=y +CONFIG_COMMON_CLK_HI3660=y +CONFIG_COMMON_CLK_HI3798CV200=y +CONFIG_COMMON_CLK_HI6220=y +CONFIG_RESET_HISI=y +CONFIG_STUB_CLK_HI6220=y +# CONFIG_STUB_CLK_HI3660 is not set +CONFIG_COMMON_CLK_AMLOGIC=y +CONFIG_COMMON_CLK_AMLOGIC_AUDIO=y +CONFIG_COMMON_CLK_MESON_AO=y +CONFIG_COMMON_CLK_REGMAP_MESON=y +CONFIG_COMMON_CLK_GXBB=y +CONFIG_COMMON_CLK_AXG=y +CONFIG_COMMON_CLK_AXG_AUDIO=m +CONFIG_ARMADA_37XX_CLK=y +CONFIG_ARMADA_AP806_SYSCON=y +CONFIG_ARMADA_CP110_SYSCON=y +CONFIG_QCOM_GDSC=y +CONFIG_QCOM_RPMCC=y +CONFIG_COMMON_CLK_QCOM=y +CONFIG_QCOM_A53PLL=y +CONFIG_QCOM_CLK_APCS_MSM8916=m +CONFIG_QCOM_CLK_RPM=m +CONFIG_QCOM_CLK_SMD_RPM=m +# CONFIG_APQ_GCC_8084 is not set +# CONFIG_APQ_MMCC_8084 is not set +# CONFIG_IPQ_GCC_4019 is not set +# CONFIG_IPQ_GCC_806X is not set +# CONFIG_IPQ_LCC_806X is not set +# CONFIG_IPQ_GCC_8074 is not set +# CONFIG_MSM_GCC_8660 is not set +CONFIG_MSM_GCC_8916=y +# CONFIG_MSM_GCC_8960 is not set +# CONFIG_MSM_LCC_8960 is not set +# CONFIG_MDM_GCC_9615 is not set +# CONFIG_MDM_LCC_9615 is not set +# CONFIG_MSM_MMCC_8960 is not set +# CONFIG_MSM_GCC_8974 is not set +# CONFIG_MSM_MMCC_8974 is not set +# CONFIG_MSM_GCC_8994 is not set +CONFIG_MSM_GCC_8996=y +CONFIG_MSM_MMCC_8996=y +CONFIG_MSM_GCC_8998=m +CONFIG_SDM_GCC_845=m +CONFIG_SDM_VIDEOCC_845=m +CONFIG_SDM_DISPCC_845=m +# CONFIG_SPMI_PMIC_CLKDIV is not set +CONFIG_SUNXI_CCU=y +CONFIG_SUN50I_A64_CCU=y +CONFIG_SUN50I_H6_CCU=y +CONFIG_SUN50I_H6_R_CCU=y +# CONFIG_SUN8I_A83T_CCU is not set +CONFIG_SUN8I_H3_CCU=y +CONFIG_SUN8I_DE2_CCU=y +CONFIG_SUN8I_R_CCU=y +CONFIG_CLK_TEGRA_BPMP=y +# CONFIG_HWSPINLOCK is not set + +# +# Clock Source drivers +# +CONFIG_TIMER_OF=y +CONFIG_TIMER_ACPI=y +CONFIG_TIMER_PROBE=y +CONFIG_CLKSRC_MMIO=y +CONFIG_ROCKCHIP_TIMER=y +CONFIG_ARM_ARCH_TIMER=y +CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y +CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND=y +CONFIG_FSL_ERRATUM_A008585=y +CONFIG_HISILICON_ERRATUM_161010101=y +CONFIG_ARM64_ERRATUM_858921=y +CONFIG_ARM_TIMER_SP804=y +CONFIG_CLKSRC_VERSATILE=y +CONFIG_MAILBOX=y +# CONFIG_ARM_MHU is not set +# CONFIG_PLATFORM_MHU is not set +# CONFIG_PL320_MBOX is not set +# CONFIG_ROCKCHIP_MBOX is not set +CONFIG_PCC=y +# CONFIG_ALTERA_MBOX is not set +CONFIG_BCM2835_MBOX=y +# CONFIG_HI3660_MBOX is not set +CONFIG_HI6220_MBOX=y +# CONFIG_MAILBOX_TEST is not set +CONFIG_QCOM_APCS_IPC=m +CONFIG_TEGRA_HSP_MBOX=y +CONFIG_XGENE_SLIMPRO_MBOX=m +CONFIG_IOMMU_API=y +CONFIG_IOMMU_SUPPORT=y + +# +# Generic IOMMU Pagetable Support +# +CONFIG_IOMMU_IO_PGTABLE=y +CONFIG_IOMMU_IO_PGTABLE_LPAE=y +# CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set +# CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set +# CONFIG_IOMMU_DEBUGFS is not set +# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set +CONFIG_IOMMU_IOVA=y +CONFIG_OF_IOMMU=y +CONFIG_IOMMU_DMA=y +# CONFIG_ROCKCHIP_IOMMU is not set +CONFIG_TEGRA_IOMMU_SMMU=y +CONFIG_ARM_SMMU=y +CONFIG_ARM_SMMU_V3=y +CONFIG_QCOM_IOMMU=y + +# +# Remoteproc drivers +# +# CONFIG_REMOTEPROC is not set + +# +# Rpmsg drivers +# +CONFIG_RPMSG=m +# CONFIG_RPMSG_CHAR is not set +CONFIG_RPMSG_QCOM_GLINK_NATIVE=m +CONFIG_RPMSG_QCOM_GLINK_RPM=m +# CONFIG_RPMSG_VIRTIO is not set +# CONFIG_SOUNDWIRE is not set + +# +# SOC (System On Chip) specific Drivers +# + +# +# Amlogic SoC drivers +# +CONFIG_MESON_GX_SOCINFO=y +CONFIG_MESON_GX_PM_DOMAINS=y +CONFIG_MESON_MX_SOCINFO=y + +# +# Broadcom SoC drivers +# +CONFIG_RASPBERRYPI_POWER=y +# CONFIG_SOC_BRCMSTB is not set + +# +# NXP/Freescale QorIQ SoC drivers +# + +# +# i.MX SoC drivers +# + +# +# Qualcomm SoC drivers +# +# CONFIG_QCOM_COMMAND_DB is not set +CONFIG_QCOM_GENI_SE=m +CONFIG_QCOM_GSBI=m +CONFIG_QCOM_LLCC=m +CONFIG_QCOM_SDM845_LLCC=m +CONFIG_QCOM_MDT_LOADER=m +# CONFIG_QCOM_RMTFS_MEM is not set +# CONFIG_QCOM_RPMH is not set +CONFIG_QCOM_SMD_RPM=m +CONFIG_QCOM_WCNSS_CTRL=m +CONFIG_QCOM_APR=m +CONFIG_ROCKCHIP_GRF=y +CONFIG_ROCKCHIP_PM_DOMAINS=y +CONFIG_SUNXI_SRAM=y +CONFIG_ARCH_TEGRA_132_SOC=y +CONFIG_ARCH_TEGRA_210_SOC=y +# CONFIG_ARCH_TEGRA_186_SOC is not set +CONFIG_ARCH_TEGRA_194_SOC=y +CONFIG_SOC_TEGRA_FUSE=y +CONFIG_SOC_TEGRA_FLOWCTRL=y +CONFIG_SOC_TEGRA_PMC=y +CONFIG_SOC_TEGRA_POWERGATE_BPMP=y +# CONFIG_SOC_TI is not set + +# +# Xilinx SoC drivers +# +# CONFIG_XILINX_VCU is not set +CONFIG_PM_DEVFREQ=y + +# +# DEVFREQ Governors +# +CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m +# CONFIG_DEVFREQ_GOV_PERFORMANCE is not set +# CONFIG_DEVFREQ_GOV_POWERSAVE is not set +# CONFIG_DEVFREQ_GOV_USERSPACE is not set +# CONFIG_DEVFREQ_GOV_PASSIVE is not set + +# +# DEVFREQ Drivers +# +# CONFIG_ARM_RK3399_DMC_DEVFREQ is not set +# CONFIG_PM_DEVFREQ_EVENT is not set +CONFIG_EXTCON=y + +# +# Extcon Device Drivers +# +# CONFIG_EXTCON_ADC_JACK is not set +# CONFIG_EXTCON_GPIO is not set +# CONFIG_EXTCON_MAX3355 is not set +CONFIG_EXTCON_QCOM_SPMI_MISC=m +# CONFIG_EXTCON_RT8973A is not set +# CONFIG_EXTCON_SM5502 is not set +CONFIG_EXTCON_USB_GPIO=m +# CONFIG_EXTCON_USBC_CROS_EC is not set +CONFIG_MEMORY=y +# CONFIG_ARM_PL172_MPMC is not set +CONFIG_TEGRA_MC=y +CONFIG_IIO=m +CONFIG_IIO_BUFFER=y +# CONFIG_IIO_BUFFER_CB is not set +# CONFIG_IIO_BUFFER_HW_CONSUMER is not set +CONFIG_IIO_KFIFO_BUF=m +CONFIG_IIO_TRIGGERED_BUFFER=m +# CONFIG_IIO_CONFIGFS is not set +CONFIG_IIO_TRIGGER=y +CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 +# CONFIG_IIO_SW_DEVICE is not set +# CONFIG_IIO_SW_TRIGGER is not set + +# +# Accelerometers +# +# CONFIG_ADIS16201 is not set +# CONFIG_ADIS16209 is not set +# CONFIG_ADXL345_I2C is not set +# CONFIG_ADXL345_SPI is not set +# CONFIG_BMA180 is not set +# CONFIG_BMA220 is not set +# CONFIG_BMC150_ACCEL is not set +# CONFIG_DA280 is not set +# CONFIG_DA311 is not set +# CONFIG_DMARD06 is not set +# CONFIG_DMARD09 is not set +# CONFIG_DMARD10 is not set +CONFIG_HID_SENSOR_ACCEL_3D=m +# CONFIG_IIO_CROS_EC_ACCEL_LEGACY is not set +# CONFIG_IIO_ST_ACCEL_3AXIS is not set +# CONFIG_KXSD9 is not set +# CONFIG_KXCJK1013 is not set +# CONFIG_MC3230 is not set +# CONFIG_MMA7455_I2C is not set +# CONFIG_MMA7455_SPI is not set +# CONFIG_MMA7660 is not set +# CONFIG_MMA8452 is not set +# CONFIG_MMA9551 is not set +# CONFIG_MMA9553 is not set +# CONFIG_MXC4005 is not set +# CONFIG_MXC6255 is not set +# CONFIG_SCA3000 is not set +# CONFIG_STK8312 is not set +# CONFIG_STK8BA50 is not set + +# +# Analog to digital converters +# +# CONFIG_AD7266 is not set +# CONFIG_AD7291 is not set +# CONFIG_AD7298 is not set +# CONFIG_AD7476 is not set +# CONFIG_AD7766 is not set +# CONFIG_AD7791 is not set +# CONFIG_AD7793 is not set +# CONFIG_AD7887 is not set +# CONFIG_AD7923 is not set +# CONFIG_AD799X is not set +CONFIG_AXP20X_ADC=m +CONFIG_AXP288_ADC=m +# CONFIG_CC10001_ADC is not set +# CONFIG_ENVELOPE_DETECTOR is not set +# CONFIG_HI8435 is not set +# CONFIG_HX711 is not set +# CONFIG_INA2XX_ADC is not set +# CONFIG_LTC2471 is not set +# CONFIG_LTC2485 is not set +# CONFIG_LTC2497 is not set +# CONFIG_MAX1027 is not set +# CONFIG_MAX11100 is not set +# CONFIG_MAX1118 is not set +# CONFIG_MAX1363 is not set +# CONFIG_MAX9611 is not set +# CONFIG_MCP320X is not set +# CONFIG_MCP3422 is not set +CONFIG_MESON_SARADC=m +# CONFIG_NAU7802 is not set +CONFIG_QCOM_VADC_COMMON=m +CONFIG_QCOM_SPMI_IADC=m +CONFIG_QCOM_SPMI_VADC=m +# CONFIG_ROCKCHIP_SARADC is not set +# CONFIG_SD_ADC_MODULATOR is not set +# CONFIG_TI_ADC081C is not set +# CONFIG_TI_ADC0832 is not set +# CONFIG_TI_ADC084S021 is not set +# CONFIG_TI_ADC12138 is not set +# CONFIG_TI_ADC108S102 is not set +# CONFIG_TI_ADC128S052 is not set +# CONFIG_TI_ADC161S626 is not set +# CONFIG_TI_ADS1015 is not set +# CONFIG_TI_ADS7950 is not set +# CONFIG_TI_ADS8688 is not set +# CONFIG_TI_TLC4541 is not set +# CONFIG_VF610_ADC is not set +CONFIG_VIPERBOARD_ADC=m + +# +# Analog Front Ends +# +# CONFIG_IIO_RESCALE is not set + +# +# Amplifiers +# +# CONFIG_AD8366 is not set + +# +# Chemical Sensors +# +# CONFIG_ATLAS_PH_SENSOR is not set +# CONFIG_BME680 is not set +# CONFIG_CCS811 is not set +# CONFIG_IAQCORE is not set +# CONFIG_VZ89X is not set +# CONFIG_IIO_CROS_EC_SENSORS_CORE is not set + +# +# Hid Sensor IIO Common +# +CONFIG_HID_SENSOR_IIO_COMMON=m +CONFIG_HID_SENSOR_IIO_TRIGGER=m + +# +# SSP Sensor Common +# +# CONFIG_IIO_SSP_SENSORHUB is not set + +# +# Counters +# + +# +# Digital to analog converters +# +# CONFIG_AD5064 is not set +# CONFIG_AD5360 is not set +# CONFIG_AD5380 is not set +# CONFIG_AD5421 is not set +CONFIG_AD5446=m +# CONFIG_AD5449 is not set +# CONFIG_AD5592R is not set +# CONFIG_AD5593R is not set +# CONFIG_AD5504 is not set +# CONFIG_AD5624R_SPI is not set +# CONFIG_LTC2632 is not set +# CONFIG_AD5686_SPI is not set +# CONFIG_AD5696_I2C is not set +# CONFIG_AD5755 is not set +# CONFIG_AD5758 is not set +# CONFIG_AD5761 is not set +# CONFIG_AD5764 is not set +# CONFIG_AD5791 is not set +# CONFIG_AD7303 is not set +# CONFIG_AD8801 is not set +# CONFIG_DPOT_DAC is not set +# CONFIG_DS4424 is not set +# CONFIG_M62332 is not set +# CONFIG_MAX517 is not set +# CONFIG_MAX5821 is not set +# CONFIG_MCP4725 is not set +# CONFIG_MCP4922 is not set +# CONFIG_TI_DAC082S085 is not set +# CONFIG_TI_DAC5571 is not set +# CONFIG_VF610_DAC is not set + +# +# IIO dummy driver +# + +# +# Frequency Synthesizers DDS/PLL +# + +# +# Clock Generator/Distribution +# +# CONFIG_AD9523 is not set + +# +# Phase-Locked Loop (PLL) frequency synthesizers +# +# CONFIG_ADF4350 is not set + +# +# Digital gyroscope sensors +# +# CONFIG_ADIS16080 is not set +# CONFIG_ADIS16130 is not set +# CONFIG_ADIS16136 is not set +# CONFIG_ADIS16260 is not set +# CONFIG_ADXRS450 is not set +# CONFIG_BMG160 is not set +CONFIG_HID_SENSOR_GYRO_3D=m +# CONFIG_MPU3050_I2C is not set +# CONFIG_IIO_ST_GYRO_3AXIS is not set +# CONFIG_ITG3200 is not set + +# +# Health Sensors +# + +# +# Heart Rate Monitors +# +# CONFIG_AFE4403 is not set +# CONFIG_AFE4404 is not set +# CONFIG_MAX30100 is not set +# CONFIG_MAX30102 is not set + +# +# Humidity sensors +# +# CONFIG_AM2315 is not set +CONFIG_DHT11=m +# CONFIG_HDC100X is not set +# CONFIG_HID_SENSOR_HUMIDITY is not set +# CONFIG_HTS221 is not set +# CONFIG_HTU21 is not set +# CONFIG_SI7005 is not set +# CONFIG_SI7020 is not set + +# +# Inertial measurement units +# +# CONFIG_ADIS16400 is not set +# CONFIG_ADIS16480 is not set +# CONFIG_BMI160_I2C is not set +# CONFIG_BMI160_SPI is not set +# CONFIG_KMX61 is not set +# CONFIG_INV_MPU6050_I2C is not set +# CONFIG_INV_MPU6050_SPI is not set +# CONFIG_IIO_ST_LSM6DSX is not set + +# +# Light sensors +# +CONFIG_ACPI_ALS=m +# CONFIG_ADJD_S311 is not set +# CONFIG_AL3320A is not set +# CONFIG_APDS9300 is not set +# CONFIG_APDS9960 is not set +# CONFIG_BH1750 is not set +CONFIG_BH1780=m +# CONFIG_CM32181 is not set +# CONFIG_CM3232 is not set +# CONFIG_CM3323 is not set +# CONFIG_CM3605 is not set +# CONFIG_CM36651 is not set +# CONFIG_GP2AP020A00F is not set +# CONFIG_SENSORS_ISL29018 is not set +# CONFIG_SENSORS_ISL29028 is not set +# CONFIG_ISL29125 is not set +CONFIG_HID_SENSOR_ALS=m +CONFIG_HID_SENSOR_PROX=m +# CONFIG_JSA1212 is not set +# CONFIG_RPR0521 is not set +# CONFIG_LTR501 is not set +# CONFIG_LV0104CS is not set +# CONFIG_MAX44000 is not set +# CONFIG_OPT3001 is not set +# CONFIG_PA12203001 is not set +# CONFIG_SI1133 is not set +# CONFIG_SI1145 is not set +# CONFIG_STK3310 is not set +# CONFIG_ST_UVIS25 is not set +# CONFIG_TCS3414 is not set +# CONFIG_TCS3472 is not set +# CONFIG_SENSORS_TSL2563 is not set +# CONFIG_TSL2583 is not set +# CONFIG_TSL2772 is not set +# CONFIG_TSL4531 is not set +# CONFIG_US5182D is not set +# CONFIG_VCNL4000 is not set +# CONFIG_VEML6070 is not set +# CONFIG_VL6180 is not set +# CONFIG_ZOPT2201 is not set + +# +# Magnetometer sensors +# +# CONFIG_AK8974 is not set +# CONFIG_AK8975 is not set +# CONFIG_AK09911 is not set +# CONFIG_BMC150_MAGN_I2C is not set +# CONFIG_BMC150_MAGN_SPI is not set +# CONFIG_MAG3110 is not set +CONFIG_HID_SENSOR_MAGNETOMETER_3D=m +# CONFIG_MMC35240 is not set +# CONFIG_IIO_ST_MAGN_3AXIS is not set +# CONFIG_SENSORS_HMC5843_I2C is not set +# CONFIG_SENSORS_HMC5843_SPI is not set + +# +# Multiplexers +# +# CONFIG_IIO_MUX is not set + +# +# Inclinometer sensors +# +CONFIG_HID_SENSOR_INCLINOMETER_3D=m +CONFIG_HID_SENSOR_DEVICE_ROTATION=m + +# +# Triggers - standalone +# +# CONFIG_IIO_INTERRUPT_TRIGGER is not set +# CONFIG_IIO_SYSFS_TRIGGER is not set + +# +# Digital potentiometers +# +# CONFIG_AD5272 is not set +# CONFIG_DS1803 is not set +# CONFIG_MAX5481 is not set +# CONFIG_MAX5487 is not set +# CONFIG_MCP4018 is not set +# CONFIG_MCP4131 is not set +# CONFIG_MCP4531 is not set +# CONFIG_TPL0102 is not set + +# +# Digital potentiostats +# +# CONFIG_LMP91000 is not set + +# +# Pressure sensors +# +# CONFIG_ABP060MG is not set +# CONFIG_BMP280 is not set +CONFIG_HID_SENSOR_PRESS=m +# CONFIG_HP03 is not set +# CONFIG_MPL115_I2C is not set +# CONFIG_MPL115_SPI is not set +# CONFIG_MPL3115 is not set +# CONFIG_MS5611 is not set +# CONFIG_MS5637 is not set +# CONFIG_IIO_ST_PRESS is not set +# CONFIG_T5403 is not set +# CONFIG_HP206C is not set +# CONFIG_ZPA2326 is not set + +# +# Lightning sensors +# +# CONFIG_AS3935 is not set + +# +# Proximity and distance sensors +# +# CONFIG_ISL29501 is not set +# CONFIG_LIDAR_LITE_V2 is not set +# CONFIG_RFD77402 is not set +# CONFIG_SRF04 is not set +# CONFIG_SX9500 is not set +# CONFIG_SRF08 is not set + +# +# Resolver to digital converters +# +# CONFIG_AD2S1200 is not set + +# +# Temperature sensors +# +# CONFIG_MAXIM_THERMOCOUPLE is not set +# CONFIG_HID_SENSOR_TEMP is not set +# CONFIG_MLX90614 is not set +# CONFIG_MLX90632 is not set +# CONFIG_TMP006 is not set +# CONFIG_TMP007 is not set +# CONFIG_TSYS01 is not set +# CONFIG_TSYS02D is not set +# CONFIG_NTB is not set +# CONFIG_VME_BUS is not set +CONFIG_PWM=y +CONFIG_PWM_SYSFS=y +CONFIG_PWM_BCM2835=m +# CONFIG_PWM_CROS_EC is not set +# CONFIG_PWM_FSL_FTM is not set +# CONFIG_PWM_HIBVT is not set +CONFIG_PWM_MESON=m +# CONFIG_PWM_PCA9685 is not set +CONFIG_PWM_ROCKCHIP=m +CONFIG_PWM_SUN4I=m +CONFIG_PWM_TEGRA=m + +# +# IRQ chip support +# +CONFIG_IRQCHIP=y +CONFIG_ARM_GIC=y +CONFIG_ARM_GIC_MAX_NR=1 +CONFIG_ARM_GIC_V2M=y +CONFIG_ARM_GIC_V3=y +CONFIG_ARM_GIC_V3_ITS=y +CONFIG_ARM_GIC_V3_ITS_PCI=y +CONFIG_HISILICON_IRQ_MBIGEN=y +CONFIG_MVEBU_GICP=y +CONFIG_MVEBU_ICU=y +CONFIG_MVEBU_ODMI=y +CONFIG_MVEBU_PIC=y +CONFIG_PARTITION_PERCPU=y +CONFIG_QCOM_IRQ_COMBINER=y +CONFIG_MESON_IRQ_GPIO=y +# CONFIG_QCOM_PDC is not set +# CONFIG_IPACK_BUS is not set +CONFIG_ARCH_HAS_RESET_CONTROLLER=y +CONFIG_RESET_CONTROLLER=y +CONFIG_RESET_MESON=y +# CONFIG_RESET_MESON_AUDIO_ARB is not set +# CONFIG_RESET_QCOM_AOSS is not set +CONFIG_RESET_SIMPLE=y +CONFIG_RESET_SUNXI=y +# CONFIG_RESET_TI_SYSCON is not set +CONFIG_COMMON_RESET_HI3660=y +CONFIG_COMMON_RESET_HI6220=y +CONFIG_RESET_TEGRA_BPMP=y +# CONFIG_FMC is not set + +# +# PHY Subsystem +# +CONFIG_GENERIC_PHY=y +CONFIG_PHY_XGENE=m +CONFIG_PHY_SUN4I_USB=m +# CONFIG_PHY_SUN9I_USB is not set +CONFIG_PHY_MESON8B_USB2=m +CONFIG_PHY_MESON_GXL_USB2=y +CONFIG_PHY_MESON_GXL_USB3=y +# CONFIG_BCM_KONA_USB2_PHY is not set +CONFIG_PHY_HI6220_USB=m +# CONFIG_PHY_HISTB_COMBPHY is not set +# CONFIG_PHY_HISI_INNO_USB2 is not set +CONFIG_PHY_MVEBU_CP110_COMPHY=m +# CONFIG_PHY_PXA_28NM_HSIC is not set +# CONFIG_PHY_PXA_28NM_USB2 is not set +# CONFIG_PHY_CPCAP_USB is not set +# CONFIG_PHY_MAPPHONE_MDM6600 is not set +CONFIG_PHY_QCOM_APQ8064_SATA=m +CONFIG_PHY_QCOM_IPQ806X_SATA=m +CONFIG_PHY_QCOM_QMP=m +CONFIG_PHY_QCOM_QUSB2=m +CONFIG_PHY_QCOM_UFS=m +CONFIG_PHY_QCOM_USB_HS=m +CONFIG_PHY_QCOM_USB_HSIC=m +# CONFIG_PHY_ROCKCHIP_DP is not set +CONFIG_PHY_ROCKCHIP_EMMC=m +CONFIG_PHY_ROCKCHIP_INNO_USB2=m +CONFIG_PHY_ROCKCHIP_PCIE=m +# CONFIG_PHY_ROCKCHIP_TYPEC is not set +# CONFIG_PHY_ROCKCHIP_USB is not set +# CONFIG_PHY_SAMSUNG_USB2 is not set +CONFIG_PHY_TEGRA_XUSB=m +CONFIG_PHY_TUSB1210=m +# CONFIG_POWERCAP is not set +# CONFIG_MCB is not set + +# +# Performance monitor support +# +# CONFIG_ARM_CCI_PMU is not set +# CONFIG_ARM_CCN is not set +CONFIG_ARM_PMU=y +CONFIG_ARM_PMU_ACPI=y +# CONFIG_ARM_DSU_PMU is not set +# CONFIG_HISI_PMU is not set +# CONFIG_QCOM_L2_PMU is not set +# CONFIG_QCOM_L3_PMU is not set +# CONFIG_XGENE_PMU is not set +# CONFIG_ARM_SPE_PMU is not set +CONFIG_RAS=y + +# +# Android +# +# CONFIG_ANDROID is not set +CONFIG_LIBNVDIMM=y +CONFIG_BLK_DEV_PMEM=y +CONFIG_ND_BLK=y +CONFIG_ND_CLAIM=y +CONFIG_ND_BTT=y +CONFIG_BTT=y +CONFIG_OF_PMEM=y +CONFIG_DAX_DRIVER=y +CONFIG_DAX=y +CONFIG_DEV_DAX=m +CONFIG_NVMEM=y +CONFIG_QCOM_QFPROM=m +# CONFIG_ROCKCHIP_EFUSE is not set +CONFIG_NVMEM_SUNXI_SID=m +# CONFIG_MESON_EFUSE is not set +# CONFIG_MESON_MX_EFUSE is not set + +# +# HW tracing support +# +# CONFIG_STM is not set +# CONFIG_INTEL_TH is not set +# CONFIG_FPGA is not set +# CONFIG_FSI is not set +CONFIG_TEE=m + +# +# TEE drivers +# +CONFIG_OPTEE=m +CONFIG_OPTEE_SHM_NUM_PRIV_PAGES=1 +CONFIG_PM_OPP=y +# CONFIG_SIOX is not set +# CONFIG_SLIMBUS is not set + +# +# File systems +# +CONFIG_DCACHE_WORD_ACCESS=y +CONFIG_FS_IOMAP=y +# CONFIG_EXT2_FS is not set +# CONFIG_EXT3_FS is not set +CONFIG_EXT4_FS=m +CONFIG_EXT4_USE_FOR_EXT2=y +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y +CONFIG_EXT4_ENCRYPTION=y +CONFIG_EXT4_FS_ENCRYPTION=y +# CONFIG_EXT4_DEBUG is not set +CONFIG_JBD2=m +# CONFIG_JBD2_DEBUG is not set +CONFIG_FS_MBCACHE=m +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +CONFIG_REISERFS_FS_XATTR=y +CONFIG_REISERFS_FS_POSIX_ACL=y +CONFIG_REISERFS_FS_SECURITY=y +CONFIG_JFS_FS=m +CONFIG_JFS_POSIX_ACL=y +CONFIG_JFS_SECURITY=y +# CONFIG_JFS_DEBUG is not set +# CONFIG_JFS_STATISTICS is not set +CONFIG_XFS_FS=m +CONFIG_XFS_QUOTA=y +CONFIG_XFS_POSIX_ACL=y +CONFIG_XFS_RT=y +# CONFIG_XFS_ONLINE_SCRUB is not set +# CONFIG_XFS_WARN is not set +# CONFIG_XFS_DEBUG is not set +CONFIG_GFS2_FS=m +CONFIG_GFS2_FS_LOCKING_DLM=y +CONFIG_OCFS2_FS=m +CONFIG_OCFS2_FS_O2CB=m +CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m +CONFIG_OCFS2_FS_STATS=y +CONFIG_OCFS2_DEBUG_MASKLOG=y +# CONFIG_OCFS2_DEBUG_FS is not set +CONFIG_BTRFS_FS=m +CONFIG_BTRFS_FS_POSIX_ACL=y +# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set +# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set +# CONFIG_BTRFS_DEBUG is not set +# CONFIG_BTRFS_ASSERT is not set +# CONFIG_BTRFS_FS_REF_VERIFY is not set +CONFIG_NILFS2_FS=m +CONFIG_F2FS_FS=m +CONFIG_F2FS_STAT_FS=y +CONFIG_F2FS_FS_XATTR=y +CONFIG_F2FS_FS_POSIX_ACL=y +CONFIG_F2FS_FS_SECURITY=y +# CONFIG_F2FS_CHECK_FS is not set +CONFIG_F2FS_FS_ENCRYPTION=y +# CONFIG_F2FS_IO_TRACE is not set +# CONFIG_F2FS_FAULT_INJECTION is not set +CONFIG_FS_DAX=y +CONFIG_FS_POSIX_ACL=y +CONFIG_EXPORTFS=y +CONFIG_EXPORTFS_BLOCK_OPS=y +CONFIG_FILE_LOCKING=y +CONFIG_MANDATORY_FILE_LOCKING=y +CONFIG_FS_ENCRYPTION=m +CONFIG_FSNOTIFY=y +CONFIG_DNOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_FANOTIFY=y +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y +CONFIG_QUOTA=y +CONFIG_QUOTA_NETLINK_INTERFACE=y +CONFIG_PRINT_QUOTA_WARNING=y +# CONFIG_QUOTA_DEBUG is not set +CONFIG_QUOTA_TREE=m +CONFIG_QFMT_V1=m +CONFIG_QFMT_V2=m +CONFIG_QUOTACTL=y +CONFIG_AUTOFS4_FS=m +CONFIG_AUTOFS_FS=m +CONFIG_FUSE_FS=m +CONFIG_CUSE=m +CONFIG_OVERLAY_FS=m +# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set +CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y +# CONFIG_OVERLAY_FS_INDEX is not set +# CONFIG_OVERLAY_FS_XINO_AUTO is not set +# CONFIG_OVERLAY_FS_METACOPY is not set + +# +# Caches +# +CONFIG_FSCACHE=m +CONFIG_FSCACHE_STATS=y +# CONFIG_FSCACHE_HISTOGRAM is not set +# CONFIG_FSCACHE_DEBUG is not set +# CONFIG_FSCACHE_OBJECT_LIST is not set +CONFIG_CACHEFILES=m +# CONFIG_CACHEFILES_DEBUG is not set +# CONFIG_CACHEFILES_HISTOGRAM is not set + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=m + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=m +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=m +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="ascii" +CONFIG_FAT_DEFAULT_UTF8=y +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +# CONFIG_NTFS_RW is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_KCORE=y +CONFIG_PROC_VMCORE=y +# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_PROC_CHILDREN=y +CONFIG_KERNFS=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_TMPFS_XATTR=y +CONFIG_HUGETLBFS=y +CONFIG_HUGETLB_PAGE=y +CONFIG_MEMFD_CREATE=y +CONFIG_ARCH_HAS_GIGANTIC_PAGE=y +CONFIG_CONFIGFS_FS=m +CONFIG_EFIVAR_FS=m +CONFIG_MISC_FILESYSTEMS=y +# CONFIG_ORANGEFS_FS is not set +CONFIG_ADFS_FS=m +# CONFIG_ADFS_FS_RW is not set +CONFIG_AFFS_FS=m +CONFIG_ECRYPT_FS=m +CONFIG_ECRYPT_FS_MESSAGING=y +CONFIG_HFS_FS=m +CONFIG_HFSPLUS_FS=m +CONFIG_BEFS_FS=m +# CONFIG_BEFS_DEBUG is not set +CONFIG_BFS_FS=m +CONFIG_EFS_FS=m +CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +CONFIG_JFFS2_SUMMARY=y +CONFIG_JFFS2_FS_XATTR=y +CONFIG_JFFS2_FS_POSIX_ACL=y +CONFIG_JFFS2_FS_SECURITY=y +CONFIG_JFFS2_COMPRESSION_OPTIONS=y +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_LZO=y +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +# CONFIG_JFFS2_CMODE_NONE is not set +CONFIG_JFFS2_CMODE_PRIORITY=y +# CONFIG_JFFS2_CMODE_SIZE is not set +# CONFIG_JFFS2_CMODE_FAVOURLZO is not set +CONFIG_UBIFS_FS=m +CONFIG_UBIFS_FS_ADVANCED_COMPR=y +CONFIG_UBIFS_FS_LZO=y +CONFIG_UBIFS_FS_ZLIB=y +# CONFIG_UBIFS_ATIME_SUPPORT is not set +CONFIG_UBIFS_FS_XATTR=y +# CONFIG_UBIFS_FS_ENCRYPTION is not set +CONFIG_UBIFS_FS_SECURITY=y +# CONFIG_CRAMFS is not set +CONFIG_SQUASHFS=m +CONFIG_SQUASHFS_FILE_CACHE=y +# CONFIG_SQUASHFS_FILE_DIRECT is not set +CONFIG_SQUASHFS_DECOMP_SINGLE=y +# CONFIG_SQUASHFS_DECOMP_MULTI is not set +# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set +CONFIG_SQUASHFS_XATTR=y +CONFIG_SQUASHFS_ZLIB=y +CONFIG_SQUASHFS_LZ4=y +CONFIG_SQUASHFS_LZO=y +CONFIG_SQUASHFS_XZ=y +CONFIG_SQUASHFS_ZSTD=y +# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +CONFIG_VXFS_FS=m +CONFIG_MINIX_FS=m +CONFIG_OMFS_FS=m +CONFIG_HPFS_FS=m +CONFIG_QNX4FS_FS=m +CONFIG_QNX6FS_FS=m +# CONFIG_QNX6FS_DEBUG is not set +CONFIG_ROMFS_FS=m +# CONFIG_ROMFS_BACKED_BY_BLOCK is not set +# CONFIG_ROMFS_BACKED_BY_MTD is not set +CONFIG_ROMFS_BACKED_BY_BOTH=y +CONFIG_ROMFS_ON_BLOCK=y +CONFIG_ROMFS_ON_MTD=y +CONFIG_PSTORE=y +CONFIG_PSTORE_DEFLATE_COMPRESS=m +# CONFIG_PSTORE_LZO_COMPRESS is not set +# CONFIG_PSTORE_LZ4_COMPRESS is not set +# CONFIG_PSTORE_LZ4HC_COMPRESS is not set +# CONFIG_PSTORE_842_COMPRESS is not set +# CONFIG_PSTORE_ZSTD_COMPRESS is not set +CONFIG_PSTORE_COMPRESS=y +CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y +CONFIG_PSTORE_COMPRESS_DEFAULT="deflate" +# CONFIG_PSTORE_CONSOLE is not set +# CONFIG_PSTORE_PMSG is not set +# CONFIG_PSTORE_FTRACE is not set +CONFIG_PSTORE_RAM=m +CONFIG_SYSV_FS=m +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG is not set +CONFIG_EXOFS_FS=m +# CONFIG_EXOFS_DEBUG is not set +CONFIG_ORE=m +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=m +CONFIG_NFS_V2=m +CONFIG_NFS_V3=m +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=m +CONFIG_NFS_SWAP=y +CONFIG_NFS_V4_1=y +CONFIG_NFS_V4_2=y +CONFIG_PNFS_FILE_LAYOUT=m +CONFIG_PNFS_BLOCK=m +CONFIG_PNFS_FLEXFILE_LAYOUT=m +CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" +# CONFIG_NFS_V4_1_MIGRATION is not set +CONFIG_NFS_V4_SECURITY_LABEL=y +CONFIG_NFS_FSCACHE=y +# CONFIG_NFS_USE_LEGACY_DNS is not set +CONFIG_NFS_USE_KERNEL_DNS=y +CONFIG_NFS_DEBUG=y +CONFIG_NFSD=m +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3=y +CONFIG_NFSD_V3_ACL=y +CONFIG_NFSD_V4=y +CONFIG_NFSD_PNFS=y +CONFIG_NFSD_BLOCKLAYOUT=y +# CONFIG_NFSD_SCSILAYOUT is not set +# CONFIG_NFSD_FLEXFILELAYOUT is not set +CONFIG_NFSD_V4_SECURITY_LABEL=y +# CONFIG_NFSD_FAULT_INJECTION is not set +CONFIG_GRACE_PERIOD=m +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_NFS_ACL_SUPPORT=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=m +CONFIG_SUNRPC_GSS=m +CONFIG_SUNRPC_BACKCHANNEL=y +CONFIG_SUNRPC_SWAP=y +CONFIG_RPCSEC_GSS_KRB5=m +CONFIG_SUNRPC_DEBUG=y +CONFIG_SUNRPC_XPRT_RDMA=m +CONFIG_CEPH_FS=m +CONFIG_CEPH_FSCACHE=y +CONFIG_CEPH_FS_POSIX_ACL=y +CONFIG_CIFS=m +# CONFIG_CIFS_STATS2 is not set +CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y +CONFIG_CIFS_WEAK_PW_HASH=y +CONFIG_CIFS_UPCALL=y +CONFIG_CIFS_XATTR=y +CONFIG_CIFS_POSIX=y +CONFIG_CIFS_ACL=y +CONFIG_CIFS_DEBUG=y +# CONFIG_CIFS_DEBUG2 is not set +# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set +CONFIG_CIFS_DFS_UPCALL=y +# CONFIG_CIFS_SMB_DIRECT is not set +CONFIG_CIFS_FSCACHE=y +CONFIG_CODA_FS=m +CONFIG_AFS_FS=m +# CONFIG_AFS_DEBUG is not set +CONFIG_AFS_FSCACHE=y +CONFIG_9P_FS=m +CONFIG_9P_FSCACHE=y +CONFIG_9P_FS_POSIX_ACL=y +CONFIG_9P_FS_SECURITY=y +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="utf8" +CONFIG_NLS_CODEPAGE_437=m +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=m +CONFIG_NLS_ISO8859_1=m +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_MAC_ROMAN=m +CONFIG_NLS_MAC_CELTIC=m +CONFIG_NLS_MAC_CENTEURO=m +CONFIG_NLS_MAC_CROATIAN=m +CONFIG_NLS_MAC_CYRILLIC=m +CONFIG_NLS_MAC_GAELIC=m +CONFIG_NLS_MAC_GREEK=m +CONFIG_NLS_MAC_ICELAND=m +CONFIG_NLS_MAC_INUIT=m +CONFIG_NLS_MAC_ROMANIAN=m +CONFIG_NLS_MAC_TURKISH=m +CONFIG_NLS_UTF8=m +CONFIG_DLM=m +CONFIG_DLM_DEBUG=y + +# +# Security options +# +CONFIG_KEYS=y +CONFIG_KEYS_COMPAT=y +# CONFIG_PERSISTENT_KEYRINGS is not set +# CONFIG_BIG_KEYS is not set +# CONFIG_ENCRYPTED_KEYS is not set +# CONFIG_KEY_DH_OPERATIONS is not set +CONFIG_SECURITY_DMESG_RESTRICT=y +CONFIG_SECURITY=y +CONFIG_SECURITYFS=y +CONFIG_SECURITY_NETWORK=y +# CONFIG_SECURITY_INFINIBAND is not set +CONFIG_SECURITY_NETWORK_XFRM=y +CONFIG_SECURITY_PATH=y +CONFIG_LSM_MMAP_MIN_ADDR=32768 +CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y +CONFIG_HARDENED_USERCOPY=y +CONFIG_HARDENED_USERCOPY_FALLBACK=y +# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set +# CONFIG_FORTIFY_SOURCE is not set +# CONFIG_STATIC_USERMODEHELPER is not set +CONFIG_SECURITY_SELINUX=y +# CONFIG_SECURITY_SELINUX_BOOTPARAM is not set +# CONFIG_SECURITY_SELINUX_DISABLE is not set +CONFIG_SECURITY_SELINUX_DEVELOP=y +CONFIG_SECURITY_SELINUX_AVC_STATS=y +CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0 +# CONFIG_SECURITY_SMACK is not set +CONFIG_SECURITY_TOMOYO=y +CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048 +CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024 +# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set +CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init" +CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init" +CONFIG_SECURITY_APPARMOR=y +CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1 +CONFIG_SECURITY_APPARMOR_HASH=y +CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y +# CONFIG_SECURITY_APPARMOR_DEBUG is not set +# CONFIG_SECURITY_LOADPIN is not set +CONFIG_SECURITY_YAMA=y +CONFIG_INTEGRITY=y +CONFIG_INTEGRITY_SIGNATURE=y +CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y +CONFIG_INTEGRITY_TRUSTED_KEYRING=y +CONFIG_INTEGRITY_AUDIT=y +# CONFIG_IMA is not set +# CONFIG_EVM is not set +# CONFIG_DEFAULT_SECURITY_SELINUX is not set +# CONFIG_DEFAULT_SECURITY_TOMOYO is not set +CONFIG_DEFAULT_SECURITY_APPARMOR=y +# CONFIG_DEFAULT_SECURITY_DAC is not set +CONFIG_DEFAULT_SECURITY="apparmor" +CONFIG_XOR_BLOCKS=m +CONFIG_ASYNC_CORE=m +CONFIG_ASYNC_MEMCPY=m +CONFIG_ASYNC_XOR=m +CONFIG_ASYNC_PQ=m +CONFIG_ASYNC_RAID6_RECOV=m +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD=m +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_BLKCIPHER=m +CONFIG_CRYPTO_BLKCIPHER2=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG=m +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_RNG_DEFAULT=m +CONFIG_CRYPTO_AKCIPHER2=y +CONFIG_CRYPTO_AKCIPHER=y +CONFIG_CRYPTO_KPP2=y +CONFIG_CRYPTO_KPP=m +CONFIG_CRYPTO_ACOMP2=y +CONFIG_CRYPTO_RSA=y +CONFIG_CRYPTO_DH=m +CONFIG_CRYPTO_ECDH=m +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_USER=m +# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set +CONFIG_CRYPTO_GF128MUL=m +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_NULL2=y +CONFIG_CRYPTO_PCRYPT=m +CONFIG_CRYPTO_WORKQUEUE=y +CONFIG_CRYPTO_CRYPTD=m +# CONFIG_CRYPTO_MCRYPTD is not set +CONFIG_CRYPTO_AUTHENC=m +CONFIG_CRYPTO_TEST=m +CONFIG_CRYPTO_SIMD=m +CONFIG_CRYPTO_ENGINE=m + +# +# Authenticated Encryption with Associated Data +# +CONFIG_CRYPTO_CCM=m +CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_CHACHA20POLY1305=m +CONFIG_CRYPTO_AEGIS128=m +CONFIG_CRYPTO_AEGIS128L=m +CONFIG_CRYPTO_AEGIS256=m +CONFIG_CRYPTO_MORUS640=m +CONFIG_CRYPTO_MORUS1280=m +CONFIG_CRYPTO_SEQIV=m +CONFIG_CRYPTO_ECHAINIV=m + +# +# Block modes +# +CONFIG_CRYPTO_CBC=m +CONFIG_CRYPTO_CFB=m +CONFIG_CRYPTO_CTR=m +CONFIG_CRYPTO_CTS=m +CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_XTS=m +# CONFIG_CRYPTO_KEYWRAP is not set + +# +# Hash modes +# +CONFIG_CRYPTO_CMAC=m +CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_VMAC=m + +# +# Digest +# +CONFIG_CRYPTO_CRC32C=m +CONFIG_CRYPTO_CRC32=m +CONFIG_CRYPTO_CRCT10DIF=y +CONFIG_CRYPTO_GHASH=m +CONFIG_CRYPTO_POLY1305=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_RMD128=m +CONFIG_CRYPTO_RMD160=m +CONFIG_CRYPTO_RMD256=m +CONFIG_CRYPTO_RMD320=m +CONFIG_CRYPTO_SHA1=y +CONFIG_CRYPTO_SHA256=y +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_SHA3=m +# CONFIG_CRYPTO_SM3 is not set +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_WP512=m + +# +# Ciphers +# +CONFIG_CRYPTO_AES=y +# CONFIG_CRYPTO_AES_TI is not set +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_BLOWFISH_COMMON=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_CAST_COMMON=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_SALSA20=m +CONFIG_CRYPTO_CHACHA20=m +CONFIG_CRYPTO_SEED=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_SM4=m +CONFIG_CRYPTO_SPECK=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=m + +# +# Compression +# +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_LZO=y +# CONFIG_CRYPTO_842 is not set +CONFIG_CRYPTO_LZ4=m +CONFIG_CRYPTO_LZ4HC=m +CONFIG_CRYPTO_ZSTD=m + +# +# Random Number Generation +# +CONFIG_CRYPTO_ANSI_CPRNG=m +CONFIG_CRYPTO_DRBG_MENU=m +CONFIG_CRYPTO_DRBG_HMAC=y +# CONFIG_CRYPTO_DRBG_HASH is not set +# CONFIG_CRYPTO_DRBG_CTR is not set +CONFIG_CRYPTO_DRBG=m +CONFIG_CRYPTO_JITTERENTROPY=m +CONFIG_CRYPTO_USER_API=m +CONFIG_CRYPTO_USER_API_HASH=m +CONFIG_CRYPTO_USER_API_SKCIPHER=m +CONFIG_CRYPTO_USER_API_RNG=m +CONFIG_CRYPTO_USER_API_AEAD=m +CONFIG_CRYPTO_HASH_INFO=y +CONFIG_CRYPTO_HW=y +CONFIG_CRYPTO_DEV_MARVELL_CESA=m +# CONFIG_CRYPTO_DEV_CCP is not set +CONFIG_CRYPTO_DEV_CPT=m +CONFIG_CAVIUM_CPT=m +CONFIG_CRYPTO_DEV_NITROX=m +CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m +# CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set +CONFIG_CRYPTO_DEV_QCE=m +CONFIG_CRYPTO_DEV_QCOM_RNG=m +# CONFIG_CRYPTO_DEV_ROCKCHIP is not set +CONFIG_CRYPTO_DEV_CHELSIO=m +# CONFIG_CHELSIO_IPSEC_INLINE is not set +CONFIG_CRYPTO_DEV_VIRTIO=m +CONFIG_CRYPTO_DEV_SAFEXCEL=m +# CONFIG_CRYPTO_DEV_CCREE is not set +CONFIG_CRYPTO_DEV_HISI_SEC=m +CONFIG_ASYMMETRIC_KEY_TYPE=y +CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y +CONFIG_X509_CERTIFICATE_PARSER=y +CONFIG_PKCS7_MESSAGE_PARSER=y +# CONFIG_PKCS7_TEST_KEY is not set +# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set + +# +# Certificates for signature checking +# +CONFIG_SYSTEM_TRUSTED_KEYRING=y +CONFIG_SYSTEM_TRUSTED_KEYS="" +# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set +# CONFIG_SECONDARY_TRUSTED_KEYRING is not set +# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set +CONFIG_BINARY_PRINTF=y + +# +# Library routines +# +CONFIG_RAID6_PQ=m +CONFIG_BITREVERSE=y +CONFIG_HAVE_ARCH_BITREVERSE=y +CONFIG_RATIONAL=y +CONFIG_GENERIC_STRNCPY_FROM_USER=y +CONFIG_GENERIC_STRNLEN_USER=y +CONFIG_GENERIC_NET_UTILS=y +CONFIG_GENERIC_PCI_IOMAP=y +CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y +CONFIG_ARCH_HAS_FAST_MULTIPLIER=y +# CONFIG_INDIRECT_PIO is not set +CONFIG_CRC_CCITT=m +CONFIG_CRC16=m +CONFIG_CRC_T10DIF=y +CONFIG_CRC_ITU_T=m +CONFIG_CRC32=y +# CONFIG_CRC32_SELFTEST is not set +CONFIG_CRC32_SLICEBY8=y +# CONFIG_CRC32_SLICEBY4 is not set +# CONFIG_CRC32_SARWATE is not set +# CONFIG_CRC32_BIT is not set +CONFIG_CRC64=m +# CONFIG_CRC4 is not set +CONFIG_CRC7=m +CONFIG_LIBCRC32C=m +CONFIG_CRC8=m +CONFIG_XXHASH=m +CONFIG_AUDIT_GENERIC=y +CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y +CONFIG_AUDIT_COMPAT_GENERIC=y +# CONFIG_RANDOM32_SELFTEST is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=m +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y +CONFIG_LZ4_COMPRESS=m +CONFIG_LZ4HC_COMPRESS=m +CONFIG_LZ4_DECOMPRESS=y +CONFIG_ZSTD_COMPRESS=m +CONFIG_ZSTD_DECOMPRESS=m +CONFIG_XZ_DEC=y +# CONFIG_XZ_DEC_X86 is not set +# CONFIG_XZ_DEC_POWERPC is not set +# CONFIG_XZ_DEC_IA64 is not set +# CONFIG_XZ_DEC_ARM is not set +# CONFIG_XZ_DEC_ARMTHUMB is not set +# CONFIG_XZ_DEC_SPARC is not set +# CONFIG_XZ_DEC_TEST is not set +CONFIG_DECOMPRESS_GZIP=y +CONFIG_DECOMPRESS_BZIP2=y +CONFIG_DECOMPRESS_LZMA=y +CONFIG_DECOMPRESS_XZ=y +CONFIG_DECOMPRESS_LZO=y +CONFIG_DECOMPRESS_LZ4=y +CONFIG_GENERIC_ALLOCATOR=y +CONFIG_REED_SOLOMON=m +CONFIG_REED_SOLOMON_ENC8=y +CONFIG_REED_SOLOMON_DEC8=y +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m +CONFIG_BTREE=y +CONFIG_INTERVAL_TREE=y +CONFIG_RADIX_TREE_MULTIORDER=y +CONFIG_ASSOCIATIVE_ARRAY=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT_MAP=y +CONFIG_HAS_DMA=y +CONFIG_NEED_SG_DMA_LENGTH=y +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_ARCH_DMA_ADDR_T_64BIT=y +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_DMA_DIRECT_OPS=y +CONFIG_DMA_VIRT_OPS=y +CONFIG_SWIOTLB=y +CONFIG_SGL_ALLOC=y +CONFIG_CHECK_SIGNATURE=y +CONFIG_CPU_RMAP=y +CONFIG_DQL=y +CONFIG_GLOB=y +# CONFIG_GLOB_SELFTEST is not set +CONFIG_NLATTR=y +CONFIG_LRU_CACHE=m +CONFIG_CLZ_TAB=y +CONFIG_CORDIC=m +# CONFIG_DDR is not set +CONFIG_IRQ_POLL=y +CONFIG_MPILIB=y +CONFIG_SIGNATURE=y +CONFIG_LIBFDT=y +CONFIG_OID_REGISTRY=y +CONFIG_UCS2_STRING=y +CONFIG_FONT_SUPPORT=y +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +CONFIG_SG_SPLIT=y +CONFIG_SG_POOL=y +CONFIG_ARCH_HAS_SG_CHAIN=y +CONFIG_ARCH_HAS_PMEM_API=y +CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y +CONFIG_SBITMAP=y +# CONFIG_STRING_SELFTEST is not set + +# +# Kernel hacking +# + +# +# printk and dmesg options +# +CONFIG_PRINTK_TIME=y +CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 +CONFIG_CONSOLE_LOGLEVEL_QUIET=4 +CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 +CONFIG_BOOT_PRINTK_DELAY=y +CONFIG_DYNAMIC_DEBUG=y + +# +# Compile-time checks and compiler options +# +CONFIG_DEBUG_INFO=y +# CONFIG_DEBUG_INFO_REDUCED is not set +# CONFIG_DEBUG_INFO_SPLIT is not set +# CONFIG_DEBUG_INFO_DWARF4 is not set +# CONFIG_GDB_SCRIPTS is not set +CONFIG_ENABLE_MUST_CHECK=y +CONFIG_FRAME_WARN=2048 +CONFIG_STRIP_ASM_SYMS=y +# CONFIG_READABLE_ASM is not set +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_PAGE_OWNER is not set +CONFIG_DEBUG_FS=y +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_SECTION_MISMATCH is not set +CONFIG_SECTION_MISMATCH_WARN_ONLY=y +CONFIG_ARCH_WANT_FRAME_POINTERS=y +CONFIG_FRAME_POINTER=y +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +CONFIG_MAGIC_SYSRQ=y +CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01b6 +CONFIG_MAGIC_SYSRQ_SERIAL=y +CONFIG_DEBUG_KERNEL=y + +# +# Memory Debugging +# +CONFIG_PAGE_EXTENSION=y +# CONFIG_DEBUG_PAGEALLOC is not set +CONFIG_PAGE_POISONING=y +CONFIG_PAGE_POISONING_NO_SANITY=y +# CONFIG_PAGE_POISONING_ZERO is not set +# CONFIG_DEBUG_PAGE_REF is not set +# CONFIG_DEBUG_RODATA_TEST is not set +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_SLUB_DEBUG_ON is not set +# CONFIG_SLUB_STATS is not set +CONFIG_HAVE_DEBUG_KMEMLEAK=y +# CONFIG_DEBUG_KMEMLEAK is not set +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_DEBUG_VM is not set +CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y +# CONFIG_DEBUG_VIRTUAL is not set +CONFIG_DEBUG_MEMORY_INIT=y +# CONFIG_DEBUG_PER_CPU_MAPS is not set +CONFIG_HAVE_ARCH_KASAN=y +# CONFIG_KASAN is not set +CONFIG_ARCH_HAS_KCOV=y +CONFIG_CC_HAS_SANCOV_TRACE_PC=y +# CONFIG_KCOV is not set +# CONFIG_DEBUG_SHIRQ is not set + +# +# Debug Lockups and Hangs +# +CONFIG_LOCKUP_DETECTOR=y +CONFIG_SOFTLOCKUP_DETECTOR=y +# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 +CONFIG_DETECT_HUNG_TASK=y +CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 +# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 +# CONFIG_WQ_WATCHDOG is not set +# CONFIG_PANIC_ON_OOPS is not set +CONFIG_PANIC_ON_OOPS_VALUE=0 +CONFIG_PANIC_TIMEOUT=0 +CONFIG_SCHED_DEBUG=y +CONFIG_SCHED_INFO=y +CONFIG_SCHEDSTATS=y +CONFIG_SCHED_STACK_END_CHECK=y +# CONFIG_DEBUG_TIMEKEEPING is not set + +# +# Lock Debugging (spinlocks, mutexes, etc...) +# +CONFIG_LOCK_DEBUGGING_SUPPORT=y +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set +# CONFIG_DEBUG_RWSEMS is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_DEBUG_ATOMIC_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_LOCK_TORTURE_TEST is not set +# CONFIG_WW_MUTEX_SELFTEST is not set +CONFIG_STACKTRACE=y +# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set +# CONFIG_DEBUG_KOBJECT is not set +CONFIG_HAVE_DEBUG_BUGVERBOSE=y +CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_DEBUG_LIST=y +# CONFIG_DEBUG_PI_LIST is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +# CONFIG_DEBUG_CREDENTIALS is not set + +# +# RCU Debugging +# +# CONFIG_RCU_PERF_TEST is not set +# CONFIG_RCU_TORTURE_TEST is not set +CONFIG_RCU_CPU_STALL_TIMEOUT=21 +# CONFIG_RCU_TRACE is not set +# CONFIG_RCU_EQS_DEBUG is not set +# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set +CONFIG_NOTIFIER_ERROR_INJECTION=m +CONFIG_PM_NOTIFIER_ERROR_INJECT=m +# CONFIG_NETDEV_NOTIFIER_ERROR_INJECT is not set +# CONFIG_FAULT_INJECTION is not set +# CONFIG_LATENCYTOP is not set +CONFIG_NOP_TRACER=y +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_TRACER_MAX_TRACE=y +CONFIG_TRACE_CLOCK=y +CONFIG_RING_BUFFER=y +CONFIG_EVENT_TRACING=y +CONFIG_CONTEXT_SWITCH_TRACER=y +CONFIG_TRACING=y +CONFIG_GENERIC_TRACER=y +CONFIG_TRACING_SUPPORT=y +CONFIG_FTRACE=y +CONFIG_FUNCTION_TRACER=y +CONFIG_FUNCTION_GRAPH_TRACER=y +# CONFIG_PREEMPTIRQ_EVENTS is not set +# CONFIG_IRQSOFF_TRACER is not set +# CONFIG_SCHED_TRACER is not set +# CONFIG_HWLAT_TRACER is not set +CONFIG_FTRACE_SYSCALLS=y +CONFIG_TRACER_SNAPSHOT=y +# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set +CONFIG_BRANCH_PROFILE_NONE=y +# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set +# CONFIG_PROFILE_ALL_BRANCHES is not set +CONFIG_STACK_TRACER=y +CONFIG_BLK_DEV_IO_TRACE=y +CONFIG_KPROBE_EVENTS=y +CONFIG_UPROBE_EVENTS=y +CONFIG_BPF_EVENTS=y +CONFIG_PROBE_EVENTS=y +CONFIG_DYNAMIC_FTRACE=y +# CONFIG_FUNCTION_PROFILER is not set +CONFIG_FTRACE_MCOUNT_RECORD=y +# CONFIG_FTRACE_STARTUP_TEST is not set +# CONFIG_HIST_TRIGGERS is not set +# CONFIG_TRACEPOINT_BENCHMARK is not set +# CONFIG_RING_BUFFER_BENCHMARK is not set +# CONFIG_RING_BUFFER_STARTUP_TEST is not set +# CONFIG_PREEMPTIRQ_DELAY_TEST is not set +# CONFIG_TRACE_EVAL_MAP_FILE is not set +CONFIG_TRACING_EVENTS_GPIO=y +# CONFIG_DMA_API_DEBUG is not set +CONFIG_RUNTIME_TESTING_MENU=y +# CONFIG_LKDTM is not set +# CONFIG_TEST_LIST_SORT is not set +# CONFIG_TEST_SORT is not set +# CONFIG_KPROBES_SANITY_TEST is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_RBTREE_TEST is not set +# CONFIG_INTERVAL_TREE_TEST is not set +# CONFIG_PERCPU_TEST is not set +# CONFIG_ATOMIC64_SELFTEST is not set +# CONFIG_ASYNC_RAID6_TEST is not set +# CONFIG_TEST_HEXDUMP is not set +# CONFIG_TEST_STRING_HELPERS is not set +# CONFIG_TEST_KSTRTOX is not set +# CONFIG_TEST_PRINTF is not set +# CONFIG_TEST_BITMAP is not set +# CONFIG_TEST_BITFIELD is not set +# CONFIG_TEST_UUID is not set +# CONFIG_TEST_OVERFLOW is not set +# CONFIG_TEST_RHASHTABLE is not set +# CONFIG_TEST_HASH is not set +# CONFIG_TEST_IDA is not set +# CONFIG_TEST_LKM is not set +CONFIG_TEST_USER_COPY=m +CONFIG_TEST_BPF=m +# CONFIG_FIND_BIT_BENCHMARK is not set +CONFIG_TEST_FIRMWARE=m +# CONFIG_TEST_SYSCTL is not set +# CONFIG_TEST_UDELAY is not set +CONFIG_TEST_STATIC_KEYS=m +# CONFIG_TEST_KMOD is not set +# CONFIG_MEMTEST is not set +CONFIG_BUG_ON_DATA_CORRUPTION=y +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set +CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y +# CONFIG_UBSAN is not set +CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y +CONFIG_STRICT_DEVMEM=y +CONFIG_IO_STRICT_DEVMEM=y +# CONFIG_ARM64_PTDUMP_DEBUGFS is not set +# CONFIG_PID_IN_CONTEXTIDR is not set +# CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set +# CONFIG_DEBUG_WX is not set +# CONFIG_DEBUG_ALIGN_RODATA is not set +# CONFIG_DEBUG_EFI is not set +# CONFIG_ARM64_RELOC_TEST is not set +# CONFIG_CORESIGHT is not set diff --git a/gnu/packages/aux-files/linux-libre/4.19-i686.conf b/gnu/packages/aux-files/linux-libre/4.19-i686.conf new file mode 100644 index 0000000000..07a035be91 --- /dev/null +++ b/gnu/packages/aux-files/linux-libre/4.19-i686.conf @@ -0,0 +1,9689 @@ +# +# Automatically generated file; DO NOT EDIT. +# Linux/x86 4.19.0-gnu Kernel Configuration +# + +# +# Compiler: gcc (GCC) 7.3.0 +# +CONFIG_CC_IS_GCC=y +CONFIG_GCC_VERSION=70300 +CONFIG_CLANG_VERSION=0 +CONFIG_IRQ_WORK=y +CONFIG_BUILDTIME_EXTABLE_SORT=y +CONFIG_THREAD_INFO_IN_TASK=y + +# +# General setup +# +CONFIG_INIT_ENV_ARG_LIMIT=32 +# CONFIG_COMPILE_TEST is not set +CONFIG_LOCALVERSION="" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_BUILD_SALT="" +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_BZIP2=y +CONFIG_HAVE_KERNEL_LZMA=y +CONFIG_HAVE_KERNEL_XZ=y +CONFIG_HAVE_KERNEL_LZO=y +CONFIG_HAVE_KERNEL_LZ4=y +CONFIG_KERNEL_GZIP=y +# CONFIG_KERNEL_BZIP2 is not set +# CONFIG_KERNEL_LZMA is not set +# CONFIG_KERNEL_XZ is not set +# CONFIG_KERNEL_LZO is not set +# CONFIG_KERNEL_LZ4 is not set +CONFIG_DEFAULT_HOSTNAME="(none)" +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +CONFIG_POSIX_MQUEUE_SYSCTL=y +CONFIG_CROSS_MEMORY_ATTACH=y +CONFIG_USELIB=y +CONFIG_AUDIT=y +CONFIG_HAVE_ARCH_AUDITSYSCALL=y +CONFIG_AUDITSYSCALL=y +CONFIG_AUDIT_WATCH=y +CONFIG_AUDIT_TREE=y + +# +# IRQ subsystem +# +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y +CONFIG_GENERIC_PENDING_IRQ=y +CONFIG_GENERIC_IRQ_MIGRATION=y +CONFIG_GENERIC_IRQ_CHIP=y +CONFIG_IRQ_DOMAIN=y +CONFIG_IRQ_DOMAIN_HIERARCHY=y +CONFIG_GENERIC_MSI_IRQ=y +CONFIG_GENERIC_MSI_IRQ_DOMAIN=y +CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y +CONFIG_GENERIC_IRQ_RESERVATION_MODE=y +CONFIG_IRQ_FORCED_THREADING=y +CONFIG_SPARSE_IRQ=y +# CONFIG_GENERIC_IRQ_DEBUGFS is not set +CONFIG_CLOCKSOURCE_WATCHDOG=y +CONFIG_ARCH_CLOCKSOURCE_DATA=y +CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y +CONFIG_GENERIC_TIME_VSYSCALL=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y +CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y +CONFIG_GENERIC_CMOS_UPDATE=y + +# +# Timers subsystem +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ_COMMON=y +# CONFIG_HZ_PERIODIC is not set +CONFIG_NO_HZ_IDLE=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +# CONFIG_PREEMPT_NONE is not set +CONFIG_PREEMPT_VOLUNTARY=y +# CONFIG_PREEMPT is not set + +# +# CPU/Task time and stats accounting +# +CONFIG_TICK_CPU_ACCOUNTING=y +# CONFIG_IRQ_TIME_ACCOUNTING is not set +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_BSD_PROCESS_ACCT_V3=y +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y +CONFIG_CPU_ISOLATION=y + +# +# RCU Subsystem +# +CONFIG_TREE_RCU=y +# CONFIG_RCU_EXPERT is not set +CONFIG_SRCU=y +CONFIG_TREE_SRCU=y +CONFIG_RCU_STALL_COMMON=y +CONFIG_RCU_NEED_SEGCBLIST=y +CONFIG_BUILD_BIN2C=y +# CONFIG_IKCONFIG is not set +CONFIG_LOG_BUF_SHIFT=17 +CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 +CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13 +CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y +CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y +CONFIG_CGROUPS=y +CONFIG_PAGE_COUNTER=y +CONFIG_MEMCG=y +CONFIG_MEMCG_SWAP=y +# CONFIG_MEMCG_SWAP_ENABLED is not set +CONFIG_MEMCG_KMEM=y +CONFIG_BLK_CGROUP=y +# CONFIG_DEBUG_BLK_CGROUP is not set +CONFIG_CGROUP_WRITEBACK=y +CONFIG_CGROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +CONFIG_CFS_BANDWIDTH=y +# CONFIG_RT_GROUP_SCHED is not set +CONFIG_CGROUP_PIDS=y +# CONFIG_CGROUP_RDMA is not set +CONFIG_CGROUP_FREEZER=y +CONFIG_CGROUP_HUGETLB=y +CONFIG_CPUSETS=y +CONFIG_PROC_PID_CPUSET=y +CONFIG_CGROUP_DEVICE=y +CONFIG_CGROUP_CPUACCT=y +CONFIG_CGROUP_PERF=y +CONFIG_CGROUP_BPF=y +# CONFIG_CGROUP_DEBUG is not set +CONFIG_SOCK_CGROUP_DATA=y +CONFIG_NAMESPACES=y +CONFIG_UTS_NS=y +CONFIG_IPC_NS=y +CONFIG_USER_NS=y +CONFIG_PID_NS=y +CONFIG_NET_NS=y +CONFIG_CHECKPOINT_RESTORE=y +CONFIG_SCHED_AUTOGROUP=y +# CONFIG_SYSFS_DEPRECATED is not set +CONFIG_RELAY=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +CONFIG_RD_BZIP2=y +CONFIG_RD_LZMA=y +CONFIG_RD_XZ=y +CONFIG_RD_LZO=y +CONFIG_RD_LZ4=y +CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +CONFIG_HAVE_UID16=y +CONFIG_SYSCTL_EXCEPTION_TRACE=y +CONFIG_HAVE_PCSPKR_PLATFORM=y +CONFIG_BPF=y +CONFIG_EXPERT=y +CONFIG_UID16=y +CONFIG_MULTIUSER=y +CONFIG_SGETMASK_SYSCALL=y +CONFIG_SYSFS_SYSCALL=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_FHANDLE=y +CONFIG_POSIX_TIMERS=y +CONFIG_PRINTK=y +CONFIG_PRINTK_NMI=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_PCSPKR_PLATFORM=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_FUTEX_PI=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +CONFIG_ADVISE_SYSCALLS=y +CONFIG_MEMBARRIER=y +CONFIG_KALLSYMS=y +CONFIG_KALLSYMS_ALL=y +CONFIG_KALLSYMS_BASE_RELATIVE=y +CONFIG_BPF_SYSCALL=y +CONFIG_USERFAULTFD=y +CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y +CONFIG_RSEQ=y +# CONFIG_DEBUG_RSEQ is not set +# CONFIG_EMBEDDED is not set +CONFIG_HAVE_PERF_EVENTS=y +# CONFIG_PC104 is not set + +# +# Kernel Performance Events And Counters +# +CONFIG_PERF_EVENTS=y +# CONFIG_DEBUG_PERF_USE_VMALLOC is not set +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_SLUB_DEBUG=y +# CONFIG_SLUB_MEMCG_SYSFS_ON is not set +# CONFIG_COMPAT_BRK is not set +# CONFIG_SLAB is not set +CONFIG_SLUB=y +# CONFIG_SLOB is not set +CONFIG_SLAB_MERGE_DEFAULT=y +CONFIG_SLAB_FREELIST_RANDOM=y +CONFIG_SLAB_FREELIST_HARDENED=y +CONFIG_SLUB_CPU_PARTIAL=y +CONFIG_SYSTEM_DATA_VERIFICATION=y +CONFIG_PROFILING=y +CONFIG_TRACEPOINTS=y +# CONFIG_64BIT is not set +CONFIG_X86_32=y +CONFIG_X86=y +CONFIG_INSTRUCTION_DECODER=y +CONFIG_OUTPUT_FORMAT="elf32-i386" +CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_MMU=y +CONFIG_ARCH_MMAP_RND_BITS_MIN=8 +CONFIG_ARCH_MMAP_RND_BITS_MAX=16 +CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8 +CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16 +CONFIG_GENERIC_ISA_DMA=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ARCH_HAS_CPU_RELAX=y +CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y +CONFIG_ARCH_HAS_FILTER_PGPROT=y +CONFIG_HAVE_SETUP_PER_CPU_AREA=y +CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y +CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y +CONFIG_ARCH_WANT_GENERAL_HUGETLB=y +CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y +CONFIG_HAVE_INTEL_TXT=y +CONFIG_X86_32_SMP=y +CONFIG_ARCH_SUPPORTS_UPROBES=y +CONFIG_FIX_EARLYCON_MEM=y +CONFIG_PGTABLE_LEVELS=3 +CONFIG_CC_HAS_SANE_STACKPROTECTOR=y + +# +# Processor type and features +# +CONFIG_ZONE_DMA=y +CONFIG_SMP=y +CONFIG_X86_FEATURE_NAMES=y +CONFIG_X86_MPPARSE=y +# CONFIG_GOLDFISH is not set +CONFIG_RETPOLINE=y +# CONFIG_INTEL_RDT is not set +# CONFIG_X86_BIGSMP is not set +CONFIG_X86_EXTENDED_PLATFORM=y +# CONFIG_X86_GOLDFISH is not set +CONFIG_X86_INTEL_MID=y +# CONFIG_X86_INTEL_QUARK is not set +CONFIG_X86_INTEL_LPSS=y +CONFIG_X86_AMD_PLATFORM_DEVICE=y +CONFIG_IOSF_MBI=y +CONFIG_IOSF_MBI_DEBUG=y +# CONFIG_X86_RDC321X is not set +# CONFIG_X86_32_NON_STANDARD is not set +CONFIG_X86_32_IRIS=m +CONFIG_SCHED_OMIT_FRAME_POINTER=y +CONFIG_HYPERVISOR_GUEST=y +CONFIG_PARAVIRT=y +# CONFIG_PARAVIRT_DEBUG is not set +CONFIG_PARAVIRT_SPINLOCKS=y +# CONFIG_QUEUED_LOCK_STAT is not set +CONFIG_XEN=y +CONFIG_XEN_PV=y +CONFIG_XEN_PV_SMP=y +CONFIG_XEN_DOM0=y +CONFIG_XEN_PVHVM=y +CONFIG_XEN_PVHVM_SMP=y +CONFIG_XEN_SAVE_RESTORE=y +# CONFIG_XEN_DEBUG_FS is not set +CONFIG_XEN_PVH=y +CONFIG_KVM_GUEST=y +CONFIG_KVM_DEBUG_FS=y +# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set +CONFIG_PARAVIRT_CLOCK=y +CONFIG_NO_BOOTMEM=y +# CONFIG_M486 is not set +# CONFIG_M586 is not set +# CONFIG_M586TSC is not set +# CONFIG_M586MMX is not set +CONFIG_M686=y +# CONFIG_MPENTIUMII is not set +# CONFIG_MPENTIUMIII is not set +# CONFIG_MPENTIUMM is not set +# CONFIG_MPENTIUM4 is not set +# CONFIG_MK6 is not set +# CONFIG_MK7 is not set +# CONFIG_MK8 is not set +# CONFIG_MCRUSOE is not set +# CONFIG_MEFFICEON is not set +# CONFIG_MWINCHIPC6 is not set +# CONFIG_MWINCHIP3D is not set +# CONFIG_MELAN is not set +# CONFIG_MGEODEGX1 is not set +# CONFIG_MGEODE_LX is not set +# CONFIG_MCYRIXIII is not set +# CONFIG_MVIAC3_2 is not set +# CONFIG_MVIAC7 is not set +# CONFIG_MCORE2 is not set +# CONFIG_MATOM is not set +CONFIG_X86_GENERIC=y +CONFIG_X86_INTERNODE_CACHE_SHIFT=6 +CONFIG_X86_L1_CACHE_SHIFT=6 +CONFIG_X86_INTEL_USERCOPY=y +CONFIG_X86_USE_PPRO_CHECKSUM=y +CONFIG_X86_TSC=y +CONFIG_X86_CMPXCHG64=y +CONFIG_X86_CMOV=y +CONFIG_X86_MINIMUM_CPU_FAMILY=6 +CONFIG_X86_DEBUGCTLMSR=y +CONFIG_PROCESSOR_SELECT=y +CONFIG_CPU_SUP_INTEL=y +CONFIG_CPU_SUP_CYRIX_32=y +CONFIG_CPU_SUP_AMD=y +CONFIG_CPU_SUP_CENTAUR=y +CONFIG_CPU_SUP_TRANSMETA_32=y +CONFIG_CPU_SUP_UMC_32=y +CONFIG_HPET_TIMER=y +CONFIG_HPET_EMULATE_RTC=y +CONFIG_APB_TIMER=y +CONFIG_DMI=y +CONFIG_NR_CPUS_RANGE_BEGIN=2 +CONFIG_NR_CPUS_RANGE_END=8 +CONFIG_NR_CPUS_DEFAULT=8 +CONFIG_NR_CPUS=8 +CONFIG_SCHED_SMT=y +CONFIG_SCHED_MC=y +CONFIG_SCHED_MC_PRIO=y +CONFIG_X86_LOCAL_APIC=y +CONFIG_X86_IO_APIC=y +CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y +CONFIG_X86_MCE=y +# CONFIG_X86_MCELOG_LEGACY is not set +CONFIG_X86_MCE_INTEL=y +CONFIG_X86_MCE_AMD=y +# CONFIG_X86_ANCIENT_MCE is not set +CONFIG_X86_MCE_THRESHOLD=y +# CONFIG_X86_MCE_INJECT is not set +CONFIG_X86_THERMAL_VECTOR=y + +# +# Performance monitoring +# +CONFIG_PERF_EVENTS_INTEL_UNCORE=y +CONFIG_PERF_EVENTS_INTEL_RAPL=y +CONFIG_PERF_EVENTS_INTEL_CSTATE=y +CONFIG_PERF_EVENTS_AMD_POWER=m +# CONFIG_X86_LEGACY_VM86 is not set +CONFIG_X86_16BIT=y +CONFIG_X86_ESPFIX32=y +# CONFIG_TOSHIBA is not set +CONFIG_I8K=m +CONFIG_X86_REBOOTFIXUPS=y +CONFIG_MICROCODE=y +CONFIG_MICROCODE_INTEL=y +CONFIG_MICROCODE_AMD=y +CONFIG_MICROCODE_OLD_INTERFACE=y +CONFIG_X86_MSR=m +CONFIG_X86_CPUID=m +# CONFIG_NOHIGHMEM is not set +# CONFIG_HIGHMEM4G is not set +CONFIG_HIGHMEM64G=y +CONFIG_VMSPLIT_3G=y +# CONFIG_VMSPLIT_2G is not set +# CONFIG_VMSPLIT_1G is not set +CONFIG_PAGE_OFFSET=0xC0000000 +CONFIG_HIGHMEM=y +CONFIG_X86_PAE=y +CONFIG_ARCH_HAS_MEM_ENCRYPT=y +CONFIG_ARCH_FLATMEM_ENABLE=y +CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_ARCH_SELECT_MEMORY_MODEL=y +CONFIG_ILLEGAL_POINTER_VALUE=0 +CONFIG_X86_PMEM_LEGACY_DEVICE=y +CONFIG_X86_PMEM_LEGACY=y +CONFIG_HIGHPTE=y +CONFIG_X86_CHECK_BIOS_CORRUPTION=y +CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y +CONFIG_X86_RESERVE_LOW=64 +# CONFIG_MATH_EMULATION is not set +CONFIG_MTRR=y +CONFIG_MTRR_SANITIZER=y +CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1 +CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 +CONFIG_X86_PAT=y +CONFIG_ARCH_USES_PG_UNCACHED=y +CONFIG_ARCH_RANDOM=y +CONFIG_X86_SMAP=y +CONFIG_X86_INTEL_UMIP=y +CONFIG_EFI=y +CONFIG_EFI_STUB=y +CONFIG_SECCOMP=y +# CONFIG_HZ_100 is not set +CONFIG_HZ_250=y +# CONFIG_HZ_300 is not set +# CONFIG_HZ_1000 is not set +CONFIG_HZ=250 +CONFIG_SCHED_HRTICK=y +CONFIG_KEXEC=y +CONFIG_CRASH_DUMP=y +CONFIG_KEXEC_JUMP=y +CONFIG_PHYSICAL_START=0x1000000 +CONFIG_RELOCATABLE=y +CONFIG_RANDOMIZE_BASE=y +CONFIG_X86_NEED_RELOCS=y +CONFIG_PHYSICAL_ALIGN=0x1000000 +CONFIG_HOTPLUG_CPU=y +# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set +# CONFIG_DEBUG_HOTPLUG_CPU0 is not set +# CONFIG_COMPAT_VDSO is not set +# CONFIG_CMDLINE_BOOL is not set +CONFIG_MODIFY_LDT_SYSCALL=y +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y +CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y +CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y + +# +# Power management and ACPI options +# +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +# CONFIG_SUSPEND_SKIP_SYNC is not set +CONFIG_HIBERNATE_CALLBACKS=y +CONFIG_HIBERNATION=y +CONFIG_PM_STD_PARTITION="" +CONFIG_PM_SLEEP=y +CONFIG_PM_SLEEP_SMP=y +# CONFIG_PM_AUTOSLEEP is not set +CONFIG_PM_WAKELOCKS=y +CONFIG_PM_WAKELOCKS_LIMIT=100 +CONFIG_PM_WAKELOCKS_GC=y +CONFIG_PM=y +CONFIG_PM_DEBUG=y +CONFIG_PM_ADVANCED_DEBUG=y +# CONFIG_PM_TEST_SUSPEND is not set +CONFIG_PM_SLEEP_DEBUG=y +# CONFIG_DPM_WATCHDOG is not set +CONFIG_PM_TRACE=y +CONFIG_PM_TRACE_RTC=y +CONFIG_PM_CLK=y +CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y +CONFIG_ARCH_SUPPORTS_ACPI=y +CONFIG_ACPI=y +CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y +CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y +CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y +# CONFIG_ACPI_DEBUGGER is not set +CONFIG_ACPI_SPCR_TABLE=y +CONFIG_ACPI_SLEEP=y +# CONFIG_ACPI_PROCFS_POWER is not set +CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y +CONFIG_ACPI_EC_DEBUGFS=m +CONFIG_ACPI_AC=y +CONFIG_ACPI_BATTERY=y +CONFIG_ACPI_BUTTON=y +CONFIG_ACPI_VIDEO=m +CONFIG_ACPI_FAN=y +CONFIG_ACPI_TAD=m +CONFIG_ACPI_DOCK=y +CONFIG_ACPI_CPU_FREQ_PSS=y +CONFIG_ACPI_PROCESSOR_CSTATE=y +CONFIG_ACPI_PROCESSOR_IDLE=y +CONFIG_ACPI_PROCESSOR=y +CONFIG_ACPI_IPMI=m +CONFIG_ACPI_HOTPLUG_CPU=y +CONFIG_ACPI_PROCESSOR_AGGREGATOR=m +CONFIG_ACPI_THERMAL=y +CONFIG_ACPI_CUSTOM_DSDT_FILE="" +CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y +CONFIG_ACPI_TABLE_UPGRADE=y +# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_PCI_SLOT=y +CONFIG_ACPI_CONTAINER=y +CONFIG_ACPI_HOTPLUG_MEMORY=y +CONFIG_ACPI_HOTPLUG_IOAPIC=y +CONFIG_ACPI_SBS=m +CONFIG_ACPI_HED=y +# CONFIG_ACPI_CUSTOM_METHOD is not set +CONFIG_ACPI_BGRT=y +# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set +CONFIG_HAVE_ACPI_APEI=y +CONFIG_HAVE_ACPI_APEI_NMI=y +CONFIG_ACPI_APEI=y +CONFIG_ACPI_APEI_GHES=y +CONFIG_ACPI_APEI_PCIEAER=y +CONFIG_ACPI_APEI_EINJ=m +# CONFIG_ACPI_APEI_ERST_DEBUG is not set +CONFIG_DPTF_POWER=m +CONFIG_ACPI_WATCHDOG=y +CONFIG_ACPI_EXTLOG=m +# CONFIG_PMIC_OPREGION is not set +CONFIG_ACPI_CONFIGFS=m +CONFIG_X86_PM_TIMER=y +CONFIG_SFI=y +CONFIG_X86_APM_BOOT=y +CONFIG_APM=m +# CONFIG_APM_IGNORE_USER_SUSPEND is not set +# CONFIG_APM_DO_ENABLE is not set +# CONFIG_APM_CPU_IDLE is not set +# CONFIG_APM_DISPLAY_BLANK is not set +# CONFIG_APM_ALLOW_INTS is not set + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_GOV_ATTR_SET=y +CONFIG_CPU_FREQ_GOV_COMMON=y +CONFIG_CPU_FREQ_STAT=y +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=y +CONFIG_CPU_FREQ_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y + +# +# CPU frequency scaling drivers +# +CONFIG_X86_INTEL_PSTATE=y +CONFIG_X86_PCC_CPUFREQ=y +CONFIG_X86_ACPI_CPUFREQ=y +CONFIG_X86_ACPI_CPUFREQ_CPB=y +CONFIG_X86_SFI_CPUFREQ=m +CONFIG_X86_POWERNOW_K6=m +CONFIG_X86_POWERNOW_K7=m +CONFIG_X86_POWERNOW_K7_ACPI=y +CONFIG_X86_POWERNOW_K8=y +CONFIG_X86_AMD_FREQ_SENSITIVITY=m +CONFIG_X86_GX_SUSPMOD=m +CONFIG_X86_SPEEDSTEP_CENTRINO=y +CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y +CONFIG_X86_SPEEDSTEP_ICH=y +CONFIG_X86_SPEEDSTEP_SMI=y +CONFIG_X86_P4_CLOCKMOD=m +CONFIG_X86_CPUFREQ_NFORCE2=y +CONFIG_X86_LONGRUN=m +CONFIG_X86_LONGHAUL=m +# CONFIG_X86_E_POWERSAVER is not set + +# +# shared options +# +CONFIG_X86_SPEEDSTEP_LIB=y +CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y + +# +# CPU Idle +# +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_IDLE_GOV_MENU=y +CONFIG_INTEL_IDLE=y + +# +# Bus options (PCI etc.) +# +CONFIG_PCI=y +# CONFIG_PCI_GOBIOS is not set +# CONFIG_PCI_GOMMCONFIG is not set +# CONFIG_PCI_GODIRECT is not set +CONFIG_PCI_GOANY=y +CONFIG_PCI_BIOS=y +CONFIG_PCI_DIRECT=y +CONFIG_PCI_MMCONFIG=y +CONFIG_PCI_XEN=y +CONFIG_PCI_DOMAINS=y +# CONFIG_PCI_CNB20LE_QUIRK is not set +CONFIG_PCIEPORTBUS=y +CONFIG_HOTPLUG_PCI_PCIE=y +CONFIG_PCIEAER=y +# CONFIG_PCIEAER_INJECT is not set +# CONFIG_PCIE_ECRC is not set +CONFIG_PCIEASPM=y +CONFIG_PCIEASPM_DEBUG=y +CONFIG_PCIEASPM_DEFAULT=y +# CONFIG_PCIEASPM_POWERSAVE is not set +# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set +# CONFIG_PCIEASPM_PERFORMANCE is not set +CONFIG_PCIE_PME=y +CONFIG_PCIE_DPC=y +CONFIG_PCIE_PTM=y +CONFIG_PCI_MSI=y +CONFIG_PCI_MSI_IRQ_DOMAIN=y +CONFIG_PCI_QUIRKS=y +# CONFIG_PCI_DEBUG is not set +CONFIG_PCI_REALLOC_ENABLE_AUTO=y +CONFIG_PCI_STUB=m +# CONFIG_PCI_PF_STUB is not set +CONFIG_XEN_PCIDEV_FRONTEND=m +CONFIG_PCI_ATS=y +CONFIG_PCI_LOCKLESS_CONFIG=y +CONFIG_PCI_IOV=y +CONFIG_PCI_PRI=y +CONFIG_PCI_PASID=y +CONFIG_PCI_LABEL=y +CONFIG_HOTPLUG_PCI=y +CONFIG_HOTPLUG_PCI_COMPAQ=m +CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM=y +CONFIG_HOTPLUG_PCI_IBM=m +CONFIG_HOTPLUG_PCI_ACPI=y +CONFIG_HOTPLUG_PCI_ACPI_IBM=m +CONFIG_HOTPLUG_PCI_CPCI=y +CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m +CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m +CONFIG_HOTPLUG_PCI_SHPC=y + +# +# PCI controller drivers +# + +# +# Cadence PCIe controllers support +# + +# +# DesignWare PCI Core Support +# +# CONFIG_PCIE_DW_PLAT_HOST is not set + +# +# PCI Endpoint +# +# CONFIG_PCI_ENDPOINT is not set + +# +# PCI switch controller drivers +# +CONFIG_PCI_SW_SWITCHTEC=m +# CONFIG_ISA_BUS is not set +CONFIG_ISA_DMA_API=y +CONFIG_ISA=y +CONFIG_EISA=y +CONFIG_EISA_VLB_PRIMING=y +CONFIG_EISA_PCI_EISA=y +CONFIG_EISA_VIRTUAL_ROOT=y +CONFIG_EISA_NAMES=y +CONFIG_SCx200=m +CONFIG_SCx200HR_TIMER=m +CONFIG_ALIX=y +CONFIG_NET5501=y +CONFIG_GEOS=y +CONFIG_AMD_NB=y +CONFIG_PCCARD=m +CONFIG_PCMCIA=m +CONFIG_PCMCIA_LOAD_CIS=y +CONFIG_CARDBUS=y + +# +# PC-card bridges +# +CONFIG_YENTA=m +CONFIG_YENTA_O2=y +CONFIG_YENTA_RICOH=y +CONFIG_YENTA_TI=y +CONFIG_YENTA_ENE_TUNE=y +CONFIG_YENTA_TOSHIBA=y +CONFIG_PD6729=m +CONFIG_I82092=m +CONFIG_I82365=m +CONFIG_TCIC=m +CONFIG_PCMCIA_PROBE=y +CONFIG_PCCARD_NONSTATIC=y +CONFIG_RAPIDIO=y +CONFIG_RAPIDIO_TSI721=m +CONFIG_RAPIDIO_DISC_TIMEOUT=30 +# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set +CONFIG_RAPIDIO_DMA_ENGINE=y +# CONFIG_RAPIDIO_DEBUG is not set +CONFIG_RAPIDIO_ENUM_BASIC=m +CONFIG_RAPIDIO_CHMAN=m +CONFIG_RAPIDIO_MPORT_CDEV=m + +# +# RapidIO Switch drivers +# +CONFIG_RAPIDIO_TSI57X=m +CONFIG_RAPIDIO_CPS_XX=m +CONFIG_RAPIDIO_TSI568=m +CONFIG_RAPIDIO_CPS_GEN2=m +CONFIG_RAPIDIO_RXS_GEN3=m +# CONFIG_X86_SYSFB is not set + +# +# Binary Emulations +# +CONFIG_COMPAT_32=y +CONFIG_HAVE_ATOMIC_IOMAP=y +CONFIG_HAVE_GENERIC_GUP=y + +# +# Firmware Drivers +# +CONFIG_EDD=y +CONFIG_EDD_OFF=y +CONFIG_FIRMWARE_MEMMAP=y +CONFIG_DELL_RBU=m +CONFIG_DCDBAS=m +CONFIG_DMIID=y +CONFIG_DMI_SYSFS=m +CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y +CONFIG_ISCSI_IBFT_FIND=y +CONFIG_ISCSI_IBFT=m +CONFIG_FW_CFG_SYSFS=m +# CONFIG_FW_CFG_SYSFS_CMDLINE is not set +# CONFIG_GOOGLE_FIRMWARE is not set + +# +# EFI (Extensible Firmware Interface) Support +# +CONFIG_EFI_VARS=y +CONFIG_EFI_ESRT=y +CONFIG_EFI_VARS_PSTORE=m +# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set +CONFIG_EFI_RUNTIME_MAP=y +# CONFIG_EFI_FAKE_MEMMAP is not set +CONFIG_EFI_RUNTIME_WRAPPERS=y +CONFIG_EFI_BOOTLOADER_CONTROL=m +CONFIG_EFI_CAPSULE_LOADER=y +CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH=y +# CONFIG_EFI_TEST is not set +CONFIG_APPLE_PROPERTIES=y +CONFIG_RESET_ATTACK_MITIGATION=y +CONFIG_UEFI_CPER=y +CONFIG_UEFI_CPER_X86=y +CONFIG_EFI_DEV_PATH_PARSER=y + +# +# Tegra firmware driver +# +CONFIG_HAVE_KVM=y +CONFIG_HAVE_KVM_IRQCHIP=y +CONFIG_HAVE_KVM_IRQFD=y +CONFIG_HAVE_KVM_IRQ_ROUTING=y +CONFIG_HAVE_KVM_EVENTFD=y +CONFIG_KVM_MMIO=y +CONFIG_KVM_ASYNC_PF=y +CONFIG_HAVE_KVM_MSI=y +CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y +CONFIG_KVM_VFIO=y +CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y +CONFIG_HAVE_KVM_IRQ_BYPASS=y +CONFIG_VIRTUALIZATION=y +CONFIG_KVM=m +CONFIG_KVM_INTEL=m +CONFIG_KVM_AMD=m +# CONFIG_KVM_MMU_AUDIT is not set +CONFIG_VHOST_NET=m +CONFIG_VHOST_SCSI=m +CONFIG_VHOST_VSOCK=m +CONFIG_VHOST=m +# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set + +# +# General architecture-dependent options +# +CONFIG_CRASH_CORE=y +CONFIG_KEXEC_CORE=y +CONFIG_HOTPLUG_SMT=y +CONFIG_OPROFILE=m +# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set +CONFIG_HAVE_OPROFILE=y +CONFIG_OPROFILE_NMI_TIMER=y +CONFIG_KPROBES=y +CONFIG_JUMP_LABEL=y +# CONFIG_STATIC_KEYS_SELFTEST is not set +CONFIG_OPTPROBES=y +CONFIG_KPROBES_ON_FTRACE=y +CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_ARCH_USE_BUILTIN_BSWAP=y +CONFIG_KRETPROBES=y +CONFIG_USER_RETURN_NOTIFIER=y +CONFIG_HAVE_IOREMAP_PROT=y +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_OPTPROBES=y +CONFIG_HAVE_KPROBES_ON_FTRACE=y +CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y +CONFIG_HAVE_NMI=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_DMA_CONTIGUOUS=y +CONFIG_GENERIC_SMP_IDLE_THREAD=y +CONFIG_ARCH_HAS_FORTIFY_SOURCE=y +CONFIG_ARCH_HAS_SET_MEMORY=y +CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y +CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_RSEQ=y +CONFIG_HAVE_CLK=y +CONFIG_HAVE_HW_BREAKPOINT=y +CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y +CONFIG_HAVE_USER_RETURN_NOTIFIER=y +CONFIG_HAVE_PERF_EVENTS_NMI=y +CONFIG_HAVE_HARDLOCKUP_DETECTOR_PERF=y +CONFIG_HAVE_PERF_REGS=y +CONFIG_HAVE_PERF_USER_STACK_DUMP=y +CONFIG_HAVE_ARCH_JUMP_LABEL=y +CONFIG_HAVE_RCU_TABLE_FREE=y +CONFIG_HAVE_RCU_TABLE_INVALIDATE=y +CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y +CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y +CONFIG_HAVE_CMPXCHG_LOCAL=y +CONFIG_HAVE_CMPXCHG_DOUBLE=y +CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y +CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_SECCOMP_FILTER=y +CONFIG_HAVE_STACKPROTECTOR=y +CONFIG_CC_HAS_STACKPROTECTOR_NONE=y +CONFIG_STACKPROTECTOR=y +CONFIG_STACKPROTECTOR_STRONG=y +CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y +CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y +CONFIG_HAVE_ARCH_HUGE_VMAP=y +CONFIG_HAVE_MOD_ARCH_SPECIFIC=y +CONFIG_MODULES_USE_ELF_REL=y +CONFIG_ARCH_HAS_ELF_RANDOMIZE=y +CONFIG_HAVE_ARCH_MMAP_RND_BITS=y +CONFIG_HAVE_EXIT_THREAD=y +CONFIG_ARCH_MMAP_RND_BITS=8 +CONFIG_HAVE_COPY_THREAD_TLS=y +CONFIG_ISA_BUS_API=y +CONFIG_CLONE_BACKWARDS=y +CONFIG_OLD_SIGSUSPEND3=y +CONFIG_OLD_SIGACTION=y +CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y +CONFIG_STRICT_KERNEL_RWX=y +CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y +CONFIG_STRICT_MODULE_RWX=y +CONFIG_ARCH_HAS_REFCOUNT=y +CONFIG_REFCOUNT_FULL=y +CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y + +# +# GCOV-based kernel profiling +# +# CONFIG_GCOV_KERNEL is not set +CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y +CONFIG_PLUGIN_HOSTCC="" +CONFIG_HAVE_GCC_PLUGINS=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set +CONFIG_MODVERSIONS=y +CONFIG_MODULE_SRCVERSION_ALL=y +# CONFIG_MODULE_SIG is not set +# CONFIG_MODULE_COMPRESS is not set +CONFIG_MODULES_TREE_LOOKUP=y +CONFIG_BLOCK=y +CONFIG_LBDAF=y +CONFIG_BLK_SCSI_REQUEST=y +CONFIG_BLK_DEV_BSG=y +CONFIG_BLK_DEV_BSGLIB=y +CONFIG_BLK_DEV_INTEGRITY=y +CONFIG_BLK_DEV_ZONED=y +CONFIG_BLK_DEV_THROTTLING=y +# CONFIG_BLK_DEV_THROTTLING_LOW is not set +CONFIG_BLK_CMDLINE_PARSER=y +CONFIG_BLK_WBT=y +# CONFIG_BLK_CGROUP_IOLATENCY is not set +# CONFIG_BLK_WBT_SQ is not set +CONFIG_BLK_WBT_MQ=y +CONFIG_BLK_DEBUG_FS=y +CONFIG_BLK_DEBUG_FS_ZONED=y +# CONFIG_BLK_SED_OPAL is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +CONFIG_AIX_PARTITION=y +CONFIG_OSF_PARTITION=y +CONFIG_AMIGA_PARTITION=y +CONFIG_ATARI_PARTITION=y +CONFIG_MAC_PARTITION=y +CONFIG_MSDOS_PARTITION=y +CONFIG_BSD_DISKLABEL=y +CONFIG_MINIX_SUBPARTITION=y +CONFIG_SOLARIS_X86_PARTITION=y +CONFIG_UNIXWARE_DISKLABEL=y +CONFIG_LDM_PARTITION=y +# CONFIG_LDM_DEBUG is not set +CONFIG_SGI_PARTITION=y +CONFIG_ULTRIX_PARTITION=y +CONFIG_SUN_PARTITION=y +CONFIG_KARMA_PARTITION=y +CONFIG_EFI_PARTITION=y +CONFIG_SYSV68_PARTITION=y +CONFIG_CMDLINE_PARTITION=y +CONFIG_BLK_MQ_PCI=y +CONFIG_BLK_MQ_VIRTIO=y +CONFIG_BLK_MQ_RDMA=y + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +CONFIG_CFQ_GROUP_IOSCHED=y +CONFIG_DEFAULT_DEADLINE=y +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="deadline" +CONFIG_MQ_IOSCHED_DEADLINE=m +CONFIG_MQ_IOSCHED_KYBER=m +CONFIG_IOSCHED_BFQ=m +# CONFIG_BFQ_GROUP_IOSCHED is not set +CONFIG_PREEMPT_NOTIFIERS=y +CONFIG_PADATA=y +CONFIG_ASN1=y +CONFIG_INLINE_SPIN_UNLOCK_IRQ=y +CONFIG_INLINE_READ_UNLOCK=y +CONFIG_INLINE_READ_UNLOCK_IRQ=y +CONFIG_INLINE_WRITE_UNLOCK=y +CONFIG_INLINE_WRITE_UNLOCK_IRQ=y +CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y +CONFIG_MUTEX_SPIN_ON_OWNER=y +CONFIG_RWSEM_SPIN_ON_OWNER=y +CONFIG_LOCK_SPIN_ON_OWNER=y +CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y +CONFIG_QUEUED_SPINLOCKS=y +CONFIG_ARCH_USE_QUEUED_RWLOCKS=y +CONFIG_QUEUED_RWLOCKS=y +CONFIG_ARCH_HAS_SYNC_CORE_BEFORE_USERMODE=y +CONFIG_FREEZER=y + +# +# Executable file formats +# +CONFIG_BINFMT_ELF=y +CONFIG_ELFCORE=y +CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y +CONFIG_BINFMT_SCRIPT=y +CONFIG_HAVE_AOUT=y +CONFIG_BINFMT_AOUT=m +CONFIG_BINFMT_MISC=m +CONFIG_COREDUMP=y + +# +# Memory Management options +# +CONFIG_SELECT_MEMORY_MODEL=y +# CONFIG_FLATMEM_MANUAL is not set +CONFIG_SPARSEMEM_MANUAL=y +CONFIG_SPARSEMEM=y +CONFIG_HAVE_MEMORY_PRESENT=y +CONFIG_SPARSEMEM_STATIC=y +CONFIG_HAVE_MEMBLOCK=y +CONFIG_HAVE_MEMBLOCK_NODE_MAP=y +CONFIG_ARCH_DISCARD_MEMBLOCK=y +CONFIG_MEMORY_ISOLATION=y +CONFIG_MEMORY_HOTPLUG=y +CONFIG_MEMORY_HOTPLUG_SPARSE=y +# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set +CONFIG_MEMORY_HOTREMOVE=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_MEMORY_BALLOON=y +CONFIG_BALLOON_COMPACTION=y +CONFIG_COMPACTION=y +CONFIG_MIGRATION=y +CONFIG_PHYS_ADDR_T_64BIT=y +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y +CONFIG_MMU_NOTIFIER=y +CONFIG_KSM=y +CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 +CONFIG_TRANSPARENT_HUGEPAGE=y +CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y +# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set +CONFIG_TRANSPARENT_HUGE_PAGECACHE=y +CONFIG_CLEANCACHE=y +CONFIG_FRONTSWAP=y +CONFIG_CMA=y +# CONFIG_CMA_DEBUG is not set +# CONFIG_CMA_DEBUGFS is not set +CONFIG_CMA_AREAS=7 +CONFIG_ZSWAP=y +CONFIG_ZPOOL=y +CONFIG_ZBUD=y +CONFIG_Z3FOLD=m +CONFIG_ZSMALLOC=y +CONFIG_PGTABLE_MAPPING=y +# CONFIG_ZSMALLOC_STAT is not set +CONFIG_GENERIC_EARLY_IOREMAP=y +CONFIG_IDLE_PAGE_TRACKING=y +CONFIG_FRAME_VECTOR=y +# CONFIG_PERCPU_STATS is not set +# CONFIG_GUP_BENCHMARK is not set +CONFIG_ARCH_HAS_PTE_SPECIAL=y +CONFIG_NET=y +CONFIG_NET_INGRESS=y +CONFIG_NET_EGRESS=y + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_PACKET_DIAG=m +CONFIG_UNIX=y +CONFIG_UNIX_DIAG=m +CONFIG_TLS=m +# CONFIG_TLS_DEVICE is not set +CONFIG_XFRM=y +CONFIG_XFRM_OFFLOAD=y +CONFIG_XFRM_ALGO=m +CONFIG_XFRM_USER=m +CONFIG_XFRM_INTERFACE=m +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +CONFIG_XFRM_STATISTICS=y +CONFIG_XFRM_IPCOMP=m +CONFIG_NET_KEY=m +# CONFIG_NET_KEY_MIGRATE is not set +# CONFIG_SMC is not set +# CONFIG_XDP_SOCKETS is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_IP_FIB_TRIE_STATS=y +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_ROUTE_MULTIPATH=y +CONFIG_IP_ROUTE_VERBOSE=y +CONFIG_IP_ROUTE_CLASSID=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +# CONFIG_IP_PNP_BOOTP is not set +# CONFIG_IP_PNP_RARP is not set +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE_DEMUX=m +CONFIG_NET_IP_TUNNEL=m +CONFIG_NET_IPGRE=m +CONFIG_NET_IPGRE_BROADCAST=y +CONFIG_IP_MROUTE_COMMON=y +CONFIG_IP_MROUTE=y +# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set +CONFIG_IP_PIMSM_V1=y +CONFIG_IP_PIMSM_V2=y +CONFIG_SYN_COOKIES=y +CONFIG_NET_IPVTI=m +CONFIG_NET_UDP_TUNNEL=m +CONFIG_NET_FOU=m +CONFIG_NET_FOU_IP_TUNNELS=y +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +CONFIG_INET_ESP_OFFLOAD=m +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=m +CONFIG_INET_XFRM_MODE_TUNNEL=m +CONFIG_INET_XFRM_MODE_BEET=m +CONFIG_INET_DIAG=m +CONFIG_INET_TCP_DIAG=m +CONFIG_INET_UDP_DIAG=m +CONFIG_INET_RAW_DIAG=m +# CONFIG_INET_DIAG_DESTROY is not set +CONFIG_TCP_CONG_ADVANCED=y +CONFIG_TCP_CONG_BIC=m +CONFIG_TCP_CONG_CUBIC=y +CONFIG_TCP_CONG_WESTWOOD=m +CONFIG_TCP_CONG_HTCP=m +CONFIG_TCP_CONG_HSTCP=m +CONFIG_TCP_CONG_HYBLA=m +CONFIG_TCP_CONG_VEGAS=m +CONFIG_TCP_CONG_NV=m +CONFIG_TCP_CONG_SCALABLE=m +CONFIG_TCP_CONG_LP=m +CONFIG_TCP_CONG_VENO=m +CONFIG_TCP_CONG_YEAH=m +CONFIG_TCP_CONG_ILLINOIS=m +CONFIG_TCP_CONG_DCTCP=m +CONFIG_TCP_CONG_CDG=m +CONFIG_TCP_CONG_BBR=m +CONFIG_DEFAULT_CUBIC=y +# CONFIG_DEFAULT_RENO is not set +CONFIG_DEFAULT_TCP_CONG="cubic" +CONFIG_TCP_MD5SIG=y +CONFIG_IPV6=y +CONFIG_IPV6_ROUTER_PREF=y +CONFIG_IPV6_ROUTE_INFO=y +# CONFIG_IPV6_OPTIMISTIC_DAD is not set +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_ESP_OFFLOAD=m +CONFIG_INET6_IPCOMP=m +CONFIG_IPV6_MIP6=m +CONFIG_IPV6_ILA=m +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=m +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m +CONFIG_IPV6_VTI=m +CONFIG_IPV6_SIT=m +CONFIG_IPV6_SIT_6RD=y +CONFIG_IPV6_NDISC_NODETYPE=y +CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_GRE=m +CONFIG_IPV6_FOU=m +CONFIG_IPV6_FOU_TUNNEL=m +CONFIG_IPV6_MULTIPLE_TABLES=y +CONFIG_IPV6_SUBTREES=y +CONFIG_IPV6_MROUTE=y +CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y +CONFIG_IPV6_PIMSM_V2=y +# CONFIG_IPV6_SEG6_LWTUNNEL is not set +# CONFIG_IPV6_SEG6_HMAC is not set +CONFIG_NETLABEL=y +CONFIG_NETWORK_SECMARK=y +CONFIG_NET_PTP_CLASSIFY=y +# CONFIG_NETWORK_PHY_TIMESTAMPING is not set +CONFIG_NETFILTER=y +CONFIG_NETFILTER_ADVANCED=y +CONFIG_BRIDGE_NETFILTER=m + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_INGRESS=y +CONFIG_NETFILTER_NETLINK=m +CONFIG_NETFILTER_FAMILY_BRIDGE=y +CONFIG_NETFILTER_FAMILY_ARP=y +CONFIG_NETFILTER_NETLINK_ACCT=m +CONFIG_NETFILTER_NETLINK_QUEUE=m +CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NETFILTER_NETLINK_OSF=m +CONFIG_NF_CONNTRACK=m +CONFIG_NF_LOG_COMMON=m +CONFIG_NF_LOG_NETDEV=m +CONFIG_NETFILTER_CONNCOUNT=m +CONFIG_NF_CONNTRACK_MARK=y +CONFIG_NF_CONNTRACK_SECMARK=y +CONFIG_NF_CONNTRACK_ZONES=y +# CONFIG_NF_CONNTRACK_PROCFS is not set +CONFIG_NF_CONNTRACK_EVENTS=y +CONFIG_NF_CONNTRACK_TIMEOUT=y +CONFIG_NF_CONNTRACK_TIMESTAMP=y +CONFIG_NF_CONNTRACK_LABELS=y +CONFIG_NF_CT_PROTO_DCCP=y +CONFIG_NF_CT_PROTO_GRE=m +CONFIG_NF_CT_PROTO_SCTP=y +CONFIG_NF_CT_PROTO_UDPLITE=y +CONFIG_NF_CONNTRACK_AMANDA=m +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_H323=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_BROADCAST=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_SNMP=m +CONFIG_NF_CONNTRACK_PPTP=m +CONFIG_NF_CONNTRACK_SANE=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CONNTRACK_TFTP=m +CONFIG_NF_CT_NETLINK=m +CONFIG_NF_CT_NETLINK_TIMEOUT=m +CONFIG_NF_CT_NETLINK_HELPER=m +CONFIG_NETFILTER_NETLINK_GLUE_CT=y +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_NF_NAT_PROTO_DCCP=y +CONFIG_NF_NAT_PROTO_UDPLITE=y +CONFIG_NF_NAT_PROTO_SCTP=y +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_SIP=m +CONFIG_NF_NAT_TFTP=m +CONFIG_NF_NAT_REDIRECT=y +CONFIG_NETFILTER_SYNPROXY=m +CONFIG_NF_TABLES=m +CONFIG_NF_TABLES_SET=m +# CONFIG_NF_TABLES_INET is not set +# CONFIG_NF_TABLES_NETDEV is not set +CONFIG_NFT_NUMGEN=m +CONFIG_NFT_CT=m +CONFIG_NFT_FLOW_OFFLOAD=m +CONFIG_NFT_COUNTER=m +CONFIG_NFT_CONNLIMIT=m +CONFIG_NFT_LOG=m +CONFIG_NFT_LIMIT=m +CONFIG_NFT_MASQ=m +CONFIG_NFT_REDIR=m +CONFIG_NFT_NAT=m +CONFIG_NFT_TUNNEL=m +CONFIG_NFT_OBJREF=m +CONFIG_NFT_QUEUE=m +CONFIG_NFT_QUOTA=m +CONFIG_NFT_REJECT=m +CONFIG_NFT_COMPAT=m +CONFIG_NFT_HASH=m +CONFIG_NFT_SOCKET=m +CONFIG_NFT_OSF=m +CONFIG_NFT_TPROXY=m +CONFIG_NF_FLOW_TABLE_INET=m +CONFIG_NF_FLOW_TABLE=m +CONFIG_NETFILTER_XTABLES=m + +# +# Xtables combined modules +# +CONFIG_NETFILTER_XT_MARK=m +CONFIG_NETFILTER_XT_CONNMARK=m +CONFIG_NETFILTER_XT_SET=m + +# +# Xtables targets +# +CONFIG_NETFILTER_XT_TARGET_AUDIT=m +CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m +CONFIG_NETFILTER_XT_TARGET_CT=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m +CONFIG_NETFILTER_XT_TARGET_HL=m +CONFIG_NETFILTER_XT_TARGET_HMARK=m +CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m +CONFIG_NETFILTER_XT_TARGET_LED=m +CONFIG_NETFILTER_XT_TARGET_LOG=m +CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_NAT=m +CONFIG_NETFILTER_XT_TARGET_NETMAP=m +CONFIG_NETFILTER_XT_TARGET_NFLOG=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set +CONFIG_NETFILTER_XT_TARGET_RATEEST=m +CONFIG_NETFILTER_XT_TARGET_REDIRECT=m +CONFIG_NETFILTER_XT_TARGET_TEE=m +CONFIG_NETFILTER_XT_TARGET_TPROXY=m +CONFIG_NETFILTER_XT_TARGET_TRACE=m +CONFIG_NETFILTER_XT_TARGET_SECMARK=m +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m +CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m + +# +# Xtables matches +# +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m +CONFIG_NETFILTER_XT_MATCH_BPF=m +CONFIG_NETFILTER_XT_MATCH_CGROUP=m +CONFIG_NETFILTER_XT_MATCH_CLUSTER=m +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_NETFILTER_XT_MATCH_CPU=m +CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m +CONFIG_NETFILTER_XT_MATCH_DSCP=m +CONFIG_NETFILTER_XT_MATCH_ECN=m +CONFIG_NETFILTER_XT_MATCH_ESP=m +CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m +CONFIG_NETFILTER_XT_MATCH_HELPER=m +CONFIG_NETFILTER_XT_MATCH_HL=m +CONFIG_NETFILTER_XT_MATCH_IPCOMP=m +CONFIG_NETFILTER_XT_MATCH_IPRANGE=m +CONFIG_NETFILTER_XT_MATCH_IPVS=m +CONFIG_NETFILTER_XT_MATCH_L2TP=m +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +CONFIG_NETFILTER_XT_MATCH_NFACCT=m +CONFIG_NETFILTER_XT_MATCH_OSF=m +CONFIG_NETFILTER_XT_MATCH_OWNER=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m +CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_QUOTA=m +CONFIG_NETFILTER_XT_MATCH_RATEEST=m +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_RECENT=m +CONFIG_NETFILTER_XT_MATCH_SCTP=m +CONFIG_NETFILTER_XT_MATCH_SOCKET=m +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STATISTIC=m +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m +CONFIG_NETFILTER_XT_MATCH_TIME=m +CONFIG_NETFILTER_XT_MATCH_U32=m +CONFIG_IP_SET=m +CONFIG_IP_SET_MAX=256 +CONFIG_IP_SET_BITMAP_IP=m +CONFIG_IP_SET_BITMAP_IPMAC=m +CONFIG_IP_SET_BITMAP_PORT=m +CONFIG_IP_SET_HASH_IP=m +CONFIG_IP_SET_HASH_IPMARK=m +CONFIG_IP_SET_HASH_IPPORT=m +CONFIG_IP_SET_HASH_IPPORTIP=m +CONFIG_IP_SET_HASH_IPPORTNET=m +CONFIG_IP_SET_HASH_IPMAC=m +CONFIG_IP_SET_HASH_MAC=m +CONFIG_IP_SET_HASH_NETPORTNET=m +CONFIG_IP_SET_HASH_NET=m +CONFIG_IP_SET_HASH_NETNET=m +CONFIG_IP_SET_HASH_NETPORT=m +CONFIG_IP_SET_HASH_NETIFACE=m +CONFIG_IP_SET_LIST_SET=m +CONFIG_IP_VS=m +CONFIG_IP_VS_IPV6=y +# CONFIG_IP_VS_DEBUG is not set +CONFIG_IP_VS_TAB_BITS=12 + +# +# IPVS transport protocol load balancing support +# +CONFIG_IP_VS_PROTO_TCP=y +CONFIG_IP_VS_PROTO_UDP=y +CONFIG_IP_VS_PROTO_AH_ESP=y +CONFIG_IP_VS_PROTO_ESP=y +CONFIG_IP_VS_PROTO_AH=y +CONFIG_IP_VS_PROTO_SCTP=y + +# +# IPVS scheduler +# +CONFIG_IP_VS_RR=m +CONFIG_IP_VS_WRR=m +CONFIG_IP_VS_LC=m +CONFIG_IP_VS_WLC=m +CONFIG_IP_VS_FO=m +CONFIG_IP_VS_OVF=m +CONFIG_IP_VS_LBLC=m +CONFIG_IP_VS_LBLCR=m +CONFIG_IP_VS_DH=m +CONFIG_IP_VS_SH=m +CONFIG_IP_VS_MH=m +CONFIG_IP_VS_SED=m +CONFIG_IP_VS_NQ=m + +# +# IPVS SH scheduler +# +CONFIG_IP_VS_SH_TAB_BITS=8 + +# +# IPVS MH scheduler +# +CONFIG_IP_VS_MH_TAB_INDEX=12 + +# +# IPVS application helper +# +CONFIG_IP_VS_FTP=m +CONFIG_IP_VS_NFCT=y +CONFIG_IP_VS_PE_SIP=m + +# +# IP: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_SOCKET_IPV4=m +CONFIG_NF_TPROXY_IPV4=m +# CONFIG_NF_TABLES_IPV4 is not set +# CONFIG_NF_TABLES_ARP is not set +CONFIG_NF_FLOW_TABLE_IPV4=m +CONFIG_NF_DUP_IPV4=m +CONFIG_NF_LOG_ARP=m +CONFIG_NF_LOG_IPV4=m +CONFIG_NF_REJECT_IPV4=m +CONFIG_NF_NAT_IPV4=m +CONFIG_NF_NAT_MASQUERADE_IPV4=y +CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NF_NAT_PROTO_GRE=m +CONFIG_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_RPFILTER=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_SYNPROXY=m +CONFIG_IP_NF_NAT=m +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_SECURITY=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m + +# +# IPv6: Netfilter Configuration +# +CONFIG_NF_SOCKET_IPV6=m +CONFIG_NF_TPROXY_IPV6=m +# CONFIG_NF_TABLES_IPV6 is not set +CONFIG_NF_FLOW_TABLE_IPV6=m +CONFIG_NF_DUP_IPV6=m +CONFIG_NF_REJECT_IPV6=m +CONFIG_NF_LOG_IPV6=m +CONFIG_NF_NAT_IPV6=m +CONFIG_NF_NAT_MASQUERADE_IPV6=y +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_MH=m +CONFIG_IP6_NF_MATCH_RPFILTER=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_MATCH_SRH=m +CONFIG_IP6_NF_TARGET_HL=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_TARGET_SYNPROXY=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_RAW=m +CONFIG_IP6_NF_SECURITY=m +CONFIG_IP6_NF_NAT=m +CONFIG_IP6_NF_TARGET_MASQUERADE=m +CONFIG_IP6_NF_TARGET_NPT=m +CONFIG_NF_DEFRAG_IPV6=m + +# +# DECnet: Netfilter Configuration +# +CONFIG_DECNET_NF_GRABULATOR=m +# CONFIG_NF_TABLES_BRIDGE is not set +CONFIG_BRIDGE_NF_EBTABLES=m +CONFIG_BRIDGE_EBT_BROUTE=m +CONFIG_BRIDGE_EBT_T_FILTER=m +CONFIG_BRIDGE_EBT_T_NAT=m +CONFIG_BRIDGE_EBT_802_3=m +CONFIG_BRIDGE_EBT_AMONG=m +CONFIG_BRIDGE_EBT_ARP=m +CONFIG_BRIDGE_EBT_IP=m +CONFIG_BRIDGE_EBT_IP6=m +CONFIG_BRIDGE_EBT_LIMIT=m +CONFIG_BRIDGE_EBT_MARK=m +CONFIG_BRIDGE_EBT_PKTTYPE=m +CONFIG_BRIDGE_EBT_STP=m +CONFIG_BRIDGE_EBT_VLAN=m +CONFIG_BRIDGE_EBT_ARPREPLY=m +CONFIG_BRIDGE_EBT_DNAT=m +CONFIG_BRIDGE_EBT_MARK_T=m +CONFIG_BRIDGE_EBT_REDIRECT=m +CONFIG_BRIDGE_EBT_SNAT=m +CONFIG_BRIDGE_EBT_LOG=m +CONFIG_BRIDGE_EBT_NFLOG=m +# CONFIG_BPFILTER is not set +CONFIG_IP_DCCP=m +CONFIG_INET_DCCP_DIAG=m + +# +# DCCP CCIDs Configuration +# +# CONFIG_IP_DCCP_CCID2_DEBUG is not set +# CONFIG_IP_DCCP_CCID3 is not set + +# +# DCCP Kernel Hacking +# +# CONFIG_IP_DCCP_DEBUG is not set +CONFIG_IP_SCTP=m +# CONFIG_SCTP_DBG_OBJCNT is not set +# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set +CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y +# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set +CONFIG_SCTP_COOKIE_HMAC_MD5=y +CONFIG_SCTP_COOKIE_HMAC_SHA1=y +CONFIG_INET_SCTP_DIAG=m +CONFIG_RDS=m +CONFIG_RDS_RDMA=m +CONFIG_RDS_TCP=m +# CONFIG_RDS_DEBUG is not set +CONFIG_TIPC=m +CONFIG_TIPC_MEDIA_IB=y +CONFIG_TIPC_MEDIA_UDP=y +CONFIG_TIPC_DIAG=m +CONFIG_ATM=m +CONFIG_ATM_CLIP=m +# CONFIG_ATM_CLIP_NO_ICMP is not set +CONFIG_ATM_LANE=m +CONFIG_ATM_MPOA=m +CONFIG_ATM_BR2684=m +# CONFIG_ATM_BR2684_IPFILTER is not set +CONFIG_L2TP=m +CONFIG_L2TP_DEBUGFS=m +CONFIG_L2TP_V3=y +CONFIG_L2TP_IP=m +CONFIG_L2TP_ETH=m +CONFIG_STP=m +CONFIG_GARP=m +CONFIG_MRP=m +CONFIG_BRIDGE=m +CONFIG_BRIDGE_IGMP_SNOOPING=y +CONFIG_BRIDGE_VLAN_FILTERING=y +CONFIG_HAVE_NET_DSA=y +CONFIG_NET_DSA=m +CONFIG_NET_DSA_LEGACY=y +CONFIG_NET_DSA_TAG_BRCM=y +CONFIG_NET_DSA_TAG_BRCM_PREPEND=y +CONFIG_NET_DSA_TAG_DSA=y +CONFIG_NET_DSA_TAG_EDSA=y +CONFIG_NET_DSA_TAG_KSZ=y +CONFIG_NET_DSA_TAG_LAN9303=y +CONFIG_NET_DSA_TAG_MTK=y +CONFIG_NET_DSA_TAG_TRAILER=y +CONFIG_NET_DSA_TAG_QCA=y +CONFIG_VLAN_8021Q=m +CONFIG_VLAN_8021Q_GVRP=y +CONFIG_VLAN_8021Q_MVRP=y +CONFIG_DECNET=m +# CONFIG_DECNET_ROUTER is not set +CONFIG_LLC=m +CONFIG_LLC2=m +CONFIG_ATALK=m +CONFIG_DEV_APPLETALK=m +CONFIG_LTPC=m +CONFIG_COPS=m +CONFIG_COPS_DAYNA=y +CONFIG_COPS_TANGENT=y +CONFIG_IPDDP=m +CONFIG_IPDDP_ENCAP=y +CONFIG_X25=m +CONFIG_LAPB=m +CONFIG_PHONET=m +CONFIG_6LOWPAN=m +# CONFIG_6LOWPAN_DEBUGFS is not set +CONFIG_6LOWPAN_NHC=m +CONFIG_6LOWPAN_NHC_DEST=m +CONFIG_6LOWPAN_NHC_FRAGMENT=m +CONFIG_6LOWPAN_NHC_HOP=m +CONFIG_6LOWPAN_NHC_IPV6=m +CONFIG_6LOWPAN_NHC_MOBILITY=m +CONFIG_6LOWPAN_NHC_ROUTING=m +CONFIG_6LOWPAN_NHC_UDP=m +CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m +CONFIG_6LOWPAN_GHC_UDP=m +CONFIG_6LOWPAN_GHC_ICMPV6=m +CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m +CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m +CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m +CONFIG_IEEE802154=m +CONFIG_IEEE802154_NL802154_EXPERIMENTAL=y +CONFIG_IEEE802154_SOCKET=m +CONFIG_IEEE802154_6LOWPAN=m +CONFIG_MAC802154=m +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +CONFIG_NET_SCH_CBQ=m +CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_HFSC=m +CONFIG_NET_SCH_ATM=m +CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_MULTIQ=m +CONFIG_NET_SCH_RED=m +CONFIG_NET_SCH_SFB=m +CONFIG_NET_SCH_SFQ=m +CONFIG_NET_SCH_TEQL=m +CONFIG_NET_SCH_TBF=m +CONFIG_NET_SCH_CBS=m +CONFIG_NET_SCH_ETF=m +CONFIG_NET_SCH_GRED=m +CONFIG_NET_SCH_DSMARK=m +CONFIG_NET_SCH_NETEM=m +CONFIG_NET_SCH_DRR=m +CONFIG_NET_SCH_MQPRIO=m +CONFIG_NET_SCH_SKBPRIO=m +CONFIG_NET_SCH_CHOKE=m +CONFIG_NET_SCH_QFQ=m +CONFIG_NET_SCH_CODEL=m +CONFIG_NET_SCH_FQ_CODEL=m +CONFIG_NET_SCH_CAKE=m +CONFIG_NET_SCH_FQ=m +CONFIG_NET_SCH_HHF=m +CONFIG_NET_SCH_PIE=m +CONFIG_NET_SCH_INGRESS=m +CONFIG_NET_SCH_PLUG=m +# CONFIG_NET_SCH_DEFAULT is not set + +# +# Classification +# +CONFIG_NET_CLS=y +CONFIG_NET_CLS_BASIC=m +CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_CLS_ROUTE4=m +CONFIG_NET_CLS_FW=m +CONFIG_NET_CLS_U32=m +# CONFIG_CLS_U32_PERF is not set +CONFIG_CLS_U32_MARK=y +CONFIG_NET_CLS_RSVP=m +CONFIG_NET_CLS_RSVP6=m +CONFIG_NET_CLS_FLOW=m +CONFIG_NET_CLS_CGROUP=m +CONFIG_NET_CLS_BPF=m +CONFIG_NET_CLS_FLOWER=m +CONFIG_NET_CLS_MATCHALL=m +CONFIG_NET_EMATCH=y +CONFIG_NET_EMATCH_STACK=32 +CONFIG_NET_EMATCH_CMP=m +CONFIG_NET_EMATCH_NBYTE=m +CONFIG_NET_EMATCH_U32=m +CONFIG_NET_EMATCH_META=m +CONFIG_NET_EMATCH_TEXT=m +CONFIG_NET_EMATCH_CANID=m +CONFIG_NET_EMATCH_IPSET=m +CONFIG_NET_EMATCH_IPT=m +CONFIG_NET_CLS_ACT=y +CONFIG_NET_ACT_POLICE=m +CONFIG_NET_ACT_GACT=m +CONFIG_GACT_PROB=y +CONFIG_NET_ACT_MIRRED=m +CONFIG_NET_ACT_SAMPLE=m +CONFIG_NET_ACT_IPT=m +CONFIG_NET_ACT_NAT=m +CONFIG_NET_ACT_PEDIT=m +CONFIG_NET_ACT_SIMP=m +CONFIG_NET_ACT_SKBEDIT=m +CONFIG_NET_ACT_CSUM=m +CONFIG_NET_ACT_VLAN=m +CONFIG_NET_ACT_BPF=m +CONFIG_NET_ACT_CONNMARK=m +CONFIG_NET_ACT_SKBMOD=m +CONFIG_NET_ACT_IFE=m +CONFIG_NET_ACT_TUNNEL_KEY=m +CONFIG_NET_IFE_SKBMARK=m +CONFIG_NET_IFE_SKBPRIO=m +CONFIG_NET_IFE_SKBTCINDEX=m +# CONFIG_NET_CLS_IND is not set +CONFIG_NET_SCH_FIFO=y +CONFIG_DCB=y +CONFIG_DNS_RESOLVER=y +CONFIG_BATMAN_ADV=m +# CONFIG_BATMAN_ADV_BATMAN_V is not set +CONFIG_BATMAN_ADV_BLA=y +CONFIG_BATMAN_ADV_DAT=y +CONFIG_BATMAN_ADV_NC=y +CONFIG_BATMAN_ADV_MCAST=y +CONFIG_BATMAN_ADV_DEBUGFS=y +# CONFIG_BATMAN_ADV_DEBUG is not set +CONFIG_OPENVSWITCH=m +CONFIG_OPENVSWITCH_GRE=m +CONFIG_OPENVSWITCH_VXLAN=m +CONFIG_OPENVSWITCH_GENEVE=m +CONFIG_VSOCKETS=m +CONFIG_VSOCKETS_DIAG=m +CONFIG_VMWARE_VMCI_VSOCKETS=m +CONFIG_VIRTIO_VSOCKETS=m +CONFIG_VIRTIO_VSOCKETS_COMMON=m +CONFIG_HYPERV_VSOCKETS=m +CONFIG_NETLINK_DIAG=m +CONFIG_MPLS=y +CONFIG_NET_MPLS_GSO=m +CONFIG_MPLS_ROUTING=m +CONFIG_MPLS_IPTUNNEL=m +CONFIG_NET_NSH=m +CONFIG_HSR=m +CONFIG_NET_SWITCHDEV=y +CONFIG_NET_L3_MASTER_DEV=y +CONFIG_NET_NCSI=y +CONFIG_RPS=y +CONFIG_RFS_ACCEL=y +CONFIG_XPS=y +CONFIG_CGROUP_NET_PRIO=y +CONFIG_CGROUP_NET_CLASSID=y +CONFIG_NET_RX_BUSY_POLL=y +CONFIG_BQL=y +# CONFIG_BPF_JIT is not set +# CONFIG_BPF_STREAM_PARSER is not set +CONFIG_NET_FLOW_LIMIT=y + +# +# Network testing +# +CONFIG_NET_PKTGEN=m +# CONFIG_NET_DROP_MONITOR is not set +CONFIG_HAMRADIO=y + +# +# Packet Radio protocols +# +CONFIG_AX25=m +CONFIG_AX25_DAMA_SLAVE=y +CONFIG_NETROM=m +CONFIG_ROSE=m + +# +# AX.25 network device drivers +# +CONFIG_MKISS=m +CONFIG_6PACK=m +CONFIG_BPQETHER=m +CONFIG_SCC=m +# CONFIG_SCC_DELAY is not set +# CONFIG_SCC_TRXECHO is not set +CONFIG_BAYCOM_SER_FDX=m +CONFIG_BAYCOM_SER_HDX=m +CONFIG_BAYCOM_PAR=m +CONFIG_BAYCOM_EPP=m +CONFIG_YAM=m +CONFIG_CAN=m +CONFIG_CAN_RAW=m +CONFIG_CAN_BCM=m +CONFIG_CAN_GW=m + +# +# CAN Device Drivers +# +CONFIG_CAN_VCAN=m +CONFIG_CAN_VXCAN=m +CONFIG_CAN_SLCAN=m +CONFIG_CAN_DEV=m +CONFIG_CAN_CALC_BITTIMING=y +CONFIG_CAN_JANZ_ICAN3=m +CONFIG_PCH_CAN=m +CONFIG_CAN_C_CAN=m +CONFIG_CAN_C_CAN_PLATFORM=m +CONFIG_CAN_C_CAN_PCI=m +CONFIG_CAN_CC770=m +CONFIG_CAN_CC770_ISA=m +CONFIG_CAN_CC770_PLATFORM=m +CONFIG_CAN_IFI_CANFD=m +CONFIG_CAN_M_CAN=m +CONFIG_CAN_PEAK_PCIEFD=m +CONFIG_CAN_SJA1000=m +CONFIG_CAN_SJA1000_ISA=m +CONFIG_CAN_SJA1000_PLATFORM=m +CONFIG_CAN_EMS_PCMCIA=m +CONFIG_CAN_EMS_PCI=m +CONFIG_CAN_PEAK_PCMCIA=m +CONFIG_CAN_PEAK_PCI=m +CONFIG_CAN_PEAK_PCIEC=y +CONFIG_CAN_KVASER_PCI=m +CONFIG_CAN_PLX_PCI=m +CONFIG_CAN_TSCAN1=m +CONFIG_CAN_SOFTING=m +CONFIG_CAN_SOFTING_CS=m + +# +# CAN SPI interfaces +# +CONFIG_CAN_HI311X=m +CONFIG_CAN_MCP251X=m + +# +# CAN USB interfaces +# +CONFIG_CAN_8DEV_USB=m +CONFIG_CAN_EMS_USB=m +CONFIG_CAN_ESD_USB2=m +CONFIG_CAN_GS_USB=m +CONFIG_CAN_KVASER_USB=m +CONFIG_CAN_MCBA_USB=m +CONFIG_CAN_PEAK_USB=m +CONFIG_CAN_UCAN=m +# CONFIG_CAN_DEBUG_DEVICES is not set +CONFIG_BT=m +CONFIG_BT_BREDR=y +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_CMTP=m +CONFIG_BT_HIDP=m +CONFIG_BT_HS=y +CONFIG_BT_LE=y +CONFIG_BT_6LOWPAN=m +# CONFIG_BT_LEDS is not set +# CONFIG_BT_SELFTEST is not set +CONFIG_BT_DEBUGFS=y + +# +# Bluetooth device drivers +# +CONFIG_BT_INTEL=m +CONFIG_BT_BCM=m +CONFIG_BT_RTL=m +CONFIG_BT_QCA=m +CONFIG_BT_HCIBTUSB=m +# CONFIG_BT_HCIBTUSB_AUTOSUSPEND is not set +CONFIG_BT_HCIBTUSB_BCM=y +CONFIG_BT_HCIBTUSB_RTL=y +CONFIG_BT_HCIBTSDIO=m +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_SERDEV=y +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_NOKIA=m +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIUART_ATH3K=y +CONFIG_BT_HCIUART_LL=y +CONFIG_BT_HCIUART_3WIRE=y +CONFIG_BT_HCIUART_INTEL=y +CONFIG_BT_HCIUART_BCM=y +CONFIG_BT_HCIUART_RTL=y +CONFIG_BT_HCIUART_QCA=y +CONFIG_BT_HCIUART_AG6XX=y +CONFIG_BT_HCIUART_MRVL=y +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m +CONFIG_BT_HCIDTL1=m +CONFIG_BT_HCIBT3C=m +CONFIG_BT_HCIBLUECARD=m +CONFIG_BT_HCIVHCI=m +CONFIG_BT_MRVL=m +CONFIG_BT_MRVL_SDIO=m +CONFIG_BT_ATH3K=m +CONFIG_BT_WILINK=m +CONFIG_BT_MTKUART=m +CONFIG_BT_HCIRSI=m +CONFIG_AF_RXRPC=m +CONFIG_AF_RXRPC_IPV6=y +# CONFIG_AF_RXRPC_INJECT_LOSS is not set +# CONFIG_AF_RXRPC_DEBUG is not set +# CONFIG_RXKAD is not set +CONFIG_AF_KCM=m +CONFIG_STREAM_PARSER=m +CONFIG_FIB_RULES=y +CONFIG_WIRELESS=y +CONFIG_WIRELESS_EXT=y +CONFIG_WEXT_CORE=y +CONFIG_WEXT_PROC=y +CONFIG_WEXT_SPY=y +CONFIG_WEXT_PRIV=y +CONFIG_CFG80211=m +# CONFIG_NL80211_TESTMODE is not set +# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set +# CONFIG_CFG80211_CERTIFICATION_ONUS is not set +CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y +CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y +CONFIG_CFG80211_DEFAULT_PS=y +CONFIG_CFG80211_DEBUGFS=y +CONFIG_CFG80211_CRDA_SUPPORT=y +CONFIG_CFG80211_WEXT=y +CONFIG_CFG80211_WEXT_EXPORT=y +CONFIG_LIB80211=m +CONFIG_LIB80211_CRYPT_WEP=m +CONFIG_LIB80211_CRYPT_CCMP=m +CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set +CONFIG_MAC80211=m +CONFIG_MAC80211_HAS_RC=y +CONFIG_MAC80211_RC_MINSTREL=y +CONFIG_MAC80211_RC_MINSTREL_HT=y +CONFIG_MAC80211_RC_MINSTREL_VHT=y +CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y +CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" +CONFIG_MAC80211_MESH=y +CONFIG_MAC80211_LEDS=y +CONFIG_MAC80211_DEBUGFS=y +CONFIG_MAC80211_MESSAGE_TRACING=y +# CONFIG_MAC80211_DEBUG_MENU is not set +CONFIG_MAC80211_STA_HASH_MAX_SIZE=0 +CONFIG_WIMAX=m +CONFIG_WIMAX_DEBUG_LEVEL=8 +CONFIG_RFKILL=y +CONFIG_RFKILL_LEDS=y +CONFIG_RFKILL_INPUT=y +CONFIG_RFKILL_GPIO=m +CONFIG_NET_9P=m +CONFIG_NET_9P_VIRTIO=m +CONFIG_NET_9P_XEN=m +CONFIG_NET_9P_RDMA=m +# CONFIG_NET_9P_DEBUG is not set +CONFIG_CAIF=m +# CONFIG_CAIF_DEBUG is not set +CONFIG_CAIF_NETDEV=m +CONFIG_CAIF_USB=m +CONFIG_CEPH_LIB=m +# CONFIG_CEPH_LIB_PRETTYDEBUG is not set +CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y +CONFIG_NFC=m +CONFIG_NFC_DIGITAL=m +CONFIG_NFC_NCI=m +CONFIG_NFC_NCI_SPI=m +CONFIG_NFC_NCI_UART=m +CONFIG_NFC_HCI=m +CONFIG_NFC_SHDLC=y + +# +# Near Field Communication (NFC) devices +# +CONFIG_NFC_TRF7970A=m +CONFIG_NFC_MEI_PHY=m +CONFIG_NFC_SIM=m +CONFIG_NFC_PORT100=m +CONFIG_NFC_FDP=m +CONFIG_NFC_FDP_I2C=m +CONFIG_NFC_PN544=m +CONFIG_NFC_PN544_I2C=m +CONFIG_NFC_PN544_MEI=m +CONFIG_NFC_PN533=m +CONFIG_NFC_PN533_USB=m +CONFIG_NFC_PN533_I2C=m +CONFIG_NFC_MICROREAD=m +CONFIG_NFC_MICROREAD_I2C=m +CONFIG_NFC_MICROREAD_MEI=m +CONFIG_NFC_MRVL=m +CONFIG_NFC_MRVL_USB=m +CONFIG_NFC_MRVL_UART=m +CONFIG_NFC_MRVL_I2C=m +CONFIG_NFC_MRVL_SPI=m +CONFIG_NFC_ST21NFCA=m +CONFIG_NFC_ST21NFCA_I2C=m +CONFIG_NFC_ST_NCI=m +CONFIG_NFC_ST_NCI_I2C=m +CONFIG_NFC_ST_NCI_SPI=m +CONFIG_NFC_NXP_NCI=m +CONFIG_NFC_NXP_NCI_I2C=m +CONFIG_NFC_S3FWRN5=m +CONFIG_NFC_S3FWRN5_I2C=m +CONFIG_NFC_ST95HF=m +CONFIG_PSAMPLE=m +CONFIG_NET_IFE=m +CONFIG_LWTUNNEL=y +CONFIG_LWTUNNEL_BPF=y +CONFIG_DST_CACHE=y +CONFIG_GRO_CELLS=y +CONFIG_NET_DEVLINK=m +CONFIG_MAY_USE_DEVLINK=m +CONFIG_PAGE_POOL=y +CONFIG_FAILOVER=y +CONFIG_HAVE_EBPF_JIT=y + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER=y +CONFIG_UEVENT_HELPER_PATH="" +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +# CONFIG_STANDALONE is not set +CONFIG_PREVENT_FIRMWARE_BUILD=y + +# +# Firmware loader +# +CONFIG_FW_LOADER=y +CONFIG_EXTRA_FIRMWARE="" +CONFIG_FW_LOADER_USER_HELPER=y +# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set +CONFIG_WANT_DEV_COREDUMP=y +CONFIG_ALLOW_DEV_COREDUMP=y +CONFIG_DEV_COREDUMP=y +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set +# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set +CONFIG_SYS_HYPERVISOR=y +CONFIG_GENERIC_CPU_AUTOPROBE=y +CONFIG_GENERIC_CPU_VULNERABILITIES=y +CONFIG_REGMAP=y +CONFIG_REGMAP_I2C=y +CONFIG_REGMAP_SPI=y +CONFIG_REGMAP_SPMI=m +CONFIG_REGMAP_W1=m +CONFIG_REGMAP_MMIO=y +CONFIG_REGMAP_IRQ=y +CONFIG_DMA_SHARED_BUFFER=y +# CONFIG_DMA_FENCE_TRACE is not set +# CONFIG_DMA_CMA is not set + +# +# Bus devices +# +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=y +CONFIG_GNSS=m +CONFIG_GNSS_SERIAL=m +CONFIG_GNSS_SIRF_SERIAL=m +CONFIG_GNSS_UBX_SERIAL=m +CONFIG_MTD=m +# CONFIG_MTD_TESTS is not set +CONFIG_MTD_REDBOOT_PARTS=m +CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 +# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set +# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set +CONFIG_MTD_CMDLINE_PARTS=m +CONFIG_MTD_AR7_PARTS=m + +# +# Partition parsers +# + +# +# User Modules And Translation Layers +# +CONFIG_MTD_BLKDEVS=m +CONFIG_MTD_BLOCK=m +CONFIG_MTD_BLOCK_RO=m +CONFIG_FTL=m +CONFIG_NFTL=m +CONFIG_NFTL_RW=y +CONFIG_INFTL=m +CONFIG_RFD_FTL=m +CONFIG_SSFDC=m +CONFIG_SM_FTL=m +CONFIG_MTD_OOPS=m +CONFIG_MTD_SWAP=m +# CONFIG_MTD_PARTITIONED_MASTER is not set + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=m +CONFIG_MTD_JEDECPROBE=m +CONFIG_MTD_GEN_PROBE=m +# CONFIG_MTD_CFI_ADV_OPTIONS is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +CONFIG_MTD_CFI_INTELEXT=m +CONFIG_MTD_CFI_AMDSTD=m +CONFIG_MTD_CFI_STAA=m +CONFIG_MTD_CFI_UTIL=m +CONFIG_MTD_RAM=m +CONFIG_MTD_ROM=m +CONFIG_MTD_ABSENT=m + +# +# Mapping drivers for chip access +# +CONFIG_MTD_COMPLEX_MAPPINGS=y +CONFIG_MTD_PHYSMAP=m +# CONFIG_MTD_PHYSMAP_COMPAT is not set +CONFIG_MTD_SBC_GXX=m +CONFIG_MTD_SCx200_DOCFLASH=m +CONFIG_MTD_AMD76XROM=m +CONFIG_MTD_ICHXROM=m +CONFIG_MTD_ESB2ROM=m +CONFIG_MTD_CK804XROM=m +CONFIG_MTD_SCB2_FLASH=m +CONFIG_MTD_NETtel=m +CONFIG_MTD_L440GX=m +CONFIG_MTD_PCI=m +CONFIG_MTD_PCMCIA=m +# CONFIG_MTD_PCMCIA_ANONYMOUS is not set +CONFIG_MTD_GPIO_ADDR=m +CONFIG_MTD_INTEL_VR_NOR=m +CONFIG_MTD_PLATRAM=m +CONFIG_MTD_LATCH_ADDR=m + +# +# Self-contained MTD device drivers +# +CONFIG_MTD_PMC551=m +# CONFIG_MTD_PMC551_BUGFIX is not set +# CONFIG_MTD_PMC551_DEBUG is not set +CONFIG_MTD_DATAFLASH=m +# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set +CONFIG_MTD_DATAFLASH_OTP=y +CONFIG_MTD_M25P80=m +CONFIG_MTD_MCHP23K256=m +CONFIG_MTD_SST25L=m +CONFIG_MTD_SLRAM=m +CONFIG_MTD_PHRAM=m +CONFIG_MTD_MTDRAM=m +CONFIG_MTDRAM_TOTAL_SIZE=4096 +CONFIG_MTDRAM_ERASE_SIZE=128 +CONFIG_MTD_BLOCK2MTD=m + +# +# Disk-On-Chip Device Drivers +# +CONFIG_MTD_DOCG3=m +CONFIG_BCH_CONST_M=14 +CONFIG_BCH_CONST_T=4 +CONFIG_MTD_NAND_CORE=m +CONFIG_MTD_ONENAND=m +CONFIG_MTD_ONENAND_VERIFY_WRITE=y +CONFIG_MTD_ONENAND_GENERIC=m +# CONFIG_MTD_ONENAND_OTP is not set +CONFIG_MTD_ONENAND_2X_PROGRAM=y +CONFIG_MTD_NAND_ECC=m +# CONFIG_MTD_NAND_ECC_SMC is not set +CONFIG_MTD_NAND=m +CONFIG_MTD_NAND_BCH=m +CONFIG_MTD_NAND_ECC_BCH=y +CONFIG_MTD_SM_COMMON=m +CONFIG_MTD_NAND_DENALI=m +CONFIG_MTD_NAND_DENALI_PCI=m +CONFIG_MTD_NAND_GPIO=m +CONFIG_MTD_NAND_RICOH=m +CONFIG_MTD_NAND_DISKONCHIP=m +# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set +CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 +# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set +CONFIG_MTD_NAND_DOCG4=m +CONFIG_MTD_NAND_CAFE=m +CONFIG_MTD_NAND_CS553X=m +CONFIG_MTD_NAND_NANDSIM=m +CONFIG_MTD_NAND_PLATFORM=m +CONFIG_MTD_SPI_NAND=m + +# +# LPDDR & LPDDR2 PCM memory drivers +# +CONFIG_MTD_LPDDR=m +CONFIG_MTD_QINFO_PROBE=m +CONFIG_MTD_SPI_NOR=m +CONFIG_MTD_MT81xx_NOR=m +CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y +CONFIG_SPI_INTEL_SPI=m +CONFIG_SPI_INTEL_SPI_PCI=m +CONFIG_SPI_INTEL_SPI_PLATFORM=m +CONFIG_MTD_UBI=m +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MTD_UBI_BEB_LIMIT=20 +CONFIG_MTD_UBI_FASTMAP=y +CONFIG_MTD_UBI_GLUEBI=m +CONFIG_MTD_UBI_BLOCK=y +# CONFIG_OF is not set +CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y +CONFIG_PARPORT=m +CONFIG_PARPORT_PC=m +CONFIG_PARPORT_SERIAL=m +CONFIG_PARPORT_PC_FIFO=y +# CONFIG_PARPORT_PC_SUPERIO is not set +CONFIG_PARPORT_PC_PCMCIA=m +CONFIG_PARPORT_AX88796=m +CONFIG_PARPORT_1284=y +CONFIG_PARPORT_NOT_PC=y +CONFIG_PNP=y +# CONFIG_PNP_DEBUG_MESSAGES is not set + +# +# Protocols +# +CONFIG_ISAPNP=y +CONFIG_PNPBIOS=y +CONFIG_PNPBIOS_PROC_FS=y +CONFIG_PNPACPI=y +CONFIG_BLK_DEV=y +CONFIG_BLK_DEV_NULL_BLK=m +CONFIG_BLK_DEV_FD=m +CONFIG_CDROM=y +CONFIG_PARIDE=m + +# +# Parallel IDE high-level drivers +# +CONFIG_PARIDE_PD=m +CONFIG_PARIDE_PCD=m +CONFIG_PARIDE_PF=m +CONFIG_PARIDE_PT=m +CONFIG_PARIDE_PG=m + +# +# Parallel IDE protocol modules +# +CONFIG_PARIDE_ATEN=m +CONFIG_PARIDE_BPCK=m +CONFIG_PARIDE_BPCK6=m +CONFIG_PARIDE_COMM=m +CONFIG_PARIDE_DSTR=m +CONFIG_PARIDE_FIT2=m +CONFIG_PARIDE_FIT3=m +CONFIG_PARIDE_EPAT=m +CONFIG_PARIDE_EPATC8=y +CONFIG_PARIDE_EPIA=m +CONFIG_PARIDE_FRIQ=m +CONFIG_PARIDE_FRPW=m +CONFIG_PARIDE_KBIC=m +CONFIG_PARIDE_KTTI=m +CONFIG_PARIDE_ON20=m +CONFIG_PARIDE_ON26=m +CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m +CONFIG_ZRAM=m +# CONFIG_ZRAM_WRITEBACK is not set +# CONFIG_ZRAM_MEMORY_TRACKING is not set +CONFIG_BLK_DEV_DAC960=m +CONFIG_BLK_DEV_UMEM=m +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 +CONFIG_BLK_DEV_CRYPTOLOOP=m +CONFIG_BLK_DEV_DRBD=m +# CONFIG_DRBD_FAULT_INJECTION is not set +CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_SX8=m +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=65536 +CONFIG_CDROM_PKTCDVD=m +CONFIG_CDROM_PKTCDVD_BUFFERS=8 +# CONFIG_CDROM_PKTCDVD_WCACHE is not set +CONFIG_ATA_OVER_ETH=m +CONFIG_XEN_BLKDEV_FRONTEND=y +CONFIG_XEN_BLKDEV_BACKEND=m +CONFIG_VIRTIO_BLK=y +# CONFIG_VIRTIO_BLK_SCSI is not set +CONFIG_BLK_DEV_RBD=m +CONFIG_BLK_DEV_RSXX=m + +# +# NVME Support +# +CONFIG_NVME_CORE=y +CONFIG_BLK_DEV_NVME=y +# CONFIG_NVME_MULTIPATH is not set +CONFIG_NVME_FABRICS=m +CONFIG_NVME_RDMA=m +CONFIG_NVME_FC=m +CONFIG_NVME_TARGET=m +CONFIG_NVME_TARGET_LOOP=m +CONFIG_NVME_TARGET_RDMA=m +CONFIG_NVME_TARGET_FC=m +CONFIG_NVME_TARGET_FCLOOP=m + +# +# Misc devices +# +CONFIG_SENSORS_LIS3LV02D=m +CONFIG_AD525X_DPOT=m +CONFIG_AD525X_DPOT_I2C=m +CONFIG_AD525X_DPOT_SPI=m +CONFIG_DUMMY_IRQ=m +CONFIG_IBM_ASM=m +CONFIG_PHANTOM=m +CONFIG_INTEL_MID_PTI=m +CONFIG_SGI_IOC4=m +CONFIG_TIFM_CORE=m +CONFIG_TIFM_7XX1=m +CONFIG_ICS932S401=m +CONFIG_ENCLOSURE_SERVICES=m +# CONFIG_CS5535_MFGPT is not set +CONFIG_HP_ILO=m +CONFIG_APDS9802ALS=m +CONFIG_ISL29003=m +CONFIG_ISL29020=m +CONFIG_SENSORS_TSL2550=m +CONFIG_SENSORS_BH1770=m +CONFIG_SENSORS_APDS990X=m +CONFIG_HMC6352=m +CONFIG_DS1682=m +CONFIG_VMWARE_BALLOON=m +CONFIG_PCH_PHUB=m +CONFIG_USB_SWITCH_FSA9480=m +CONFIG_LATTICE_ECP3_CONFIG=m +CONFIG_SRAM=y +# CONFIG_PCI_ENDPOINT_TEST is not set +CONFIG_MISC_RTSX=m +CONFIG_C2PORT=m +CONFIG_C2PORT_DURAMAR_2150=m + +# +# EEPROM support +# +CONFIG_EEPROM_AT24=m +CONFIG_EEPROM_AT25=m +CONFIG_EEPROM_LEGACY=m +CONFIG_EEPROM_MAX6875=m +CONFIG_EEPROM_93CX6=m +CONFIG_EEPROM_93XX46=m +CONFIG_EEPROM_IDT_89HPESX=m +CONFIG_CB710_CORE=m +# CONFIG_CB710_DEBUG is not set +CONFIG_CB710_DEBUG_ASSUMPTIONS=y + +# +# Texas Instruments shared transport line discipline +# +CONFIG_TI_ST=m +CONFIG_SENSORS_LIS3_I2C=m +CONFIG_ALTERA_STAPL=m +CONFIG_INTEL_MEI=m +CONFIG_INTEL_MEI_ME=m +CONFIG_INTEL_MEI_TXE=m +CONFIG_VMWARE_VMCI=m + +# +# Intel MIC & related support +# + +# +# Intel MIC Bus Driver +# + +# +# SCIF Bus Driver +# + +# +# VOP Bus Driver +# + +# +# Intel MIC Host Driver +# + +# +# Intel MIC Card Driver +# + +# +# SCIF Driver +# + +# +# Intel MIC Coprocessor State Management (COSM) Drivers +# + +# +# VOP Driver +# +CONFIG_VHOST_RING=m +CONFIG_ECHO=m +CONFIG_MISC_RTSX_PCI=m +CONFIG_MISC_RTSX_USB=m +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set + +# +# SCSI device support +# +CONFIG_SCSI_MOD=y +CONFIG_RAID_ATTRS=m +CONFIG_SCSI=y +CONFIG_SCSI_DMA=y +CONFIG_SCSI_NETLINK=y +# CONFIG_SCSI_MQ_DEFAULT is not set +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=y +CONFIG_CHR_DEV_ST=m +CONFIG_CHR_DEV_OSST=m +CONFIG_BLK_DEV_SR=y +# CONFIG_BLK_DEV_SR_VENDOR is not set +CONFIG_CHR_DEV_SG=y +CONFIG_CHR_DEV_SCH=m +CONFIG_SCSI_ENCLOSURE=m +CONFIG_SCSI_CONSTANTS=y +CONFIG_SCSI_LOGGING=y +CONFIG_SCSI_SCAN_ASYNC=y + +# +# SCSI Transports +# +CONFIG_SCSI_SPI_ATTRS=m +CONFIG_SCSI_FC_ATTRS=m +CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_SAS_ATTRS=m +CONFIG_SCSI_SAS_LIBSAS=m +CONFIG_SCSI_SAS_ATA=y +CONFIG_SCSI_SAS_HOST_SMP=y +CONFIG_SCSI_SRP_ATTRS=m +CONFIG_SCSI_LOWLEVEL=y +CONFIG_ISCSI_TCP=m +CONFIG_ISCSI_BOOT_SYSFS=m +CONFIG_SCSI_CXGB3_ISCSI=m +CONFIG_SCSI_CXGB4_ISCSI=m +CONFIG_SCSI_BNX2_ISCSI=m +CONFIG_SCSI_BNX2X_FCOE=m +CONFIG_BE2ISCSI=m +CONFIG_BLK_DEV_3W_XXXX_RAID=m +CONFIG_SCSI_HPSA=m +CONFIG_SCSI_3W_9XXX=m +CONFIG_SCSI_3W_SAS=m +CONFIG_SCSI_ACARD=m +CONFIG_SCSI_AHA152X=m +CONFIG_SCSI_AHA1542=m +CONFIG_SCSI_AHA1740=m +CONFIG_SCSI_AACRAID=m +CONFIG_SCSI_AIC7XXX=m +CONFIG_AIC7XXX_CMDS_PER_DEVICE=8 +CONFIG_AIC7XXX_RESET_DELAY_MS=5000 +# CONFIG_AIC7XXX_DEBUG_ENABLE is not set +CONFIG_AIC7XXX_DEBUG_MASK=0 +CONFIG_AIC7XXX_REG_PRETTY_PRINT=y +CONFIG_SCSI_AIC79XX=m +CONFIG_AIC79XX_CMDS_PER_DEVICE=32 +CONFIG_AIC79XX_RESET_DELAY_MS=5000 +# CONFIG_AIC79XX_DEBUG_ENABLE is not set +CONFIG_AIC79XX_DEBUG_MASK=0 +CONFIG_AIC79XX_REG_PRETTY_PRINT=y +CONFIG_SCSI_AIC94XX=m +# CONFIG_AIC94XX_DEBUG is not set +CONFIG_SCSI_MVSAS=m +# CONFIG_SCSI_MVSAS_DEBUG is not set +# CONFIG_SCSI_MVSAS_TASKLET is not set +CONFIG_SCSI_MVUMI=m +CONFIG_SCSI_DPT_I2O=m +CONFIG_SCSI_ADVANSYS=m +CONFIG_SCSI_ARCMSR=m +CONFIG_SCSI_ESAS2R=m +CONFIG_MEGARAID_NEWGEN=y +CONFIG_MEGARAID_MM=m +CONFIG_MEGARAID_MAILBOX=m +CONFIG_MEGARAID_LEGACY=m +CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_MPT3SAS=m +CONFIG_SCSI_MPT2SAS_MAX_SGE=128 +CONFIG_SCSI_MPT3SAS_MAX_SGE=128 +CONFIG_SCSI_MPT2SAS=m +CONFIG_SCSI_SMARTPQI=m +CONFIG_SCSI_UFSHCD=m +CONFIG_SCSI_UFSHCD_PCI=m +# CONFIG_SCSI_UFS_DWC_TC_PCI is not set +CONFIG_SCSI_UFSHCD_PLATFORM=m +# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set +CONFIG_SCSI_HPTIOP=m +CONFIG_SCSI_BUSLOGIC=m +CONFIG_SCSI_FLASHPOINT=y +CONFIG_VMWARE_PVSCSI=m +CONFIG_XEN_SCSI_FRONTEND=m +CONFIG_HYPERV_STORAGE=m +CONFIG_LIBFC=m +CONFIG_LIBFCOE=m +CONFIG_FCOE=m +CONFIG_FCOE_FNIC=m +CONFIG_SCSI_SNIC=m +# CONFIG_SCSI_SNIC_DEBUG_FS is not set +CONFIG_SCSI_DMX3191D=m +CONFIG_SCSI_GDTH=m +CONFIG_SCSI_ISCI=m +CONFIG_SCSI_GENERIC_NCR5380=m +CONFIG_SCSI_IPS=m +CONFIG_SCSI_INITIO=m +CONFIG_SCSI_INIA100=m +CONFIG_SCSI_PPA=m +CONFIG_SCSI_IMM=m +# CONFIG_SCSI_IZIP_EPP16 is not set +# CONFIG_SCSI_IZIP_SLOW_CTR is not set +CONFIG_SCSI_STEX=m +CONFIG_SCSI_SYM53C8XX_2=m +CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 +CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 +CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 +CONFIG_SCSI_SYM53C8XX_MMIO=y +CONFIG_SCSI_IPR=m +CONFIG_SCSI_IPR_TRACE=y +CONFIG_SCSI_IPR_DUMP=y +CONFIG_SCSI_QLOGIC_FAS=m +CONFIG_SCSI_QLOGIC_1280=m +CONFIG_SCSI_QLA_FC=m +CONFIG_TCM_QLA2XXX=m +# CONFIG_TCM_QLA2XXX_DEBUG is not set +CONFIG_SCSI_QLA_ISCSI=m +CONFIG_QEDI=m +CONFIG_QEDF=m +CONFIG_SCSI_LPFC=m +# CONFIG_SCSI_LPFC_DEBUG_FS is not set +CONFIG_SCSI_SIM710=m +CONFIG_SCSI_DC395x=m +CONFIG_SCSI_AM53C974=m +CONFIG_SCSI_NSP32=m +CONFIG_SCSI_WD719X=m +CONFIG_SCSI_DEBUG=m +CONFIG_SCSI_PMCRAID=m +CONFIG_SCSI_PM8001=m +CONFIG_SCSI_BFA_FC=m +CONFIG_SCSI_VIRTIO=m +CONFIG_SCSI_CHELSIO_FCOE=m +CONFIG_SCSI_LOWLEVEL_PCMCIA=y +CONFIG_PCMCIA_AHA152X=m +CONFIG_PCMCIA_NINJA_SCSI=m +CONFIG_PCMCIA_QLOGIC=m +CONFIG_PCMCIA_SYM53C500=m +CONFIG_SCSI_DH=y +CONFIG_SCSI_DH_RDAC=m +CONFIG_SCSI_DH_HP_SW=m +CONFIG_SCSI_DH_EMC=m +CONFIG_SCSI_DH_ALUA=m +CONFIG_SCSI_OSD_INITIATOR=m +CONFIG_SCSI_OSD_ULD=m +CONFIG_SCSI_OSD_DPRINT_SENSE=1 +# CONFIG_SCSI_OSD_DEBUG is not set +CONFIG_ATA=y +CONFIG_ATA_VERBOSE_ERROR=y +CONFIG_ATA_ACPI=y +CONFIG_SATA_ZPODD=y +CONFIG_SATA_PMP=y + +# +# Controllers with non-SFF native interface +# +CONFIG_SATA_AHCI=m +CONFIG_SATA_MOBILE_LPM_POLICY=0 +CONFIG_SATA_AHCI_PLATFORM=m +CONFIG_SATA_INIC162X=m +CONFIG_SATA_ACARD_AHCI=m +CONFIG_SATA_SIL24=m +CONFIG_ATA_SFF=y + +# +# SFF controllers with custom DMA interface +# +CONFIG_PDC_ADMA=m +CONFIG_SATA_QSTOR=m +CONFIG_SATA_SX4=m +CONFIG_ATA_BMDMA=y + +# +# SATA SFF controllers with BMDMA +# +CONFIG_ATA_PIIX=y +CONFIG_SATA_DWC=m +# CONFIG_SATA_DWC_OLD_DMA is not set +# CONFIG_SATA_DWC_DEBUG is not set +CONFIG_SATA_MV=m +CONFIG_SATA_NV=m +CONFIG_SATA_PROMISE=m +CONFIG_SATA_SIL=m +CONFIG_SATA_SIS=m +CONFIG_SATA_SVW=m +CONFIG_SATA_ULI=m +CONFIG_SATA_VIA=m +CONFIG_SATA_VITESSE=m + +# +# PATA SFF controllers with BMDMA +# +CONFIG_PATA_ALI=m +CONFIG_PATA_AMD=m +CONFIG_PATA_ARTOP=m +CONFIG_PATA_ATIIXP=m +CONFIG_PATA_ATP867X=m +CONFIG_PATA_CMD64X=m +CONFIG_PATA_CS5520=m +CONFIG_PATA_CS5530=m +CONFIG_PATA_CS5535=m +CONFIG_PATA_CS5536=m +CONFIG_PATA_CYPRESS=m +CONFIG_PATA_EFAR=m +CONFIG_PATA_HPT366=m +CONFIG_PATA_HPT37X=m +CONFIG_PATA_HPT3X2N=m +CONFIG_PATA_HPT3X3=m +# CONFIG_PATA_HPT3X3_DMA is not set +CONFIG_PATA_IT8213=m +CONFIG_PATA_IT821X=m +CONFIG_PATA_JMICRON=m +CONFIG_PATA_MARVELL=m +CONFIG_PATA_NETCELL=m +CONFIG_PATA_NINJA32=m +CONFIG_PATA_NS87415=m +CONFIG_PATA_OLDPIIX=m +CONFIG_PATA_OPTIDMA=m +CONFIG_PATA_PDC2027X=m +CONFIG_PATA_PDC_OLD=m +CONFIG_PATA_RADISYS=m +CONFIG_PATA_RDC=m +CONFIG_PATA_SC1200=m +CONFIG_PATA_SCH=m +CONFIG_PATA_SERVERWORKS=m +CONFIG_PATA_SIL680=m +CONFIG_PATA_SIS=y +CONFIG_PATA_TOSHIBA=m +CONFIG_PATA_TRIFLEX=m +CONFIG_PATA_VIA=m +CONFIG_PATA_WINBOND=m + +# +# PIO-only SFF controllers +# +CONFIG_PATA_CMD640_PCI=m +CONFIG_PATA_ISAPNP=m +CONFIG_PATA_MPIIX=m +CONFIG_PATA_NS87410=m +CONFIG_PATA_OPTI=m +CONFIG_PATA_PCMCIA=m +CONFIG_PATA_PLATFORM=m +CONFIG_PATA_QDI=m +CONFIG_PATA_RZ1000=m +CONFIG_PATA_WINBOND_VLB=m + +# +# Generic fallback / legacy drivers +# +CONFIG_PATA_ACPI=m +CONFIG_ATA_GENERIC=y +CONFIG_PATA_LEGACY=m +CONFIG_MD=y +CONFIG_BLK_DEV_MD=y +CONFIG_MD_AUTODETECT=y +CONFIG_MD_LINEAR=m +CONFIG_MD_RAID0=m +CONFIG_MD_RAID1=m +CONFIG_MD_RAID10=m +CONFIG_MD_RAID456=m +CONFIG_MD_MULTIPATH=m +CONFIG_MD_FAULTY=m +CONFIG_MD_CLUSTER=m +CONFIG_BCACHE=m +# CONFIG_BCACHE_DEBUG is not set +# CONFIG_BCACHE_CLOSURES_DEBUG is not set +CONFIG_BLK_DEV_DM_BUILTIN=y +CONFIG_BLK_DEV_DM=y +# CONFIG_DM_MQ_DEFAULT is not set +# CONFIG_DM_DEBUG is not set +CONFIG_DM_BUFIO=m +# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set +CONFIG_DM_BIO_PRISON=m +CONFIG_DM_PERSISTENT_DATA=m +CONFIG_DM_UNSTRIPED=m +CONFIG_DM_CRYPT=m +CONFIG_DM_SNAPSHOT=m +CONFIG_DM_THIN_PROVISIONING=m +CONFIG_DM_CACHE=m +CONFIG_DM_CACHE_SMQ=m +CONFIG_DM_WRITECACHE=m +CONFIG_DM_ERA=m +CONFIG_DM_MIRROR=m +CONFIG_DM_LOG_USERSPACE=m +CONFIG_DM_RAID=m +CONFIG_DM_ZERO=m +CONFIG_DM_MULTIPATH=m +CONFIG_DM_MULTIPATH_QL=m +CONFIG_DM_MULTIPATH_ST=m +CONFIG_DM_DELAY=m +CONFIG_DM_UEVENT=y +CONFIG_DM_FLAKEY=m +CONFIG_DM_VERITY=m +# CONFIG_DM_VERITY_FEC is not set +CONFIG_DM_SWITCH=m +CONFIG_DM_LOG_WRITES=m +CONFIG_DM_INTEGRITY=m +CONFIG_DM_ZONED=m +CONFIG_TARGET_CORE=m +CONFIG_TCM_IBLOCK=m +CONFIG_TCM_FILEIO=m +CONFIG_TCM_PSCSI=m +CONFIG_TCM_USER2=m +CONFIG_LOOPBACK_TARGET=m +CONFIG_TCM_FC=m +CONFIG_ISCSI_TARGET=m +CONFIG_ISCSI_TARGET_CXGB4=m +CONFIG_SBP_TARGET=m +CONFIG_FUSION=y +CONFIG_FUSION_SPI=m +CONFIG_FUSION_FC=m +CONFIG_FUSION_SAS=m +CONFIG_FUSION_MAX_SGE=128 +CONFIG_FUSION_CTL=m +CONFIG_FUSION_LAN=m +CONFIG_FUSION_LOGGING=y + +# +# IEEE 1394 (FireWire) support +# +CONFIG_FIREWIRE=m +CONFIG_FIREWIRE_OHCI=m +CONFIG_FIREWIRE_SBP2=m +CONFIG_FIREWIRE_NET=m +CONFIG_FIREWIRE_NOSY=m +CONFIG_MACINTOSH_DRIVERS=y +CONFIG_MAC_EMUMOUSEBTN=m +CONFIG_NETDEVICES=y +CONFIG_MII=m +CONFIG_NET_CORE=y +CONFIG_BONDING=m +CONFIG_DUMMY=m +CONFIG_EQUALIZER=m +CONFIG_NET_FC=y +CONFIG_IFB=m +CONFIG_NET_TEAM=m +CONFIG_NET_TEAM_MODE_BROADCAST=m +CONFIG_NET_TEAM_MODE_ROUNDROBIN=m +CONFIG_NET_TEAM_MODE_RANDOM=m +CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m +CONFIG_NET_TEAM_MODE_LOADBALANCE=m +CONFIG_MACVLAN=m +CONFIG_MACVTAP=m +CONFIG_IPVLAN=m +CONFIG_IPVTAP=m +CONFIG_VXLAN=m +CONFIG_GENEVE=m +CONFIG_GTP=m +CONFIG_MACSEC=m +CONFIG_NETCONSOLE=m +CONFIG_NETCONSOLE_DYNAMIC=y +CONFIG_NETPOLL=y +CONFIG_NET_POLL_CONTROLLER=y +CONFIG_NTB_NETDEV=m +CONFIG_RIONET=m +CONFIG_RIONET_TX_SIZE=128 +CONFIG_RIONET_RX_SIZE=128 +CONFIG_TUN=y +CONFIG_TAP=m +# CONFIG_TUN_VNET_CROSS_LE is not set +CONFIG_VETH=m +CONFIG_VIRTIO_NET=y +CONFIG_NLMON=m +CONFIG_NET_VRF=m +CONFIG_VSOCKMON=m +CONFIG_SUNGEM_PHY=m +CONFIG_ARCNET=m +CONFIG_ARCNET_1201=m +CONFIG_ARCNET_1051=m +CONFIG_ARCNET_RAW=m +CONFIG_ARCNET_CAP=m +CONFIG_ARCNET_COM90xx=m +CONFIG_ARCNET_COM90xxIO=m +CONFIG_ARCNET_RIM_I=m +CONFIG_ARCNET_COM20020=m +CONFIG_ARCNET_COM20020_ISA=m +CONFIG_ARCNET_COM20020_PCI=m +CONFIG_ARCNET_COM20020_CS=m +CONFIG_ATM_DRIVERS=y +CONFIG_ATM_DUMMY=m +CONFIG_ATM_TCP=m +CONFIG_ATM_LANAI=m +CONFIG_ATM_ENI=m +# CONFIG_ATM_ENI_DEBUG is not set +# CONFIG_ATM_ENI_TUNE_BURST is not set +CONFIG_ATM_FIRESTREAM=m +CONFIG_ATM_ZATM=m +# CONFIG_ATM_ZATM_DEBUG is not set +CONFIG_ATM_NICSTAR=m +# CONFIG_ATM_NICSTAR_USE_SUNI is not set +# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set +CONFIG_ATM_IDT77252=m +# CONFIG_ATM_IDT77252_DEBUG is not set +# CONFIG_ATM_IDT77252_RCV_ALL is not set +CONFIG_ATM_IDT77252_USE_SUNI=y +CONFIG_ATM_AMBASSADOR=m +# CONFIG_ATM_AMBASSADOR_DEBUG is not set +CONFIG_ATM_HORIZON=m +# CONFIG_ATM_HORIZON_DEBUG is not set +CONFIG_ATM_IA=m +# CONFIG_ATM_IA_DEBUG is not set +CONFIG_ATM_FORE200E=m +# CONFIG_ATM_FORE200E_USE_TASKLET is not set +CONFIG_ATM_FORE200E_TX_RETRY=16 +CONFIG_ATM_FORE200E_DEBUG=0 +CONFIG_ATM_HE=m +CONFIG_ATM_HE_USE_SUNI=y +CONFIG_ATM_SOLOS=m + +# +# CAIF transport drivers +# +CONFIG_CAIF_TTY=m +CONFIG_CAIF_SPI_SLAVE=m +# CONFIG_CAIF_SPI_SYNC is not set +CONFIG_CAIF_HSI=m +CONFIG_CAIF_VIRTIO=m + +# +# Distributed Switch Architecture drivers +# +CONFIG_B53=m +CONFIG_B53_SPI_DRIVER=m +CONFIG_B53_MDIO_DRIVER=m +CONFIG_B53_MMAP_DRIVER=m +CONFIG_B53_SRAB_DRIVER=m +CONFIG_NET_DSA_BCM_SF2=m +# CONFIG_NET_DSA_LOOP is not set +CONFIG_NET_DSA_MT7530=m +CONFIG_NET_DSA_MV88E6060=m +CONFIG_MICROCHIP_KSZ=m +CONFIG_MICROCHIP_KSZ_SPI_DRIVER=m +CONFIG_NET_DSA_MV88E6XXX=m +CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y +# CONFIG_NET_DSA_MV88E6XXX_PTP is not set +CONFIG_NET_DSA_QCA8K=m +CONFIG_NET_DSA_REALTEK_SMI=m +CONFIG_NET_DSA_SMSC_LAN9303=m +CONFIG_NET_DSA_SMSC_LAN9303_I2C=m +CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m +CONFIG_ETHERNET=y +CONFIG_MDIO=m +CONFIG_NET_VENDOR_3COM=y +CONFIG_EL3=m +CONFIG_3C515=m +CONFIG_PCMCIA_3C574=m +CONFIG_PCMCIA_3C589=m +CONFIG_VORTEX=m +CONFIG_TYPHOON=m +CONFIG_NET_VENDOR_ADAPTEC=y +CONFIG_ADAPTEC_STARFIRE=m +CONFIG_NET_VENDOR_AGERE=y +CONFIG_ET131X=m +CONFIG_NET_VENDOR_ALACRITECH=y +CONFIG_SLICOSS=m +CONFIG_NET_VENDOR_ALTEON=y +CONFIG_ACENIC=m +# CONFIG_ACENIC_OMIT_TIGON_I is not set +CONFIG_ALTERA_TSE=m +CONFIG_NET_VENDOR_AMAZON=y +CONFIG_ENA_ETHERNET=m +CONFIG_NET_VENDOR_AMD=y +CONFIG_AMD8111_ETH=m +CONFIG_LANCE=m +CONFIG_PCNET32=m +CONFIG_PCMCIA_NMCLAN=m +CONFIG_NI65=m +CONFIG_AMD_XGBE=m +# CONFIG_AMD_XGBE_DCB is not set +CONFIG_AMD_XGBE_HAVE_ECC=y +CONFIG_NET_VENDOR_AQUANTIA=y +CONFIG_NET_VENDOR_ARC=y +CONFIG_NET_VENDOR_ATHEROS=y +CONFIG_ATL2=m +CONFIG_ATL1=m +CONFIG_ATL1E=m +CONFIG_ATL1C=m +CONFIG_ALX=m +CONFIG_NET_VENDOR_AURORA=y +CONFIG_AURORA_NB8800=m +CONFIG_NET_VENDOR_BROADCOM=y +CONFIG_B44=m +CONFIG_B44_PCI_AUTOSELECT=y +CONFIG_B44_PCICORE_AUTOSELECT=y +CONFIG_B44_PCI=y +CONFIG_BCMGENET=m +CONFIG_BNX2=m +CONFIG_CNIC=m +CONFIG_TIGON3=m +CONFIG_TIGON3_HWMON=y +CONFIG_BNX2X=m +CONFIG_BNX2X_SRIOV=y +# CONFIG_SYSTEMPORT is not set +CONFIG_BNXT=m +CONFIG_BNXT_SRIOV=y +CONFIG_BNXT_FLOWER_OFFLOAD=y +# CONFIG_BNXT_DCB is not set +CONFIG_BNXT_HWMON=y +CONFIG_NET_VENDOR_BROCADE=y +CONFIG_BNA=m +CONFIG_NET_VENDOR_CADENCE=y +CONFIG_MACB=m +CONFIG_MACB_USE_HWSTAMP=y +CONFIG_MACB_PCI=m +CONFIG_NET_VENDOR_CAVIUM=y +CONFIG_NET_VENDOR_CHELSIO=y +CONFIG_CHELSIO_T1=m +CONFIG_CHELSIO_T1_1G=y +CONFIG_CHELSIO_T3=m +CONFIG_CHELSIO_T4=m +CONFIG_CHELSIO_T4_DCB=y +CONFIG_CHELSIO_T4_FCOE=y +CONFIG_CHELSIO_T4VF=m +CONFIG_CHELSIO_LIB=m +CONFIG_NET_VENDOR_CIRRUS=y +CONFIG_CS89x0=m +CONFIG_CS89x0_PLATFORM=y +CONFIG_NET_VENDOR_CISCO=y +CONFIG_ENIC=m +# CONFIG_NET_VENDOR_CORTINA is not set +CONFIG_CX_ECAT=m +CONFIG_DNET=m +CONFIG_NET_VENDOR_DEC=y +CONFIG_NET_TULIP=y +CONFIG_DE2104X=m +CONFIG_DE2104X_DSL=0 +CONFIG_TULIP=m +# CONFIG_TULIP_MWI is not set +# CONFIG_TULIP_MMIO is not set +# CONFIG_TULIP_NAPI is not set +CONFIG_DE4X5=m +CONFIG_WINBOND_840=m +CONFIG_DM9102=m +CONFIG_ULI526X=m +CONFIG_PCMCIA_XIRCOM=m +CONFIG_NET_VENDOR_DLINK=y +CONFIG_DL2K=m +CONFIG_SUNDANCE=m +# CONFIG_SUNDANCE_MMIO is not set +CONFIG_NET_VENDOR_EMULEX=y +CONFIG_BE2NET=m +CONFIG_BE2NET_HWMON=y +CONFIG_BE2NET_BE2=y +CONFIG_BE2NET_BE3=y +CONFIG_BE2NET_LANCER=y +CONFIG_BE2NET_SKYHAWK=y +CONFIG_NET_VENDOR_EZCHIP=y +CONFIG_NET_VENDOR_FUJITSU=y +CONFIG_PCMCIA_FMVJ18X=m +CONFIG_NET_VENDOR_HP=y +CONFIG_HP100=m +CONFIG_NET_VENDOR_HUAWEI=y +CONFIG_HINIC=m +CONFIG_NET_VENDOR_I825XX=y +CONFIG_NET_VENDOR_INTEL=y +CONFIG_E100=m +CONFIG_E1000=m +CONFIG_E1000E=m +CONFIG_E1000E_HWTS=y +CONFIG_IGB=m +CONFIG_IGB_HWMON=y +CONFIG_IGBVF=m +CONFIG_IXGB=m +CONFIG_IXGBE=m +CONFIG_IXGBE_HWMON=y +CONFIG_IXGBE_DCB=y +CONFIG_IXGBEVF=m +CONFIG_I40E=m +CONFIG_I40E_DCB=y +CONFIG_I40EVF=m +CONFIG_ICE=m +CONFIG_FM10K=m +CONFIG_JME=m +CONFIG_NET_VENDOR_MARVELL=y +CONFIG_MVMDIO=m +CONFIG_SKGE=m +# CONFIG_SKGE_DEBUG is not set +CONFIG_SKGE_GENESIS=y +CONFIG_SKY2=m +# CONFIG_SKY2_DEBUG is not set +CONFIG_NET_VENDOR_MELLANOX=y +CONFIG_MLX4_EN=m +CONFIG_MLX4_EN_DCB=y +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +CONFIG_MLX4_CORE_GEN2=y +CONFIG_MLX5_CORE=m +# CONFIG_MLX5_FPGA is not set +CONFIG_MLX5_CORE_EN=y +CONFIG_MLX5_EN_ARFS=y +CONFIG_MLX5_EN_RXNFC=y +CONFIG_MLX5_MPFS=y +CONFIG_MLX5_ESWITCH=y +CONFIG_MLX5_CORE_EN_DCB=y +# CONFIG_MLX5_CORE_IPOIB is not set +CONFIG_MLXSW_CORE=m +CONFIG_MLXSW_CORE_HWMON=y +CONFIG_MLXSW_CORE_THERMAL=y +CONFIG_MLXSW_PCI=m +CONFIG_MLXSW_I2C=m +CONFIG_MLXSW_SWITCHIB=m +CONFIG_MLXSW_SWITCHX2=m +CONFIG_MLXSW_SPECTRUM=m +CONFIG_MLXSW_SPECTRUM_DCB=y +CONFIG_MLXSW_MINIMAL=m +CONFIG_MLXFW=m +CONFIG_NET_VENDOR_MICREL=y +CONFIG_KS8842=m +CONFIG_KS8851=m +CONFIG_KS8851_MLL=m +CONFIG_KSZ884X_PCI=m +CONFIG_NET_VENDOR_MICROCHIP=y +CONFIG_ENC28J60=m +# CONFIG_ENC28J60_WRITEVERIFY is not set +CONFIG_ENCX24J600=m +CONFIG_LAN743X=m +CONFIG_NET_VENDOR_MICROSEMI=y +CONFIG_MSCC_OCELOT_SWITCH=m +CONFIG_MSCC_OCELOT_SWITCH_OCELOT=m +CONFIG_NET_VENDOR_MYRI=y +CONFIG_MYRI10GE=m +CONFIG_FEALNX=m +CONFIG_NET_VENDOR_NATSEMI=y +CONFIG_NATSEMI=m +CONFIG_NS83820=m +CONFIG_NET_VENDOR_NETERION=y +CONFIG_S2IO=m +CONFIG_VXGE=m +# CONFIG_VXGE_DEBUG_TRACE_ALL is not set +CONFIG_NET_VENDOR_NETRONOME=y +CONFIG_NFP=m +# CONFIG_NFP_APP_FLOWER is not set +CONFIG_NFP_APP_ABM_NIC=y +# CONFIG_NFP_DEBUG is not set +CONFIG_NET_VENDOR_NI=y +CONFIG_NET_VENDOR_8390=y +CONFIG_PCMCIA_AXNET=m +CONFIG_NE2000=m +CONFIG_NE2K_PCI=m +CONFIG_PCMCIA_PCNET=m +CONFIG_ULTRA=m +CONFIG_WD80x3=m +CONFIG_NET_VENDOR_NVIDIA=y +CONFIG_FORCEDETH=m +CONFIG_NET_VENDOR_OKI=y +CONFIG_PCH_GBE=m +CONFIG_ETHOC=m +CONFIG_NET_VENDOR_PACKET_ENGINES=y +CONFIG_HAMACHI=m +CONFIG_YELLOWFIN=m +CONFIG_NET_VENDOR_QLOGIC=y +CONFIG_QLA3XXX=m +CONFIG_QLCNIC=m +CONFIG_QLCNIC_SRIOV=y +CONFIG_QLCNIC_DCB=y +CONFIG_QLCNIC_HWMON=y +CONFIG_QLGE=m +CONFIG_NETXEN_NIC=m +CONFIG_QED=m +CONFIG_QED_LL2=y +CONFIG_QED_SRIOV=y +CONFIG_QEDE=m +CONFIG_QED_ISCSI=y +CONFIG_QED_FCOE=y +CONFIG_QED_OOO=y +CONFIG_NET_VENDOR_QUALCOMM=y +CONFIG_QCOM_EMAC=m +CONFIG_RMNET=m +CONFIG_NET_VENDOR_RDC=y +CONFIG_R6040=m +CONFIG_NET_VENDOR_REALTEK=y +CONFIG_ATP=m +CONFIG_8139CP=m +CONFIG_8139TOO=m +CONFIG_8139TOO_PIO=y +# CONFIG_8139TOO_TUNE_TWISTER is not set +CONFIG_8139TOO_8129=y +# CONFIG_8139_OLD_RX_RESET is not set +CONFIG_R8169=m +CONFIG_NET_VENDOR_RENESAS=y +CONFIG_NET_VENDOR_ROCKER=y +CONFIG_ROCKER=m +CONFIG_NET_VENDOR_SAMSUNG=y +CONFIG_SXGBE_ETH=m +CONFIG_NET_VENDOR_SEEQ=y +CONFIG_NET_VENDOR_SOLARFLARE=y +CONFIG_SFC=m +CONFIG_SFC_MTD=y +CONFIG_SFC_MCDI_MON=y +CONFIG_SFC_SRIOV=y +CONFIG_SFC_MCDI_LOGGING=y +CONFIG_SFC_FALCON=m +CONFIG_SFC_FALCON_MTD=y +CONFIG_NET_VENDOR_SILAN=y +CONFIG_SC92031=m +CONFIG_NET_VENDOR_SIS=y +CONFIG_SIS900=m +CONFIG_SIS190=m +CONFIG_NET_VENDOR_SMSC=y +CONFIG_SMC9194=m +CONFIG_PCMCIA_SMC91C92=m +CONFIG_EPIC100=m +CONFIG_SMSC911X=m +CONFIG_SMSC9420=m +# CONFIG_NET_VENDOR_SOCIONEXT is not set +CONFIG_NET_VENDOR_STMICRO=y +CONFIG_STMMAC_ETH=m +CONFIG_STMMAC_PLATFORM=m +CONFIG_DWMAC_GENERIC=m +# CONFIG_STMMAC_PCI is not set +CONFIG_NET_VENDOR_SUN=y +CONFIG_HAPPYMEAL=m +CONFIG_SUNGEM=m +CONFIG_CASSINI=m +CONFIG_NIU=m +CONFIG_NET_VENDOR_SYNOPSYS=y +CONFIG_DWC_XLGMAC=m +CONFIG_DWC_XLGMAC_PCI=m +CONFIG_NET_VENDOR_TEHUTI=y +CONFIG_TEHUTI=m +CONFIG_NET_VENDOR_TI=y +CONFIG_TI_CPSW_ALE=m +CONFIG_TLAN=m +CONFIG_NET_VENDOR_VIA=y +CONFIG_VIA_RHINE=m +CONFIG_VIA_RHINE_MMIO=y +CONFIG_VIA_VELOCITY=m +CONFIG_NET_VENDOR_WIZNET=y +CONFIG_WIZNET_W5100=m +CONFIG_WIZNET_W5300=m +# CONFIG_WIZNET_BUS_DIRECT is not set +# CONFIG_WIZNET_BUS_INDIRECT is not set +CONFIG_WIZNET_BUS_ANY=y +# CONFIG_WIZNET_W5100_SPI is not set +CONFIG_NET_VENDOR_XIRCOM=y +CONFIG_PCMCIA_XIRC2PS=m +CONFIG_FDDI=y +CONFIG_DEFXX=m +# CONFIG_DEFXX_MMIO is not set +CONFIG_SKFP=m +# CONFIG_HIPPI is not set +CONFIG_NET_SB1000=m +CONFIG_MDIO_DEVICE=y +CONFIG_MDIO_BUS=y +CONFIG_MDIO_BCM_UNIMAC=m +CONFIG_MDIO_BITBANG=m +CONFIG_MDIO_GPIO=m +CONFIG_MDIO_I2C=m +CONFIG_MDIO_MSCC_MIIM=m +CONFIG_PHYLINK=m +CONFIG_PHYLIB=y +CONFIG_SWPHY=y +# CONFIG_LED_TRIGGER_PHY is not set + +# +# MII PHY device drivers +# +CONFIG_SFP=m +CONFIG_AMD_PHY=m +CONFIG_AQUANTIA_PHY=m +CONFIG_ASIX_PHY=m +CONFIG_AT803X_PHY=m +CONFIG_BCM7XXX_PHY=m +CONFIG_BCM87XX_PHY=m +CONFIG_BCM_NET_PHYLIB=m +CONFIG_BROADCOM_PHY=m +CONFIG_CICADA_PHY=m +CONFIG_CORTINA_PHY=m +CONFIG_DAVICOM_PHY=m +CONFIG_DP83822_PHY=m +CONFIG_DP83TC811_PHY=m +CONFIG_DP83848_PHY=m +CONFIG_DP83867_PHY=m +CONFIG_FIXED_PHY=y +CONFIG_ICPLUS_PHY=m +CONFIG_INTEL_XWAY_PHY=m +CONFIG_LSI_ET1011C_PHY=m +CONFIG_LXT_PHY=m +CONFIG_MARVELL_PHY=m +CONFIG_MARVELL_10G_PHY=m +CONFIG_MICREL_PHY=m +CONFIG_MICROCHIP_PHY=m +CONFIG_MICROCHIP_T1_PHY=m +CONFIG_MICROSEMI_PHY=m +CONFIG_NATIONAL_PHY=m +CONFIG_QSEMI_PHY=m +CONFIG_REALTEK_PHY=m +CONFIG_RENESAS_PHY=m +CONFIG_ROCKCHIP_PHY=m +CONFIG_SMSC_PHY=m +CONFIG_STE10XP=m +CONFIG_TERANETICS_PHY=m +CONFIG_VITESSE_PHY=m +CONFIG_XILINX_GMII2RGMII=m +CONFIG_MICREL_KS8995MA=m +CONFIG_PLIP=m +CONFIG_PPP=y +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_FILTER=y +CONFIG_PPP_MPPE=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPPOATM=m +CONFIG_PPPOE=m +CONFIG_PPTP=m +CONFIG_PPPOL2TP=m +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_SLIP=m +CONFIG_SLHC=y +CONFIG_SLIP_COMPRESSED=y +CONFIG_SLIP_SMART=y +CONFIG_SLIP_MODE_SLIP6=y +CONFIG_USB_NET_DRIVERS=m +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_RTL8152=m +CONFIG_USB_LAN78XX=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_AX88179_178A=m +CONFIG_USB_NET_CDCETHER=m +CONFIG_USB_NET_CDC_EEM=m +CONFIG_USB_NET_CDC_NCM=m +CONFIG_USB_NET_HUAWEI_CDC_NCM=m +CONFIG_USB_NET_CDC_MBIM=m +CONFIG_USB_NET_DM9601=m +CONFIG_USB_NET_SR9700=m +CONFIG_USB_NET_SR9800=m +CONFIG_USB_NET_SMSC75XX=m +CONFIG_USB_NET_SMSC95XX=m +CONFIG_USB_NET_GL620A=m +CONFIG_USB_NET_NET1080=m +CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_MCS7830=m +CONFIG_USB_NET_RNDIS_HOST=m +CONFIG_USB_NET_CDC_SUBSET_ENABLE=m +CONFIG_USB_NET_CDC_SUBSET=m +CONFIG_USB_ALI_M5632=y +CONFIG_USB_AN2720=y +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +CONFIG_USB_EPSON2888=y +CONFIG_USB_KC2190=y +CONFIG_USB_NET_ZAURUS=m +CONFIG_USB_NET_CX82310_ETH=m +CONFIG_USB_NET_KALMIA=m +CONFIG_USB_NET_QMI_WWAN=m +CONFIG_USB_HSO=m +CONFIG_USB_NET_INT51X1=m +CONFIG_USB_CDC_PHONET=m +CONFIG_USB_IPHETH=m +CONFIG_USB_SIERRA_NET=m +CONFIG_USB_VL600=m +CONFIG_USB_NET_CH9200=m +CONFIG_WLAN=y +# CONFIG_WIRELESS_WDS is not set +CONFIG_WLAN_VENDOR_ADMTEK=y +CONFIG_ADM8211=m +CONFIG_ATH_COMMON=m +CONFIG_WLAN_VENDOR_ATH=y +# CONFIG_ATH_DEBUG is not set +CONFIG_ATH5K=m +# CONFIG_ATH5K_DEBUG is not set +# CONFIG_ATH5K_TRACER is not set +CONFIG_ATH5K_PCI=y +CONFIG_ATH9K_HW=m +CONFIG_ATH9K_COMMON=m +CONFIG_ATH9K_COMMON_DEBUG=y +CONFIG_ATH9K_BTCOEX_SUPPORT=y +CONFIG_ATH9K=m +CONFIG_ATH9K_PCI=y +CONFIG_ATH9K_AHB=y +CONFIG_ATH9K_DEBUGFS=y +CONFIG_ATH9K_STATION_STATISTICS=y +# CONFIG_ATH9K_DYNACK is not set +CONFIG_ATH9K_WOW=y +CONFIG_ATH9K_RFKILL=y +CONFIG_ATH9K_CHANNEL_CONTEXT=y +CONFIG_ATH9K_PCOEM=y +CONFIG_ATH9K_HTC=m +CONFIG_ATH9K_HTC_DEBUGFS=y +CONFIG_ATH9K_HWRNG=y +# CONFIG_ATH9K_COMMON_SPECTRAL is not set +CONFIG_CARL9170=m +CONFIG_CARL9170_LEDS=y +# CONFIG_CARL9170_DEBUGFS is not set +CONFIG_CARL9170_WPC=y +CONFIG_CARL9170_HWRNG=y +CONFIG_ATH6KL=m +CONFIG_ATH6KL_SDIO=m +CONFIG_ATH6KL_USB=m +# CONFIG_ATH6KL_DEBUG is not set +# CONFIG_ATH6KL_TRACING is not set +CONFIG_AR5523=m +CONFIG_WIL6210=m +CONFIG_WIL6210_ISR_COR=y +CONFIG_WIL6210_TRACING=y +CONFIG_WIL6210_DEBUGFS=y +CONFIG_ATH10K=m +CONFIG_ATH10K_CE=y +CONFIG_ATH10K_PCI=m +CONFIG_ATH10K_SDIO=m +CONFIG_ATH10K_USB=m +# CONFIG_ATH10K_DEBUG is not set +CONFIG_ATH10K_DEBUGFS=y +# CONFIG_ATH10K_SPECTRAL is not set +CONFIG_ATH10K_TRACING=y +CONFIG_WCN36XX=m +# CONFIG_WCN36XX_DEBUGFS is not set +CONFIG_WLAN_VENDOR_ATMEL=y +CONFIG_ATMEL=m +CONFIG_PCI_ATMEL=m +CONFIG_PCMCIA_ATMEL=m +CONFIG_AT76C50X_USB=m +CONFIG_WLAN_VENDOR_BROADCOM=y +CONFIG_B43=m +CONFIG_B43_BCMA=y +CONFIG_B43_SSB=y +CONFIG_B43_BUSES_BCMA_AND_SSB=y +# CONFIG_B43_BUSES_BCMA is not set +# CONFIG_B43_BUSES_SSB is not set +CONFIG_B43_PCI_AUTOSELECT=y +CONFIG_B43_PCICORE_AUTOSELECT=y +# CONFIG_B43_SDIO is not set +CONFIG_B43_BCMA_PIO=y +CONFIG_B43_PIO=y +CONFIG_B43_PHY_G=y +CONFIG_B43_PHY_N=y +CONFIG_B43_PHY_LP=y +CONFIG_B43_PHY_HT=y +CONFIG_B43_LEDS=y +CONFIG_B43_HWRNG=y +# CONFIG_B43_DEBUG is not set +CONFIG_B43LEGACY=m +CONFIG_B43LEGACY_PCI_AUTOSELECT=y +CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y +CONFIG_B43LEGACY_LEDS=y +CONFIG_B43LEGACY_HWRNG=y +# CONFIG_B43LEGACY_DEBUG is not set +CONFIG_B43LEGACY_DMA=y +CONFIG_B43LEGACY_PIO=y +CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y +# CONFIG_B43LEGACY_DMA_MODE is not set +# CONFIG_B43LEGACY_PIO_MODE is not set +CONFIG_BRCMUTIL=m +CONFIG_BRCMSMAC=m +CONFIG_BRCMFMAC=m +CONFIG_BRCMFMAC_PROTO_BCDC=y +CONFIG_BRCMFMAC_PROTO_MSGBUF=y +CONFIG_BRCMFMAC_SDIO=y +CONFIG_BRCMFMAC_USB=y +CONFIG_BRCMFMAC_PCIE=y +CONFIG_BRCM_TRACING=y +# CONFIG_BRCMDBG is not set +CONFIG_WLAN_VENDOR_CISCO=y +CONFIG_AIRO=m +CONFIG_AIRO_CS=m +CONFIG_WLAN_VENDOR_INTEL=y +CONFIG_IPW2100=m +CONFIG_IPW2100_MONITOR=y +# CONFIG_IPW2100_DEBUG is not set +CONFIG_IPW2200=m +CONFIG_IPW2200_MONITOR=y +CONFIG_IPW2200_RADIOTAP=y +CONFIG_IPW2200_PROMISCUOUS=y +CONFIG_IPW2200_QOS=y +# CONFIG_IPW2200_DEBUG is not set +CONFIG_LIBIPW=m +# CONFIG_LIBIPW_DEBUG is not set +CONFIG_IWLEGACY=m +CONFIG_IWL4965=m +CONFIG_IWL3945=m + +# +# iwl3945 / iwl4965 Debugging Options +# +# CONFIG_IWLEGACY_DEBUG is not set +CONFIG_IWLEGACY_DEBUGFS=y +CONFIG_IWLWIFI=m +CONFIG_IWLWIFI_LEDS=y +CONFIG_IWLDVM=m +CONFIG_IWLMVM=m +CONFIG_IWLWIFI_OPMODE_MODULAR=y +# CONFIG_IWLWIFI_BCAST_FILTERING is not set +# CONFIG_IWLWIFI_PCIE_RTPM is not set + +# +# Debugging Options +# +# CONFIG_IWLWIFI_DEBUG is not set +CONFIG_IWLWIFI_DEBUGFS=y +CONFIG_IWLWIFI_DEVICE_TRACING=y +CONFIG_WLAN_VENDOR_INTERSIL=y +CONFIG_HOSTAP=m +CONFIG_HOSTAP_FIRMWARE=y +CONFIG_HOSTAP_FIRMWARE_NVRAM=y +CONFIG_HOSTAP_PLX=m +CONFIG_HOSTAP_PCI=m +CONFIG_HOSTAP_CS=m +CONFIG_HERMES=m +# CONFIG_HERMES_PRISM is not set +CONFIG_HERMES_CACHE_FW_ON_INIT=y +CONFIG_PLX_HERMES=m +CONFIG_TMD_HERMES=m +CONFIG_NORTEL_HERMES=m +CONFIG_PCMCIA_HERMES=m +CONFIG_PCMCIA_SPECTRUM=m +CONFIG_ORINOCO_USB=m +CONFIG_P54_COMMON=m +CONFIG_P54_USB=m +CONFIG_P54_PCI=m +CONFIG_P54_SPI=m +# CONFIG_P54_SPI_DEFAULT_EEPROM is not set +CONFIG_P54_LEDS=y +# CONFIG_PRISM54 is not set +CONFIG_WLAN_VENDOR_MARVELL=y +CONFIG_LIBERTAS=m +CONFIG_LIBERTAS_USB=m +CONFIG_LIBERTAS_CS=m +CONFIG_LIBERTAS_SDIO=m +CONFIG_LIBERTAS_SPI=m +# CONFIG_LIBERTAS_DEBUG is not set +CONFIG_LIBERTAS_MESH=y +CONFIG_LIBERTAS_THINFIRM=m +# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set +CONFIG_LIBERTAS_THINFIRM_USB=m +CONFIG_MWIFIEX=m +CONFIG_MWIFIEX_SDIO=m +CONFIG_MWIFIEX_PCIE=m +CONFIG_MWIFIEX_USB=m +CONFIG_MWL8K=m +CONFIG_WLAN_VENDOR_MEDIATEK=y +CONFIG_MT7601U=m +CONFIG_MT76_CORE=m +CONFIG_MT76_USB=m +CONFIG_MT76x2_COMMON=m +CONFIG_MT76x0U=m +CONFIG_MT76x2E=m +CONFIG_MT76x2U=m +CONFIG_WLAN_VENDOR_RALINK=y +CONFIG_RT2X00=m +CONFIG_RT2400PCI=m +CONFIG_RT2500PCI=m +CONFIG_RT61PCI=m +CONFIG_RT2800PCI=m +CONFIG_RT2800PCI_RT33XX=y +CONFIG_RT2800PCI_RT35XX=y +CONFIG_RT2800PCI_RT53XX=y +CONFIG_RT2800PCI_RT3290=y +CONFIG_RT2500USB=m +CONFIG_RT73USB=m +CONFIG_RT2800USB=m +CONFIG_RT2800USB_RT33XX=y +CONFIG_RT2800USB_RT35XX=y +CONFIG_RT2800USB_RT3573=y +CONFIG_RT2800USB_RT53XX=y +CONFIG_RT2800USB_RT55XX=y +CONFIG_RT2800USB_UNKNOWN=y +CONFIG_RT2800_LIB=m +CONFIG_RT2800_LIB_MMIO=m +CONFIG_RT2X00_LIB_MMIO=m +CONFIG_RT2X00_LIB_PCI=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_CRYPTO=y +CONFIG_RT2X00_LIB_LEDS=y +# CONFIG_RT2X00_LIB_DEBUGFS is not set +# CONFIG_RT2X00_DEBUG is not set +CONFIG_WLAN_VENDOR_REALTEK=y +CONFIG_RTL8180=m +CONFIG_RTL8187=m +CONFIG_RTL8187_LEDS=y +CONFIG_RTL_CARDS=m +CONFIG_RTL8192CE=m +CONFIG_RTL8192SE=m +CONFIG_RTL8192DE=m +CONFIG_RTL8723AE=m +CONFIG_RTL8723BE=m +CONFIG_RTL8188EE=m +CONFIG_RTL8192EE=m +CONFIG_RTL8821AE=m +CONFIG_RTL8192CU=m +CONFIG_RTLWIFI=m +CONFIG_RTLWIFI_PCI=m +CONFIG_RTLWIFI_USB=m +# CONFIG_RTLWIFI_DEBUG is not set +CONFIG_RTL8192C_COMMON=m +CONFIG_RTL8723_COMMON=m +CONFIG_RTLBTCOEXIST=m +CONFIG_RTL8XXXU=m +CONFIG_RTL8XXXU_UNTESTED=y +CONFIG_WLAN_VENDOR_RSI=y +CONFIG_RSI_91X=m +# CONFIG_RSI_DEBUGFS is not set +CONFIG_RSI_SDIO=m +CONFIG_RSI_USB=m +CONFIG_RSI_COEX=y +CONFIG_WLAN_VENDOR_ST=y +CONFIG_CW1200=m +CONFIG_CW1200_WLAN_SDIO=m +CONFIG_CW1200_WLAN_SPI=m +CONFIG_WLAN_VENDOR_TI=y +CONFIG_WL1251=m +CONFIG_WL1251_SPI=m +CONFIG_WL1251_SDIO=m +CONFIG_WL12XX=m +CONFIG_WL18XX=m +CONFIG_WLCORE=m +CONFIG_WLCORE_SDIO=m +CONFIG_WILINK_PLATFORM_DATA=y +CONFIG_WLAN_VENDOR_ZYDAS=y +CONFIG_USB_ZD1201=m +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set +CONFIG_WLAN_VENDOR_QUANTENNA=y +CONFIG_QTNFMAC=m +CONFIG_QTNFMAC_PEARL_PCIE=m +CONFIG_PCMCIA_RAYCS=m +CONFIG_PCMCIA_WL3501=m +CONFIG_MAC80211_HWSIM=m +CONFIG_USB_NET_RNDIS_WLAN=m + +# +# WiMAX Wireless Broadband devices +# +CONFIG_WIMAX_I2400M=m +CONFIG_WIMAX_I2400M_USB=m +CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 +CONFIG_WAN=y +CONFIG_HOSTESS_SV11=m +CONFIG_COSA=m +CONFIG_LANMEDIA=m +CONFIG_SEALEVEL_4021=m +CONFIG_HDLC=m +CONFIG_HDLC_RAW=m +CONFIG_HDLC_RAW_ETH=m +CONFIG_HDLC_CISCO=m +CONFIG_HDLC_FR=m +CONFIG_HDLC_PPP=m +CONFIG_HDLC_X25=m +CONFIG_PCI200SYN=m +CONFIG_WANXL=m +CONFIG_PC300TOO=m +CONFIG_N2=m +CONFIG_C101=m +CONFIG_FARSYNC=m +CONFIG_DSCC4=m +CONFIG_DSCC4_PCISYNC=y +CONFIG_DSCC4_PCI_RST=y +CONFIG_DLCI=m +CONFIG_DLCI_MAX=8 +CONFIG_SDLA=m +CONFIG_LAPBETHER=m +CONFIG_X25_ASY=m +CONFIG_SBNI=m +# CONFIG_SBNI_MULTILINE is not set +CONFIG_IEEE802154_DRIVERS=m +CONFIG_IEEE802154_FAKELB=m +CONFIG_IEEE802154_AT86RF230=m +CONFIG_IEEE802154_AT86RF230_DEBUGFS=y +CONFIG_IEEE802154_MRF24J40=m +CONFIG_IEEE802154_CC2520=m +CONFIG_IEEE802154_ATUSB=m +CONFIG_IEEE802154_ADF7242=m +CONFIG_IEEE802154_CA8210=m +# CONFIG_IEEE802154_CA8210_DEBUGFS is not set +CONFIG_IEEE802154_MCR20A=m +# CONFIG_IEEE802154_HWSIM is not set +CONFIG_XEN_NETDEV_FRONTEND=y +CONFIG_XEN_NETDEV_BACKEND=m +CONFIG_VMXNET3=m +CONFIG_FUJITSU_ES=m +CONFIG_THUNDERBOLT_NET=m +CONFIG_HYPERV_NET=m +CONFIG_NETDEVSIM=m +CONFIG_NET_FAILOVER=y +CONFIG_ISDN=y +CONFIG_ISDN_I4L=m +CONFIG_ISDN_PPP=y +CONFIG_ISDN_PPP_VJ=y +CONFIG_ISDN_MPP=y +CONFIG_IPPP_FILTER=y +CONFIG_ISDN_PPP_BSDCOMP=m +CONFIG_ISDN_AUDIO=y +CONFIG_ISDN_TTY_FAX=y +CONFIG_ISDN_X25=y + +# +# ISDN feature submodules +# +CONFIG_ISDN_DIVERSION=m + +# +# ISDN4Linux hardware drivers +# + +# +# Passive cards +# +CONFIG_ISDN_DRV_HISAX=m + +# +# D-channel protocol features +# +CONFIG_HISAX_EURO=y +CONFIG_DE_AOC=y +# CONFIG_HISAX_NO_SENDCOMPLETE is not set +# CONFIG_HISAX_NO_LLC is not set +# CONFIG_HISAX_NO_KEYPAD is not set +CONFIG_HISAX_1TR6=y +CONFIG_HISAX_NI1=y +CONFIG_HISAX_MAX_CARDS=8 + +# +# HiSax supported cards +# +CONFIG_HISAX_16_0=y +CONFIG_HISAX_16_3=y +CONFIG_HISAX_TELESPCI=y +CONFIG_HISAX_S0BOX=y +CONFIG_HISAX_AVM_A1=y +CONFIG_HISAX_FRITZPCI=y +CONFIG_HISAX_AVM_A1_PCMCIA=y +CONFIG_HISAX_ELSA=y +CONFIG_HISAX_IX1MICROR2=y +CONFIG_HISAX_DIEHLDIVA=y +CONFIG_HISAX_ASUSCOM=y +CONFIG_HISAX_TELEINT=y +CONFIG_HISAX_HFCS=y +CONFIG_HISAX_SEDLBAUER=y +CONFIG_HISAX_SPORTSTER=y +CONFIG_HISAX_MIC=y +CONFIG_HISAX_NETJET=y +CONFIG_HISAX_NETJET_U=y +CONFIG_HISAX_NICCY=y +CONFIG_HISAX_ISURF=y +CONFIG_HISAX_HSTSAPHIR=y +CONFIG_HISAX_BKM_A4T=y +CONFIG_HISAX_SCT_QUADRO=y +CONFIG_HISAX_GAZEL=y +CONFIG_HISAX_HFC_PCI=y +CONFIG_HISAX_W6692=y +CONFIG_HISAX_HFC_SX=y +CONFIG_HISAX_ENTERNOW_PCI=y +# CONFIG_HISAX_DEBUG is not set + +# +# HiSax PCMCIA card service modules +# +CONFIG_HISAX_SEDLBAUER_CS=m +CONFIG_HISAX_ELSA_CS=m +CONFIG_HISAX_AVM_A1_CS=m +CONFIG_HISAX_TELES_CS=m + +# +# HiSax sub driver modules +# +CONFIG_HISAX_ST5481=m +CONFIG_HISAX_HFCUSB=m +CONFIG_HISAX_HFC4S8S=m +CONFIG_HISAX_FRITZ_PCIPNP=m +CONFIG_ISDN_CAPI=m +CONFIG_CAPI_TRACE=y +CONFIG_ISDN_CAPI_CAPI20=m +CONFIG_ISDN_CAPI_MIDDLEWARE=y +CONFIG_ISDN_CAPI_CAPIDRV=m +# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set + +# +# CAPI hardware drivers +# +CONFIG_CAPI_AVM=y +CONFIG_ISDN_DRV_AVMB1_B1ISA=m +CONFIG_ISDN_DRV_AVMB1_B1PCI=m +CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y +CONFIG_ISDN_DRV_AVMB1_T1ISA=m +CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m +CONFIG_ISDN_DRV_AVMB1_AVM_CS=m +CONFIG_ISDN_DRV_AVMB1_T1PCI=m +CONFIG_ISDN_DRV_AVMB1_C4=m +CONFIG_CAPI_EICON=y +CONFIG_ISDN_DIVAS=m +CONFIG_ISDN_DIVAS_BRIPCI=y +CONFIG_ISDN_DIVAS_PRIPCI=y +CONFIG_ISDN_DIVAS_DIVACAPI=m +CONFIG_ISDN_DIVAS_USERIDI=m +CONFIG_ISDN_DIVAS_MAINT=m +CONFIG_ISDN_DRV_GIGASET=m +# CONFIG_GIGASET_CAPI is not set +CONFIG_GIGASET_I4L=y +CONFIG_GIGASET_BASE=m +CONFIG_GIGASET_M105=m +CONFIG_GIGASET_M101=m +# CONFIG_GIGASET_DEBUG is not set +CONFIG_HYSDN=m +CONFIG_HYSDN_CAPI=y +CONFIG_MISDN=m +CONFIG_MISDN_DSP=m +CONFIG_MISDN_L1OIP=m + +# +# mISDN hardware drivers +# +CONFIG_MISDN_HFCPCI=m +CONFIG_MISDN_HFCMULTI=m +CONFIG_MISDN_HFCUSB=m +CONFIG_MISDN_AVMFRITZ=m +CONFIG_MISDN_SPEEDFAX=m +CONFIG_MISDN_INFINEON=m +CONFIG_MISDN_W6692=m +CONFIG_MISDN_NETJET=m +CONFIG_MISDN_IPAC=m +CONFIG_MISDN_ISAR=m +CONFIG_ISDN_HDLC=m +CONFIG_NVM=y +CONFIG_NVM_PBLK=m +# CONFIG_NVM_PBLK_DEBUG is not set + +# +# Input device support +# +CONFIG_INPUT=y +CONFIG_INPUT_LEDS=m +CONFIG_INPUT_FF_MEMLESS=m +CONFIG_INPUT_POLLDEV=m +CONFIG_INPUT_SPARSEKMAP=m +CONFIG_INPUT_MATRIXKMAP=m + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +CONFIG_INPUT_JOYDEV=m +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +CONFIG_KEYBOARD_ADC=m +CONFIG_KEYBOARD_ADP5520=m +CONFIG_KEYBOARD_ADP5588=m +CONFIG_KEYBOARD_ADP5589=m +CONFIG_KEYBOARD_ATKBD=y +CONFIG_KEYBOARD_QT1070=m +CONFIG_KEYBOARD_QT2160=m +CONFIG_KEYBOARD_DLINK_DIR685=m +CONFIG_KEYBOARD_LKKBD=m +CONFIG_KEYBOARD_GPIO=m +CONFIG_KEYBOARD_GPIO_POLLED=m +CONFIG_KEYBOARD_TCA6416=m +CONFIG_KEYBOARD_TCA8418=m +CONFIG_KEYBOARD_MATRIX=m +CONFIG_KEYBOARD_LM8323=m +CONFIG_KEYBOARD_LM8333=m +CONFIG_KEYBOARD_MAX7359=m +CONFIG_KEYBOARD_MCS=m +CONFIG_KEYBOARD_MPR121=m +CONFIG_KEYBOARD_NEWTON=m +CONFIG_KEYBOARD_OPENCORES=m +CONFIG_KEYBOARD_SAMSUNG=m +CONFIG_KEYBOARD_STOWAWAY=m +CONFIG_KEYBOARD_SUNKBD=m +CONFIG_KEYBOARD_TM2_TOUCHKEY=m +CONFIG_KEYBOARD_TWL4030=m +CONFIG_KEYBOARD_XTKBD=m +CONFIG_KEYBOARD_CROS_EC=m +CONFIG_KEYBOARD_MTK_PMIC=m +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=m +CONFIG_MOUSE_PS2_ALPS=y +CONFIG_MOUSE_PS2_BYD=y +CONFIG_MOUSE_PS2_LOGIPS2PP=y +CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y +CONFIG_MOUSE_PS2_CYPRESS=y +CONFIG_MOUSE_PS2_LIFEBOOK=y +CONFIG_MOUSE_PS2_TRACKPOINT=y +CONFIG_MOUSE_PS2_ELANTECH=y +CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y +CONFIG_MOUSE_PS2_SENTELIC=y +CONFIG_MOUSE_PS2_TOUCHKIT=y +CONFIG_MOUSE_PS2_FOCALTECH=y +CONFIG_MOUSE_PS2_VMMOUSE=y +CONFIG_MOUSE_PS2_SMBUS=y +CONFIG_MOUSE_SERIAL=m +CONFIG_MOUSE_APPLETOUCH=m +CONFIG_MOUSE_BCM5974=m +CONFIG_MOUSE_CYAPA=m +CONFIG_MOUSE_ELAN_I2C=m +CONFIG_MOUSE_ELAN_I2C_I2C=y +CONFIG_MOUSE_ELAN_I2C_SMBUS=y +# CONFIG_MOUSE_INPORT is not set +CONFIG_MOUSE_LOGIBM=m +CONFIG_MOUSE_PC110PAD=m +CONFIG_MOUSE_VSXXXAA=m +CONFIG_MOUSE_GPIO=m +CONFIG_MOUSE_SYNAPTICS_I2C=m +CONFIG_MOUSE_SYNAPTICS_USB=m +CONFIG_INPUT_JOYSTICK=y +CONFIG_JOYSTICK_ANALOG=m +CONFIG_JOYSTICK_A3D=m +CONFIG_JOYSTICK_ADI=m +CONFIG_JOYSTICK_COBRA=m +CONFIG_JOYSTICK_GF2K=m +CONFIG_JOYSTICK_GRIP=m +CONFIG_JOYSTICK_GRIP_MP=m +CONFIG_JOYSTICK_GUILLEMOT=m +CONFIG_JOYSTICK_INTERACT=m +CONFIG_JOYSTICK_SIDEWINDER=m +CONFIG_JOYSTICK_TMDC=m +CONFIG_JOYSTICK_IFORCE=m +CONFIG_JOYSTICK_IFORCE_USB=y +CONFIG_JOYSTICK_IFORCE_232=y +CONFIG_JOYSTICK_WARRIOR=m +CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_SPACEORB=m +CONFIG_JOYSTICK_SPACEBALL=m +CONFIG_JOYSTICK_STINGER=m +CONFIG_JOYSTICK_TWIDJOY=m +CONFIG_JOYSTICK_ZHENHUA=m +CONFIG_JOYSTICK_DB9=m +CONFIG_JOYSTICK_GAMECON=m +CONFIG_JOYSTICK_TURBOGRAFX=m +CONFIG_JOYSTICK_AS5011=m +CONFIG_JOYSTICK_JOYDUMP=m +CONFIG_JOYSTICK_XPAD=m +CONFIG_JOYSTICK_XPAD_FF=y +CONFIG_JOYSTICK_XPAD_LEDS=y +CONFIG_JOYSTICK_WALKERA0701=m +CONFIG_JOYSTICK_PSXPAD_SPI=m +# CONFIG_JOYSTICK_PSXPAD_SPI_FF is not set +CONFIG_JOYSTICK_PXRC=m +CONFIG_INPUT_TABLET=y +CONFIG_TABLET_USB_ACECAD=m +CONFIG_TABLET_USB_AIPTEK=m +CONFIG_TABLET_USB_GTCO=m +CONFIG_TABLET_USB_HANWANG=m +CONFIG_TABLET_USB_KBTAB=m +CONFIG_TABLET_USB_PEGASUS=m +CONFIG_TABLET_SERIAL_WACOM4=m +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_PROPERTIES=y +CONFIG_TOUCHSCREEN_88PM860X=m +CONFIG_TOUCHSCREEN_ADS7846=m +CONFIG_TOUCHSCREEN_AD7877=m +CONFIG_TOUCHSCREEN_AD7879=m +CONFIG_TOUCHSCREEN_AD7879_I2C=m +CONFIG_TOUCHSCREEN_AD7879_SPI=m +CONFIG_TOUCHSCREEN_ADC=m +CONFIG_TOUCHSCREEN_ATMEL_MXT=m +# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set +CONFIG_TOUCHSCREEN_AUO_PIXCIR=m +CONFIG_TOUCHSCREEN_BU21013=m +CONFIG_TOUCHSCREEN_BU21029=m +CONFIG_TOUCHSCREEN_CHIPONE_ICN8505=m +CONFIG_TOUCHSCREEN_CY8CTMG110=m +CONFIG_TOUCHSCREEN_CYTTSP_CORE=m +CONFIG_TOUCHSCREEN_CYTTSP_I2C=m +CONFIG_TOUCHSCREEN_CYTTSP_SPI=m +CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m +CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m +CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m +CONFIG_TOUCHSCREEN_DA9034=m +CONFIG_TOUCHSCREEN_DA9052=m +CONFIG_TOUCHSCREEN_DYNAPRO=m +CONFIG_TOUCHSCREEN_HAMPSHIRE=m +CONFIG_TOUCHSCREEN_EETI=m +CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m +CONFIG_TOUCHSCREEN_EXC3000=m +CONFIG_TOUCHSCREEN_FUJITSU=m +CONFIG_TOUCHSCREEN_GOODIX=m +CONFIG_TOUCHSCREEN_HIDEEP=m +CONFIG_TOUCHSCREEN_ILI210X=m +CONFIG_TOUCHSCREEN_S6SY761=m +CONFIG_TOUCHSCREEN_GUNZE=m +CONFIG_TOUCHSCREEN_EKTF2127=m +CONFIG_TOUCHSCREEN_ELAN=m +CONFIG_TOUCHSCREEN_ELO=m +CONFIG_TOUCHSCREEN_WACOM_W8001=m +CONFIG_TOUCHSCREEN_WACOM_I2C=m +CONFIG_TOUCHSCREEN_MAX11801=m +CONFIG_TOUCHSCREEN_MCS5000=m +CONFIG_TOUCHSCREEN_MMS114=m +CONFIG_TOUCHSCREEN_MELFAS_MIP4=m +CONFIG_TOUCHSCREEN_MTOUCH=m +CONFIG_TOUCHSCREEN_INEXIO=m +CONFIG_TOUCHSCREEN_MK712=m +CONFIG_TOUCHSCREEN_HTCPEN=m +CONFIG_TOUCHSCREEN_PENMOUNT=m +CONFIG_TOUCHSCREEN_EDT_FT5X06=m +CONFIG_TOUCHSCREEN_TOUCHRIGHT=m +CONFIG_TOUCHSCREEN_TOUCHWIN=m +CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m +CONFIG_TOUCHSCREEN_UCB1400=m +CONFIG_TOUCHSCREEN_PIXCIR=m +CONFIG_TOUCHSCREEN_WDT87XX_I2C=m +CONFIG_TOUCHSCREEN_WM831X=m +CONFIG_TOUCHSCREEN_WM97XX=m +CONFIG_TOUCHSCREEN_WM9705=y +CONFIG_TOUCHSCREEN_WM9712=y +CONFIG_TOUCHSCREEN_WM9713=y +CONFIG_TOUCHSCREEN_USB_COMPOSITE=m +CONFIG_TOUCHSCREEN_MC13783=m +CONFIG_TOUCHSCREEN_USB_EGALAX=y +CONFIG_TOUCHSCREEN_USB_PANJIT=y +CONFIG_TOUCHSCREEN_USB_3M=y +CONFIG_TOUCHSCREEN_USB_ITM=y +CONFIG_TOUCHSCREEN_USB_ETURBO=y +CONFIG_TOUCHSCREEN_USB_GUNZE=y +CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y +CONFIG_TOUCHSCREEN_USB_IRTOUCH=y +CONFIG_TOUCHSCREEN_USB_IDEALTEK=y +CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y +CONFIG_TOUCHSCREEN_USB_GOTOP=y +CONFIG_TOUCHSCREEN_USB_JASTEC=y +CONFIG_TOUCHSCREEN_USB_ELO=y +CONFIG_TOUCHSCREEN_USB_E2I=y +CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y +CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y +CONFIG_TOUCHSCREEN_USB_NEXIO=y +CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y +CONFIG_TOUCHSCREEN_TOUCHIT213=m +CONFIG_TOUCHSCREEN_TSC_SERIO=m +CONFIG_TOUCHSCREEN_TSC200X_CORE=m +CONFIG_TOUCHSCREEN_TSC2004=m +CONFIG_TOUCHSCREEN_TSC2005=m +CONFIG_TOUCHSCREEN_TSC2007=m +# CONFIG_TOUCHSCREEN_TSC2007_IIO is not set +CONFIG_TOUCHSCREEN_PCAP=m +CONFIG_TOUCHSCREEN_RM_TS=m +CONFIG_TOUCHSCREEN_SILEAD=m +CONFIG_TOUCHSCREEN_SIS_I2C=m +CONFIG_TOUCHSCREEN_ST1232=m +CONFIG_TOUCHSCREEN_STMFTS=m +CONFIG_TOUCHSCREEN_SUR40=m +CONFIG_TOUCHSCREEN_SURFACE3_SPI=m +CONFIG_TOUCHSCREEN_SX8654=m +CONFIG_TOUCHSCREEN_TPS6507X=m +CONFIG_TOUCHSCREEN_ZET6223=m +CONFIG_TOUCHSCREEN_ZFORCE=m +CONFIG_TOUCHSCREEN_ROHM_BU21023=m +CONFIG_INPUT_MISC=y +CONFIG_INPUT_88PM860X_ONKEY=m +CONFIG_INPUT_88PM80X_ONKEY=m +CONFIG_INPUT_AD714X=m +CONFIG_INPUT_AD714X_I2C=m +CONFIG_INPUT_AD714X_SPI=m +CONFIG_INPUT_ARIZONA_HAPTICS=m +CONFIG_INPUT_BMA150=m +CONFIG_INPUT_E3X0_BUTTON=m +CONFIG_INPUT_PCSPKR=m +CONFIG_INPUT_MAX77693_HAPTIC=m +CONFIG_INPUT_MAX8925_ONKEY=m +CONFIG_INPUT_MAX8997_HAPTIC=m +CONFIG_INPUT_MC13783_PWRBUTTON=m +CONFIG_INPUT_MMA8450=m +CONFIG_INPUT_APANEL=m +CONFIG_INPUT_GP2A=m +CONFIG_INPUT_GPIO_BEEPER=m +CONFIG_INPUT_GPIO_DECODER=m +CONFIG_INPUT_WISTRON_BTNS=m +CONFIG_INPUT_ATLAS_BTNS=m +CONFIG_INPUT_ATI_REMOTE2=m +CONFIG_INPUT_KEYSPAN_REMOTE=m +CONFIG_INPUT_KXTJ9=m +# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set +CONFIG_INPUT_POWERMATE=m +CONFIG_INPUT_YEALINK=m +CONFIG_INPUT_CM109=m +CONFIG_INPUT_REGULATOR_HAPTIC=m +CONFIG_INPUT_RETU_PWRBUTTON=m +CONFIG_INPUT_AXP20X_PEK=m +CONFIG_INPUT_TWL4030_PWRBUTTON=m +CONFIG_INPUT_TWL4030_VIBRA=m +CONFIG_INPUT_TWL6040_VIBRA=m +CONFIG_INPUT_UINPUT=y +CONFIG_INPUT_PALMAS_PWRBUTTON=m +CONFIG_INPUT_PCF50633_PMU=m +CONFIG_INPUT_PCF8574=m +CONFIG_INPUT_PWM_BEEPER=m +CONFIG_INPUT_PWM_VIBRA=m +CONFIG_INPUT_GPIO_ROTARY_ENCODER=m +CONFIG_INPUT_DA9052_ONKEY=m +CONFIG_INPUT_DA9055_ONKEY=m +CONFIG_INPUT_DA9063_ONKEY=m +CONFIG_INPUT_WM831X_ON=m +CONFIG_INPUT_PCAP=m +CONFIG_INPUT_ADXL34X=m +CONFIG_INPUT_ADXL34X_I2C=m +CONFIG_INPUT_ADXL34X_SPI=m +CONFIG_INPUT_IMS_PCU=m +CONFIG_INPUT_CMA3000=m +CONFIG_INPUT_CMA3000_I2C=m +CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m +CONFIG_INPUT_IDEAPAD_SLIDEBAR=m +CONFIG_INPUT_SOC_BUTTON_ARRAY=m +CONFIG_INPUT_DRV260X_HAPTICS=m +CONFIG_INPUT_DRV2665_HAPTICS=m +CONFIG_INPUT_DRV2667_HAPTICS=m +CONFIG_INPUT_RAVE_SP_PWRBUTTON=m +CONFIG_RMI4_CORE=m +CONFIG_RMI4_I2C=m +CONFIG_RMI4_SPI=m +CONFIG_RMI4_SMB=m +CONFIG_RMI4_F03=y +CONFIG_RMI4_F03_SERIO=m +CONFIG_RMI4_2D_SENSOR=y +CONFIG_RMI4_F11=y +CONFIG_RMI4_F12=y +CONFIG_RMI4_F30=y +# CONFIG_RMI4_F34 is not set +# CONFIG_RMI4_F54 is not set +CONFIG_RMI4_F55=y + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y +CONFIG_SERIO_I8042=y +CONFIG_SERIO_SERPORT=m +CONFIG_SERIO_CT82C710=m +CONFIG_SERIO_PARKBD=m +CONFIG_SERIO_PCIPS2=m +CONFIG_SERIO_LIBPS2=y +CONFIG_SERIO_RAW=m +CONFIG_SERIO_ALTERA_PS2=m +CONFIG_SERIO_PS2MULT=m +CONFIG_SERIO_ARC_PS2=m +CONFIG_HYPERV_KEYBOARD=m +CONFIG_SERIO_GPIO_PS2=m +CONFIG_USERIO=m +CONFIG_GAMEPORT=m +CONFIG_GAMEPORT_NS558=m +CONFIG_GAMEPORT_L4=m +CONFIG_GAMEPORT_EMU10K1=m +CONFIG_GAMEPORT_FM801=m + +# +# Character devices +# +CONFIG_TTY=y +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_VT_CONSOLE_SLEEP=y +CONFIG_HW_CONSOLE=y +CONFIG_VT_HW_CONSOLE_BINDING=y +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=0 +CONFIG_SERIAL_NONSTANDARD=y +CONFIG_ROCKETPORT=m +CONFIG_CYCLADES=m +# CONFIG_CYZ_INTR is not set +CONFIG_MOXA_INTELLIO=m +CONFIG_MOXA_SMARTIO=m +CONFIG_SYNCLINK=m +CONFIG_SYNCLINKMP=m +CONFIG_SYNCLINK_GT=m +CONFIG_NOZOMI=m +CONFIG_ISI=m +CONFIG_N_HDLC=m +CONFIG_N_GSM=m +CONFIG_TRACE_ROUTER=m +CONFIG_TRACE_SINK=m +CONFIG_DEVMEM=y +# CONFIG_DEVKMEM is not set + +# +# Serial drivers +# +CONFIG_SERIAL_EARLYCON=y +CONFIG_SERIAL_8250=y +# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set +CONFIG_SERIAL_8250_PNP=y +# CONFIG_SERIAL_8250_FINTEK is not set +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_DMA=y +CONFIG_SERIAL_8250_PCI=y +CONFIG_SERIAL_8250_EXAR=m +CONFIG_SERIAL_8250_CS=m +CONFIG_SERIAL_8250_MEN_MCB=m +CONFIG_SERIAL_8250_NR_UARTS=48 +CONFIG_SERIAL_8250_RUNTIME_UARTS=32 +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_MANY_PORTS=y +CONFIG_SERIAL_8250_FOURPORT=m +CONFIG_SERIAL_8250_ACCENT=m +CONFIG_SERIAL_8250_BOCA=m +CONFIG_SERIAL_8250_EXAR_ST16C554=m +CONFIG_SERIAL_8250_HUB6=m +CONFIG_SERIAL_8250_SHARE_IRQ=y +# CONFIG_SERIAL_8250_DETECT_IRQ is not set +CONFIG_SERIAL_8250_RSA=y +CONFIG_SERIAL_8250_DW=m +CONFIG_SERIAL_8250_RT288X=y +CONFIG_SERIAL_8250_LPSS=m +CONFIG_SERIAL_8250_MID=m +CONFIG_SERIAL_8250_MOXA=m + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_KGDB_NMI=y +CONFIG_SERIAL_MAX3100=m +CONFIG_SERIAL_MAX310X=y +CONFIG_SERIAL_UARTLITE=m +CONFIG_SERIAL_UARTLITE_NR_UARTS=1 +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_CONSOLE_POLL=y +CONFIG_SERIAL_JSM=m +CONFIG_SERIAL_SCCNXP=y +CONFIG_SERIAL_SCCNXP_CONSOLE=y +CONFIG_SERIAL_SC16IS7XX_CORE=m +CONFIG_SERIAL_SC16IS7XX=m +CONFIG_SERIAL_SC16IS7XX_I2C=y +CONFIG_SERIAL_SC16IS7XX_SPI=y +CONFIG_SERIAL_TIMBERDALE=m +CONFIG_SERIAL_ALTERA_JTAGUART=m +CONFIG_SERIAL_ALTERA_UART=m +CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 +CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200 +# CONFIG_SERIAL_IFX6X60 is not set +CONFIG_SERIAL_PCH_UART=m +CONFIG_SERIAL_ARC=m +CONFIG_SERIAL_ARC_NR_PORTS=1 +CONFIG_SERIAL_RP2=m +CONFIG_SERIAL_RP2_NR_UARTS=32 +CONFIG_SERIAL_FSL_LPUART=m +CONFIG_SERIAL_MEN_Z135=m +CONFIG_SERIAL_DEV_BUS=y +CONFIG_SERIAL_DEV_CTRL_TTYPORT=y +CONFIG_TTY_PRINTK=y +CONFIG_PRINTER=m +# CONFIG_LP_CONSOLE is not set +CONFIG_PPDEV=m +CONFIG_HVC_DRIVER=y +CONFIG_HVC_IRQ=y +CONFIG_HVC_XEN=y +CONFIG_HVC_XEN_FRONTEND=y +CONFIG_VIRTIO_CONSOLE=y +CONFIG_IPMI_HANDLER=m +CONFIG_IPMI_DMI_DECODE=y +# CONFIG_IPMI_PANIC_EVENT is not set +CONFIG_IPMI_DEVICE_INTERFACE=m +CONFIG_IPMI_SI=m +CONFIG_IPMI_SSIF=m +CONFIG_IPMI_WATCHDOG=m +CONFIG_IPMI_POWEROFF=m +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_TIMERIOMEM=m +CONFIG_HW_RANDOM_INTEL=m +CONFIG_HW_RANDOM_AMD=m +CONFIG_HW_RANDOM_GEODE=m +CONFIG_HW_RANDOM_VIA=m +CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_NVRAM=m +CONFIG_DTLK=m +CONFIG_R3964=m +CONFIG_APPLICOM=m +CONFIG_SONYPI=m + +# +# PCMCIA character devices +# +CONFIG_SYNCLINK_CS=m +CONFIG_CARDMAN_4000=m +CONFIG_CARDMAN_4040=m +CONFIG_SCR24X=m +CONFIG_IPWIRELESS=m +CONFIG_MWAVE=m +CONFIG_SCx200_GPIO=m +CONFIG_PC8736x_GPIO=m +CONFIG_NSC_GPIO=m +CONFIG_RAW_DRIVER=m +CONFIG_MAX_RAW_DEVS=256 +CONFIG_HPET=y +CONFIG_HPET_MMAP=y +CONFIG_HPET_MMAP_DEFAULT=y +CONFIG_HANGCHECK_TIMER=m +CONFIG_TCG_TPM=y +CONFIG_HW_RANDOM_TPM=y +CONFIG_TCG_TIS_CORE=y +CONFIG_TCG_TIS=y +CONFIG_TCG_TIS_SPI=m +CONFIG_TCG_TIS_I2C_ATMEL=m +CONFIG_TCG_TIS_I2C_INFINEON=m +CONFIG_TCG_TIS_I2C_NUVOTON=m +CONFIG_TCG_NSC=m +CONFIG_TCG_ATMEL=m +CONFIG_TCG_INFINEON=m +CONFIG_TCG_XEN=m +CONFIG_TCG_CRB=y +CONFIG_TCG_VTPM_PROXY=m +CONFIG_TCG_TIS_ST33ZP24=m +CONFIG_TCG_TIS_ST33ZP24_I2C=m +CONFIG_TCG_TIS_ST33ZP24_SPI=m +CONFIG_TELCLOCK=m +CONFIG_DEVPORT=y +CONFIG_XILLYBUS=m +CONFIG_XILLYBUS_PCIE=m +# CONFIG_RANDOM_TRUST_CPU is not set + +# +# I2C support +# +CONFIG_I2C=y +CONFIG_ACPI_I2C_OPREGION=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_MUX=m + +# +# Multiplexer I2C Chip support +# +CONFIG_I2C_MUX_GPIO=m +CONFIG_I2C_MUX_LTC4306=m +CONFIG_I2C_MUX_PCA9541=m +CONFIG_I2C_MUX_PCA954x=m +CONFIG_I2C_MUX_REG=m +CONFIG_I2C_MUX_MLXCPLD=m +CONFIG_I2C_HELPER_AUTO=y +CONFIG_I2C_SMBUS=m +CONFIG_I2C_ALGOBIT=m +CONFIG_I2C_ALGOPCA=m + +# +# I2C Hardware Bus support +# + +# +# PC SMBus host controller drivers +# +CONFIG_I2C_ALI1535=m +CONFIG_I2C_ALI1563=m +CONFIG_I2C_ALI15X3=m +CONFIG_I2C_AMD756=m +CONFIG_I2C_AMD756_S4882=m +CONFIG_I2C_AMD8111=m +CONFIG_I2C_I801=m +CONFIG_I2C_ISCH=m +CONFIG_I2C_ISMT=m +CONFIG_I2C_PIIX4=m +CONFIG_I2C_CHT_WC=m +CONFIG_I2C_NFORCE2=m +CONFIG_I2C_NFORCE2_S4985=m +CONFIG_I2C_SIS5595=m +CONFIG_I2C_SIS630=m +CONFIG_I2C_SIS96X=m +CONFIG_I2C_VIA=m +CONFIG_I2C_VIAPRO=m + +# +# ACPI drivers +# +CONFIG_I2C_SCMI=m + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +CONFIG_I2C_CBUS_GPIO=m +CONFIG_I2C_DESIGNWARE_CORE=y +CONFIG_I2C_DESIGNWARE_PLATFORM=y +# CONFIG_I2C_DESIGNWARE_SLAVE is not set +CONFIG_I2C_DESIGNWARE_PCI=m +CONFIG_I2C_DESIGNWARE_BAYTRAIL=y +CONFIG_I2C_EG20T=m +CONFIG_I2C_EMEV2=m +CONFIG_I2C_GPIO=m +# CONFIG_I2C_GPIO_FAULT_INJECTOR is not set +CONFIG_I2C_KEMPLD=m +CONFIG_I2C_OCORES=m +CONFIG_I2C_PCA_PLATFORM=m +CONFIG_I2C_SIMTEC=m +CONFIG_I2C_XILINX=m + +# +# External I2C/SMBus adapter drivers +# +CONFIG_I2C_DIOLAN_U2C=m +CONFIG_I2C_DLN2=m +CONFIG_I2C_PARPORT=m +CONFIG_I2C_PARPORT_LIGHT=m +CONFIG_I2C_ROBOTFUZZ_OSIF=m +CONFIG_I2C_TAOS_EVM=m +CONFIG_I2C_TINY_USB=m +CONFIG_I2C_VIPERBOARD=m + +# +# Other I2C/SMBus bus drivers +# +CONFIG_I2C_PCA_ISA=m +CONFIG_I2C_CROS_EC_TUNNEL=m +CONFIG_SCx200_ACB=m +CONFIG_I2C_STUB=m +CONFIG_I2C_SLAVE=y +CONFIG_I2C_SLAVE_EEPROM=m +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +CONFIG_SPI=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y +CONFIG_SPI_MEM=y + +# +# SPI Master Controller Drivers +# +CONFIG_SPI_ALTERA=m +CONFIG_SPI_AXI_SPI_ENGINE=m +CONFIG_SPI_BITBANG=m +CONFIG_SPI_BUTTERFLY=m +CONFIG_SPI_CADENCE=m +CONFIG_SPI_DESIGNWARE=m +CONFIG_SPI_DW_PCI=m +CONFIG_SPI_DW_MID_DMA=y +CONFIG_SPI_DW_MMIO=m +CONFIG_SPI_DLN2=m +CONFIG_SPI_GPIO=m +CONFIG_SPI_LM70_LLP=m +CONFIG_SPI_OC_TINY=m +CONFIG_SPI_PXA2XX=m +CONFIG_SPI_PXA2XX_PCI=m +CONFIG_SPI_ROCKCHIP=m +CONFIG_SPI_SC18IS602=m +CONFIG_SPI_TOPCLIFF_PCH=m +CONFIG_SPI_XCOMM=m +# CONFIG_SPI_XILINX is not set +CONFIG_SPI_ZYNQMP_GQSPI=m + +# +# SPI Protocol Masters +# +CONFIG_SPI_SPIDEV=m +# CONFIG_SPI_LOOPBACK_TEST is not set +CONFIG_SPI_TLE62X0=m +# CONFIG_SPI_SLAVE is not set +CONFIG_SPMI=m +CONFIG_HSI=m +CONFIG_HSI_BOARDINFO=y + +# +# HSI controllers +# + +# +# HSI clients +# +CONFIG_HSI_CHAR=m +CONFIG_PPS=m +# CONFIG_PPS_DEBUG is not set + +# +# PPS clients support +# +# CONFIG_PPS_CLIENT_KTIMER is not set +CONFIG_PPS_CLIENT_LDISC=m +CONFIG_PPS_CLIENT_PARPORT=m +CONFIG_PPS_CLIENT_GPIO=m + +# +# PPS generators support +# + +# +# PTP clock support +# +CONFIG_PTP_1588_CLOCK=m + +# +# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks. +# +CONFIG_PTP_1588_CLOCK_PCH=m +CONFIG_PTP_1588_CLOCK_KVM=m +CONFIG_PINCTRL=y +CONFIG_PINMUX=y +CONFIG_PINCONF=y +CONFIG_GENERIC_PINCONF=y +# CONFIG_DEBUG_PINCTRL is not set +CONFIG_PINCTRL_AMD=y +CONFIG_PINCTRL_MCP23S08=m +CONFIG_PINCTRL_SX150X=y +CONFIG_PINCTRL_BAYTRAIL=y +CONFIG_PINCTRL_CHERRYVIEW=m +CONFIG_PINCTRL_MERRIFIELD=m +CONFIG_PINCTRL_INTEL=m +CONFIG_PINCTRL_BROXTON=m +CONFIG_PINCTRL_CANNONLAKE=m +CONFIG_PINCTRL_CEDARFORK=m +CONFIG_PINCTRL_DENVERTON=m +CONFIG_PINCTRL_GEMINILAKE=m +CONFIG_PINCTRL_ICELAKE=m +CONFIG_PINCTRL_LEWISBURG=m +CONFIG_PINCTRL_SUNRISEPOINT=m +CONFIG_PINCTRL_MADERA=m +CONFIG_GPIOLIB=y +CONFIG_GPIOLIB_FASTPATH_LIMIT=512 +CONFIG_GPIO_ACPI=y +CONFIG_GPIOLIB_IRQCHIP=y +# CONFIG_DEBUG_GPIO is not set +CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_GENERIC=m +CONFIG_GPIO_MAX730X=m + +# +# Memory mapped GPIO drivers +# +CONFIG_GPIO_AMDPT=m +CONFIG_GPIO_DWAPB=m +CONFIG_GPIO_EXAR=m +CONFIG_GPIO_GENERIC_PLATFORM=m +CONFIG_GPIO_ICH=m +CONFIG_GPIO_LYNXPOINT=y +CONFIG_GPIO_MB86S7X=m +CONFIG_GPIO_MENZ127=m +# CONFIG_GPIO_MOCKUP is not set +CONFIG_GPIO_VX855=m + +# +# Port-mapped I/O GPIO drivers +# +CONFIG_GPIO_F7188X=m +CONFIG_GPIO_IT87=m +CONFIG_GPIO_SCH=m +CONFIG_GPIO_SCH311X=m +CONFIG_GPIO_WINBOND=m +CONFIG_GPIO_WS16C48=m + +# +# I2C GPIO expanders +# +CONFIG_GPIO_ADP5588=m +CONFIG_GPIO_MAX7300=m +CONFIG_GPIO_MAX732X=m +CONFIG_GPIO_PCA953X=m +CONFIG_GPIO_PCF857X=m +CONFIG_GPIO_TPIC2810=m + +# +# MFD GPIO expanders +# +CONFIG_GPIO_ADP5520=m +CONFIG_GPIO_ARIZONA=m +CONFIG_GPIO_BD9571MWV=m +CONFIG_GPIO_CRYSTAL_COVE=m +CONFIG_GPIO_CS5535=m +CONFIG_GPIO_DA9052=m +CONFIG_GPIO_DA9055=m +CONFIG_GPIO_DLN2=m +CONFIG_GPIO_JANZ_TTL=m +CONFIG_GPIO_KEMPLD=m +CONFIG_GPIO_LP3943=m +CONFIG_GPIO_LP873X=m +CONFIG_GPIO_MADERA=m +CONFIG_GPIO_MSIC=y +CONFIG_GPIO_PALMAS=y +CONFIG_GPIO_RC5T583=y +CONFIG_GPIO_TIMBERDALE=y +CONFIG_GPIO_TPS65086=m +CONFIG_GPIO_TPS6586X=y +CONFIG_GPIO_TPS65910=y +CONFIG_GPIO_TPS65912=m +CONFIG_GPIO_TWL4030=m +CONFIG_GPIO_TWL6040=m +CONFIG_GPIO_UCB1400=m +CONFIG_GPIO_WHISKEY_COVE=m +CONFIG_GPIO_WM831X=m +CONFIG_GPIO_WM8350=m +CONFIG_GPIO_WM8994=m + +# +# PCI GPIO expanders +# +CONFIG_GPIO_AMD8111=m +CONFIG_GPIO_INTEL_MID=y +CONFIG_GPIO_MERRIFIELD=m +CONFIG_GPIO_ML_IOH=m +CONFIG_GPIO_PCH=m +CONFIG_GPIO_PCI_IDIO_16=m +CONFIG_GPIO_PCIE_IDIO_24=m +CONFIG_GPIO_RDC321X=m + +# +# SPI GPIO expanders +# +CONFIG_GPIO_MAX3191X=m +CONFIG_GPIO_MAX7301=m +CONFIG_GPIO_MC33880=m +CONFIG_GPIO_PISOSR=m +CONFIG_GPIO_XRA1403=m + +# +# USB GPIO expanders +# +CONFIG_GPIO_VIPERBOARD=m +CONFIG_W1=m +CONFIG_W1_CON=y + +# +# 1-wire Bus Masters +# +CONFIG_W1_MASTER_MATROX=m +CONFIG_W1_MASTER_DS2490=m +CONFIG_W1_MASTER_DS2482=m +CONFIG_W1_MASTER_DS1WM=m +CONFIG_W1_MASTER_GPIO=m + +# +# 1-wire Slaves +# +CONFIG_W1_SLAVE_THERM=m +CONFIG_W1_SLAVE_SMEM=m +CONFIG_W1_SLAVE_DS2405=m +CONFIG_W1_SLAVE_DS2408=m +CONFIG_W1_SLAVE_DS2408_READBACK=y +CONFIG_W1_SLAVE_DS2413=m +CONFIG_W1_SLAVE_DS2406=m +CONFIG_W1_SLAVE_DS2423=m +CONFIG_W1_SLAVE_DS2805=m +CONFIG_W1_SLAVE_DS2431=m +CONFIG_W1_SLAVE_DS2433=m +# CONFIG_W1_SLAVE_DS2433_CRC is not set +CONFIG_W1_SLAVE_DS2438=m +CONFIG_W1_SLAVE_DS2780=m +CONFIG_W1_SLAVE_DS2781=m +CONFIG_W1_SLAVE_DS28E04=m +CONFIG_W1_SLAVE_DS28E17=m +CONFIG_POWER_AVS=y +CONFIG_POWER_RESET=y +CONFIG_POWER_RESET_RESTART=y +CONFIG_POWER_SUPPLY=y +# CONFIG_POWER_SUPPLY_DEBUG is not set +CONFIG_PDA_POWER=m +CONFIG_GENERIC_ADC_BATTERY=m +CONFIG_MAX8925_POWER=m +CONFIG_WM831X_BACKUP=m +CONFIG_WM831X_POWER=m +CONFIG_WM8350_POWER=m +CONFIG_TEST_POWER=m +CONFIG_BATTERY_88PM860X=m +CONFIG_CHARGER_ADP5061=m +CONFIG_BATTERY_DS2760=m +CONFIG_BATTERY_DS2780=m +CONFIG_BATTERY_DS2781=m +CONFIG_BATTERY_DS2782=m +CONFIG_BATTERY_SBS=m +CONFIG_CHARGER_SBS=m +CONFIG_MANAGER_SBS=m +CONFIG_BATTERY_BQ27XXX=m +CONFIG_BATTERY_BQ27XXX_I2C=m +CONFIG_BATTERY_BQ27XXX_HDQ=m +# CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set +CONFIG_BATTERY_DA9030=m +CONFIG_BATTERY_DA9052=m +CONFIG_CHARGER_DA9150=m +CONFIG_BATTERY_DA9150=m +CONFIG_CHARGER_AXP20X=m +CONFIG_BATTERY_AXP20X=m +CONFIG_AXP20X_POWER=m +CONFIG_AXP288_CHARGER=m +CONFIG_AXP288_FUEL_GAUGE=m +CONFIG_BATTERY_MAX17040=m +CONFIG_BATTERY_MAX17042=m +CONFIG_BATTERY_MAX1721X=m +CONFIG_BATTERY_TWL4030_MADC=m +CONFIG_CHARGER_88PM860X=m +CONFIG_CHARGER_PCF50633=m +CONFIG_BATTERY_RX51=m +CONFIG_CHARGER_ISP1704=m +CONFIG_CHARGER_MAX8903=m +CONFIG_CHARGER_TWL4030=m +CONFIG_CHARGER_LP8727=m +CONFIG_CHARGER_LP8788=m +CONFIG_CHARGER_GPIO=m +CONFIG_CHARGER_MANAGER=y +CONFIG_CHARGER_LTC3651=m +CONFIG_CHARGER_MAX14577=m +CONFIG_CHARGER_MAX77693=m +CONFIG_CHARGER_MAX8997=m +CONFIG_CHARGER_MAX8998=m +CONFIG_CHARGER_BQ2415X=m +CONFIG_CHARGER_BQ24190=m +CONFIG_CHARGER_BQ24257=m +CONFIG_CHARGER_BQ24735=m +CONFIG_CHARGER_BQ25890=m +CONFIG_CHARGER_SMB347=m +CONFIG_CHARGER_TPS65090=m +CONFIG_BATTERY_GAUGE_LTC2941=m +CONFIG_BATTERY_RT5033=m +CONFIG_CHARGER_RT9455=m +CONFIG_CHARGER_CROS_USBPD=m +CONFIG_HWMON=y +CONFIG_HWMON_VID=m +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Native drivers +# +CONFIG_SENSORS_ABITUGURU=m +CONFIG_SENSORS_ABITUGURU3=m +CONFIG_SENSORS_AD7314=m +CONFIG_SENSORS_AD7414=m +CONFIG_SENSORS_AD7418=m +CONFIG_SENSORS_ADM1021=m +CONFIG_SENSORS_ADM1025=m +CONFIG_SENSORS_ADM1026=m +CONFIG_SENSORS_ADM1029=m +CONFIG_SENSORS_ADM1031=m +CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ADT7X10=m +CONFIG_SENSORS_ADT7310=m +CONFIG_SENSORS_ADT7410=m +CONFIG_SENSORS_ADT7411=m +CONFIG_SENSORS_ADT7462=m +CONFIG_SENSORS_ADT7470=m +CONFIG_SENSORS_ADT7475=m +CONFIG_SENSORS_ASC7621=m +CONFIG_SENSORS_K8TEMP=m +CONFIG_SENSORS_K10TEMP=m +CONFIG_SENSORS_FAM15H_POWER=m +CONFIG_SENSORS_APPLESMC=m +CONFIG_SENSORS_ASB100=m +CONFIG_SENSORS_ASPEED=m +CONFIG_SENSORS_ATXP1=m +CONFIG_SENSORS_DS620=m +CONFIG_SENSORS_DS1621=m +CONFIG_SENSORS_DELL_SMM=m +CONFIG_SENSORS_DA9052_ADC=m +CONFIG_SENSORS_DA9055=m +CONFIG_SENSORS_I5K_AMB=m +CONFIG_SENSORS_F71805F=m +CONFIG_SENSORS_F71882FG=m +CONFIG_SENSORS_F75375S=m +CONFIG_SENSORS_MC13783_ADC=m +CONFIG_SENSORS_FSCHMD=m +CONFIG_SENSORS_FTSTEUTATES=m +CONFIG_SENSORS_GL518SM=m +CONFIG_SENSORS_GL520SM=m +CONFIG_SENSORS_G760A=m +CONFIG_SENSORS_G762=m +CONFIG_SENSORS_HIH6130=m +CONFIG_SENSORS_IBMAEM=m +CONFIG_SENSORS_IBMPEX=m +CONFIG_SENSORS_IIO_HWMON=m +CONFIG_SENSORS_I5500=m +CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_IT87=m +CONFIG_SENSORS_JC42=m +CONFIG_SENSORS_POWR1220=m +CONFIG_SENSORS_LINEAGE=m +CONFIG_SENSORS_LTC2945=m +CONFIG_SENSORS_LTC2990=m +CONFIG_SENSORS_LTC4151=m +CONFIG_SENSORS_LTC4215=m +CONFIG_SENSORS_LTC4222=m +CONFIG_SENSORS_LTC4245=m +CONFIG_SENSORS_LTC4260=m +CONFIG_SENSORS_LTC4261=m +CONFIG_SENSORS_MAX1111=m +CONFIG_SENSORS_MAX16065=m +CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX1668=m +CONFIG_SENSORS_MAX197=m +CONFIG_SENSORS_MAX31722=m +CONFIG_SENSORS_MAX6621=m +CONFIG_SENSORS_MAX6639=m +CONFIG_SENSORS_MAX6642=m +CONFIG_SENSORS_MAX6650=m +CONFIG_SENSORS_MAX6697=m +CONFIG_SENSORS_MAX31790=m +CONFIG_SENSORS_MCP3021=m +CONFIG_SENSORS_TC654=m +CONFIG_SENSORS_MENF21BMC_HWMON=m +CONFIG_SENSORS_ADCXX=m +CONFIG_SENSORS_LM63=m +CONFIG_SENSORS_LM70=m +CONFIG_SENSORS_LM73=m +CONFIG_SENSORS_LM75=m +CONFIG_SENSORS_LM77=m +CONFIG_SENSORS_LM78=m +CONFIG_SENSORS_LM80=m +CONFIG_SENSORS_LM83=m +CONFIG_SENSORS_LM85=m +CONFIG_SENSORS_LM87=m +CONFIG_SENSORS_LM90=m +CONFIG_SENSORS_LM92=m +CONFIG_SENSORS_LM93=m +CONFIG_SENSORS_LM95234=m +CONFIG_SENSORS_LM95241=m +CONFIG_SENSORS_LM95245=m +CONFIG_SENSORS_PC87360=m +CONFIG_SENSORS_PC87427=m +CONFIG_SENSORS_NTC_THERMISTOR=m +CONFIG_SENSORS_NCT6683=m +CONFIG_SENSORS_NCT6775=m +CONFIG_SENSORS_NCT7802=m +CONFIG_SENSORS_NCT7904=m +CONFIG_SENSORS_NPCM7XX=m +CONFIG_SENSORS_PCF8591=m +CONFIG_PMBUS=m +CONFIG_SENSORS_PMBUS=m +CONFIG_SENSORS_ADM1275=m +CONFIG_SENSORS_IBM_CFFPS=m +CONFIG_SENSORS_IR35221=m +CONFIG_SENSORS_LM25066=m +CONFIG_SENSORS_LTC2978=m +CONFIG_SENSORS_LTC2978_REGULATOR=y +CONFIG_SENSORS_LTC3815=m +CONFIG_SENSORS_MAX16064=m +CONFIG_SENSORS_MAX20751=m +CONFIG_SENSORS_MAX31785=m +CONFIG_SENSORS_MAX34440=m +CONFIG_SENSORS_MAX8688=m +CONFIG_SENSORS_TPS40422=m +CONFIG_SENSORS_TPS53679=m +CONFIG_SENSORS_UCD9000=m +CONFIG_SENSORS_UCD9200=m +CONFIG_SENSORS_ZL6100=m +CONFIG_SENSORS_SHT15=m +CONFIG_SENSORS_SHT21=m +CONFIG_SENSORS_SHT3x=m +CONFIG_SENSORS_SHTC1=m +CONFIG_SENSORS_SIS5595=m +CONFIG_SENSORS_DME1737=m +CONFIG_SENSORS_EMC1403=m +CONFIG_SENSORS_EMC2103=m +CONFIG_SENSORS_EMC6W201=m +CONFIG_SENSORS_SMSC47M1=m +CONFIG_SENSORS_SMSC47M192=m +CONFIG_SENSORS_SMSC47B397=m +CONFIG_SENSORS_SCH56XX_COMMON=m +CONFIG_SENSORS_SCH5627=m +CONFIG_SENSORS_SCH5636=m +CONFIG_SENSORS_STTS751=m +CONFIG_SENSORS_SMM665=m +CONFIG_SENSORS_ADC128D818=m +CONFIG_SENSORS_ADS1015=m +CONFIG_SENSORS_ADS7828=m +CONFIG_SENSORS_ADS7871=m +CONFIG_SENSORS_AMC6821=m +CONFIG_SENSORS_INA209=m +CONFIG_SENSORS_INA2XX=m +CONFIG_SENSORS_INA3221=m +CONFIG_SENSORS_TC74=m +CONFIG_SENSORS_THMC50=m +CONFIG_SENSORS_TMP102=m +CONFIG_SENSORS_TMP103=m +CONFIG_SENSORS_TMP108=m +CONFIG_SENSORS_TMP401=m +CONFIG_SENSORS_TMP421=m +CONFIG_SENSORS_VIA_CPUTEMP=m +CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT1211=m +CONFIG_SENSORS_VT8231=m +CONFIG_SENSORS_W83773G=m +CONFIG_SENSORS_W83781D=m +CONFIG_SENSORS_W83791D=m +CONFIG_SENSORS_W83792D=m +CONFIG_SENSORS_W83793=m +CONFIG_SENSORS_W83795=m +# CONFIG_SENSORS_W83795_FANCTRL is not set +CONFIG_SENSORS_W83L785TS=m +CONFIG_SENSORS_W83L786NG=m +CONFIG_SENSORS_W83627HF=m +CONFIG_SENSORS_W83627EHF=m +CONFIG_SENSORS_WM831X=m +CONFIG_SENSORS_WM8350=m +CONFIG_SENSORS_XGENE=m + +# +# ACPI drivers +# +CONFIG_SENSORS_ACPI_POWER=m +CONFIG_SENSORS_ATK0110=m +CONFIG_THERMAL=y +# CONFIG_THERMAL_STATISTICS is not set +CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 +CONFIG_THERMAL_HWMON=y +CONFIG_THERMAL_WRITABLE_TRIPS=y +CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y +# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set +# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set +CONFIG_THERMAL_GOV_FAIR_SHARE=y +CONFIG_THERMAL_GOV_STEP_WISE=y +CONFIG_THERMAL_GOV_BANG_BANG=y +CONFIG_THERMAL_GOV_USER_SPACE=y +CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y +CONFIG_CLOCK_THERMAL=y +CONFIG_DEVFREQ_THERMAL=y +CONFIG_THERMAL_EMULATION=y +CONFIG_INTEL_POWERCLAMP=m +CONFIG_X86_PKG_TEMP_THERMAL=m +CONFIG_INTEL_SOC_DTS_IOSF_CORE=m +CONFIG_INTEL_SOC_DTS_THERMAL=m + +# +# ACPI INT340X thermal drivers +# +CONFIG_INT340X_THERMAL=m +CONFIG_ACPI_THERMAL_REL=m +CONFIG_INT3406_THERMAL=m +CONFIG_INTEL_BXT_PMIC_THERMAL=m +CONFIG_INTEL_PCH_THERMAL=m +CONFIG_GENERIC_ADC_THERMAL=m +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_CORE=y +# CONFIG_WATCHDOG_NOWAYOUT is not set +CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y +CONFIG_WATCHDOG_SYSFS=y + +# +# Watchdog Device Drivers +# +CONFIG_SOFT_WATCHDOG=m +CONFIG_DA9052_WATCHDOG=m +CONFIG_DA9055_WATCHDOG=m +CONFIG_DA9063_WATCHDOG=m +CONFIG_DA9062_WATCHDOG=m +CONFIG_MENF21BMC_WATCHDOG=m +CONFIG_MENZ069_WATCHDOG=m +CONFIG_WDAT_WDT=m +CONFIG_WM831X_WATCHDOG=m +CONFIG_WM8350_WATCHDOG=m +CONFIG_XILINX_WATCHDOG=m +CONFIG_ZIIRAVE_WATCHDOG=m +CONFIG_RAVE_SP_WATCHDOG=m +CONFIG_CADENCE_WATCHDOG=m +CONFIG_DW_WATCHDOG=m +CONFIG_TWL4030_WATCHDOG=m +CONFIG_MAX63XX_WATCHDOG=m +CONFIG_RETU_WATCHDOG=m +CONFIG_ACQUIRE_WDT=m +CONFIG_ADVANTECH_WDT=m +CONFIG_ALIM1535_WDT=m +CONFIG_ALIM7101_WDT=m +CONFIG_EBC_C384_WDT=m +CONFIG_F71808E_WDT=m +CONFIG_SP5100_TCO=m +CONFIG_SBC_FITPC2_WATCHDOG=m +CONFIG_EUROTECH_WDT=m +CONFIG_IB700_WDT=m +CONFIG_IBMASR=m +CONFIG_WAFER_WDT=m +CONFIG_I6300ESB_WDT=m +CONFIG_IE6XX_WDT=m +CONFIG_INTEL_SCU_WATCHDOG=y +CONFIG_INTEL_MID_WATCHDOG=m +CONFIG_ITCO_WDT=m +CONFIG_ITCO_VENDOR_SUPPORT=y +CONFIG_IT8712F_WDT=m +CONFIG_IT87_WDT=m +CONFIG_HP_WATCHDOG=m +CONFIG_KEMPLD_WDT=m +CONFIG_HPWDT_NMI_DECODING=y +CONFIG_SC1200_WDT=m +CONFIG_SCx200_WDT=m +CONFIG_PC87413_WDT=m +CONFIG_NV_TCO=m +CONFIG_60XX_WDT=m +CONFIG_SBC8360_WDT=m +CONFIG_SBC7240_WDT=m +CONFIG_CPU5_WDT=m +CONFIG_SMSC_SCH311X_WDT=m +CONFIG_SMSC37B787_WDT=m +CONFIG_VIA_WDT=m +CONFIG_W83627HF_WDT=m +CONFIG_W83877F_WDT=m +CONFIG_W83977F_WDT=m +CONFIG_MACHZ_WDT=m +CONFIG_SBC_EPX_C3_WATCHDOG=m +CONFIG_INTEL_MEI_WDT=m +CONFIG_NI903X_WDT=m +CONFIG_NIC7018_WDT=m +CONFIG_MEN_A21_WDT=m +CONFIG_XEN_WDT=m + +# +# ISA-based Watchdog Cards +# +CONFIG_PCWATCHDOG=m +CONFIG_MIXCOMWD=m +CONFIG_WDT=m + +# +# PCI-based Watchdog Cards +# +CONFIG_PCIPCWATCHDOG=m +CONFIG_WDTPCI=m + +# +# USB-based Watchdog Cards +# +CONFIG_USBPCWATCHDOG=m + +# +# Watchdog Pretimeout Governors +# +# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set +CONFIG_SSB_POSSIBLE=y +CONFIG_SSB=m +CONFIG_SSB_SPROM=y +CONFIG_SSB_BLOCKIO=y +CONFIG_SSB_PCIHOST_POSSIBLE=y +CONFIG_SSB_PCIHOST=y +CONFIG_SSB_B43_PCI_BRIDGE=y +CONFIG_SSB_PCMCIAHOST_POSSIBLE=y +# CONFIG_SSB_PCMCIAHOST is not set +CONFIG_SSB_SDIOHOST_POSSIBLE=y +CONFIG_SSB_SDIOHOST=y +CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y +CONFIG_SSB_DRIVER_PCICORE=y +CONFIG_SSB_DRIVER_GPIO=y +CONFIG_BCMA_POSSIBLE=y +CONFIG_BCMA=m +CONFIG_BCMA_BLOCKIO=y +CONFIG_BCMA_HOST_PCI_POSSIBLE=y +CONFIG_BCMA_HOST_PCI=y +CONFIG_BCMA_HOST_SOC=y +CONFIG_BCMA_DRIVER_PCI=y +CONFIG_BCMA_SFLASH=y +CONFIG_BCMA_DRIVER_GMAC_CMN=y +CONFIG_BCMA_DRIVER_GPIO=y +# CONFIG_BCMA_DEBUG is not set + +# +# Multifunction device drivers +# +CONFIG_MFD_CORE=y +CONFIG_MFD_CS5535=m +CONFIG_MFD_AS3711=y +CONFIG_PMIC_ADP5520=y +CONFIG_MFD_AAT2870_CORE=y +CONFIG_MFD_BCM590XX=m +CONFIG_MFD_BD9571MWV=m +CONFIG_MFD_AXP20X=m +CONFIG_MFD_AXP20X_I2C=m +CONFIG_MFD_CROS_EC=m +CONFIG_MFD_CROS_EC_CHARDEV=m +CONFIG_MFD_MADERA=m +CONFIG_MFD_MADERA_I2C=m +CONFIG_MFD_MADERA_SPI=m +# CONFIG_MFD_CS47L35 is not set +# CONFIG_MFD_CS47L85 is not set +# CONFIG_MFD_CS47L90 is not set +CONFIG_PMIC_DA903X=y +CONFIG_PMIC_DA9052=y +CONFIG_MFD_DA9052_SPI=y +CONFIG_MFD_DA9052_I2C=y +CONFIG_MFD_DA9055=y +CONFIG_MFD_DA9062=m +CONFIG_MFD_DA9063=y +CONFIG_MFD_DA9150=m +CONFIG_MFD_DLN2=m +CONFIG_MFD_MC13XXX=m +CONFIG_MFD_MC13XXX_SPI=m +CONFIG_MFD_MC13XXX_I2C=m +CONFIG_HTC_PASIC3=m +CONFIG_HTC_I2CPLD=y +CONFIG_MFD_INTEL_QUARK_I2C_GPIO=m +CONFIG_LPC_ICH=m +CONFIG_LPC_SCH=m +CONFIG_INTEL_SOC_PMIC=y +CONFIG_INTEL_SOC_PMIC_BXTWC=m +CONFIG_INTEL_SOC_PMIC_CHTWC=y +CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m +CONFIG_MFD_INTEL_LPSS=m +CONFIG_MFD_INTEL_LPSS_ACPI=m +CONFIG_MFD_INTEL_LPSS_PCI=m +CONFIG_MFD_INTEL_MSIC=y +CONFIG_MFD_JANZ_CMODIO=m +CONFIG_MFD_KEMPLD=m +CONFIG_MFD_88PM800=m +CONFIG_MFD_88PM805=m +CONFIG_MFD_88PM860X=y +CONFIG_MFD_MAX14577=y +CONFIG_MFD_MAX77693=y +CONFIG_MFD_MAX77843=y +CONFIG_MFD_MAX8907=m +CONFIG_MFD_MAX8925=y +CONFIG_MFD_MAX8997=y +CONFIG_MFD_MAX8998=y +CONFIG_MFD_MT6397=m +CONFIG_MFD_MENF21BMC=m +CONFIG_EZX_PCAP=y +CONFIG_MFD_VIPERBOARD=m +CONFIG_MFD_RETU=m +CONFIG_MFD_PCF50633=m +CONFIG_PCF50633_ADC=m +CONFIG_PCF50633_GPIO=m +CONFIG_UCB1400_CORE=m +CONFIG_MFD_RDC321X=m +CONFIG_MFD_RT5033=m +CONFIG_MFD_RC5T583=y +CONFIG_MFD_SEC_CORE=y +CONFIG_MFD_SI476X_CORE=m +CONFIG_MFD_SM501=m +CONFIG_MFD_SM501_GPIO=y +CONFIG_MFD_SKY81452=m +CONFIG_MFD_SMSC=y +CONFIG_ABX500_CORE=y +CONFIG_AB3100_CORE=y +CONFIG_AB3100_OTP=m +CONFIG_MFD_SYSCON=y +CONFIG_MFD_TI_AM335X_TSCADC=m +CONFIG_MFD_LP3943=m +CONFIG_MFD_LP8788=y +CONFIG_MFD_TI_LMU=m +CONFIG_MFD_PALMAS=y +CONFIG_TPS6105X=m +CONFIG_TPS65010=m +CONFIG_TPS6507X=m +CONFIG_MFD_TPS65086=m +CONFIG_MFD_TPS65090=y +# CONFIG_MFD_TPS68470 is not set +CONFIG_MFD_TI_LP873X=m +CONFIG_MFD_TPS6586X=y +CONFIG_MFD_TPS65910=y +CONFIG_MFD_TPS65912=y +CONFIG_MFD_TPS65912_I2C=y +CONFIG_MFD_TPS65912_SPI=y +CONFIG_MFD_TPS80031=y +CONFIG_TWL4030_CORE=y +CONFIG_MFD_TWL4030_AUDIO=y +CONFIG_TWL6040_CORE=y +CONFIG_MFD_WL1273_CORE=m +CONFIG_MFD_LM3533=m +CONFIG_MFD_TIMBERDALE=m +CONFIG_MFD_VX855=m +CONFIG_MFD_ARIZONA=y +CONFIG_MFD_ARIZONA_I2C=m +CONFIG_MFD_ARIZONA_SPI=m +CONFIG_MFD_CS47L24=y +CONFIG_MFD_WM5102=y +CONFIG_MFD_WM5110=y +CONFIG_MFD_WM8997=y +CONFIG_MFD_WM8998=y +CONFIG_MFD_WM8400=y +CONFIG_MFD_WM831X=y +CONFIG_MFD_WM831X_I2C=y +CONFIG_MFD_WM831X_SPI=y +CONFIG_MFD_WM8350=y +CONFIG_MFD_WM8350_I2C=y +CONFIG_MFD_WM8994=m +CONFIG_RAVE_SP_CORE=m +CONFIG_REGULATOR=y +# CONFIG_REGULATOR_DEBUG is not set +CONFIG_REGULATOR_FIXED_VOLTAGE=m +CONFIG_REGULATOR_VIRTUAL_CONSUMER=m +CONFIG_REGULATOR_USERSPACE_CONSUMER=m +CONFIG_REGULATOR_88PG86X=m +CONFIG_REGULATOR_88PM800=m +CONFIG_REGULATOR_88PM8607=m +CONFIG_REGULATOR_ACT8865=m +CONFIG_REGULATOR_AD5398=m +CONFIG_REGULATOR_ANATOP=m +CONFIG_REGULATOR_AAT2870=m +CONFIG_REGULATOR_AB3100=m +CONFIG_REGULATOR_ARIZONA_LDO1=m +CONFIG_REGULATOR_ARIZONA_MICSUPP=m +CONFIG_REGULATOR_AS3711=m +CONFIG_REGULATOR_AXP20X=m +CONFIG_REGULATOR_BCM590XX=m +CONFIG_REGULATOR_BD9571MWV=m +CONFIG_REGULATOR_DA903X=m +CONFIG_REGULATOR_DA9052=m +CONFIG_REGULATOR_DA9055=m +CONFIG_REGULATOR_DA9062=m +CONFIG_REGULATOR_DA9063=m +CONFIG_REGULATOR_DA9210=m +CONFIG_REGULATOR_DA9211=m +CONFIG_REGULATOR_FAN53555=m +CONFIG_REGULATOR_GPIO=m +CONFIG_REGULATOR_ISL9305=m +CONFIG_REGULATOR_ISL6271A=m +CONFIG_REGULATOR_LM363X=m +CONFIG_REGULATOR_LP3971=m +CONFIG_REGULATOR_LP3972=m +CONFIG_REGULATOR_LP872X=m +CONFIG_REGULATOR_LP8755=m +CONFIG_REGULATOR_LP8788=m +CONFIG_REGULATOR_LTC3589=m +CONFIG_REGULATOR_LTC3676=m +CONFIG_REGULATOR_MAX14577=m +CONFIG_REGULATOR_MAX1586=m +CONFIG_REGULATOR_MAX8649=m +CONFIG_REGULATOR_MAX8660=m +CONFIG_REGULATOR_MAX8907=m +CONFIG_REGULATOR_MAX8925=m +CONFIG_REGULATOR_MAX8952=m +CONFIG_REGULATOR_MAX8997=m +CONFIG_REGULATOR_MAX8998=m +CONFIG_REGULATOR_MAX77693=m +CONFIG_REGULATOR_MC13XXX_CORE=m +CONFIG_REGULATOR_MC13783=m +CONFIG_REGULATOR_MC13892=m +CONFIG_REGULATOR_MT6311=m +CONFIG_REGULATOR_MT6323=m +CONFIG_REGULATOR_MT6397=m +CONFIG_REGULATOR_PALMAS=m +CONFIG_REGULATOR_PCAP=m +CONFIG_REGULATOR_PCF50633=m +CONFIG_REGULATOR_PFUZE100=m +CONFIG_REGULATOR_PV88060=m +CONFIG_REGULATOR_PV88080=m +CONFIG_REGULATOR_PV88090=m +CONFIG_REGULATOR_PWM=m +CONFIG_REGULATOR_QCOM_SPMI=m +CONFIG_REGULATOR_RC5T583=m +CONFIG_REGULATOR_RT5033=m +CONFIG_REGULATOR_S2MPA01=m +CONFIG_REGULATOR_S2MPS11=m +CONFIG_REGULATOR_S5M8767=m +CONFIG_REGULATOR_SKY81452=m +CONFIG_REGULATOR_TPS51632=m +CONFIG_REGULATOR_TPS6105X=m +CONFIG_REGULATOR_TPS62360=m +CONFIG_REGULATOR_TPS65023=m +CONFIG_REGULATOR_TPS6507X=m +CONFIG_REGULATOR_TPS65086=m +CONFIG_REGULATOR_TPS65090=m +CONFIG_REGULATOR_TPS65132=m +CONFIG_REGULATOR_TPS6524X=m +CONFIG_REGULATOR_TPS6586X=m +CONFIG_REGULATOR_TPS65910=m +CONFIG_REGULATOR_TPS65912=m +CONFIG_REGULATOR_TPS80031=m +CONFIG_REGULATOR_TWL4030=m +CONFIG_REGULATOR_WM831X=m +CONFIG_REGULATOR_WM8350=m +CONFIG_REGULATOR_WM8400=m +CONFIG_REGULATOR_WM8994=m +CONFIG_CEC_CORE=m +CONFIG_CEC_NOTIFIER=y +CONFIG_RC_CORE=m +CONFIG_RC_MAP=m +CONFIG_LIRC=y +CONFIG_RC_DECODERS=y +CONFIG_IR_NEC_DECODER=m +CONFIG_IR_RC5_DECODER=m +CONFIG_IR_RC6_DECODER=m +CONFIG_IR_JVC_DECODER=m +CONFIG_IR_SONY_DECODER=m +CONFIG_IR_SANYO_DECODER=m +CONFIG_IR_SHARP_DECODER=m +CONFIG_IR_MCE_KBD_DECODER=m +CONFIG_IR_XMP_DECODER=m +CONFIG_IR_IMON_DECODER=m +CONFIG_RC_DEVICES=y +CONFIG_RC_ATI_REMOTE=m +CONFIG_IR_ENE=m +CONFIG_IR_IMON=m +CONFIG_IR_IMON_RAW=m +CONFIG_IR_MCEUSB=m +CONFIG_IR_ITE_CIR=m +CONFIG_IR_FINTEK=m +CONFIG_IR_NUVOTON=m +CONFIG_IR_REDRAT3=m +CONFIG_IR_STREAMZAP=m +CONFIG_IR_WINBOND_CIR=m +CONFIG_IR_IGORPLUGUSB=m +CONFIG_IR_IGUANA=m +CONFIG_IR_TTUSBIR=m +CONFIG_RC_LOOPBACK=m +CONFIG_IR_SERIAL=m +CONFIG_IR_SERIAL_TRANSMITTER=y +CONFIG_IR_SIR=m +CONFIG_MEDIA_SUPPORT=m + +# +# Multimedia core support +# +CONFIG_MEDIA_CAMERA_SUPPORT=y +CONFIG_MEDIA_ANALOG_TV_SUPPORT=y +CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y +CONFIG_MEDIA_RADIO_SUPPORT=y +CONFIG_MEDIA_SDR_SUPPORT=y +CONFIG_MEDIA_CEC_SUPPORT=y +# CONFIG_MEDIA_CEC_RC is not set +CONFIG_MEDIA_CONTROLLER=y +# CONFIG_MEDIA_CONTROLLER_DVB is not set +CONFIG_VIDEO_DEV=m +CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_VIDEO_V4L2=m +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +# CONFIG_VIDEO_PCI_SKELETON is not set +CONFIG_VIDEO_TUNER=m +CONFIG_V4L2_MEM2MEM_DEV=m +CONFIG_V4L2_FLASH_LED_CLASS=m +CONFIG_V4L2_FWNODE=m +CONFIG_VIDEOBUF_GEN=m +CONFIG_VIDEOBUF_DMA_SG=m +CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_DVB_CORE=m +# CONFIG_DVB_MMAP is not set +CONFIG_DVB_NET=y +CONFIG_TTPCI_EEPROM=m +CONFIG_DVB_MAX_ADAPTERS=8 +CONFIG_DVB_DYNAMIC_MINORS=y +# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set +# CONFIG_DVB_ULE_DEBUG is not set + +# +# Media drivers +# +CONFIG_MEDIA_USB_SUPPORT=y + +# +# Webcam devices +# +CONFIG_USB_VIDEO_CLASS=m +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +CONFIG_USB_GSPCA=m +CONFIG_USB_M5602=m +CONFIG_USB_STV06XX=m +CONFIG_USB_GL860=m +CONFIG_USB_GSPCA_BENQ=m +CONFIG_USB_GSPCA_CONEX=m +CONFIG_USB_GSPCA_CPIA1=m +CONFIG_USB_GSPCA_DTCS033=m +CONFIG_USB_GSPCA_ETOMS=m +CONFIG_USB_GSPCA_FINEPIX=m +CONFIG_USB_GSPCA_JEILINJ=m +CONFIG_USB_GSPCA_JL2005BCD=m +CONFIG_USB_GSPCA_KINECT=m +CONFIG_USB_GSPCA_KONICA=m +CONFIG_USB_GSPCA_MARS=m +CONFIG_USB_GSPCA_MR97310A=m +CONFIG_USB_GSPCA_NW80X=m +CONFIG_USB_GSPCA_OV519=m +CONFIG_USB_GSPCA_OV534=m +CONFIG_USB_GSPCA_OV534_9=m +CONFIG_USB_GSPCA_PAC207=m +CONFIG_USB_GSPCA_PAC7302=m +CONFIG_USB_GSPCA_PAC7311=m +CONFIG_USB_GSPCA_SE401=m +CONFIG_USB_GSPCA_SN9C2028=m +CONFIG_USB_GSPCA_SN9C20X=m +CONFIG_USB_GSPCA_SONIXB=m +CONFIG_USB_GSPCA_SONIXJ=m +CONFIG_USB_GSPCA_SPCA500=m +CONFIG_USB_GSPCA_SPCA501=m +CONFIG_USB_GSPCA_SPCA505=m +CONFIG_USB_GSPCA_SPCA506=m +CONFIG_USB_GSPCA_SPCA508=m +CONFIG_USB_GSPCA_SPCA561=m +CONFIG_USB_GSPCA_SPCA1528=m +CONFIG_USB_GSPCA_SQ905=m +CONFIG_USB_GSPCA_SQ905C=m +CONFIG_USB_GSPCA_SQ930X=m +CONFIG_USB_GSPCA_STK014=m +CONFIG_USB_GSPCA_STK1135=m +CONFIG_USB_GSPCA_STV0680=m +CONFIG_USB_GSPCA_SUNPLUS=m +CONFIG_USB_GSPCA_T613=m +CONFIG_USB_GSPCA_TOPRO=m +CONFIG_USB_GSPCA_TOUPTEK=m +CONFIG_USB_GSPCA_TV8532=m +CONFIG_USB_GSPCA_VC032X=m +CONFIG_USB_GSPCA_VICAM=m +CONFIG_USB_GSPCA_XIRLINK_CIT=m +CONFIG_USB_GSPCA_ZC3XX=m +CONFIG_USB_PWC=m +# CONFIG_USB_PWC_DEBUG is not set +CONFIG_USB_PWC_INPUT_EVDEV=y +CONFIG_VIDEO_CPIA2=m +CONFIG_USB_ZR364XX=m +CONFIG_USB_STKWEBCAM=m +CONFIG_USB_S2255=m +CONFIG_VIDEO_USBTV=m + +# +# Analog TV USB devices +# +CONFIG_VIDEO_PVRUSB2=m +CONFIG_VIDEO_PVRUSB2_SYSFS=y +CONFIG_VIDEO_PVRUSB2_DVB=y +# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set +CONFIG_VIDEO_HDPVR=m +CONFIG_VIDEO_USBVISION=m +CONFIG_VIDEO_STK1160_COMMON=m +CONFIG_VIDEO_STK1160=m +CONFIG_VIDEO_GO7007=m +CONFIG_VIDEO_GO7007_USB=m +CONFIG_VIDEO_GO7007_LOADER=m +CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m + +# +# Analog/digital TV USB devices +# +CONFIG_VIDEO_AU0828=m +CONFIG_VIDEO_AU0828_V4L2=y +CONFIG_VIDEO_AU0828_RC=y +CONFIG_VIDEO_CX231XX=m +CONFIG_VIDEO_CX231XX_RC=y +CONFIG_VIDEO_CX231XX_ALSA=m +CONFIG_VIDEO_CX231XX_DVB=m +CONFIG_VIDEO_TM6000=m +CONFIG_VIDEO_TM6000_ALSA=m +CONFIG_VIDEO_TM6000_DVB=m + +# +# Digital TV USB devices +# +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_DIB3000MC=m +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_DIBUSB_MB=m +# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIB0700=m +CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_CXUSB=m +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_VP7045=m +CONFIG_DVB_USB_VP702X=m +CONFIG_DVB_USB_GP8PSK=m +CONFIG_DVB_USB_NOVA_T_USB2=m +CONFIG_DVB_USB_TTUSB2=m +CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_USB_OPERA1=m +CONFIG_DVB_USB_AF9005=m +CONFIG_DVB_USB_AF9005_REMOTE=m +CONFIG_DVB_USB_PCTV452E=m +CONFIG_DVB_USB_DW2102=m +CONFIG_DVB_USB_CINERGY_T2=m +CONFIG_DVB_USB_DTV5100=m +CONFIG_DVB_USB_AZ6027=m +CONFIG_DVB_USB_TECHNISAT_USB2=m +CONFIG_DVB_USB_V2=m +CONFIG_DVB_USB_AF9015=m +CONFIG_DVB_USB_AF9035=m +CONFIG_DVB_USB_ANYSEE=m +CONFIG_DVB_USB_AU6610=m +CONFIG_DVB_USB_AZ6007=m +CONFIG_DVB_USB_CE6230=m +CONFIG_DVB_USB_EC168=m +CONFIG_DVB_USB_GL861=m +CONFIG_DVB_USB_LME2510=m +CONFIG_DVB_USB_MXL111SF=m +CONFIG_DVB_USB_RTL28XXU=m +CONFIG_DVB_USB_DVBSKY=m +CONFIG_DVB_USB_ZD1301=m +CONFIG_DVB_TTUSB_BUDGET=m +CONFIG_DVB_TTUSB_DEC=m +CONFIG_SMS_USB_DRV=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set +CONFIG_DVB_AS102=m + +# +# Webcam, TV (analog/digital) USB devices +# +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_V4L2=m +CONFIG_VIDEO_EM28XX_ALSA=m +CONFIG_VIDEO_EM28XX_DVB=m +CONFIG_VIDEO_EM28XX_RC=m + +# +# Software defined radio USB devices +# +CONFIG_USB_AIRSPY=m +CONFIG_USB_HACKRF=m +CONFIG_USB_MSI2500=m + +# +# USB HDMI CEC adapters +# +CONFIG_USB_PULSE8_CEC=m +CONFIG_USB_RAINSHADOW_CEC=m +CONFIG_MEDIA_PCI_SUPPORT=y + +# +# Media capture support +# +CONFIG_VIDEO_MEYE=m +CONFIG_VIDEO_SOLO6X10=m +CONFIG_VIDEO_TW5864=m +CONFIG_VIDEO_TW68=m +CONFIG_VIDEO_TW686X=m + +# +# Media capture/analog TV support +# +CONFIG_VIDEO_IVTV=m +# CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set +CONFIG_VIDEO_IVTV_ALSA=m +CONFIG_VIDEO_FB_IVTV=m +CONFIG_VIDEO_HEXIUM_GEMINI=m +CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_MXB=m +CONFIG_VIDEO_DT3155=m + +# +# Media capture/analog/hybrid TV support +# +CONFIG_VIDEO_CX18=m +CONFIG_VIDEO_CX18_ALSA=m +CONFIG_VIDEO_CX23885=m +CONFIG_MEDIA_ALTERA_CI=m +CONFIG_VIDEO_CX25821=m +CONFIG_VIDEO_CX25821_ALSA=m +CONFIG_VIDEO_CX88=m +CONFIG_VIDEO_CX88_ALSA=m +CONFIG_VIDEO_CX88_BLACKBIRD=m +CONFIG_VIDEO_CX88_DVB=m +CONFIG_VIDEO_CX88_ENABLE_VP3054=y +CONFIG_VIDEO_CX88_VP3054=m +CONFIG_VIDEO_CX88_MPEG=m +CONFIG_VIDEO_BT848=m +CONFIG_DVB_BT8XX=m +CONFIG_VIDEO_SAA7134=m +CONFIG_VIDEO_SAA7134_ALSA=m +CONFIG_VIDEO_SAA7134_RC=y +CONFIG_VIDEO_SAA7134_DVB=m +CONFIG_VIDEO_SAA7134_GO7007=m +CONFIG_VIDEO_SAA7164=m +CONFIG_VIDEO_COBALT=m + +# +# Media digital TV PCI Adapters +# +CONFIG_DVB_AV7110_IR=y +CONFIG_DVB_AV7110=m +CONFIG_DVB_AV7110_OSD=y +CONFIG_DVB_BUDGET_CORE=m +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +CONFIG_DVB_BUDGET_AV=m +CONFIG_DVB_BUDGET_PATCH=m +CONFIG_DVB_B2C2_FLEXCOP_PCI=m +# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set +CONFIG_DVB_PLUTO2=m +CONFIG_DVB_DM1105=m +CONFIG_DVB_PT1=m +CONFIG_DVB_PT3=m +CONFIG_MANTIS_CORE=m +CONFIG_DVB_MANTIS=m +CONFIG_DVB_HOPPER=m +CONFIG_DVB_NGENE=m +CONFIG_DVB_DDBRIDGE=m +# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set +CONFIG_DVB_SMIPCIE=m +CONFIG_DVB_NETUP_UNIDVB=m +CONFIG_VIDEO_IPU3_CIO2=m +CONFIG_V4L_PLATFORM_DRIVERS=y +CONFIG_VIDEO_CAFE_CCIC=m +CONFIG_VIDEO_VIA_CAMERA=m +CONFIG_VIDEO_CADENCE=y +CONFIG_VIDEO_CADENCE_CSI2RX=m +CONFIG_VIDEO_CADENCE_CSI2TX=m +CONFIG_SOC_CAMERA=m +CONFIG_SOC_CAMERA_PLATFORM=m +CONFIG_V4L_MEM2MEM_DRIVERS=y +CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m +CONFIG_VIDEO_SH_VEU=m +CONFIG_V4L_TEST_DRIVERS=y +# CONFIG_VIDEO_VIMC is not set +CONFIG_VIDEO_VIVID=m +CONFIG_VIDEO_VIVID_CEC=y +CONFIG_VIDEO_VIVID_MAX_DEVS=64 +CONFIG_VIDEO_VIM2M=m +CONFIG_VIDEO_VICODEC=m +CONFIG_DVB_PLATFORM_DRIVERS=y +CONFIG_CEC_PLATFORM_DRIVERS=y +CONFIG_VIDEO_CROS_EC_CEC=m +CONFIG_SDR_PLATFORM_DRIVERS=y + +# +# Supported MMC/SDIO adapters +# +CONFIG_SMS_SDIO_DRV=m +CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_TEA575X=m +CONFIG_RADIO_SI470X=m +CONFIG_USB_SI470X=m +CONFIG_I2C_SI470X=m +CONFIG_RADIO_SI4713=m +CONFIG_USB_SI4713=m +CONFIG_PLATFORM_SI4713=m +CONFIG_I2C_SI4713=m +CONFIG_RADIO_SI476X=m +CONFIG_USB_MR800=m +CONFIG_USB_DSBR=m +CONFIG_RADIO_MAXIRADIO=m +CONFIG_RADIO_SHARK=m +CONFIG_RADIO_SHARK2=m +CONFIG_USB_KEENE=m +CONFIG_USB_RAREMONO=m +CONFIG_USB_MA901=m +CONFIG_RADIO_TEA5764=m +CONFIG_RADIO_SAA7706H=m +CONFIG_RADIO_TEF6862=m +CONFIG_RADIO_TIMBERDALE=m +CONFIG_RADIO_WL1273=m + +# +# Texas Instruments WL128x FM driver (ST based) +# +CONFIG_RADIO_WL128X=m +CONFIG_V4L_RADIO_ISA_DRIVERS=y +CONFIG_RADIO_ISA=m +CONFIG_RADIO_CADET=m +CONFIG_RADIO_RTRACK=m +CONFIG_RADIO_RTRACK2=m +CONFIG_RADIO_AZTECH=m +CONFIG_RADIO_GEMTEK=m +CONFIG_RADIO_MIROPCM20=m +CONFIG_RADIO_SF16FMI=m +CONFIG_RADIO_SF16FMR2=m +CONFIG_RADIO_TERRATEC=m +CONFIG_RADIO_TRUST=m +CONFIG_RADIO_TYPHOON=m +CONFIG_RADIO_ZOLTRIX=m + +# +# Supported FireWire (IEEE 1394) Adapters +# +CONFIG_DVB_FIREDTV=m +CONFIG_DVB_FIREDTV_INPUT=y +CONFIG_MEDIA_COMMON_OPTIONS=y + +# +# common driver options +# +CONFIG_VIDEO_CX2341X=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_CYPRESS_FIRMWARE=m +CONFIG_VIDEOBUF2_CORE=m +CONFIG_VIDEOBUF2_V4L2=m +CONFIG_VIDEOBUF2_MEMOPS=m +CONFIG_VIDEOBUF2_DMA_CONTIG=m +CONFIG_VIDEOBUF2_VMALLOC=m +CONFIG_VIDEOBUF2_DMA_SG=m +CONFIG_VIDEOBUF2_DVB=m +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_SMS_SIANO_MDTV=m +CONFIG_SMS_SIANO_RC=y +CONFIG_SMS_SIANO_DEBUGFS=y +CONFIG_VIDEO_V4L2_TPG=m + +# +# Media ancillary drivers (tuners, sensors, i2c, spi, frontends) +# +CONFIG_MEDIA_SUBDRV_AUTOSELECT=y +CONFIG_MEDIA_ATTACH=y +CONFIG_VIDEO_IR_I2C=m + +# +# Audio decoders, processors and mixers +# +CONFIG_VIDEO_TVAUDIO=m +CONFIG_VIDEO_TDA7432=m +CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TEA6415C=m +CONFIG_VIDEO_TEA6420=m +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_CS3308=m +CONFIG_VIDEO_CS5345=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_UDA1342=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_VP27SMPX=m +CONFIG_VIDEO_SONY_BTF_MPX=m + +# +# RDS decoders +# +CONFIG_VIDEO_SAA6588=m + +# +# Video decoders +# +CONFIG_VIDEO_ADV7604=m +CONFIG_VIDEO_ADV7842=m +CONFIG_VIDEO_BT819=m +CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_BT866=m +CONFIG_VIDEO_KS0127=m +CONFIG_VIDEO_SAA7110=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_TW2804=m +CONFIG_VIDEO_TW9903=m +CONFIG_VIDEO_TW9906=m +CONFIG_VIDEO_VPX3220=m + +# +# Video and audio decoders +# +CONFIG_VIDEO_SAA717X=m +CONFIG_VIDEO_CX25840=m + +# +# Video encoders +# +CONFIG_VIDEO_SAA7127=m +CONFIG_VIDEO_SAA7185=m +CONFIG_VIDEO_ADV7170=m +CONFIG_VIDEO_ADV7175=m +CONFIG_VIDEO_ADV7511=m + +# +# Camera sensor devices +# +CONFIG_VIDEO_OV2640=m +CONFIG_VIDEO_OV7640=m +CONFIG_VIDEO_OV7670=m +CONFIG_VIDEO_MT9M111=m +CONFIG_VIDEO_MT9V011=m + +# +# Flash devices +# + +# +# Video improvement chips +# +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m + +# +# Audio/Video compression chips +# +CONFIG_VIDEO_SAA6752HS=m + +# +# SDR tuner chips +# + +# +# Miscellaneous helper chips +# +CONFIG_VIDEO_M52790=m + +# +# Sensors used on soc_camera driver +# + +# +# soc_camera sensor drivers +# +CONFIG_SOC_CAMERA_MT9M001=m +CONFIG_SOC_CAMERA_MT9M111=m +CONFIG_SOC_CAMERA_MT9T112=m +CONFIG_SOC_CAMERA_MT9V022=m +CONFIG_SOC_CAMERA_OV5642=m +CONFIG_SOC_CAMERA_OV772X=m +CONFIG_SOC_CAMERA_OV9640=m +CONFIG_SOC_CAMERA_OV9740=m +CONFIG_SOC_CAMERA_RJ54N1=m +CONFIG_SOC_CAMERA_TW9910=m + +# +# Media SPI Adapters +# +CONFIG_CXD2880_SPI_DRV=m +CONFIG_MEDIA_TUNER=m +CONFIG_MEDIA_TUNER_SIMPLE=m +CONFIG_MEDIA_TUNER_TDA18250=m +CONFIG_MEDIA_TUNER_TDA8290=m +CONFIG_MEDIA_TUNER_TDA827X=m +CONFIG_MEDIA_TUNER_TDA18271=m +CONFIG_MEDIA_TUNER_TDA9887=m +CONFIG_MEDIA_TUNER_TEA5761=m +CONFIG_MEDIA_TUNER_TEA5767=m +CONFIG_MEDIA_TUNER_MSI001=m +CONFIG_MEDIA_TUNER_MT20XX=m +CONFIG_MEDIA_TUNER_MT2060=m +CONFIG_MEDIA_TUNER_MT2063=m +CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_MT2131=m +CONFIG_MEDIA_TUNER_QT1010=m +CONFIG_MEDIA_TUNER_XC2028=m +CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_XC4000=m +CONFIG_MEDIA_TUNER_MXL5005S=m +CONFIG_MEDIA_TUNER_MXL5007T=m +CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m +CONFIG_MEDIA_TUNER_TDA18218=m +CONFIG_MEDIA_TUNER_FC0011=m +CONFIG_MEDIA_TUNER_FC0012=m +CONFIG_MEDIA_TUNER_FC0013=m +CONFIG_MEDIA_TUNER_TDA18212=m +CONFIG_MEDIA_TUNER_E4000=m +CONFIG_MEDIA_TUNER_FC2580=m +CONFIG_MEDIA_TUNER_M88RS6000T=m +CONFIG_MEDIA_TUNER_TUA9001=m +CONFIG_MEDIA_TUNER_SI2157=m +CONFIG_MEDIA_TUNER_IT913X=m +CONFIG_MEDIA_TUNER_R820T=m +CONFIG_MEDIA_TUNER_MXL301RF=m +CONFIG_MEDIA_TUNER_QM1D1C0042=m +CONFIG_MEDIA_TUNER_QM1D1B0004=m + +# +# Multistandard (satellite) frontends +# +CONFIG_DVB_STB0899=m +CONFIG_DVB_STB6100=m +CONFIG_DVB_STV090x=m +CONFIG_DVB_STV0910=m +CONFIG_DVB_STV6110x=m +CONFIG_DVB_STV6111=m +CONFIG_DVB_MXL5XX=m +CONFIG_DVB_M88DS3103=m + +# +# Multistandard (cable + terrestrial) frontends +# +CONFIG_DVB_DRXK=m +CONFIG_DVB_TDA18271C2DD=m +CONFIG_DVB_SI2165=m +CONFIG_DVB_MN88472=m +CONFIG_DVB_MN88473=m + +# +# DVB-S (satellite) frontends +# +CONFIG_DVB_CX24110=m +CONFIG_DVB_CX24123=m +CONFIG_DVB_MT312=m +CONFIG_DVB_ZL10036=m +CONFIG_DVB_ZL10039=m +CONFIG_DVB_S5H1420=m +CONFIG_DVB_STV0288=m +CONFIG_DVB_STB6000=m +CONFIG_DVB_STV0299=m +CONFIG_DVB_STV6110=m +CONFIG_DVB_STV0900=m +CONFIG_DVB_TDA8083=m +CONFIG_DVB_TDA10086=m +CONFIG_DVB_TDA8261=m +CONFIG_DVB_VES1X93=m +CONFIG_DVB_TUNER_ITD1000=m +CONFIG_DVB_TUNER_CX24113=m +CONFIG_DVB_TDA826X=m +CONFIG_DVB_TUA6100=m +CONFIG_DVB_CX24116=m +CONFIG_DVB_CX24117=m +CONFIG_DVB_CX24120=m +CONFIG_DVB_SI21XX=m +CONFIG_DVB_TS2020=m +CONFIG_DVB_DS3000=m +CONFIG_DVB_MB86A16=m +CONFIG_DVB_TDA10071=m + +# +# DVB-T (terrestrial) frontends +# +CONFIG_DVB_SP8870=m +CONFIG_DVB_SP887X=m +CONFIG_DVB_CX22700=m +CONFIG_DVB_CX22702=m +CONFIG_DVB_DRXD=m +CONFIG_DVB_L64781=m +CONFIG_DVB_TDA1004X=m +CONFIG_DVB_NXT6000=m +CONFIG_DVB_MT352=m +CONFIG_DVB_ZL10353=m +CONFIG_DVB_DIB3000MB=m +CONFIG_DVB_DIB3000MC=m +CONFIG_DVB_DIB7000M=m +CONFIG_DVB_DIB7000P=m +CONFIG_DVB_TDA10048=m +CONFIG_DVB_AF9013=m +CONFIG_DVB_EC100=m +CONFIG_DVB_STV0367=m +CONFIG_DVB_CXD2820R=m +CONFIG_DVB_CXD2841ER=m +CONFIG_DVB_RTL2830=m +CONFIG_DVB_RTL2832=m +CONFIG_DVB_RTL2832_SDR=m +CONFIG_DVB_SI2168=m +CONFIG_DVB_AS102_FE=m +CONFIG_DVB_ZD1301_DEMOD=m +CONFIG_DVB_GP8PSK_FE=m + +# +# DVB-C (cable) frontends +# +CONFIG_DVB_VES1820=m +CONFIG_DVB_TDA10021=m +CONFIG_DVB_TDA10023=m +CONFIG_DVB_STV0297=m + +# +# ATSC (North American/Korean Terrestrial/Cable DTV) frontends +# +CONFIG_DVB_NXT200X=m +CONFIG_DVB_OR51211=m +CONFIG_DVB_OR51132=m +CONFIG_DVB_BCM3510=m +CONFIG_DVB_LGDT330X=m +CONFIG_DVB_LGDT3305=m +CONFIG_DVB_LGDT3306A=m +CONFIG_DVB_LG2160=m +CONFIG_DVB_S5H1409=m +CONFIG_DVB_AU8522=m +CONFIG_DVB_AU8522_DTV=m +CONFIG_DVB_AU8522_V4L=m +CONFIG_DVB_S5H1411=m + +# +# ISDB-T (terrestrial) frontends +# +CONFIG_DVB_S921=m +CONFIG_DVB_DIB8000=m +CONFIG_DVB_MB86A20S=m + +# +# ISDB-S (satellite) & ISDB-T (terrestrial) frontends +# +CONFIG_DVB_TC90522=m + +# +# Digital terrestrial only tuners/PLL +# +CONFIG_DVB_PLL=m +CONFIG_DVB_TUNER_DIB0070=m +CONFIG_DVB_TUNER_DIB0090=m + +# +# SEC control devices for DVB-S +# +CONFIG_DVB_DRX39XYJ=m +CONFIG_DVB_LNBH25=m +CONFIG_DVB_LNBP21=m +CONFIG_DVB_LNBP22=m +CONFIG_DVB_ISL6405=m +CONFIG_DVB_ISL6421=m +CONFIG_DVB_ISL6423=m +CONFIG_DVB_A8293=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m +CONFIG_DVB_TDA665x=m +CONFIG_DVB_IX2505V=m +CONFIG_DVB_M88RS2000=m +CONFIG_DVB_AF9033=m +CONFIG_DVB_HORUS3A=m +CONFIG_DVB_ASCOT2E=m +CONFIG_DVB_HELENE=m + +# +# Common Interface (EN50221) controller drivers +# +CONFIG_DVB_CXD2099=m +CONFIG_DVB_SP2=m + +# +# Tools to develop new frontends +# +CONFIG_DVB_DUMMY_FE=m + +# +# Graphics support +# +CONFIG_AGP=y +CONFIG_AGP_ALI=m +CONFIG_AGP_ATI=m +CONFIG_AGP_AMD=y +CONFIG_AGP_AMD64=y +CONFIG_AGP_INTEL=y +CONFIG_AGP_NVIDIA=y +CONFIG_AGP_SIS=m +CONFIG_AGP_SWORKS=m +CONFIG_AGP_VIA=y +CONFIG_AGP_EFFICEON=m +CONFIG_INTEL_GTT=y +CONFIG_VGA_ARB=y +CONFIG_VGA_ARB_MAX_GPUS=16 +CONFIG_VGA_SWITCHEROO=y +CONFIG_DRM=m +CONFIG_DRM_MIPI_DSI=y +# CONFIG_DRM_DP_AUX_CHARDEV is not set +# CONFIG_DRM_DEBUG_SELFTEST is not set +CONFIG_DRM_KMS_HELPER=m +CONFIG_DRM_KMS_FB_HELPER=y +CONFIG_DRM_FBDEV_EMULATION=y +CONFIG_DRM_FBDEV_OVERALLOC=100 +CONFIG_DRM_LOAD_EDID_FIRMWARE=y +# CONFIG_DRM_DP_CEC is not set +CONFIG_DRM_TTM=m +CONFIG_DRM_VM=y +CONFIG_DRM_SCHED=m + +# +# I2C encoder or helper chips +# +CONFIG_DRM_I2C_CH7006=m +CONFIG_DRM_I2C_SIL164=m +CONFIG_DRM_I2C_NXP_TDA998X=m +CONFIG_DRM_I2C_NXP_TDA9950=m +CONFIG_DRM_RADEON=m +# CONFIG_DRM_RADEON_USERPTR is not set +CONFIG_DRM_AMDGPU=m +# CONFIG_DRM_AMDGPU_SI is not set +# CONFIG_DRM_AMDGPU_CIK is not set +CONFIG_DRM_AMDGPU_USERPTR=y +# CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set + +# +# ACP (Audio CoProcessor) Configuration +# +# CONFIG_DRM_AMD_ACP is not set + +# +# Display Engine Configuration +# +CONFIG_DRM_AMD_DC=y +CONFIG_DRM_AMD_DC_DCN1_0=y +# CONFIG_DEBUG_KERNEL_DC is not set + +# +# AMD Library routines +# +CONFIG_CHASH=m +# CONFIG_CHASH_STATS is not set +# CONFIG_CHASH_SELFTEST is not set +CONFIG_DRM_NOUVEAU=m +CONFIG_NOUVEAU_DEBUG=5 +CONFIG_NOUVEAU_DEBUG_DEFAULT=3 +# CONFIG_NOUVEAU_DEBUG_MMU is not set +CONFIG_DRM_NOUVEAU_BACKLIGHT=y +CONFIG_DRM_I915=m +# CONFIG_DRM_I915_ALPHA_SUPPORT is not set +CONFIG_DRM_I915_CAPTURE_ERROR=y +CONFIG_DRM_I915_COMPRESS_ERROR=y +CONFIG_DRM_I915_USERPTR=y + +# +# drm/i915 Debugging +# +# CONFIG_DRM_I915_WERROR is not set +# CONFIG_DRM_I915_DEBUG is not set +# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set +# CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set +# CONFIG_DRM_I915_DEBUG_GUC is not set +# CONFIG_DRM_I915_SELFTEST is not set +# CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set +# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set +CONFIG_DRM_VGEM=m +# CONFIG_DRM_VKMS is not set +CONFIG_DRM_VMWGFX=m +CONFIG_DRM_VMWGFX_FBCON=y +CONFIG_DRM_GMA500=m +CONFIG_DRM_GMA600=y +CONFIG_DRM_GMA3600=y +CONFIG_DRM_MEDFIELD=y +CONFIG_DRM_UDL=m +CONFIG_DRM_AST=m +# CONFIG_DRM_MGAG200 is not set +CONFIG_DRM_CIRRUS_QEMU=m +CONFIG_DRM_QXL=m +# CONFIG_DRM_BOCHS is not set +CONFIG_DRM_VIRTIO_GPU=m +CONFIG_DRM_PANEL=y + +# +# Display Panels +# +# CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set +CONFIG_DRM_BRIDGE=y +CONFIG_DRM_PANEL_BRIDGE=y + +# +# Display Interface Bridges +# +CONFIG_DRM_ANALOGIX_ANX78XX=m +CONFIG_DRM_HISI_HIBMC=m +# CONFIG_DRM_TINYDRM is not set +CONFIG_DRM_XEN=y +CONFIG_DRM_XEN_FRONTEND=m +# CONFIG_DRM_LEGACY is not set +CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y + +# +# Frame buffer Devices +# +CONFIG_FB=y +CONFIG_FIRMWARE_EDID=y +CONFIG_FB_CMDLINE=y +CONFIG_FB_NOTIFY=y +CONFIG_FB_DDC=m +CONFIG_FB_BOOT_VESA_SUPPORT=y +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +CONFIG_FB_SYS_FILLRECT=m +CONFIG_FB_SYS_COPYAREA=m +CONFIG_FB_SYS_IMAGEBLIT=m +# CONFIG_FB_FOREIGN_ENDIAN is not set +CONFIG_FB_SYS_FOPS=m +CONFIG_FB_DEFERRED_IO=y +CONFIG_FB_HECUBA=m +CONFIG_FB_SVGALIB=m +CONFIG_FB_BACKLIGHT=y +CONFIG_FB_MODE_HELPERS=y +CONFIG_FB_TILEBLITTING=y + +# +# Frame buffer hardware drivers +# +CONFIG_FB_CIRRUS=m +CONFIG_FB_PM2=m +CONFIG_FB_PM2_FIFO_DISCONNECT=y +CONFIG_FB_CYBER2000=m +CONFIG_FB_CYBER2000_DDC=y +CONFIG_FB_ARC=m +CONFIG_FB_ASILIANT=y +CONFIG_FB_IMSTT=y +CONFIG_FB_VGA16=m +CONFIG_FB_UVESA=m +CONFIG_FB_VESA=y +CONFIG_FB_EFI=y +CONFIG_FB_N411=m +CONFIG_FB_HGA=m +CONFIG_FB_OPENCORES=m +CONFIG_FB_S1D13XXX=m +# CONFIG_FB_NVIDIA is not set +CONFIG_FB_RIVA=m +CONFIG_FB_RIVA_I2C=y +# CONFIG_FB_RIVA_DEBUG is not set +CONFIG_FB_RIVA_BACKLIGHT=y +CONFIG_FB_I740=m +CONFIG_FB_I810=m +# CONFIG_FB_I810_GTF is not set +CONFIG_FB_LE80578=m +CONFIG_FB_CARILLO_RANCH=m +CONFIG_FB_INTEL=m +# CONFIG_FB_INTEL_DEBUG is not set +CONFIG_FB_INTEL_I2C=y +CONFIG_FB_MATROX=m +CONFIG_FB_MATROX_MILLENIUM=y +CONFIG_FB_MATROX_MYSTIQUE=y +CONFIG_FB_MATROX_G=y +CONFIG_FB_MATROX_I2C=m +CONFIG_FB_MATROX_MAVEN=m +CONFIG_FB_RADEON=m +CONFIG_FB_RADEON_I2C=y +CONFIG_FB_RADEON_BACKLIGHT=y +# CONFIG_FB_RADEON_DEBUG is not set +CONFIG_FB_ATY128=m +CONFIG_FB_ATY128_BACKLIGHT=y +CONFIG_FB_ATY=m +CONFIG_FB_ATY_CT=y +# CONFIG_FB_ATY_GENERIC_LCD is not set +CONFIG_FB_ATY_GX=y +CONFIG_FB_ATY_BACKLIGHT=y +CONFIG_FB_S3=m +CONFIG_FB_S3_DDC=y +CONFIG_FB_SAVAGE=m +CONFIG_FB_SAVAGE_I2C=y +# CONFIG_FB_SAVAGE_ACCEL is not set +CONFIG_FB_SIS=m +CONFIG_FB_SIS_300=y +CONFIG_FB_SIS_315=y +CONFIG_FB_VIA=m +# CONFIG_FB_VIA_DIRECT_PROCFS is not set +CONFIG_FB_VIA_X_COMPATIBILITY=y +CONFIG_FB_NEOMAGIC=m +CONFIG_FB_KYRO=m +CONFIG_FB_3DFX=m +# CONFIG_FB_3DFX_ACCEL is not set +# CONFIG_FB_3DFX_I2C is not set +CONFIG_FB_VOODOO1=m +CONFIG_FB_VT8623=m +CONFIG_FB_TRIDENT=m +CONFIG_FB_ARK=m +CONFIG_FB_PM3=m +CONFIG_FB_CARMINE=m +CONFIG_FB_CARMINE_DRAM_EVAL=y +# CONFIG_CARMINE_DRAM_CUSTOM is not set +CONFIG_FB_GEODE=y +CONFIG_FB_GEODE_LX=m +CONFIG_FB_GEODE_GX=m +CONFIG_FB_GEODE_GX1=m +CONFIG_FB_SM501=m +CONFIG_FB_SMSCUFX=m +CONFIG_FB_UDL=m +CONFIG_FB_IBM_GXT4500=m +# CONFIG_FB_VIRTUAL is not set +CONFIG_XEN_FBDEV_FRONTEND=m +CONFIG_FB_METRONOME=m +CONFIG_FB_MB862XX=m +CONFIG_FB_MB862XX_PCI_GDC=y +CONFIG_FB_MB862XX_I2C=y +CONFIG_FB_BROADSHEET=m +CONFIG_FB_HYPERV=m +CONFIG_FB_SIMPLE=y +CONFIG_FB_SM712=m +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_CLASS_DEVICE=m +CONFIG_LCD_L4F00242T03=m +CONFIG_LCD_LMS283GF05=m +CONFIG_LCD_LTV350QV=m +CONFIG_LCD_ILI922X=m +CONFIG_LCD_ILI9320=m +CONFIG_LCD_TDO24M=m +CONFIG_LCD_VGG2432A4=m +CONFIG_LCD_PLATFORM=m +CONFIG_LCD_S6E63M0=m +CONFIG_LCD_LD9040=m +CONFIG_LCD_AMS369FG06=m +CONFIG_LCD_LMS501KF03=m +CONFIG_LCD_HX8357=m +CONFIG_LCD_OTM3225A=m +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_BACKLIGHT_GENERIC=m +CONFIG_BACKLIGHT_LM3533=m +CONFIG_BACKLIGHT_CARILLO_RANCH=m +CONFIG_BACKLIGHT_PWM=m +CONFIG_BACKLIGHT_DA903X=m +CONFIG_BACKLIGHT_DA9052=m +CONFIG_BACKLIGHT_MAX8925=m +CONFIG_BACKLIGHT_APPLE=m +CONFIG_BACKLIGHT_PM8941_WLED=m +CONFIG_BACKLIGHT_SAHARA=m +CONFIG_BACKLIGHT_WM831X=m +CONFIG_BACKLIGHT_ADP5520=m +CONFIG_BACKLIGHT_ADP8860=m +CONFIG_BACKLIGHT_ADP8870=m +CONFIG_BACKLIGHT_88PM860X=m +CONFIG_BACKLIGHT_PCF50633=m +CONFIG_BACKLIGHT_AAT2870=m +CONFIG_BACKLIGHT_LM3630A=m +CONFIG_BACKLIGHT_LM3639=m +CONFIG_BACKLIGHT_LP855X=m +CONFIG_BACKLIGHT_LP8788=m +CONFIG_BACKLIGHT_PANDORA=m +CONFIG_BACKLIGHT_SKY81452=m +CONFIG_BACKLIGHT_AS3711=m +CONFIG_BACKLIGHT_GPIO=m +CONFIG_BACKLIGHT_LV5207LP=m +CONFIG_BACKLIGHT_BD6107=m +CONFIG_BACKLIGHT_ARCXCNN=m +CONFIG_BACKLIGHT_RAVE_SP=m +CONFIG_VGASTATE=m +CONFIG_VIDEOMODE_HELPERS=y +CONFIG_HDMI=y + +# +# Console display driver support +# +CONFIG_VGA_CONSOLE=y +# CONFIG_VGACON_SOFT_SCROLLBACK is not set +CONFIG_MDA_CONSOLE=m +CONFIG_DUMMY_CONSOLE=y +CONFIG_DUMMY_CONSOLE_COLUMNS=80 +CONFIG_DUMMY_CONSOLE_ROWS=25 +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set +# CONFIG_LOGO_LINUX_CLUT224 is not set +CONFIG_SOUND=m +CONFIG_SOUND_OSS_CORE=y +# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +CONFIG_SND_PCM_ELD=y +CONFIG_SND_PCM_IEC958=y +CONFIG_SND_DMAENGINE_PCM=m +CONFIG_SND_HWDEP=m +CONFIG_SND_SEQ_DEVICE=m +CONFIG_SND_RAWMIDI=m +CONFIG_SND_COMPRESS_OFFLOAD=m +CONFIG_SND_JACK=y +CONFIG_SND_JACK_INPUT_DEV=y +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y +CONFIG_SND_PCM_TIMER=y +CONFIG_SND_HRTIMER=m +CONFIG_SND_DYNAMIC_MINORS=y +CONFIG_SND_MAX_CARDS=32 +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_PROC_FS=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set +CONFIG_SND_VMASTER=y +CONFIG_SND_DMA_SGBUF=y +CONFIG_SND_SEQUENCER=m +CONFIG_SND_SEQ_DUMMY=m +# CONFIG_SND_SEQUENCER_OSS is not set +CONFIG_SND_SEQ_HRTIMER_DEFAULT=y +CONFIG_SND_SEQ_MIDI_EVENT=m +CONFIG_SND_SEQ_MIDI=m +CONFIG_SND_SEQ_MIDI_EMUL=m +CONFIG_SND_SEQ_VIRMIDI=m +CONFIG_SND_MPU401_UART=m +CONFIG_SND_OPL3_LIB=m +CONFIG_SND_OPL4_LIB=m +CONFIG_SND_OPL3_LIB_SEQ=m +CONFIG_SND_OPL4_LIB_SEQ=m +CONFIG_SND_VX_LIB=m +CONFIG_SND_AC97_CODEC=m +CONFIG_SND_DRIVERS=y +CONFIG_SND_PCSP=m +CONFIG_SND_DUMMY=m +CONFIG_SND_ALOOP=m +CONFIG_SND_VIRMIDI=m +CONFIG_SND_MTPAV=m +CONFIG_SND_MTS64=m +CONFIG_SND_SERIAL_U16550=m +CONFIG_SND_MPU401=m +CONFIG_SND_PORTMAN2X4=m +CONFIG_SND_AC97_POWER_SAVE=y +CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 +CONFIG_SND_WSS_LIB=m +CONFIG_SND_SB_COMMON=m +CONFIG_SND_SB8_DSP=m +CONFIG_SND_SB16_DSP=m +CONFIG_SND_ISA=y +CONFIG_SND_ADLIB=m +CONFIG_SND_AD1816A=m +CONFIG_SND_AD1848=m +CONFIG_SND_ALS100=m +CONFIG_SND_AZT1605=m +CONFIG_SND_AZT2316=m +CONFIG_SND_AZT2320=m +CONFIG_SND_CMI8328=m +CONFIG_SND_CMI8330=m +CONFIG_SND_CS4231=m +CONFIG_SND_CS4236=m +CONFIG_SND_ES1688=m +CONFIG_SND_ES18XX=m +CONFIG_SND_SC6000=m +CONFIG_SND_GUSCLASSIC=m +CONFIG_SND_GUSEXTREME=m +CONFIG_SND_GUSMAX=m +CONFIG_SND_INTERWAVE=m +CONFIG_SND_INTERWAVE_STB=m +CONFIG_SND_JAZZ16=m +CONFIG_SND_OPL3SA2=m +CONFIG_SND_OPTI92X_AD1848=m +CONFIG_SND_OPTI92X_CS4231=m +CONFIG_SND_OPTI93X=m +CONFIG_SND_MIRO=m +CONFIG_SND_SB8=m +CONFIG_SND_SB16=m +CONFIG_SND_SBAWE=m +CONFIG_SND_SBAWE_SEQ=m +CONFIG_SND_SB16_CSP=y +CONFIG_SND_SSCAPE=m +CONFIG_SND_WAVEFRONT=m +CONFIG_SND_MSND_PINNACLE=m +CONFIG_SND_MSND_CLASSIC=m +CONFIG_SND_PCI=y +CONFIG_SND_AD1889=m +CONFIG_SND_ALS300=m +CONFIG_SND_ALS4000=m +CONFIG_SND_ALI5451=m +CONFIG_SND_ASIHPI=m +CONFIG_SND_ATIIXP=m +CONFIG_SND_ATIIXP_MODEM=m +CONFIG_SND_AU8810=m +CONFIG_SND_AU8820=m +CONFIG_SND_AU8830=m +CONFIG_SND_AW2=m +CONFIG_SND_AZT3328=m +CONFIG_SND_BT87X=m +# CONFIG_SND_BT87X_OVERCLOCK is not set +CONFIG_SND_CA0106=m +CONFIG_SND_CMIPCI=m +CONFIG_SND_OXYGEN_LIB=m +CONFIG_SND_OXYGEN=m +CONFIG_SND_CS4281=m +CONFIG_SND_CS46XX=m +CONFIG_SND_CS46XX_NEW_DSP=y +CONFIG_SND_CS5530=m +CONFIG_SND_CS5535AUDIO=m +CONFIG_SND_CTXFI=m +CONFIG_SND_DARLA20=m +CONFIG_SND_GINA20=m +CONFIG_SND_LAYLA20=m +CONFIG_SND_DARLA24=m +CONFIG_SND_GINA24=m +CONFIG_SND_LAYLA24=m +CONFIG_SND_MONA=m +CONFIG_SND_MIA=m +CONFIG_SND_ECHO3G=m +CONFIG_SND_INDIGO=m +CONFIG_SND_INDIGOIO=m +CONFIG_SND_INDIGODJ=m +CONFIG_SND_INDIGOIOX=m +CONFIG_SND_INDIGODJX=m +CONFIG_SND_EMU10K1=m +CONFIG_SND_EMU10K1_SEQ=m +CONFIG_SND_EMU10K1X=m +CONFIG_SND_ENS1370=m +CONFIG_SND_ENS1371=m +CONFIG_SND_ES1938=m +CONFIG_SND_ES1968=m +CONFIG_SND_ES1968_INPUT=y +CONFIG_SND_ES1968_RADIO=y +CONFIG_SND_FM801=m +CONFIG_SND_FM801_TEA575X_BOOL=y +CONFIG_SND_HDSP=m +CONFIG_SND_HDSPM=m +CONFIG_SND_ICE1712=m +CONFIG_SND_ICE1724=m +CONFIG_SND_INTEL8X0=m +CONFIG_SND_INTEL8X0M=m +CONFIG_SND_KORG1212=m +CONFIG_SND_LOLA=m +CONFIG_SND_LX6464ES=m +CONFIG_SND_MAESTRO3=m +CONFIG_SND_MAESTRO3_INPUT=y +CONFIG_SND_MIXART=m +CONFIG_SND_NM256=m +CONFIG_SND_PCXHR=m +CONFIG_SND_RIPTIDE=m +CONFIG_SND_RME32=m +CONFIG_SND_RME96=m +CONFIG_SND_RME9652=m +CONFIG_SND_SIS7019=m +CONFIG_SND_SONICVIBES=m +CONFIG_SND_TRIDENT=m +CONFIG_SND_VIA82XX=m +CONFIG_SND_VIA82XX_MODEM=m +CONFIG_SND_VIRTUOSO=m +CONFIG_SND_VX222=m +CONFIG_SND_YMFPCI=m + +# +# HD-Audio +# +CONFIG_SND_HDA=m +CONFIG_SND_HDA_INTEL=m +CONFIG_SND_HDA_HWDEP=y +CONFIG_SND_HDA_RECONFIG=y +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_INPUT_BEEP_MODE=0 +CONFIG_SND_HDA_PATCH_LOADER=y +CONFIG_SND_HDA_CODEC_REALTEK=m +CONFIG_SND_HDA_CODEC_ANALOG=m +CONFIG_SND_HDA_CODEC_SIGMATEL=m +CONFIG_SND_HDA_CODEC_VIA=m +CONFIG_SND_HDA_CODEC_HDMI=m +CONFIG_SND_HDA_CODEC_CIRRUS=m +CONFIG_SND_HDA_CODEC_CONEXANT=m +CONFIG_SND_HDA_CODEC_CA0110=m +CONFIG_SND_HDA_CODEC_CA0132=m +CONFIG_SND_HDA_CODEC_CA0132_DSP=y +CONFIG_SND_HDA_CODEC_CMEDIA=m +CONFIG_SND_HDA_CODEC_SI3054=m +CONFIG_SND_HDA_GENERIC=m +CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 +CONFIG_SND_HDA_CORE=m +CONFIG_SND_HDA_DSP_LOADER=y +CONFIG_SND_HDA_COMPONENT=y +CONFIG_SND_HDA_I915=y +CONFIG_SND_HDA_EXT_CORE=m +CONFIG_SND_HDA_PREALLOC_SIZE=64 +CONFIG_SND_SPI=y +CONFIG_SND_USB=y +CONFIG_SND_USB_AUDIO=m +CONFIG_SND_USB_UA101=m +CONFIG_SND_USB_USX2Y=m +CONFIG_SND_USB_CAIAQ=m +CONFIG_SND_USB_CAIAQ_INPUT=y +CONFIG_SND_USB_US122L=m +CONFIG_SND_USB_6FIRE=m +CONFIG_SND_USB_HIFACE=m +CONFIG_SND_BCD2000=m +CONFIG_SND_USB_LINE6=m +CONFIG_SND_USB_POD=m +CONFIG_SND_USB_PODHD=m +CONFIG_SND_USB_TONEPORT=m +CONFIG_SND_USB_VARIAX=m +CONFIG_SND_FIREWIRE=y +CONFIG_SND_FIREWIRE_LIB=m +CONFIG_SND_DICE=m +CONFIG_SND_OXFW=m +CONFIG_SND_ISIGHT=m +CONFIG_SND_FIREWORKS=m +CONFIG_SND_BEBOB=m +CONFIG_SND_FIREWIRE_DIGI00X=m +CONFIG_SND_FIREWIRE_TASCAM=m +CONFIG_SND_FIREWIRE_MOTU=m +CONFIG_SND_FIREFACE=m +CONFIG_SND_PCMCIA=y +CONFIG_SND_VXPOCKET=m +CONFIG_SND_PDAUDIOCF=m +CONFIG_SND_SOC=m +CONFIG_SND_SOC_AC97_BUS=y +CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y +CONFIG_SND_SOC_COMPRESS=y +CONFIG_SND_SOC_TOPOLOGY=y +CONFIG_SND_SOC_ACPI=m +CONFIG_SND_SOC_AMD_ACP=m +CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m +CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m +CONFIG_SND_ATMEL_SOC=m +CONFIG_SND_DESIGNWARE_I2S=m +# CONFIG_SND_DESIGNWARE_PCM is not set + +# +# SoC Audio for Freescale CPUs +# + +# +# Common SoC Audio options for Freescale CPUs: +# +CONFIG_SND_SOC_FSL_ASRC=m +CONFIG_SND_SOC_FSL_SAI=m +CONFIG_SND_SOC_FSL_SSI=m +CONFIG_SND_SOC_FSL_SPDIF=m +CONFIG_SND_SOC_FSL_ESAI=m +CONFIG_SND_SOC_IMX_AUDMUX=m +CONFIG_SND_I2S_HI6210_I2S=m +# CONFIG_SND_SOC_IMG is not set +CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y +CONFIG_SND_SST_IPC=m +CONFIG_SND_SST_IPC_PCI=m +CONFIG_SND_SST_IPC_ACPI=m +CONFIG_SND_SOC_INTEL_SST_ACPI=m +CONFIG_SND_SOC_INTEL_SST=m +CONFIG_SND_SOC_INTEL_SST_FIRMWARE=m +CONFIG_SND_SOC_INTEL_HASWELL=m +CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m +CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI=m +CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI=m +CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m +CONFIG_SND_SOC_INTEL_SKYLAKE=m +CONFIG_SND_SOC_ACPI_INTEL_MATCH=m +CONFIG_SND_SOC_INTEL_MACH=y +CONFIG_SND_SOC_INTEL_HASWELL_MACH=m +CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m +CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m +CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m +CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m +CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m +CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m +CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m +CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m +CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m +CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m +CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m +CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m +CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m +CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m +CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m +CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m +CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH=m +CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH=m +CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH=m +CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH=m + +# +# STMicroelectronics STM32 SOC audio support +# +CONFIG_SND_SOC_XTFPGA_I2S=m +CONFIG_ZX_TDM=m +CONFIG_SND_SOC_I2C_AND_SPI=m + +# +# CODEC drivers +# +CONFIG_SND_SOC_AC97_CODEC=m +CONFIG_SND_SOC_ADAU_UTILS=m +CONFIG_SND_SOC_ADAU1701=m +CONFIG_SND_SOC_ADAU17X1=m +CONFIG_SND_SOC_ADAU1761=m +CONFIG_SND_SOC_ADAU1761_I2C=m +CONFIG_SND_SOC_ADAU1761_SPI=m +CONFIG_SND_SOC_ADAU7002=m +CONFIG_SND_SOC_AK4104=m +CONFIG_SND_SOC_AK4458=m +CONFIG_SND_SOC_AK4554=m +CONFIG_SND_SOC_AK4613=m +CONFIG_SND_SOC_AK4642=m +CONFIG_SND_SOC_AK5386=m +CONFIG_SND_SOC_AK5558=m +CONFIG_SND_SOC_ALC5623=m +CONFIG_SND_SOC_BD28623=m +CONFIG_SND_SOC_BT_SCO=m +CONFIG_SND_SOC_CS35L32=m +CONFIG_SND_SOC_CS35L33=m +CONFIG_SND_SOC_CS35L34=m +CONFIG_SND_SOC_CS35L35=m +CONFIG_SND_SOC_CS42L42=m +CONFIG_SND_SOC_CS42L51=m +CONFIG_SND_SOC_CS42L51_I2C=m +CONFIG_SND_SOC_CS42L52=m +CONFIG_SND_SOC_CS42L56=m +CONFIG_SND_SOC_CS42L73=m +CONFIG_SND_SOC_CS4265=m +CONFIG_SND_SOC_CS4270=m +CONFIG_SND_SOC_CS4271=m +CONFIG_SND_SOC_CS4271_I2C=m +CONFIG_SND_SOC_CS4271_SPI=m +CONFIG_SND_SOC_CS42XX8=m +CONFIG_SND_SOC_CS42XX8_I2C=m +CONFIG_SND_SOC_CS43130=m +CONFIG_SND_SOC_CS4349=m +CONFIG_SND_SOC_CS53L30=m +CONFIG_SND_SOC_DA7213=m +CONFIG_SND_SOC_DA7219=m +CONFIG_SND_SOC_DMIC=m +CONFIG_SND_SOC_HDMI_CODEC=m +CONFIG_SND_SOC_ES7134=m +CONFIG_SND_SOC_ES7241=m +CONFIG_SND_SOC_ES8316=m +CONFIG_SND_SOC_ES8328=m +CONFIG_SND_SOC_ES8328_I2C=m +CONFIG_SND_SOC_ES8328_SPI=m +CONFIG_SND_SOC_GTM601=m +CONFIG_SND_SOC_HDAC_HDMI=m +CONFIG_SND_SOC_INNO_RK3036=m +CONFIG_SND_SOC_MAX98090=m +CONFIG_SND_SOC_MAX98357A=m +CONFIG_SND_SOC_MAX98504=m +CONFIG_SND_SOC_MAX9867=m +CONFIG_SND_SOC_MAX98927=m +CONFIG_SND_SOC_MAX98373=m +CONFIG_SND_SOC_MAX9860=m +CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m +CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m +CONFIG_SND_SOC_PCM1681=m +CONFIG_SND_SOC_PCM1789=m +CONFIG_SND_SOC_PCM1789_I2C=m +CONFIG_SND_SOC_PCM179X=m +CONFIG_SND_SOC_PCM179X_I2C=m +CONFIG_SND_SOC_PCM179X_SPI=m +CONFIG_SND_SOC_PCM186X=m +CONFIG_SND_SOC_PCM186X_I2C=m +CONFIG_SND_SOC_PCM186X_SPI=m +CONFIG_SND_SOC_PCM3168A=m +CONFIG_SND_SOC_PCM3168A_I2C=m +CONFIG_SND_SOC_PCM3168A_SPI=m +CONFIG_SND_SOC_PCM512x=m +CONFIG_SND_SOC_PCM512x_I2C=m +CONFIG_SND_SOC_PCM512x_SPI=m +CONFIG_SND_SOC_RL6231=m +CONFIG_SND_SOC_RL6347A=m +CONFIG_SND_SOC_RT286=m +CONFIG_SND_SOC_RT298=m +CONFIG_SND_SOC_RT5514=m +CONFIG_SND_SOC_RT5514_SPI=m +CONFIG_SND_SOC_RT5616=m +CONFIG_SND_SOC_RT5631=m +CONFIG_SND_SOC_RT5640=m +CONFIG_SND_SOC_RT5645=m +CONFIG_SND_SOC_RT5651=m +CONFIG_SND_SOC_RT5663=m +CONFIG_SND_SOC_RT5670=m +CONFIG_SND_SOC_RT5677=m +CONFIG_SND_SOC_RT5677_SPI=m +CONFIG_SND_SOC_RT5682=m +CONFIG_SND_SOC_SGTL5000=m +CONFIG_SND_SOC_SI476X=m +CONFIG_SND_SOC_SIGMADSP=m +CONFIG_SND_SOC_SIGMADSP_I2C=m +CONFIG_SND_SOC_SIGMADSP_REGMAP=m +CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m +CONFIG_SND_SOC_SIRF_AUDIO_CODEC=m +CONFIG_SND_SOC_SPDIF=m +CONFIG_SND_SOC_SSM2305=m +CONFIG_SND_SOC_SSM2602=m +CONFIG_SND_SOC_SSM2602_SPI=m +CONFIG_SND_SOC_SSM2602_I2C=m +CONFIG_SND_SOC_SSM4567=m +CONFIG_SND_SOC_STA32X=m +CONFIG_SND_SOC_STA350=m +CONFIG_SND_SOC_STI_SAS=m +CONFIG_SND_SOC_TAS2552=m +CONFIG_SND_SOC_TAS5086=m +CONFIG_SND_SOC_TAS571X=m +CONFIG_SND_SOC_TAS5720=m +CONFIG_SND_SOC_TAS6424=m +CONFIG_SND_SOC_TDA7419=m +CONFIG_SND_SOC_TFA9879=m +CONFIG_SND_SOC_TLV320AIC23=m +CONFIG_SND_SOC_TLV320AIC23_I2C=m +CONFIG_SND_SOC_TLV320AIC23_SPI=m +CONFIG_SND_SOC_TLV320AIC31XX=m +CONFIG_SND_SOC_TLV320AIC32X4=m +CONFIG_SND_SOC_TLV320AIC32X4_I2C=m +CONFIG_SND_SOC_TLV320AIC32X4_SPI=m +CONFIG_SND_SOC_TLV320AIC3X=m +CONFIG_SND_SOC_TS3A227E=m +CONFIG_SND_SOC_TSCS42XX=m +CONFIG_SND_SOC_TSCS454=m +CONFIG_SND_SOC_WM8510=m +CONFIG_SND_SOC_WM8523=m +CONFIG_SND_SOC_WM8524=m +CONFIG_SND_SOC_WM8580=m +CONFIG_SND_SOC_WM8711=m +CONFIG_SND_SOC_WM8728=m +CONFIG_SND_SOC_WM8731=m +CONFIG_SND_SOC_WM8737=m +CONFIG_SND_SOC_WM8741=m +CONFIG_SND_SOC_WM8750=m +CONFIG_SND_SOC_WM8753=m +CONFIG_SND_SOC_WM8770=m +CONFIG_SND_SOC_WM8776=m +CONFIG_SND_SOC_WM8782=m +CONFIG_SND_SOC_WM8804=m +CONFIG_SND_SOC_WM8804_I2C=m +CONFIG_SND_SOC_WM8804_SPI=m +CONFIG_SND_SOC_WM8903=m +CONFIG_SND_SOC_WM8960=m +CONFIG_SND_SOC_WM8962=m +CONFIG_SND_SOC_WM8974=m +CONFIG_SND_SOC_WM8978=m +CONFIG_SND_SOC_WM8985=m +CONFIG_SND_SOC_ZX_AUD96P22=m +CONFIG_SND_SOC_MAX9759=m +CONFIG_SND_SOC_MT6351=m +CONFIG_SND_SOC_NAU8540=m +CONFIG_SND_SOC_NAU8810=m +CONFIG_SND_SOC_NAU8824=m +CONFIG_SND_SOC_NAU8825=m +CONFIG_SND_SOC_TPA6130A2=m +CONFIG_SND_SIMPLE_CARD_UTILS=m +CONFIG_SND_SIMPLE_CARD=m +CONFIG_SND_X86=y +CONFIG_HDMI_LPE_AUDIO=m +CONFIG_SND_SYNTH_EMUX=m +CONFIG_SND_XEN_FRONTEND=m +CONFIG_AC97_BUS=m + +# +# HID support +# +CONFIG_HID=m +CONFIG_HID_BATTERY_STRENGTH=y +CONFIG_HIDRAW=y +CONFIG_UHID=m +CONFIG_HID_GENERIC=m + +# +# Special HID drivers +# +CONFIG_HID_A4TECH=m +CONFIG_HID_ACCUTOUCH=m +CONFIG_HID_ACRUX=m +CONFIG_HID_ACRUX_FF=y +CONFIG_HID_APPLE=m +CONFIG_HID_APPLEIR=m +CONFIG_HID_ASUS=m +CONFIG_HID_AUREAL=m +CONFIG_HID_BELKIN=m +CONFIG_HID_BETOP_FF=m +CONFIG_HID_CHERRY=m +CONFIG_HID_CHICONY=m +CONFIG_HID_CORSAIR=m +CONFIG_HID_COUGAR=m +CONFIG_HID_PRODIKEYS=m +CONFIG_HID_CMEDIA=m +CONFIG_HID_CP2112=m +CONFIG_HID_CYPRESS=m +CONFIG_HID_DRAGONRISE=m +CONFIG_DRAGONRISE_FF=y +CONFIG_HID_EMS_FF=m +CONFIG_HID_ELAN=m +CONFIG_HID_ELECOM=m +CONFIG_HID_ELO=m +CONFIG_HID_EZKEY=m +CONFIG_HID_GEMBIRD=m +CONFIG_HID_GFRM=m +CONFIG_HID_HOLTEK=m +CONFIG_HOLTEK_FF=y +CONFIG_HID_GOOGLE_HAMMER=m +CONFIG_HID_GT683R=m +CONFIG_HID_KEYTOUCH=m +CONFIG_HID_KYE=m +CONFIG_HID_UCLOGIC=m +CONFIG_HID_WALTOP=m +CONFIG_HID_GYRATION=m +CONFIG_HID_ICADE=m +CONFIG_HID_ITE=m +CONFIG_HID_JABRA=m +CONFIG_HID_TWINHAN=m +CONFIG_HID_KENSINGTON=m +CONFIG_HID_LCPOWER=m +CONFIG_HID_LED=m +CONFIG_HID_LENOVO=m +CONFIG_HID_LOGITECH=m +CONFIG_HID_LOGITECH_DJ=m +CONFIG_HID_LOGITECH_HIDPP=m +CONFIG_LOGITECH_FF=y +CONFIG_LOGIRUMBLEPAD2_FF=y +CONFIG_LOGIG940_FF=y +CONFIG_LOGIWHEELS_FF=y +CONFIG_HID_MAGICMOUSE=m +CONFIG_HID_MAYFLASH=m +CONFIG_HID_REDRAGON=m +CONFIG_HID_MICROSOFT=m +CONFIG_HID_MONTEREY=m +CONFIG_HID_MULTITOUCH=m +CONFIG_HID_NTI=m +CONFIG_HID_NTRIG=m +CONFIG_HID_ORTEK=m +CONFIG_HID_PANTHERLORD=m +CONFIG_PANTHERLORD_FF=y +CONFIG_HID_PENMOUNT=m +CONFIG_HID_PETALYNX=m +CONFIG_HID_PICOLCD=m +CONFIG_HID_PICOLCD_FB=y +CONFIG_HID_PICOLCD_BACKLIGHT=y +CONFIG_HID_PICOLCD_LCD=y +CONFIG_HID_PICOLCD_LEDS=y +CONFIG_HID_PICOLCD_CIR=y +CONFIG_HID_PLANTRONICS=m +CONFIG_HID_PRIMAX=m +CONFIG_HID_RETRODE=m +CONFIG_HID_ROCCAT=m +CONFIG_HID_SAITEK=m +CONFIG_HID_SAMSUNG=m +CONFIG_HID_SONY=m +CONFIG_SONY_FF=y +CONFIG_HID_SPEEDLINK=m +CONFIG_HID_STEAM=m +CONFIG_HID_STEELSERIES=m +CONFIG_HID_SUNPLUS=m +CONFIG_HID_RMI=m +CONFIG_HID_GREENASIA=m +CONFIG_GREENASIA_FF=y +CONFIG_HID_HYPERV_MOUSE=m +CONFIG_HID_SMARTJOYPLUS=m +CONFIG_SMARTJOYPLUS_FF=y +CONFIG_HID_TIVO=m +CONFIG_HID_TOPSEED=m +CONFIG_HID_THINGM=m +CONFIG_HID_THRUSTMASTER=m +CONFIG_THRUSTMASTER_FF=y +CONFIG_HID_UDRAW_PS3=m +CONFIG_HID_WACOM=m +CONFIG_HID_WIIMOTE=m +CONFIG_HID_XINMO=m +CONFIG_HID_ZEROPLUS=m +CONFIG_ZEROPLUS_FF=y +CONFIG_HID_ZYDACRON=m +CONFIG_HID_SENSOR_HUB=m +CONFIG_HID_SENSOR_CUSTOM_SENSOR=m +CONFIG_HID_ALPS=m + +# +# USB HID support +# +CONFIG_USB_HID=m +CONFIG_HID_PID=y +CONFIG_USB_HIDDEV=y + +# +# USB HID Boot Protocol drivers +# +CONFIG_USB_KBD=m +CONFIG_USB_MOUSE=m + +# +# I2C HID support +# +CONFIG_I2C_HID=m +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +CONFIG_USB_SUPPORT=y +CONFIG_USB_COMMON=y +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB=y +CONFIG_USB_PCI=y +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y + +# +# Miscellaneous USB options +# +CONFIG_USB_DEFAULT_PERSIST=y +CONFIG_USB_DYNAMIC_MINORS=y +# CONFIG_USB_OTG is not set +# CONFIG_USB_OTG_WHITELIST is not set +# CONFIG_USB_OTG_BLACKLIST_HUB is not set +CONFIG_USB_LEDS_TRIGGER_USBPORT=m +CONFIG_USB_MON=m +CONFIG_USB_WUSB=m +CONFIG_USB_WUSB_CBAF=m +# CONFIG_USB_WUSB_CBAF_DEBUG is not set + +# +# USB Host Controller Drivers +# +CONFIG_USB_C67X00_HCD=m +CONFIG_USB_XHCI_HCD=y +# CONFIG_USB_XHCI_DBGCAP is not set +CONFIG_USB_XHCI_PCI=y +CONFIG_USB_XHCI_PLATFORM=m +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_ROOT_HUB_TT=y +CONFIG_USB_EHCI_TT_NEWSCHED=y +CONFIG_USB_EHCI_PCI=y +CONFIG_USB_EHCI_HCD_PLATFORM=y +CONFIG_USB_OXU210HP_HCD=m +CONFIG_USB_ISP116X_HCD=m +CONFIG_USB_FOTG210_HCD=m +CONFIG_USB_MAX3421_HCD=m +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_HCD_PCI=y +CONFIG_USB_OHCI_HCD_PLATFORM=y +CONFIG_USB_UHCI_HCD=y +CONFIG_USB_U132_HCD=m +CONFIG_USB_SL811_HCD=m +CONFIG_USB_SL811_HCD_ISO=y +CONFIG_USB_SL811_CS=m +CONFIG_USB_R8A66597_HCD=m +CONFIG_USB_WHCI_HCD=m +CONFIG_USB_HWA_HCD=m +CONFIG_USB_HCD_BCMA=m +CONFIG_USB_HCD_SSB=m +# CONFIG_USB_HCD_TEST_MODE is not set + +# +# USB Device Class drivers +# +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m +CONFIG_USB_WDM=m +CONFIG_USB_TMC=m + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may +# + +# +# also be needed; see USB_STORAGE Help for more info +# +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +CONFIG_USB_STORAGE_REALTEK=m +CONFIG_REALTEK_AUTOPM=y +CONFIG_USB_STORAGE_DATAFAB=m +CONFIG_USB_STORAGE_FREECOM=m +CONFIG_USB_STORAGE_ISD200=m +CONFIG_USB_STORAGE_USBAT=m +CONFIG_USB_STORAGE_SDDR09=m +CONFIG_USB_STORAGE_SDDR55=m +CONFIG_USB_STORAGE_JUMPSHOT=m +CONFIG_USB_STORAGE_ALAUDA=m +CONFIG_USB_STORAGE_ONETOUCH=m +CONFIG_USB_STORAGE_KARMA=m +CONFIG_USB_STORAGE_CYPRESS_ATACB=m +CONFIG_USB_STORAGE_ENE_UB6250=m +CONFIG_USB_UAS=m + +# +# USB Imaging devices +# +CONFIG_USB_MDC800=m +CONFIG_USB_MICROTEK=m +CONFIG_USBIP_CORE=m +CONFIG_USBIP_VHCI_HCD=m +CONFIG_USBIP_VHCI_HC_PORTS=8 +CONFIG_USBIP_VHCI_NR_HCS=1 +CONFIG_USBIP_HOST=m +CONFIG_USBIP_VUDC=m +# CONFIG_USBIP_DEBUG is not set +CONFIG_USB_MUSB_HDRC=m +# CONFIG_USB_MUSB_HOST is not set +# CONFIG_USB_MUSB_GADGET is not set +CONFIG_USB_MUSB_DUAL_ROLE=y + +# +# Platform Glue Layer +# + +# +# MUSB DMA mode +# +CONFIG_MUSB_PIO_ONLY=y +CONFIG_USB_DWC3=m +CONFIG_USB_DWC3_ULPI=y +# CONFIG_USB_DWC3_HOST is not set +# CONFIG_USB_DWC3_GADGET is not set +CONFIG_USB_DWC3_DUAL_ROLE=y + +# +# Platform Glue Driver Support +# +CONFIG_USB_DWC3_PCI=m +CONFIG_USB_DWC3_HAPS=m +CONFIG_USB_DWC2=y +CONFIG_USB_DWC2_HOST=y + +# +# Gadget/Dual-role mode requires USB Gadget support to be enabled +# +CONFIG_USB_DWC2_PCI=m +# CONFIG_USB_DWC2_DEBUG is not set +# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set +CONFIG_USB_CHIPIDEA=m +CONFIG_USB_CHIPIDEA_PCI=m +CONFIG_USB_CHIPIDEA_UDC=y +CONFIG_USB_CHIPIDEA_HOST=y +CONFIG_USB_ISP1760=m +CONFIG_USB_ISP1760_HCD=y +CONFIG_USB_ISP1761_UDC=y +# CONFIG_USB_ISP1760_HOST_ROLE is not set +# CONFIG_USB_ISP1760_GADGET_ROLE is not set +CONFIG_USB_ISP1760_DUAL_ROLE=y + +# +# USB port drivers +# +CONFIG_USB_USS720=m +CONFIG_USB_SERIAL=m +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_SIMPLE=m +CONFIG_USB_SERIAL_AIRCABLE=m +CONFIG_USB_SERIAL_ARK3116=m +CONFIG_USB_SERIAL_BELKIN=m +CONFIG_USB_SERIAL_CH341=m +CONFIG_USB_SERIAL_WHITEHEAT=m +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +CONFIG_USB_SERIAL_CP210X=m +CONFIG_USB_SERIAL_CYPRESS_M8=m +CONFIG_USB_SERIAL_EMPEG=m +CONFIG_USB_SERIAL_FTDI_SIO=m +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +CONFIG_USB_SERIAL_EDGEPORT_TI=m +CONFIG_USB_SERIAL_F81232=m +CONFIG_USB_SERIAL_F8153X=m +CONFIG_USB_SERIAL_GARMIN=m +CONFIG_USB_SERIAL_IPW=m +CONFIG_USB_SERIAL_IUU=m +CONFIG_USB_SERIAL_KEYSPAN_PDA=m +CONFIG_USB_SERIAL_KEYSPAN=m +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_KOBIL_SCT=m +CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_METRO=m +CONFIG_USB_SERIAL_MOS7720=m +CONFIG_USB_SERIAL_MOS7715_PARPORT=y +CONFIG_USB_SERIAL_MOS7840=m +CONFIG_USB_SERIAL_MXUPORT=m +CONFIG_USB_SERIAL_NAVMAN=m +CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_OTI6858=m +CONFIG_USB_SERIAL_QCAUX=m +CONFIG_USB_SERIAL_QUALCOMM=m +CONFIG_USB_SERIAL_SPCP8X5=m +CONFIG_USB_SERIAL_SAFE=m +# CONFIG_USB_SERIAL_SAFE_PADDED is not set +CONFIG_USB_SERIAL_SIERRAWIRELESS=m +CONFIG_USB_SERIAL_SYMBOL=m +CONFIG_USB_SERIAL_TI=m +CONFIG_USB_SERIAL_CYBERJACK=m +CONFIG_USB_SERIAL_XIRCOM=m +CONFIG_USB_SERIAL_WWAN=m +CONFIG_USB_SERIAL_OPTION=m +CONFIG_USB_SERIAL_OMNINET=m +CONFIG_USB_SERIAL_OPTICON=m +CONFIG_USB_SERIAL_XSENS_MT=m +CONFIG_USB_SERIAL_WISHBONE=m +CONFIG_USB_SERIAL_SSU100=m +CONFIG_USB_SERIAL_QT2=m +CONFIG_USB_SERIAL_UPD78F0730=m +CONFIG_USB_SERIAL_DEBUG=m + +# +# USB Miscellaneous drivers +# +CONFIG_USB_EMI62=m +CONFIG_USB_EMI26=m +CONFIG_USB_ADUTUX=m +CONFIG_USB_SEVSEG=m +CONFIG_USB_RIO500=m +CONFIG_USB_LEGOTOWER=m +CONFIG_USB_LCD=m +CONFIG_USB_CYPRESS_CY7C63=m +CONFIG_USB_CYTHERM=m +CONFIG_USB_IDMOUSE=m +CONFIG_USB_FTDI_ELAN=m +CONFIG_USB_APPLEDISPLAY=m +CONFIG_USB_SISUSBVGA=m +# CONFIG_USB_SISUSBVGA_CON is not set +CONFIG_USB_LD=m +CONFIG_USB_TRANCEVIBRATOR=m +CONFIG_USB_IOWARRIOR=m +CONFIG_USB_TEST=m +CONFIG_USB_EHSET_TEST_FIXTURE=m +CONFIG_USB_ISIGHTFW=m +CONFIG_USB_YUREX=m +CONFIG_USB_EZUSB_FX2=m +CONFIG_USB_HUB_USB251XB=m +CONFIG_USB_HSIC_USB3503=m +CONFIG_USB_HSIC_USB4604=m +CONFIG_USB_LINK_LAYER_TEST=m +CONFIG_USB_CHAOSKEY=m +CONFIG_USB_ATM=m +CONFIG_USB_SPEEDTOUCH=m +CONFIG_USB_CXACRU=m +CONFIG_USB_UEAGLEATM=m +CONFIG_USB_XUSBATM=m + +# +# USB Physical Layer drivers +# +CONFIG_USB_PHY=y +CONFIG_NOP_USB_XCEIV=m +CONFIG_USB_GPIO_VBUS=m +CONFIG_TAHVO_USB=m +CONFIG_TAHVO_USB_HOST_BY_DEFAULT=y +CONFIG_USB_ISP1301=m +CONFIG_USB_GADGET=m +# CONFIG_USB_GADGET_DEBUG is not set +# CONFIG_USB_GADGET_DEBUG_FILES is not set +# CONFIG_USB_GADGET_DEBUG_FS is not set +CONFIG_USB_GADGET_VBUS_DRAW=2 +CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 +# CONFIG_U_SERIAL_CONSOLE is not set + +# +# USB Peripheral Controller +# +CONFIG_USB_FOTG210_UDC=m +CONFIG_USB_GR_UDC=m +CONFIG_USB_R8A66597=m +CONFIG_USB_PXA27X=m +CONFIG_USB_MV_UDC=m +CONFIG_USB_MV_U3D=m +CONFIG_USB_SNP_CORE=m +# CONFIG_USB_M66592 is not set +CONFIG_USB_BDC_UDC=m + +# +# Platform Support +# +CONFIG_USB_BDC_PCI=m +CONFIG_USB_AMD5536UDC=m +CONFIG_USB_NET2272=m +CONFIG_USB_NET2272_DMA=y +CONFIG_USB_NET2280=m +CONFIG_USB_GOKU=m +CONFIG_USB_EG20T=m +# CONFIG_USB_DUMMY_HCD is not set +CONFIG_USB_LIBCOMPOSITE=m +CONFIG_USB_F_ACM=m +CONFIG_USB_F_SS_LB=m +CONFIG_USB_U_SERIAL=m +CONFIG_USB_U_ETHER=m +CONFIG_USB_U_AUDIO=m +CONFIG_USB_F_SERIAL=m +CONFIG_USB_F_OBEX=m +CONFIG_USB_F_NCM=m +CONFIG_USB_F_ECM=m +CONFIG_USB_F_PHONET=m +CONFIG_USB_F_EEM=m +CONFIG_USB_F_SUBSET=m +CONFIG_USB_F_RNDIS=m +CONFIG_USB_F_MASS_STORAGE=m +CONFIG_USB_F_FS=m +CONFIG_USB_F_UAC1=m +CONFIG_USB_F_UAC2=m +CONFIG_USB_F_UVC=m +CONFIG_USB_F_MIDI=m +CONFIG_USB_F_HID=m +CONFIG_USB_F_PRINTER=m +CONFIG_USB_F_TCM=m +CONFIG_USB_CONFIGFS=m +CONFIG_USB_CONFIGFS_SERIAL=y +CONFIG_USB_CONFIGFS_ACM=y +CONFIG_USB_CONFIGFS_OBEX=y +CONFIG_USB_CONFIGFS_NCM=y +CONFIG_USB_CONFIGFS_ECM=y +CONFIG_USB_CONFIGFS_ECM_SUBSET=y +CONFIG_USB_CONFIGFS_RNDIS=y +CONFIG_USB_CONFIGFS_EEM=y +CONFIG_USB_CONFIGFS_PHONET=y +CONFIG_USB_CONFIGFS_MASS_STORAGE=y +CONFIG_USB_CONFIGFS_F_LB_SS=y +CONFIG_USB_CONFIGFS_F_FS=y +CONFIG_USB_CONFIGFS_F_UAC1=y +# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set +CONFIG_USB_CONFIGFS_F_UAC2=y +CONFIG_USB_CONFIGFS_F_MIDI=y +CONFIG_USB_CONFIGFS_F_HID=y +CONFIG_USB_CONFIGFS_F_UVC=y +CONFIG_USB_CONFIGFS_F_PRINTER=y +# CONFIG_USB_CONFIGFS_F_TCM is not set +CONFIG_USB_ZERO=m +CONFIG_USB_AUDIO=m +CONFIG_GADGET_UAC1=y +# CONFIG_GADGET_UAC1_LEGACY is not set +CONFIG_USB_ETH=m +CONFIG_USB_ETH_RNDIS=y +CONFIG_USB_ETH_EEM=y +CONFIG_USB_G_NCM=m +CONFIG_USB_GADGETFS=m +CONFIG_USB_FUNCTIONFS=m +CONFIG_USB_FUNCTIONFS_ETH=y +CONFIG_USB_FUNCTIONFS_RNDIS=y +CONFIG_USB_FUNCTIONFS_GENERIC=y +CONFIG_USB_MASS_STORAGE=m +CONFIG_USB_GADGET_TARGET=m +CONFIG_USB_G_SERIAL=m +CONFIG_USB_MIDI_GADGET=m +CONFIG_USB_G_PRINTER=m +CONFIG_USB_CDC_COMPOSITE=m +CONFIG_USB_G_NOKIA=m +CONFIG_USB_G_ACM_MS=m +# CONFIG_USB_G_MULTI is not set +CONFIG_USB_G_HID=m +CONFIG_USB_G_DBGP=m +# CONFIG_USB_G_DBGP_PRINTK is not set +CONFIG_USB_G_DBGP_SERIAL=y +CONFIG_USB_G_WEBCAM=m +CONFIG_TYPEC=m +CONFIG_TYPEC_TCPM=m +CONFIG_TYPEC_TCPCI=m +CONFIG_TYPEC_RT1711H=m +CONFIG_TYPEC_FUSB302=m +CONFIG_TYPEC_UCSI=m +CONFIG_UCSI_ACPI=m +CONFIG_TYPEC_TPS6598X=m + +# +# USB Type-C Multiplexer/DeMultiplexer Switch support +# +CONFIG_TYPEC_MUX_PI3USB30532=m + +# +# USB Type-C Alternate Mode drivers +# +CONFIG_TYPEC_DP_ALTMODE=m +CONFIG_USB_ROLES_INTEL_XHCI=m +CONFIG_USB_LED_TRIG=y +CONFIG_USB_ULPI_BUS=m +CONFIG_USB_ROLE_SWITCH=m +CONFIG_UWB=m +CONFIG_UWB_HWA=m +CONFIG_UWB_WHCI=m +CONFIG_UWB_I1480U=m +CONFIG_MMC=y +CONFIG_MMC_BLOCK=m +CONFIG_MMC_BLOCK_MINORS=8 +CONFIG_SDIO_UART=m +# CONFIG_MMC_TEST is not set + +# +# MMC/SD/SDIO Host Controller Drivers +# +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_SDHCI=m +CONFIG_MMC_SDHCI_PCI=m +CONFIG_MMC_RICOH_MMC=y +CONFIG_MMC_SDHCI_ACPI=m +CONFIG_MMC_SDHCI_PLTFM=m +CONFIG_MMC_SDHCI_F_SDH30=m +CONFIG_MMC_WBSD=m +CONFIG_MMC_TIFM_SD=m +CONFIG_MMC_SPI=m +CONFIG_MMC_SDRICOH_CS=m +CONFIG_MMC_CB710=m +CONFIG_MMC_VIA_SDMMC=m +CONFIG_MMC_VUB300=m +CONFIG_MMC_USHC=m +CONFIG_MMC_USDHI6ROL0=m +CONFIG_MMC_REALTEK_PCI=m +CONFIG_MMC_REALTEK_USB=m +CONFIG_MMC_CQHCI=m +CONFIG_MMC_TOSHIBA_PCI=m +CONFIG_MMC_MTK=m +CONFIG_MMC_SDHCI_XENON=m +CONFIG_MEMSTICK=m +# CONFIG_MEMSTICK_DEBUG is not set + +# +# MemoryStick drivers +# +# CONFIG_MEMSTICK_UNSAFE_RESUME is not set +CONFIG_MSPRO_BLOCK=m +CONFIG_MS_BLOCK=m + +# +# MemoryStick Host Controller Drivers +# +CONFIG_MEMSTICK_TIFM_MS=m +CONFIG_MEMSTICK_JMICRON_38X=m +CONFIG_MEMSTICK_R592=m +CONFIG_MEMSTICK_REALTEK_PCI=m +CONFIG_MEMSTICK_REALTEK_USB=m +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_CLASS_FLASH=m +# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set + +# +# LED drivers +# +CONFIG_LEDS_88PM860X=m +CONFIG_LEDS_APU=m +CONFIG_LEDS_AS3645A=m +CONFIG_LEDS_LM3530=m +CONFIG_LEDS_LM3533=m +CONFIG_LEDS_LM3642=m +CONFIG_LEDS_LM3601X=m +CONFIG_LEDS_MT6323=m +CONFIG_LEDS_NET48XX=m +CONFIG_LEDS_WRAP=m +CONFIG_LEDS_PCA9532=m +CONFIG_LEDS_PCA9532_GPIO=y +CONFIG_LEDS_GPIO=m +CONFIG_LEDS_LP3944=m +CONFIG_LEDS_LP3952=m +CONFIG_LEDS_LP55XX_COMMON=m +CONFIG_LEDS_LP5521=m +CONFIG_LEDS_LP5523=m +CONFIG_LEDS_LP5562=m +CONFIG_LEDS_LP8501=m +CONFIG_LEDS_LP8788=m +CONFIG_LEDS_CLEVO_MAIL=m +CONFIG_LEDS_PCA955X=m +# CONFIG_LEDS_PCA955X_GPIO is not set +CONFIG_LEDS_PCA963X=m +CONFIG_LEDS_WM831X_STATUS=m +CONFIG_LEDS_WM8350=m +CONFIG_LEDS_DA903X=m +CONFIG_LEDS_DA9052=m +CONFIG_LEDS_DAC124S085=m +CONFIG_LEDS_PWM=m +CONFIG_LEDS_REGULATOR=m +CONFIG_LEDS_BD2802=m +CONFIG_LEDS_INTEL_SS4200=m +CONFIG_LEDS_LT3593=m +CONFIG_LEDS_ADP5520=m +CONFIG_LEDS_MC13783=m +CONFIG_LEDS_TCA6507=m +CONFIG_LEDS_TLC591XX=m +CONFIG_LEDS_MAX8997=m +CONFIG_LEDS_LM355x=m +CONFIG_LEDS_OT200=m +CONFIG_LEDS_MENF21BMC=m + +# +# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM) +# +CONFIG_LEDS_BLINKM=m +# CONFIG_LEDS_MLXCPLD is not set +# CONFIG_LEDS_MLXREG is not set +CONFIG_LEDS_USER=m +CONFIG_LEDS_NIC78BX=m + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=m +CONFIG_LEDS_TRIGGER_ONESHOT=m +CONFIG_LEDS_TRIGGER_DISK=y +# CONFIG_LEDS_TRIGGER_MTD is not set +CONFIG_LEDS_TRIGGER_HEARTBEAT=m +CONFIG_LEDS_TRIGGER_BACKLIGHT=m +CONFIG_LEDS_TRIGGER_CPU=y +CONFIG_LEDS_TRIGGER_ACTIVITY=m +CONFIG_LEDS_TRIGGER_GPIO=m +CONFIG_LEDS_TRIGGER_DEFAULT_ON=m + +# +# iptables trigger is under Netfilter config (LED target) +# +CONFIG_LEDS_TRIGGER_TRANSIENT=m +CONFIG_LEDS_TRIGGER_CAMERA=m +CONFIG_LEDS_TRIGGER_PANIC=y +CONFIG_LEDS_TRIGGER_NETDEV=m +# CONFIG_ACCESSIBILITY is not set +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +# CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI is not set +CONFIG_INFINIBAND_USER_MEM=y +CONFIG_INFINIBAND_ON_DEMAND_PAGING=y +CONFIG_INFINIBAND_ADDR_TRANS=y +CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y +CONFIG_INFINIBAND_MTHCA=m +# CONFIG_INFINIBAND_MTHCA_DEBUG is not set +CONFIG_INFINIBAND_CXGB3=m +CONFIG_INFINIBAND_CXGB4=m +CONFIG_INFINIBAND_I40IW=m +CONFIG_MLX4_INFINIBAND=m +CONFIG_MLX5_INFINIBAND=m +CONFIG_INFINIBAND_NES=m +# CONFIG_INFINIBAND_NES_DEBUG is not set +CONFIG_INFINIBAND_OCRDMA=m +CONFIG_INFINIBAND_VMWARE_PVRDMA=m +CONFIG_INFINIBAND_USNIC=m +CONFIG_INFINIBAND_IPOIB=m +CONFIG_INFINIBAND_IPOIB_CM=y +# CONFIG_INFINIBAND_IPOIB_DEBUG is not set +CONFIG_INFINIBAND_SRP=m +CONFIG_INFINIBAND_SRPT=m +CONFIG_INFINIBAND_ISER=m +CONFIG_INFINIBAND_ISERT=m +CONFIG_RDMA_RXE=m +CONFIG_INFINIBAND_BNXT_RE=m +CONFIG_EDAC_ATOMIC_SCRUB=y +CONFIG_EDAC_SUPPORT=y +CONFIG_EDAC=y +# CONFIG_EDAC_LEGACY_SYSFS is not set +# CONFIG_EDAC_DEBUG is not set +CONFIG_EDAC_DECODE_MCE=m +CONFIG_EDAC_GHES=y +CONFIG_EDAC_AMD64=m +# CONFIG_EDAC_AMD64_ERROR_INJECTION is not set +CONFIG_EDAC_AMD76X=m +CONFIG_EDAC_E7XXX=m +CONFIG_EDAC_E752X=m +CONFIG_EDAC_I82875P=m +CONFIG_EDAC_I82975X=m +CONFIG_EDAC_I3000=m +CONFIG_EDAC_I3200=m +CONFIG_EDAC_IE31200=m +CONFIG_EDAC_X38=m +CONFIG_EDAC_I5400=m +CONFIG_EDAC_I7CORE=m +CONFIG_EDAC_I82860=m +CONFIG_EDAC_R82600=m +CONFIG_EDAC_I5000=m +CONFIG_EDAC_I5100=m +CONFIG_EDAC_I7300=m +CONFIG_RTC_LIB=y +CONFIG_RTC_MC146818_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +CONFIG_RTC_SYSTOHC=y +CONFIG_RTC_SYSTOHC_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set +CONFIG_RTC_NVMEM=y + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set +# CONFIG_RTC_DRV_TEST is not set + +# +# I2C RTC drivers +# +CONFIG_RTC_DRV_88PM860X=m +CONFIG_RTC_DRV_88PM80X=m +CONFIG_RTC_DRV_ABB5ZES3=m +CONFIG_RTC_DRV_ABX80X=m +CONFIG_RTC_DRV_DS1307=m +# CONFIG_RTC_DRV_DS1307_CENTURY is not set +CONFIG_RTC_DRV_DS1374=m +CONFIG_RTC_DRV_DS1374_WDT=y +CONFIG_RTC_DRV_DS1672=m +CONFIG_RTC_DRV_LP8788=m +CONFIG_RTC_DRV_MAX6900=m +CONFIG_RTC_DRV_MAX8907=m +CONFIG_RTC_DRV_MAX8925=m +CONFIG_RTC_DRV_MAX8998=m +CONFIG_RTC_DRV_MAX8997=m +CONFIG_RTC_DRV_RS5C372=m +CONFIG_RTC_DRV_ISL1208=m +CONFIG_RTC_DRV_ISL12022=m +CONFIG_RTC_DRV_X1205=m +CONFIG_RTC_DRV_PCF8523=m +CONFIG_RTC_DRV_PCF85063=m +CONFIG_RTC_DRV_PCF85363=m +CONFIG_RTC_DRV_PCF8563=m +CONFIG_RTC_DRV_PCF8583=m +CONFIG_RTC_DRV_M41T80=m +CONFIG_RTC_DRV_M41T80_WDT=y +CONFIG_RTC_DRV_BQ32K=m +CONFIG_RTC_DRV_PALMAS=m +CONFIG_RTC_DRV_TPS6586X=m +CONFIG_RTC_DRV_TPS65910=m +CONFIG_RTC_DRV_TPS80031=m +CONFIG_RTC_DRV_RC5T583=m +CONFIG_RTC_DRV_S35390A=m +CONFIG_RTC_DRV_FM3130=m +CONFIG_RTC_DRV_RX8010=m +CONFIG_RTC_DRV_RX8581=m +CONFIG_RTC_DRV_RX8025=m +CONFIG_RTC_DRV_EM3027=m +CONFIG_RTC_DRV_RV8803=m +CONFIG_RTC_DRV_S5M=m + +# +# SPI RTC drivers +# +CONFIG_RTC_DRV_M41T93=m +CONFIG_RTC_DRV_M41T94=m +CONFIG_RTC_DRV_DS1302=m +CONFIG_RTC_DRV_DS1305=m +CONFIG_RTC_DRV_DS1343=m +CONFIG_RTC_DRV_DS1347=m +CONFIG_RTC_DRV_DS1390=m +CONFIG_RTC_DRV_MAX6916=m +CONFIG_RTC_DRV_R9701=m +CONFIG_RTC_DRV_RX4581=m +CONFIG_RTC_DRV_RX6110=m +CONFIG_RTC_DRV_RS5C348=m +CONFIG_RTC_DRV_MAX6902=m +CONFIG_RTC_DRV_PCF2123=m +CONFIG_RTC_DRV_MCP795=m +CONFIG_RTC_I2C_AND_SPI=y + +# +# SPI and I2C RTC drivers +# +CONFIG_RTC_DRV_DS3232=m +CONFIG_RTC_DRV_DS3232_HWMON=y +CONFIG_RTC_DRV_PCF2127=m +CONFIG_RTC_DRV_RV3029C2=m +CONFIG_RTC_DRV_RV3029_HWMON=y + +# +# Platform RTC drivers +# +CONFIG_RTC_DRV_CMOS=y +CONFIG_RTC_DRV_VRTC=m +CONFIG_RTC_DRV_DS1286=m +CONFIG_RTC_DRV_DS1511=m +CONFIG_RTC_DRV_DS1553=m +CONFIG_RTC_DRV_DS1685_FAMILY=m +CONFIG_RTC_DRV_DS1685=y +# CONFIG_RTC_DRV_DS1689 is not set +# CONFIG_RTC_DRV_DS17285 is not set +# CONFIG_RTC_DRV_DS17485 is not set +# CONFIG_RTC_DRV_DS17885 is not set +# CONFIG_RTC_DS1685_PROC_REGS is not set +CONFIG_RTC_DRV_DS1742=m +CONFIG_RTC_DRV_DS2404=m +CONFIG_RTC_DRV_DA9052=m +CONFIG_RTC_DRV_DA9055=m +CONFIG_RTC_DRV_DA9063=m +CONFIG_RTC_DRV_STK17TA8=m +CONFIG_RTC_DRV_M48T86=m +CONFIG_RTC_DRV_M48T35=m +CONFIG_RTC_DRV_M48T59=m +CONFIG_RTC_DRV_MSM6242=m +CONFIG_RTC_DRV_BQ4802=m +CONFIG_RTC_DRV_RP5C01=m +CONFIG_RTC_DRV_V3020=m +CONFIG_RTC_DRV_WM831X=m +CONFIG_RTC_DRV_WM8350=m +CONFIG_RTC_DRV_PCF50633=m +CONFIG_RTC_DRV_AB3100=m +CONFIG_RTC_DRV_CROS_EC=m + +# +# on-CPU RTC drivers +# +CONFIG_RTC_DRV_FTRTC010=m +CONFIG_RTC_DRV_PCAP=m +CONFIG_RTC_DRV_MC13XXX=m +CONFIG_RTC_DRV_MT6397=m + +# +# HID Sensor RTC drivers +# +CONFIG_RTC_DRV_HID_SENSOR_TIME=m +CONFIG_DMADEVICES=y +# CONFIG_DMADEVICES_DEBUG is not set + +# +# DMA Devices +# +CONFIG_DMA_ENGINE=y +CONFIG_DMA_VIRTUAL_CHANNELS=m +CONFIG_DMA_ACPI=y +CONFIG_ALTERA_MSGDMA=m +CONFIG_INTEL_IDMA64=m +CONFIG_PCH_DMA=m +CONFIG_TIMB_DMA=m +CONFIG_QCOM_HIDMA_MGMT=m +CONFIG_QCOM_HIDMA=m +CONFIG_DW_DMAC_CORE=m +CONFIG_DW_DMAC=m +CONFIG_DW_DMAC_PCI=m +CONFIG_HSU_DMA=m +CONFIG_HSU_DMA_PCI=m + +# +# DMA Clients +# +CONFIG_ASYNC_TX_DMA=y +# CONFIG_DMATEST is not set + +# +# DMABUF options +# +CONFIG_SYNC_FILE=y +# CONFIG_SW_SYNC is not set +CONFIG_AUXDISPLAY=y +CONFIG_HD44780=m +CONFIG_KS0108=m +CONFIG_KS0108_PORT=0x378 +CONFIG_KS0108_DELAY=2 +CONFIG_CFAG12864B=m +CONFIG_CFAG12864B_RATE=20 +CONFIG_IMG_ASCII_LCD=m +CONFIG_PANEL=m +CONFIG_PANEL_PARPORT=0 +CONFIG_PANEL_PROFILE=5 +# CONFIG_PANEL_CHANGE_MESSAGE is not set +CONFIG_CHARLCD=m +CONFIG_UIO=m +CONFIG_UIO_CIF=m +CONFIG_UIO_PDRV_GENIRQ=m +CONFIG_UIO_DMEM_GENIRQ=m +CONFIG_UIO_AEC=m +CONFIG_UIO_SERCOS3=m +CONFIG_UIO_PCI_GENERIC=m +CONFIG_UIO_NETX=m +CONFIG_UIO_PRUSS=m +CONFIG_UIO_MF624=m +CONFIG_UIO_HV_GENERIC=m +CONFIG_VFIO_IOMMU_TYPE1=m +CONFIG_VFIO_VIRQFD=m +CONFIG_VFIO=m +CONFIG_VFIO_NOIOMMU=y +CONFIG_VFIO_PCI=m +CONFIG_VFIO_PCI_VGA=y +CONFIG_VFIO_PCI_MMAP=y +CONFIG_VFIO_PCI_INTX=y +CONFIG_VFIO_PCI_IGD=y +CONFIG_VFIO_MDEV=m +CONFIG_VFIO_MDEV_DEVICE=m +CONFIG_IRQ_BYPASS_MANAGER=m +CONFIG_VIRT_DRIVERS=y +CONFIG_VBOXGUEST=m +CONFIG_VIRTIO=y +CONFIG_VIRTIO_MENU=y +CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_PCI_LEGACY=y +CONFIG_VIRTIO_BALLOON=y +CONFIG_VIRTIO_INPUT=m +CONFIG_VIRTIO_MMIO=y +CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y + +# +# Microsoft Hyper-V guest support +# +CONFIG_HYPERV=m +CONFIG_HYPERV_UTILS=m +CONFIG_HYPERV_BALLOON=m + +# +# Xen driver support +# +CONFIG_XEN_BALLOON=y +CONFIG_XEN_SELFBALLOONING=y +CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y +CONFIG_XEN_BALLOON_MEMORY_HOTPLUG_LIMIT=4 +CONFIG_XEN_SCRUB_PAGES_DEFAULT=y +CONFIG_XEN_DEV_EVTCHN=m +CONFIG_XEN_BACKEND=y +CONFIG_XENFS=m +CONFIG_XEN_COMPAT_XENFS=y +CONFIG_XEN_SYS_HYPERVISOR=y +CONFIG_XEN_XENBUS_FRONTEND=y +CONFIG_XEN_GNTDEV=m +CONFIG_XEN_GRANT_DEV_ALLOC=m +# CONFIG_XEN_GRANT_DMA_ALLOC is not set +CONFIG_SWIOTLB_XEN=y +CONFIG_XEN_TMEM=m +CONFIG_XEN_PCIDEV_BACKEND=m +CONFIG_XEN_PVCALLS_FRONTEND=m +# CONFIG_XEN_PVCALLS_BACKEND is not set +CONFIG_XEN_SCSI_BACKEND=m +CONFIG_XEN_PRIVCMD=m +CONFIG_XEN_ACPI_PROCESSOR=y +CONFIG_XEN_HAVE_PVMMU=y +CONFIG_XEN_AUTO_XLATE=y +CONFIG_XEN_ACPI=y +CONFIG_XEN_SYMS=y +CONFIG_XEN_HAVE_VPMU=y +CONFIG_STAGING=y +CONFIG_PRISM2_USB=m +CONFIG_COMEDI=m +# CONFIG_COMEDI_DEBUG is not set +CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048 +CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480 +CONFIG_COMEDI_MISC_DRIVERS=y +CONFIG_COMEDI_BOND=m +CONFIG_COMEDI_TEST=m +CONFIG_COMEDI_PARPORT=m +CONFIG_COMEDI_SSV_DNP=m +CONFIG_COMEDI_ISA_DRIVERS=y +CONFIG_COMEDI_PCL711=m +CONFIG_COMEDI_PCL724=m +CONFIG_COMEDI_PCL726=m +CONFIG_COMEDI_PCL730=m +CONFIG_COMEDI_PCL812=m +CONFIG_COMEDI_PCL816=m +CONFIG_COMEDI_PCL818=m +CONFIG_COMEDI_PCM3724=m +CONFIG_COMEDI_AMPLC_DIO200_ISA=m +CONFIG_COMEDI_AMPLC_PC236_ISA=m +CONFIG_COMEDI_AMPLC_PC263_ISA=m +CONFIG_COMEDI_RTI800=m +CONFIG_COMEDI_RTI802=m +CONFIG_COMEDI_DAC02=m +CONFIG_COMEDI_DAS16M1=m +CONFIG_COMEDI_DAS08_ISA=m +CONFIG_COMEDI_DAS16=m +CONFIG_COMEDI_DAS800=m +CONFIG_COMEDI_DAS1800=m +CONFIG_COMEDI_DAS6402=m +CONFIG_COMEDI_DT2801=m +CONFIG_COMEDI_DT2811=m +CONFIG_COMEDI_DT2814=m +CONFIG_COMEDI_DT2815=m +CONFIG_COMEDI_DT2817=m +CONFIG_COMEDI_DT282X=m +CONFIG_COMEDI_DMM32AT=m +CONFIG_COMEDI_FL512=m +CONFIG_COMEDI_AIO_AIO12_8=m +CONFIG_COMEDI_AIO_IIRO_16=m +CONFIG_COMEDI_II_PCI20KC=m +CONFIG_COMEDI_C6XDIGIO=m +CONFIG_COMEDI_MPC624=m +CONFIG_COMEDI_ADQ12B=m +CONFIG_COMEDI_NI_AT_A2150=m +CONFIG_COMEDI_NI_AT_AO=m +CONFIG_COMEDI_NI_ATMIO=m +CONFIG_COMEDI_NI_ATMIO16D=m +CONFIG_COMEDI_NI_LABPC_ISA=m +CONFIG_COMEDI_PCMAD=m +CONFIG_COMEDI_PCMDA12=m +CONFIG_COMEDI_PCMMIO=m +CONFIG_COMEDI_PCMUIO=m +CONFIG_COMEDI_MULTIQ3=m +CONFIG_COMEDI_S526=m +CONFIG_COMEDI_PCI_DRIVERS=m +CONFIG_COMEDI_8255_PCI=m +CONFIG_COMEDI_ADDI_WATCHDOG=m +CONFIG_COMEDI_ADDI_APCI_1032=m +CONFIG_COMEDI_ADDI_APCI_1500=m +CONFIG_COMEDI_ADDI_APCI_1516=m +CONFIG_COMEDI_ADDI_APCI_1564=m +CONFIG_COMEDI_ADDI_APCI_16XX=m +CONFIG_COMEDI_ADDI_APCI_2032=m +CONFIG_COMEDI_ADDI_APCI_2200=m +CONFIG_COMEDI_ADDI_APCI_3120=m +CONFIG_COMEDI_ADDI_APCI_3501=m +CONFIG_COMEDI_ADDI_APCI_3XXX=m +CONFIG_COMEDI_ADL_PCI6208=m +CONFIG_COMEDI_ADL_PCI7X3X=m +CONFIG_COMEDI_ADL_PCI8164=m +CONFIG_COMEDI_ADL_PCI9111=m +CONFIG_COMEDI_ADL_PCI9118=m +CONFIG_COMEDI_ADV_PCI1710=m +CONFIG_COMEDI_ADV_PCI1720=m +CONFIG_COMEDI_ADV_PCI1723=m +CONFIG_COMEDI_ADV_PCI1724=m +CONFIG_COMEDI_ADV_PCI1760=m +CONFIG_COMEDI_ADV_PCI_DIO=m +CONFIG_COMEDI_AMPLC_DIO200_PCI=m +CONFIG_COMEDI_AMPLC_PC236_PCI=m +CONFIG_COMEDI_AMPLC_PC263_PCI=m +CONFIG_COMEDI_AMPLC_PCI224=m +CONFIG_COMEDI_AMPLC_PCI230=m +CONFIG_COMEDI_CONTEC_PCI_DIO=m +CONFIG_COMEDI_DAS08_PCI=m +CONFIG_COMEDI_DT3000=m +CONFIG_COMEDI_DYNA_PCI10XX=m +CONFIG_COMEDI_GSC_HPDI=m +CONFIG_COMEDI_MF6X4=m +CONFIG_COMEDI_ICP_MULTI=m +CONFIG_COMEDI_DAQBOARD2000=m +CONFIG_COMEDI_JR3_PCI=m +CONFIG_COMEDI_KE_COUNTER=m +CONFIG_COMEDI_CB_PCIDAS64=m +CONFIG_COMEDI_CB_PCIDAS=m +CONFIG_COMEDI_CB_PCIDDA=m +CONFIG_COMEDI_CB_PCIMDAS=m +CONFIG_COMEDI_CB_PCIMDDA=m +CONFIG_COMEDI_ME4000=m +CONFIG_COMEDI_ME_DAQ=m +CONFIG_COMEDI_NI_6527=m +CONFIG_COMEDI_NI_65XX=m +CONFIG_COMEDI_NI_660X=m +CONFIG_COMEDI_NI_670X=m +CONFIG_COMEDI_NI_LABPC_PCI=m +CONFIG_COMEDI_NI_PCIDIO=m +CONFIG_COMEDI_NI_PCIMIO=m +CONFIG_COMEDI_RTD520=m +CONFIG_COMEDI_S626=m +CONFIG_COMEDI_MITE=m +CONFIG_COMEDI_NI_TIOCMD=m +CONFIG_COMEDI_PCMCIA_DRIVERS=m +CONFIG_COMEDI_CB_DAS16_CS=m +CONFIG_COMEDI_DAS08_CS=m +CONFIG_COMEDI_NI_DAQ_700_CS=m +CONFIG_COMEDI_NI_DAQ_DIO24_CS=m +CONFIG_COMEDI_NI_LABPC_CS=m +CONFIG_COMEDI_NI_MIO_CS=m +CONFIG_COMEDI_QUATECH_DAQP_CS=m +CONFIG_COMEDI_USB_DRIVERS=m +CONFIG_COMEDI_DT9812=m +CONFIG_COMEDI_NI_USB6501=m +CONFIG_COMEDI_USBDUX=m +CONFIG_COMEDI_USBDUXFAST=m +CONFIG_COMEDI_USBDUXSIGMA=m +CONFIG_COMEDI_VMK80XX=m +CONFIG_COMEDI_8254=m +CONFIG_COMEDI_8255=m +CONFIG_COMEDI_8255_SA=m +CONFIG_COMEDI_KCOMEDILIB=m +CONFIG_COMEDI_AMPLC_DIO200=m +CONFIG_COMEDI_AMPLC_PC236=m +CONFIG_COMEDI_DAS08=m +CONFIG_COMEDI_ISADMA=m +CONFIG_COMEDI_NI_LABPC=m +CONFIG_COMEDI_NI_LABPC_ISADMA=m +CONFIG_COMEDI_NI_TIO=m +CONFIG_RTL8192U=m +CONFIG_RTLLIB=m +CONFIG_RTLLIB_CRYPTO_CCMP=m +CONFIG_RTLLIB_CRYPTO_TKIP=m +CONFIG_RTLLIB_CRYPTO_WEP=m +CONFIG_RTL8192E=m +CONFIG_RTL8723BS=m +CONFIG_R8712U=m +CONFIG_R8188EU=m +CONFIG_88EU_AP_MODE=y +CONFIG_R8822BE=m +CONFIG_RTLWIFI_DEBUG_ST=y +CONFIG_RTS5208=m +CONFIG_VT6655=m +CONFIG_VT6656=m + +# +# IIO staging drivers +# + +# +# Accelerometers +# +CONFIG_ADIS16203=m +CONFIG_ADIS16240=m + +# +# Analog to digital converters +# +CONFIG_AD7606=m +CONFIG_AD7606_IFACE_PARALLEL=m +CONFIG_AD7606_IFACE_SPI=m +CONFIG_AD7780=m +CONFIG_AD7816=m +CONFIG_AD7192=m +CONFIG_AD7280=m + +# +# Analog digital bi-direction converters +# +CONFIG_ADT7316=m +CONFIG_ADT7316_SPI=m +CONFIG_ADT7316_I2C=m + +# +# Capacitance to digital converters +# +CONFIG_AD7150=m +CONFIG_AD7152=m +CONFIG_AD7746=m + +# +# Direct Digital Synthesis +# +CONFIG_AD9832=m +CONFIG_AD9834=m + +# +# Network Analyzer, Impedance Converters +# +CONFIG_AD5933=m + +# +# Active energy metering IC +# +CONFIG_ADE7854=m +CONFIG_ADE7854_I2C=m +CONFIG_ADE7854_SPI=m + +# +# Resolver to digital converters +# +CONFIG_AD2S90=m +CONFIG_AD2S1210=m +CONFIG_FB_SM750=m +CONFIG_FB_XGI=m + +# +# Speakup console speech +# +CONFIG_SPEAKUP=m +CONFIG_SPEAKUP_SYNTH_ACNTSA=m +CONFIG_SPEAKUP_SYNTH_ACNTPC=m +CONFIG_SPEAKUP_SYNTH_APOLLO=m +CONFIG_SPEAKUP_SYNTH_AUDPTR=m +CONFIG_SPEAKUP_SYNTH_BNS=m +CONFIG_SPEAKUP_SYNTH_DECTLK=m +CONFIG_SPEAKUP_SYNTH_DECEXT=m +CONFIG_SPEAKUP_SYNTH_DECPC=m +CONFIG_SPEAKUP_SYNTH_DTLK=m +CONFIG_SPEAKUP_SYNTH_KEYPC=m +CONFIG_SPEAKUP_SYNTH_LTLK=m +CONFIG_SPEAKUP_SYNTH_SOFT=m +CONFIG_SPEAKUP_SYNTH_SPKOUT=m +CONFIG_SPEAKUP_SYNTH_TXPRT=m +CONFIG_SPEAKUP_SYNTH_DUMMY=m +CONFIG_STAGING_MEDIA=y +CONFIG_I2C_BCM2048=m +CONFIG_SOC_CAMERA_IMX074=m +CONFIG_SOC_CAMERA_MT9T031=m +CONFIG_VIDEO_ZORAN=m +CONFIG_VIDEO_ZORAN_DC30=m +CONFIG_VIDEO_ZORAN_ZR36060=m +CONFIG_VIDEO_ZORAN_BUZ=m +CONFIG_VIDEO_ZORAN_DC10=m +CONFIG_VIDEO_ZORAN_LML33=m +CONFIG_VIDEO_ZORAN_LML33R10=m +CONFIG_VIDEO_ZORAN_AVS6EYES=m + +# +# Android +# +CONFIG_LTE_GDM724X=m +CONFIG_FIREWIRE_SERIAL=m +CONFIG_FWTTY_MAX_TOTAL_PORTS=64 +CONFIG_FWTTY_MAX_CARD_PORTS=32 +CONFIG_MTD_SPINAND_MT29F=m +CONFIG_MTD_SPINAND_ONDIEECC=y +CONFIG_DGNC=m +CONFIG_GS_FPGABOOT=m +# CONFIG_UNISYSSPAR is not set +CONFIG_FB_TFT=m +CONFIG_FB_TFT_AGM1264K_FL=m +CONFIG_FB_TFT_BD663474=m +CONFIG_FB_TFT_HX8340BN=m +CONFIG_FB_TFT_HX8347D=m +CONFIG_FB_TFT_HX8353D=m +CONFIG_FB_TFT_HX8357D=m +CONFIG_FB_TFT_ILI9163=m +CONFIG_FB_TFT_ILI9320=m +CONFIG_FB_TFT_ILI9325=m +CONFIG_FB_TFT_ILI9340=m +CONFIG_FB_TFT_ILI9341=m +CONFIG_FB_TFT_ILI9481=m +CONFIG_FB_TFT_ILI9486=m +CONFIG_FB_TFT_PCD8544=m +CONFIG_FB_TFT_RA8875=m +CONFIG_FB_TFT_S6D02A1=m +CONFIG_FB_TFT_S6D1121=m +CONFIG_FB_TFT_SH1106=m +CONFIG_FB_TFT_SSD1289=m +CONFIG_FB_TFT_SSD1305=m +CONFIG_FB_TFT_SSD1306=m +CONFIG_FB_TFT_SSD1331=m +CONFIG_FB_TFT_SSD1351=m +CONFIG_FB_TFT_ST7735R=m +CONFIG_FB_TFT_ST7789V=m +CONFIG_FB_TFT_TINYLCD=m +CONFIG_FB_TFT_TLS8204=m +CONFIG_FB_TFT_UC1611=m +CONFIG_FB_TFT_UC1701=m +CONFIG_FB_TFT_UPD161704=m +CONFIG_FB_TFT_WATTEROTT=m +CONFIG_FB_FLEX=m +CONFIG_FB_TFT_FBTFT_DEVICE=m +CONFIG_WILC1000=m +CONFIG_WILC1000_SDIO=m +CONFIG_WILC1000_SPI=m +# CONFIG_WILC1000_HW_OOB_INTR is not set +CONFIG_MOST=m +CONFIG_MOST_CDEV=m +CONFIG_MOST_NET=m +CONFIG_MOST_SOUND=m +CONFIG_MOST_VIDEO=m +CONFIG_MOST_I2C=m +CONFIG_MOST_USB=m +CONFIG_KS7010=m +# CONFIG_GREYBUS is not set +CONFIG_DRM_VBOXVIDEO=m +# CONFIG_PI433 is not set +CONFIG_MTK_MMC=m +# CONFIG_MTK_AEE_KDUMP is not set +# CONFIG_MTK_MMC_CD_POLL is not set + +# +# Gasket devices +# +CONFIG_XIL_AXIS_FIFO=m +CONFIG_EROFS_FS=m +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS_XATTR=y +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +# CONFIG_EROFS_FS_USE_VM_MAP_RAM is not set +# CONFIG_EROFS_FAULT_INJECTION is not set +# CONFIG_EROFS_FS_ZIP is not set +CONFIG_X86_PLATFORM_DEVICES=y +CONFIG_ACER_WMI=m +CONFIG_ACER_WIRELESS=m +CONFIG_ACERHDF=m +CONFIG_ALIENWARE_WMI=m +CONFIG_ASUS_LAPTOP=m +CONFIG_DELL_SMBIOS=m +CONFIG_DELL_SMBIOS_WMI=y +CONFIG_DELL_SMBIOS_SMM=y +CONFIG_DELL_LAPTOP=m +CONFIG_DELL_WMI=m +CONFIG_DELL_WMI_DESCRIPTOR=m +CONFIG_DELL_WMI_AIO=m +CONFIG_DELL_WMI_LED=m +CONFIG_DELL_SMO8800=m +CONFIG_DELL_RBTN=m +CONFIG_FUJITSU_LAPTOP=m +CONFIG_FUJITSU_TABLET=m +CONFIG_AMILO_RFKILL=m +# CONFIG_GPD_POCKET_FAN is not set +CONFIG_TC1100_WMI=m +CONFIG_HP_ACCEL=m +CONFIG_HP_WIRELESS=m +CONFIG_HP_WMI=m +CONFIG_MSI_LAPTOP=m +CONFIG_PANASONIC_LAPTOP=m +CONFIG_COMPAL_LAPTOP=m +CONFIG_SONY_LAPTOP=m +CONFIG_SONYPI_COMPAT=y +CONFIG_IDEAPAD_LAPTOP=m +CONFIG_SURFACE3_WMI=m +CONFIG_THINKPAD_ACPI=m +CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y +CONFIG_THINKPAD_ACPI_DEBUGFACILITIES=y +# CONFIG_THINKPAD_ACPI_DEBUG is not set +# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set +CONFIG_THINKPAD_ACPI_VIDEO=y +CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y +CONFIG_SENSORS_HDAPS=m +CONFIG_INTEL_MENLOW=m +CONFIG_EEEPC_LAPTOP=m +CONFIG_ASUS_WMI=m +CONFIG_ASUS_NB_WMI=m +CONFIG_EEEPC_WMI=m +CONFIG_ASUS_WIRELESS=m +CONFIG_ACPI_WMI=m +CONFIG_WMI_BMOF=m +CONFIG_INTEL_WMI_THUNDERBOLT=m +CONFIG_MSI_WMI=m +CONFIG_PEAQ_WMI=m +CONFIG_TOPSTAR_LAPTOP=m +CONFIG_ACPI_TOSHIBA=m +CONFIG_TOSHIBA_BT_RFKILL=m +CONFIG_TOSHIBA_HAPS=m +CONFIG_TOSHIBA_WMI=m +CONFIG_ACPI_CMPC=m +CONFIG_INTEL_CHT_INT33FE=m +CONFIG_INTEL_INT0002_VGPIO=m +CONFIG_INTEL_HID_EVENT=m +CONFIG_INTEL_VBTN=m +CONFIG_INTEL_SCU_IPC=y +CONFIG_INTEL_SCU_IPC_UTIL=m +CONFIG_INTEL_MID_POWER_BUTTON=m +CONFIG_INTEL_MFLD_THERMAL=m +CONFIG_INTEL_IPS=m +CONFIG_INTEL_PMC_CORE=y +CONFIG_IBM_RTL=m +CONFIG_SAMSUNG_LAPTOP=m +CONFIG_MXM_WMI=m +CONFIG_INTEL_OAKTRAIL=m +CONFIG_SAMSUNG_Q10=m +CONFIG_APPLE_GMUX=m +CONFIG_INTEL_RST=m +CONFIG_INTEL_SMARTCONNECT=m +CONFIG_PVPANIC=m +CONFIG_INTEL_PMC_IPC=m +CONFIG_INTEL_BXTWC_PMIC_TMU=m +CONFIG_SURFACE_PRO3_BUTTON=m +CONFIG_SURFACE_3_BUTTON=m +CONFIG_INTEL_PUNIT_IPC=m +# CONFIG_MLX_PLATFORM is not set +# CONFIG_TOUCHSCREEN_DMI is not set +CONFIG_INTEL_CHTDC_TI_PWRBTN=m +CONFIG_I2C_MULTI_INSTANTIATE=m +CONFIG_PMC_ATOM=y +CONFIG_CHROME_PLATFORMS=y +CONFIG_CHROMEOS_LAPTOP=m +CONFIG_CHROMEOS_PSTORE=m +CONFIG_CHROMEOS_TBMC=m +CONFIG_CROS_EC_CTL=m +CONFIG_CROS_EC_I2C=m +CONFIG_CROS_EC_SPI=m +CONFIG_CROS_EC_LPC=m +# CONFIG_CROS_EC_LPC_MEC is not set +CONFIG_CROS_EC_PROTO=y +CONFIG_CROS_KBD_LED_BACKLIGHT=m +# CONFIG_MELLANOX_PLATFORM is not set +CONFIG_CLKDEV_LOOKUP=y +CONFIG_HAVE_CLK_PREPARE=y +CONFIG_COMMON_CLK=y + +# +# Common Clock Framework +# +CONFIG_COMMON_CLK_WM831X=m +CONFIG_COMMON_CLK_MAX9485=m +CONFIG_COMMON_CLK_SI5351=m +CONFIG_COMMON_CLK_SI544=m +CONFIG_COMMON_CLK_CDCE706=m +CONFIG_COMMON_CLK_CS2000_CP=m +CONFIG_COMMON_CLK_S2MPS11=m +CONFIG_CLK_TWL6040=m +CONFIG_COMMON_CLK_PALMAS=m +CONFIG_COMMON_CLK_PWM=m +# CONFIG_HWSPINLOCK is not set + +# +# Clock Source drivers +# +CONFIG_CLKSRC_I8253=y +CONFIG_CLKEVT_I8253=y +CONFIG_I8253_LOCK=y +CONFIG_CLKBLD_I8253=y +CONFIG_DW_APB_TIMER=y +CONFIG_MAILBOX=y +CONFIG_PCC=y +CONFIG_ALTERA_MBOX=m +CONFIG_IOMMU_API=y +CONFIG_IOMMU_SUPPORT=y + +# +# Generic IOMMU Pagetable Support +# +# CONFIG_IOMMU_DEBUGFS is not set +# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set +CONFIG_IOMMU_IOVA=y +CONFIG_DMAR_TABLE=y +CONFIG_INTEL_IOMMU=y +CONFIG_INTEL_IOMMU_SVM=y +# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set +CONFIG_INTEL_IOMMU_FLOPPY_WA=y + +# +# Remoteproc drivers +# +CONFIG_REMOTEPROC=m + +# +# Rpmsg drivers +# +CONFIG_RPMSG=m +# CONFIG_RPMSG_CHAR is not set +CONFIG_RPMSG_QCOM_GLINK_NATIVE=m +CONFIG_RPMSG_QCOM_GLINK_RPM=m +CONFIG_RPMSG_VIRTIO=m +# CONFIG_SOUNDWIRE is not set + +# +# SOC (System On Chip) specific Drivers +# + +# +# Amlogic SoC drivers +# + +# +# Broadcom SoC drivers +# + +# +# NXP/Freescale QorIQ SoC drivers +# + +# +# i.MX SoC drivers +# + +# +# Qualcomm SoC drivers +# +CONFIG_SOC_TI=y + +# +# Xilinx SoC drivers +# +# CONFIG_XILINX_VCU is not set +CONFIG_PM_DEVFREQ=y + +# +# DEVFREQ Governors +# +CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y +CONFIG_DEVFREQ_GOV_PERFORMANCE=y +CONFIG_DEVFREQ_GOV_POWERSAVE=y +CONFIG_DEVFREQ_GOV_USERSPACE=y +CONFIG_DEVFREQ_GOV_PASSIVE=m + +# +# DEVFREQ Drivers +# +CONFIG_PM_DEVFREQ_EVENT=y +CONFIG_EXTCON=y + +# +# Extcon Device Drivers +# +CONFIG_EXTCON_ADC_JACK=m +CONFIG_EXTCON_ARIZONA=m +CONFIG_EXTCON_AXP288=m +CONFIG_EXTCON_GPIO=m +CONFIG_EXTCON_INTEL_INT3496=m +CONFIG_EXTCON_INTEL_CHT_WC=m +CONFIG_EXTCON_MAX14577=m +CONFIG_EXTCON_MAX3355=m +CONFIG_EXTCON_MAX77693=m +CONFIG_EXTCON_MAX77843=m +CONFIG_EXTCON_MAX8997=m +CONFIG_EXTCON_PALMAS=m +CONFIG_EXTCON_RT8973A=m +CONFIG_EXTCON_SM5502=m +CONFIG_EXTCON_USB_GPIO=m +CONFIG_EXTCON_USBC_CROS_EC=m +CONFIG_MEMORY=y +CONFIG_IIO=m +CONFIG_IIO_BUFFER=y +CONFIG_IIO_BUFFER_CB=m +CONFIG_IIO_BUFFER_HW_CONSUMER=m +CONFIG_IIO_KFIFO_BUF=m +CONFIG_IIO_TRIGGERED_BUFFER=m +CONFIG_IIO_CONFIGFS=m +CONFIG_IIO_TRIGGER=y +CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 +CONFIG_IIO_SW_DEVICE=m +CONFIG_IIO_SW_TRIGGER=m +CONFIG_IIO_TRIGGERED_EVENT=m + +# +# Accelerometers +# +CONFIG_ADIS16201=m +CONFIG_ADIS16209=m +CONFIG_BMA180=m +CONFIG_BMA220=m +CONFIG_BMC150_ACCEL=m +CONFIG_BMC150_ACCEL_I2C=m +CONFIG_BMC150_ACCEL_SPI=m +CONFIG_DA280=m +CONFIG_DA311=m +CONFIG_DMARD09=m +CONFIG_DMARD10=m +CONFIG_HID_SENSOR_ACCEL_3D=m +CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m +CONFIG_IIO_ST_ACCEL_3AXIS=m +CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m +CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m +CONFIG_KXSD9=m +CONFIG_KXSD9_SPI=m +CONFIG_KXSD9_I2C=m +CONFIG_KXCJK1013=m +CONFIG_MC3230=m +CONFIG_MMA7455=m +CONFIG_MMA7455_I2C=m +CONFIG_MMA7455_SPI=m +CONFIG_MMA7660=m +CONFIG_MMA8452=m +CONFIG_MMA9551_CORE=m +CONFIG_MMA9551=m +CONFIG_MMA9553=m +CONFIG_MXC4005=m +CONFIG_MXC6255=m +CONFIG_SCA3000=m +CONFIG_STK8312=m +CONFIG_STK8BA50=m + +# +# Analog to digital converters +# +CONFIG_AD_SIGMA_DELTA=m +CONFIG_AD7266=m +CONFIG_AD7291=m +CONFIG_AD7298=m +CONFIG_AD7476=m +CONFIG_AD7766=m +CONFIG_AD7791=m +CONFIG_AD7793=m +CONFIG_AD7887=m +CONFIG_AD7923=m +CONFIG_AD799X=m +CONFIG_AXP20X_ADC=m +CONFIG_AXP288_ADC=m +CONFIG_CC10001_ADC=m +CONFIG_DA9150_GPADC=m +CONFIG_DLN2_ADC=m +CONFIG_HI8435=m +CONFIG_HX711=m +CONFIG_INA2XX_ADC=m +CONFIG_LP8788_ADC=m +CONFIG_LTC2471=m +CONFIG_LTC2485=m +CONFIG_LTC2497=m +CONFIG_MAX1027=m +CONFIG_MAX11100=m +CONFIG_MAX1118=m +CONFIG_MAX1363=m +CONFIG_MAX9611=m +CONFIG_MCP320X=m +CONFIG_MCP3422=m +CONFIG_MEN_Z188_ADC=m +CONFIG_NAU7802=m +CONFIG_PALMAS_GPADC=m +CONFIG_QCOM_VADC_COMMON=m +CONFIG_QCOM_SPMI_IADC=m +CONFIG_QCOM_SPMI_VADC=m +CONFIG_TI_ADC081C=m +CONFIG_TI_ADC0832=m +CONFIG_TI_ADC084S021=m +CONFIG_TI_ADC12138=m +CONFIG_TI_ADC108S102=m +CONFIG_TI_ADC128S052=m +CONFIG_TI_ADC161S626=m +CONFIG_TI_ADS1015=m +CONFIG_TI_ADS7950=m +CONFIG_TI_AM335X_ADC=m +CONFIG_TI_TLC4541=m +CONFIG_TWL4030_MADC=m +CONFIG_TWL6030_GPADC=m +CONFIG_VIPERBOARD_ADC=m + +# +# Analog Front Ends +# + +# +# Amplifiers +# +CONFIG_AD8366=m + +# +# Chemical Sensors +# +CONFIG_ATLAS_PH_SENSOR=m +CONFIG_BME680=m +CONFIG_BME680_I2C=m +CONFIG_BME680_SPI=m +CONFIG_CCS811=m +CONFIG_IAQCORE=m +CONFIG_VZ89X=m +CONFIG_IIO_CROS_EC_SENSORS_CORE=m +CONFIG_IIO_CROS_EC_SENSORS=m + +# +# Hid Sensor IIO Common +# +CONFIG_HID_SENSOR_IIO_COMMON=m +CONFIG_HID_SENSOR_IIO_TRIGGER=m +CONFIG_IIO_MS_SENSORS_I2C=m + +# +# SSP Sensor Common +# +CONFIG_IIO_SSP_SENSORS_COMMONS=m +CONFIG_IIO_SSP_SENSORHUB=m +CONFIG_IIO_ST_SENSORS_I2C=m +CONFIG_IIO_ST_SENSORS_SPI=m +CONFIG_IIO_ST_SENSORS_CORE=m + +# +# Counters +# + +# +# Digital to analog converters +# +CONFIG_AD5064=m +CONFIG_AD5360=m +CONFIG_AD5380=m +CONFIG_AD5421=m +CONFIG_AD5446=m +CONFIG_AD5449=m +CONFIG_AD5592R_BASE=m +CONFIG_AD5592R=m +CONFIG_AD5593R=m +CONFIG_AD5504=m +CONFIG_AD5624R_SPI=m +CONFIG_LTC2632=m +CONFIG_AD5686=m +CONFIG_AD5686_SPI=m +CONFIG_AD5696_I2C=m +CONFIG_AD5755=m +CONFIG_AD5758=m +CONFIG_AD5761=m +CONFIG_AD5764=m +CONFIG_AD5791=m +CONFIG_AD7303=m +CONFIG_AD8801=m +CONFIG_DS4424=m +CONFIG_M62332=m +CONFIG_MAX517=m +CONFIG_MCP4725=m +CONFIG_MCP4922=m +CONFIG_TI_DAC082S085=m +CONFIG_TI_DAC5571=m + +# +# IIO dummy driver +# +CONFIG_IIO_SIMPLE_DUMMY=m +# CONFIG_IIO_SIMPLE_DUMMY_EVENTS is not set +# CONFIG_IIO_SIMPLE_DUMMY_BUFFER is not set + +# +# Frequency Synthesizers DDS/PLL +# + +# +# Clock Generator/Distribution +# +CONFIG_AD9523=m + +# +# Phase-Locked Loop (PLL) frequency synthesizers +# +CONFIG_ADF4350=m + +# +# Digital gyroscope sensors +# +CONFIG_ADIS16080=m +CONFIG_ADIS16130=m +CONFIG_ADIS16136=m +CONFIG_ADIS16260=m +CONFIG_ADXRS450=m +CONFIG_BMG160=m +CONFIG_BMG160_I2C=m +CONFIG_BMG160_SPI=m +CONFIG_HID_SENSOR_GYRO_3D=m +CONFIG_MPU3050=m +CONFIG_MPU3050_I2C=m +CONFIG_IIO_ST_GYRO_3AXIS=m +CONFIG_IIO_ST_GYRO_I2C_3AXIS=m +CONFIG_IIO_ST_GYRO_SPI_3AXIS=m +CONFIG_ITG3200=m + +# +# Health Sensors +# + +# +# Heart Rate Monitors +# +CONFIG_AFE4403=m +CONFIG_AFE4404=m +CONFIG_MAX30100=m +CONFIG_MAX30102=m + +# +# Humidity sensors +# +CONFIG_AM2315=m +CONFIG_DHT11=m +CONFIG_HDC100X=m +CONFIG_HID_SENSOR_HUMIDITY=m +CONFIG_HTS221=m +CONFIG_HTS221_I2C=m +CONFIG_HTS221_SPI=m +CONFIG_HTU21=m +CONFIG_SI7005=m +CONFIG_SI7020=m + +# +# Inertial measurement units +# +CONFIG_ADIS16400=m +CONFIG_ADIS16480=m +CONFIG_BMI160=m +CONFIG_BMI160_I2C=m +CONFIG_BMI160_SPI=m +CONFIG_KMX61=m +CONFIG_INV_MPU6050_IIO=m +CONFIG_INV_MPU6050_I2C=m +CONFIG_INV_MPU6050_SPI=m +CONFIG_IIO_ST_LSM6DSX=m +CONFIG_IIO_ST_LSM6DSX_I2C=m +CONFIG_IIO_ST_LSM6DSX_SPI=m +CONFIG_IIO_ADIS_LIB=m +CONFIG_IIO_ADIS_LIB_BUFFER=y + +# +# Light sensors +# +CONFIG_ACPI_ALS=m +CONFIG_ADJD_S311=m +CONFIG_AL3320A=m +CONFIG_APDS9300=m +CONFIG_APDS9960=m +CONFIG_BH1750=m +CONFIG_BH1780=m +CONFIG_CM32181=m +CONFIG_CM3232=m +CONFIG_CM3323=m +CONFIG_CM36651=m +CONFIG_IIO_CROS_EC_LIGHT_PROX=m +CONFIG_GP2AP020A00F=m +CONFIG_SENSORS_ISL29018=m +CONFIG_SENSORS_ISL29028=m +CONFIG_ISL29125=m +CONFIG_HID_SENSOR_ALS=m +CONFIG_HID_SENSOR_PROX=m +CONFIG_JSA1212=m +CONFIG_RPR0521=m +CONFIG_SENSORS_LM3533=m +CONFIG_LTR501=m +CONFIG_LV0104CS=m +CONFIG_MAX44000=m +CONFIG_OPT3001=m +CONFIG_PA12203001=m +CONFIG_SI1133=m +CONFIG_SI1145=m +CONFIG_STK3310=m +CONFIG_ST_UVIS25=m +CONFIG_ST_UVIS25_I2C=m +CONFIG_ST_UVIS25_SPI=m +CONFIG_TCS3414=m +CONFIG_TCS3472=m +CONFIG_SENSORS_TSL2563=m +CONFIG_TSL2583=m +CONFIG_TSL2772=m +CONFIG_TSL4531=m +CONFIG_US5182D=m +CONFIG_VCNL4000=m +CONFIG_VEML6070=m +CONFIG_VL6180=m +CONFIG_ZOPT2201=m + +# +# Magnetometer sensors +# +CONFIG_AK8975=m +CONFIG_AK09911=m +CONFIG_BMC150_MAGN=m +CONFIG_BMC150_MAGN_I2C=m +CONFIG_BMC150_MAGN_SPI=m +CONFIG_MAG3110=m +CONFIG_HID_SENSOR_MAGNETOMETER_3D=m +CONFIG_MMC35240=m +CONFIG_IIO_ST_MAGN_3AXIS=m +CONFIG_IIO_ST_MAGN_I2C_3AXIS=m +CONFIG_IIO_ST_MAGN_SPI_3AXIS=m +CONFIG_SENSORS_HMC5843=m +CONFIG_SENSORS_HMC5843_I2C=m +CONFIG_SENSORS_HMC5843_SPI=m + +# +# Multiplexers +# + +# +# Inclinometer sensors +# +CONFIG_HID_SENSOR_INCLINOMETER_3D=m +CONFIG_HID_SENSOR_DEVICE_ROTATION=m + +# +# Triggers - standalone +# +CONFIG_IIO_HRTIMER_TRIGGER=m +CONFIG_IIO_INTERRUPT_TRIGGER=m +CONFIG_IIO_TIGHTLOOP_TRIGGER=m +CONFIG_IIO_SYSFS_TRIGGER=m + +# +# Digital potentiometers +# +CONFIG_AD5272=m +CONFIG_DS1803=m +CONFIG_MAX5481=m +CONFIG_MAX5487=m +CONFIG_MCP4018=m +CONFIG_MCP4131=m +CONFIG_MCP4531=m +CONFIG_TPL0102=m + +# +# Digital potentiostats +# +CONFIG_LMP91000=m + +# +# Pressure sensors +# +CONFIG_ABP060MG=m +CONFIG_BMP280=m +CONFIG_BMP280_I2C=m +CONFIG_BMP280_SPI=m +CONFIG_IIO_CROS_EC_BARO=m +CONFIG_HID_SENSOR_PRESS=m +CONFIG_HP03=m +CONFIG_MPL115=m +CONFIG_MPL115_I2C=m +CONFIG_MPL115_SPI=m +CONFIG_MPL3115=m +CONFIG_MS5611=m +CONFIG_MS5611_I2C=m +CONFIG_MS5611_SPI=m +CONFIG_MS5637=m +CONFIG_IIO_ST_PRESS=m +CONFIG_IIO_ST_PRESS_I2C=m +CONFIG_IIO_ST_PRESS_SPI=m +CONFIG_T5403=m +CONFIG_HP206C=m +CONFIG_ZPA2326=m +CONFIG_ZPA2326_I2C=m +CONFIG_ZPA2326_SPI=m + +# +# Lightning sensors +# +CONFIG_AS3935=m + +# +# Proximity and distance sensors +# +CONFIG_ISL29501=m +CONFIG_LIDAR_LITE_V2=m +CONFIG_RFD77402=m +CONFIG_SRF04=m +CONFIG_SX9500=m +CONFIG_SRF08=m + +# +# Resolver to digital converters +# +CONFIG_AD2S1200=m + +# +# Temperature sensors +# +CONFIG_MAXIM_THERMOCOUPLE=m +CONFIG_HID_SENSOR_TEMP=m +CONFIG_MLX90614=m +CONFIG_MLX90632=m +CONFIG_TMP006=m +CONFIG_TMP007=m +CONFIG_TSYS01=m +CONFIG_TSYS02D=m +CONFIG_NTB=m +CONFIG_NTB_IDT=m +CONFIG_NTB_SWITCHTEC=m +CONFIG_NTB_PINGPONG=m +CONFIG_NTB_TOOL=m +CONFIG_NTB_PERF=m +CONFIG_NTB_TRANSPORT=m +CONFIG_VME_BUS=y + +# +# VME Bridge Drivers +# +CONFIG_VME_CA91CX42=m +CONFIG_VME_TSI148=m +# CONFIG_VME_FAKE is not set + +# +# VME Board Drivers +# +CONFIG_VMIVME_7805=m + +# +# VME Device Drivers +# +CONFIG_VME_USER=m +CONFIG_PWM=y +CONFIG_PWM_SYSFS=y +CONFIG_PWM_CRC=y +CONFIG_PWM_CROS_EC=m +CONFIG_PWM_LP3943=m +CONFIG_PWM_LPSS=m +CONFIG_PWM_LPSS_PCI=m +CONFIG_PWM_LPSS_PLATFORM=m +CONFIG_PWM_PCA9685=m +CONFIG_PWM_TWL=m +CONFIG_PWM_TWL_LED=m + +# +# IRQ chip support +# +CONFIG_ARM_GIC_MAX_NR=1 +CONFIG_IPACK_BUS=m +CONFIG_BOARD_TPCI200=m +CONFIG_SERIAL_IPOCTAL=m +CONFIG_RESET_CONTROLLER=y +CONFIG_RESET_TI_SYSCON=m +CONFIG_FMC=m +CONFIG_FMC_FAKEDEV=m +CONFIG_FMC_TRIVIAL=m +CONFIG_FMC_WRITE_EEPROM=m +CONFIG_FMC_CHARDEV=m + +# +# PHY Subsystem +# +CONFIG_GENERIC_PHY=y +CONFIG_BCM_KONA_USB2_PHY=m +CONFIG_PHY_PXA_28NM_HSIC=m +CONFIG_PHY_PXA_28NM_USB2=m +CONFIG_PHY_CPCAP_USB=m +CONFIG_PHY_QCOM_USB_HS=m +CONFIG_PHY_QCOM_USB_HSIC=m +CONFIG_PHY_SAMSUNG_USB2=m +CONFIG_PHY_TUSB1210=m +CONFIG_POWERCAP=y +CONFIG_INTEL_RAPL=m +# CONFIG_IDLE_INJECT is not set +CONFIG_MCB=m +CONFIG_MCB_PCI=m +CONFIG_MCB_LPC=m + +# +# Performance monitor support +# +CONFIG_RAS=y +CONFIG_THUNDERBOLT=m + +# +# Android +# +# CONFIG_ANDROID is not set +CONFIG_LIBNVDIMM=y +CONFIG_BLK_DEV_PMEM=m +CONFIG_ND_BLK=m +CONFIG_ND_CLAIM=y +CONFIG_ND_BTT=m +CONFIG_BTT=y +CONFIG_DAX_DRIVER=y +CONFIG_DAX=y +CONFIG_DEV_DAX=m +CONFIG_NVMEM=y +CONFIG_RAVE_SP_EEPROM=m + +# +# HW tracing support +# +CONFIG_STM=m +CONFIG_STM_DUMMY=m +CONFIG_STM_SOURCE_CONSOLE=m +CONFIG_STM_SOURCE_HEARTBEAT=m +CONFIG_STM_SOURCE_FTRACE=m +CONFIG_INTEL_TH=m +CONFIG_INTEL_TH_PCI=m +CONFIG_INTEL_TH_ACPI=m +CONFIG_INTEL_TH_GTH=m +CONFIG_INTEL_TH_STH=m +CONFIG_INTEL_TH_MSU=m +CONFIG_INTEL_TH_PTI=m +# CONFIG_INTEL_TH_DEBUG is not set +CONFIG_FPGA=m +CONFIG_ALTERA_PR_IP_CORE=m +CONFIG_FPGA_MGR_ALTERA_PS_SPI=m +CONFIG_FPGA_MGR_ALTERA_CVP=m +CONFIG_FPGA_MGR_XILINX_SPI=m +CONFIG_FPGA_MGR_MACHXO2_SPI=m +CONFIG_FPGA_BRIDGE=m +CONFIG_XILINX_PR_DECOUPLER=m +CONFIG_FPGA_REGION=m +CONFIG_FPGA_DFL=m +CONFIG_FPGA_DFL_FME=m +CONFIG_FPGA_DFL_FME_MGR=m +CONFIG_FPGA_DFL_FME_BRIDGE=m +CONFIG_FPGA_DFL_FME_REGION=m +CONFIG_FPGA_DFL_AFU=m +CONFIG_FPGA_DFL_PCI=m +CONFIG_PM_OPP=y +# CONFIG_SIOX is not set +# CONFIG_SLIMBUS is not set + +# +# File systems +# +CONFIG_DCACHE_WORD_ACCESS=y +CONFIG_FS_IOMAP=y +# CONFIG_EXT2_FS is not set +# CONFIG_EXT3_FS is not set +CONFIG_EXT4_FS=y +CONFIG_EXT4_USE_FOR_EXT2=y +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y +# CONFIG_EXT4_ENCRYPTION is not set +# CONFIG_EXT4_DEBUG is not set +CONFIG_JBD2=y +# CONFIG_JBD2_DEBUG is not set +CONFIG_FS_MBCACHE=y +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +CONFIG_REISERFS_FS_XATTR=y +CONFIG_REISERFS_FS_POSIX_ACL=y +CONFIG_REISERFS_FS_SECURITY=y +CONFIG_JFS_FS=m +CONFIG_JFS_POSIX_ACL=y +CONFIG_JFS_SECURITY=y +# CONFIG_JFS_DEBUG is not set +CONFIG_JFS_STATISTICS=y +CONFIG_XFS_FS=m +CONFIG_XFS_QUOTA=y +CONFIG_XFS_POSIX_ACL=y +CONFIG_XFS_RT=y +# CONFIG_XFS_ONLINE_SCRUB is not set +# CONFIG_XFS_WARN is not set +# CONFIG_XFS_DEBUG is not set +CONFIG_GFS2_FS=m +CONFIG_GFS2_FS_LOCKING_DLM=y +CONFIG_OCFS2_FS=m +CONFIG_OCFS2_FS_O2CB=m +CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m +CONFIG_OCFS2_FS_STATS=y +CONFIG_OCFS2_DEBUG_MASKLOG=y +# CONFIG_OCFS2_DEBUG_FS is not set +CONFIG_BTRFS_FS=m +CONFIG_BTRFS_FS_POSIX_ACL=y +# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set +# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set +# CONFIG_BTRFS_DEBUG is not set +# CONFIG_BTRFS_ASSERT is not set +# CONFIG_BTRFS_FS_REF_VERIFY is not set +CONFIG_NILFS2_FS=m +CONFIG_F2FS_FS=m +CONFIG_F2FS_STAT_FS=y +CONFIG_F2FS_FS_XATTR=y +CONFIG_F2FS_FS_POSIX_ACL=y +CONFIG_F2FS_FS_SECURITY=y +# CONFIG_F2FS_CHECK_FS is not set +# CONFIG_F2FS_FS_ENCRYPTION is not set +# CONFIG_F2FS_IO_TRACE is not set +# CONFIG_F2FS_FAULT_INJECTION is not set +CONFIG_FS_DAX=y +CONFIG_FS_POSIX_ACL=y +CONFIG_EXPORTFS=y +# CONFIG_EXPORTFS_BLOCK_OPS is not set +CONFIG_FILE_LOCKING=y +CONFIG_MANDATORY_FILE_LOCKING=y +CONFIG_FS_ENCRYPTION=m +CONFIG_FSNOTIFY=y +CONFIG_DNOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_FANOTIFY=y +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y +CONFIG_QUOTA=y +CONFIG_QUOTA_NETLINK_INTERFACE=y +# CONFIG_PRINT_QUOTA_WARNING is not set +# CONFIG_QUOTA_DEBUG is not set +CONFIG_QUOTA_TREE=m +CONFIG_QFMT_V1=m +CONFIG_QFMT_V2=m +CONFIG_QUOTACTL=y +CONFIG_AUTOFS4_FS=m +CONFIG_AUTOFS_FS=m +CONFIG_FUSE_FS=y +CONFIG_CUSE=m +CONFIG_OVERLAY_FS=m +# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set +# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set +# CONFIG_OVERLAY_FS_INDEX is not set +# CONFIG_OVERLAY_FS_XINO_AUTO is not set +# CONFIG_OVERLAY_FS_METACOPY is not set + +# +# Caches +# +CONFIG_FSCACHE=m +CONFIG_FSCACHE_STATS=y +# CONFIG_FSCACHE_HISTOGRAM is not set +# CONFIG_FSCACHE_DEBUG is not set +# CONFIG_FSCACHE_OBJECT_LIST is not set +CONFIG_CACHEFILES=m +# CONFIG_CACHEFILES_DEBUG is not set +# CONFIG_CACHEFILES_HISTOGRAM is not set + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=m + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_FAT_DEFAULT_UTF8 is not set +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +# CONFIG_NTFS_RW is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_KCORE=y +CONFIG_PROC_VMCORE=y +# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_PROC_CHILDREN=y +CONFIG_KERNFS=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_TMPFS_XATTR=y +CONFIG_HUGETLBFS=y +CONFIG_HUGETLB_PAGE=y +CONFIG_MEMFD_CREATE=y +CONFIG_CONFIGFS_FS=m +CONFIG_EFIVAR_FS=y +CONFIG_MISC_FILESYSTEMS=y +CONFIG_ORANGEFS_FS=m +CONFIG_ADFS_FS=m +# CONFIG_ADFS_FS_RW is not set +CONFIG_AFFS_FS=m +CONFIG_ECRYPT_FS=y +CONFIG_ECRYPT_FS_MESSAGING=y +CONFIG_HFS_FS=m +CONFIG_HFSPLUS_FS=m +CONFIG_BEFS_FS=m +# CONFIG_BEFS_DEBUG is not set +CONFIG_BFS_FS=m +CONFIG_EFS_FS=m +CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +# CONFIG_JFFS2_SUMMARY is not set +CONFIG_JFFS2_FS_XATTR=y +CONFIG_JFFS2_FS_POSIX_ACL=y +CONFIG_JFFS2_FS_SECURITY=y +CONFIG_JFFS2_COMPRESSION_OPTIONS=y +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_LZO=y +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +# CONFIG_JFFS2_CMODE_NONE is not set +# CONFIG_JFFS2_CMODE_PRIORITY is not set +# CONFIG_JFFS2_CMODE_SIZE is not set +CONFIG_JFFS2_CMODE_FAVOURLZO=y +CONFIG_UBIFS_FS=m +# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set +CONFIG_UBIFS_FS_LZO=y +CONFIG_UBIFS_FS_ZLIB=y +CONFIG_UBIFS_ATIME_SUPPORT=y +CONFIG_UBIFS_FS_XATTR=y +CONFIG_UBIFS_FS_ENCRYPTION=y +CONFIG_UBIFS_FS_SECURITY=y +CONFIG_CRAMFS=m +CONFIG_CRAMFS_BLOCKDEV=y +# CONFIG_CRAMFS_MTD is not set +CONFIG_SQUASHFS=m +# CONFIG_SQUASHFS_FILE_CACHE is not set +CONFIG_SQUASHFS_FILE_DIRECT=y +# CONFIG_SQUASHFS_DECOMP_SINGLE is not set +# CONFIG_SQUASHFS_DECOMP_MULTI is not set +CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y +CONFIG_SQUASHFS_XATTR=y +CONFIG_SQUASHFS_ZLIB=y +CONFIG_SQUASHFS_LZ4=y +CONFIG_SQUASHFS_LZO=y +CONFIG_SQUASHFS_XZ=y +# CONFIG_SQUASHFS_ZSTD is not set +# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +CONFIG_VXFS_FS=m +CONFIG_MINIX_FS=m +CONFIG_OMFS_FS=m +CONFIG_HPFS_FS=m +CONFIG_QNX4FS_FS=m +CONFIG_QNX6FS_FS=m +# CONFIG_QNX6FS_DEBUG is not set +CONFIG_ROMFS_FS=m +CONFIG_ROMFS_BACKED_BY_BLOCK=y +# CONFIG_ROMFS_BACKED_BY_MTD is not set +# CONFIG_ROMFS_BACKED_BY_BOTH is not set +CONFIG_ROMFS_ON_BLOCK=y +CONFIG_PSTORE=y +CONFIG_PSTORE_DEFLATE_COMPRESS=m +# CONFIG_PSTORE_LZO_COMPRESS is not set +# CONFIG_PSTORE_LZ4_COMPRESS is not set +# CONFIG_PSTORE_LZ4HC_COMPRESS is not set +# CONFIG_PSTORE_842_COMPRESS is not set +# CONFIG_PSTORE_ZSTD_COMPRESS is not set +CONFIG_PSTORE_COMPRESS=y +CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y +CONFIG_PSTORE_COMPRESS_DEFAULT="deflate" +# CONFIG_PSTORE_CONSOLE is not set +# CONFIG_PSTORE_PMSG is not set +# CONFIG_PSTORE_FTRACE is not set +CONFIG_PSTORE_RAM=m +CONFIG_SYSV_FS=m +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG is not set +CONFIG_EXOFS_FS=m +# CONFIG_EXOFS_DEBUG is not set +CONFIG_ORE=m +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=m +CONFIG_NFS_V2=m +CONFIG_NFS_V3=m +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=m +CONFIG_NFS_SWAP=y +CONFIG_NFS_V4_1=y +CONFIG_NFS_V4_2=y +CONFIG_PNFS_FILE_LAYOUT=m +CONFIG_PNFS_BLOCK=m +CONFIG_PNFS_FLEXFILE_LAYOUT=m +CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" +CONFIG_NFS_V4_1_MIGRATION=y +CONFIG_NFS_V4_SECURITY_LABEL=y +CONFIG_NFS_FSCACHE=y +# CONFIG_NFS_USE_LEGACY_DNS is not set +CONFIG_NFS_USE_KERNEL_DNS=y +CONFIG_NFS_DEBUG=y +CONFIG_NFSD=m +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3=y +CONFIG_NFSD_V3_ACL=y +CONFIG_NFSD_V4=y +# CONFIG_NFSD_BLOCKLAYOUT is not set +# CONFIG_NFSD_SCSILAYOUT is not set +# CONFIG_NFSD_FLEXFILELAYOUT is not set +CONFIG_NFSD_V4_SECURITY_LABEL=y +# CONFIG_NFSD_FAULT_INJECTION is not set +CONFIG_GRACE_PERIOD=m +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_NFS_ACL_SUPPORT=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=m +CONFIG_SUNRPC_GSS=m +CONFIG_SUNRPC_BACKCHANNEL=y +CONFIG_SUNRPC_SWAP=y +CONFIG_RPCSEC_GSS_KRB5=m +CONFIG_SUNRPC_DEBUG=y +CONFIG_SUNRPC_XPRT_RDMA=m +CONFIG_CEPH_FS=m +CONFIG_CEPH_FSCACHE=y +CONFIG_CEPH_FS_POSIX_ACL=y +CONFIG_CIFS=m +# CONFIG_CIFS_STATS2 is not set +CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y +CONFIG_CIFS_WEAK_PW_HASH=y +CONFIG_CIFS_UPCALL=y +CONFIG_CIFS_XATTR=y +CONFIG_CIFS_POSIX=y +CONFIG_CIFS_ACL=y +CONFIG_CIFS_DEBUG=y +# CONFIG_CIFS_DEBUG2 is not set +# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set +CONFIG_CIFS_DFS_UPCALL=y +# CONFIG_CIFS_SMB_DIRECT is not set +CONFIG_CIFS_FSCACHE=y +CONFIG_CODA_FS=m +CONFIG_AFS_FS=m +# CONFIG_AFS_DEBUG is not set +CONFIG_AFS_FSCACHE=y +CONFIG_9P_FS=m +CONFIG_9P_FSCACHE=y +CONFIG_9P_FS_POSIX_ACL=y +CONFIG_9P_FS_SECURITY=y +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="utf8" +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=m +CONFIG_NLS_ISO8859_1=m +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_MAC_ROMAN=m +CONFIG_NLS_MAC_CELTIC=m +CONFIG_NLS_MAC_CENTEURO=m +CONFIG_NLS_MAC_CROATIAN=m +CONFIG_NLS_MAC_CYRILLIC=m +CONFIG_NLS_MAC_GAELIC=m +CONFIG_NLS_MAC_GREEK=m +CONFIG_NLS_MAC_ICELAND=m +CONFIG_NLS_MAC_INUIT=m +CONFIG_NLS_MAC_ROMANIAN=m +CONFIG_NLS_MAC_TURKISH=m +CONFIG_NLS_UTF8=m +CONFIG_DLM=m +# CONFIG_DLM_DEBUG is not set + +# +# Security options +# +CONFIG_KEYS=y +CONFIG_PERSISTENT_KEYRINGS=y +CONFIG_BIG_KEYS=y +CONFIG_TRUSTED_KEYS=y +CONFIG_ENCRYPTED_KEYS=y +CONFIG_KEY_DH_OPERATIONS=y +# CONFIG_SECURITY_DMESG_RESTRICT is not set +CONFIG_SECURITY=y +CONFIG_SECURITY_WRITABLE_HOOKS=y +CONFIG_SECURITYFS=y +CONFIG_SECURITY_NETWORK=y +CONFIG_PAGE_TABLE_ISOLATION=y +# CONFIG_SECURITY_INFINIBAND is not set +CONFIG_SECURITY_NETWORK_XFRM=y +CONFIG_SECURITY_PATH=y +CONFIG_INTEL_TXT=y +CONFIG_LSM_MMAP_MIN_ADDR=0 +CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y +CONFIG_HARDENED_USERCOPY=y +CONFIG_HARDENED_USERCOPY_FALLBACK=y +# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set +CONFIG_FORTIFY_SOURCE=y +# CONFIG_STATIC_USERMODEHELPER is not set +CONFIG_SECURITY_SELINUX=y +CONFIG_SECURITY_SELINUX_BOOTPARAM=y +CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 +CONFIG_SECURITY_SELINUX_DISABLE=y +CONFIG_SECURITY_SELINUX_DEVELOP=y +CONFIG_SECURITY_SELINUX_AVC_STATS=y +CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 +CONFIG_SECURITY_SMACK=y +# CONFIG_SECURITY_SMACK_BRINGUP is not set +CONFIG_SECURITY_SMACK_NETFILTER=y +# CONFIG_SECURITY_SMACK_APPEND_SIGNALS is not set +CONFIG_SECURITY_TOMOYO=y +CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048 +CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024 +# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set +CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init" +CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init" +CONFIG_SECURITY_APPARMOR=y +CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1 +CONFIG_SECURITY_APPARMOR_HASH=y +CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y +# CONFIG_SECURITY_APPARMOR_DEBUG is not set +# CONFIG_SECURITY_LOADPIN is not set +CONFIG_SECURITY_YAMA=y +CONFIG_INTEGRITY=y +CONFIG_INTEGRITY_SIGNATURE=y +CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y +CONFIG_INTEGRITY_TRUSTED_KEYRING=y +CONFIG_INTEGRITY_AUDIT=y +CONFIG_IMA=y +CONFIG_IMA_MEASURE_PCR_IDX=10 +CONFIG_IMA_LSM_RULES=y +# CONFIG_IMA_TEMPLATE is not set +CONFIG_IMA_NG_TEMPLATE=y +# CONFIG_IMA_SIG_TEMPLATE is not set +CONFIG_IMA_DEFAULT_TEMPLATE="ima-ng" +CONFIG_IMA_DEFAULT_HASH_SHA1=y +# CONFIG_IMA_DEFAULT_HASH_SHA256 is not set +CONFIG_IMA_DEFAULT_HASH="sha1" +# CONFIG_IMA_WRITE_POLICY is not set +# CONFIG_IMA_READ_POLICY is not set +CONFIG_IMA_APPRAISE=y +# CONFIG_IMA_APPRAISE_BUILD_POLICY is not set +CONFIG_IMA_APPRAISE_BOOTPARAM=y +CONFIG_IMA_TRUSTED_KEYRING=y +CONFIG_IMA_BLACKLIST_KEYRING=y +# CONFIG_IMA_LOAD_X509 is not set +CONFIG_EVM=y +CONFIG_EVM_ATTR_FSUUID=y +CONFIG_EVM_EXTRA_SMACK_XATTRS=y +# CONFIG_EVM_ADD_XATTRS is not set +# CONFIG_EVM_LOAD_X509 is not set +# CONFIG_DEFAULT_SECURITY_SELINUX is not set +# CONFIG_DEFAULT_SECURITY_SMACK is not set +# CONFIG_DEFAULT_SECURITY_TOMOYO is not set +CONFIG_DEFAULT_SECURITY_APPARMOR=y +# CONFIG_DEFAULT_SECURITY_DAC is not set +CONFIG_DEFAULT_SECURITY="apparmor" +CONFIG_XOR_BLOCKS=m +CONFIG_ASYNC_CORE=m +CONFIG_ASYNC_MEMCPY=m +CONFIG_ASYNC_XOR=m +CONFIG_ASYNC_PQ=m +CONFIG_ASYNC_RAID6_RECOV=m +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD=y +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_BLKCIPHER2=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG=y +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_RNG_DEFAULT=y +CONFIG_CRYPTO_AKCIPHER2=y +CONFIG_CRYPTO_AKCIPHER=y +CONFIG_CRYPTO_KPP2=y +CONFIG_CRYPTO_KPP=y +CONFIG_CRYPTO_ACOMP2=y +CONFIG_CRYPTO_RSA=y +CONFIG_CRYPTO_DH=y +CONFIG_CRYPTO_ECDH=m +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_USER=m +CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y +CONFIG_CRYPTO_GF128MUL=y +CONFIG_CRYPTO_NULL=y +CONFIG_CRYPTO_NULL2=y +CONFIG_CRYPTO_PCRYPT=m +CONFIG_CRYPTO_WORKQUEUE=y +CONFIG_CRYPTO_CRYPTD=m +CONFIG_CRYPTO_MCRYPTD=m +CONFIG_CRYPTO_AUTHENC=m +CONFIG_CRYPTO_TEST=m +CONFIG_CRYPTO_SIMD=m +CONFIG_CRYPTO_GLUE_HELPER_X86=m +CONFIG_CRYPTO_ENGINE=m + +# +# Authenticated Encryption with Associated Data +# +CONFIG_CRYPTO_CCM=m +CONFIG_CRYPTO_GCM=y +CONFIG_CRYPTO_CHACHA20POLY1305=m +CONFIG_CRYPTO_AEGIS128=m +CONFIG_CRYPTO_AEGIS128L=m +CONFIG_CRYPTO_AEGIS256=m +CONFIG_CRYPTO_MORUS640=m +CONFIG_CRYPTO_MORUS1280=m +CONFIG_CRYPTO_SEQIV=y +CONFIG_CRYPTO_ECHAINIV=m + +# +# Block modes +# +CONFIG_CRYPTO_CBC=y +CONFIG_CRYPTO_CFB=m +CONFIG_CRYPTO_CTR=y +CONFIG_CRYPTO_CTS=m +CONFIG_CRYPTO_ECB=y +CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_XTS=m +CONFIG_CRYPTO_KEYWRAP=m + +# +# Hash modes +# +CONFIG_CRYPTO_CMAC=m +CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_VMAC=m + +# +# Digest +# +CONFIG_CRYPTO_CRC32C=y +CONFIG_CRYPTO_CRC32C_INTEL=y +CONFIG_CRYPTO_CRC32=m +CONFIG_CRYPTO_CRC32_PCLMUL=m +CONFIG_CRYPTO_CRCT10DIF=y +CONFIG_CRYPTO_GHASH=y +CONFIG_CRYPTO_POLY1305=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_RMD128=m +CONFIG_CRYPTO_RMD160=m +CONFIG_CRYPTO_RMD256=m +CONFIG_CRYPTO_RMD320=m +CONFIG_CRYPTO_SHA1=y +CONFIG_CRYPTO_SHA256=y +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_SHA3=m +CONFIG_CRYPTO_SM3=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_WP512=m + +# +# Ciphers +# +CONFIG_CRYPTO_AES=y +CONFIG_CRYPTO_AES_TI=m +CONFIG_CRYPTO_AES_586=m +CONFIG_CRYPTO_AES_NI_INTEL=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_BLOWFISH_COMMON=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_CAST_COMMON=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_SALSA20=m +CONFIG_CRYPTO_CHACHA20=m +CONFIG_CRYPTO_SEED=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_SERPENT_SSE2_586=m +CONFIG_CRYPTO_SM4=m +CONFIG_CRYPTO_SPECK=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=m +CONFIG_CRYPTO_TWOFISH_586=m + +# +# Compression +# +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_LZO=y +CONFIG_CRYPTO_842=m +CONFIG_CRYPTO_LZ4=m +CONFIG_CRYPTO_LZ4HC=m +CONFIG_CRYPTO_ZSTD=m + +# +# Random Number Generation +# +CONFIG_CRYPTO_ANSI_CPRNG=m +CONFIG_CRYPTO_DRBG_MENU=y +CONFIG_CRYPTO_DRBG_HMAC=y +CONFIG_CRYPTO_DRBG_HASH=y +CONFIG_CRYPTO_DRBG_CTR=y +CONFIG_CRYPTO_DRBG=y +CONFIG_CRYPTO_JITTERENTROPY=y +CONFIG_CRYPTO_USER_API=m +CONFIG_CRYPTO_USER_API_HASH=m +CONFIG_CRYPTO_USER_API_SKCIPHER=m +CONFIG_CRYPTO_USER_API_RNG=m +CONFIG_CRYPTO_USER_API_AEAD=m +CONFIG_CRYPTO_HASH_INFO=y +CONFIG_CRYPTO_HW=y +CONFIG_CRYPTO_DEV_PADLOCK=y +CONFIG_CRYPTO_DEV_PADLOCK_AES=m +CONFIG_CRYPTO_DEV_PADLOCK_SHA=m +CONFIG_CRYPTO_DEV_GEODE=m +CONFIG_CRYPTO_DEV_CCP=y +CONFIG_CRYPTO_DEV_CCP_DD=m +CONFIG_CRYPTO_DEV_SP_CCP=y +CONFIG_CRYPTO_DEV_CCP_CRYPTO=m +CONFIG_CRYPTO_DEV_QAT=m +CONFIG_CRYPTO_DEV_QAT_DH895xCC=m +CONFIG_CRYPTO_DEV_QAT_C3XXX=m +CONFIG_CRYPTO_DEV_QAT_C62X=m +CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m +CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m +CONFIG_CRYPTO_DEV_QAT_C62XVF=m +CONFIG_CRYPTO_DEV_CHELSIO=m +# CONFIG_CHELSIO_IPSEC_INLINE is not set +# CONFIG_CRYPTO_DEV_CHELSIO_TLS is not set +CONFIG_CRYPTO_DEV_VIRTIO=m +CONFIG_ASYMMETRIC_KEY_TYPE=y +CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y +CONFIG_X509_CERTIFICATE_PARSER=y +CONFIG_PKCS7_MESSAGE_PARSER=y +# CONFIG_PKCS7_TEST_KEY is not set +# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set + +# +# Certificates for signature checking +# +CONFIG_SYSTEM_TRUSTED_KEYRING=y +CONFIG_SYSTEM_TRUSTED_KEYS="" +# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set +# CONFIG_SECONDARY_TRUSTED_KEYRING is not set +# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set +CONFIG_BINARY_PRINTF=y + +# +# Library routines +# +CONFIG_RAID6_PQ=m +CONFIG_BITREVERSE=y +CONFIG_RATIONAL=y +CONFIG_GENERIC_STRNCPY_FROM_USER=y +CONFIG_GENERIC_STRNLEN_USER=y +CONFIG_GENERIC_NET_UTILS=y +CONFIG_GENERIC_FIND_FIRST_BIT=y +CONFIG_GENERIC_PCI_IOMAP=y +CONFIG_GENERIC_IOMAP=y +CONFIG_ARCH_HAS_FAST_MULTIPLIER=y +CONFIG_CRC_CCITT=y +CONFIG_CRC16=y +CONFIG_CRC_T10DIF=y +CONFIG_CRC_ITU_T=m +CONFIG_CRC32=y +# CONFIG_CRC32_SELFTEST is not set +CONFIG_CRC32_SLICEBY8=y +# CONFIG_CRC32_SLICEBY4 is not set +# CONFIG_CRC32_SARWATE is not set +# CONFIG_CRC32_BIT is not set +CONFIG_CRC64=m +# CONFIG_CRC4 is not set +CONFIG_CRC7=m +CONFIG_LIBCRC32C=m +CONFIG_CRC8=m +CONFIG_XXHASH=m +CONFIG_AUDIT_GENERIC=y +# CONFIG_RANDOM32_SELFTEST is not set +CONFIG_842_COMPRESS=m +CONFIG_842_DECOMPRESS=m +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y +CONFIG_LZ4_COMPRESS=m +CONFIG_LZ4HC_COMPRESS=m +CONFIG_LZ4_DECOMPRESS=y +CONFIG_ZSTD_COMPRESS=m +CONFIG_ZSTD_DECOMPRESS=m +CONFIG_XZ_DEC=y +CONFIG_XZ_DEC_X86=y +CONFIG_XZ_DEC_POWERPC=y +CONFIG_XZ_DEC_IA64=y +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_ARMTHUMB=y +CONFIG_XZ_DEC_SPARC=y +CONFIG_XZ_DEC_BCJ=y +CONFIG_XZ_DEC_TEST=m +CONFIG_DECOMPRESS_GZIP=y +CONFIG_DECOMPRESS_BZIP2=y +CONFIG_DECOMPRESS_LZMA=y +CONFIG_DECOMPRESS_XZ=y +CONFIG_DECOMPRESS_LZO=y +CONFIG_DECOMPRESS_LZ4=y +CONFIG_GENERIC_ALLOCATOR=y +CONFIG_REED_SOLOMON=m +CONFIG_REED_SOLOMON_ENC8=y +CONFIG_REED_SOLOMON_DEC8=y +CONFIG_REED_SOLOMON_DEC16=y +CONFIG_BCH=m +CONFIG_BCH_CONST_PARAMS=y +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m +CONFIG_BTREE=y +CONFIG_INTERVAL_TREE=y +CONFIG_RADIX_TREE_MULTIORDER=y +CONFIG_ASSOCIATIVE_ARRAY=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT_MAP=y +CONFIG_HAS_DMA=y +CONFIG_NEED_SG_DMA_LENGTH=y +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_ARCH_DMA_ADDR_T_64BIT=y +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_DMA_DIRECT_OPS=y +CONFIG_DMA_VIRT_OPS=y +CONFIG_SWIOTLB=y +CONFIG_SGL_ALLOC=y +CONFIG_CHECK_SIGNATURE=y +CONFIG_CPU_RMAP=y +CONFIG_DQL=y +CONFIG_GLOB=y +# CONFIG_GLOB_SELFTEST is not set +CONFIG_NLATTR=y +CONFIG_LRU_CACHE=m +CONFIG_CLZ_TAB=y +CONFIG_CORDIC=m +CONFIG_DDR=y +CONFIG_IRQ_POLL=y +CONFIG_MPILIB=y +CONFIG_SIGNATURE=y +CONFIG_OID_REGISTRY=y +CONFIG_UCS2_STRING=y +CONFIG_FONT_SUPPORT=y +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +CONFIG_SG_POOL=y +CONFIG_ARCH_HAS_SG_CHAIN=y +CONFIG_SBITMAP=y +CONFIG_PARMAN=m +# CONFIG_STRING_SELFTEST is not set + +# +# Kernel hacking +# + +# +# printk and dmesg options +# +CONFIG_PRINTK_TIME=y +CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 +CONFIG_CONSOLE_LOGLEVEL_QUIET=4 +CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 +CONFIG_BOOT_PRINTK_DELAY=y +CONFIG_DYNAMIC_DEBUG=y + +# +# Compile-time checks and compiler options +# +# CONFIG_DEBUG_INFO is not set +# CONFIG_ENABLE_MUST_CHECK is not set +CONFIG_FRAME_WARN=1024 +# CONFIG_STRIP_ASM_SYMS is not set +# CONFIG_READABLE_ASM is not set +CONFIG_UNUSED_SYMBOLS=y +# CONFIG_PAGE_OWNER is not set +CONFIG_DEBUG_FS=y +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_SECTION_MISMATCH is not set +CONFIG_SECTION_MISMATCH_WARN_ONLY=y +CONFIG_FRAME_POINTER=y +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +CONFIG_MAGIC_SYSRQ=y +CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1 +CONFIG_MAGIC_SYSRQ_SERIAL=y +CONFIG_DEBUG_KERNEL=y + +# +# Memory Debugging +# +CONFIG_PAGE_EXTENSION=y +# CONFIG_DEBUG_PAGEALLOC is not set +# CONFIG_PAGE_POISONING is not set +# CONFIG_DEBUG_PAGE_REF is not set +# CONFIG_DEBUG_RODATA_TEST is not set +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_SLUB_DEBUG_ON is not set +# CONFIG_SLUB_STATS is not set +CONFIG_HAVE_DEBUG_KMEMLEAK=y +# CONFIG_DEBUG_KMEMLEAK is not set +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_DEBUG_VM is not set +CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y +# CONFIG_DEBUG_VIRTUAL is not set +# CONFIG_DEBUG_MEMORY_INIT is not set +CONFIG_MEMORY_NOTIFIER_ERROR_INJECT=m +# CONFIG_DEBUG_PER_CPU_MAPS is not set +# CONFIG_DEBUG_HIGHMEM is not set +CONFIG_HAVE_DEBUG_STACKOVERFLOW=y +# CONFIG_DEBUG_STACKOVERFLOW is not set +CONFIG_CC_HAS_SANCOV_TRACE_PC=y +# CONFIG_DEBUG_SHIRQ is not set + +# +# Debug Lockups and Hangs +# +CONFIG_LOCKUP_DETECTOR=y +CONFIG_SOFTLOCKUP_DETECTOR=y +# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 +CONFIG_HARDLOCKUP_DETECTOR_PERF=y +CONFIG_HARDLOCKUP_DETECTOR=y +# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set +CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0 +CONFIG_DETECT_HUNG_TASK=y +CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 +# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 +# CONFIG_WQ_WATCHDOG is not set +# CONFIG_PANIC_ON_OOPS is not set +CONFIG_PANIC_ON_OOPS_VALUE=0 +CONFIG_PANIC_TIMEOUT=0 +CONFIG_SCHED_DEBUG=y +CONFIG_SCHED_INFO=y +CONFIG_SCHEDSTATS=y +CONFIG_SCHED_STACK_END_CHECK=y +# CONFIG_DEBUG_TIMEKEEPING is not set + +# +# Lock Debugging (spinlocks, mutexes, etc...) +# +CONFIG_LOCK_DEBUGGING_SUPPORT=y +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set +# CONFIG_DEBUG_RWSEMS is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_DEBUG_ATOMIC_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +CONFIG_LOCK_TORTURE_TEST=m +CONFIG_WW_MUTEX_SELFTEST=m +CONFIG_STACKTRACE=y +# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set +# CONFIG_DEBUG_KOBJECT is not set +CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_LIST is not set +# CONFIG_DEBUG_PI_LIST is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +# CONFIG_DEBUG_CREDENTIALS is not set + +# +# RCU Debugging +# +CONFIG_TORTURE_TEST=m +# CONFIG_RCU_PERF_TEST is not set +# CONFIG_RCU_TORTURE_TEST is not set +CONFIG_RCU_CPU_STALL_TIMEOUT=60 +# CONFIG_RCU_TRACE is not set +# CONFIG_RCU_EQS_DEBUG is not set +# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set +CONFIG_NOTIFIER_ERROR_INJECTION=m +CONFIG_PM_NOTIFIER_ERROR_INJECT=m +CONFIG_NETDEV_NOTIFIER_ERROR_INJECT=m +CONFIG_FUNCTION_ERROR_INJECTION=y +# CONFIG_FAULT_INJECTION is not set +# CONFIG_LATENCYTOP is not set +CONFIG_USER_STACKTRACE_SUPPORT=y +CONFIG_NOP_TRACER=y +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_HAVE_FENTRY=y +CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_TRACER_MAX_TRACE=y +CONFIG_TRACE_CLOCK=y +CONFIG_RING_BUFFER=y +CONFIG_EVENT_TRACING=y +CONFIG_CONTEXT_SWITCH_TRACER=y +CONFIG_RING_BUFFER_ALLOW_SWAP=y +CONFIG_TRACING=y +CONFIG_GENERIC_TRACER=y +CONFIG_TRACING_SUPPORT=y +CONFIG_FTRACE=y +CONFIG_FUNCTION_TRACER=y +CONFIG_FUNCTION_GRAPH_TRACER=y +# CONFIG_PREEMPTIRQ_EVENTS is not set +# CONFIG_IRQSOFF_TRACER is not set +CONFIG_SCHED_TRACER=y +# CONFIG_HWLAT_TRACER is not set +CONFIG_FTRACE_SYSCALLS=y +CONFIG_TRACER_SNAPSHOT=y +# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set +CONFIG_BRANCH_PROFILE_NONE=y +# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set +CONFIG_STACK_TRACER=y +CONFIG_BLK_DEV_IO_TRACE=y +CONFIG_KPROBE_EVENTS=y +# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set +# CONFIG_UPROBE_EVENTS is not set +CONFIG_BPF_EVENTS=y +CONFIG_PROBE_EVENTS=y +CONFIG_DYNAMIC_FTRACE=y +CONFIG_DYNAMIC_FTRACE_WITH_REGS=y +CONFIG_FUNCTION_PROFILER=y +# CONFIG_BPF_KPROBE_OVERRIDE is not set +CONFIG_FTRACE_MCOUNT_RECORD=y +# CONFIG_FTRACE_STARTUP_TEST is not set +CONFIG_MMIOTRACE=y +# CONFIG_HIST_TRIGGERS is not set +# CONFIG_MMIOTRACE_TEST is not set +# CONFIG_TRACEPOINT_BENCHMARK is not set +# CONFIG_RING_BUFFER_BENCHMARK is not set +# CONFIG_RING_BUFFER_STARTUP_TEST is not set +# CONFIG_PREEMPTIRQ_DELAY_TEST is not set +# CONFIG_TRACE_EVAL_MAP_FILE is not set +CONFIG_TRACING_EVENTS_GPIO=y +# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set +# CONFIG_DMA_API_DEBUG is not set +CONFIG_RUNTIME_TESTING_MENU=y +# CONFIG_LKDTM is not set +# CONFIG_TEST_LIST_SORT is not set +# CONFIG_TEST_SORT is not set +# CONFIG_KPROBES_SANITY_TEST is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +CONFIG_RBTREE_TEST=m +CONFIG_INTERVAL_TREE_TEST=m +CONFIG_PERCPU_TEST=m +# CONFIG_ATOMIC64_SELFTEST is not set +CONFIG_ASYNC_RAID6_TEST=m +CONFIG_TEST_HEXDUMP=m +CONFIG_TEST_STRING_HELPERS=m +CONFIG_TEST_KSTRTOX=m +CONFIG_TEST_PRINTF=m +CONFIG_TEST_BITMAP=m +CONFIG_TEST_BITFIELD=m +CONFIG_TEST_UUID=m +CONFIG_TEST_OVERFLOW=m +# CONFIG_TEST_RHASHTABLE is not set +CONFIG_TEST_HASH=m +CONFIG_TEST_IDA=m +CONFIG_TEST_PARMAN=m +CONFIG_TEST_LKM=m +CONFIG_TEST_USER_COPY=m +CONFIG_TEST_BPF=m +CONFIG_FIND_BIT_BENCHMARK=m +CONFIG_TEST_FIRMWARE=m +# CONFIG_TEST_SYSCTL is not set +CONFIG_TEST_UDELAY=m +CONFIG_TEST_STATIC_KEYS=m +# CONFIG_TEST_KMOD is not set +CONFIG_MEMTEST=y +# CONFIG_BUG_ON_DATA_CORRUPTION is not set +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +CONFIG_KGDB=y +CONFIG_KGDB_SERIAL_CONSOLE=y +# CONFIG_KGDB_TESTS is not set +CONFIG_KGDB_LOW_LEVEL_TRAP=y +CONFIG_KGDB_KDB=y +CONFIG_KDB_DEFAULT_ENABLE=0x1 +CONFIG_KDB_KEYBOARD=y +CONFIG_KDB_CONTINUE_CATASTROPHIC=0 +CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y +# CONFIG_UBSAN is not set +CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y +CONFIG_STRICT_DEVMEM=y +CONFIG_IO_STRICT_DEVMEM=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_EARLY_PRINTK_USB=y +# CONFIG_X86_VERBOSE_BOOTUP is not set +CONFIG_EARLY_PRINTK=y +CONFIG_EARLY_PRINTK_DBGP=y +CONFIG_EARLY_PRINTK_EFI=y +# CONFIG_EARLY_PRINTK_USB_XDBC is not set +# CONFIG_X86_PTDUMP is not set +# CONFIG_EFI_PGT_DUMP is not set +# CONFIG_DEBUG_WX is not set +CONFIG_DOUBLEFAULT=y +# CONFIG_DEBUG_TLBFLUSH is not set +CONFIG_HAVE_MMIOTRACE_SUPPORT=y +# CONFIG_X86_DECODER_SELFTEST is not set +CONFIG_IO_DELAY_TYPE_0X80=0 +CONFIG_IO_DELAY_TYPE_0XED=1 +CONFIG_IO_DELAY_TYPE_UDELAY=2 +CONFIG_IO_DELAY_TYPE_NONE=3 +# CONFIG_IO_DELAY_0X80 is not set +CONFIG_IO_DELAY_0XED=y +# CONFIG_IO_DELAY_UDELAY is not set +# CONFIG_IO_DELAY_NONE is not set +CONFIG_DEFAULT_IO_DELAY_TYPE=1 +# CONFIG_DEBUG_BOOT_PARAMS is not set +# CONFIG_CPA_DEBUG is not set +CONFIG_OPTIMIZE_INLINING=y +# CONFIG_DEBUG_ENTRY is not set +# CONFIG_DEBUG_NMI_SELFTEST is not set +CONFIG_X86_DEBUG_FPU=y +CONFIG_PUNIT_ATOM_DEBUG=m +CONFIG_UNWINDER_FRAME_POINTER=y +# CONFIG_UNWINDER_GUESS is not set diff --git a/gnu/packages/aux-files/linux-libre/4.19-x86_64.conf b/gnu/packages/aux-files/linux-libre/4.19-x86_64.conf new file mode 100644 index 0000000000..0e102c87de --- /dev/null +++ b/gnu/packages/aux-files/linux-libre/4.19-x86_64.conf @@ -0,0 +1,9591 @@ +# +# Automatically generated file; DO NOT EDIT. +# Linux/x86 4.19.0-gnu Kernel Configuration +# + +# +# Compiler: gcc (GCC) 7.3.0 +# +CONFIG_CC_IS_GCC=y +CONFIG_GCC_VERSION=70300 +CONFIG_CLANG_VERSION=0 +CONFIG_IRQ_WORK=y +CONFIG_BUILDTIME_EXTABLE_SORT=y +CONFIG_THREAD_INFO_IN_TASK=y + +# +# General setup +# +CONFIG_INIT_ENV_ARG_LIMIT=32 +# CONFIG_COMPILE_TEST is not set +CONFIG_LOCALVERSION="" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_BUILD_SALT="" +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_BZIP2=y +CONFIG_HAVE_KERNEL_LZMA=y +CONFIG_HAVE_KERNEL_XZ=y +CONFIG_HAVE_KERNEL_LZO=y +CONFIG_HAVE_KERNEL_LZ4=y +CONFIG_KERNEL_GZIP=y +# CONFIG_KERNEL_BZIP2 is not set +# CONFIG_KERNEL_LZMA is not set +# CONFIG_KERNEL_XZ is not set +# CONFIG_KERNEL_LZO is not set +# CONFIG_KERNEL_LZ4 is not set +CONFIG_DEFAULT_HOSTNAME="(none)" +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +CONFIG_POSIX_MQUEUE_SYSCTL=y +CONFIG_CROSS_MEMORY_ATTACH=y +CONFIG_USELIB=y +CONFIG_AUDIT=y +CONFIG_HAVE_ARCH_AUDITSYSCALL=y +CONFIG_AUDITSYSCALL=y +CONFIG_AUDIT_WATCH=y +CONFIG_AUDIT_TREE=y + +# +# IRQ subsystem +# +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y +CONFIG_GENERIC_PENDING_IRQ=y +CONFIG_GENERIC_IRQ_MIGRATION=y +CONFIG_GENERIC_IRQ_CHIP=y +CONFIG_IRQ_DOMAIN=y +CONFIG_IRQ_DOMAIN_HIERARCHY=y +CONFIG_GENERIC_MSI_IRQ=y +CONFIG_GENERIC_MSI_IRQ_DOMAIN=y +CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y +CONFIG_GENERIC_IRQ_RESERVATION_MODE=y +CONFIG_IRQ_FORCED_THREADING=y +CONFIG_SPARSE_IRQ=y +# CONFIG_GENERIC_IRQ_DEBUGFS is not set +CONFIG_CLOCKSOURCE_WATCHDOG=y +CONFIG_ARCH_CLOCKSOURCE_DATA=y +CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y +CONFIG_GENERIC_TIME_VSYSCALL=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y +CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y +CONFIG_GENERIC_CMOS_UPDATE=y + +# +# Timers subsystem +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ_COMMON=y +# CONFIG_HZ_PERIODIC is not set +CONFIG_NO_HZ_IDLE=y +# CONFIG_NO_HZ_FULL is not set +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +# CONFIG_PREEMPT_NONE is not set +CONFIG_PREEMPT_VOLUNTARY=y +# CONFIG_PREEMPT is not set + +# +# CPU/Task time and stats accounting +# +CONFIG_TICK_CPU_ACCOUNTING=y +# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set +# CONFIG_IRQ_TIME_ACCOUNTING is not set +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_BSD_PROCESS_ACCT_V3=y +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y +CONFIG_CPU_ISOLATION=y + +# +# RCU Subsystem +# +CONFIG_TREE_RCU=y +# CONFIG_RCU_EXPERT is not set +CONFIG_SRCU=y +CONFIG_TREE_SRCU=y +CONFIG_RCU_STALL_COMMON=y +CONFIG_RCU_NEED_SEGCBLIST=y +CONFIG_BUILD_BIN2C=y +# CONFIG_IKCONFIG is not set +CONFIG_LOG_BUF_SHIFT=18 +CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 +CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13 +CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y +CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y +CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y +CONFIG_ARCH_SUPPORTS_INT128=y +CONFIG_NUMA_BALANCING=y +CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y +CONFIG_CGROUPS=y +CONFIG_PAGE_COUNTER=y +CONFIG_MEMCG=y +CONFIG_MEMCG_SWAP=y +# CONFIG_MEMCG_SWAP_ENABLED is not set +CONFIG_MEMCG_KMEM=y +CONFIG_BLK_CGROUP=y +# CONFIG_DEBUG_BLK_CGROUP is not set +CONFIG_CGROUP_WRITEBACK=y +CONFIG_CGROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +CONFIG_CFS_BANDWIDTH=y +# CONFIG_RT_GROUP_SCHED is not set +CONFIG_CGROUP_PIDS=y +# CONFIG_CGROUP_RDMA is not set +CONFIG_CGROUP_FREEZER=y +CONFIG_CGROUP_HUGETLB=y +CONFIG_CPUSETS=y +CONFIG_PROC_PID_CPUSET=y +CONFIG_CGROUP_DEVICE=y +CONFIG_CGROUP_CPUACCT=y +CONFIG_CGROUP_PERF=y +CONFIG_CGROUP_BPF=y +# CONFIG_CGROUP_DEBUG is not set +CONFIG_SOCK_CGROUP_DATA=y +CONFIG_NAMESPACES=y +CONFIG_UTS_NS=y +CONFIG_IPC_NS=y +CONFIG_USER_NS=y +CONFIG_PID_NS=y +CONFIG_NET_NS=y +CONFIG_CHECKPOINT_RESTORE=y +CONFIG_SCHED_AUTOGROUP=y +# CONFIG_SYSFS_DEPRECATED is not set +CONFIG_RELAY=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +CONFIG_RD_BZIP2=y +CONFIG_RD_LZMA=y +CONFIG_RD_XZ=y +CONFIG_RD_LZO=y +CONFIG_RD_LZ4=y +CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +CONFIG_HAVE_UID16=y +CONFIG_SYSCTL_EXCEPTION_TRACE=y +CONFIG_HAVE_PCSPKR_PLATFORM=y +CONFIG_BPF=y +CONFIG_EXPERT=y +CONFIG_UID16=y +CONFIG_MULTIUSER=y +CONFIG_SGETMASK_SYSCALL=y +CONFIG_SYSFS_SYSCALL=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_FHANDLE=y +CONFIG_POSIX_TIMERS=y +CONFIG_PRINTK=y +CONFIG_PRINTK_NMI=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_PCSPKR_PLATFORM=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_FUTEX_PI=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +CONFIG_ADVISE_SYSCALLS=y +CONFIG_MEMBARRIER=y +CONFIG_KALLSYMS=y +CONFIG_KALLSYMS_ALL=y +CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y +CONFIG_KALLSYMS_BASE_RELATIVE=y +CONFIG_BPF_SYSCALL=y +CONFIG_USERFAULTFD=y +CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y +CONFIG_RSEQ=y +# CONFIG_DEBUG_RSEQ is not set +# CONFIG_EMBEDDED is not set +CONFIG_HAVE_PERF_EVENTS=y +# CONFIG_PC104 is not set + +# +# Kernel Performance Events And Counters +# +CONFIG_PERF_EVENTS=y +# CONFIG_DEBUG_PERF_USE_VMALLOC is not set +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_SLUB_DEBUG=y +# CONFIG_SLUB_MEMCG_SYSFS_ON is not set +# CONFIG_COMPAT_BRK is not set +# CONFIG_SLAB is not set +CONFIG_SLUB=y +# CONFIG_SLOB is not set +CONFIG_SLAB_MERGE_DEFAULT=y +CONFIG_SLAB_FREELIST_RANDOM=y +CONFIG_SLAB_FREELIST_HARDENED=y +CONFIG_SLUB_CPU_PARTIAL=y +CONFIG_SYSTEM_DATA_VERIFICATION=y +CONFIG_PROFILING=y +CONFIG_TRACEPOINTS=y +CONFIG_64BIT=y +CONFIG_X86_64=y +CONFIG_X86=y +CONFIG_INSTRUCTION_DECODER=y +CONFIG_OUTPUT_FORMAT="elf64-x86-64" +CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig" +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_MMU=y +CONFIG_ARCH_MMAP_RND_BITS_MIN=28 +CONFIG_ARCH_MMAP_RND_BITS_MAX=32 +CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8 +CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16 +CONFIG_GENERIC_ISA_DMA=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ARCH_HAS_CPU_RELAX=y +CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y +CONFIG_ARCH_HAS_FILTER_PGPROT=y +CONFIG_HAVE_SETUP_PER_CPU_AREA=y +CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y +CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y +CONFIG_ARCH_WANT_GENERAL_HUGETLB=y +CONFIG_ZONE_DMA32=y +CONFIG_AUDIT_ARCH=y +CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y +CONFIG_HAVE_INTEL_TXT=y +CONFIG_X86_64_SMP=y +CONFIG_ARCH_SUPPORTS_UPROBES=y +CONFIG_FIX_EARLYCON_MEM=y +CONFIG_PGTABLE_LEVELS=4 +CONFIG_CC_HAS_SANE_STACKPROTECTOR=y + +# +# Processor type and features +# +# CONFIG_ZONE_DMA is not set +CONFIG_SMP=y +CONFIG_X86_FEATURE_NAMES=y +CONFIG_X86_X2APIC=y +CONFIG_X86_MPPARSE=y +# CONFIG_GOLDFISH is not set +CONFIG_RETPOLINE=y +# CONFIG_INTEL_RDT is not set +CONFIG_X86_EXTENDED_PLATFORM=y +CONFIG_X86_NUMACHIP=y +# CONFIG_X86_VSMP is not set +# CONFIG_X86_UV is not set +# CONFIG_X86_GOLDFISH is not set +# CONFIG_X86_INTEL_MID is not set +CONFIG_X86_INTEL_LPSS=y +CONFIG_X86_AMD_PLATFORM_DEVICE=y +CONFIG_IOSF_MBI=y +CONFIG_IOSF_MBI_DEBUG=y +CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y +CONFIG_SCHED_OMIT_FRAME_POINTER=y +CONFIG_HYPERVISOR_GUEST=y +CONFIG_PARAVIRT=y +# CONFIG_PARAVIRT_DEBUG is not set +CONFIG_PARAVIRT_SPINLOCKS=y +# CONFIG_QUEUED_LOCK_STAT is not set +CONFIG_XEN=y +CONFIG_XEN_PV=y +CONFIG_XEN_PV_SMP=y +CONFIG_XEN_DOM0=y +CONFIG_XEN_PVHVM=y +CONFIG_XEN_PVHVM_SMP=y +CONFIG_XEN_512GB=y +CONFIG_XEN_SAVE_RESTORE=y +# CONFIG_XEN_DEBUG_FS is not set +CONFIG_XEN_PVH=y +CONFIG_KVM_GUEST=y +CONFIG_KVM_DEBUG_FS=y +# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set +CONFIG_PARAVIRT_CLOCK=y +CONFIG_JAILHOUSE_GUEST=y +CONFIG_NO_BOOTMEM=y +# CONFIG_MK8 is not set +# CONFIG_MPSC is not set +# CONFIG_MCORE2 is not set +# CONFIG_MATOM is not set +CONFIG_GENERIC_CPU=y +CONFIG_X86_INTERNODE_CACHE_SHIFT=6 +CONFIG_X86_L1_CACHE_SHIFT=6 +CONFIG_X86_TSC=y +CONFIG_X86_CMPXCHG64=y +CONFIG_X86_CMOV=y +CONFIG_X86_MINIMUM_CPU_FAMILY=64 +CONFIG_X86_DEBUGCTLMSR=y +CONFIG_PROCESSOR_SELECT=y +CONFIG_CPU_SUP_INTEL=y +CONFIG_CPU_SUP_AMD=y +CONFIG_CPU_SUP_CENTAUR=y +CONFIG_HPET_TIMER=y +CONFIG_HPET_EMULATE_RTC=y +CONFIG_DMI=y +CONFIG_GART_IOMMU=y +CONFIG_CALGARY_IOMMU=y +CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y +# CONFIG_MAXSMP is not set +CONFIG_NR_CPUS_RANGE_BEGIN=2 +CONFIG_NR_CPUS_RANGE_END=512 +CONFIG_NR_CPUS_DEFAULT=64 +CONFIG_NR_CPUS=256 +CONFIG_SCHED_SMT=y +CONFIG_SCHED_MC=y +CONFIG_SCHED_MC_PRIO=y +CONFIG_X86_LOCAL_APIC=y +CONFIG_X86_IO_APIC=y +CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y +CONFIG_X86_MCE=y +# CONFIG_X86_MCELOG_LEGACY is not set +CONFIG_X86_MCE_INTEL=y +CONFIG_X86_MCE_AMD=y +CONFIG_X86_MCE_THRESHOLD=y +# CONFIG_X86_MCE_INJECT is not set +CONFIG_X86_THERMAL_VECTOR=y + +# +# Performance monitoring +# +CONFIG_PERF_EVENTS_INTEL_UNCORE=y +CONFIG_PERF_EVENTS_INTEL_RAPL=y +CONFIG_PERF_EVENTS_INTEL_CSTATE=y +CONFIG_PERF_EVENTS_AMD_POWER=m +CONFIG_X86_16BIT=y +CONFIG_X86_ESPFIX64=y +CONFIG_X86_VSYSCALL_EMULATION=y +CONFIG_I8K=m +CONFIG_MICROCODE=y +CONFIG_MICROCODE_INTEL=y +CONFIG_MICROCODE_AMD=y +CONFIG_MICROCODE_OLD_INTERFACE=y +CONFIG_X86_MSR=m +CONFIG_X86_CPUID=m +# CONFIG_X86_5LEVEL is not set +CONFIG_X86_DIRECT_GBPAGES=y +CONFIG_ARCH_HAS_MEM_ENCRYPT=y +# CONFIG_AMD_MEM_ENCRYPT is not set +CONFIG_NUMA=y +CONFIG_AMD_NUMA=y +CONFIG_X86_64_ACPI_NUMA=y +CONFIG_NODES_SPAN_OTHER_NODES=y +# CONFIG_NUMA_EMU is not set +CONFIG_NODES_SHIFT=6 +CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_ARCH_SPARSEMEM_DEFAULT=y +CONFIG_ARCH_SELECT_MEMORY_MODEL=y +CONFIG_ARCH_MEMORY_PROBE=y +CONFIG_ARCH_PROC_KCORE_TEXT=y +CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 +CONFIG_X86_PMEM_LEGACY_DEVICE=y +CONFIG_X86_PMEM_LEGACY=y +CONFIG_X86_CHECK_BIOS_CORRUPTION=y +CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y +CONFIG_X86_RESERVE_LOW=64 +CONFIG_MTRR=y +CONFIG_MTRR_SANITIZER=y +CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1 +CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 +CONFIG_X86_PAT=y +CONFIG_ARCH_USES_PG_UNCACHED=y +CONFIG_ARCH_RANDOM=y +CONFIG_X86_SMAP=y +CONFIG_X86_INTEL_UMIP=y +CONFIG_X86_INTEL_MPX=y +CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y +CONFIG_EFI=y +CONFIG_EFI_STUB=y +CONFIG_EFI_MIXED=y +CONFIG_SECCOMP=y +# CONFIG_HZ_100 is not set +CONFIG_HZ_250=y +# CONFIG_HZ_300 is not set +# CONFIG_HZ_1000 is not set +CONFIG_HZ=250 +CONFIG_SCHED_HRTICK=y +CONFIG_KEXEC=y +CONFIG_KEXEC_FILE=y +CONFIG_ARCH_HAS_KEXEC_PURGATORY=y +CONFIG_KEXEC_VERIFY_SIG=y +CONFIG_CRASH_DUMP=y +CONFIG_KEXEC_JUMP=y +CONFIG_PHYSICAL_START=0x1000000 +CONFIG_RELOCATABLE=y +CONFIG_RANDOMIZE_BASE=y +CONFIG_X86_NEED_RELOCS=y +CONFIG_PHYSICAL_ALIGN=0x1000000 +CONFIG_DYNAMIC_MEMORY_LAYOUT=y +CONFIG_RANDOMIZE_MEMORY=y +CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa +CONFIG_HOTPLUG_CPU=y +# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set +# CONFIG_DEBUG_HOTPLUG_CPU0 is not set +# CONFIG_COMPAT_VDSO is not set +CONFIG_LEGACY_VSYSCALL_EMULATE=y +# CONFIG_LEGACY_VSYSCALL_NONE is not set +# CONFIG_CMDLINE_BOOL is not set +CONFIG_MODIFY_LDT_SYSCALL=y +CONFIG_HAVE_LIVEPATCH=y +CONFIG_LIVEPATCH=y +CONFIG_ARCH_HAS_ADD_PAGES=y +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y +CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y +CONFIG_USE_PERCPU_NUMA_NODE_ID=y +CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y +CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y +CONFIG_ARCH_ENABLE_THP_MIGRATION=y + +# +# Power management and ACPI options +# +CONFIG_ARCH_HIBERNATION_HEADER=y +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +# CONFIG_SUSPEND_SKIP_SYNC is not set +CONFIG_HIBERNATE_CALLBACKS=y +CONFIG_HIBERNATION=y +CONFIG_PM_STD_PARTITION="" +CONFIG_PM_SLEEP=y +CONFIG_PM_SLEEP_SMP=y +# CONFIG_PM_AUTOSLEEP is not set +CONFIG_PM_WAKELOCKS=y +CONFIG_PM_WAKELOCKS_LIMIT=100 +CONFIG_PM_WAKELOCKS_GC=y +CONFIG_PM=y +CONFIG_PM_DEBUG=y +CONFIG_PM_ADVANCED_DEBUG=y +# CONFIG_PM_TEST_SUSPEND is not set +CONFIG_PM_SLEEP_DEBUG=y +# CONFIG_DPM_WATCHDOG is not set +CONFIG_PM_TRACE=y +CONFIG_PM_TRACE_RTC=y +CONFIG_PM_CLK=y +CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y +CONFIG_ARCH_SUPPORTS_ACPI=y +CONFIG_ACPI=y +CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y +CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y +CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y +# CONFIG_ACPI_DEBUGGER is not set +CONFIG_ACPI_SPCR_TABLE=y +CONFIG_ACPI_LPIT=y +CONFIG_ACPI_SLEEP=y +# CONFIG_ACPI_PROCFS_POWER is not set +CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y +CONFIG_ACPI_EC_DEBUGFS=m +CONFIG_ACPI_AC=y +CONFIG_ACPI_BATTERY=y +CONFIG_ACPI_BUTTON=y +CONFIG_ACPI_VIDEO=m +CONFIG_ACPI_FAN=y +CONFIG_ACPI_TAD=m +CONFIG_ACPI_DOCK=y +CONFIG_ACPI_CPU_FREQ_PSS=y +CONFIG_ACPI_PROCESSOR_CSTATE=y +CONFIG_ACPI_PROCESSOR_IDLE=y +CONFIG_ACPI_CPPC_LIB=y +CONFIG_ACPI_PROCESSOR=y +CONFIG_ACPI_IPMI=m +CONFIG_ACPI_HOTPLUG_CPU=y +CONFIG_ACPI_PROCESSOR_AGGREGATOR=m +CONFIG_ACPI_THERMAL=y +CONFIG_ACPI_NUMA=y +CONFIG_ACPI_CUSTOM_DSDT_FILE="" +CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y +CONFIG_ACPI_TABLE_UPGRADE=y +# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_PCI_SLOT=y +CONFIG_ACPI_CONTAINER=y +CONFIG_ACPI_HOTPLUG_MEMORY=y +CONFIG_ACPI_HOTPLUG_IOAPIC=y +CONFIG_ACPI_SBS=m +CONFIG_ACPI_HED=y +# CONFIG_ACPI_CUSTOM_METHOD is not set +CONFIG_ACPI_BGRT=y +# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set +CONFIG_ACPI_NFIT=m +CONFIG_HAVE_ACPI_APEI=y +CONFIG_HAVE_ACPI_APEI_NMI=y +CONFIG_ACPI_APEI=y +CONFIG_ACPI_APEI_GHES=y +CONFIG_ACPI_APEI_PCIEAER=y +CONFIG_ACPI_APEI_MEMORY_FAILURE=y +CONFIG_ACPI_APEI_EINJ=m +# CONFIG_ACPI_APEI_ERST_DEBUG is not set +CONFIG_DPTF_POWER=m +CONFIG_ACPI_WATCHDOG=y +CONFIG_ACPI_EXTLOG=m +# CONFIG_PMIC_OPREGION is not set +CONFIG_ACPI_CONFIGFS=m +CONFIG_X86_PM_TIMER=y +CONFIG_SFI=y + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_GOV_ATTR_SET=y +CONFIG_CPU_FREQ_GOV_COMMON=y +CONFIG_CPU_FREQ_STAT=y +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=y +CONFIG_CPU_FREQ_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y + +# +# CPU frequency scaling drivers +# +CONFIG_X86_INTEL_PSTATE=y +CONFIG_X86_PCC_CPUFREQ=y +CONFIG_X86_ACPI_CPUFREQ=y +CONFIG_X86_ACPI_CPUFREQ_CPB=y +CONFIG_X86_POWERNOW_K8=y +CONFIG_X86_AMD_FREQ_SENSITIVITY=m +CONFIG_X86_SPEEDSTEP_CENTRINO=y +CONFIG_X86_P4_CLOCKMOD=m + +# +# shared options +# +CONFIG_X86_SPEEDSTEP_LIB=m + +# +# CPU Idle +# +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_IDLE_GOV_MENU=y +CONFIG_INTEL_IDLE=y + +# +# Bus options (PCI etc.) +# +CONFIG_PCI=y +CONFIG_PCI_DIRECT=y +CONFIG_PCI_MMCONFIG=y +CONFIG_PCI_XEN=y +CONFIG_PCI_DOMAINS=y +CONFIG_MMCONF_FAM10H=y +# CONFIG_PCI_CNB20LE_QUIRK is not set +CONFIG_PCIEPORTBUS=y +CONFIG_HOTPLUG_PCI_PCIE=y +CONFIG_PCIEAER=y +# CONFIG_PCIEAER_INJECT is not set +# CONFIG_PCIE_ECRC is not set +CONFIG_PCIEASPM=y +CONFIG_PCIEASPM_DEBUG=y +CONFIG_PCIEASPM_DEFAULT=y +# CONFIG_PCIEASPM_POWERSAVE is not set +# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set +# CONFIG_PCIEASPM_PERFORMANCE is not set +CONFIG_PCIE_PME=y +CONFIG_PCIE_DPC=y +CONFIG_PCIE_PTM=y +CONFIG_PCI_MSI=y +CONFIG_PCI_MSI_IRQ_DOMAIN=y +CONFIG_PCI_QUIRKS=y +# CONFIG_PCI_DEBUG is not set +CONFIG_PCI_REALLOC_ENABLE_AUTO=y +CONFIG_PCI_STUB=m +# CONFIG_PCI_PF_STUB is not set +CONFIG_XEN_PCIDEV_FRONTEND=m +CONFIG_PCI_ATS=y +CONFIG_PCI_LOCKLESS_CONFIG=y +CONFIG_PCI_IOV=y +CONFIG_PCI_PRI=y +CONFIG_PCI_PASID=y +CONFIG_PCI_LABEL=y +CONFIG_PCI_HYPERV=m +CONFIG_HOTPLUG_PCI=y +CONFIG_HOTPLUG_PCI_ACPI=y +CONFIG_HOTPLUG_PCI_ACPI_IBM=m +CONFIG_HOTPLUG_PCI_CPCI=y +CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m +CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m +CONFIG_HOTPLUG_PCI_SHPC=y + +# +# PCI controller drivers +# + +# +# Cadence PCIe controllers support +# +# CONFIG_VMD is not set + +# +# DesignWare PCI Core Support +# +# CONFIG_PCIE_DW_PLAT_HOST is not set + +# +# PCI Endpoint +# +# CONFIG_PCI_ENDPOINT is not set + +# +# PCI switch controller drivers +# +CONFIG_PCI_SW_SWITCHTEC=m +# CONFIG_ISA_BUS is not set +CONFIG_ISA_DMA_API=y +CONFIG_AMD_NB=y +CONFIG_PCCARD=m +CONFIG_PCMCIA=m +CONFIG_PCMCIA_LOAD_CIS=y +CONFIG_CARDBUS=y + +# +# PC-card bridges +# +CONFIG_YENTA=m +CONFIG_YENTA_O2=y +CONFIG_YENTA_RICOH=y +CONFIG_YENTA_TI=y +CONFIG_YENTA_ENE_TUNE=y +CONFIG_YENTA_TOSHIBA=y +CONFIG_PD6729=m +CONFIG_I82092=m +CONFIG_PCCARD_NONSTATIC=y +CONFIG_RAPIDIO=y +CONFIG_RAPIDIO_TSI721=m +CONFIG_RAPIDIO_DISC_TIMEOUT=30 +# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set +CONFIG_RAPIDIO_DMA_ENGINE=y +# CONFIG_RAPIDIO_DEBUG is not set +CONFIG_RAPIDIO_ENUM_BASIC=m +CONFIG_RAPIDIO_CHMAN=m +CONFIG_RAPIDIO_MPORT_CDEV=m + +# +# RapidIO Switch drivers +# +CONFIG_RAPIDIO_TSI57X=m +CONFIG_RAPIDIO_CPS_XX=m +CONFIG_RAPIDIO_TSI568=m +CONFIG_RAPIDIO_CPS_GEN2=m +CONFIG_RAPIDIO_RXS_GEN3=m +# CONFIG_X86_SYSFB is not set + +# +# Binary Emulations +# +CONFIG_IA32_EMULATION=y +# CONFIG_IA32_AOUT is not set +CONFIG_X86_X32=y +CONFIG_COMPAT_32=y +CONFIG_COMPAT=y +CONFIG_COMPAT_FOR_U64_ALIGNMENT=y +CONFIG_SYSVIPC_COMPAT=y +CONFIG_X86_DEV_DMA_OPS=y +CONFIG_HAVE_GENERIC_GUP=y + +# +# Firmware Drivers +# +CONFIG_EDD=y +CONFIG_EDD_OFF=y +CONFIG_FIRMWARE_MEMMAP=y +CONFIG_DELL_RBU=m +CONFIG_DCDBAS=m +CONFIG_DMIID=y +CONFIG_DMI_SYSFS=m +CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y +CONFIG_ISCSI_IBFT_FIND=y +CONFIG_ISCSI_IBFT=m +CONFIG_FW_CFG_SYSFS=m +# CONFIG_FW_CFG_SYSFS_CMDLINE is not set +# CONFIG_GOOGLE_FIRMWARE is not set + +# +# EFI (Extensible Firmware Interface) Support +# +CONFIG_EFI_VARS=y +CONFIG_EFI_ESRT=y +CONFIG_EFI_VARS_PSTORE=m +# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set +CONFIG_EFI_RUNTIME_MAP=y +# CONFIG_EFI_FAKE_MEMMAP is not set +CONFIG_EFI_RUNTIME_WRAPPERS=y +CONFIG_EFI_BOOTLOADER_CONTROL=m +# CONFIG_EFI_CAPSULE_LOADER is not set +# CONFIG_EFI_TEST is not set +CONFIG_APPLE_PROPERTIES=y +CONFIG_RESET_ATTACK_MITIGATION=y +CONFIG_UEFI_CPER=y +CONFIG_UEFI_CPER_X86=y +CONFIG_EFI_DEV_PATH_PARSER=y + +# +# Tegra firmware driver +# +CONFIG_HAVE_KVM=y +CONFIG_HAVE_KVM_IRQCHIP=y +CONFIG_HAVE_KVM_IRQFD=y +CONFIG_HAVE_KVM_IRQ_ROUTING=y +CONFIG_HAVE_KVM_EVENTFD=y +CONFIG_KVM_MMIO=y +CONFIG_KVM_ASYNC_PF=y +CONFIG_HAVE_KVM_MSI=y +CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y +CONFIG_KVM_VFIO=y +CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y +CONFIG_KVM_COMPAT=y +CONFIG_HAVE_KVM_IRQ_BYPASS=y +CONFIG_VIRTUALIZATION=y +CONFIG_KVM=m +CONFIG_KVM_INTEL=m +CONFIG_KVM_AMD=m +CONFIG_KVM_AMD_SEV=y +# CONFIG_KVM_MMU_AUDIT is not set +CONFIG_VHOST_NET=m +CONFIG_VHOST_SCSI=m +CONFIG_VHOST_VSOCK=m +CONFIG_VHOST=m +# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set + +# +# General architecture-dependent options +# +CONFIG_CRASH_CORE=y +CONFIG_KEXEC_CORE=y +CONFIG_HOTPLUG_SMT=y +CONFIG_OPROFILE=m +# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set +CONFIG_HAVE_OPROFILE=y +CONFIG_OPROFILE_NMI_TIMER=y +CONFIG_KPROBES=y +CONFIG_JUMP_LABEL=y +# CONFIG_STATIC_KEYS_SELFTEST is not set +CONFIG_OPTPROBES=y +CONFIG_KPROBES_ON_FTRACE=y +CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_ARCH_USE_BUILTIN_BSWAP=y +CONFIG_KRETPROBES=y +CONFIG_USER_RETURN_NOTIFIER=y +CONFIG_HAVE_IOREMAP_PROT=y +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_OPTPROBES=y +CONFIG_HAVE_KPROBES_ON_FTRACE=y +CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y +CONFIG_HAVE_NMI=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_DMA_CONTIGUOUS=y +CONFIG_GENERIC_SMP_IDLE_THREAD=y +CONFIG_ARCH_HAS_FORTIFY_SOURCE=y +CONFIG_ARCH_HAS_SET_MEMORY=y +CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y +CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_RSEQ=y +CONFIG_HAVE_CLK=y +CONFIG_HAVE_HW_BREAKPOINT=y +CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y +CONFIG_HAVE_USER_RETURN_NOTIFIER=y +CONFIG_HAVE_PERF_EVENTS_NMI=y +CONFIG_HAVE_HARDLOCKUP_DETECTOR_PERF=y +CONFIG_HAVE_PERF_REGS=y +CONFIG_HAVE_PERF_USER_STACK_DUMP=y +CONFIG_HAVE_ARCH_JUMP_LABEL=y +CONFIG_HAVE_RCU_TABLE_FREE=y +CONFIG_HAVE_RCU_TABLE_INVALIDATE=y +CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y +CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y +CONFIG_HAVE_CMPXCHG_LOCAL=y +CONFIG_HAVE_CMPXCHG_DOUBLE=y +CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y +CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y +CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_SECCOMP_FILTER=y +CONFIG_HAVE_STACKPROTECTOR=y +CONFIG_CC_HAS_STACKPROTECTOR_NONE=y +CONFIG_STACKPROTECTOR=y +CONFIG_STACKPROTECTOR_STRONG=y +CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y +CONFIG_HAVE_CONTEXT_TRACKING=y +CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y +CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y +CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD=y +CONFIG_HAVE_ARCH_HUGE_VMAP=y +CONFIG_HAVE_ARCH_SOFT_DIRTY=y +CONFIG_HAVE_MOD_ARCH_SPECIFIC=y +CONFIG_MODULES_USE_ELF_RELA=y +CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y +CONFIG_ARCH_HAS_ELF_RANDOMIZE=y +CONFIG_HAVE_ARCH_MMAP_RND_BITS=y +CONFIG_HAVE_EXIT_THREAD=y +CONFIG_ARCH_MMAP_RND_BITS=28 +CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y +CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8 +CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES=y +CONFIG_HAVE_COPY_THREAD_TLS=y +CONFIG_HAVE_STACK_VALIDATION=y +CONFIG_HAVE_RELIABLE_STACKTRACE=y +CONFIG_ISA_BUS_API=y +CONFIG_OLD_SIGSUSPEND3=y +CONFIG_COMPAT_OLD_SIGACTION=y +CONFIG_COMPAT_32BIT_TIME=y +CONFIG_HAVE_ARCH_VMAP_STACK=y +CONFIG_VMAP_STACK=y +CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y +CONFIG_STRICT_KERNEL_RWX=y +CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y +CONFIG_STRICT_MODULE_RWX=y +CONFIG_ARCH_HAS_REFCOUNT=y +CONFIG_REFCOUNT_FULL=y +CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y + +# +# GCOV-based kernel profiling +# +# CONFIG_GCOV_KERNEL is not set +CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y +CONFIG_PLUGIN_HOSTCC="" +CONFIG_HAVE_GCC_PLUGINS=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set +CONFIG_MODVERSIONS=y +CONFIG_MODULE_SRCVERSION_ALL=y +# CONFIG_MODULE_SIG is not set +# CONFIG_MODULE_COMPRESS is not set +CONFIG_MODULES_TREE_LOOKUP=y +CONFIG_BLOCK=y +CONFIG_BLK_SCSI_REQUEST=y +CONFIG_BLK_DEV_BSG=y +CONFIG_BLK_DEV_BSGLIB=y +CONFIG_BLK_DEV_INTEGRITY=y +CONFIG_BLK_DEV_ZONED=y +CONFIG_BLK_DEV_THROTTLING=y +# CONFIG_BLK_DEV_THROTTLING_LOW is not set +CONFIG_BLK_CMDLINE_PARSER=y +CONFIG_BLK_WBT=y +# CONFIG_BLK_CGROUP_IOLATENCY is not set +# CONFIG_BLK_WBT_SQ is not set +CONFIG_BLK_WBT_MQ=y +CONFIG_BLK_DEBUG_FS=y +CONFIG_BLK_DEBUG_FS_ZONED=y +# CONFIG_BLK_SED_OPAL is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +CONFIG_AIX_PARTITION=y +CONFIG_OSF_PARTITION=y +CONFIG_AMIGA_PARTITION=y +CONFIG_ATARI_PARTITION=y +CONFIG_MAC_PARTITION=y +CONFIG_MSDOS_PARTITION=y +CONFIG_BSD_DISKLABEL=y +CONFIG_MINIX_SUBPARTITION=y +CONFIG_SOLARIS_X86_PARTITION=y +CONFIG_UNIXWARE_DISKLABEL=y +CONFIG_LDM_PARTITION=y +# CONFIG_LDM_DEBUG is not set +CONFIG_SGI_PARTITION=y +CONFIG_ULTRIX_PARTITION=y +CONFIG_SUN_PARTITION=y +CONFIG_KARMA_PARTITION=y +CONFIG_EFI_PARTITION=y +CONFIG_SYSV68_PARTITION=y +CONFIG_CMDLINE_PARTITION=y +CONFIG_BLOCK_COMPAT=y +CONFIG_BLK_MQ_PCI=y +CONFIG_BLK_MQ_VIRTIO=y +CONFIG_BLK_MQ_RDMA=y + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +CONFIG_CFQ_GROUP_IOSCHED=y +CONFIG_DEFAULT_DEADLINE=y +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="deadline" +CONFIG_MQ_IOSCHED_DEADLINE=m +CONFIG_MQ_IOSCHED_KYBER=m +CONFIG_IOSCHED_BFQ=m +# CONFIG_BFQ_GROUP_IOSCHED is not set +CONFIG_PREEMPT_NOTIFIERS=y +CONFIG_PADATA=y +CONFIG_ASN1=y +CONFIG_INLINE_SPIN_UNLOCK_IRQ=y +CONFIG_INLINE_READ_UNLOCK=y +CONFIG_INLINE_READ_UNLOCK_IRQ=y +CONFIG_INLINE_WRITE_UNLOCK=y +CONFIG_INLINE_WRITE_UNLOCK_IRQ=y +CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y +CONFIG_MUTEX_SPIN_ON_OWNER=y +CONFIG_RWSEM_SPIN_ON_OWNER=y +CONFIG_LOCK_SPIN_ON_OWNER=y +CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y +CONFIG_QUEUED_SPINLOCKS=y +CONFIG_ARCH_USE_QUEUED_RWLOCKS=y +CONFIG_QUEUED_RWLOCKS=y +CONFIG_ARCH_HAS_SYNC_CORE_BEFORE_USERMODE=y +CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y +CONFIG_FREEZER=y + +# +# Executable file formats +# +CONFIG_BINFMT_ELF=y +CONFIG_COMPAT_BINFMT_ELF=y +CONFIG_ELFCORE=y +CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y +CONFIG_BINFMT_SCRIPT=y +CONFIG_BINFMT_MISC=m +CONFIG_COREDUMP=y + +# +# Memory Management options +# +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_SPARSEMEM_MANUAL=y +CONFIG_SPARSEMEM=y +CONFIG_NEED_MULTIPLE_NODES=y +CONFIG_HAVE_MEMORY_PRESENT=y +CONFIG_SPARSEMEM_EXTREME=y +CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y +CONFIG_SPARSEMEM_VMEMMAP=y +CONFIG_HAVE_MEMBLOCK=y +CONFIG_HAVE_MEMBLOCK_NODE_MAP=y +CONFIG_ARCH_DISCARD_MEMBLOCK=y +CONFIG_MEMORY_ISOLATION=y +CONFIG_HAVE_BOOTMEM_INFO_NODE=y +CONFIG_MEMORY_HOTPLUG=y +CONFIG_MEMORY_HOTPLUG_SPARSE=y +# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set +CONFIG_MEMORY_HOTREMOVE=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_MEMORY_BALLOON=y +CONFIG_BALLOON_COMPACTION=y +CONFIG_COMPACTION=y +CONFIG_MIGRATION=y +CONFIG_PHYS_ADDR_T_64BIT=y +CONFIG_VIRT_TO_BUS=y +CONFIG_MMU_NOTIFIER=y +CONFIG_KSM=y +CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 +CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y +CONFIG_MEMORY_FAILURE=y +CONFIG_HWPOISON_INJECT=m +CONFIG_TRANSPARENT_HUGEPAGE=y +CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y +# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set +CONFIG_ARCH_WANTS_THP_SWAP=y +CONFIG_THP_SWAP=y +CONFIG_TRANSPARENT_HUGE_PAGECACHE=y +CONFIG_CLEANCACHE=y +CONFIG_FRONTSWAP=y +CONFIG_CMA=y +# CONFIG_CMA_DEBUG is not set +# CONFIG_CMA_DEBUGFS is not set +CONFIG_CMA_AREAS=7 +CONFIG_MEM_SOFT_DIRTY=y +CONFIG_ZSWAP=y +CONFIG_ZPOOL=y +CONFIG_ZBUD=y +CONFIG_Z3FOLD=m +CONFIG_ZSMALLOC=y +CONFIG_PGTABLE_MAPPING=y +# CONFIG_ZSMALLOC_STAT is not set +CONFIG_GENERIC_EARLY_IOREMAP=y +# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set +CONFIG_IDLE_PAGE_TRACKING=y +CONFIG_ARCH_HAS_ZONE_DEVICE=y +CONFIG_ZONE_DEVICE=y +CONFIG_ARCH_HAS_HMM=y +CONFIG_DEV_PAGEMAP_OPS=y +# CONFIG_HMM_MIRROR is not set +# CONFIG_DEVICE_PRIVATE is not set +# CONFIG_DEVICE_PUBLIC is not set +CONFIG_FRAME_VECTOR=y +CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y +CONFIG_ARCH_HAS_PKEYS=y +# CONFIG_PERCPU_STATS is not set +# CONFIG_GUP_BENCHMARK is not set +CONFIG_ARCH_HAS_PTE_SPECIAL=y +CONFIG_NET=y +CONFIG_COMPAT_NETLINK_MESSAGES=y +CONFIG_NET_INGRESS=y +CONFIG_NET_EGRESS=y + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_PACKET_DIAG=m +CONFIG_UNIX=y +CONFIG_UNIX_DIAG=m +CONFIG_TLS=m +# CONFIG_TLS_DEVICE is not set +CONFIG_XFRM=y +CONFIG_XFRM_OFFLOAD=y +CONFIG_XFRM_ALGO=m +CONFIG_XFRM_USER=m +CONFIG_XFRM_INTERFACE=m +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +CONFIG_XFRM_STATISTICS=y +CONFIG_XFRM_IPCOMP=m +CONFIG_NET_KEY=m +# CONFIG_NET_KEY_MIGRATE is not set +# CONFIG_SMC is not set +# CONFIG_XDP_SOCKETS is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_IP_FIB_TRIE_STATS=y +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_ROUTE_MULTIPATH=y +CONFIG_IP_ROUTE_VERBOSE=y +CONFIG_IP_ROUTE_CLASSID=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +# CONFIG_IP_PNP_BOOTP is not set +# CONFIG_IP_PNP_RARP is not set +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE_DEMUX=m +CONFIG_NET_IP_TUNNEL=m +CONFIG_NET_IPGRE=m +CONFIG_NET_IPGRE_BROADCAST=y +CONFIG_IP_MROUTE_COMMON=y +CONFIG_IP_MROUTE=y +# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set +CONFIG_IP_PIMSM_V1=y +CONFIG_IP_PIMSM_V2=y +CONFIG_SYN_COOKIES=y +CONFIG_NET_IPVTI=m +CONFIG_NET_UDP_TUNNEL=m +CONFIG_NET_FOU=m +CONFIG_NET_FOU_IP_TUNNELS=y +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +CONFIG_INET_ESP_OFFLOAD=m +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=m +CONFIG_INET_XFRM_MODE_TUNNEL=m +CONFIG_INET_XFRM_MODE_BEET=m +CONFIG_INET_DIAG=m +CONFIG_INET_TCP_DIAG=m +CONFIG_INET_UDP_DIAG=m +CONFIG_INET_RAW_DIAG=m +# CONFIG_INET_DIAG_DESTROY is not set +CONFIG_TCP_CONG_ADVANCED=y +CONFIG_TCP_CONG_BIC=m +CONFIG_TCP_CONG_CUBIC=y +CONFIG_TCP_CONG_WESTWOOD=m +CONFIG_TCP_CONG_HTCP=m +CONFIG_TCP_CONG_HSTCP=m +CONFIG_TCP_CONG_HYBLA=m +CONFIG_TCP_CONG_VEGAS=m +CONFIG_TCP_CONG_NV=m +CONFIG_TCP_CONG_SCALABLE=m +CONFIG_TCP_CONG_LP=m +CONFIG_TCP_CONG_VENO=m +CONFIG_TCP_CONG_YEAH=m +CONFIG_TCP_CONG_ILLINOIS=m +CONFIG_TCP_CONG_DCTCP=m +CONFIG_TCP_CONG_CDG=m +CONFIG_TCP_CONG_BBR=m +CONFIG_DEFAULT_CUBIC=y +# CONFIG_DEFAULT_RENO is not set +CONFIG_DEFAULT_TCP_CONG="cubic" +CONFIG_TCP_MD5SIG=y +CONFIG_IPV6=y +CONFIG_IPV6_ROUTER_PREF=y +CONFIG_IPV6_ROUTE_INFO=y +# CONFIG_IPV6_OPTIMISTIC_DAD is not set +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_ESP_OFFLOAD=m +CONFIG_INET6_IPCOMP=m +CONFIG_IPV6_MIP6=m +CONFIG_IPV6_ILA=m +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=m +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m +CONFIG_IPV6_VTI=m +CONFIG_IPV6_SIT=m +CONFIG_IPV6_SIT_6RD=y +CONFIG_IPV6_NDISC_NODETYPE=y +CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_GRE=m +CONFIG_IPV6_FOU=m +CONFIG_IPV6_FOU_TUNNEL=m +CONFIG_IPV6_MULTIPLE_TABLES=y +CONFIG_IPV6_SUBTREES=y +CONFIG_IPV6_MROUTE=y +CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y +CONFIG_IPV6_PIMSM_V2=y +# CONFIG_IPV6_SEG6_LWTUNNEL is not set +# CONFIG_IPV6_SEG6_HMAC is not set +CONFIG_NETLABEL=y +CONFIG_NETWORK_SECMARK=y +CONFIG_NET_PTP_CLASSIFY=y +# CONFIG_NETWORK_PHY_TIMESTAMPING is not set +CONFIG_NETFILTER=y +CONFIG_NETFILTER_ADVANCED=y +CONFIG_BRIDGE_NETFILTER=m + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_INGRESS=y +CONFIG_NETFILTER_NETLINK=m +CONFIG_NETFILTER_FAMILY_BRIDGE=y +CONFIG_NETFILTER_FAMILY_ARP=y +CONFIG_NETFILTER_NETLINK_ACCT=m +CONFIG_NETFILTER_NETLINK_QUEUE=m +CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NETFILTER_NETLINK_OSF=m +CONFIG_NF_CONNTRACK=m +CONFIG_NF_LOG_COMMON=m +CONFIG_NF_LOG_NETDEV=m +CONFIG_NETFILTER_CONNCOUNT=m +CONFIG_NF_CONNTRACK_MARK=y +CONFIG_NF_CONNTRACK_SECMARK=y +CONFIG_NF_CONNTRACK_ZONES=y +# CONFIG_NF_CONNTRACK_PROCFS is not set +CONFIG_NF_CONNTRACK_EVENTS=y +CONFIG_NF_CONNTRACK_TIMEOUT=y +CONFIG_NF_CONNTRACK_TIMESTAMP=y +CONFIG_NF_CONNTRACK_LABELS=y +CONFIG_NF_CT_PROTO_DCCP=y +CONFIG_NF_CT_PROTO_GRE=m +CONFIG_NF_CT_PROTO_SCTP=y +CONFIG_NF_CT_PROTO_UDPLITE=y +CONFIG_NF_CONNTRACK_AMANDA=m +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_H323=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_BROADCAST=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_SNMP=m +CONFIG_NF_CONNTRACK_PPTP=m +CONFIG_NF_CONNTRACK_SANE=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CONNTRACK_TFTP=m +CONFIG_NF_CT_NETLINK=m +CONFIG_NF_CT_NETLINK_TIMEOUT=m +CONFIG_NF_CT_NETLINK_HELPER=m +CONFIG_NETFILTER_NETLINK_GLUE_CT=y +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_NF_NAT_PROTO_DCCP=y +CONFIG_NF_NAT_PROTO_UDPLITE=y +CONFIG_NF_NAT_PROTO_SCTP=y +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_SIP=m +CONFIG_NF_NAT_TFTP=m +CONFIG_NF_NAT_REDIRECT=y +CONFIG_NETFILTER_SYNPROXY=m +CONFIG_NF_TABLES=m +CONFIG_NF_TABLES_SET=m +# CONFIG_NF_TABLES_INET is not set +# CONFIG_NF_TABLES_NETDEV is not set +CONFIG_NFT_NUMGEN=m +CONFIG_NFT_CT=m +CONFIG_NFT_FLOW_OFFLOAD=m +CONFIG_NFT_COUNTER=m +CONFIG_NFT_CONNLIMIT=m +CONFIG_NFT_LOG=m +CONFIG_NFT_LIMIT=m +CONFIG_NFT_MASQ=m +CONFIG_NFT_REDIR=m +CONFIG_NFT_NAT=m +CONFIG_NFT_TUNNEL=m +CONFIG_NFT_OBJREF=m +CONFIG_NFT_QUEUE=m +CONFIG_NFT_QUOTA=m +CONFIG_NFT_REJECT=m +CONFIG_NFT_COMPAT=m +CONFIG_NFT_HASH=m +CONFIG_NFT_SOCKET=m +CONFIG_NFT_OSF=m +CONFIG_NFT_TPROXY=m +CONFIG_NF_FLOW_TABLE_INET=m +CONFIG_NF_FLOW_TABLE=m +CONFIG_NETFILTER_XTABLES=m + +# +# Xtables combined modules +# +CONFIG_NETFILTER_XT_MARK=m +CONFIG_NETFILTER_XT_CONNMARK=m +CONFIG_NETFILTER_XT_SET=m + +# +# Xtables targets +# +CONFIG_NETFILTER_XT_TARGET_AUDIT=m +CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m +CONFIG_NETFILTER_XT_TARGET_CT=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m +CONFIG_NETFILTER_XT_TARGET_HL=m +CONFIG_NETFILTER_XT_TARGET_HMARK=m +CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m +CONFIG_NETFILTER_XT_TARGET_LED=m +CONFIG_NETFILTER_XT_TARGET_LOG=m +CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_NAT=m +CONFIG_NETFILTER_XT_TARGET_NETMAP=m +CONFIG_NETFILTER_XT_TARGET_NFLOG=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set +CONFIG_NETFILTER_XT_TARGET_RATEEST=m +CONFIG_NETFILTER_XT_TARGET_REDIRECT=m +CONFIG_NETFILTER_XT_TARGET_TEE=m +CONFIG_NETFILTER_XT_TARGET_TPROXY=m +CONFIG_NETFILTER_XT_TARGET_TRACE=m +CONFIG_NETFILTER_XT_TARGET_SECMARK=m +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m +CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m + +# +# Xtables matches +# +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m +CONFIG_NETFILTER_XT_MATCH_BPF=m +CONFIG_NETFILTER_XT_MATCH_CGROUP=m +CONFIG_NETFILTER_XT_MATCH_CLUSTER=m +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_NETFILTER_XT_MATCH_CPU=m +CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m +CONFIG_NETFILTER_XT_MATCH_DSCP=m +CONFIG_NETFILTER_XT_MATCH_ECN=m +CONFIG_NETFILTER_XT_MATCH_ESP=m +CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m +CONFIG_NETFILTER_XT_MATCH_HELPER=m +CONFIG_NETFILTER_XT_MATCH_HL=m +CONFIG_NETFILTER_XT_MATCH_IPCOMP=m +CONFIG_NETFILTER_XT_MATCH_IPRANGE=m +CONFIG_NETFILTER_XT_MATCH_IPVS=m +CONFIG_NETFILTER_XT_MATCH_L2TP=m +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +CONFIG_NETFILTER_XT_MATCH_NFACCT=m +CONFIG_NETFILTER_XT_MATCH_OSF=m +CONFIG_NETFILTER_XT_MATCH_OWNER=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m +CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_QUOTA=m +CONFIG_NETFILTER_XT_MATCH_RATEEST=m +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_RECENT=m +CONFIG_NETFILTER_XT_MATCH_SCTP=m +CONFIG_NETFILTER_XT_MATCH_SOCKET=m +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STATISTIC=m +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m +CONFIG_NETFILTER_XT_MATCH_TIME=m +CONFIG_NETFILTER_XT_MATCH_U32=m +CONFIG_IP_SET=m +CONFIG_IP_SET_MAX=256 +CONFIG_IP_SET_BITMAP_IP=m +CONFIG_IP_SET_BITMAP_IPMAC=m +CONFIG_IP_SET_BITMAP_PORT=m +CONFIG_IP_SET_HASH_IP=m +CONFIG_IP_SET_HASH_IPMARK=m +CONFIG_IP_SET_HASH_IPPORT=m +CONFIG_IP_SET_HASH_IPPORTIP=m +CONFIG_IP_SET_HASH_IPPORTNET=m +CONFIG_IP_SET_HASH_IPMAC=m +CONFIG_IP_SET_HASH_MAC=m +CONFIG_IP_SET_HASH_NETPORTNET=m +CONFIG_IP_SET_HASH_NET=m +CONFIG_IP_SET_HASH_NETNET=m +CONFIG_IP_SET_HASH_NETPORT=m +CONFIG_IP_SET_HASH_NETIFACE=m +CONFIG_IP_SET_LIST_SET=m +CONFIG_IP_VS=m +CONFIG_IP_VS_IPV6=y +# CONFIG_IP_VS_DEBUG is not set +CONFIG_IP_VS_TAB_BITS=12 + +# +# IPVS transport protocol load balancing support +# +CONFIG_IP_VS_PROTO_TCP=y +CONFIG_IP_VS_PROTO_UDP=y +CONFIG_IP_VS_PROTO_AH_ESP=y +CONFIG_IP_VS_PROTO_ESP=y +CONFIG_IP_VS_PROTO_AH=y +CONFIG_IP_VS_PROTO_SCTP=y + +# +# IPVS scheduler +# +CONFIG_IP_VS_RR=m +CONFIG_IP_VS_WRR=m +CONFIG_IP_VS_LC=m +CONFIG_IP_VS_WLC=m +CONFIG_IP_VS_FO=m +CONFIG_IP_VS_OVF=m +CONFIG_IP_VS_LBLC=m +CONFIG_IP_VS_LBLCR=m +CONFIG_IP_VS_DH=m +CONFIG_IP_VS_SH=m +CONFIG_IP_VS_MH=m +CONFIG_IP_VS_SED=m +CONFIG_IP_VS_NQ=m + +# +# IPVS SH scheduler +# +CONFIG_IP_VS_SH_TAB_BITS=8 + +# +# IPVS MH scheduler +# +CONFIG_IP_VS_MH_TAB_INDEX=12 + +# +# IPVS application helper +# +CONFIG_IP_VS_FTP=m +CONFIG_IP_VS_NFCT=y +CONFIG_IP_VS_PE_SIP=m + +# +# IP: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_SOCKET_IPV4=m +CONFIG_NF_TPROXY_IPV4=m +# CONFIG_NF_TABLES_IPV4 is not set +# CONFIG_NF_TABLES_ARP is not set +CONFIG_NF_FLOW_TABLE_IPV4=m +CONFIG_NF_DUP_IPV4=m +CONFIG_NF_LOG_ARP=m +CONFIG_NF_LOG_IPV4=m +CONFIG_NF_REJECT_IPV4=m +CONFIG_NF_NAT_IPV4=m +CONFIG_NF_NAT_MASQUERADE_IPV4=y +CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NF_NAT_PROTO_GRE=m +CONFIG_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_RPFILTER=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_SYNPROXY=m +CONFIG_IP_NF_NAT=m +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_SECURITY=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m + +# +# IPv6: Netfilter Configuration +# +CONFIG_NF_SOCKET_IPV6=m +CONFIG_NF_TPROXY_IPV6=m +# CONFIG_NF_TABLES_IPV6 is not set +CONFIG_NF_FLOW_TABLE_IPV6=m +CONFIG_NF_DUP_IPV6=m +CONFIG_NF_REJECT_IPV6=m +CONFIG_NF_LOG_IPV6=m +CONFIG_NF_NAT_IPV6=m +CONFIG_NF_NAT_MASQUERADE_IPV6=y +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_MH=m +CONFIG_IP6_NF_MATCH_RPFILTER=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_MATCH_SRH=m +CONFIG_IP6_NF_TARGET_HL=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_TARGET_SYNPROXY=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_RAW=m +CONFIG_IP6_NF_SECURITY=m +CONFIG_IP6_NF_NAT=m +CONFIG_IP6_NF_TARGET_MASQUERADE=m +CONFIG_IP6_NF_TARGET_NPT=m +CONFIG_NF_DEFRAG_IPV6=m + +# +# DECnet: Netfilter Configuration +# +CONFIG_DECNET_NF_GRABULATOR=m +# CONFIG_NF_TABLES_BRIDGE is not set +CONFIG_BRIDGE_NF_EBTABLES=m +CONFIG_BRIDGE_EBT_BROUTE=m +CONFIG_BRIDGE_EBT_T_FILTER=m +CONFIG_BRIDGE_EBT_T_NAT=m +CONFIG_BRIDGE_EBT_802_3=m +CONFIG_BRIDGE_EBT_AMONG=m +CONFIG_BRIDGE_EBT_ARP=m +CONFIG_BRIDGE_EBT_IP=m +CONFIG_BRIDGE_EBT_IP6=m +CONFIG_BRIDGE_EBT_LIMIT=m +CONFIG_BRIDGE_EBT_MARK=m +CONFIG_BRIDGE_EBT_PKTTYPE=m +CONFIG_BRIDGE_EBT_STP=m +CONFIG_BRIDGE_EBT_VLAN=m +CONFIG_BRIDGE_EBT_ARPREPLY=m +CONFIG_BRIDGE_EBT_DNAT=m +CONFIG_BRIDGE_EBT_MARK_T=m +CONFIG_BRIDGE_EBT_REDIRECT=m +CONFIG_BRIDGE_EBT_SNAT=m +CONFIG_BRIDGE_EBT_LOG=m +CONFIG_BRIDGE_EBT_NFLOG=m +# CONFIG_BPFILTER is not set +CONFIG_IP_DCCP=m +CONFIG_INET_DCCP_DIAG=m + +# +# DCCP CCIDs Configuration +# +# CONFIG_IP_DCCP_CCID2_DEBUG is not set +# CONFIG_IP_DCCP_CCID3 is not set + +# +# DCCP Kernel Hacking +# +# CONFIG_IP_DCCP_DEBUG is not set +CONFIG_IP_SCTP=m +# CONFIG_SCTP_DBG_OBJCNT is not set +# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set +CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y +# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set +CONFIG_SCTP_COOKIE_HMAC_MD5=y +CONFIG_SCTP_COOKIE_HMAC_SHA1=y +CONFIG_INET_SCTP_DIAG=m +CONFIG_RDS=m +CONFIG_RDS_RDMA=m +CONFIG_RDS_TCP=m +# CONFIG_RDS_DEBUG is not set +CONFIG_TIPC=m +CONFIG_TIPC_MEDIA_IB=y +CONFIG_TIPC_MEDIA_UDP=y +CONFIG_TIPC_DIAG=m +CONFIG_ATM=m +CONFIG_ATM_CLIP=m +# CONFIG_ATM_CLIP_NO_ICMP is not set +CONFIG_ATM_LANE=m +CONFIG_ATM_MPOA=m +CONFIG_ATM_BR2684=m +# CONFIG_ATM_BR2684_IPFILTER is not set +CONFIG_L2TP=m +CONFIG_L2TP_DEBUGFS=m +CONFIG_L2TP_V3=y +CONFIG_L2TP_IP=m +CONFIG_L2TP_ETH=m +CONFIG_STP=m +CONFIG_GARP=m +CONFIG_MRP=m +CONFIG_BRIDGE=m +CONFIG_BRIDGE_IGMP_SNOOPING=y +CONFIG_BRIDGE_VLAN_FILTERING=y +CONFIG_HAVE_NET_DSA=y +CONFIG_NET_DSA=m +CONFIG_NET_DSA_LEGACY=y +CONFIG_NET_DSA_TAG_BRCM=y +CONFIG_NET_DSA_TAG_BRCM_PREPEND=y +CONFIG_NET_DSA_TAG_DSA=y +CONFIG_NET_DSA_TAG_EDSA=y +CONFIG_NET_DSA_TAG_KSZ=y +CONFIG_NET_DSA_TAG_LAN9303=y +CONFIG_NET_DSA_TAG_MTK=y +CONFIG_NET_DSA_TAG_TRAILER=y +CONFIG_NET_DSA_TAG_QCA=y +CONFIG_VLAN_8021Q=m +CONFIG_VLAN_8021Q_GVRP=y +CONFIG_VLAN_8021Q_MVRP=y +CONFIG_DECNET=m +# CONFIG_DECNET_ROUTER is not set +CONFIG_LLC=m +CONFIG_LLC2=m +CONFIG_ATALK=m +CONFIG_DEV_APPLETALK=m +CONFIG_IPDDP=m +CONFIG_IPDDP_ENCAP=y +CONFIG_X25=m +CONFIG_LAPB=m +CONFIG_PHONET=m +CONFIG_6LOWPAN=m +# CONFIG_6LOWPAN_DEBUGFS is not set +CONFIG_6LOWPAN_NHC=m +CONFIG_6LOWPAN_NHC_DEST=m +CONFIG_6LOWPAN_NHC_FRAGMENT=m +CONFIG_6LOWPAN_NHC_HOP=m +CONFIG_6LOWPAN_NHC_IPV6=m +CONFIG_6LOWPAN_NHC_MOBILITY=m +CONFIG_6LOWPAN_NHC_ROUTING=m +CONFIG_6LOWPAN_NHC_UDP=m +CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m +CONFIG_6LOWPAN_GHC_UDP=m +CONFIG_6LOWPAN_GHC_ICMPV6=m +CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m +CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m +CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m +CONFIG_IEEE802154=m +CONFIG_IEEE802154_NL802154_EXPERIMENTAL=y +CONFIG_IEEE802154_SOCKET=m +CONFIG_IEEE802154_6LOWPAN=m +CONFIG_MAC802154=m +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +CONFIG_NET_SCH_CBQ=m +CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_HFSC=m +CONFIG_NET_SCH_ATM=m +CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_MULTIQ=m +CONFIG_NET_SCH_RED=m +CONFIG_NET_SCH_SFB=m +CONFIG_NET_SCH_SFQ=m +CONFIG_NET_SCH_TEQL=m +CONFIG_NET_SCH_TBF=m +CONFIG_NET_SCH_CBS=m +CONFIG_NET_SCH_ETF=m +CONFIG_NET_SCH_GRED=m +CONFIG_NET_SCH_DSMARK=m +CONFIG_NET_SCH_NETEM=m +CONFIG_NET_SCH_DRR=m +CONFIG_NET_SCH_MQPRIO=m +CONFIG_NET_SCH_SKBPRIO=m +CONFIG_NET_SCH_CHOKE=m +CONFIG_NET_SCH_QFQ=m +CONFIG_NET_SCH_CODEL=m +CONFIG_NET_SCH_FQ_CODEL=m +CONFIG_NET_SCH_CAKE=m +CONFIG_NET_SCH_FQ=m +CONFIG_NET_SCH_HHF=m +CONFIG_NET_SCH_PIE=m +CONFIG_NET_SCH_INGRESS=m +CONFIG_NET_SCH_PLUG=m +# CONFIG_NET_SCH_DEFAULT is not set + +# +# Classification +# +CONFIG_NET_CLS=y +CONFIG_NET_CLS_BASIC=m +CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_CLS_ROUTE4=m +CONFIG_NET_CLS_FW=m +CONFIG_NET_CLS_U32=m +# CONFIG_CLS_U32_PERF is not set +CONFIG_CLS_U32_MARK=y +CONFIG_NET_CLS_RSVP=m +CONFIG_NET_CLS_RSVP6=m +CONFIG_NET_CLS_FLOW=m +CONFIG_NET_CLS_CGROUP=m +CONFIG_NET_CLS_BPF=m +CONFIG_NET_CLS_FLOWER=m +CONFIG_NET_CLS_MATCHALL=m +CONFIG_NET_EMATCH=y +CONFIG_NET_EMATCH_STACK=32 +CONFIG_NET_EMATCH_CMP=m +CONFIG_NET_EMATCH_NBYTE=m +CONFIG_NET_EMATCH_U32=m +CONFIG_NET_EMATCH_META=m +CONFIG_NET_EMATCH_TEXT=m +CONFIG_NET_EMATCH_CANID=m +CONFIG_NET_EMATCH_IPSET=m +CONFIG_NET_EMATCH_IPT=m +CONFIG_NET_CLS_ACT=y +CONFIG_NET_ACT_POLICE=m +CONFIG_NET_ACT_GACT=m +CONFIG_GACT_PROB=y +CONFIG_NET_ACT_MIRRED=m +CONFIG_NET_ACT_SAMPLE=m +CONFIG_NET_ACT_IPT=m +CONFIG_NET_ACT_NAT=m +CONFIG_NET_ACT_PEDIT=m +CONFIG_NET_ACT_SIMP=m +CONFIG_NET_ACT_SKBEDIT=m +CONFIG_NET_ACT_CSUM=m +CONFIG_NET_ACT_VLAN=m +CONFIG_NET_ACT_BPF=m +CONFIG_NET_ACT_CONNMARK=m +CONFIG_NET_ACT_SKBMOD=m +CONFIG_NET_ACT_IFE=m +CONFIG_NET_ACT_TUNNEL_KEY=m +CONFIG_NET_IFE_SKBMARK=m +CONFIG_NET_IFE_SKBPRIO=m +CONFIG_NET_IFE_SKBTCINDEX=m +# CONFIG_NET_CLS_IND is not set +CONFIG_NET_SCH_FIFO=y +CONFIG_DCB=y +CONFIG_DNS_RESOLVER=y +CONFIG_BATMAN_ADV=m +# CONFIG_BATMAN_ADV_BATMAN_V is not set +CONFIG_BATMAN_ADV_BLA=y +CONFIG_BATMAN_ADV_DAT=y +CONFIG_BATMAN_ADV_NC=y +CONFIG_BATMAN_ADV_MCAST=y +CONFIG_BATMAN_ADV_DEBUGFS=y +# CONFIG_BATMAN_ADV_DEBUG is not set +CONFIG_OPENVSWITCH=m +CONFIG_OPENVSWITCH_GRE=m +CONFIG_OPENVSWITCH_VXLAN=m +CONFIG_OPENVSWITCH_GENEVE=m +CONFIG_VSOCKETS=m +CONFIG_VSOCKETS_DIAG=m +CONFIG_VMWARE_VMCI_VSOCKETS=m +CONFIG_VIRTIO_VSOCKETS=m +CONFIG_VIRTIO_VSOCKETS_COMMON=m +CONFIG_HYPERV_VSOCKETS=m +CONFIG_NETLINK_DIAG=m +CONFIG_MPLS=y +CONFIG_NET_MPLS_GSO=m +CONFIG_MPLS_ROUTING=m +CONFIG_MPLS_IPTUNNEL=m +CONFIG_NET_NSH=m +CONFIG_HSR=m +CONFIG_NET_SWITCHDEV=y +CONFIG_NET_L3_MASTER_DEV=y +CONFIG_NET_NCSI=y +CONFIG_RPS=y +CONFIG_RFS_ACCEL=y +CONFIG_XPS=y +CONFIG_CGROUP_NET_PRIO=y +CONFIG_CGROUP_NET_CLASSID=y +CONFIG_NET_RX_BUSY_POLL=y +CONFIG_BQL=y +# CONFIG_BPF_JIT is not set +# CONFIG_BPF_STREAM_PARSER is not set +CONFIG_NET_FLOW_LIMIT=y + +# +# Network testing +# +CONFIG_NET_PKTGEN=m +# CONFIG_NET_DROP_MONITOR is not set +CONFIG_HAMRADIO=y + +# +# Packet Radio protocols +# +CONFIG_AX25=m +CONFIG_AX25_DAMA_SLAVE=y +CONFIG_NETROM=m +CONFIG_ROSE=m + +# +# AX.25 network device drivers +# +CONFIG_MKISS=m +CONFIG_6PACK=m +CONFIG_BPQETHER=m +CONFIG_BAYCOM_SER_FDX=m +CONFIG_BAYCOM_SER_HDX=m +CONFIG_BAYCOM_PAR=m +CONFIG_YAM=m +CONFIG_CAN=m +CONFIG_CAN_RAW=m +CONFIG_CAN_BCM=m +CONFIG_CAN_GW=m + +# +# CAN Device Drivers +# +CONFIG_CAN_VCAN=m +CONFIG_CAN_VXCAN=m +CONFIG_CAN_SLCAN=m +CONFIG_CAN_DEV=m +CONFIG_CAN_CALC_BITTIMING=y +CONFIG_CAN_JANZ_ICAN3=m +CONFIG_CAN_C_CAN=m +CONFIG_CAN_C_CAN_PLATFORM=m +CONFIG_CAN_C_CAN_PCI=m +CONFIG_CAN_CC770=m +CONFIG_CAN_CC770_ISA=m +CONFIG_CAN_CC770_PLATFORM=m +CONFIG_CAN_IFI_CANFD=m +CONFIG_CAN_M_CAN=m +CONFIG_CAN_PEAK_PCIEFD=m +CONFIG_CAN_SJA1000=m +CONFIG_CAN_SJA1000_ISA=m +CONFIG_CAN_SJA1000_PLATFORM=m +CONFIG_CAN_EMS_PCMCIA=m +CONFIG_CAN_EMS_PCI=m +CONFIG_CAN_PEAK_PCMCIA=m +CONFIG_CAN_PEAK_PCI=m +CONFIG_CAN_PEAK_PCIEC=y +CONFIG_CAN_KVASER_PCI=m +CONFIG_CAN_PLX_PCI=m +CONFIG_CAN_SOFTING=m +CONFIG_CAN_SOFTING_CS=m + +# +# CAN SPI interfaces +# +CONFIG_CAN_HI311X=m +CONFIG_CAN_MCP251X=m + +# +# CAN USB interfaces +# +CONFIG_CAN_8DEV_USB=m +CONFIG_CAN_EMS_USB=m +CONFIG_CAN_ESD_USB2=m +CONFIG_CAN_GS_USB=m +CONFIG_CAN_KVASER_USB=m +CONFIG_CAN_MCBA_USB=m +CONFIG_CAN_PEAK_USB=m +CONFIG_CAN_UCAN=m +# CONFIG_CAN_DEBUG_DEVICES is not set +CONFIG_BT=m +CONFIG_BT_BREDR=y +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_CMTP=m +CONFIG_BT_HIDP=m +CONFIG_BT_HS=y +CONFIG_BT_LE=y +CONFIG_BT_6LOWPAN=m +# CONFIG_BT_LEDS is not set +# CONFIG_BT_SELFTEST is not set +CONFIG_BT_DEBUGFS=y + +# +# Bluetooth device drivers +# +CONFIG_BT_INTEL=m +CONFIG_BT_BCM=m +CONFIG_BT_RTL=m +CONFIG_BT_QCA=m +CONFIG_BT_HCIBTUSB=m +# CONFIG_BT_HCIBTUSB_AUTOSUSPEND is not set +CONFIG_BT_HCIBTUSB_BCM=y +CONFIG_BT_HCIBTUSB_RTL=y +CONFIG_BT_HCIBTSDIO=m +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_SERDEV=y +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_NOKIA=m +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIUART_ATH3K=y +CONFIG_BT_HCIUART_LL=y +CONFIG_BT_HCIUART_3WIRE=y +CONFIG_BT_HCIUART_INTEL=y +CONFIG_BT_HCIUART_BCM=y +CONFIG_BT_HCIUART_RTL=y +CONFIG_BT_HCIUART_QCA=y +CONFIG_BT_HCIUART_AG6XX=y +CONFIG_BT_HCIUART_MRVL=y +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m +CONFIG_BT_HCIDTL1=m +CONFIG_BT_HCIBT3C=m +CONFIG_BT_HCIBLUECARD=m +CONFIG_BT_HCIVHCI=m +CONFIG_BT_MRVL=m +CONFIG_BT_MRVL_SDIO=m +CONFIG_BT_ATH3K=m +CONFIG_BT_WILINK=m +CONFIG_BT_MTKUART=m +CONFIG_BT_HCIRSI=m +CONFIG_AF_RXRPC=m +CONFIG_AF_RXRPC_IPV6=y +# CONFIG_AF_RXRPC_INJECT_LOSS is not set +# CONFIG_AF_RXRPC_DEBUG is not set +# CONFIG_RXKAD is not set +CONFIG_AF_KCM=m +CONFIG_STREAM_PARSER=m +CONFIG_FIB_RULES=y +CONFIG_WIRELESS=y +CONFIG_WIRELESS_EXT=y +CONFIG_WEXT_CORE=y +CONFIG_WEXT_PROC=y +CONFIG_WEXT_SPY=y +CONFIG_WEXT_PRIV=y +CONFIG_CFG80211=m +# CONFIG_NL80211_TESTMODE is not set +# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set +# CONFIG_CFG80211_CERTIFICATION_ONUS is not set +CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y +CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y +CONFIG_CFG80211_DEFAULT_PS=y +CONFIG_CFG80211_DEBUGFS=y +CONFIG_CFG80211_CRDA_SUPPORT=y +CONFIG_CFG80211_WEXT=y +CONFIG_CFG80211_WEXT_EXPORT=y +CONFIG_LIB80211=m +CONFIG_LIB80211_CRYPT_WEP=m +CONFIG_LIB80211_CRYPT_CCMP=m +CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set +CONFIG_MAC80211=m +CONFIG_MAC80211_HAS_RC=y +CONFIG_MAC80211_RC_MINSTREL=y +CONFIG_MAC80211_RC_MINSTREL_HT=y +CONFIG_MAC80211_RC_MINSTREL_VHT=y +CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y +CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" +CONFIG_MAC80211_MESH=y +CONFIG_MAC80211_LEDS=y +CONFIG_MAC80211_DEBUGFS=y +CONFIG_MAC80211_MESSAGE_TRACING=y +# CONFIG_MAC80211_DEBUG_MENU is not set +CONFIG_MAC80211_STA_HASH_MAX_SIZE=0 +CONFIG_WIMAX=m +CONFIG_WIMAX_DEBUG_LEVEL=8 +CONFIG_RFKILL=y +CONFIG_RFKILL_LEDS=y +CONFIG_RFKILL_INPUT=y +CONFIG_RFKILL_GPIO=m +CONFIG_NET_9P=m +CONFIG_NET_9P_VIRTIO=m +CONFIG_NET_9P_XEN=m +CONFIG_NET_9P_RDMA=m +# CONFIG_NET_9P_DEBUG is not set +CONFIG_CAIF=m +# CONFIG_CAIF_DEBUG is not set +CONFIG_CAIF_NETDEV=m +CONFIG_CAIF_USB=m +CONFIG_CEPH_LIB=m +# CONFIG_CEPH_LIB_PRETTYDEBUG is not set +CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y +CONFIG_NFC=m +CONFIG_NFC_DIGITAL=m +CONFIG_NFC_NCI=m +CONFIG_NFC_NCI_SPI=m +CONFIG_NFC_NCI_UART=m +CONFIG_NFC_HCI=m +CONFIG_NFC_SHDLC=y + +# +# Near Field Communication (NFC) devices +# +CONFIG_NFC_TRF7970A=m +CONFIG_NFC_MEI_PHY=m +CONFIG_NFC_SIM=m +CONFIG_NFC_PORT100=m +CONFIG_NFC_FDP=m +CONFIG_NFC_FDP_I2C=m +CONFIG_NFC_PN544=m +CONFIG_NFC_PN544_I2C=m +CONFIG_NFC_PN544_MEI=m +CONFIG_NFC_PN533=m +CONFIG_NFC_PN533_USB=m +CONFIG_NFC_PN533_I2C=m +CONFIG_NFC_MICROREAD=m +CONFIG_NFC_MICROREAD_I2C=m +CONFIG_NFC_MICROREAD_MEI=m +CONFIG_NFC_MRVL=m +CONFIG_NFC_MRVL_USB=m +CONFIG_NFC_MRVL_UART=m +CONFIG_NFC_MRVL_I2C=m +CONFIG_NFC_MRVL_SPI=m +CONFIG_NFC_ST21NFCA=m +CONFIG_NFC_ST21NFCA_I2C=m +CONFIG_NFC_ST_NCI=m +CONFIG_NFC_ST_NCI_I2C=m +CONFIG_NFC_ST_NCI_SPI=m +CONFIG_NFC_NXP_NCI=m +CONFIG_NFC_NXP_NCI_I2C=m +CONFIG_NFC_S3FWRN5=m +CONFIG_NFC_S3FWRN5_I2C=m +CONFIG_NFC_ST95HF=m +CONFIG_PSAMPLE=m +CONFIG_NET_IFE=m +CONFIG_LWTUNNEL=y +CONFIG_LWTUNNEL_BPF=y +CONFIG_DST_CACHE=y +CONFIG_GRO_CELLS=y +CONFIG_NET_DEVLINK=m +CONFIG_MAY_USE_DEVLINK=m +CONFIG_PAGE_POOL=y +CONFIG_FAILOVER=y +CONFIG_HAVE_EBPF_JIT=y + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER=y +CONFIG_UEVENT_HELPER_PATH="" +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +# CONFIG_STANDALONE is not set +CONFIG_PREVENT_FIRMWARE_BUILD=y + +# +# Firmware loader +# +CONFIG_FW_LOADER=y +CONFIG_EXTRA_FIRMWARE="" +CONFIG_FW_LOADER_USER_HELPER=y +# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set +CONFIG_WANT_DEV_COREDUMP=y +CONFIG_ALLOW_DEV_COREDUMP=y +CONFIG_DEV_COREDUMP=y +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set +# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set +CONFIG_SYS_HYPERVISOR=y +CONFIG_GENERIC_CPU_AUTOPROBE=y +CONFIG_GENERIC_CPU_VULNERABILITIES=y +CONFIG_REGMAP=y +CONFIG_REGMAP_I2C=y +CONFIG_REGMAP_SPI=y +CONFIG_REGMAP_SPMI=m +CONFIG_REGMAP_W1=m +CONFIG_REGMAP_MMIO=y +CONFIG_REGMAP_IRQ=y +CONFIG_DMA_SHARED_BUFFER=y +# CONFIG_DMA_FENCE_TRACE is not set +# CONFIG_DMA_CMA is not set + +# +# Bus devices +# +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=y +CONFIG_GNSS=m +CONFIG_GNSS_SERIAL=m +CONFIG_GNSS_SIRF_SERIAL=m +CONFIG_GNSS_UBX_SERIAL=m +CONFIG_MTD=m +# CONFIG_MTD_TESTS is not set +CONFIG_MTD_REDBOOT_PARTS=m +CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 +# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set +# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set +CONFIG_MTD_CMDLINE_PARTS=m +CONFIG_MTD_AR7_PARTS=m + +# +# Partition parsers +# + +# +# User Modules And Translation Layers +# +CONFIG_MTD_BLKDEVS=m +CONFIG_MTD_BLOCK=m +CONFIG_MTD_BLOCK_RO=m +CONFIG_FTL=m +CONFIG_NFTL=m +CONFIG_NFTL_RW=y +CONFIG_INFTL=m +CONFIG_RFD_FTL=m +CONFIG_SSFDC=m +CONFIG_SM_FTL=m +CONFIG_MTD_OOPS=m +CONFIG_MTD_SWAP=m +# CONFIG_MTD_PARTITIONED_MASTER is not set + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=m +CONFIG_MTD_JEDECPROBE=m +CONFIG_MTD_GEN_PROBE=m +# CONFIG_MTD_CFI_ADV_OPTIONS is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +CONFIG_MTD_CFI_INTELEXT=m +CONFIG_MTD_CFI_AMDSTD=m +CONFIG_MTD_CFI_STAA=m +CONFIG_MTD_CFI_UTIL=m +CONFIG_MTD_RAM=m +CONFIG_MTD_ROM=m +CONFIG_MTD_ABSENT=m + +# +# Mapping drivers for chip access +# +CONFIG_MTD_COMPLEX_MAPPINGS=y +CONFIG_MTD_PHYSMAP=m +# CONFIG_MTD_PHYSMAP_COMPAT is not set +CONFIG_MTD_SBC_GXX=m +CONFIG_MTD_AMD76XROM=m +CONFIG_MTD_ICHXROM=m +CONFIG_MTD_ESB2ROM=m +CONFIG_MTD_CK804XROM=m +CONFIG_MTD_SCB2_FLASH=m +CONFIG_MTD_NETtel=m +CONFIG_MTD_L440GX=m +CONFIG_MTD_PCI=m +CONFIG_MTD_PCMCIA=m +# CONFIG_MTD_PCMCIA_ANONYMOUS is not set +CONFIG_MTD_GPIO_ADDR=m +CONFIG_MTD_INTEL_VR_NOR=m +CONFIG_MTD_PLATRAM=m +CONFIG_MTD_LATCH_ADDR=m + +# +# Self-contained MTD device drivers +# +CONFIG_MTD_PMC551=m +# CONFIG_MTD_PMC551_BUGFIX is not set +# CONFIG_MTD_PMC551_DEBUG is not set +CONFIG_MTD_DATAFLASH=m +# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set +CONFIG_MTD_DATAFLASH_OTP=y +CONFIG_MTD_M25P80=m +CONFIG_MTD_MCHP23K256=m +CONFIG_MTD_SST25L=m +CONFIG_MTD_SLRAM=m +CONFIG_MTD_PHRAM=m +CONFIG_MTD_MTDRAM=m +CONFIG_MTDRAM_TOTAL_SIZE=4096 +CONFIG_MTDRAM_ERASE_SIZE=128 +CONFIG_MTD_BLOCK2MTD=m + +# +# Disk-On-Chip Device Drivers +# +CONFIG_MTD_DOCG3=m +CONFIG_BCH_CONST_M=14 +CONFIG_BCH_CONST_T=4 +CONFIG_MTD_NAND_CORE=m +CONFIG_MTD_ONENAND=m +CONFIG_MTD_ONENAND_VERIFY_WRITE=y +CONFIG_MTD_ONENAND_GENERIC=m +# CONFIG_MTD_ONENAND_OTP is not set +CONFIG_MTD_ONENAND_2X_PROGRAM=y +CONFIG_MTD_NAND_ECC=m +# CONFIG_MTD_NAND_ECC_SMC is not set +CONFIG_MTD_NAND=m +CONFIG_MTD_NAND_BCH=m +CONFIG_MTD_NAND_ECC_BCH=y +CONFIG_MTD_SM_COMMON=m +CONFIG_MTD_NAND_DENALI=m +CONFIG_MTD_NAND_DENALI_PCI=m +CONFIG_MTD_NAND_GPIO=m +CONFIG_MTD_NAND_RICOH=m +CONFIG_MTD_NAND_DISKONCHIP=m +# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set +CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 +# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set +CONFIG_MTD_NAND_DOCG4=m +CONFIG_MTD_NAND_CAFE=m +CONFIG_MTD_NAND_NANDSIM=m +CONFIG_MTD_NAND_PLATFORM=m +CONFIG_MTD_SPI_NAND=m + +# +# LPDDR & LPDDR2 PCM memory drivers +# +CONFIG_MTD_LPDDR=m +CONFIG_MTD_QINFO_PROBE=m +CONFIG_MTD_SPI_NOR=m +CONFIG_MTD_MT81xx_NOR=m +CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y +CONFIG_SPI_INTEL_SPI=m +CONFIG_SPI_INTEL_SPI_PCI=m +CONFIG_SPI_INTEL_SPI_PLATFORM=m +CONFIG_MTD_UBI=m +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MTD_UBI_BEB_LIMIT=20 +CONFIG_MTD_UBI_FASTMAP=y +CONFIG_MTD_UBI_GLUEBI=m +CONFIG_MTD_UBI_BLOCK=y +# CONFIG_OF is not set +CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y +CONFIG_PARPORT=m +CONFIG_PARPORT_PC=m +CONFIG_PARPORT_SERIAL=m +CONFIG_PARPORT_PC_FIFO=y +# CONFIG_PARPORT_PC_SUPERIO is not set +CONFIG_PARPORT_PC_PCMCIA=m +CONFIG_PARPORT_AX88796=m +CONFIG_PARPORT_1284=y +CONFIG_PARPORT_NOT_PC=y +CONFIG_PNP=y +# CONFIG_PNP_DEBUG_MESSAGES is not set + +# +# Protocols +# +CONFIG_PNPACPI=y +CONFIG_BLK_DEV=y +CONFIG_BLK_DEV_NULL_BLK=m +CONFIG_BLK_DEV_FD=m +CONFIG_CDROM=y +CONFIG_PARIDE=m + +# +# Parallel IDE high-level drivers +# +CONFIG_PARIDE_PD=m +CONFIG_PARIDE_PCD=m +CONFIG_PARIDE_PF=m +CONFIG_PARIDE_PT=m +CONFIG_PARIDE_PG=m + +# +# Parallel IDE protocol modules +# +CONFIG_PARIDE_ATEN=m +CONFIG_PARIDE_BPCK=m +CONFIG_PARIDE_COMM=m +CONFIG_PARIDE_DSTR=m +CONFIG_PARIDE_FIT2=m +CONFIG_PARIDE_FIT3=m +CONFIG_PARIDE_EPAT=m +CONFIG_PARIDE_EPATC8=y +CONFIG_PARIDE_EPIA=m +CONFIG_PARIDE_FRIQ=m +CONFIG_PARIDE_FRPW=m +CONFIG_PARIDE_KBIC=m +CONFIG_PARIDE_KTTI=m +CONFIG_PARIDE_ON20=m +CONFIG_PARIDE_ON26=m +CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m +CONFIG_ZRAM=m +# CONFIG_ZRAM_WRITEBACK is not set +# CONFIG_ZRAM_MEMORY_TRACKING is not set +CONFIG_BLK_DEV_DAC960=m +CONFIG_BLK_DEV_UMEM=m +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 +CONFIG_BLK_DEV_CRYPTOLOOP=m +CONFIG_BLK_DEV_DRBD=m +# CONFIG_DRBD_FAULT_INJECTION is not set +CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_SKD=m +CONFIG_BLK_DEV_SX8=m +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=65536 +CONFIG_CDROM_PKTCDVD=m +CONFIG_CDROM_PKTCDVD_BUFFERS=8 +# CONFIG_CDROM_PKTCDVD_WCACHE is not set +CONFIG_ATA_OVER_ETH=m +CONFIG_XEN_BLKDEV_FRONTEND=y +CONFIG_XEN_BLKDEV_BACKEND=m +CONFIG_VIRTIO_BLK=y +# CONFIG_VIRTIO_BLK_SCSI is not set +CONFIG_BLK_DEV_RBD=m +CONFIG_BLK_DEV_RSXX=m + +# +# NVME Support +# +CONFIG_NVME_CORE=y +CONFIG_BLK_DEV_NVME=y +# CONFIG_NVME_MULTIPATH is not set +CONFIG_NVME_FABRICS=m +CONFIG_NVME_RDMA=m +CONFIG_NVME_FC=m +CONFIG_NVME_TARGET=m +CONFIG_NVME_TARGET_LOOP=m +CONFIG_NVME_TARGET_RDMA=m +CONFIG_NVME_TARGET_FC=m +CONFIG_NVME_TARGET_FCLOOP=m + +# +# Misc devices +# +CONFIG_SENSORS_LIS3LV02D=m +CONFIG_AD525X_DPOT=m +CONFIG_AD525X_DPOT_I2C=m +CONFIG_AD525X_DPOT_SPI=m +CONFIG_DUMMY_IRQ=m +CONFIG_IBM_ASM=m +CONFIG_PHANTOM=m +CONFIG_SGI_IOC4=m +CONFIG_TIFM_CORE=m +CONFIG_TIFM_7XX1=m +CONFIG_ICS932S401=m +CONFIG_ENCLOSURE_SERVICES=m +CONFIG_HP_ILO=m +CONFIG_APDS9802ALS=m +CONFIG_ISL29003=m +CONFIG_ISL29020=m +CONFIG_SENSORS_TSL2550=m +CONFIG_SENSORS_BH1770=m +CONFIG_SENSORS_APDS990X=m +CONFIG_HMC6352=m +CONFIG_DS1682=m +CONFIG_VMWARE_BALLOON=m +CONFIG_USB_SWITCH_FSA9480=m +CONFIG_LATTICE_ECP3_CONFIG=m +CONFIG_SRAM=y +# CONFIG_PCI_ENDPOINT_TEST is not set +CONFIG_MISC_RTSX=m +CONFIG_C2PORT=m +CONFIG_C2PORT_DURAMAR_2150=m + +# +# EEPROM support +# +CONFIG_EEPROM_AT24=m +CONFIG_EEPROM_AT25=m +CONFIG_EEPROM_LEGACY=m +CONFIG_EEPROM_MAX6875=m +CONFIG_EEPROM_93CX6=m +CONFIG_EEPROM_93XX46=m +CONFIG_EEPROM_IDT_89HPESX=m +CONFIG_CB710_CORE=m +# CONFIG_CB710_DEBUG is not set +CONFIG_CB710_DEBUG_ASSUMPTIONS=y + +# +# Texas Instruments shared transport line discipline +# +CONFIG_TI_ST=m +CONFIG_SENSORS_LIS3_I2C=m +CONFIG_ALTERA_STAPL=m +CONFIG_INTEL_MEI=m +CONFIG_INTEL_MEI_ME=m +CONFIG_INTEL_MEI_TXE=m +CONFIG_VMWARE_VMCI=m + +# +# Intel MIC & related support +# + +# +# Intel MIC Bus Driver +# +CONFIG_INTEL_MIC_BUS=m + +# +# SCIF Bus Driver +# +CONFIG_SCIF_BUS=m + +# +# VOP Bus Driver +# +CONFIG_VOP_BUS=m + +# +# Intel MIC Host Driver +# +CONFIG_INTEL_MIC_HOST=m + +# +# Intel MIC Card Driver +# +CONFIG_INTEL_MIC_CARD=m + +# +# SCIF Driver +# +CONFIG_SCIF=m + +# +# Intel MIC Coprocessor State Management (COSM) Drivers +# +CONFIG_MIC_COSM=m + +# +# VOP Driver +# +CONFIG_VOP=m +CONFIG_VHOST_RING=m +CONFIG_GENWQE=m +CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0 +CONFIG_ECHO=m +CONFIG_MISC_RTSX_PCI=m +CONFIG_MISC_RTSX_USB=m +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set + +# +# SCSI device support +# +CONFIG_SCSI_MOD=y +CONFIG_RAID_ATTRS=m +CONFIG_SCSI=y +CONFIG_SCSI_DMA=y +CONFIG_SCSI_NETLINK=y +# CONFIG_SCSI_MQ_DEFAULT is not set +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=y +CONFIG_CHR_DEV_ST=m +CONFIG_CHR_DEV_OSST=m +CONFIG_BLK_DEV_SR=y +# CONFIG_BLK_DEV_SR_VENDOR is not set +CONFIG_CHR_DEV_SG=y +CONFIG_CHR_DEV_SCH=m +CONFIG_SCSI_ENCLOSURE=m +CONFIG_SCSI_CONSTANTS=y +CONFIG_SCSI_LOGGING=y +CONFIG_SCSI_SCAN_ASYNC=y + +# +# SCSI Transports +# +CONFIG_SCSI_SPI_ATTRS=m +CONFIG_SCSI_FC_ATTRS=m +CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_SAS_ATTRS=m +CONFIG_SCSI_SAS_LIBSAS=m +CONFIG_SCSI_SAS_ATA=y +CONFIG_SCSI_SAS_HOST_SMP=y +CONFIG_SCSI_SRP_ATTRS=m +CONFIG_SCSI_LOWLEVEL=y +CONFIG_ISCSI_TCP=m +CONFIG_ISCSI_BOOT_SYSFS=m +CONFIG_SCSI_CXGB3_ISCSI=m +CONFIG_SCSI_CXGB4_ISCSI=m +CONFIG_SCSI_BNX2_ISCSI=m +CONFIG_SCSI_BNX2X_FCOE=m +CONFIG_BE2ISCSI=m +CONFIG_BLK_DEV_3W_XXXX_RAID=m +CONFIG_SCSI_HPSA=m +CONFIG_SCSI_3W_9XXX=m +CONFIG_SCSI_3W_SAS=m +CONFIG_SCSI_ACARD=m +CONFIG_SCSI_AACRAID=m +CONFIG_SCSI_AIC7XXX=m +CONFIG_AIC7XXX_CMDS_PER_DEVICE=8 +CONFIG_AIC7XXX_RESET_DELAY_MS=5000 +# CONFIG_AIC7XXX_DEBUG_ENABLE is not set +CONFIG_AIC7XXX_DEBUG_MASK=0 +CONFIG_AIC7XXX_REG_PRETTY_PRINT=y +CONFIG_SCSI_AIC79XX=m +CONFIG_AIC79XX_CMDS_PER_DEVICE=32 +CONFIG_AIC79XX_RESET_DELAY_MS=5000 +# CONFIG_AIC79XX_DEBUG_ENABLE is not set +CONFIG_AIC79XX_DEBUG_MASK=0 +CONFIG_AIC79XX_REG_PRETTY_PRINT=y +CONFIG_SCSI_AIC94XX=m +# CONFIG_AIC94XX_DEBUG is not set +CONFIG_SCSI_MVSAS=m +# CONFIG_SCSI_MVSAS_DEBUG is not set +# CONFIG_SCSI_MVSAS_TASKLET is not set +CONFIG_SCSI_MVUMI=m +CONFIG_SCSI_DPT_I2O=m +CONFIG_SCSI_ADVANSYS=m +CONFIG_SCSI_ARCMSR=m +CONFIG_SCSI_ESAS2R=m +CONFIG_MEGARAID_NEWGEN=y +CONFIG_MEGARAID_MM=m +CONFIG_MEGARAID_MAILBOX=m +CONFIG_MEGARAID_LEGACY=m +CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_MPT3SAS=m +CONFIG_SCSI_MPT2SAS_MAX_SGE=128 +CONFIG_SCSI_MPT3SAS_MAX_SGE=128 +CONFIG_SCSI_MPT2SAS=m +CONFIG_SCSI_SMARTPQI=m +CONFIG_SCSI_UFSHCD=m +CONFIG_SCSI_UFSHCD_PCI=m +# CONFIG_SCSI_UFS_DWC_TC_PCI is not set +CONFIG_SCSI_UFSHCD_PLATFORM=m +# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set +CONFIG_SCSI_HPTIOP=m +CONFIG_SCSI_BUSLOGIC=m +CONFIG_SCSI_FLASHPOINT=y +CONFIG_VMWARE_PVSCSI=m +CONFIG_XEN_SCSI_FRONTEND=m +CONFIG_HYPERV_STORAGE=m +CONFIG_LIBFC=m +CONFIG_LIBFCOE=m +CONFIG_FCOE=m +CONFIG_FCOE_FNIC=m +CONFIG_SCSI_SNIC=m +# CONFIG_SCSI_SNIC_DEBUG_FS is not set +CONFIG_SCSI_DMX3191D=m +CONFIG_SCSI_GDTH=m +CONFIG_SCSI_ISCI=m +CONFIG_SCSI_IPS=m +CONFIG_SCSI_INITIO=m +CONFIG_SCSI_INIA100=m +CONFIG_SCSI_PPA=m +CONFIG_SCSI_IMM=m +# CONFIG_SCSI_IZIP_EPP16 is not set +# CONFIG_SCSI_IZIP_SLOW_CTR is not set +CONFIG_SCSI_STEX=m +CONFIG_SCSI_SYM53C8XX_2=m +CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 +CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 +CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 +CONFIG_SCSI_SYM53C8XX_MMIO=y +CONFIG_SCSI_IPR=m +CONFIG_SCSI_IPR_TRACE=y +CONFIG_SCSI_IPR_DUMP=y +CONFIG_SCSI_QLOGIC_1280=m +CONFIG_SCSI_QLA_FC=m +CONFIG_TCM_QLA2XXX=m +# CONFIG_TCM_QLA2XXX_DEBUG is not set +CONFIG_SCSI_QLA_ISCSI=m +CONFIG_QEDI=m +CONFIG_QEDF=m +CONFIG_SCSI_LPFC=m +# CONFIG_SCSI_LPFC_DEBUG_FS is not set +CONFIG_SCSI_DC395x=m +CONFIG_SCSI_AM53C974=m +CONFIG_SCSI_WD719X=m +CONFIG_SCSI_DEBUG=m +CONFIG_SCSI_PMCRAID=m +CONFIG_SCSI_PM8001=m +CONFIG_SCSI_BFA_FC=m +CONFIG_SCSI_VIRTIO=m +CONFIG_SCSI_CHELSIO_FCOE=m +CONFIG_SCSI_LOWLEVEL_PCMCIA=y +CONFIG_PCMCIA_AHA152X=m +CONFIG_PCMCIA_QLOGIC=m +CONFIG_PCMCIA_SYM53C500=m +CONFIG_SCSI_DH=y +CONFIG_SCSI_DH_RDAC=m +CONFIG_SCSI_DH_HP_SW=m +CONFIG_SCSI_DH_EMC=m +CONFIG_SCSI_DH_ALUA=m +CONFIG_SCSI_OSD_INITIATOR=m +CONFIG_SCSI_OSD_ULD=m +CONFIG_SCSI_OSD_DPRINT_SENSE=1 +# CONFIG_SCSI_OSD_DEBUG is not set +CONFIG_ATA=y +CONFIG_ATA_VERBOSE_ERROR=y +CONFIG_ATA_ACPI=y +CONFIG_SATA_ZPODD=y +CONFIG_SATA_PMP=y + +# +# Controllers with non-SFF native interface +# +CONFIG_SATA_AHCI=m +CONFIG_SATA_MOBILE_LPM_POLICY=0 +CONFIG_SATA_AHCI_PLATFORM=m +CONFIG_SATA_INIC162X=m +CONFIG_SATA_ACARD_AHCI=m +CONFIG_SATA_SIL24=m +CONFIG_ATA_SFF=y + +# +# SFF controllers with custom DMA interface +# +CONFIG_PDC_ADMA=m +CONFIG_SATA_QSTOR=m +CONFIG_SATA_SX4=m +CONFIG_ATA_BMDMA=y + +# +# SATA SFF controllers with BMDMA +# +CONFIG_ATA_PIIX=y +CONFIG_SATA_DWC=m +# CONFIG_SATA_DWC_OLD_DMA is not set +# CONFIG_SATA_DWC_DEBUG is not set +CONFIG_SATA_MV=m +CONFIG_SATA_NV=m +CONFIG_SATA_PROMISE=m +CONFIG_SATA_SIL=m +CONFIG_SATA_SIS=m +CONFIG_SATA_SVW=m +CONFIG_SATA_ULI=m +CONFIG_SATA_VIA=m +CONFIG_SATA_VITESSE=m + +# +# PATA SFF controllers with BMDMA +# +CONFIG_PATA_ALI=m +CONFIG_PATA_AMD=m +CONFIG_PATA_ARTOP=m +CONFIG_PATA_ATIIXP=m +CONFIG_PATA_ATP867X=m +CONFIG_PATA_CMD64X=m +CONFIG_PATA_CYPRESS=m +CONFIG_PATA_EFAR=m +CONFIG_PATA_HPT366=m +CONFIG_PATA_HPT37X=m +CONFIG_PATA_HPT3X2N=m +CONFIG_PATA_HPT3X3=m +# CONFIG_PATA_HPT3X3_DMA is not set +CONFIG_PATA_IT8213=m +CONFIG_PATA_IT821X=m +CONFIG_PATA_JMICRON=m +CONFIG_PATA_MARVELL=m +CONFIG_PATA_NETCELL=m +CONFIG_PATA_NINJA32=m +CONFIG_PATA_NS87415=m +CONFIG_PATA_OLDPIIX=m +CONFIG_PATA_OPTIDMA=m +CONFIG_PATA_PDC2027X=m +CONFIG_PATA_PDC_OLD=m +CONFIG_PATA_RADISYS=m +CONFIG_PATA_RDC=m +CONFIG_PATA_SCH=m +CONFIG_PATA_SERVERWORKS=m +CONFIG_PATA_SIL680=m +CONFIG_PATA_SIS=y +CONFIG_PATA_TOSHIBA=m +CONFIG_PATA_TRIFLEX=m +CONFIG_PATA_VIA=m +CONFIG_PATA_WINBOND=m + +# +# PIO-only SFF controllers +# +CONFIG_PATA_CMD640_PCI=m +CONFIG_PATA_MPIIX=m +CONFIG_PATA_NS87410=m +CONFIG_PATA_OPTI=m +CONFIG_PATA_PCMCIA=m +CONFIG_PATA_PLATFORM=m +CONFIG_PATA_RZ1000=m + +# +# Generic fallback / legacy drivers +# +CONFIG_PATA_ACPI=m +CONFIG_ATA_GENERIC=y +CONFIG_PATA_LEGACY=m +CONFIG_MD=y +CONFIG_BLK_DEV_MD=y +CONFIG_MD_AUTODETECT=y +CONFIG_MD_LINEAR=m +CONFIG_MD_RAID0=m +CONFIG_MD_RAID1=m +CONFIG_MD_RAID10=m +CONFIG_MD_RAID456=m +CONFIG_MD_MULTIPATH=m +CONFIG_MD_FAULTY=m +CONFIG_MD_CLUSTER=m +CONFIG_BCACHE=m +# CONFIG_BCACHE_DEBUG is not set +# CONFIG_BCACHE_CLOSURES_DEBUG is not set +CONFIG_BLK_DEV_DM_BUILTIN=y +CONFIG_BLK_DEV_DM=y +# CONFIG_DM_MQ_DEFAULT is not set +# CONFIG_DM_DEBUG is not set +CONFIG_DM_BUFIO=m +# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set +CONFIG_DM_BIO_PRISON=m +CONFIG_DM_PERSISTENT_DATA=m +CONFIG_DM_UNSTRIPED=m +CONFIG_DM_CRYPT=m +CONFIG_DM_SNAPSHOT=m +CONFIG_DM_THIN_PROVISIONING=m +CONFIG_DM_CACHE=m +CONFIG_DM_CACHE_SMQ=m +CONFIG_DM_WRITECACHE=m +CONFIG_DM_ERA=m +CONFIG_DM_MIRROR=m +CONFIG_DM_LOG_USERSPACE=m +CONFIG_DM_RAID=m +CONFIG_DM_ZERO=m +CONFIG_DM_MULTIPATH=m +CONFIG_DM_MULTIPATH_QL=m +CONFIG_DM_MULTIPATH_ST=m +CONFIG_DM_DELAY=m +CONFIG_DM_UEVENT=y +CONFIG_DM_FLAKEY=m +CONFIG_DM_VERITY=m +# CONFIG_DM_VERITY_FEC is not set +CONFIG_DM_SWITCH=m +CONFIG_DM_LOG_WRITES=m +CONFIG_DM_INTEGRITY=m +CONFIG_DM_ZONED=m +CONFIG_TARGET_CORE=m +CONFIG_TCM_IBLOCK=m +CONFIG_TCM_FILEIO=m +CONFIG_TCM_PSCSI=m +CONFIG_TCM_USER2=m +CONFIG_LOOPBACK_TARGET=m +CONFIG_TCM_FC=m +CONFIG_ISCSI_TARGET=m +CONFIG_ISCSI_TARGET_CXGB4=m +CONFIG_SBP_TARGET=m +CONFIG_FUSION=y +CONFIG_FUSION_SPI=m +CONFIG_FUSION_FC=m +CONFIG_FUSION_SAS=m +CONFIG_FUSION_MAX_SGE=128 +CONFIG_FUSION_CTL=m +CONFIG_FUSION_LAN=m +CONFIG_FUSION_LOGGING=y + +# +# IEEE 1394 (FireWire) support +# +CONFIG_FIREWIRE=m +CONFIG_FIREWIRE_OHCI=m +CONFIG_FIREWIRE_SBP2=m +CONFIG_FIREWIRE_NET=m +CONFIG_FIREWIRE_NOSY=m +CONFIG_MACINTOSH_DRIVERS=y +CONFIG_MAC_EMUMOUSEBTN=m +CONFIG_NETDEVICES=y +CONFIG_MII=m +CONFIG_NET_CORE=y +CONFIG_BONDING=m +CONFIG_DUMMY=m +CONFIG_EQUALIZER=m +CONFIG_NET_FC=y +CONFIG_IFB=m +CONFIG_NET_TEAM=m +CONFIG_NET_TEAM_MODE_BROADCAST=m +CONFIG_NET_TEAM_MODE_ROUNDROBIN=m +CONFIG_NET_TEAM_MODE_RANDOM=m +CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m +CONFIG_NET_TEAM_MODE_LOADBALANCE=m +CONFIG_MACVLAN=m +CONFIG_MACVTAP=m +CONFIG_IPVLAN=m +CONFIG_IPVTAP=m +CONFIG_VXLAN=m +CONFIG_GENEVE=m +CONFIG_GTP=m +CONFIG_MACSEC=m +CONFIG_NETCONSOLE=m +CONFIG_NETCONSOLE_DYNAMIC=y +CONFIG_NETPOLL=y +CONFIG_NET_POLL_CONTROLLER=y +CONFIG_NTB_NETDEV=m +CONFIG_RIONET=m +CONFIG_RIONET_TX_SIZE=128 +CONFIG_RIONET_RX_SIZE=128 +CONFIG_TUN=y +CONFIG_TAP=m +# CONFIG_TUN_VNET_CROSS_LE is not set +CONFIG_VETH=m +CONFIG_VIRTIO_NET=y +CONFIG_NLMON=m +CONFIG_NET_VRF=m +CONFIG_VSOCKMON=m +CONFIG_SUNGEM_PHY=m +CONFIG_ARCNET=m +CONFIG_ARCNET_1201=m +CONFIG_ARCNET_1051=m +CONFIG_ARCNET_RAW=m +CONFIG_ARCNET_CAP=m +CONFIG_ARCNET_COM90xx=m +CONFIG_ARCNET_COM90xxIO=m +CONFIG_ARCNET_RIM_I=m +CONFIG_ARCNET_COM20020=m +CONFIG_ARCNET_COM20020_PCI=m +CONFIG_ARCNET_COM20020_CS=m +CONFIG_ATM_DRIVERS=y +CONFIG_ATM_DUMMY=m +CONFIG_ATM_TCP=m +CONFIG_ATM_LANAI=m +CONFIG_ATM_ENI=m +# CONFIG_ATM_ENI_DEBUG is not set +# CONFIG_ATM_ENI_TUNE_BURST is not set +CONFIG_ATM_FIRESTREAM=m +CONFIG_ATM_ZATM=m +# CONFIG_ATM_ZATM_DEBUG is not set +CONFIG_ATM_NICSTAR=m +# CONFIG_ATM_NICSTAR_USE_SUNI is not set +# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set +CONFIG_ATM_IDT77252=m +# CONFIG_ATM_IDT77252_DEBUG is not set +# CONFIG_ATM_IDT77252_RCV_ALL is not set +CONFIG_ATM_IDT77252_USE_SUNI=y +CONFIG_ATM_AMBASSADOR=m +# CONFIG_ATM_AMBASSADOR_DEBUG is not set +CONFIG_ATM_HORIZON=m +# CONFIG_ATM_HORIZON_DEBUG is not set +CONFIG_ATM_IA=m +# CONFIG_ATM_IA_DEBUG is not set +CONFIG_ATM_FORE200E=m +# CONFIG_ATM_FORE200E_USE_TASKLET is not set +CONFIG_ATM_FORE200E_TX_RETRY=16 +CONFIG_ATM_FORE200E_DEBUG=0 +CONFIG_ATM_HE=m +CONFIG_ATM_HE_USE_SUNI=y +CONFIG_ATM_SOLOS=m + +# +# CAIF transport drivers +# +CONFIG_CAIF_TTY=m +CONFIG_CAIF_SPI_SLAVE=m +# CONFIG_CAIF_SPI_SYNC is not set +CONFIG_CAIF_HSI=m +CONFIG_CAIF_VIRTIO=m + +# +# Distributed Switch Architecture drivers +# +CONFIG_B53=m +CONFIG_B53_SPI_DRIVER=m +CONFIG_B53_MDIO_DRIVER=m +CONFIG_B53_MMAP_DRIVER=m +CONFIG_B53_SRAB_DRIVER=m +CONFIG_NET_DSA_BCM_SF2=m +# CONFIG_NET_DSA_LOOP is not set +CONFIG_NET_DSA_MT7530=m +CONFIG_NET_DSA_MV88E6060=m +CONFIG_MICROCHIP_KSZ=m +CONFIG_MICROCHIP_KSZ_SPI_DRIVER=m +CONFIG_NET_DSA_MV88E6XXX=m +CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y +# CONFIG_NET_DSA_MV88E6XXX_PTP is not set +CONFIG_NET_DSA_QCA8K=m +CONFIG_NET_DSA_REALTEK_SMI=m +CONFIG_NET_DSA_SMSC_LAN9303=m +CONFIG_NET_DSA_SMSC_LAN9303_I2C=m +CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m +CONFIG_ETHERNET=y +CONFIG_MDIO=m +CONFIG_NET_VENDOR_3COM=y +CONFIG_PCMCIA_3C574=m +CONFIG_PCMCIA_3C589=m +CONFIG_VORTEX=m +CONFIG_TYPHOON=m +CONFIG_NET_VENDOR_ADAPTEC=y +CONFIG_ADAPTEC_STARFIRE=m +CONFIG_NET_VENDOR_AGERE=y +CONFIG_ET131X=m +CONFIG_NET_VENDOR_ALACRITECH=y +CONFIG_SLICOSS=m +CONFIG_NET_VENDOR_ALTEON=y +CONFIG_ACENIC=m +# CONFIG_ACENIC_OMIT_TIGON_I is not set +CONFIG_ALTERA_TSE=m +CONFIG_NET_VENDOR_AMAZON=y +CONFIG_ENA_ETHERNET=m +CONFIG_NET_VENDOR_AMD=y +CONFIG_AMD8111_ETH=m +CONFIG_PCNET32=m +CONFIG_PCMCIA_NMCLAN=m +CONFIG_AMD_XGBE=m +# CONFIG_AMD_XGBE_DCB is not set +CONFIG_AMD_XGBE_HAVE_ECC=y +CONFIG_NET_VENDOR_AQUANTIA=y +CONFIG_AQTION=m +CONFIG_NET_VENDOR_ARC=y +CONFIG_NET_VENDOR_ATHEROS=y +CONFIG_ATL2=m +CONFIG_ATL1=m +CONFIG_ATL1E=m +CONFIG_ATL1C=m +CONFIG_ALX=m +CONFIG_NET_VENDOR_AURORA=y +CONFIG_AURORA_NB8800=m +CONFIG_NET_VENDOR_BROADCOM=y +CONFIG_B44=m +CONFIG_B44_PCI_AUTOSELECT=y +CONFIG_B44_PCICORE_AUTOSELECT=y +CONFIG_B44_PCI=y +CONFIG_BCMGENET=m +CONFIG_BNX2=m +CONFIG_CNIC=m +CONFIG_TIGON3=m +CONFIG_TIGON3_HWMON=y +CONFIG_BNX2X=m +CONFIG_BNX2X_SRIOV=y +# CONFIG_SYSTEMPORT is not set +CONFIG_BNXT=m +CONFIG_BNXT_SRIOV=y +CONFIG_BNXT_FLOWER_OFFLOAD=y +# CONFIG_BNXT_DCB is not set +CONFIG_BNXT_HWMON=y +CONFIG_NET_VENDOR_BROCADE=y +CONFIG_BNA=m +CONFIG_NET_VENDOR_CADENCE=y +CONFIG_MACB=m +CONFIG_MACB_USE_HWSTAMP=y +CONFIG_MACB_PCI=m +CONFIG_NET_VENDOR_CAVIUM=y +CONFIG_THUNDER_NIC_PF=m +CONFIG_THUNDER_NIC_VF=m +CONFIG_THUNDER_NIC_BGX=m +CONFIG_THUNDER_NIC_RGX=m +CONFIG_CAVIUM_PTP=m +CONFIG_LIQUIDIO=m +CONFIG_LIQUIDIO_VF=m +CONFIG_NET_VENDOR_CHELSIO=y +CONFIG_CHELSIO_T1=m +CONFIG_CHELSIO_T1_1G=y +CONFIG_CHELSIO_T3=m +CONFIG_CHELSIO_T4=m +CONFIG_CHELSIO_T4_DCB=y +CONFIG_CHELSIO_T4_FCOE=y +CONFIG_CHELSIO_T4VF=m +CONFIG_CHELSIO_LIB=m +CONFIG_NET_VENDOR_CISCO=y +CONFIG_ENIC=m +# CONFIG_NET_VENDOR_CORTINA is not set +CONFIG_CX_ECAT=m +CONFIG_DNET=m +CONFIG_NET_VENDOR_DEC=y +CONFIG_NET_TULIP=y +CONFIG_DE2104X=m +CONFIG_DE2104X_DSL=0 +CONFIG_TULIP=m +# CONFIG_TULIP_MWI is not set +# CONFIG_TULIP_MMIO is not set +# CONFIG_TULIP_NAPI is not set +CONFIG_DE4X5=m +CONFIG_WINBOND_840=m +CONFIG_DM9102=m +CONFIG_ULI526X=m +CONFIG_PCMCIA_XIRCOM=m +CONFIG_NET_VENDOR_DLINK=y +CONFIG_DL2K=m +CONFIG_SUNDANCE=m +# CONFIG_SUNDANCE_MMIO is not set +CONFIG_NET_VENDOR_EMULEX=y +CONFIG_BE2NET=m +CONFIG_BE2NET_HWMON=y +CONFIG_BE2NET_BE2=y +CONFIG_BE2NET_BE3=y +CONFIG_BE2NET_LANCER=y +CONFIG_BE2NET_SKYHAWK=y +CONFIG_NET_VENDOR_EZCHIP=y +CONFIG_NET_VENDOR_FUJITSU=y +CONFIG_PCMCIA_FMVJ18X=m +CONFIG_NET_VENDOR_HP=y +CONFIG_HP100=m +CONFIG_NET_VENDOR_HUAWEI=y +CONFIG_HINIC=m +CONFIG_NET_VENDOR_I825XX=y +CONFIG_NET_VENDOR_INTEL=y +CONFIG_E100=m +CONFIG_E1000=m +CONFIG_E1000E=m +CONFIG_E1000E_HWTS=y +CONFIG_IGB=m +CONFIG_IGB_HWMON=y +CONFIG_IGB_DCA=y +CONFIG_IGBVF=m +CONFIG_IXGB=m +CONFIG_IXGBE=m +CONFIG_IXGBE_HWMON=y +CONFIG_IXGBE_DCA=y +CONFIG_IXGBE_DCB=y +CONFIG_IXGBEVF=m +CONFIG_I40E=m +CONFIG_I40E_DCB=y +CONFIG_I40EVF=m +CONFIG_ICE=m +CONFIG_FM10K=m +CONFIG_JME=m +CONFIG_NET_VENDOR_MARVELL=y +CONFIG_MVMDIO=m +CONFIG_SKGE=m +# CONFIG_SKGE_DEBUG is not set +CONFIG_SKGE_GENESIS=y +CONFIG_SKY2=m +# CONFIG_SKY2_DEBUG is not set +CONFIG_NET_VENDOR_MELLANOX=y +CONFIG_MLX4_EN=m +CONFIG_MLX4_EN_DCB=y +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +CONFIG_MLX4_CORE_GEN2=y +CONFIG_MLX5_CORE=m +# CONFIG_MLX5_FPGA is not set +CONFIG_MLX5_CORE_EN=y +CONFIG_MLX5_EN_ARFS=y +CONFIG_MLX5_EN_RXNFC=y +CONFIG_MLX5_MPFS=y +CONFIG_MLX5_ESWITCH=y +CONFIG_MLX5_CORE_EN_DCB=y +# CONFIG_MLX5_CORE_IPOIB is not set +CONFIG_MLXSW_CORE=m +CONFIG_MLXSW_CORE_HWMON=y +CONFIG_MLXSW_CORE_THERMAL=y +CONFIG_MLXSW_PCI=m +CONFIG_MLXSW_I2C=m +CONFIG_MLXSW_SWITCHIB=m +CONFIG_MLXSW_SWITCHX2=m +CONFIG_MLXSW_SPECTRUM=m +CONFIG_MLXSW_SPECTRUM_DCB=y +CONFIG_MLXSW_MINIMAL=m +CONFIG_MLXFW=m +CONFIG_NET_VENDOR_MICREL=y +CONFIG_KS8842=m +CONFIG_KS8851=m +CONFIG_KS8851_MLL=m +CONFIG_KSZ884X_PCI=m +CONFIG_NET_VENDOR_MICROCHIP=y +CONFIG_ENC28J60=m +# CONFIG_ENC28J60_WRITEVERIFY is not set +CONFIG_ENCX24J600=m +CONFIG_LAN743X=m +CONFIG_NET_VENDOR_MICROSEMI=y +CONFIG_MSCC_OCELOT_SWITCH=m +CONFIG_MSCC_OCELOT_SWITCH_OCELOT=m +CONFIG_NET_VENDOR_MYRI=y +CONFIG_MYRI10GE=m +CONFIG_MYRI10GE_DCA=y +CONFIG_FEALNX=m +CONFIG_NET_VENDOR_NATSEMI=y +CONFIG_NATSEMI=m +CONFIG_NS83820=m +CONFIG_NET_VENDOR_NETERION=y +CONFIG_S2IO=m +CONFIG_VXGE=m +# CONFIG_VXGE_DEBUG_TRACE_ALL is not set +CONFIG_NET_VENDOR_NETRONOME=y +CONFIG_NFP=m +# CONFIG_NFP_APP_FLOWER is not set +CONFIG_NFP_APP_ABM_NIC=y +# CONFIG_NFP_DEBUG is not set +CONFIG_NET_VENDOR_NI=y +CONFIG_NET_VENDOR_8390=y +CONFIG_PCMCIA_AXNET=m +CONFIG_NE2K_PCI=m +CONFIG_PCMCIA_PCNET=m +CONFIG_NET_VENDOR_NVIDIA=y +CONFIG_FORCEDETH=m +CONFIG_NET_VENDOR_OKI=y +CONFIG_ETHOC=m +CONFIG_NET_VENDOR_PACKET_ENGINES=y +CONFIG_HAMACHI=m +CONFIG_YELLOWFIN=m +CONFIG_NET_VENDOR_QLOGIC=y +CONFIG_QLA3XXX=m +CONFIG_QLCNIC=m +CONFIG_QLCNIC_SRIOV=y +CONFIG_QLCNIC_DCB=y +CONFIG_QLCNIC_HWMON=y +CONFIG_QLGE=m +CONFIG_NETXEN_NIC=m +CONFIG_QED=m +CONFIG_QED_LL2=y +CONFIG_QED_SRIOV=y +CONFIG_QEDE=m +CONFIG_QED_RDMA=y +CONFIG_QED_ISCSI=y +CONFIG_QED_FCOE=y +CONFIG_QED_OOO=y +CONFIG_NET_VENDOR_QUALCOMM=y +CONFIG_QCOM_EMAC=m +CONFIG_RMNET=m +CONFIG_NET_VENDOR_RDC=y +CONFIG_R6040=m +CONFIG_NET_VENDOR_REALTEK=y +CONFIG_ATP=m +CONFIG_8139CP=m +CONFIG_8139TOO=m +CONFIG_8139TOO_PIO=y +# CONFIG_8139TOO_TUNE_TWISTER is not set +CONFIG_8139TOO_8129=y +# CONFIG_8139_OLD_RX_RESET is not set +CONFIG_R8169=m +CONFIG_NET_VENDOR_RENESAS=y +CONFIG_NET_VENDOR_ROCKER=y +CONFIG_ROCKER=m +CONFIG_NET_VENDOR_SAMSUNG=y +CONFIG_SXGBE_ETH=m +CONFIG_NET_VENDOR_SEEQ=y +CONFIG_NET_VENDOR_SOLARFLARE=y +CONFIG_SFC=m +CONFIG_SFC_MTD=y +CONFIG_SFC_MCDI_MON=y +CONFIG_SFC_SRIOV=y +CONFIG_SFC_MCDI_LOGGING=y +CONFIG_SFC_FALCON=m +CONFIG_SFC_FALCON_MTD=y +CONFIG_NET_VENDOR_SILAN=y +CONFIG_SC92031=m +CONFIG_NET_VENDOR_SIS=y +CONFIG_SIS900=m +CONFIG_SIS190=m +CONFIG_NET_VENDOR_SMSC=y +CONFIG_PCMCIA_SMC91C92=m +CONFIG_EPIC100=m +CONFIG_SMSC911X=m +CONFIG_SMSC9420=m +# CONFIG_NET_VENDOR_SOCIONEXT is not set +CONFIG_NET_VENDOR_STMICRO=y +CONFIG_STMMAC_ETH=m +CONFIG_STMMAC_PLATFORM=m +CONFIG_DWMAC_GENERIC=m +# CONFIG_STMMAC_PCI is not set +CONFIG_NET_VENDOR_SUN=y +CONFIG_HAPPYMEAL=m +CONFIG_SUNGEM=m +CONFIG_CASSINI=m +CONFIG_NIU=m +CONFIG_NET_VENDOR_SYNOPSYS=y +CONFIG_DWC_XLGMAC=m +CONFIG_DWC_XLGMAC_PCI=m +CONFIG_NET_VENDOR_TEHUTI=y +CONFIG_TEHUTI=m +CONFIG_NET_VENDOR_TI=y +CONFIG_TI_CPSW_ALE=m +CONFIG_TLAN=m +CONFIG_NET_VENDOR_VIA=y +CONFIG_VIA_RHINE=m +CONFIG_VIA_RHINE_MMIO=y +CONFIG_VIA_VELOCITY=m +CONFIG_NET_VENDOR_WIZNET=y +CONFIG_WIZNET_W5100=m +CONFIG_WIZNET_W5300=m +# CONFIG_WIZNET_BUS_DIRECT is not set +# CONFIG_WIZNET_BUS_INDIRECT is not set +CONFIG_WIZNET_BUS_ANY=y +# CONFIG_WIZNET_W5100_SPI is not set +CONFIG_NET_VENDOR_XIRCOM=y +CONFIG_PCMCIA_XIRC2PS=m +CONFIG_FDDI=y +CONFIG_DEFXX=m +# CONFIG_DEFXX_MMIO is not set +CONFIG_SKFP=m +# CONFIG_HIPPI is not set +CONFIG_NET_SB1000=m +CONFIG_MDIO_DEVICE=y +CONFIG_MDIO_BUS=y +CONFIG_MDIO_BCM_UNIMAC=m +CONFIG_MDIO_BITBANG=m +CONFIG_MDIO_CAVIUM=m +CONFIG_MDIO_GPIO=m +CONFIG_MDIO_I2C=m +CONFIG_MDIO_MSCC_MIIM=m +CONFIG_MDIO_THUNDER=m +CONFIG_PHYLINK=m +CONFIG_PHYLIB=y +CONFIG_SWPHY=y +# CONFIG_LED_TRIGGER_PHY is not set + +# +# MII PHY device drivers +# +CONFIG_SFP=m +CONFIG_AMD_PHY=m +CONFIG_AQUANTIA_PHY=m +CONFIG_ASIX_PHY=m +CONFIG_AT803X_PHY=m +CONFIG_BCM7XXX_PHY=m +CONFIG_BCM87XX_PHY=m +CONFIG_BCM_NET_PHYLIB=m +CONFIG_BROADCOM_PHY=m +CONFIG_CICADA_PHY=m +CONFIG_CORTINA_PHY=m +CONFIG_DAVICOM_PHY=m +CONFIG_DP83822_PHY=m +CONFIG_DP83TC811_PHY=m +CONFIG_DP83848_PHY=m +CONFIG_DP83867_PHY=m +CONFIG_FIXED_PHY=y +CONFIG_ICPLUS_PHY=m +CONFIG_INTEL_XWAY_PHY=m +CONFIG_LSI_ET1011C_PHY=m +CONFIG_LXT_PHY=m +CONFIG_MARVELL_PHY=m +CONFIG_MARVELL_10G_PHY=m +CONFIG_MICREL_PHY=m +CONFIG_MICROCHIP_PHY=m +CONFIG_MICROCHIP_T1_PHY=m +CONFIG_MICROSEMI_PHY=m +CONFIG_NATIONAL_PHY=m +CONFIG_QSEMI_PHY=m +CONFIG_REALTEK_PHY=m +CONFIG_RENESAS_PHY=m +CONFIG_ROCKCHIP_PHY=m +CONFIG_SMSC_PHY=m +CONFIG_STE10XP=m +CONFIG_TERANETICS_PHY=m +CONFIG_VITESSE_PHY=m +CONFIG_XILINX_GMII2RGMII=m +CONFIG_MICREL_KS8995MA=m +CONFIG_PLIP=m +CONFIG_PPP=y +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_FILTER=y +CONFIG_PPP_MPPE=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPPOATM=m +CONFIG_PPPOE=m +CONFIG_PPTP=m +CONFIG_PPPOL2TP=m +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_SLIP=m +CONFIG_SLHC=y +CONFIG_SLIP_COMPRESSED=y +CONFIG_SLIP_SMART=y +CONFIG_SLIP_MODE_SLIP6=y +CONFIG_USB_NET_DRIVERS=m +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_RTL8152=m +CONFIG_USB_LAN78XX=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_AX88179_178A=m +CONFIG_USB_NET_CDCETHER=m +CONFIG_USB_NET_CDC_EEM=m +CONFIG_USB_NET_CDC_NCM=m +CONFIG_USB_NET_HUAWEI_CDC_NCM=m +CONFIG_USB_NET_CDC_MBIM=m +CONFIG_USB_NET_DM9601=m +CONFIG_USB_NET_SR9700=m +CONFIG_USB_NET_SR9800=m +CONFIG_USB_NET_SMSC75XX=m +CONFIG_USB_NET_SMSC95XX=m +CONFIG_USB_NET_GL620A=m +CONFIG_USB_NET_NET1080=m +CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_MCS7830=m +CONFIG_USB_NET_RNDIS_HOST=m +CONFIG_USB_NET_CDC_SUBSET_ENABLE=m +CONFIG_USB_NET_CDC_SUBSET=m +CONFIG_USB_ALI_M5632=y +CONFIG_USB_AN2720=y +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +CONFIG_USB_EPSON2888=y +CONFIG_USB_KC2190=y +CONFIG_USB_NET_ZAURUS=m +CONFIG_USB_NET_CX82310_ETH=m +CONFIG_USB_NET_KALMIA=m +CONFIG_USB_NET_QMI_WWAN=m +CONFIG_USB_HSO=m +CONFIG_USB_NET_INT51X1=m +CONFIG_USB_CDC_PHONET=m +CONFIG_USB_IPHETH=m +CONFIG_USB_SIERRA_NET=m +CONFIG_USB_VL600=m +CONFIG_USB_NET_CH9200=m +CONFIG_WLAN=y +# CONFIG_WIRELESS_WDS is not set +CONFIG_WLAN_VENDOR_ADMTEK=y +CONFIG_ADM8211=m +CONFIG_ATH_COMMON=m +CONFIG_WLAN_VENDOR_ATH=y +# CONFIG_ATH_DEBUG is not set +CONFIG_ATH5K=m +# CONFIG_ATH5K_DEBUG is not set +# CONFIG_ATH5K_TRACER is not set +CONFIG_ATH5K_PCI=y +CONFIG_ATH9K_HW=m +CONFIG_ATH9K_COMMON=m +CONFIG_ATH9K_COMMON_DEBUG=y +CONFIG_ATH9K_BTCOEX_SUPPORT=y +CONFIG_ATH9K=m +CONFIG_ATH9K_PCI=y +CONFIG_ATH9K_AHB=y +CONFIG_ATH9K_DEBUGFS=y +CONFIG_ATH9K_STATION_STATISTICS=y +# CONFIG_ATH9K_DYNACK is not set +CONFIG_ATH9K_WOW=y +CONFIG_ATH9K_RFKILL=y +CONFIG_ATH9K_CHANNEL_CONTEXT=y +CONFIG_ATH9K_PCOEM=y +CONFIG_ATH9K_HTC=m +CONFIG_ATH9K_HTC_DEBUGFS=y +CONFIG_ATH9K_HWRNG=y +# CONFIG_ATH9K_COMMON_SPECTRAL is not set +CONFIG_CARL9170=m +CONFIG_CARL9170_LEDS=y +# CONFIG_CARL9170_DEBUGFS is not set +CONFIG_CARL9170_WPC=y +CONFIG_CARL9170_HWRNG=y +CONFIG_ATH6KL=m +CONFIG_ATH6KL_SDIO=m +CONFIG_ATH6KL_USB=m +# CONFIG_ATH6KL_DEBUG is not set +# CONFIG_ATH6KL_TRACING is not set +CONFIG_AR5523=m +CONFIG_WIL6210=m +CONFIG_WIL6210_ISR_COR=y +CONFIG_WIL6210_TRACING=y +CONFIG_WIL6210_DEBUGFS=y +CONFIG_ATH10K=m +CONFIG_ATH10K_CE=y +CONFIG_ATH10K_PCI=m +CONFIG_ATH10K_SDIO=m +CONFIG_ATH10K_USB=m +# CONFIG_ATH10K_DEBUG is not set +CONFIG_ATH10K_DEBUGFS=y +# CONFIG_ATH10K_SPECTRAL is not set +CONFIG_ATH10K_TRACING=y +CONFIG_WCN36XX=m +# CONFIG_WCN36XX_DEBUGFS is not set +CONFIG_WLAN_VENDOR_ATMEL=y +CONFIG_ATMEL=m +CONFIG_PCI_ATMEL=m +CONFIG_PCMCIA_ATMEL=m +CONFIG_AT76C50X_USB=m +CONFIG_WLAN_VENDOR_BROADCOM=y +CONFIG_B43=m +CONFIG_B43_BCMA=y +CONFIG_B43_SSB=y +CONFIG_B43_BUSES_BCMA_AND_SSB=y +# CONFIG_B43_BUSES_BCMA is not set +# CONFIG_B43_BUSES_SSB is not set +CONFIG_B43_PCI_AUTOSELECT=y +CONFIG_B43_PCICORE_AUTOSELECT=y +# CONFIG_B43_SDIO is not set +CONFIG_B43_BCMA_PIO=y +CONFIG_B43_PIO=y +CONFIG_B43_PHY_G=y +CONFIG_B43_PHY_N=y +CONFIG_B43_PHY_LP=y +CONFIG_B43_PHY_HT=y +CONFIG_B43_LEDS=y +CONFIG_B43_HWRNG=y +# CONFIG_B43_DEBUG is not set +CONFIG_B43LEGACY=m +CONFIG_B43LEGACY_PCI_AUTOSELECT=y +CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y +CONFIG_B43LEGACY_LEDS=y +CONFIG_B43LEGACY_HWRNG=y +# CONFIG_B43LEGACY_DEBUG is not set +CONFIG_B43LEGACY_DMA=y +CONFIG_B43LEGACY_PIO=y +CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y +# CONFIG_B43LEGACY_DMA_MODE is not set +# CONFIG_B43LEGACY_PIO_MODE is not set +CONFIG_BRCMUTIL=m +CONFIG_BRCMSMAC=m +CONFIG_BRCMFMAC=m +CONFIG_BRCMFMAC_PROTO_BCDC=y +CONFIG_BRCMFMAC_PROTO_MSGBUF=y +CONFIG_BRCMFMAC_SDIO=y +CONFIG_BRCMFMAC_USB=y +CONFIG_BRCMFMAC_PCIE=y +CONFIG_BRCM_TRACING=y +# CONFIG_BRCMDBG is not set +CONFIG_WLAN_VENDOR_CISCO=y +CONFIG_AIRO=m +CONFIG_AIRO_CS=m +CONFIG_WLAN_VENDOR_INTEL=y +CONFIG_IPW2100=m +CONFIG_IPW2100_MONITOR=y +# CONFIG_IPW2100_DEBUG is not set +CONFIG_IPW2200=m +CONFIG_IPW2200_MONITOR=y +CONFIG_IPW2200_RADIOTAP=y +CONFIG_IPW2200_PROMISCUOUS=y +CONFIG_IPW2200_QOS=y +# CONFIG_IPW2200_DEBUG is not set +CONFIG_LIBIPW=m +# CONFIG_LIBIPW_DEBUG is not set +CONFIG_IWLEGACY=m +CONFIG_IWL4965=m +CONFIG_IWL3945=m + +# +# iwl3945 / iwl4965 Debugging Options +# +# CONFIG_IWLEGACY_DEBUG is not set +CONFIG_IWLEGACY_DEBUGFS=y +CONFIG_IWLWIFI=m +CONFIG_IWLWIFI_LEDS=y +CONFIG_IWLDVM=m +CONFIG_IWLMVM=m +CONFIG_IWLWIFI_OPMODE_MODULAR=y +# CONFIG_IWLWIFI_BCAST_FILTERING is not set +# CONFIG_IWLWIFI_PCIE_RTPM is not set + +# +# Debugging Options +# +# CONFIG_IWLWIFI_DEBUG is not set +CONFIG_IWLWIFI_DEBUGFS=y +CONFIG_IWLWIFI_DEVICE_TRACING=y +CONFIG_WLAN_VENDOR_INTERSIL=y +CONFIG_HOSTAP=m +CONFIG_HOSTAP_FIRMWARE=y +CONFIG_HOSTAP_FIRMWARE_NVRAM=y +CONFIG_HOSTAP_PLX=m +CONFIG_HOSTAP_PCI=m +CONFIG_HOSTAP_CS=m +CONFIG_HERMES=m +# CONFIG_HERMES_PRISM is not set +CONFIG_HERMES_CACHE_FW_ON_INIT=y +CONFIG_PLX_HERMES=m +CONFIG_TMD_HERMES=m +CONFIG_NORTEL_HERMES=m +CONFIG_PCMCIA_HERMES=m +CONFIG_PCMCIA_SPECTRUM=m +CONFIG_ORINOCO_USB=m +CONFIG_P54_COMMON=m +CONFIG_P54_USB=m +CONFIG_P54_PCI=m +CONFIG_P54_SPI=m +# CONFIG_P54_SPI_DEFAULT_EEPROM is not set +CONFIG_P54_LEDS=y +# CONFIG_PRISM54 is not set +CONFIG_WLAN_VENDOR_MARVELL=y +CONFIG_LIBERTAS=m +CONFIG_LIBERTAS_USB=m +CONFIG_LIBERTAS_CS=m +CONFIG_LIBERTAS_SDIO=m +CONFIG_LIBERTAS_SPI=m +# CONFIG_LIBERTAS_DEBUG is not set +CONFIG_LIBERTAS_MESH=y +CONFIG_LIBERTAS_THINFIRM=m +# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set +CONFIG_LIBERTAS_THINFIRM_USB=m +CONFIG_MWIFIEX=m +CONFIG_MWIFIEX_SDIO=m +CONFIG_MWIFIEX_PCIE=m +CONFIG_MWIFIEX_USB=m +CONFIG_MWL8K=m +CONFIG_WLAN_VENDOR_MEDIATEK=y +CONFIG_MT7601U=m +CONFIG_MT76_CORE=m +CONFIG_MT76_USB=m +CONFIG_MT76x2_COMMON=m +CONFIG_MT76x0U=m +CONFIG_MT76x2E=m +CONFIG_MT76x2U=m +CONFIG_WLAN_VENDOR_RALINK=y +CONFIG_RT2X00=m +CONFIG_RT2400PCI=m +CONFIG_RT2500PCI=m +CONFIG_RT61PCI=m +CONFIG_RT2800PCI=m +CONFIG_RT2800PCI_RT33XX=y +CONFIG_RT2800PCI_RT35XX=y +CONFIG_RT2800PCI_RT53XX=y +CONFIG_RT2800PCI_RT3290=y +CONFIG_RT2500USB=m +CONFIG_RT73USB=m +CONFIG_RT2800USB=m +CONFIG_RT2800USB_RT33XX=y +CONFIG_RT2800USB_RT35XX=y +CONFIG_RT2800USB_RT3573=y +CONFIG_RT2800USB_RT53XX=y +CONFIG_RT2800USB_RT55XX=y +CONFIG_RT2800USB_UNKNOWN=y +CONFIG_RT2800_LIB=m +CONFIG_RT2800_LIB_MMIO=m +CONFIG_RT2X00_LIB_MMIO=m +CONFIG_RT2X00_LIB_PCI=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_CRYPTO=y +CONFIG_RT2X00_LIB_LEDS=y +# CONFIG_RT2X00_LIB_DEBUGFS is not set +# CONFIG_RT2X00_DEBUG is not set +CONFIG_WLAN_VENDOR_REALTEK=y +CONFIG_RTL8180=m +CONFIG_RTL8187=m +CONFIG_RTL8187_LEDS=y +CONFIG_RTL_CARDS=m +CONFIG_RTL8192CE=m +CONFIG_RTL8192SE=m +CONFIG_RTL8192DE=m +CONFIG_RTL8723AE=m +CONFIG_RTL8723BE=m +CONFIG_RTL8188EE=m +CONFIG_RTL8192EE=m +CONFIG_RTL8821AE=m +CONFIG_RTL8192CU=m +CONFIG_RTLWIFI=m +CONFIG_RTLWIFI_PCI=m +CONFIG_RTLWIFI_USB=m +# CONFIG_RTLWIFI_DEBUG is not set +CONFIG_RTL8192C_COMMON=m +CONFIG_RTL8723_COMMON=m +CONFIG_RTLBTCOEXIST=m +CONFIG_RTL8XXXU=m +CONFIG_RTL8XXXU_UNTESTED=y +CONFIG_WLAN_VENDOR_RSI=y +CONFIG_RSI_91X=m +# CONFIG_RSI_DEBUGFS is not set +CONFIG_RSI_SDIO=m +CONFIG_RSI_USB=m +CONFIG_RSI_COEX=y +CONFIG_WLAN_VENDOR_ST=y +CONFIG_CW1200=m +CONFIG_CW1200_WLAN_SDIO=m +CONFIG_CW1200_WLAN_SPI=m +CONFIG_WLAN_VENDOR_TI=y +CONFIG_WL1251=m +CONFIG_WL1251_SPI=m +CONFIG_WL1251_SDIO=m +CONFIG_WL12XX=m +CONFIG_WL18XX=m +CONFIG_WLCORE=m +CONFIG_WLCORE_SDIO=m +CONFIG_WILINK_PLATFORM_DATA=y +CONFIG_WLAN_VENDOR_ZYDAS=y +CONFIG_USB_ZD1201=m +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set +CONFIG_WLAN_VENDOR_QUANTENNA=y +CONFIG_QTNFMAC=m +CONFIG_QTNFMAC_PEARL_PCIE=m +CONFIG_PCMCIA_RAYCS=m +CONFIG_PCMCIA_WL3501=m +CONFIG_MAC80211_HWSIM=m +CONFIG_USB_NET_RNDIS_WLAN=m + +# +# WiMAX Wireless Broadband devices +# +CONFIG_WIMAX_I2400M=m +CONFIG_WIMAX_I2400M_USB=m +CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 +CONFIG_WAN=y +CONFIG_LANMEDIA=m +CONFIG_HDLC=m +CONFIG_HDLC_RAW=m +CONFIG_HDLC_RAW_ETH=m +CONFIG_HDLC_CISCO=m +CONFIG_HDLC_FR=m +CONFIG_HDLC_PPP=m +CONFIG_HDLC_X25=m +CONFIG_PCI200SYN=m +CONFIG_WANXL=m +CONFIG_PC300TOO=m +CONFIG_FARSYNC=m +CONFIG_DSCC4=m +CONFIG_DSCC4_PCISYNC=y +CONFIG_DSCC4_PCI_RST=y +CONFIG_DLCI=m +CONFIG_DLCI_MAX=8 +CONFIG_LAPBETHER=m +CONFIG_X25_ASY=m +CONFIG_SBNI=m +# CONFIG_SBNI_MULTILINE is not set +CONFIG_IEEE802154_DRIVERS=m +CONFIG_IEEE802154_FAKELB=m +CONFIG_IEEE802154_AT86RF230=m +CONFIG_IEEE802154_AT86RF230_DEBUGFS=y +CONFIG_IEEE802154_MRF24J40=m +CONFIG_IEEE802154_CC2520=m +CONFIG_IEEE802154_ATUSB=m +CONFIG_IEEE802154_ADF7242=m +CONFIG_IEEE802154_CA8210=m +# CONFIG_IEEE802154_CA8210_DEBUGFS is not set +CONFIG_IEEE802154_MCR20A=m +# CONFIG_IEEE802154_HWSIM is not set +CONFIG_XEN_NETDEV_FRONTEND=y +CONFIG_XEN_NETDEV_BACKEND=m +CONFIG_VMXNET3=m +CONFIG_FUJITSU_ES=m +CONFIG_THUNDERBOLT_NET=m +CONFIG_HYPERV_NET=m +CONFIG_NETDEVSIM=m +CONFIG_NET_FAILOVER=y +CONFIG_ISDN=y +CONFIG_ISDN_I4L=m +CONFIG_ISDN_PPP=y +CONFIG_ISDN_PPP_VJ=y +CONFIG_ISDN_MPP=y +CONFIG_IPPP_FILTER=y +CONFIG_ISDN_PPP_BSDCOMP=m +CONFIG_ISDN_AUDIO=y +CONFIG_ISDN_TTY_FAX=y +CONFIG_ISDN_X25=y + +# +# ISDN feature submodules +# +CONFIG_ISDN_DIVERSION=m + +# +# ISDN4Linux hardware drivers +# + +# +# Passive cards +# +CONFIG_ISDN_DRV_HISAX=m + +# +# D-channel protocol features +# +CONFIG_HISAX_EURO=y +CONFIG_DE_AOC=y +# CONFIG_HISAX_NO_SENDCOMPLETE is not set +# CONFIG_HISAX_NO_LLC is not set +# CONFIG_HISAX_NO_KEYPAD is not set +CONFIG_HISAX_1TR6=y +CONFIG_HISAX_NI1=y +CONFIG_HISAX_MAX_CARDS=8 + +# +# HiSax supported cards +# +CONFIG_HISAX_16_3=y +CONFIG_HISAX_TELESPCI=y +CONFIG_HISAX_S0BOX=y +CONFIG_HISAX_FRITZPCI=y +CONFIG_HISAX_AVM_A1_PCMCIA=y +CONFIG_HISAX_ELSA=y +CONFIG_HISAX_DIEHLDIVA=y +CONFIG_HISAX_SEDLBAUER=y +CONFIG_HISAX_NETJET=y +CONFIG_HISAX_NETJET_U=y +CONFIG_HISAX_NICCY=y +CONFIG_HISAX_BKM_A4T=y +CONFIG_HISAX_SCT_QUADRO=y +CONFIG_HISAX_GAZEL=y +CONFIG_HISAX_HFC_PCI=y +CONFIG_HISAX_W6692=y +CONFIG_HISAX_HFC_SX=y +CONFIG_HISAX_ENTERNOW_PCI=y +# CONFIG_HISAX_DEBUG is not set + +# +# HiSax PCMCIA card service modules +# +CONFIG_HISAX_SEDLBAUER_CS=m +CONFIG_HISAX_ELSA_CS=m +CONFIG_HISAX_AVM_A1_CS=m +CONFIG_HISAX_TELES_CS=m + +# +# HiSax sub driver modules +# +CONFIG_HISAX_ST5481=m +CONFIG_HISAX_HFCUSB=m +CONFIG_HISAX_HFC4S8S=m +CONFIG_HISAX_FRITZ_PCIPNP=m +CONFIG_ISDN_CAPI=m +CONFIG_CAPI_TRACE=y +CONFIG_ISDN_CAPI_CAPI20=m +CONFIG_ISDN_CAPI_MIDDLEWARE=y +CONFIG_ISDN_CAPI_CAPIDRV=m +# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set + +# +# CAPI hardware drivers +# +CONFIG_CAPI_AVM=y +CONFIG_ISDN_DRV_AVMB1_B1PCI=m +CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y +CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m +CONFIG_ISDN_DRV_AVMB1_AVM_CS=m +CONFIG_ISDN_DRV_AVMB1_T1PCI=m +CONFIG_ISDN_DRV_AVMB1_C4=m +CONFIG_CAPI_EICON=y +CONFIG_ISDN_DIVAS=m +CONFIG_ISDN_DIVAS_BRIPCI=y +CONFIG_ISDN_DIVAS_PRIPCI=y +CONFIG_ISDN_DIVAS_DIVACAPI=m +CONFIG_ISDN_DIVAS_USERIDI=m +CONFIG_ISDN_DIVAS_MAINT=m +CONFIG_ISDN_DRV_GIGASET=m +# CONFIG_GIGASET_CAPI is not set +CONFIG_GIGASET_I4L=y +CONFIG_GIGASET_BASE=m +CONFIG_GIGASET_M105=m +CONFIG_GIGASET_M101=m +# CONFIG_GIGASET_DEBUG is not set +CONFIG_HYSDN=m +CONFIG_HYSDN_CAPI=y +CONFIG_MISDN=m +CONFIG_MISDN_DSP=m +CONFIG_MISDN_L1OIP=m + +# +# mISDN hardware drivers +# +CONFIG_MISDN_HFCPCI=m +CONFIG_MISDN_HFCMULTI=m +CONFIG_MISDN_HFCUSB=m +CONFIG_MISDN_AVMFRITZ=m +CONFIG_MISDN_SPEEDFAX=m +CONFIG_MISDN_INFINEON=m +CONFIG_MISDN_W6692=m +CONFIG_MISDN_NETJET=m +CONFIG_MISDN_IPAC=m +CONFIG_MISDN_ISAR=m +CONFIG_ISDN_HDLC=m +CONFIG_NVM=y +CONFIG_NVM_PBLK=m +# CONFIG_NVM_PBLK_DEBUG is not set + +# +# Input device support +# +CONFIG_INPUT=y +CONFIG_INPUT_LEDS=m +CONFIG_INPUT_FF_MEMLESS=m +CONFIG_INPUT_POLLDEV=m +CONFIG_INPUT_SPARSEKMAP=m +CONFIG_INPUT_MATRIXKMAP=m + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +CONFIG_INPUT_JOYDEV=m +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +CONFIG_KEYBOARD_ADC=m +CONFIG_KEYBOARD_ADP5520=m +CONFIG_KEYBOARD_ADP5588=m +CONFIG_KEYBOARD_ADP5589=m +CONFIG_KEYBOARD_ATKBD=y +CONFIG_KEYBOARD_QT1070=m +CONFIG_KEYBOARD_QT2160=m +CONFIG_KEYBOARD_DLINK_DIR685=m +CONFIG_KEYBOARD_LKKBD=m +CONFIG_KEYBOARD_GPIO=m +CONFIG_KEYBOARD_GPIO_POLLED=m +CONFIG_KEYBOARD_TCA6416=m +CONFIG_KEYBOARD_TCA8418=m +CONFIG_KEYBOARD_MATRIX=m +CONFIG_KEYBOARD_LM8323=m +CONFIG_KEYBOARD_LM8333=m +CONFIG_KEYBOARD_MAX7359=m +CONFIG_KEYBOARD_MCS=m +CONFIG_KEYBOARD_MPR121=m +CONFIG_KEYBOARD_NEWTON=m +CONFIG_KEYBOARD_OPENCORES=m +CONFIG_KEYBOARD_SAMSUNG=m +CONFIG_KEYBOARD_STOWAWAY=m +CONFIG_KEYBOARD_SUNKBD=m +CONFIG_KEYBOARD_TM2_TOUCHKEY=m +CONFIG_KEYBOARD_TWL4030=m +CONFIG_KEYBOARD_XTKBD=m +CONFIG_KEYBOARD_CROS_EC=m +CONFIG_KEYBOARD_MTK_PMIC=m +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=m +CONFIG_MOUSE_PS2_ALPS=y +CONFIG_MOUSE_PS2_BYD=y +CONFIG_MOUSE_PS2_LOGIPS2PP=y +CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y +CONFIG_MOUSE_PS2_CYPRESS=y +CONFIG_MOUSE_PS2_LIFEBOOK=y +CONFIG_MOUSE_PS2_TRACKPOINT=y +CONFIG_MOUSE_PS2_ELANTECH=y +CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y +CONFIG_MOUSE_PS2_SENTELIC=y +CONFIG_MOUSE_PS2_TOUCHKIT=y +CONFIG_MOUSE_PS2_FOCALTECH=y +CONFIG_MOUSE_PS2_VMMOUSE=y +CONFIG_MOUSE_PS2_SMBUS=y +CONFIG_MOUSE_SERIAL=m +CONFIG_MOUSE_APPLETOUCH=m +CONFIG_MOUSE_BCM5974=m +CONFIG_MOUSE_CYAPA=m +CONFIG_MOUSE_ELAN_I2C=m +CONFIG_MOUSE_ELAN_I2C_I2C=y +CONFIG_MOUSE_ELAN_I2C_SMBUS=y +CONFIG_MOUSE_VSXXXAA=m +CONFIG_MOUSE_GPIO=m +CONFIG_MOUSE_SYNAPTICS_I2C=m +CONFIG_MOUSE_SYNAPTICS_USB=m +CONFIG_INPUT_JOYSTICK=y +CONFIG_JOYSTICK_ANALOG=m +CONFIG_JOYSTICK_A3D=m +CONFIG_JOYSTICK_ADI=m +CONFIG_JOYSTICK_COBRA=m +CONFIG_JOYSTICK_GF2K=m +CONFIG_JOYSTICK_GRIP=m +CONFIG_JOYSTICK_GRIP_MP=m +CONFIG_JOYSTICK_GUILLEMOT=m +CONFIG_JOYSTICK_INTERACT=m +CONFIG_JOYSTICK_SIDEWINDER=m +CONFIG_JOYSTICK_TMDC=m +CONFIG_JOYSTICK_IFORCE=m +CONFIG_JOYSTICK_IFORCE_USB=y +CONFIG_JOYSTICK_IFORCE_232=y +CONFIG_JOYSTICK_WARRIOR=m +CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_SPACEORB=m +CONFIG_JOYSTICK_SPACEBALL=m +CONFIG_JOYSTICK_STINGER=m +CONFIG_JOYSTICK_TWIDJOY=m +CONFIG_JOYSTICK_ZHENHUA=m +CONFIG_JOYSTICK_DB9=m +CONFIG_JOYSTICK_GAMECON=m +CONFIG_JOYSTICK_TURBOGRAFX=m +CONFIG_JOYSTICK_AS5011=m +CONFIG_JOYSTICK_JOYDUMP=m +CONFIG_JOYSTICK_XPAD=m +CONFIG_JOYSTICK_XPAD_FF=y +CONFIG_JOYSTICK_XPAD_LEDS=y +CONFIG_JOYSTICK_WALKERA0701=m +CONFIG_JOYSTICK_PSXPAD_SPI=m +# CONFIG_JOYSTICK_PSXPAD_SPI_FF is not set +CONFIG_JOYSTICK_PXRC=m +CONFIG_INPUT_TABLET=y +CONFIG_TABLET_USB_ACECAD=m +CONFIG_TABLET_USB_AIPTEK=m +CONFIG_TABLET_USB_GTCO=m +CONFIG_TABLET_USB_HANWANG=m +CONFIG_TABLET_USB_KBTAB=m +CONFIG_TABLET_USB_PEGASUS=m +CONFIG_TABLET_SERIAL_WACOM4=m +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_PROPERTIES=y +CONFIG_TOUCHSCREEN_88PM860X=m +CONFIG_TOUCHSCREEN_ADS7846=m +CONFIG_TOUCHSCREEN_AD7877=m +CONFIG_TOUCHSCREEN_AD7879=m +CONFIG_TOUCHSCREEN_AD7879_I2C=m +CONFIG_TOUCHSCREEN_AD7879_SPI=m +CONFIG_TOUCHSCREEN_ADC=m +CONFIG_TOUCHSCREEN_ATMEL_MXT=m +# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set +CONFIG_TOUCHSCREEN_AUO_PIXCIR=m +CONFIG_TOUCHSCREEN_BU21013=m +CONFIG_TOUCHSCREEN_BU21029=m +CONFIG_TOUCHSCREEN_CHIPONE_ICN8505=m +CONFIG_TOUCHSCREEN_CY8CTMG110=m +CONFIG_TOUCHSCREEN_CYTTSP_CORE=m +CONFIG_TOUCHSCREEN_CYTTSP_I2C=m +CONFIG_TOUCHSCREEN_CYTTSP_SPI=m +CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m +CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m +CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m +CONFIG_TOUCHSCREEN_DA9034=m +CONFIG_TOUCHSCREEN_DA9052=m +CONFIG_TOUCHSCREEN_DYNAPRO=m +CONFIG_TOUCHSCREEN_HAMPSHIRE=m +CONFIG_TOUCHSCREEN_EETI=m +CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m +CONFIG_TOUCHSCREEN_EXC3000=m +CONFIG_TOUCHSCREEN_FUJITSU=m +CONFIG_TOUCHSCREEN_GOODIX=m +CONFIG_TOUCHSCREEN_HIDEEP=m +CONFIG_TOUCHSCREEN_ILI210X=m +CONFIG_TOUCHSCREEN_S6SY761=m +CONFIG_TOUCHSCREEN_GUNZE=m +CONFIG_TOUCHSCREEN_EKTF2127=m +CONFIG_TOUCHSCREEN_ELAN=m +CONFIG_TOUCHSCREEN_ELO=m +CONFIG_TOUCHSCREEN_WACOM_W8001=m +CONFIG_TOUCHSCREEN_WACOM_I2C=m +CONFIG_TOUCHSCREEN_MAX11801=m +CONFIG_TOUCHSCREEN_MCS5000=m +CONFIG_TOUCHSCREEN_MMS114=m +CONFIG_TOUCHSCREEN_MELFAS_MIP4=m +CONFIG_TOUCHSCREEN_MTOUCH=m +CONFIG_TOUCHSCREEN_INEXIO=m +CONFIG_TOUCHSCREEN_MK712=m +CONFIG_TOUCHSCREEN_PENMOUNT=m +CONFIG_TOUCHSCREEN_EDT_FT5X06=m +CONFIG_TOUCHSCREEN_TOUCHRIGHT=m +CONFIG_TOUCHSCREEN_TOUCHWIN=m +CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m +CONFIG_TOUCHSCREEN_UCB1400=m +CONFIG_TOUCHSCREEN_PIXCIR=m +CONFIG_TOUCHSCREEN_WDT87XX_I2C=m +CONFIG_TOUCHSCREEN_WM831X=m +CONFIG_TOUCHSCREEN_WM97XX=m +CONFIG_TOUCHSCREEN_WM9705=y +CONFIG_TOUCHSCREEN_WM9712=y +CONFIG_TOUCHSCREEN_WM9713=y +CONFIG_TOUCHSCREEN_USB_COMPOSITE=m +CONFIG_TOUCHSCREEN_MC13783=m +CONFIG_TOUCHSCREEN_USB_EGALAX=y +CONFIG_TOUCHSCREEN_USB_PANJIT=y +CONFIG_TOUCHSCREEN_USB_3M=y +CONFIG_TOUCHSCREEN_USB_ITM=y +CONFIG_TOUCHSCREEN_USB_ETURBO=y +CONFIG_TOUCHSCREEN_USB_GUNZE=y +CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y +CONFIG_TOUCHSCREEN_USB_IRTOUCH=y +CONFIG_TOUCHSCREEN_USB_IDEALTEK=y +CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y +CONFIG_TOUCHSCREEN_USB_GOTOP=y +CONFIG_TOUCHSCREEN_USB_JASTEC=y +CONFIG_TOUCHSCREEN_USB_ELO=y +CONFIG_TOUCHSCREEN_USB_E2I=y +CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y +CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y +CONFIG_TOUCHSCREEN_USB_NEXIO=y +CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y +CONFIG_TOUCHSCREEN_TOUCHIT213=m +CONFIG_TOUCHSCREEN_TSC_SERIO=m +CONFIG_TOUCHSCREEN_TSC200X_CORE=m +CONFIG_TOUCHSCREEN_TSC2004=m +CONFIG_TOUCHSCREEN_TSC2005=m +CONFIG_TOUCHSCREEN_TSC2007=m +# CONFIG_TOUCHSCREEN_TSC2007_IIO is not set +CONFIG_TOUCHSCREEN_PCAP=m +CONFIG_TOUCHSCREEN_RM_TS=m +CONFIG_TOUCHSCREEN_SILEAD=m +CONFIG_TOUCHSCREEN_SIS_I2C=m +CONFIG_TOUCHSCREEN_ST1232=m +CONFIG_TOUCHSCREEN_STMFTS=m +CONFIG_TOUCHSCREEN_SUR40=m +CONFIG_TOUCHSCREEN_SURFACE3_SPI=m +CONFIG_TOUCHSCREEN_SX8654=m +CONFIG_TOUCHSCREEN_TPS6507X=m +CONFIG_TOUCHSCREEN_ZET6223=m +CONFIG_TOUCHSCREEN_ZFORCE=m +CONFIG_TOUCHSCREEN_ROHM_BU21023=m +CONFIG_INPUT_MISC=y +CONFIG_INPUT_88PM860X_ONKEY=m +CONFIG_INPUT_88PM80X_ONKEY=m +CONFIG_INPUT_AD714X=m +CONFIG_INPUT_AD714X_I2C=m +CONFIG_INPUT_AD714X_SPI=m +CONFIG_INPUT_ARIZONA_HAPTICS=m +CONFIG_INPUT_BMA150=m +CONFIG_INPUT_E3X0_BUTTON=m +CONFIG_INPUT_PCSPKR=m +CONFIG_INPUT_MAX77693_HAPTIC=m +CONFIG_INPUT_MAX8925_ONKEY=m +CONFIG_INPUT_MAX8997_HAPTIC=m +CONFIG_INPUT_MC13783_PWRBUTTON=m +CONFIG_INPUT_MMA8450=m +CONFIG_INPUT_APANEL=m +CONFIG_INPUT_GP2A=m +CONFIG_INPUT_GPIO_BEEPER=m +CONFIG_INPUT_GPIO_DECODER=m +CONFIG_INPUT_ATLAS_BTNS=m +CONFIG_INPUT_ATI_REMOTE2=m +CONFIG_INPUT_KEYSPAN_REMOTE=m +CONFIG_INPUT_KXTJ9=m +# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set +CONFIG_INPUT_POWERMATE=m +CONFIG_INPUT_YEALINK=m +CONFIG_INPUT_CM109=m +CONFIG_INPUT_REGULATOR_HAPTIC=m +CONFIG_INPUT_RETU_PWRBUTTON=m +CONFIG_INPUT_AXP20X_PEK=m +CONFIG_INPUT_TWL4030_PWRBUTTON=m +CONFIG_INPUT_TWL4030_VIBRA=m +CONFIG_INPUT_TWL6040_VIBRA=m +CONFIG_INPUT_UINPUT=y +CONFIG_INPUT_PALMAS_PWRBUTTON=m +CONFIG_INPUT_PCF50633_PMU=m +CONFIG_INPUT_PCF8574=m +CONFIG_INPUT_PWM_BEEPER=m +CONFIG_INPUT_PWM_VIBRA=m +CONFIG_INPUT_GPIO_ROTARY_ENCODER=m +CONFIG_INPUT_DA9052_ONKEY=m +CONFIG_INPUT_DA9055_ONKEY=m +CONFIG_INPUT_DA9063_ONKEY=m +CONFIG_INPUT_WM831X_ON=m +CONFIG_INPUT_PCAP=m +CONFIG_INPUT_ADXL34X=m +CONFIG_INPUT_ADXL34X_I2C=m +CONFIG_INPUT_ADXL34X_SPI=m +CONFIG_INPUT_IMS_PCU=m +CONFIG_INPUT_CMA3000=m +CONFIG_INPUT_CMA3000_I2C=m +CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m +CONFIG_INPUT_IDEAPAD_SLIDEBAR=m +CONFIG_INPUT_SOC_BUTTON_ARRAY=m +CONFIG_INPUT_DRV260X_HAPTICS=m +CONFIG_INPUT_DRV2665_HAPTICS=m +CONFIG_INPUT_DRV2667_HAPTICS=m +CONFIG_INPUT_RAVE_SP_PWRBUTTON=m +CONFIG_RMI4_CORE=m +CONFIG_RMI4_I2C=m +CONFIG_RMI4_SPI=m +CONFIG_RMI4_SMB=m +CONFIG_RMI4_F03=y +CONFIG_RMI4_F03_SERIO=m +CONFIG_RMI4_2D_SENSOR=y +CONFIG_RMI4_F11=y +CONFIG_RMI4_F12=y +CONFIG_RMI4_F30=y +# CONFIG_RMI4_F34 is not set +# CONFIG_RMI4_F54 is not set +CONFIG_RMI4_F55=y + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y +CONFIG_SERIO_I8042=y +CONFIG_SERIO_SERPORT=m +CONFIG_SERIO_CT82C710=m +CONFIG_SERIO_PARKBD=m +CONFIG_SERIO_PCIPS2=m +CONFIG_SERIO_LIBPS2=y +CONFIG_SERIO_RAW=m +CONFIG_SERIO_ALTERA_PS2=m +CONFIG_SERIO_PS2MULT=m +CONFIG_SERIO_ARC_PS2=m +CONFIG_HYPERV_KEYBOARD=m +CONFIG_SERIO_GPIO_PS2=m +CONFIG_USERIO=m +CONFIG_GAMEPORT=m +CONFIG_GAMEPORT_NS558=m +CONFIG_GAMEPORT_L4=m +CONFIG_GAMEPORT_EMU10K1=m +CONFIG_GAMEPORT_FM801=m + +# +# Character devices +# +CONFIG_TTY=y +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_VT_CONSOLE_SLEEP=y +CONFIG_HW_CONSOLE=y +CONFIG_VT_HW_CONSOLE_BINDING=y +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=0 +CONFIG_SERIAL_NONSTANDARD=y +CONFIG_ROCKETPORT=m +CONFIG_CYCLADES=m +# CONFIG_CYZ_INTR is not set +CONFIG_MOXA_INTELLIO=m +CONFIG_MOXA_SMARTIO=m +CONFIG_SYNCLINK=m +CONFIG_SYNCLINKMP=m +CONFIG_SYNCLINK_GT=m +CONFIG_NOZOMI=m +CONFIG_ISI=m +CONFIG_N_HDLC=m +CONFIG_N_GSM=m +CONFIG_TRACE_ROUTER=m +CONFIG_TRACE_SINK=m +CONFIG_DEVMEM=y +# CONFIG_DEVKMEM is not set + +# +# Serial drivers +# +CONFIG_SERIAL_EARLYCON=y +CONFIG_SERIAL_8250=y +# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set +CONFIG_SERIAL_8250_PNP=y +# CONFIG_SERIAL_8250_FINTEK is not set +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_DMA=y +CONFIG_SERIAL_8250_PCI=y +CONFIG_SERIAL_8250_EXAR=m +CONFIG_SERIAL_8250_CS=m +CONFIG_SERIAL_8250_MEN_MCB=m +CONFIG_SERIAL_8250_NR_UARTS=48 +CONFIG_SERIAL_8250_RUNTIME_UARTS=32 +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_MANY_PORTS=y +CONFIG_SERIAL_8250_SHARE_IRQ=y +# CONFIG_SERIAL_8250_DETECT_IRQ is not set +CONFIG_SERIAL_8250_RSA=y +CONFIG_SERIAL_8250_DW=m +CONFIG_SERIAL_8250_RT288X=y +CONFIG_SERIAL_8250_LPSS=m +CONFIG_SERIAL_8250_MID=m +CONFIG_SERIAL_8250_MOXA=m + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_KGDB_NMI=y +CONFIG_SERIAL_MAX3100=m +CONFIG_SERIAL_MAX310X=y +CONFIG_SERIAL_UARTLITE=m +CONFIG_SERIAL_UARTLITE_NR_UARTS=1 +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_CONSOLE_POLL=y +CONFIG_SERIAL_JSM=m +CONFIG_SERIAL_SCCNXP=y +CONFIG_SERIAL_SCCNXP_CONSOLE=y +CONFIG_SERIAL_SC16IS7XX_CORE=m +CONFIG_SERIAL_SC16IS7XX=m +CONFIG_SERIAL_SC16IS7XX_I2C=y +CONFIG_SERIAL_SC16IS7XX_SPI=y +CONFIG_SERIAL_ALTERA_JTAGUART=m +CONFIG_SERIAL_ALTERA_UART=m +CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 +CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200 +# CONFIG_SERIAL_IFX6X60 is not set +CONFIG_SERIAL_ARC=m +CONFIG_SERIAL_ARC_NR_PORTS=1 +CONFIG_SERIAL_RP2=m +CONFIG_SERIAL_RP2_NR_UARTS=32 +CONFIG_SERIAL_FSL_LPUART=m +CONFIG_SERIAL_MEN_Z135=m +CONFIG_SERIAL_DEV_BUS=y +CONFIG_SERIAL_DEV_CTRL_TTYPORT=y +CONFIG_TTY_PRINTK=y +CONFIG_PRINTER=m +# CONFIG_LP_CONSOLE is not set +CONFIG_PPDEV=m +CONFIG_HVC_DRIVER=y +CONFIG_HVC_IRQ=y +CONFIG_HVC_XEN=y +CONFIG_HVC_XEN_FRONTEND=y +CONFIG_VIRTIO_CONSOLE=y +CONFIG_IPMI_HANDLER=m +CONFIG_IPMI_DMI_DECODE=y +# CONFIG_IPMI_PANIC_EVENT is not set +CONFIG_IPMI_DEVICE_INTERFACE=m +CONFIG_IPMI_SI=m +CONFIG_IPMI_SSIF=m +CONFIG_IPMI_WATCHDOG=m +CONFIG_IPMI_POWEROFF=m +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_TIMERIOMEM=m +CONFIG_HW_RANDOM_INTEL=m +CONFIG_HW_RANDOM_AMD=m +CONFIG_HW_RANDOM_VIA=m +CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_NVRAM=m +CONFIG_R3964=m +CONFIG_APPLICOM=m + +# +# PCMCIA character devices +# +CONFIG_SYNCLINK_CS=m +CONFIG_CARDMAN_4000=m +CONFIG_CARDMAN_4040=m +CONFIG_SCR24X=m +CONFIG_IPWIRELESS=m +CONFIG_MWAVE=m +CONFIG_RAW_DRIVER=m +CONFIG_MAX_RAW_DEVS=256 +CONFIG_HPET=y +CONFIG_HPET_MMAP=y +CONFIG_HPET_MMAP_DEFAULT=y +CONFIG_HANGCHECK_TIMER=m +CONFIG_TCG_TPM=y +CONFIG_HW_RANDOM_TPM=y +CONFIG_TCG_TIS_CORE=y +CONFIG_TCG_TIS=y +CONFIG_TCG_TIS_SPI=m +CONFIG_TCG_TIS_I2C_ATMEL=m +CONFIG_TCG_TIS_I2C_INFINEON=m +CONFIG_TCG_TIS_I2C_NUVOTON=m +CONFIG_TCG_NSC=m +CONFIG_TCG_ATMEL=m +CONFIG_TCG_INFINEON=m +CONFIG_TCG_XEN=m +CONFIG_TCG_CRB=y +CONFIG_TCG_VTPM_PROXY=m +CONFIG_TCG_TIS_ST33ZP24=m +CONFIG_TCG_TIS_ST33ZP24_I2C=m +CONFIG_TCG_TIS_ST33ZP24_SPI=m +CONFIG_TELCLOCK=m +CONFIG_DEVPORT=y +CONFIG_XILLYBUS=m +CONFIG_XILLYBUS_PCIE=m +# CONFIG_RANDOM_TRUST_CPU is not set + +# +# I2C support +# +CONFIG_I2C=y +CONFIG_ACPI_I2C_OPREGION=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_MUX=m + +# +# Multiplexer I2C Chip support +# +CONFIG_I2C_MUX_GPIO=m +CONFIG_I2C_MUX_LTC4306=m +CONFIG_I2C_MUX_PCA9541=m +CONFIG_I2C_MUX_PCA954x=m +CONFIG_I2C_MUX_REG=m +CONFIG_I2C_MUX_MLXCPLD=m +CONFIG_I2C_HELPER_AUTO=y +CONFIG_I2C_SMBUS=m +CONFIG_I2C_ALGOBIT=m +CONFIG_I2C_ALGOPCA=m + +# +# I2C Hardware Bus support +# + +# +# PC SMBus host controller drivers +# +CONFIG_I2C_ALI1535=m +CONFIG_I2C_ALI1563=m +CONFIG_I2C_ALI15X3=m +CONFIG_I2C_AMD756=m +CONFIG_I2C_AMD756_S4882=m +CONFIG_I2C_AMD8111=m +CONFIG_I2C_I801=m +CONFIG_I2C_ISCH=m +CONFIG_I2C_ISMT=m +CONFIG_I2C_PIIX4=m +CONFIG_I2C_CHT_WC=m +CONFIG_I2C_NFORCE2=m +CONFIG_I2C_NFORCE2_S4985=m +CONFIG_I2C_SIS5595=m +CONFIG_I2C_SIS630=m +CONFIG_I2C_SIS96X=m +CONFIG_I2C_VIA=m +CONFIG_I2C_VIAPRO=m + +# +# ACPI drivers +# +CONFIG_I2C_SCMI=m + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +CONFIG_I2C_CBUS_GPIO=m +CONFIG_I2C_DESIGNWARE_CORE=y +CONFIG_I2C_DESIGNWARE_PLATFORM=y +# CONFIG_I2C_DESIGNWARE_SLAVE is not set +CONFIG_I2C_DESIGNWARE_PCI=m +CONFIG_I2C_DESIGNWARE_BAYTRAIL=y +CONFIG_I2C_EMEV2=m +CONFIG_I2C_GPIO=m +# CONFIG_I2C_GPIO_FAULT_INJECTOR is not set +CONFIG_I2C_KEMPLD=m +CONFIG_I2C_OCORES=m +CONFIG_I2C_PCA_PLATFORM=m +CONFIG_I2C_SIMTEC=m +CONFIG_I2C_XILINX=m + +# +# External I2C/SMBus adapter drivers +# +CONFIG_I2C_DIOLAN_U2C=m +CONFIG_I2C_DLN2=m +CONFIG_I2C_PARPORT=m +CONFIG_I2C_PARPORT_LIGHT=m +CONFIG_I2C_ROBOTFUZZ_OSIF=m +CONFIG_I2C_TAOS_EVM=m +CONFIG_I2C_TINY_USB=m +CONFIG_I2C_VIPERBOARD=m + +# +# Other I2C/SMBus bus drivers +# +CONFIG_I2C_MLXCPLD=m +CONFIG_I2C_CROS_EC_TUNNEL=m +CONFIG_I2C_STUB=m +CONFIG_I2C_SLAVE=y +CONFIG_I2C_SLAVE_EEPROM=m +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +CONFIG_SPI=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y +CONFIG_SPI_MEM=y + +# +# SPI Master Controller Drivers +# +CONFIG_SPI_ALTERA=m +CONFIG_SPI_AXI_SPI_ENGINE=m +CONFIG_SPI_BITBANG=m +CONFIG_SPI_BUTTERFLY=m +CONFIG_SPI_CADENCE=m +CONFIG_SPI_DESIGNWARE=m +CONFIG_SPI_DW_PCI=m +CONFIG_SPI_DW_MID_DMA=y +CONFIG_SPI_DW_MMIO=m +CONFIG_SPI_DLN2=m +CONFIG_SPI_GPIO=m +CONFIG_SPI_LM70_LLP=m +CONFIG_SPI_OC_TINY=m +CONFIG_SPI_PXA2XX=m +CONFIG_SPI_PXA2XX_PCI=m +CONFIG_SPI_ROCKCHIP=m +CONFIG_SPI_SC18IS602=m +CONFIG_SPI_XCOMM=m +# CONFIG_SPI_XILINX is not set +CONFIG_SPI_ZYNQMP_GQSPI=m + +# +# SPI Protocol Masters +# +CONFIG_SPI_SPIDEV=m +# CONFIG_SPI_LOOPBACK_TEST is not set +CONFIG_SPI_TLE62X0=m +# CONFIG_SPI_SLAVE is not set +CONFIG_SPMI=m +CONFIG_HSI=m +CONFIG_HSI_BOARDINFO=y + +# +# HSI controllers +# + +# +# HSI clients +# +CONFIG_HSI_CHAR=m +CONFIG_PPS=m +# CONFIG_PPS_DEBUG is not set + +# +# PPS clients support +# +# CONFIG_PPS_CLIENT_KTIMER is not set +CONFIG_PPS_CLIENT_LDISC=m +CONFIG_PPS_CLIENT_PARPORT=m +CONFIG_PPS_CLIENT_GPIO=m + +# +# PPS generators support +# + +# +# PTP clock support +# +CONFIG_PTP_1588_CLOCK=m + +# +# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks. +# +CONFIG_PTP_1588_CLOCK_KVM=m +CONFIG_PINCTRL=y +CONFIG_PINMUX=y +CONFIG_PINCONF=y +CONFIG_GENERIC_PINCONF=y +# CONFIG_DEBUG_PINCTRL is not set +CONFIG_PINCTRL_AMD=y +CONFIG_PINCTRL_MCP23S08=m +CONFIG_PINCTRL_SX150X=y +CONFIG_PINCTRL_BAYTRAIL=y +CONFIG_PINCTRL_CHERRYVIEW=m +CONFIG_PINCTRL_INTEL=m +CONFIG_PINCTRL_BROXTON=m +CONFIG_PINCTRL_CANNONLAKE=m +CONFIG_PINCTRL_CEDARFORK=m +CONFIG_PINCTRL_DENVERTON=m +CONFIG_PINCTRL_GEMINILAKE=m +CONFIG_PINCTRL_ICELAKE=m +CONFIG_PINCTRL_LEWISBURG=m +CONFIG_PINCTRL_SUNRISEPOINT=m +CONFIG_PINCTRL_MADERA=m +CONFIG_GPIOLIB=y +CONFIG_GPIOLIB_FASTPATH_LIMIT=512 +CONFIG_GPIO_ACPI=y +CONFIG_GPIOLIB_IRQCHIP=y +# CONFIG_DEBUG_GPIO is not set +CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_GENERIC=m +CONFIG_GPIO_MAX730X=m + +# +# Memory mapped GPIO drivers +# +CONFIG_GPIO_AMDPT=m +CONFIG_GPIO_DWAPB=m +CONFIG_GPIO_EXAR=m +CONFIG_GPIO_GENERIC_PLATFORM=m +CONFIG_GPIO_ICH=m +CONFIG_GPIO_LYNXPOINT=y +CONFIG_GPIO_MB86S7X=m +CONFIG_GPIO_MENZ127=m +# CONFIG_GPIO_MOCKUP is not set +CONFIG_GPIO_VX855=m + +# +# Port-mapped I/O GPIO drivers +# +CONFIG_GPIO_F7188X=m +CONFIG_GPIO_IT87=m +CONFIG_GPIO_SCH=m +CONFIG_GPIO_SCH311X=m +CONFIG_GPIO_WINBOND=m +CONFIG_GPIO_WS16C48=m + +# +# I2C GPIO expanders +# +CONFIG_GPIO_ADP5588=m +CONFIG_GPIO_MAX7300=m +CONFIG_GPIO_MAX732X=m +CONFIG_GPIO_PCA953X=m +CONFIG_GPIO_PCF857X=m +CONFIG_GPIO_TPIC2810=m + +# +# MFD GPIO expanders +# +CONFIG_GPIO_ADP5520=m +CONFIG_GPIO_ARIZONA=m +CONFIG_GPIO_BD9571MWV=m +CONFIG_GPIO_CRYSTAL_COVE=m +CONFIG_GPIO_DA9052=m +CONFIG_GPIO_DA9055=m +CONFIG_GPIO_DLN2=m +CONFIG_GPIO_JANZ_TTL=m +CONFIG_GPIO_KEMPLD=m +CONFIG_GPIO_LP3943=m +CONFIG_GPIO_LP873X=m +CONFIG_GPIO_MADERA=m +CONFIG_GPIO_PALMAS=y +CONFIG_GPIO_RC5T583=y +CONFIG_GPIO_TPS65086=m +CONFIG_GPIO_TPS6586X=y +CONFIG_GPIO_TPS65910=y +CONFIG_GPIO_TPS65912=m +CONFIG_GPIO_TWL4030=m +CONFIG_GPIO_TWL6040=m +CONFIG_GPIO_UCB1400=m +CONFIG_GPIO_WHISKEY_COVE=m +CONFIG_GPIO_WM831X=m +CONFIG_GPIO_WM8350=m +CONFIG_GPIO_WM8994=m + +# +# PCI GPIO expanders +# +CONFIG_GPIO_AMD8111=m +CONFIG_GPIO_ML_IOH=m +CONFIG_GPIO_PCI_IDIO_16=m +CONFIG_GPIO_PCIE_IDIO_24=m +CONFIG_GPIO_RDC321X=m + +# +# SPI GPIO expanders +# +CONFIG_GPIO_MAX3191X=m +CONFIG_GPIO_MAX7301=m +CONFIG_GPIO_MC33880=m +CONFIG_GPIO_PISOSR=m +CONFIG_GPIO_XRA1403=m + +# +# USB GPIO expanders +# +CONFIG_GPIO_VIPERBOARD=m +CONFIG_W1=m +CONFIG_W1_CON=y + +# +# 1-wire Bus Masters +# +CONFIG_W1_MASTER_MATROX=m +CONFIG_W1_MASTER_DS2490=m +CONFIG_W1_MASTER_DS2482=m +CONFIG_W1_MASTER_DS1WM=m +CONFIG_W1_MASTER_GPIO=m + +# +# 1-wire Slaves +# +CONFIG_W1_SLAVE_THERM=m +CONFIG_W1_SLAVE_SMEM=m +CONFIG_W1_SLAVE_DS2405=m +CONFIG_W1_SLAVE_DS2408=m +CONFIG_W1_SLAVE_DS2408_READBACK=y +CONFIG_W1_SLAVE_DS2413=m +CONFIG_W1_SLAVE_DS2406=m +CONFIG_W1_SLAVE_DS2423=m +CONFIG_W1_SLAVE_DS2805=m +CONFIG_W1_SLAVE_DS2431=m +CONFIG_W1_SLAVE_DS2433=m +# CONFIG_W1_SLAVE_DS2433_CRC is not set +CONFIG_W1_SLAVE_DS2438=m +CONFIG_W1_SLAVE_DS2780=m +CONFIG_W1_SLAVE_DS2781=m +CONFIG_W1_SLAVE_DS28E04=m +CONFIG_W1_SLAVE_DS28E17=m +CONFIG_POWER_AVS=y +CONFIG_POWER_RESET=y +CONFIG_POWER_RESET_RESTART=y +CONFIG_POWER_SUPPLY=y +# CONFIG_POWER_SUPPLY_DEBUG is not set +CONFIG_PDA_POWER=m +CONFIG_GENERIC_ADC_BATTERY=m +CONFIG_MAX8925_POWER=m +CONFIG_WM831X_BACKUP=m +CONFIG_WM831X_POWER=m +CONFIG_WM8350_POWER=m +CONFIG_TEST_POWER=m +CONFIG_BATTERY_88PM860X=m +CONFIG_CHARGER_ADP5061=m +CONFIG_BATTERY_DS2760=m +CONFIG_BATTERY_DS2780=m +CONFIG_BATTERY_DS2781=m +CONFIG_BATTERY_DS2782=m +CONFIG_BATTERY_SBS=m +CONFIG_CHARGER_SBS=m +CONFIG_MANAGER_SBS=m +CONFIG_BATTERY_BQ27XXX=m +CONFIG_BATTERY_BQ27XXX_I2C=m +CONFIG_BATTERY_BQ27XXX_HDQ=m +# CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set +CONFIG_BATTERY_DA9030=m +CONFIG_BATTERY_DA9052=m +CONFIG_CHARGER_DA9150=m +CONFIG_BATTERY_DA9150=m +CONFIG_CHARGER_AXP20X=m +CONFIG_BATTERY_AXP20X=m +CONFIG_AXP20X_POWER=m +CONFIG_AXP288_CHARGER=m +CONFIG_AXP288_FUEL_GAUGE=m +CONFIG_BATTERY_MAX17040=m +CONFIG_BATTERY_MAX17042=m +CONFIG_BATTERY_MAX1721X=m +CONFIG_BATTERY_TWL4030_MADC=m +CONFIG_CHARGER_88PM860X=m +CONFIG_CHARGER_PCF50633=m +CONFIG_BATTERY_RX51=m +CONFIG_CHARGER_ISP1704=m +CONFIG_CHARGER_MAX8903=m +CONFIG_CHARGER_TWL4030=m +CONFIG_CHARGER_LP8727=m +CONFIG_CHARGER_LP8788=m +CONFIG_CHARGER_GPIO=m +CONFIG_CHARGER_MANAGER=y +CONFIG_CHARGER_LTC3651=m +CONFIG_CHARGER_MAX14577=m +CONFIG_CHARGER_MAX77693=m +CONFIG_CHARGER_MAX8997=m +CONFIG_CHARGER_MAX8998=m +CONFIG_CHARGER_BQ2415X=m +CONFIG_CHARGER_BQ24190=m +CONFIG_CHARGER_BQ24257=m +CONFIG_CHARGER_BQ24735=m +CONFIG_CHARGER_BQ25890=m +CONFIG_CHARGER_SMB347=m +CONFIG_CHARGER_TPS65090=m +CONFIG_BATTERY_GAUGE_LTC2941=m +CONFIG_BATTERY_RT5033=m +CONFIG_CHARGER_RT9455=m +CONFIG_CHARGER_CROS_USBPD=m +CONFIG_HWMON=y +CONFIG_HWMON_VID=m +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Native drivers +# +CONFIG_SENSORS_ABITUGURU=m +CONFIG_SENSORS_ABITUGURU3=m +CONFIG_SENSORS_AD7314=m +CONFIG_SENSORS_AD7414=m +CONFIG_SENSORS_AD7418=m +CONFIG_SENSORS_ADM1021=m +CONFIG_SENSORS_ADM1025=m +CONFIG_SENSORS_ADM1026=m +CONFIG_SENSORS_ADM1029=m +CONFIG_SENSORS_ADM1031=m +CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ADT7X10=m +CONFIG_SENSORS_ADT7310=m +CONFIG_SENSORS_ADT7410=m +CONFIG_SENSORS_ADT7411=m +CONFIG_SENSORS_ADT7462=m +CONFIG_SENSORS_ADT7470=m +CONFIG_SENSORS_ADT7475=m +CONFIG_SENSORS_ASC7621=m +CONFIG_SENSORS_K8TEMP=m +CONFIG_SENSORS_K10TEMP=m +CONFIG_SENSORS_FAM15H_POWER=m +CONFIG_SENSORS_APPLESMC=m +CONFIG_SENSORS_ASB100=m +CONFIG_SENSORS_ASPEED=m +CONFIG_SENSORS_ATXP1=m +CONFIG_SENSORS_DS620=m +CONFIG_SENSORS_DS1621=m +CONFIG_SENSORS_DELL_SMM=m +CONFIG_SENSORS_DA9052_ADC=m +CONFIG_SENSORS_DA9055=m +CONFIG_SENSORS_I5K_AMB=m +CONFIG_SENSORS_F71805F=m +CONFIG_SENSORS_F71882FG=m +CONFIG_SENSORS_F75375S=m +CONFIG_SENSORS_MC13783_ADC=m +CONFIG_SENSORS_FSCHMD=m +CONFIG_SENSORS_FTSTEUTATES=m +CONFIG_SENSORS_GL518SM=m +CONFIG_SENSORS_GL520SM=m +CONFIG_SENSORS_G760A=m +CONFIG_SENSORS_G762=m +CONFIG_SENSORS_HIH6130=m +CONFIG_SENSORS_IBMAEM=m +CONFIG_SENSORS_IBMPEX=m +CONFIG_SENSORS_IIO_HWMON=m +CONFIG_SENSORS_I5500=m +CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_IT87=m +CONFIG_SENSORS_JC42=m +CONFIG_SENSORS_POWR1220=m +CONFIG_SENSORS_LINEAGE=m +CONFIG_SENSORS_LTC2945=m +CONFIG_SENSORS_LTC2990=m +CONFIG_SENSORS_LTC4151=m +CONFIG_SENSORS_LTC4215=m +CONFIG_SENSORS_LTC4222=m +CONFIG_SENSORS_LTC4245=m +CONFIG_SENSORS_LTC4260=m +CONFIG_SENSORS_LTC4261=m +CONFIG_SENSORS_MAX1111=m +CONFIG_SENSORS_MAX16065=m +CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX1668=m +CONFIG_SENSORS_MAX197=m +CONFIG_SENSORS_MAX31722=m +CONFIG_SENSORS_MAX6621=m +CONFIG_SENSORS_MAX6639=m +CONFIG_SENSORS_MAX6642=m +CONFIG_SENSORS_MAX6650=m +CONFIG_SENSORS_MAX6697=m +CONFIG_SENSORS_MAX31790=m +CONFIG_SENSORS_MCP3021=m +CONFIG_SENSORS_TC654=m +CONFIG_SENSORS_MENF21BMC_HWMON=m +CONFIG_SENSORS_ADCXX=m +CONFIG_SENSORS_LM63=m +CONFIG_SENSORS_LM70=m +CONFIG_SENSORS_LM73=m +CONFIG_SENSORS_LM75=m +CONFIG_SENSORS_LM77=m +CONFIG_SENSORS_LM78=m +CONFIG_SENSORS_LM80=m +CONFIG_SENSORS_LM83=m +CONFIG_SENSORS_LM85=m +CONFIG_SENSORS_LM87=m +CONFIG_SENSORS_LM90=m +CONFIG_SENSORS_LM92=m +CONFIG_SENSORS_LM93=m +CONFIG_SENSORS_LM95234=m +CONFIG_SENSORS_LM95241=m +CONFIG_SENSORS_LM95245=m +CONFIG_SENSORS_PC87360=m +CONFIG_SENSORS_PC87427=m +CONFIG_SENSORS_NTC_THERMISTOR=m +CONFIG_SENSORS_NCT6683=m +CONFIG_SENSORS_NCT6775=m +CONFIG_SENSORS_NCT7802=m +CONFIG_SENSORS_NCT7904=m +CONFIG_SENSORS_NPCM7XX=m +CONFIG_SENSORS_PCF8591=m +CONFIG_PMBUS=m +CONFIG_SENSORS_PMBUS=m +CONFIG_SENSORS_ADM1275=m +CONFIG_SENSORS_IBM_CFFPS=m +CONFIG_SENSORS_IR35221=m +CONFIG_SENSORS_LM25066=m +CONFIG_SENSORS_LTC2978=m +CONFIG_SENSORS_LTC2978_REGULATOR=y +CONFIG_SENSORS_LTC3815=m +CONFIG_SENSORS_MAX16064=m +CONFIG_SENSORS_MAX20751=m +CONFIG_SENSORS_MAX31785=m +CONFIG_SENSORS_MAX34440=m +CONFIG_SENSORS_MAX8688=m +CONFIG_SENSORS_TPS40422=m +CONFIG_SENSORS_TPS53679=m +CONFIG_SENSORS_UCD9000=m +CONFIG_SENSORS_UCD9200=m +CONFIG_SENSORS_ZL6100=m +CONFIG_SENSORS_SHT15=m +CONFIG_SENSORS_SHT21=m +CONFIG_SENSORS_SHT3x=m +CONFIG_SENSORS_SHTC1=m +CONFIG_SENSORS_SIS5595=m +CONFIG_SENSORS_DME1737=m +CONFIG_SENSORS_EMC1403=m +CONFIG_SENSORS_EMC2103=m +CONFIG_SENSORS_EMC6W201=m +CONFIG_SENSORS_SMSC47M1=m +CONFIG_SENSORS_SMSC47M192=m +CONFIG_SENSORS_SMSC47B397=m +CONFIG_SENSORS_SCH56XX_COMMON=m +CONFIG_SENSORS_SCH5627=m +CONFIG_SENSORS_SCH5636=m +CONFIG_SENSORS_STTS751=m +CONFIG_SENSORS_SMM665=m +CONFIG_SENSORS_ADC128D818=m +CONFIG_SENSORS_ADS1015=m +CONFIG_SENSORS_ADS7828=m +CONFIG_SENSORS_ADS7871=m +CONFIG_SENSORS_AMC6821=m +CONFIG_SENSORS_INA209=m +CONFIG_SENSORS_INA2XX=m +CONFIG_SENSORS_INA3221=m +CONFIG_SENSORS_TC74=m +CONFIG_SENSORS_THMC50=m +CONFIG_SENSORS_TMP102=m +CONFIG_SENSORS_TMP103=m +CONFIG_SENSORS_TMP108=m +CONFIG_SENSORS_TMP401=m +CONFIG_SENSORS_TMP421=m +CONFIG_SENSORS_VIA_CPUTEMP=m +CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT1211=m +CONFIG_SENSORS_VT8231=m +CONFIG_SENSORS_W83773G=m +CONFIG_SENSORS_W83781D=m +CONFIG_SENSORS_W83791D=m +CONFIG_SENSORS_W83792D=m +CONFIG_SENSORS_W83793=m +CONFIG_SENSORS_W83795=m +# CONFIG_SENSORS_W83795_FANCTRL is not set +CONFIG_SENSORS_W83L785TS=m +CONFIG_SENSORS_W83L786NG=m +CONFIG_SENSORS_W83627HF=m +CONFIG_SENSORS_W83627EHF=m +CONFIG_SENSORS_WM831X=m +CONFIG_SENSORS_WM8350=m +CONFIG_SENSORS_XGENE=m + +# +# ACPI drivers +# +CONFIG_SENSORS_ACPI_POWER=m +CONFIG_SENSORS_ATK0110=m +CONFIG_THERMAL=y +# CONFIG_THERMAL_STATISTICS is not set +CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 +CONFIG_THERMAL_HWMON=y +CONFIG_THERMAL_WRITABLE_TRIPS=y +CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y +# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set +# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set +CONFIG_THERMAL_GOV_FAIR_SHARE=y +CONFIG_THERMAL_GOV_STEP_WISE=y +CONFIG_THERMAL_GOV_BANG_BANG=y +CONFIG_THERMAL_GOV_USER_SPACE=y +CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y +CONFIG_CLOCK_THERMAL=y +CONFIG_DEVFREQ_THERMAL=y +CONFIG_THERMAL_EMULATION=y +CONFIG_INTEL_POWERCLAMP=m +CONFIG_X86_PKG_TEMP_THERMAL=m +CONFIG_INTEL_SOC_DTS_IOSF_CORE=m +CONFIG_INTEL_SOC_DTS_THERMAL=m + +# +# ACPI INT340X thermal drivers +# +CONFIG_INT340X_THERMAL=m +CONFIG_ACPI_THERMAL_REL=m +CONFIG_INT3406_THERMAL=m +CONFIG_INTEL_BXT_PMIC_THERMAL=m +CONFIG_INTEL_PCH_THERMAL=m +CONFIG_GENERIC_ADC_THERMAL=m +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_CORE=y +# CONFIG_WATCHDOG_NOWAYOUT is not set +CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y +CONFIG_WATCHDOG_SYSFS=y + +# +# Watchdog Device Drivers +# +CONFIG_SOFT_WATCHDOG=m +CONFIG_DA9052_WATCHDOG=m +CONFIG_DA9055_WATCHDOG=m +CONFIG_DA9063_WATCHDOG=m +CONFIG_DA9062_WATCHDOG=m +CONFIG_MENF21BMC_WATCHDOG=m +CONFIG_MENZ069_WATCHDOG=m +CONFIG_WDAT_WDT=m +CONFIG_WM831X_WATCHDOG=m +CONFIG_WM8350_WATCHDOG=m +CONFIG_XILINX_WATCHDOG=m +CONFIG_ZIIRAVE_WATCHDOG=m +CONFIG_RAVE_SP_WATCHDOG=m +CONFIG_CADENCE_WATCHDOG=m +CONFIG_DW_WATCHDOG=m +CONFIG_TWL4030_WATCHDOG=m +CONFIG_MAX63XX_WATCHDOG=m +CONFIG_RETU_WATCHDOG=m +CONFIG_ACQUIRE_WDT=m +CONFIG_ADVANTECH_WDT=m +CONFIG_ALIM1535_WDT=m +CONFIG_ALIM7101_WDT=m +CONFIG_EBC_C384_WDT=m +CONFIG_F71808E_WDT=m +CONFIG_SP5100_TCO=m +CONFIG_SBC_FITPC2_WATCHDOG=m +CONFIG_EUROTECH_WDT=m +CONFIG_IB700_WDT=m +CONFIG_IBMASR=m +CONFIG_WAFER_WDT=m +CONFIG_I6300ESB_WDT=m +CONFIG_IE6XX_WDT=m +CONFIG_ITCO_WDT=m +CONFIG_ITCO_VENDOR_SUPPORT=y +CONFIG_IT8712F_WDT=m +CONFIG_IT87_WDT=m +CONFIG_HP_WATCHDOG=m +CONFIG_KEMPLD_WDT=m +CONFIG_HPWDT_NMI_DECODING=y +CONFIG_SC1200_WDT=m +CONFIG_PC87413_WDT=m +CONFIG_NV_TCO=m +CONFIG_60XX_WDT=m +CONFIG_CPU5_WDT=m +CONFIG_SMSC_SCH311X_WDT=m +CONFIG_SMSC37B787_WDT=m +CONFIG_VIA_WDT=m +CONFIG_W83627HF_WDT=m +CONFIG_W83877F_WDT=m +CONFIG_W83977F_WDT=m +CONFIG_MACHZ_WDT=m +CONFIG_SBC_EPX_C3_WATCHDOG=m +CONFIG_INTEL_MEI_WDT=m +CONFIG_NI903X_WDT=m +CONFIG_NIC7018_WDT=m +CONFIG_MEN_A21_WDT=m +CONFIG_XEN_WDT=m + +# +# PCI-based Watchdog Cards +# +CONFIG_PCIPCWATCHDOG=m +CONFIG_WDTPCI=m + +# +# USB-based Watchdog Cards +# +CONFIG_USBPCWATCHDOG=m + +# +# Watchdog Pretimeout Governors +# +# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set +CONFIG_SSB_POSSIBLE=y +CONFIG_SSB=m +CONFIG_SSB_SPROM=y +CONFIG_SSB_BLOCKIO=y +CONFIG_SSB_PCIHOST_POSSIBLE=y +CONFIG_SSB_PCIHOST=y +CONFIG_SSB_B43_PCI_BRIDGE=y +CONFIG_SSB_PCMCIAHOST_POSSIBLE=y +# CONFIG_SSB_PCMCIAHOST is not set +CONFIG_SSB_SDIOHOST_POSSIBLE=y +CONFIG_SSB_SDIOHOST=y +CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y +CONFIG_SSB_DRIVER_PCICORE=y +CONFIG_SSB_DRIVER_GPIO=y +CONFIG_BCMA_POSSIBLE=y +CONFIG_BCMA=m +CONFIG_BCMA_BLOCKIO=y +CONFIG_BCMA_HOST_PCI_POSSIBLE=y +CONFIG_BCMA_HOST_PCI=y +CONFIG_BCMA_HOST_SOC=y +CONFIG_BCMA_DRIVER_PCI=y +CONFIG_BCMA_SFLASH=y +CONFIG_BCMA_DRIVER_GMAC_CMN=y +CONFIG_BCMA_DRIVER_GPIO=y +# CONFIG_BCMA_DEBUG is not set + +# +# Multifunction device drivers +# +CONFIG_MFD_CORE=y +CONFIG_MFD_AS3711=y +CONFIG_PMIC_ADP5520=y +CONFIG_MFD_AAT2870_CORE=y +CONFIG_MFD_BCM590XX=m +CONFIG_MFD_BD9571MWV=m +CONFIG_MFD_AXP20X=m +CONFIG_MFD_AXP20X_I2C=m +CONFIG_MFD_CROS_EC=m +CONFIG_MFD_CROS_EC_CHARDEV=m +CONFIG_MFD_MADERA=m +CONFIG_MFD_MADERA_I2C=m +CONFIG_MFD_MADERA_SPI=m +# CONFIG_MFD_CS47L35 is not set +# CONFIG_MFD_CS47L85 is not set +# CONFIG_MFD_CS47L90 is not set +CONFIG_PMIC_DA903X=y +CONFIG_PMIC_DA9052=y +CONFIG_MFD_DA9052_SPI=y +CONFIG_MFD_DA9052_I2C=y +CONFIG_MFD_DA9055=y +CONFIG_MFD_DA9062=m +CONFIG_MFD_DA9063=y +CONFIG_MFD_DA9150=m +CONFIG_MFD_DLN2=m +CONFIG_MFD_MC13XXX=m +CONFIG_MFD_MC13XXX_SPI=m +CONFIG_MFD_MC13XXX_I2C=m +CONFIG_HTC_PASIC3=m +CONFIG_HTC_I2CPLD=y +CONFIG_MFD_INTEL_QUARK_I2C_GPIO=m +CONFIG_LPC_ICH=m +CONFIG_LPC_SCH=m +CONFIG_INTEL_SOC_PMIC=y +CONFIG_INTEL_SOC_PMIC_BXTWC=m +CONFIG_INTEL_SOC_PMIC_CHTWC=y +CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m +CONFIG_MFD_INTEL_LPSS=m +CONFIG_MFD_INTEL_LPSS_ACPI=m +CONFIG_MFD_INTEL_LPSS_PCI=m +CONFIG_MFD_JANZ_CMODIO=m +CONFIG_MFD_KEMPLD=m +CONFIG_MFD_88PM800=m +CONFIG_MFD_88PM805=m +CONFIG_MFD_88PM860X=y +CONFIG_MFD_MAX14577=y +CONFIG_MFD_MAX77693=y +CONFIG_MFD_MAX77843=y +CONFIG_MFD_MAX8907=m +CONFIG_MFD_MAX8925=y +CONFIG_MFD_MAX8997=y +CONFIG_MFD_MAX8998=y +CONFIG_MFD_MT6397=m +CONFIG_MFD_MENF21BMC=m +CONFIG_EZX_PCAP=y +CONFIG_MFD_VIPERBOARD=m +CONFIG_MFD_RETU=m +CONFIG_MFD_PCF50633=m +CONFIG_PCF50633_ADC=m +CONFIG_PCF50633_GPIO=m +CONFIG_UCB1400_CORE=m +CONFIG_MFD_RDC321X=m +CONFIG_MFD_RT5033=m +CONFIG_MFD_RC5T583=y +CONFIG_MFD_SEC_CORE=y +CONFIG_MFD_SI476X_CORE=m +CONFIG_MFD_SM501=m +CONFIG_MFD_SM501_GPIO=y +CONFIG_MFD_SKY81452=m +CONFIG_MFD_SMSC=y +CONFIG_ABX500_CORE=y +CONFIG_AB3100_CORE=y +CONFIG_AB3100_OTP=m +CONFIG_MFD_SYSCON=y +CONFIG_MFD_TI_AM335X_TSCADC=m +CONFIG_MFD_LP3943=m +CONFIG_MFD_LP8788=y +CONFIG_MFD_TI_LMU=m +CONFIG_MFD_PALMAS=y +CONFIG_TPS6105X=m +CONFIG_TPS65010=m +CONFIG_TPS6507X=m +CONFIG_MFD_TPS65086=m +CONFIG_MFD_TPS65090=y +# CONFIG_MFD_TPS68470 is not set +CONFIG_MFD_TI_LP873X=m +CONFIG_MFD_TPS6586X=y +CONFIG_MFD_TPS65910=y +CONFIG_MFD_TPS65912=y +CONFIG_MFD_TPS65912_I2C=y +CONFIG_MFD_TPS65912_SPI=y +CONFIG_MFD_TPS80031=y +CONFIG_TWL4030_CORE=y +CONFIG_MFD_TWL4030_AUDIO=y +CONFIG_TWL6040_CORE=y +CONFIG_MFD_WL1273_CORE=m +CONFIG_MFD_LM3533=m +CONFIG_MFD_VX855=m +CONFIG_MFD_ARIZONA=y +CONFIG_MFD_ARIZONA_I2C=m +CONFIG_MFD_ARIZONA_SPI=m +CONFIG_MFD_CS47L24=y +CONFIG_MFD_WM5102=y +CONFIG_MFD_WM5110=y +CONFIG_MFD_WM8997=y +CONFIG_MFD_WM8998=y +CONFIG_MFD_WM8400=y +CONFIG_MFD_WM831X=y +CONFIG_MFD_WM831X_I2C=y +CONFIG_MFD_WM831X_SPI=y +CONFIG_MFD_WM8350=y +CONFIG_MFD_WM8350_I2C=y +CONFIG_MFD_WM8994=m +CONFIG_RAVE_SP_CORE=m +CONFIG_REGULATOR=y +# CONFIG_REGULATOR_DEBUG is not set +CONFIG_REGULATOR_FIXED_VOLTAGE=m +CONFIG_REGULATOR_VIRTUAL_CONSUMER=m +CONFIG_REGULATOR_USERSPACE_CONSUMER=m +CONFIG_REGULATOR_88PG86X=m +CONFIG_REGULATOR_88PM800=m +CONFIG_REGULATOR_88PM8607=m +CONFIG_REGULATOR_ACT8865=m +CONFIG_REGULATOR_AD5398=m +CONFIG_REGULATOR_ANATOP=m +CONFIG_REGULATOR_AAT2870=m +CONFIG_REGULATOR_AB3100=m +CONFIG_REGULATOR_ARIZONA_LDO1=m +CONFIG_REGULATOR_ARIZONA_MICSUPP=m +CONFIG_REGULATOR_AS3711=m +CONFIG_REGULATOR_AXP20X=m +CONFIG_REGULATOR_BCM590XX=m +CONFIG_REGULATOR_BD9571MWV=m +CONFIG_REGULATOR_DA903X=m +CONFIG_REGULATOR_DA9052=m +CONFIG_REGULATOR_DA9055=m +CONFIG_REGULATOR_DA9062=m +CONFIG_REGULATOR_DA9063=m +CONFIG_REGULATOR_DA9210=m +CONFIG_REGULATOR_DA9211=m +CONFIG_REGULATOR_FAN53555=m +CONFIG_REGULATOR_GPIO=m +CONFIG_REGULATOR_ISL9305=m +CONFIG_REGULATOR_ISL6271A=m +CONFIG_REGULATOR_LM363X=m +CONFIG_REGULATOR_LP3971=m +CONFIG_REGULATOR_LP3972=m +CONFIG_REGULATOR_LP872X=m +CONFIG_REGULATOR_LP8755=m +CONFIG_REGULATOR_LP8788=m +CONFIG_REGULATOR_LTC3589=m +CONFIG_REGULATOR_LTC3676=m +CONFIG_REGULATOR_MAX14577=m +CONFIG_REGULATOR_MAX1586=m +CONFIG_REGULATOR_MAX8649=m +CONFIG_REGULATOR_MAX8660=m +CONFIG_REGULATOR_MAX8907=m +CONFIG_REGULATOR_MAX8925=m +CONFIG_REGULATOR_MAX8952=m +CONFIG_REGULATOR_MAX8997=m +CONFIG_REGULATOR_MAX8998=m +CONFIG_REGULATOR_MAX77693=m +CONFIG_REGULATOR_MC13XXX_CORE=m +CONFIG_REGULATOR_MC13783=m +CONFIG_REGULATOR_MC13892=m +CONFIG_REGULATOR_MT6311=m +CONFIG_REGULATOR_MT6323=m +CONFIG_REGULATOR_MT6397=m +CONFIG_REGULATOR_PALMAS=m +CONFIG_REGULATOR_PCAP=m +CONFIG_REGULATOR_PCF50633=m +CONFIG_REGULATOR_PFUZE100=m +CONFIG_REGULATOR_PV88060=m +CONFIG_REGULATOR_PV88080=m +CONFIG_REGULATOR_PV88090=m +CONFIG_REGULATOR_PWM=m +CONFIG_REGULATOR_QCOM_SPMI=m +CONFIG_REGULATOR_RC5T583=m +CONFIG_REGULATOR_RT5033=m +CONFIG_REGULATOR_S2MPA01=m +CONFIG_REGULATOR_S2MPS11=m +CONFIG_REGULATOR_S5M8767=m +CONFIG_REGULATOR_SKY81452=m +CONFIG_REGULATOR_TPS51632=m +CONFIG_REGULATOR_TPS6105X=m +CONFIG_REGULATOR_TPS62360=m +CONFIG_REGULATOR_TPS65023=m +CONFIG_REGULATOR_TPS6507X=m +CONFIG_REGULATOR_TPS65086=m +CONFIG_REGULATOR_TPS65090=m +CONFIG_REGULATOR_TPS65132=m +CONFIG_REGULATOR_TPS6524X=m +CONFIG_REGULATOR_TPS6586X=m +CONFIG_REGULATOR_TPS65910=m +CONFIG_REGULATOR_TPS65912=m +CONFIG_REGULATOR_TPS80031=m +CONFIG_REGULATOR_TWL4030=m +CONFIG_REGULATOR_WM831X=m +CONFIG_REGULATOR_WM8350=m +CONFIG_REGULATOR_WM8400=m +CONFIG_REGULATOR_WM8994=m +CONFIG_CEC_CORE=m +CONFIG_CEC_NOTIFIER=y +CONFIG_RC_CORE=m +CONFIG_RC_MAP=m +CONFIG_LIRC=y +CONFIG_RC_DECODERS=y +CONFIG_IR_NEC_DECODER=m +CONFIG_IR_RC5_DECODER=m +CONFIG_IR_RC6_DECODER=m +CONFIG_IR_JVC_DECODER=m +CONFIG_IR_SONY_DECODER=m +CONFIG_IR_SANYO_DECODER=m +CONFIG_IR_SHARP_DECODER=m +CONFIG_IR_MCE_KBD_DECODER=m +CONFIG_IR_XMP_DECODER=m +CONFIG_IR_IMON_DECODER=m +CONFIG_RC_DEVICES=y +CONFIG_RC_ATI_REMOTE=m +CONFIG_IR_ENE=m +CONFIG_IR_IMON=m +CONFIG_IR_IMON_RAW=m +CONFIG_IR_MCEUSB=m +CONFIG_IR_ITE_CIR=m +CONFIG_IR_FINTEK=m +CONFIG_IR_NUVOTON=m +CONFIG_IR_REDRAT3=m +CONFIG_IR_STREAMZAP=m +CONFIG_IR_WINBOND_CIR=m +CONFIG_IR_IGORPLUGUSB=m +CONFIG_IR_IGUANA=m +CONFIG_IR_TTUSBIR=m +CONFIG_RC_LOOPBACK=m +CONFIG_IR_SERIAL=m +CONFIG_IR_SERIAL_TRANSMITTER=y +CONFIG_IR_SIR=m +CONFIG_MEDIA_SUPPORT=m + +# +# Multimedia core support +# +CONFIG_MEDIA_CAMERA_SUPPORT=y +CONFIG_MEDIA_ANALOG_TV_SUPPORT=y +CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y +CONFIG_MEDIA_RADIO_SUPPORT=y +CONFIG_MEDIA_SDR_SUPPORT=y +CONFIG_MEDIA_CEC_SUPPORT=y +# CONFIG_MEDIA_CEC_RC is not set +CONFIG_MEDIA_CONTROLLER=y +# CONFIG_MEDIA_CONTROLLER_DVB is not set +CONFIG_VIDEO_DEV=m +CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_VIDEO_V4L2=m +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +# CONFIG_VIDEO_PCI_SKELETON is not set +CONFIG_VIDEO_TUNER=m +CONFIG_V4L2_MEM2MEM_DEV=m +CONFIG_V4L2_FLASH_LED_CLASS=m +CONFIG_V4L2_FWNODE=m +CONFIG_VIDEOBUF_GEN=m +CONFIG_VIDEOBUF_DMA_SG=m +CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_DVB_CORE=m +# CONFIG_DVB_MMAP is not set +CONFIG_DVB_NET=y +CONFIG_TTPCI_EEPROM=m +CONFIG_DVB_MAX_ADAPTERS=8 +CONFIG_DVB_DYNAMIC_MINORS=y +# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set +# CONFIG_DVB_ULE_DEBUG is not set + +# +# Media drivers +# +CONFIG_MEDIA_USB_SUPPORT=y + +# +# Webcam devices +# +CONFIG_USB_VIDEO_CLASS=m +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +CONFIG_USB_GSPCA=m +CONFIG_USB_M5602=m +CONFIG_USB_STV06XX=m +CONFIG_USB_GL860=m +CONFIG_USB_GSPCA_BENQ=m +CONFIG_USB_GSPCA_CONEX=m +CONFIG_USB_GSPCA_CPIA1=m +CONFIG_USB_GSPCA_DTCS033=m +CONFIG_USB_GSPCA_ETOMS=m +CONFIG_USB_GSPCA_FINEPIX=m +CONFIG_USB_GSPCA_JEILINJ=m +CONFIG_USB_GSPCA_JL2005BCD=m +CONFIG_USB_GSPCA_KINECT=m +CONFIG_USB_GSPCA_KONICA=m +CONFIG_USB_GSPCA_MARS=m +CONFIG_USB_GSPCA_MR97310A=m +CONFIG_USB_GSPCA_NW80X=m +CONFIG_USB_GSPCA_OV519=m +CONFIG_USB_GSPCA_OV534=m +CONFIG_USB_GSPCA_OV534_9=m +CONFIG_USB_GSPCA_PAC207=m +CONFIG_USB_GSPCA_PAC7302=m +CONFIG_USB_GSPCA_PAC7311=m +CONFIG_USB_GSPCA_SE401=m +CONFIG_USB_GSPCA_SN9C2028=m +CONFIG_USB_GSPCA_SN9C20X=m +CONFIG_USB_GSPCA_SONIXB=m +CONFIG_USB_GSPCA_SONIXJ=m +CONFIG_USB_GSPCA_SPCA500=m +CONFIG_USB_GSPCA_SPCA501=m +CONFIG_USB_GSPCA_SPCA505=m +CONFIG_USB_GSPCA_SPCA506=m +CONFIG_USB_GSPCA_SPCA508=m +CONFIG_USB_GSPCA_SPCA561=m +CONFIG_USB_GSPCA_SPCA1528=m +CONFIG_USB_GSPCA_SQ905=m +CONFIG_USB_GSPCA_SQ905C=m +CONFIG_USB_GSPCA_SQ930X=m +CONFIG_USB_GSPCA_STK014=m +CONFIG_USB_GSPCA_STK1135=m +CONFIG_USB_GSPCA_STV0680=m +CONFIG_USB_GSPCA_SUNPLUS=m +CONFIG_USB_GSPCA_T613=m +CONFIG_USB_GSPCA_TOPRO=m +CONFIG_USB_GSPCA_TOUPTEK=m +CONFIG_USB_GSPCA_TV8532=m +CONFIG_USB_GSPCA_VC032X=m +CONFIG_USB_GSPCA_VICAM=m +CONFIG_USB_GSPCA_XIRLINK_CIT=m +CONFIG_USB_GSPCA_ZC3XX=m +CONFIG_USB_PWC=m +# CONFIG_USB_PWC_DEBUG is not set +CONFIG_USB_PWC_INPUT_EVDEV=y +CONFIG_VIDEO_CPIA2=m +CONFIG_USB_ZR364XX=m +CONFIG_USB_STKWEBCAM=m +CONFIG_USB_S2255=m +CONFIG_VIDEO_USBTV=m + +# +# Analog TV USB devices +# +CONFIG_VIDEO_PVRUSB2=m +CONFIG_VIDEO_PVRUSB2_SYSFS=y +CONFIG_VIDEO_PVRUSB2_DVB=y +# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set +CONFIG_VIDEO_HDPVR=m +CONFIG_VIDEO_USBVISION=m +CONFIG_VIDEO_STK1160_COMMON=m +CONFIG_VIDEO_STK1160=m +CONFIG_VIDEO_GO7007=m +CONFIG_VIDEO_GO7007_USB=m +CONFIG_VIDEO_GO7007_LOADER=m +CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m + +# +# Analog/digital TV USB devices +# +CONFIG_VIDEO_AU0828=m +CONFIG_VIDEO_AU0828_V4L2=y +CONFIG_VIDEO_AU0828_RC=y +CONFIG_VIDEO_CX231XX=m +CONFIG_VIDEO_CX231XX_RC=y +CONFIG_VIDEO_CX231XX_ALSA=m +CONFIG_VIDEO_CX231XX_DVB=m +CONFIG_VIDEO_TM6000=m +CONFIG_VIDEO_TM6000_ALSA=m +CONFIG_VIDEO_TM6000_DVB=m + +# +# Digital TV USB devices +# +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_DIB3000MC=m +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_DIBUSB_MB=m +# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIB0700=m +CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_CXUSB=m +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_VP7045=m +CONFIG_DVB_USB_VP702X=m +CONFIG_DVB_USB_GP8PSK=m +CONFIG_DVB_USB_NOVA_T_USB2=m +CONFIG_DVB_USB_TTUSB2=m +CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_USB_OPERA1=m +CONFIG_DVB_USB_AF9005=m +CONFIG_DVB_USB_AF9005_REMOTE=m +CONFIG_DVB_USB_PCTV452E=m +CONFIG_DVB_USB_DW2102=m +CONFIG_DVB_USB_CINERGY_T2=m +CONFIG_DVB_USB_DTV5100=m +CONFIG_DVB_USB_AZ6027=m +CONFIG_DVB_USB_TECHNISAT_USB2=m +CONFIG_DVB_USB_V2=m +CONFIG_DVB_USB_AF9015=m +CONFIG_DVB_USB_AF9035=m +CONFIG_DVB_USB_ANYSEE=m +CONFIG_DVB_USB_AU6610=m +CONFIG_DVB_USB_AZ6007=m +CONFIG_DVB_USB_CE6230=m +CONFIG_DVB_USB_EC168=m +CONFIG_DVB_USB_GL861=m +CONFIG_DVB_USB_LME2510=m +CONFIG_DVB_USB_MXL111SF=m +CONFIG_DVB_USB_RTL28XXU=m +CONFIG_DVB_USB_DVBSKY=m +CONFIG_DVB_USB_ZD1301=m +CONFIG_DVB_TTUSB_BUDGET=m +CONFIG_DVB_TTUSB_DEC=m +CONFIG_SMS_USB_DRV=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set +CONFIG_DVB_AS102=m + +# +# Webcam, TV (analog/digital) USB devices +# +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_V4L2=m +CONFIG_VIDEO_EM28XX_ALSA=m +CONFIG_VIDEO_EM28XX_DVB=m +CONFIG_VIDEO_EM28XX_RC=m + +# +# Software defined radio USB devices +# +CONFIG_USB_AIRSPY=m +CONFIG_USB_HACKRF=m +CONFIG_USB_MSI2500=m + +# +# USB HDMI CEC adapters +# +CONFIG_USB_PULSE8_CEC=m +CONFIG_USB_RAINSHADOW_CEC=m +CONFIG_MEDIA_PCI_SUPPORT=y + +# +# Media capture support +# +CONFIG_VIDEO_MEYE=m +CONFIG_VIDEO_SOLO6X10=m +CONFIG_VIDEO_TW5864=m +CONFIG_VIDEO_TW68=m +CONFIG_VIDEO_TW686X=m + +# +# Media capture/analog TV support +# +CONFIG_VIDEO_IVTV=m +# CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set +CONFIG_VIDEO_IVTV_ALSA=m +CONFIG_VIDEO_FB_IVTV=m +CONFIG_VIDEO_HEXIUM_GEMINI=m +CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_MXB=m +CONFIG_VIDEO_DT3155=m + +# +# Media capture/analog/hybrid TV support +# +CONFIG_VIDEO_CX18=m +CONFIG_VIDEO_CX18_ALSA=m +CONFIG_VIDEO_CX23885=m +CONFIG_MEDIA_ALTERA_CI=m +CONFIG_VIDEO_CX25821=m +CONFIG_VIDEO_CX25821_ALSA=m +CONFIG_VIDEO_CX88=m +CONFIG_VIDEO_CX88_ALSA=m +CONFIG_VIDEO_CX88_BLACKBIRD=m +CONFIG_VIDEO_CX88_DVB=m +CONFIG_VIDEO_CX88_ENABLE_VP3054=y +CONFIG_VIDEO_CX88_VP3054=m +CONFIG_VIDEO_CX88_MPEG=m +CONFIG_VIDEO_BT848=m +CONFIG_DVB_BT8XX=m +CONFIG_VIDEO_SAA7134=m +CONFIG_VIDEO_SAA7134_ALSA=m +CONFIG_VIDEO_SAA7134_RC=y +CONFIG_VIDEO_SAA7134_DVB=m +CONFIG_VIDEO_SAA7134_GO7007=m +CONFIG_VIDEO_SAA7164=m +CONFIG_VIDEO_COBALT=m + +# +# Media digital TV PCI Adapters +# +CONFIG_DVB_AV7110_IR=y +CONFIG_DVB_AV7110=m +CONFIG_DVB_AV7110_OSD=y +CONFIG_DVB_BUDGET_CORE=m +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +CONFIG_DVB_BUDGET_AV=m +CONFIG_DVB_BUDGET_PATCH=m +CONFIG_DVB_B2C2_FLEXCOP_PCI=m +# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set +CONFIG_DVB_PLUTO2=m +CONFIG_DVB_DM1105=m +CONFIG_DVB_PT1=m +CONFIG_DVB_PT3=m +CONFIG_MANTIS_CORE=m +CONFIG_DVB_MANTIS=m +CONFIG_DVB_HOPPER=m +CONFIG_DVB_NGENE=m +CONFIG_DVB_DDBRIDGE=m +# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set +CONFIG_DVB_SMIPCIE=m +CONFIG_DVB_NETUP_UNIDVB=m +CONFIG_VIDEO_IPU3_CIO2=m +CONFIG_V4L_PLATFORM_DRIVERS=y +CONFIG_VIDEO_CAFE_CCIC=m +CONFIG_VIDEO_VIA_CAMERA=m +CONFIG_VIDEO_CADENCE=y +CONFIG_VIDEO_CADENCE_CSI2RX=m +CONFIG_VIDEO_CADENCE_CSI2TX=m +CONFIG_SOC_CAMERA=m +CONFIG_SOC_CAMERA_PLATFORM=m +CONFIG_V4L_MEM2MEM_DRIVERS=y +CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m +CONFIG_VIDEO_SH_VEU=m +CONFIG_V4L_TEST_DRIVERS=y +# CONFIG_VIDEO_VIMC is not set +CONFIG_VIDEO_VIVID=m +CONFIG_VIDEO_VIVID_CEC=y +CONFIG_VIDEO_VIVID_MAX_DEVS=64 +CONFIG_VIDEO_VIM2M=m +CONFIG_VIDEO_VICODEC=m +CONFIG_DVB_PLATFORM_DRIVERS=y +CONFIG_CEC_PLATFORM_DRIVERS=y +CONFIG_VIDEO_CROS_EC_CEC=m +CONFIG_SDR_PLATFORM_DRIVERS=y + +# +# Supported MMC/SDIO adapters +# +CONFIG_SMS_SDIO_DRV=m +CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_TEA575X=m +CONFIG_RADIO_SI470X=m +CONFIG_USB_SI470X=m +CONFIG_I2C_SI470X=m +CONFIG_RADIO_SI4713=m +CONFIG_USB_SI4713=m +CONFIG_PLATFORM_SI4713=m +CONFIG_I2C_SI4713=m +CONFIG_RADIO_SI476X=m +CONFIG_USB_MR800=m +CONFIG_USB_DSBR=m +CONFIG_RADIO_MAXIRADIO=m +CONFIG_RADIO_SHARK=m +CONFIG_RADIO_SHARK2=m +CONFIG_USB_KEENE=m +CONFIG_USB_RAREMONO=m +CONFIG_USB_MA901=m +CONFIG_RADIO_TEA5764=m +CONFIG_RADIO_SAA7706H=m +CONFIG_RADIO_TEF6862=m +CONFIG_RADIO_WL1273=m + +# +# Texas Instruments WL128x FM driver (ST based) +# +CONFIG_RADIO_WL128X=m + +# +# Supported FireWire (IEEE 1394) Adapters +# +CONFIG_DVB_FIREDTV=m +CONFIG_DVB_FIREDTV_INPUT=y +CONFIG_MEDIA_COMMON_OPTIONS=y + +# +# common driver options +# +CONFIG_VIDEO_CX2341X=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_CYPRESS_FIRMWARE=m +CONFIG_VIDEOBUF2_CORE=m +CONFIG_VIDEOBUF2_V4L2=m +CONFIG_VIDEOBUF2_MEMOPS=m +CONFIG_VIDEOBUF2_DMA_CONTIG=m +CONFIG_VIDEOBUF2_VMALLOC=m +CONFIG_VIDEOBUF2_DMA_SG=m +CONFIG_VIDEOBUF2_DVB=m +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_SMS_SIANO_MDTV=m +CONFIG_SMS_SIANO_RC=y +CONFIG_SMS_SIANO_DEBUGFS=y +CONFIG_VIDEO_V4L2_TPG=m + +# +# Media ancillary drivers (tuners, sensors, i2c, spi, frontends) +# +CONFIG_MEDIA_SUBDRV_AUTOSELECT=y +CONFIG_MEDIA_ATTACH=y +CONFIG_VIDEO_IR_I2C=m + +# +# Audio decoders, processors and mixers +# +CONFIG_VIDEO_TVAUDIO=m +CONFIG_VIDEO_TDA7432=m +CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TEA6415C=m +CONFIG_VIDEO_TEA6420=m +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_CS3308=m +CONFIG_VIDEO_CS5345=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_UDA1342=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_VP27SMPX=m +CONFIG_VIDEO_SONY_BTF_MPX=m + +# +# RDS decoders +# +CONFIG_VIDEO_SAA6588=m + +# +# Video decoders +# +CONFIG_VIDEO_ADV7604=m +CONFIG_VIDEO_ADV7842=m +CONFIG_VIDEO_BT819=m +CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_BT866=m +CONFIG_VIDEO_KS0127=m +CONFIG_VIDEO_SAA7110=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_TW2804=m +CONFIG_VIDEO_TW9903=m +CONFIG_VIDEO_TW9906=m +CONFIG_VIDEO_VPX3220=m + +# +# Video and audio decoders +# +CONFIG_VIDEO_SAA717X=m +CONFIG_VIDEO_CX25840=m + +# +# Video encoders +# +CONFIG_VIDEO_SAA7127=m +CONFIG_VIDEO_SAA7185=m +CONFIG_VIDEO_ADV7170=m +CONFIG_VIDEO_ADV7175=m +CONFIG_VIDEO_ADV7511=m + +# +# Camera sensor devices +# +CONFIG_VIDEO_OV2640=m +CONFIG_VIDEO_OV7640=m +CONFIG_VIDEO_OV7670=m +CONFIG_VIDEO_MT9M111=m +CONFIG_VIDEO_MT9V011=m + +# +# Flash devices +# + +# +# Video improvement chips +# +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m + +# +# Audio/Video compression chips +# +CONFIG_VIDEO_SAA6752HS=m + +# +# SDR tuner chips +# + +# +# Miscellaneous helper chips +# +CONFIG_VIDEO_M52790=m + +# +# Sensors used on soc_camera driver +# + +# +# soc_camera sensor drivers +# +CONFIG_SOC_CAMERA_MT9M001=m +CONFIG_SOC_CAMERA_MT9M111=m +CONFIG_SOC_CAMERA_MT9T112=m +CONFIG_SOC_CAMERA_MT9V022=m +CONFIG_SOC_CAMERA_OV5642=m +CONFIG_SOC_CAMERA_OV772X=m +CONFIG_SOC_CAMERA_OV9640=m +CONFIG_SOC_CAMERA_OV9740=m +CONFIG_SOC_CAMERA_RJ54N1=m +CONFIG_SOC_CAMERA_TW9910=m + +# +# Media SPI Adapters +# +CONFIG_CXD2880_SPI_DRV=m +CONFIG_MEDIA_TUNER=m +CONFIG_MEDIA_TUNER_SIMPLE=m +CONFIG_MEDIA_TUNER_TDA18250=m +CONFIG_MEDIA_TUNER_TDA8290=m +CONFIG_MEDIA_TUNER_TDA827X=m +CONFIG_MEDIA_TUNER_TDA18271=m +CONFIG_MEDIA_TUNER_TDA9887=m +CONFIG_MEDIA_TUNER_TEA5761=m +CONFIG_MEDIA_TUNER_TEA5767=m +CONFIG_MEDIA_TUNER_MSI001=m +CONFIG_MEDIA_TUNER_MT20XX=m +CONFIG_MEDIA_TUNER_MT2060=m +CONFIG_MEDIA_TUNER_MT2063=m +CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_MT2131=m +CONFIG_MEDIA_TUNER_QT1010=m +CONFIG_MEDIA_TUNER_XC2028=m +CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_XC4000=m +CONFIG_MEDIA_TUNER_MXL5005S=m +CONFIG_MEDIA_TUNER_MXL5007T=m +CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m +CONFIG_MEDIA_TUNER_TDA18218=m +CONFIG_MEDIA_TUNER_FC0011=m +CONFIG_MEDIA_TUNER_FC0012=m +CONFIG_MEDIA_TUNER_FC0013=m +CONFIG_MEDIA_TUNER_TDA18212=m +CONFIG_MEDIA_TUNER_E4000=m +CONFIG_MEDIA_TUNER_FC2580=m +CONFIG_MEDIA_TUNER_M88RS6000T=m +CONFIG_MEDIA_TUNER_TUA9001=m +CONFIG_MEDIA_TUNER_SI2157=m +CONFIG_MEDIA_TUNER_IT913X=m +CONFIG_MEDIA_TUNER_R820T=m +CONFIG_MEDIA_TUNER_MXL301RF=m +CONFIG_MEDIA_TUNER_QM1D1C0042=m +CONFIG_MEDIA_TUNER_QM1D1B0004=m + +# +# Multistandard (satellite) frontends +# +CONFIG_DVB_STB0899=m +CONFIG_DVB_STB6100=m +CONFIG_DVB_STV090x=m +CONFIG_DVB_STV0910=m +CONFIG_DVB_STV6110x=m +CONFIG_DVB_STV6111=m +CONFIG_DVB_MXL5XX=m +CONFIG_DVB_M88DS3103=m + +# +# Multistandard (cable + terrestrial) frontends +# +CONFIG_DVB_DRXK=m +CONFIG_DVB_TDA18271C2DD=m +CONFIG_DVB_SI2165=m +CONFIG_DVB_MN88472=m +CONFIG_DVB_MN88473=m + +# +# DVB-S (satellite) frontends +# +CONFIG_DVB_CX24110=m +CONFIG_DVB_CX24123=m +CONFIG_DVB_MT312=m +CONFIG_DVB_ZL10036=m +CONFIG_DVB_ZL10039=m +CONFIG_DVB_S5H1420=m +CONFIG_DVB_STV0288=m +CONFIG_DVB_STB6000=m +CONFIG_DVB_STV0299=m +CONFIG_DVB_STV6110=m +CONFIG_DVB_STV0900=m +CONFIG_DVB_TDA8083=m +CONFIG_DVB_TDA10086=m +CONFIG_DVB_TDA8261=m +CONFIG_DVB_VES1X93=m +CONFIG_DVB_TUNER_ITD1000=m +CONFIG_DVB_TUNER_CX24113=m +CONFIG_DVB_TDA826X=m +CONFIG_DVB_TUA6100=m +CONFIG_DVB_CX24116=m +CONFIG_DVB_CX24117=m +CONFIG_DVB_CX24120=m +CONFIG_DVB_SI21XX=m +CONFIG_DVB_TS2020=m +CONFIG_DVB_DS3000=m +CONFIG_DVB_MB86A16=m +CONFIG_DVB_TDA10071=m + +# +# DVB-T (terrestrial) frontends +# +CONFIG_DVB_SP8870=m +CONFIG_DVB_SP887X=m +CONFIG_DVB_CX22700=m +CONFIG_DVB_CX22702=m +CONFIG_DVB_DRXD=m +CONFIG_DVB_L64781=m +CONFIG_DVB_TDA1004X=m +CONFIG_DVB_NXT6000=m +CONFIG_DVB_MT352=m +CONFIG_DVB_ZL10353=m +CONFIG_DVB_DIB3000MB=m +CONFIG_DVB_DIB3000MC=m +CONFIG_DVB_DIB7000M=m +CONFIG_DVB_DIB7000P=m +CONFIG_DVB_TDA10048=m +CONFIG_DVB_AF9013=m +CONFIG_DVB_EC100=m +CONFIG_DVB_STV0367=m +CONFIG_DVB_CXD2820R=m +CONFIG_DVB_CXD2841ER=m +CONFIG_DVB_RTL2830=m +CONFIG_DVB_RTL2832=m +CONFIG_DVB_RTL2832_SDR=m +CONFIG_DVB_SI2168=m +CONFIG_DVB_AS102_FE=m +CONFIG_DVB_ZD1301_DEMOD=m +CONFIG_DVB_GP8PSK_FE=m + +# +# DVB-C (cable) frontends +# +CONFIG_DVB_VES1820=m +CONFIG_DVB_TDA10021=m +CONFIG_DVB_TDA10023=m +CONFIG_DVB_STV0297=m + +# +# ATSC (North American/Korean Terrestrial/Cable DTV) frontends +# +CONFIG_DVB_NXT200X=m +CONFIG_DVB_OR51211=m +CONFIG_DVB_OR51132=m +CONFIG_DVB_BCM3510=m +CONFIG_DVB_LGDT330X=m +CONFIG_DVB_LGDT3305=m +CONFIG_DVB_LGDT3306A=m +CONFIG_DVB_LG2160=m +CONFIG_DVB_S5H1409=m +CONFIG_DVB_AU8522=m +CONFIG_DVB_AU8522_DTV=m +CONFIG_DVB_AU8522_V4L=m +CONFIG_DVB_S5H1411=m + +# +# ISDB-T (terrestrial) frontends +# +CONFIG_DVB_S921=m +CONFIG_DVB_DIB8000=m +CONFIG_DVB_MB86A20S=m + +# +# ISDB-S (satellite) & ISDB-T (terrestrial) frontends +# +CONFIG_DVB_TC90522=m + +# +# Digital terrestrial only tuners/PLL +# +CONFIG_DVB_PLL=m +CONFIG_DVB_TUNER_DIB0070=m +CONFIG_DVB_TUNER_DIB0090=m + +# +# SEC control devices for DVB-S +# +CONFIG_DVB_DRX39XYJ=m +CONFIG_DVB_LNBH25=m +CONFIG_DVB_LNBP21=m +CONFIG_DVB_LNBP22=m +CONFIG_DVB_ISL6405=m +CONFIG_DVB_ISL6421=m +CONFIG_DVB_ISL6423=m +CONFIG_DVB_A8293=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m +CONFIG_DVB_TDA665x=m +CONFIG_DVB_IX2505V=m +CONFIG_DVB_M88RS2000=m +CONFIG_DVB_AF9033=m +CONFIG_DVB_HORUS3A=m +CONFIG_DVB_ASCOT2E=m +CONFIG_DVB_HELENE=m + +# +# Common Interface (EN50221) controller drivers +# +CONFIG_DVB_CXD2099=m +CONFIG_DVB_SP2=m + +# +# Tools to develop new frontends +# +CONFIG_DVB_DUMMY_FE=m + +# +# Graphics support +# +CONFIG_AGP=y +CONFIG_AGP_AMD64=y +CONFIG_AGP_INTEL=y +CONFIG_AGP_SIS=m +CONFIG_AGP_VIA=y +CONFIG_INTEL_GTT=y +CONFIG_VGA_ARB=y +CONFIG_VGA_ARB_MAX_GPUS=16 +CONFIG_VGA_SWITCHEROO=y +CONFIG_DRM=m +CONFIG_DRM_MIPI_DSI=y +# CONFIG_DRM_DP_AUX_CHARDEV is not set +# CONFIG_DRM_DEBUG_SELFTEST is not set +CONFIG_DRM_KMS_HELPER=m +CONFIG_DRM_KMS_FB_HELPER=y +CONFIG_DRM_FBDEV_EMULATION=y +CONFIG_DRM_FBDEV_OVERALLOC=100 +CONFIG_DRM_LOAD_EDID_FIRMWARE=y +# CONFIG_DRM_DP_CEC is not set +CONFIG_DRM_TTM=m +CONFIG_DRM_VM=y +CONFIG_DRM_SCHED=m + +# +# I2C encoder or helper chips +# +CONFIG_DRM_I2C_CH7006=m +CONFIG_DRM_I2C_SIL164=m +CONFIG_DRM_I2C_NXP_TDA998X=m +CONFIG_DRM_I2C_NXP_TDA9950=m +CONFIG_DRM_RADEON=m +# CONFIG_DRM_RADEON_USERPTR is not set +CONFIG_DRM_AMDGPU=m +# CONFIG_DRM_AMDGPU_SI is not set +# CONFIG_DRM_AMDGPU_CIK is not set +CONFIG_DRM_AMDGPU_USERPTR=y +# CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set + +# +# ACP (Audio CoProcessor) Configuration +# +# CONFIG_DRM_AMD_ACP is not set + +# +# Display Engine Configuration +# +CONFIG_DRM_AMD_DC=y +CONFIG_DRM_AMD_DC_DCN1_0=y +# CONFIG_DEBUG_KERNEL_DC is not set + +# +# AMD Library routines +# +CONFIG_CHASH=m +# CONFIG_CHASH_STATS is not set +# CONFIG_CHASH_SELFTEST is not set +CONFIG_DRM_NOUVEAU=m +CONFIG_NOUVEAU_DEBUG=5 +CONFIG_NOUVEAU_DEBUG_DEFAULT=3 +# CONFIG_NOUVEAU_DEBUG_MMU is not set +CONFIG_DRM_NOUVEAU_BACKLIGHT=y +CONFIG_DRM_I915=m +# CONFIG_DRM_I915_ALPHA_SUPPORT is not set +CONFIG_DRM_I915_CAPTURE_ERROR=y +CONFIG_DRM_I915_COMPRESS_ERROR=y +CONFIG_DRM_I915_USERPTR=y +# CONFIG_DRM_I915_GVT is not set + +# +# drm/i915 Debugging +# +# CONFIG_DRM_I915_WERROR is not set +# CONFIG_DRM_I915_DEBUG is not set +# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set +# CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set +# CONFIG_DRM_I915_DEBUG_GUC is not set +# CONFIG_DRM_I915_SELFTEST is not set +# CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set +# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set +CONFIG_DRM_VGEM=m +# CONFIG_DRM_VKMS is not set +CONFIG_DRM_VMWGFX=m +CONFIG_DRM_VMWGFX_FBCON=y +CONFIG_DRM_GMA500=m +CONFIG_DRM_GMA600=y +CONFIG_DRM_GMA3600=y +CONFIG_DRM_UDL=m +CONFIG_DRM_AST=m +# CONFIG_DRM_MGAG200 is not set +CONFIG_DRM_CIRRUS_QEMU=m +CONFIG_DRM_QXL=m +# CONFIG_DRM_BOCHS is not set +CONFIG_DRM_VIRTIO_GPU=m +CONFIG_DRM_PANEL=y + +# +# Display Panels +# +# CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set +CONFIG_DRM_BRIDGE=y +CONFIG_DRM_PANEL_BRIDGE=y + +# +# Display Interface Bridges +# +CONFIG_DRM_ANALOGIX_ANX78XX=m +CONFIG_HSA_AMD=m +CONFIG_DRM_HISI_HIBMC=m +# CONFIG_DRM_TINYDRM is not set +CONFIG_DRM_XEN=y +CONFIG_DRM_XEN_FRONTEND=m +# CONFIG_DRM_LEGACY is not set +CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y + +# +# Frame buffer Devices +# +CONFIG_FB=y +CONFIG_FIRMWARE_EDID=y +CONFIG_FB_CMDLINE=y +CONFIG_FB_NOTIFY=y +CONFIG_FB_DDC=m +CONFIG_FB_BOOT_VESA_SUPPORT=y +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +CONFIG_FB_SYS_FILLRECT=m +CONFIG_FB_SYS_COPYAREA=m +CONFIG_FB_SYS_IMAGEBLIT=m +# CONFIG_FB_FOREIGN_ENDIAN is not set +CONFIG_FB_SYS_FOPS=m +CONFIG_FB_DEFERRED_IO=y +CONFIG_FB_HECUBA=m +CONFIG_FB_SVGALIB=m +CONFIG_FB_BACKLIGHT=y +CONFIG_FB_MODE_HELPERS=y +CONFIG_FB_TILEBLITTING=y + +# +# Frame buffer hardware drivers +# +CONFIG_FB_CIRRUS=m +CONFIG_FB_PM2=m +CONFIG_FB_PM2_FIFO_DISCONNECT=y +CONFIG_FB_CYBER2000=m +CONFIG_FB_CYBER2000_DDC=y +CONFIG_FB_ARC=m +CONFIG_FB_ASILIANT=y +CONFIG_FB_IMSTT=y +CONFIG_FB_VGA16=m +CONFIG_FB_UVESA=m +CONFIG_FB_VESA=y +CONFIG_FB_EFI=y +CONFIG_FB_N411=m +CONFIG_FB_HGA=m +CONFIG_FB_OPENCORES=m +CONFIG_FB_S1D13XXX=m +# CONFIG_FB_NVIDIA is not set +CONFIG_FB_RIVA=m +CONFIG_FB_RIVA_I2C=y +# CONFIG_FB_RIVA_DEBUG is not set +CONFIG_FB_RIVA_BACKLIGHT=y +CONFIG_FB_I740=m +CONFIG_FB_LE80578=m +CONFIG_FB_CARILLO_RANCH=m +CONFIG_FB_INTEL=m +# CONFIG_FB_INTEL_DEBUG is not set +CONFIG_FB_INTEL_I2C=y +CONFIG_FB_MATROX=m +CONFIG_FB_MATROX_MILLENIUM=y +CONFIG_FB_MATROX_MYSTIQUE=y +CONFIG_FB_MATROX_G=y +CONFIG_FB_MATROX_I2C=m +CONFIG_FB_MATROX_MAVEN=m +CONFIG_FB_RADEON=m +CONFIG_FB_RADEON_I2C=y +CONFIG_FB_RADEON_BACKLIGHT=y +# CONFIG_FB_RADEON_DEBUG is not set +CONFIG_FB_ATY128=m +CONFIG_FB_ATY128_BACKLIGHT=y +CONFIG_FB_ATY=m +CONFIG_FB_ATY_CT=y +# CONFIG_FB_ATY_GENERIC_LCD is not set +CONFIG_FB_ATY_GX=y +CONFIG_FB_ATY_BACKLIGHT=y +CONFIG_FB_S3=m +CONFIG_FB_S3_DDC=y +CONFIG_FB_SAVAGE=m +CONFIG_FB_SAVAGE_I2C=y +# CONFIG_FB_SAVAGE_ACCEL is not set +CONFIG_FB_SIS=m +CONFIG_FB_SIS_300=y +CONFIG_FB_SIS_315=y +CONFIG_FB_VIA=m +# CONFIG_FB_VIA_DIRECT_PROCFS is not set +CONFIG_FB_VIA_X_COMPATIBILITY=y +CONFIG_FB_NEOMAGIC=m +CONFIG_FB_KYRO=m +CONFIG_FB_3DFX=m +# CONFIG_FB_3DFX_ACCEL is not set +# CONFIG_FB_3DFX_I2C is not set +CONFIG_FB_VOODOO1=m +CONFIG_FB_VT8623=m +CONFIG_FB_TRIDENT=m +CONFIG_FB_ARK=m +CONFIG_FB_PM3=m +CONFIG_FB_CARMINE=m +CONFIG_FB_CARMINE_DRAM_EVAL=y +# CONFIG_CARMINE_DRAM_CUSTOM is not set +CONFIG_FB_SM501=m +CONFIG_FB_SMSCUFX=m +CONFIG_FB_UDL=m +CONFIG_FB_IBM_GXT4500=m +# CONFIG_FB_VIRTUAL is not set +CONFIG_XEN_FBDEV_FRONTEND=m +CONFIG_FB_METRONOME=m +CONFIG_FB_MB862XX=m +CONFIG_FB_MB862XX_PCI_GDC=y +CONFIG_FB_MB862XX_I2C=y +CONFIG_FB_BROADSHEET=m +CONFIG_FB_HYPERV=m +CONFIG_FB_SIMPLE=y +CONFIG_FB_SM712=m +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_CLASS_DEVICE=m +CONFIG_LCD_L4F00242T03=m +CONFIG_LCD_LMS283GF05=m +CONFIG_LCD_LTV350QV=m +CONFIG_LCD_ILI922X=m +CONFIG_LCD_ILI9320=m +CONFIG_LCD_TDO24M=m +CONFIG_LCD_VGG2432A4=m +CONFIG_LCD_PLATFORM=m +CONFIG_LCD_S6E63M0=m +CONFIG_LCD_LD9040=m +CONFIG_LCD_AMS369FG06=m +CONFIG_LCD_LMS501KF03=m +CONFIG_LCD_HX8357=m +CONFIG_LCD_OTM3225A=m +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_BACKLIGHT_GENERIC=m +CONFIG_BACKLIGHT_LM3533=m +CONFIG_BACKLIGHT_CARILLO_RANCH=m +CONFIG_BACKLIGHT_PWM=m +CONFIG_BACKLIGHT_DA903X=m +CONFIG_BACKLIGHT_DA9052=m +CONFIG_BACKLIGHT_MAX8925=m +CONFIG_BACKLIGHT_APPLE=m +CONFIG_BACKLIGHT_PM8941_WLED=m +CONFIG_BACKLIGHT_SAHARA=m +CONFIG_BACKLIGHT_WM831X=m +CONFIG_BACKLIGHT_ADP5520=m +CONFIG_BACKLIGHT_ADP8860=m +CONFIG_BACKLIGHT_ADP8870=m +CONFIG_BACKLIGHT_88PM860X=m +CONFIG_BACKLIGHT_PCF50633=m +CONFIG_BACKLIGHT_AAT2870=m +CONFIG_BACKLIGHT_LM3630A=m +CONFIG_BACKLIGHT_LM3639=m +CONFIG_BACKLIGHT_LP855X=m +CONFIG_BACKLIGHT_LP8788=m +CONFIG_BACKLIGHT_PANDORA=m +CONFIG_BACKLIGHT_SKY81452=m +CONFIG_BACKLIGHT_AS3711=m +CONFIG_BACKLIGHT_GPIO=m +CONFIG_BACKLIGHT_LV5207LP=m +CONFIG_BACKLIGHT_BD6107=m +CONFIG_BACKLIGHT_ARCXCNN=m +CONFIG_BACKLIGHT_RAVE_SP=m +CONFIG_VGASTATE=m +CONFIG_VIDEOMODE_HELPERS=y +CONFIG_HDMI=y + +# +# Console display driver support +# +CONFIG_VGA_CONSOLE=y +# CONFIG_VGACON_SOFT_SCROLLBACK is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_DUMMY_CONSOLE_COLUMNS=80 +CONFIG_DUMMY_CONSOLE_ROWS=25 +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set +# CONFIG_LOGO_LINUX_CLUT224 is not set +CONFIG_SOUND=m +CONFIG_SOUND_OSS_CORE=y +# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +CONFIG_SND_PCM_ELD=y +CONFIG_SND_PCM_IEC958=y +CONFIG_SND_DMAENGINE_PCM=m +CONFIG_SND_HWDEP=m +CONFIG_SND_SEQ_DEVICE=m +CONFIG_SND_RAWMIDI=m +CONFIG_SND_COMPRESS_OFFLOAD=m +CONFIG_SND_JACK=y +CONFIG_SND_JACK_INPUT_DEV=y +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y +CONFIG_SND_PCM_TIMER=y +CONFIG_SND_HRTIMER=m +CONFIG_SND_DYNAMIC_MINORS=y +CONFIG_SND_MAX_CARDS=32 +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_PROC_FS=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set +CONFIG_SND_VMASTER=y +CONFIG_SND_DMA_SGBUF=y +CONFIG_SND_SEQUENCER=m +CONFIG_SND_SEQ_DUMMY=m +# CONFIG_SND_SEQUENCER_OSS is not set +CONFIG_SND_SEQ_HRTIMER_DEFAULT=y +CONFIG_SND_SEQ_MIDI_EVENT=m +CONFIG_SND_SEQ_MIDI=m +CONFIG_SND_SEQ_MIDI_EMUL=m +CONFIG_SND_SEQ_VIRMIDI=m +CONFIG_SND_MPU401_UART=m +CONFIG_SND_OPL3_LIB=m +CONFIG_SND_OPL3_LIB_SEQ=m +CONFIG_SND_VX_LIB=m +CONFIG_SND_AC97_CODEC=m +CONFIG_SND_DRIVERS=y +CONFIG_SND_PCSP=m +CONFIG_SND_DUMMY=m +CONFIG_SND_ALOOP=m +CONFIG_SND_VIRMIDI=m +CONFIG_SND_MTPAV=m +CONFIG_SND_MTS64=m +CONFIG_SND_SERIAL_U16550=m +CONFIG_SND_MPU401=m +CONFIG_SND_PORTMAN2X4=m +CONFIG_SND_AC97_POWER_SAVE=y +CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 +CONFIG_SND_SB_COMMON=m +CONFIG_SND_PCI=y +CONFIG_SND_AD1889=m +CONFIG_SND_ALS4000=m +CONFIG_SND_ASIHPI=m +CONFIG_SND_ATIIXP=m +CONFIG_SND_ATIIXP_MODEM=m +CONFIG_SND_AU8810=m +CONFIG_SND_AU8820=m +CONFIG_SND_AU8830=m +CONFIG_SND_AW2=m +CONFIG_SND_BT87X=m +# CONFIG_SND_BT87X_OVERCLOCK is not set +CONFIG_SND_CA0106=m +CONFIG_SND_CMIPCI=m +CONFIG_SND_OXYGEN_LIB=m +CONFIG_SND_OXYGEN=m +CONFIG_SND_CS4281=m +CONFIG_SND_CS46XX=m +CONFIG_SND_CS46XX_NEW_DSP=y +CONFIG_SND_CTXFI=m +CONFIG_SND_DARLA20=m +CONFIG_SND_GINA20=m +CONFIG_SND_LAYLA20=m +CONFIG_SND_DARLA24=m +CONFIG_SND_GINA24=m +CONFIG_SND_LAYLA24=m +CONFIG_SND_MONA=m +CONFIG_SND_MIA=m +CONFIG_SND_ECHO3G=m +CONFIG_SND_INDIGO=m +CONFIG_SND_INDIGOIO=m +CONFIG_SND_INDIGODJ=m +CONFIG_SND_INDIGOIOX=m +CONFIG_SND_INDIGODJX=m +CONFIG_SND_ENS1370=m +CONFIG_SND_ENS1371=m +CONFIG_SND_FM801=m +CONFIG_SND_FM801_TEA575X_BOOL=y +CONFIG_SND_HDSP=m +CONFIG_SND_HDSPM=m +CONFIG_SND_ICE1724=m +CONFIG_SND_INTEL8X0=m +CONFIG_SND_INTEL8X0M=m +CONFIG_SND_KORG1212=m +CONFIG_SND_LOLA=m +CONFIG_SND_LX6464ES=m +CONFIG_SND_MIXART=m +CONFIG_SND_NM256=m +CONFIG_SND_PCXHR=m +CONFIG_SND_RIPTIDE=m +CONFIG_SND_RME32=m +CONFIG_SND_RME96=m +CONFIG_SND_RME9652=m +CONFIG_SND_VIA82XX=m +CONFIG_SND_VIA82XX_MODEM=m +CONFIG_SND_VIRTUOSO=m +CONFIG_SND_VX222=m +CONFIG_SND_YMFPCI=m + +# +# HD-Audio +# +CONFIG_SND_HDA=m +CONFIG_SND_HDA_INTEL=m +CONFIG_SND_HDA_HWDEP=y +CONFIG_SND_HDA_RECONFIG=y +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_INPUT_BEEP_MODE=0 +CONFIG_SND_HDA_PATCH_LOADER=y +CONFIG_SND_HDA_CODEC_REALTEK=m +CONFIG_SND_HDA_CODEC_ANALOG=m +CONFIG_SND_HDA_CODEC_SIGMATEL=m +CONFIG_SND_HDA_CODEC_VIA=m +CONFIG_SND_HDA_CODEC_HDMI=m +CONFIG_SND_HDA_CODEC_CIRRUS=m +CONFIG_SND_HDA_CODEC_CONEXANT=m +CONFIG_SND_HDA_CODEC_CA0110=m +CONFIG_SND_HDA_CODEC_CA0132=m +CONFIG_SND_HDA_CODEC_CA0132_DSP=y +CONFIG_SND_HDA_CODEC_CMEDIA=m +CONFIG_SND_HDA_CODEC_SI3054=m +CONFIG_SND_HDA_GENERIC=m +CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 +CONFIG_SND_HDA_CORE=m +CONFIG_SND_HDA_DSP_LOADER=y +CONFIG_SND_HDA_COMPONENT=y +CONFIG_SND_HDA_I915=y +CONFIG_SND_HDA_EXT_CORE=m +CONFIG_SND_HDA_PREALLOC_SIZE=64 +CONFIG_SND_SPI=y +CONFIG_SND_USB=y +CONFIG_SND_USB_AUDIO=m +CONFIG_SND_USB_UA101=m +CONFIG_SND_USB_USX2Y=m +CONFIG_SND_USB_CAIAQ=m +CONFIG_SND_USB_CAIAQ_INPUT=y +CONFIG_SND_USB_US122L=m +CONFIG_SND_USB_6FIRE=m +CONFIG_SND_USB_HIFACE=m +CONFIG_SND_BCD2000=m +CONFIG_SND_USB_LINE6=m +CONFIG_SND_USB_POD=m +CONFIG_SND_USB_PODHD=m +CONFIG_SND_USB_TONEPORT=m +CONFIG_SND_USB_VARIAX=m +CONFIG_SND_FIREWIRE=y +CONFIG_SND_FIREWIRE_LIB=m +CONFIG_SND_DICE=m +CONFIG_SND_OXFW=m +CONFIG_SND_ISIGHT=m +CONFIG_SND_FIREWORKS=m +CONFIG_SND_BEBOB=m +CONFIG_SND_FIREWIRE_DIGI00X=m +CONFIG_SND_FIREWIRE_TASCAM=m +CONFIG_SND_FIREWIRE_MOTU=m +CONFIG_SND_FIREFACE=m +CONFIG_SND_PCMCIA=y +CONFIG_SND_VXPOCKET=m +CONFIG_SND_PDAUDIOCF=m +CONFIG_SND_SOC=m +CONFIG_SND_SOC_AC97_BUS=y +CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y +CONFIG_SND_SOC_COMPRESS=y +CONFIG_SND_SOC_TOPOLOGY=y +CONFIG_SND_SOC_ACPI=m +CONFIG_SND_SOC_AMD_ACP=m +CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m +CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m +CONFIG_SND_ATMEL_SOC=m +CONFIG_SND_DESIGNWARE_I2S=m +# CONFIG_SND_DESIGNWARE_PCM is not set + +# +# SoC Audio for Freescale CPUs +# + +# +# Common SoC Audio options for Freescale CPUs: +# +CONFIG_SND_SOC_FSL_ASRC=m +CONFIG_SND_SOC_FSL_SAI=m +CONFIG_SND_SOC_FSL_SSI=m +CONFIG_SND_SOC_FSL_SPDIF=m +CONFIG_SND_SOC_FSL_ESAI=m +CONFIG_SND_SOC_IMX_AUDMUX=m +CONFIG_SND_I2S_HI6210_I2S=m +# CONFIG_SND_SOC_IMG is not set +CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y +CONFIG_SND_SST_IPC=m +CONFIG_SND_SST_IPC_PCI=m +CONFIG_SND_SST_IPC_ACPI=m +CONFIG_SND_SOC_INTEL_SST_ACPI=m +CONFIG_SND_SOC_INTEL_SST=m +CONFIG_SND_SOC_INTEL_SST_FIRMWARE=m +CONFIG_SND_SOC_INTEL_HASWELL=m +CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m +CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI=m +CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI=m +CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m +CONFIG_SND_SOC_INTEL_SKYLAKE=m +CONFIG_SND_SOC_ACPI_INTEL_MATCH=m +CONFIG_SND_SOC_INTEL_MACH=y +CONFIG_SND_SOC_INTEL_HASWELL_MACH=m +CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m +CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m +CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m +CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m +CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m +CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m +CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m +CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m +CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m +CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m +CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m +CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m +CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m +CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m +CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m +CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m +CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH=m +CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH=m +CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH=m +CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH=m + +# +# STMicroelectronics STM32 SOC audio support +# +CONFIG_SND_SOC_XTFPGA_I2S=m +CONFIG_ZX_TDM=m +CONFIG_SND_SOC_I2C_AND_SPI=m + +# +# CODEC drivers +# +CONFIG_SND_SOC_AC97_CODEC=m +CONFIG_SND_SOC_ADAU_UTILS=m +CONFIG_SND_SOC_ADAU1701=m +CONFIG_SND_SOC_ADAU17X1=m +CONFIG_SND_SOC_ADAU1761=m +CONFIG_SND_SOC_ADAU1761_I2C=m +CONFIG_SND_SOC_ADAU1761_SPI=m +CONFIG_SND_SOC_ADAU7002=m +CONFIG_SND_SOC_AK4104=m +CONFIG_SND_SOC_AK4458=m +CONFIG_SND_SOC_AK4554=m +CONFIG_SND_SOC_AK4613=m +CONFIG_SND_SOC_AK4642=m +CONFIG_SND_SOC_AK5386=m +CONFIG_SND_SOC_AK5558=m +CONFIG_SND_SOC_ALC5623=m +CONFIG_SND_SOC_BD28623=m +CONFIG_SND_SOC_BT_SCO=m +CONFIG_SND_SOC_CS35L32=m +CONFIG_SND_SOC_CS35L33=m +CONFIG_SND_SOC_CS35L34=m +CONFIG_SND_SOC_CS35L35=m +CONFIG_SND_SOC_CS42L42=m +CONFIG_SND_SOC_CS42L51=m +CONFIG_SND_SOC_CS42L51_I2C=m +CONFIG_SND_SOC_CS42L52=m +CONFIG_SND_SOC_CS42L56=m +CONFIG_SND_SOC_CS42L73=m +CONFIG_SND_SOC_CS4265=m +CONFIG_SND_SOC_CS4270=m +CONFIG_SND_SOC_CS4271=m +CONFIG_SND_SOC_CS4271_I2C=m +CONFIG_SND_SOC_CS4271_SPI=m +CONFIG_SND_SOC_CS42XX8=m +CONFIG_SND_SOC_CS42XX8_I2C=m +CONFIG_SND_SOC_CS43130=m +CONFIG_SND_SOC_CS4349=m +CONFIG_SND_SOC_CS53L30=m +CONFIG_SND_SOC_DA7213=m +CONFIG_SND_SOC_DA7219=m +CONFIG_SND_SOC_DMIC=m +CONFIG_SND_SOC_HDMI_CODEC=m +CONFIG_SND_SOC_ES7134=m +CONFIG_SND_SOC_ES7241=m +CONFIG_SND_SOC_ES8316=m +CONFIG_SND_SOC_ES8328=m +CONFIG_SND_SOC_ES8328_I2C=m +CONFIG_SND_SOC_ES8328_SPI=m +CONFIG_SND_SOC_GTM601=m +CONFIG_SND_SOC_HDAC_HDMI=m +CONFIG_SND_SOC_INNO_RK3036=m +CONFIG_SND_SOC_MAX98090=m +CONFIG_SND_SOC_MAX98357A=m +CONFIG_SND_SOC_MAX98504=m +CONFIG_SND_SOC_MAX9867=m +CONFIG_SND_SOC_MAX98927=m +CONFIG_SND_SOC_MAX98373=m +CONFIG_SND_SOC_MAX9860=m +CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m +CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m +CONFIG_SND_SOC_PCM1681=m +CONFIG_SND_SOC_PCM1789=m +CONFIG_SND_SOC_PCM1789_I2C=m +CONFIG_SND_SOC_PCM179X=m +CONFIG_SND_SOC_PCM179X_I2C=m +CONFIG_SND_SOC_PCM179X_SPI=m +CONFIG_SND_SOC_PCM186X=m +CONFIG_SND_SOC_PCM186X_I2C=m +CONFIG_SND_SOC_PCM186X_SPI=m +CONFIG_SND_SOC_PCM3168A=m +CONFIG_SND_SOC_PCM3168A_I2C=m +CONFIG_SND_SOC_PCM3168A_SPI=m +CONFIG_SND_SOC_PCM512x=m +CONFIG_SND_SOC_PCM512x_I2C=m +CONFIG_SND_SOC_PCM512x_SPI=m +CONFIG_SND_SOC_RL6231=m +CONFIG_SND_SOC_RL6347A=m +CONFIG_SND_SOC_RT286=m +CONFIG_SND_SOC_RT298=m +CONFIG_SND_SOC_RT5514=m +CONFIG_SND_SOC_RT5514_SPI=m +CONFIG_SND_SOC_RT5616=m +CONFIG_SND_SOC_RT5631=m +CONFIG_SND_SOC_RT5640=m +CONFIG_SND_SOC_RT5645=m +CONFIG_SND_SOC_RT5651=m +CONFIG_SND_SOC_RT5663=m +CONFIG_SND_SOC_RT5670=m +CONFIG_SND_SOC_RT5677=m +CONFIG_SND_SOC_RT5677_SPI=m +CONFIG_SND_SOC_RT5682=m +CONFIG_SND_SOC_SGTL5000=m +CONFIG_SND_SOC_SI476X=m +CONFIG_SND_SOC_SIGMADSP=m +CONFIG_SND_SOC_SIGMADSP_I2C=m +CONFIG_SND_SOC_SIGMADSP_REGMAP=m +CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m +CONFIG_SND_SOC_SIRF_AUDIO_CODEC=m +CONFIG_SND_SOC_SPDIF=m +CONFIG_SND_SOC_SSM2305=m +CONFIG_SND_SOC_SSM2602=m +CONFIG_SND_SOC_SSM2602_SPI=m +CONFIG_SND_SOC_SSM2602_I2C=m +CONFIG_SND_SOC_SSM4567=m +CONFIG_SND_SOC_STA32X=m +CONFIG_SND_SOC_STA350=m +CONFIG_SND_SOC_STI_SAS=m +CONFIG_SND_SOC_TAS2552=m +CONFIG_SND_SOC_TAS5086=m +CONFIG_SND_SOC_TAS571X=m +CONFIG_SND_SOC_TAS5720=m +CONFIG_SND_SOC_TAS6424=m +CONFIG_SND_SOC_TDA7419=m +CONFIG_SND_SOC_TFA9879=m +CONFIG_SND_SOC_TLV320AIC23=m +CONFIG_SND_SOC_TLV320AIC23_I2C=m +CONFIG_SND_SOC_TLV320AIC23_SPI=m +CONFIG_SND_SOC_TLV320AIC31XX=m +CONFIG_SND_SOC_TLV320AIC32X4=m +CONFIG_SND_SOC_TLV320AIC32X4_I2C=m +CONFIG_SND_SOC_TLV320AIC32X4_SPI=m +CONFIG_SND_SOC_TLV320AIC3X=m +CONFIG_SND_SOC_TS3A227E=m +CONFIG_SND_SOC_TSCS42XX=m +CONFIG_SND_SOC_TSCS454=m +CONFIG_SND_SOC_WM8510=m +CONFIG_SND_SOC_WM8523=m +CONFIG_SND_SOC_WM8524=m +CONFIG_SND_SOC_WM8580=m +CONFIG_SND_SOC_WM8711=m +CONFIG_SND_SOC_WM8728=m +CONFIG_SND_SOC_WM8731=m +CONFIG_SND_SOC_WM8737=m +CONFIG_SND_SOC_WM8741=m +CONFIG_SND_SOC_WM8750=m +CONFIG_SND_SOC_WM8753=m +CONFIG_SND_SOC_WM8770=m +CONFIG_SND_SOC_WM8776=m +CONFIG_SND_SOC_WM8782=m +CONFIG_SND_SOC_WM8804=m +CONFIG_SND_SOC_WM8804_I2C=m +CONFIG_SND_SOC_WM8804_SPI=m +CONFIG_SND_SOC_WM8903=m +CONFIG_SND_SOC_WM8960=m +CONFIG_SND_SOC_WM8962=m +CONFIG_SND_SOC_WM8974=m +CONFIG_SND_SOC_WM8978=m +CONFIG_SND_SOC_WM8985=m +CONFIG_SND_SOC_ZX_AUD96P22=m +CONFIG_SND_SOC_MAX9759=m +CONFIG_SND_SOC_MT6351=m +CONFIG_SND_SOC_NAU8540=m +CONFIG_SND_SOC_NAU8810=m +CONFIG_SND_SOC_NAU8824=m +CONFIG_SND_SOC_NAU8825=m +CONFIG_SND_SOC_TPA6130A2=m +CONFIG_SND_SIMPLE_CARD_UTILS=m +CONFIG_SND_SIMPLE_CARD=m +CONFIG_SND_X86=y +CONFIG_HDMI_LPE_AUDIO=m +CONFIG_SND_XEN_FRONTEND=m +CONFIG_AC97_BUS=m + +# +# HID support +# +CONFIG_HID=m +CONFIG_HID_BATTERY_STRENGTH=y +CONFIG_HIDRAW=y +CONFIG_UHID=m +CONFIG_HID_GENERIC=m + +# +# Special HID drivers +# +CONFIG_HID_A4TECH=m +CONFIG_HID_ACCUTOUCH=m +CONFIG_HID_ACRUX=m +CONFIG_HID_ACRUX_FF=y +CONFIG_HID_APPLE=m +CONFIG_HID_APPLEIR=m +CONFIG_HID_ASUS=m +CONFIG_HID_AUREAL=m +CONFIG_HID_BELKIN=m +CONFIG_HID_BETOP_FF=m +CONFIG_HID_CHERRY=m +CONFIG_HID_CHICONY=m +CONFIG_HID_CORSAIR=m +CONFIG_HID_COUGAR=m +CONFIG_HID_PRODIKEYS=m +CONFIG_HID_CMEDIA=m +CONFIG_HID_CP2112=m +CONFIG_HID_CYPRESS=m +CONFIG_HID_DRAGONRISE=m +CONFIG_DRAGONRISE_FF=y +CONFIG_HID_EMS_FF=m +CONFIG_HID_ELAN=m +CONFIG_HID_ELECOM=m +CONFIG_HID_ELO=m +CONFIG_HID_EZKEY=m +CONFIG_HID_GEMBIRD=m +CONFIG_HID_GFRM=m +CONFIG_HID_HOLTEK=m +CONFIG_HOLTEK_FF=y +CONFIG_HID_GOOGLE_HAMMER=m +CONFIG_HID_GT683R=m +CONFIG_HID_KEYTOUCH=m +CONFIG_HID_KYE=m +CONFIG_HID_UCLOGIC=m +CONFIG_HID_WALTOP=m +CONFIG_HID_GYRATION=m +CONFIG_HID_ICADE=m +CONFIG_HID_ITE=m +CONFIG_HID_JABRA=m +CONFIG_HID_TWINHAN=m +CONFIG_HID_KENSINGTON=m +CONFIG_HID_LCPOWER=m +CONFIG_HID_LED=m +CONFIG_HID_LENOVO=m +CONFIG_HID_LOGITECH=m +CONFIG_HID_LOGITECH_DJ=m +CONFIG_HID_LOGITECH_HIDPP=m +CONFIG_LOGITECH_FF=y +CONFIG_LOGIRUMBLEPAD2_FF=y +CONFIG_LOGIG940_FF=y +CONFIG_LOGIWHEELS_FF=y +CONFIG_HID_MAGICMOUSE=m +CONFIG_HID_MAYFLASH=m +CONFIG_HID_REDRAGON=m +CONFIG_HID_MICROSOFT=m +CONFIG_HID_MONTEREY=m +CONFIG_HID_MULTITOUCH=m +CONFIG_HID_NTI=m +CONFIG_HID_NTRIG=m +CONFIG_HID_ORTEK=m +CONFIG_HID_PANTHERLORD=m +CONFIG_PANTHERLORD_FF=y +CONFIG_HID_PENMOUNT=m +CONFIG_HID_PETALYNX=m +CONFIG_HID_PICOLCD=m +CONFIG_HID_PICOLCD_FB=y +CONFIG_HID_PICOLCD_BACKLIGHT=y +CONFIG_HID_PICOLCD_LCD=y +CONFIG_HID_PICOLCD_LEDS=y +CONFIG_HID_PICOLCD_CIR=y +CONFIG_HID_PLANTRONICS=m +CONFIG_HID_PRIMAX=m +CONFIG_HID_RETRODE=m +CONFIG_HID_ROCCAT=m +CONFIG_HID_SAITEK=m +CONFIG_HID_SAMSUNG=m +CONFIG_HID_SONY=m +CONFIG_SONY_FF=y +CONFIG_HID_SPEEDLINK=m +CONFIG_HID_STEAM=m +CONFIG_HID_STEELSERIES=m +CONFIG_HID_SUNPLUS=m +CONFIG_HID_RMI=m +CONFIG_HID_GREENASIA=m +CONFIG_GREENASIA_FF=y +CONFIG_HID_HYPERV_MOUSE=m +CONFIG_HID_SMARTJOYPLUS=m +CONFIG_SMARTJOYPLUS_FF=y +CONFIG_HID_TIVO=m +CONFIG_HID_TOPSEED=m +CONFIG_HID_THINGM=m +CONFIG_HID_THRUSTMASTER=m +CONFIG_THRUSTMASTER_FF=y +CONFIG_HID_UDRAW_PS3=m +CONFIG_HID_WACOM=m +CONFIG_HID_WIIMOTE=m +CONFIG_HID_XINMO=m +CONFIG_HID_ZEROPLUS=m +CONFIG_ZEROPLUS_FF=y +CONFIG_HID_ZYDACRON=m +CONFIG_HID_SENSOR_HUB=m +CONFIG_HID_SENSOR_CUSTOM_SENSOR=m +CONFIG_HID_ALPS=m + +# +# USB HID support +# +CONFIG_USB_HID=m +CONFIG_HID_PID=y +CONFIG_USB_HIDDEV=y + +# +# USB HID Boot Protocol drivers +# +CONFIG_USB_KBD=m +CONFIG_USB_MOUSE=m + +# +# I2C HID support +# +CONFIG_I2C_HID=m + +# +# Intel ISH HID support +# +CONFIG_INTEL_ISH_HID=m +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +CONFIG_USB_SUPPORT=y +CONFIG_USB_COMMON=y +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB=y +CONFIG_USB_PCI=y +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y + +# +# Miscellaneous USB options +# +CONFIG_USB_DEFAULT_PERSIST=y +CONFIG_USB_DYNAMIC_MINORS=y +# CONFIG_USB_OTG is not set +# CONFIG_USB_OTG_WHITELIST is not set +# CONFIG_USB_OTG_BLACKLIST_HUB is not set +CONFIG_USB_LEDS_TRIGGER_USBPORT=m +CONFIG_USB_MON=m +CONFIG_USB_WUSB=m +CONFIG_USB_WUSB_CBAF=m +# CONFIG_USB_WUSB_CBAF_DEBUG is not set + +# +# USB Host Controller Drivers +# +CONFIG_USB_C67X00_HCD=m +CONFIG_USB_XHCI_HCD=y +# CONFIG_USB_XHCI_DBGCAP is not set +CONFIG_USB_XHCI_PCI=y +CONFIG_USB_XHCI_PLATFORM=m +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_ROOT_HUB_TT=y +CONFIG_USB_EHCI_TT_NEWSCHED=y +CONFIG_USB_EHCI_PCI=y +CONFIG_USB_EHCI_HCD_PLATFORM=y +CONFIG_USB_OXU210HP_HCD=m +CONFIG_USB_ISP116X_HCD=m +CONFIG_USB_FOTG210_HCD=m +CONFIG_USB_MAX3421_HCD=m +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_HCD_PCI=y +CONFIG_USB_OHCI_HCD_PLATFORM=y +CONFIG_USB_UHCI_HCD=y +CONFIG_USB_U132_HCD=m +CONFIG_USB_SL811_HCD=m +CONFIG_USB_SL811_HCD_ISO=y +CONFIG_USB_SL811_CS=m +CONFIG_USB_R8A66597_HCD=m +CONFIG_USB_WHCI_HCD=m +CONFIG_USB_HWA_HCD=m +CONFIG_USB_HCD_BCMA=m +CONFIG_USB_HCD_SSB=m +# CONFIG_USB_HCD_TEST_MODE is not set + +# +# USB Device Class drivers +# +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m +CONFIG_USB_WDM=m +CONFIG_USB_TMC=m + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may +# + +# +# also be needed; see USB_STORAGE Help for more info +# +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +CONFIG_USB_STORAGE_REALTEK=m +CONFIG_REALTEK_AUTOPM=y +CONFIG_USB_STORAGE_DATAFAB=m +CONFIG_USB_STORAGE_FREECOM=m +CONFIG_USB_STORAGE_ISD200=m +CONFIG_USB_STORAGE_USBAT=m +CONFIG_USB_STORAGE_SDDR09=m +CONFIG_USB_STORAGE_SDDR55=m +CONFIG_USB_STORAGE_JUMPSHOT=m +CONFIG_USB_STORAGE_ALAUDA=m +CONFIG_USB_STORAGE_ONETOUCH=m +CONFIG_USB_STORAGE_KARMA=m +CONFIG_USB_STORAGE_CYPRESS_ATACB=m +CONFIG_USB_STORAGE_ENE_UB6250=m +CONFIG_USB_UAS=m + +# +# USB Imaging devices +# +CONFIG_USB_MDC800=m +CONFIG_USB_MICROTEK=m +CONFIG_USBIP_CORE=m +CONFIG_USBIP_VHCI_HCD=m +CONFIG_USBIP_VHCI_HC_PORTS=8 +CONFIG_USBIP_VHCI_NR_HCS=1 +CONFIG_USBIP_HOST=m +CONFIG_USBIP_VUDC=m +# CONFIG_USBIP_DEBUG is not set +CONFIG_USB_MUSB_HDRC=m +# CONFIG_USB_MUSB_HOST is not set +# CONFIG_USB_MUSB_GADGET is not set +CONFIG_USB_MUSB_DUAL_ROLE=y + +# +# Platform Glue Layer +# + +# +# MUSB DMA mode +# +CONFIG_MUSB_PIO_ONLY=y +CONFIG_USB_DWC3=m +CONFIG_USB_DWC3_ULPI=y +# CONFIG_USB_DWC3_HOST is not set +# CONFIG_USB_DWC3_GADGET is not set +CONFIG_USB_DWC3_DUAL_ROLE=y + +# +# Platform Glue Driver Support +# +CONFIG_USB_DWC3_PCI=m +CONFIG_USB_DWC3_HAPS=m +CONFIG_USB_DWC2=y +CONFIG_USB_DWC2_HOST=y + +# +# Gadget/Dual-role mode requires USB Gadget support to be enabled +# +CONFIG_USB_DWC2_PCI=m +# CONFIG_USB_DWC2_DEBUG is not set +# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set +CONFIG_USB_CHIPIDEA=m +CONFIG_USB_CHIPIDEA_PCI=m +CONFIG_USB_CHIPIDEA_UDC=y +CONFIG_USB_CHIPIDEA_HOST=y +CONFIG_USB_ISP1760=m +CONFIG_USB_ISP1760_HCD=y +CONFIG_USB_ISP1761_UDC=y +# CONFIG_USB_ISP1760_HOST_ROLE is not set +# CONFIG_USB_ISP1760_GADGET_ROLE is not set +CONFIG_USB_ISP1760_DUAL_ROLE=y + +# +# USB port drivers +# +CONFIG_USB_USS720=m +CONFIG_USB_SERIAL=m +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_SIMPLE=m +CONFIG_USB_SERIAL_AIRCABLE=m +CONFIG_USB_SERIAL_ARK3116=m +CONFIG_USB_SERIAL_BELKIN=m +CONFIG_USB_SERIAL_CH341=m +CONFIG_USB_SERIAL_WHITEHEAT=m +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +CONFIG_USB_SERIAL_CP210X=m +CONFIG_USB_SERIAL_CYPRESS_M8=m +CONFIG_USB_SERIAL_EMPEG=m +CONFIG_USB_SERIAL_FTDI_SIO=m +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +CONFIG_USB_SERIAL_EDGEPORT_TI=m +CONFIG_USB_SERIAL_F81232=m +CONFIG_USB_SERIAL_F8153X=m +CONFIG_USB_SERIAL_GARMIN=m +CONFIG_USB_SERIAL_IPW=m +CONFIG_USB_SERIAL_IUU=m +CONFIG_USB_SERIAL_KEYSPAN_PDA=m +CONFIG_USB_SERIAL_KEYSPAN=m +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_KOBIL_SCT=m +CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_METRO=m +CONFIG_USB_SERIAL_MOS7720=m +CONFIG_USB_SERIAL_MOS7715_PARPORT=y +CONFIG_USB_SERIAL_MOS7840=m +CONFIG_USB_SERIAL_MXUPORT=m +CONFIG_USB_SERIAL_NAVMAN=m +CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_OTI6858=m +CONFIG_USB_SERIAL_QCAUX=m +CONFIG_USB_SERIAL_QUALCOMM=m +CONFIG_USB_SERIAL_SPCP8X5=m +CONFIG_USB_SERIAL_SAFE=m +# CONFIG_USB_SERIAL_SAFE_PADDED is not set +CONFIG_USB_SERIAL_SIERRAWIRELESS=m +CONFIG_USB_SERIAL_SYMBOL=m +CONFIG_USB_SERIAL_TI=m +CONFIG_USB_SERIAL_CYBERJACK=m +CONFIG_USB_SERIAL_XIRCOM=m +CONFIG_USB_SERIAL_WWAN=m +CONFIG_USB_SERIAL_OPTION=m +CONFIG_USB_SERIAL_OMNINET=m +CONFIG_USB_SERIAL_OPTICON=m +CONFIG_USB_SERIAL_XSENS_MT=m +CONFIG_USB_SERIAL_WISHBONE=m +CONFIG_USB_SERIAL_SSU100=m +CONFIG_USB_SERIAL_QT2=m +CONFIG_USB_SERIAL_UPD78F0730=m +CONFIG_USB_SERIAL_DEBUG=m + +# +# USB Miscellaneous drivers +# +CONFIG_USB_EMI62=m +CONFIG_USB_EMI26=m +CONFIG_USB_ADUTUX=m +CONFIG_USB_SEVSEG=m +CONFIG_USB_RIO500=m +CONFIG_USB_LEGOTOWER=m +CONFIG_USB_LCD=m +CONFIG_USB_CYPRESS_CY7C63=m +CONFIG_USB_CYTHERM=m +CONFIG_USB_IDMOUSE=m +CONFIG_USB_FTDI_ELAN=m +CONFIG_USB_APPLEDISPLAY=m +CONFIG_USB_SISUSBVGA=m +# CONFIG_USB_SISUSBVGA_CON is not set +CONFIG_USB_LD=m +CONFIG_USB_TRANCEVIBRATOR=m +CONFIG_USB_IOWARRIOR=m +CONFIG_USB_TEST=m +CONFIG_USB_EHSET_TEST_FIXTURE=m +CONFIG_USB_ISIGHTFW=m +CONFIG_USB_YUREX=m +CONFIG_USB_EZUSB_FX2=m +CONFIG_USB_HUB_USB251XB=m +CONFIG_USB_HSIC_USB3503=m +CONFIG_USB_HSIC_USB4604=m +CONFIG_USB_LINK_LAYER_TEST=m +CONFIG_USB_CHAOSKEY=m +CONFIG_USB_ATM=m +CONFIG_USB_SPEEDTOUCH=m +CONFIG_USB_CXACRU=m +CONFIG_USB_UEAGLEATM=m +CONFIG_USB_XUSBATM=m + +# +# USB Physical Layer drivers +# +CONFIG_USB_PHY=y +CONFIG_NOP_USB_XCEIV=m +CONFIG_USB_GPIO_VBUS=m +CONFIG_TAHVO_USB=m +CONFIG_TAHVO_USB_HOST_BY_DEFAULT=y +CONFIG_USB_ISP1301=m +CONFIG_USB_GADGET=m +# CONFIG_USB_GADGET_DEBUG is not set +# CONFIG_USB_GADGET_DEBUG_FILES is not set +# CONFIG_USB_GADGET_DEBUG_FS is not set +CONFIG_USB_GADGET_VBUS_DRAW=2 +CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 +# CONFIG_U_SERIAL_CONSOLE is not set + +# +# USB Peripheral Controller +# +CONFIG_USB_FOTG210_UDC=m +CONFIG_USB_GR_UDC=m +CONFIG_USB_R8A66597=m +CONFIG_USB_PXA27X=m +CONFIG_USB_MV_UDC=m +CONFIG_USB_MV_U3D=m +CONFIG_USB_SNP_CORE=m +# CONFIG_USB_M66592 is not set +CONFIG_USB_BDC_UDC=m + +# +# Platform Support +# +CONFIG_USB_BDC_PCI=m +CONFIG_USB_AMD5536UDC=m +CONFIG_USB_NET2272=m +CONFIG_USB_NET2272_DMA=y +CONFIG_USB_NET2280=m +CONFIG_USB_GOKU=m +CONFIG_USB_EG20T=m +# CONFIG_USB_DUMMY_HCD is not set +CONFIG_USB_LIBCOMPOSITE=m +CONFIG_USB_F_ACM=m +CONFIG_USB_F_SS_LB=m +CONFIG_USB_U_SERIAL=m +CONFIG_USB_U_ETHER=m +CONFIG_USB_U_AUDIO=m +CONFIG_USB_F_SERIAL=m +CONFIG_USB_F_OBEX=m +CONFIG_USB_F_NCM=m +CONFIG_USB_F_ECM=m +CONFIG_USB_F_PHONET=m +CONFIG_USB_F_EEM=m +CONFIG_USB_F_SUBSET=m +CONFIG_USB_F_RNDIS=m +CONFIG_USB_F_MASS_STORAGE=m +CONFIG_USB_F_FS=m +CONFIG_USB_F_UAC1=m +CONFIG_USB_F_UAC2=m +CONFIG_USB_F_UVC=m +CONFIG_USB_F_MIDI=m +CONFIG_USB_F_HID=m +CONFIG_USB_F_PRINTER=m +CONFIG_USB_F_TCM=m +CONFIG_USB_CONFIGFS=m +CONFIG_USB_CONFIGFS_SERIAL=y +CONFIG_USB_CONFIGFS_ACM=y +CONFIG_USB_CONFIGFS_OBEX=y +CONFIG_USB_CONFIGFS_NCM=y +CONFIG_USB_CONFIGFS_ECM=y +CONFIG_USB_CONFIGFS_ECM_SUBSET=y +CONFIG_USB_CONFIGFS_RNDIS=y +CONFIG_USB_CONFIGFS_EEM=y +CONFIG_USB_CONFIGFS_PHONET=y +CONFIG_USB_CONFIGFS_MASS_STORAGE=y +CONFIG_USB_CONFIGFS_F_LB_SS=y +CONFIG_USB_CONFIGFS_F_FS=y +CONFIG_USB_CONFIGFS_F_UAC1=y +# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set +CONFIG_USB_CONFIGFS_F_UAC2=y +CONFIG_USB_CONFIGFS_F_MIDI=y +CONFIG_USB_CONFIGFS_F_HID=y +CONFIG_USB_CONFIGFS_F_UVC=y +CONFIG_USB_CONFIGFS_F_PRINTER=y +# CONFIG_USB_CONFIGFS_F_TCM is not set +CONFIG_USB_ZERO=m +CONFIG_USB_AUDIO=m +CONFIG_GADGET_UAC1=y +# CONFIG_GADGET_UAC1_LEGACY is not set +CONFIG_USB_ETH=m +CONFIG_USB_ETH_RNDIS=y +CONFIG_USB_ETH_EEM=y +CONFIG_USB_G_NCM=m +CONFIG_USB_GADGETFS=m +CONFIG_USB_FUNCTIONFS=m +CONFIG_USB_FUNCTIONFS_ETH=y +CONFIG_USB_FUNCTIONFS_RNDIS=y +CONFIG_USB_FUNCTIONFS_GENERIC=y +CONFIG_USB_MASS_STORAGE=m +CONFIG_USB_GADGET_TARGET=m +CONFIG_USB_G_SERIAL=m +CONFIG_USB_MIDI_GADGET=m +CONFIG_USB_G_PRINTER=m +CONFIG_USB_CDC_COMPOSITE=m +CONFIG_USB_G_NOKIA=m +CONFIG_USB_G_ACM_MS=m +# CONFIG_USB_G_MULTI is not set +CONFIG_USB_G_HID=m +CONFIG_USB_G_DBGP=m +# CONFIG_USB_G_DBGP_PRINTK is not set +CONFIG_USB_G_DBGP_SERIAL=y +CONFIG_USB_G_WEBCAM=m +CONFIG_TYPEC=m +CONFIG_TYPEC_TCPM=m +CONFIG_TYPEC_TCPCI=m +CONFIG_TYPEC_RT1711H=m +CONFIG_TYPEC_FUSB302=m +CONFIG_TYPEC_UCSI=m +CONFIG_UCSI_ACPI=m +CONFIG_TYPEC_TPS6598X=m + +# +# USB Type-C Multiplexer/DeMultiplexer Switch support +# +CONFIG_TYPEC_MUX_PI3USB30532=m + +# +# USB Type-C Alternate Mode drivers +# +CONFIG_TYPEC_DP_ALTMODE=m +CONFIG_USB_ROLES_INTEL_XHCI=m +CONFIG_USB_LED_TRIG=y +CONFIG_USB_ULPI_BUS=m +CONFIG_USB_ROLE_SWITCH=m +CONFIG_UWB=m +CONFIG_UWB_HWA=m +CONFIG_UWB_WHCI=m +CONFIG_UWB_I1480U=m +CONFIG_MMC=y +CONFIG_MMC_BLOCK=m +CONFIG_MMC_BLOCK_MINORS=8 +CONFIG_SDIO_UART=m +# CONFIG_MMC_TEST is not set + +# +# MMC/SD/SDIO Host Controller Drivers +# +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_SDHCI=m +CONFIG_MMC_SDHCI_PCI=m +CONFIG_MMC_RICOH_MMC=y +CONFIG_MMC_SDHCI_ACPI=m +CONFIG_MMC_SDHCI_PLTFM=m +CONFIG_MMC_SDHCI_F_SDH30=m +CONFIG_MMC_WBSD=m +CONFIG_MMC_TIFM_SD=m +CONFIG_MMC_SPI=m +CONFIG_MMC_SDRICOH_CS=m +CONFIG_MMC_CB710=m +CONFIG_MMC_VIA_SDMMC=m +CONFIG_MMC_VUB300=m +CONFIG_MMC_USHC=m +CONFIG_MMC_USDHI6ROL0=m +CONFIG_MMC_REALTEK_PCI=m +CONFIG_MMC_REALTEK_USB=m +CONFIG_MMC_CQHCI=m +CONFIG_MMC_TOSHIBA_PCI=m +CONFIG_MMC_MTK=m +CONFIG_MMC_SDHCI_XENON=m +CONFIG_MEMSTICK=m +# CONFIG_MEMSTICK_DEBUG is not set + +# +# MemoryStick drivers +# +# CONFIG_MEMSTICK_UNSAFE_RESUME is not set +CONFIG_MSPRO_BLOCK=m +CONFIG_MS_BLOCK=m + +# +# MemoryStick Host Controller Drivers +# +CONFIG_MEMSTICK_TIFM_MS=m +CONFIG_MEMSTICK_JMICRON_38X=m +CONFIG_MEMSTICK_R592=m +CONFIG_MEMSTICK_REALTEK_PCI=m +CONFIG_MEMSTICK_REALTEK_USB=m +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_CLASS_FLASH=m +# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set + +# +# LED drivers +# +CONFIG_LEDS_88PM860X=m +CONFIG_LEDS_APU=m +CONFIG_LEDS_AS3645A=m +CONFIG_LEDS_LM3530=m +CONFIG_LEDS_LM3533=m +CONFIG_LEDS_LM3642=m +CONFIG_LEDS_LM3601X=m +CONFIG_LEDS_MT6323=m +CONFIG_LEDS_PCA9532=m +CONFIG_LEDS_PCA9532_GPIO=y +CONFIG_LEDS_GPIO=m +CONFIG_LEDS_LP3944=m +CONFIG_LEDS_LP3952=m +CONFIG_LEDS_LP55XX_COMMON=m +CONFIG_LEDS_LP5521=m +CONFIG_LEDS_LP5523=m +CONFIG_LEDS_LP5562=m +CONFIG_LEDS_LP8501=m +CONFIG_LEDS_LP8788=m +CONFIG_LEDS_CLEVO_MAIL=m +CONFIG_LEDS_PCA955X=m +# CONFIG_LEDS_PCA955X_GPIO is not set +CONFIG_LEDS_PCA963X=m +CONFIG_LEDS_WM831X_STATUS=m +CONFIG_LEDS_WM8350=m +CONFIG_LEDS_DA903X=m +CONFIG_LEDS_DA9052=m +CONFIG_LEDS_DAC124S085=m +CONFIG_LEDS_PWM=m +CONFIG_LEDS_REGULATOR=m +CONFIG_LEDS_BD2802=m +CONFIG_LEDS_INTEL_SS4200=m +CONFIG_LEDS_LT3593=m +CONFIG_LEDS_ADP5520=m +CONFIG_LEDS_MC13783=m +CONFIG_LEDS_TCA6507=m +CONFIG_LEDS_TLC591XX=m +CONFIG_LEDS_MAX8997=m +CONFIG_LEDS_LM355x=m +CONFIG_LEDS_MENF21BMC=m + +# +# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM) +# +CONFIG_LEDS_BLINKM=m +CONFIG_LEDS_MLXCPLD=m +CONFIG_LEDS_MLXREG=m +CONFIG_LEDS_USER=m +CONFIG_LEDS_NIC78BX=m + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=m +CONFIG_LEDS_TRIGGER_ONESHOT=m +CONFIG_LEDS_TRIGGER_DISK=y +# CONFIG_LEDS_TRIGGER_MTD is not set +CONFIG_LEDS_TRIGGER_HEARTBEAT=m +CONFIG_LEDS_TRIGGER_BACKLIGHT=m +CONFIG_LEDS_TRIGGER_CPU=y +CONFIG_LEDS_TRIGGER_ACTIVITY=m +CONFIG_LEDS_TRIGGER_GPIO=m +CONFIG_LEDS_TRIGGER_DEFAULT_ON=m + +# +# iptables trigger is under Netfilter config (LED target) +# +CONFIG_LEDS_TRIGGER_TRANSIENT=m +CONFIG_LEDS_TRIGGER_CAMERA=m +CONFIG_LEDS_TRIGGER_PANIC=y +CONFIG_LEDS_TRIGGER_NETDEV=m +# CONFIG_ACCESSIBILITY is not set +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +# CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI is not set +CONFIG_INFINIBAND_USER_MEM=y +CONFIG_INFINIBAND_ON_DEMAND_PAGING=y +CONFIG_INFINIBAND_ADDR_TRANS=y +CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y +CONFIG_INFINIBAND_MTHCA=m +# CONFIG_INFINIBAND_MTHCA_DEBUG is not set +CONFIG_INFINIBAND_QIB=m +CONFIG_INFINIBAND_QIB_DCA=y +CONFIG_INFINIBAND_CXGB3=m +CONFIG_INFINIBAND_CXGB4=m +CONFIG_INFINIBAND_I40IW=m +CONFIG_MLX4_INFINIBAND=m +CONFIG_MLX5_INFINIBAND=m +CONFIG_INFINIBAND_NES=m +# CONFIG_INFINIBAND_NES_DEBUG is not set +CONFIG_INFINIBAND_OCRDMA=m +CONFIG_INFINIBAND_VMWARE_PVRDMA=m +CONFIG_INFINIBAND_USNIC=m +CONFIG_INFINIBAND_IPOIB=m +CONFIG_INFINIBAND_IPOIB_CM=y +# CONFIG_INFINIBAND_IPOIB_DEBUG is not set +CONFIG_INFINIBAND_SRP=m +CONFIG_INFINIBAND_SRPT=m +CONFIG_INFINIBAND_ISER=m +CONFIG_INFINIBAND_ISERT=m +CONFIG_INFINIBAND_OPA_VNIC=m +CONFIG_INFINIBAND_RDMAVT=m +CONFIG_RDMA_RXE=m +CONFIG_INFINIBAND_HFI1=m +# CONFIG_HFI1_DEBUG_SDMA_ORDER is not set +# CONFIG_SDMA_VERBOSITY is not set +CONFIG_INFINIBAND_QEDR=m +CONFIG_INFINIBAND_BNXT_RE=m +CONFIG_EDAC_ATOMIC_SCRUB=y +CONFIG_EDAC_SUPPORT=y +CONFIG_EDAC=y +# CONFIG_EDAC_LEGACY_SYSFS is not set +# CONFIG_EDAC_DEBUG is not set +CONFIG_EDAC_DECODE_MCE=m +CONFIG_EDAC_GHES=y +CONFIG_EDAC_AMD64=m +# CONFIG_EDAC_AMD64_ERROR_INJECTION is not set +CONFIG_EDAC_E752X=m +CONFIG_EDAC_I82975X=m +CONFIG_EDAC_I3000=m +CONFIG_EDAC_I3200=m +CONFIG_EDAC_IE31200=m +CONFIG_EDAC_X38=m +CONFIG_EDAC_I5400=m +CONFIG_EDAC_I7CORE=m +CONFIG_EDAC_I5000=m +CONFIG_EDAC_I5100=m +CONFIG_EDAC_I7300=m +CONFIG_EDAC_SBRIDGE=m +CONFIG_EDAC_SKX=m +CONFIG_EDAC_PND2=m +CONFIG_RTC_LIB=y +CONFIG_RTC_MC146818_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +CONFIG_RTC_SYSTOHC=y +CONFIG_RTC_SYSTOHC_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set +CONFIG_RTC_NVMEM=y + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set +# CONFIG_RTC_DRV_TEST is not set + +# +# I2C RTC drivers +# +CONFIG_RTC_DRV_88PM860X=m +CONFIG_RTC_DRV_88PM80X=m +CONFIG_RTC_DRV_ABB5ZES3=m +CONFIG_RTC_DRV_ABX80X=m +CONFIG_RTC_DRV_DS1307=m +# CONFIG_RTC_DRV_DS1307_CENTURY is not set +CONFIG_RTC_DRV_DS1374=m +CONFIG_RTC_DRV_DS1374_WDT=y +CONFIG_RTC_DRV_DS1672=m +CONFIG_RTC_DRV_LP8788=m +CONFIG_RTC_DRV_MAX6900=m +CONFIG_RTC_DRV_MAX8907=m +CONFIG_RTC_DRV_MAX8925=m +CONFIG_RTC_DRV_MAX8998=m +CONFIG_RTC_DRV_MAX8997=m +CONFIG_RTC_DRV_RS5C372=m +CONFIG_RTC_DRV_ISL1208=m +CONFIG_RTC_DRV_ISL12022=m +CONFIG_RTC_DRV_X1205=m +CONFIG_RTC_DRV_PCF8523=m +CONFIG_RTC_DRV_PCF85063=m +CONFIG_RTC_DRV_PCF85363=m +CONFIG_RTC_DRV_PCF8563=m +CONFIG_RTC_DRV_PCF8583=m +CONFIG_RTC_DRV_M41T80=m +CONFIG_RTC_DRV_M41T80_WDT=y +CONFIG_RTC_DRV_BQ32K=m +CONFIG_RTC_DRV_PALMAS=m +CONFIG_RTC_DRV_TPS6586X=m +CONFIG_RTC_DRV_TPS65910=m +CONFIG_RTC_DRV_TPS80031=m +CONFIG_RTC_DRV_RC5T583=m +CONFIG_RTC_DRV_S35390A=m +CONFIG_RTC_DRV_FM3130=m +CONFIG_RTC_DRV_RX8010=m +CONFIG_RTC_DRV_RX8581=m +CONFIG_RTC_DRV_RX8025=m +CONFIG_RTC_DRV_EM3027=m +CONFIG_RTC_DRV_RV8803=m +CONFIG_RTC_DRV_S5M=m + +# +# SPI RTC drivers +# +CONFIG_RTC_DRV_M41T93=m +CONFIG_RTC_DRV_M41T94=m +CONFIG_RTC_DRV_DS1302=m +CONFIG_RTC_DRV_DS1305=m +CONFIG_RTC_DRV_DS1343=m +CONFIG_RTC_DRV_DS1347=m +CONFIG_RTC_DRV_DS1390=m +CONFIG_RTC_DRV_MAX6916=m +CONFIG_RTC_DRV_R9701=m +CONFIG_RTC_DRV_RX4581=m +CONFIG_RTC_DRV_RX6110=m +CONFIG_RTC_DRV_RS5C348=m +CONFIG_RTC_DRV_MAX6902=m +CONFIG_RTC_DRV_PCF2123=m +CONFIG_RTC_DRV_MCP795=m +CONFIG_RTC_I2C_AND_SPI=y + +# +# SPI and I2C RTC drivers +# +CONFIG_RTC_DRV_DS3232=m +CONFIG_RTC_DRV_DS3232_HWMON=y +CONFIG_RTC_DRV_PCF2127=m +CONFIG_RTC_DRV_RV3029C2=m +CONFIG_RTC_DRV_RV3029_HWMON=y + +# +# Platform RTC drivers +# +CONFIG_RTC_DRV_CMOS=y +CONFIG_RTC_DRV_DS1286=m +CONFIG_RTC_DRV_DS1511=m +CONFIG_RTC_DRV_DS1553=m +CONFIG_RTC_DRV_DS1685_FAMILY=m +CONFIG_RTC_DRV_DS1685=y +# CONFIG_RTC_DRV_DS1689 is not set +# CONFIG_RTC_DRV_DS17285 is not set +# CONFIG_RTC_DRV_DS17485 is not set +# CONFIG_RTC_DRV_DS17885 is not set +# CONFIG_RTC_DS1685_PROC_REGS is not set +CONFIG_RTC_DRV_DS1742=m +CONFIG_RTC_DRV_DS2404=m +CONFIG_RTC_DRV_DA9052=m +CONFIG_RTC_DRV_DA9055=m +CONFIG_RTC_DRV_DA9063=m +CONFIG_RTC_DRV_STK17TA8=m +CONFIG_RTC_DRV_M48T86=m +CONFIG_RTC_DRV_M48T35=m +CONFIG_RTC_DRV_M48T59=m +CONFIG_RTC_DRV_MSM6242=m +CONFIG_RTC_DRV_BQ4802=m +CONFIG_RTC_DRV_RP5C01=m +CONFIG_RTC_DRV_V3020=m +CONFIG_RTC_DRV_WM831X=m +CONFIG_RTC_DRV_WM8350=m +CONFIG_RTC_DRV_PCF50633=m +CONFIG_RTC_DRV_AB3100=m +CONFIG_RTC_DRV_CROS_EC=m + +# +# on-CPU RTC drivers +# +CONFIG_RTC_DRV_FTRTC010=m +CONFIG_RTC_DRV_PCAP=m +CONFIG_RTC_DRV_MC13XXX=m +CONFIG_RTC_DRV_MT6397=m + +# +# HID Sensor RTC drivers +# +CONFIG_RTC_DRV_HID_SENSOR_TIME=m +CONFIG_DMADEVICES=y +# CONFIG_DMADEVICES_DEBUG is not set + +# +# DMA Devices +# +CONFIG_DMA_ENGINE=y +CONFIG_DMA_VIRTUAL_CHANNELS=m +CONFIG_DMA_ACPI=y +CONFIG_ALTERA_MSGDMA=m +CONFIG_INTEL_IDMA64=m +CONFIG_INTEL_IOATDMA=m +CONFIG_INTEL_MIC_X100_DMA=m +CONFIG_QCOM_HIDMA_MGMT=m +CONFIG_QCOM_HIDMA=m +CONFIG_DW_DMAC_CORE=m +CONFIG_DW_DMAC=m +CONFIG_DW_DMAC_PCI=m +CONFIG_HSU_DMA=m + +# +# DMA Clients +# +CONFIG_ASYNC_TX_DMA=y +# CONFIG_DMATEST is not set +CONFIG_DMA_ENGINE_RAID=y + +# +# DMABUF options +# +CONFIG_SYNC_FILE=y +# CONFIG_SW_SYNC is not set +CONFIG_DCA=m +CONFIG_AUXDISPLAY=y +CONFIG_HD44780=m +CONFIG_KS0108=m +CONFIG_KS0108_PORT=0x378 +CONFIG_KS0108_DELAY=2 +CONFIG_CFAG12864B=m +CONFIG_CFAG12864B_RATE=20 +CONFIG_IMG_ASCII_LCD=m +CONFIG_PANEL=m +CONFIG_PANEL_PARPORT=0 +CONFIG_PANEL_PROFILE=5 +# CONFIG_PANEL_CHANGE_MESSAGE is not set +CONFIG_CHARLCD=m +CONFIG_UIO=m +CONFIG_UIO_CIF=m +CONFIG_UIO_PDRV_GENIRQ=m +CONFIG_UIO_DMEM_GENIRQ=m +CONFIG_UIO_AEC=m +CONFIG_UIO_SERCOS3=m +CONFIG_UIO_PCI_GENERIC=m +CONFIG_UIO_NETX=m +CONFIG_UIO_PRUSS=m +CONFIG_UIO_MF624=m +CONFIG_UIO_HV_GENERIC=m +CONFIG_VFIO_IOMMU_TYPE1=m +CONFIG_VFIO_VIRQFD=m +CONFIG_VFIO=m +CONFIG_VFIO_NOIOMMU=y +CONFIG_VFIO_PCI=m +CONFIG_VFIO_PCI_VGA=y +CONFIG_VFIO_PCI_MMAP=y +CONFIG_VFIO_PCI_INTX=y +CONFIG_VFIO_PCI_IGD=y +CONFIG_VFIO_MDEV=m +CONFIG_VFIO_MDEV_DEVICE=m +CONFIG_IRQ_BYPASS_MANAGER=m +CONFIG_VIRT_DRIVERS=y +CONFIG_VBOXGUEST=m +CONFIG_VIRTIO=y +CONFIG_VIRTIO_MENU=y +CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_PCI_LEGACY=y +CONFIG_VIRTIO_BALLOON=y +CONFIG_VIRTIO_INPUT=m +CONFIG_VIRTIO_MMIO=y +CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y + +# +# Microsoft Hyper-V guest support +# +CONFIG_HYPERV=m +CONFIG_HYPERV_TSCPAGE=y +CONFIG_HYPERV_UTILS=m +CONFIG_HYPERV_BALLOON=m + +# +# Xen driver support +# +CONFIG_XEN_BALLOON=y +CONFIG_XEN_SELFBALLOONING=y +CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y +CONFIG_XEN_BALLOON_MEMORY_HOTPLUG_LIMIT=512 +CONFIG_XEN_SCRUB_PAGES_DEFAULT=y +CONFIG_XEN_DEV_EVTCHN=m +CONFIG_XEN_BACKEND=y +CONFIG_XENFS=m +CONFIG_XEN_COMPAT_XENFS=y +CONFIG_XEN_SYS_HYPERVISOR=y +CONFIG_XEN_XENBUS_FRONTEND=y +CONFIG_XEN_GNTDEV=m +CONFIG_XEN_GRANT_DEV_ALLOC=m +# CONFIG_XEN_GRANT_DMA_ALLOC is not set +CONFIG_SWIOTLB_XEN=y +CONFIG_XEN_TMEM=m +CONFIG_XEN_PCIDEV_BACKEND=m +CONFIG_XEN_PVCALLS_FRONTEND=m +# CONFIG_XEN_PVCALLS_BACKEND is not set +CONFIG_XEN_SCSI_BACKEND=m +CONFIG_XEN_PRIVCMD=m +CONFIG_XEN_ACPI_PROCESSOR=y +CONFIG_XEN_MCE_LOG=y +CONFIG_XEN_HAVE_PVMMU=y +CONFIG_XEN_EFI=y +CONFIG_XEN_AUTO_XLATE=y +CONFIG_XEN_ACPI=y +CONFIG_XEN_SYMS=y +CONFIG_XEN_HAVE_VPMU=y +CONFIG_STAGING=y +CONFIG_PRISM2_USB=m +CONFIG_COMEDI=m +# CONFIG_COMEDI_DEBUG is not set +CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048 +CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480 +CONFIG_COMEDI_MISC_DRIVERS=y +CONFIG_COMEDI_BOND=m +CONFIG_COMEDI_TEST=m +CONFIG_COMEDI_PARPORT=m +CONFIG_COMEDI_ISA_DRIVERS=y +CONFIG_COMEDI_PCL711=m +CONFIG_COMEDI_PCL724=m +CONFIG_COMEDI_PCL726=m +CONFIG_COMEDI_PCL730=m +CONFIG_COMEDI_PCL812=m +CONFIG_COMEDI_PCL816=m +CONFIG_COMEDI_PCL818=m +CONFIG_COMEDI_PCM3724=m +CONFIG_COMEDI_AMPLC_DIO200_ISA=m +CONFIG_COMEDI_AMPLC_PC236_ISA=m +CONFIG_COMEDI_AMPLC_PC263_ISA=m +CONFIG_COMEDI_RTI800=m +CONFIG_COMEDI_RTI802=m +CONFIG_COMEDI_DAC02=m +CONFIG_COMEDI_DAS16M1=m +CONFIG_COMEDI_DAS08_ISA=m +CONFIG_COMEDI_DAS16=m +CONFIG_COMEDI_DAS800=m +CONFIG_COMEDI_DAS1800=m +CONFIG_COMEDI_DAS6402=m +CONFIG_COMEDI_DT2801=m +CONFIG_COMEDI_DT2811=m +CONFIG_COMEDI_DT2814=m +CONFIG_COMEDI_DT2815=m +CONFIG_COMEDI_DT2817=m +CONFIG_COMEDI_DT282X=m +CONFIG_COMEDI_DMM32AT=m +CONFIG_COMEDI_FL512=m +CONFIG_COMEDI_AIO_AIO12_8=m +CONFIG_COMEDI_AIO_IIRO_16=m +CONFIG_COMEDI_II_PCI20KC=m +CONFIG_COMEDI_C6XDIGIO=m +CONFIG_COMEDI_MPC624=m +CONFIG_COMEDI_ADQ12B=m +CONFIG_COMEDI_NI_AT_A2150=m +CONFIG_COMEDI_NI_AT_AO=m +CONFIG_COMEDI_NI_ATMIO=m +CONFIG_COMEDI_NI_ATMIO16D=m +CONFIG_COMEDI_NI_LABPC_ISA=m +CONFIG_COMEDI_PCMAD=m +CONFIG_COMEDI_PCMDA12=m +CONFIG_COMEDI_PCMMIO=m +CONFIG_COMEDI_PCMUIO=m +CONFIG_COMEDI_MULTIQ3=m +CONFIG_COMEDI_S526=m +CONFIG_COMEDI_PCI_DRIVERS=m +CONFIG_COMEDI_8255_PCI=m +CONFIG_COMEDI_ADDI_WATCHDOG=m +CONFIG_COMEDI_ADDI_APCI_1032=m +CONFIG_COMEDI_ADDI_APCI_1500=m +CONFIG_COMEDI_ADDI_APCI_1516=m +CONFIG_COMEDI_ADDI_APCI_1564=m +CONFIG_COMEDI_ADDI_APCI_16XX=m +CONFIG_COMEDI_ADDI_APCI_2032=m +CONFIG_COMEDI_ADDI_APCI_2200=m +CONFIG_COMEDI_ADDI_APCI_3120=m +CONFIG_COMEDI_ADDI_APCI_3501=m +CONFIG_COMEDI_ADDI_APCI_3XXX=m +CONFIG_COMEDI_ADL_PCI6208=m +CONFIG_COMEDI_ADL_PCI7X3X=m +CONFIG_COMEDI_ADL_PCI8164=m +CONFIG_COMEDI_ADL_PCI9111=m +CONFIG_COMEDI_ADL_PCI9118=m +CONFIG_COMEDI_ADV_PCI1710=m +CONFIG_COMEDI_ADV_PCI1720=m +CONFIG_COMEDI_ADV_PCI1723=m +CONFIG_COMEDI_ADV_PCI1724=m +CONFIG_COMEDI_ADV_PCI1760=m +CONFIG_COMEDI_ADV_PCI_DIO=m +CONFIG_COMEDI_AMPLC_DIO200_PCI=m +CONFIG_COMEDI_AMPLC_PC236_PCI=m +CONFIG_COMEDI_AMPLC_PC263_PCI=m +CONFIG_COMEDI_AMPLC_PCI224=m +CONFIG_COMEDI_AMPLC_PCI230=m +CONFIG_COMEDI_CONTEC_PCI_DIO=m +CONFIG_COMEDI_DAS08_PCI=m +CONFIG_COMEDI_DT3000=m +CONFIG_COMEDI_DYNA_PCI10XX=m +CONFIG_COMEDI_GSC_HPDI=m +CONFIG_COMEDI_MF6X4=m +CONFIG_COMEDI_ICP_MULTI=m +CONFIG_COMEDI_DAQBOARD2000=m +CONFIG_COMEDI_JR3_PCI=m +CONFIG_COMEDI_KE_COUNTER=m +CONFIG_COMEDI_CB_PCIDAS64=m +CONFIG_COMEDI_CB_PCIDAS=m +CONFIG_COMEDI_CB_PCIDDA=m +CONFIG_COMEDI_CB_PCIMDAS=m +CONFIG_COMEDI_CB_PCIMDDA=m +CONFIG_COMEDI_ME4000=m +CONFIG_COMEDI_ME_DAQ=m +CONFIG_COMEDI_NI_6527=m +CONFIG_COMEDI_NI_65XX=m +CONFIG_COMEDI_NI_660X=m +CONFIG_COMEDI_NI_670X=m +CONFIG_COMEDI_NI_LABPC_PCI=m +CONFIG_COMEDI_NI_PCIDIO=m +CONFIG_COMEDI_NI_PCIMIO=m +CONFIG_COMEDI_RTD520=m +CONFIG_COMEDI_S626=m +CONFIG_COMEDI_MITE=m +CONFIG_COMEDI_NI_TIOCMD=m +CONFIG_COMEDI_PCMCIA_DRIVERS=m +CONFIG_COMEDI_CB_DAS16_CS=m +CONFIG_COMEDI_DAS08_CS=m +CONFIG_COMEDI_NI_DAQ_700_CS=m +CONFIG_COMEDI_NI_DAQ_DIO24_CS=m +CONFIG_COMEDI_NI_LABPC_CS=m +CONFIG_COMEDI_NI_MIO_CS=m +CONFIG_COMEDI_QUATECH_DAQP_CS=m +CONFIG_COMEDI_USB_DRIVERS=m +CONFIG_COMEDI_DT9812=m +CONFIG_COMEDI_NI_USB6501=m +CONFIG_COMEDI_USBDUX=m +CONFIG_COMEDI_USBDUXFAST=m +CONFIG_COMEDI_USBDUXSIGMA=m +CONFIG_COMEDI_VMK80XX=m +CONFIG_COMEDI_8254=m +CONFIG_COMEDI_8255=m +CONFIG_COMEDI_8255_SA=m +CONFIG_COMEDI_KCOMEDILIB=m +CONFIG_COMEDI_AMPLC_DIO200=m +CONFIG_COMEDI_AMPLC_PC236=m +CONFIG_COMEDI_DAS08=m +CONFIG_COMEDI_ISADMA=m +CONFIG_COMEDI_NI_LABPC=m +CONFIG_COMEDI_NI_LABPC_ISADMA=m +CONFIG_COMEDI_NI_TIO=m +CONFIG_RTL8192U=m +CONFIG_RTLLIB=m +CONFIG_RTLLIB_CRYPTO_CCMP=m +CONFIG_RTLLIB_CRYPTO_TKIP=m +CONFIG_RTLLIB_CRYPTO_WEP=m +CONFIG_RTL8192E=m +CONFIG_RTL8723BS=m +CONFIG_R8712U=m +CONFIG_R8188EU=m +CONFIG_88EU_AP_MODE=y +CONFIG_R8822BE=m +CONFIG_RTLWIFI_DEBUG_ST=y +CONFIG_RTS5208=m +CONFIG_VT6655=m +CONFIG_VT6656=m + +# +# IIO staging drivers +# + +# +# Accelerometers +# +CONFIG_ADIS16203=m +CONFIG_ADIS16240=m + +# +# Analog to digital converters +# +CONFIG_AD7606=m +CONFIG_AD7606_IFACE_PARALLEL=m +CONFIG_AD7606_IFACE_SPI=m +CONFIG_AD7780=m +CONFIG_AD7816=m +CONFIG_AD7192=m +CONFIG_AD7280=m + +# +# Analog digital bi-direction converters +# +CONFIG_ADT7316=m +CONFIG_ADT7316_SPI=m +CONFIG_ADT7316_I2C=m + +# +# Capacitance to digital converters +# +CONFIG_AD7150=m +CONFIG_AD7152=m +CONFIG_AD7746=m + +# +# Direct Digital Synthesis +# +CONFIG_AD9832=m +CONFIG_AD9834=m + +# +# Network Analyzer, Impedance Converters +# +CONFIG_AD5933=m + +# +# Active energy metering IC +# +CONFIG_ADE7854=m +CONFIG_ADE7854_I2C=m +CONFIG_ADE7854_SPI=m + +# +# Resolver to digital converters +# +CONFIG_AD2S90=m +CONFIG_AD2S1210=m +CONFIG_FB_SM750=m +CONFIG_FB_XGI=m + +# +# Speakup console speech +# +CONFIG_SPEAKUP=m +CONFIG_SPEAKUP_SYNTH_ACNTSA=m +CONFIG_SPEAKUP_SYNTH_APOLLO=m +CONFIG_SPEAKUP_SYNTH_AUDPTR=m +CONFIG_SPEAKUP_SYNTH_BNS=m +CONFIG_SPEAKUP_SYNTH_DECTLK=m +CONFIG_SPEAKUP_SYNTH_DECEXT=m +CONFIG_SPEAKUP_SYNTH_LTLK=m +CONFIG_SPEAKUP_SYNTH_SOFT=m +CONFIG_SPEAKUP_SYNTH_SPKOUT=m +CONFIG_SPEAKUP_SYNTH_TXPRT=m +CONFIG_SPEAKUP_SYNTH_DUMMY=m +CONFIG_STAGING_MEDIA=y +CONFIG_I2C_BCM2048=m +CONFIG_SOC_CAMERA_IMX074=m +CONFIG_SOC_CAMERA_MT9T031=m +CONFIG_VIDEO_ZORAN=m +CONFIG_VIDEO_ZORAN_DC30=m +CONFIG_VIDEO_ZORAN_ZR36060=m +CONFIG_VIDEO_ZORAN_BUZ=m +CONFIG_VIDEO_ZORAN_DC10=m +CONFIG_VIDEO_ZORAN_LML33=m +CONFIG_VIDEO_ZORAN_LML33R10=m +CONFIG_VIDEO_ZORAN_AVS6EYES=m + +# +# Android +# +CONFIG_LTE_GDM724X=m +CONFIG_FIREWIRE_SERIAL=m +CONFIG_FWTTY_MAX_TOTAL_PORTS=64 +CONFIG_FWTTY_MAX_CARD_PORTS=32 +CONFIG_MTD_SPINAND_MT29F=m +CONFIG_MTD_SPINAND_ONDIEECC=y +CONFIG_DGNC=m +CONFIG_GS_FPGABOOT=m +CONFIG_UNISYSSPAR=y +CONFIG_UNISYS_VISORNIC=m +CONFIG_UNISYS_VISORINPUT=m +CONFIG_UNISYS_VISORHBA=m +CONFIG_FB_TFT=m +CONFIG_FB_TFT_AGM1264K_FL=m +CONFIG_FB_TFT_BD663474=m +CONFIG_FB_TFT_HX8340BN=m +CONFIG_FB_TFT_HX8347D=m +CONFIG_FB_TFT_HX8353D=m +CONFIG_FB_TFT_HX8357D=m +CONFIG_FB_TFT_ILI9163=m +CONFIG_FB_TFT_ILI9320=m +CONFIG_FB_TFT_ILI9325=m +CONFIG_FB_TFT_ILI9340=m +CONFIG_FB_TFT_ILI9341=m +CONFIG_FB_TFT_ILI9481=m +CONFIG_FB_TFT_ILI9486=m +CONFIG_FB_TFT_PCD8544=m +CONFIG_FB_TFT_RA8875=m +CONFIG_FB_TFT_S6D02A1=m +CONFIG_FB_TFT_S6D1121=m +CONFIG_FB_TFT_SH1106=m +CONFIG_FB_TFT_SSD1289=m +CONFIG_FB_TFT_SSD1305=m +CONFIG_FB_TFT_SSD1306=m +CONFIG_FB_TFT_SSD1331=m +CONFIG_FB_TFT_SSD1351=m +CONFIG_FB_TFT_ST7735R=m +CONFIG_FB_TFT_ST7789V=m +CONFIG_FB_TFT_TINYLCD=m +CONFIG_FB_TFT_TLS8204=m +CONFIG_FB_TFT_UC1611=m +CONFIG_FB_TFT_UC1701=m +CONFIG_FB_TFT_UPD161704=m +CONFIG_FB_TFT_WATTEROTT=m +CONFIG_FB_FLEX=m +CONFIG_FB_TFT_FBTFT_DEVICE=m +CONFIG_WILC1000=m +CONFIG_WILC1000_SDIO=m +CONFIG_WILC1000_SPI=m +# CONFIG_WILC1000_HW_OOB_INTR is not set +CONFIG_MOST=m +CONFIG_MOST_CDEV=m +CONFIG_MOST_NET=m +CONFIG_MOST_SOUND=m +CONFIG_MOST_VIDEO=m +CONFIG_MOST_I2C=m +CONFIG_MOST_USB=m +CONFIG_KS7010=m +# CONFIG_GREYBUS is not set +CONFIG_DRM_VBOXVIDEO=m +# CONFIG_PI433 is not set +CONFIG_MTK_MMC=m +# CONFIG_MTK_AEE_KDUMP is not set +# CONFIG_MTK_MMC_CD_POLL is not set + +# +# Gasket devices +# +CONFIG_STAGING_GASKET_FRAMEWORK=m +CONFIG_STAGING_APEX_DRIVER=m +CONFIG_XIL_AXIS_FIFO=m +CONFIG_EROFS_FS=m +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS_XATTR=y +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +# CONFIG_EROFS_FS_USE_VM_MAP_RAM is not set +# CONFIG_EROFS_FAULT_INJECTION is not set +# CONFIG_EROFS_FS_ZIP is not set +CONFIG_X86_PLATFORM_DEVICES=y +CONFIG_ACER_WMI=m +CONFIG_ACER_WIRELESS=m +CONFIG_ACERHDF=m +CONFIG_ALIENWARE_WMI=m +CONFIG_ASUS_LAPTOP=m +CONFIG_DELL_SMBIOS=m +CONFIG_DELL_SMBIOS_WMI=y +CONFIG_DELL_SMBIOS_SMM=y +CONFIG_DELL_LAPTOP=m +CONFIG_DELL_WMI=m +CONFIG_DELL_WMI_DESCRIPTOR=m +CONFIG_DELL_WMI_AIO=m +CONFIG_DELL_WMI_LED=m +CONFIG_DELL_SMO8800=m +CONFIG_DELL_RBTN=m +CONFIG_FUJITSU_LAPTOP=m +CONFIG_FUJITSU_TABLET=m +CONFIG_AMILO_RFKILL=m +CONFIG_GPD_POCKET_FAN=m +CONFIG_HP_ACCEL=m +CONFIG_HP_WIRELESS=m +CONFIG_HP_WMI=m +CONFIG_MSI_LAPTOP=m +CONFIG_PANASONIC_LAPTOP=m +CONFIG_COMPAL_LAPTOP=m +CONFIG_SONY_LAPTOP=m +CONFIG_SONYPI_COMPAT=y +CONFIG_IDEAPAD_LAPTOP=m +CONFIG_SURFACE3_WMI=m +CONFIG_THINKPAD_ACPI=m +CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y +CONFIG_THINKPAD_ACPI_DEBUGFACILITIES=y +# CONFIG_THINKPAD_ACPI_DEBUG is not set +# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set +CONFIG_THINKPAD_ACPI_VIDEO=y +CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y +CONFIG_SENSORS_HDAPS=m +CONFIG_INTEL_MENLOW=m +CONFIG_EEEPC_LAPTOP=m +CONFIG_ASUS_WMI=m +CONFIG_ASUS_NB_WMI=m +CONFIG_EEEPC_WMI=m +CONFIG_ASUS_WIRELESS=m +CONFIG_ACPI_WMI=m +CONFIG_WMI_BMOF=m +CONFIG_INTEL_WMI_THUNDERBOLT=m +CONFIG_MSI_WMI=m +CONFIG_PEAQ_WMI=m +CONFIG_TOPSTAR_LAPTOP=m +CONFIG_ACPI_TOSHIBA=m +CONFIG_TOSHIBA_BT_RFKILL=m +CONFIG_TOSHIBA_HAPS=m +CONFIG_TOSHIBA_WMI=m +CONFIG_ACPI_CMPC=m +CONFIG_INTEL_CHT_INT33FE=m +CONFIG_INTEL_INT0002_VGPIO=m +CONFIG_INTEL_HID_EVENT=m +CONFIG_INTEL_VBTN=m +CONFIG_INTEL_IPS=m +CONFIG_INTEL_PMC_CORE=y +CONFIG_IBM_RTL=m +CONFIG_SAMSUNG_LAPTOP=m +CONFIG_MXM_WMI=m +CONFIG_INTEL_OAKTRAIL=m +CONFIG_SAMSUNG_Q10=m +CONFIG_APPLE_GMUX=m +CONFIG_INTEL_RST=m +CONFIG_INTEL_SMARTCONNECT=m +CONFIG_PVPANIC=m +CONFIG_INTEL_PMC_IPC=m +CONFIG_INTEL_BXTWC_PMIC_TMU=m +CONFIG_SURFACE_PRO3_BUTTON=m +CONFIG_SURFACE_3_BUTTON=m +CONFIG_INTEL_PUNIT_IPC=m +CONFIG_INTEL_TELEMETRY=m +# CONFIG_MLX_PLATFORM is not set +# CONFIG_INTEL_TURBO_MAX_3 is not set +# CONFIG_TOUCHSCREEN_DMI is not set +CONFIG_INTEL_CHTDC_TI_PWRBTN=m +CONFIG_I2C_MULTI_INSTANTIATE=m +CONFIG_PMC_ATOM=y +CONFIG_CHROME_PLATFORMS=y +CONFIG_CHROMEOS_LAPTOP=m +CONFIG_CHROMEOS_PSTORE=m +CONFIG_CHROMEOS_TBMC=m +CONFIG_CROS_EC_CTL=m +CONFIG_CROS_EC_I2C=m +CONFIG_CROS_EC_SPI=m +CONFIG_CROS_EC_LPC=m +# CONFIG_CROS_EC_LPC_MEC is not set +CONFIG_CROS_EC_PROTO=y +CONFIG_CROS_KBD_LED_BACKLIGHT=m +# CONFIG_MELLANOX_PLATFORM is not set +CONFIG_CLKDEV_LOOKUP=y +CONFIG_HAVE_CLK_PREPARE=y +CONFIG_COMMON_CLK=y + +# +# Common Clock Framework +# +CONFIG_COMMON_CLK_WM831X=m +CONFIG_COMMON_CLK_MAX9485=m +CONFIG_COMMON_CLK_SI5351=m +CONFIG_COMMON_CLK_SI544=m +CONFIG_COMMON_CLK_CDCE706=m +CONFIG_COMMON_CLK_CS2000_CP=m +CONFIG_COMMON_CLK_S2MPS11=m +CONFIG_CLK_TWL6040=m +CONFIG_COMMON_CLK_PALMAS=m +CONFIG_COMMON_CLK_PWM=m +# CONFIG_HWSPINLOCK is not set + +# +# Clock Source drivers +# +CONFIG_CLKEVT_I8253=y +CONFIG_I8253_LOCK=y +CONFIG_CLKBLD_I8253=y +CONFIG_MAILBOX=y +CONFIG_PCC=y +CONFIG_ALTERA_MBOX=m +CONFIG_IOMMU_API=y +CONFIG_IOMMU_SUPPORT=y + +# +# Generic IOMMU Pagetable Support +# +# CONFIG_IOMMU_DEBUGFS is not set +# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set +CONFIG_IOMMU_IOVA=y +CONFIG_AMD_IOMMU=y +CONFIG_AMD_IOMMU_V2=m +CONFIG_DMAR_TABLE=y +CONFIG_INTEL_IOMMU=y +CONFIG_INTEL_IOMMU_SVM=y +# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set +CONFIG_INTEL_IOMMU_FLOPPY_WA=y +CONFIG_IRQ_REMAP=y + +# +# Remoteproc drivers +# +CONFIG_REMOTEPROC=m + +# +# Rpmsg drivers +# +CONFIG_RPMSG=m +# CONFIG_RPMSG_CHAR is not set +CONFIG_RPMSG_QCOM_GLINK_NATIVE=m +CONFIG_RPMSG_QCOM_GLINK_RPM=m +CONFIG_RPMSG_VIRTIO=m +# CONFIG_SOUNDWIRE is not set + +# +# SOC (System On Chip) specific Drivers +# + +# +# Amlogic SoC drivers +# + +# +# Broadcom SoC drivers +# + +# +# NXP/Freescale QorIQ SoC drivers +# + +# +# i.MX SoC drivers +# + +# +# Qualcomm SoC drivers +# +CONFIG_SOC_TI=y + +# +# Xilinx SoC drivers +# +CONFIG_XILINX_VCU=m +CONFIG_PM_DEVFREQ=y + +# +# DEVFREQ Governors +# +CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y +CONFIG_DEVFREQ_GOV_PERFORMANCE=y +CONFIG_DEVFREQ_GOV_POWERSAVE=y +CONFIG_DEVFREQ_GOV_USERSPACE=y +CONFIG_DEVFREQ_GOV_PASSIVE=m + +# +# DEVFREQ Drivers +# +CONFIG_PM_DEVFREQ_EVENT=y +CONFIG_EXTCON=y + +# +# Extcon Device Drivers +# +CONFIG_EXTCON_ADC_JACK=m +CONFIG_EXTCON_ARIZONA=m +CONFIG_EXTCON_AXP288=m +CONFIG_EXTCON_GPIO=m +CONFIG_EXTCON_INTEL_INT3496=m +CONFIG_EXTCON_INTEL_CHT_WC=m +CONFIG_EXTCON_MAX14577=m +CONFIG_EXTCON_MAX3355=m +CONFIG_EXTCON_MAX77693=m +CONFIG_EXTCON_MAX77843=m +CONFIG_EXTCON_MAX8997=m +CONFIG_EXTCON_PALMAS=m +CONFIG_EXTCON_RT8973A=m +CONFIG_EXTCON_SM5502=m +CONFIG_EXTCON_USB_GPIO=m +CONFIG_EXTCON_USBC_CROS_EC=m +CONFIG_MEMORY=y +CONFIG_IIO=m +CONFIG_IIO_BUFFER=y +CONFIG_IIO_BUFFER_CB=m +CONFIG_IIO_BUFFER_HW_CONSUMER=m +CONFIG_IIO_KFIFO_BUF=m +CONFIG_IIO_TRIGGERED_BUFFER=m +CONFIG_IIO_CONFIGFS=m +CONFIG_IIO_TRIGGER=y +CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 +CONFIG_IIO_SW_DEVICE=m +CONFIG_IIO_SW_TRIGGER=m +CONFIG_IIO_TRIGGERED_EVENT=m + +# +# Accelerometers +# +CONFIG_ADIS16201=m +CONFIG_ADIS16209=m +CONFIG_BMA180=m +CONFIG_BMA220=m +CONFIG_BMC150_ACCEL=m +CONFIG_BMC150_ACCEL_I2C=m +CONFIG_BMC150_ACCEL_SPI=m +CONFIG_DA280=m +CONFIG_DA311=m +CONFIG_DMARD09=m +CONFIG_DMARD10=m +CONFIG_HID_SENSOR_ACCEL_3D=m +CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m +CONFIG_IIO_ST_ACCEL_3AXIS=m +CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m +CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m +CONFIG_KXSD9=m +CONFIG_KXSD9_SPI=m +CONFIG_KXSD9_I2C=m +CONFIG_KXCJK1013=m +CONFIG_MC3230=m +CONFIG_MMA7455=m +CONFIG_MMA7455_I2C=m +CONFIG_MMA7455_SPI=m +CONFIG_MMA7660=m +CONFIG_MMA8452=m +CONFIG_MMA9551_CORE=m +CONFIG_MMA9551=m +CONFIG_MMA9553=m +CONFIG_MXC4005=m +CONFIG_MXC6255=m +CONFIG_SCA3000=m +CONFIG_STK8312=m +CONFIG_STK8BA50=m + +# +# Analog to digital converters +# +CONFIG_AD_SIGMA_DELTA=m +CONFIG_AD7266=m +CONFIG_AD7291=m +CONFIG_AD7298=m +CONFIG_AD7476=m +CONFIG_AD7766=m +CONFIG_AD7791=m +CONFIG_AD7793=m +CONFIG_AD7887=m +CONFIG_AD7923=m +CONFIG_AD799X=m +CONFIG_AXP20X_ADC=m +CONFIG_AXP288_ADC=m +CONFIG_CC10001_ADC=m +CONFIG_DA9150_GPADC=m +CONFIG_DLN2_ADC=m +CONFIG_HI8435=m +CONFIG_HX711=m +CONFIG_INA2XX_ADC=m +CONFIG_LP8788_ADC=m +CONFIG_LTC2471=m +CONFIG_LTC2485=m +CONFIG_LTC2497=m +CONFIG_MAX1027=m +CONFIG_MAX11100=m +CONFIG_MAX1118=m +CONFIG_MAX1363=m +CONFIG_MAX9611=m +CONFIG_MCP320X=m +CONFIG_MCP3422=m +CONFIG_MEN_Z188_ADC=m +CONFIG_NAU7802=m +CONFIG_PALMAS_GPADC=m +CONFIG_QCOM_VADC_COMMON=m +CONFIG_QCOM_SPMI_IADC=m +CONFIG_QCOM_SPMI_VADC=m +CONFIG_TI_ADC081C=m +CONFIG_TI_ADC0832=m +CONFIG_TI_ADC084S021=m +CONFIG_TI_ADC12138=m +CONFIG_TI_ADC108S102=m +CONFIG_TI_ADC128S052=m +CONFIG_TI_ADC161S626=m +CONFIG_TI_ADS1015=m +CONFIG_TI_ADS7950=m +CONFIG_TI_AM335X_ADC=m +CONFIG_TI_TLC4541=m +CONFIG_TWL4030_MADC=m +CONFIG_TWL6030_GPADC=m +CONFIG_VIPERBOARD_ADC=m + +# +# Analog Front Ends +# + +# +# Amplifiers +# +CONFIG_AD8366=m + +# +# Chemical Sensors +# +CONFIG_ATLAS_PH_SENSOR=m +CONFIG_BME680=m +CONFIG_BME680_I2C=m +CONFIG_BME680_SPI=m +CONFIG_CCS811=m +CONFIG_IAQCORE=m +CONFIG_VZ89X=m +CONFIG_IIO_CROS_EC_SENSORS_CORE=m +CONFIG_IIO_CROS_EC_SENSORS=m + +# +# Hid Sensor IIO Common +# +CONFIG_HID_SENSOR_IIO_COMMON=m +CONFIG_HID_SENSOR_IIO_TRIGGER=m +CONFIG_IIO_MS_SENSORS_I2C=m + +# +# SSP Sensor Common +# +CONFIG_IIO_SSP_SENSORS_COMMONS=m +CONFIG_IIO_SSP_SENSORHUB=m +CONFIG_IIO_ST_SENSORS_I2C=m +CONFIG_IIO_ST_SENSORS_SPI=m +CONFIG_IIO_ST_SENSORS_CORE=m + +# +# Counters +# + +# +# Digital to analog converters +# +CONFIG_AD5064=m +CONFIG_AD5360=m +CONFIG_AD5380=m +CONFIG_AD5421=m +CONFIG_AD5446=m +CONFIG_AD5449=m +CONFIG_AD5592R_BASE=m +CONFIG_AD5592R=m +CONFIG_AD5593R=m +CONFIG_AD5504=m +CONFIG_AD5624R_SPI=m +CONFIG_LTC2632=m +CONFIG_AD5686=m +CONFIG_AD5686_SPI=m +CONFIG_AD5696_I2C=m +CONFIG_AD5755=m +CONFIG_AD5758=m +CONFIG_AD5761=m +CONFIG_AD5764=m +CONFIG_AD5791=m +CONFIG_AD7303=m +CONFIG_AD8801=m +CONFIG_DS4424=m +CONFIG_M62332=m +CONFIG_MAX517=m +CONFIG_MCP4725=m +CONFIG_MCP4922=m +CONFIG_TI_DAC082S085=m +CONFIG_TI_DAC5571=m + +# +# IIO dummy driver +# +CONFIG_IIO_SIMPLE_DUMMY=m +# CONFIG_IIO_SIMPLE_DUMMY_EVENTS is not set +# CONFIG_IIO_SIMPLE_DUMMY_BUFFER is not set + +# +# Frequency Synthesizers DDS/PLL +# + +# +# Clock Generator/Distribution +# +CONFIG_AD9523=m + +# +# Phase-Locked Loop (PLL) frequency synthesizers +# +CONFIG_ADF4350=m + +# +# Digital gyroscope sensors +# +CONFIG_ADIS16080=m +CONFIG_ADIS16130=m +CONFIG_ADIS16136=m +CONFIG_ADIS16260=m +CONFIG_ADXRS450=m +CONFIG_BMG160=m +CONFIG_BMG160_I2C=m +CONFIG_BMG160_SPI=m +CONFIG_HID_SENSOR_GYRO_3D=m +CONFIG_MPU3050=m +CONFIG_MPU3050_I2C=m +CONFIG_IIO_ST_GYRO_3AXIS=m +CONFIG_IIO_ST_GYRO_I2C_3AXIS=m +CONFIG_IIO_ST_GYRO_SPI_3AXIS=m +CONFIG_ITG3200=m + +# +# Health Sensors +# + +# +# Heart Rate Monitors +# +CONFIG_AFE4403=m +CONFIG_AFE4404=m +CONFIG_MAX30100=m +CONFIG_MAX30102=m + +# +# Humidity sensors +# +CONFIG_AM2315=m +CONFIG_DHT11=m +CONFIG_HDC100X=m +CONFIG_HID_SENSOR_HUMIDITY=m +CONFIG_HTS221=m +CONFIG_HTS221_I2C=m +CONFIG_HTS221_SPI=m +CONFIG_HTU21=m +CONFIG_SI7005=m +CONFIG_SI7020=m + +# +# Inertial measurement units +# +CONFIG_ADIS16400=m +CONFIG_ADIS16480=m +CONFIG_BMI160=m +CONFIG_BMI160_I2C=m +CONFIG_BMI160_SPI=m +CONFIG_KMX61=m +CONFIG_INV_MPU6050_IIO=m +CONFIG_INV_MPU6050_I2C=m +CONFIG_INV_MPU6050_SPI=m +CONFIG_IIO_ST_LSM6DSX=m +CONFIG_IIO_ST_LSM6DSX_I2C=m +CONFIG_IIO_ST_LSM6DSX_SPI=m +CONFIG_IIO_ADIS_LIB=m +CONFIG_IIO_ADIS_LIB_BUFFER=y + +# +# Light sensors +# +CONFIG_ACPI_ALS=m +CONFIG_ADJD_S311=m +CONFIG_AL3320A=m +CONFIG_APDS9300=m +CONFIG_APDS9960=m +CONFIG_BH1750=m +CONFIG_BH1780=m +CONFIG_CM32181=m +CONFIG_CM3232=m +CONFIG_CM3323=m +CONFIG_CM36651=m +CONFIG_IIO_CROS_EC_LIGHT_PROX=m +CONFIG_GP2AP020A00F=m +CONFIG_SENSORS_ISL29018=m +CONFIG_SENSORS_ISL29028=m +CONFIG_ISL29125=m +CONFIG_HID_SENSOR_ALS=m +CONFIG_HID_SENSOR_PROX=m +CONFIG_JSA1212=m +CONFIG_RPR0521=m +CONFIG_SENSORS_LM3533=m +CONFIG_LTR501=m +CONFIG_LV0104CS=m +CONFIG_MAX44000=m +CONFIG_OPT3001=m +CONFIG_PA12203001=m +CONFIG_SI1133=m +CONFIG_SI1145=m +CONFIG_STK3310=m +CONFIG_ST_UVIS25=m +CONFIG_ST_UVIS25_I2C=m +CONFIG_ST_UVIS25_SPI=m +CONFIG_TCS3414=m +CONFIG_TCS3472=m +CONFIG_SENSORS_TSL2563=m +CONFIG_TSL2583=m +CONFIG_TSL2772=m +CONFIG_TSL4531=m +CONFIG_US5182D=m +CONFIG_VCNL4000=m +CONFIG_VEML6070=m +CONFIG_VL6180=m +CONFIG_ZOPT2201=m + +# +# Magnetometer sensors +# +CONFIG_AK8975=m +CONFIG_AK09911=m +CONFIG_BMC150_MAGN=m +CONFIG_BMC150_MAGN_I2C=m +CONFIG_BMC150_MAGN_SPI=m +CONFIG_MAG3110=m +CONFIG_HID_SENSOR_MAGNETOMETER_3D=m +CONFIG_MMC35240=m +CONFIG_IIO_ST_MAGN_3AXIS=m +CONFIG_IIO_ST_MAGN_I2C_3AXIS=m +CONFIG_IIO_ST_MAGN_SPI_3AXIS=m +CONFIG_SENSORS_HMC5843=m +CONFIG_SENSORS_HMC5843_I2C=m +CONFIG_SENSORS_HMC5843_SPI=m + +# +# Multiplexers +# + +# +# Inclinometer sensors +# +CONFIG_HID_SENSOR_INCLINOMETER_3D=m +CONFIG_HID_SENSOR_DEVICE_ROTATION=m + +# +# Triggers - standalone +# +CONFIG_IIO_HRTIMER_TRIGGER=m +CONFIG_IIO_INTERRUPT_TRIGGER=m +CONFIG_IIO_TIGHTLOOP_TRIGGER=m +CONFIG_IIO_SYSFS_TRIGGER=m + +# +# Digital potentiometers +# +CONFIG_AD5272=m +CONFIG_DS1803=m +CONFIG_MAX5481=m +CONFIG_MAX5487=m +CONFIG_MCP4018=m +CONFIG_MCP4131=m +CONFIG_MCP4531=m +CONFIG_TPL0102=m + +# +# Digital potentiostats +# +CONFIG_LMP91000=m + +# +# Pressure sensors +# +CONFIG_ABP060MG=m +CONFIG_BMP280=m +CONFIG_BMP280_I2C=m +CONFIG_BMP280_SPI=m +CONFIG_IIO_CROS_EC_BARO=m +CONFIG_HID_SENSOR_PRESS=m +CONFIG_HP03=m +CONFIG_MPL115=m +CONFIG_MPL115_I2C=m +CONFIG_MPL115_SPI=m +CONFIG_MPL3115=m +CONFIG_MS5611=m +CONFIG_MS5611_I2C=m +CONFIG_MS5611_SPI=m +CONFIG_MS5637=m +CONFIG_IIO_ST_PRESS=m +CONFIG_IIO_ST_PRESS_I2C=m +CONFIG_IIO_ST_PRESS_SPI=m +CONFIG_T5403=m +CONFIG_HP206C=m +CONFIG_ZPA2326=m +CONFIG_ZPA2326_I2C=m +CONFIG_ZPA2326_SPI=m + +# +# Lightning sensors +# +CONFIG_AS3935=m + +# +# Proximity and distance sensors +# +CONFIG_ISL29501=m +CONFIG_LIDAR_LITE_V2=m +CONFIG_RFD77402=m +CONFIG_SRF04=m +CONFIG_SX9500=m +CONFIG_SRF08=m + +# +# Resolver to digital converters +# +CONFIG_AD2S1200=m + +# +# Temperature sensors +# +CONFIG_MAXIM_THERMOCOUPLE=m +CONFIG_HID_SENSOR_TEMP=m +CONFIG_MLX90614=m +CONFIG_MLX90632=m +CONFIG_TMP006=m +CONFIG_TMP007=m +CONFIG_TSYS01=m +CONFIG_TSYS02D=m +CONFIG_NTB=m +CONFIG_NTB_AMD=m +CONFIG_NTB_IDT=m +CONFIG_NTB_INTEL=m +CONFIG_NTB_SWITCHTEC=m +CONFIG_NTB_PINGPONG=m +CONFIG_NTB_TOOL=m +CONFIG_NTB_PERF=m +CONFIG_NTB_TRANSPORT=m +CONFIG_VME_BUS=y + +# +# VME Bridge Drivers +# +CONFIG_VME_CA91CX42=m +CONFIG_VME_TSI148=m +# CONFIG_VME_FAKE is not set + +# +# VME Board Drivers +# +CONFIG_VMIVME_7805=m + +# +# VME Device Drivers +# +CONFIG_VME_USER=m +CONFIG_PWM=y +CONFIG_PWM_SYSFS=y +CONFIG_PWM_CRC=y +CONFIG_PWM_CROS_EC=m +CONFIG_PWM_LP3943=m +CONFIG_PWM_LPSS=m +CONFIG_PWM_LPSS_PCI=m +CONFIG_PWM_LPSS_PLATFORM=m +CONFIG_PWM_PCA9685=m +CONFIG_PWM_TWL=m +CONFIG_PWM_TWL_LED=m + +# +# IRQ chip support +# +CONFIG_ARM_GIC_MAX_NR=1 +CONFIG_IPACK_BUS=m +CONFIG_BOARD_TPCI200=m +CONFIG_SERIAL_IPOCTAL=m +CONFIG_RESET_CONTROLLER=y +CONFIG_RESET_TI_SYSCON=m +CONFIG_FMC=m +CONFIG_FMC_FAKEDEV=m +CONFIG_FMC_TRIVIAL=m +CONFIG_FMC_WRITE_EEPROM=m +CONFIG_FMC_CHARDEV=m + +# +# PHY Subsystem +# +CONFIG_GENERIC_PHY=y +CONFIG_BCM_KONA_USB2_PHY=m +CONFIG_PHY_PXA_28NM_HSIC=m +CONFIG_PHY_PXA_28NM_USB2=m +CONFIG_PHY_CPCAP_USB=m +CONFIG_PHY_QCOM_USB_HS=m +CONFIG_PHY_QCOM_USB_HSIC=m +CONFIG_PHY_SAMSUNG_USB2=m +CONFIG_PHY_TUSB1210=m +CONFIG_POWERCAP=y +CONFIG_INTEL_RAPL=m +# CONFIG_IDLE_INJECT is not set +CONFIG_MCB=m +CONFIG_MCB_PCI=m +CONFIG_MCB_LPC=m + +# +# Performance monitor support +# +CONFIG_RAS=y +# CONFIG_RAS_CEC is not set +CONFIG_THUNDERBOLT=m + +# +# Android +# +# CONFIG_ANDROID is not set +CONFIG_LIBNVDIMM=y +CONFIG_BLK_DEV_PMEM=m +CONFIG_ND_BLK=m +CONFIG_ND_CLAIM=y +CONFIG_ND_BTT=m +CONFIG_BTT=y +CONFIG_ND_PFN=m +CONFIG_NVDIMM_PFN=y +CONFIG_NVDIMM_DAX=y +CONFIG_DAX_DRIVER=y +CONFIG_DAX=y +CONFIG_DEV_DAX=m +CONFIG_DEV_DAX_PMEM=m +CONFIG_NVMEM=y +CONFIG_RAVE_SP_EEPROM=m + +# +# HW tracing support +# +CONFIG_STM=m +CONFIG_STM_DUMMY=m +CONFIG_STM_SOURCE_CONSOLE=m +CONFIG_STM_SOURCE_HEARTBEAT=m +CONFIG_STM_SOURCE_FTRACE=m +CONFIG_INTEL_TH=m +CONFIG_INTEL_TH_PCI=m +CONFIG_INTEL_TH_ACPI=m +CONFIG_INTEL_TH_GTH=m +CONFIG_INTEL_TH_STH=m +CONFIG_INTEL_TH_MSU=m +CONFIG_INTEL_TH_PTI=m +# CONFIG_INTEL_TH_DEBUG is not set +CONFIG_FPGA=m +CONFIG_ALTERA_PR_IP_CORE=m +CONFIG_FPGA_MGR_ALTERA_PS_SPI=m +CONFIG_FPGA_MGR_ALTERA_CVP=m +CONFIG_FPGA_MGR_XILINX_SPI=m +CONFIG_FPGA_MGR_MACHXO2_SPI=m +CONFIG_FPGA_BRIDGE=m +CONFIG_XILINX_PR_DECOUPLER=m +CONFIG_FPGA_REGION=m +CONFIG_FPGA_DFL=m +CONFIG_FPGA_DFL_FME=m +CONFIG_FPGA_DFL_FME_MGR=m +CONFIG_FPGA_DFL_FME_BRIDGE=m +CONFIG_FPGA_DFL_FME_REGION=m +CONFIG_FPGA_DFL_AFU=m +CONFIG_FPGA_DFL_PCI=m +CONFIG_PM_OPP=y +CONFIG_UNISYS_VISORBUS=m +# CONFIG_SIOX is not set +# CONFIG_SLIMBUS is not set + +# +# File systems +# +CONFIG_DCACHE_WORD_ACCESS=y +CONFIG_FS_IOMAP=y +# CONFIG_EXT2_FS is not set +# CONFIG_EXT3_FS is not set +CONFIG_EXT4_FS=y +CONFIG_EXT4_USE_FOR_EXT2=y +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y +# CONFIG_EXT4_ENCRYPTION is not set +# CONFIG_EXT4_DEBUG is not set +CONFIG_JBD2=y +# CONFIG_JBD2_DEBUG is not set +CONFIG_FS_MBCACHE=y +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +CONFIG_REISERFS_FS_XATTR=y +CONFIG_REISERFS_FS_POSIX_ACL=y +CONFIG_REISERFS_FS_SECURITY=y +CONFIG_JFS_FS=m +CONFIG_JFS_POSIX_ACL=y +CONFIG_JFS_SECURITY=y +# CONFIG_JFS_DEBUG is not set +CONFIG_JFS_STATISTICS=y +CONFIG_XFS_FS=m +CONFIG_XFS_QUOTA=y +CONFIG_XFS_POSIX_ACL=y +CONFIG_XFS_RT=y +# CONFIG_XFS_ONLINE_SCRUB is not set +# CONFIG_XFS_WARN is not set +# CONFIG_XFS_DEBUG is not set +CONFIG_GFS2_FS=m +CONFIG_GFS2_FS_LOCKING_DLM=y +CONFIG_OCFS2_FS=m +CONFIG_OCFS2_FS_O2CB=m +CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m +CONFIG_OCFS2_FS_STATS=y +CONFIG_OCFS2_DEBUG_MASKLOG=y +# CONFIG_OCFS2_DEBUG_FS is not set +CONFIG_BTRFS_FS=m +CONFIG_BTRFS_FS_POSIX_ACL=y +# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set +# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set +# CONFIG_BTRFS_DEBUG is not set +# CONFIG_BTRFS_ASSERT is not set +# CONFIG_BTRFS_FS_REF_VERIFY is not set +CONFIG_NILFS2_FS=m +CONFIG_F2FS_FS=m +CONFIG_F2FS_STAT_FS=y +CONFIG_F2FS_FS_XATTR=y +CONFIG_F2FS_FS_POSIX_ACL=y +CONFIG_F2FS_FS_SECURITY=y +# CONFIG_F2FS_CHECK_FS is not set +# CONFIG_F2FS_FS_ENCRYPTION is not set +# CONFIG_F2FS_IO_TRACE is not set +# CONFIG_F2FS_FAULT_INJECTION is not set +CONFIG_FS_DAX=y +CONFIG_FS_DAX_PMD=y +CONFIG_FS_POSIX_ACL=y +CONFIG_EXPORTFS=y +# CONFIG_EXPORTFS_BLOCK_OPS is not set +CONFIG_FILE_LOCKING=y +CONFIG_MANDATORY_FILE_LOCKING=y +CONFIG_FS_ENCRYPTION=m +CONFIG_FSNOTIFY=y +CONFIG_DNOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_FANOTIFY=y +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y +CONFIG_QUOTA=y +CONFIG_QUOTA_NETLINK_INTERFACE=y +# CONFIG_PRINT_QUOTA_WARNING is not set +# CONFIG_QUOTA_DEBUG is not set +CONFIG_QUOTA_TREE=m +CONFIG_QFMT_V1=m +CONFIG_QFMT_V2=m +CONFIG_QUOTACTL=y +CONFIG_QUOTACTL_COMPAT=y +CONFIG_AUTOFS4_FS=m +CONFIG_AUTOFS_FS=m +CONFIG_FUSE_FS=y +CONFIG_CUSE=m +CONFIG_OVERLAY_FS=m +# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set +# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set +# CONFIG_OVERLAY_FS_INDEX is not set +# CONFIG_OVERLAY_FS_XINO_AUTO is not set +# CONFIG_OVERLAY_FS_METACOPY is not set + +# +# Caches +# +CONFIG_FSCACHE=m +CONFIG_FSCACHE_STATS=y +# CONFIG_FSCACHE_HISTOGRAM is not set +# CONFIG_FSCACHE_DEBUG is not set +# CONFIG_FSCACHE_OBJECT_LIST is not set +CONFIG_CACHEFILES=m +# CONFIG_CACHEFILES_DEBUG is not set +# CONFIG_CACHEFILES_HISTOGRAM is not set + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=m + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_FAT_DEFAULT_UTF8 is not set +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +# CONFIG_NTFS_RW is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_KCORE=y +CONFIG_PROC_VMCORE=y +# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_PROC_CHILDREN=y +CONFIG_KERNFS=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_TMPFS_XATTR=y +CONFIG_HUGETLBFS=y +CONFIG_HUGETLB_PAGE=y +CONFIG_MEMFD_CREATE=y +CONFIG_ARCH_HAS_GIGANTIC_PAGE=y +CONFIG_CONFIGFS_FS=m +CONFIG_EFIVAR_FS=y +CONFIG_MISC_FILESYSTEMS=y +CONFIG_ORANGEFS_FS=m +CONFIG_ADFS_FS=m +# CONFIG_ADFS_FS_RW is not set +CONFIG_AFFS_FS=m +CONFIG_ECRYPT_FS=y +CONFIG_ECRYPT_FS_MESSAGING=y +CONFIG_HFS_FS=m +CONFIG_HFSPLUS_FS=m +CONFIG_BEFS_FS=m +# CONFIG_BEFS_DEBUG is not set +CONFIG_BFS_FS=m +CONFIG_EFS_FS=m +CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +# CONFIG_JFFS2_SUMMARY is not set +CONFIG_JFFS2_FS_XATTR=y +CONFIG_JFFS2_FS_POSIX_ACL=y +CONFIG_JFFS2_FS_SECURITY=y +CONFIG_JFFS2_COMPRESSION_OPTIONS=y +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_LZO=y +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +# CONFIG_JFFS2_CMODE_NONE is not set +# CONFIG_JFFS2_CMODE_PRIORITY is not set +# CONFIG_JFFS2_CMODE_SIZE is not set +CONFIG_JFFS2_CMODE_FAVOURLZO=y +CONFIG_UBIFS_FS=m +# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set +CONFIG_UBIFS_FS_LZO=y +CONFIG_UBIFS_FS_ZLIB=y +CONFIG_UBIFS_ATIME_SUPPORT=y +CONFIG_UBIFS_FS_XATTR=y +CONFIG_UBIFS_FS_ENCRYPTION=y +CONFIG_UBIFS_FS_SECURITY=y +CONFIG_CRAMFS=m +CONFIG_CRAMFS_BLOCKDEV=y +# CONFIG_CRAMFS_MTD is not set +CONFIG_SQUASHFS=m +# CONFIG_SQUASHFS_FILE_CACHE is not set +CONFIG_SQUASHFS_FILE_DIRECT=y +# CONFIG_SQUASHFS_DECOMP_SINGLE is not set +# CONFIG_SQUASHFS_DECOMP_MULTI is not set +CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y +CONFIG_SQUASHFS_XATTR=y +CONFIG_SQUASHFS_ZLIB=y +CONFIG_SQUASHFS_LZ4=y +CONFIG_SQUASHFS_LZO=y +CONFIG_SQUASHFS_XZ=y +# CONFIG_SQUASHFS_ZSTD is not set +# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +CONFIG_VXFS_FS=m +CONFIG_MINIX_FS=m +CONFIG_OMFS_FS=m +CONFIG_HPFS_FS=m +CONFIG_QNX4FS_FS=m +CONFIG_QNX6FS_FS=m +# CONFIG_QNX6FS_DEBUG is not set +CONFIG_ROMFS_FS=m +CONFIG_ROMFS_BACKED_BY_BLOCK=y +# CONFIG_ROMFS_BACKED_BY_MTD is not set +# CONFIG_ROMFS_BACKED_BY_BOTH is not set +CONFIG_ROMFS_ON_BLOCK=y +CONFIG_PSTORE=y +CONFIG_PSTORE_DEFLATE_COMPRESS=m +# CONFIG_PSTORE_LZO_COMPRESS is not set +# CONFIG_PSTORE_LZ4_COMPRESS is not set +# CONFIG_PSTORE_LZ4HC_COMPRESS is not set +# CONFIG_PSTORE_842_COMPRESS is not set +# CONFIG_PSTORE_ZSTD_COMPRESS is not set +CONFIG_PSTORE_COMPRESS=y +CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y +CONFIG_PSTORE_COMPRESS_DEFAULT="deflate" +# CONFIG_PSTORE_CONSOLE is not set +# CONFIG_PSTORE_PMSG is not set +# CONFIG_PSTORE_FTRACE is not set +CONFIG_PSTORE_RAM=m +CONFIG_SYSV_FS=m +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG is not set +CONFIG_EXOFS_FS=m +# CONFIG_EXOFS_DEBUG is not set +CONFIG_ORE=m +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=m +CONFIG_NFS_V2=m +CONFIG_NFS_V3=m +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=m +CONFIG_NFS_SWAP=y +CONFIG_NFS_V4_1=y +CONFIG_NFS_V4_2=y +CONFIG_PNFS_FILE_LAYOUT=m +CONFIG_PNFS_BLOCK=m +CONFIG_PNFS_FLEXFILE_LAYOUT=m +CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" +CONFIG_NFS_V4_1_MIGRATION=y +CONFIG_NFS_V4_SECURITY_LABEL=y +CONFIG_NFS_FSCACHE=y +# CONFIG_NFS_USE_LEGACY_DNS is not set +CONFIG_NFS_USE_KERNEL_DNS=y +CONFIG_NFS_DEBUG=y +CONFIG_NFSD=m +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3=y +CONFIG_NFSD_V3_ACL=y +CONFIG_NFSD_V4=y +# CONFIG_NFSD_BLOCKLAYOUT is not set +# CONFIG_NFSD_SCSILAYOUT is not set +# CONFIG_NFSD_FLEXFILELAYOUT is not set +CONFIG_NFSD_V4_SECURITY_LABEL=y +# CONFIG_NFSD_FAULT_INJECTION is not set +CONFIG_GRACE_PERIOD=m +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_NFS_ACL_SUPPORT=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=m +CONFIG_SUNRPC_GSS=m +CONFIG_SUNRPC_BACKCHANNEL=y +CONFIG_SUNRPC_SWAP=y +CONFIG_RPCSEC_GSS_KRB5=m +CONFIG_SUNRPC_DEBUG=y +CONFIG_SUNRPC_XPRT_RDMA=m +CONFIG_CEPH_FS=m +CONFIG_CEPH_FSCACHE=y +CONFIG_CEPH_FS_POSIX_ACL=y +CONFIG_CIFS=m +# CONFIG_CIFS_STATS2 is not set +CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y +CONFIG_CIFS_WEAK_PW_HASH=y +CONFIG_CIFS_UPCALL=y +CONFIG_CIFS_XATTR=y +CONFIG_CIFS_POSIX=y +CONFIG_CIFS_ACL=y +CONFIG_CIFS_DEBUG=y +# CONFIG_CIFS_DEBUG2 is not set +# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set +CONFIG_CIFS_DFS_UPCALL=y +# CONFIG_CIFS_SMB_DIRECT is not set +CONFIG_CIFS_FSCACHE=y +CONFIG_CODA_FS=m +CONFIG_AFS_FS=m +# CONFIG_AFS_DEBUG is not set +CONFIG_AFS_FSCACHE=y +CONFIG_9P_FS=m +CONFIG_9P_FSCACHE=y +CONFIG_9P_FS_POSIX_ACL=y +CONFIG_9P_FS_SECURITY=y +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="utf8" +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=m +CONFIG_NLS_ISO8859_1=m +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_MAC_ROMAN=m +CONFIG_NLS_MAC_CELTIC=m +CONFIG_NLS_MAC_CENTEURO=m +CONFIG_NLS_MAC_CROATIAN=m +CONFIG_NLS_MAC_CYRILLIC=m +CONFIG_NLS_MAC_GAELIC=m +CONFIG_NLS_MAC_GREEK=m +CONFIG_NLS_MAC_ICELAND=m +CONFIG_NLS_MAC_INUIT=m +CONFIG_NLS_MAC_ROMANIAN=m +CONFIG_NLS_MAC_TURKISH=m +CONFIG_NLS_UTF8=m +CONFIG_DLM=m +# CONFIG_DLM_DEBUG is not set + +# +# Security options +# +CONFIG_KEYS=y +CONFIG_KEYS_COMPAT=y +CONFIG_PERSISTENT_KEYRINGS=y +CONFIG_BIG_KEYS=y +CONFIG_TRUSTED_KEYS=y +CONFIG_ENCRYPTED_KEYS=y +CONFIG_KEY_DH_OPERATIONS=y +# CONFIG_SECURITY_DMESG_RESTRICT is not set +CONFIG_SECURITY=y +CONFIG_SECURITY_WRITABLE_HOOKS=y +CONFIG_SECURITYFS=y +CONFIG_SECURITY_NETWORK=y +CONFIG_PAGE_TABLE_ISOLATION=y +# CONFIG_SECURITY_INFINIBAND is not set +CONFIG_SECURITY_NETWORK_XFRM=y +CONFIG_SECURITY_PATH=y +CONFIG_INTEL_TXT=y +CONFIG_LSM_MMAP_MIN_ADDR=0 +CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y +CONFIG_HARDENED_USERCOPY=y +CONFIG_HARDENED_USERCOPY_FALLBACK=y +# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set +CONFIG_FORTIFY_SOURCE=y +# CONFIG_STATIC_USERMODEHELPER is not set +CONFIG_SECURITY_SELINUX=y +CONFIG_SECURITY_SELINUX_BOOTPARAM=y +CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 +CONFIG_SECURITY_SELINUX_DISABLE=y +CONFIG_SECURITY_SELINUX_DEVELOP=y +CONFIG_SECURITY_SELINUX_AVC_STATS=y +CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 +CONFIG_SECURITY_SMACK=y +# CONFIG_SECURITY_SMACK_BRINGUP is not set +CONFIG_SECURITY_SMACK_NETFILTER=y +# CONFIG_SECURITY_SMACK_APPEND_SIGNALS is not set +CONFIG_SECURITY_TOMOYO=y +CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048 +CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024 +# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set +CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init" +CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init" +CONFIG_SECURITY_APPARMOR=y +CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1 +CONFIG_SECURITY_APPARMOR_HASH=y +CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y +# CONFIG_SECURITY_APPARMOR_DEBUG is not set +# CONFIG_SECURITY_LOADPIN is not set +CONFIG_SECURITY_YAMA=y +CONFIG_INTEGRITY=y +CONFIG_INTEGRITY_SIGNATURE=y +CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y +CONFIG_INTEGRITY_TRUSTED_KEYRING=y +CONFIG_INTEGRITY_AUDIT=y +CONFIG_IMA=y +CONFIG_IMA_MEASURE_PCR_IDX=10 +CONFIG_IMA_LSM_RULES=y +# CONFIG_IMA_TEMPLATE is not set +CONFIG_IMA_NG_TEMPLATE=y +# CONFIG_IMA_SIG_TEMPLATE is not set +CONFIG_IMA_DEFAULT_TEMPLATE="ima-ng" +CONFIG_IMA_DEFAULT_HASH_SHA1=y +# CONFIG_IMA_DEFAULT_HASH_SHA256 is not set +# CONFIG_IMA_DEFAULT_HASH_SHA512 is not set +CONFIG_IMA_DEFAULT_HASH="sha1" +# CONFIG_IMA_WRITE_POLICY is not set +# CONFIG_IMA_READ_POLICY is not set +CONFIG_IMA_APPRAISE=y +# CONFIG_IMA_APPRAISE_BUILD_POLICY is not set +CONFIG_IMA_APPRAISE_BOOTPARAM=y +CONFIG_IMA_TRUSTED_KEYRING=y +CONFIG_IMA_BLACKLIST_KEYRING=y +# CONFIG_IMA_LOAD_X509 is not set +CONFIG_EVM=y +CONFIG_EVM_ATTR_FSUUID=y +CONFIG_EVM_EXTRA_SMACK_XATTRS=y +# CONFIG_EVM_ADD_XATTRS is not set +# CONFIG_EVM_LOAD_X509 is not set +# CONFIG_DEFAULT_SECURITY_SELINUX is not set +# CONFIG_DEFAULT_SECURITY_SMACK is not set +# CONFIG_DEFAULT_SECURITY_TOMOYO is not set +CONFIG_DEFAULT_SECURITY_APPARMOR=y +# CONFIG_DEFAULT_SECURITY_DAC is not set +CONFIG_DEFAULT_SECURITY="apparmor" +CONFIG_XOR_BLOCKS=m +CONFIG_ASYNC_CORE=m +CONFIG_ASYNC_MEMCPY=m +CONFIG_ASYNC_XOR=m +CONFIG_ASYNC_PQ=m +CONFIG_ASYNC_RAID6_RECOV=m +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD=y +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_BLKCIPHER2=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG=y +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_RNG_DEFAULT=y +CONFIG_CRYPTO_AKCIPHER2=y +CONFIG_CRYPTO_AKCIPHER=y +CONFIG_CRYPTO_KPP2=y +CONFIG_CRYPTO_KPP=y +CONFIG_CRYPTO_ACOMP2=y +CONFIG_CRYPTO_RSA=y +CONFIG_CRYPTO_DH=y +CONFIG_CRYPTO_ECDH=m +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_USER=m +CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y +CONFIG_CRYPTO_GF128MUL=y +CONFIG_CRYPTO_NULL=y +CONFIG_CRYPTO_NULL2=y +CONFIG_CRYPTO_PCRYPT=m +CONFIG_CRYPTO_WORKQUEUE=y +CONFIG_CRYPTO_CRYPTD=m +CONFIG_CRYPTO_MCRYPTD=m +CONFIG_CRYPTO_AUTHENC=m +CONFIG_CRYPTO_TEST=m +CONFIG_CRYPTO_SIMD=m +CONFIG_CRYPTO_GLUE_HELPER_X86=m +CONFIG_CRYPTO_ENGINE=m + +# +# Authenticated Encryption with Associated Data +# +CONFIG_CRYPTO_CCM=m +CONFIG_CRYPTO_GCM=y +CONFIG_CRYPTO_CHACHA20POLY1305=m +CONFIG_CRYPTO_AEGIS128=m +CONFIG_CRYPTO_AEGIS128L=m +CONFIG_CRYPTO_AEGIS256=m +CONFIG_CRYPTO_AEGIS128_AESNI_SSE2=m +CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2=m +CONFIG_CRYPTO_AEGIS256_AESNI_SSE2=m +CONFIG_CRYPTO_MORUS640=m +CONFIG_CRYPTO_MORUS640_GLUE=m +CONFIG_CRYPTO_MORUS640_SSE2=m +CONFIG_CRYPTO_MORUS1280=m +CONFIG_CRYPTO_MORUS1280_GLUE=m +CONFIG_CRYPTO_MORUS1280_SSE2=m +CONFIG_CRYPTO_MORUS1280_AVX2=m +CONFIG_CRYPTO_SEQIV=y +CONFIG_CRYPTO_ECHAINIV=m + +# +# Block modes +# +CONFIG_CRYPTO_CBC=y +CONFIG_CRYPTO_CFB=m +CONFIG_CRYPTO_CTR=y +CONFIG_CRYPTO_CTS=m +CONFIG_CRYPTO_ECB=y +CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_XTS=m +CONFIG_CRYPTO_KEYWRAP=m + +# +# Hash modes +# +CONFIG_CRYPTO_CMAC=m +CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_VMAC=m + +# +# Digest +# +CONFIG_CRYPTO_CRC32C=y +CONFIG_CRYPTO_CRC32C_INTEL=y +CONFIG_CRYPTO_CRC32=m +CONFIG_CRYPTO_CRC32_PCLMUL=m +CONFIG_CRYPTO_CRCT10DIF=y +CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m +CONFIG_CRYPTO_GHASH=y +CONFIG_CRYPTO_POLY1305=m +CONFIG_CRYPTO_POLY1305_X86_64=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_RMD128=m +CONFIG_CRYPTO_RMD160=m +CONFIG_CRYPTO_RMD256=m +CONFIG_CRYPTO_RMD320=m +CONFIG_CRYPTO_SHA1=y +CONFIG_CRYPTO_SHA1_SSSE3=m +CONFIG_CRYPTO_SHA256_SSSE3=m +CONFIG_CRYPTO_SHA512_SSSE3=m +CONFIG_CRYPTO_SHA1_MB=m +CONFIG_CRYPTO_SHA256_MB=m +CONFIG_CRYPTO_SHA512_MB=m +CONFIG_CRYPTO_SHA256=y +CONFIG_CRYPTO_SHA512=y +CONFIG_CRYPTO_SHA3=m +CONFIG_CRYPTO_SM3=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_WP512=m +CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m + +# +# Ciphers +# +CONFIG_CRYPTO_AES=y +CONFIG_CRYPTO_AES_TI=m +CONFIG_CRYPTO_AES_X86_64=m +CONFIG_CRYPTO_AES_NI_INTEL=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_BLOWFISH_COMMON=m +CONFIG_CRYPTO_BLOWFISH_X86_64=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_CAMELLIA_X86_64=m +CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m +CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m +CONFIG_CRYPTO_CAST_COMMON=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST5_AVX_X86_64=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_CAST6_AVX_X86_64=m +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_DES3_EDE_X86_64=m +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_SALSA20=m +CONFIG_CRYPTO_CHACHA20=m +CONFIG_CRYPTO_CHACHA20_X86_64=m +CONFIG_CRYPTO_SEED=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m +CONFIG_CRYPTO_SERPENT_AVX_X86_64=m +CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m +CONFIG_CRYPTO_SM4=m +CONFIG_CRYPTO_SPECK=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=m +CONFIG_CRYPTO_TWOFISH_X86_64=m +CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m +CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m + +# +# Compression +# +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_LZO=y +CONFIG_CRYPTO_842=m +CONFIG_CRYPTO_LZ4=m +CONFIG_CRYPTO_LZ4HC=m +CONFIG_CRYPTO_ZSTD=m + +# +# Random Number Generation +# +CONFIG_CRYPTO_ANSI_CPRNG=m +CONFIG_CRYPTO_DRBG_MENU=y +CONFIG_CRYPTO_DRBG_HMAC=y +CONFIG_CRYPTO_DRBG_HASH=y +CONFIG_CRYPTO_DRBG_CTR=y +CONFIG_CRYPTO_DRBG=y +CONFIG_CRYPTO_JITTERENTROPY=y +CONFIG_CRYPTO_USER_API=m +CONFIG_CRYPTO_USER_API_HASH=m +CONFIG_CRYPTO_USER_API_SKCIPHER=m +CONFIG_CRYPTO_USER_API_RNG=m +CONFIG_CRYPTO_USER_API_AEAD=m +CONFIG_CRYPTO_HASH_INFO=y +CONFIG_CRYPTO_HW=y +CONFIG_CRYPTO_DEV_PADLOCK=y +CONFIG_CRYPTO_DEV_PADLOCK_AES=m +CONFIG_CRYPTO_DEV_PADLOCK_SHA=m +CONFIG_CRYPTO_DEV_CCP=y +CONFIG_CRYPTO_DEV_CCP_DD=m +CONFIG_CRYPTO_DEV_SP_CCP=y +CONFIG_CRYPTO_DEV_CCP_CRYPTO=m +CONFIG_CRYPTO_DEV_SP_PSP=y +CONFIG_CRYPTO_DEV_QAT=m +CONFIG_CRYPTO_DEV_QAT_DH895xCC=m +CONFIG_CRYPTO_DEV_QAT_C3XXX=m +CONFIG_CRYPTO_DEV_QAT_C62X=m +CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m +CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m +CONFIG_CRYPTO_DEV_QAT_C62XVF=m +CONFIG_CRYPTO_DEV_NITROX=m +CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m +CONFIG_CRYPTO_DEV_CHELSIO=m +# CONFIG_CHELSIO_IPSEC_INLINE is not set +# CONFIG_CRYPTO_DEV_CHELSIO_TLS is not set +CONFIG_CRYPTO_DEV_VIRTIO=m +CONFIG_ASYMMETRIC_KEY_TYPE=y +CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y +CONFIG_X509_CERTIFICATE_PARSER=y +CONFIG_PKCS7_MESSAGE_PARSER=y +# CONFIG_PKCS7_TEST_KEY is not set +# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set + +# +# Certificates for signature checking +# +CONFIG_SYSTEM_TRUSTED_KEYRING=y +CONFIG_SYSTEM_TRUSTED_KEYS="" +# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set +# CONFIG_SECONDARY_TRUSTED_KEYRING is not set +# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set +CONFIG_BINARY_PRINTF=y + +# +# Library routines +# +CONFIG_RAID6_PQ=m +CONFIG_BITREVERSE=y +CONFIG_RATIONAL=y +CONFIG_GENERIC_STRNCPY_FROM_USER=y +CONFIG_GENERIC_STRNLEN_USER=y +CONFIG_GENERIC_NET_UTILS=y +CONFIG_GENERIC_FIND_FIRST_BIT=y +CONFIG_GENERIC_PCI_IOMAP=y +CONFIG_GENERIC_IOMAP=y +CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y +CONFIG_ARCH_HAS_FAST_MULTIPLIER=y +CONFIG_CRC_CCITT=y +CONFIG_CRC16=y +CONFIG_CRC_T10DIF=y +CONFIG_CRC_ITU_T=m +CONFIG_CRC32=y +# CONFIG_CRC32_SELFTEST is not set +CONFIG_CRC32_SLICEBY8=y +# CONFIG_CRC32_SLICEBY4 is not set +# CONFIG_CRC32_SARWATE is not set +# CONFIG_CRC32_BIT is not set +CONFIG_CRC64=m +# CONFIG_CRC4 is not set +CONFIG_CRC7=m +CONFIG_LIBCRC32C=m +CONFIG_CRC8=m +CONFIG_XXHASH=m +# CONFIG_RANDOM32_SELFTEST is not set +CONFIG_842_COMPRESS=m +CONFIG_842_DECOMPRESS=m +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y +CONFIG_LZ4_COMPRESS=m +CONFIG_LZ4HC_COMPRESS=m +CONFIG_LZ4_DECOMPRESS=y +CONFIG_ZSTD_COMPRESS=m +CONFIG_ZSTD_DECOMPRESS=m +CONFIG_XZ_DEC=y +CONFIG_XZ_DEC_X86=y +CONFIG_XZ_DEC_POWERPC=y +CONFIG_XZ_DEC_IA64=y +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_ARMTHUMB=y +CONFIG_XZ_DEC_SPARC=y +CONFIG_XZ_DEC_BCJ=y +CONFIG_XZ_DEC_TEST=m +CONFIG_DECOMPRESS_GZIP=y +CONFIG_DECOMPRESS_BZIP2=y +CONFIG_DECOMPRESS_LZMA=y +CONFIG_DECOMPRESS_XZ=y +CONFIG_DECOMPRESS_LZO=y +CONFIG_DECOMPRESS_LZ4=y +CONFIG_GENERIC_ALLOCATOR=y +CONFIG_REED_SOLOMON=m +CONFIG_REED_SOLOMON_ENC8=y +CONFIG_REED_SOLOMON_DEC8=y +CONFIG_REED_SOLOMON_DEC16=y +CONFIG_BCH=m +CONFIG_BCH_CONST_PARAMS=y +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m +CONFIG_BTREE=y +CONFIG_INTERVAL_TREE=y +CONFIG_RADIX_TREE_MULTIORDER=y +CONFIG_ASSOCIATIVE_ARRAY=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT_MAP=y +CONFIG_HAS_DMA=y +CONFIG_NEED_SG_DMA_LENGTH=y +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_ARCH_DMA_ADDR_T_64BIT=y +CONFIG_DMA_DIRECT_OPS=y +CONFIG_DMA_VIRT_OPS=y +CONFIG_SWIOTLB=y +CONFIG_SGL_ALLOC=y +CONFIG_IOMMU_HELPER=y +CONFIG_CHECK_SIGNATURE=y +CONFIG_CPU_RMAP=y +CONFIG_DQL=y +CONFIG_GLOB=y +# CONFIG_GLOB_SELFTEST is not set +CONFIG_NLATTR=y +CONFIG_LRU_CACHE=m +CONFIG_CLZ_TAB=y +CONFIG_CORDIC=m +CONFIG_DDR=y +CONFIG_IRQ_POLL=y +CONFIG_MPILIB=y +CONFIG_SIGNATURE=y +CONFIG_OID_REGISTRY=y +CONFIG_UCS2_STRING=y +CONFIG_FONT_SUPPORT=y +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +CONFIG_SG_POOL=y +CONFIG_ARCH_HAS_SG_CHAIN=y +CONFIG_ARCH_HAS_PMEM_API=y +CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y +CONFIG_ARCH_HAS_UACCESS_MCSAFE=y +CONFIG_SBITMAP=y +CONFIG_PARMAN=m +# CONFIG_STRING_SELFTEST is not set + +# +# Kernel hacking +# + +# +# printk and dmesg options +# +CONFIG_PRINTK_TIME=y +CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 +CONFIG_CONSOLE_LOGLEVEL_QUIET=4 +CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 +CONFIG_BOOT_PRINTK_DELAY=y +CONFIG_DYNAMIC_DEBUG=y + +# +# Compile-time checks and compiler options +# +# CONFIG_DEBUG_INFO is not set +# CONFIG_ENABLE_MUST_CHECK is not set +CONFIG_FRAME_WARN=1024 +# CONFIG_STRIP_ASM_SYMS is not set +# CONFIG_READABLE_ASM is not set +CONFIG_UNUSED_SYMBOLS=y +# CONFIG_PAGE_OWNER is not set +CONFIG_DEBUG_FS=y +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_SECTION_MISMATCH is not set +CONFIG_SECTION_MISMATCH_WARN_ONLY=y +CONFIG_FRAME_POINTER=y +CONFIG_STACK_VALIDATION=y +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +CONFIG_MAGIC_SYSRQ=y +CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1 +CONFIG_MAGIC_SYSRQ_SERIAL=y +CONFIG_DEBUG_KERNEL=y + +# +# Memory Debugging +# +# CONFIG_PAGE_EXTENSION is not set +# CONFIG_DEBUG_PAGEALLOC is not set +# CONFIG_PAGE_POISONING is not set +# CONFIG_DEBUG_PAGE_REF is not set +# CONFIG_DEBUG_RODATA_TEST is not set +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_SLUB_DEBUG_ON is not set +# CONFIG_SLUB_STATS is not set +CONFIG_HAVE_DEBUG_KMEMLEAK=y +# CONFIG_DEBUG_KMEMLEAK is not set +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_DEBUG_VM is not set +CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y +# CONFIG_DEBUG_VIRTUAL is not set +# CONFIG_DEBUG_MEMORY_INIT is not set +CONFIG_MEMORY_NOTIFIER_ERROR_INJECT=m +# CONFIG_DEBUG_PER_CPU_MAPS is not set +CONFIG_HAVE_DEBUG_STACKOVERFLOW=y +# CONFIG_DEBUG_STACKOVERFLOW is not set +CONFIG_HAVE_ARCH_KASAN=y +# CONFIG_KASAN is not set +CONFIG_ARCH_HAS_KCOV=y +CONFIG_CC_HAS_SANCOV_TRACE_PC=y +# CONFIG_KCOV is not set +# CONFIG_DEBUG_SHIRQ is not set + +# +# Debug Lockups and Hangs +# +CONFIG_LOCKUP_DETECTOR=y +CONFIG_SOFTLOCKUP_DETECTOR=y +# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 +CONFIG_HARDLOCKUP_DETECTOR_PERF=y +CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y +CONFIG_HARDLOCKUP_DETECTOR=y +# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set +CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0 +CONFIG_DETECT_HUNG_TASK=y +CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 +# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 +# CONFIG_WQ_WATCHDOG is not set +# CONFIG_PANIC_ON_OOPS is not set +CONFIG_PANIC_ON_OOPS_VALUE=0 +CONFIG_PANIC_TIMEOUT=0 +CONFIG_SCHED_DEBUG=y +CONFIG_SCHED_INFO=y +CONFIG_SCHEDSTATS=y +CONFIG_SCHED_STACK_END_CHECK=y +# CONFIG_DEBUG_TIMEKEEPING is not set + +# +# Lock Debugging (spinlocks, mutexes, etc...) +# +CONFIG_LOCK_DEBUGGING_SUPPORT=y +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set +# CONFIG_DEBUG_RWSEMS is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_DEBUG_ATOMIC_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +CONFIG_LOCK_TORTURE_TEST=m +CONFIG_WW_MUTEX_SELFTEST=m +CONFIG_STACKTRACE=y +# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set +# CONFIG_DEBUG_KOBJECT is not set +CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_LIST is not set +# CONFIG_DEBUG_PI_LIST is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +# CONFIG_DEBUG_CREDENTIALS is not set + +# +# RCU Debugging +# +CONFIG_TORTURE_TEST=m +# CONFIG_RCU_PERF_TEST is not set +# CONFIG_RCU_TORTURE_TEST is not set +CONFIG_RCU_CPU_STALL_TIMEOUT=60 +# CONFIG_RCU_TRACE is not set +# CONFIG_RCU_EQS_DEBUG is not set +# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set +CONFIG_NOTIFIER_ERROR_INJECTION=m +CONFIG_PM_NOTIFIER_ERROR_INJECT=m +CONFIG_NETDEV_NOTIFIER_ERROR_INJECT=m +CONFIG_FUNCTION_ERROR_INJECTION=y +# CONFIG_FAULT_INJECTION is not set +# CONFIG_LATENCYTOP is not set +CONFIG_USER_STACKTRACE_SUPPORT=y +CONFIG_NOP_TRACER=y +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_HAVE_FENTRY=y +CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_TRACER_MAX_TRACE=y +CONFIG_TRACE_CLOCK=y +CONFIG_RING_BUFFER=y +CONFIG_EVENT_TRACING=y +CONFIG_CONTEXT_SWITCH_TRACER=y +CONFIG_RING_BUFFER_ALLOW_SWAP=y +CONFIG_TRACING=y +CONFIG_GENERIC_TRACER=y +CONFIG_TRACING_SUPPORT=y +CONFIG_FTRACE=y +CONFIG_FUNCTION_TRACER=y +CONFIG_FUNCTION_GRAPH_TRACER=y +# CONFIG_PREEMPTIRQ_EVENTS is not set +# CONFIG_IRQSOFF_TRACER is not set +CONFIG_SCHED_TRACER=y +# CONFIG_HWLAT_TRACER is not set +CONFIG_FTRACE_SYSCALLS=y +CONFIG_TRACER_SNAPSHOT=y +# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set +CONFIG_BRANCH_PROFILE_NONE=y +# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set +CONFIG_STACK_TRACER=y +CONFIG_BLK_DEV_IO_TRACE=y +CONFIG_KPROBE_EVENTS=y +# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set +# CONFIG_UPROBE_EVENTS is not set +CONFIG_BPF_EVENTS=y +CONFIG_PROBE_EVENTS=y +CONFIG_DYNAMIC_FTRACE=y +CONFIG_DYNAMIC_FTRACE_WITH_REGS=y +CONFIG_FUNCTION_PROFILER=y +# CONFIG_BPF_KPROBE_OVERRIDE is not set +CONFIG_FTRACE_MCOUNT_RECORD=y +# CONFIG_FTRACE_STARTUP_TEST is not set +CONFIG_MMIOTRACE=y +# CONFIG_HIST_TRIGGERS is not set +# CONFIG_MMIOTRACE_TEST is not set +# CONFIG_TRACEPOINT_BENCHMARK is not set +# CONFIG_RING_BUFFER_BENCHMARK is not set +# CONFIG_RING_BUFFER_STARTUP_TEST is not set +# CONFIG_PREEMPTIRQ_DELAY_TEST is not set +# CONFIG_TRACE_EVAL_MAP_FILE is not set +CONFIG_TRACING_EVENTS_GPIO=y +# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set +# CONFIG_DMA_API_DEBUG is not set +CONFIG_RUNTIME_TESTING_MENU=y +# CONFIG_LKDTM is not set +# CONFIG_TEST_LIST_SORT is not set +# CONFIG_TEST_SORT is not set +# CONFIG_KPROBES_SANITY_TEST is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +CONFIG_RBTREE_TEST=m +CONFIG_INTERVAL_TREE_TEST=m +CONFIG_PERCPU_TEST=m +# CONFIG_ATOMIC64_SELFTEST is not set +CONFIG_ASYNC_RAID6_TEST=m +CONFIG_TEST_HEXDUMP=m +CONFIG_TEST_STRING_HELPERS=m +CONFIG_TEST_KSTRTOX=m +CONFIG_TEST_PRINTF=m +CONFIG_TEST_BITMAP=m +CONFIG_TEST_BITFIELD=m +CONFIG_TEST_UUID=m +CONFIG_TEST_OVERFLOW=m +# CONFIG_TEST_RHASHTABLE is not set +CONFIG_TEST_HASH=m +CONFIG_TEST_IDA=m +CONFIG_TEST_PARMAN=m +CONFIG_TEST_LKM=m +CONFIG_TEST_USER_COPY=m +CONFIG_TEST_BPF=m +CONFIG_FIND_BIT_BENCHMARK=m +CONFIG_TEST_FIRMWARE=m +# CONFIG_TEST_SYSCTL is not set +CONFIG_TEST_UDELAY=m +CONFIG_TEST_STATIC_KEYS=m +# CONFIG_TEST_KMOD is not set +CONFIG_MEMTEST=y +# CONFIG_BUG_ON_DATA_CORRUPTION is not set +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +CONFIG_KGDB=y +CONFIG_KGDB_SERIAL_CONSOLE=y +# CONFIG_KGDB_TESTS is not set +CONFIG_KGDB_LOW_LEVEL_TRAP=y +CONFIG_KGDB_KDB=y +CONFIG_KDB_DEFAULT_ENABLE=0x1 +CONFIG_KDB_KEYBOARD=y +CONFIG_KDB_CONTINUE_CATASTROPHIC=0 +CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y +# CONFIG_UBSAN is not set +CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y +CONFIG_STRICT_DEVMEM=y +CONFIG_IO_STRICT_DEVMEM=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_EARLY_PRINTK_USB=y +# CONFIG_X86_VERBOSE_BOOTUP is not set +CONFIG_EARLY_PRINTK=y +CONFIG_EARLY_PRINTK_DBGP=y +CONFIG_EARLY_PRINTK_EFI=y +# CONFIG_EARLY_PRINTK_USB_XDBC is not set +# CONFIG_X86_PTDUMP is not set +# CONFIG_EFI_PGT_DUMP is not set +# CONFIG_DEBUG_WX is not set +CONFIG_DOUBLEFAULT=y +# CONFIG_DEBUG_TLBFLUSH is not set +# CONFIG_IOMMU_DEBUG is not set +CONFIG_HAVE_MMIOTRACE_SUPPORT=y +# CONFIG_X86_DECODER_SELFTEST is not set +CONFIG_IO_DELAY_TYPE_0X80=0 +CONFIG_IO_DELAY_TYPE_0XED=1 +CONFIG_IO_DELAY_TYPE_UDELAY=2 +CONFIG_IO_DELAY_TYPE_NONE=3 +# CONFIG_IO_DELAY_0X80 is not set +CONFIG_IO_DELAY_0XED=y +# CONFIG_IO_DELAY_UDELAY is not set +# CONFIG_IO_DELAY_NONE is not set +CONFIG_DEFAULT_IO_DELAY_TYPE=1 +# CONFIG_DEBUG_BOOT_PARAMS is not set +# CONFIG_CPA_DEBUG is not set +CONFIG_OPTIMIZE_INLINING=y +# CONFIG_DEBUG_ENTRY is not set +# CONFIG_DEBUG_NMI_SELFTEST is not set +CONFIG_X86_DEBUG_FPU=y +CONFIG_PUNIT_ATOM_DEBUG=m +# CONFIG_UNWINDER_ORC is not set +CONFIG_UNWINDER_FRAME_POINTER=y +# CONFIG_UNWINDER_GUESS is not set diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2c6bd79231..589d373ce7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -406,10 +406,10 @@ It has been modified to remove all non-free binary blobs.") ;; supports qemu "virt" machine and possibly a large number of ARM boards. ;; See : https://wiki.debian.org/DebianKernel/ARMMP. -(define %linux-libre-version "4.18.16") -(define %linux-libre-hash "15apfgswp2lrwjpi3vwnanlkdw3q6rkvwrbgrb71rjsy9gazlz62") +(define %linux-libre-version "4.19") +(define %linux-libre-hash "1j4lizjygy7hb7sq2kxqkpcs4nhxgmi48cpng97b0sm9b46plvfh") -(define %linux-libre-4.18-patches +(define %linux-libre-4.19-patches (list %boot-logo-patch (origin (method url-fetch) @@ -420,21 +420,13 @@ It has been modified to remove all non-free binary blobs.") "arm-mm-export-__sync_icache_dcache-for-xen-privcmd.patch")) (file-name "linux-libre-4.18-arm-export-__sync_icache_dcache.patch") (sha256 - (base32 "1ifnfhpakzffn4b8n7x7w5cps9mzjxlkcfz9zqak2vaw8nzvl39f"))) - (origin - (method url-fetch) - (uri (string-append - "https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git" - "/patch/?id=c5157101e7793b42a56e07368c7f4cb73fb58008")) - (file-name "linux-libre-4.18-arm64-export-__sync_icache_dcache.patch") - (sha256 - (base32 "0q13arsi8al3l3yq6d76z4h8n45wlpkjyxlrgn1sqbx5xjksycyz"))))) + (base32 "1ifnfhpakzffn4b8n7x7w5cps9mzjxlkcfz9zqak2vaw8nzvl39f"))))) (define-public linux-libre (make-linux-libre %linux-libre-version %linux-libre-hash %linux-compatible-systems - #:patches %linux-libre-4.18-patches + #:patches %linux-libre-4.19-patches #:configuration-file kernel-config)) (define %linux-libre-4.14-version "4.14.78") @@ -462,7 +454,7 @@ It has been modified to remove all non-free binary blobs.") (make-linux-libre %linux-libre-version %linux-libre-hash '("armhf-linux") - #:patches %linux-libre-4.18-patches + #:patches %linux-libre-4.19-patches #:defconfig "multi_v7_defconfig" #:extra-version "arm-generic")) @@ -477,7 +469,7 @@ It has been modified to remove all non-free binary blobs.") (make-linux-libre %linux-libre-version %linux-libre-hash '("armhf-linux") - #:patches %linux-libre-4.18-patches + #:patches %linux-libre-4.19-patches #:defconfig "omap2plus_defconfig" #:extra-version "arm-omap2plus")) -- cgit v1.2.3 From d0d3ed6dfccb9934a90caf29861e4dac09faec2b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 24 Oct 2018 05:33:55 +0200 Subject: gnu: tinc: Update to 1.0.35 [fixes CVE-2018-{16737,16738,16758}]. * gnu/packages/vpn.scm (tinc): Update to 1.0.35. --- gnu/packages/vpn.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 9b1f26aa7d..44e736ed45 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -312,14 +312,14 @@ traversing network address translators (@dfn{NAT}s) and firewalls.") (define-public tinc (package (name "tinc") - (version "1.0.33") + (version "1.0.35") (source (origin (method url-fetch) (uri (string-append "http://tinc-vpn.org/packages/" name "-" version ".tar.gz")) (sha256 (base32 - "1x0hpfz13vn4pl6dcpnls6xq3rfcbdsg90awcfn53ijb8k35svvz")))) + "0pl92sdwrkiwgll78x0ww06hfljd07mkwm62g8x17qn3gha3pj0q")))) (build-system gnu-build-system) (arguments '(#:configure-flags -- cgit v1.2.3 From e5d757709a05169e4f1d87baf17358aab0dd8bb1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 24 Oct 2018 05:43:00 +0200 Subject: gnu: loksh: Don't use unstable tarball. * gnu/packages/shells.scm (loksh)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/shells.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 8362d00f60..7a7f2ae2bd 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -572,13 +572,13 @@ The OpenBSD Korn Shell is a cleaned up and enhanced ksh.") (version "6.3") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/dimkr/loksh/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/dimkr/loksh.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 - "0i1b60g1p19s5cnzz0nmjzjnxywm9szzyp1rcwfcx3gmzvrwr2sc")))) + (base32 "0hx57y73g807x321wpa6sr0vvw6igwhaq88rrdryjjbw6p4k0vcc")))) (build-system gnu-build-system) (inputs `(("libbsd" ,libbsd))) -- cgit v1.2.3 From 716cd19ad2357cb40f9236512656d5b198ea9806 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 24 Oct 2018 05:52:54 +0200 Subject: gnu: loksh: Update to 6.4. * gnu/packages/shells.scm (loksh): Update to 6.4. [inputs]: Add ncurses. --- gnu/packages/shells.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 7a7f2ae2bd..47efe5db1b 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -569,7 +569,7 @@ The OpenBSD Korn Shell is a cleaned up and enhanced ksh.") (define-public loksh (package (name "loksh") - (version "6.3") + (version "6.4") (source (origin (method git-fetch) @@ -578,10 +578,11 @@ The OpenBSD Korn Shell is a cleaned up and enhanced ksh.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0hx57y73g807x321wpa6sr0vvw6igwhaq88rrdryjjbw6p4k0vcc")))) + (base32 "1d92cf5iadj1vwg0wwksaq1691zaxjrd2y4qygj4sdd25zsahj6p")))) (build-system gnu-build-system) (inputs - `(("libbsd" ,libbsd))) + `(("libbsd" ,libbsd) + ("ncurses" ,ncurses))) (native-inputs `(("pkg-config" ,pkg-config))) (arguments -- cgit v1.2.3 From 569adffe4b595096da8d17c34b5df3aa5689d4f5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 24 Oct 2018 05:55:23 +0200 Subject: gnu: pcsc-lite: Update to 1.8.24. * gnu/packages/security-token.scm (pcsc-lite): Update to 1.8.24. --- gnu/packages/security-token.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 4495069c0d..400c053048 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -160,7 +160,7 @@ the low-level development kit for the Yubico YubiKey authentication device.") (define-public pcsc-lite (package (name "pcsc-lite") - (version "1.8.23") + (version "1.8.24") (source (origin (method url-fetch) (uri (string-append @@ -168,7 +168,7 @@ the low-level development kit for the Yubico YubiKey authentication device.") name "-" version ".tar.bz2")) (sha256 (base32 - "1jc9ws5ra6v3plwraqixin0w0wfxj64drahrbkyrrwzghqjjc9ss")))) + "0s3mv6csbi9303vvis0hilm71xsmi6cqkbh2kiipdisydbx6865q")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--enable-usbdropdir=/var/lib/pcsc/drivers" -- cgit v1.2.3 From 5787e152302c580ea4cbb79291633eed2e743777 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 24 Oct 2018 10:46:05 +0200 Subject: gnu: Move go-github-com-gogo-protobuf* from syncthing.scm to golang.scm * gnu/packages/syncthing.scm (go-github-com-gogo-protobuf, go-github-com-gogo-protobuf-protoc-gen-gogo, go-github-com-gogo-protobuf-union): Delete. * gnu/packages/golang.scm (go-github-com-gogo-protobuf, go-github-com-gogo-protobuf-protoc-gen-gogo, go-github-com-gogo-protobuf-union): Add. --- gnu/packages/golang.scm | 125 ++++++++++++++++++++++++++++++++++++++++++++- gnu/packages/syncthing.scm | 94 ---------------------------------- 2 files changed, 124 insertions(+), 95 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index f14057417d..9c81534205 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -46,7 +46,8 @@ #:use-module (gnu packages lua) #:use-module (gnu packages mp3) #:use-module (ice-9 match) - #:use-module (srfi srfi-1)) + #:use-module (srfi srfi-1) + #:export (go-github-com-gogo-protobuf-union)) ;; According to https://golang.org/doc/install/gccgo, gccgo-4.8.2 includes a ;; complete go-1.1.2 implementation, gccgo-4.9 includes a complete go-1.2 @@ -2348,3 +2349,125 @@ and lookup requests. Browse requests are not supported yet.") (synopsis "Go wrapper for taglib") (description "Go wrapper for taglib") (license license:unlicense)))) + +(define* (go-github-com-gogo-protobuf-union + #:optional (packages (list go-github-com-gogo-protobuf + go-github-com-gogo-protobuf-protoc-gen-gogo))) + (package + (name "go-github-com-gogo-protobuf-union") + (version (package-version go-github-com-gogo-protobuf)) + (source #f) + (build-system trivial-build-system) + (arguments + '(#:modules ((guix build union)) + #:builder (begin + (use-modules (ice-9 match) + (guix build union)) + (match %build-inputs + (((names . directories) ...) + (union-build (assoc-ref %outputs "out") + directories) + #t))))) + (inputs (map (lambda (package) + (list (package-name package) package)) + packages)) + (synopsis "Union of Go protobuf libraries") + (description "This is a union of Go protobuf libraries") + (home-page (package-home-page go-github-com-gogo-protobuf)) + (license (package-license go-github-com-gogo-protobuf)))) + +(define-public go-github-com-gogo-protobuf + (let ((commit "160de10b2537169b5ae3e7e221d28269ef40d311") + (revision "2")) + (package + (name "go-github-com-gogo-protobuf") + (version (git-version "0.5" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gogo/protobuf") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0hxq28sgxym04rv0q40gpwkh4ni359q21hq3g78wwxwx4qfd4zwm")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/gogo/protobuf/proto" + #:unpack-path "github.com/gogo/protobuf")) + (propagated-inputs + `(("go-github-com-gogo-protobuf-protoc-gen-gogo" + ,go-github-com-gogo-protobuf-protoc-gen-gogo))) + (synopsis "Protocol Buffers for Go with Gadgets") + (description "Gogoprotobuf is a fork of golang/protobuf with extra code +generation features. This code generation is used to achieve: +@itemize +@item fast marshalling and unmarshalling +@item more canonical Go structures +@item goprotobuf compatibility +@item less typing by optionally generating extra helper code +@item peace of mind by optionally generating test and benchmark code +@item other serialization formats +@end itemize") + (home-page "https://github.com/gogo/protobuf") + (license license:bsd-3)))) + +(define-public go-github-com-gogo-protobuf-protoc-gen-gogo + (let ((commit "efccd33a0c20aa078705571d5ddbfa14c8395a63") + (revision "0")) + (package + (name "go-github-com-gogo-protobuf-protoc-gen-gogo") + (version (git-version "0.2" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gogo/protobuf") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "09kfa3aqmhh7p0rc6wd4fw5cjccidsk9vgcy13albv0g8vnbmmgw")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/gogo/protobuf/protoc-gen-gogo" + #:unpack-path "github.com/gogo/protobuf")) + (synopsis "Protocol Buffers for Go with Gadgets") + (description "Gogoprotobuf is a fork of golang/protobuf with extra code +generation features. This code generation is used to achieve: +@itemize +@item fast marshalling and unmarshalling +@item more canonical Go structures +@item goprotobuf compatibility +@item less typing by optionally generating extra helper code +@item peace of mind by optionally generating test and benchmark code +@item other serialization formats +@end itemize") + (home-page "https://github.com/gogo/protobuf") + (license license:bsd-3)))) + +(define-public go-github-com-gogo-protobuf-proto + (let ((commit + "fd322a3c49630fe6d05737e2b7d9426e6680e28d") + (revision "0")) + (package + (name "go-github-com-gogo-protobuf-proto") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gogo/protobuf.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1zi85584dy91hyrwpanygz1pppi0chn3hzzv128i83i6j45a5fp9")))) + (build-system go-build-system) + (arguments + '(#:unpack-path "github.com/gogo/protobuf" + #:import-path "github.com/gogo/protobuf/proto")) + (native-inputs `()) + (home-page "https://github.com/gogo/protobuf") + (synopsis "XXX") + (description "XXX") + (license license:expat)))) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 2e936eef7d..0fe1d3d774 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -298,100 +298,6 @@ structs in the Go programming language.") (home-page "https://github.com/gobwas/glob") (license expat)))) -(define* (go-github-com-gogo-protobuf-union - #:optional (packages (list go-github-com-gogo-protobuf - go-github-com-gogo-protobuf-protoc-gen-gogo))) - (package - (name "go-github-com-gogo-protobuf-union") - (version (package-version go-github-com-gogo-protobuf)) - (source #f) - (build-system trivial-build-system) - (arguments - '(#:modules ((guix build union)) - #:builder (begin - (use-modules (ice-9 match) - (guix build union)) - (match %build-inputs - (((names . directories) ...) - (union-build (assoc-ref %outputs "out") - directories) - #t))))) - (inputs (map (lambda (package) - (list (package-name package) package)) - packages)) - (synopsis "Union of Go protobuf libraries") - (description "This is a union of Go protobuf libraries") - (home-page (package-home-page go-github-com-gogo-protobuf)) - (license (package-license go-github-com-gogo-protobuf)))) - -(define-public go-github-com-gogo-protobuf - (let ((commit "160de10b2537169b5ae3e7e221d28269ef40d311") - (revision "2")) - (package - (name "go-github-com-gogo-protobuf") - (version (git-version "0.5" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gogo/protobuf") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0hxq28sgxym04rv0q40gpwkh4ni359q21hq3g78wwxwx4qfd4zwm")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/gogo/protobuf/proto" - #:unpack-path "github.com/gogo/protobuf")) - (propagated-inputs - `(("go-github-com-gogo-protobuf-protoc-gen-gogo" - ,go-github-com-gogo-protobuf-protoc-gen-gogo))) - (synopsis "Protocol Buffers for Go with Gadgets") - (description "Gogoprotobuf is a fork of golang/protobuf with extra code -generation features. This code generation is used to achieve: -@itemize -@item fast marshalling and unmarshalling -@item more canonical Go structures -@item goprotobuf compatibility -@item less typing by optionally generating extra helper code -@item peace of mind by optionally generating test and benchmark code -@item other serialization formats -@end itemize") - (home-page "https://github.com/gogo/protobuf") - (license bsd-3)))) - -(define-public go-github-com-gogo-protobuf-protoc-gen-gogo - (let ((commit "efccd33a0c20aa078705571d5ddbfa14c8395a63") - (revision "0")) - (package - (name "go-github-com-gogo-protobuf-protoc-gen-gogo") - (version (git-version "0.2" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gogo/protobuf") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "09kfa3aqmhh7p0rc6wd4fw5cjccidsk9vgcy13albv0g8vnbmmgw")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/gogo/protobuf/protoc-gen-gogo" - #:unpack-path "github.com/gogo/protobuf")) - (synopsis "Protocol Buffers for Go with Gadgets") - (description "Gogoprotobuf is a fork of golang/protobuf with extra code -generation features. This code generation is used to achieve: -@itemize -@item fast marshalling and unmarshalling -@item more canonical Go structures -@item goprotobuf compatibility -@item less typing by optionally generating extra helper code -@item peace of mind by optionally generating test and benchmark code -@item other serialization formats -@end itemize") - (home-page "https://github.com/gogo/protobuf") - (license bsd-3)))) (define-public go-github-com-golang-groupcache-lru (let ((commit "84a468cf14b4376def5d68c722b139b881c450a4") -- cgit v1.2.3 From 830dc25176349112c759ba3986c721089e9ec605 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 24 Oct 2018 10:57:43 +0200 Subject: gnu: Move go-golang-org-x-crypto-union from syncthing.scm to golang.scm * gnu/packages/syncthing.scm (go-golang-org-x-crypto-union): Delete. * gnu/packages/golang.scm (go-golang-org-x-crypto-union): Add. --- gnu/packages/golang.scm | 42 +++++++++++++++++++++++++++++++++++++++++- gnu/packages/syncthing.scm | 38 -------------------------------------- 2 files changed, 41 insertions(+), 39 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 9c81534205..f59ddd1386 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -36,6 +36,7 @@ #:use-module (guix git-download) #:use-module (guix packages) #:use-module (guix build-system gnu) + #:use-module (guix build-system trivial) #:use-module (guix build-system go) #:use-module (gnu packages admin) #:use-module (gnu packages gcc) @@ -47,7 +48,8 @@ #:use-module (gnu packages mp3) #:use-module (ice-9 match) #:use-module (srfi srfi-1) - #:export (go-github-com-gogo-protobuf-union)) + #:export (go-github-com-gogo-protobuf-union) + #:export (go-golang-org-x-crypto-union)) ;; According to https://golang.org/doc/install/gccgo, gccgo-4.8.2 includes a ;; complete go-1.1.2 implementation, gccgo-4.9 includes a complete go-1.2 @@ -988,6 +990,44 @@ Tiny Encryption Algorithm (XTEA) block cipher.") (home-page "https://go.googlesource.com/crypto/") (license license:bsd-3)))) +;; Go searches for library modules by looking in the GOPATH environment +;; variable. This variable is a list of paths. However, Go does not +;; keep searching on GOPATH if it tries and fails to import a module. +;; So, we use a union for packages sharing a namespace. +(define* (go-golang-org-x-crypto-union #:optional + (packages (list go-golang-org-x-crypto-blowfish + go-golang-org-x-crypto-bcrypt + go-golang-org-x-crypto-tea + go-golang-org-x-crypto-xtea + go-golang-org-x-crypto-pbkdf2 + go-golang-org-x-crypto-twofish + go-golang-org-x-crypto-cast5 + go-golang-org-x-crypto-salsa20))) + (package + (name "go-golang-org-x-crypto") + (version (package-version go-golang-org-x-crypto-bcrypt)) + (source #f) + (build-system trivial-build-system) + (arguments + '(#:modules ((guix build union)) + #:builder (begin + (use-modules (ice-9 match) + (guix build union)) + (match %build-inputs + (((names . directories) ...) + (union-build (assoc-ref %outputs "out") + directories) + #t))))) + (inputs (map (lambda (package) + (list (package-name package) package)) + packages)) + (synopsis "Union of the Go x crypto libraries") + (description "A union of the Golang cryptographic libraries. A +union is required because `go build` assumes that all of the headers and +libraries are in the same directory.") + (home-page (package-home-page go-golang-org-x-crypto-bcrypt)) + (license (package-license go-golang-org-x-crypto-bcrypt)))) + (define-public go-golang-org-x-net-ipv4 (let ((commit "d866cfc389cec985d6fda2859936a575a55a3ab6") (revision "1")) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 0fe1d3d774..48b52d2002 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -728,44 +728,6 @@ generation.") (home-page "https://github.com/vitrun/qart") (license bsd-3)))) -;; Go searches for library modules by looking in the GOPATH environment -;; variable. This variable is a list of paths. However, Go does not -;; keep searching on GOPATH if it tries and fails to import a module. -;; So, we use a union for packages sharing a namespace. -(define* (go-golang-org-x-crypto-union #:optional - (packages (list go-golang-org-x-crypto-blowfish - go-golang-org-x-crypto-bcrypt - go-golang-org-x-crypto-tea - go-golang-org-x-crypto-xtea - go-golang-org-x-crypto-pbkdf2 - go-golang-org-x-crypto-twofish - go-golang-org-x-crypto-cast5 - go-golang-org-x-crypto-salsa20))) - (package - (name "go-golang-org-x-crypto") - (version (package-version go-golang-org-x-crypto-bcrypt)) - (source #f) - (build-system trivial-build-system) - (arguments - '(#:modules ((guix build union)) - #:builder (begin - (use-modules (ice-9 match) - (guix build union)) - (match %build-inputs - (((names . directories) ...) - (union-build (assoc-ref %outputs "out") - directories) - #t))))) - (inputs (map (lambda (package) - (list (package-name package) package)) - packages)) - (synopsis "Union of the Go x crypto libraries") - (description "A union of the Golang cryptographic libraries. A -union is required because `go build` assumes that all of the headers and -libraries are in the same directory.") - (home-page (package-home-page go-golang-org-x-crypto-bcrypt)) - (license (package-license go-golang-org-x-crypto-bcrypt)))) - (define* (go-golang-org-x-net-union #:optional (packages (list go-golang-org-x-net-ipv4 go-golang-org-x-net-bpf -- cgit v1.2.3 From 7eb0ad380b655b3d8869ea3aab1c6e33ec2cf669 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 24 Oct 2018 10:58:49 +0200 Subject: gnu: Add go-golang-org-x-crypto-ed25519. * gnu/packages/golang.scm (go-golang-org-x-crypto-ed25519): New variable. --- gnu/packages/golang.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index f59ddd1386..e2042692a2 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -990,6 +990,18 @@ Tiny Encryption Algorithm (XTEA) block cipher.") (home-page "https://go.googlesource.com/crypto/") (license license:bsd-3)))) +(define-public go-golang-org-x-crypto-ed25519 + (package + (inherit go-golang-org-x-crypto-bcrypt) + (name "go-golang-org-x-crypto-ed25519") + (arguments + (substitute-keyword-arguments (package-arguments go-golang-org-x-crypto-bcrypt) + ((#:import-path _) + "golang.org/x/crypto/ed25519"))) + (synopsis "ED25519 in Go") + (description "This package provides a Go implementation of the ED25519 +signature algorithm."))) + ;; Go searches for library modules by looking in the GOPATH environment ;; variable. This variable is a list of paths. However, Go does not ;; keep searching on GOPATH if it tries and fails to import a module. -- cgit v1.2.3 From a9010ead4c727e3dfd3ebd04fabcc915d54f799d Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 24 Oct 2018 10:59:38 +0200 Subject: gnu: Add go-golang-org-x-crypto-ripemd160. * gnu/packages/golang.scm (go-golang-org-x-crypto-ripemd160): New variable. --- gnu/packages/golang.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index e2042692a2..66f2b729c5 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1002,6 +1002,18 @@ Tiny Encryption Algorithm (XTEA) block cipher.") (description "This package provides a Go implementation of the ED25519 signature algorithm."))) +(define-public go-golang-org-x-crypto-ripemd160 + (package + (inherit go-golang-org-x-crypto-bcrypt) + (name "go-golang-org-x-crypto-ripemd160") + (arguments + (substitute-keyword-arguments (package-arguments go-golang-org-x-crypto-bcrypt) + ((#:import-path _) + "golang.org/x/crypto/ripemd160"))) + (synopsis "RIPEMD-160 in Go") + (description "This package provides a Go implementation of the RIPEMD-160 +hash algorithm."))) + ;; Go searches for library modules by looking in the GOPATH environment ;; variable. This variable is a list of paths. However, Go does not ;; keep searching on GOPATH if it tries and fails to import a module. -- cgit v1.2.3 From 6fa257cca7b4496d066eb8b730a0634e601c4809 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 24 Oct 2018 10:59:50 +0200 Subject: gnu: Add go-golang-org-x-crypto-blake2s. * gnu/packages/golang.scm (go-golang-org-x-crypto-blake2s): New variable. --- gnu/packages/golang.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 66f2b729c5..3c63925b7d 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1014,6 +1014,18 @@ signature algorithm."))) (description "This package provides a Go implementation of the RIPEMD-160 hash algorithm."))) +(define-public go-golang-org-x-crypto-blake2s + (package + (inherit go-golang-org-x-crypto-bcrypt) + (name "go-golang-org-x-crypto-blake2s") + (arguments + (substitute-keyword-arguments (package-arguments go-golang-org-x-crypto-bcrypt) + ((#:import-path _) + "golang.org/x/crypto/blake2s"))) + (synopsis "BLAKE2s in Go") + (description "This package provides a Go implementation of the BLAKE2s +hash algorithm."))) + ;; Go searches for library modules by looking in the GOPATH environment ;; variable. This variable is a list of paths. However, Go does not ;; keep searching on GOPATH if it tries and fails to import a module. -- cgit v1.2.3 From 19789c8b91c5879b6cd13ed5dc0793e0edd66a33 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 24 Oct 2018 11:00:00 +0200 Subject: gnu: Add go-golang-org-x-crypto-sha3. * gnu/packages/golang.scm (go-golang-org-x-crypto-sha3): New variable. --- gnu/packages/golang.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 3c63925b7d..c114431bab 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1026,6 +1026,19 @@ hash algorithm."))) (description "This package provides a Go implementation of the BLAKE2s hash algorithm."))) +(define-public go-golang-org-x-crypto-sha3 + (package + (inherit go-golang-org-x-crypto-bcrypt) + (name "go-golang-org-x-crypto-sha3") + (arguments + (substitute-keyword-arguments (package-arguments go-golang-org-x-crypto-bcrypt) + ((#:import-path _) + "golang.org/x/crypto/sha3"))) + (synopsis "SHA-3 in Go") + (description "This package provides a Go implementation of the SHA-3 +fixed-output-length hash functions and the SHAKE variable-output-length hash +functions defined by FIPS-202."))) + ;; Go searches for library modules by looking in the GOPATH environment ;; variable. This variable is a list of paths. However, Go does not ;; keep searching on GOPATH if it tries and fails to import a module. -- cgit v1.2.3 From 48a279ee14ac5a285185168f72041418550371fa Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 24 Oct 2018 11:00:12 +0200 Subject: gnu: go-golang-org-x-crypto-union: Wrap all crypto packages. * gnu/packages/golang.scm (go-golang-org-x-crypto-union): Include go-golang-org-x-crypto-ed25519, go-golang-org-x-crypto-ripemd160, go-golang-org-x-crypto-blake2s, go-golang-org-x-crypto-sha3 in union. --- gnu/packages/golang.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index c114431bab..a9bb4e68d1 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1051,7 +1051,11 @@ functions defined by FIPS-202."))) go-golang-org-x-crypto-pbkdf2 go-golang-org-x-crypto-twofish go-golang-org-x-crypto-cast5 - go-golang-org-x-crypto-salsa20))) + go-golang-org-x-crypto-salsa20 + go-golang-org-x-crypto-ed25519 + go-golang-org-x-crypto-ripemd160 + go-golang-org-x-crypto-blake2s + go-golang-org-x-crypto-sha3))) (package (name "go-golang-org-x-crypto") (version (package-version go-golang-org-x-crypto-bcrypt)) -- cgit v1.2.3 From 386bd7ba393297f440c198eb6d5611ff8c73d875 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 24 Oct 2018 11:04:46 +0200 Subject: gnu: Add go-github-com-libp2p-go-flow-metrics. * gnu/packages/golang.scm (go-github-com-libp2p-go-flow-metrics): New variable. --- gnu/packages/golang.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index a9bb4e68d1..6c8754b97c 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2564,3 +2564,31 @@ generation features. This code generation is used to achieve: (synopsis "XXX") (description "XXX") (license license:expat)))) + +(define-public go-github-com-libp2p-go-flow-metrics + (let ((commit "7e5a55af485341567f98d6847a373eb5ddcdcd43") + (revision "0")) + (package + (name "go-github-com-libp2p-go-flow-metrics") + (version (git-version "0.2.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libp2p/go-flow-metrics.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1p87iyk6q6f3g3xkncssx400qlld8f2z93qiz8m1f97grfyhjif1")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/libp2p/go-flow-metrics" + ;; TODO: Tests hang. + #:tests? #f)) + (home-page + "https://github.com/libp2p/go-flow-metrics") + (synopsis "Simple library for tracking flow metrics") + (description "A simple alternative to rcrowley's @command{go-metrics} +that's a lot faster (and only does simple bandwidth metrics).") + (license license:expat)))) -- cgit v1.2.3 From 6a95e3a3a4c97f20b66483b6bd7cac82ddfa0497 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 24 Oct 2018 11:07:38 +0200 Subject: gnu: Add go-github-com-davecgh-go-spew. * gnu/packages/golang.scm (go-github-com-davecgh-go-spew): New variable. --- gnu/packages/golang.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 6c8754b97c..2bea5579a2 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2592,3 +2592,43 @@ generation features. This code generation is used to achieve: (description "A simple alternative to rcrowley's @command{go-metrics} that's a lot faster (and only does simple bandwidth metrics).") (license license:expat)))) + +(define-public go-github-com-davecgh-go-spew + (let ((commit "d8f796af33cc11cb798c1aaeb27a4ebc5099927d") + (revision "0")) + (package + (name "go-github-com-davecgh-go-spew") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/davecgh/go-spew.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "19z27f306fpsrjdvkzd61w1bdazcdbczjyjck177g33iklinhpvx")))) + (build-system go-build-system) + (arguments + '(#:unpack-path "github.com/davecgh/go-spew" + #:import-path "github.com/davecgh/go-spew/spew")) + (home-page "https://github.com/davecgh/go-spew") + (synopsis "Deep pretty printer for Go data structures to aid in debugging") + (description "Package @command{spew} implements a deep pretty printer +for Go data structures to aid in debugging. + +A quick overview of the additional features spew provides over the built-in printing facilities for Go data types are as follows: + +@itemize +@item Pointers are dereferenced and followed. +@item Circular data structures are detected and handled properly. +@item Custom Stringer/error interfaces are optionally invoked, including on +unexported types. +@item Custom types which only implement the Stringer/error interfaces via a +pointer receiver are optionally invoked when passing non-pointer variables. +@item Byte arrays and slices are dumped like the hexdump -C command which +includes offsets, byte values in hex, and ASCII output (only when using Dump +style). +@end itemize\n") + (license license:isc)))) -- cgit v1.2.3 From 171c3259fc47fd7c2ba3814bfffd4d716016cb6e Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 24 Oct 2018 11:11:28 +0200 Subject: gnu: Add go-github-com-btcsuite-btclog. * gnu/packages/golang.scm (go-github-com-btcsuite-btclog): New variable. --- gnu/packages/golang.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 2bea5579a2..6447e28405 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2632,3 +2632,29 @@ includes offsets, byte values in hex, and ASCII output (only when using Dump style). @end itemize\n") (license license:isc)))) + +(define-public go-github-com-btcsuite-btclog + (let ((commit "84c8d2346e9fc8c7b947e243b9c24e6df9fd206a") + (revision "0")) + (package + (name "go-github-com-btcsuite-btclog") + (version (git-version "0.0.3" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/btcsuite/btclog.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "02dl46wcnfpg9sqvg0ipipkpnd7lrf4fnvb9zy56jqa7mfcwc7wk")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/btcsuite/btclog")) + (home-page "https://github.com/btcsuite/btclog") + (synopsis "Subsystem aware logger for Go") + (description "Package @command{btclog} defines a logger interface and +provides a default implementation of a subsystem-aware leveled logger +implementing the same interface.") + (license license:isc)))) -- cgit v1.2.3 From d5599afadf9026079ef5bf34af9d1b111731b81b Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 24 Oct 2018 11:30:32 +0200 Subject: gnu: Add go-github-com-btcsuite-btcd-btcec. * gnu/packages/golang.scm (go-github-com-btcsuite-btcd-btcec): New variable. --- gnu/packages/golang.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 6447e28405..1cc10d5ff0 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2658,3 +2658,41 @@ style). provides a default implementation of a subsystem-aware leveled logger implementing the same interface.") (license license:isc)))) + +(define-public go-github-com-btcsuite-btcd-btcec + (let ((commit "67e573d211ace594f1366b4ce9d39726c4b19bd0") + (revision "0")) + (package + (name "go-github-com-btcsuite-btcd-btcec") + (version (git-version "0.12.0-beta" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/btcsuite/btcd.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "04s92gsy71w1jirlr5lkk9y6r5cparbas7nmf6ywbp7kq7fn8ajn")))) + (build-system go-build-system) + (arguments + '(#:unpack-path "github.com/btcsuite/btcd" + #:import-path "github.com/btcsuite/btcd/btcec")) + (native-inputs + `(("go-github-com-davecgh-go-spew" ,go-github-com-davecgh-go-spew))) + (home-page "https://github.com/btcsuite/btcd") + (synopsis "Elliptic curve cryptography to work with Bitcoin") + (description "Package @command{btcec} implements elliptic curve +cryptography needed for working with Bitcoin (secp256k1 only for now). It is +designed so that it may be used with the standard crypto/ecdsa packages +provided with Go. A comprehensive suite of test is provided to ensure proper +functionality. Package @command{btcec} was originally based on work from +ThePiachu which is licensed under the same terms as Go, but it has +signficantly diverged since then. The @command{btcsuite} developers original +is licensed under the liberal ISC license. + +Although this package was primarily written for btcd, it has intentionally +been designed so it can be used as a standalone package for any projects +needing to use secp256k1 elliptic curve cryptography.") + (license license:isc)))) -- cgit v1.2.3 From ff2d11c3ce8dc1fb3715bffbc058fa4ab22226b1 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 24 Oct 2018 11:37:14 +0200 Subject: gnu: Add go-github-com-minio-sha256-simd. * gnu/packages/golang.scm (go-github-com-minio-sha256-simd): New variable. --- gnu/packages/golang.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 1cc10d5ff0..1631c0bc72 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2696,3 +2696,39 @@ Although this package was primarily written for btcd, it has intentionally been designed so it can be used as a standalone package for any projects needing to use secp256k1 elliptic curve cryptography.") (license license:isc)))) + +(define-public go-github-com-minio-sha256-simd + (let ((commit "51976451ce1942acbb55707a983ed232fa027110") + (revision "0")) + (package + (name "go-github-com-minio-sha256-simd") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/minio/sha256-simd.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0kaxvpidf6ygkkb06vi95pirll31jnmywhyalfjvf7djhim2wr8f")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/minio/sha256-simd")) + (home-page "https://github.com/minio/sha256-simd") + (synopsis "Accelerate SHA256 computations in pure Go") + (description "Accelerate SHA256 computations in pure Go using AVX512 and +AVX2 for Intel and ARM64 for ARM. On AVX512 it provides an up to 8x +improvement (over 3 GB/s per core) in comparison to AVX2. + +This package is designed as a replacement for @command{crypto/sha256}. For +Intel CPUs it has two flavors for AVX512 and AVX2 (AVX/SSE are also +supported). For ARM CPUs with the Cryptography Extensions, advantage is taken +of the SHA2 instructions resulting in a massive performance improvement. + +This package uses Golang assembly. The AVX512 version is based on the Intel's +\"multi-buffer crypto library for IPSec\" whereas the other Intel +implementations are described in \"Fast SHA-256 Implementations on Intel +Architecture Processors\" by J. Guilford et al.") + (license license:asl2.0)))) -- cgit v1.2.3 From 71f3680499d578946193af3db08f19688fb48ce7 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 24 Oct 2018 11:38:54 +0200 Subject: gnu: Add go-github-com-libp2p-go-libp2p-crypto. * gnu/packages/golang.scm (go-github-com-libp2p-go-libp2p-crypto): New variable. --- gnu/packages/golang.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 1631c0bc72..4ee4a01b43 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2732,3 +2732,33 @@ This package uses Golang assembly. The AVX512 version is based on the Intel's implementations are described in \"Fast SHA-256 Implementations on Intel Architecture Processors\" by J. Guilford et al.") (license license:asl2.0)))) + +(define-public go-github-com-libp2p-go-libp2p-crypto + (let ((commit "7240b40a3ddc47c4d17c15baabcbe45e5219171b") + (revision "0")) + (package + (name "go-github-com-libp2p-go-libp2p-crypto") + (version (git-version "2.0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libp2p/go-libp2p-crypto.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0qwpy57qv5143l9dlfwfvpqsxdd2i4zwnawx1w4pmgxxim3nw1wb")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/libp2p/go-libp2p-crypto")) + (native-inputs + `(("go-golang-org-x-crypto-ed25519" ,go-golang-org-x-crypto-ed25519) + ("go-github-com-btcsuite-btcd-btcec" ,go-github-com-btcsuite-btcd-btcec) + ("go-github-com-gogo-protobuf-proto" ,go-github-com-gogo-protobuf-proto) + ("go-github-com-minio-sha256-simd" ,go-github-com-minio-sha256-simd))) + (home-page + "https://github.com/libp2p/go-libp2p-crypto") + (synopsis "Various cryptographic utilities used by IPFS") + (description "Various cryptographic utilities used by IPFS") + (license license:expat)))) -- cgit v1.2.3 From 15272a5053f4c70c073713febfbba3c4623f82de Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 24 Oct 2018 11:41:10 +0200 Subject: gnu: Add go-github-com-mr-tron-base58. * gnu/packages/golang.scm (go-github-com-mr-tron-base58): New variable. --- gnu/packages/golang.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 4ee4a01b43..795ab29838 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2762,3 +2762,30 @@ Architecture Processors\" by J. Guilford et al.") (synopsis "Various cryptographic utilities used by IPFS") (description "Various cryptographic utilities used by IPFS") (license license:expat)))) + +(define-public go-github-com-mr-tron-base58 + (let ((commit "d724c80ecac7b49e4e562d58b2b4f4ee4ed8c312") + (revision "0")) + (package + (name "go-github-com-mr-tron-base58") + (version (git-version "1.1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mr-tron/base58.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "12qhgnn9wf3c1ang16r4i778whk4wsrj7d90h2xgmz4fi1469rqa")))) + (build-system go-build-system) + (arguments + `(#:unpack-path "github.com/mr-tron/base58" + #:import-path "github.com/mr-tron/base58/base58")) + (home-page "https://github.com/mr-tron/base58") + (synopsis "Fast implementation of base58 encoding on Golang") + (description "Fast implementation of base58 encoding on Golang. A +trivial @command{big.Int} encoding benchmark results in 6 times faster +encoding and 8 times faster decoding.") + (license license:expat)))) -- cgit v1.2.3 From 27d59d8bf5ed9a6560f15951395d03f05dc8d645 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 24 Oct 2018 11:43:17 +0200 Subject: gnu: Add go-github-com-gxed-hashland-keccakpg. * gnu/packages/golang.scm (go-github-com-gxed-hashland-keccakpg): New variable. --- gnu/packages/golang.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 795ab29838..87a1cd625e 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2789,3 +2789,29 @@ Architecture Processors\" by J. Guilford et al.") trivial @command{big.Int} encoding benchmark results in 6 times faster encoding and 8 times faster decoding.") (license license:expat)))) + +(define-public go-github-com-gxed-hashland-keccakpg + (let ((commit "d9f6b97f8db22dd1e090fd0bbbe98f09cc7dd0a8") + (revision "0")) + (package + (name "go-github-com-gxed-hashland-keccakpg") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gxed/hashland.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1q23y4lacsz46k9gmgfw4iwwydw36j2601rbidmmswl94grpc386")))) + (build-system go-build-system) + (arguments + '(#:unpack-path "github.com/gxed/hashland" + #:import-path "github.com/gxed/hashland/keccakpg")) + (home-page "https://github.com/gxed/hashland") + (synopsis "Implements the Keccak (SHA-3) hash algorithm in Go") + (description "Package @command{keccak} implements the Keccak (SHA-3) +hash algorithm. See http://keccak.noekeon.org.") + (license license:expat)))) -- cgit v1.2.3 From 90f2a8480518555a2eb3b8fa0cb3616fdab0ccb8 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 24 Oct 2018 11:45:20 +0200 Subject: gnu: Add go-github-com-minio-blake2b-simd. * gnu/packages/golang.scm (go-github-com-minio-blake2b-simd): New variable. --- gnu/packages/golang.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 87a1cd625e..6174f756b8 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2815,3 +2815,35 @@ encoding and 8 times faster decoding.") (description "Package @command{keccak} implements the Keccak (SHA-3) hash algorithm. See http://keccak.noekeon.org.") (license license:expat)))) + +(define-public go-github-com-minio-blake2b-simd + (let ((commit "3f5f724cb5b182a5c278d6d3d55b40e7f8c2efb4") + (revision "0")) + (package + (name "go-github-com-minio-blake2b-simd") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/minio/blake2b-simd.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0b6jbnj62c0gmmfd4zdmh8xbg01p80f13yygir9xprqkzk6fikmd")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/minio/blake2b-simd")) + (home-page "https://github.com/minio/blake2b-simd") + (synopsis "Fast hashing in pure Go of BLAKE2b with SIMD instructions") + (description "This package was initially based on the pure go BLAKE2b +implementation of Dmitry Chestnykh and merged with the (cgo dependent) AVX +optimized BLAKE2 implementation (which in turn is based on the official +implementation. It does so by using Go's Assembler for amd64 architectures +with a golang only fallback for other architectures. + +In addition to AVX there is also support for AVX2 as well as SSE. Best +performance is obtained with AVX2 which gives roughly a 4X performance +increase approaching hashing speeds of 1GB/sec on a single core.") + (license license:asl2.0)))) -- cgit v1.2.3 From 9a7f1575713be1050eedc611047b9603fdbd1bf6 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 24 Oct 2018 11:46:42 +0200 Subject: gnu: Add go-github-com-spaolacci-murmur3. * gnu/packages/golang.scm (go-github-com-spaolacci-murmur3): New variable. --- gnu/packages/golang.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 6174f756b8..d8126d8916 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2847,3 +2847,31 @@ In addition to AVX there is also support for AVX2 as well as SSE. Best performance is obtained with AVX2 which gives roughly a 4X performance increase approaching hashing speeds of 1GB/sec on a single core.") (license license:asl2.0)))) + +(define-public go-github-com-spaolacci-murmur3 + (let ((commit "f09979ecbc725b9e6d41a297405f65e7e8804acc") + (revision "0")) + (package + (name "go-github-com-spaolacci-murmur3") + (version (git-version "1.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/spaolacci/murmur3.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/spaolacci/murmur3")) + (home-page "https://github.com/spaolacci/murmur3") + (synopsis "Native MurmurHash3 Go implementation") + (description "Native Go implementation of Austin Appleby's third +MurmurHash revision (aka MurmurHash3). + +Reference algorithm has been slightly hacked as to support the streaming mode +required by Go's standard Hash interface.") + (license license:bsd-3)))) -- cgit v1.2.3 From 2e42e587b43106980dbd8a6bfee2fd644c1a7f53 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 24 Oct 2018 11:48:27 +0200 Subject: gnu: Add go-github-com-multiformats-go-multihash. * gnu/packages/golang.scm (go-github-com-multiformats-go-multihash): New variable. --- gnu/packages/golang.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index d8126d8916..ab78038649 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2875,3 +2875,34 @@ MurmurHash revision (aka MurmurHash3). Reference algorithm has been slightly hacked as to support the streaming mode required by Go's standard Hash interface.") (license license:bsd-3)))) + +(define-public go-github-com-multiformats-go-multihash + (let ((commit "97cdb562a04c6ef66d8ed40cd62f8fbcddd396d6") + (revision "0")) + (package + (name "go-github-com-multiformats-go-multihash") + (version (git-version "1.0.8" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/multiformats/go-multihash.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "02wd9akrwy4y5m0nig9m24p14bjjgb4n1djydrq8cm4yhbvjrrk0")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/multiformats/go-multihash")) + (native-inputs + `(("go-github-com-mr-tron-base58" ,go-github-com-mr-tron-base58) + ("go-github-com-gxed-hashland-keccakpg" ,go-github-com-gxed-hashland-keccakpg) + ("go-github-com-minio-blake2b-simd" ,go-github-com-minio-blake2b-simd) + ("go-github-com-minio-sha256-simd" ,go-github-com-minio-sha256-simd) + ("go-github-com-spaolacci-murmur3" ,go-github-com-spaolacci-murmur3) + ("go-golang-org-x-crypto-union" ,(go-golang-org-x-crypto-union)))) + (home-page "https://github.com/multiformats/go-multihash") + (synopsis "Multihash implementation in Go") + (description "Multihash implementation in Go.") + (license license:expat)))) -- cgit v1.2.3 From 1db1e3c79efd6c61632a68a003d0979d0ad5b35f Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 24 Oct 2018 11:49:53 +0200 Subject: gnu: Add go-github-com-libp2p-go-libp2p-peer. * gnu/packages/golang.scm (go-github-com-libp2p-go-libp2p-peer): New variable. --- gnu/packages/golang.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index ab78038649..4c36f1eaaf 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2906,3 +2906,38 @@ required by Go's standard Hash interface.") (synopsis "Multihash implementation in Go") (description "Multihash implementation in Go.") (license license:expat)))) + +(define-public go-github-com-libp2p-go-libp2p-peer + (let ((commit "993d742bc29dcf4894b7730ba610fd78900be76c") + (revision "0")) + (package + (name "go-github-com-libp2p-go-libp2p-peer") + (version (git-version "2.3.8" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libp2p/go-libp2p-peer.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1h96qjdi0i1wbr0jliap2903mycphas3ny0zdrm77yca9plcnphh")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/libp2p/go-libp2p-peer")) + (native-inputs + `(("go-github-com-libp2p-go-libp2p-crypto" ,go-github-com-libp2p-go-libp2p-crypto) + ("go-github-com-gogo-protobuf-proto" ,go-github-com-gogo-protobuf-proto) + ("go-github-com-minio-sha256-simd" ,go-github-com-minio-sha256-simd) + ("go-github-com-minio-blake2b-simd" ,go-github-com-minio-blake2b-simd) + ("go-github-com-btcsuite-btcd-btcec" ,go-github-com-btcsuite-btcd-btcec) + ("go-github-com-mr-tron-base58" ,go-github-com-mr-tron-base58) + ("go-github-com-multiformats-go-multihash" ,go-github-com-multiformats-go-multihash) + ("go-github-com-gxed-hashland-keccakpg" ,go-github-com-gxed-hashland-keccakpg) + ("go-github-com-spaolacci-murmur3" ,go-github-com-spaolacci-murmur3) + ("go-golang-org-x-crypto-union" ,(go-golang-org-x-crypto-union)))) + (home-page "https://github.com/libp2p/go-libp2p-peer") + (synopsis "PKI based identities for use in go-libp2p") + (description "PKI based identities for use in @command{go-libp2p}.") + (license license:expat)))) -- cgit v1.2.3 From 43a5c177379f580b804f843ace179d68a8b7fc03 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 24 Oct 2018 11:51:19 +0200 Subject: gnu: Add go-github-com-libp2p-go-libp2p-protocol. * gnu/packages/golang.scm (go-github-com-libp2p-go-libp2p-protocol): New variable. --- gnu/packages/golang.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 4c36f1eaaf..4b2c30f558 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2941,3 +2941,28 @@ required by Go's standard Hash interface.") (synopsis "PKI based identities for use in go-libp2p") (description "PKI based identities for use in @command{go-libp2p}.") (license license:expat)))) + +(define-public go-github-com-libp2p-go-libp2p-protocol + (let ((commit "b29f3d97e3a2fb8b29c5d04290e6cb5c5018004b") + (revision "0")) + (package + (name "go-github-com-libp2p-go-libp2p-protocol") + (version (git-version "1.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libp2p/go-libp2p-protocol.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1xgjfnx9zcqglg9li29wdqywsp8hz22wx6phns9zscni2jsfidld")))) + (build-system go-build-system) + (arguments + '(#:import-path + "github.com/libp2p/go-libp2p-protocol")) + (home-page "https://github.com/libp2p/go-libp2p-protocol") + (synopsis "Type for protocol strings in Golang") + (description "Just a type for protocol strings. Nothing more.") + (license license:expat)))) -- cgit v1.2.3 From 77d8a9179268c3295957b213a8e36c93687b6399 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 24 Oct 2018 11:52:24 +0200 Subject: gnu: Add go-github-com-libp2p-go-libp2p-metrics. * gnu/packages/golang.scm (go-github-com-libp2p-go-libp2p-metrics): New variable. --- gnu/packages/golang.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 4b2c30f558..29181ed554 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2966,3 +2966,42 @@ required by Go's standard Hash interface.") (synopsis "Type for protocol strings in Golang") (description "Just a type for protocol strings. Nothing more.") (license license:expat)))) + +(define-public go-github-com-libp2p-go-libp2p-metrics + (let ((commit "a10ff6e75dae3c868023867e8caa534a04bdc624") + (revision "0")) + (package + (name "go-github-com-libp2p-go-libp2p-metrics") + (version (git-version "2.1.6" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libp2p/go-libp2p-metrics.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "05wy0cq4h6yg9bzgapcvm2criwriicbswx80ma82gyn4a9fdrk8m")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/libp2p/go-libp2p-metrics")) + (native-inputs + `(("go-github-com-libp2p-go-flow-metrics" ,go-github-com-libp2p-go-flow-metrics) + ("go-github-com-libp2p-go-libp2p-peer" ,go-github-com-libp2p-go-libp2p-peer) + ("go-github-com-libp2p-go-libp2p-protocol" ,go-github-com-libp2p-go-libp2p-protocol) + ("go-github-com-libp2p-go-libp2p-crypto" ,go-github-com-libp2p-go-libp2p-crypto) + ("go-github-com-mr-tron-base58" ,go-github-com-mr-tron-base58) + ("go-github-com-multiformats-go-multihash" ,go-github-com-multiformats-go-multihash) + ("go-github-com-btcsuite-btcd-btcec" ,go-github-com-btcsuite-btcd-btcec) + ("go-github-com-gogo-protobuf-proto" ,go-github-com-gogo-protobuf-proto) + ("go-github-com-gxed-hashland-keccakpg" ,go-github-com-gxed-hashland-keccakpg) + ("go-github-com-minio-blake2b-simd" ,go-github-com-minio-blake2b-simd) + ("go-github-com-minio-sha256-simd" ,go-github-com-minio-sha256-simd) + ("go-github-com-spaolacci-murmur3" ,go-github-com-spaolacci-murmur3) + ("go-golang-org-x-crypto-union" ,(go-golang-org-x-crypto-union)))) + (home-page "https://github.com/libp2p/go-libp2p-metrics") + (synopsis "Connection wrapper for go-libp2p that provides bandwidth metrics") + (description "A connection wrapper for @command{go-libp2p} that provides bandwidth +statistics for wrapped connections.") + (license license:expat)))) -- cgit v1.2.3 From 8cb912817363a87ae9d6e3ec858a3f7aa715a913 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 24 Oct 2018 11:56:01 +0200 Subject: gnu: Add go-github-com-mitchellh-go-homedir. * gnu/packages/golang.scm (go-github-com-mitchellh-go-homedir): New variable. --- gnu/packages/golang.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 29181ed554..ad914d5583 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3005,3 +3005,42 @@ required by Go's standard Hash interface.") (description "A connection wrapper for @command{go-libp2p} that provides bandwidth statistics for wrapped connections.") (license license:expat)))) + +(define-public go-github-com-mitchellh-go-homedir + (let ((commit "ae18d6b8b3205b561c79e8e5f69bff09736185f4") + (revision "0")) + (package + (name "go-github-com-mitchellh-go-homedir") + (version (git-version "1.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mitchellh/go-homedir.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq")))) + (build-system go-build-system) + (arguments + (quote (#:import-path "github.com/mitchellh/go-homedir" + ;; TODO: Tests fail because it tries to access home. + #:tests? #f))) + (home-page "https://github.com/mitchellh/go-homedir") + (synopsis "Go library for detecting and expanding the user's home directory without cgo") + (description "This is a Go library for detecting the user's home +directory without the use of @command{cgo}, so the library can be used in +cross-compilation environments. + +Usage is simple, just call homedir.Dir() to get the home directory for a user, +and homedir.Expand() to expand the @command{~} in a path to the home +directory. + +Why not just use @command{os/user}? The built-in @command{os/user} package +requires cgo on Darwin systems. This means that any Go code that uses that +package cannot cross compile. But 99% of the time the use for +@command{os/user} is just to retrieve the home directory, which we can do for +the current user without cgo. This library does that, enabling +cross-compilation.") + (license license:expat)))) -- cgit v1.2.3 From e53121b36f64bb677127f6814e87e875e0d7ff7b Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 24 Oct 2018 11:57:39 +0200 Subject: gnu: Add go-github-com-multiformats-go-multiaddr. * gnu/packages/golang.scm (go-github-com-multiformats-go-multiaddr): New variable. --- gnu/packages/golang.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index ad914d5583..0c5eb6cff1 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3044,3 +3044,45 @@ package cannot cross compile. But 99% of the time the use for the current user without cgo. This library does that, enabling cross-compilation.") (license license:expat)))) + +(define-public go-github-com-multiformats-go-multiaddr + (let ((commit "fe1c46f8be5af4aff4db286e08839295bd922efb") + (revision "0")) + (package + (name "go-github-com-multiformats-go-multiaddr") + (version (git-version "1.3.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/multiformats/go-multiaddr.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0p5f8h098a4yjjmzsgqs7vhx1iqifb8izwg3559cr4h7clkpzznh")))) + (build-system go-build-system) + (arguments + '(#:import-path + "github.com/multiformats/go-multiaddr")) + (native-inputs + `(("go-github-com-multiformats-go-multihash" ,go-github-com-multiformats-go-multihash) + ("go-github-com-gxed-hashland-keccakpg" ,go-github-com-gxed-hashland-keccakpg) + ("go-github-com-minio-blake2b-simd" ,go-github-com-minio-blake2b-simd) + ("go-github-com-minio-sha256-simd" ,go-github-com-minio-sha256-simd) + ("go-github-com-mr-tron-base58" ,go-github-com-mr-tron-base58) + ("go-github-com-spaolacci-murmur3" ,go-github-com-spaolacci-murmur3) + ("go-golang-org-x-crypto-union" ,(go-golang-org-x-crypto-union)))) + (home-page "https://github.com/multiformats/go-multiaddr") + (synopsis "Composable and future-proof network addresses") + (description "Multiaddr is a standard way to represent addresses that +does the following: + +@itemize +@item Support any standard network protocols. +@item Self-describe (include protocols). +@item Have a binary packed format. +@item Have a nice string representation. +@item Encapsulate well. +@end itemize\n") + (license license:expat)))) -- cgit v1.2.3 From 66fb6e292a5a315a62810031e16ecfe30cb88d7d Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 24 Oct 2018 12:00:03 +0200 Subject: gnu: Add go-github-com-multiformats-go-multiaddr-net. * gnu/packages/golang.scm (go-github-com-multiformats-go-multiaddr-net): New variable. --- gnu/packages/golang.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 0c5eb6cff1..afad3aae44 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3086,3 +3086,41 @@ does the following: @item Encapsulate well. @end itemize\n") (license license:expat)))) + +(define-public go-github-com-multiformats-go-multiaddr-net + (let ((commit "1cb9a0e8a6de3c8a10f6cee60d01d793603c4f7e") + (revision "0")) + (package + (name "go-github-com-multiformats-go-multiaddr-net") + (version (git-version "1.6.3" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/multiformats/go-multiaddr-net.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1ypgi47xdz3bh8lh7f8cmk7w3ql9g4izx5l3kzdg9gda1xn5zxq3")))) + (build-system go-build-system) + (arguments + (quote (#:import-path "github.com/multiformats/go-multiaddr-net" + ;; TODO: Tests fail because they try to access the network. + #:tests? #f))) + (native-inputs + `(("go-github-com-multiformats-go-multiaddr" ,go-github-com-multiformats-go-multiaddr) + ("go-github-com-multiformats-go-multihash" ,go-github-com-multiformats-go-multihash) + ("go-github-com-gxed-hashland-keccakpg" ,go-github-com-gxed-hashland-keccakpg) + ("go-github-com-minio-blake2b-simd" ,go-github-com-minio-blake2b-simd) + ("go-github-com-minio-sha256-simd" ,go-github-com-minio-sha256-simd) + ("go-github-com-mr-tron-base58" ,go-github-com-mr-tron-base58) + ("go-github-com-spaolacci-murmur3" ,go-github-com-spaolacci-murmur3) + ("go-golang-org-x-crypto-union" ,(go-golang-org-x-crypto-union)))) + (home-page "https://github.com/multiformats/go-multiaddr-net") + (synopsis "Multiaddress net tools") + (description "This package provides Multiaddr specific versions of +common functions in stdlib's @command{net} package. This means wrappers of +standard net symbols like @command{net.Dial} and @command{net.Listen}, as well +as conversion to and from @command{net.Addr}.") + (license license:expat)))) -- cgit v1.2.3 From 38d346dcc6ae84bcf17c57989816848051d89028 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 24 Oct 2018 12:01:08 +0200 Subject: gnu: Add go-github-com-whyrusleeping-tar-utils. * gnu/packages/golang.scm (go-github-com-whyrusleeping-tar-utils): New variable. --- gnu/packages/golang.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index afad3aae44..3b354372c6 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3124,3 +3124,28 @@ common functions in stdlib's @command{net} package. This means wrappers of standard net symbols like @command{net.Dial} and @command{net.Listen}, as well as conversion to and from @command{net.Addr}.") (license license:expat)))) + +(define-public go-github-com-whyrusleeping-tar-utils + (let ((commit "8c6c8ba81d5c71fd69c0f48dbde4b2fb422b6dfc") + (revision "0")) + (package + (name "go-github-com-whyrusleeping-tar-utils") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/whyrusleeping/tar-utils.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "14jjdw3yics0k467xsyk388684wdpi0bbx8nqj0y4pqxa0s0in6s")))) + (build-system go-build-system) + (arguments + '(#:import-path + "github.com/whyrusleeping/tar-utils")) + (home-page "https://github.com/whyrusleeping/tar-utils") + (synopsis "Tar utilities extracted from go-ipfs codebase") + (description "Tar utilities extracted from @command{go-ipfs} codebase.") + (license license:expat)))) -- cgit v1.2.3 From ad8d4637400f3120320f8012d12065ab48291f3a Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 24 Oct 2018 12:03:27 +0200 Subject: gnu: Add go-github-com-cheekybits-is. * gnu/packages/golang.scm (go-github-com-cheekybits-is): New variable. --- gnu/packages/golang.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 3b354372c6..d1b5c86624 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3149,3 +3149,35 @@ as conversion to and from @command{net.Addr}.") (synopsis "Tar utilities extracted from go-ipfs codebase") (description "Tar utilities extracted from @command{go-ipfs} codebase.") (license license:expat)))) + +(define-public go-github-com-cheekybits-is + (let ((commit "68e9c0620927fb5427fda3708222d0edee89eae9") + (revision "0")) + (package + (name "go-github-com-cheekybits-is") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cheekybits/is.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1mkbyzhwq3rby832ikq00nxv3jnckxsm3949wkxd8ya9js2jmg4d")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/cheekybits/is")) + (home-page "https://github.com/cheekybits/is") + (synopsis "Mini testing helper for Go") + (description "A mini testing helper for Go. + +@itemize +@item It has a simple interface (@command{is.OK} and @command{is.Equal}). +@item It plugs into existing Go toolchain (uses @command{testing.T}). +@item It's obvious for newcomers. +@item It also gives you @command{is.Panic} and @command{is.PanicWith} helpers +- because testing panics is ugly. +@end itemize\n") + (license license:expat)))) -- cgit v1.2.3 From 20f48e4b5da6b0ea818a10651900ed62315348e2 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 24 Oct 2018 12:05:02 +0200 Subject: gnu: Add go-github-com-sabhiram-go-gitignore. * gnu/packages/golang.scm (go-github-com-sabhiram-go-gitignore): New variable. --- gnu/packages/golang.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index d1b5c86624..f614c41d67 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3181,3 +3181,30 @@ as conversion to and from @command{net.Addr}.") - because testing panics is ugly. @end itemize\n") (license license:expat)))) + +(define-public go-github-com-sabhiram-go-gitignore + (let ((commit "d3107576ba9425fc1c85f4b3569c4631b805a02e") + (revision "0")) + (package + (name "go-github-com-sabhiram-go-gitignore") + (version (git-version "1.0.2" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sabhiram/go-gitignore.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1rdwyxgcsiwgmlqnc3k6h300mzlvjc3j21np4yh1h476wc8dvl0l")))) + (build-system go-build-system) + (arguments + '(#:import-path + "github.com/sabhiram/go-gitignore")) + (native-inputs + `(("go-github-com-stretchr-testify" ,go-github-com-stretchr-testify))) + (home-page "https://github.com/sabhiram/go-gitignore") + (synopsis "Gitignore parser for Go") + (description "A @command{.gitignore} parser for Go.") + (license license:expat)))) -- cgit v1.2.3 From b5bb0b500bf0bc14bbb5d554a75d4f46f1d74795 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 24 Oct 2018 12:07:04 +0200 Subject: gnu: Add go-github-com-urfave-cli. * gnu/packages/golang.scm (go-github-com-urfave-cli): New variable. --- gnu/packages/golang.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index f614c41d67..e07bf6c8e5 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3208,3 +3208,29 @@ as conversion to and from @command{net.Addr}.") (synopsis "Gitignore parser for Go") (description "A @command{.gitignore} parser for Go.") (license license:expat)))) + +(define-public go-github-com-urfave-cli + (let ((commit "934abfb2f102315b5794e15ebc7949e4ca253920") + (revision "0")) + (package + (name "go-github-com-urfave-cli") + (version (git-version "1.19.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/urfave/cli.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0c5r8pgj3k48dfcwj8lw3cxkwkl8vh0fhvz5snfdwd0bcxdqx1yq")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/urfave/cli")) + (home-page "https://github.com/urfave/cli") + (synopsis "Simple, fast, and fun package for building command line apps in Go") + (description "@command{cli} is a simple, fast, and fun package for +building command line apps in Go. The goal is to enable developers to write +fast and distributable command line applications in an expressive way.") + (license license:expat)))) -- cgit v1.2.3 From 7bd9020e48467fb05950c84eaf29460b449d7c1c Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 24 Oct 2018 12:08:48 +0200 Subject: gnu: Add go-github-com-whyrusleeping-json-filter. * gnu/packages/golang.scm (go-github-com-whyrusleeping-json-filter): New variable. --- gnu/packages/golang.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index e07bf6c8e5..34d60110c4 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3234,3 +3234,29 @@ as conversion to and from @command{net.Addr}.") building command line apps in Go. The goal is to enable developers to write fast and distributable command line applications in an expressive way.") (license license:expat)))) + +(define-public go-github-com-whyrusleeping-json-filter + (let ((commit "ff25329a9528f01c5175414f16cc0a6a162a5b8b") + (revision "0")) + (package + (name "go-github-com-whyrusleeping-json-filter") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/whyrusleeping/json-filter.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0cai0drvx4c8j686l908vpcsz3mw3vxi3ziz94b0f3c5ylpj07j7")))) + (build-system go-build-system) + (arguments + '(#:import-path + "github.com/whyrusleeping/json-filter")) + (home-page "https://github.com/whyrusleeping/json-filter") + (synopsis "Library to query JSON objects marshalled into map[string]interface") + (description "A library to query JSON objects marshalled into +@command{map[string]interface{}}.") + (license license:expat)))) -- cgit v1.2.3 From 38566e975ec9a743f724efecd9829ebf630f6806 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 24 Oct 2018 12:11:41 +0200 Subject: gnu: Add go-github-com-whyrusleeping-progmeter. * gnu/packages/golang.scm (go-github-com-whyrusleeping-progmeter): New variable. --- gnu/packages/golang.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 34d60110c4..de4e3f29cf 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3260,3 +3260,28 @@ fast and distributable command line applications in an expressive way.") (description "A library to query JSON objects marshalled into @command{map[string]interface{}}.") (license license:expat)))) + +(define-public go-github-com-whyrusleeping-progmeter + (let ((commit "f3e57218a75b913eff88d49a52c1debf9684ea04") + (revision "0")) + (package + (name "go-github-com-whyrusleeping-progmeter") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/whyrusleeping/progmeter.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0xs8rz6yhpvj9512c5v3b8dwr2kivywnyyfxzdfbr6fy1xc8zskb")))) + (build-system go-build-system) + (arguments + '(#:import-path + "github.com/whyrusleeping/progmeter")) + (home-page "https://github.com/whyrusleeping/progmeter") + (synopsis "Progress meter for Go") + (description "Progress meter for Go.") + (license license:expat)))) -- cgit v1.2.3 From 56eb7bd33c7c698253be91a932ed3cc8fc85ab6f Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 24 Oct 2018 12:12:40 +0200 Subject: gnu: Add go-github-com-whyrusleeping-stump. * gnu/packages/golang.scm (go-github-com-whyrusleeping-stump): New variable. --- gnu/packages/golang.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index de4e3f29cf..9b469072c4 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3285,3 +3285,28 @@ fast and distributable command line applications in an expressive way.") (synopsis "Progress meter for Go") (description "Progress meter for Go.") (license license:expat)))) + +(define-public go-github-com-whyrusleeping-stump + (let ((commit "206f8f13aae1697a6fc1f4a55799faf955971fc5") + (revision "0")) + (package + (name "go-github-com-whyrusleeping-stump") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/whyrusleeping/stump.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1s40qdppjnk8gijk7x6kbviiqz62nz3h6gic2q9cwcmq8r5isw7n")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/whyrusleeping/stump")) + (home-page "https://github.com/whyrusleeping/stump") + (synopsis "Very basic logging package for Go") + (description "A simple log library, for when you don't really care to +have super fancy logs.") + (license license:expat)))) -- cgit v1.2.3 From 247b1bd2b65ec51292655c9d5998c77616ba2736 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 24 Oct 2018 12:16:18 +0200 Subject: gnu: Add go-github-com-ipfs-go-ipfs-cmdkit-files. * gnu/packages/ipfs.scm (go-github-com-ipfs-go-ipfs-cmdkit-files): New variable. --- gnu/local.mk | 1 + gnu/packages/ipfs.scm | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 gnu/packages/ipfs.scm (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 47883f829e..6ae7ff42f5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -234,6 +234,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/imagemagick.scm \ %D%/packages/inklingreader.scm \ %D%/packages/inkscape.scm \ + %D%/packages/ipfs.scm \ %D%/packages/irc.scm \ %D%/packages/iso-codes.scm \ %D%/packages/java.scm \ diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm new file mode 100644 index 0000000000..ff446da32b --- /dev/null +++ b/gnu/packages/ipfs.scm @@ -0,0 +1,52 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2018 Pierre Neidhardt +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages ipfs) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix git-download) + #:use-module (guix build-system go) + #:use-module (gnu packages golang)) + +(define-public go-github-com-ipfs-go-ipfs-cmdkit-files + (let ((commit + "386fcf8f18a185ec121676665fe2d9574496048d") + (revision "0")) + (package + (name "go-github-com-ipfs-go-ipfs-cmdkit-files") + (version (git-version "1.1.3" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ipfs/go-ipfs-cmdkit.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0qk6fshgdmhp8dip2ksm13j6nywi41m9mn0czkvmw6b697z85l2r")))) + (build-system go-build-system) + (arguments + '(#:unpack-path "github.com/ipfs/go-ipfs-cmdkit" + #:import-path "github.com/ipfs/go-ipfs-cmdkit/files")) + (home-page "https://github.com/ipfs/go-ipfs-cmdkit") + (synopsis "Shared types, functions and values for go-ipfs") + (description "@command{cmdkit} offers some types, functions and values +that are shared between @command{go-ipfs/commands} and its rewrite +@command{go-ipfs-cmds}.") + (license license:expat)))) -- cgit v1.2.3 From 566f13f8452a707e3cd7c5c3c86911d84b20bbcf Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 24 Oct 2018 12:20:45 +0200 Subject: gnu: Add go-github-com-ipfs-go-ipfs-api. * gnu/packages/ipfs.scm (go-github-com-ipfs-go-ipfs-api): New variable. --- gnu/packages/ipfs.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index ff446da32b..812fcf615e 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -50,3 +50,51 @@ that are shared between @command{go-ipfs/commands} and its rewrite @command{go-ipfs-cmds}.") (license license:expat)))) + +(define-public go-github-com-ipfs-go-ipfs-api + (let ((commit + "dafc2a13a4389ac1a6c2786e34ab70a4f26d3a3f") + (revision "0")) + (package + (name "go-github-com-ipfs-go-ipfs-api") + (version (git-version "1.3.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ipfs/go-ipfs-api.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "06kibnwb037sqynk99j07wm8alvxwx3bari9gdax4jv93396kycj")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/ipfs/go-ipfs-api" + ;; TODO: Tests fail, might need network access. + #:tests? #f)) + (native-inputs + `(("go-github-com-ipfs-go-ipfs-cmdkit-files" ,go-github-com-ipfs-go-ipfs-cmdkit-files) + ("go-github-com-libp2p-go-libp2p-metrics" ,go-github-com-libp2p-go-libp2p-metrics) + ("go-github-com-libp2p-go-flow-metrics" ,go-github-com-libp2p-go-flow-metrics) + ("go-github-com-libp2p-go-libp2p-peer" ,go-github-com-libp2p-go-libp2p-peer) + ("go-github-com-libp2p-go-libp2p-protocol" ,go-github-com-libp2p-go-libp2p-protocol) + ("go-github-com-libp2p-go-libp2p-crypto" ,go-github-com-libp2p-go-libp2p-crypto) + ("go-github-com-mitchellh-go-homedir" ,go-github-com-mitchellh-go-homedir) + ("go-github-com-multiformats-go-multiaddr" ,go-github-com-multiformats-go-multiaddr) + ("go-github-com-multiformats-go-multiaddr-net" ,go-github-com-multiformats-go-multiaddr-net) + ("go-github-com-btcsuite-btcd-btcec" ,go-github-com-btcsuite-btcd-btcec) + ("go-github-com-gogo-protobuf-proto" ,go-github-com-gogo-protobuf-proto) + ("go-github-com-minio-blake2b-simd" ,go-github-com-minio-blake2b-simd) + ("go-github-com-minio-sha256-simd" ,go-github-com-minio-sha256-simd) + ("go-github-com-mr-tron-base58" ,go-github-com-mr-tron-base58) + ("go-github-com-multiformats-go-multihash" ,go-github-com-multiformats-go-multihash) + ("go-golang-org-x-crypto-union" ,(go-golang-org-x-crypto-union)) + ("go-github-com-spaolacci-murmur3" ,go-github-com-spaolacci-murmur3) + ("go-github-com-gxed-hashland-keccakpg" ,go-github-com-gxed-hashland-keccakpg) + ("go-github-com-whyrusleeping-tar-utils" ,go-github-com-whyrusleeping-tar-utils) + ("go-github-com-cheekybits-is" ,go-github-com-cheekybits-is))) + (home-page "https://github.com/ipfs/go-ipfs-api") + (synopsis "Unofficial Go interface to IPFS's HTTP API") + (description "An unofficial Go interface to IPFS's HTTP API") + (license license:expat)))) -- cgit v1.2.3 From 202c1b97034ed1ea9fa8fea449d0806c05e3998f Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 24 Oct 2018 12:25:31 +0200 Subject: gnu: Add gx. * gnu/packages/ipfs.scm (gx): New variable. --- gnu/packages/ipfs.scm | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index 812fcf615e..85fd6ac949 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -98,3 +98,57 @@ that are shared between @command{go-ipfs/commands} and its rewrite (synopsis "Unofficial Go interface to IPFS's HTTP API") (description "An unofficial Go interface to IPFS's HTTP API") (license license:expat)))) + +(define-public gx + (let ((commit + "89338e509426d2895f20086685cf4c77d64cc5df") + (revision "0")) + (package + (name "gx") + (version (git-version "0.14.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/whyrusleeping/gx.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "08gh04jln8rxpq0j4fm4chjap162wp8cjwj9szbvj9c7123s42rd")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/whyrusleeping/gx")) + (native-inputs + `(("go-github-com-blang-semver" ,go-github-com-blang-semver) + ("go-github-com-gxed-hashland-keccakpg" ,go-github-com-gxed-hashland-keccakpg) + ("go-github-com-ipfs-go-ipfs-api" ,go-github-com-ipfs-go-ipfs-api) + ("go-github-com-ipfs-go-ipfs-cmdkit-files" ,go-github-com-ipfs-go-ipfs-cmdkit-files) + ("go-github-com-libp2p-go-flow-metrics" ,go-github-com-libp2p-go-flow-metrics) + ("go-github-com-libp2p-go-libp2p-crypto" ,go-github-com-libp2p-go-libp2p-crypto) + ("go-github-com-libp2p-go-libp2p-metrics" ,go-github-com-libp2p-go-libp2p-metrics) + ("go-github-com-libp2p-go-libp2p-peer" ,go-github-com-libp2p-go-libp2p-peer) + ("go-github-com-libp2p-go-libp2p-protocol" ,go-github-com-libp2p-go-libp2p-protocol) + ("go-github-com-minio-blake2b-simd" ,go-github-com-minio-blake2b-simd) + ("go-github-com-minio-sha256-simd" ,go-github-com-minio-sha256-simd) + ("go-github-com-mitchellh-go-homedir" ,go-github-com-mitchellh-go-homedir) + ("go-github-com-mr-tron-base58" ,go-github-com-mr-tron-base58) + ("go-github-com-multiformats-go-multiaddr" ,go-github-com-multiformats-go-multiaddr) + ("go-github-com-multiformats-go-multiaddr-net" ,go-github-com-multiformats-go-multiaddr-net) + ("go-github-com-multiformats-go-multihash" ,go-github-com-multiformats-go-multihash) + ("go-github-com-spaolacci-murmur3" ,go-github-com-spaolacci-murmur3) + ("go-github-com-whyrusleeping-tar-utils" ,go-github-com-whyrusleeping-tar-utils) + ("go-golang-org-x-crypto-union" ,(go-golang-org-x-crypto-union)) + ("go-github-com-btcsuite-btcd-btcec" ,go-github-com-btcsuite-btcd-btcec) + ("go-github-com-gogo-protobuf-proto" ,go-github-com-gogo-protobuf-proto) + ("go-github-com-sabhiram-go-gitignore" ,go-github-com-sabhiram-go-gitignore) + ("go-github-com-urfave-cli" ,go-github-com-urfave-cli) + ("go-github-com-whyrusleeping-json-filter" ,go-github-com-whyrusleeping-json-filter) + ("go-github-com-whyrusleeping-progmeter" ,go-github-com-whyrusleeping-progmeter) + ("go-github-com-whyrusleeping-stump" ,go-github-com-whyrusleeping-stump))) + (home-page "https://github.com/whyrusleeping/gx") + (synopsis "Package management tool using IPFS") + (description "@command{gx} is a packaging tool built around the +distributed, content addressed filesystem IPFS. It aims to be flexible, +powerful and simple.") + (license license:expat)))) -- cgit v1.2.3 From 96bdf904ac625e3ded6be745ed821339ca467ce5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 23 Oct 2018 10:48:44 +0300 Subject: gnu: dotherside: Update home-page. * gnu/packages/qt.scm (dotherside)[home-page]: Fix project's home-page. --- gnu/packages/qt.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 7dfdade979..5195c71ccf 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2186,7 +2186,7 @@ time Web content can be enhanced with native controls.") (inputs `(("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative))) - (home-page "https://github.com/frankosterfeld/qtkeychain") + (home-page "https://filcuc.github.io/DOtherSide/index.html") (synopsis "C language library for creating bindings for the Qt QML language") (description "DOtherSide is a C language library for creating bindings for the -- cgit v1.2.3 From 5b6c3ad0cda0f50843cbaaafc27c0482109b1e23 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 24 Oct 2018 14:39:35 +0200 Subject: gnu: Add go-github-com-kr-fs. * gnu/packages/golang.scm (go-github-com-kr-fs): New variable. --- gnu/packages/golang.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 9b469072c4..60d3ee7ad9 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3310,3 +3310,27 @@ fast and distributable command line applications in an expressive way.") (description "A simple log library, for when you don't really care to have super fancy logs.") (license license:expat)))) + +(define-public go-github-com-kr-fs + (let ((commit "1455def202f6e05b95cc7bfc7e8ae67ae5141eba") + (revision "0")) + (package + (name "go-github-com-kr-fs") + (version (git-version "0.1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kr/fs.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "11zg176x9hr9q7fsk95r6q0wf214gg4czy02slax4x56n79g6a7q")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/kr/fs")) + (home-page "https://github.com/kr/fs") + (synopsis "Filesystem-related functions for Go") + (description "Package fs provides filesystem-related functions.") + (license license:bsd-3)))) -- cgit v1.2.3 From e82ae6730240f6533d565dbae49401ba073ed872 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 24 Oct 2018 14:40:06 +0200 Subject: gnu: Add go-github-com-whyrusleeping-gx-util. * gnu/packages/ipfs.scm (go-github-com-whyrusleeping-gx-util): New variable. --- gnu/packages/ipfs.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index 85fd6ac949..09366a0b33 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -152,3 +152,11 @@ that are shared between @command{go-ipfs/commands} and its rewrite distributed, content addressed filesystem IPFS. It aims to be flexible, powerful and simple.") (license license:expat)))) + +(define-public go-github-com-whyrusleeping-gx-util + (package + (inherit gx) + (name "go-github-com-whyrusleeping-gx-util") + (arguments + '(#:unpack-path "github.com/whyrusleeping/gx" + #:import-path "github.com/whyrusleeping/gx/gxutil")))) -- cgit v1.2.3 From 96b4977a1924ca648a3cceb15443539104d294f1 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 24 Oct 2018 14:41:09 +0200 Subject: gnu: Add gx-go. * gnu/packages/ipfs.scm (gx-go): New variable. --- gnu/packages/ipfs.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index 09366a0b33..f40c1180ae 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -160,3 +160,53 @@ powerful and simple.") (arguments '(#:unpack-path "github.com/whyrusleeping/gx" #:import-path "github.com/whyrusleeping/gx/gxutil")))) + +(define-public gx-go + (package + (name "gx-go") + (version "1.9.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/whyrusleeping/gx-go") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0fdy4b3ymqw6hzvvjwq37mfrdmizc8lxm53axw93n3x6118na9jc")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/whyrusleeping/gx-go")) + (native-inputs + `(("go-github-com-whyrusleeping-gx-util" ,go-github-com-whyrusleeping-gx-util) + ("go-github-com-kr-fs" ,go-github-com-kr-fs) + ("go-github-com-gxed-hashland-keccakpg" ,go-github-com-gxed-hashland-keccakpg) + ("go-github-com-ipfs-go-ipfs-api" ,go-github-com-ipfs-go-ipfs-api) + ("go-github-com-ipfs-go-ipfs-cmdkit-files" ,go-github-com-ipfs-go-ipfs-cmdkit-files) + ("go-github-com-libp2p-go-flow-metrics" ,go-github-com-libp2p-go-flow-metrics) + ("go-github-com-libp2p-go-libp2p-crypto" ,go-github-com-libp2p-go-libp2p-crypto) + ("go-github-com-libp2p-go-libp2p-metrics" ,go-github-com-libp2p-go-libp2p-metrics) + ("go-github-com-libp2p-go-libp2p-peer" ,go-github-com-libp2p-go-libp2p-peer) + ("go-github-com-libp2p-go-libp2p-protocol" ,go-github-com-libp2p-go-libp2p-protocol) + ("go-github-com-minio-blake2b-simd" ,go-github-com-minio-blake2b-simd) + ("go-github-com-minio-sha256-simd" ,go-github-com-minio-sha256-simd) + ("go-github-com-mitchellh-go-homedir" ,go-github-com-mitchellh-go-homedir) + ("go-github-com-mr-tron-base58" ,go-github-com-mr-tron-base58) + ("go-github-com-multiformats-go-multiaddr" ,go-github-com-multiformats-go-multiaddr) + ("go-github-com-multiformats-go-multiaddr-net" ,go-github-com-multiformats-go-multiaddr-net) + ("go-github-com-multiformats-go-multihash" ,go-github-com-multiformats-go-multihash) + ("go-github-com-spaolacci-murmur3" ,go-github-com-spaolacci-murmur3) + ("go-github-com-whyrusleeping-tar-utils" ,go-github-com-whyrusleeping-tar-utils) + ("go-golang-org-x-crypto-union" ,(go-golang-org-x-crypto-union)) + ("go-github-com-btcsuite-btcd-btcec" ,go-github-com-btcsuite-btcd-btcec) + ("go-github-com-gogo-protobuf-proto" ,go-github-com-gogo-protobuf-proto) + ("go-github-com-sabhiram-go-gitignore" ,go-github-com-sabhiram-go-gitignore) + ("go-github-com-urfave-cli" ,go-github-com-urfave-cli) + ("go-github-com-whyrusleeping-progmeter" ,go-github-com-whyrusleeping-progmeter) + ("go-github-com-whyrusleeping-stump" ,go-github-com-whyrusleeping-stump))) + (home-page "https://github.com/whyrusleeping/gx-go") + (synopsis "Golang subtool for the @command{gx} package manager") + (description "A subtool for the @command{gx} package manager for packages +written in Go.") + (license license:expat))) -- cgit v1.2.3 From 545da9fd5f6c5b55f1bdc1f735ebdf6ba71495a5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 Oct 2018 16:34:23 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From fab3484657e4728496d39bb9d3518ea19412e1cf Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Thu, 18 Oct 2018 10:55:46 +0800 Subject: gnu: Add lxqt-globalkeys. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm (lxqt-globalkeys): New variable. Signed-off-by: 宋文武 --- gnu/packages/lxqt.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index b45d21c87b..a270aff7a9 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -197,6 +197,50 @@ itself as well as other components maintained by the LXQt project.") (home-page "https://lxqt.org") (license lgpl2.1+))) +(define-public lxqt-globalkeys + (package + (name "lxqt-globalkeys") + (version "0.13.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/lxqt/" name "/releases/download/" + version "/" name "-" version ".tar.xz")) + (sha256 + (base32 "1gyvcjbhi7zpvgz1sf773dv9gc35hx5fz023njp9r4vl0dpcavgd")))) + (build-system cmake-build-system) + (inputs + `(("kwindowsystem" ,kwindowsystem) + ("liblxqt" ,liblxqt) + ("libqtxdg" ,libqtxdg) + ("qtbase" ,qtbase) + ("qtsvg" ,qtsvg) + ("qtx11extras" ,qtx11extras))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("qttools" ,qttools) + ("lxqt-build-tools" ,lxqt-build-tools))) + (arguments + '(#:tests? #f ; no tests + #:configure-flags + ;; TODO: prefetch translations files from 'lxqt-l10n'. + '("-DPULL_TRANSLATIONS=NO") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + (substitute* '("autostart/CMakeLists.txt" + "xdg/CMakeLists.txt") + (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") + "DESTINATION \"${CMAKE_INSTALL_PREFIX}/etc/xdg")) + #t))))) + (home-page "https://lxqt.org/") + (synopsis "Daemon used to register global keyboard shortcuts") + (description "lxqt-globalkeys is providing tools to set global keyboard +shortcuts in LXQt sessions, that is shortcuts which apply to the LXQt session +as a whole and are not limited to distinct applications.") + (license lgpl2.1+))) + (define-public lxqt-session (package (name "lxqt-session") -- cgit v1.2.3 From fbe645eafa89f719312a09062172d97eec3078b7 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Thu, 18 Oct 2018 18:54:29 +0800 Subject: gnu: Add libsysstat. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm (libsysstat): New variable. Signed-off-by: 宋文武 --- gnu/packages/lxqt.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index a270aff7a9..2d51fec72c 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -171,6 +171,29 @@ to statistics about the system on which it's run.") ;; Libraries are under LGPL2.1+, and programs under GPLv2+. (license gpl2+))) +(define-public libsysstat + (package + (name "libsysstat") + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/lxqt/" name "/releases/download/" + version "/" name "-" version ".tar.xz")) + (sha256 + (base32 "0ngz8v3bixsdg96d5ipcyxd6nsrg52974xdxy9rnimahlv1yaxn3")))) + (build-system cmake-build-system) + (arguments '(#:tests? #f)) ; no tests + (inputs + `(("qtbase" ,qtbase))) + (native-inputs + `(("lxqt-build-tools" ,lxqt-build-tools))) + (home-page "https://lxqt.org/") + (synopsis "Library used to query system info and statistics") + (description "libsysstat is a library to query system information like CPU +and memory usage or network traffic.") + (license lgpl2.1+))) + (define-public lxqt-build-tools (package (name "lxqt-build-tools") -- cgit v1.2.3 From af291d1cdf8f82bc00b25f1e62d3c4dcbda3a936 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Thu, 18 Oct 2018 10:58:24 +0800 Subject: gnu: Add lxqt-panel. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm (lxqt-panel): New variable. Signed-off-by: 宋文武 --- gnu/packages/lxqt.scm | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 2d51fec72c..f112f52856 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -36,9 +36,13 @@ #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages linux) #:use-module (gnu packages perl) + #:use-module (gnu packages lxde) + #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) #:use-module (gnu packages polkit) + #:use-module (gnu packages pulseaudio) #:use-module (gnu packages qt) + #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg)) (define-public libdbusmenu-qt @@ -264,6 +268,63 @@ shortcuts in LXQt sessions, that is shortcuts which apply to the LXQt session as a whole and are not limited to distinct applications.") (license lgpl2.1+))) +(define-public lxqt-panel + (package + (name "lxqt-panel") + (version "0.13.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/lxqt/" name "/releases/download/" + version "/" name "-" version ".tar.xz")) + (sha256 + (base32 "1qraigzq7nc5a2q6f5ybxwx07gxffa3m3bg7fiv6ppwss51xqfd1")))) + (build-system cmake-build-system) + (inputs + `(("alsa-lib" ,alsa-lib) + ("kguiaddons" ,kguiaddons) + ("kwindowsystem" ,kwindowsystem) + ("libdbusmenu-qt" ,libdbusmenu-qt) + ("liblxqt" ,liblxqt) + ("libqtxdg" ,libqtxdg) + ("libstatgrab" ,libstatgrab) + ("libsysstat", libsysstat) + ("libxcomposite" ,libxcomposite) + ("libxdamage" ,libxdamage) + ("libxkbcommon" ,libxkbcommon) + ("libxrender" ,libxrender) + ("lm-sensors" ,lm-sensors "lib") + ("lxqt-globalkeys" ,lxqt-globalkeys) + ("pcre" ,pcre) + ("pulseaudio" ,pulseaudio) + ("qtbase" ,qtbase) + ("qtsvg" ,qtsvg) + ("qtx11extras" ,qtx11extras) + ("solid" ,solid) + ("xcb-util" ,xcb-util))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("lxqt-build-tools" ,lxqt-build-tools) + ("qttools" ,qttools))) + (arguments + '(#:tests? #f ; no tests + #:configure-flags + ;; TODO: prefetch translations files from 'lxqt-l10n'. + '("-DPULL_TRANSLATIONS=NO") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + (substitute* '("autostart/CMakeLists.txt" + "menu/CMakeLists.txt") + (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") + "DESTINATION \"${CMAKE_INSTALL_PREFIX}/etc/xdg")) + #t))))) + (home-page "https://lxqt.org/") + (synopsis "The LXQt desktop panel") + (description "lxqt-panel represents the taskbar of LXQt.") + (license lgpl2.1+))) + (define-public lxqt-session (package (name "lxqt-session") -- cgit v1.2.3 From cc7f4175728a651b4a9763bd9e6c3c5b5a44c547 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Thu, 18 Oct 2018 11:01:29 +0800 Subject: gnu: Add lxqt-runner. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm (lxqt-runner): New variable. Signed-off-by: 宋文武 --- gnu/packages/lxqt.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index f112f52856..0253cb48fb 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -37,6 +37,7 @@ #:use-module (gnu packages linux) #:use-module (gnu packages perl) #:use-module (gnu packages lxde) + #:use-module (gnu packages maths) #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) #:use-module (gnu packages polkit) @@ -325,6 +326,51 @@ as a whole and are not limited to distinct applications.") (description "lxqt-panel represents the taskbar of LXQt.") (license lgpl2.1+))) +(define-public lxqt-runner + (package + (name "lxqt-runner") + (version "0.13.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/lxqt/" name "/releases/download/" + version "/" name "-" version ".tar.xz")) + (sha256 + (base32 "0dsg6fdcqbl7gza0sg1pb49zn5x31q7zx77jp7mkf6wc2lv8lali")))) + (build-system cmake-build-system) + (inputs + `(("kwindowsystem" ,kwindowsystem) + ("liblxqt" ,liblxqt) + ("libqtxdg" ,libqtxdg) + ("lxqt-globalkeys" ,lxqt-globalkeys) + ("muparser" ,muparser) + ("pcre" ,pcre) + ("qtbase" ,qtbase) + ("qtsvg" ,qtsvg) + ("qtx11extras" ,qtx11extras))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("qttools", qttools) + ("lxqt-build-tools" ,lxqt-build-tools))) + (arguments + '(#:tests? #f ; no tests + #:configure-flags + ;; TODO: prefetch translations files from 'lxqt-l10n'. + '("-DPULL_TRANSLATIONS=NO") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + (substitute* '("autostart/CMakeLists.txt") + (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") + "DESTINATION \"${CMAKE_INSTALL_PREFIX}/etc/xdg")) + #t))))) + (home-page "https://lxqt.org/") + (synopsis "Tool used to launch programs quickly by typing their names") + (description "lxqt-runner provides a GUI that comes up on the desktop and +allows for launching applications or shutting down the system.") + (license lgpl2.1+))) + (define-public lxqt-session (package (name "lxqt-session") -- cgit v1.2.3 From dbb4f7d0a654cdcc210ddf7cb9b99ea688dfc379 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Thu, 18 Oct 2018 11:11:36 +0800 Subject: gnu: Add lxqt-sudo. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm (lxqt-sudo): New variable. Signed-off-by: 宋文武 --- gnu/packages/lxqt.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 0253cb48fb..cc8b6f6066 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -30,6 +30,7 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (gnu packages) + #:use-module (gnu packages admin) #:use-module (gnu packages documentation) #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) @@ -414,3 +415,39 @@ allows for launching applications or shutting down the system.") (description "lxqt-session provides the standard session manager for the LXQt desktop environment.") (license lgpl2.1+))) + +(define-public lxqt-sudo + (package + (name "lxqt-sudo") + (version "0.13.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/lxqt/" name "/releases/download/" + version "/" name "-" version ".tar.xz")) + (sha256 + (base32 "1j28wlw4rkzvr85yl78fqkvz7sv7dykm9ghm63xdkskfjbsas1cf")))) + (build-system cmake-build-system) + (inputs + `(("kwindowsystem" ,kwindowsystem) + ("liblxqt" ,liblxqt) + ("libqtxdg" ,libqtxdg) + ("qtbase" ,qtbase) + ("qtsvg" ,qtsvg) + ("qtx11extras" ,qtx11extras) + ("sudo" ,sudo))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("qttools" ,qttools) + ("lxqt-build-tools" ,lxqt-build-tools))) + (arguments + '(#:tests? #f ; no tests + #:configure-flags + ;; TODO: prefetch translations files from 'lxqt-l10n'. + '("-DPULL_TRANSLATIONS=NO"))) + (home-page "https://lxqt.org/") + (synopsis "GUI frontend for sudo/su") + (description "lxqt-sudo is a graphical front-end of commands sudo and su +respectively. As such it enables regular users to launch applications with +permissions of other users including root.") + (license lgpl2.1+))) -- cgit v1.2.3 From 79f9e4e0b5a43f2517688c291a114ea4211e3d39 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Thu, 18 Oct 2018 11:14:35 +0800 Subject: gnu: Add libfm-qt. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm (libfm-qt): New variable. Signed-off-by: 宋文武 --- gnu/packages/lxqt.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index cc8b6f6066..188eb9dc12 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -40,6 +40,7 @@ #:use-module (gnu packages lxde) #:use-module (gnu packages maths) #:use-module (gnu packages pcre) + #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) #:use-module (gnu packages polkit) #:use-module (gnu packages pulseaudio) @@ -76,6 +77,42 @@ protocol. The DBusMenu protocol makes it possible for applications to export and import their menus over DBus.") (license lgpl2.1+))) +(define-public libfm-qt + (package + (name "libfm-qt") + (version "0.13.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/lxqt/" name "/releases/download/" + version "/" name "-" version ".tar.xz")) + (sha256 + (base32 "0p0lbz7dh5c38zq3yp1v1mm99ymg7mqr3h7yzniif2hipmgvxsv9")))) + (build-system cmake-build-system) + (arguments + '(#:tests? #f ; no tests + #:configure-flags + ;; TODO: prefetch translations files from 'lxqt-l10n'. + '("-DPULL_TRANSLATIONS=NO"))) + (inputs + `(("glib" ,glib) + ("libexif" ,libexif) + ("libfm" ,libfm) + ("libxcb" ,libxcb) + ("menu-cache" ,menu-cache) + ("pcre" ,pcre) + ("qtbase" ,qtbase) + ("qttools" ,qttools) + ("qtx11extras" ,qtx11extras))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("lxqt-build-tools" ,lxqt-build-tools))) + (home-page "https://lxqt.org/") + (synopsis "Qt binding for libfm") + (description "libfm-qt is the Qt port of libfm, a library providing +components to build desktop file managers which belongs to LXDE.") + (license lgpl2.1+))) + (define-public liblxqt (package (name "liblxqt") -- cgit v1.2.3 From d6fd4a76eb81d2aedaa51a78e29b9b96312d03f9 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Thu, 18 Oct 2018 11:19:38 +0800 Subject: gnu: Add pcmanfm-qt. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm (pcmanfm-qt): New variable. Signed-off-by: 宋文武 --- gnu/packages/lxqt.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 188eb9dc12..ee48494308 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -488,3 +488,42 @@ for the LXQt desktop environment.") respectively. As such it enables regular users to launch applications with permissions of other users including root.") (license lgpl2.1+))) + +(define-public pcmanfm-qt + (package + (name "pcmanfm-qt") + (version "0.13.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/lxqt/" name "/releases/download/" + version "/" name "-" version ".tar.xz")) + (sha256 + (base32 "08jprkkk62pk34q9lxa207bh27xi86fj8jxfd5z3w2m5j5nim5mz")))) + (build-system cmake-build-system) + (inputs + `(("libfm-qt" ,libfm-qt) + ("qtbase" ,qtbase) + ("qtx11extras" ,qtx11extras))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("qttools" ,qttools) + ("lxqt-build-tools" ,lxqt-build-tools))) + (arguments + '(#:tests? #f ; no tests + #:configure-flags + ;; TODO: prefetch translations files from 'lxqt-l10n'. + '("-DPULL_TRANSLATIONS=NO") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + (substitute* '("autostart/CMakeLists.txt") + (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") + "DESTINATION \"${CMAKE_INSTALL_PREFIX}/etc/xdg")) + #t))))) + (home-page "https://lxqt.org/") + (synopsis "File manager and desktop icon manager") + (description "PCManFM-Qt is the Qt port of PCManFM, the file manager of +LXDE.") + (license lgpl2.1+))) -- cgit v1.2.3 From 2bdab26f06d5b1767400ad7688e4b37e1b628a0c Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Thu, 18 Oct 2018 11:40:41 +0800 Subject: gnu: Add lxqt-about. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm (lxqt-about): New variable. Signed-off-by: 宋文武 --- gnu/packages/lxqt.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index ee48494308..467240af09 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -237,6 +237,39 @@ to statistics about the system on which it's run.") and memory usage or network traffic.") (license lgpl2.1+))) +(define-public lxqt-about + (package + (name "lxqt-about") + (version "0.13.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/lxqt/" name "/releases/download/" + version "/" name "-" version ".tar.xz")) + (sha256 + (base32 "08imj7p77ifzfxnn8c482mhrvfx9gi0rb43ab5rw1rkmfvax2n5w")))) + (build-system cmake-build-system) + (inputs + `(("kwindowsystem" ,kwindowsystem) + ("liblxqt" ,liblxqt) + ("libqtxdg" ,libqtxdg) + ("qtbase" ,qtbase) + ("qtsvg" ,qtsvg) + ("qtx11extras" ,qtx11extras))) + (native-inputs + `(("lxqt-build-tools" ,lxqt-build-tools) + ("qttools" ,qttools))) + (arguments + '(#:tests? #f ; no tests + #:configure-flags + ;; TODO: prefetch translations files from 'lxqt-l10n'. + '("-DPULL_TRANSLATIONS=NO"))) + (home-page "https://lxqt.org") + (synopsis "Provides information about LXQt and the system") + (description "lxqt-about is a dialogue window providing information about +LXQt and the system it's running on.") + (license lgpl2.1+))) + (define-public lxqt-build-tools (package (name "lxqt-build-tools") -- cgit v1.2.3 From 34e08de321366844140d37879c5e80a45ecbb23c Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Thu, 18 Oct 2018 11:53:30 +0800 Subject: gnu: Add lxqt-admin. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm (lxqt-admin): New variable. Signed-off-by: 宋文武 --- gnu/packages/lxqt.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 467240af09..6965847bb2 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -270,6 +270,47 @@ and memory usage or network traffic.") LXQt and the system it's running on.") (license lgpl2.1+))) +(define-public lxqt-admin + (package + (name "lxqt-admin") + (version "0.13.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/lxqt/" name "/releases/download/" + version "/" name "-" version ".tar.xz")) + (sha256 + (base32 "0qvpv668ja83ydbdrlal1596xhag3xlkbd6qlh9xwdpb7nysvns1")))) + (build-system cmake-build-system) + (inputs + `(("kwindowsystem" ,kwindowsystem) + ("liblxqt" ,liblxqt) + ("libqtxdg" ,libqtxdg) + ("polkit-qt" ,polkit-qt) + ("qtsvg" ,qtsvg) + ("qtx11extras" ,qtx11extras))) + (native-inputs + `(("lxqt-build-tools" ,lxqt-build-tools) + ("qttools" ,qttools))) + (arguments + '(#:tests? #f ; no tests + #:configure-flags + ;; TODO: prefetch translations files from 'lxqt-l10n'. + '("-DPULL_TRANSLATIONS=NO") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + (substitute* "lxqt-admin-user/CMakeLists.txt" + (("DESTINATION \"\\$\\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\\}") + "DESTINATION \"${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions")) + #t))))) + (home-page "https://lxqt.org") + (synopsis "LXQt system administration tool") + (description "lxqt-admin is providing two GUI tools to adjust settings of +the operating system LXQt is running on.") + (license lgpl2.1+))) + (define-public lxqt-build-tools (package (name "lxqt-build-tools") -- cgit v1.2.3 From a6b941ddd14e52555698d7262ec4b768a3bf49fa Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Thu, 18 Oct 2018 13:32:55 +0800 Subject: gnu: lxqt.scm: Add prefix to licenses imports. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm: Import (guix licenses) with prefix "license:". Signed-off-by: 宋文武 --- gnu/packages/lxqt.scm | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 6965847bb2..e978b55d80 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -24,7 +24,7 @@ (define-module (gnu packages lxqt) #:use-module (guix download) - #:use-module ((guix licenses)) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) #:use-module (guix build-system cmake) @@ -75,7 +75,7 @@ (description "This library provides a Qt implementation of the DBusMenu protocol. The DBusMenu protocol makes it possible for applications to export and import their menus over DBus.") - (license lgpl2.1+))) + (license license:lgpl2.1+))) (define-public libfm-qt (package @@ -111,7 +111,7 @@ and import their menus over DBus.") (synopsis "Qt binding for libfm") (description "libfm-qt is the Qt port of libfm, a library providing components to build desktop file managers which belongs to LXDE.") - (license lgpl2.1+))) + (license license:lgpl2.1+))) (define-public liblxqt (package @@ -153,7 +153,7 @@ components to build desktop file managers which belongs to LXDE.") (synopsis "Core utility library for all LXQt components") (description "liblxqt provides the basic libraries shared by the components of the LXQt desktop environment.") - (license lgpl2.1+))) + (license license:lgpl2.1+))) (define-public libqtxdg (package @@ -188,7 +188,7 @@ components of the LXQt desktop environment.") (synopsis "Qt implementation of freedesktop.org xdg specifications") (description "Libqtxdg implements the freedesktop.org xdg specifications in Qt.") - (license lgpl2.1+))) + (license license:lgpl2.1+))) (define-public libstatgrab (package @@ -212,7 +212,7 @@ in Qt.") (description "libstatgrab is a library that provides cross platform access to statistics about the system on which it's run.") ;; Libraries are under LGPL2.1+, and programs under GPLv2+. - (license gpl2+))) + (license license:gpl2+))) (define-public libsysstat (package @@ -235,7 +235,7 @@ to statistics about the system on which it's run.") (synopsis "Library used to query system info and statistics") (description "libsysstat is a library to query system information like CPU and memory usage or network traffic.") - (license lgpl2.1+))) + (license license:lgpl2.1+))) (define-public lxqt-about (package @@ -268,7 +268,7 @@ and memory usage or network traffic.") (synopsis "Provides information about LXQt and the system") (description "lxqt-about is a dialogue window providing information about LXQt and the system it's running on.") - (license lgpl2.1+))) + (license license:lgpl2.1+))) (define-public lxqt-admin (package @@ -309,7 +309,7 @@ LXQt and the system it's running on.") (synopsis "LXQt system administration tool") (description "lxqt-admin is providing two GUI tools to adjust settings of the operating system LXQt is running on.") - (license lgpl2.1+))) + (license license:lgpl2.1+))) (define-public lxqt-build-tools (package @@ -335,7 +335,7 @@ the operating system LXQt is running on.") "Lxqt-build-tools is providing several tools needed to build LXQt itself as well as other components maintained by the LXQt project.") (home-page "https://lxqt.org") - (license lgpl2.1+))) + (license license:lgpl2.1+))) (define-public lxqt-globalkeys (package @@ -379,7 +379,7 @@ itself as well as other components maintained by the LXQt project.") (description "lxqt-globalkeys is providing tools to set global keyboard shortcuts in LXQt sessions, that is shortcuts which apply to the LXQt session as a whole and are not limited to distinct applications.") - (license lgpl2.1+))) + (license license:lgpl2.1+))) (define-public lxqt-panel (package @@ -436,7 +436,7 @@ as a whole and are not limited to distinct applications.") (home-page "https://lxqt.org/") (synopsis "The LXQt desktop panel") (description "lxqt-panel represents the taskbar of LXQt.") - (license lgpl2.1+))) + (license license:lgpl2.1+))) (define-public lxqt-runner (package @@ -481,7 +481,7 @@ as a whole and are not limited to distinct applications.") (synopsis "Tool used to launch programs quickly by typing their names") (description "lxqt-runner provides a GUI that comes up on the desktop and allows for launching applications or shutting down the system.") - (license lgpl2.1+))) + (license license:lgpl2.1+))) (define-public lxqt-session (package @@ -525,7 +525,7 @@ allows for launching applications or shutting down the system.") (synopsis "Session manager for LXQt") (description "lxqt-session provides the standard session manager for the LXQt desktop environment.") - (license lgpl2.1+))) + (license license:lgpl2.1+))) (define-public lxqt-sudo (package @@ -561,7 +561,7 @@ for the LXQt desktop environment.") (description "lxqt-sudo is a graphical front-end of commands sudo and su respectively. As such it enables regular users to launch applications with permissions of other users including root.") - (license lgpl2.1+))) + (license license:lgpl2.1+))) (define-public pcmanfm-qt (package @@ -600,4 +600,4 @@ permissions of other users including root.") (synopsis "File manager and desktop icon manager") (description "PCManFM-Qt is the Qt port of PCManFM, the file manager of LXDE.") - (license lgpl2.1+))) + (license license:lgpl2.1+))) -- cgit v1.2.3 From c1144c78ad853dc1bfbd6f32a69fa0d53a79ff11 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Thu, 18 Oct 2018 13:58:22 +0800 Subject: gnu: Add libkscreen. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/kde.scm (libkscreen): New variable. Signed-off-by: 宋文武 --- gnu/packages/kde.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index c2164250e9..d2ae91b179 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -36,6 +36,7 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) + #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages graphics) #:use-module (gnu packages image) @@ -479,6 +480,45 @@ used in KDE development tools Kompare and KDevelop.") ;; source archive (license (list license:gpl2+ license:lgpl2.0+ license:bsd-3)))) +(define-public libkscreen + (package + (name "libkscreen") + (version "5.13.5") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/plasma/" version "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "04719va15i66qn1xqx318v6risxhp8bfcnhxh9mqm5h9qx5c6c4k")))) + (build-system cmake-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ;; For testing. + ("dbus" ,dbus))) + (inputs + `(("kwayland" ,kwayland) + ("libxrandr" ,libxrandr) + ("qtbase" ,qtbase) + ("qtx11extras" ,qtx11extras))) + (arguments + '(#:tests? #f ; FIXME: 55% tests passed, 5 tests failed out of 11 + #:phases + (modify-phases %standard-phases + (add-before 'check 'pre-check + (lambda _ + ;; For the missing '/etc/machine-id'. + (setenv "DBUS_FATAL_WARNINGS" "0") + ;; Run the tests offscreen. + (setenv "QT_QPA_PLATFORM" "offscreen") + #t))))) + (home-page "https://community.kde.org/Solid/Projects/ScreenManagement") + (synopsis "KDE's screen management software") + (description "KScreen is the new screen management software for KDE Plasma +Workspaces which tries to be as magic and automatic as possible for users with +basic needs and easy to configure for those who want special setups.") + (license license:gpl2+))) + (define-public libksysguard (package (name "libksysguard") -- cgit v1.2.3 From f437e39aa2cd9214b03d5cf4f5bda22441834e04 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 24 Oct 2018 05:54:35 +0200 Subject: gnu: loksh: Use PREFIX. * gnu/packages/shells.scm (loksh)[argumentss]: Substitute PREFIX for DESTDIR #:make-flags. --- gnu/packages/shells.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 47efe5db1b..3e9d797e2c 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -586,14 +586,13 @@ The OpenBSD Korn Shell is a cleaned up and enhanced ksh.") (native-inputs `(("pkg-config" ,pkg-config))) (arguments - `(#:tests? #f ;No tests included + `(#:tests? #f ; no tests included #:make-flags (list "CC=gcc" "HAVE_LIBBSD=1" - (string-append "DESTDIR=" - (assoc-ref %outputs "out")) - "PREFIX=") + (string-append "PREFIX=" + (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases - (delete 'configure)))) ;No configure script + (delete 'configure)))) ; no configure script (home-page "https://github.com/dimkr/loksh") (synopsis "Korn Shell from OpenBSD") (description -- cgit v1.2.3 From ac9f4819795ee8e2118f9c043a1ef81f45cc6677 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 24 Oct 2018 15:47:16 +0200 Subject: gnu: iproute2: Update to 4.19.0. * gnu/packages/linux.scm (iproute): Update to 4.19.0. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 589d373ce7..84537b936c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1222,7 +1222,7 @@ that the Ethernet protocol is much simpler than the IP protocol.") (define-public iproute (package (name "iproute2") - (version "4.18.0") + (version "4.19.0") (source (origin (method url-fetch) (uri (string-append @@ -1230,7 +1230,7 @@ that the Ethernet protocol is much simpler than the IP protocol.") version ".tar.xz")) (sha256 (base32 - "0ida5njr9nacg6ym3rjvl3cc9czw0hn4akhzbqf8f4zmjl6cgrm9")))) + "114rlb3bvrf7q6yr03mn1rj6gl7mrg0psvm2dx0qb2kxyjhmrv6r")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no test suite -- cgit v1.2.3 From 5b59c77585b41896eda1a40b24b1c3c4a536f080 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 24 Oct 2018 20:51:06 +0200 Subject: gnu: minixml: Update to 2.12. * gnu/packages/xml.scm (minixml): Update to 2.12. [arguments]: Add the resulting libraries to the build's RUNPATH. --- gnu/packages/xml.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 1173dc47bb..4e4fa2da6c 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -960,7 +960,7 @@ Libxml2).") (define-public minixml (package (name "minixml") - (version "2.11") + (version "2.12") (source (origin (method url-fetch/tarbomb) (uri (string-append "https://github.com/michaelrsweet/mxml/" @@ -968,10 +968,13 @@ Libxml2).") "/mxml-" version ".tar.gz")) (sha256 (base32 - "13xsw8vvkxd10vca42ccdyl9rs64lcvhbfz57aknpl3xcfn8mxma")))) + "1z8nqxa4pqdic8wpixkkgg1m2pak9wjikjjxnk3j5i0d29dbgmmg")))) (build-system gnu-build-system) (arguments - `(#:phases + `(#:configure-flags + (list (string-append "LDFLAGS=-Wl,-rpath=" + (assoc-ref %outputs "out") "/lib")) + #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-permissions ;; FIXME: url-fetch/tarbomb resets all permissions to 555/444. -- cgit v1.2.3 From d4eb8a21a6bd5df9126290208d275c94d65c95e3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 22 Oct 2018 17:58:02 +0200 Subject: gnu: Add python-readlike. * gnu/packages/python.scm (python-readlike, python2-readlike): New public variables. --- gnu/packages/python.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index dee7d9a06a..d9f3ebfc55 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -14524,3 +14524,30 @@ can be retrieved in constant time. Some of the terminology is inspired by LISP. It is possible to create an improper list by creating a @code{Pair} with a non-list @code{cdr}.") (license license:gpl3+))) + +(define-public python-readlike + (package + (name "python-readlike") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "readlike" version)) + (sha256 + (base32 "027w8fvi50ksl57q0a7kb5zvmq8jxaawnviib1jdqw0p3igvm1j4")))) + (build-system python-build-system) + (home-page "https://github.com/jangler/readlike") + (synopsis "GNU Readline-like line editing module") + (description + "This Python module provides line editing functions similar to the default +Emacs-style ones of GNU Readline. Unlike the Python standard library's +@code{readline} package, this one allows access to those capabilties in settings +outside of a standard command-line interface. It is especially well-suited to +interfacing with Urwid, due to a shared syntax for describing key inputs. + +Currently, all stateless Readline commands are implemented. Yanking and history +are not supported.") + (license license:expat))) + +(define-public python2-readlike + (package-with-python2 python-readlike)) -- cgit v1.2.3 From 11d99192c76e36d6aeb9998749d3d50d1937561e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 22 Oct 2018 20:36:28 +0200 Subject: gnu: Add python-reparser. * gnu/packages/python.scm (python-reparser, python2-reparser): New public variable. --- gnu/packages/python.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index d9f3ebfc55..fbb280224a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -14551,3 +14551,29 @@ are not supported.") (define-public python2-readlike (package-with-python2 python-readlike)) + +(define-public python-reparser + (package + (name "python-reparser") + (version "1.4.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "ReParser" version)) + (sha256 + (base32 "0nniqb69xr0fv7ydlmrr877wyyjb61nlayka7xr08vlxl9caz776")))) + (build-system python-build-system) + (home-page "https://github.com/xmikos/reparser") + (synopsis "Simple lexer/parser for inline markup based on regular expressions") + (description + "This Python library provides a simple lexer/parser for inline markup based +on regular expressions.") + (license license:expat))) + +(define-public python2-reparser + (let ((reparser (package-with-python2 + (strip-python2-variant python-reparser)))) + (package (inherit reparser) + (propagated-inputs + `(("python2-enum34" ,python2-enum34) + ,@(package-propagated-inputs reparser)))))) -- cgit v1.2.3 From 56a5ef4cb2624de6e17a88f395da42b710795072 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 23 Oct 2018 00:39:37 +0200 Subject: gnu: Add python-mechanicalsoup. * gnu/packages/python-web.scm (python-mechanicalsoup) (python2-mechanicalsoup): New public variable. --- gnu/packages/python-web.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index f8052458a1..eda796e01c 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -60,6 +60,7 @@ #:use-module (gnu packages python-crypto) #:use-module (gnu packages tls) #:use-module (gnu packages time) + #:use-module (gnu packages web) #:use-module (gnu packages xml) #:use-module ((guix licenses) #:prefix license:) #:use-module (srfi srfi-1)) @@ -255,6 +256,43 @@ other HTTP libraries.") (define-public python2-httplib2 (package-with-python2 python-httplib2)) +(define-public python-mechanicalsoup + (package + (name "python-mechanicalsoup") + (version "0.11.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "MechanicalSoup" version)) + (sha256 + (base32 "0k59wwk75q7nz6i6gynvzhagy02ql0bv7py3qqcwgjw7607yq4i7")))) + (build-system python-build-system) + (arguments + ;; TODO: Enable tests when python-flake8@3.5 hits master. + `(#:tests? #f)) + (propagated-inputs + `(("python-beautifulsoup4" ,python-beautifulsoup4) + ("python-lxml" ,python-lxml) + ("python-requests" ,python-requests) + ("python-six" ,python-six))) + ;; (native-inputs + ;; ;; For tests. + ;; `(("python-pytest-flake8" ,python-pytest-flake8) + ;; ("python-pytest-httpbin" ,python-pytest-httpbin) + ;; ("python-pytest-mock" ,python-pytest-mock) + ;; ("python-pytest-runner" ,python-pytest-runner) + ;; ("python-requests-mock" ,python-requests-mock))) + (home-page "https://mechanicalsoup.readthedocs.io/") + (synopsis "Python library for automating website interaction") + (description + "MechanicalSoup is a Python library for automating interaction with +websites. It automatically stores and sends cookies, follows redirects, and can +follow links and submit forms. It doesn’t do JavaScript.") + (license license:expat))) + +(define-public python2-mechanicalsoup + (package-with-python2 python-mechanicalsoup)) + (define-public python-sockjs-tornado (package (name "python-sockjs-tornado") -- cgit v1.2.3 From f65fdd95df71f829cbb21542a1bb2cb1de68554c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 23 Oct 2018 02:50:10 +0200 Subject: gnu: Add hangups. * gnu/packages/messaging.scm (hangups): New public variable. --- gnu/packages/messaging.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 3f050391b1..42fb3733bb 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -71,8 +71,10 @@ #:use-module (gnu packages perl) #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages protobuf) #:use-module (gnu packages python) #:use-module (gnu packages python-crypto) + #:use-module (gnu packages python-web) #:use-module (gnu packages qt) #:use-module (gnu packages readline) #:use-module (gnu packages tcl) @@ -1719,4 +1721,46 @@ QMatrixClient project.") (license (list license:gpl3+ ; all source code license:lgpl3+)))) ; icons/breeze +(define-public hangups + (package + (name "hangups") + (version "0.4.6") + (source + (origin + (method url-fetch) + (uri (pypi-uri "hangups" version)) + (sha256 + (base32 "0mvpfd5dc3zgcvwfidcd2qyn59xl5biv728mxifw0ls5rzkc9chs")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'relax-dependencies + ;; Relax overly strict package version specifications. + (lambda _ + (substitute* "setup.py" + (("==") ">=")) + #t))))) + (propagated-inputs + `(("python-aiohttp" ,python-aiohttp) + ("python-appdirs" ,python-appdirs) + ("python-async-timeout" ,python-async-timeout) + ("python-configargparse" ,python-configargparse) + ("python-mechanicalsoup" ,python-mechanicalsoup) + ("python-protobuf" ,python-protobuf) + ("python-readlike" ,python-readlike) + ("python-reparser" ,python-reparser) + ("python-requests" ,python-requests) + ("python-urwid" ,python-urwid))) + (home-page "https://hangups.readthedocs.io/") + (synopsis "Instant messaging client for Google Hangouts") + (description + "Hangups is an instant messaging client for Google Hangouts. It includes +both a Python library and a reference client with a text-based user interface. + +Hangups is implements a reverse-engineered version of Hangouts' proprietary, +non-interoperable protocol, which allows it to support features like group +messaging that aren’t available to clients that connect over XMPP.") + (license license:expat))) + ;;; messaging.scm ends here -- cgit v1.2.3 From e2ec95c4ebc504b843de21cb691231b1f7b9de40 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 24 Oct 2018 16:46:07 +0200 Subject: gnu: Add pdfpc. * gnu/packages/pdf.scm (pdfpc): New variable. --- gnu/packages/pdf.scm | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 57a5e1c0ed..e71f814b8d 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2015, 2016 Andreas Enge ;;; Copyright © 2014 Mark H Weaver -;;; Copyright © 2014, 2015, 2016 Ricardo Wurmus +;;; Copyright © 2014, 2015, 2016, 2018 Ricardo Wurmus ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2016 Roel Janssen ;;; Copyright © 2016 Nils Gillmann @@ -34,6 +34,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) @@ -58,6 +59,7 @@ #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) + #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) @@ -1008,3 +1010,41 @@ Support some GNU grep options as file name output, page number output, optional case insensitivity, count occurrences, color highlights and search in multiple files.") (license license:gpl2+))) + +(define-public pdfpc + (package + (name "pdfpc") + (version "4.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pdfpc/pdfpc.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1rmsrpf5vlqhnyyrhq8apndny88ld2qvfjx6258653pqbimv7mx5")))) + (build-system cmake-build-system) + (arguments '(#:tests? #f)) ; no test target + (inputs + `(("cairo" ,cairo) + ("gtk+" ,gtk+) + ("gstreamer" ,gstreamer) + ("gst-plugins-base" ,gst-plugins-base) + ("libgee" ,libgee) + ("poppler" ,poppler) + ("pango" ,pango) + ("vala" ,vala))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "https://pdfpc.github.io/") + (synopsis "Presenter console with multi-monitor support for PDF files") + (description + "pdfpc is a presentation viewer application which uses multi-monitor +output to provide meta information to the speaker during the presentation. It +is able to show a normal presentation window on one screen, while showing a +more sophisticated overview on the other one providing information like a +picture of the next slide, as well as the left over time till the end of the +presentation. The input files processed by pdfpc are PDF documents.") + (license license:gpl2+))) -- cgit v1.2.3 From b865e7c254ac55002e86e3b8df7edeb73ffeac0d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 25 Oct 2018 04:15:02 +0200 Subject: gnu: cdogs-sdl: Update to 0.6.8. * gnu/packages/games.scm (cdogs-sdl): Update to 0.6.8. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index bb96bbe68a..53e7a79ce6 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4018,7 +4018,7 @@ emerges from a sewer hole and pulls her below ground.") (define-public cdogs-sdl (package (name "cdogs-sdl") - (version "0.6.7") + (version "0.6.8") (source (origin (method git-fetch) (uri (git-reference @@ -4027,7 +4027,7 @@ emerges from a sewer hole and pulls her below ground.") (file-name (git-file-name name version)) (sha256 (base32 - "1frafzsj3f83xkmn4llr7g728c82lcqi424ini1hv3gv5zjgpa15")))) + "1v0adxm4xsix6r6j9hs7vmss7pxrb37azwfazr54p1dmfz4s6rp8")))) (build-system cmake-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 95f6adae34e81513b878ecd8c98c1b21c217a2b6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 25 Oct 2018 04:20:27 +0200 Subject: gnu: sfml: Don't use unstable tarball. * gnu/packages/game-development.scm (sfml)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/game-development.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 6b7e71f6c0..6ed14083b0 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -442,16 +442,17 @@ clone.") (name "sfml") (version "2.5.0") (source (origin - (method url-fetch) + (method git-fetch) ;; Do not fetch the archives from ;; http://mirror0.sfml-dev.org/files/ because files there seem ;; to be changed in place. - (uri (string-append "https://github.com/SFML/SFML/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (uri (git-reference + (url "https://github.com/SFML/SFML.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1x3yvhdrln5b6h4g5r4mds76gq8zsxw6icxqpwqkmxsqcq5yviab")) + "1cmg7xgk2shi94h47w0p9g0wh4g00sgwlq0nwc1n6d6qy9wfrx1k")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 9ac59ad30a89f51254fa1f95d42ab290e0f6c3f7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 25 Oct 2018 04:23:31 +0200 Subject: gnu: sfml: Update to 2.5.1. * gnu/packages/game-development.scm (sfml): Update to 2.5.1. --- gnu/packages/game-development.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 6ed14083b0..da1675820b 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -440,7 +440,7 @@ clone.") (define-public sfml (package (name "sfml") - (version "2.5.0") + (version "2.5.1") (source (origin (method git-fetch) ;; Do not fetch the archives from @@ -452,7 +452,7 @@ clone.") (file-name (git-file-name name version)) (sha256 (base32 - "1cmg7xgk2shi94h47w0p9g0wh4g00sgwlq0nwc1n6d6qy9wfrx1k")) + "0abr8ri2ssfy9ylpgjrr43m6rhrjy03wbj9bn509zqymifvq5pay")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 9bf745c9317a4032b01c022a6ab7b1c6e258259d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 25 Oct 2018 05:14:38 +0200 Subject: gnu: r-sjlabelled: Update to 1.0.14. * gnu/packages/cran.scm (r-sjlabelled): Update to 1.0.14. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 73680a7453..02a2c9539f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4775,14 +4775,14 @@ other add-on packages.") (define-public r-sjlabelled (package (name "r-sjlabelled") - (version "1.0.13") + (version "1.0.14") (source (origin (method url-fetch) (uri (cran-uri "sjlabelled" version)) (sha256 (base32 - "0xizj7mrhnbn8kwjgm076si9w68a7lgrx4vj1sbqmv9jx055h8wv")))) + "0ayfzhm9bwjfaarq5z0gvn9kapjwj3532azgin97nr5fnjdhvgaw")))) (build-system r-build-system) (propagated-inputs `(("r-broom" ,r-broom) -- cgit v1.2.3 From 69bb2d99661a3d65a1993f66bbbdb8e6b7c17ecd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 25 Oct 2018 05:14:54 +0200 Subject: gnu: r-sjmisc: Update to 2.7.5. * gnu/packages/cran.scm (r-sjmisc): Update to 2.7.5. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 02a2c9539f..f6dc1514de 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4808,14 +4808,14 @@ vice versa), or to deal with multiple declared missing values.") (define-public r-sjmisc (package (name "r-sjmisc") - (version "2.7.4") + (version "2.7.5") (source (origin (method url-fetch) (uri (cran-uri "sjmisc" version)) (sha256 (base32 - "11cy09k1d2y5wwqvafqxr01hzk4x68ji2pqlwj7fnpw27i3ap4q4")))) + "05fjqfr2rfk11065zqkzb9mbqd6mgdkw9jdhq3by425a7f8m2dcg")))) (build-system r-build-system) (propagated-inputs `(("r-broom" ,r-broom) -- cgit v1.2.3 From 302db5855226f2f82597de6887a450f8a900faff Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 25 Oct 2018 05:15:10 +0200 Subject: gnu: Add r-sandwich. * gnu/packages/cran.scm (r-sandwich): New variable. --- gnu/packages/cran.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f6dc1514de..f1948a85e5 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6277,3 +6277,25 @@ observation.") "This package provides tools for the analysis and visualization of bilateral asymmetry in parasitic infections.") (license license:gpl3+))) + +(define-public r-sandwich + (package + (name "r-sandwich") + (version "2.5-0") + (source + (origin + (method url-fetch) + (uri (cran-uri "sandwich" version)) + (sha256 + (base32 + "168kq5kk34xbhfsxsanard9zriyp6cw0s09ralzb57kk42pl9hbc")))) + (build-system r-build-system) + (propagated-inputs + `(("r-zoo" ,r-zoo))) + (home-page "https://cran.r-project.org/web/packages/sandwich/") + (synopsis "Robust Covariance Matrix Estimators") + (description + "This package provides model-robust standard error estimators for +cross-sectional, time series, clustered, panel, and longitudinal data.") + ;; Either version of the license. + (license (list license:gpl2 license:gpl3)))) -- cgit v1.2.3 From 6ce07cf99dc417067f0e76efc7fc53f8292377b7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 25 Oct 2018 05:15:23 +0200 Subject: gnu: Add r-th-data. * gnu/packages/cran.scm (r-th-data): New variable. --- gnu/packages/cran.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f1948a85e5..0a4ed76aad 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6299,3 +6299,26 @@ observation.") cross-sectional, time series, clustered, panel, and longitudinal data.") ;; Either version of the license. (license (list license:gpl2 license:gpl3)))) + +(define-public r-th-data + (package + (name "r-th-data") + (version "1.0-9") + (source + (origin + (method url-fetch) + (uri (cran-uri "TH.data" version)) + (sha256 + (base32 + "03xfvww0krw0fn76qmmvrj7dx4shin57qafwhkrggfg25hbqlcfq")))) + (properties `((upstream-name . "TH.data"))) + (build-system r-build-system) + (propagated-inputs + `(("r-mass" ,r-mass) + ("r-survival" ,r-survival))) + (home-page "https://cran.r-project.org/web/packages/TH.data/") + (synopsis "Shared data sets") + (description + "This package contains supporting data sets that are used in other +packages maintained by Torsten Hothorn.") + (license license:gpl3))) -- cgit v1.2.3 From 7753b5436687bdf913439d1ab74b13b0b39b630b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 25 Oct 2018 05:15:37 +0200 Subject: gnu: Add r-multcomp. * gnu/packages/cran.scm (r-multcomp): New variable. --- gnu/packages/cran.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 0a4ed76aad..361140c822 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6322,3 +6322,31 @@ cross-sectional, time series, clustered, panel, and longitudinal data.") "This package contains supporting data sets that are used in other packages maintained by Torsten Hothorn.") (license license:gpl3))) + +(define-public r-multcomp + (package + (name "r-multcomp") + (version "1.4-8") + (source + (origin + (method url-fetch) + (uri (cran-uri "multcomp" version)) + (sha256 + (base32 + "0fm78g4zjc6ank316qfw977864shmy890znn4fahwc8jjdhpc252")))) + (build-system r-build-system) + (propagated-inputs + `(("r-codetools" ,r-codetools) + ("r-mvtnorm" ,r-mvtnorm) + ("r-sandwich" ,r-sandwich) + ("r-survival" ,r-survival) + ("r-th-data" ,r-th-data))) + (home-page "https://cran.r-project.org/web/packages/multcomp/") + (synopsis "Simultaneous inference in general parametric models") + (description + "Simultaneous tests and confidence intervals for general linear +hypotheses in parametric models, including linear, generalized linear, linear +mixed effects, and survival models. The package includes demos reproducing +analyzes presented in the book \"Multiple Comparisons Using R\" (Bretz, +Hothorn, Westfall, 2010, CRC Press).") + (license license:gpl2))) -- cgit v1.2.3 From 55a08dceb5c1522dcbcb2c49a2ca8f261abe8747 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 25 Oct 2018 05:15:47 +0200 Subject: gnu: Add r-emmeans. * gnu/packages/cran.scm (r-emmeans): New variable. --- gnu/packages/cran.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 361140c822..b89a477fbd 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6350,3 +6350,30 @@ mixed effects, and survival models. The package includes demos reproducing analyzes presented in the book \"Multiple Comparisons Using R\" (Bretz, Hothorn, Westfall, 2010, CRC Press).") (license license:gpl2))) + +(define-public r-emmeans + (package + (name "r-emmeans") + (version "1.2.4") + (source + (origin + (method url-fetch) + (uri (cran-uri "emmeans" version)) + (sha256 + (base32 + "01g6albv9whpdsj4j7c3q02pwdlkscjl5d2l8z96qafw7n9gml6g")))) + (build-system r-build-system) + (propagated-inputs + `(("r-estimability" ,r-estimability) + ("r-mvtnorm" ,r-mvtnorm) + ("r-plyr" ,r-plyr) + ("r-xtable" ,r-xtable))) + (home-page "https://github.com/rvlenth/emmeans") + (synopsis "Estimated marginal means, aka least-squares means") + (description + "This package provides tools to obtain @dfn{estimated marginal +means} (EMMs) for many linear, generalized linear, and mixed models. It can +be used to compute contrasts or linear functions of EMMs, trends, and +comparisons of slopes.") + ;; Either version of the license. + (license (list license:gpl2 license:gpl3)))) -- cgit v1.2.3 From 63fcb88a502054b38cca0e7c4db83529800282f7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 25 Oct 2018 05:15:56 +0200 Subject: gnu: Add r-pwr. * gnu/packages/cran.scm (r-pwr): New variable. --- gnu/packages/cran.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b89a477fbd..1510d0edb3 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6377,3 +6377,24 @@ be used to compute contrasts or linear functions of EMMs, trends, and comparisons of slopes.") ;; Either version of the license. (license (list license:gpl2 license:gpl3)))) + +(define-public r-pwr + (package + (name "r-pwr") + (version "1.2-2") + (source + (origin + (method url-fetch) + (uri (cran-uri "pwr" version)) + (sha256 + (base32 + "0r5g781lr677vp3zyhgmi7r68c87l8gd05l1s3ffnxgn5wf043sm")))) + (build-system r-build-system) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://github.com/heliosdrm/pwr") + (synopsis "Basic functions for power analysis") + (description + "This package provides power analysis functions along the lines of +Cohen (1988).") + (license license:gpl3+))) -- cgit v1.2.3 From bd531e83d1c4320ed8ce031c9b7d3261268fd793 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 25 Oct 2018 05:16:06 +0200 Subject: gnu: Add r-coin. * gnu/packages/cran.scm (r-coin): New variable. --- gnu/packages/cran.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 1510d0edb3..69ba63d082 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6398,3 +6398,28 @@ comparisons of slopes.") "This package provides power analysis functions along the lines of Cohen (1988).") (license license:gpl3+))) + +(define-public r-coin + (package + (name "r-coin") + (version "1.2-2") + (source + (origin + (method url-fetch) + (uri (cran-uri "coin" version)) + (sha256 + (base32 + "1fq58793bymzig1syjg2lvn6hsxfwkhh00jfrchh3c0y7rfhc66m")))) + (build-system r-build-system) + (propagated-inputs + `(("r-modeltools" ,r-modeltools) + ("r-multcomp" ,r-multcomp) + ("r-mvtnorm" ,r-mvtnorm) + ("r-survival" ,r-survival))) + (home-page "http://coin.r-forge.r-project.org") + (synopsis "Conditional inference procedures in a permutation test framework") + (description + "This package provides conditional inference procedures for the general +independence problem including two-sample, K-sample (non-parametric ANOVA), +correlation, censored, ordered and multivariate problems.") + (license license:gpl2))) -- cgit v1.2.3 From 9b3ecb60e2bb5eabaa70d0682e99e735561ce48c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 25 Oct 2018 05:16:17 +0200 Subject: gnu: Add r-bayesplot. * gnu/packages/cran.scm (r-bayesplot): New variable. --- gnu/packages/cran.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 69ba63d082..a75c19a1f1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -36,6 +36,7 @@ #:use-module (gnu packages gcc) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) + #:use-module (gnu packages haskell) #:use-module (gnu packages machine-learning) #:use-module (gnu packages maths) #:use-module (gnu packages mpi) @@ -6423,3 +6424,34 @@ Cohen (1988).") independence problem including two-sample, K-sample (non-parametric ANOVA), correlation, censored, ordered and multivariate problems.") (license license:gpl2))) + +(define-public r-bayesplot + (package + (name "r-bayesplot") + (version "1.6.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "bayesplot" version)) + (sha256 + (base32 + "0in9cq2ybpa7njrwqx4l6nc8i01cjswsvzwlyiw465pi74aapr57")))) + (build-system r-build-system) + (inputs + `(("pandoc" ,ghc-pandoc) + ("pandoc-citeproc" ,ghc-pandoc-citeproc))) + (propagated-inputs + `(("r-dplyr" ,r-dplyr) + ("r-ggplot2" ,r-ggplot2) + ("r-ggridges" ,r-ggridges) + ("r-reshape2" ,r-reshape2) + ("r-rlang" ,r-rlang))) + (home-page "http://mc-stan.org/bayesplot") + (synopsis "Plotting for Bayesian models") + (description + "This package provides plotting functions for posterior analysis, model +checking, and MCMC diagnostics. The package is designed not only to provide +convenient functionality for users, but also a common set of functions that +can be easily used by developers working on a variety of R packages for +Bayesian modeling.") + (license license:gpl3+))) -- cgit v1.2.3 From 3b8a3f554811f675bc68d997476dabd8bf82ae1f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 25 Oct 2018 05:16:34 +0200 Subject: gnu: Add r-tmb. * gnu/packages/cran.scm (r-tmb): New variable. --- gnu/packages/cran.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a75c19a1f1..77eb389bdd 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6455,3 +6455,31 @@ convenient functionality for users, but also a common set of functions that can be easily used by developers working on a variety of R packages for Bayesian modeling.") (license license:gpl3+))) + +(define-public r-tmb + (package + (name "r-tmb") + (version "1.7.14") + (source + (origin + (method url-fetch) + (uri (cran-uri "TMB" version)) + (sha256 + (base32 + "0bpc504nz8xfwr8ack52dj4hpjcykn6zyf8n228z32dw9d5n96dl")))) + (properties `((upstream-name . "TMB"))) + (build-system r-build-system) + (propagated-inputs + `(("r-matrix" ,r-matrix) + ("r-rcppeigen" ,r-rcppeigen))) + (home-page "http://tmb-project.org") + (synopsis "Template model builder: a general random effect tool") + (description + "With this tool, a user should be able to quickly implement complex +random effect models through simple C++ templates. The package combines +@code{CppAD} (C++ automatic differentiation), @code{Eigen} (templated +matrix-vector library) and @code{CHOLMOD} (sparse matrix routines available +from R) to obtain an efficient implementation of the applied Laplace +approximation with exact derivatives. Key features are: Automatic sparseness +detection, parallelism through BLAS and parallel user templates.") + (license license:gpl2))) -- cgit v1.2.3 From aa4bde0b3a8e012124fabdfd0c74a76abd24597d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 25 Oct 2018 05:16:44 +0200 Subject: gnu: Add r-sjstats. * gnu/packages/cran.scm (r-sjstats): New variable. --- gnu/packages/cran.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 77eb389bdd..70cba10132 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6483,3 +6483,49 @@ from R) to obtain an efficient implementation of the applied Laplace approximation with exact derivatives. Key features are: Automatic sparseness detection, parallelism through BLAS and parallel user templates.") (license license:gpl2))) + +(define-public r-sjstats + (package + (name "r-sjstats") + (version "0.17.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "sjstats" version)) + (sha256 + (base32 + "0s9b0xr8gmcm0kh48jkwk8ns0lqknd8kpys4f7czf0xwzmcx2n1z")))) + (build-system r-build-system) + (propagated-inputs + `(("r-bayesplot" ,r-bayesplot) + ("r-broom" ,r-broom) + ("r-coin" ,r-coin) + ("r-crayon" ,r-crayon) + ("r-dplyr" ,r-dplyr) + ("r-emmeans" ,r-emmeans) + ("r-glmmtmb" ,r-glmmtmb) + ("r-lme4" ,r-lme4) + ("r-magrittr" ,r-magrittr) + ("r-mass" ,r-mass) + ("r-matrix" ,r-matrix) + ("r-modelr" ,r-modelr) + ("r-nlme" ,r-nlme) + ("r-purrr" ,r-purrr) + ("r-pwr" ,r-pwr) + ("r-rlang" ,r-rlang) + ("r-sjlabelled" ,r-sjlabelled) + ("r-sjmisc" ,r-sjmisc) + ("r-tidyr" ,r-tidyr))) + (home-page "https://github.com/strengejacke/sjstats") + (synopsis "Functions for common statistical computations") + (description + "This package provides a collection of convenient functions for common +statistical computations, which are not directly provided by R's @code{base} +or @code{stats} packages. This package aims at providing, first, shortcuts +for statistical measures, which otherwise could only be calculated with +additional effort. Second, these shortcut functions are generic, and can be +applied not only to vectors, but also to other objects as well. The focus of +most functions lies on summary statistics or fit measures for regression +models, including generalized linear models, mixed effects models and Bayesian +models.") + (license license:gpl3))) -- cgit v1.2.3 From 413944234cf736f6e180a3c075df7e8229727d8f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 25 Oct 2018 05:16:54 +0200 Subject: gnu: Add r-glmmtmb. * gnu/packages/cran.scm (r-glmmtmb): New variable. --- gnu/packages/cran.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 70cba10132..4cd11bfd24 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6529,3 +6529,35 @@ most functions lies on summary statistics or fit measures for regression models, including generalized linear models, mixed effects models and Bayesian models.") (license license:gpl3))) + +(define-public r-glmmtmb + (package + (name "r-glmmtmb") + (version "0.2.2.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "glmmTMB" version)) + (sha256 + (base32 + "1clpkjlmsjmn3m1z5jqv8cgw6bvpqsy4nx6k947r0jya017ny5y5")))) + (properties `((upstream-name . "glmmTMB"))) + (build-system r-build-system) + (propagated-inputs + `(("r-lme4" ,r-lme4) + ("r-matrix" ,r-matrix) + ("r-nlme" ,r-nlme) + ("r-rcppeigen" ,r-rcppeigen) + ("r-tmb" ,r-tmb))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://github.com/glmmTMB") + (synopsis "Generalized linear mixed models") + (description + "Fit linear and generalized linear mixed models with various extensions, +including zero-inflation. The models are fitted using maximum likelihood +estimation via the Template Model Builder. Random effects are assumed to be +Gaussian on the scale of the linear predictor and are integrated out using the +Laplace approximation. Gradients are calculated using automatic +differentiation.") + (license license:agpl3+))) -- cgit v1.2.3 From 489a6178e68a3a740ecf5c076d05b352bc448fae Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 25 Oct 2018 05:17:04 +0200 Subject: gnu: Add r-ggeffects. * gnu/packages/cran.scm (r-ggeffects): New variable. --- gnu/packages/cran.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4cd11bfd24..a28b8195d1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6561,3 +6561,42 @@ Gaussian on the scale of the linear predictor and are integrated out using the Laplace approximation. Gradients are calculated using automatic differentiation.") (license license:agpl3+))) + +(define-public r-ggeffects + (package + (name "r-ggeffects") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "ggeffects" version)) + (sha256 + (base32 + "00l02g7yssqxmcmbrzk2wsj3i9ywd0xsy0rmbfh57q1qi76a1wq1")))) + (build-system r-build-system) + (propagated-inputs + `(("r-crayon" ,r-crayon) + ("r-dplyr" ,r-dplyr) + ("r-ggplot2" ,r-ggplot2) + ("r-lme4" ,r-lme4) + ("r-magrittr" ,r-magrittr) + ("r-mass" ,r-mass) + ("r-prediction" ,r-prediction) + ("r-purrr" ,r-purrr) + ("r-rlang" ,r-rlang) + ("r-scales" ,r-scales) + ("r-sjlabelled" ,r-sjlabelled) + ("r-sjmisc" ,r-sjmisc) + ("r-sjstats" ,r-sjstats) + ("r-tidyr" ,r-tidyr))) + (home-page "https://github.com/strengejacke/ggeffects") + (synopsis "Create tidy data frames of marginal effects for ggplot") + (description + "This package provides tools to compute marginal effects from statistical +models and return the result as tidy data frames. These data frames are ready +to use with the @code{ggplot2} package. Marginal effects can be calculated +for many different models. Interaction terms, splines and polynomial terms +are also supported. The two main functions are @code{ggpredict()} and +@code{ggeffect()}. There is a generic @code{plot()} method to plot the +results using @code{ggplot2}.") + (license license:gpl3))) -- cgit v1.2.3 From 7b63047c943a68717b1fc21dc078e44c2415e694 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 25 Oct 2018 05:17:16 +0200 Subject: gnu: Add r-sjplot. * gnu/packages/cran.scm (r-sjplot): New variable. --- gnu/packages/cran.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a28b8195d1..1dcb0cceef 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6600,3 +6600,50 @@ are also supported. The two main functions are @code{ggpredict()} and @code{ggeffect()}. There is a generic @code{plot()} method to plot the results using @code{ggplot2}.") (license license:gpl3))) + +(define-public r-sjplot + (package + (name "r-sjplot") + (version "2.6.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "sjPlot" version)) + (sha256 + (base32 + "13qvw2s3r96qfi8kfsn76m050ccnmckl31a9qv94xws8da99v2fk")))) + (properties `((upstream-name . "sjPlot"))) + (build-system r-build-system) + (propagated-inputs + `(("r-broom" ,r-broom) + ("r-dplyr" ,r-dplyr) + ("r-forcats" ,r-forcats) + ("r-ggeffects" ,r-ggeffects) + ("r-ggplot2" ,r-ggplot2) + ("r-glmmtmb" ,r-glmmtmb) + ("r-knitr" ,r-knitr) + ("r-lme4" ,r-lme4) + ("r-magrittr" ,r-magrittr) + ("r-mass" ,r-mass) + ("r-modelr" ,r-modelr) + ("r-nlme" ,r-nlme) + ("r-psych" ,r-psych) + ("r-purrr" ,r-purrr) + ("r-rlang" ,r-rlang) + ("r-scales" ,r-scales) + ("r-sjlabelled" ,r-sjlabelled) + ("r-sjmisc" ,r-sjmisc) + ("r-sjstats" ,r-sjstats) + ("r-tidyr" ,r-tidyr))) + (home-page "https://strengejacke.github.io/sjPlot/") + (synopsis "Data visualization for statistics in social science") + (description + "This package represents a collection of plotting and table output +functions for data visualization. Results of various statistical +analyses (that are commonly used in social sciences) can be visualized using +this package, including simple and cross tabulated frequencies, histograms, +box plots, (generalized) linear models, mixed effects models, principal +component analysis and correlation matrices, cluster analyses, scatter plots, +stacked scales, effects plots of regression models (including interaction +terms) and much more. This package supports labelled data.") + (license license:gpl3))) -- cgit v1.2.3 From 35bfe41a015d5d1e92896d8bc995491120032c94 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Thu, 18 Oct 2018 13:58:55 +0800 Subject: gnu: Add lxqt-config. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm (lxqt-config): New variable. Signed-off-by: 宋文武 --- gnu/packages/lxqt.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index e978b55d80..39f7b2c3a8 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -31,9 +31,11 @@ #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages admin) + #:use-module (gnu packages compression) #:use-module (gnu packages documentation) #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) + #:use-module (gnu packages kde) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages linux) #:use-module (gnu packages perl) @@ -337,6 +339,52 @@ itself as well as other components maintained by the LXQt project.") (home-page "https://lxqt.org") (license license:lgpl2.1+))) +(define-public lxqt-config + (package + (name "lxqt-config") + (version "0.13.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/lxqt/" name "/releases/download/" + version "/" name "-" version ".tar.xz")) + (sha256 + (base32 "0rizhl2v41kpgp57a61r6nmwcdw8nh9hprrrf33nfrdw8hpwxb95")))) + (build-system cmake-build-system) + (inputs + `(("kwindowsystem" ,kwindowsystem) + ("libkscreen" ,libkscreen) + ("liblxqt" ,liblxqt) + ("libqtxdg" ,libqtxdg) + ("libxcursor" ,libxcursor) + ("qtbase" ,qtbase) + ("qtsvg" ,qtsvg) + ("qtx11extras" ,qtx11extras) + ("solid" ,solid) + ("zlib" ,zlib))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("lxqt-build-tools" ,lxqt-build-tools) + ("qttools" ,qttools))) + (arguments + '(#:tests? #f ; no tests + #:configure-flags + ;; TODO: prefetch translations files from 'lxqt-l10n'. + '("-DPULL_TRANSLATIONS=NO") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + (substitute* '("src/CMakeLists.txt") + (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") + "DESTINATION \"${CMAKE_INSTALL_PREFIX}/etc/xdg")) + #t))))) + (home-page "https://lxqt.org") + (synopsis "Tools to configure LXQt and the underlying operating system") + (description "lxqt-config is providing several tools involved in the +configuration of both LXQt and the underlying operating system.") + (license license:lgpl2.1+))) + (define-public lxqt-globalkeys (package (name "lxqt-globalkeys") -- cgit v1.2.3 From f2b48558dfe033708e02667e24e08cd5c0861aa3 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Thu, 18 Oct 2018 14:02:33 +0800 Subject: gnu: lxqt.scm: Move qttools from inputs to native-inputs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm: Move qttools from inputs to native-inputs. Signed-off-by: 宋文武 --- gnu/packages/lxqt.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 39f7b2c3a8..7f2d251a76 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -104,11 +104,11 @@ and import their menus over DBus.") ("menu-cache" ,menu-cache) ("pcre" ,pcre) ("qtbase" ,qtbase) - ("qttools" ,qttools) ("qtx11extras" ,qtx11extras))) (native-inputs `(("pkg-config" ,pkg-config) - ("lxqt-build-tools" ,lxqt-build-tools))) + ("lxqt-build-tools" ,lxqt-build-tools) + ("qttools" ,qttools))) (home-page "https://lxqt.org/") (synopsis "Qt binding for libfm") (description "libfm-qt is the Qt port of libfm, a library providing @@ -147,10 +147,10 @@ components to build desktop file managers which belongs to LXDE.") ("libxscrnsaver" ,libxscrnsaver) ("polkit-qt" ,polkit-qt) ("qtsvg" ,qtsvg) - ("qttools" ,qttools) ("qtx11extras" ,qtx11extras))) (native-inputs - `(("lxqt-build-tools" ,lxqt-build-tools))) + `(("lxqt-build-tools" ,lxqt-build-tools) + ("qttools" ,qttools))) (home-page "https://lxqt.org/") (synopsis "Core utility library for all LXQt components") (description "liblxqt provides the basic libraries shared by the @@ -550,12 +550,12 @@ allows for launching applications or shutting down the system.") ("libqtxdg" ,libqtxdg) ("qtbase" ,qtbase) ("qtsvg" ,qtsvg) - ("qttools" ,qttools) ("qtx11extras" ,qtx11extras) ("xdg-user-dirs" ,xdg-user-dirs))) (native-inputs `(("pkg-config" ,pkg-config) - ("lxqt-build-tools" ,lxqt-build-tools))) + ("lxqt-build-tools" ,lxqt-build-tools) + ("qttools" ,qttools))) (arguments `(#:tests? #f #:configure-flags -- cgit v1.2.3 From a98000a4625a075f3c47898b9c0fdf570f7c0024 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Thu, 18 Oct 2018 14:10:48 +0800 Subject: gnu: Add lxqt-notificationd. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm (lxqt-notificationd): New variable. Signed-off-by: 宋文武 --- gnu/packages/lxqt.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 7f2d251a76..31b7a5ab35 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -429,6 +429,47 @@ shortcuts in LXQt sessions, that is shortcuts which apply to the LXQt session as a whole and are not limited to distinct applications.") (license license:lgpl2.1+))) +(define-public lxqt-notificationd + (package + (name "lxqt-notificationd") + (version "0.13.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/lxqt/" name "/releases/download/" + version "/" name "-" version ".tar.xz")) + (sha256 + (base32 "1l0hdbvghyhqgvy4pih7rvz26bc6yc8a3l1bdj11hnkw62h1i7d6")))) + (build-system cmake-build-system) + (inputs + `(("kwindowsystem" ,kwindowsystem) + ("liblxqt" ,liblxqt) + ("libqtxdg" ,libqtxdg) + ("qtbase" ,qtbase) + ("qtsvg" ,qtsvg) + ("qtx11extras" ,qtx11extras))) + (native-inputs + `(("lxqt-build-tools" ,lxqt-build-tools) + ("qttools" ,qttools))) + (arguments + '(#:tests? #f ; no test target + #:configure-flags + ;; TODO: prefetch translations files from 'lxqt-l10n'. + '("-DPULL_TRANSLATIONS=NO") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + (substitute* '("autostart/CMakeLists.txt") + (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") + "DESTINATION \"${CMAKE_INSTALL_PREFIX}/etc/xdg")) + #t))))) + (home-page "https://lxqt.org/") + (synopsis "The LXQt notification daemon") + (description "lxqt-notificationd is LXQt's implementation of a daemon +according to the Desktop Notifications Specification.") + (license license:lgpl2.1+))) + (define-public lxqt-panel (package (name "lxqt-panel") -- cgit v1.2.3 From bf0da63aaeb99445de362effe77c72ff9aff942d Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Thu, 18 Oct 2018 14:24:20 +0800 Subject: gnu: Add lxqt-policykit. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm (lxqt-policykit): New variable. Signed-off-by: 宋文武 --- gnu/packages/lxqt.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 31b7a5ab35..7cc077ee1f 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -527,6 +527,50 @@ according to the Desktop Notifications Specification.") (description "lxqt-panel represents the taskbar of LXQt.") (license license:lgpl2.1+))) +(define-public lxqt-policykit + (package + (name "lxqt-policykit") + (version "0.13.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/lxqt/" name "/releases/download/" + version "/" name "-" version ".tar.xz")) + (sha256 + (base32 "1d97fys6625nk4q6irp0jhsbk30xi7idnii1f3vrrrdcl2cahagp")))) + (build-system cmake-build-system) + (inputs + `(("kwindowsystem" ,kwindowsystem) + ("liblxqt" ,liblxqt) + ("libqtxdg" ,libqtxdg) + ("pcre" ,pcre) + ("polkit-qt" ,polkit-qt) + ("qtbase" ,qtbase) + ("qtsvg" ,qtsvg) + ("qtx11extras" ,qtx11extras))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("polkit" ,polkit) + ("lxqt-build-tools" ,lxqt-build-tools) + ("qttools" ,qttools))) + (arguments + '(#:tests? #f ; no test target + #:configure-flags + '("-DPULL_TRANSLATIONS=NO") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + (substitute* '("autostart/CMakeLists.txt") + (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") + "DESTINATION \"${CMAKE_INSTALL_PREFIX}/etc/xdg")) + #t))))) + (home-page "https://lxqt.org/") + (synopsis "The LXQt PolicyKit agent") + (description "lxqt-policykit is the polkit authentification agent of +LXQt.") + (license license:lgpl2.1+))) + (define-public lxqt-runner (package (name "lxqt-runner") -- cgit v1.2.3 From ca302c3e8cbedb62f41f25eee4c360064c368573 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Thu, 18 Oct 2018 14:30:04 +0800 Subject: gnu: Add lxqt-openssh-askpass. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm (lxqt-openssh-askpass): New variable. Signed-off-by: 宋文武 --- gnu/packages/lxqt.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 7cc077ee1f..7c0e866ef0 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -470,6 +470,39 @@ as a whole and are not limited to distinct applications.") according to the Desktop Notifications Specification.") (license license:lgpl2.1+))) +(define-public lxqt-openssh-askpass + (package + (name "lxqt-openssh-askpass") + (version "0.13.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/lxqt/" name "/releases/download/" + version "/" name "-" version ".tar.xz")) + (sha256 + (base32 "0l2272gya8jgv71bvg2hz37lnhiznv4ng3j0p6j79f99hwb5ygpk")))) + (build-system cmake-build-system) + (inputs + `(("kwindowsystem" ,kwindowsystem) + ("liblxqt" ,liblxqt) + ("libqtxdg" ,libqtxdg) + ("qtbase" ,qtbase) + ("qtsvg" ,qtsvg) + ("qtx11extras" ,qtx11extras))) + (native-inputs + `(("lxqt-build-tools" ,lxqt-build-tools) + ("qttools" ,qttools))) + (arguments + '(#:tests? #f ; no tests + #:configure-flags + ;; TODO: prefetch translations files from 'lxqt-l10n'. + '("-DPULL_TRANSLATIONS=NO"))) + (home-page "https://lxqt.org/") + (synopsis "GUI to query passwords on behalf of SSH agents") + (description "lxqt-openssh-askpass is a GUI to query credentials on behalf +of other programs.") + (license license:lgpl2.1+))) + (define-public lxqt-panel (package (name "lxqt-panel") -- cgit v1.2.3 From 643961bbc6474e1824967786c35207c43407d497 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Thu, 18 Oct 2018 14:38:02 +0800 Subject: gnu: Add lxqt-powermanagement. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm (lxqt-powermanagement): New variable. Signed-off-by: 宋文武 --- gnu/packages/lxqt.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 7c0e866ef0..43c7caa98b 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -604,6 +604,50 @@ of other programs.") LXQt.") (license license:lgpl2.1+))) +(define-public lxqt-powermanagement + (package + (name "lxqt-powermanagement") + (version "0.13.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/lxqt/" name "/releases/download/" + version "/" name "-" version ".tar.xz")) + (sha256 + (base32 "15nvdypyjwnp7k3d2pkhdbmaqb3ccacmh95rbdbc5mr7yrjy9613")))) + (build-system cmake-build-system) + (inputs + `(("kidletime" ,kidletime) + ("kwindowsystem" ,kwindowsystem) + ("liblxqt" ,liblxqt) + ("libqtxdg" ,libqtxdg) + ("qtbase" ,qtbase) + ("qtsvg" ,qtsvg) + ("qtx11extras" ,qtx11extras) + ("solid" ,solid))) + (native-inputs + `(("lxqt-build-tools" ,lxqt-build-tools) + ("qttools" ,qttools))) + (arguments + '(#:tests? #f ; no tests + #:configure-flags + ;; TODO: prefetch translations files from 'lxqt-l10n'. + '("-DPULL_TRANSLATIONS=NO") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + (substitute* '("autostart/CMakeLists.txt") + (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") + "DESTINATION \"${CMAKE_INSTALL_PREFIX}/etc/xdg")) + #t))))) + (home-page "https://lxqt.org/") + (synopsis "Power management module for LXQt") + (description "lxqt-powermanagement is providing tools to monitor power +management events and optionally trigger actions like e. g. shut down a system +when laptop batteries are low on power.") + (license license:lgpl2.1+))) + (define-public lxqt-runner (package (name "lxqt-runner") -- cgit v1.2.3 From 5663b5b073ba51fd0c477be65c39d812aa5c1ce5 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Thu, 18 Oct 2018 14:56:23 +0800 Subject: gnu: Add lxqt-qtplugin. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm (lxqt-qtplugin): New variable. Signed-off-by: 宋文武 --- gnu/packages/lxqt.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 43c7caa98b..9e4e1dadfb 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -648,6 +648,44 @@ management events and optionally trigger actions like e. g. shut down a system when laptop batteries are low on power.") (license license:lgpl2.1+))) +(define-public lxqt-qtplugin + (package + (name "lxqt-qtplugin") + (version "0.13.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/lxqt/" name "/releases/download/" + version "/" name "-" version ".tar.xz")) + (sha256 + (base32 "0nnwbc99njpsyqb0cy3x0srcgwa7qrnq0qwcyx7fbvwsq1l8cz56")))) + (build-system cmake-build-system) + (inputs + `(("libdbusmenu-qt" ,libdbusmenu-qt) + ("libfm-qt" ,libfm-qt) + ("libqtxdg" ,libqtxdg) + ("qtbase" ,qtbase) + ("qtsvg" ,qtsvg) + ("qtx11extras" ,qtx11extras))) + (native-inputs + `(("lxqt-build-tools" ,lxqt-build-tools) + ("qttools" ,qttools))) + (arguments + '(#:tests? #f ; no tests + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + (substitute* '("src/CMakeLists.txt") + (("DESTINATION \"\\$\\{QT_PLUGINS_DIR\\}") + "DESTINATION \"${CMAKE_INSTALL_PREFIX}/lib/qt5/plugins")) + #t))))) + (home-page "https://lxqt.org/") + (synopsis "LXQt Qt platform integration plugin") + (description "lxqt-qtplugin is providing a library libqtlxqt to integrate +Qt with LXQt.") + (license license:lgpl2.1+))) + (define-public lxqt-runner (package (name "lxqt-runner") -- cgit v1.2.3 From 8b1d43a75509366af9ea454ba8bf5b7658eef05c Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Thu, 18 Oct 2018 15:11:10 +0800 Subject: gnu: Add lxqt-themes. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm (lxqt-themes): New variable. Signed-off-by: 宋文武 --- gnu/packages/lxqt.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 9e4e1dadfb..f1492e022e 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -429,6 +429,41 @@ shortcuts in LXQt sessions, that is shortcuts which apply to the LXQt session as a whole and are not limited to distinct applications.") (license license:lgpl2.1+))) +(define-public lxqt-themes + (package + (name "lxqt-themes") + (version "0.13.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/lxqt/" name "/releases/download/" + version "/" name "-" version ".tar.xz")) + (sha256 + (base32 "13kkkzjx8bgnwckz79j273azvm4za66i4cp2qhxwdpxh0fwziklf")))) + (build-system cmake-build-system) + (native-inputs + `(("lxqt-build-tools" ,lxqt-build-tools))) + (arguments + `(#:tests? #f ; no tests + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + (substitute* '("CMakeLists.txt") + (("DESTINATION \"\\$\\{LXQT_GRAPHICS_DIR\\}") + "DESTINATION \"${CMAKE_INSTALL_PREFIX}/share/lxqt/graphics")) + (substitute* '("themes/CMakeLists.txt") + (("DESTINATION \"\\$\\{LXQT_SHARE_DIR\\}") + "DESTINATION \"${CMAKE_INSTALL_PREFIX}/share/lxqt")) + #t))))) + (home-page "https://lxqt.org/") + (synopsis "Themes, graphics and icons for LXQt") + (description "This package comprises a number of graphic files and themes +for LXQt.") + ;; The whole package is released under LGPL 2.1+, while the LXQt logo is + ;; licensed under CC-BY-SA 3.0. + (license license:lgpl2.1+))) + (define-public lxqt-notificationd (package (name "lxqt-notificationd") -- cgit v1.2.3 From 84f6a9907b91a1a2fdb5fe3fc4bab177b8734f95 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Thu, 18 Oct 2018 15:20:39 +0800 Subject: gnu: Add pavucontrol-qt. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm (pavucontrol-qt): New variable. Signed-off-by: 宋文武 --- gnu/packages/lxqt.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index f1492e022e..7d26e39328 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -846,6 +846,39 @@ respectively. As such it enables regular users to launch applications with permissions of other users including root.") (license license:lgpl2.1+))) +(define-public pavucontrol-qt + (package + (name "pavucontrol-qt") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/lxqt/" name "/releases/download/" + version "/" name "-" version ".tar.xz")) + (sha256 + (base32 "0pqvhhgw7d00wqw5v3ghm4l8250zy7bqpvhff6l7y1lw0z2fvcp6")))) + (build-system cmake-build-system) + (inputs + `(("glib" ,glib) + ("pcre" ,pcre) + ("pulseaudio" ,pulseaudio) + ("qtbase" ,qtbase) + ("qtx11extras" ,qtx11extras))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("lxqt-build-tools" ,lxqt-build-tools) + ("qttools" ,qttools))) + (arguments + '(#:tests? #f ; no tests + #:configure-flags + ;; TODO: prefetch translations files from 'lxqt-l10n'. + '("-DPULL_TRANSLATIONS=NO"))) + (home-page "https://lxqt.org/") + (synopsis "Pulseaudio mixer in Qt") + (description "@code{pavucontrol-qt} is the Qt port of volume control +@code{pavucontrol} of sound server @code{PulseAudio}.") + (license license:lgpl2.1+))) + (define-public pcmanfm-qt (package (name "pcmanfm-qt") -- cgit v1.2.3 From dea0178fb139c432297889493c911daa24261abd Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 25 Oct 2018 19:46:49 -0400 Subject: gnu: Mercurial: Update to 4.7.2. * gnu/packages/version-control.scm (mercurial): Update to 4.7.2. --- gnu/packages/version-control.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 14a18c8c35..44b97692d0 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1119,14 +1119,14 @@ control to Git repositories.") (define-public mercurial (package (name "mercurial") - (version "4.6.2") + (version "4.7.2") (source (origin (method url-fetch) (uri (string-append "https://www.mercurial-scm.org/" "release/mercurial-" version ".tar.gz")) (sha256 (base32 - "1bv6wgcdx8glihjjfg22khhc52mclsn4kwfqvzbzlg0b42h4xl0w")))) + "1yq9r8s9jzj8hk2yizjk25s4w16yx9b8mbdj6wp8ld7j2r15kw4p")))) (build-system python-build-system) (arguments `(;; Restrict to Python 2, as Python 3 would require -- cgit v1.2.3 From e81ddedaef5b298e52e46783c8e53b6351596a7b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 24 Oct 2018 05:33:42 +0200 Subject: gnu: tinc: Use HTTPS for sources and home page. * gnu/packages/vpn.scm (tinc)[source, home-page]: Use HTTPS. --- gnu/packages/vpn.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 44e736ed45..dcb114670e 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -315,7 +315,7 @@ traversing network address translators (@dfn{NAT}s) and firewalls.") (version "1.0.35") (source (origin (method url-fetch) - (uri (string-append "http://tinc-vpn.org/packages/" + (uri (string-append "https://tinc-vpn.org/packages/" name "-" version ".tar.gz")) (sha256 (base32 @@ -328,7 +328,7 @@ traversing network address translators (@dfn{NAT}s) and firewalls.") (inputs `(("zlib" ,zlib) ("lzo" ,lzo) ("openssl" ,openssl))) - (home-page "http://tinc-vpn.org") + (home-page "https://tinc-vpn.org") (synopsis "Virtual Private Network (VPN) daemon") (description "Tinc is a VPN that uses tunnelling and encryption to create a secure -- cgit v1.2.3 From 0e8e29088f60569fe823e11ba5653f4b4f4d4b4c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 26 Oct 2018 01:53:59 +0200 Subject: gnu: dnsmasq: Update to 2.80 [security fixes]. * gnu/packages/dns.scm (dnsmasq): Update to 2.80. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index e738d3fe2f..55147f829e 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -65,7 +65,7 @@ (define-public dnsmasq (package (name "dnsmasq") - (version "2.79") + (version "2.80") (source (origin (method url-fetch) (uri (string-append @@ -73,7 +73,7 @@ version ".tar.xz")) (sha256 (base32 - "07w6cw706yyahwvbvslhkrbjf2ynv567cgy9pal8bz8lrbsp9bbq")))) + "1fv3g8vikj3sn37x1j6qsywn09w1jipvlv34j3q5qrljbrwa5ayd")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 2fba511e0fa2b39218101c2661864b6b570315c2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 26 Oct 2018 02:24:39 +0200 Subject: gnu: libsigrok: Update to 0.5.1. * gnu/packages/electronics.scm (libsigrok): Update to 0.5.1. [arguments]: Adjust to split udev rules and clean up a little. --- gnu/packages/electronics.scm | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index d13f220b84..4aaf050faf 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -123,7 +123,7 @@ as simple logic analyzer and/or oscilloscope hardware.") (define-public libsigrok (package (name "libsigrok") - (version "0.5.0") + (version "0.5.1") (source (origin (method url-fetch) (uri (string-append @@ -131,19 +131,17 @@ as simple logic analyzer and/or oscilloscope hardware.") version ".tar.gz")) (sha256 (base32 - "197kr5ip98lxn7rv10zs35d1w0j7265s0xvckx0mq2l8kdvqd32c")))) + "171b553dir5gn6w4f7n37waqk62nq2kf1jykx4ifjacdz5xdw3z4")))) (outputs '("out" "doc")) (arguments - `(#:tests? #f ; tests need usb access + `(#:tests? #f ; tests need USB access #:phases (modify-phases %standard-phases (add-before 'configure 'change-udev-group (lambda _ - (let ((file "contrib/z60_libsigrok.rules")) - (substitute* file - (("plugdev") "dialout")) - (rename-file file "contrib/60-libsigrok.rules") - #t))) + (substitute* (find-files "contrib" "\\.rules$") + (("plugdev") "dialout")) + #t)) (add-after 'build 'build-doc (lambda _ (invoke "doxygen"))) @@ -155,11 +153,12 @@ as simple logic analyzer and/or oscilloscope hardware.") #t)) (add-after 'install-doc 'install-udev-rules (lambda* (#:key outputs #:allow-other-keys) - (install-file "contrib/60-libsigrok.rules" - (string-append - (assoc-ref outputs "out") - "/lib/udev/rules.d/")) - #t)) + (let* ((out (assoc-ref outputs "out")) + (rules (string-append out "/lib/udev/rules.d/"))) + (for-each (lambda (file) + (install-file file rules)) + (find-files "contrib" "\\.rules$")) + #t))) (add-after 'install-udev-rules 'install-fw (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((fx2lafw (assoc-ref inputs "sigrok-firmware-fx2lafw")) @@ -167,7 +166,6 @@ as simple logic analyzer and/or oscilloscope hardware.") (dir-suffix "/share/sigrok-firmware/") (input-dir (string-append fx2lafw dir-suffix)) (output-dir (string-append out dir-suffix))) - (mkdir-p output-dir) (for-each (lambda (file) (install-file file output-dir)) -- cgit v1.2.3 From b17004f9f9541acbd07b45e35222e431427bfde0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 26 Oct 2018 01:49:37 +0200 Subject: gnu: hplip: Update to 3.18.9. * gnu/packages/cups.scm (hplip): Update to 3.18.9. [arguments]: Add the resulting libraries to the build's RUNPATH. --- gnu/packages/cups.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 81e442eef1..89930874d8 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -396,14 +396,14 @@ device-specific programs to convert and print many types of files.") (define-public hplip (package (name "hplip") - (version "3.18.6") + (version "3.18.9") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/hplip/hplip/" version "/hplip-" version ".tar.gz")) (sha256 (base32 - "0zbv6cp9n3xypf2fg4j6fpz8zkvl0z08lyc1vq1gd04ln1l3xkqf")) + "0g3q5mm2crjyc1z4z6gv4lam6sc5d3diz704djrnpqadk4q3h290")) (modules '((guix build utils))) (snippet ;; Fix type mismatch. @@ -428,6 +428,8 @@ device-specific programs to convert and print many types of files.") `("--disable-network-build" ,(string-append "--prefix=" (assoc-ref %outputs "out")) ,(string-append "--sysconfdir=" (assoc-ref %outputs "out") "/etc") + ,(string-append "LDFLAGS=-Wl,-rpath=" + (assoc-ref %outputs "out") "/lib") ;; Disable until mime.types merging works (FIXME). "--disable-fax-build" "--enable-hpcups-install" -- cgit v1.2.3 From 21c51ebd66faa0b47f0be223d97c3a371346f54b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 26 Oct 2018 01:50:50 +0200 Subject: gnu: hplip: Update home page. * gnu/packages/cups.scm (hplip)[home-page]: Follow its permanent redirection. --- gnu/packages/cups.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 89930874d8..4259648c69 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -412,7 +412,7 @@ device-specific programs to convert and print many types of files.") (("boolean") "bool")) #t)))) (build-system gnu-build-system) - (home-page "http://hplipopensource.com/") + (home-page "https://developers.hp.com/hp-linux-imaging-and-printing") (synopsis "HP printer drivers") (description "Hewlett-Packard printer drivers and PostScript Printer Descriptions -- cgit v1.2.3 From 0aab234954207bb8b285c0ebe68477cb3171508d Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Thu, 18 Oct 2018 15:54:15 +0800 Subject: gnu: Add qtermwidget. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm (qtermwidget): New variable. Signed-off-by: 宋文武 --- gnu/packages/lxqt.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 7d26e39328..8f01744cc5 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -917,3 +917,30 @@ permissions of other users including root.") (description "PCManFM-Qt is the Qt port of PCManFM, the file manager of LXDE.") (license license:lgpl2.1+))) + +(define-public qtermwidget + (package + (name "qtermwidget") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/lxqt/" name "/releases/download/" + version "/" name "-" version ".tar.xz")) + (sha256 + (base32 "1c1qzbysxjbikp4bpgphphw4dgpl10gz8m06ccs2c48qxhpyd773")))) + (build-system cmake-build-system) + (inputs + `(("qtbase" ,qtbase))) + (native-inputs + `(("lxqt-build-tools" ,lxqt-build-tools) + ("qttools" ,qttools))) + (arguments + '(#:tests? #f ; no tests + #:configure-flags + ;; TODO: prefetch translations files from 'lxqt-l10n'. + '("-DPULL_TRANSLATIONS=NO"))) + (home-page "https://lxqt.org/") + (synopsis "The terminal widget for QTerminal") + (description "QTermWidget is a terminal emulator widget for Qt 5.") + (license license:lgpl2.1+))) -- cgit v1.2.3 From 26127ebb97d48d8cddc2e287f9b9a063e8599dc1 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Thu, 18 Oct 2018 19:19:06 +0800 Subject: gnu: lxqt.scm: Sort packages into base, core, etc. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm: Sort packages into base, core, etc. Signed-off-by: 宋文武 --- gnu/packages/lxqt.scm | 315 ++++++++++++++++++++++++++------------------------ 1 file changed, 165 insertions(+), 150 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 8f01744cc5..4528444ca3 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -50,6 +50,9 @@ #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg)) + +;; Third party libraries + (define-public libdbusmenu-qt (package (name "libdbusmenu-qt") @@ -79,82 +82,57 @@ protocol. The DBusMenu protocol makes it possible for applications to export and import their menus over DBus.") (license license:lgpl2.1+))) -(define-public libfm-qt +(define-public libstatgrab (package - (name "libfm-qt") - (version "0.13.1") + (name "libstatgrab") + (version "0.91") (source (origin (method url-fetch) - (uri (string-append "https://github.com/lxqt/" name "/releases/download/" - version "/" name "-" version ".tar.xz")) + (uri (string-append "https://ftp.i-scream.org/pub/i-scream/libstatgrab/" + name "-" version ".tar.gz")) (sha256 - (base32 "0p0lbz7dh5c38zq3yp1v1mm99ymg7mqr3h7yzniif2hipmgvxsv9")))) - (build-system cmake-build-system) + (base32 "1azinx2yzs442ycwq6p15skl3mscmqj7fd5hq7fckhjp92735s83")))) + (build-system gnu-build-system) (arguments - '(#:tests? #f ; no tests - #:configure-flags - ;; TODO: prefetch translations files from 'lxqt-l10n'. - '("-DPULL_TRANSLATIONS=NO"))) - (inputs - `(("glib" ,glib) - ("libexif" ,libexif) - ("libfm" ,libfm) - ("libxcb" ,libxcb) - ("menu-cache" ,menu-cache) - ("pcre" ,pcre) - ("qtbase" ,qtbase) - ("qtx11extras" ,qtx11extras))) + '(#:configure-flags '("--enable-tests"))) (native-inputs - `(("pkg-config" ,pkg-config) - ("lxqt-build-tools" ,lxqt-build-tools) - ("qttools" ,qttools))) - (home-page "https://lxqt.org/") - (synopsis "Qt binding for libfm") - (description "libfm-qt is the Qt port of libfm, a library providing -components to build desktop file managers which belongs to LXDE.") - (license license:lgpl2.1+))) + ;; For testing. + `(("perl" ,perl))) + (home-page "https://www.i-scream.org/libstatgrab/") + (synopsis "Provides access to statistics about the system") + (description "libstatgrab is a library that provides cross platform access +to statistics about the system on which it's run.") + ;; Libraries are under LGPL2.1+, and programs under GPLv2+. + (license license:gpl2+))) -(define-public liblxqt + +;; Base + +(define-public lxqt-build-tools (package - (name "liblxqt") - (version "0.13.0") + (name "lxqt-build-tools") + (version "0.5.0") (source (origin (method url-fetch) - (uri (string-append - "https://github.com/lxqt/" name "/releases/download/" - version "/" name "-" version ".tar.xz")) + (uri (string-append "https://github.com/lxqt/" name "/releases/download/" + version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0fba0nq5b9fvvmklcikcd4nwhzlp5d6k1q1f80r34kncdzfvj7dl")))) + (base32 "13b5x26p6ycnwzlgg1cgvlc88wjrjmlb3snrrmzh0xgh9h6hhvd6")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; no tests - #:configure-flags - ;; TODO: prefetch translations files from 'lxqt-l10n'. - '("-DPULL_TRANSLATIONS=NO") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-source - (lambda _ - (substitute* "CMakeLists.txt" - (("DESTINATION \"\\$\\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\\}") - "DESTINATION \"${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions")) - #t))))) - (inputs - `(("kwindowsystem" ,kwindowsystem) - ("libqtxdg" ,libqtxdg) - ("libxscrnsaver" ,libxscrnsaver) - ("polkit-qt" ,polkit-qt) - ("qtsvg" ,qtsvg) - ("qtx11extras" ,qtx11extras))) + `(#:tests? #f)) ; no tests (native-inputs - `(("lxqt-build-tools" ,lxqt-build-tools) - ("qttools" ,qttools))) - (home-page "https://lxqt.org/") - (synopsis "Core utility library for all LXQt components") - (description "liblxqt provides the basic libraries shared by the -components of the LXQt desktop environment.") + `(("pkg-config" ,pkg-config) + ("glib" ,glib))) + (inputs + `(("qtbase" ,qtbase))) + (synopsis "LXQt Build tools") + (description + "Lxqt-build-tools is providing several tools needed to build LXQt +itself as well as other components maintained by the LXQt project.") + (home-page "https://lxqt.org") (license license:lgpl2.1+))) (define-public libqtxdg @@ -192,29 +170,47 @@ components of the LXQt desktop environment.") in Qt.") (license license:lgpl2.1+))) -(define-public libstatgrab +(define-public liblxqt (package - (name "libstatgrab") - (version "0.91") + (name "liblxqt") + (version "0.13.0") (source (origin (method url-fetch) - (uri (string-append "https://ftp.i-scream.org/pub/i-scream/libstatgrab/" - name "-" version ".tar.gz")) + (uri (string-append + "https://github.com/lxqt/" name "/releases/download/" + version "/" name "-" version ".tar.xz")) (sha256 - (base32 "1azinx2yzs442ycwq6p15skl3mscmqj7fd5hq7fckhjp92735s83")))) - (build-system gnu-build-system) + (base32 "0fba0nq5b9fvvmklcikcd4nwhzlp5d6k1q1f80r34kncdzfvj7dl")))) + (build-system cmake-build-system) (arguments - '(#:configure-flags '("--enable-tests"))) + `(#:tests? #f ; no tests + #:configure-flags + ;; TODO: prefetch translations files from 'lxqt-l10n'. + '("-DPULL_TRANSLATIONS=NO") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + (substitute* "CMakeLists.txt" + (("DESTINATION \"\\$\\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\\}") + "DESTINATION \"${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions")) + #t))))) + (inputs + `(("kwindowsystem" ,kwindowsystem) + ("libqtxdg" ,libqtxdg) + ("libxscrnsaver" ,libxscrnsaver) + ("polkit-qt" ,polkit-qt) + ("qtsvg" ,qtsvg) + ("qtx11extras" ,qtx11extras))) (native-inputs - ;; For testing. - `(("perl" ,perl))) - (home-page "https://www.i-scream.org/libstatgrab/") - (synopsis "Provides access to statistics about the system") - (description "libstatgrab is a library that provides cross platform access -to statistics about the system on which it's run.") - ;; Libraries are under LGPL2.1+, and programs under GPLv2+. - (license license:gpl2+))) + `(("lxqt-build-tools" ,lxqt-build-tools) + ("qttools" ,qttools))) + (home-page "https://lxqt.org/") + (synopsis "Core utility library for all LXQt components") + (description "liblxqt provides the basic libraries shared by the +components of the LXQt desktop environment.") + (license license:lgpl2.1+))) (define-public libsysstat (package @@ -239,6 +235,9 @@ to statistics about the system on which it's run.") and memory usage or network traffic.") (license license:lgpl2.1+))) + +;; Core + (define-public lxqt-about (package (name "lxqt-about") @@ -313,32 +312,6 @@ LXQt and the system it's running on.") the operating system LXQt is running on.") (license license:lgpl2.1+))) -(define-public lxqt-build-tools - (package - (name "lxqt-build-tools") - (version "0.5.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/lxqt/" name "/releases/download/" - version "/" name "-" version ".tar.xz")) - (sha256 - (base32 "13b5x26p6ycnwzlgg1cgvlc88wjrjmlb3snrrmzh0xgh9h6hhvd6")))) - (build-system cmake-build-system) - (arguments - `(#:tests? #f)) ; no tests - (native-inputs - `(("pkg-config" ,pkg-config) - ("glib" ,glib))) - (inputs - `(("qtbase" ,qtbase))) - (synopsis "LXQt Build tools") - (description - "Lxqt-build-tools is providing several tools needed to build LXQt -itself as well as other components maintained by the LXQt project.") - (home-page "https://lxqt.org") - (license license:lgpl2.1+))) - (define-public lxqt-config (package (name "lxqt-config") @@ -429,41 +402,6 @@ shortcuts in LXQt sessions, that is shortcuts which apply to the LXQt session as a whole and are not limited to distinct applications.") (license license:lgpl2.1+))) -(define-public lxqt-themes - (package - (name "lxqt-themes") - (version "0.13.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/lxqt/" name "/releases/download/" - version "/" name "-" version ".tar.xz")) - (sha256 - (base32 "13kkkzjx8bgnwckz79j273azvm4za66i4cp2qhxwdpxh0fwziklf")))) - (build-system cmake-build-system) - (native-inputs - `(("lxqt-build-tools" ,lxqt-build-tools))) - (arguments - `(#:tests? #f ; no tests - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-source - (lambda _ - (substitute* '("CMakeLists.txt") - (("DESTINATION \"\\$\\{LXQT_GRAPHICS_DIR\\}") - "DESTINATION \"${CMAKE_INSTALL_PREFIX}/share/lxqt/graphics")) - (substitute* '("themes/CMakeLists.txt") - (("DESTINATION \"\\$\\{LXQT_SHARE_DIR\\}") - "DESTINATION \"${CMAKE_INSTALL_PREFIX}/share/lxqt")) - #t))))) - (home-page "https://lxqt.org/") - (synopsis "Themes, graphics and icons for LXQt") - (description "This package comprises a number of graphic files and themes -for LXQt.") - ;; The whole package is released under LGPL 2.1+, while the LXQt logo is - ;; licensed under CC-BY-SA 3.0. - (license license:lgpl2.1+))) - (define-public lxqt-notificationd (package (name "lxqt-notificationd") @@ -846,37 +784,78 @@ respectively. As such it enables regular users to launch applications with permissions of other users including root.") (license license:lgpl2.1+))) -(define-public pavucontrol-qt +(define-public lxqt-themes (package - (name "pavucontrol-qt") - (version "0.4.0") + (name "lxqt-themes") + (version "0.13.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0pqvhhgw7d00wqw5v3ghm4l8250zy7bqpvhff6l7y1lw0z2fvcp6")))) + (base32 "13kkkzjx8bgnwckz79j273azvm4za66i4cp2qhxwdpxh0fwziklf")))) + (build-system cmake-build-system) + (native-inputs + `(("lxqt-build-tools" ,lxqt-build-tools))) + (arguments + `(#:tests? #f ; no tests + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + (substitute* '("CMakeLists.txt") + (("DESTINATION \"\\$\\{LXQT_GRAPHICS_DIR\\}") + "DESTINATION \"${CMAKE_INSTALL_PREFIX}/share/lxqt/graphics")) + (substitute* '("themes/CMakeLists.txt") + (("DESTINATION \"\\$\\{LXQT_SHARE_DIR\\}") + "DESTINATION \"${CMAKE_INSTALL_PREFIX}/share/lxqt")) + #t))))) + (home-page "https://lxqt.org/") + (synopsis "Themes, graphics and icons for LXQt") + (description "This package comprises a number of graphic files and themes +for LXQt.") + ;; The whole package is released under LGPL 2.1+, while the LXQt logo is + ;; licensed under CC-BY-SA 3.0. + (license license:lgpl2.1+))) + + +;; File Manager + +(define-public libfm-qt + (package + (name "libfm-qt") + (version "0.13.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/lxqt/" name "/releases/download/" + version "/" name "-" version ".tar.xz")) + (sha256 + (base32 "0p0lbz7dh5c38zq3yp1v1mm99ymg7mqr3h7yzniif2hipmgvxsv9")))) (build-system cmake-build-system) + (arguments + '(#:tests? #f ; no tests + #:configure-flags + ;; TODO : prefetch translations files from 'lxqt-l10n'. + '("-DPULL_TRANSLATIONS=NO"))) (inputs `(("glib" ,glib) + ("libexif" ,libexif) + ("libfm" ,libfm) + ("libxcb" ,libxcb) + ("menu-cache" ,menu-cache) ("pcre" ,pcre) - ("pulseaudio" ,pulseaudio) ("qtbase" ,qtbase) ("qtx11extras" ,qtx11extras))) (native-inputs `(("pkg-config" ,pkg-config) ("lxqt-build-tools" ,lxqt-build-tools) ("qttools" ,qttools))) - (arguments - '(#:tests? #f ; no tests - #:configure-flags - ;; TODO: prefetch translations files from 'lxqt-l10n'. - '("-DPULL_TRANSLATIONS=NO"))) (home-page "https://lxqt.org/") - (synopsis "Pulseaudio mixer in Qt") - (description "@code{pavucontrol-qt} is the Qt port of volume control -@code{pavucontrol} of sound server @code{PulseAudio}.") + (synopsis "Qt binding for libfm") + (description "libfm-qt is the Qt port of libfm, a library providing +components to build desktop file managers which belongs to LXDE.") (license license:lgpl2.1+))) (define-public pcmanfm-qt @@ -918,6 +897,42 @@ permissions of other users including root.") LXDE.") (license license:lgpl2.1+))) + +;; Extra + +(define-public pavucontrol-qt + (package + (name "pavucontrol-qt") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/lxqt/" name "/releases/download/" + version "/" name "-" version ".tar.xz")) + (sha256 + (base32 "0pqvhhgw7d00wqw5v3ghm4l8250zy7bqpvhff6l7y1lw0z2fvcp6")))) + (build-system cmake-build-system) + (inputs + `(("glib" ,glib) + ("pcre" ,pcre) + ("pulseaudio" ,pulseaudio) + ("qtbase" ,qtbase) + ("qtx11extras" ,qtx11extras))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("lxqt-build-tools" ,lxqt-build-tools) + ("qttools" ,qttools))) + (arguments + '(#:tests? #f ; no tests + #:configure-flags + ;; TODO: prefetch translations files from 'lxqt-l10n'. + '("-DPULL_TRANSLATIONS=NO"))) + (home-page "https://lxqt.org/") + (synopsis "Pulseaudio mixer in Qt") + (description "@code{pavucontrol-qt} is the Qt port of volume control +@code{pavucontrol} of sound server @code{PulseAudio}.") + (license license:lgpl2.1+))) + (define-public qtermwidget (package (name "qtermwidget") -- cgit v1.2.3 From 604bdae7e502923ecb1b78700912767beaec48d2 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Thu, 18 Oct 2018 19:33:15 +0800 Subject: gnu: Add lximage-qt. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm (lximage-qt): New variable. Signed-off-by: 宋文武 --- gnu/packages/lxqt.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 4528444ca3..27d4c01e5e 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -900,6 +900,39 @@ LXDE.") ;; Extra +(define-public lximage-qt + (package + (name "lximage-qt") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/lxqt/" name "/releases/download/" + version "/" name "-" version ".tar.xz")) + (sha256 + (base32 "1mwjh6lrjayr9snsmabkl5qs4xm6d27mfz8k3jxfm5dk3pjj1b0w")))) + (build-system cmake-build-system) + (inputs + `(("libexif" ,libexif) + ("libfm-qt" ,libfm-qt) + ("qtbase" ,qtbase) + ("qtsvg" ,qtsvg) + ("qtx11extras" ,qtx11extras))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("lxqt-build-tools" ,lxqt-build-tools) + ("qttools" ,qttools))) + (arguments + '(#:tests? #f ; no tests + #:configure-flags + ;; TODO: prefetch translations files from 'lxqt-l10n'. + '("-DPULL_TRANSLATIONS=NO"))) + (home-page "https://lxqt.org/") + (synopsis "The image viewer and screenshot tool for lxqt") + (description "LXImage-Qt is the Qt port of LXImage, a simple and fast +image viewer.") + (license license:lgpl2.1+))) + (define-public pavucontrol-qt (package (name "pavucontrol-qt") -- cgit v1.2.3 From 4b88ab554c5f6ea71910265e9cd96129af138f1f Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Thu, 18 Oct 2018 19:48:09 +0800 Subject: gnu: Add screengrab. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm (screengrab): New variable. Signed-off-by: 宋文武 --- gnu/packages/lxqt.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 27d4c01e5e..a5ffd0921d 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -992,3 +992,32 @@ image viewer.") (synopsis "The terminal widget for QTerminal") (description "QTermWidget is a terminal emulator widget for Qt 5.") (license license:lgpl2.1+))) + +(define-public screengrab + (package + (name "screengrab") + (version "1.99") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/lxqt/" name "/releases/download/" + version "/" name "-" version ".tar.xz")) + (sha256 + (base32 "17y8rsx9fixvxv2byq8d6c01vry10nv07f8jy85vz7zp4f0rgzz3")))) + (build-system cmake-build-system) + (inputs + `(("kwindowsystem" ,kwindowsystem) + ("libqtxdg" ,libqtxdg) + ("qtbase" ,qtbase) + ("qtsvg" ,qtsvg) + ("qtx11extras" ,qtx11extras))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("qttools" ,qttools))) + (arguments + '(#:tests? #f)) ; no tests + (home-page "https://lxqt.org/") + (synopsis "Crossplatform tool for fast making screenshots") + (description "ScreenGrab is a program for fast creating screenshots, and +easily publishing them on internet image hosting services.") + (license license:lgpl2.1+))) -- cgit v1.2.3 From 7e9e775f440dd38315960b681e09224b5dd4bb5d Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Thu, 18 Oct 2018 20:01:17 +0800 Subject: gnu: Add qterminal. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm (qterminal): New variable. Signed-off-by: 宋文武 --- gnu/packages/lxqt.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index a5ffd0921d..2a0fde4fb7 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -993,6 +993,36 @@ image viewer.") (description "QTermWidget is a terminal emulator widget for Qt 5.") (license license:lgpl2.1+))) +(define-public qterminal + (package + (name "qterminal") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/lxqt/" name "/releases/download/" + version "/" name "-" version ".tar.xz")) + (sha256 + (base32 "1vlza75br1ys62lgkdz26md729bfpbnasfzswp7hakmgaq1rhms1")))) + (build-system cmake-build-system) + (inputs + `(("qtbase" ,qtbase) + ("qtx11extras" ,qtx11extras) + ("qtermwidget" ,qtermwidget))) + (native-inputs + `(("lxqt-build-tools" ,lxqt-build-tools) + ("qttools" ,qttools))) + (arguments + '(#:tests? #f ; no tests + #:configure-flags + ;; TODO: prefetch translations files from 'lxqt-l10n'. + '("-DPULL_TRANSLATIONS=NO"))) + (home-page "https://lxqt.org/") + (synopsis "Lightweight Qt-based terminal emulator") + (description "QTerminal is a lightweight Qt terminal emulator based on +QTermWidget.") + (license license:lgpl2.1+))) + (define-public screengrab (package (name "screengrab") -- cgit v1.2.3 From 9886134cc6643d9353b6920b1a031cf927094d50 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Thu, 18 Oct 2018 20:01:39 +0800 Subject: gnu: Add qps. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm (qps): New variable. Signed-off-by: 宋文武 --- gnu/packages/lxqt.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 2a0fde4fb7..141cbaf931 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -966,6 +966,32 @@ image viewer.") @code{pavucontrol} of sound server @code{PulseAudio}.") (license license:lgpl2.1+))) +(define-public qps + (package + (name "qps") + (version "1.10.18") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/lxqt/" name "/releases/download/" + version "/" name "-" version ".tar.xz")) + (sha256 + (base32 "0pzk83p7a9ax0893s9hp2qkmiilzrf8iqry5a0x1g73hdwm5hm44")))) + (build-system cmake-build-system) + (inputs + `(("libxrender" ,libxrender) + ("qtbase" ,qtbase) + ("qtx11extras" ,qtx11extras))) + (native-inputs + `(("qttools" ,qttools))) + (arguments + '(#:tests? #f)) ; no tests + (home-page "https://lxqt.org/") + (synopsis "Qt-based visual process status monitor") + (description "@code{qps} is a monitor that displays the status of the +processes currently in existence, much like code{top} or code{ps}.") + (license license:gpl2+))) + (define-public qtermwidget (package (name "qtermwidget") -- cgit v1.2.3 From 32b74b7028abc568ea0f9700fd901a55b4a01c4a Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Thu, 18 Oct 2018 20:33:24 +0800 Subject: gnu: Add compton-conf. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm (compton-conf): New variable. Signed-off-by: 宋文武 --- gnu/packages/lxqt.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 141cbaf931..53405d5c98 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -47,6 +47,7 @@ #:use-module (gnu packages polkit) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages qt) + #:use-module (gnu packages textutils) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg)) @@ -900,6 +901,44 @@ LXDE.") ;; Extra +(define-public compton-conf + (package + (name "compton-conf") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/lxqt/" name "/releases/download/" + version "/" name "-" version ".tar.xz")) + (sha256 + (base32 "0q3yx2a6wf8yahrwgvhmv9sd7gmrhid528vrqy04dg8m5cx1bjci")))) + (build-system cmake-build-system) + (inputs + `(("libconfig" ,libconfig) + ("qtbase" ,qtbase))) + (native-inputs + `(("lxqt-build-tools" ,lxqt-build-tools) + ("pkg-config" ,pkg-config) + ("qttools" ,qttools))) + (arguments + '(#:tests? #f ; no tests + #:configure-flags + ;; TODO: prefetch translations files from 'lxqt-l10n'. + '("-DPULL_TRANSLATIONS=NO") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + (substitute* '("autostart/CMakeLists.txt") + (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") + "DESTINATION \"${CMAKE_INSTALL_PREFIX}/etc/xdg")) + #t))))) + (home-page "https://lxqt.org/") + (synopsis "GUI configuration tool for compton X composite manager") + (description "@code{compton-conf} is a configuration tool for X composite +manager Compton.") + (license license:lgpl2.1+))) + (define-public lximage-qt (package (name "lximage-qt") -- cgit v1.2.3 From 31fd62c8ca5131833d980a5f5e90d013ac842f31 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Thu, 18 Oct 2018 20:33:43 +0800 Subject: gnu: Add obconf-qt. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm (obconf-qt): New variable. Signed-off-by: 宋文武 --- gnu/packages/lxqt.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 53405d5c98..76fe01be46 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -35,12 +35,16 @@ #:use-module (gnu packages documentation) #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) + #:use-module (gnu packages gtk) + #:use-module (gnu packages image) #:use-module (gnu packages kde) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages linux) #:use-module (gnu packages perl) #:use-module (gnu packages lxde) #:use-module (gnu packages maths) + #:use-module (gnu packages openbox) #:use-module (gnu packages pcre) #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) @@ -49,6 +53,7 @@ #:use-module (gnu packages qt) #:use-module (gnu packages textutils) #:use-module (gnu packages xdisorg) + #:use-module (gnu packages xml) #:use-module (gnu packages xorg)) @@ -972,6 +977,44 @@ manager Compton.") image viewer.") (license license:lgpl2.1+))) +(define-public obconf-qt + (package + (name "obconf-qt") + (version "0.13.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/lxqt/" name "/releases/download/" + version "/" name "-" version ".tar.xz")) + (sha256 + (base32 "1fbzn1p2mdvn8dcbavmd1imrvkph2jfssrlw8l26qz6qk8qlmhnf")))) + (build-system cmake-build-system) + (inputs + `(("imlib2" ,imlib2) + ("libsm" ,libsm) + ("librsvg" ,librsvg) + ("libxft" ,libxft) + ("libxml2" ,libxml2) + ("openbox" ,openbox) + ("pango" ,pango) + ("pcre" ,pcre) + ("qtbase" ,qtbase) + ("qtx11extras" ,qtx11extras))) + (native-inputs + `(("lxqt-build-tools" ,lxqt-build-tools) + ("pkg-config" ,pkg-config) + ("qttools" ,qttools))) + (arguments + '(#:tests? #f ; no tests + #:configure-flags + ;; TODO: prefetch translations files from 'lxqt-l10n'. + '("-DPULL_TRANSLATIONS=NO"))) + (home-page "https://lxqt.org/") + (synopsis "Openbox configuration tool") + (description "ObConf-Qt is a Qt port of ObConf, a configuration editor for +window manager OpenBox.") + (license license:gpl2+))) + (define-public pavucontrol-qt (package (name "pavucontrol-qt") -- cgit v1.2.3 From 097166dfb05ca7ea6eb3b7a10cdd356353819f35 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Sat, 20 Oct 2018 10:50:40 +0800 Subject: gnu: lxqt.scm: Remove ${CMAKE_INSTALL_PREFIX} from DESTINATION path. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm: Remove ${CMAKE_INSTALL_PREFIX} from DESTINATION path. Signed-off-by: 宋文武 --- gnu/packages/lxqt.scm | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 76fe01be46..38330dd976 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -200,7 +200,7 @@ in Qt.") (lambda _ (substitute* "CMakeLists.txt" (("DESTINATION \"\\$\\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\\}") - "DESTINATION \"${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions")) + "DESTINATION \"share/polkit-1/actions")) #t))))) (inputs `(("kwindowsystem" ,kwindowsystem) @@ -310,7 +310,7 @@ LXQt and the system it's running on.") (lambda _ (substitute* "lxqt-admin-user/CMakeLists.txt" (("DESTINATION \"\\$\\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\\}") - "DESTINATION \"${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions")) + "DESTINATION \"share/polkit-1/actions")) #t))))) (home-page "https://lxqt.org") (synopsis "LXQt system administration tool") @@ -356,7 +356,7 @@ the operating system LXQt is running on.") (lambda _ (substitute* '("src/CMakeLists.txt") (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") - "DESTINATION \"${CMAKE_INSTALL_PREFIX}/etc/xdg")) + "DESTINATION \"etc/xdg")) #t))))) (home-page "https://lxqt.org") (synopsis "Tools to configure LXQt and the underlying operating system") @@ -399,7 +399,7 @@ configuration of both LXQt and the underlying operating system.") (substitute* '("autostart/CMakeLists.txt" "xdg/CMakeLists.txt") (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") - "DESTINATION \"${CMAKE_INSTALL_PREFIX}/etc/xdg")) + "DESTINATION \"etc/xdg")) #t))))) (home-page "https://lxqt.org/") (synopsis "Daemon used to register global keyboard shortcuts") @@ -441,7 +441,7 @@ as a whole and are not limited to distinct applications.") (lambda _ (substitute* '("autostart/CMakeLists.txt") (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") - "DESTINATION \"${CMAKE_INSTALL_PREFIX}/etc/xdg")) + "DESTINATION \"etc/xdg")) #t))))) (home-page "https://lxqt.org/") (synopsis "The LXQt notification daemon") @@ -532,7 +532,7 @@ of other programs.") (substitute* '("autostart/CMakeLists.txt" "menu/CMakeLists.txt") (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") - "DESTINATION \"${CMAKE_INSTALL_PREFIX}/etc/xdg")) + "DESTINATION \"etc/xdg")) #t))))) (home-page "https://lxqt.org/") (synopsis "The LXQt desktop panel") @@ -575,7 +575,7 @@ of other programs.") (lambda _ (substitute* '("autostart/CMakeLists.txt") (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") - "DESTINATION \"${CMAKE_INSTALL_PREFIX}/etc/xdg")) + "DESTINATION \"etc/xdg")) #t))))) (home-page "https://lxqt.org/") (synopsis "The LXQt PolicyKit agent") @@ -618,7 +618,7 @@ LXQt.") (lambda _ (substitute* '("autostart/CMakeLists.txt") (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") - "DESTINATION \"${CMAKE_INSTALL_PREFIX}/etc/xdg")) + "DESTINATION \"etc/xdg")) #t))))) (home-page "https://lxqt.org/") (synopsis "Power management module for LXQt") @@ -657,7 +657,7 @@ when laptop batteries are low on power.") (lambda _ (substitute* '("src/CMakeLists.txt") (("DESTINATION \"\\$\\{QT_PLUGINS_DIR\\}") - "DESTINATION \"${CMAKE_INSTALL_PREFIX}/lib/qt5/plugins")) + "DESTINATION \"lib/qt5/plugins")) #t))))) (home-page "https://lxqt.org/") (synopsis "LXQt Qt platform integration plugin") @@ -702,7 +702,7 @@ Qt with LXQt.") (lambda _ (substitute* '("autostart/CMakeLists.txt") (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") - "DESTINATION \"${CMAKE_INSTALL_PREFIX}/etc/xdg")) + "DESTINATION \"etc/xdg")) #t))))) (home-page "https://lxqt.org/") (synopsis "Tool used to launch programs quickly by typing their names") @@ -746,7 +746,7 @@ allows for launching applications or shutting down the system.") (substitute* '("autostart/CMakeLists.txt" "config/CMakeLists.txt") (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") - "DESTINATION \"${CMAKE_INSTALL_PREFIX}/etc/xdg")) + "DESTINATION \"etc/xdg")) #t))))) (home-page "https://lxqt.org/") (synopsis "Session manager for LXQt") @@ -812,10 +812,10 @@ permissions of other users including root.") (lambda _ (substitute* '("CMakeLists.txt") (("DESTINATION \"\\$\\{LXQT_GRAPHICS_DIR\\}") - "DESTINATION \"${CMAKE_INSTALL_PREFIX}/share/lxqt/graphics")) + "DESTINATION \"share/lxqt/graphics")) (substitute* '("themes/CMakeLists.txt") (("DESTINATION \"\\$\\{LXQT_SHARE_DIR\\}") - "DESTINATION \"${CMAKE_INSTALL_PREFIX}/share/lxqt")) + "DESTINATION \"share/lxqt")) #t))))) (home-page "https://lxqt.org/") (synopsis "Themes, graphics and icons for LXQt") @@ -895,7 +895,7 @@ components to build desktop file managers which belongs to LXDE.") (lambda _ (substitute* '("autostart/CMakeLists.txt") (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") - "DESTINATION \"${CMAKE_INSTALL_PREFIX}/etc/xdg")) + "DESTINATION \"etc/xdg")) #t))))) (home-page "https://lxqt.org/") (synopsis "File manager and desktop icon manager") @@ -936,7 +936,7 @@ LXDE.") (lambda _ (substitute* '("autostart/CMakeLists.txt") (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") - "DESTINATION \"${CMAKE_INSTALL_PREFIX}/etc/xdg")) + "DESTINATION \"etc/xdg")) #t))))) (home-page "https://lxqt.org/") (synopsis "GUI configuration tool for compton X composite manager") -- cgit v1.2.3 From a457e3f6ef591b29ceae6461b5d8e318ad2fbb62 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Fri, 19 Oct 2018 13:59:24 +0800 Subject: gnu: libqtxdg: Simplify configure flags. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm (libqtxdg)[arugemnts]: Use relative path for 'QTXDGX_ICONENGINEPLUGIN_INSTALL_PATH'. Signed-off-by: 宋文武 --- gnu/packages/lxqt.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 38330dd976..2664807ebb 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -155,10 +155,9 @@ itself as well as other components maintained by the LXQt project.") (base32 "0lq548pa69hfvnbj2ypba5ygm8n6v6g7bqqm8p5g538l1l3394cl")))) (build-system cmake-build-system) (arguments - `(#:configure-flags - `("-DBUILD_TESTS=ON" - ,(string-append "-DQTXDGX_ICONENGINEPLUGIN_INSTALL_PATH=" - %output "/lib/qt5/plugins/iconengines")) + '(#:configure-flags + '("-DBUILD_TESTS=ON" + "-DQTXDGX_ICONENGINEPLUGIN_INSTALL_PATH=lib/qt5/plugins/iconengines") #:phases (modify-phases %standard-phases (add-before 'check 'pre-check -- cgit v1.2.3 From 1fdcee026b298aa19b71d0761ed034e1e56e84db Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Mon, 22 Oct 2018 11:29:20 +0800 Subject: gnu: Add lxqt. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm (lxqt): New variable. Signed-off-by: 宋文武 --- gnu/packages/lxqt.scm | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 2664807ebb..f0cf02c990 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -29,10 +29,13 @@ #:use-module (guix utils) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system trivial) #:use-module (gnu packages) #:use-module (gnu packages admin) #:use-module (gnu packages compression) #:use-module (gnu packages documentation) + #:use-module (gnu packages compton) + #:use-module (gnu packages fonts) #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) @@ -1158,3 +1161,54 @@ QTermWidget.") (description "ScreenGrab is a program for fast creating screenshots, and easily publishing them on internet image hosting services.") (license license:lgpl2.1+))) + + +;; The LXQt Desktop Environment + +(define-public lxqt + (package + (name "lxqt") + (version (package-version lxqt-session)) + (source #f) + (build-system trivial-build-system) + (arguments '(#:builder (begin (mkdir %output) #t))) + (propagated-inputs + `(;; XDG + ("desktop-file-utils" ,desktop-file-utils) + ("hicolor-icon-theme" ,hicolor-icon-theme) + ("xdg-user-dirs" ,xdg-user-dirs) + ("xdg-utils" ,xdg-utils) + ;; Base + ;; TODO: qtsvg is needed for lxqt apps to display icons. Maybe it + ;; should be added to their propagated-inputs? + ("qtsvg" ,qtsvg) + ;; Core + ("lxqt-about" ,lxqt-about) + ("lxqt-admin" ,lxqt-admin) + ("lxqt-config" ,lxqt-config) + ("lxqt-notificationd" ,lxqt-notificationd) + ("lxqt-openssh-askpass" ,lxqt-openssh-askpass) + ("lxqt-panel" ,lxqt-panel) + ("lxqt-policykit" ,lxqt-policykit) + ("lxqt-powermanagement" ,lxqt-powermanagement) + ("lxqt-qtplugin" ,lxqt-qtplugin) + ("lxqt-runner" ,lxqt-runner) + ("lxqt-session" ,lxqt-session) + ("lxqt-sudo" ,lxqt-sudo) + ("lxqt-themes" ,lxqt-themes) + ("pcmanfm-qt" ,pcmanfm-qt) + ;; Extra + ("compton" ,compton) + ("compton-conf" ,compton-conf) + ("font-dejavu" ,font-dejavu) + ("lximage-qt" ,lximage-qt) + ("obconf-qt" ,obconf-qt) + ("openbox" ,openbox) + ("oxygen-icons" ,oxygen-icons) + ("pavucontrol-qt" ,pavucontrol-qt) + ("qps" ,qps) + ("qterminal" ,qtermwidget))) + (synopsis "The Lightweight Qt Desktop Environment") + (description "LXQt is a lightweight Qt desktop environment.") + (home-page "https://lxde.org") + (license license:lgpl2.1+))) -- cgit v1.2.3 From e027a494fd5e6025e645ce9f36cccca39a77d327 Mon Sep 17 00:00:00 2001 From: Nikolai Merinov Date: Tue, 16 Oct 2018 02:32:11 +0500 Subject: gnu: rust: Work around rust 1.25...1.27 reproducibility issues. * gnu/packages/patches/rust-mdbook-support-reproducible-builds-by-forcing-window.search.patch: New file. * gnu/local.mk (dist_patch_DATA): Add new patch file. * gnu/packages/rust.scm (rust-1.19): Use system libssh2 library. during cargo build. Note: libgit2 still bundled, because cargo tests assume specific libgit2 minor release. (rust-1.23): Inherit native-inputs from previous package. (rust-1.25): Switch back to llvm 3.9.1 as workaround for https://github.com/rust-lang/rust/issues/50556 issue. (rust-1.27): Apply changes from https://github.com/rust-lang-nursery/mdBook/pull/692 to make generation of "searchindex.js" files reproducible. Disable cargo test that required llvm 6. --- gnu/local.mk | 1 + ...roducible-builds-by-forcing-window.search.patch | 25 +++++++++++++ gnu/packages/rust.scm | 41 ++++++++++------------ 3 files changed, 44 insertions(+), 23 deletions(-) create mode 100644 gnu/packages/patches/rust-mdbook-support-reproducible-builds-by-forcing-window.search.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 6ae7ff42f5..c46f3a8c4a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1131,6 +1131,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/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-mdbook-support-reproducible-builds-by-forcing-window.search.patch new file mode 100644 index 0000000000..ef7bf53b5d --- /dev/null +++ b/gnu/packages/patches/rust-mdbook-support-reproducible-builds-by-forcing-window.search.patch @@ -0,0 +1,25 @@ +From b9ca108fcae2b738ca3f0c88c84ae5dc5a6f843f Mon Sep 17 00:00:00 2001 +From: Tim Ryan +Date: Mon, 14 May 2018 06:22:21 -0400 +Subject: [PATCH] Support reproducible builds by forcing window.search to use + stable key ordering. (#692) +See +--- + src/vendor/mdbook/src/renderer/html_handlebars/search.rs | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/vendor/mdbook/src/renderer/html_handlebars/search.rs b/src/vendor/mdbook/src/renderer/html_handlebars/search.rs +index d49772f8b..1ee66a511 100644 +--- a/src/vendor/mdbook/src/renderer/html_handlebars/search.rs ++++ b/src/vendor/mdbook/src/renderer/html_handlebars/search.rs +@@ -205,6 +205,10 @@ fn write_to_js(index: Index, search_config: &Search) -> Result { + searchoptions, + index, + }; ++ ++ // By converting to serde_json::Value as an intermediary, we use a ++ // BTreeMap internally and can force a stable ordering of map keys. ++ let json_contents = serde_json::to_value(&json_contents)?; + let json_contents = serde_json::to_string(&json_contents)?; + + Ok(format!("window.search = {};", json_contents)) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 40633854ae..9a7d207dcf 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -480,7 +480,8 @@ test = { path = \"../libtest\" } `(("jemalloc" ,jemalloc-4.5.0) ("llvm" ,llvm-3.9.1) ("openssl" ,openssl) - ("libcurl" ,curl))) ; For "cargo" + ("libssh2" ,libssh2) ; For "cargo" + ("libcurl" ,curl))) ; For "cargo" ;; rustc invokes gcc, so we need to set its search paths accordingly. ;; Note: duplicate its value here to cope with circular dependencies among @@ -649,18 +650,11 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (name "rust") (version "1.23.0") (source (rust-source version "14fb8vhjzsxlbi6yrn1r6fl5dlbdd1m92dn5zj5gmzfwf4w9ar3l")) + ;; Use rust-bootstrap@1.22 package to build rust 1.23 (native-inputs - `(("bison" ,bison) ; For the tests - ("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" ,rust-bootstrap) - ("cargo-bootstrap" ,rust-bootstrap "cargo") - ("pkg-config" ,pkg-config) ; For "cargo" - ("which" ,which))) + (alist-replace "cargo-bootstrap" (list rust-bootstrap "cargo") + (alist-replace "rustc-bootstrap" (list rust-bootstrap) + (package-native-inputs rust-1.20)))) (arguments (substitute-keyword-arguments (package-arguments rust-1.20) ((#:phases phases) @@ -692,6 +686,9 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (("fn test_loading_cosine") "#[ignore]\nfn test_loading_cosine")) #t))))))))) +;;; Rust 1.25 release support work with llvm 6--but build with llvm 6 is +;;; not determenistic due to . +;;; Keep using llvm 3.9.1 until builds become determenistic (define-public rust-1.25 (let ((base-rust (rust-bootstrapped-package rust-1.24 "1.25.0" @@ -699,10 +696,6 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" #:patches '("rust-1.25-accept-more-detailed-gdb-lines.patch")))) (package (inherit base-rust) - (inputs - ;; Use LLVM 6.0 - (alist-replace "llvm" (list llvm) - (package-inputs base-rust))) (arguments (substitute-keyword-arguments (package-arguments base-rust) ((#:phases phases) @@ -713,14 +706,9 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" ;; This test wants to update the crate index. (("fn no_index_update") "#[ignore]\nfn no_index_update")) #t)) - (add-after 'configure 'enable-codegen-tests - (lambda _ - (substitute* "config.toml" - (("codegen-tests = false") "")) - #t)) ;; FIXME: Re-enable this test if it's indeed supposed to work. ;; See . - (add-after 'enable-codegen-tests 'disable-nil-enum-test + (add-after 'configure 'disable-nil-enum-test (lambda _ (substitute* "src/test/debuginfo/nil-enum.rs" (("ignore-lldb") "ignore-gdb")) @@ -795,7 +783,8 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" #:patches '("rust-coresimd-doctest.patch" "rust-bootstrap-stage0-test.patch" - "rust-1.25-accept-more-detailed-gdb-lines.patch")))) + "rust-1.25-accept-more-detailed-gdb-lines.patch" + "rust-mdbook-support-reproducible-builds-by-forcing-window.search.patch")))) (package (inherit base-rust) (arguments @@ -808,4 +797,10 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" ;; `prefix' directory should exist before `install' call (mkdir-p (assoc-ref outputs "out")) (mkdir-p (assoc-ref outputs "cargo")) + #t)) + (add-after 'patch-cargo-tests 'disable-thinlto-test + (lambda* _ + ;; thinlto required llvm 6.0 for work + (substitute* "src/tools/cargo/tests/testsuite/path.rs" + (("fn thin_lto_works") "#[ignore]\nfn thin_lto_works")) #t))))))))) -- cgit v1.2.3 From 2e2b8635b99167554bc51a9d1067c808bcb63d37 Mon Sep 17 00:00:00 2001 From: Nikolai Merinov Date: Tue, 16 Oct 2018 02:37:41 +0500 Subject: gnu: rust: Update to 1.28. * gnu/packages/rust.scm (rust): Rename to... (rust-1.27): ... this. (rust): New variable. --- gnu/packages/rust.scm | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 9a7d207dcf..cd4656ea03 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -776,7 +776,7 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (("fn no_index_update") "#[ignore]\nfn no_index_update")) #t))))))))) -(define-public rust +(define-public rust-1.27 (let ((base-rust (rust-bootstrapped-package rust-1.26 "1.27.2" "0pg1s37bhx9zqbynxyydq5j6q7kij9vxkcv8maz0m25prm88r0cs" @@ -804,3 +804,37 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (substitute* "src/tools/cargo/tests/testsuite/path.rs" (("fn thin_lto_works") "#[ignore]\nfn thin_lto_works")) #t))))))))) + +(define-public rust + (let ((base-rust + (rust-bootstrapped-package rust-1.27 "1.28.0" + "11k4rn77bca2rikykkk9fmprrgjswd4x4kaq7fia08vgkir82nhx" + #:patches + '("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")))) + (package + (inherit base-rust) + (inputs + ;; Use LLVM 6.0 + (alist-replace "llvm" (list llvm) + (package-inputs base-rust))) + (arguments + (substitute-keyword-arguments (package-arguments base-rust) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'configure 'enable-codegen-tests + ;; Codegen tests should pass with llvm 6, so enable them. + (lambda* _ + (substitute* "config.toml" + (("codegen-tests = false") "")) + #t)) + (add-after 'patch-tests 'disable-amd64-avx-test + ;; That test would fail on x86_64 machines without avx. + (lambda* _ + (substitute* "src/test/run-pass/issue-44056.rs" + (("only-x86_64") "ignore-test")) + #t)) + ;; The thinlto test should pass with llvm 6. + (delete 'disable-thinlto-test)))))))) -- cgit v1.2.3 From fdf02484289e155de56e7320f7e1dd1e57431f4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 26 Oct 2018 21:07:03 +0200 Subject: gnu: sbcl-lift: Fix 'license' field. The invalid 'license' field was preventing evaluations from completing. * gnu/packages/lisp.scm (sbcl-lift)[license]: Change to LICENSE:EXPAT. --- gnu/packages/lisp.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 7964aa307e..c32380969f 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -2403,7 +2403,7 @@ testcases are organized into hierarchical testsuites each of which can have its own fixture. When run, a testcase can succeed, fail, or error. LIFT supports randomized testing, benchmarking, profiling, and reporting.") (home-page "https://github.com/gwkkwg/lift") - (license license:x11-style)))) + (license license:expat)))) (define-public cl-lift (sbcl-package->cl-source-package sbcl-lift)) -- cgit v1.2.3 From 3239dcd38d28d6a34338a9c1a1ddad42a326f7a2 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Rouby Date: Thu, 25 Oct 2018 12:28:16 +0200 Subject: gnu: Add jp2a. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/image.scm: New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/image.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index b367e0799c..9bf9bd7e5e 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2018 Fis Trivial ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Marius Bakke +;;; Copyright © 2018 Pierre-Antoine Rouby ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,6 +44,7 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages boost) #:use-module (gnu packages check) + #:use-module (gnu packages curl) #:use-module (gnu packages compression) #:use-module (gnu packages documentation) #:use-module (gnu packages fontutils) @@ -1497,3 +1499,30 @@ Two other programs are included with Gifsicle: @command{gifview} is a lightweight animated-GIF viewer, and @command{gifdiff} compares two GIFs for identical visual appearance.") (license license:gpl2+))) + +(define-public jp2a + (package + (name "jp2a") + (version "1.0.7") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/cslarsen/jp2a/archive/v" + version ".tar.gz")) + (sha256 + (base32 + "0nahpjvrahixcfqqrjj2k4fscc8qs4hqnmj2qgjzsjj3z6xxh2g5")) + (file-name (string-append name "-" version ".tar.gz")))) + (build-system gnu-build-system) + (inputs + `(("libjpeg" ,libjpeg) + ("curl" ,curl))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config))) + (home-page "https://csl.name/jp2a/") + (synopsis "Convert JPEG images to ASCII") + (description + "Jp2a is a small utility that converts JPEG images to ASCII.") + (license license:gpl2))) -- cgit v1.2.3 From 01a0a0c445d42eda74e344d29a82e56f139aab31 Mon Sep 17 00:00:00 2001 From: HiPhish Date: Wed, 24 Oct 2018 14:22:14 +0200 Subject: gnu: Add lua5.1-lpeg and lua5.1-lmpack. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lua.scm (lua5.1-lpeg): New variable. * gnu/packages/serialization.scm (lua5.1-libmpack): New variable. The packages lua-lpeg and lua-libmpack had no Lua 5.1 variants. These packages will be needed to build Neovim properly. Signed-off-by: Ludovic Courtès --- gnu/packages/lua.scm | 3 +++ gnu/packages/serialization.scm | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index be77ac4a63..2dc1452ccc 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -408,6 +408,9 @@ Grammars (PEGs).") (define-public lua-lpeg (make-lua-lpeg "lua-lpeg" lua)) +(define-public lua5.1-lpeg + (make-lua-lpeg "lua5.1-lpeg" lua-5.1)) + (define-public lua5.2-lpeg (make-lua-lpeg "lua5.2-lpeg" lua-5.2)) diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 3064e385e2..6b28463d51 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -225,6 +225,26 @@ that implements both the msgpack and msgpack-rpc specifications.") (home-page "https://github.com/libmpack/libmpack-lua") (synopsis "Lua bindings for the libmpack binary serialization library"))) +(define-public lua5.1-libmpack + (package (inherit lua-libmpack) + (name "lua5.1-libmpack") + (arguments + (substitute-keyword-arguments (package-arguments lua-libmpack) + ((#:make-flags flags) + `(let* ((lua-version ,(package-version lua-5.1)) + (lua-major+minor ,(version-major+minor (package-version lua-5.1)))) + (list "CC=gcc" + "USE_SYSTEM_LUA=yes" + (string-append "MPACK_LUA_VERSION=" lua-version) + (string-append "MPACK_LUA_VERSION_NOPATCH=" lua-major+minor) + (string-append "PREFIX=" + (assoc-ref %outputs "out")) + (string-append "LUA_CMOD_INSTALLDIR=" + (assoc-ref %outputs "out") + "/lib/lua/" lua-major+minor)))))) + (inputs + `(("lua" ,lua-5.1))))) + (define-public lua5.2-libmpack (package (inherit lua-libmpack) (name "lua5.2-libmpack") -- cgit v1.2.3 From 829785c11d19fbc30c141349f085d2c50fb2dddd Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Fri, 26 Oct 2018 21:14:53 -0500 Subject: gnu: Add tnef. * gnu/packages/mail.scm (tnef): New variable. --- gnu/packages/mail.scm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 73a17fb21b..e7e440bcf7 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2014 Julien Lepiller ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015 Paul van der Walt -;;; Copyright © 2015, 2016 Eric Bavier +;;; Copyright © 2015, 2016, 2018 Eric Bavier ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2016 Christopher Allan Webber @@ -2621,3 +2621,29 @@ within the message, and allows you to choose one or more URLs to send to your Web browser. Alternatively, it send a list of all URLs to stdout. It is a replacement for the @code{urlview} program.") (license gpl2))) + +(define-public tnef + (package + (name "tnef") + (version "1.4.17") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/verdammelt/tnef.git") + (commit version))) + (sha256 + (base32 + "0cq2xh5wd74qn6k2nnw5rayxgqhjl3jbzf4zlc4babcwxrv32ldh")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake))) + (arguments `(#:parallel-tests? #f)) ;tests are side-effect'y + (home-page "https://github.com/verdammelt/tnef") + (synopsis "Unpack @code{application/ms-tnef} attachments") + (description + "TNEF is a tar-like program that unpacks MIME attachments of type +@code{application/ms-tnef}.") + (license gpl2+))) -- cgit v1.2.3 From 429a332b1c3c505331f30d04901bd8cb5d287bbe Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 26 Oct 2018 16:04:52 +0200 Subject: gnu: flatbuffers: Update to 1.10.0. * gnu/packages/serialization.scm (flatbuffers): Update to 1.10.0. --- gnu/packages/serialization.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 6b28463d51..b34ea30edb 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -438,7 +438,7 @@ to generate and parse. The two primary functions are @code{cbor.loads} and (define-public flatbuffers (package (name "flatbuffers") - (version "1.9.0") + (version "1.10.0") (source (origin (method url-fetch) @@ -446,7 +446,7 @@ to generate and parse. The two primary functions are @code{cbor.loads} and version ".tar.gz")) (sha256 (base32 - "1qs7sa9q4q6hs12yp875lvrv6393178qcmqs1ziwmjk088g4k9aw")))) + "0z4swldxs0s31hnkqdhsbfmc8vx3p7zsvmqaw4l31r2iikdy651p")))) (build-system cmake-build-system) (arguments '(#:build-type "Release" -- cgit v1.2.3 From b106b78cf8749c7077e01166a92b76c22ddd57a4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 26 Oct 2018 17:02:48 +0200 Subject: gnu: perl-x11-xcb: Update to 0.18. * gnu/packages/xorg.scm (perl-x11-xcb): Update to 0.18. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 86b4470aa0..852eef9606 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5778,7 +5778,7 @@ programs that cannot use the window system directly.") (define-public perl-x11-xcb (package (name "perl-x11-xcb") - (version "0.17") + (version "0.18") (source (origin (method url-fetch) (uri (string-append @@ -5786,7 +5786,7 @@ programs that cannot use the window system directly.") "X11-XCB-" version ".tar.gz")) (sha256 (base32 - "12qyf98s5hbybmh0mblpz50c00i68srq73w5rw31m2dhclj8n96q")))) + "1cjpghw7cnackw20lbd7yzm222kz5bnrwz52f8ay24d1f4pwrnxf")))) (build-system perl-build-system) (arguments '(;; Disable parallel build to prevent a race condition. -- cgit v1.2.3 From b2d286545da7a8c5364cd8fb307b80a9c08c1060 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 27 Oct 2018 04:12:03 +0200 Subject: gnu: gama: Update to 2.01. * gnu/packages/gps.scm (gama): Update to 2.01. --- gnu/packages/gps.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index cd639a4d39..0709a58610 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -147,7 +147,7 @@ between two other data points.") (define-public gama (package (name "gama") - (version "2.00") + (version "2.01") (source (origin (method url-fetch) @@ -155,7 +155,7 @@ between two other data points.") version ".tar.gz")) (sha256 (base32 - "1p51jlzr6qqqvzx0sq8j7fxqfij62c3pjcsb53vgx0jx0qdqyjba")))) + "1z3n5p69qglxq15l9g13cg78kyb0l6v8mbzqgc1fqkfbdk1mis0k")))) (build-system gnu-build-system) (arguments '(#:parallel-tests? #f)) ; race condition (native-inputs -- cgit v1.2.3 From 574d877e40c293bf1f79fb2f5735b9ab24df4349 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 27 Oct 2018 04:17:34 +0200 Subject: gnu: gvpe: Update to 3.1. * gnu/packages/vpn.scm (gvpe): Update to 3.1. [source]: Remove obsolete snippet. [native-inputs]: Add pkg-config. --- gnu/packages/vpn.scm | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index dcb114670e..1edd1ac56a 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -48,27 +48,17 @@ (define-public gvpe (package (name "gvpe") - (version "3.0") + (version "3.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gvpe/gvpe-" version ".tar.gz")) (sha256 (base32 - "1v61mj25iyd91z0ir7cmradkkcm1ffbk52c96v293ibsvjs2s2hf")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Remove the outdated bundled copy of glibc's getopt, which - ;; provides a 'getopt' declaration that conflicts with that - ;; of glibc 2.26. - (substitute* "lib/Makefile.in" - (("getopt1?\\.(c|h|\\$\\(OBJEXT\\))") "")) - (for-each delete-file - '("lib/getopt.h" "lib/getopt.c")) - #t)))) + "1cz8n75ksl0l908zc5l3rnfm1hv7130s2w8710799fr5sxrdbszi")))) (build-system gnu-build-system) (home-page "http://software.schmorp.de/pkg/gvpe.html") + (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("openssl" ,openssl) ("zlib" ,zlib))) (synopsis "Secure VPN among multiple nodes over an untrusted network") -- cgit v1.2.3 From 6d9a690927ac92e4c217d41d7e34e91457c5e1a7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 26 Oct 2018 04:03:59 +0200 Subject: gnu: parallel: Update to 20181022. * gnu/packages/parallel.scm (parallel): Update to 20181022. --- gnu/packages/parallel.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 3dba2b8c00..1970eb169b 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -48,7 +48,7 @@ (define-public parallel (package (name "parallel") - (version "20180922") + (version "20181022") (source (origin (method url-fetch) @@ -56,7 +56,7 @@ version ".tar.bz2")) (sha256 (base32 - "07q7lzway2qf8mx6fb4q45jmirsc8pw6rgv03ifrp32jw3q8w1za")))) + "1v6vrfnn6acjjlp8xiizvcrb3zzs94av5xcl6xm8zfvcapixx11f")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 4795e5e177e5aa7b79ce9d4b0965f81e058d594d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 27 Oct 2018 04:20:39 +0200 Subject: gnu: units: Update to 2.18. * gnu/packages/maths.scm (units): Update to 2.18. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 48bfcba35a..437f3672c2 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -286,13 +286,13 @@ programming language.") (define-public units (package (name "units") - (version "2.17") + (version "2.18") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/units/units-" version ".tar.gz")) (sha256 (base32 - "1n2xzpnxfn475zkd8rzs5gg58xszjbr4bdbgvk6hryzimvwwj0qz")))) + "0y26kj349i048y4z3xrk90bvciw2j6ds3rka7r7yn3183hirr5b4")))) (build-system gnu-build-system) (inputs `(("readline" ,readline) -- cgit v1.2.3 From 3825b44448e1ba60b16b4169bdab391755297cfb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 27 Oct 2018 04:43:33 +0200 Subject: gnu: xmlsec-nss: Fix tests (and hence build). * gnu/packages/xml.scm (xmlsec-nss)[native-inputs]: Add nss:bin to provide the certutil command. --- gnu/packages/xml.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 4e4fa2da6c..9aa2800b9e 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -952,6 +952,10 @@ Libxml2).") (package (inherit xmlsec) (name "xmlsec-nss") + (native-inputs + ;; For tests. + `(("nss:bin" ,nss "bin") ; for certutil + ,@(package-native-inputs xmlsec))) (inputs `(("nss" ,nss) ("libltdl" ,libltdl))) -- cgit v1.2.3 From a46c00a3d8a45e0390fc5e5fd18c74000550554c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sat, 27 Oct 2018 11:30:07 +0800 Subject: gnu: lxqt: Propagate qterminal actually. * gnu/packages/lxqt.scm (lxqt)[propagated-inputs]: Fix typo of 'qterminal'. --- gnu/packages/lxqt.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index f0cf02c990..878998d8f9 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -1207,7 +1207,7 @@ easily publishing them on internet image hosting services.") ("oxygen-icons" ,oxygen-icons) ("pavucontrol-qt" ,pavucontrol-qt) ("qps" ,qps) - ("qterminal" ,qtermwidget))) + ("qterminal" ,qterminal))) (synopsis "The Lightweight Qt Desktop Environment") (description "LXQt is a lightweight Qt desktop environment.") (home-page "https://lxde.org") -- cgit v1.2.3 From 6f00fb75ca52ae112a73f2fbc6d8f6269a8db5f6 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Sat, 27 Oct 2018 15:56:47 +0800 Subject: gnu: lxqt: Correct licenses for several packages. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm (pcmanfm-qt, lximage-qt, pavucontrol-qt, qtermwidget) (qterminal, screengrab, lxqt): Correct license to GPL2+. Signed-off-by: 宋文武 --- gnu/packages/lxqt.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 878998d8f9..1c6bfb7b60 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -903,7 +903,7 @@ components to build desktop file managers which belongs to LXDE.") (synopsis "File manager and desktop icon manager") (description "PCManFM-Qt is the Qt port of PCManFM, the file manager of LXDE.") - (license license:lgpl2.1+))) + (license license:gpl2+))) ;; Extra @@ -977,7 +977,7 @@ manager Compton.") (synopsis "The image viewer and screenshot tool for lxqt") (description "LXImage-Qt is the Qt port of LXImage, a simple and fast image viewer.") - (license license:lgpl2.1+))) + (license license:gpl2+))) (define-public obconf-qt (package @@ -1048,7 +1048,7 @@ window manager OpenBox.") (synopsis "Pulseaudio mixer in Qt") (description "@code{pavucontrol-qt} is the Qt port of volume control @code{pavucontrol} of sound server @code{PulseAudio}.") - (license license:lgpl2.1+))) + (license license:gpl2+))) (define-public qps (package @@ -1101,7 +1101,7 @@ processes currently in existence, much like code{top} or code{ps}.") (home-page "https://lxqt.org/") (synopsis "The terminal widget for QTerminal") (description "QTermWidget is a terminal emulator widget for Qt 5.") - (license license:lgpl2.1+))) + (license license:gpl2+))) (define-public qterminal (package @@ -1131,7 +1131,7 @@ processes currently in existence, much like code{top} or code{ps}.") (synopsis "Lightweight Qt-based terminal emulator") (description "QTerminal is a lightweight Qt terminal emulator based on QTermWidget.") - (license license:lgpl2.1+))) + (license license:gpl2+))) (define-public screengrab (package @@ -1160,7 +1160,7 @@ QTermWidget.") (synopsis "Crossplatform tool for fast making screenshots") (description "ScreenGrab is a program for fast creating screenshots, and easily publishing them on internet image hosting services.") - (license license:lgpl2.1+))) + (license license:gpl2+))) ;; The LXQt Desktop Environment @@ -1211,4 +1211,4 @@ easily publishing them on internet image hosting services.") (synopsis "The Lightweight Qt Desktop Environment") (description "LXQt is a lightweight Qt desktop environment.") (home-page "https://lxde.org") - (license license:lgpl2.1+))) + (license license:gpl2+))) -- cgit v1.2.3 From cbea1e8dd22c01b8c228afc0b74dfe39ed356d37 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Fri, 19 Oct 2018 22:16:38 +0800 Subject: gnu: lxqt-build-tools: Define LXQT_DATA_DIR and LXQT_ETC_XDG_DIR. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm (lxqt-build-tools)[arguments]: Define LXQT_DATA_DIR and LXQT_ETC_XDG_DIR in the configure flags. Signed-off-by: 宋文武 --- gnu/packages/lxqt.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 1c6bfb7b60..b78b8ac99f 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -131,7 +131,13 @@ to statistics about the system on which it's run.") (base32 "13b5x26p6ycnwzlgg1cgvlc88wjrjmlb3snrrmzh0xgh9h6hhvd6")))) (build-system cmake-build-system) (arguments - `(#:tests? #f)) ; no tests + `(#:tests? #f ; no tests + #:configure-flags + ;; 'startlxqt' will add LXQT_DATA_DIR to XDG_DATA_DIRS, + ;; LXQT_ETC_XDG_DIR to XDG_CONFIG_DIRS, and 'lxqt-about' will report + ;; LXQT_ETC_XDG_DIR in its "Technical Info". + '("-DLXQT_DATA_DIR=/run/current-system/profile/share" + "-DLXQT_ETC_XDG_DIR=/run/current-system/profile/etc/xdg"))) (native-inputs `(("pkg-config" ,pkg-config) ("glib" ,glib))) -- cgit v1.2.3 From abc98e3be5fbccf88fe69399db4d83f902b65a15 Mon Sep 17 00:00:00 2001 From: Florian Pelz Date: Sat, 20 Oct 2018 18:44:03 +0200 Subject: services: httpd: Allow using it with PHP. * gnu/services/web.scm (httpd): Make existing httpd-module API public. * doc/guix.texi (Apache HTTP Server): Document its usage with PHP-FPM. Signed-off-by: Christopher Baines --- gnu/services/web.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu') diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 1edb1f4d34..fcf453c248 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -70,6 +70,11 @@ httpd-config-file-user httpd-config-file-group + + httpd-module + httpd-module? + %default-httpd-modules + httpd-service-type -- cgit v1.2.3 From 1316413558e288c577d132bee41adcce4bc1e24a Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 25 Oct 2018 19:31:38 +0200 Subject: gnu: git: Add "subtree" output. * gnu/packages/version-control.scm (git)[outputs]: Add "subtree". --- gnu/packages/version-control.scm | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 44b97692d0..ccb1f5dacc 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -166,7 +166,11 @@ as well as the classic centralized workflow.") version ".tar.xz")) (sha256 (base32 - "1vn6pi9yvw7rnb9dvi1yjrvv39fqd1m9mwbaffqwizs3gaf91br7")))))) + "1vn6pi9yvw7rnb9dvi1yjrvv39fqd1m9mwbaffqwizs3gaf91br7")))) + ;; For subtree documentation. + ("asciidoc" ,asciidoc) + ("docbook-xsl" ,docbook-xsl) + ("xmlto" ,xmlto))) (inputs `(("curl" ,curl) ("expat" ,expat) @@ -198,6 +202,7 @@ as well as the classic centralized workflow.") "send-email" ; for git-send-email "svn" ; git-svn "credential-netrc" ; git-credential-netrc + "subtree" ; git-subtree "gui")) ; gitk, git gui (arguments `(#:make-flags `("V=1" ;more verbose compilation @@ -256,6 +261,26 @@ as well as the classic centralized workflow.") ;; Add the "PM.stamp" to avoid "no rule to make target". (call-with-output-file "perl/PM.stamp" (const #t)) #t)) + (add-after 'build 'build-subtree + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "contrib/subtree" + (substitute* "Makefile" + ;; Apparently `xmlto' does not bother to looks up the stylesheets + ;; specified in the XML, unlike the above substitution. Instead it + ;; uses a hard-coded URL. Work around it here, but if this is + ;; common perhaps we should hardcode this path in xmlto itself. + (("\\$\\(XMLTO\\) -m \\$\\(MANPAGE_XSL\\) man") + (string-append "$(XMLTO) -x " + (string-append (assoc-ref inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-" + ,(package-version docbook-xsl)) + "/manpages/docbook.xsl -m $(MANPAGE_XSL) man"))) + (invoke "make") + (invoke "make" "install") + (invoke "make" "install-doc") + (substitute* "git-subtree" + (("/bin/sh") (which "sh")))) + #t)) (add-before 'check 'patch-tests (lambda _ (let ((store-directory (%store-directory))) @@ -317,6 +342,14 @@ as well as the classic centralized workflow.") `("PERL5LIB" ":" prefix (,(string-append (assoc-ref outputs "out") "/share/perl5")))) #t))) + (add-after 'install 'install-subtree + (lambda* (#:key outputs #:allow-other-keys) + (let ((subtree (assoc-ref outputs "subtree"))) + (install-file "contrib/subtree/git-subtree" + (string-append subtree "/bin")) + (install-file "contrib/subtree/git-subtree.1" + (string-append subtree "/share/man/man1")) + #t))) (add-after 'install 'split (lambda* (#:key inputs outputs #:allow-other-keys) ;; Split the binaries to the various outputs. -- cgit v1.2.3 From 244a0d5aade838aebf0b63885a43747518a74ed6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 27 Oct 2018 12:50:19 +0200 Subject: gnu: libzmf: Disable '-Werror'. Fixes builds on i686-linux. * gnu/packages/libreoffice.scm (libzmf)[arguments]: New field. --- gnu/packages/libreoffice.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index e5ab5c5071..b6ff6dc528 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -731,6 +731,9 @@ Works word processor file format.") (sha256 (base32 "08mg5kmkjrmqrd8j5rkzw9vdqlvibhb1ynp6bmfxnzq5rcq1l197")))) (build-system gnu-build-system) + (arguments + ;; A harmless 'sign-compare' error pops up on i686 so disable '-Werror'. + '(#:configure-flags '("--disable-werror"))) (inputs `(("boost" ,boost) ("icu4c" ,icu4c) -- cgit v1.2.3 From e9a041577a4c63d86ff9164bd0e0d46e59db6122 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20=C4=8Cech?= Date: Sun, 21 Oct 2018 18:18:13 +0200 Subject: gnu: Add telegram-purple. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/messaging.scm (telegram-purple): New variable. * gnu/packages/patches/telegram-purple-adjust-test.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. Co-authored-by: Ludovic Courtès --- gnu/local.mk | 1 + gnu/packages/messaging.scm | 82 ++++++++++++++++++++++ .../patches/telegram-purple-adjust-test.patch | 14 ++++ 3 files changed, 97 insertions(+) create mode 100644 gnu/packages/patches/telegram-purple-adjust-test.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index c46f3a8c4a..ba86d556a0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1166,6 +1166,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/telegram-purple-adjust-test.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/messaging.scm b/gnu/packages/messaging.scm index 42fb3733bb..0090fe12ce 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1763,4 +1763,86 @@ non-interoperable protocol, which allows it to support features like group messaging that aren’t available to clients that connect over XMPP.") (license license:expat))) +(define-public telegram-purple + (package + (name "telegram-purple") + (version "1.3.1") + (home-page "https://github.com/majn/telegram-purple") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)) + (recursive? #t))) + (sha256 + (base32 + "0p93jpjpx7hszwffzgixw04zkrpsiyzz4za3gfr4j07krc4771fp")) + (modules '((guix build utils))) + (snippet + '(begin + (substitute* "Makefile.in" + ;; By default these two directories point to Pidgin's own + ;; prefix. + (("^PLUGIN_DIR_PURPLE=.*") + (string-append + "exec_prefix := @exec_prefix@\n" + "PLUGIN_DIR_PURPLE := @libdir@/purple-2\n")) + (("^DATA_ROOT_DIR_PURPLE=.*") + "DATA_ROOT_DIR_PURPLE := @datarootdir@\n") + + ;; Honor sysconfdir instead of trying to write to /etc. + (("DESTDIR\\)/etc/telegram-purple") + "DESTDIR)@sysconfdir@/telegram-purple")) + #t)) + (patches (search-patches "telegram-purple-adjust-test.patch")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("which" ,which))) + (inputs + `(("pidgin" ,pidgin) + ("libgcrypt" ,libgcrypt) + ("libwebp" ,libwebp) + ("glib" ,glib) + ("gettext" ,gnu-gettext) + ("gtk+" ,gtk+-2) + ("zlib" ,zlib))) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; We're using release tag for repository checkout - let's prepare + ;; header defining GIT_COMMIT manually instead of running git to + ;; identify version which is being compiled. Git repository + ;; is removed anyway and only source code is kept. + (add-after 'unpack 'prepare-commit.h + (lambda _ + (with-output-to-file "./commit.h" + (lambda () + (display + (string-append "//generated by guix, use version instead of " + "commit\n" + "#ifndef GIT_COMMIT\n" + "# define GIT_COMMIT \"v" + ,version "\"\n" + "#endif\n")))) + #t)) + (add-before 'configure 'set-SHELL-variables + ;; Set these environment variables so that 'tgl/configure' uses the + ;; right shell and not /bin/sh. + (lambda _ + (let ((bash (which "bash"))) + (setenv "SHELL" bash) + (setenv "CONFIG_SHELL" bash) + #t)))))) + (synopsis "Telegram messaging support for Pidgin") + (description + "Telegram-purple is a plugin for Libpurple, the communication library +used by the Pidgin instant messaging client, that adds support for the +Telegram messenger.") + + ;; Code under tgl/ (the Telegram library) is LGPLv2.1+, but the plugin + ;; itself is GPLv2+. + (license license:gpl2+))) + ;;; messaging.scm ends here diff --git a/gnu/packages/patches/telegram-purple-adjust-test.patch b/gnu/packages/patches/telegram-purple-adjust-test.patch new file mode 100644 index 0000000000..db3b497d5d --- /dev/null +++ b/gnu/packages/patches/telegram-purple-adjust-test.patch @@ -0,0 +1,14 @@ +This test incorrectly expects the libpurple search path to initially +contain exactly one element. Remove this incorrect assertion. + +--- telegram-purple-1.3.1-checkout/test/loadtest.c 2018-10-27 16:25:06.258459600 +0200 ++++ telegram-purple-1.3.1-checkout/test/loadtest.c 2018-10-27 16:25:11.830434770 +0200 +@@ -156,7 +156,7 @@ static void tdf_inject_plugin (void) { + printf ("Injecting our module into purple_plugins_* ...\n"); + purple_plugins_init (); + GList *search_paths = purple_plugins_get_search_paths (); +- assert (!search_paths->prev && !search_paths->next && search_paths->data); ++ assert (!search_paths->prev && search_paths->data); + GList *new_paths = g_list_append (search_paths, g_strdup ("bin/")); + assert (new_paths == search_paths); + // Load "my" path before the default. -- cgit v1.2.3 From 67e0fb8b496903ae2c43c9386a2bc3b0a7c28579 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 27 Oct 2018 16:33:26 +0200 Subject: gnu: Add xrandr-invert-colors. * gnu/packages/xdisorg.scm (xrandr-invert-colors): New variable. --- gnu/packages/xdisorg.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index c92dbd1784..cf3e33eb5b 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1521,3 +1521,37 @@ the X11 clipboard") the numlock key in X11. It can be called from the user's initialization files to automatically turn it on on login.") (license license:expat))) + +(define-public xrandr-invert-colors + (package + (name "xrandr-invert-colors") + (version "0.01") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/zoltanp/xrandr-invert-colors.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1br3x9vr6xm4ika06n8cfxx1b3wdchdqvyzjl4y1chmivrml8x9h")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags (list "CC=gcc") + #:tests? #f ; there are none + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (install-file "xrandr-invert-colors.bin" bin) + #t)))))) + (inputs + `(("libxrandr" ,libxrandr))) + (home-page "https://github.com/zoltanp/xrandr-invert-colors") + (synopsis "Invert display colors") + (description "This package provides a small utility for inverting the +colors on all monitors attached to an XRandR-capable X11 display server.") + (license license:gpl3+))) -- cgit v1.2.3 From b5a310056cf942a5675bf3c862ece273c28a4ba4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C4=83d=C4=83lin=20Ionel=20Patra=C8=99cu?= Date: Sat, 27 Oct 2018 18:44:31 +0200 Subject: gnu: Add r-quic. * gnu/packages/cran.scm (r-quic): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 1dcb0cceef..3cf1e09df1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6162,6 +6162,29 @@ representing one simulated time step. Various mutation events are possible at each time step, contributing to a diverse final repertoire.") (license license:gpl2))) +(define-public r-quic + (package + (name "r-quic") + (version "1.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "QUIC" version)) + (sha256 + (base32 "021bp9xbaih60qmss015ycblbv6d1dvb1z89y93zpqqnc2qhpv3c")))) + (properties `((upstream-name . "QUIC"))) + (build-system r-build-system) + (home-page "https://www.cs.utexas.edu/users/sustik/QUIC/") + (synopsis "Regularized sparse inverse covariance matrix estimation") + (description + "This package implements the regularized Gaussian maximum likelihood +estimation of the inverse of a covariance matrix. It uses Newton's method and +coordinate descent to solve the regularized inverse covariance matrix +estimation problem.") + ;; The project home page states that the release is under GPLv3 or later. + ;; The CRAN page only says GPL-3. + (license license:gpl3+))) + (define-public r-ac3net (package (name "r-ac3net") -- cgit v1.2.3 From b509df82de369262403acf2e74f1e80fdc02c96d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C4=83d=C4=83lin=20Ionel=20Patra=C8=99cu?= Date: Sat, 27 Oct 2018 18:49:29 +0200 Subject: gnu: Add r-abundant. * gnu/packages/cran.scm (r-abundant): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 3cf1e09df1..7f2123b90e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6185,6 +6185,29 @@ estimation problem.") ;; The CRAN page only says GPL-3. (license license:gpl3+))) +(define-public r-abundant + (package + (name "r-abundant") + (version "1.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "abundant" version)) + (sha256 + (base32 "1m76qdmqvwpgm0sihazi2dna7cgsz9rljal18vgffb5wamwmg9k7")))) + (build-system r-build-system) + (propagated-inputs + `(("r-quic" ,r-quic))) + (home-page "https://cran.r-project.org/web/packages/abundant/") + (synopsis "Abundant regression and high-dimensional principal fitted components") + (description + "This package provides tools to fit and predict with the high-dimensional +principal fitted components model. This model is described by Cook, Forzani, +and Rothman (2012) @url{doi:10.1214/11-AOS962}.") + ;; The DESCRIPTION file states GPL-2, but since it directly depends on a + ;; GPLv3+ package (QUIC) this likely means GPLv2+. + (license license:gpl2+))) + (define-public r-ac3net (package (name "r-ac3net") -- cgit v1.2.3 From 763d44920dc1ae8a1ea2ff5aab58fdf818182880 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 27 Oct 2018 20:08:50 +0200 Subject: gnu: guile-sdl2: Update to 0.3.1. * gnu/packages/sdl.scm (guile-sdl2): Update to 0.3.1. --- gnu/packages/sdl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index caa1d6d1c1..3fa0e0242a 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -486,7 +486,7 @@ sound and device input (keyboards, joysticks, mice, etc.).") (define-public guile-sdl2 (package (name "guile-sdl2") - (version "0.3.0") + (version "0.3.1") (source (origin (method url-fetch) (uri (string-append @@ -494,7 +494,7 @@ sound and device input (keyboards, joysticks, mice, etc.).") version ".tar.gz")) (sha256 (base32 - "0iq6fw213qw292fxhrsg40al7hqyqyh4qpgl0x9rh08y949h2w97")))) + "0bw7x2lx90k4banc5k7yfkn3as93y25gr1xdr225ll7lmij21k64")))) (build-system gnu-build-system) (arguments '(#:make-flags '("GUILE_AUTO_COMPILE=0") -- cgit v1.2.3 From 20a3df0fd3353fe00a3cfde36317e0c8f4fc1187 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 27 Oct 2018 23:53:57 +0300 Subject: gnu: mailutils: Update to 3.5. * gnu/packages/mail.scm (mailutils): Update to 3.5. [source]: Remove patch, remove snippet. [native-inputs]: Remove flex, bison. [inputs]: Remove guile-2.0, add guile-2.2. * gnu/packages/patches/mailutils-uninitialized-memory.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/mail.scm | 24 ++---- .../patches/mailutils-uninitialized-memory.patch | 87 ---------------------- 3 files changed, 5 insertions(+), 107 deletions(-) delete mode 100644 gnu/packages/patches/mailutils-uninitialized-memory.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index ba86d556a0..56c434d0a8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -938,7 +938,6 @@ dist_patch_DATA = \ %D%/packages/patches/lvm2-static-link.patch \ %D%/packages/patches/lxsession-use-gapplication.patch \ %D%/packages/patches/lyx-2.2.3-fix-test.patch \ - %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 \ diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index e7e440bcf7..7d6ea741d7 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -126,24 +126,14 @@ (define-public mailutils (package (name "mailutils") - (version "3.4") + (version "3.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/mailutils/mailutils-" - version ".tar.bz2")) + version ".tar.xz")) (sha256 (base32 - "1dn71p85wlyisnwsb485sk3q5v393k3dizsa9fmimskdwjwgk3ch")) - (patches - (search-patches "mailutils-uninitialized-memory.patch")) - (snippet - ;; For a rebuild of the Flex/Bison byproducts touched by the - ;; patch above. - '(begin - (for-each delete-file - '("mh/mh_alias_lex.c" - "libmailutils/cfg/parser.c")) - #t)))) + "1wx275w38fwni2abc8g7g3irbk332vr34byxd72zqfdiznsqgims")))) (build-system gnu-build-system) (arguments '(#:phases @@ -197,16 +187,12 @@ #:configure-flags '("--sysconfdir=/etc") #:parallel-tests? #f)) (native-inputs - ;; Note: Bison and Flex needed due to - ;; 'mailutils-uninitialized-memory.patch'. - `(("bison" ,bison) - ("flex" ,flex) - ("perl" ,perl))) ;for 'gylwrap' + `(("perl" ,perl))) ;for 'gylwrap' (inputs `(("dejagnu" ,dejagnu) ("m4" ,m4) ("texinfo" ,texinfo) - ("guile" ,guile-2.0) + ("guile" ,guile-2.2) ("gnutls" ,gnutls) ("ncurses" ,ncurses) ("readline" ,readline) diff --git a/gnu/packages/patches/mailutils-uninitialized-memory.patch b/gnu/packages/patches/mailutils-uninitialized-memory.patch deleted file mode 100644 index ef4daf94cb..0000000000 --- a/gnu/packages/patches/mailutils-uninitialized-memory.patch +++ /dev/null @@ -1,87 +0,0 @@ -Without this patch, the MH test suite would fail when building with -glibc 2.26, with 'ali' segfaulting like this: - - Core was generated by `/tmp/guix-build-mailutils-3.4.drv-0/mailutils-3.4/mh/.libs/ali -a ./Mail/mh_ali'. - Program terminated with signal SIGSEGV, Segmentation fault. - #0 0x00007f8eac263a14 in hash ( - name=0x72642e342e332d73 , hash_num=0) at assoc.c:102 - 102 for (i = 0; *name; name++) - (gdb) bt - #0 0x00007f8eac263a14 in hash ( - name=0x72642e342e332d73 , hash_num=0) at assoc.c:102 - #1 0x00007f8eac263e6b in assoc_find_slot (assoc=0xaa59e0, - name=0x72642e342e332d73 , install=0x0, slot=0x7ffcddcbf2b8) at assoc.c:219 - #2 0x00007f8eac264124 in mu_assoc_lookup (assoc=0xaa59e0, - name=0x72642e342e332d73 , dataptr=0x7ffcddcbf2e0) at assoc.c:308 - #3 0x00007f8eac29e8ac in mu_ident_deref ( - name=0x72642e342e332d73 ) at ident.c:98 - #4 0x00007f8eac29f8a6 in mu_locus_point_deinit (pt=0xaa5718) at locus.c:48 - #5 0x00007f8eac29fa1b in mu_locus_range_deinit (lr=0xaa5718) at locus.c:99 - #6 0x00007f8eac29f9db in mu_locus_range_copy (dest=0xaa5718, - src=0x622be0 ) at locus.c:89 - #7 0x0000000000408a2a in push_source (name=0xaa74bc "mh_aliases2", fail=1) - at mh_alias_lex.l:170 - -commit b330af9008e4c9168b379867b854f5900a539ad7 -Author: Sergey Poznyakoff -Date: Sat Nov 18 10:15:48 2017 +0200 - - Fix the use of uninitialized memory - - * mh/mh_alias_lex.l (push_source): Initialize locus range prior to copying - to it. - * libmailutils/cfg/parser.y (mu_cfg_tree_create_node): Likewise. - * libmu_sieve/util.c: (mu_sieve_value_create): Likewise. - -diff --git a/libmailutils/cfg/parser.y b/libmailutils/cfg/parser.y -index 4503c7781..3436b8d90 100644 ---- a/libmailutils/cfg/parser.y -+++ b/libmailutils/cfg/parser.y -@@ -1134,10 +1134,9 @@ mu_cfg_tree_create_node (struct mu_cfg_tree *tree, - - np = mu_alloc (size); - np->type = type; -+ mu_locus_range_init (&np->locus); - if (loc) - mu_locus_range_copy (&np->locus, loc); -- else -- memset (&np->locus, 0, sizeof np->locus); - p = (char*) (np + 1); - np->tag = p; - strcpy (p, tag); -diff --git a/libmu_sieve/sieve-lex.l b/libmu_sieve/sieve-lex.l -index fd145bfe1..f14e80194 100644 ---- a/libmu_sieve/sieve-lex.l -+++ b/libmu_sieve/sieve-lex.l -@@ -190,6 +190,7 @@ push_source (const char *name) - { - ctx = mu_sieve_malloc (mu_sieve_machine, sizeof (*ctx)); - ctx->trk = trk; -+ mu_locus_range_init (&ctx->incl_range); - mu_locus_range_copy (&ctx->incl_range, &yylloc); - ctx->i_node = sieve_source_inode; - ctx->input = input_stream; -diff --git a/libmu_sieve/util.c b/libmu_sieve/util.c -index 8d62a60c2..7d71b5509 100644 ---- a/libmu_sieve/util.c -+++ b/libmu_sieve/util.c -@@ -55,6 +55,7 @@ mu_sieve_value_create (mu_sieve_machine_t mach, mu_sieve_data_type type, - val->locus.end.mu_line = locus->end.mu_line; - val->locus.end.mu_col = locus->end.mu_col; - -+ mu_locus_range_init (&val->locus); - mu_locus_range_copy (&val->locus, locus); - switch (type) - { -diff --git a/mh/mh_alias_lex.l b/mh/mh_alias_lex.l -index 371353ed3..b97264b38 100644 ---- a/mh/mh_alias_lex.l -+++ b/mh/mh_alias_lex.l -@@ -167,6 +167,7 @@ push_source (const char *name, int fail) - { - ctx = mu_alloc (sizeof (*ctx)); - ctx->trk = trk; -+ mu_locus_range_init (&ctx->incl_range); - mu_locus_range_copy (&ctx->incl_range, &yylloc); - ctx->exec_p = exec_p; - ctx->i_node = ali_source_inode; -- cgit v1.2.3 From ac3b4b124fa9b3c0dbbc22ac2bec157fe70ae0f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 28 Oct 2018 01:09:54 +0200 Subject: =?UTF-8?q?gnu:=20mailutils:=20Install=20modules=20to=20=E2=80=A6/?= =?UTF-8?q?guile/site/2.2.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/mail.scm (mailutils)[arguments]: Pass "--with-guile-site-dir". --- gnu/packages/mail.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 7d6ea741d7..c533664071 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -184,7 +184,13 @@ #t))) ;; TODO: Add `--with-sql'. - #:configure-flags '("--sysconfdir=/etc") + #:configure-flags (list "--sysconfdir=/etc" + + ;; Add "/2.2" to the installation directory. + (string-append "--with-guile-site-dir=" + (assoc-ref %outputs "out") + "/share/guile/site/2.2")) + #:parallel-tests? #f)) (native-inputs `(("perl" ,perl))) ;for 'gylwrap' -- cgit v1.2.3 From 1f889cac4e767bf24fabf88a8bd48d5243aa9042 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 28 Oct 2018 01:10:55 +0200 Subject: gnu: mailutils: Add dependency on GSASL. * gnu/packages/mail.scm (mailutils)[inputs]: Add GSASL. --- gnu/packages/mail.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index c533664071..4fffc2f7f4 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -199,6 +199,7 @@ ("m4" ,m4) ("texinfo" ,texinfo) ("guile" ,guile-2.2) + ("gsasl" ,gsasl) ("gnutls" ,gnutls) ("ncurses" ,ncurses) ("readline" ,readline) -- cgit v1.2.3 From f3dd10dfe7e3baf91ecaf547536ad3fefb2a4aea Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Wed, 24 Oct 2018 15:44:49 -0400 Subject: gnu: libmspack: Update to 0.8 [fixes CVE-2018-{18584,18585,18586}]. * gnu/packages/compression.scm (libmspack): Update to 0.8. --- gnu/packages/compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 5a151b486d..464402ec6c 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -645,13 +645,13 @@ sfArk file format to the uncompressed sf2 format.") (package (name "libmspack") (home-page "https://cabextract.org.uk/libmspack/") - (version "0.7.1") + (version "0.8") (source (origin (method url-fetch) (uri (string-append home-page name "-" version "alpha.tar.gz")) (sha256 - (base32 "0zn4vwzk5ankgd0l88cipan19pzbzv0sm3fba17lvqwka3dp1acp")))) + (base32 "1byx98jajv927f0a7np0hvs8lxzccny6pj8vrrgmldv1jlp7jcq5")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-static"))) -- cgit v1.2.3 From a8b12397a1155d9e2cb278ffbfe66d042573d129 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 26 Oct 2018 16:11:21 +0200 Subject: gnu: flatbuffers: Fix typo in description. * gnu/packages/serialization.scm (flatbuffers)[description]: Hyphenate. --- gnu/packages/serialization.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index b34ea30edb..40b3d1bae0 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -455,7 +455,7 @@ to generate and parse. The two primary functions are @code{cbor.loads} and (assoc-ref %outputs "out") "/lib")))) (home-page "https://google.github.io/flatbuffers/") (synopsis "Memory-efficient serialization library") - (description "FlatBuffers is a cross platform serialization library for C++, + (description "FlatBuffers is a cross-platform serialization library for C++, C#, C, Go, Java, JavaScript, PHP, and Python. It was originally created for game development and other performance-critical applications.") (license license:asl2.0))) -- cgit v1.2.3 From fc82538c15392759955e0f1a2dedecf454a86860 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 28 Oct 2018 00:03:41 +0200 Subject: gnu: perl-xml-xpath: Update to 1.44. * gnu/packages/xml.scm (perl-xml-xpath): Update to 1.44. --- gnu/packages/xml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 9aa2800b9e..c1f14d720e 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -809,14 +809,14 @@ RSS 0.91, RSS 1.0, RSS 2.0, Atom") (define-public perl-xml-xpath (package (name "perl-xml-xpath") - (version "1.42") + (version "1.44") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/M/MA/MANWAR/" "XML-XPath-" version ".tar.gz")) (sha256 (base32 - "04mm91kxav598ax7nlg81dhnvanwvg6bkf30l0cgkmga5iyccsly")))) + "03yxj7w5a43ibbpiqsvb3lswj2b71dydsx4rs2fw0p8n0l3i3j8w")))) (build-system perl-build-system) (native-inputs `(("perl-path-tiny" ,perl-path-tiny))) -- cgit v1.2.3 From 6135735b52c7f328cdc1fe22ca5c288ef8f96165 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 28 Oct 2018 00:46:05 +0200 Subject: gnu: perl-www-mechanize: Update to 1.89. * gnu/packages/web.scm (perl-www-mechanize): Update to 1.89. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index c3b06b05bc..29d03f6a15 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3697,7 +3697,7 @@ library.") (define-public perl-www-mechanize (package (name "perl-www-mechanize") - (version "1.88") + (version "1.89") (source (origin (method url-fetch) @@ -3705,7 +3705,7 @@ library.") "WWW-Mechanize-" version ".tar.gz")) (sha256 (base32 - "0yd8a1zsfpbv5wr79x3iqmik9gvcd10iam9dfrdan4dri9vpxn9n")))) + "1mxx362vqiniw8vi6k3j7v9b1s7012irhfcblcz1p6jz9cjqi7mh")))) (build-system perl-build-system) (native-inputs ;only for tests `(("perl-cgi" ,perl-cgi) -- cgit v1.2.3 From 31b619566dfb01b0deb8b127c7b24ef347de8b87 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 28 Oct 2018 00:49:41 +0200 Subject: gnu: fzy: Don't use unstable tarball. * gnu/packages/shellutils.scm (fzy)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/shellutils.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 425713a91f..d4076dae01 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -28,6 +28,7 @@ #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (gnu packages autotools) #:use-module (gnu packages ncurses) #:use-module (gnu packages readline) @@ -136,13 +137,14 @@ environment variables of the current shell.") (version "0.9") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/jhawthorn/fzy/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/jhawthorn/fzy.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1xfgxqbkcpi2n4381kj3fq4026qs6by7xhl5gn0fgp3dh232c63j")))) + "1f1sh88ivdgnqaqha5ircfd9vb0xmss976qns022n0ddb91k5ka6")))) (build-system gnu-build-system) (arguments '(#:make-flags (list "CC=gcc" -- cgit v1.2.3 From 2792d8a8652bbc017ee0be17cff33ee5968c9d41 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 28 Oct 2018 00:53:42 +0200 Subject: gnu: fzy: Update to 1.0. * gnu/packages/shellutils.scm (fzy): Update to 1.0. --- gnu/packages/shellutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index d4076dae01..3020fdd210 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -134,7 +134,7 @@ environment variables of the current shell.") (define-public fzy (package (name "fzy") - (version "0.9") + (version "1.0") (source (origin (method git-fetch) @@ -144,7 +144,7 @@ environment variables of the current shell.") (file-name (git-file-name name version)) (sha256 (base32 - "1f1sh88ivdgnqaqha5ircfd9vb0xmss976qns022n0ddb91k5ka6")))) + "1gkzdvj73f71388jvym47075l9zw61v6l8wdv2lnc0mns6dxig0k")))) (build-system gnu-build-system) (arguments '(#:make-flags (list "CC=gcc" -- cgit v1.2.3 From 2b9b4b1fe368fb1745c4150adbb8754948326c95 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 28 Oct 2018 02:35:09 +0200 Subject: gnu: hashcat-utils: Update to 1.9. And trim lines to 80 characters. * gnu/packages/password-utils.scm (hashcat-utils): Update to 1.9. [source]: Parametrise. --- gnu/packages/password-utils.scm | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index e09bbea5cc..357ef86d56 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -735,15 +735,15 @@ password cracking.") (define-public hashcat-utils (package (name "hashcat-utils") - (version "1.8") + (version "1.9") (source (origin (method url-fetch) - (uri (string-append "https://github.com/hashcat/hashcat-utils/releases/download/v" - version "/hashcat-utils-1.8.7z")) + (uri (string-append "https://github.com/hashcat/hashcat-utils/releases/" + "download/v" version "/" + "hashcat-utils-" version ".7z")) (sha256 - (base32 - "1x80rngjz7gkhwplhw1iqr0wzb6hjkrjfld2kz9kmgp5dr9nys1p")))) + (base32 "0kq555kb338691qd7zjmi8vhq4km3apnsl2w63zh0igwzcjx6lx1")))) (native-inputs `(("p7zip" ,p7zip))) (inputs @@ -767,12 +767,16 @@ password cracking.") (lambda* (#:key outputs #:allow-other-keys) (let ((out (string-append (assoc-ref outputs "out") "/bin"))) (mkdir-p out) - (for-each (lambda (file) - (copy-file file (string-append out "/" (basename file ".bin")))) - (find-files "." "\\.bin$")) - (for-each (lambda (file) - (copy-file file (string-append out "/" (basename file ".pl")))) - (find-files "../bin" "\\.pl$")) + (for-each + (lambda (file) + (copy-file file (string-append out "/" + (basename file ".bin")))) + (find-files "." "\\.bin$")) + (for-each + (lambda (file) + (copy-file file (string-append out "/" + (basename file ".pl")))) + (find-files "../bin" "\\.pl$")) #t)))))) (home-page "https://github.com/hashcat/hashcat-utils/") (synopsis "Small utilities that are useful in advanced password cracking") -- cgit v1.2.3 From 7930cfc98923eda64ec4a37d56b19f96f86f5f59 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 21 Oct 2018 09:03:02 +0300 Subject: gnu: qt: Update to 5.11.2. * gnu/packages/qt.scm (qt, qtbase, qtsvg, qtimageformats, qtx11extras, qtxmlpatterns, qtdeclarative, qtconnectivity, qtwebsockets, qtsensors, qtmultimedia, qtwayland, qtserialport, qtserialbus, qtwebchannel, qtwebglplugin, qtwebview, qtlocation, qttools, qtscript, qtquickcontrols, qtquickcontrols2, qtgraphicaleffects, qtgamepad, qtscxml, qtpurchasing, qtcanvas3d, qtcharts, qtdatavis3d, qtnetworkauth, qtremoteobjects, qtspeech): Update to 5.11.2. --- gnu/packages/qt.scm | 128 ++++++++++++++++++++++++++-------------------------- 1 file changed, 64 insertions(+), 64 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 5195c71ccf..05713e8ef1 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -105,7 +105,7 @@ system, and the core design of Django is reused in Grantlee.") (define-public qt (package (name "qt") - (version "5.11.1") + (version "5.11.2") (outputs '("out" "examples")) (source (origin (method url-fetch) @@ -118,7 +118,7 @@ system, and the core design of Django is reused in Grantlee.") version ".tar.xz")) (sha256 (base32 - "0azva1wx298jh0xskymz8jic83yhxs1xfxf321wqd5lwiyq2qq1r")) + "10faac59jvz6dxxljdkaknlxazpnaxgvqdcszabfbbkc1f24n466")) (modules '((guix build utils))) (snippet '(begin @@ -483,7 +483,7 @@ system, and the core design of Django is reused in Grantlee.") (define-public qtbase (package (name "qtbase") - (version "5.11.1") + (version "5.11.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -492,7 +492,7 @@ system, and the core design of Django is reused in Grantlee.") version ".tar.xz")) (sha256 (base32 - "0ipv18ypbgpxhh49rfplqmflskmnhhwj1bjr5hrwi0jpvar4gl50")) + "01q1rn5rp9biq3z38953z2hgm4nirvp2jfv8wg7isnld8v1yg0b3")) ;; Use TZDIR to avoid depending on package "tzdata". (patches (search-patches "qtbase-use-TZDIR.patch")) (modules '((guix build utils))) @@ -726,7 +726,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") (define-public qtsvg (package (inherit qtbase) (name "qtsvg") - (version "5.11.1") + (version "5.11.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -735,7 +735,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") version ".tar.xz")) (sha256 (base32 - "0drhig0jcss3cf01aqfmafajf8gzf6bh468g1ikyrkh46czgyshx")))) + "0rni3cdcli91v7k8ra9s9phpznvkza8qqvcrv9yyfrmlapwbn5mw")))) (propagated-inputs `()) (native-inputs `(("perl" ,perl))) (inputs @@ -801,7 +801,7 @@ HostData=lib/qt5 (define-public qtimageformats (package (inherit qtsvg) (name "qtimageformats") - (version "5.11.1") + (version "5.11.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -810,7 +810,7 @@ HostData=lib/qt5 version ".tar.xz")) (sha256 (base32 - "05jnyrq7klr3mdiz0r9c151vl829yc8y9cxfbw5dwbp1rkndwl7b")) + "0s1s33k0wrnf9fi1wlm1kaq9hs1fx89597nhk53vzdfha42x3r97")) (modules '((guix build utils))) (snippet '(begin @@ -832,7 +832,7 @@ support for MNG, TGA, TIFF and WBMP image formats."))) (define-public qtx11extras (package (inherit qtsvg) (name "qtx11extras") - (version "5.11.1") + (version "5.11.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -841,7 +841,7 @@ support for MNG, TGA, TIFF and WBMP image formats."))) version ".tar.xz")) (sha256 (base32 - "0rccpmhz48kq4xs441lj9mnwpbi6kxwl8y7dj7w7g5zvpv41kwmw")))) + "12cha7pd3cjx7zr0l7rbi1j2pfwmfpdwc7w3dsqbyi1d0mhwl1zl")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -856,7 +856,7 @@ from within Qt 5."))) (define-public qtxmlpatterns (package (inherit qtsvg) (name "qtxmlpatterns") - (version "5.11.1") + (version "5.11.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -865,7 +865,7 @@ from within Qt 5."))) version ".tar.xz")) (sha256 (base32 - "0n5gacpni019i2872m4b1p5qaqibhszsdl3xhw3xsckvr0hf25v1")))) + "0ik7m1a0shjsyzs8n9hfx8m9hy1p3wg505slcs0xznj0pa0gdmaz")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -885,7 +885,7 @@ xmlpatternsvalidator."))) (define-public qtdeclarative (package (inherit qtsvg) (name "qtdeclarative") - (version "5.11.1") + (version "5.11.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -894,7 +894,7 @@ xmlpatternsvalidator."))) version ".tar.xz")) (sha256 (base32 - "0fjg9ii64mhx2ww70rj44cy65rwwkwyjxcm435kwp3v1pzv5xkwy")))) + "1kgj6q53rk573yi47j32mn1mfk5ag98zvhv9qgrlb78y0gw8c392")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -917,7 +917,7 @@ with JavaScript and C++."))) (define-public qtconnectivity (package (inherit qtsvg) (name "qtconnectivity") - (version "5.11.1") + (version "5.11.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -926,7 +926,7 @@ with JavaScript and C++."))) version ".tar.xz")) (sha256 (base32 - "0mz6mbf069yqdvi6mcvp6izskcn9wzig4s3dzmygwd430pmx93kk")))) + "1ia21llw610wd7licdm81p8zpkrkvkc5yc7y4wplgg6k2jyip42q")))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config) @@ -941,7 +941,7 @@ with Bluetooth and NFC."))) (define-public qtwebsockets (package (inherit qtsvg) (name "qtwebsockets") - (version "5.11.1") + (version "5.11.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -950,7 +950,7 @@ with Bluetooth and NFC."))) version ".tar.xz")) (sha256 (base32 - "1bj82y3f1nd2adnj3ljfr4vlx4bkgdlm3zvhlsas2lz837vi5aks")))) + "13cbr2pffv1hwvm8d8kzask0pyc2j3brgq23vi5i1i70kihrfqdf")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -968,7 +968,7 @@ consume data received from the server, or both."))) (define-public qtsensors (package (inherit qtsvg) (name "qtsensors") - (version "5.11.1") + (version "5.11.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -977,7 +977,7 @@ consume data received from the server, or both."))) version ".tar.xz")) (sha256 (base32 - "1yn065l6kzs3fn74950pkxxglqi55lzk7alf15klsd1wnxc0zsfb")))) + "1iv3gmk121myqdr64d9lf2m816ypxrb526gn0ssxx8gp4j4c69qf")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:parallel-tests? _ #f) #f) ; can lead to race condition @@ -1001,7 +1001,7 @@ recognition API for devices."))) (define-public qtmultimedia (package (inherit qtsvg) (name "qtmultimedia") - (version "5.11.1") + (version "5.11.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1010,7 +1010,7 @@ recognition API for devices."))) version ".tar.xz")) (sha256 (base32 - "0369b0mh7sr718l119b07grb1v8xqlq6l4damyd6lrmlj1wbb2zj")) + "0vbjrxsdahgbgpc2zcvgg3mpijzd5kknz5clfcw2cq3310yqyq15")) (modules '((guix build utils))) (snippet '(begin @@ -1052,7 +1052,7 @@ set of plugins for interacting with pulseaudio and GStreamer."))) (define-public qtwayland (package (inherit qtsvg) (name "qtwayland") - (version "5.11.1") + (version "5.11.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1061,7 +1061,7 @@ set of plugins for interacting with pulseaudio and GStreamer."))) version ".tar.xz")) (sha256 (base32 - "1sj4lsza48xji1qhmi1wqpx07jgm1mpa95gmd2w1kxw240hbr6p0")) + "0wdpxjr3zfmgcfg14zlwd8mjbc191pvlchj1xxd0lj30ldfy2daf")) (modules '((guix build utils))) (snippet ;; The examples try to build and cause the build to fail @@ -1104,7 +1104,7 @@ compositor libraries."))) (define-public qtserialport (package (inherit qtsvg) (name "qtserialport") - (version "5.11.1") + (version "5.11.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1113,7 +1113,7 @@ compositor libraries."))) version ".tar.xz")) (sha256 (base32 - "18v4pbq7bnmrl81m8s11ksbjlvzbb4kw5py6ji2dhmnm44w9k9sn")))) + "0vkgvicm67vds2iqmhnjsqwnx1f8zhbzc31w6q198i0x8b76j6xh")))) (native-inputs `(("perl" ,perl))) (inputs `(("qtbase" ,qtbase) @@ -1138,7 +1138,7 @@ interacting with serial ports from within Qt."))) (define-public qtserialbus (package (inherit qtsvg) (name "qtserialbus") - (version "5.11.1") + (version "5.11.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1147,7 +1147,7 @@ interacting with serial ports from within Qt."))) version ".tar.xz")) (sha256 (base32 - "0jjmdd6vkvs5izqazp1rsrad0b1fzk6knrbdjl37lvcsawyfxfyk")))) + "07k4g5qfh657das2f5i6ph0hl4bva13yzlmxnay7qpzqcb0w4x0p")))) (inputs `(("qtbase" ,qtbase) ("qtserialport" ,qtserialport))) @@ -1159,7 +1159,7 @@ and others."))) (define-public qtwebchannel (package (inherit qtsvg) (name "qtwebchannel") - (version "5.11.1") + (version "5.11.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1168,7 +1168,7 @@ and others."))) version ".tar.xz")) (sha256 (base32 - "11rfjkb4h8dzxfmk889x7kkc73cbk26smc7h62lnh35f2nppd95r")))) + "1z02dhrd1h2rpdhww9py9dnhss80xwf45n568y7gr3gay7ldlpwl")))) (native-inputs `(("perl" ,perl) ("qtdeclarative" ,qtdeclarative) @@ -1183,7 +1183,7 @@ popular web engines, Qt WebKit 2 and Qt WebEngine."))) (define-public qtwebglplugin (package (inherit qtsvg) (name "qtwebglplugin") - (version "5.11.1") + (version "5.11.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1192,7 +1192,7 @@ popular web engines, Qt WebKit 2 and Qt WebEngine."))) version ".tar.xz")) (sha256 (base32 - "108yhi3sj6d1ysmlpka69ivb20mx9h6jpra6yq099i3jw4gc753x")))) + "0vazz9yr1qgpcq7p77vg9mrjxy6hjabvwj9irw5l5w7fmsk2ns0n")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -1218,7 +1218,7 @@ OpenGL ES 2.0 and can be used in HTML5 canvas elements"))) (define-public qtwebview (package (inherit qtsvg) (name "qtwebview") - (version "5.11.1") + (version "5.11.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1227,7 +1227,7 @@ OpenGL ES 2.0 and can be used in HTML5 canvas elements"))) version ".tar.xz")) (sha256 (base32 - "18da6a13wpb23vb6mbg9v75gphdf5mjmch7q3v1qjrv2sdwbpjbp")))) + "1r30n9vjcgh2cd2iycfwwwpmbz7grrd3iqrc0afwnri3vylnfqil")))) (native-inputs `(("perl" ,perl))) (inputs @@ -1241,7 +1241,7 @@ native APIs where it makes sense."))) (define-public qtlocation (package (inherit qtsvg) (name "qtlocation") - (version "5.11.1") + (version "5.11.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1250,7 +1250,7 @@ native APIs where it makes sense."))) version ".tar.xz")) (sha256 (base32 - "03vrbymwbn4nqsypcmr4ccqv20nvwdfs9gb01pi3jxr6x0wrlb0p")))) + "0kh2c2ahg8xkpvqsva13i35ndsc0x0ypnmd6vix5pm5jvwg9366n")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1271,7 +1271,7 @@ positioning and geolocation plugins."))) (define-public qttools (package (inherit qtsvg) (name "qttools") - (version "5.11.1") + (version "5.11.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1280,7 +1280,7 @@ positioning and geolocation plugins."))) version ".tar.xz")) (sha256 (base32 - "1zhl8p29mbabf07rhaks13qcm45zdckzymvz9qn95nxfj9piiyxp")))) + "1f1iqvksrlgkxdbagb6vvjib3argbv9l7iis6ymb8n0rfwn37s7h")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1298,7 +1298,7 @@ that helps in Qt development."))) (define-public qtscript (package (inherit qtsvg) (name "qtscript") - (version "5.11.1") + (version "5.11.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1307,7 +1307,7 @@ that helps in Qt development."))) version ".tar.xz")) (sha256 (base32 - "0z6sb4b9ds5lwkr0sxrnx6nim3aq2qx4a8illjy5vclfdv80yhqw")) + "0xprhd1brn30dqf5vy4inqgzpq48i8nlc428x9rr8fk5hdm4dhmj")) (patches (search-patches "qtscript-disable-tests.patch")))) (native-inputs `(("perl" ,perl) @@ -1322,7 +1322,7 @@ ECMAScript and Qt."))) (define-public qtquickcontrols (package (inherit qtsvg) (name "qtquickcontrols") - (version "5.11.1") + (version "5.11.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1331,7 +1331,7 @@ ECMAScript and Qt."))) version ".tar.xz")) (sha256 (base32 - "0mn662j0gkpama7zlrsn4h27sjrk49kpbha1h0zxxyiza5cpzsms")))) + "1q11nr85436xzrf4mbrbav306hrz0s2qaclqhhb0g88vzcq2wxww")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1346,7 +1346,7 @@ can be used to build complete interfaces in Qt Quick."))) (define-public qtquickcontrols2 (package (inherit qtsvg) (name "qtquickcontrols2") - (version "5.11.1") + (version "5.11.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1355,7 +1355,7 @@ can be used to build complete interfaces in Qt Quick."))) version ".tar.xz")) (sha256 (base32 - "0hn4kvrkz5ivwrp9p6yzwlw7cn4j72kcpm2nqyi3dbai1px6dc5x")))) + "116b5nhmsx898626s37r446yci7kxd3k7xap1dh9spqklkwlj1da")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1371,7 +1371,7 @@ not available."))) (define-public qtgraphicaleffects (package (inherit qtsvg) (name "qtgraphicaleffects") - (version "5.11.1") + (version "5.11.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1380,7 +1380,7 @@ not available."))) version ".tar.xz")) (sha256 (base32 - "1ws8aj7bq3rxpzjs370dcyqk8a5v1y6fwvrdhf70j8b2d4v75lnr")))) + "1zd9wjh2hhd6lby0z3ak0ff6zkbv73hh0drrg9qp2yrgjfismp59")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1426,7 +1426,7 @@ backend for QtQuick scene graph.") (define-public qtgamepad (package (inherit qtsvg) (name "qtgamepad") - (version "5.11.1") + (version "5.11.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1435,7 +1435,7 @@ backend for QtQuick scene graph.") version ".tar.xz")) (sha256 (base32 - "1n97w9rcbg8mzkvjgn3i8jbfmplp7w0p80ykdchpml47gxk1kwma")))) + "076874iyadj7pkprlk24h257nb8i4sni9c6kbixm5zrr2y73fbxf")))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config))) @@ -1456,7 +1456,7 @@ and mobile applications targeting TV-like form factors."))) (define-public qtscxml (package (inherit qtsvg) (name "qtscxml") - (version "5.11.1") + (version "5.11.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1465,7 +1465,7 @@ and mobile applications targeting TV-like form factors."))) version ".tar.xz")) (sha256 (base32 - "0f1k4fnk2aydagxqvkb636pcsi17sbq2zj2fn0ad50dvq013yiph")) + "197p5x1dadgjb39pd2vw60r63lvz68i0pm5i8xbyzgzm94hwn9fn")) (modules '((guix build utils))) (snippet '(begin @@ -1487,7 +1487,7 @@ also contains functionality to support data models and executable content."))) (define-public qtpurchasing (package (inherit qtsvg) (name "qtpurchasing") - (version "5.11.1") + (version "5.11.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1496,7 +1496,7 @@ also contains functionality to support data models and executable content."))) version ".tar.xz")) (sha256 (base32 - "0crm39fy9aqns10mjlbxvkkna9xklic49zfp3f7v7cwl66wap6dc")))) + "1xld1yx085mhnqdipy29g2yy5af67hfm0wy4mvj7pl6y5qj8jw9d")))) (inputs `(("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative))) @@ -1507,7 +1507,7 @@ purchasing goods and services."))) (define-public qtcanvas3d (package (inherit qtsvg) (name "qtcanvas3d") - (version "5.11.1") + (version "5.11.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1516,7 +1516,7 @@ purchasing goods and services."))) version ".tar.xz")) (sha256 (base32 - "1pif3m1f44jrly2nh0hzid6dmdxqiy5qgx645hz6g5fmpl113d8g")) + "0h7arss7wr0jwl87kiwgbf0nlcgpbriyf7cnv9j4h7g8d09a777x")) (modules '((guix build utils))) (snippet '(begin @@ -1546,7 +1546,7 @@ drawing calls from Qt Quick JavaScript."))) (define-public qtcharts (package (inherit qtsvg) (name "qtcharts") - (version "5.11.1") + (version "5.11.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1555,7 +1555,7 @@ drawing calls from Qt Quick JavaScript."))) version ".tar.xz")) (sha256 (base32 - "0avscsni84zrzydilkkp456sbaypyzhkn42qygjdq7wcn045zxk2")))) + "0551qfqnsfiy8kb1ng2v0yn7s6ggy7ghcmis983sbzxzjv2i58zn")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1573,7 +1573,7 @@ selecting one of the charts themes.") (define-public qtdatavis3d (package (inherit qtsvg) (name "qtdatavis3d") - (version "5.11.1") + (version "5.11.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1582,7 +1582,7 @@ selecting one of the charts themes.") version ".tar.xz")) (sha256 (base32 - "0gay0dsz05xfrlx190y95hp9wipzb988h02fqbqvyn00ds3s178w")))) + "05pzvrhvxhxjlav4axrhwlnxjzlr7mi8k3f06g59ryrwmb99kd37")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1600,7 +1600,7 @@ customized by using themes or by adding custom items and labels to them.") (define-public qtnetworkauth (package (inherit qtsvg) (name "qtnetworkauth") - (version "5.11.1") + (version "5.11.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1609,7 +1609,7 @@ customized by using themes or by adding custom items and labels to them.") version ".tar.xz")) (sha256 (base32 - "05p4pvfp3k5612d54anvpj39bgc7v572x6kgk3fy69xgn7lhbd02")))) + "1zmpvkhf2kmnr8vsa6jq675d5cpnmsg3f8yds6g91yq1g3prqdvr")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -1629,7 +1629,7 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt."))) (define-public qtremoteobjects (package (inherit qtsvg) (name "qtremoteobjects") - (version "5.11.1") + (version "5.11.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1638,7 +1638,7 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt."))) version ".tar.xz")) (sha256 (base32 - "1yv9f2329nv4viiyqmq7ciz51574wd11grj8s88qm0ndcb36jbgb")))) + "06awsaf15rch1y9p2q9kdlmlaa8g28whbzf04b10zfflyijnvg7j")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -1662,7 +1662,7 @@ processes or computers."))) (define-public qtspeech (package (inherit qtsvg) (name "qtspeech") - (version "5.11.1") + (version "5.11.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1671,7 +1671,7 @@ processes or computers."))) version ".tar.xz")) (sha256 (base32 - "1nwvbaijg35i98yaiqgnyn5vv0cn4v3wrxhwi1s0hfv9sv3q5iyw")))) + "110xr2y174sayi9f6swzp1wx7mx4sw9rifcdx2bkbsnbfab6zg8a")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests -- cgit v1.2.3 From d28af1991ae0a99e660ad1b82ac955556d3a9382 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 21 Oct 2018 09:04:41 +0300 Subject: gnu: qt: Use system sqlite. * gnu/packages/databases.scm (sqlite-with-column-metadata): New variable. * gnu/packages/qt.scm (qt, qtbase)[source]: Remove bundled sqlite. [inputs]: Add sqlite-with-column-metadata. [arguments]: Add configure-flag to use system sqlite. --- gnu/packages/databases.scm | 12 ++++++++++++ gnu/packages/qt.scm | 15 ++++++--------- 2 files changed, 18 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 6ebbc281fd..87fb170e5d 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1211,6 +1211,18 @@ is in the public domain.") ((#:configure-flags flags) `(cons "--enable-fts5" ,flags)))))) +;; This is used by Qt. +(define-public sqlite-with-column-metadata + (package (inherit sqlite) + (name "sqlite-with-column-metadata") + (arguments + (substitute-keyword-arguments (package-arguments sqlite) + ((#:configure-flags flags) + `(list (string-append "CFLAGS=-O2 -DSQLITE_SECURE_DELETE " + "-DSQLITE_ENABLE_UNLOCK_NOTIFY " + "-DSQLITE_ENABLE_DBSTAT_VTAB " + "-DSQLITE_ENABLE_COLUMN_METADATA"))))))) + (define-public tdb (package (name "tdb") diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 05713e8ef1..dffa8b5cf0 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -135,7 +135,7 @@ system, and the core design of Django is reused in Grantlee.") (lambda (dir) (delete-file-recursively (string-append "qtbase/src/3rdparty/" dir))) (list "double-conversion" "freetype" "harfbuzz-ng" - "libpng" "libjpeg" "pcre2" "xcb" + "libpng" "libjpeg" "pcre2" "sqlite" "xcb" "xkbcommon" "zlib")) (for-each (lambda (dir) @@ -206,7 +206,7 @@ system, and the core design of Django is reused in Grantlee.") ("postgresql" ,postgresql) ("pulseaudio" ,pulseaudio) ("pcre2" ,pcre2) - ;("sqlite" ,sqlite) + ("sqlite" ,sqlite-with-column-metadata) ("udev" ,eudev) ("unixodbc" ,unixodbc) ("wayland" ,wayland) @@ -273,7 +273,7 @@ system, and the core design of Django is reused in Grantlee.") "-no-compile-examples" ;; Most "-system-..." are automatic, but some use ;; the bundled copy by default. - ;"-system-sqlite" + "-system-sqlite" "-system-harfbuzz" "-system-pcre" ;; explicitly link with openssl instead of dlopening it @@ -503,7 +503,7 @@ system, and the core design of Django is reused in Grantlee.") (lambda (dir) (delete-file-recursively (string-append "src/3rdparty/" dir))) (list "double-conversion" "freetype" "harfbuzz-ng" - "libpng" "libjpeg" "pcre2" "xcb" + "libpng" "libjpeg" "pcre2" "sqlite" "xcb" "xkbcommon" "zlib")) #t)))) (build-system gnu-build-system) @@ -545,7 +545,7 @@ system, and the core design of Django is reused in Grantlee.") ("pcre2" ,pcre2) ("postgresql" ,postgresql) ("pulseaudio" ,pulseaudio) - ;("sqlite" ,sqlite) + ("sqlite" ,sqlite-with-column-metadata) ("unixodbc" ,unixodbc) ("xcb-util" ,xcb-util) ("xcb-util-image" ,xcb-util-image) @@ -616,10 +616,7 @@ system, and the core design of Django is reused in Grantlee.") "-no-compile-examples" ;; Most "-system-..." are automatic, but some use ;; the bundled copy by default. - ;; System sqlite fails on 5.10+ - ;;.obj/qsql_sqlite.o: In function `QSQLiteResultPrivate::initColumns(bool)': - ;;qsql_sqlite.cpp:(.text+0x190c): undefined reference to `sqlite3_column_table_name16' - ;"-system-sqlite" + "-system-sqlite" "-system-harfbuzz" "-system-pcre" ;; explicitly link with openssl instead of dlopening it -- cgit v1.2.3 From 124351efadf9c0ad5a4dd2d48ca604ed19092ffc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 21 Oct 2018 09:05:13 +0300 Subject: gnu: qt: Add vulkan support. * gnu/packages/qt.scm (qt, qtbase)[native-inputs]: Add vulkan-headers. (qt@4)[native-inputs]: Don't add vulkan-headers. (qttools)[native-inputs]: Add vulkan-headers. --- gnu/packages/qt.scm | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index dffa8b5cf0..ae926ed3d0 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -64,9 +64,11 @@ #:use-module (gnu packages ruby) #:use-module (gnu packages sdl) #:use-module (gnu packages tls) + #:use-module (gnu packages vulkan) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg) - #:use-module (gnu packages xml)) + #:use-module (gnu packages xml) + #:use-module (srfi srfi-1)) (define-public grantlee (package @@ -224,6 +226,7 @@ system, and the core design of Django is reused in Grantlee.") ("pkg-config" ,pkg-config) ("python" ,python-2) ("ruby" ,ruby) + ("vulkan-headers" ,vulkan-headers) ("which" ,(@ (gnu packages base) which)))) (arguments `(#:parallel-build? #f ; Triggers race condition in qtbase module on Hydra. @@ -401,10 +404,16 @@ system, and the core design of Django is reused in Grantlee.") ;; Remove webkit module, which is not built. '(begin (delete-file-recursively "src/3rdparty/webkit") #t)))) - (inputs `(,@(alist-delete "harfbuzz" - (alist-delete "libjpeg" (package-inputs qt))) - ("libjepg" ,libjpeg-8) - ("libsm" ,libsm))) + (inputs + `(,@(fold alist-delete + (package-inputs qt) + '("harfbuzz" "libjpeg")) + ("libjpeg" ,libjpeg-8) + ("libsm" ,libsm))) + (native-inputs + `(,@(fold alist-delete + (package-native-inputs qt) + '("vulkan-headers")))) ;; Note: there are 37 MiB of examples and a '-exampledir' configure flags, ;; but we can't make them a separate output because "out" and "examples" @@ -560,6 +569,7 @@ system, and the core design of Django is reused in Grantlee.") ("perl" ,perl) ("pkg-config" ,pkg-config) ("python" ,python-2) + ("vulkan-headers" ,vulkan-headers) ("ruby" ,ruby))) (arguments `(#:phases @@ -1283,7 +1293,8 @@ positioning and geolocation plugins."))) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (native-inputs `(("perl" ,perl) - ("qtdeclarative" ,qtdeclarative))) + ("qtdeclarative" ,qtdeclarative) + ("vulkan-headers" ,vulkan-headers))) (inputs `(("mesa" ,mesa) ("qtbase" ,qtbase))) -- cgit v1.2.3 From 3ea61f9642e0552bde145b823292445b4172e6bd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 21 Oct 2018 10:07:17 +0300 Subject: gnu: qt: Use invoke. * gnu/packages/qt.scm (qt)[arguments]: Use invoke. --- gnu/packages/qt.scm | 90 ++++++++++++++++++++++++++--------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index ae926ed3d0..b6105faa91 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -249,51 +249,51 @@ system, and the core design of Django is reused in Grantlee.") (("/bin/ls") (which "ls"))) ;; do not pass "--enable-fast-install", which makes the ;; configure process fail - (zero? (system* - "./configure" - "-verbose" - "-prefix" out - "-docdir" (string-append out "/share/doc/qt5") - "-headerdir" (string-append out "/include/qt5") - "-archdatadir" (string-append out "/lib/qt5") - "-datadir" (string-append out "/share/qt5") - "-examplesdir" (string-append - examples "/share/doc/qt5/examples") ; 151MiB - "-opensource" - "-confirm-license" - - ;; These features require higher versions of Linux than the - ;; minimum version of the glibc. See - ;; src/corelib/global/minimum-linux_p.h. By disabling these - ;; features Qt5 applications can be used on the oldest - ;; 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; for the time being, we - ;; prefer to save the space and build time. - "-no-compile-examples" - ;; Most "-system-..." are automatic, but some use - ;; the bundled copy by default. - "-system-sqlite" - "-system-harfbuzz" - "-system-pcre" - ;; explicitly link with openssl instead of dlopening it - "-openssl-linked" - ;; explicitly link with dbus instead of dlopening it - "-dbus-linked" - ;; don't use the precompiled headers - "-no-pch" - ;; drop special machine instructions not supported - ;; on all instances of the target - ,@(if (string-prefix? "x86_64" - (or (%current-target-system) - (%current-system))) - '() - '("-no-sse2")) - "-no-mips_dsp" - "-no-mips_dspr2"))))) + (invoke + "./configure" + "-verbose" + "-prefix" out + "-docdir" (string-append out "/share/doc/qt5") + "-headerdir" (string-append out "/include/qt5") + "-archdatadir" (string-append out "/lib/qt5") + "-datadir" (string-append out "/share/qt5") + "-examplesdir" (string-append + examples "/share/doc/qt5/examples") ; 151MiB + "-opensource" + "-confirm-license" + + ;; These features require higher versions of Linux than the + ;; minimum version of the glibc. See + ;; src/corelib/global/minimum-linux_p.h. By disabling these + ;; features Qt5 applications can be used on the oldest + ;; 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; for the time being, we + ;; prefer to save the space and build time. + "-no-compile-examples" + ;; Most "-system-..." are automatic, but some use + ;; the bundled copy by default. + "-system-sqlite" + "-system-harfbuzz" + "-system-pcre" + ;; explicitly link with openssl instead of dlopening it + "-openssl-linked" + ;; explicitly link with dbus instead of dlopening it + "-dbus-linked" + ;; don't use the precompiled headers + "-no-pch" + ;; drop special machine instructions not supported + ;; on all instances of the target + ,@(if (string-prefix? "x86_64" + (or (%current-target-system) + (%current-system))) + '() + '("-no-sse2")) + "-no-mips_dsp" + "-no-mips_dspr2")))) (add-after 'install 'patch-mkspecs (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From 1f71daf499c1c0708f56cd4623d07082a355fff3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 21 Oct 2018 10:04:34 +0300 Subject: gnu: qt@4: Update build config. * gnu/packages/qt.scm (qt@4)[arguments]: Substitute hardcoded '/bin/ls' invocation. Add configure-flags to not build the examples or demos. Don't use the precompiled headers. --- gnu/packages/qt.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index b6105faa91..b28e358b04 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -430,11 +430,14 @@ system, and the core design of Django is reused in Grantlee.") (doc (assoc-ref outputs "doc"))) (substitute* '("configure") (("/bin/pwd") (which "pwd"))) + (substitute* "src/corelib/global/global.pri" + (("/bin/ls") (which "ls"))) (zero? (system* "./configure" "-verbose" "-prefix" out + "-nomake" "examples demos" ;; Note: Don't pass '-docdir' since 'qmake' and ;; libQtCore would record its value, thereby defeating ;; the whole point of having a separate output. @@ -457,6 +460,8 @@ system, and the core design of Django is reused in Grantlee.") ;; Skip the webkit module; it fails to build on armhf ;; and, apart from that, may pose security risks. "-no-webkit" + ;; don't use the precompiled headers + "-no-pch" ;; drop special machine instructions not supported ;; on all instances of the target ,@(if (string-prefix? "x86_64" -- cgit v1.2.3 From 852a5692bbed1f2d23c0e47a7cdfb2a604a8f8b3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 21 Oct 2018 10:07:35 +0300 Subject: gnu: qt@4: Use invoke. * gnu/packages/qt.scm (qt@4)[arguments]: Use invoke. --- gnu/packages/qt.scm | 88 ++++++++++++++++++++++++++--------------------------- 1 file changed, 44 insertions(+), 44 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index b28e358b04..d487699827 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -433,50 +433,50 @@ system, and the core design of Django is reused in Grantlee.") (substitute* "src/corelib/global/global.pri" (("/bin/ls") (which "ls"))) - (zero? (system* - "./configure" - "-verbose" - "-prefix" out - "-nomake" "examples demos" - ;; Note: Don't pass '-docdir' since 'qmake' and - ;; libQtCore would record its value, thereby defeating - ;; the whole point of having a separate output. - "-datadir" (string-append out "/share/qt-" ,version - "/data") - "-importdir" (string-append out "/lib/qt-4" - "/imports") - "-plugindir" (string-append out "/lib/qt-4" - "/plugins") - "-translationdir" (string-append out "/share/qt-" ,version - "/translations") - "-demosdir" (string-append out "/share/qt-" ,version - "/demos") - "-examplesdir" (string-append out "/share/qt-" ,version - "/examples") - "-opensource" - "-confirm-license" - ;; explicitly link with dbus instead of dlopening it - "-dbus-linked" - ;; Skip the webkit module; it fails to build on armhf - ;; and, apart from that, may pose security risks. - "-no-webkit" - ;; don't use the precompiled headers - "-no-pch" - ;; drop special machine instructions not supported - ;; on all instances of the target - ,@(if (string-prefix? "x86_64" - (or (%current-target-system) - (%current-system))) - '() - '("-no-mmx" - "-no-3dnow" - "-no-sse" - "-no-sse2")) - "-no-sse3" - "-no-ssse3" - "-no-sse4.1" - "-no-sse4.2" - "-no-avx"))))) + (invoke + "./configure" + "-verbose" + "-prefix" out + "-nomake" "examples demos" + ;; Note: Don't pass '-docdir' since 'qmake' and + ;; libQtCore would record its value, thereby defeating + ;; the whole point of having a separate output. + "-datadir" (string-append out "/share/qt-" ,version + "/data") + "-importdir" (string-append out "/lib/qt-4" + "/imports") + "-plugindir" (string-append out "/lib/qt-4" + "/plugins") + "-translationdir" (string-append out "/share/qt-" ,version + "/translations") + "-demosdir" (string-append out "/share/qt-" ,version + "/demos") + "-examplesdir" (string-append out "/share/qt-" ,version + "/examples") + "-opensource" + "-confirm-license" + ;; explicitly link with dbus instead of dlopening it + "-dbus-linked" + ;; Skip the webkit module; it fails to build on armhf + ;; and, apart from that, may pose security risks. + "-no-webkit" + ;; don't use the precompiled headers + "-no-pch" + ;; drop special machine instructions not supported + ;; on all instances of the target + ,@(if (string-prefix? "x86_64" + (or (%current-target-system) + (%current-system))) + '() + '("-no-mmx" + "-no-3dnow" + "-no-sse" + "-no-sse2")) + "-no-sse3" + "-no-ssse3" + "-no-sse4.1" + "-no-sse4.2" + "-no-avx")))) (add-after 'install 'move-doc (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From 81f12f33b70855c0a99d5c2f1c2526e4a21b9823 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 27 Oct 2018 17:21:18 +0900 Subject: gnu: linux-libre: Enable BOCHS DRM support. * gnu/packages/aux-files/linux-libre/4.19-x86_64.conf: Build DRM BOCHS support as a module. It adds DRM support for BOCHS dispi vga interface used by qemu (-vga std option). It will also be useful for QEMU 3.0 to enable the new "bochs-display" display device. * gnu/packages/aux-files/linux-libre/4.19-i686.conf: Ditto. --- gnu/packages/aux-files/linux-libre/4.19-i686.conf | 2 +- gnu/packages/aux-files/linux-libre/4.19-x86_64.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/aux-files/linux-libre/4.19-i686.conf b/gnu/packages/aux-files/linux-libre/4.19-i686.conf index 07a035be91..c1df3f0f49 100644 --- a/gnu/packages/aux-files/linux-libre/4.19-i686.conf +++ b/gnu/packages/aux-files/linux-libre/4.19-i686.conf @@ -5949,7 +5949,7 @@ CONFIG_DRM_AST=m # CONFIG_DRM_MGAG200 is not set CONFIG_DRM_CIRRUS_QEMU=m CONFIG_DRM_QXL=m -# CONFIG_DRM_BOCHS is not set +CONFIG_DRM_BOCHS=m CONFIG_DRM_VIRTIO_GPU=m CONFIG_DRM_PANEL=y diff --git a/gnu/packages/aux-files/linux-libre/4.19-x86_64.conf b/gnu/packages/aux-files/linux-libre/4.19-x86_64.conf index 0e102c87de..a8f8c81648 100644 --- a/gnu/packages/aux-files/linux-libre/4.19-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/4.19-x86_64.conf @@ -5853,7 +5853,7 @@ CONFIG_DRM_AST=m # CONFIG_DRM_MGAG200 is not set CONFIG_DRM_CIRRUS_QEMU=m CONFIG_DRM_QXL=m -# CONFIG_DRM_BOCHS is not set +CONFIG_DRM_BOCHS=m CONFIG_DRM_VIRTIO_GPU=m CONFIG_DRM_PANEL=y -- cgit v1.2.3 From b4c93a78c830a68d337598e7620adde64829bdb1 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 25 Oct 2018 20:11:46 -0400 Subject: gnu: xorg-server: Update to 1.20.3 [fixes CVE-2018-14665]. * gnu/packages/xorg.scm (xorg-server): Update to 1.20.3. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 852eef9606..6f9c266fff 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5065,7 +5065,7 @@ over Xlib, including: (define-public xorg-server (package (name "xorg-server") - (version "1.20.2") + (version "1.20.3") (source (origin (method url-fetch) @@ -5074,7 +5074,7 @@ over Xlib, including: name "-" version ".tar.bz2")) (sha256 (base32 - "1qnf7jdygdgbgjfm5mfr691dl8d56mpssa82mvhm8bzj92yggm8f")) + "1ph1j8gy5cazsq05krq9kppjx5v1sl75pbdka8ibxb1cq5kf8g0v")) (patches (list ;; See: -- cgit v1.2.3 From a2717e698619fed3204db978f954a1195e1d2b4b Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 29 Oct 2018 20:43:46 -0400 Subject: gnu: calcurse: Use HTTPS URLs. Reported by Marco van Hulten . * gnu/packages/calcurse.scm (calcurse)[source, home-page]: Use HTTPS URLs. --- gnu/packages/calcurse.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/calcurse.scm b/gnu/packages/calcurse.scm index 8ee5d86e3c..22b54d47ac 100644 --- a/gnu/packages/calcurse.scm +++ b/gnu/packages/calcurse.scm @@ -34,7 +34,7 @@ (source (origin (method url-fetch) - (uri (string-append "http://calcurse.org/files/calcurse-" + (uri (string-append "https://calcurse.org/files/calcurse-" version ".tar.gz")) (sha256 (base32 @@ -57,7 +57,7 @@ (setenv "TZDIR" ;for test/ical-007.sh (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo"))))))) - (home-page "http://www.calcurse.org") + (home-page "https://www.calcurse.org") (synopsis "Text-based calendar and scheduling") (description "Calcurse is a text-based calendar and scheduling application. It helps -- cgit v1.2.3 From 1371e2250ad04d658a6d85b3ded1c607a4090f2d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 30 Oct 2018 11:03:06 +0200 Subject: gnu: mujs: Update to 1.0.5. * gnu/packages/javascript.scm (mujs): Update to 1.0.5. --- gnu/packages/javascript.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index 75517caf6b..b2bbe8ec53 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice -;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2017, 2018 Efraim Flashner ;;; Copyright © 2018 Nicolas Goaziou ;;; ;;; This file is part of GNU Guix. @@ -413,7 +413,7 @@ external server.") (define-public mujs (package (name "mujs") - (version "1.0.4") + (version "1.0.5") (source (origin (method git-fetch) (uri (git-reference @@ -422,7 +422,7 @@ external server.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1ly0yybs66nk63517kg4dmdc7dbikhqqqf2r2kvccgzzvv6k0vs8")))) + "0pkv26jxwgv5ax0ylfmi4h96h79hj4gvr95218ns8wngnmgr1ny6")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From f8ddf719f3b4005b0cff0d36a82d23c07f2c2913 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 30 Oct 2018 11:03:48 +0200 Subject: gnu: mujs: Install shared library. * gnu/packages/javascript.scm (mujs)[arguments]: Add custom phase to install libmujs.so. --- gnu/packages/javascript.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index b2bbe8ec53..8731a44927 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -425,8 +425,14 @@ external server.") "0pkv26jxwgv5ax0ylfmi4h96h79hj4gvr95218ns8wngnmgr1ny6")))) (build-system gnu-build-system) (arguments - '(#:phases (modify-phases %standard-phases - (delete 'configure)) ; no configure + '(#:phases + (modify-phases %standard-phases + (delete 'configure) ; no configure + (add-after 'install 'install-shared-library + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (install-file "build/release/libmujs.so" + (string-append out "/lib")))))) #:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out")) (string-append "CC=gcc")) #:tests? #f)) ; no tests -- cgit v1.2.3 From b1435fe735171c340bc8309209edd2a37c6e5aae Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 30 Oct 2018 11:06:25 +0200 Subject: gnu: mupdf: Update to 1.14. * gnu/packages/pdf.scm (mupdf): Update to 1.14. [source]: Don't remove all the bundled libraries. [arguments]: Add 'configure-flags to use system libraries. --- gnu/packages/pdf.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index e71f814b8d..0dc8ef1205 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -596,7 +596,7 @@ extracting content or merging files.") (define-public mupdf (package (name "mupdf") - (version "1.13.0") + (version "1.14.0") (source (origin (method url-fetch) @@ -604,9 +604,17 @@ extracting content or merging files.") name "-" version "-source.tar.xz")) (sha256 (base32 - "0129k92bav692l6lyw10ryldx7h2f9khjpgnp3f3n4fdsph9hrkl")) + "1psnz02w5p7wc1s1ma7vvjmkjfy641xvsh9ykaqzkk84dflnjgk0")) (modules '((guix build utils))) - (snippet '(begin (delete-file-recursively "thirdparty") #t)))) + (snippet + ;; We keep lcms2 since it is different than our lcms. + '(begin + (for-each + (lambda (dir) + (delete-file-recursively (string-append "thirdparty/" dir))) + '("curl" "freeglut" "freetype" "harfbuzz" "jbig2dec" + "libjpeg" "mujs" "openjpeg" "zlib")) + #t)))) (build-system gnu-build-system) (inputs `(("curl" ,curl) @@ -627,6 +635,8 @@ extracting content or merging files.") '(#:tests? #f ; no check target #:make-flags (list "CC=gcc" "XCFLAGS=-fpic" + "USE_SYSTEM_LIBS=yes" + "USE_SYSTEM_MUJS=yes" (string-append "prefix=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases (delete 'configure)))) -- cgit v1.2.3 From e726f0939e8b015d27203e11a92208323c29a163 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 30 Oct 2018 11:12:57 +0200 Subject: gnu: mupdf: Update license list. * gnu/packages/pdf.scm (mupdf)[license]: Update the license list. --- gnu/packages/pdf.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 0dc8ef1205..061a65a0dc 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -651,7 +651,11 @@ listing the table of contents and hyperlinks. The library ships with a rudimentary X11 viewer, and a set of command line tools for batch rendering @command{pdfdraw}, rewriting files @command{pdfclean}, and examining the file structure @command{pdfshow}.") - (license license:agpl3+))) + (license (list license:agpl3+ + license:bsd-3 ; resources/cmaps + license:x11 ; thirdparty/lcms2 + license:silofl1.1 ; resources/fonts/{han,noto,sil,urw} + license:asl2.0)))) ; resources/fonts/droid (define-public qpdf (package -- cgit v1.2.3 From 24fc8f055df2138eaea74589c7f04793812f7bd8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 30 Oct 2018 11:08:10 +0200 Subject: gnu: zathura-pdf-mupdf: Update to 0.3.4. * gnu/packages/pdf.scm (zathura-pdf-mupdf): Update to 0.3.4. [source]: Remove patch. * gnu/packages/patches/zathura-pdf-mupdf-link-to-jpeg-libraries.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - .../zathura-pdf-mupdf-link-to-jpeg-libraries.patch | 55 ---------------------- gnu/packages/pdf.scm | 6 +-- 3 files changed, 2 insertions(+), 60 deletions(-) delete mode 100644 gnu/packages/patches/zathura-pdf-mupdf-link-to-jpeg-libraries.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 56c434d0a8..5f72879658 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1246,7 +1246,6 @@ dist_patch_DATA = \ %D%/packages/patches/xinetd-fix-fd-leak.patch \ %D%/packages/patches/xinetd-CVE-2013-4342.patch \ %D%/packages/patches/xmodmap-asprintf.patch \ - %D%/packages/patches/zathura-pdf-mupdf-link-to-jpeg-libraries.patch \ %D%/packages/patches/zathura-plugindir-environment-variable.patch MISC_DISTRO_FILES = \ diff --git a/gnu/packages/patches/zathura-pdf-mupdf-link-to-jpeg-libraries.patch b/gnu/packages/patches/zathura-pdf-mupdf-link-to-jpeg-libraries.patch deleted file mode 100644 index 63e058bbef..0000000000 --- a/gnu/packages/patches/zathura-pdf-mupdf-link-to-jpeg-libraries.patch +++ /dev/null @@ -1,55 +0,0 @@ -From: Tobias Geerinckx-Rice -Date: Mon, 18 Jun 2018 02:37:41 +0200 -Subject: zathura-pdf-mupdf: Link to JPEG libraries. - -As of version 0.3.3, zathura-pdf-mupdf no longer links to some required -JPEG libraries, leading to such errors as: - - $ zathura foo.pdf - error: Could not load plugin '/gnu/store/...-profile/lib/zathura/libpdf-mupdf.so' (/gnu/store/...-profile/lib/zathura/libpdf-mupdf.so: undefined symbol: jpeg_resync_to_restart). - -The patch below, copied verbatim from Arch[0], fixes that. -Its description happens to match our reality, too. - -[0]: https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/zathura-pdf-mupdf ---- -From 3fb0ff750373d45d4f5172ce1d41b74183cd07e8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= -Date: Sat, 24 Mar 2018 14:31:18 +0100 -Subject: [PATCH] Explicitly link against jbig2dec, openjp2, and jpeg -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Normally these are statically linked into libmupdfthird, but we delete -those to make mupdf use the system libraries. Previously -zathura-pdf-mupdf explicitly linked against them, but this is -technically incorrect since they are supposed to be in libmupdfthird so -that was removed. This commit essentially reverts that in the new build -system. - -Signed-off-by: Johannes Löthberg ---- - meson.build | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 3b0d7b7..ae2fc9c 100644 ---- a/meson.build -+++ b/meson.build -@@ -22,7 +22,11 @@ cairo = dependency('cairo') - mupdf = cc.find_library('mupdf') - mupdfthird = cc.find_library('mupdfthird') - --build_dependencies = [zathura, girara, glib, cairo, mupdf, mupdfthird] -+jbig2dec = cc.find_library('jbig2dec') -+openjp2 = cc.find_library('openjp2') -+jpeg = cc.find_library('jpeg') -+ -+build_dependencies = [zathura, girara, glib, cairo, mupdf, mupdfthird, jbig2dec, openjp2, jpeg] - - # defines - defines = [ --- -2.16.3 - diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 061a65a0dc..4c3e983497 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -415,17 +415,15 @@ using the DjVuLibre library.") (define-public zathura-pdf-mupdf (package (name "zathura-pdf-mupdf") - (version "0.3.3") + (version "0.3.4") (source (origin (method url-fetch) (uri (string-append "https://pwmt.org/projects/zathura-pdf-mupdf" "/download/zathura-pdf-mupdf-" version ".tar.xz")) - (patches - (search-patches "zathura-pdf-mupdf-link-to-jpeg-libraries.patch")) (sha256 (base32 - "1zbdqimav4wfgimpy3nfzl10qj7vyv23rdy2z5z7z93jwbp2rc2j")))) + "166d5nz47ixzwj4pixsd5fd9qvjf5v34cdqi3p72vr23pswk2hyn")))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("jbig2dec" ,jbig2dec) -- cgit v1.2.3 From a6f2afeee185ee28157649cccc1b06ff37fe93df Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 30 Oct 2018 11:10:07 +0200 Subject: gnu: zathura-pdf-mupdf: Simplify arguments. * gnu/packages/pdf.scm (zathura-pdf-mupdf)[arguments]: Remove custom 'patch-plugin-directory phase, replacd with configure-flag. --- gnu/packages/pdf.scm | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 4c3e983497..1d37de70d7 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -435,17 +435,9 @@ using the DjVuLibre library.") (build-system meson-build-system) (arguments `(#:tests? #f ; package does not contain tests - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-plugin-directory - ;; Something of a regression in 0.3.3: the new Meson build system - ;; now hard-codes an incorrect plugin directory. Fix it. - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "meson.build" - (("(install_dir:).*" _ key) - (string-append key - "'" (assoc-ref outputs "out") "/lib/zathura'\n"))) - #t))))) + #:configure-flags (list (string-append "-Dplugindir=" + (assoc-ref %outputs "out") + "/lib/zathura")))) (home-page "https://pwmt.org/projects/zathura-pdf-mupdf/") (synopsis "PDF support for zathura (mupdf backend)") (description "The zathura-pdf-mupdf plugin adds PDF support to zathura -- cgit v1.2.3 From 46cb1c97cb27904b5dea3d153d817130711a2e0a Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Fri, 26 Oct 2018 18:22:32 +0200 Subject: gnu: rust: Accept more detailed gdb lines for simple enums. * gnu/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch: Modify. * gnu/packages/rust.scm (rust-1.25)[arguments]<#:phases>[disable-nil-enum-test]: Delete phase. --- .../rust-1.25-accept-more-detailed-gdb-lines.patch | 16 ++++++++++++++++ gnu/packages/rust.scm | 7 ------- 2 files changed, 16 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch b/gnu/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch index 6ffc897297..f40a12d382 100644 --- a/gnu/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch +++ b/gnu/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch @@ -92,3 +92,19 @@ diff -ur orig/rustc-1.25.0-src/src/test/debuginfo/generic-tuple-style-enum.rs ru // gdb-command:print univariant // gdbg-check:$4 = {{__0 = -1}} +--- orig/rustc-1.25.0-src/src/test/debuginfo/nil-enum.rs 2018-09-13 10:24:33.783565071 +0200 ++++ rustc-1.25.0-src/src/test/debuginfo/nil-enum.rs 2018-10-26 18:19:20.404564587 +0200 +@@ -17,11 +17,11 @@ + + // gdb-command:print first + // gdbg-check:$1 = {} +-// gdbr-check:$1 = ++// gdbr-check:$1 = nil_enum::ANilEnum + + // gdb-command:print second + // gdbg-check:$2 = {} +-// gdbr-check:$2 = ++// gdbr-check:$2 = nil_enum::AnotherNilEnum + + #![allow(unused_variables)] + #![feature(omit_gdb_pretty_printer_section)] diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index cd4656ea03..f2794be8a6 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -706,13 +706,6 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" ;; This test wants to update the crate index. (("fn no_index_update") "#[ignore]\nfn no_index_update")) #t)) - ;; FIXME: Re-enable this test if it's indeed supposed to work. - ;; See . - (add-after 'configure 'disable-nil-enum-test - (lambda _ - (substitute* "src/test/debuginfo/nil-enum.rs" - (("ignore-lldb") "ignore-gdb")) - #t)) (replace 'patch-aarch64-test (lambda _ (substitute* "src/librustc_metadata/dynamic_lib.rs" -- cgit v1.2.3 From 7bf169f75cb4ffcef1393e702104eed63bc70917 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sun, 23 Sep 2018 01:19:53 +0200 Subject: gnu: rust: Hide "ar" entry from rust@1.21.0. * gnu/packages/rust.scm (rust-1.21)[arguments]<#:phases>[remove-ar]: New phase. --- gnu/packages/rust.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index f2794be8a6..7871946883 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -637,8 +637,20 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" #t)))))))))) (define-public rust-1.21 - (rust-bootstrapped-package rust-1.20 "1.21.0" - "1yj8lnxybjrybp00fqhxw8fpr641dh8wcn9mk44xjnsb4i1c21qp")) + (let ((base-rust (rust-bootstrapped-package rust-1.20 "1.21.0" + "1yj8lnxybjrybp00fqhxw8fpr641dh8wcn9mk44xjnsb4i1c21qp"))) + (package + (inherit base-rust) + (arguments + (substitute-keyword-arguments (package-arguments base-rust) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'configure 'remove-ar + (lambda* (#:key inputs #:allow-other-keys) + ;; Remove because toml complains about "unknown field". + (substitute* "config.toml" + (("^ar =.*") "\n")) + #t))))))))) (define-public rust-1.22 (rust-bootstrapped-package rust-1.21 "1.22.1" -- cgit v1.2.3 From a75b8c08c0a28b1243680efccbe59ec5aa88795d Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 24 Sep 2018 00:37:58 +0200 Subject: gnu: rust@1.23.0: Inherit from rust@1.22.0. * gnu/packages/rust.scm (rust-1.23)[inherit]: Inherit from rust-1.22. [arguments]: Inherit from rust-1.22. Delete "remove-ar" phase. --- gnu/packages/rust.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 7871946883..6eb71d2787 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -658,7 +658,7 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (define-public rust-1.23 (package - (inherit rust-1.20) + (inherit rust-1.22) (name "rust") (version "1.23.0") (source (rust-source version "14fb8vhjzsxlbi6yrn1r6fl5dlbdd1m92dn5zj5gmzfwf4w9ar3l")) @@ -666,12 +666,13 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (native-inputs (alist-replace "cargo-bootstrap" (list rust-bootstrap "cargo") (alist-replace "rustc-bootstrap" (list rust-bootstrap) - (package-native-inputs rust-1.20)))) + (package-native-inputs rust-1.22)))) (arguments - (substitute-keyword-arguments (package-arguments rust-1.20) + (substitute-keyword-arguments (package-arguments rust-1.22) ((#:phases phases) `(modify-phases ,phases (delete 'configure-archiver) + (delete 'remove-ar) (add-after 'unpack 'dont-build-native (lambda _ ;; XXX: Revisit this when we use gcc 6. -- cgit v1.2.3 From 44d530ef095acb78847e917be4bfe70753561ead Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 24 Sep 2018 00:40:58 +0200 Subject: gnu: rust@1.23.0: Bootstrap from rust@1.22.0. * gnu/packages/rust.scm (rust-1.23): Bootstrap from rust@1.22.0. --- gnu/packages/rust.scm | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 6eb71d2787..25ced10d9c 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -657,28 +657,22 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" "1lrzzp0nh7s61wgfs2h6ilaqi6iq89f1pd1yaf65l87bssyl4ylb")) (define-public rust-1.23 - (package - (inherit rust-1.22) - (name "rust") - (version "1.23.0") - (source (rust-source version "14fb8vhjzsxlbi6yrn1r6fl5dlbdd1m92dn5zj5gmzfwf4w9ar3l")) - ;; Use rust-bootstrap@1.22 package to build rust 1.23 - (native-inputs - (alist-replace "cargo-bootstrap" (list rust-bootstrap "cargo") - (alist-replace "rustc-bootstrap" (list rust-bootstrap) - (package-native-inputs rust-1.22)))) - (arguments - (substitute-keyword-arguments (package-arguments rust-1.22) - ((#:phases phases) - `(modify-phases ,phases - (delete 'configure-archiver) - (delete 'remove-ar) - (add-after 'unpack 'dont-build-native - (lambda _ - ;; XXX: Revisit this when we use gcc 6. - (substitute* "src/binaryen/CMakeLists.txt" - (("ADD_COMPILE_FLAG\\(\\\"-march=native\\\"\\)") "")) - #t)))))))) + (let ((base-rust (rust-bootstrapped-package rust-1.22 "1.23.0" + "14fb8vhjzsxlbi6yrn1r6fl5dlbdd1m92dn5zj5gmzfwf4w9ar3l"))) + (package + (inherit base-rust) + (arguments + (substitute-keyword-arguments (package-arguments base-rust) + ((#:phases phases) + `(modify-phases ,phases + (delete 'configure-archiver) + (delete 'remove-ar) + (add-after 'unpack 'dont-build-native + (lambda _ + ;; XXX: Revisit this when we use gcc 6. + (substitute* "src/binaryen/CMakeLists.txt" + (("ADD_COMPILE_FLAG\\(\\\"-march=native\\\"\\)") "")) + #t))))))))) (define-public rust-1.24 (let ((base-rust -- cgit v1.2.3 From 52bc7df1a19b05caef59a72b69e015cccf719893 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 24 Sep 2018 13:08:07 +0200 Subject: gnu: rust: Remove binary bootstrapper. * gnu/packages/rust.scm (rust-bootstrap): Delete variable. --- gnu/packages/rust.scm | 82 --------------------------------------------------- 1 file changed, 82 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 25ced10d9c..a56faad079 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -69,88 +69,6 @@ ("mips64el-linux" "mips64el-unknown-linux-gnuabi64") (_ (nix-system->gnu-triplet system)))) -(define rust-bootstrap - (package - (name "rust-bootstrap") - (version "1.22.1") - (source #f) - (build-system gnu-build-system) - (native-inputs - `(("patchelf" ,patchelf))) - (inputs - `(("gcc" ,(canonical-package gcc)) - ("gcc:lib" ,(canonical-package gcc) "lib") - ("zlib" ,zlib) - ("source" - ,(origin - (method url-fetch) - (uri (string-append - "https://static.rust-lang.org/dist/" - "rust-" version "-" (nix-system->gnu-triplet-for-rust) - ".tar.gz")) - (sha256 - (base32 - (match (nix-system->gnu-triplet-for-rust) - ("i686-unknown-linux-gnu" - "15zqbx86nm13d5vq2gm69b7av4vg479f74b5by64hs3bcwwm08pr") - ("x86_64-unknown-linux-gnu" - "1yll78x6b3abnvgjf2b66gvp6mmcb9y9jdiqcwhmgc0z0i0fix4c") - ("armv7-unknown-linux-gnueabihf" - "138a8l528kzp5wyk1mgjaxs304ac5ms8vlpq0ggjaznm6bn2j7a5") - ("aarch64-unknown-linux-gnu" - "0z6m9m1rx4d96nvybbfmpscq4dv616m615ijy16d5wh2vx0p4na8") - ("mips64el-unknown-linux-gnuabi64" - "07k4pcv7jvfa48cscdj8752lby7m7xdl88v3a6na1vs675lhgja2") - (_ "")))))))) - (outputs '("out" "cargo")) - (arguments - `(#:tests? #f - #:strip-binaries? #f - #:phases - (modify-phases %standard-phases - (delete 'configure) - (delete 'build) - (replace 'install - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (cargo-out (assoc-ref outputs "cargo")) - (gcc:lib (assoc-ref inputs "gcc:lib")) - (libc (assoc-ref inputs "libc")) - (zlib (assoc-ref inputs "zlib")) - (ld-so (string-append libc ,(glibc-dynamic-linker))) - (rpath (string-append out "/lib:" zlib "/lib:" - libc "/lib:" gcc:lib "/lib")) - (cargo-rpath (string-append cargo-out "/lib:" libc "/lib:" - gcc:lib "/lib")) - (rustc (string-append out "/bin/rustc")) - (rustdoc (string-append out "/bin/rustdoc")) - (cargo (string-append cargo-out "/bin/cargo")) - (gcc (assoc-ref inputs "gcc"))) - ;; Install rustc/rustdoc. - (invoke "bash" "install.sh" - (string-append "--prefix=" out) - (string-append "--components=rustc," - "rust-std-" - ,(nix-system->gnu-triplet-for-rust))) - ;; Install cargo. - (invoke "bash" "install.sh" - (string-append "--prefix=" cargo-out) - (string-append "--components=cargo")) - (for-each (lambda (file) - (invoke "patchelf" "--set-rpath" rpath file)) - (cons* rustc rustdoc (find-files out "\\.so$"))) - (invoke "patchelf" "--set-rpath" cargo-rpath cargo) - (for-each (lambda (file) - (invoke "patchelf" "--set-interpreter" ld-so file)) - (list rustc rustdoc cargo)) - #t)))))) - (home-page "https://www.rust-lang.org") - (synopsis "Prebuilt rust compiler and cargo package manager") - (description "This package provides a pre-built @command{rustc} compiler -and a pre-built @command{cargo} package manager, which can -in turn be used to build the final Rust.") - (license license:asl2.0))) - (define* (rust-source version hash #:key (patches '())) (origin -- cgit v1.2.3 From 4df3e06210405dda92d0e9749b8434a095e1277e Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 15 Oct 2018 11:58:37 +0200 Subject: gnu: rust: Document upstream's assessment. * gnu/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch: Add URL. --- gnu/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch b/gnu/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch index f40a12d382..a2bad55117 100644 --- a/gnu/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch +++ b/gnu/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch @@ -1,5 +1,6 @@ GDB responds with some overly detailed lines - which makes the tests fail. Patch rust to accept those instead. +See . diff -ur orig/rustc-1.25.0-src/src/test/debuginfo/generic-enum-with-different-disr-sizes.rs rustc-1.25.0-src/src/test/debuginfo/generic-enum-with-different-disr-sizes.rs --- orig/rustc-1.25.0-src/src/test/debuginfo/generic-enum-with-different-disr-sizes.rs 2018-09-13 10:24:33.775565159 +0200 +++ rustc-1.25.0-src/src/test/debuginfo/generic-enum-with-different-disr-sizes.rs 2018-09-13 10:25:56.322513658 +0200 -- cgit v1.2.3 From 03f8011220baf59a0314018c8e564b29c0c2b8b9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Oct 2018 19:20:50 +0100 Subject: gnu: Add r-ini. * gnu/packages/cran.scm (r-ini): New variable. --- gnu/packages/cran.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 7f2123b90e..c92b41d140 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6693,3 +6693,24 @@ component analysis and correlation matrices, cluster analyses, scatter plots, stacked scales, effects plots of regression models (including interaction terms) and much more. This package supports labelled data.") (license license:gpl3))) + +(define-public r-ini + (package + (name "r-ini") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "ini" version)) + (sha256 + (base32 + "04yqij344dwm0xqgara8xia42mlmij3i8711qbb5534w05a1l6bv")))) + (build-system r-build-system) + (home-page "https://github.com/dvdscripter/ini") + (synopsis "Read and write configuration files") + (description + "This package provides tools to parse simple @code{.ini} configuration +files to an structured list. Users can manipulate this resulting list with +@code{lapply()} functions. This same structured list can be used to write +back to file after modifications.") + (license license:gpl3))) -- cgit v1.2.3 From 21405e81e7bf4016c4e8ed385186a94e8955bef7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Oct 2018 19:21:02 +0100 Subject: gnu: Add r-gh. * gnu/packages/cran.scm (r-gh): New variable. --- gnu/packages/cran.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c92b41d140..5e9973a071 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6714,3 +6714,25 @@ files to an structured list. Users can manipulate this resulting list with @code{lapply()} functions. This same structured list can be used to write back to file after modifications.") (license license:gpl3))) + +(define-public r-gh + (package + (name "r-gh") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "gh" version)) + (sha256 + (base32 + "1llinfajb0g7006jd2w1hpskxpmkjhnqarcjb71r1qvsccb2ph7k")))) + (build-system r-build-system) + (propagated-inputs + `(("r-httr" ,r-httr) + ("r-ini" ,r-ini) + ("r-jsonlite" ,r-jsonlite))) + (home-page "https://github.com/r-lib/gh#readme") + (synopsis "Access the GitHub API via R") + (description + "This package provides a minimal R client to access the GitHub API.") + (license license:expat))) -- cgit v1.2.3 From d6871153c8217f79cb2fe10a002eaaa9c4340e34 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Oct 2018 19:21:15 +0100 Subject: gnu: Add r-fs. * gnu/packages/cran.scm (r-fs): New variable. --- gnu/packages/cran.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 5e9973a071..bc99c3e6df 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6736,3 +6736,26 @@ back to file after modifications.") (description "This package provides a minimal R client to access the GitHub API.") (license license:expat))) + +(define-public r-fs + (package + (name "r-fs") + (version "1.2.6") + (source + (origin + (method url-fetch) + (uri (cran-uri "fs" version)) + (sha256 + (base32 + "0kqqaqqml8x3r1mdld40iwns0ylj2f52qsdh1vcn39f7w7c2ka8j")))) + (build-system r-build-system) + (propagated-inputs + `(("r-rcpp" ,r-rcpp))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "http://fs.r-lib.org") + (synopsis "Cross-platform file system operations based on libuv") + (description + "This package provides a cross-platform interface to file system +operations, built on top of the libuv C library.") + (license license:gpl3))) -- cgit v1.2.3 From 153e5b2ddc2d4ffa8cdfad4f5a3154be0b115551 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Oct 2018 19:21:26 +0100 Subject: gnu: Add r-clisymbols. * gnu/packages/cran.scm (r-clisymbols): New variable. --- gnu/packages/cran.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index bc99c3e6df..74e8367a29 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6759,3 +6759,23 @@ back to file after modifications.") "This package provides a cross-platform interface to file system operations, built on top of the libuv C library.") (license license:gpl3))) + +(define-public r-clisymbols + (package + (name "r-clisymbols") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "clisymbols" version)) + (sha256 + (base32 + "1q7gi2zmykhzas9v8fdnbpdq7pzdcpbhim1yxvd2062l777g4j86")))) + (build-system r-build-system) + (home-page "https://github.com/gaborcsardi/clisymbols") + (synopsis "Unicode symbols at the R prompt") + (description + "This package provides a small subset of Unicode symbols, that are useful +when building command line applications. They fall back to alternatives on +terminals that do not support Unicode.") + (license license:expat))) -- cgit v1.2.3 From efefd3ec42be0125f71066995b94ab8c6a26cde4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Oct 2018 19:21:37 +0100 Subject: gnu: Add r-usethis. * gnu/packages/cran.scm (r-usethis): New variable. --- gnu/packages/cran.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 74e8367a29..00aa963473 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6779,3 +6779,38 @@ operations, built on top of the libuv C library.") when building command line applications. They fall back to alternatives on terminals that do not support Unicode.") (license license:expat))) + +(define-public r-usethis + (package + (name "r-usethis") + (version "1.4.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "usethis" version)) + (sha256 + (base32 + "1gadckx3sxz9gxvpkprj9x7zcgg2nz5m4q0vi76ya9li1v03rwwn")))) + (build-system r-build-system) + (propagated-inputs + `(("r-clipr" ,r-clipr) + ("r-clisymbols" ,r-clisymbols) + ("r-crayon" ,r-crayon) + ("r-curl" ,r-curl) + ("r-desc" ,r-desc) + ("r-fs" ,r-fs) + ("r-gh" ,r-gh) + ("r-git2r" ,r-git2r) + ("r-glue" ,r-glue) + ("r-rlang" ,r-rlang) + ("r-rprojroot" ,r-rprojroot) + ("r-rstudioapi" ,r-rstudioapi) + ("r-whisker" ,r-whisker))) + (home-page "https://github.com/r-lib/usethis") + (synopsis "Automate R package and project setup") + (description + "This package helps you to automate R package and project setup tasks +that are otherwise performed manually. This includes setting up unit testing, +test coverage, continuous integration, Git, GitHub integration, licenses, +Rcpp, RStudio projects, and more.") + (license license:gpl3))) -- cgit v1.2.3 From 993426244e19738d435a3c37a38ca60e92b45cf2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Oct 2018 19:21:45 +0100 Subject: gnu: Add r-sessioninfo. * gnu/packages/cran.scm (r-sessioninfo): New variable. --- gnu/packages/cran.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 00aa963473..8b12dd0214 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6814,3 +6814,26 @@ that are otherwise performed manually. This includes setting up unit testing, test coverage, continuous integration, Git, GitHub integration, licenses, Rcpp, RStudio projects, and more.") (license license:gpl3))) + +(define-public r-sessioninfo + (package + (name "r-sessioninfo") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "sessioninfo" version)) + (sha256 + (base32 + "01c0m8yzadpwd825hky6as0f8ka4xyz7zfy0ih2iy7qqw11w6qn5")))) + (build-system r-build-system) + (propagated-inputs + `(("r-cli" ,r-cli) + ("r-withr" ,r-withr))) + (home-page "https://github.com/r-lib/sessioninfo#readme") + (synopsis "R session information") + (description + "This package provides tools to query and print information about the +current R session. It is similar to @code{utils::sessionInfo()}, but includes +more information about packages, and where they were installed from.") + (license license:gpl2))) -- cgit v1.2.3 From cbc8e6dd4aecdc92c823b623b76b365cec9a364d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Oct 2018 19:21:55 +0100 Subject: gnu: Add r-remotes. * gnu/packages/cran.scm (r-remotes): New variable. --- gnu/packages/cran.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8b12dd0214..645a22abf0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6837,3 +6837,24 @@ Rcpp, RStudio projects, and more.") current R session. It is similar to @code{utils::sessionInfo()}, but includes more information about packages, and where they were installed from.") (license license:gpl2))) + +(define-public r-remotes + (package + (name "r-remotes") + (version "2.0.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "remotes" version)) + (sha256 + (base32 + "1xkzlciv68jyf4j8hads0i47nxbgsy1kv7258c6zzyq66z0amhss")))) + (build-system r-build-system) + (home-page "https://github.com/r-lib/remotes#readme") + (synopsis "R package installation from remote repositories") + (description + "Download and install R packages stored in GitHub, BitBucket, or plain +subversion or git repositories. This package is a lightweight replacement of +the @code{install_*} functions in the @code{devtools} package. Indeed most of +the code was copied over from @code{devtools}.") + (license license:gpl2+))) -- cgit v1.2.3 From 7d8f34707a9fb41b88b5ea0a0cee7068ce9e9cf0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Oct 2018 19:22:04 +0100 Subject: gnu: Add r-xopen. * gnu/packages/cran.scm (r-xopen): New variable. --- gnu/packages/cran.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 645a22abf0..9e4ea6b0a4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6858,3 +6858,24 @@ subversion or git repositories. This package is a lightweight replacement of the @code{install_*} functions in the @code{devtools} package. Indeed most of the code was copied over from @code{devtools}.") (license license:gpl2+))) + +(define-public r-xopen + (package + (name "r-xopen") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "xopen" version)) + (sha256 + (base32 + "1vrvgdika1d63dwygynbv2wmd87ll8dji5dy89hj576n8hw601z2")))) + (build-system r-build-system) + (propagated-inputs + `(("r-processx" ,r-processx))) + (home-page "https://github.com/r-lib/xopen#readme") + (synopsis "Open system files, URLs, anything") + (description + "This package provides a cross-platform solution to open files, +directories or URLs with their associated programs.") + (license license:expat))) -- cgit v1.2.3 From 5df4e27fec27d20ab2c17691b2c5ff15ce8fb066 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Oct 2018 19:22:13 +0100 Subject: gnu: Add r-rcmdcheck. * gnu/packages/cran.scm (r-rcmdcheck): New variable. --- gnu/packages/cran.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9e4ea6b0a4..c6fab7554e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6879,3 +6879,34 @@ the code was copied over from @code{devtools}.") "This package provides a cross-platform solution to open files, directories or URLs with their associated programs.") (license license:expat))) + +(define-public r-rcmdcheck + (package + (name "r-rcmdcheck") + (version "1.3.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "rcmdcheck" version)) + (sha256 + (base32 + "13liz9lmx9xgc0f7pjiz3sp8ygvazx2zslbiwz3p9fimfsx1yfsg")))) + (build-system r-build-system) + (propagated-inputs + `(("r-callr" ,r-callr) + ("r-cli" ,r-cli) + ("r-crayon" ,r-crayon) + ("r-desc" ,r-desc) + ("r-digest" ,r-digest) + ("r-pkgbuild" ,r-pkgbuild) + ("r-prettyunits" ,r-prettyunits) + ("r-r6" ,r-r6) + ("r-rprojroot" ,r-rprojroot) + ("r-withr" ,r-withr) + ("r-xopen" ,r-xopen))) + (home-page "https://github.com/r-Lib/rcmdcheck#readme") + (synopsis "Run R CMD check from R and capture results") + (description + "Run @code{R CMD check} from R programmatically, and capture the results +of the individual checks.") + (license license:expat))) -- cgit v1.2.3 From 9b02d1a11e75044d46e5341b47659d45b1ecb21f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Oct 2018 19:22:23 +0100 Subject: gnu: Add r-rapportools. * gnu/packages/cran.scm (r-rapportools): New variable. --- gnu/packages/cran.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c6fab7554e..ab93c833f8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6910,3 +6910,27 @@ directories or URLs with their associated programs.") "Run @code{R CMD check} from R programmatically, and capture the results of the individual checks.") (license license:expat))) + +(define-public r-rapportools + (package + (name "r-rapportools") + (version "1.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "rapportools" version)) + (sha256 + (base32 + "1sgv4sc737i12arh5dc3263kjsz3dzg06qihfmrqyax94mv2d01b")))) + (build-system r-build-system) + (propagated-inputs + `(("r-pander" ,r-pander) + ("r-plyr" ,r-plyr) + ("r-reshape" ,r-reshape))) + (home-page "https://cran.r-project.org/web/packages/rapportools/") + (synopsis "Miscellaneous helper functions with sane defaults for reporting") + (description + "This package provides helper functions that act as wrappers to more +advanced statistical methods with the advantage of having sane defaults for +quick reporting.") + (license license:agpl3+))) -- cgit v1.2.3 From 319a80ce96f49e6750c80529dd5fbdf50594b343 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Oct 2018 19:22:38 +0100 Subject: gnu: Add r-pander. * gnu/packages/cran.scm (r-pander): New variable. --- gnu/packages/cran.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ab93c833f8..bed280ba51 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6934,3 +6934,29 @@ of the individual checks.") advanced statistical methods with the advantage of having sane defaults for quick reporting.") (license license:agpl3+))) + +(define-public r-pander + (package + (name "r-pander") + (version "0.6.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "pander" version)) + (sha256 + (base32 + "0gd7rqkpbraznip8jmri9lqa8ajg1sryyplhd6m633wg91whiipi")))) + (build-system r-build-system) + (propagated-inputs + `(("r-digest" ,r-digest) + ("r-rcpp" ,r-rcpp))) + (home-page "https://rapporter.github.io/pander") + (synopsis "Render R objects into Pandoc's markdown") + (description + "The main aim of the pander R package is to provide a minimal and easy +tool for rendering R objects into Pandoc's markdown. The package is also +capable of exporting/converting complex Pandoc documents (reports) in various +ways.") + ;; This package is licensed under either the AGPLv3+ or the very rarely + ;; used OSL 3.0. + (license license:agpl3+))) -- cgit v1.2.3 From 74cc74e43496f7534c6878137d32284df065ec75 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Oct 2018 19:22:48 +0100 Subject: gnu: Add r-summarytools. * gnu/packages/cran.scm (r-summarytools): New variable. --- gnu/packages/cran.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index bed280ba51..a41448970a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6960,3 +6960,33 @@ ways.") ;; This package is licensed under either the AGPLv3+ or the very rarely ;; used OSL 3.0. (license license:agpl3+))) + +(define-public r-summarytools + (package + (name "r-summarytools") + (version "0.8.8") + (source + (origin + (method url-fetch) + (uri (cran-uri "summarytools" version)) + (sha256 + (base32 + "0z836m6ib9bznwcawn6xf8gck05ydxwi3bx4jbrbyqql4kci8zwb")))) + (build-system r-build-system) + (propagated-inputs + `(("r-htmltools" ,r-htmltools) + ("r-lubridate" ,r-lubridate) + ("r-matrixstats" ,r-matrixstats) + ("r-pander" ,r-pander) + ("r-pryr" ,r-pryr) + ("r-rapportools" ,r-rapportools) + ("r-rcurl" ,r-rcurl))) + (home-page "https://github.com/dcomtois/summarytools") + (synopsis "Tools to quickly and neatly summarize data") + (description + "This package provides tools for data frame summaries, cross-tabulations, +weight-enabled frequency tables and common univariate statistics in concise +tables available in a variety of formats (plain ASCII, Markdown and HTML). A +good point-of-entry for exploring data, both for experienced and new R +users.") + (license license:gpl2))) -- cgit v1.2.3 From 7c7ee6cf4c1066ac97386269065d53782b04f7e9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Oct 2018 19:22:58 +0100 Subject: gnu: Add r-lsei. * gnu/packages/cran.scm (r-lsei): New variable. --- gnu/packages/cran.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a41448970a..ba55e72638 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6990,3 +6990,26 @@ tables available in a variety of formats (plain ASCII, Markdown and HTML). A good point-of-entry for exploring data, both for experienced and new R users.") (license license:gpl2))) + +(define-public r-lsei + (package + (name "r-lsei") + (version "1.2-0") + (source + (origin + (method url-fetch) + (uri (cran-uri "lsei" version)) + (sha256 + (base32 + "1xl06fb3is744pxlh42wx5hn1h0ab1k31wnmsmh0524kxzcyp0a7")))) + (build-system r-build-system) + (native-inputs + `(("gfortran" ,gfortran))) + (home-page "https://www.stat.auckland.ac.nz/~yongwang") + (synopsis "Solve regression problems under equality/inequality constraints") + (description + "It contains functions that solve least squares linear regression +problems under linear equality/inequality constraints. Functions for solving +quadratic programming problems are also available, which transform such +problems into least squares ones first.") + (license license:gpl2+))) -- cgit v1.2.3 From 2ea75a83690da0963cb72ab859f768c880cc707f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Oct 2018 19:23:04 +0100 Subject: gnu: Add r-npsurv. * gnu/packages/cran.scm (r-npsurv): New variable. --- gnu/packages/cran.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ba55e72638..e321993c12 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7013,3 +7013,24 @@ problems under linear equality/inequality constraints. Functions for solving quadratic programming problems are also available, which transform such problems into least squares ones first.") (license license:gpl2+))) + +(define-public r-npsurv + (package + (name "r-npsurv") + (version "0.4-0") + (source + (origin + (method url-fetch) + (uri (cran-uri "npsurv" version)) + (sha256 + (base32 + "1wq4c9yfha5azjhrn40iiqkshmvh611sa90jp3lh82n4bl9zfk20")))) + (build-system r-build-system) + (propagated-inputs + `(("r-lsei" ,r-lsei))) + (home-page "https://www.stat.auckland.ac.nz/~yongwang") + (synopsis "Nonparametric survival analysis") + (description + "This package contains functions for non-parametric survival analysis of +exact and interval-censored observations.") + (license license:gpl2+))) -- cgit v1.2.3 From 2f5e8f609447c70c6c50a95f880f82d53a70c78c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Oct 2018 19:30:57 +0100 Subject: gnu: r-mass: Update to 7.3-51. * gnu/packages/statistics.scm (r-mass): Update to 7.3-51. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 04979ffe25..95acf733ed 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -339,14 +339,14 @@ D.V. Hinkley (1997, CUP), originally written by Angelo Canty for S.") (define-public r-mass (package (name "r-mass") - (version "7.3-50") + (version "7.3-51") (source (origin (method url-fetch) (uri (cran-uri "MASS" version)) (sha256 (base32 - "16hasv9k4n773jsyzvh8s3gbga49hwdj8n5hxij6zqisy4i0kxq6")))) + "0yp5ssfm9mahrp30y1hkqgjg70mzs6w065ba8h7j5ky1z6msdsdy")))) (properties `((upstream-name . "MASS"))) (build-system r-build-system) (home-page "http://www.stats.ox.ac.uk/pub/MASS4/") -- cgit v1.2.3 From b85f805090787585ce318949c3ccb6cb72fef0f2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Oct 2018 19:31:45 +0100 Subject: gnu: r-mgcv: Update to 1.8-25. * gnu/packages/statistics.scm (r-mgcv): Update to 1.8-25. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 95acf733ed..d966407f0d 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -532,14 +532,14 @@ nonlinear mixed-effects models.") (define-public r-mgcv (package (name "r-mgcv") - (version "1.8-24") + (version "1.8-25") (source (origin (method url-fetch) (uri (cran-uri "mgcv" version)) (sha256 (base32 - "15b76m1f0hz8dbmj9shqvslihdx5b7c48vck9grj5xs1z2y45r9c")))) + "1y2rq6v45pr2wcxihhgmingcdvcsilim2cvskrlb7k2n00qg6v2q")))) (build-system r-build-system) (propagated-inputs `(("r-matrix" ,r-matrix) -- cgit v1.2.3 From 058394967cf690a6f22ac60bdb692bf1d9784f2f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Oct 2018 19:31:59 +0100 Subject: gnu: r-digest: Update to 0.6.18. * gnu/packages/statistics.scm (r-digest): Update to 0.6.18. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index d966407f0d..703207663e 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -725,13 +725,13 @@ effects of different types of color-blindness.") (define-public r-digest (package (name "r-digest") - (version "0.6.16") + (version "0.6.18") (source (origin (method url-fetch) (uri (cran-uri "digest" version)) (sha256 - (base32 "1lhs59pdjhpb63jyy98pi1shk9shw044k6vl0mvw0f40v08326ar")))) + (base32 "0k3iv0r8wy8w7zchmgrnrqv3bc149075j4817kf0q521vi4f6vbj")))) (build-system r-build-system) ;; Vignettes require r-knitr, which requires r-digest, so we have to ;; disable them and the tests. -- cgit v1.2.3 From 9413424d2df8fae20a280526b626d0aa4fc6569b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Oct 2018 19:32:14 +0100 Subject: gnu: r-ggplot2: Update to 3.1.0. * gnu/packages/statistics.scm (r-ggplot2): Update to 3.1.0. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 703207663e..12e869514e 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1059,13 +1059,13 @@ legends.") (define-public r-ggplot2 (package (name "r-ggplot2") - (version "3.0.0") + (version "3.1.0") (source (origin (method url-fetch) (uri (cran-uri "ggplot2" version)) (sha256 - (base32 "0kb977hizsvk3b1k3zr717q78bpmbabhl8cj9a3w717nkq1zas67")))) + (base32 "1msy36r21nlmnpyaw2m9k0ykmnd19b9il01b65w457pfw75prrs9")))) (build-system r-build-system) (propagated-inputs `(("r-digest" ,r-digest) -- cgit v1.2.3 From 9f7438355d7efb72d5640c050a25c498d0599f78 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Oct 2018 19:32:34 +0100 Subject: gnu: r-mine: Update to 0.6. * gnu/packages/statistics.scm (r-mine): Update to 0.6. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 12e869514e..e6ca26636b 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1310,13 +1310,13 @@ supported via Andre Simon's highlight package.") (define-public r-mime (package (name "r-mime") - (version "0.5") + (version "0.6") (source (origin (method url-fetch) (uri (cran-uri "mime" version)) (sha256 (base32 - "0i91m3ivaja1k33jwcvz16pfjypkci27awm8glil7sxhmwaj3izw")))) + "00f4gw4sg1kn03s67gficxgb7a7fb6pwhlvrxrml05q1mc2vcxa7")))) (build-system r-build-system) (home-page "https://github.com/yihui/mime") (synopsis "R package to map filenames to MIME types") -- cgit v1.2.3 From cb448dd251219cb36fbb7d16186edf69c3b8f5d1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Oct 2018 19:32:45 +0100 Subject: gnu: r-microbenchmark: Update to 1.4-6. * gnu/packages/statistics.scm (r-microbenchmark): Update to 1.4-6. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index e6ca26636b..e9029a717b 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1423,13 +1423,13 @@ from knitr Rmarkdown.") (define-public r-microbenchmark (package (name "r-microbenchmark") - (version "1.4-4") + (version "1.4-6") (source (origin (method url-fetch) (uri (cran-uri "microbenchmark" version)) (sha256 (base32 - "0fv2w2vsiz18imf4115nd9chhmf275w2mb49pn7pkxi6z3bamc9c")))) + "1sn1fxgzakm5iqbgc35g3k4yi0iqrkmwz33cvdrphrzh1lxnmi3s")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/microbenchmark/") (synopsis "Accurate timing functions for R") -- cgit v1.2.3 From 3a83251c4f48ccaab791fa9b0fbe0e5c8df8fbad Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Oct 2018 19:33:06 +0100 Subject: gnu: r-testthat: Update to 2.0.1. * gnu/packages/statistics.scm (r-testthat): Update to 2.0.1. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index e9029a717b..6cec56a4cb 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1526,13 +1526,13 @@ R packages that praise their users.") (define-public r-testthat (package (name "r-testthat") - (version "2.0.0") + (version "2.0.1") (source (origin (method url-fetch) (uri (cran-uri "testthat" version)) (sha256 (base32 - "155l53kb69jga5d8c5nvdwqlvlgfmk4vzyyl4d0108j53jnlgh1v")))) + "1cafy5xsjx6m08s45456mjsal7mfxzwpbrds0p4z3gwam948gpzy")))) (build-system r-build-system) (propagated-inputs `(("r-cli" ,r-cli) -- cgit v1.2.3 From 822863f8f9f05e044bca00dca98b5a2e714192fa Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Oct 2018 19:33:20 +0100 Subject: gnu: r-r6: Update to 2.3.0. * gnu/packages/statistics.scm (r-r6): Update to 2.3.0. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 6cec56a4cb..1564839b6c 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1553,13 +1553,13 @@ flexible and easy to set up.") (define-public r-r6 (package (name "r-r6") - (version "2.2.2") + (version "2.3.0") (source (origin (method url-fetch) (uri (cran-uri "R6" version)) (sha256 (base32 - "13xfdr19ca7ymisidsanm6w7hsk3qmy5l8c0mlz3nk48f7s5cxq8")))) + "1jgshp0x8a65rwyvk31slnfp7l153dk5826y2rxcd5lpclby3d85")))) (build-system r-build-system) (home-page "https://github.com/wch/R6/") (synopsis "Classes with reference semantics in R") -- cgit v1.2.3 From 17f6198f0634e3bf219e5864c5d587cda2206051 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Oct 2018 19:33:32 +0100 Subject: gnu: r-rlang: Update to 0.3.0.1. * gnu/packages/statistics.scm (r-rlang): Update to 0.3.0.1. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 1564839b6c..cd213c25c4 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1575,13 +1575,13 @@ defined in different packages.") (define-public r-rlang (package (name "r-rlang") - (version "0.2.2") + (version "0.3.0.1") (source (origin (method url-fetch) (uri (cran-uri "rlang" version)) (sha256 (base32 - "0cqd894wzi53rs53prg0j7i75h0yzgi0127fzjqbdbhczwh984f9")))) + "0j7kp6h25wbkvpzr7dpc0zgdpjiwsjjlgprj3mv7bgfalfq1si99")))) (build-system r-build-system) (home-page "http://rlang.tidyverse.org") (synopsis "Functions for base types, core R and Tidyverse features") -- cgit v1.2.3 From f75ee8c69120e3d6297777f77930221a5ee707ec Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Oct 2018 19:33:43 +0100 Subject: gnu: r-dplyr: Update to 0.7.7. * gnu/packages/statistics.scm (r-dplyr): Update to 0.7.7. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index cd213c25c4..293f61af92 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1617,13 +1617,13 @@ and printing capabilities than traditional data frames.") (define-public r-dplyr (package (name "r-dplyr") - (version "0.7.6") + (version "0.7.7") (source (origin (method url-fetch) (uri (cran-uri "dplyr" version)) (sha256 (base32 - "0c43h13s5mr0fklikbbm89gs6z5n66rkjzdv6w3w6kl5af5wr2fl")))) + "196lwck3i3m25jnn1f1nrda9svnjqqi89s0is79gbrphamddnlq5")))) (build-system r-build-system) (propagated-inputs `(("r-assertthat" ,r-assertthat) -- cgit v1.2.3 From 672ba7494beca6007aec20ac97e6a4f5f3ec28d8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Oct 2018 19:33:54 +0100 Subject: gnu: r-data-table: Update to 1.11.8. * gnu/packages/statistics.scm (r-data-table): Update to 1.11.8. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 293f61af92..f32f3338e7 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1767,13 +1767,13 @@ times.") (define-public r-data-table (package (name "r-data-table") - (version "1.11.4") + (version "1.11.8") (source (origin (method url-fetch) (uri (cran-uri "data.table" version)) (sha256 (base32 - "1mc1drqj5i5ar2za3nkh5j70y37s7z7xwqri2r2b72zkqggg3k7x")))) + "1nb6wngrk1a30m984524gf26fa1nwgyf4y4an94dibcwb5jp8hnw")))) (build-system r-build-system) (home-page "https://github.com/Rdatatable/data.table/wiki") (synopsis "Enhanced version of data.frame R object") -- cgit v1.2.3 From e028eaa99244e5f218c8e5eb150ca4df7dbd0ede Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Oct 2018 19:34:12 +0100 Subject: gnu: r-coda: Update to 0.19-2. * gnu/packages/statistics.scm (r-coda): Update to 0.19-2. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index f32f3338e7..c76bf643cd 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1913,13 +1913,13 @@ inference for statistical models.") (define-public r-coda (package (name "r-coda") - (version "0.19-1") + (version "0.19-2") (source (origin (method url-fetch) (uri (cran-uri "coda" version)) (sha256 (base32 - "14a4a8df4ygj05h37chmdn8kzcqs07fpbflxfrq530563mrza7yl")))) + "03fs3sdrrym3is92dgpa6ydk3m63gaihwy7bva4k0wm2hxm7x2k7")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice))) -- cgit v1.2.3 From 960425c9e332275cf3d721970405334140793d12 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Oct 2018 19:34:28 +0100 Subject: gnu: r-commonmark: Update to 1.6. * gnu/packages/statistics.scm (r-commonmark): Update to 1.6. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index c76bf643cd..e0f95bfe11 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2212,14 +2212,14 @@ other packages.") (define-public r-commonmark (package (name "r-commonmark") - (version "1.5") + (version "1.6") (source (origin (method url-fetch) (uri (cran-uri "commonmark" version)) (sha256 (base32 - "1jwx5rgm0ypd9a3v4jd9za4a644rdzhk1n4dvmgkj9hdpwsida3z")))) + "1xymqncf8byqxzpx64zlp6vbx7gry572jkr2ax0zlavr8bli861x")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/commonmark") (synopsis "CommonMark and Github Markdown Rendering in R") -- cgit v1.2.3 From 943cab4f724a2813c56437f3a5862d6ae5497369 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Oct 2018 19:34:39 +0100 Subject: gnu: r-rstudioapi: Update to 0.8. * gnu/packages/statistics.scm (r-rstudioapi): Update to 0.8. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index e0f95bfe11..94e8dabd56 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2350,13 +2350,13 @@ pure C implementation of the Git core methods.") (define-public r-rstudioapi (package (name "r-rstudioapi") - (version "0.7") + (version "0.8") (source (origin (method url-fetch) (uri (cran-uri "rstudioapi" version)) (sha256 (base32 - "133s75q2hr6jg28m1wvs96qrbc9c4vw87migwhkjqb88xxvbqhd5")))) + "0d6r0in13k0rcyr6asanwy0a9dv4lizq6l2w913rr222pq6vrrck")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/rstudioapi") (synopsis "Safely access the RStudio API") -- cgit v1.2.3 From 62a7492c908d6b72fd3feab0bd29ca8d8f3068f7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Oct 2018 19:34:53 +0100 Subject: gnu: r-plotrix: Update to 3.7-4. * gnu/packages/statistics.scm (r-plotrix): Update to 3.7-4. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 94e8dabd56..6e297e3ead 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2459,13 +2459,13 @@ disk (or a connection).") (define-public r-plotrix (package (name "r-plotrix") - (version "3.7-3") + (version "3.7-4") (source (origin (method url-fetch) (uri (cran-uri "plotrix" version)) (sha256 (base32 - "18702y1gbyis56mh219z5ww0nrkh6qx7bgqv3khyn80g2giwk7cf")))) + "1hs0zwaqs34559girinvysjfbvznyn8znp9cwvkqx6k2cqvcjinj")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/plotrix") (synopsis "Various plotting functions") -- cgit v1.2.3 From 3ea7aefd59fe50167a5a5e5ce361c8384eec435f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Oct 2018 19:35:04 +0100 Subject: gnu: r-snow: Update to 0.4-3. * gnu/packages/statistics.scm (r-snow): Update to 0.4-3. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 6e297e3ead..1bd23d4d7c 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2942,13 +2942,13 @@ multiple breakpoints are allowed.") (define-public r-snow (package (name "r-snow") - (version "0.4-2") + (version "0.4-3") (source (origin (method url-fetch) (uri (cran-uri "snow" version)) (sha256 (base32 - "1mxbrkpnmq32x4wd0194d541661yvfrrjlr3lsf7qq53ms3h21zf")))) + "1n3n8pva9s34fvlw32yng0x416lmbv7q1fsd0ywa4kikmxym64l5")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/snow") (synopsis "Support for simple parallel computing in R") -- cgit v1.2.3 From 33fb92aacd5ba4f1cdef762a0cbbb6aa15172af0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Oct 2018 19:35:14 +0100 Subject: gnu: r-doparallel: Update to 1.0.14. * gnu/packages/statistics.scm (r-doparallel): Update to 1.0.14. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 1bd23d4d7c..c0ea9f7492 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3034,14 +3034,14 @@ parallel.") (define-public r-doparallel (package (name "r-doparallel") - (version "1.0.11") + (version "1.0.14") (source (origin (method url-fetch) (uri (cran-uri "doParallel" version)) (sha256 (base32 - "0sppgxk3d8mfsrb3cjdyn0mv0s4i7pcy8g8c3cjzbr6k8vmx5jsc")))) + "01qjs4iw9f1kgymcypj0m2s4pvgqhxaycpli0fb8lq3dc0vpzfyb")))) (properties `((upstream-name . "doParallel"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 834f203c075c165b56568420e50fce354dc1a0d2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Oct 2018 19:35:26 +0100 Subject: gnu: r-tidyselect: Update to 0.2.5. * gnu/packages/statistics.scm (r-tidyselect): Update to 0.2.5. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index c0ea9f7492..2142ed900f 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3634,14 +3634,14 @@ the 'lite' version of the more complete @code{viridis} package.") (define-public r-tidyselect (package (name "r-tidyselect") - (version "0.2.4") + (version "0.2.5") (source (origin (method url-fetch) (uri (cran-uri "tidyselect" version)) (sha256 (base32 - "1592dbzawhd1hpsp9919l4sifyiaaj6xr7lnhsbwa6jwmmb0xcsw")))) + "0x3cp36byhfjajikr1lwffjm85ayw3bcs7d7kb0cydgs61ifiqjw")))) (build-system r-build-system) (propagated-inputs `(("r-glue" ,r-glue) -- cgit v1.2.3 From 98a4b9d040fceeea0bf44a233807e3f8eccab28c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Oct 2018 19:35:38 +0100 Subject: gnu: r-zoo: Update to 1.8-4. * gnu/packages/statistics.scm (r-zoo): Update to 1.8-4. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 2142ed900f..f47ceda17b 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4231,13 +4231,13 @@ mechanism.") (define-public r-zoo (package (name "r-zoo") - (version "1.8-3") + (version "1.8-4") (source (origin (method url-fetch) (uri (cran-uri "zoo" version)) (sha256 (base32 - "15jmkgwvq2mm9f09vijgx7sff8pszh90fndcwhk2vw9i0p183di0")))) + "1pywcp86kqijdrvl42qwdy75szrag9pzj0p88zbrj2r1klb8rn5i")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice))) -- cgit v1.2.3 From 16508df1d3f6f5e611d68eb7a5d4e91aa62a070f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Oct 2018 19:35:51 +0100 Subject: gnu: r-cardata: Update to 3.0-2. * gnu/packages/statistics.scm (r-cardata): Update to 3.0-2. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index f47ceda17b..626772d789 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5165,14 +5165,14 @@ bootstrap test for generalized linear mixed models.") (define-public r-cardata (package (name "r-cardata") - (version "3.0-1") + (version "3.0-2") (source (origin (method url-fetch) (uri (cran-uri "carData" version)) (sha256 (base32 - "193pdwgw6gk19v7swk1kwphg3vqdmpsgi555g9nyz93sa39j7r8j")))) + "152lfgaspgx6x2wzdb5p3zv6r87a0d2pg10h6fjmdr613kzlwp1v")))) (properties `((upstream-name . "carData"))) (build-system r-build-system) (home-page "https://r-forge.r-project.org/projects/car/") -- cgit v1.2.3 From 60aac7ec1648d4474aa63488c2bc87579410142f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 28 Oct 2018 19:36:04 +0100 Subject: gnu: r-robustbase: Update to 0.93-3. * gnu/packages/statistics.scm (r-robustbase): Update to 0.93-3. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 626772d789..59785f5eeb 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4735,14 +4735,14 @@ can be efficiently implemented directly in the R language.") (define-public r-robustbase (package (name "r-robustbase") - (version "0.93-2") + (version "0.93-3") (source (origin (method url-fetch) (uri (cran-uri "robustbase" version)) (sha256 (base32 - "1632p73iv9iqqm0v3k9rfv9way0him3fl35si1nly9wi5kpq5ci7")))) + "1nqh1qg1qd1qrxl1w585dqx7ql55qzjny1r4f9hqxpwd7lml07cc")))) (build-system r-build-system) (inputs `(("gfortran" ,gfortran))) -- cgit v1.2.3 From aa995686395052d0bc336b16e7b95cacc9bb5acf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:41:45 +0100 Subject: gnu: r-evaluate: Update to 0.12. * gnu/packages/statistics.scm (r-evaluate): Update to 0.12. [propagated-inputs]: Remove r-stringr. --- gnu/packages/statistics.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 59785f5eeb..303432c802 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1249,16 +1249,14 @@ for template use among CRAN packages.") (define-public r-evaluate (package (name "r-evaluate") - (version "0.11") + (version "0.12") (source (origin (method url-fetch) (uri (cran-uri "evaluate" version)) (sha256 (base32 - "1k8vcd4vsgg0hf7kdz8rlqp1dx4ygvg35aj4n3ay50kdnpzhaj5h")))) + "11rpn40153kcvqqrfhg2ldqfs68frg6yzsl0k3rxnlnv4c0v008g")))) (build-system r-build-system) - (propagated-inputs - `(("r-stringr" ,r-stringr))) (home-page "https://github.com/hadley/evaluate") (synopsis "Parsing and evaluation tools for R") (description -- cgit v1.2.3 From c5bd8a7c239691c765f774326e2519b7b6945bcb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:42:10 +0100 Subject: gnu: r-devtools: Update to 2.0.1. * gnu/packages/statistics.scm (r-devtools): Update to 2.0.1. [propagated-inputs]: Remove r-whisker; add r-callr, r-cli, r-pkgbuild, r-pkgload, r-rcmdcheck, r-remotes, r-sessioninfo, and r-usethis. --- gnu/packages/statistics.scm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 303432c802..5e05a4b1ce 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2366,22 +2366,29 @@ informative error messages when it's not available.") (define-public r-devtools (package (name "r-devtools") - (version "1.13.6") + (version "2.0.1") (source (origin (method url-fetch) (uri (cran-uri "devtools" version)) (sha256 (base32 - "1d9n49djydywfyp9w3njgxs5lag4ac7719wmxy1lkgcmn3l9sx5r")))) + "1nyspqicn9zd1rgq3k07b3179i8w5ys6jbd65g9q8qczrb7z3x8f")))) (build-system r-build-system) (propagated-inputs - `(("r-digest" ,r-digest) + `(("r-callr" ,r-callr) + ("r-cli" ,r-cli) + ("r-digest" ,r-digest) ("r-git2r" ,r-git2r) ("r-httr" ,r-httr) ("r-jsonlite" ,r-jsonlite) ("r-memoise" ,r-memoise) + ("r-pkgbuild" ,r-pkgbuild) + ("r-pkgload" ,r-pkgload) + ("r-rcmdcheck" ,r-rcmdcheck) + ("r-remotes" ,r-remotes) ("r-rstudioapi" ,r-rstudioapi) - ("r-whisker" ,r-whisker) + ("r-sessioninfo" ,r-sessioninfo) + ("r-usethis" ,r-usethis) ("r-withr" ,r-withr))) (home-page "https://github.com/hadley/devtools") (synopsis "Tools to make developing R packages easier") -- cgit v1.2.3 From 6ab5670abab425edb03226812ed7e5d9284c0950 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:43:40 +0100 Subject: gnu: r-nloptr: Update to 1.2.1. * gnu/packages/statistics.scm (r-nloptr): Update to 1.2.1. [native-inputs]: Add r-knitr and gfortran. --- gnu/packages/statistics.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 5e05a4b1ce..3ca0d01d35 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5089,17 +5089,19 @@ expected shortfall risk are also included.") (define-public r-nloptr (package (name "r-nloptr") - (version "1.0.4") + (version "1.2.1") (source (origin (method url-fetch) (uri (cran-uri "nloptr" version)) (sha256 (base32 - "1sz1xj3785x4vsm4nd6in298bk32hs2jk5nsxma7ivxi7jcmn8l4")))) + "15yz60kljxwnhm2m3gryjzxl3ynhkhd5jiwc179b1hz6rlzf71hz")))) (build-system r-build-system) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("r-knitr" ,r-knitr) ; for building vignettes + ("pkg-config" ,pkg-config) + ("gfortran" ,gfortran))) (inputs `(("nlopt" ,nlopt))) (home-page "https://cran.r-project.org/web/packages/nloptr") -- cgit v1.2.3 From 696e1ce263a7ed960ef6d2150d1f484b8bf7d3cf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:44:05 +0100 Subject: gnu: r-graph: Update to 1.58.2. * gnu/packages/bioconductor.scm (r-graph): Update to 1.58.2. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 92b67453f6..6ce5c0dc96 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -363,13 +363,13 @@ expressed genes in DNA microarray experiments.") (define-public r-graph (package (name "r-graph") - (version "1.58.0") + (version "1.58.2") (source (origin (method url-fetch) (uri (bioconductor-uri "graph" version)) (sha256 (base32 - "1zx445lk36g1s6i5dbhhf00nzzazyklfjxxjfax6q8hnhvgm9759")))) + "07smbb3c30pr5r425g181xsg0rs5jx6x2q6xpwb5dqgicxrz30ga")))) (build-system r-build-system) (propagated-inputs `(("r-biocgenerics" ,r-biocgenerics))) -- cgit v1.2.3 From 192c19f48496db34feb681edfa07ba357d7cd090 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:44:20 +0100 Subject: gnu: r-vegan: Update to 2.5-3. * gnu/packages/bioinformatics.scm (r-vegan): Update to 2.5-3. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 96ea07bdc4..c03219759a 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6292,14 +6292,14 @@ information as possible.") (define-public r-vegan (package (name "r-vegan") - (version "2.5-2") + (version "2.5-3") (source (origin (method url-fetch) (uri (cran-uri "vegan" version)) (sha256 (base32 - "13pyqvlpz64qibi8k5d109v7q09j06mbv6ndix3n4cn21mjx391c")))) + "023xznh0iy0496icpchadmp7a3rk3nj9s48fvwlvp3dssw58yp3c")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) -- cgit v1.2.3 From e563acb96b1d485b733484a81869144b2793c41a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:44:32 +0100 Subject: gnu: r-iranges: Update to 2.14.12. * gnu/packages/bioinformatics.scm (r-iranges): Update to 2.14.12. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index c03219759a..0c6a2f8e3e 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7309,13 +7309,13 @@ utilities for sequence data management under the ACNUC system.") (define-public r-iranges (package (name "r-iranges") - (version "2.14.11") + (version "2.14.12") (source (origin (method url-fetch) (uri (bioconductor-uri "IRanges" version)) (sha256 (base32 - "0wz63hysspyjihqadg91dbvllc5a61zzjrsz0b9498lihqc6m1la")))) + "1ar8sqqgjdy00dbgrxnacqy6gwir5xax76yf0vjxi2vj2skqb0kn")))) (properties `((upstream-name . "IRanges"))) (build-system r-build-system) -- cgit v1.2.3 From eb890466fa6cb3abdbc0c0181fb2eef9edf6dbf4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:44:47 +0100 Subject: gnu: r-genomeinfodbdata: Update to 1.1.0. * gnu/packages/bioinformatics.scm (r-genomeinfodbdata): Update to 1.1.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 0c6a2f8e3e..d8954f7b1e 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7338,7 +7338,7 @@ possible.") (define-public r-genomeinfodbdata (package (name "r-genomeinfodbdata") - (version "0.99.1") + (version "1.1.0") (source (origin (method url-fetch) ;; We cannot use bioconductor-uri here because this tarball is @@ -7348,7 +7348,7 @@ possible.") version ".tar.gz")) (sha256 (base32 - "0hipipvyvrh75n68hsjg35sxbcfzrghzxv547vnkk2f8ya99g01r")))) + "0k1hsjx6n2i1sf14hyrgdhxqxm5mxk0bgnivhiax944whcicmzbf")))) (properties `((upstream-name . "GenomeInfoDbData"))) (build-system r-build-system) -- cgit v1.2.3 From 57cf6a14f0d58db651d2b8b82f5c230e89325f0a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:45:00 +0100 Subject: gnu: r-edger: Update to 3.22.5. * gnu/packages/bioinformatics.scm (r-edger): Update to 3.22.5. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index d8954f7b1e..472c6c20c3 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7389,13 +7389,13 @@ names in their natural, rather than lexicographic, order.") (define-public r-edger (package (name "r-edger") - (version "3.22.3") + (version "3.22.5") (source (origin (method url-fetch) (uri (bioconductor-uri "edgeR" version)) (sha256 (base32 - "0w3jv29n0kkaiig8dbbdqy2dkng8xfaihch82mj9ci5hphrx3nng")))) + "0pkcdkh8mwdaca6xa8a7vwdfh46r03rkxwkrf17pwwd4557j7lj7")))) (properties `((upstream-name . "edgeR"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 9dad1957ab0a9b95b58c8fd6c851d3e1c1cbb8c2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:45:11 +0100 Subject: gnu: r-limma: Update to 3.36.5. * gnu/packages/bioinformatics.scm (r-limma): Update to 3.36.5. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 472c6c20c3..a302511675 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7455,13 +7455,13 @@ coding changes and predict coding outcomes.") (define-public r-limma (package (name "r-limma") - (version "3.36.3") + (version "3.36.5") (source (origin (method url-fetch) (uri (bioconductor-uri "limma" version)) (sha256 (base32 - "0iiifszr6hcqih6kszdsbkx3gacfg3d7v8hdx0lbjqnjqgqz7pwk")))) + "0d13w95si7l6fqfsdf6k50v4l573hhfva6mvd94v26iba24p2f6x")))) (build-system r-build-system) (home-page "http://bioinf.wehi.edu.au/limma") (synopsis "Package for linear models for microarray and RNA-seq data") -- cgit v1.2.3 From 72408357fa7169e3a629753066a3c4c4a17d5c65 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:45:21 +0100 Subject: gnu: r-genomicranges: Update to 1.32.7. * gnu/packages/bioinformatics.scm (r-genomicranges): Update to 1.32.7. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a302511675..7204a8d1bd 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7510,13 +7510,13 @@ different technologies, including microarrays, RNA-seq, and quantitative PCR.") (define-public r-genomicranges (package (name "r-genomicranges") - (version "1.32.6") + (version "1.32.7") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicRanges" version)) (sha256 (base32 - "0p58yk2i5gqvjlkx548mnrr49wvs0xfcl06l9rqj2hi6hkkbvnp3")))) + "1lh54asabrmk982636avpp1kcfzakwxi31cbj3jc8mkhar1mkyrx")))) (properties `((upstream-name . "GenomicRanges"))) (build-system r-build-system) -- cgit v1.2.3 From dd0216e0e7ef289f882d6cb0e78ea55dc78fa930 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:45:33 +0100 Subject: gnu: r-delayedarray: Update to 0.6.6. * gnu/packages/bioinformatics.scm (r-delayedarray): Update to 0.6.6. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 7204a8d1bd..43932ae663 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7716,13 +7716,13 @@ files.") (define-public r-delayedarray (package (name "r-delayedarray") - (version "0.6.5") + (version "0.6.6") (source (origin (method url-fetch) (uri (bioconductor-uri "DelayedArray" version)) (sha256 (base32 - "10b03zrnvz5isfh4z55hasya2m71lrfx10l5lm2sdmqs0gwkanrd")))) + "0rkp0mfsq3wfnib389dh3i44ab0wiz8skkjcv4596dwgq50jqpf2")))) (properties `((upstream-name . "DelayedArray"))) (build-system r-build-system) -- cgit v1.2.3 From 466bf3af89b6aa386aef6de3bc47832f1d628b6d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:45:45 +0100 Subject: gnu: r-genomicfeatures: Update to 1.32.3. * gnu/packages/bioinformatics.scm (r-genomicfeatures): Update to 1.32.3. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 43932ae663..13689d34df 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7858,13 +7858,13 @@ as well as query and modify the browser state, such as the current viewport.") (define-public r-genomicfeatures (package (name "r-genomicfeatures") - (version "1.32.2") + (version "1.32.3") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicFeatures" version)) (sha256 (base32 - "0kfyyg1ib8fkq2hxraal10z4bx3rg8figdskw4yhn1mbh6l42q5f")))) + "06prj5iih3ywsgq00lgfl29p3f8j23a0kqqhzhqcgjrrwsp94588")))) (properties `((upstream-name . "GenomicFeatures"))) (build-system r-build-system) -- cgit v1.2.3 From 11824607504081dc99e844ec182ec31e7c63e239 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:45:59 +0100 Subject: gnu: r-go-db: Update to 3.6.0. * gnu/packages/bioinformatics.scm (r-go-db): Update to 3.6.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 13689d34df..33f0828c54 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7899,7 +7899,7 @@ extracting the desired features in a convenient format.") (define-public r-go-db (package (name "r-go-db") - (version "3.5.0") + (version "3.6.0") (source (origin (method url-fetch) (uri (string-append "https://www.bioconductor.org/packages/" @@ -7907,7 +7907,7 @@ extracting the desired features in a convenient format.") version ".tar.gz")) (sha256 (base32 - "02d1mn1al3q7qvhx1ylrr3ar4w4iw0qyi5d89v2336rzwk9maq35")))) + "0fi2qywr9apg5lwfqfq9qq6bgrnv4rdhxx25656qn4bsy62i838j")))) (properties `((upstream-name . "GO.db"))) (build-system r-build-system) -- cgit v1.2.3 From ac0166450d8222af42027e7e073496c6414413a6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:46:09 +0100 Subject: gnu: r-wgcna: Update to 1.66. * gnu/packages/bioinformatics.scm (r-wgcna): Update to 1.66. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 33f0828c54..b94a7e4ea4 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8777,14 +8777,14 @@ in SNV base substitution data.") (define-public r-wgcna (package (name "r-wgcna") - (version "1.63") + (version "1.66") (source (origin (method url-fetch) (uri (cran-uri "WGCNA" version)) (sha256 (base32 - "1225dqm68bynkmklnsxdqdd3zqrpzbvqwyly8ibxmk75z33xz309")))) + "0rhnyhzfn93yp24jz9v6dzrmyizwzdw070a7idm0k33w1cm8sjqv")))) (properties `((upstream-name . "WGCNA"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 807d961cc9f192d90dc0b6a7fea6615d836485bd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:46:19 +0100 Subject: gnu: r-methylkit: Update to 1.6.3. * gnu/packages/bioinformatics.scm (r-methylkit): Update to 1.6.3. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b94a7e4ea4..9e5f0eae72 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9359,13 +9359,13 @@ number detection tools.") (define-public r-methylkit (package (name "r-methylkit") - (version "1.6.1") + (version "1.6.3") (source (origin (method url-fetch) (uri (bioconductor-uri "methylKit" version)) (sha256 (base32 - "1hr2czi5ybdf7hdmqsv39d17f3mvmw94wa38bc14zzm9mgy9gfy7")))) + "1nla74d2sjs51yyvvxf038a03mhw9appvjzj60vr2vd3p5lhqn9k")))) (properties `((upstream-name . "methylKit"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 67cfb83ff1f7078cf500b8bb45e7d4a97a99d7a6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:46:31 +0100 Subject: gnu: r-msnbase: Update to 2.6.4. * gnu/packages/bioinformatics.scm (r-msnbase): Update to 2.6.4. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9e5f0eae72..a45990d80e 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9733,14 +9733,14 @@ structure (pcaRes) to provide a common interface to the PCA results.") (define-public r-msnbase (package (name "r-msnbase") - (version "2.6.3") + (version "2.6.4") (source (origin (method url-fetch) (uri (bioconductor-uri "MSnbase" version)) (sha256 (base32 - "15jhqg02ypmznc0wxksw56yij02csy678vqy531fdv86fsmypwa0")))) + "1civd8b1rd5n6ys52dazw5m1yy2wq7049dbbyhzv7pjpa1m2x1rm")))) (properties `((upstream-name . "MSnbase"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 4fc6609a0cff4811a963586ca3c0e15175635025 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:46:44 +0100 Subject: gnu: r-keggrest: Update to 1.20.2. * gnu/packages/bioinformatics.scm (r-keggrest): Update to 1.20.2. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a45990d80e..96b4cbdf17 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10063,14 +10063,14 @@ microarrays or GRanges for sequencing data.") (define-public r-keggrest (package (name "r-keggrest") - (version "1.20.1") + (version "1.20.2") (source (origin (method url-fetch) (uri (bioconductor-uri "KEGGREST" version)) (sha256 (base32 - "1ss0xd5570x570v01r6lp64rr1apjrzp0j62520pvm3g8knjhfvs")))) + "0whmmbkq8bmc3ll20l4cv6hhxjgzbkrs97japljzg07ncn1fffsa")))) (properties `((upstream-name . "KEGGREST"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 6b451c0801bb851a73317f449a70f1d9059fe025 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:47:01 +0100 Subject: gnu: r-gprofiler: Update to 0.6.7. * gnu/packages/bioinformatics.scm (r-gprofiler): Update to 0.6.7. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 96b4cbdf17..1cf1de1ae5 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10378,14 +10378,14 @@ interval to data view, mismatch pileup, and several splicing summaries.") (define-public r-gprofiler (package (name "r-gprofiler") - (version "0.6.6") + (version "0.6.7") (source (origin (method url-fetch) (uri (cran-uri "gProfileR" version)) (sha256 (base32 - "1n6cj12j102b4x9vhyl4dljp1i0r43p23cnhqbx4als2xfxdlqgi")))) + "12nwidbnqmnfy5dnqga26byslvdnkrpz2fi19qfcby6xx0wbndk7")))) (properties `((upstream-name . "gProfileR"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 1c9906c2dd2f4fdc83153b0ee825e304ac9ce1f2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:47:14 +0100 Subject: gnu: r-reprex: Update to 0.2.1. * gnu/packages/cran.scm (r-reprex): Update to 0.2.1. [propagated-inputs]: Add r-fs, remove r-knitr. --- gnu/packages/cran.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e321993c12..2e4b83e48a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -166,19 +166,19 @@ package is a port of the Python package @code{cssselect}.") (define-public r-reprex (package (name "r-reprex") - (version "0.2.0") + (version "0.2.1") (source (origin (method url-fetch) (uri (cran-uri "reprex" version)) (sha256 (base32 - "1l44pxjiz3g0jkk3v6rg5jps3llihfiah0qyv40s0bxvxa6gm8v9")))) + "1ws5gds453xgfili87r35rz1wn2i7jbqissq98csbiddpkgls8sx")))) (build-system r-build-system) (propagated-inputs `(("r-callr" ,r-callr) ("r-clipr" ,r-clipr) - ("r-knitr" ,r-knitr) + ("r-fs" ,r-fs) ("r-rlang" ,r-rlang) ("r-rmarkdown" ,r-rmarkdown) ("r-whisker" ,r-whisker) -- cgit v1.2.3 From b62e104b8411723b1d1ceafb3393c87530d34833 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:47:50 +0100 Subject: gnu: r-ape: Update to 5.2. * gnu/packages/cran.scm (r-ape): Update to 5.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2e4b83e48a..7dd9e117b3 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -320,14 +320,14 @@ component analysis (with robust methods, and parallelized functions).") (define-public r-ape (package (name "r-ape") - (version "5.1") + (version "5.2") (source (origin (method url-fetch) (uri (cran-uri "ape" version)) (sha256 (base32 - "0vm2065993wf4hdqarxqykhfz9aaj0rrb98alhkq4qw1d2kdrmdp")))) + "05b4yka5cirdgxd4d7iiaqvr428pk3j6n9q6dvg5j38kdj2h5sr7")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice) -- cgit v1.2.3 From 7e127ab1286cfa27879280bb2c17a6c609a46fa7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:48:01 +0100 Subject: gnu: r-ps: Update to 1.2.0. * gnu/packages/cran.scm (r-ps): Update to 1.2.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 7dd9e117b3..3888d26695 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -492,13 +492,13 @@ print, summary, plot, update, etc. (define-public r-ps (package (name "r-ps") - (version "1.1.0") + (version "1.2.0") (source (origin (method url-fetch) (uri (cran-uri "ps" version)) (sha256 - (base32 "1zm9qkyvy1fvcjvmgw51iqw8x1xzkpy7rx7xnchwfj0xpzal0ljx")))) + (base32 "0ai8igdkysmks1ihbp3h3s552da2hskxqwrvp4cx7vwn91x9f3wd")))) (build-system r-build-system) (home-page "http://ps.r-lib.org") (synopsis "List, query, and manipulate system processes") -- cgit v1.2.3 From 2657e666cb7df7a1409d978221206b648981e1ca Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:48:14 +0100 Subject: gnu: r-pkgbuild: Update to 1.0.2. * gnu/packages/cran.scm (r-pkgbuild): Update to 1.0.2. [propagated-inputs]: Add r-cli and r-prettyunits. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 3888d26695..3c8a63d8aa 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -510,19 +510,21 @@ processes. Most of its code is based on the @code{psutil} Python package.") (define-public r-pkgbuild (package (name "r-pkgbuild") - (version "1.0.0") + (version "1.0.2") (source (origin (method url-fetch) (uri (cran-uri "pkgbuild" version)) (sha256 (base32 - "10iz8057mixl9j73pq2cbp4ib6dadfsgi3fcsjjm7l3wwb9issd9")))) + "1i1rrax7x7r2bplig5cfc50lx85jc4n9a3qmvbdviaj22wr2lghs")))) (build-system r-build-system) (propagated-inputs `(("r-callr" ,r-callr) + ("r-cli" ,r-cli) ("r-crayon" ,r-crayon) ("r-desc" ,r-desc) + ("r-prettyunits" ,r-prettyunits) ("r-r6" ,r-r6) ("r-rprojroot" ,r-rprojroot) ("r-withr" ,r-withr))) -- cgit v1.2.3 From 0ab28e54508fdd4399a580680c843cd8304461ae Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:48:40 +0100 Subject: gnu: r-pkgload: Update to 1.0.1. * gnu/packages/cran.scm (r-pkgload): Update to 1.0.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 3c8a63d8aa..d4283d242b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -539,14 +539,14 @@ is configured appropriately so R can use them.") (define-public r-pkgload (package (name "r-pkgload") - (version "1.0.0") + (version "1.0.1") (source (origin (method url-fetch) (uri (cran-uri "pkgload" version)) (sha256 (base32 - "1rjj229nq9fsl4ki4m75ybsavjgpqqhsr1zjzapwicsrxv6212px")))) + "0mm0avvan528zbrcrxigl5fkd7za01fb0qhlqrqvm3ar0115cqa8")))) (build-system r-build-system) (propagated-inputs `(("r-desc" ,r-desc) -- cgit v1.2.3 From 674c8185608f926837af63fc17fca4f77d7686ee Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:48:50 +0100 Subject: gnu: r-rcpp: Update to 0.12.19. * gnu/packages/cran.scm (r-rcpp): Update to 0.12.19. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d4283d242b..c206c92f09 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -566,13 +566,13 @@ you to rapidly iterate while developing a package.") (define-public r-rcpp (package (name "r-rcpp") - (version "0.12.18") + (version "0.12.19") (source (origin (method url-fetch) (uri (cran-uri "Rcpp" version)) (sha256 - (base32 "006kpg2ph109rh1l13lqk26pp4as4fvl5661vrcczjygacgd1v7w")))) + (base32 "10mmiaawv9iwglc6z4y51mdpsfb1sivqmwr6xnfqkllcnpabdbk3")))) (build-system r-build-system) (home-page "http://www.rcpp.org") (synopsis "Seamless R and C++ integration") -- cgit v1.2.3 From ecdfca05c8b375412939e3c84f755cc2bfde10cd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:49:07 +0100 Subject: gnu: r-ffbase: Update to 0.12.5. * gnu/packages/cran.scm (r-ffbase): Update to 0.12.5. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c206c92f09..ea50b545ed 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -891,14 +891,14 @@ in main memory.") (define-public r-ffbase (package (name "r-ffbase") - (version "0.12.3") + (version "0.12.5") (source (origin (method url-fetch) (uri (cran-uri "ffbase" version)) (sha256 (base32 - "1nz97bndxxkzp8rq6va8ff5ky9vkaib1jybm6j852awwb3n9had5")))) + "1h5x6rbb1nrpzf4ywkizn8ij0bz3mlz46byh46ylxhicg1ribi24")))) (build-system r-build-system) (propagated-inputs `(("r-bit" ,r-bit) -- cgit v1.2.3 From 2b8126a4ecf0a4c0a512bf1f51579f40cdf1ab1c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:49:23 +0100 Subject: gnu: r-reshape: Update to 0.8.8. * gnu/packages/cran.scm (r-reshape): Update to 0.8.8. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ea50b545ed..a51ca351ed 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -936,14 +936,14 @@ quantities.") (define-public r-reshape (package (name "r-reshape") - (version "0.8.7") + (version "0.8.8") (source (origin (method url-fetch) (uri (cran-uri "reshape" version)) (sha256 (base32 - "14ir3w4bb3bsz8jsak27nj7kpn227pdgr9653gjq5wc93rywi9ig")))) + "0s6i0sqxg1vldxs6miv8mi0zydxbqzgpmzfiwkj8y7jix3yrfmad")))) (build-system r-build-system) (propagated-inputs `(("r-plyr" ,r-plyr) -- cgit v1.2.3 From 9e82d6080eb8db02b3e39004a590f2ac49b68c70 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:49:37 +0100 Subject: gnu: r-cli: Update to 1.0.1. * gnu/packages/cran.scm (r-cli): Update to 1.0.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a51ca351ed..6d540d3550 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2550,14 +2550,14 @@ plots in @code{ggplot2}.") (define-public r-cli (package (name "r-cli") - (version "1.0.0") + (version "1.0.1") (source (origin (method url-fetch) (uri (cran-uri "cli" version)) (sha256 (base32 - "07as3dr7vwx02p3qgzlmxz1dlrd3x3lysrzp222ip9jcjpydp8wg")))) + "1r2yih4c0bdmbx0qrarlf0m1p5z30sri755zmdazsq2pw76zp07g")))) (build-system r-build-system) (propagated-inputs `(("r-assertthat" ,r-assertthat) -- cgit v1.2.3 From 16a39c2d5683a38723a49b2d17b77290420fb72d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:49:52 +0100 Subject: gnu: r-ggridges: Update to 0.5.1. * gnu/packages/cran.scm (r-ggridges): Update to 0.5.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6d540d3550..06cdd3c06f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2503,14 +2503,14 @@ plotting. a three dimensional point cloud.") (define-public r-ggridges (package (name "r-ggridges") - (version "0.5.0") + (version "0.5.1") (source (origin (method url-fetch) (uri (cran-uri "ggridges" version)) (sha256 (base32 - "1znvsbl3px8dddpjgdrygnpz4s685wizi0jnjvx2hrz58i0chjqj")))) + "0dhwcpy785ac2ny5bjp284595nnybi3554wd0yffsli0vzf7ry01")))) (build-system r-build-system) (propagated-inputs `(("r-ggplot2" ,r-ggplot2) -- cgit v1.2.3 From 870faab4b73aa61ad731da8185a105adb1122a9a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:50:06 +0100 Subject: gnu: r-xts: Update to 0.11-1. * gnu/packages/cran.scm (r-xts): Update to 0.11-1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 06cdd3c06f..0f03c52704 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2318,14 +2318,14 @@ training models for classification or ranking.") (define-public r-xts (package (name "r-xts") - (version "0.11-0") + (version "0.11-1") (source (origin (method url-fetch) (uri (cran-uri "xts" version)) (sha256 (base32 - "1v50yn4bsjzdyk7r90isn6dxmpkapillrhpx3gqsshd180vwzqk9")))) + "17d3g14xkxa1a5z5gd3gk1xjqfkjg1ik3i12q0arina8frql3jhd")))) (build-system r-build-system) (propagated-inputs `(("r-zoo" ,r-zoo))) (home-page "https://github.com/joshuaulrich/xts") -- cgit v1.2.3 From 5621b8403b9eafe2e25a48c7567c5e119b50a969 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:50:18 +0100 Subject: gnu: r-sm: Update to 2.2-5.6. * gnu/packages/cran.scm (r-sm): Update to 2.2-5.6. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 0f03c52704..2f434a87e6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2228,14 +2228,14 @@ acceptance regions, log-ratio plots and Q-Q plots.") (define-public r-sm (package (name "r-sm") - (version "2.2-5.5") + (version "2.2-5.6") (source (origin (method url-fetch) (uri (cran-uri "sm" version)) (sha256 (base32 - "1rw2mxygxsmk8mn4wag1ppjgzk0rlvh6zd8q02qrhjrn9jhi5qj3")))) + "0c4whcx879gb4lwvqnzxl5n9xgpcqh2c54ip9ami3mwfprzcv45q")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) (home-page "http://www.stats.gla.ac.uk/~adrian/sm/") -- cgit v1.2.3 From bba80fadbe4f94a219d86d314a0de5b3c473d36c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:50:31 +0100 Subject: gnu: r-magic: Update to 1.5-9. * gnu/packages/cran.scm (r-magic): Update to 1.5-9. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2f434a87e6..556c21ad7e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1628,14 +1628,14 @@ calendar objects.") (define-public r-magic (package (name "r-magic") - (version "1.5-8") + (version "1.5-9") (source (origin (method url-fetch) (uri (cran-uri "magic" version)) (sha256 (base32 - "083cgpp3v03li0h8597b3g21pd9lkbmn9pyssblnhc800mpc52vz")))) + "0snmdh6vk0p6ar1swsihisinxrx7l8371dri5lk0z24ysgr5w7gs")))) (build-system r-build-system) (propagated-inputs `(("r-abind" ,r-abind))) -- cgit v1.2.3 From 8c456dff26492b88ab6477a00c3ec5fcda323f29 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:50:43 +0100 Subject: gnu: r-fitdistrplus: Update to 1.0-11. * gnu/packages/cran.scm (r-fitdistrplus): Update to 1.0-11. [propagated-inputs]: Add r-npsurv. --- gnu/packages/cran.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 556c21ad7e..070ec8aff2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1350,17 +1350,18 @@ functions from LINPACK.") (define-public r-fitdistrplus (package (name "r-fitdistrplus") - (version "1.0-9") + (version "1.0-11") (source (origin (method url-fetch) (uri (cran-uri "fitdistrplus" version)) (sha256 (base32 - "18x9454g598d54763k3hvi33iszifk7sxvhd1zg5r8z1vpixx3z6")))) + "12hckg3y5j3zh9q1gwxkc27q813p2r42iqp7wdfiq6nj55jrh6w6")))) (build-system r-build-system) (propagated-inputs `(("r-mass" ,r-mass) + ("r-npsurv" ,r-npsurv) ("r-survival" ,r-survival))) (home-page "http://riskassessment.r-forge.r-project.org") (synopsis "Fitting a parametric distribution from data") -- cgit v1.2.3 From a8de3090d8c1ba6d5a4fecaf1799402fc7faf3ae Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:51:09 +0100 Subject: gnu: r-xfun: Update to 0.4. * gnu/packages/cran.scm (r-xfun): Update to 0.4. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 070ec8aff2..efac6110cc 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2766,14 +2766,14 @@ iVAT).") (define-public r-xfun (package (name "r-xfun") - (version "0.3") + (version "0.4") (source (origin (method url-fetch) (uri (cran-uri "xfun" version)) (sha256 (base32 - "1r11dd49ngmjgbjdv28a9c1jp8cg1l50x0acbsamzz576p8i2wl9")))) + "0991ywgc2dsraba91kkj37akhfzhzn02cnz7c88hhdis9kag3pwv")))) (build-system r-build-system) (home-page "https://github.com/yihui/xfun") (synopsis "Miscellaneous functions") -- cgit v1.2.3 From dda4ce560f50f9cf35d955641d53a485224a4e65 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:51:21 +0100 Subject: gnu: r-tinytex: Update to 0.9. * gnu/packages/cran.scm (r-tinytex): Update to 0.9. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index efac6110cc..da5d0694e1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2850,14 +2850,14 @@ terminals.") (define-public r-tinytex (package (name "r-tinytex") - (version "0.8") + (version "0.9") (source (origin (method url-fetch) (uri (cran-uri "tinytex" version)) (sha256 (base32 - "1bgpr5i5399jf9n6pg2mm4aamisbhppg082ad0wv1j4g0rlxf1gy")))) + "08w5hyq3ysh631d5whgcfv1bb007cdc0bjhb83vwmhazs6rgvyjy")))) (build-system r-build-system) (propagated-inputs `(("r-xfun" ,r-xfun))) -- cgit v1.2.3 From 534bf85b9d71be43b005a8c73e1b313cbb4f1a66 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:51:32 +0100 Subject: gnu: r-ttr: Update to 0.23-4. * gnu/packages/cran.scm (r-ttr): Update to 0.23-4. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index da5d0694e1..34e0e1275b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2965,14 +2965,14 @@ generation, and 2D/3D network visualization.") (define-public r-ttr (package (name "r-ttr") - (version "0.23-3") + (version "0.23-4") (source (origin (method url-fetch) (uri (cran-uri "TTR" version)) (sha256 (base32 - "07r62ngyzjl4aszdxnr3n6bnbcgcap32yhd430jsilicg8n06di1")))) + "18mzyv6cmxmqyqsfwlx2b2k055887mfgc2jgj8xkn8c6m56n05zb")))) (properties `((upstream-name . "TTR"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 905734fd7c8984d910e6c5f35b682517f8d620e2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:51:47 +0100 Subject: gnu: r-extradistr: Update to 1.8.10. * gnu/packages/cran.scm (r-extradistr): Update to 1.8.10. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 34e0e1275b..abfe29f0ee 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3173,14 +3173,14 @@ Cryer and Kung-Sik Chan.") (define-public r-extradistr (package (name "r-extradistr") - (version "1.8.9") + (version "1.8.10") (source (origin (method url-fetch) (uri (cran-uri "extraDistr" version)) (sha256 (base32 - "1fg8vjpal33y51iqzglk1yvy46d7js0l0wfbdy698lq8a06hq19p")))) + "00lvqp5bb3iak5myiz4rqm887bkq9sdh7aybmz84mmfni6q01m28")))) (properties `((upstream-name . "extraDistr"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 484e81f73a781547953f092263ffc1955d6115fb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:52:01 +0100 Subject: gnu: r-cubature: Update to 1.4-1. * gnu/packages/cran.scm (r-cubature): Update to 1.4-1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index abfe29f0ee..c50241b5d2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3243,14 +3243,14 @@ applied econometric analysis.") (define-public r-cubature (package (name "r-cubature") - (version "1.4") + (version "1.4-1") (source (origin (method url-fetch) (uri (cran-uri "cubature" version)) (sha256 (base32 - "1hd23b8v2kpqp5gr0va8p2q7j8w9rik6ks7zrr4b8mb2mwrakk74")))) + "10jl5l3xnigiq95829ssq69xbim97k851187dghc30awszcx4clh")))) (build-system r-build-system) (propagated-inputs `(("r-rcpp" ,r-rcpp))) -- cgit v1.2.3 From 44de41b572c6d8011d4f643824977c3a9219644c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:52:13 +0100 Subject: gnu: r-expm: Update to 0.999-3. * gnu/packages/cran.scm (r-expm): Update to 0.999-3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c50241b5d2..0aa0aedcb6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3299,14 +3299,14 @@ sample Robust Rank-Order Distributional Test.") (define-public r-expm (package (name "r-expm") - (version "0.999-2") + (version "0.999-3") (source (origin (method url-fetch) (uri (cran-uri "expm" version)) (sha256 (base32 - "1mihl67kvv1xv0figp25jkmwfn4iwkcx15cng2348y8gm6zybw9q")))) + "04k4a6g071jkjc0d30ncmf713dj16brcs9m6pj43hnycc1caq6si")))) (build-system r-build-system) (propagated-inputs `(("r-matrix" ,r-matrix))) (native-inputs `(("gfortran" ,gfortran))) -- cgit v1.2.3 From 02c57c018a617abd3fcfd83a1a29074048b25dc7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:52:25 +0100 Subject: gnu: r-np: Update to 0.60-9. * gnu/packages/cran.scm (r-np): Update to 0.60-9. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 0aa0aedcb6..19c73239fc 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3364,14 +3364,14 @@ creation and manipulation of WAVE audio files.") (define-public r-np (package (name "r-np") - (version "0.60-8") + (version "0.60-9") (source (origin (method url-fetch) (uri (cran-uri "np" version)) (sha256 (base32 - "17h67a510wh83800ri6g02wvznrlhigxni8shyijz1iaxcpk8k4j")))) + "1z4jcpx8bbgwslv42wrphfd1qfq965qjn0kmfxm5f6hbbycahcgy")))) (build-system r-build-system) (propagated-inputs `(("r-boot" ,r-boot) -- cgit v1.2.3 From fda8dd58c2ceb32e96e1ed02630d7edb162a4914 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:52:38 +0100 Subject: gnu: r-shinyace: Update to 0.3.2. * gnu/packages/cran.scm (r-shinyace): Update to 0.3.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 19c73239fc..8cbf6395df 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3503,14 +3503,14 @@ files.") (define-public r-shinyace (package (name "r-shinyace") - (version "0.3.1") + (version "0.3.2") (source (origin (method url-fetch) (uri (cran-uri "shinyAce" version)) (sha256 (base32 - "1hqgszbiv99dibhwr21v21ll4s2hjn3ccqdicsm0z3gk77bh8iyb")))) + "1fbk5i6w6cpam8s3acf4bgdp8hajn4digjjix3i6i4q3p2rvn6zx")))) (properties `((upstream-name . "shinyAce"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 80234d3294338646b0ca761b7abae0958eae15ef Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:52:51 +0100 Subject: gnu: r-maptools: Update to 0.9-4. * gnu/packages/cran.scm (r-maptools): Update to 0.9-4. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8cbf6395df..acdae84f2d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4062,14 +4062,14 @@ simple method for converting between file types.") (define-public r-maptools (package (name "r-maptools") - (version "0.9-3") + (version "0.9-4") (source (origin (method url-fetch) (uri (cran-uri "maptools" version)) (sha256 (base32 - "0hxbv01im9zk1qrwgigpc510w6x0kzdzip4gx2jzfqmmwr8m17r8")))) + "1753kgyc4kmbb5h6knz5wgvvvj8v77kzm8lz0kwz05m5k3spa24k")))) (build-system r-build-system) (propagated-inputs `(("r-foreign" ,r-foreign) -- cgit v1.2.3 From 7608984fe9a0e5d8ade27341ecd7d38171f39816 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:53:03 +0100 Subject: gnu: r-later: Update to 0.7.5. * gnu/packages/cran.scm (r-later): Update to 0.7.5. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index acdae84f2d..2bfe810558 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4090,14 +4090,14 @@ exchanging spatial objects with other R packages.") (define-public r-later (package (name "r-later") - (version "0.7.4") + (version "0.7.5") (source (origin (method url-fetch) (uri (cran-uri "later" version)) (sha256 (base32 - "125zc499gj702x2bch95lsfzk2qb4dzv3604x9afym2i3ylrmm64")))) + "0xhwn37makzm85zb6w5acc7svzibxcnz69rks0kxw22vapkxwz1i")))) (build-system r-build-system) (propagated-inputs `(("r-bh" ,r-bh) -- cgit v1.2.3 From 08645fcff55bb1b6cc9afa684deb77ec4c53945d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:53:19 +0100 Subject: gnu: r-fansi: Update to 0.4.0. * gnu/packages/cran.scm (r-fansi): Update to 0.4.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2bfe810558..2aef7c1a52 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4539,14 +4539,14 @@ steps and provides ggplot2-based elegant data visualization.") (define-public r-fansi (package (name "r-fansi") - (version "0.3.0") + (version "0.4.0") (source (origin (method url-fetch) (uri (cran-uri "fansi" version)) (sha256 (base32 - "135qj7bcc3mwn0vg55hiiadf66lx6zaxvkicfmfw9x0zr7ah2r6x")))) + "02f2rx7v7wz6w97m2slwky2i5y8f9iafycmkyr3siy3z3k8fj171")))) (build-system r-build-system) (native-inputs `(("r-knitr" ,r-knitr))) ; for vignettes -- cgit v1.2.3 From 081af9fae79954e7e0b927d1af667cb1bf36bb60 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:53:31 +0100 Subject: gnu: r-hdf5r: Update to 1.0.1. * gnu/packages/cran.scm (r-hdf5r): Update to 1.0.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2aef7c1a52..e30a2b3e97 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4581,14 +4581,14 @@ results to the user.") (define-public r-hdf5r (package (name "r-hdf5r") - (version "1.0.0") + (version "1.0.1") (source (origin (method url-fetch) (uri (cran-uri "hdf5r" version)) (sha256 (base32 - "1s6p4cj909kc635fh5xpl87bqlcdj3dn3r1wk5g40abimk2b0pva")))) + "0h222q80li8rs3cv4c5lvv3g91ygd51w43ay6fwyk9q9d315vwrj")))) (build-system r-build-system) (inputs `(("hdf5" ,hdf5) -- cgit v1.2.3 From 71d995392b3b8c717df739a8b7d9fd73c4b17f70 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:53:47 +0100 Subject: gnu: r-rdpack: Update to 0.10-1. * gnu/packages/cran.scm (r-rdpack): Update to 0.10-1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e30a2b3e97..d341ad1ef7 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4671,14 +4671,14 @@ functions.") (define-public r-rdpack (package (name "r-rdpack") - (version "0.9-0") + (version "0.10-1") (source (origin (method url-fetch) (uri (cran-uri "Rdpack" version)) (sha256 (base32 - "067w0w6kza0hkzcnx58danl83yfvl9yjacr47mnid2bg856gdd1b")))) + "0bbjnw88h54v40hzim00i8yd3p4rk9i84zfdmgcbnylscwvsf0av")))) (properties `((upstream-name . "Rdpack"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 464676a970e4cc0a7e1b3019ecf0c6ed05324ed8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:53:59 +0100 Subject: gnu: r-proc: Update to 1.13.0. * gnu/packages/cran.scm (r-proc): Update to 1.13.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d341ad1ef7..300d67c02d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5222,14 +5222,14 @@ containing one or more SNPs that evolved under directional selection.") (define-public r-proc (package (name "r-proc") - (version "1.12.1") + (version "1.13.0") (source (origin (method url-fetch) (uri (cran-uri "pROC" version)) (sha256 (base32 - "05ad69a6fxy9k903cw3h4q59ch2jv6qfg9yjdbw3cgiiazcafrlj")))) + "0ain17clympkx09ym7gydylcd93096dxzqx1qzci310yq2l7fknm")))) (properties `((upstream-name . "pROC"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From bec74196ea05ee84eb4a53b8285fef6628ccfdff Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:54:10 +0100 Subject: gnu: r-abps: Update to 0.3. * gnu/packages/cran.scm (r-abps): Update to 0.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 300d67c02d..d59a16b6eb 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5860,13 +5860,13 @@ detection.") (define-public r-abps (package (name "r-abps") - (version "0.2") + (version "0.3") (source (origin (method url-fetch) (uri (cran-uri "ABPS" version)) (sha256 - (base32 "1k3f5i34f4w2khkszb4qhwwcpiy7gsfh82vjr6rypwg6rx5rjclq")))) + (base32 "0n3f66nmfi5v94il1mxy026mi84w01ph2aljk60vn3mrz8kwf2ll")))) (properties `((upstream-name . "ABPS"))) (build-system r-build-system) (propagated-inputs `(("r-kernlab" ,r-kernlab))) -- cgit v1.2.3 From 31c8d9fe009fdcc38675dfb6d8b109a7c755225a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:54:23 +0100 Subject: gnu: r-emmeans: Update to 1.3.0. * gnu/packages/cran.scm (r-emmeans): Update to 1.3.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d59a16b6eb..8034525986 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6404,14 +6404,14 @@ Hothorn, Westfall, 2010, CRC Press).") (define-public r-emmeans (package (name "r-emmeans") - (version "1.2.4") + (version "1.3.0") (source (origin (method url-fetch) (uri (cran-uri "emmeans" version)) (sha256 (base32 - "01g6albv9whpdsj4j7c3q02pwdlkscjl5d2l8z96qafw7n9gml6g")))) + "0kdyy4qp332c4yyvp1cnh48h6ks6ffir5rjcv0py0vm3m8c3hh61")))) (build-system r-build-system) (propagated-inputs `(("r-estimability" ,r-estimability) -- cgit v1.2.3 From d42f74103543dad9ec68113363859663b19fdbfa Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:54:56 +0100 Subject: gnu: r-dendextend: Update to 1.9.0. * gnu/packages/cran.scm (r-dendextend): Update to 1.9.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8034525986..636a8c2643 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -792,14 +792,14 @@ rows, dropping names) to see if the modified versions are identical.") (define-public r-dendextend (package (name "r-dendextend") - (version "1.8.0") + (version "1.9.0") (source (origin (method url-fetch) (uri (cran-uri "dendextend" version)) (sha256 (base32 - "1virn3c232xwcq3d0hhkgjh5gpzl01s39iwii5gxcm9mnsxjzdrh")))) + "1jiani6zwfajky2vafvay2hq158nh99rdrk3j00lycspds9v35fd")))) (build-system r-build-system) (propagated-inputs `(("r-fpc" ,r-fpc) -- cgit v1.2.3 From 8871a513503462cd25c5b617286710164f96dce2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 07:55:11 +0100 Subject: gnu: r-webshot: Update to 0.5.1. * gnu/packages/cran.scm (r-webshot): Update to 0.5.1. [propagated-inputs]: Add r-callr; remove r-processx and r-withr. --- gnu/packages/cran.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 636a8c2643..ded667e515 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2706,20 +2706,19 @@ of merit, ordering functions, and enhanced versions of @code{pairs} and (define-public r-webshot (package (name "r-webshot") - (version "0.5.0") + (version "0.5.1") (source (origin (method url-fetch) (uri (cran-uri "webshot" version)) (sha256 (base32 - "07r71zzmggp4jf92x4ws4wg6v1x98vaj01lsar85bnb30n5vx8gh")))) + "08sb1xi376pfy1vwilk2d68zljsg9yiv04n2dkqz383gdhh0sxdr")))) (build-system r-build-system) (propagated-inputs - `(("r-jsonlite" ,r-jsonlite) - ("r-magrittr" ,r-magrittr) - ("r-processx" ,r-processx) - ("r-withr" ,r-withr))) + `(("r-callr" ,r-callr) + ("r-jsonlite" ,r-jsonlite) + ("r-magrittr" ,r-magrittr))) (home-page "https://github.com/wch/webshot/") (synopsis "Take screenshots of web pages") (description -- cgit v1.2.3 From f697ef4a0d68c84816aa95a43e2d82d835d02e50 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 08:32:00 +0100 Subject: gnu: r-servr: Update to 0.11. * gnu/packages/web.scm (r-servr): Update to 0.11. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 29d03f6a15..c4f8eeefc0 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3874,13 +3874,13 @@ in systems and applications.") (define-public r-servr (package (name "r-servr") - (version "0.10") + (version "0.11") (source (origin (method url-fetch) (uri (cran-uri "servr" version)) (sha256 (base32 - "0yz3igqsiyqnjj1ngh199zicg3spx4kbmvl0wc8i8xahk6l9g06v")))) + "0yj3p1risf269n25dd56lqv82dsxv6a0aq4bcc1ddn9wv7h2xdfi")))) (build-system r-build-system) (propagated-inputs `(("r-httpuv" ,r-httpuv) -- cgit v1.2.3 From a056e2251e8d3fe24d3c989b5a0093e203bda1e0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 08:32:16 +0100 Subject: gnu: r-htmlwidgets: Update to 1.3. * gnu/packages/web.scm (r-htmlwidgets): Update to 1.3. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index c4f8eeefc0..0c3a13a853 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3932,13 +3932,13 @@ directory.") (define-public r-htmlwidgets (package (name "r-htmlwidgets") - (version "1.2") + (version "1.3") (source (origin (method url-fetch) (uri (cran-uri "htmlwidgets" version)) (sha256 (base32 - "04c4d0mfcy3dkdlbxnaccpdgxvyxfdwfmmh5djim6v9hyg0j2z8s")))) + "04jsdh14l2zifbjpbbh23w7bxz1wpsas0zb2gy2zwv4yqamzzr7i")))) (build-system r-build-system) (propagated-inputs `(("r-htmltools" ,r-htmltools) -- cgit v1.2.3 From 65279cc8f38373ef455e7c94019388d78d544ce6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 08:32:55 +0100 Subject: gnu: Add r-shinyfiles. * gnu/packages/web.scm (r-shinyfiles): New variable. --- gnu/packages/web.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 0c3a13a853..849220c099 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5645,6 +5645,35 @@ application framework for R, making it easy to create attractive dashboards.") ;; later. (license l:gpl2+))) +(define-public r-shinyfiles + (package + (name "r-shinyfiles") + (version "0.7.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "shinyFiles" version)) + (sha256 + (base32 + "1cbg09l7w2zbgxb4qjm9p873p0lzrihlzsk5xxi3cpxdckn6zsrm")))) + (properties `((upstream-name . "shinyFiles"))) + (build-system r-build-system) + (propagated-inputs + `(("r-fs" ,r-fs) + ("r-htmltools" ,r-htmltools) + ("r-jsonlite" ,r-jsonlite) + ("r-shiny" ,r-shiny) + ("r-tibble" ,r-tibble))) + (home-page "https://github.com/thomasp85/shinyFiles") + (synopsis "Server-side file system viewer for Shiny") + (description + "This package provides functionality for client-side navigation of the +server side file system in shiny apps. In case the app is running locally +this gives the user direct access to the file system without the need to +\"download\" files to a temporary location. Both file and folder selection as +well as file saving is available.") + (license l:gpl2+))) + (define-public r-crosstalk (package (name "r-crosstalk") -- cgit v1.2.3 From 4633c8e6fc6c71ff5e88599f683e358b0a58841a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 08:35:36 +0100 Subject: gnu: r-shinydashboard: Update to 0.7.1. * gnu/packages/web.scm (r-shinydashboard): Update to 0.7.1. [propagated-inputs]: Add r-promises. --- gnu/packages/web.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 849220c099..447a899544 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5607,13 +5607,13 @@ responsive, and powerful applications with minimal effort.") (define-public r-shinydashboard (package (name "r-shinydashboard") - (version "0.7.0") + (version "0.7.1") (source (origin (method url-fetch) (uri (cran-uri "shinydashboard" version)) (sha256 (base32 - "10yqcqqcxgfqwkmscqwvvgr710im583qsqnsqkfpisjvkqp10yqb")))) + "0khac8b27q3swdw07kl609hm0fjfjsjv591b388q99mqqr2rk92i")))) (build-system r-build-system) ;; The directory inst/AdminLTE/ contains a minified JavaScript file. ;; Regenerate it from the included sources. @@ -5633,6 +5633,7 @@ responsive, and powerful applications with minimal effort.") (dump-port minified port)))))))))) (propagated-inputs `(("r-htmltools" ,r-htmltools) + ("r-promises" ,r-promises) ("r-shiny" ,r-shiny))) (native-inputs `(("uglify-js" ,uglify-js))) -- cgit v1.2.3 From 39528a5ee9138c1d72903ce8397e3cfb64e0f54d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 08:36:07 +0100 Subject: gnu: r-pracma: Update to 2.1.8. * gnu/packages/maths.scm (r-pracma): Update to 2.1.8. [propagated-inputs]: Remove r-quadprog. --- gnu/packages/maths.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 437f3672c2..6a3a59590e 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2110,16 +2110,14 @@ programming problems.") (define-public r-pracma (package (name "r-pracma") - (version "2.1.5") + (version "2.1.8") (source (origin (method url-fetch) (uri (cran-uri "pracma" version)) (sha256 - (base32 "18cv7c2gvagbmggfbsy2xk9bpn47izd0qrmqnc3q7afvj6pr6nf9")))) + (base32 "0m8ladhrfyxwybblkcdgg4xv1mk5kibmwarpj2k0c2y34zzcix4z")))) (build-system r-build-system) - (propagated-inputs - `(("r-quadprog" ,r-quadprog))) - (home-page "https://cran.r-project.org/web/packages/pracma") + (home-page "https://cran.r-project.org/web/packages/pracma/") (synopsis "Practical numerical math functions") (description "This package provides functions for numerical analysis and linear algebra, numerical optimization, differential equations, plus some -- cgit v1.2.3 From e5f9e9fa795a1024c34539e3cbecc4a4cb4fa1ae Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 08:36:33 +0100 Subject: gnu: r-radiant-data: Update to 0.9.7. * gnu/packages/cran.scm (r-radiant-data): Update to 0.9.7. [propagated-inputs]: Add r-shinyfiles and r-summarytools. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ded667e515..b41365a08d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3525,14 +3525,14 @@ environment within Shiny.") (define-public r-radiant-data (package (name "r-radiant-data") - (version "0.9.5") + (version "0.9.7") (source (origin (method url-fetch) (uri (cran-uri "radiant.data" version)) (sha256 (base32 - "0mbxfqn79nphii4hb6kxl2wc0w0ra16y378rp2yw9a9926zdb7mb")) + "1f98ahki0kyb27gl55a859zb0lsvk9gddd9f54y767xfs6h89cgk")) (modules '((guix build utils))) (snippet '(begin @@ -3566,7 +3566,9 @@ environment within Shiny.") ("r-rstudioapi" ,r-rstudioapi) ("r-scales" ,r-scales) ("r-shiny" ,r-shiny) + ("r-shinyfiles" ,r-shinyfiles) ("r-shinyace" ,r-shinyace) + ("r-summarytools" ,r-summarytools) ("r-tibble" ,r-tibble) ("r-tidyr" ,r-tidyr) ("r-writexl" ,r-writexl))) -- cgit v1.2.3 From 7a06cdfa8c101f431227c4c5c86877939022fb1a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 20:21:43 +0100 Subject: gnu: r-analytics: Update to 3.0. * gnu/packages/cran.scm (r-analytics): Update to 3.0. [propagated-inputs]: Add r-vim. --- gnu/packages/cran.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b41365a08d..ca1c1c85f8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4240,14 +4240,14 @@ quizzes to create self-paced tutorials for learning about R and R packages.") (define-public r-analytics (package (name "r-analytics") - (version "2.0") + (version "3.0") (source (origin (method url-fetch) (uri (cran-uri "analytics" version)) (sha256 (base32 - "1jkdjqc3fnvvsgi6x9ncf36rxzq0a55cmgkcv92mfmpcramg2lk6")))) + "0js3c8lwj3knccb55nq03cbjlf4w390p9aid2mi5x80l3ayd9in1")))) (build-system r-build-system) (propagated-inputs `(("r-car" ,r-car) @@ -4260,7 +4260,8 @@ quizzes to create self-paced tutorials for learning about R and R packages.") ("r-robust" ,r-robust) ("r-trend" ,r-trend) ("r-tsa" ,r-tsa) - ("r-urca" ,r-urca))) + ("r-urca" ,r-urca) + ("r-vim" ,r-vim))) (home-page "https://cran.r-project.org/web/packages/analytics/") (synopsis "Collection of data analysis tools") (description -- cgit v1.2.3 From 32499b26e6065d67e71d8b998cbfffa6dd60b274 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 22:13:01 +0100 Subject: gnu: Add r-clusteval. * gnu/packages/cran.scm (r-clusteval): New variable. --- gnu/packages/cran.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ca1c1c85f8..5361f964d4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7039,3 +7039,25 @@ problems into least squares ones first.") "This package contains functions for non-parametric survival analysis of exact and interval-censored observations.") (license license:gpl2+))) + +(define-public r-clusteval + (package + (name "r-clusteval") + (version "0.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "clusteval" version)) + (sha256 + (base32 + "1ld0bdl4fy8dsfzm3k7a37cyxc6pfc9qs31x4pxd3z5rslghz7rj")))) + (build-system r-build-system) + (propagated-inputs + `(("r-mvtnorm" ,r-mvtnorm) + ("r-rcpp" ,r-rcpp))) + (home-page "https://cran.r-project.org/web/packages/clusteval/") + (synopsis "Evaluation of clustering algorithms") + (description + "This R package provides a suite of tools to evaluate clustering +algorithms, clusterings, and individual clusters.") + (license license:expat))) -- cgit v1.2.3 From 373cef0a0c2be5e7496f7764447417398abe02ff Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 22:46:47 +0100 Subject: gnu: Add r-tweedie. * gnu/packages/cran.scm (r-tweedie): New variable. --- gnu/packages/cran.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 5361f964d4..f5ce5bc10f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7061,3 +7061,25 @@ exact and interval-censored observations.") "This R package provides a suite of tools to evaluate clustering algorithms, clusterings, and individual clusters.") (license license:expat))) + +(define-public r-tweedie + (package + (name "r-tweedie") + (version "2.3.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "tweedie" version)) + (sha256 + (base32 + "10fv998qjxsyx0h94fi0xbh6xbf24nwgh254n9zfnmix9vk2cqls")))) + (build-system r-build-system) + (native-inputs `(("gfortran" ,gfortran))) + (home-page "https://cran.r-project.org/web/packages/tweedie/") + (synopsis "Evaluation of Tweedie exponential family models") + (description + "Maximum likelihood computations for Tweedie families, including the +series expansion (Dunn and Smyth, 2005; ) and +the Fourier inversion (Dunn and Smyth, 2008; ), +and related methods.") + (license license:gpl2+))) -- cgit v1.2.3 From 4fb35ebd8d1845dbabbbbb04b4ae332513e6e6c5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 22:47:00 +0100 Subject: gnu: Add r-rcppgsl. * gnu/packages/cran.scm (r-rcppgsl): New variable. --- gnu/packages/cran.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f5ce5bc10f..552df6dd3f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7083,3 +7083,33 @@ series expansion (Dunn and Smyth, 2005; ) and the Fourier inversion (Dunn and Smyth, 2008; ), and related methods.") (license license:gpl2+))) + +(define-public r-rcppgsl + (package + (name "r-rcppgsl") + (version "0.3.6") + (source + (origin + (method url-fetch) + (uri (cran-uri "RcppGSL" version)) + (sha256 + (base32 + "16pdapq31729db53agnb48jkvdm97167n3bigy5zazc3q3isis1m")))) + (properties `((upstream-name . "RcppGSL"))) + (build-system r-build-system) + (propagated-inputs + `(("r-rcpp" ,r-rcpp) + ("gsl" ,gsl))) + (native-inputs + `(("r-knitr" ,r-knitr))) ; for vignettes + (home-page "https://cran.r-project.org/web/packages/RcppGSL/") + (synopsis "Rcpp integration for GSL vectors and matrices") + (description + "The GNU Scientific Library (or GSL) is a collection of numerical +routines for scientific computing. It is particularly useful for C and C++ +programs as it provides a standard C interface to a wide range of mathematical +routines. There are over 1000 functions in total with an extensive test +suite. The RcppGSL package provides an easy-to-use interface between GSL data +structures and R using concepts from Rcpp which is itself a package that eases +the interfaces between R and C++.") + (license license:gpl2+))) -- cgit v1.2.3 From 20ff6e3a34eb49afef134ce6cae23d9c5935c6f5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 22:47:10 +0100 Subject: gnu: Add r-mvabund. * gnu/packages/cran.scm (r-mvabund): New variable. --- gnu/packages/cran.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 552df6dd3f..b696219cb9 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7113,3 +7113,28 @@ suite. The RcppGSL package provides an easy-to-use interface between GSL data structures and R using concepts from Rcpp which is itself a package that eases the interfaces between R and C++.") (license license:gpl2+))) + +(define-public r-mvabund + (package + (name "r-mvabund") + (version "3.13.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "mvabund" version)) + (sha256 + (base32 + "1z8bj9zbc8h7w1xki9sc2p2rq6lv8gbcmiy9819z54d7lx1i9cnj")))) + (build-system r-build-system) + (propagated-inputs + `(("r-mass" ,r-mass) + ("r-rcpp" ,r-rcpp) + ("r-rcppgsl" ,r-rcppgsl) + ("r-statmod" ,r-statmod) + ("r-tweedie" ,r-tweedie))) + (home-page "https://cran.r-project.org/web/packages/mvabund/") + (synopsis "Statistical methods for analysing multivariate abundance data") + (description + "This package provides a set of tools for displaying, modeling and +analysing multivariate abundance data in community ecology.") + (license license:lgpl2.1+))) -- cgit v1.2.3 From 49863fd695fc05eb85be7c7dfc950d4936436dc3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 22:47:18 +0100 Subject: gnu: Add r-afex. * gnu/packages/cran.scm (r-afex): New variable. --- gnu/packages/cran.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b696219cb9..09cf64a5d0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7138,3 +7138,28 @@ the interfaces between R and C++.") "This package provides a set of tools for displaying, modeling and analysing multivariate abundance data in community ecology.") (license license:lgpl2.1+))) + +(define-public r-afex + (package + (name "r-afex") + (version "0.22-1") + (source + (origin + (method url-fetch) + (uri (cran-uri "afex" version)) + (sha256 + (base32 + "065wbxljl77zqvc2c4gpfpfyc6mbnnrf24q399q9bxmrz3sapj8n")))) + (build-system r-build-system) + (propagated-inputs + `(("r-car" ,r-car) + ("r-lme4" ,r-lme4) + ("r-lmertest" ,r-lmertest) + ("r-pbkrtest" ,r-pbkrtest) + ("r-reshape2" ,r-reshape2))) + (home-page "https://afex.singmann.science/") + (synopsis "Analysis of factorial experiments") + (description + "This package provides convenience functions for analyzing factorial +experiments using ANOVA or mixed models.") + (license license:gpl2+))) -- cgit v1.2.3 From 7c02dd6268c70d86b4c63c38ddfb034463874cc0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 22:47:26 +0100 Subject: gnu: Add r-lmertest. * gnu/packages/cran.scm (r-lmertest): New variable. --- gnu/packages/cran.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 09cf64a5d0..9b465692e2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7163,3 +7163,32 @@ analysing multivariate abundance data in community ecology.") "This package provides convenience functions for analyzing factorial experiments using ANOVA or mixed models.") (license license:gpl2+))) + +(define-public r-lmertest + (package + (name "r-lmertest") + (version "3.0-1") + (source + (origin + (method url-fetch) + (uri (cran-uri "lmerTest" version)) + (sha256 + (base32 + "0pia69sc8bn37mkiprdf91iilziqb865f94k6x6c26i33fg7rq4m")))) + (properties `((upstream-name . "lmerTest"))) + (build-system r-build-system) + (propagated-inputs + `(("r-ggplot2" ,r-ggplot2) + ("r-lme4" ,r-lme4) + ("r-mass" ,r-mass) + ("r-numderiv" ,r-numderiv))) + (home-page "https://github.com/runehaubo/lmerTestR") + (synopsis "Tests in linear mixed effects models") + (description + "This package provides p-values in type I, II or III anova and summary +tables for @code{lmer} model fits via Satterthwaite's degrees of freedom +method. A Kenward-Roger method is also available via the @code{pbkrtest} +package. Model selection methods include step, drop1 and anova-like tables +for random effects (ranova). Methods for Least-Square means (LS-means) and +tests of linear contrasts of fixed effects are also available.") + (license license:gpl2+))) -- cgit v1.2.3 From fd649d1e68ac8123d6e6e66fcf8905e6c6ede5b7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Oct 2018 22:47:35 +0100 Subject: gnu: Add r-r2glmm. * gnu/packages/cran.scm (r-r2glmm): New variable. --- gnu/packages/cran.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9b465692e2..df869794db 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7192,3 +7192,36 @@ package. Model selection methods include step, drop1 and anova-like tables for random effects (ranova). Methods for Least-Square means (LS-means) and tests of linear contrasts of fixed effects are also available.") (license license:gpl2+))) + +(define-public r-r2glmm + (package + (name "r-r2glmm") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "r2glmm" version)) + (sha256 + (base32 + "0iim92blpa59vgz97c2pi05yhbjjmaffdbkbmk5kplfb2vmazgiy")))) + (build-system r-build-system) + (propagated-inputs + `(("r-afex" ,r-afex) + ("r-data-table" ,r-data-table) + ("r-dplyr" ,r-dplyr) + ("r-ggplot2" ,r-ggplot2) + ("r-gridextra" ,r-gridextra) + ("r-lmertest" ,r-lmertest) + ("r-mass" ,r-mass) + ("r-matrix" ,r-matrix) + ("r-mgcv" ,r-mgcv) + ("r-pbkrtest" ,r-pbkrtest))) + (home-page "https://github.com/bcjaeger/r2glmm") + (synopsis "Compute R squared for mixed (multilevel) models") + (description + "This package computes model and semi partial R squared with confidence +limits for the linear and generalized linear mixed model (LMM and GLMM). The +R squared measure from L. J. Edwards et al. (2008) is extended to the GLMM +using @dfn{penalized quasi-likelihood} (PQL) estimation (see Jaeger et +al. (2016)).") + (license license:gpl2))) -- cgit v1.2.3 From 1204402a9036bd35e37699d4310275b79cc54083 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Oct 2018 00:11:12 +0100 Subject: gnu: python-partd: Update to 0.3.9. * gnu/packages/python.scm (python-partd): Update to 0.3.9. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index fbb280224a..29b4a8e358 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -14433,14 +14433,14 @@ This Python package wraps the Blosc library.") (define-public python-partd (package (name "python-partd") - (version "0.3.8") + (version "0.3.9") (source (origin (method url-fetch) (uri (pypi-uri "partd" version)) (sha256 (base32 - "03s0i5qfgkx6y24bmfgyd5hnsjznkbbfafwb2khf7k9790f1yab7")))) + "0sz6rwlnl4fqq220pyz863cnv0gjdxl4m7lscl71ishl5z0xkmhz")))) (build-system python-build-system) (propagated-inputs `(("python-blosc" ,python-blosc) -- cgit v1.2.3 From 295fc4152ad92d13c92f85ca542779d11b09955c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Oct 2018 15:51:41 +0100 Subject: gnu: cloc: Update to 1.80. * gnu/packages/code.scm (cloc): Update to 1.80. --- gnu/packages/code.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 98a86b763f..72503254e6 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -211,16 +211,16 @@ COCOMO model or user-provided parameters.") (define-public cloc (package (name "cloc") - (version "1.78") + (version "1.80") (source (origin (method url-fetch) (uri (string-append - "https://github.com/AlDanial/cloc/releases/download/" version + "https://github.com/AlDanial/cloc/releases/download/v" version "/cloc-" version ".tar.gz")) (sha256 (base32 - "1j9lwy9xf43kpv1csqdxzch6y1hnsv881ddqd357f8v58dhr4s68")))) + "0rqxnaskg5b736asyzfda1113zvpkajyqjf49vl9wgzf1r9m6bq8")))) (build-system gnu-build-system) (inputs `(("coreutils" ,coreutils) @@ -231,8 +231,8 @@ COCOMO model or user-provided parameters.") ("perl-regexp-common" ,perl-regexp-common))) (arguments `(#:phases (modify-phases %standard-phases - (delete 'configure) - (delete 'build) + (delete 'configure) ; nothing to configure + (delete 'build) ; nothing to build (replace 'install (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out"))) -- cgit v1.2.3 From 61c58b7827b336877758d824aafd0c5e4a50713f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Oct 2018 15:54:20 +0100 Subject: gnu: sigrok-cli: Update to 0.7.1. * gnu/packages/electronics.scm (sigrok-cli): Update to 0.7.1. --- gnu/packages/electronics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index 4aaf050faf..ddee5bac13 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -202,7 +202,7 @@ format support.") (define-public sigrok-cli (package (name "sigrok-cli") - (version "0.7.0") + (version "0.7.1") (source (origin (method url-fetch) (uri (string-append @@ -210,7 +210,7 @@ format support.") version ".tar.gz")) (sha256 (base32 - "072ylscp0ppgii1k5j07hhv7dfmni4vyhxnsvxmgqgfyq9ldjsan")))) + "15vpn1psriadcbl6v9swwgws7dva85ld03yv6g1mgm27kx11697m")))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs -- cgit v1.2.3 From 58cd3123ac4d6fb704a07c2ab8165805db03da9a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Oct 2018 16:30:11 +0100 Subject: gnu: pulseview: Update to 0.4.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/electronics.scm (pulseview): Update to 0.4.1. [arguments]: Remove CMAKE_CXX_FLAGS from #:configure-flags. (Keep) build(ing) the unit tests. Add a ‘remove-empty-doc-directory’ phase. --- gnu/packages/electronics.scm | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index ddee5bac13..bc30e619ec 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -226,7 +226,7 @@ format support.") (define-public pulseview (package (name "pulseview") - (version "0.4.0") + (version "0.4.1") (source (origin (method url-fetch) (uri (string-append @@ -234,9 +234,20 @@ format support.") version ".tar.gz")) (sha256 (base32 - "1f8f2342d5yam98mmcb8f9g2vslcwv486bmi4x45pxn68l82ky3q")))) + "0bvgmkgz37n2bi9niskpl05hf7rsj1lj972fbrgnlz25s4ywxrwy")))) + (build-system cmake-build-system) (arguments - `(#:configure-flags '("-DCMAKE_CXX_FLAGS=-fext-numeric-literals"))) + `(#:configure-flags '("-DENABLE_TESTS=y") + #:phases + (modify-phases %standard-phases + (add-after 'install 'remove-empty-doc-directory + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (with-directory-excursion (string-append out "/share") + ;; Use RMDIR to never risk silently deleting files. + (rmdir "doc/pulseview") + (rmdir "doc")) + #t)))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs @@ -247,7 +258,6 @@ format support.") ("libsigrokdecode" ,libsigrokdecode) ("qtbase" ,qtbase) ("qtsvg" ,qtsvg))) - (build-system cmake-build-system) (home-page "https://www.sigrok.org/wiki/PulseView") (synopsis "Qt based logic analyzer, oscilloscope and MSO GUI for sigrok") (description "PulseView is a Qt based logic analyzer, oscilloscope and MSO GUI -- cgit v1.2.3 From becee7029f843b23755e2cd884fafa563bc8f6b2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Oct 2018 21:49:28 +0100 Subject: gnu: disorderfs: Update to 0.5.5. * gnu/packages/file-systems.scm (disorderfs): Update to 0.5.5. --- gnu/packages/file-systems.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index b195019866..f250719bbd 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -107,7 +107,7 @@ single file can be mounted.") (define-public disorderfs (package (name "disorderfs") - (version "0.5.4") + (version "0.5.5") (source (origin (method git-fetch) @@ -117,7 +117,7 @@ single file can be mounted.") (file-name (git-file-name name version)) (sha256 (base32 - "1mw4ix9h17ikki8p2rxdvzp87rcm1c7by5lvfn5gxlxr7hlj9f8g")))) + "18c32qcdzbxrzg7srnqnw1ls9yqqxyk9b996yxr6w2znw6x6n8v4")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -126,7 +126,7 @@ single file can be mounted.") ("attr" ,attr))) (arguments `(#:phases (modify-phases %standard-phases - (delete 'configure)) + (delete 'configure)) ; no configure script #:make-flags (let ((out (assoc-ref %outputs "out"))) (list (string-append "PREFIX=" out))) #:test-target "test" -- cgit v1.2.3 From 21fc352bad21c786ad334edc78fadf74c9a9bb0f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Oct 2018 23:06:28 +0100 Subject: gnu: yosys: Don't use unstable tarball. * gnu/packages/fpga.scm (yosys)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/fpga.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index c9454aa324..9ab2e35255 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -121,14 +121,15 @@ For synthesis, the compiler generates netlists in the desired format.") (name "yosys") (version "0.7") (source (origin - (method url-fetch) - (uri - (string-append "https://github.com/cliffordwolf/yosys/archive/" - name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/cliffordwolf/yosys.git") + (commit (string-append "yosys-" version)) + (recursive? #t))) ; for the ‘iverilog’ submodule (sha256 (base32 - "0vkfdn4phvkjqlnpqlr6q5f97bgjc3312vj5jf0vf85zqv88dy9x")) - (file-name (string-append name "-" version "-checkout.tar.gz")) + "1ssrpgw0j9qlm52g1hsbb9fsww4vnwi0l7zvvky7a8w7wamddky0")) + (file-name (git-file-name name version)) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 4cae7e67f3164b0626a2a25215f5d94141a860da Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Oct 2018 23:21:21 +0100 Subject: gnu: hyperrogue: Update to 10.4x. * gnu/packages/games.scm (hyperrogue): Update to 10.4x. --- gnu/packages/games.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 53e7a79ce6..e28dd9fa83 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3658,18 +3658,18 @@ throwing people around in pseudo-randomly generated buildings.") (define-public hyperrogue (package (name "hyperrogue") - (version "10.4t") + (version "10.4x") ;; When updating this package, be sure to update the "hyperrogue-data" ;; origin in native-inputs. (source (origin (method url-fetch) (uri (string-append - "http://www.roguetemple.com/z/hyper/" + "https://www.roguetemple.com/z/hyper/" name (string-join (string-split version #\.) "") "-src.tgz")) (sha256 (base32 - "0phqhmnzmc16a23qb4fkil0flzb86kibdckf1r35nc3l0k4193nn")))) + "0khk7xqdw4aiw1wnf1xrhmd7fklnzmpdavd7ix4mkm510dr5wklm")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target @@ -3741,12 +3741,12 @@ throwing people around in pseudo-randomly generated buildings.") (method url-fetch) (uri (string-append - "http://www.roguetemple.com/z/hyper/" name + "https://www.roguetemple.com/z/hyper/" name (string-join (string-split version #\.) "") "-win.zip")) (sha256 (base32 - "1xd9v8zzgi8m5ar8g4gy1xx5zqwidz3gn1knz0lwib3kbxx4drpg")))) + "1dv3kdv1n5imh3n9900b55rf0wwbjj7243lhsbk7lcjqsqxia39q")))) ("unzip" ,unzip))) (inputs `(("font-dejavu" ,font-dejavu) @@ -3756,7 +3756,7 @@ throwing people around in pseudo-randomly generated buildings.") sdl-gfx sdl-mixer sdl-ttf))))) - (home-page "http://www.roguetemple.com/z/hyper/") + (home-page "https://www.roguetemple.com/z/hyper/") (synopsis "Non-euclidean graphical rogue-like game") (description "HyperRogue is a game in which the player collects treasures and fights -- cgit v1.2.3 From 1d9a9d27ae4d7981a0df749708b683859ee5c58e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 31 Oct 2018 01:27:07 +0100 Subject: gnu: meandmyshadow: Update to 0.5. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/games.scm (meandmyshadow): Update to 0.5. [source]: Add unreleased bugfix patch. [arguments]: Remove obsolete ‘set-sdl'paths’ phase. [inputs]: Switch to SDL 2. Add lua. Remove libx11, mesa, and glu. * gnu/packages/patches/meandmyshadow-define-paths-earlier.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/games.scm | 38 ++++++---------- .../meandmyshadow-define-paths-earlier.patch | 50 ++++++++++++++++++++++ 3 files changed, 63 insertions(+), 26 deletions(-) create mode 100644 gnu/packages/patches/meandmyshadow-define-paths-earlier.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 5f72879658..6075e47956 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -951,6 +951,7 @@ dist_patch_DATA = \ %D%/packages/patches/mcrypt-CVE-2012-4409.patch \ %D%/packages/patches/mcrypt-CVE-2012-4426.patch \ %D%/packages/patches/mcrypt-CVE-2012-4527.patch \ + %D%/packages/patches/meandmyshadow-define-paths-earlier.patch \ %D%/packages/patches/mesa-skip-disk-cache-test.patch \ %D%/packages/patches/meson-for-build-rpath.patch \ %D%/packages/patches/metabat-fix-compilation.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index e28dd9fa83..250f6151ef 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -572,7 +572,7 @@ automata. The following features are available: (define-public meandmyshadow (package (name "meandmyshadow") - (version "0.4.1") + (version "0.5") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/meandmyshadow/" @@ -580,37 +580,23 @@ automata. The following features are available: "-src.tar.gz")) (sha256 (base32 - "0wl5dc75qy001s6043cx0vr2l5y2qfv1cldqnwill9sfygqj9p95")))) + "1b6qf83vdfv8jwn2jq9ywmda2qn2f5914i7mwfy04m17wx593m3m")) + (patches (search-patches + ;; This will not be needed in the next release. + "meandmyshadow-define-paths-earlier.patch")))) (build-system cmake-build-system) (arguments - '(#:tests? #f ; there are no tests - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'set-sdl'paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "cmake/Modules/FindSDL_gfx.cmake" - (("/usr/local/include/SDL") - (string-append (assoc-ref inputs "sdl") - "/include/SDL"))) - ;; Because SDL provides lib/libX11.so.6 we need to explicitly - ;; link with libX11, even though we're using the GL backend. - (substitute* "CMakeLists.txt" - (("\\$\\{X11_LIBRARIES\\}") "-lX11")) - #t))))) + `(#:tests? #f)) ; there are no tests (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("sdl" ,(sdl-union (list sdl - sdl-image - sdl-gfx - sdl-mixer - sdl-ttf))) - ("libx11" ,libx11) ; needed by sdl's libX11 + `(("curl" ,curl) ("libarchive" ,libarchive) - ("openssl" ,openssl) - ("mesa" ,mesa) - ("glu" ,glu) - ("curl" ,curl))) + ("lua" ,lua) + ("sdl" ,(sdl-union (list sdl2 + sdl2-image + sdl2-mixer + sdl2-ttf))))) (home-page "http://meandmyshadow.sourceforge.net/") (synopsis "Puzzle/platform game") (description "Me and My Shadow is a puzzle/platform game in which you try diff --git a/gnu/packages/patches/meandmyshadow-define-paths-earlier.patch b/gnu/packages/patches/meandmyshadow-define-paths-earlier.patch new file mode 100644 index 0000000000..505cbd23fe --- /dev/null +++ b/gnu/packages/patches/meandmyshadow-define-paths-earlier.patch @@ -0,0 +1,50 @@ +From: Tobias Geerinckx-Rice +Date: Wed, 31 Oct 2018 02:24:26 +0100 +Subject: [PATCH] gnu: meandmyshadow: Define paths earlier. + +The following patch was taken verbatim from the upstream repository[0] +and will be included in the next release. + +[0]: https://github.com/acmepjz/meandmyshadow/pull/29 +--- +From 4847e6b5755258a1e0534f2d4b91dce2ce3b459e Mon Sep 17 00:00:00 2001 +From: Dmitry Marakasov +Date: Wed, 24 Oct 2018 23:31:19 +0300 +Subject: [PATCH] Define paths earlier in CMakeLists.txt + +At the very least, paths should be defined before Configure_File(), otherwise empty DATAROOTDIR is substituted in config.h +--- + CMakeLists.txt | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e79639a..6321d9d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,6 +2,13 @@ Project (meandmyshadow) + CMake_Minimum_Required (VERSION 3.1) + Set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") + ++#Path options ++Set (BINDIR "bin" CACHE STRING "Where to install binaries") ++Set (DATAROOTDIR "${CMAKE_INSTALL_PREFIX}/share" CACHE STRING "Sets the root of data directories to a non-default location") ++Set (ICONDIR "${DATAROOTDIR}/icons" CACHE STRING "Sets the icon directory for desktop entry to a non-default location.") ++Set (DESKTOPDIR "${DATAROOTDIR}/applications" CACHE STRING "Sets the desktop file directory for desktop entry to a non-default location.") ++ ++#Options + Option (DEBUG_MODE "Compile the game with debug mode enabled" OFF) + Option (DISABLED_DEBUG_STUFF "Enable this you'll see a lot of annoying script debug messages which will lag the game." OFF) + +@@ -164,12 +171,6 @@ Target_Link_Libraries ( + ${LUA_LIBRARIES} + ) + +-#Path options +-Set (BINDIR "bin" CACHE STRING "Where to install binaries") +-Set (DATAROOTDIR "${CMAKE_INSTALL_PREFIX}/share" CACHE STRING "Sets the root of data directories to a non-default location") +-Set (ICONDIR "${DATAROOTDIR}/icons" CACHE STRING "Sets the icon directory for desktop entry to a non-default location.") +-Set (DESKTOPDIR "${DATAROOTDIR}/applications" CACHE STRING "Sets the desktop file directory for desktop entry to a non-default location.") +- + #Install locations + Install (DIRECTORY ${PROJECT_SOURCE_DIR}/data DESTINATION ${DATAROOTDIR}/meandmyshadow/) + Install (FILES AUTHORS DESTINATION ${DATAROOTDIR}/meandmyshadow/) -- cgit v1.2.3 From b590951ff2a9f05993b952f9cae925254237b1d6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 31 Oct 2018 01:27:42 +0100 Subject: gnu: meandmyshadow: Update home page. * gnu/packages/games.scm (meandmyshadow)[home-page]: Follow permanent redirect. --- gnu/packages/games.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 250f6151ef..0467872fcd 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -597,7 +597,7 @@ automata. The following features are available: sdl2-image sdl2-mixer sdl2-ttf))))) - (home-page "http://meandmyshadow.sourceforge.net/") + (home-page "https://acmepjz.github.io/meandmyshadow/") (synopsis "Puzzle/platform game") (description "Me and My Shadow is a puzzle/platform game in which you try to reach the exit by solving puzzles. Spikes, moving blocks, fragile blocks -- cgit v1.2.3 From c6588749a6424905b180dae3ce2dce81ccbf6836 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 30 Oct 2018 22:20:44 +0530 Subject: gnu: libqmatrixclient: Update to 0.4.0. * gnu/packages/messaging.scm (libqmatrixclient): Update to 0.4.0. --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 0090fe12ce..3097f1aa2a 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1648,7 +1648,7 @@ notifications, and Python scripting support.") (define-public libqmatrixclient (package (name "libqmatrixclient") - (version "0.3.0.2") + (version "0.4.0") (source (origin (method git-fetch) @@ -1658,7 +1658,7 @@ notifications, and Python scripting support.") (file-name (git-file-name name version)) (sha256 (base32 - "03pxmr4wa818fgqddkr2fkwz6pda538x3ic9yq7c40x98zqf55w5")))) + "1llzqjagvp91kcg26q5c4qw9aaz7wna3rh6k06rc3baivrjqf3cn")))) (build-system cmake-build-system) (inputs `(("qtbase" ,qtbase))) -- cgit v1.2.3 From c7ac8e36e25d540785a280bc53a2b312ea1b4eca Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 30 Oct 2018 22:23:21 +0530 Subject: gnu: quaternion: Update to 0.0.9.3. * gnu/packages/messaging.scm (quaternion): Update to 0.0.9.3. [inputs]: Add qtquickcontrols, qtsvg and qttools. [arguments]: Remove fix-libqmatrixclient-dynamic-linking phase. Add wrap-program phase. --- gnu/packages/messaging.scm | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 3097f1aa2a..de33d737e2 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1676,7 +1676,7 @@ QMatrixClient project.") (define-public quaternion (package (name "quaternion") - (version "0.0.9.2") + (version "0.0.9.3") (source (origin (method git-fetch) @@ -1686,31 +1686,31 @@ QMatrixClient project.") (file-name (git-file-name name version)) (sha256 (base32 - "0zrr4khbbdf5ziq65gi0cb1yb1d0y5rv18wld22w1x96f7fkmrib")))) + "1hr9zqf301rg583n9jv256vzj7y57d8qgayk7c723bfknf1s6hh3")))) (build-system cmake-build-system) (inputs `(("libqmatrixclient" ,libqmatrixclient) ("qtbase" ,qtbase) - ("qtdeclarative" ,qtdeclarative))) + ("qtdeclarative" ,qtdeclarative) + ("qtquickcontrols" ,qtquickcontrols) + ("qtsvg" ,qtsvg) + ("qttools" ,qttools))) (arguments `(#:tests? #f ; No tests #:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-libqmatrixclient-dynamic-linking - ;; Upstream recommends statically linking with - ;; libqmatrixclient. Patch the source so that we can dynamically - ;; link instead. In a future release, when upstream moves to - ;; dynamic linking, remove this phase. - (lambda _ - (substitute* "CMakeLists.txt" - (("^add_subdirectory\\(lib\\)" all) - (string-append "#" all))) - (for-each - (lambda (file) - (substitute* file - (("#include \"lib/([^\"]*)\"" all header) - (string-append "#include <" header ">")))) - (find-files "client" "\\.(cpp|h)$")) + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (wrap-program (string-append (assoc-ref outputs "out") + "/bin/quaternion") + `("QT_PLUGIN_PATH" ":" prefix + (,(string-append (assoc-ref inputs "qtsvg") + "/lib/qt5/plugins"))) + `("QML2_IMPORT_PATH" ":" prefix + ,(map (lambda (label) + (string-append (assoc-ref inputs label) + "/lib/qt5/qml")) + '("qtdeclarative" "qtquickcontrols")))) #t))))) (home-page "https://matrix.org/docs/projects/client/quaternion.html") (synopsis "Graphical client for the Matrix instant messaging protocol") -- cgit v1.2.3 From a45a92ccd83a54a2171d0a6c66950752fde704ad Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 30 Oct 2018 14:34:05 -0400 Subject: gnu: webkitgtk@2.22: Update to 2.22.3. * gnu/packages/webkit.scm (webkitgtk-2.22): Update to 2.22.3. --- gnu/packages/webkit.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index c5238a8a65..d1890c8b32 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -143,14 +143,14 @@ HTML/CSS applications to full-fledged web browsers.") (define-public webkitgtk-2.22 (package/inherit webkitgtk (name "webkitgtk") - (version "2.22.2") + (version "2.22.3") (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" name "-" version ".tar.xz")) (sha256 (base32 - "1flrbr8pzbrlwv09b4pmgh6vklw7jghd2lgrhcb72vl9s7a8fm1l")))) + "0wnddhm2bihmmkmi919lyxskvjk2wrzx6azkiypyjfwm08lm9zcx")))) (native-inputs `(("gcc" ,gcc-7) ; webkitgtk-2.22 requires gcc-6 or newer ,@(package-native-inputs webkitgtk))) -- cgit v1.2.3 From 3126bee69ae82bec5a20eaf2690efdc7f8cda439 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 31 Oct 2018 09:35:41 +0100 Subject: gnu: wine-staging: Update to 3.19. * gnu/packages/wine.scm (wine-staging-patchset-data): Update to 3.19. * gnu/packages/wine.scm (wine-staging): Update to 3.19. --- gnu/packages/wine.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 169cc6e3c5..60b2a81de8 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -225,7 +225,7 @@ integrate Windows applications into your desktop.") (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") - (version "3.18") + (version "3.19") (source (origin (method git-fetch) @@ -235,7 +235,7 @@ integrate Windows applications into your desktop.") (file-name (git-file-name name version)) (sha256 (base32 - "18g1lmqzkc7ngppynimfvza1gkdhqlnjbvnckmaws847ns4i0kzp")))) + "0nmlhc6jamz0zb4b1w165l8j1a1b0j5ad1sv06aasc9jy8s12b22")))) (build-system trivial-build-system) (native-inputs `(("bash" ,bash) @@ -281,7 +281,7 @@ integrate Windows applications into your desktop.") (file-name (string-append name "-" version ".tar.xz")) (sha256 (base32 - "0xqs76hxcym8nb95r7l72xx0msbscp7fhkr1wrv4r0923d5x9s4v")))) + "0slwgbxclx2dx0glj8az3mv0bqxmx119v9s0jvg1b5zhmqkcc8gg")))) (inputs `(("autoconf" ,autoconf) ; for autoreconf ("gtk+" ,gtk+) ("libva" ,libva) -- cgit v1.2.3 From 124e9d6e0a6b3e0a5c230c79bdbbaf5bb345da42 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 31 Oct 2018 10:38:39 +0100 Subject: gnu: dolphin-emu: Update to commit 22ddd11. * gnu/packages/emulators.scm (dolphin-emu): Update to commit 22ddd11. [arguments]: Return #t with phase 'fixgcc7. --- gnu/packages/emulators.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 438e9df1fc..2304b74e40 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -117,8 +117,8 @@ ;; Building from recent Git because the official 5.0 release no longer builds. (define-public dolphin-emu - (let ((commit "5f0d825f40b8aabe13eaef32d44ab667ff8e8c28") - (revision "3")) + (let ((commit "22ddd11573fd8d3e43a879804e7a64e50928435d") + (revision "4")) (package (name "dolphin-emu") (version (git-version "5.0" revision commit)) @@ -144,7 +144,7 @@ #t)) (sha256 (base32 - "0dh7mih16aif9ynbgcsn7n10f89g8d232i86xqfp2rijsdggcmzl")))) + "01l6r8spaslqc73m3y7hfb2jx5a4848vdkman6x6w2arpb8bywzl")))) (build-system cmake-build-system) (arguments '(#:tests? #f @@ -153,7 +153,8 @@ (add-before 'configure 'fixgcc7 (lambda _ (unsetenv "C_INCLUDE_PATH") - (unsetenv "CPLUS_INCLUDE_PATH"))) + (unsetenv "CPLUS_INCLUDE_PATH") + #t)) (add-before 'configure 'generate-fonts&hardcore-libvulkan-path (lambda* (#:key inputs outputs #:allow-other-keys) (let ((fontfile -- cgit v1.2.3 From c438e0cc7471cfe0b7accd5763fa4095934fbf48 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 31 Oct 2018 13:43:53 -0400 Subject: gnu: curl: Update grafted replacement to 7.62.0 [security fixes]. Fixes CVE-2018-{16839,16840,16842}. * gnu/packages/curl.scm (curl)[replacement]: Update to 7.62.0. (curl-7.61.1): Replace with ... (curl-7.62.0): ... new variable. --- gnu/packages/curl.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 6d45dc0cc5..2fb87251f4 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -51,7 +51,7 @@ (package (name "curl") (version "7.59.0") - (replacement curl-7.61.1) + (replacement curl-7.62.0) (source (origin (method url-fetch) (uri (string-append "https://curl.haxx.se/download/curl-" @@ -141,10 +141,10 @@ tunneling, and so on.") "See COPYING in the distribution.")) (home-page "https://curl.haxx.se/"))) -(define-public curl-7.61.1 +(define-public curl-7.62.0 (package (inherit curl) - (version "7.61.1") + (version "7.62.0") (source (origin (method url-fetch) @@ -152,7 +152,7 @@ tunneling, and so on.") version ".tar.xz")) (sha256 (base32 - "148qv1f32290r9pwg07mccawihz4srznkzsdwdl2xllvlgb16n9x")))))) + "1hbm29r3pirhn4gkcnd94ylc4jzgn3v3v7qbay9awxg7bwx69dfs")))))) (define-public kurly (package -- cgit v1.2.3 From c16913d34df610f5e1560ab8da953e32b3a4e7d7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 31 Oct 2018 21:56:36 +0200 Subject: gnu: myrepos: Update to 1.20180726. * gnu/packages/version-control.scm (myrepos): Update to 1.20180726. [source]: Remove patch. * gnu/packages/patches/myrepos-CVE-2018-7032.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/patches/myrepos-CVE-2018-7032.patch | 69 ------------------------ gnu/packages/version-control.scm | 5 +- 3 files changed, 2 insertions(+), 73 deletions(-) delete mode 100644 gnu/packages/patches/myrepos-CVE-2018-7032.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 6075e47956..3207cecb72 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -973,7 +973,6 @@ dist_patch_DATA = \ %D%/packages/patches/mupen64plus-ui-console-notice.patch \ %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/net-tools-bitrot.patch \ %D%/packages/patches/netcdf-date-time.patch \ %D%/packages/patches/netcdf-tst_h_par.patch \ diff --git a/gnu/packages/patches/myrepos-CVE-2018-7032.patch b/gnu/packages/patches/myrepos-CVE-2018-7032.patch deleted file mode 100644 index ce9493e5f9..0000000000 --- a/gnu/packages/patches/myrepos-CVE-2018-7032.patch +++ /dev/null @@ -1,69 +0,0 @@ -http://source.myrepos.branchable.com/?p=source.git;a=patch;h=40a3df21c73f1bb1b6915cc6fa503f50814664c8 -This can be removed with the next release. It was modified slightly to apply - -From 40a3df21c73f1bb1b6915cc6fa503f50814664c8 Mon Sep 17 00:00:00 2001 -From: Paul Wise -Date: Sun, 11 Feb 2018 21:57:49 +0800 -Subject: [PATCH] Mitigate vulnerabilities caused by some git remotes being - able to execute code - -Set GIT_PROTOCOL_FROM_USER=0 with git versions newer than 2.12. - -Prevent remote websites from causing cloning of local repositories. - -Manually whitelist known-safe protocols (http, https, git, ssh) -when using git versions older than 2.12. - -Fixes: CVE-2018-7032 -Fixes: https://bugs.debian.org/840014 -Suggestions-by: Jakub Wilk -Reported-by: Jakub Wilk ---- - webcheckout | 22 +++++++++++++++++++++- - 1 file changed, 21 insertions(+), 1 deletion(-) - -diff --git a/webcheckout b/webcheckout -index e98da5c..de497ba 100755 ---- a/webcheckout -+++ b/webcheckout -@@ -71,6 +71,16 @@ use Getopt::Long; - use warnings; - use strict; - -+# Mitigate some git remote types being dangerous -+my $git_unsafe = 1; -+my $git_version = `git --version`; -+$git_version =~ s{^git version }{}; -+my ($major, $minor) = split(/\./, $git_version); -+if (int($major) >= 2 && int($minor) >= 12) { -+ $ENV{GIT_PROTOCOL_FROM_USER} = 0; -+ $git_unsafe = 0; -+} -+ - # What to download. - my $url; - -@@ -89,7 +99,17 @@ my $destdir; - - # how to perform checkouts - my %handlers=( -- git => sub { doit("git", "clone", shift, $destdir) }, -- svn => sub { doit("svn", "checkout", shift, $destdir) }, -- bzr => sub { doit("bzr", "branch", shift, $destdir) }, -+ git => sub { -+ my $git_url = shift; -+ # Reject unsafe URLs with older versions of git -+ # that do not already check the URL safety. -+ if ($git_unsafe && $git_url !~ m{^(?:(?:https?|git|ssh):[^:]|(?:[-_.A-Za-z0-9]+@)?[-_.A-Za-z0-9]+:(?!:|//))}) { -+ print STDERR "potentially unsafe git URL, may fail, touch local files or execute arbitrary code\n"; -+ return 1; -+ } -+ # Reject cloning local directories too, webcheckout is for remote repos -+ doit(qw(git -c protocol.file.allow=user clone --), $git_url, $destdir) -+ }, -+ svn => sub { doit(qw(svn checkout --), shift, $destdir) }, -+ bzr => sub { doit(qw(bzr branch --), shift, $destdir) }, - ); --- -2.11.0 - diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index ccb1f5dacc..df0b2f0122 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1730,7 +1730,7 @@ modification time.") (define-public myrepos (package (name "myrepos") - (version "1.20171231") + (version "1.20180726") (source (origin (method git-fetch) @@ -1739,8 +1739,7 @@ modification time.") (commit version))) (file-name (string-append name "-" version "-checkout")) (sha256 - (base32 "10q7lpx152xnkk701fscn4dq99q9znnmv3bc2482khhjg7z8rps0")) - (patches (search-patches "myrepos-CVE-2018-7032.patch")))) + (base32 "0jphw61plm8cgklja6hs639xhdvxgvjwbr6jpvjwpp7hc5gmhms5")))) (build-system gnu-build-system) (inputs `(("perl" ,perl))) -- cgit v1.2.3 From 2930a39b165ce9e13e899fe66b82c03932e0e86b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 31 Oct 2018 15:54:38 +0100 Subject: gnu: julia: Update objconv input to 2018-10-07. * gnu/packages/julia.scm (julia)[input]: Update objconf to 2018-10-07. --- gnu/packages/julia.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index fb9b0eeedf..856bbc0eed 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -357,10 +357,10 @@ (method url-fetch) ;; No versioned URL, see for updates. (uri "https://www.agner.org/optimize/objconv.zip") - (file-name "objconv-2018-08-15.zip") + (file-name "objconv-2018-10-07.zip") (sha256 (base32 - "09y4pwxfs6fl47cyingbf95i2rxx74wmycl9fd4ldcgvpx9bzdrx")))) + "0wp6ld9vk11f4nnkn56627zmlv9k5vafi99qa3yyn1pgcd61zcfs")))) ("dsfmt" ,(origin (method url-fetch) -- cgit v1.2.3 From c3069cd183a5e00166c99da57668341e9767cab2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 31 Oct 2018 19:01:05 +0100 Subject: gnu: motion: Update to 4.2. * gnu/packages/video.scm (motion): Update to 4.2. --- gnu/packages/video.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 4fcd15e4aa..fb8e4fe75a 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -96,6 +96,7 @@ #:use-module (gnu packages glib) #:use-module (gnu packages guile) #:use-module (gnu packages gnome) + #:use-module (gnu packages gnunet) #:use-module (gnu packages gnupg) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) @@ -2911,7 +2912,7 @@ It counts more than 100 plugins.") (define-public motion (package (name "motion") - (version "4.1.1") + (version "4.2") (home-page "https://motion-project.github.io/") (source (origin (method url-fetch) @@ -2920,7 +2921,7 @@ It counts more than 100 plugins.") "release-" version ".tar.gz")) (sha256 (base32 - "1qm4i8zrqafl60sv2frhixvkd0wh0r5jfcrj5i6gha7yplsvjx10")) + "1ad2zlz941lvb818g1nzlpcpbxgv0h05q164hafa805yqm7m1y3f")) (file-name (string-append name "-" version ".tar.gz")))) (build-system gnu-build-system) (native-inputs @@ -2930,6 +2931,7 @@ It counts more than 100 plugins.") (inputs `(("libjpeg" ,libjpeg) ("ffmpeg" ,ffmpeg-3.4) + ("libmicrohttpd" ,libmicrohttpd) ("sqlite" ,sqlite))) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 4fbcfc148264b1ad97706d366dbd94ce4e02e56d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 31 Oct 2018 19:05:55 +0100 Subject: Keep (gnu packages video) module imports in order. * gnu/packages/video.scm (define-module): Re-order module imports alphabetically. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index fb8e4fe75a..900198a7a7 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -67,6 +67,7 @@ #:use-module (guix build-system trivial) #:use-module (gnu packages) #:use-module (gnu packages algebra) + #:use-module (gnu packages assembly) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) #:use-module (gnu packages avahi) @@ -140,8 +141,7 @@ #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages xml) - #:use-module (gnu packages xorg) - #:use-module (gnu packages assembly)) + #:use-module (gnu packages xorg)) (define-public aalib (package -- cgit v1.2.3 From 2ea678fabfb57b05652fa8e0afe8fb6b1000473f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 31 Oct 2018 19:19:29 +0100 Subject: gnu: motion: Don't use unstable tarball. * gnu/packages/video.scm (motion)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/video.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 900198a7a7..2eb79a88ff 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2915,14 +2915,14 @@ It counts more than 100 plugins.") (version "4.2") (home-page "https://motion-project.github.io/") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/Motion-Project/motion/archive/" - "release-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/Motion-Project/motion.git") + (commit (string-append "release-" version)))) (sha256 (base32 - "1ad2zlz941lvb818g1nzlpcpbxgv0h05q164hafa805yqm7m1y3f")) - (file-name (string-append name "-" version ".tar.gz")))) + "0c0q6dl4v561m5y8bp0c0h4p3s52fjgcdnsrrf5ygdi288d3rfxv")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf-wrapper) -- cgit v1.2.3 From 33bddd309c398d3d2286a48f26e41b59350b7ef7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 31 Oct 2018 19:22:50 +0100 Subject: gnu: motion: Install translations. * gnu/packages/video.scm (motion)[native-inputs]: Add gettext-minimal. --- gnu/packages/video.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 2eb79a88ff..34af248eb7 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2927,6 +2927,7 @@ It counts more than 100 plugins.") (native-inputs `(("autoconf" ,autoconf-wrapper) ("automake" ,automake) + ("gettext" ,gettext-minimal) ("pkg-config" ,pkg-config))) (inputs `(("libjpeg" ,libjpeg) -- cgit v1.2.3 From 351a12b0a7e57c9aa95e2780e7e568597a425892 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 31 Oct 2018 22:49:49 +0100 Subject: gnu: oniguruma: Update to 6.9.0. * gnu/packages/textutils.scm (oniguruma): Update to 6.9.0. --- gnu/packages/textutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 8780bb2829..084017dbde 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -338,7 +338,7 @@ as existing hashing techniques, with provably negligible risk of collisions.") (define-public oniguruma (package (name "oniguruma") - (version "6.8.2") + (version "6.9.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/kkos/" @@ -346,7 +346,7 @@ as existing hashing techniques, with provably negligible risk of collisions.") "/onig-" version ".tar.gz")) (sha256 (base32 - "00s9gjgb3srn5sbmx4x9bssn52mi04d868ghizssdhjlddgxmsmd")))) + "1jg76i2ksf3s4bz4h3g2f9ac19q31lzxs11j900w7qqc0mgb5gwi")))) (build-system gnu-build-system) (home-page "https://github.com/kkos/oniguruma") (synopsis "Regular expression library") -- cgit v1.2.3 From 60ed87871dcf2924ec9fd167478b1ad6b21343b5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 31 Oct 2018 23:48:12 +0100 Subject: gnu: python-pynacl: Update to 1.3.0. * gnu/packages/python-crypto.scm (python-pynacl): Update to 1.3.0. --- gnu/packages/python-crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index f71b8a3467..1a70f943a3 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -637,7 +637,7 @@ PKCS#8, PKCS#12, PKCS#5, X.509 and TSP.") (define-public python-pynacl (package (name "python-pynacl") - (version "1.2.1") + (version "1.3.0") (source (origin (method url-fetch) @@ -648,7 +648,7 @@ PKCS#8, PKCS#12, PKCS#5, X.509 and TSP.") #t)) (sha256 (base32 - "1ada3qr83cliap6dk897vnvjkynij1kjqbwizdbgarazlyh8zlz0")))) + "0330wyvggm19xhmwmz9rrr97lzbv3siwfy50gmax3vvgs7nh0q8c")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From a72d337fbc1a1b619de7867315fc1435a54894c8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 1 Nov 2018 03:21:00 +0100 Subject: gnu: python-jsonrpclib-pelix: Update to 0.3.2. * gnu/packages/python.scm (python-jsonrpclib-pelix): Update to 0.3.2. [arguments]: Disable #:tests?. --- gnu/packages/python.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 29b4a8e358..a65573fbb8 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -12824,15 +12824,17 @@ embeddable JavaScript engine.") (define-public python-jsonrpclib-pelix (package (name "python-jsonrpclib-pelix") - (version "0.3.1") + (version "0.3.2") (source (origin (method url-fetch) (uri (pypi-uri "jsonrpclib-pelix" version)) (sha256 (base32 - "1qs95vxplxwspbrqy8bvc195s58iy43qkf75yrjfql2sim8b25sl")))) + "0f83z5zi7w32vprhk1dyc94ir1bh4hdd57bjdbwkq9ykng8qilhl")))) (build-system python-build-system) + (arguments + `(#:tests? #f)) ; no tests in PyPI tarball (home-page "https://github.com/tcalmant/jsonrpclib/") (synopsis "JSON-RPC 2.0 client library for Python") (description -- cgit v1.2.3 From 38fda1cc36f55bd2c99fdd534b269c8807fc5799 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 1 Nov 2018 04:14:15 +0100 Subject: gnu: highlight: Update to 3.47. * gnu/packages/pretty-print.scm (highlight): Update to 3.47. --- gnu/packages/pretty-print.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm index ad429854a2..bdb5dbbdad 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -244,7 +244,7 @@ seen in a terminal.") (define-public highlight (package (name "highlight") - (version "3.42") + (version "3.47") (source (origin (method url-fetch) @@ -252,7 +252,7 @@ seen in a terminal.") version ".tar.bz2")) (sha256 (base32 - "07iihzy8ckzdrxqd6bzbij4hy4mmlixibjnjviqfihd0hh1q30m5")))) + "0xidf8755lnx55x6p4ajgg4l145akjqswny41483fvg5lpa41i6f")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests -- cgit v1.2.3 From 66a2a47117af6625d3b6fab8d661bbe57ff648c1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 1 Nov 2018 04:29:02 +0100 Subject: gnu: whois: Update to 5.4.0. * gnu/packages/networking.scm (whois): Update to 5.4.0. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 5a0c464252..5504742fa8 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -538,7 +538,7 @@ and up to 1 Mbit/s downstream.") (define-public whois (package (name "whois") - (version "5.3.2") + (version "5.4.0") (source (origin (method url-fetch) @@ -546,7 +546,7 @@ and up to 1 Mbit/s downstream.") name "_" version ".tar.xz")) (sha256 (base32 - "0m3352d5b0ragygbqjbaimghrbx4va2rixa34j5a1g3jj6l4nwbr")))) + "0y73b3z1akni620s1hlrijwdrk95ca1c8csjds48vpd6z86awx9p")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no test suite -- cgit v1.2.3 From ee3dd7a83af94ce19ce4909b15cecc57a5c99cde Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 31 Oct 2018 22:49:47 +0100 Subject: gnu: sdl2: Update to 2.0.9. * gnu/packages/sdl.scm (sdl2): Update to 2.0.9. --- gnu/packages/sdl.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 3fa0e0242a..6198925727 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015, 2017 Sou Bunnbu ;;; Copyright © 2015 Alex Kost ;;; Copyright © 2016, 2017 Efraim Flashner -;;; Copyright © 2017 Rutger Helling +;;; Copyright © 2017, 2018 Rutger Helling ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ricardo Wurmus ;;; @@ -102,7 +102,7 @@ joystick, and graphics hardware.") (define-public sdl2 (package (inherit sdl) (name "sdl2") - (version "2.0.8") + (version "2.0.9") (source (origin (method url-fetch) (uri @@ -110,7 +110,7 @@ joystick, and graphics hardware.") version ".tar.gz")) (sha256 (base32 - "1v4js1gkr75hzbxzhwzzif0sf9g07234sd23x1vdaqc661bprizd")))) + "1c94ndagzkdfqaa838yqg589p1nnqln8mv0hpwfhrkbfczf8cl95")))) (arguments (substitute-keyword-arguments (package-arguments sdl) ((#:configure-flags flags) -- cgit v1.2.3 From e7039f10ecd428445e218ec5485efbb23f3ca447 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Thu, 1 Nov 2018 08:18:18 +0100 Subject: gnu: dolphin-emu: Use ffmpeg instead of ffmpeg@3.4. * gnu/packages/emulators.scm (dolphin-emu): Use ffmpeg instead of ffmpeg@3.4. --- gnu/packages/emulators.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 2304b74e40..21a4cd55d5 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -196,7 +196,7 @@ ("bluez" ,bluez) ("curl" ,curl) ("eudev" ,eudev) - ("ffmpeg" ,ffmpeg-3.4) + ("ffmpeg" ,ffmpeg) ("font-wqy-microhei" ,font-wqy-microhei) ("freetype" ,freetype) ("glew" ,glew) -- cgit v1.2.3 From a769a4d432831cd9faa8ac8e4a857700f4245ec5 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Thu, 1 Nov 2018 08:31:45 +0100 Subject: gnu: xpra: Update to 2.4.1. * gnu/packages/xorg.scm (xpra): Update to 2.4.1. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 6f9c266fff..a4909d4a69 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5936,7 +5936,7 @@ basic eye-candy effects.") (define-public xpra (package (name "xpra") - (version "2.4") + (version "2.4.1") (source (origin (method url-fetch) @@ -5944,7 +5944,7 @@ basic eye-candy effects.") version ".tar.xz")) (sha256 (base32 - "0blzx231sr1ri1zwzpwzf611sq9104bv3ccvnap9pbvfrc05sfwx")))) + "1bhk6vydsrhlngvrv5w55arqf69cr3yw84xscnnl7km2g1iswkrs")))) (build-system python-build-system) (inputs `(("ffmpeg" ,ffmpeg) ("flac" ,flac) -- cgit v1.2.3 From d7ca1899aa54ad02321e9ac1ff9de210ab9126b1 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Thu, 1 Nov 2018 09:07:16 +0100 Subject: gnu: mame: Update to 0.203. * gnu/packages/emulators.scm (mame): Update to 0.203. --- gnu/packages/emulators.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 21a4cd55d5..232adfb081 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1186,7 +1186,7 @@ play them on systems for which they were never designed!") (define-public mame (package (name "mame") - (version "0.202") + (version "0.203") (source (origin (method git-fetch) @@ -1196,7 +1196,7 @@ play them on systems for which they were never designed!") (file-name (git-file-name name version)) (sha256 (base32 - "1v9gm124p65nbj678gfkcvwphp9qc15ky2p12ca6g3rllma94di5")) + "19ccqc00024fbjyk0k5d9xljhwq7wsrp7phwm2jmn0h77mgdj844")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. -- cgit v1.2.3 From 361dd8a55644be6ee81f3ccd9e55d2951a8693f8 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 1 Nov 2018 12:32:49 -0400 Subject: gnu: icecast: Update to 2.4.4 [fixes CVE-2018-18820]. * gnu/packages/xiph.scm (icecast): Update to 2.4.4. --- gnu/packages/xiph.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index 9a1bece63f..43b0d2723a 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -441,7 +441,7 @@ encoding Opus files and streams.") (define-public icecast (package (name "icecast") - (version "2.4.3") + (version "2.4.4") (source (origin (method url-fetch) (uri (string-append @@ -449,7 +449,7 @@ encoding Opus files and streams.") version ".tar.gz")) (sha256 (base32 - "14n5vm2xnyn8y7kl46lnnlgv6v5fjykhc57ffdsh0qaxfs6a8p68")))) + "0i2d9rhav0x6js2qhjf5iy6j2a7f0d11ail0lfv40hb1kygrgda9")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 33279c2a193e42887217b773b52cfced69c6c9a3 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 1 Nov 2018 15:03:38 -0400 Subject: gnu: mpd-mpc: Update to 0.31. * gnu/packages/mpd.scm (mpd-mpc): Update to 0.31. [native-inputs]: Add python-sphinx. --- gnu/packages/mpd.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index b69be2965f..3c683f221e 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -165,7 +165,7 @@ protocol.") (define-public mpd-mpc (package (name "mpd-mpc") - (version "0.30") + (version "0.31") (source (origin (method url-fetch) (uri @@ -174,10 +174,12 @@ protocol.") "/mpc-" version ".tar.xz")) (sha256 (base32 - "1kkzhrypkp0v6xv4d6db415pd0h6jqki29kfpsnfkvrhhh55pz35")))) + "0b9bsn4sl26xc6wdcms51x9yxznkxkppaycn8gnv4rd1m21kwdv2")))) (build-system meson-build-system) (inputs `(("libmpdclient" ,libmpdclient))) - (native-inputs `(("pkg-config" ,pkg-config))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("python-sphinx" ,python-sphinx))) (synopsis "Music Player Daemon client") (description "MPC is a minimalist command line interface to MPD, the music player daemon.") -- cgit v1.2.3 From 7571ec357670fc891bfd348d4fb9bf5760a7b6a4 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 1 Nov 2018 15:04:03 -0400 Subject: gnu: MPD: Update to 0.20.23. * gnu/packages/mpd.scm (mpd): Update to 0.20.23. --- gnu/packages/mpd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 3c683f221e..fe8610ab94 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -90,7 +90,7 @@ interfacing MPD in the C, C++ & Objective C languages.") (define-public mpd (package (name "mpd") - (version "0.20.21") + (version "0.20.23") (source (origin (method url-fetch) (uri @@ -99,7 +99,7 @@ interfacing MPD in the C, C++ & Objective C languages.") "/mpd-" version ".tar.xz")) (sha256 (base32 - "1p2qrhdb1gzfv3y5dvvbc9s2wwmhg3azvzf8r02hzhk5q96pc8l3")))) + "1smg6hab4kwrzsw1k7vlpya3ampdk8psnmkrzxlgb43j4fgmygjh")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From dd741059251ea10993e1e8b8d5f443c752a5c9ce Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 10 Oct 2018 22:26:39 +0200 Subject: gnu: Add openjdk9. * gnu/packages/java.scm (openjdk9): New variable. --- gnu/packages/java.scm | 136 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) (limited to 'gnu') 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) -- cgit v1.2.3 From 16b89ecc1f2f1f9651d119518c0e752b01f0f07b Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 10 Oct 2018 22:29:50 +0200 Subject: gnu: Add openjdk10. * gnu/packages/java.scm (openjdk10): New variable. --- gnu/packages/java.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) (limited to 'gnu') 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) -- cgit v1.2.3 From b3325eb306b33541edcb343d75d8457624744375 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 1 Nov 2018 22:56:38 -0400 Subject: gnu: Go 1.11: Avoid unnecessary store references. This shrinks the closure of Go 1.11 from 1379 MiB to 581 MiB. Fixes . * gnu/packages/golang.scm (go-1.11)[arguments]: Add a 'delete-extraneous-files' phase. --- gnu/packages/golang.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 60d3ee7ad9..82e8173210 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -510,12 +510,23 @@ in the style of communicating sequential processes (@dfn{CSP}).") (substitute* (find-files "cmd" "\\.go") (("/lib(64)?/ld-linux.*\\.so\\.[0-9]") loader)) #t))) + ;; Prevent installation of the build cache, which contains store + ;; references to most of the tools used to build Go and would + ;; unnecessarily increase the size of Go's closure if it was + ;; installed. + ;; TODO This should be moved into the 'install' phase when Go 1.9 is + ;; removed. + (add-before 'install 'delete-extraneous-files + (lambda _ + (delete-file-recursively "../pkg/obj") + #t)) (replace 'set-bootstrap-variables (lambda* (#:key outputs inputs #:allow-other-keys) ;; Tell the build system where to find the bootstrap Go. (let ((go (assoc-ref inputs "go"))) (setenv "GOROOT_BOOTSTRAP" go) - (setenv "GOGC" "400")))))))))) + (setenv "GOGC" "400") + #t))))))))) (define-public go go-1.9) -- cgit v1.2.3 From ff349415b27cc764fd7168ef35ca76c3b8b05889 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 2 Nov 2018 14:26:31 +0100 Subject: gnu: python-apache-libcloud: Update to 2.3.0. * gnu/packages/python.scm (python-apache-libcloud) (python2-apache-libcloud): Update to 2.3.0. --- gnu/packages/python.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a65573fbb8..5d716b930b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -31,7 +31,7 @@ ;;; Copyright © 2016 Dylan Jeffers ;;; Copyright © 2016, 2017 Alex Vong ;;; Copyright © 2016, 2017, 2018 Arun Isaac -;;; Copyright © 2016, 2017 Julien Lepiller +;;; Copyright © 2016, 2017, 2018 Julien Lepiller ;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2016, 2017 Thomas Danckaert ;;; Copyright © 2017 Carlo Zancanaro @@ -12368,14 +12368,14 @@ validating Swagger API specifications.") (define-public python-apache-libcloud (package (name "python-apache-libcloud") - (version "2.0.0") + (version "2.3.0") (source (origin (method url-fetch) (uri (pypi-uri "apache-libcloud" version)) (sha256 (base32 - "1a71z02ckcxld72k4qgmdnkjan52c4wczncs3p2mp5yafh7dsan7")))) + "15xg79ad4g2xrk081ylvj41k5hmg9hl1xvbmb5hd0fqn08wfwbhf")))) (build-system python-build-system) (arguments `(#:phases @@ -12404,6 +12404,11 @@ class ShellOutSSHClientTests") (("'.xf0.x90.x8d.x88'") "b'\\xF0\\x90\\x8D\\x88'") (("'.xF0', '.x90', '.x8D', '.x88'") "b'\\xF0', b'\\x90', b'\\x8D', b'\\x88'")) + #t)) + (add-before 'check 'copy-secret + (lambda _ + (copy-file "libcloud/test/secrets.py-dist" + "libcloud/test/secrets.py") #t))))) (inputs `(("openssh" ,openssh))) @@ -12413,6 +12418,8 @@ class ShellOutSSHClientTests") (native-inputs `(("python-lockfile" ,python-lockfile) ("python-mock" ,python-mock) + ("python-pytest" ,python-pytest) + ("python-pytest-runner" ,python-pytest-runner) ("python-requests-mock" ,python-requests-mock))) (home-page "https://libcloud.apache.org/") (synopsis "Unified Cloud API") -- cgit v1.2.3 From 3995e854620c993782e584471013ffe388cf7ced Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 2 Nov 2018 19:47:54 +0100 Subject: gnu: tor: Update to 0.3.4.9. * gnu/packages/tor.scm (tor): Update to 0.3.4.9. --- gnu/packages/tor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index 7d46191c12..61b0c82e30 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -47,14 +47,14 @@ (define-public tor (package (name "tor") - (version "0.3.4.8") + (version "0.3.4.9") (source (origin (method url-fetch) (uri (string-append "https://dist.torproject.org/tor-" version ".tar.gz")) (sha256 (base32 - "08qhzcmzxp5xr2l5721vagksqnnbrzzzy5hmz5y9r8lrq2r4qsl2")))) + "0jhnvnp08hsfrzgsvg5xnfxyaw3nzgg9h24cwbwnz6iby20i05qs")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list "--enable-gcc-hardening" -- cgit v1.2.3 From b1c7f5fff983bfe151aa41066bf1888fa9cd157b Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sat, 3 Nov 2018 19:12:33 +0530 Subject: gnu: emacs-emms: Update to 5.1. * gnu/packages/emacs.scm (emacs-emms): Update to 5.1. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 45e92ee47b..2832de9943 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -956,14 +956,14 @@ provides an optional IDE-like error list.") (define-public emacs-emms (package (name "emacs-emms") - (version "5.0") + (version "5.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/emms/emms-" version ".tar.gz")) (sha256 (base32 - "08f9lj77jlk96grqgjsv63s2i8ywvp4wvnmgmhnslwyx2lsdxza3")) + "149ddczyx6x10zn4mn8g0rll1rwf4yciv8x6j0qdnlbwszblx2x6")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 8e5c59868c3d616ffc4e58a1c3bdb76155973b4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 3 Nov 2018 15:16:02 +0100 Subject: gnu: diffoscope: Update to 104. * gnu/packages/package-management.scm (diffoscope): Update to 104. --- gnu/packages/package-management.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index fd01545082..28437224c4 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -570,13 +570,13 @@ transactions from C or Python.") (define-public diffoscope (package (name "diffoscope") - (version "102") + (version "104") (source (origin (method url-fetch) (uri (pypi-uri name version)) (sha256 (base32 - "0v2z98xx7n4viw12yq83flpb9ir5ahy1gn44pic0i3dam18xhcm6")))) + "0vnfhnvqvdwgh1sh2lmwad8jk2vjvq76p5xm3pfgxdik2yblmvqd")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 46c8f53ba823f4d295d08c6896777c20458dca88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 3 Nov 2018 15:16:20 +0100 Subject: gnu: emacs-dired-du: Update to 0.5.1. * gnu/packages/emacs.scm (emacs-dired-du): Update to 0.5.1. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 2832de9943..3c844d50ba 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -12012,7 +12012,7 @@ was called.") (define-public emacs-dired-du (package (name "emacs-dired-du") - (version "0.5") + (version "0.5.1") (source (origin (method url-fetch) @@ -12021,7 +12021,7 @@ was called.") version ".tar")) (sha256 (base32 - "09yj37p2fa5f81fqrzwghjkyy2ydsf4rbkfwpn2yyvzd5nd97bpl")))) + "1091scnrjh0a4gja4z6jxic6ghy1yryv46qk9c76pmh50cpw6766")))) (build-system emacs-build-system) (home-page "http://elpa.gnu.org/packages/dired-du.html") (synopsis "Dired with recursive directory sizes") -- cgit v1.2.3 From a7c8574f390367fbaf86731199b8f8fa4904a078 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 3 Nov 2018 15:16:42 +0100 Subject: gnu: perl-image-exiftool: Update to 11.11. * gnu/packages/photo.scm (perl-image-exiftool): Update to 11.11. --- gnu/packages/photo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index db7a9f9d45..5526c4f708 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -206,7 +206,7 @@ MTP, and much more.") (define-public perl-image-exiftool (package (name "perl-image-exiftool") - (version "11.01") + (version "11.11") (source (origin (method url-fetch) (uri (string-append @@ -214,7 +214,7 @@ MTP, and much more.") version ".tar.gz")) (sha256 (base32 - "175w34n73mypdpbaqj2vgqsfp59yvfrn8k7zmx4cawnp895bypvh")))) + "1szg1k82nz88pp5n7lg71ja7q3hh5i5f9bcbb7m482dwrmsywkp6")))) (build-system perl-build-system) (arguments '(#:phases -- cgit v1.2.3 From 504f0cf198b2e20a64afe8b5360137219951d748 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 3 Nov 2018 15:44:24 +0100 Subject: gnu: emacs-debbugs: Update to 0.16. * gnu/packages/emacs.scm (emacs-debbugs): Update to 0.16. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 3c844d50ba..d5ad38d1ee 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -2630,14 +2630,14 @@ source code using IPython.") (define-public emacs-debbugs (package (name "emacs-debbugs") - (version "0.15") + (version "0.16") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/debbugs-" version ".tar")) (sha256 (base32 - "1x7jw2ldgkknyxg7x9fhnqkary691icnysmi3xw0g2fjrvllzhqw")))) + "0y3bq803c7820h15g66d1648skxfhlfa2v6vincj6xk5ssp44s9p")))) (build-system emacs-build-system) (arguments '(#:include '("\\.el$" "\\.wsdl$" "\\.info$"))) (propagated-inputs -- cgit v1.2.3 From 0e091b3e9378cee49314b50e89b71ef5eacae457 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 3 Nov 2018 15:44:40 +0100 Subject: gnu: totem: Update to 3.26.2. * gnu/packages/gnome.scm (totem): Update to 3.26.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4b94b2f271..75551d0c2c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3625,7 +3625,7 @@ for application developers.") (define-public totem (package (name "totem") - (version "3.26.1") + (version "3.26.2") (source (origin (method url-fetch) @@ -3634,7 +3634,7 @@ for application developers.") name "-" version ".tar.xz")) (sha256 (base32 - "10n302fdp3lhkzbij5sbzmsnln738029xil6cnng2d4dxv4n1099")) + "1llyisls3pzf5bwkpxyfyxc2d3gpa09n5pjy7qsjdqrp3ya4k36g")) (patches (search-patches "totem-meson-easy-codec.patch")))) (build-system meson-build-system) (native-inputs -- cgit v1.2.3 From e9f305a1c82abe17cc67f0b349fcf09e7a002090 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 3 Nov 2018 20:37:27 +0200 Subject: gnu: sbcl-lift: Don't keep the bundled website. * gnu/packages/lisp.scm (sbcl-lift)[source]: Remove bundled website. [arguments]: Remove custom 'make-gzips-writable phase. --- gnu/packages/lisp.scm | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index c32380969f..9fb25a15a2 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -2382,19 +2382,17 @@ new fiends in addition to old friends like @command{aif} and (sha256 (base32 "127v5avpz1i4m0lkaxqrq8hrl69rdazqaxf6s8awf0nd7wj2g4dp")) - (file-name (git-file-name "lift" version)))) + (file-name (git-file-name "lift" version)) + (modules '((guix build utils))) + (snippet + ;; Don't keep the bundled website + `(begin + (delete-file-recursively "website") + #t)))) (build-system asdf-build-system/sbcl) (arguments ;; The tests require a debugger, but we run with the debugger disabled. - '(#:tests? #f - #:phases - (modify-phases %standard-phases - ;; Do this to ensure the 'reset-gzip-timestamps phase works. - (add-after 'unpack 'make-gzips-writeable - (lambda _ - (for-each (lambda (file) - (chmod file #o755)) - (find-files "." "\\.gz$"))))))) + '(#:tests? #f)) (synopsis "LIsp Framework for Testing") (description "The LIsp Framework for Testing (LIFT) is a unit and system test tool for LISP. -- cgit v1.2.3 From 3e84ce51fbaa325a18e727023ba912f5877c5d2a Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sun, 4 Nov 2018 10:36:17 +0530 Subject: gnu: mpop: Update to 1.4.0. * gnu/packages/mail.scm (mpop): Update to 1.4.0. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 4fffc2f7f4..35b7d27df3 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1850,7 +1850,7 @@ converts them to maildir format directories.") (define-public mpop (package (name "mpop") - (version "1.2.8") + (version "1.4.0") (source (origin (method url-fetch) @@ -1858,7 +1858,7 @@ converts them to maildir format directories.") name "-" version ".tar.xz")) (sha256 (base32 - "1skrda7lbks5h0v03ab8bhpg6ma1b63if8x9x3kb2fv70x2pkhqn")))) + "14xsvpm5bc1wycisq882gqrnamnyi1q4rlk6anlw8ihzvwgm4h2j")))) (build-system gnu-build-system) (inputs `(("gnutls" ,gnutls) -- cgit v1.2.3 From d4b5e4bb7377a31196b392c93b0072aed9cc969a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Nov 2018 11:48:04 +0200 Subject: gnu: debootstrap: Update to 1.0.109. * gnu/packages/debian.scm (debootstrap): Update to 1.0.109. --- gnu/packages/debian.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index 5ea263149e..16b5d21e91 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -116,7 +116,7 @@ contains the archive keys used for that.") (define-public debootstrap (package (name "debootstrap") - (version "1.0.106") + (version "1.0.109") (source (origin (method git-fetch) @@ -126,7 +126,7 @@ contains the archive keys used for that.") (file-name (git-file-name name version)) (sha256 (base32 - "1fm5bgllcwgwizrqi4sn8p4fpbzhbzgwprrfppfq9hqdzbmlfmnv")))) + "0bjqlyg605lnsjcn3wjplc6jl75nx7c6miyac2qsahi484rylg5g")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 2e77bbed719cfaa43d704e555a9007c5c4d52d2f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Nov 2018 11:48:36 +0200 Subject: gnu: ruby@2.3: Update to 2.3.8. * gnu/packages/ruby.scm (ruby@2.3): Update to 2.3.8. --- gnu/packages/ruby.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 7e8c8be290..bdcc3214e6 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2015, 2016, 2017 Ben Woodcroft ;;; Copyright © 2017 Nils Gillmann ;;; Copyright © 2017 Marius Bakke -;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2017, 2018 Efraim Flashner ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Clément Lassieur ;;; @@ -110,7 +110,7 @@ a focus on simplicity and productivity.") (define-public ruby-2.3 (package (inherit ruby) - (version "2.3.7") + (version "2.3.8") (source (origin (method url-fetch) @@ -119,7 +119,7 @@ a focus on simplicity and productivity.") "/ruby-" version ".tar.xz")) (sha256 (base32 - "1nwfaifq5624p1ml56qq5dy5w38z37x22r0qgrbgbzrzklmqy7y6")) + "1zhxbjff08pvbnxvn58krns6q0p6g4977q6ykfn823gxhifn63wi")) (modules '((guix build utils))) (snippet `(begin ;; Remove bundled libffi -- cgit v1.2.3 From f909e2179715ea1cf7d381810c2de5dcfedfb45e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Nov 2018 11:54:39 +0200 Subject: gnu: debian-archive-keyring: Update to 2018.1. * gnu/packages/debian.scm (debian-archive-keyring): Update to 2018.1. [source]: Download from git repository. --- gnu/packages/debian.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index 16b5d21e91..622c77b01e 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -33,15 +33,17 @@ (define-public debian-archive-keyring (package (name "debian-archive-keyring") - (version "2017.7") + (version "2018.1") (source (origin - (method url-fetch) - (uri (string-append "mirror://debian/pool/main/d/" name "/" - name "_" version ".tar.xz")) + (method git-fetch) + (uri (git-reference + (url "https://salsa.debian.org/release-team/debian-archive-keyring.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1pdwgipfi0y4svhxlw8arhq792f1g3vlmw4raphizy7sa65vd4ca")))) + "136vr5dj7w0dz563qdghsndcfcqm2m8d4j1dyiq9dzx5vd0rcpcw")))) (build-system gnu-build-system) (arguments '(#:test-target "verify-results" -- cgit v1.2.3 From 30012b74088dccbb602e3592c61a5718fc5e5524 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Nov 2018 12:45:04 +0200 Subject: gnu: myrepos: Wrap the webcheckout binary. * gnu/packages/version-control.scm (myrepos)[arguments]: Add a custom 'wrap-webcheckout phase to wrap webcheckout with its perl libraries. [inputs]: Add perl-encode-locale, perl-html-parser, perl-http-date, perl-http-message, perl-libwww, perl-try-tiny, perl-uri. --- gnu/packages/version-control.scm | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index df0b2f0122..632a43fcd6 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1741,12 +1741,32 @@ modification time.") (sha256 (base32 "0jphw61plm8cgklja6hs639xhdvxgvjwbr6jpvjwpp7hc5gmhms5")))) (build-system gnu-build-system) - (inputs - `(("perl" ,perl))) (arguments '(#:test-target "test" - #:phases (modify-phases %standard-phases (delete 'configure)) - #:make-flags (list (string-append "PREFIX=" %output)))) + #:make-flags (list (string-append "PREFIX=" %output)) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-after 'install 'wrap-webcheckout + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/webcheckout") + `("PERL5LIB" ":" prefix + ,(map (lambda (i) (string-append (assoc-ref inputs i) + "/lib/perl5/site_perl")) + '("perl-encode-locale" "perl-http-date" + "perl-http-message" "perl-html-parser" "perl-libwww" + "perl-uri" "perl-try-tiny")))) + #t)))))) + (inputs + `(("perl" ,perl) + ("perl-encode-locale" ,perl-encode-locale) + ("perl-html-parser" ,perl-html-parser) + ("perl-http-date" ,perl-http-date) + ("perl-http-message" ,perl-http-message) + ("perl-libwww" ,perl-libwww) + ("perl-try-tiny" ,perl-try-tiny) + ("perl-uri" ,perl-uri))) (home-page "https://myrepos.branchable.com/") (synopsis "Multiple repository management tool") (description -- cgit v1.2.3 From 97b7b96efc2a65f2805567191237451b34e4d966 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 4 Nov 2018 23:31:08 +0100 Subject: gnu: go-github-com-urfave-cli: Remove duplicate declaration. * gnu/packages/golang.scm (go-github-com-urfave-cli): Remove duplicate declaration. --- gnu/packages/golang.scm | 25 ------------------------- 1 file changed, 25 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 82e8173210..e49372d435 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1572,31 +1572,6 @@ Features include: optimized for performance yet simple to use.") (license license:expat)))) -(define-public go-github-com-urfave-cli - (let ((commit "cfb38830724cc34fedffe9a2a29fb54fa9169cd1") - (revision "0")) - (package - (name "go-github-com-urfave-cli") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/urfave/cli.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/urfave/cli")) - (home-page "https://github.com/urfave/cli") - (synopsis "Library for building command-line interfaces in Go") - (description "This package provides a library for building command-line -interfaces in Go.") - (license license:expat)))) - (define-public go-github-com-blang-semver (let ((commit "60ec3488bfea7cca02b021d106d9911120d25fe9") (revision "0")) -- cgit v1.2.3 From ab3c60ace3bdd376255463c6475b62f6d17e5978 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 20 Oct 2018 17:51:58 +0200 Subject: install: Parameterize the profile name for 'populate-single-profile-directory'. * gnu/build/install.scm (populate-single-profile-directory): Add #:profile-name. Replace hard-coded occurrences of "guix-profile" with PROFILE-NAME. Make the symlink part under /root a function of PROFILE-NAME. --- gnu/build/install.scm | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/build/install.scm b/gnu/build/install.scm index c602d69489..98c547f2e4 100644 --- a/gnu/build/install.scm +++ b/gnu/build/install.scm @@ -160,6 +160,7 @@ deduplicates files common to CLOSURE and the rest of PREFIX." (define* (populate-single-profile-directory directory #:key profile closure + (profile-name "guix-profile") deduplicate? register? schema) "Populate DIRECTORY with a store containing PROFILE, whose closure is given @@ -169,6 +170,9 @@ When REGISTER? is true, initialize DIRECTORY/var/guix/db to reflect the contents of the store; DEDUPLICATE? determines whether to deduplicate files in the store. +PROFILE-NAME is the name of the profile being created under +/var/guix/profiles, typically either \"guix-profile\" or \"current-guix\". + This is used to create the self-contained tarballs with 'guix pack'." (define (scope file) (string-append directory "/" file)) @@ -198,12 +202,20 @@ This is used to create the self-contained tarballs with 'guix pack'." ;; Make root's profile, which makes it a GC root. (mkdir-p* %root-profile) (symlink* profile - (string-append %root-profile "/guix-profile-1-link")) - (symlink* "guix-profile-1-link" - (string-append %root-profile "/guix-profile")) - - (mkdir-p* "/root") - (symlink* (string-append %root-profile "/guix-profile") - "/root/.guix-profile")) + (string-append %root-profile "/" profile-name "-1-link")) + (symlink* (string-append profile-name "-1-link") + (string-append %root-profile "/" profile-name)) + + (match profile-name + ("guix-profile" + (mkdir-p* "/root") + (symlink* (string-append %root-profile "/guix-profile") + "/root/.guix-profile")) + ("current-guix" + (mkdir-p* "/root/.config/guix") + (symlink* (string-append %root-profile "/current-guix") + "/root/.config/guix/current")) + (_ + #t))) ;;; install.scm ends here -- cgit v1.2.3 From 688d1a01e45eb1277a6337987bfd53f3fe3caaec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 4 Nov 2018 23:57:58 +0100 Subject: artwork: Clone over HTTPS. Suggested by Leo Famulari at . * gnu/artwork.scm (%artwork-repository): Switch to HTTPS URL. --- gnu/artwork.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/artwork.scm b/gnu/artwork.scm index 92498b8b23..35bfd0f967 100644 --- a/gnu/artwork.scm +++ b/gnu/artwork.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015 Ludovic Courtès +;;; Copyright © 2014, 2015, 2018 Ludovic Courtès ;;; Copyright © 2017 Leo Famulari ;;; ;;; This file is part of GNU Guix. @@ -33,7 +33,7 @@ (origin (method git-fetch) (uri (git-reference - (url "git://git.savannah.gnu.org/guix/guix-artwork.git") + (url "https://git.savannah.gnu.org/git/guix/guix-artwork.git") (commit commit))) (file-name (string-append "guix-artwork-" (string-take commit 7) "-checkout")) -- cgit v1.2.3 From c834bd3bb230fe32b3e69d8bd1bd321d147b95a1 Mon Sep 17 00:00:00 2001 From: Pkill -9 Date: Sat, 3 Nov 2018 15:32:53 +0000 Subject: gnu: xonotic: Add icon and category to desktop files. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/games.scm (xonotic): Add icon ("xonotic") and category ("Game") to the .desktop files for Xonotic. Signed-off-by: Ludovic Courtès --- gnu/packages/games.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 0467872fcd..3679aa09c6 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5539,7 +5539,8 @@ quotation from a collection of quotes.") Comment=Xonotic glx~@ Exec=~a/bin/xonotic-glx~@ TryExec=~@*~a/bin/xonotic-glx~@ - Icon=~@ + Icon=xonotic~@ + Categories=Game~@ Type=Application~%" output))) (with-output-to-file @@ -5551,7 +5552,8 @@ quotation from a collection of quotes.") Comment=Xonotic sdl~@ Exec=~a/bin/xonotic-sdl~@ TryExec=~@*~a/bin/xonotic-sdl~@ - Icon=~@ + Icon=xonotic~@ + Categories=Game~@ Type=Application~%" output))) (with-output-to-file @@ -5563,7 +5565,8 @@ quotation from a collection of quotes.") Comment=Xonotic~@ Exec=~a/bin/xonotic-glx~@ TryExec=~@*~a/bin/xonotic~@ - Icon=~@ + Icon=xonotic~@ + Categories=Game~@ Type=Application~%" output))) #t))) -- cgit v1.2.3 From b6e95148646429961b18434d9d0fe1ebd0265807 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 2 Nov 2018 14:07:04 -0700 Subject: gnu: pelican: Update to 3.7.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python.scm (pelican): Update to 3.7.1. [home-page]: Use HTTPS URL. Signed-off-by: Ludovic Courtès --- gnu/packages/python.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 5d716b930b..1391f4fbe3 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2867,14 +2867,14 @@ interested parties to subscribe to events, or \"signals\".") (define-public pelican (package (name "pelican") - (version "3.6.3") + (version "3.7.1") (source (origin (method url-fetch) (uri (pypi-uri "pelican" version)) (sha256 (base32 - "1hn94rb4q3zmcq16in055xikal4dba5hfx3zznq7warllcgc9f8k")))) + "12spygavv9b6xpb5pgp7f0p3z0mms60nx6zrpx1yfkj68zz4flra")))) (build-system python-build-system) (propagated-inputs `(("python-feedgenerator" ,python-feedgenerator) @@ -2887,7 +2887,7 @@ interested parties to subscribe to events, or \"signals\".") ("python-six" ,python-six) ("python-dateutil" ,python-dateutil) ("python-markdown" ,python-markdown))) - (home-page "http://getpelican.com/") + (home-page "https://getpelican.com/") (arguments `(;; XXX Requires a lot more packages to do unit tests :P #:tests? #f -- cgit v1.2.3 From 1417f503176a24c387f78a24eb8cd082a442e493 Mon Sep 17 00:00:00 2001 From: Luther Thompson Date: Wed, 31 Oct 2018 18:56:10 -0400 Subject: gnu: python-ilinkedlist: Update to 0.2.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python.scm (python-ilinkedlist): Update to 0.2.0. Signed-off-by: Ludovic Courtès --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 1391f4fbe3..54ea0caac3 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -14512,14 +14512,14 @@ run on top of the dynamic task schedulers. ") (define-public python-ilinkedlist (package (name "python-ilinkedlist") - (version "0.1.0") + (version "0.2.0") (source (origin (method url-fetch) (uri (pypi-uri "ilinkedlist" version)) (sha256 (base32 - "063c2gm4jkgkv0nsg7mrc8y0w82ms98l4xchmbrvr68cscglhk69")))) + "0klb846q5vs62d8f89my7wan1sji4yjj6pjhjch9dha3p8vlncd2")))) (build-system python-build-system) (native-inputs `(("python-pytest" ,python-pytest))) (inputs `(("python" ,python))) -- cgit v1.2.3 From 64eb038eef41dc7c1f912dc7097aa53e8b5d8b7c Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 5 Nov 2018 02:46:56 +0100 Subject: gnu: Add fswatch. * gnu/packages/monitoring.scm (fswatch): New variable. --- gnu/packages/monitoring.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index 12d736a76a..b69ec07158 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -32,6 +32,7 @@ #:use-module (guix build-system go) #:use-module (guix utils) #:use-module (gnu packages admin) + #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages curl) #:use-module (gnu packages check) @@ -39,6 +40,7 @@ #:use-module (gnu packages databases) #:use-module (gnu packages django) #:use-module (gnu packages gd) + #:use-module (gnu packages gettext) #:use-module (gnu packages image) #:use-module (gnu packages mail) #:use-module (gnu packages networking) @@ -403,3 +405,27 @@ WSGI and the node exporter textfile collector.") written in Go with pluggable metric collectors.") (home-page "https://github.com/prometheus/node_exporter") (license license:asl2.0)))) + +(define-public fswatch + (package + (name "fswatch") + (version "1.13.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emcrisostomo/fswatch.git") + (commit version))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "0r9m3rysqa1kdgghv2i6sv4zrd0v8idsbrp627ys642dl39svir3")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("gettext" ,gettext-minimal) + ("libtool" ,libtool))) + (synopsis "File system monitor") + (description "This package provides a file system monitor.") + (home-page "https://github.com/emcrisostomo/fswatch") + (license license:gpl3+))) -- cgit v1.2.3 From cddc044ce73ec6ec44279fabb629d6910e980e86 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 30 Oct 2018 20:36:08 -0500 Subject: libreoffice: honor '--cores=...' during build. * gnu/packages/libreoffice.scm (libreoffice)[configure-flags]: Add '--with-parallelism' flag. --- gnu/packages/libreoffice.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index b6ff6dc528..bb72f69f40 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -1096,6 +1096,8 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") (list "--enable-release-build" "--enable-verbose" + ;; Avoid using all cpu cores by default + (format #f "--with-parallelism=~d" (parallel-job-count)) "--disable-fetch-external" ; disable downloads "--with-system-libs" ; enable all --with-system-* flags (string-append "--with-boost-libdir=" -- cgit v1.2.3 From 28c717213de179ba227dab22a32663a90a17dfc5 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 5 Nov 2018 03:55:59 -0500 Subject: gnu: linux-libre@4.14: Update to 4.14.79. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.79. (%linux-libre-4.14-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 84537b936c..654d678360 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -429,8 +429,8 @@ It has been modified to remove all non-free binary blobs.") #:patches %linux-libre-4.19-patches #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.78") -(define %linux-libre-4.14-hash "07dhhw6zdnqn2dznpmkniz58hfkdx89yx7csm9vbx45blnyhjw5z") +(define %linux-libre-4.14-version "4.14.79") +(define %linux-libre-4.14-hash "000rd4h2yk6k68wjg37v53hqnqw1mgwhdxbcvy8iywy8za9r12c8") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.2.3 From c9f3d38be49ebd5910cb66f295338097173e6b32 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 5 Nov 2018 03:57:40 -0500 Subject: gnu: linux-libre: Update to 4.19.1. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.19.1. (%linux-libre-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 654d678360..875e7b63c5 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -406,8 +406,8 @@ It has been modified to remove all non-free binary blobs.") ;; supports qemu "virt" machine and possibly a large number of ARM boards. ;; See : https://wiki.debian.org/DebianKernel/ARMMP. -(define %linux-libre-version "4.19") -(define %linux-libre-hash "1j4lizjygy7hb7sq2kxqkpcs4nhxgmi48cpng97b0sm9b46plvfh") +(define %linux-libre-version "4.19.1") +(define %linux-libre-hash "12mrrgg2ih4jiylpy45q5nsd8afj3nya0klr543s0mcga88v9527") (define %linux-libre-4.19-patches (list %boot-logo-patch -- cgit v1.2.3 From 695db2f98a9099aaea9289f3a34c43e8d120d8b5 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 5 Nov 2018 13:58:04 +0100 Subject: gnu: Add emacs-helm-slime. * gnu/packages/emacs.scm (emacs-helm-slime): New variable. --- gnu/packages/emacs.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index d5ad38d1ee..3114a2e5c5 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -12433,3 +12433,33 @@ correctly.") (synopsis "Color ANSI codes in the REPL of SLIME") (description "Color ANSI codes in the REPL of SLIME") (license license:gpl2+)))) + +(define-public emacs-helm-slime + (let ((commit "9980925f3e5f6ac5a30369d2a544e82006a79c76")) + (package + (name "emacs-helm-slime") + (version (git-version "0.0.0" "1" commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacs-helm/helm-slime") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0xa07gpfkzwn522x9573mq5mfxvbawdgd0m93gqj6w5a14wk8zzh")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-helm" ,emacs-helm) + ("emacs-slime" ,emacs-slime))) + (home-page "https://github.com/emacs-helm/helm-slime") + (synopsis "Helm for SLIME, the Superior Lisp Interaction Mode for Emacs") + (description "Helm-SLIME defines a few new commands: + +@itemize +@item helm-slime-complete: Select a symbol from the SLIME completion systems. +@item helm-slime-list-connections: Yet another slime-list-connections with Helm. +@item: helm-slime-apropos: Yet another slime-apropos with Helm. +@item helm-slime-repl-history: Select an input from the SLIME REPL history and insert it. +@end itemize\n") + (license license:gpl3+)))) -- cgit v1.2.3 From 426ffb830ab3977cbfc7fa6282d2ba54cfbdf695 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 5 Nov 2018 20:22:06 +0100 Subject: gnu: emacs-mu4e-conversation: Update to 20181105. * gnu/packages/emacs.scm (emacs-mu4e-conversation): Update to 20181105. --- gnu/packages/emacs.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 3114a2e5c5..4821c18f6e 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -11746,10 +11746,10 @@ file.") (deprecated-package "emacs-wgrep-helm" emacs-wgrep)) (define-public emacs-mu4e-conversation - (let ((commit "223cc66e99c7665326e3d991d6d383cb0d7512bb")) + (let ((commit "54368a009474276247bdf39683e25ea68ae1f943")) (package (name "emacs-mu4e-conversation") - (version (git-version "20180722" "2" commit)) + (version (git-version "20181105" "3" commit)) (source (origin (method url-fetch) @@ -11760,7 +11760,7 @@ file.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1ivy7pihhma465hi25p1y45dyi8h52nsm2m0cvizj5sw36jw0n81")))) + "1zqnp1d3cxyvzsd76d5iw40lkif19k9svlbhqy6dvqiaqm0jbd15")))) (build-system emacs-build-system) (propagated-inputs `(("mu" ,mu))) -- cgit v1.2.3 From 288d24800d99985a857269ea180d36f3a3a2306e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 5 Nov 2018 16:11:59 -0500 Subject: gnu: ruby-rack: Update to 2.0.6 [fixes CVE-2018-{16470,16471}]. * gnu/packages/ruby.scm (ruby-rack): Update to 2.0.6. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index bdcc3214e6..2fde016851 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3481,7 +3481,7 @@ differences (added or removed nodes) between two XML/HTML documents.") (define-public ruby-rack (package (name "ruby-rack") - (version "2.0.5") + (version "2.0.6") (source (origin (method url-fetch) @@ -3493,7 +3493,7 @@ differences (added or removed nodes) between two XML/HTML documents.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1k1k4wk10l6bxx46pw58j2p3nmyzjqnr65hbjjqydd6517fmxgib")) + "0pb3g5ymvbf07xaxcn51dpqv3djlxavckp3qkxsjdxiqznb0d9p1")) ;; Ignore test which fails inside the build environment but works ;; outside. (patches (search-patches "ruby-rack-ignore-failing-test.patch")))) -- cgit v1.2.3 From 0a56ffdf1fd7a9169ed855c88a3d5907fa71447a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 23 Oct 2018 01:20:18 +0200 Subject: gnu: mono: Update home page. * gnu/packages/mono.scm (mono)[home-page]: Use HTTPS. --- gnu/packages/mono.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/mono.scm b/gnu/packages/mono.scm index 343cebc99f..16c4f71dde 100644 --- a/gnu/packages/mono.scm +++ b/gnu/packages/mono.scm @@ -105,5 +105,5 @@ (description "Mono is a compiler, vm, debugger and set of libraries for C#, a C-style programming language from Microsoft that is very similar to Java.") - (home-page "http://mono-project.com/") + (home-page "https://www.mono-project.com/") (license license:x11))) -- cgit v1.2.3 From 00815eea388b13a38ad0bef4dd9582da1b3208eb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 23 Oct 2018 22:44:45 +0200 Subject: gnu: libsoup: Update to 2.64.2. * gnu/packages/gnome.scm (libsoup): Update to 2.64.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 75551d0c2c..4a118fe0fc 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2459,7 +2459,7 @@ libxml to ease remote use of the RESTful API.") (define-public libsoup (package (name "libsoup") - (version "2.64.0") + (version "2.64.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libsoup/" @@ -2467,7 +2467,7 @@ libxml to ease remote use of the RESTful API.") name "-" version ".tar.xz")) (sha256 (base32 - "09z7g3spww3f84y8jmicdd6lqp360mbggpg5h1fq1v4p5ihcjnyr")))) + "1il6lyrmfi0hfh3ysw8w1qzc1rdz0igkb7dv6d8g5mmilnac3pbm")))) (build-system gnu-build-system) (outputs '("out" "doc")) (arguments -- cgit v1.2.3 From 196653145ab8714e7663fc9c94ea46edd5a2c92e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 5 Nov 2018 18:24:18 +0100 Subject: gnu: feh: Update to 2.28.1. * gnu/packages/image-viewers.scm (feh): Update to 2.28.1. --- gnu/packages/image-viewers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 512795ce89..518417707f 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -60,7 +60,7 @@ (define-public feh (package (name "feh") - (version "2.28") + (version "2.28.1") (home-page "https://feh.finalrewind.org/") (source (origin (method url-fetch) @@ -68,7 +68,7 @@ name "-" version ".tar.bz2")) (sha256 (base32 - "1nfka7w6pzj2bbwx8vydr2wwm7z8mrbqiy1xrq97c1g5bxy2vlhk")))) + "0wian0gnx0yfxf8x9b8wr57fjd6rnmi3y3xj83ni6x0xqrjnf1lp")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (delete 'configure)) -- cgit v1.2.3 From c5e571100206fdd00db195acef723db7c721e1a6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 5 Nov 2018 18:28:29 +0100 Subject: gnu: ffmpeg@3.4: Update to 3.4.5. * gnu/packages/video.scm (ffmpeg-3.4): Update to 3.4.5. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 34af248eb7..a2192cf672 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -790,14 +790,14 @@ audio/video codec library.") (define-public ffmpeg-3.4 (package (inherit ffmpeg) - (version "3.4.4") + (version "3.4.5") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version ".tar.xz")) (sha256 (base32 - "1iizgnhjbhar9y1ykqlj1czqanlv24knkfq5vvfnppv5x00pcvrq")))))) + "0b59qk5wpc5ksiha76jbhb859g5gxa4w0k6afh3kgvgajiivs73l")))))) (define-public ffmpeg-2.8 (package -- cgit v1.2.3 From 64b60f38e720cf1c40a786e1d6991d6ae3a0ed04 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 5 Nov 2018 18:28:51 +0100 Subject: gnu: ffmpeg: Update to 4.0.3. * gnu/packages/video.scm (ffmpeg): Update to 4.0.3. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index a2192cf672..fee2cb7762 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -614,14 +614,14 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).") (define-public ffmpeg (package (name "ffmpeg") - (version "4.0.2") + (version "4.0.3") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version ".tar.xz")) (sha256 (base32 - "15rgzcmdccy4flajs63gkz4n3k24wkkg50r13l1r83lrxg4hqp59")))) + "1vg229mxcrm415cq6q1nfm891hm4x56mb5p4cqjnlqnky7ikfg15")))) (build-system gnu-build-system) (inputs `(("fontconfig" ,fontconfig) -- cgit v1.2.3 From 66044a36983f45832165dd22fc6e4a2c8c317a75 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 5 Nov 2018 18:33:44 +0100 Subject: gnu: glm: Update to 0.9.9.3. * gnu/packages/maths.scm (glm): Update to 0.9.9.3. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 6a3a59590e..d14e61f26f 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3292,7 +3292,7 @@ Failure to do so will result in a library with poor performance.") (define-public glm (package (name "glm") - (version "0.9.9.2") + (version "0.9.9.3") (source (origin (method url-fetch) @@ -3300,7 +3300,7 @@ Failure to do so will result in a library with poor performance.") version "/glm-" version ".zip")) (sha256 (base32 - "1m2gws1d7l6h4mdn0ap74pfnm3vva3kk8rybdqd5x4lksd1mk6r0")))) + "0yqk5r3qh60d4r2iab5q7wq0fryn8p3pz6s28y1i7amqj1aqavj9")))) (build-system cmake-build-system) (native-inputs `(("unzip" ,unzip))) -- cgit v1.2.3 From 9c415f96ec6bd3077e836da919708f9e04dc1569 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 5 Nov 2018 18:34:05 +0100 Subject: gnu: libgphoto2: Update to 2.5.20. * gnu/packages/photo.scm (libgphoto2): Update to 2.5.20. --- gnu/packages/photo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 5526c4f708..1cd789b802 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -131,14 +131,14 @@ data as produced by digital cameras.") (define-public libgphoto2 (package (name "libgphoto2") - (version "2.5.19") + (version "2.5.20") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gphoto/libgphoto/" version "/libgphoto2-" version ".tar.bz2")) (sha256 (base32 - "0qrcc6kajbfb237paxrl904vvwl7hd8mnqvjw00j6m5qwd93wlk2")))) + "03wbwsb4v7yay8g5ni7pzmkbrh7qnqx977bddjpxsp9f1qag03z1")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs -- cgit v1.2.3 From c98a7e6b9167102e61646a102f6ee19ea58bd390 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 5 Nov 2018 18:36:06 +0100 Subject: gnu: i3-wm: Update to 4.16. * gnu/packages/wm.scm (i3-wm): Update to 4.16. --- gnu/packages/wm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 68d497e955..8322a62b51 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -180,14 +180,14 @@ commands would.") (define-public i3-wm (package (name "i3-wm") - (version "4.15") + (version "4.16") (source (origin (method url-fetch) (uri (string-append "https://i3wm.org/downloads/i3-" version ".tar.bz2")) (sha256 (base32 - "09jk70hsdxab24lqvj2f30ijrkbv3f6q9xi5dcsax1dw3x6m4z91")))) + "1d2mnryn7m9c6d69awd7lwzadliapd0ahi5n8d0ppqy533ssaq6c")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit v1.2.3 From 039241bc96e92ecf79728bf351a2d84bb4152d4d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 5 Nov 2018 19:18:42 +0100 Subject: gnu: libgit2: Update to 0.26.8. * gnu/packages/version-control.scm (libgit2): Update to 0.26.8. --- gnu/packages/version-control.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 632a43fcd6..b9a2ff2ea0 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -460,7 +460,7 @@ everything from small to very large projects with speed and efficiency.") (define-public libgit2 (package (name "libgit2") - (version "0.26.7") + (version "0.26.8") (source (origin (method url-fetch) (uri (string-append "https://github.com/libgit2/libgit2/" @@ -468,7 +468,7 @@ everything from small to very large projects with speed and efficiency.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1vy4dnbvhcq3pw8n8zz6clnsv2xnkrichl8k96w3lb6yyk0lln35")) + "15kp4sq72kh762bm7dgspyrk0a6siarvll3k7nrhs0xy77idf80g")) (patches (search-patches "libgit2-mtime-0.patch")) ;; Remove bundled software. -- cgit v1.2.3 From 876428dd9806e2aba68ed7e299d004fb7ff964d7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 5 Nov 2018 19:23:27 +0100 Subject: gnu: libmtp: Update to 1.1.16. * gnu/packages/libusb.scm (libmtp): Update to 1.1.16. --- gnu/packages/libusb.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index bcdc091a9b..c43d0f9e7f 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -303,14 +303,14 @@ wrapper for accessing libusb-1.0.") (define-public libmtp (package (name "libmtp") - (version "1.1.15") + (version "1.1.16") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/libmtp/libmtp/" version "/libmtp-" version ".tar.gz")) (sha256 (base32 - "089h79nkz7wcr3lbqi7025l8p75hbp0aigxk3wdk2zkm8q5r0h6h")))) + "185vh9bds6dcy00ycggg69g4v7m3api40zv8vrcfb3fk3vfzjs2v")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From b5a887637c1ebc9c97cab0ba4ed25a5b05f2a2d7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 5 Nov 2018 19:23:49 +0100 Subject: gnu: strace: Update to 4.25. * gnu/packages/linux.scm (strace): Update to 4.25. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 875e7b63c5..e52c35fdb9 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -936,7 +936,7 @@ Zerofree requires the file system to be unmounted or mounted read-only.") (define-public strace (package (name "strace") - (version "4.24") + (version "4.25") (home-page "https://strace.io") (source (origin (method url-fetch) @@ -944,7 +944,7 @@ Zerofree requires the file system to be unmounted or mounted read-only.") "/strace-" version ".tar.xz")) (sha256 (base32 - "0d061cdzk6a1822ds4wpqxg10ny27mi4i9zjmnsbz8nz3vy5jkhz")))) + "00f7zagfh3np5gwi0z7hi7zjd7s5nixcaq7z78n87dvhakkgi1fn")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From d79c8148ccf4c28f99b62fb19234da58e16138c9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 5 Nov 2018 19:32:39 +0100 Subject: gnu: libssh: Update to 0.7.7. * gnu/packages/ssh.scm (libssh): Update to 0.7.7. --- gnu/packages/ssh.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index b93cb03a14..80564a9e19 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -67,7 +67,7 @@ (define-public libssh (package (name "libssh") - (version "0.7.6") + (version "0.7.7") (source (origin (method git-fetch) (uri (git-reference @@ -82,7 +82,7 @@ (patches (search-patches "libssh-hostname-parser-bug.patch")) (sha256 (base32 - "0slwqa36mhyb6brdv2jvb9fxp7rvsv3ziv67kaxx615jxn52l5pa")) + "07adxvhmnaq2l7sq7sn4sjlikbm1zdicq8lavq5yfila6jbx9z1y")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (outputs '("out" "debug")) -- cgit v1.2.3 From 208e82297cb5d67eea8fd9b1fbb06e9505b4607b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 5 Nov 2018 19:45:01 +0100 Subject: gnu: xapian: Update to 1.4.9. * gnu/packages/patches/xapian-revert-5489fb2f8.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/search.scm (xapian): Update to 1.4.9. [source](patches): Remove. (python-xapian-bindings): Update to 1.4.9. --- gnu/local.mk | 1 - gnu/packages/patches/xapian-revert-5489fb2f8.patch | 23 ---------------------- gnu/packages/search.scm | 7 +++---- 3 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 gnu/packages/patches/xapian-revert-5489fb2f8.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 3207cecb72..1f9f6b36f8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1230,7 +1230,6 @@ dist_patch_DATA = \ %D%/packages/patches/wpa-supplicant-krack-followups.patch \ %D%/packages/patches/wxmaxima-do-not-use-old-gnuplot-parameters.patch \ %D%/packages/patches/x265-detect512-all-arches.patch \ - %D%/packages/patches/xapian-revert-5489fb2f8.patch \ %D%/packages/patches/xboing-CVE-2004-0149.patch \ %D%/packages/patches/xf86-video-ark-remove-mibstore.patch \ %D%/packages/patches/xf86-video-geode-glibc-2.20.patch \ diff --git a/gnu/packages/patches/xapian-revert-5489fb2f8.patch b/gnu/packages/patches/xapian-revert-5489fb2f8.patch deleted file mode 100644 index 7b78e2abb5..0000000000 --- a/gnu/packages/patches/xapian-revert-5489fb2f8.patch +++ /dev/null @@ -1,23 +0,0 @@ -Revert this upstream commit which breaks a test case in "notmuch": - -https://git.xapian.org/?p=xapian;a=commitdiff;h=5489fb2f838c0f0b0a593b4c17df282a93a1fe5a - -See the notmuch FAQ entry: - -https://notmuchmail.org/faq/#index12h2 - -This should be fixed for later releases. - -diff --git a/backends/glass/glass_postlist.cc b/xapian-core/backends/glass/glass_postlist.cc -index 80e578b85..a47f14a68 100644 ---- a/backends/glass/glass_postlist.cc -+++ b/backends/glass/glass_postlist.cc -@@ -759,7 +759,7 @@ GlassPostList::open_nearby_postlist(const std::string & term_, - (void)need_pos; - if (term_.empty()) - RETURN(NULL); -- if (!this_db.get() || this_db->postlist_table.is_modified()) -+ if (!this_db.get() || this_db->postlist_table.is_writable()) - RETURN(NULL); - RETURN(new GlassPostList(this_db, term_, cursor->clone())); - } diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm index 284771ab60..8237d51771 100644 --- a/gnu/packages/search.scm +++ b/gnu/packages/search.scm @@ -46,15 +46,14 @@ (define-public xapian (package (name "xapian") - (version "1.4.7") + (version "1.4.9") ;; Note: When updating Xapian, remember to update xapian-bindings below. (source (origin (method url-fetch) (uri (string-append "https://oligarchy.co.uk/xapian/" version "/xapian-core-" version ".tar.xz")) - (patches (search-patches "xapian-revert-5489fb2f8.patch")) (sha256 - (base32 "1lxmlds3v5s1gng9nk1rvmln1zcksrw5ds509y0glylwch5qmw0k")))) + (base32 "1k7m7m9jld96k16ansfw2w3c354pvd8ibhnrb6dw012g06fw7sfd")))) (build-system gnu-build-system) (inputs `(("zlib" ,zlib) ("util-linux" ,util-linux))) @@ -92,7 +91,7 @@ rich set of boolean query operators.") "/xapian-bindings-" version ".tar.xz")) (sha256 (base32 - "0sjf9ck3a6p7xnd84w09l6s0xn2g03k9a9417f4mjnywfq9pa6a5")))) + "0ll3z3418r7bzxs4kyini2cbci5xl8i5scl3wyx88s2v4ak56bcz")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-python3") -- cgit v1.2.3 From adde15186da7529b85097fdafffc2a13b0e60bdf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 5 Nov 2018 20:50:26 +0100 Subject: gnu: xf86-video-intel: Update to commit 0932a6b37ba6d5c9e916a1cb6ab89c3205b81a0c. * gnu/packages/xorg.scm (xf86-video-intel): Update to 2.99.917-11.0932a6b. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index a4909d4a69..68cfa7bf23 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2905,8 +2905,8 @@ X server.") (define-public xf86-video-intel - (let ((commit "d7dfab62a9853b44bbcd67dac08391d8e5114c97") - (revision "10")) + (let ((commit "0932a6b37ba6d5c9e916a1cb6ab89c3205b81a0c") + (revision "11")) (package (name "xf86-video-intel") (version (git-version "2.99.917" revision commit)) @@ -2919,7 +2919,7 @@ X server.") (commit commit))) (sha256 (base32 - "1vcfal4xr9q6016p28lnlyg709da6d305dysyyrj3fjp9fj48sva")) + "10pqxp7n53ddiypd3l1i9gkbgzdpi6rz9vksbd16biq7pbijc2xf")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (inputs `(("mesa" ,mesa) -- cgit v1.2.3 From 3bd83e6db2982d0b419945dd6ea4174d1a880c6d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 5 Nov 2018 23:24:19 +0100 Subject: 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 - gnu/packages/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 (limited to 'gnu') 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 -- cgit v1.2.3 From 7f860a8be150df26bdb69024f4dce2cb8acaa43a Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Mon, 29 Oct 2018 01:47:32 +0300 Subject: gnu: services: dns: Fix 'ddclient-activation'. * gnu/services/dns.scm (ddclient-activation): Fix procedure. --- gnu/services/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/services/dns.scm b/gnu/services/dns.scm index 16bd039f59..24ef886682 100644 --- a/gnu/services/dns.scm +++ b/gnu/services/dns.scm @@ -763,9 +763,9 @@ manually.") (use-modules (guix build utils) (ice-9 rdelim)) (let ((ddclient-user - #$(passwd:uid (getpw (ddclient-configuration-user config)))) + (passwd:uid (getpw #$(ddclient-configuration-user config)))) (ddclient-group - #$(passwd:gid (getpw (ddclient-configuration-group config)))) + (passwd:gid (getpw #$(ddclient-configuration-group config)))) (ddclient-secret-file #$(ddclient-configuration-secret-file config))) ;; 'ddclient' complains about ddclient.conf file permissions, which -- cgit v1.2.3 From b588adc96feec4498857ecb6d3537f746b0c0463 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Nov 2018 20:42:48 +0200 Subject: gnu: c-ares: Update to 1.15.0. * gnu/packages/adns.scm (c-ares): Update to 1.15.0. --- gnu/packages/adns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/adns.scm b/gnu/packages/adns.scm index 6e3af8b2d3..ce89c2f139 100644 --- a/gnu/packages/adns.scm +++ b/gnu/packages/adns.scm @@ -59,7 +59,7 @@ scripts.") (define-public c-ares (package (name "c-ares") - (version "1.14.0") + (version "1.15.0") (source (origin (method url-fetch) (uri (string-append @@ -67,7 +67,7 @@ scripts.") ".tar.gz")) (sha256 (base32 - "0vnwmbvymw677k780kpb6sb8i3szdp89rzy8mz1fwg1657yw3ls5")))) + "0lk8knip4xk6qzksdkn7085mmgm4ixfczdyyjw656c193y3rgnvc")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 730e5fbc66461e91981898272edd5a3d326e2f9d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 6 Nov 2018 12:22:02 +0200 Subject: Revert "gnu: c-ares: Update to 1.15.0." c-ares has more than 3000 dependant packages. This reverts commit b588adc96feec4498857ecb6d3537f746b0c0463. --- gnu/packages/adns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/adns.scm b/gnu/packages/adns.scm index ce89c2f139..6e3af8b2d3 100644 --- a/gnu/packages/adns.scm +++ b/gnu/packages/adns.scm @@ -59,7 +59,7 @@ scripts.") (define-public c-ares (package (name "c-ares") - (version "1.15.0") + (version "1.14.0") (source (origin (method url-fetch) (uri (string-append @@ -67,7 +67,7 @@ scripts.") ".tar.gz")) (sha256 (base32 - "0lk8knip4xk6qzksdkn7085mmgm4ixfczdyyjw656c193y3rgnvc")))) + "0vnwmbvymw677k780kpb6sb8i3szdp89rzy8mz1fwg1657yw3ls5")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From c58f3ebaf8e0dc0654dc0a0096b5cffc7d6bd2ec Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Tue, 6 Nov 2018 12:02:03 +0100 Subject: gnu: ffmpeg: Update to 4.1. * gnu/packages/video.scm (ffmpeg): Update to 4.1. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index fee2cb7762..f32604c6e9 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -614,14 +614,14 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).") (define-public ffmpeg (package (name "ffmpeg") - (version "4.0.3") + (version "4.1") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version ".tar.xz")) (sha256 (base32 - "1vg229mxcrm415cq6q1nfm891hm4x56mb5p4cqjnlqnky7ikfg15")))) + "150rrm549fy1x71c9whmyi5knyd9sliwvmcsm438bdgg4v8c93m3")))) (build-system gnu-build-system) (inputs `(("fontconfig" ,fontconfig) -- cgit v1.2.3 From 418dd6adb5de1bc26ff9bac1cb0dc7822be52112 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 6 Nov 2018 15:13:16 +0100 Subject: gnu: jq: Update to 1.6. * gnu/packages/web.scm (jq): Update to 1.6. [source]: Remove upstreamed patch. * gnu/packages/patches/jq-CVE-2015-8863.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/patches/jq-CVE-2015-8863.patch | 45 ----------------------------- gnu/packages/web.scm | 8 ++--- 3 files changed, 2 insertions(+), 52 deletions(-) delete mode 100644 gnu/packages/patches/jq-CVE-2015-8863.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 1f9f6b36f8..c2075f7d09 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -834,7 +834,6 @@ dist_patch_DATA = \ %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 \ %D%/packages/patches/kdbusaddons-kinit-file-name.patch \ %D%/packages/patches/khmer-use-libraries.patch \ %D%/packages/patches/libziparchive-add-includes.patch \ diff --git a/gnu/packages/patches/jq-CVE-2015-8863.patch b/gnu/packages/patches/jq-CVE-2015-8863.patch deleted file mode 100644 index 20b3bb3f06..0000000000 --- a/gnu/packages/patches/jq-CVE-2015-8863.patch +++ /dev/null @@ -1,45 +0,0 @@ -Fix CVE-2015-8863 (Off-by-one error in the tokenadd function in -jv_parse.c in jq allows remote attackers to cause a denial of service -(crash) via a long JSON-encoded number, which triggers a heap-based -buffer overflow): - - - -Copied from upstream code repository: - - - -From 8eb1367ca44e772963e704a700ef72ae2e12babd Mon Sep 17 00:00:00 2001 -From: Nicolas Williams -Date: Sat, 24 Oct 2015 17:24:57 -0500 -Subject: [PATCH] Heap buffer overflow in tokenadd() (fix #105) - -This was an off-by one: the NUL terminator byte was not allocated on -resize. This was triggered by JSON-encoded numbers longer than 256 -bytes. ---- - jv_parse.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/jv_parse.c b/jv_parse.c -index 3102ed4..84245b8 100644 ---- a/jv_parse.c -+++ b/jv_parse.c -@@ -383,7 +383,7 @@ static pfunc stream_token(struct jv_parser* p, char ch) { - - static void tokenadd(struct jv_parser* p, char c) { - assert(p->tokenpos <= p->tokenlen); -- if (p->tokenpos == p->tokenlen) { -+ if (p->tokenpos >= (p->tokenlen - 1)) { - p->tokenlen = p->tokenlen*2 + 256; - p->tokenbuf = jv_mem_realloc(p->tokenbuf, p->tokenlen); - } -@@ -485,7 +485,7 @@ static pfunc check_literal(struct jv_parser* p) { - TRY(value(p, v)); - } else { - // FIXME: better parser -- p->tokenbuf[p->tokenpos] = 0; // FIXME: invalid -+ p->tokenbuf[p->tokenpos] = 0; - char* end = 0; - double d = jvp_strtod(&p->dtoa, p->tokenbuf, &end); - if (end == 0 || *end != 0) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 447a899544..86e748f950 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4166,7 +4166,7 @@ It uses the uwsgi protocol for all the networking/interprocess communications.") (define-public jq (package (name "jq") - (version "1.5") + (version "1.6") (source (origin (method url-fetch) (uri (string-append "https://github.com/stedolan/" name @@ -4174,11 +4174,7 @@ It uses the uwsgi protocol for all the networking/interprocess communications.") "/" name "-" version ".tar.gz")) (sha256 (base32 - "0g29kyz4ykasdcrb0zmbrp2jqs9kv1wz9swx849i2d1ncknbzln4")) - ;; This patch has been pushed and the vulnerability will be - ;; fixed in the next release after 1.5. - ;; https://github.com/stedolan/jq/issues/995 - (patches (search-patches "jq-CVE-2015-8863.patch")))) + "1a76f46a652i2g333kfvrl6mp2w7whf6h1yly519izg4y967h9cn")))) (inputs `(("oniguruma" ,oniguruma))) (native-inputs -- cgit v1.2.3 From c3b8300af321bbc56c5743ae53890e2184b0aa45 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 6 Nov 2018 15:10:51 +0100 Subject: gnu: jq: Don't use NAME in source URI. * gnu/packages/web.scm (jq)[source]: Code more hard. --- gnu/packages/web.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 86e748f950..3203b258ad 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4169,9 +4169,9 @@ It uses the uwsgi protocol for all the networking/interprocess communications.") (version "1.6") (source (origin (method url-fetch) - (uri (string-append "https://github.com/stedolan/" name - "/releases/download/" name "-" version - "/" name "-" version ".tar.gz")) + (uri (string-append "https://github.com/stedolan/jq" + "/releases/download/jq-" version + "/jq-" version ".tar.gz")) (sha256 (base32 "1a76f46a652i2g333kfvrl6mp2w7whf6h1yly519izg4y967h9cn")))) -- cgit v1.2.3 From b1eeeb8dd485009bc04005ad6345c84b8932dffa Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 6 Nov 2018 15:05:30 +0100 Subject: gnu: terraform-docs: Update to 0.5.0. * gnu/packages/terraform.scm (terraform-docs): Update to 0.5.0. [native-inputs]: Remove them all. --- gnu/packages/terraform.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/terraform.scm b/gnu/packages/terraform.scm index 71b214ed0a..f14b152fdb 100644 --- a/gnu/packages/terraform.scm +++ b/gnu/packages/terraform.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Christopher Baines +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,13 +22,12 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) - #:use-module (guix build-system go) - #:use-module (gnu packages golang)) + #:use-module (guix build-system go)) (define-public terraform-docs (package (name "terraform-docs") - (version "0.3.0") + (version "0.5.0") (source (origin (method git-fetch) (uri (git-reference @@ -36,11 +36,8 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0xchpik32ab8m89s6jv671vswg8xhprfvh6s5md0zd36482d2nmm")))) + "12w2yr669hk5kxdb9rrzsn8hwvx8rzrc1rmn8hs9l8z1bkfhr4gg")))) (build-system go-build-system) - (native-inputs - `(("go-github-com-hashicorp-hcl" ,go-github-com-hashicorp-hcl) - ("go-github-com-tj-docopt" ,go-github-com-tj-docopt))) (arguments '(#:import-path "github.com/segmentio/terraform-docs")) (synopsis "Generate documentation from Terraform modules") -- cgit v1.2.3 From fe4fb278b8754b7723a912ed605cd520f1f42457 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 6 Nov 2018 15:21:26 +0100 Subject: gnu: youtube-dl: Update to 2018.11.03. * gnu/packages/video.scm (youtube-dl): Update to 2018.11.03. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index f32604c6e9..a482ef2515 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1269,7 +1269,7 @@ access to mpv's powerful playback capabilities.") (define-public youtube-dl (package (name "youtube-dl") - (version "2018.10.05") + (version "2018.11.03") (source (origin (method url-fetch) (uri (string-append "https://yt-dl.org/downloads/" @@ -1277,7 +1277,7 @@ access to mpv's powerful playback capabilities.") version ".tar.gz")) (sha256 (base32 - "1iq02kwxdgh07bf0w0fvbsjbdshs4kja35gy8m70ji9cj10l1mbw")))) + "11phhwhr1g050h4625d5jsgcsjnnv7jc6xcrbn7zdzd32f6gy2lj")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion -- cgit v1.2.3 From cddc0300b7fb5fbbc80f45a626073f8372bf491f Mon Sep 17 00:00:00 2001 From: lakshmi Date: Tue, 6 Nov 2018 15:59:01 +0100 Subject: gnu: Add r-weights. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cran.scm (r-weights): New variable. Signed-off-by: Gábor Boskovits --- gnu/packages/cran.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index df869794db..8fed911360 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7225,3 +7225,31 @@ R squared measure from L. J. Edwards et al. (2008) is extended to the GLMM using @dfn{penalized quasi-likelihood} (PQL) estimation (see Jaeger et al. (2016)).") (license license:gpl2))) + +(define-public r-weights + (package + (name "r-weights") + (version "1.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "weights" version)) + (sha256 + (base32 + "0186bfpkhxngrshac6bpg37alp6slwhwd43inrm8hqg0vhpfgc4c")))) + (build-system r-build-system) + (propagated-inputs + `(("r-gdata" ,r-gdata) + ("r-hmisc" ,r-hmisc) + ("r-mice" ,r-mice))) + (home-page + "https://cran.r-project.org/web/packages/weights/") + (synopsis "Weighting and weighted statistics") + (description "This package Provides a variety of functions for producing +simple weighted statistics, such as weighted Pearson's correlations, partial +correlations, Chi-Squared statistics, histograms, and t-tests. Also now +includes some software for quickly recoding survey data and plotting point +estimates from interaction terms in regressions (and multiply imputed +regressions). NOTE: Weighted partial correlation calculations pulled to +address a bug.") + (license license:gpl2+))) -- cgit v1.2.3 From 3527f600b5ca290f1164a3018ef8f168e940127e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 6 Nov 2018 00:21:23 +0100 Subject: gnu: guile-sqlite3: Update home page. * gnu/packages/guile.scm (guile-sqlite3)[home-page]: Update. --- gnu/packages/guile.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 9e33003375..94bb598f92 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -1143,7 +1143,7 @@ Guile's foreign function interface.") (package (name "guile-sqlite3") (version "0.1.0") - (home-page "https://notabug.org/civodul/guile-sqlite3.git") + (home-page "https://notabug.org/guile-sqlite3/guile-sqlite3.git") (source (origin (method git-fetch) (uri (git-reference -- cgit v1.2.3 From 158c02dffa40b1c713223faca74bec9fdd21ae85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Stefanovi=C4=87?= Date: Sat, 20 Oct 2018 00:20:25 +0200 Subject: gnu: Add xcb-util-errors. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xorg.scm (xcb-util-errors): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/xorg.scm | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 68cfa7bf23..49baef5f04 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5479,6 +5479,58 @@ The XCB util module provides the following libraries: "file://COPYING" "See COPYING in the distribution.")))) +(define-public xcb-util-errors + (let ((commit "5d660ebe872cadcdc85de9d6f9afe05de629c030") + (revision "1")) + (package + (name "xcb-util-errors") + (version (git-version "1.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://anongit.freedesktop.org/git/xcb/util-errors.git") + (commit commit) + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "12bah0iz5k6b9hwlc5zffyfg2gnrajll3gn5s8zmazgynvw72ahg")))) + (build-system gnu-build-system) + (outputs '("out")) + (inputs + `(("util-macros" ,util-macros) + ("xcb-proto" ,xcb-proto))) + (propagated-inputs + `(("libxcb" ,libxcb))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("python-2" ,python-2) + ("pkg-config" ,pkg-config))) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'bootstrap + (lambda _ + ;; The default 'bootstrap' phase would run 'autogen.sh', which + ;; would try to run ./configure and fail due to unpatched + ;; shebangs. + (invoke "autoreconf" "-v" "--install")))))) + (home-page "https://cgit.freedesktop.org/xcb/util-errors/") + (synopsis "XCB helper library for printing information about X11 errors") + (description + "The XCB util module provides a number of libraries which sit on +top of libxcb, the core X protocol library, and some of the extension +libraries. These experimental libraries provide convenience functions +and interfaces which make the raw X protocol more usable. Some of the +libraries also provide client-side code which is not strictly part of +the X protocol but which has traditionally been provided by Xlib. + +The XCB util-errors module provides a utility library that gives human +readable names to error codes, event codes, and also to major and minor +numbers.") + (license license:x11)))) (define-public xcb-util-image (package -- cgit v1.2.3 From 4cceb1432a381b100d416e6451e63b278e626710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 6 Nov 2018 17:08:46 +0100 Subject: gnu: libgit2: Work around test failures on 32-bit platforms. * gnu/packages/patches/libgit2-oom-test.patch: New file. * gnu/packages/version-control.scm (libgit2)[source]: Use it. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/patches/libgit2-oom-test.patch | 62 +++++++++++++++++++++++++++++ gnu/packages/version-control.scm | 3 +- 3 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/libgit2-oom-test.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index c2075f7d09..bfe93159dc 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -876,6 +876,7 @@ dist_patch_DATA = \ %D%/packages/patches/libexif-CVE-2016-6328.patch \ %D%/packages/patches/libexif-CVE-2017-7544.patch \ %D%/packages/patches/libgit2-mtime-0.patch \ + %D%/packages/patches/libgit2-oom-test.patch \ %D%/packages/patches/libgdata-fix-tests.patch \ %D%/packages/patches/libgdata-glib-duplicate-tests.patch \ %D%/packages/patches/libgnome-encoding.patch \ diff --git a/gnu/packages/patches/libgit2-oom-test.patch b/gnu/packages/patches/libgit2-oom-test.patch new file mode 100644 index 0000000000..9667d1c0da --- /dev/null +++ b/gnu/packages/patches/libgit2-oom-test.patch @@ -0,0 +1,62 @@ +Fix a test failure on 32-bit platforms as reported +at . + +From 415a8ae9c9b6ac18f0524b6af8e58408b426457d Mon Sep 17 00:00:00 2001 +From: Edward Thomson +Date: Thu, 13 Sep 2018 13:27:07 +0100 +Subject: [PATCH] tests: don't run buf::oom on 32-bit systems + +On a 32-bit Linux systems, the value large enough to make malloc +guarantee a failure is also large enough that valgrind considers it +"fishy". Skip this test on those systems entirely. +--- + tests/buf/oom.c | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +diff --git a/tests/buf/oom.c b/tests/buf/oom.c +index 2741a8ddf2..ec3bad9979 100644 +--- a/tests/buf/oom.c ++++ b/tests/buf/oom.c +@@ -11,12 +11,8 @@ + */ + #if defined(GIT_ARCH_64) && defined(__linux__) + # define TOOBIG 0x0fffffffffffffff +-#elif defined(__linux__) +-# define TOOBIG 0x0fffffff + #elif defined(GIT_ARCH_64) + # define TOOBIG 0xffffffffffffff00 +-#else +-# define TOOBIG 0xffffff00 + #endif + + /** +@@ -25,13 +21,18 @@ + * will fail. And because the git_buf_grow() wrapper always + * sets mark_oom, the code in git_buf_try_grow() will free + * the internal buffer and set it to git_buf__oom. +- * ++ * + * We initialized the internal buffer to (the static variable) + * git_buf__initbuf. The purpose of this test is to make sure + * that we don't try to free the static buffer. ++ * ++ * Skip this test entirely on 32-bit platforms; a buffer large enough ++ * to guarantee malloc failures is so large that valgrind considers ++ * it likely to be an error. + */ + void test_buf_oom__grow(void) + { ++#ifdef GIT_ARCH_64 + git_buf buf = GIT_BUF_INIT; + + git_buf_clear(&buf); +@@ -40,6 +41,9 @@ void test_buf_oom__grow(void) + cl_assert(git_buf_oom(&buf)); + + git_buf_free(&buf); ++#else ++ cl_skip(); ++#endif + } + + void test_buf_oom__grow_by(void) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index b9a2ff2ea0..04d28044dd 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -469,7 +469,8 @@ everything from small to very large projects with speed and efficiency.") (sha256 (base32 "15kp4sq72kh762bm7dgspyrk0a6siarvll3k7nrhs0xy77idf80g")) - (patches (search-patches "libgit2-mtime-0.patch")) + (patches (search-patches "libgit2-mtime-0.patch" + "libgit2-oom-test.patch")) ;; Remove bundled software. (snippet '(begin -- cgit v1.2.3 From f25614229bcde50bfec529dab55fd2f810bbbb9a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 31 Oct 2018 13:10:28 -0400 Subject: gnu: Syncthing: Update to 0.14.52. * gnu/packages/syncthing.scm (syncthing): Update to 0.14.52. --- gnu/packages/syncthing.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 48b52d2002..5d681b816e 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -30,7 +30,7 @@ (define-public syncthing (package (name "syncthing") - (version "0.14.51") + (version "0.14.52") (source (origin (method url-fetch) (uri (string-append "https://github.com/syncthing/syncthing" @@ -38,7 +38,7 @@ "/syncthing-source-v" version ".tar.gz")) (sha256 (base32 - "17phn8l2afhgzh0q9ambi28awj2m905sr1bicq2wc7ghypk5vgqh")) + "1hhn72l74vb9l32i1a54ry2l85ji78cq6isd20lxxdk0bjqc4m29")) (modules '((guix build utils))) ;; Delete bundled ("vendored") free software source code. (snippet '(begin -- cgit v1.2.3 From c6b05bacc08dc423db74ae24d442fd43f1ba8893 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 6 Nov 2018 21:34:30 +0100 Subject: gnu: nginx: Update to 1.14.1 [security fixes]. This fixes CVE-2018-16843, CVE-2018-16844, and CVE-2018-16845. * gnu/packages/web.scm (nginx): Update to 1.14.1. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 3203b258ad..b0ab4add8d 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -195,14 +195,14 @@ Interface} specification.") (name "nginx") ;; Consider updating the nginx-documentation package if the nginx package is ;; updated. - (version "1.14.0") + (version "1.14.1") (source (origin (method url-fetch) (uri (string-append "https://nginx.org/download/nginx-" version ".tar.gz")) (sha256 (base32 - "1d9c0avfpbwvzyg53b59ks8shpnrxnbnshcd7ziizflsyv5vw5ax")))) + "19542jxcjf4dvrqvgb5vr36mhbzcjrxc3v0xh451rm60610rf2dz")))) (build-system gnu-build-system) (inputs `(("openssl" ,openssl) ("pcre" ,pcre) -- cgit v1.2.3 From ec4c81fe32a90890a6190443248078ce7366503f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 27 Oct 2018 23:47:59 +0200 Subject: pack: Move store database creation to a separate derivation. * guix/scripts/pack.scm (store-database): New procedure. (self-contained-tarball): Use it when LOCALSTATEDIR? is true. Remove 'schema' and add 'database'. [build]: Pass DATABASE to 'populate-single-profile-directory'. (squashfs-image): Remove #:deduplicate? parameter. [build]: Remove (gnu build install) and (guix config) from the imported modules. Remove 'with-extensions'. * gnu/build/install.scm (populate-single-profile-directory): Remove #:deduplicate?, #:register?, and #:schema; add #:database. Remove call to 'register-closure' and simply copy DATABASE instead. --- gnu/build/install.scm | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/build/install.scm b/gnu/build/install.scm index 98c547f2e4..9f9a6aba0f 100644 --- a/gnu/build/install.scm +++ b/gnu/build/install.scm @@ -161,14 +161,13 @@ deduplicates files common to CLOSURE and the rest of PREFIX." (define* (populate-single-profile-directory directory #:key profile closure (profile-name "guix-profile") - deduplicate? - register? schema) + database) "Populate DIRECTORY with a store containing PROFILE, whose closure is given in the file called CLOSURE (as generated by #:references-graphs.) DIRECTORY is initialized to contain a single profile under /root pointing to PROFILE. -When REGISTER? is true, initialize DIRECTORY/var/guix/db to reflect the -contents of the store; DEDUPLICATE? determines whether to deduplicate files in -the store. + +When DATABASE is true, copy it to DIRECTORY/var/guix/db and create +DIRECTORY/var/guix/gcroots and friends. PROFILE-NAME is the name of the profile being created under /var/guix/profiles, typically either \"guix-profile\" or \"current-guix\". @@ -189,11 +188,9 @@ This is used to create the self-contained tarballs with 'guix pack'." ;; Populate the store. (populate-store (list closure) directory) - (when register? - (register-closure (canonicalize-path directory) closure - #:deduplicate? deduplicate? - #:schema schema) - + (when database + (install-file database (scope "/var/guix/db/")) + (chmod (scope "/var/guix/db/db.sqlite") #o644) (mkdir-p* "/var/guix/profiles") (mkdir-p* "/var/guix/gcroots") (symlink* "/var/guix/profiles" -- cgit v1.2.3 From b27ef1d46cfdc3c994b106241f99cd7142083d13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 28 Oct 2018 00:17:08 +0200 Subject: pack: Import (guix store database) only when '--localstatedir' is passed. This is another way to address , which was previously addressed in commit 19c924af4f3726688ca155a905ebf1cb9acdfca2. * gnu/build/install.scm (register-closure): Move to... * gnu/build/vm.scm (register-closure): ... here. New procedure. * guix/scripts/pack.scm (self-contained-tarball)[build]: Remove now unneeded 'with-extensions' form and custom (guix config) module. * tests/guix-pack.sh: Revert the strategy from commit 19c924af4f3726688ca155a905ebf1cb9acdfca2. * tests/pack.scm ("self-contained-tarball"): Likewise. --- gnu/build/install.scm | 18 ------------------ gnu/build/vm.scm | 19 ++++++++++++++++++- 2 files changed, 18 insertions(+), 19 deletions(-) (limited to 'gnu') diff --git a/gnu/build/install.scm b/gnu/build/install.scm index 9f9a6aba0f..a31e1945d6 100644 --- a/gnu/build/install.scm +++ b/gnu/build/install.scm @@ -18,7 +18,6 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu build install) - #:use-module (guix store database) #:use-module (guix build utils) #:use-module (guix build store-copy) #:use-module (srfi srfi-26) @@ -141,23 +140,6 @@ includes /etc, /var, /run, /bin/sh, etc., and all the symlinks to SYSTEM." (try)) (apply throw args))))))) -(define* (register-closure prefix closure - #:key - (deduplicate? #t) (reset-timestamps? #t) - (schema (sql-schema))) - "Register CLOSURE in PREFIX, where PREFIX is the directory name of the -target store and CLOSURE is the name of a file containing a reference graph as -produced by #:references-graphs.. As a side effect, if RESET-TIMESTAMPS? is -true, reset timestamps on store files and, if DEDUPLICATE? is true, -deduplicates files common to CLOSURE and the rest of PREFIX." - (let ((items (call-with-input-file closure read-reference-graph))) - (register-items items - #:prefix prefix - #:deduplicate? deduplicate? - #:reset-timestamps? reset-timestamps? - #:registration-time %epoch - #:schema schema))) - (define* (populate-single-profile-directory directory #:key profile closure (profile-name "guix-profile") diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index 5579886264..746808515f 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -25,7 +25,7 @@ #:use-module (guix build utils) #:use-module (guix build store-copy) #:use-module (guix build syscalls) - #:use-module ((guix store database) #:select (reset-timestamps)) + #:use-module (guix store database) #:use-module (gnu build linux-boot) #:use-module (gnu build install) #:use-module (gnu system uuid) @@ -191,6 +191,23 @@ the #:references-graphs parameter of 'derivation'." (mkdir output) (copy-recursively "xchg" output))))) +(define* (register-closure prefix closure + #:key + (deduplicate? #t) (reset-timestamps? #t) + (schema (sql-schema))) + "Register CLOSURE in PREFIX, where PREFIX is the directory name of the +target store and CLOSURE is the name of a file containing a reference graph as +produced by #:references-graphs.. As a side effect, if RESET-TIMESTAMPS? is +true, reset timestamps on store files and, if DEDUPLICATE? is true, +deduplicates files common to CLOSURE and the rest of PREFIX." + (let ((items (call-with-input-file closure read-reference-graph))) + (register-items items + #:prefix prefix + #:deduplicate? deduplicate? + #:reset-timestamps? reset-timestamps? + #:registration-time %epoch + #:schema schema))) + ;;; ;;; Partitions. -- cgit v1.2.3 From c5ce2db56909e7dd3fdcd30fa453272d56b07451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 3 Nov 2018 23:01:44 +0100 Subject: install: Add 'install-database-and-gc-roots'. * gnu/build/install.scm (%root-profile): New variable. (install-database-and-gc-roots): New procedure. (populate-single-profile-directory): Replace inline code with a call to 'install-database-and-gc-roots'. --- gnu/build/install.scm | 48 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 16 deletions(-) (limited to 'gnu') diff --git a/gnu/build/install.scm b/gnu/build/install.scm index a31e1945d6..c9ebe124fe 100644 --- a/gnu/build/install.scm +++ b/gnu/build/install.scm @@ -26,6 +26,7 @@ evaluate-populate-directive populate-root-file-system register-closure + install-database-and-gc-roots populate-single-profile-directory)) ;;; Commentary: @@ -140,6 +141,35 @@ includes /etc, /var, /run, /bin/sh, etc., and all the symlinks to SYSTEM." (try)) (apply throw args))))))) +(define %root-profile + "/var/guix/profiles/per-user/root") + +(define* (install-database-and-gc-roots root database profile + #:key (profile-name "guix-profile")) + "Install DATABASE, the store database, under directory ROOT. Create +PROFILE-NAME and have it link to PROFILE, a store item." + (define (scope file) + (string-append root "/" file)) + + (define (mkdir-p* dir) + (mkdir-p (scope dir))) + + (define (symlink* old new) + (symlink old (scope new))) + + (install-file database (scope "/var/guix/db/")) + (chmod (scope "/var/guix/db/db.sqlite") #o644) + (mkdir-p* "/var/guix/profiles") + (mkdir-p* "/var/guix/gcroots") + (symlink* "/var/guix/profiles" "/var/guix/gcroots/profiles") + + ;; Make root's profile, which makes it a GC root. + (mkdir-p* %root-profile) + (symlink* profile + (string-append %root-profile "/" profile-name "-1-link")) + (symlink* (string-append profile-name "-1-link") + (string-append %root-profile "/" profile-name))) + (define* (populate-single-profile-directory directory #:key profile closure (profile-name "guix-profile") @@ -158,9 +188,6 @@ This is used to create the self-contained tarballs with 'guix pack'." (define (scope file) (string-append directory "/" file)) - (define %root-profile - "/var/guix/profiles/per-user/root") - (define (mkdir-p* dir) (mkdir-p (scope dir))) @@ -171,19 +198,8 @@ This is used to create the self-contained tarballs with 'guix pack'." (populate-store (list closure) directory) (when database - (install-file database (scope "/var/guix/db/")) - (chmod (scope "/var/guix/db/db.sqlite") #o644) - (mkdir-p* "/var/guix/profiles") - (mkdir-p* "/var/guix/gcroots") - (symlink* "/var/guix/profiles" - "/var/guix/gcroots/profiles")) - - ;; Make root's profile, which makes it a GC root. - (mkdir-p* %root-profile) - (symlink* profile - (string-append %root-profile "/" profile-name "-1-link")) - (symlink* (string-append profile-name "-1-link") - (string-append %root-profile "/" profile-name)) + (install-database-and-gc-roots directory database profile + #:profile-name profile-name)) (match profile-name ("guix-profile" -- cgit v1.2.3 From b20aef98a01923700f22ba471e4d2bb05765516b Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 6 Nov 2018 17:20:15 -0500 Subject: gnu: GnuPG: Update to 2.2.11. * gnu/packages/gnupg.scm (gnupg): Update to 2.2.11. --- gnu/packages/gnupg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index c38fe64200..a9169b25af 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -248,14 +248,14 @@ compatible to GNU Pth.") (define-public gnupg (package (name "gnupg") - (version "2.2.10") + (version "2.2.11") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/gnupg/gnupg-" version ".tar.bz2")) (sha256 (base32 - "05f9804g72pffdxgvxjmjzkfcpjg1x221g9rwcr8fi51hrxd77br")))) + "1ncwqjhcxh46fgkp84g2lhf91amcha7abk6wdm1kagzm7q93wv29")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 02e2133bd2bf964125a070be57d172cc6171d4fb Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 6 Nov 2018 18:50:07 -0500 Subject: gnu: LibreOffice: Update to 6.1.3.2. * gnu/packages/libreoffice.scm (libreoffice): Update to 6.1.3.2. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index bb72f69f40..abf16acb3d 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -930,7 +930,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") (define-public libreoffice (package (name "libreoffice") - (version "6.1.2.1") + (version "6.1.3.2") (source (origin (method url-fetch) @@ -940,7 +940,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") (version-prefix version 3) "/libreoffice-" version ".tar.xz")) (sha256 (base32 - "149ziasibplihfxlzafzcm4737ns30hg9175967b43c81yv5f335")) + "0i4gf3qi16fg7dxq2l4vhkwh4f5lx7xd1ilpzcw26vccqkv3hvyl")) (patches (search-patches "libreoffice-icu.patch" "libreoffice-glm.patch")))) (build-system glib-or-gtk-build-system) -- cgit v1.2.3 From cbb5d2e14582ad825e94a2e1f13cc6c74923894f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 7 Nov 2018 10:37:58 +0200 Subject: gnu: kodi: Fix typo. This is a follow-up to 2c17bd7b2955beef4130d11b33e07e4fb3b234dc. * gnu/packages/kodi.scm (kodi)[arguments]: Remove unwanted symbols. --- gnu/packages/kodi.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index 21e7b12d3e..6729f1f322 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -317,8 +317,8 @@ generator library for C++.") (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo"))) - ;; Don't phone home to check for updates.¬ - (substitute* "system/addon-manifest.xml"¬ + ;; Don't phone home to check for updates. + (substitute* "system/addon-manifest.xml" (("service.xbmc.versioncheck") "")) -- cgit v1.2.3 From 581720bc7468374a61bedc000b3a80d5ea2d9336 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 1 Oct 2018 08:33:24 +0200 Subject: gnu: Add guile-newt. * gnu/packages/guile.scm (guile-newt): New variable. --- gnu/packages/guile.scm | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 94bb598f92..3c8d2e58f9 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2017 Andy Wingo ;;; Copyright © 2017 David Thompson -;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2017, 2018 Mathieu Othacehe ;;; Copyright © 2017 Theodoros Foradis ;;; Copyright © 2017 Nils Gillmann ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice @@ -68,6 +68,7 @@ #:use-module (gnu packages maths) #:use-module (gnu packages image) #:use-module (gnu packages version-control) + #:use-module (gnu packages slang) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg) #:use-module (gnu packages networking) @@ -2286,4 +2287,39 @@ using S-expressions.") tracker's SOAP service, such as @url{https://bugs.gnu.org}.") (license license:gpl3+))) +;; There has not been any release yet. +(define-public guile-newt + (let ((commit "596ad760bee1be419d71271732f0f30eaee55143") + (revision "0")) + (package + (name "guile-newt") + (version (string-append "0-" revision "." (string-take commit 9))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/mothacehe/guile-newt") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "18qqbi0bc7vp2vlrhib3p3wwgn7wrlv5728dn0avirhw4fxxivnf")))) + (build-system gnu-build-system) + (arguments + '(#:make-flags + '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings + (inputs + `(("guile" ,guile-2.2) + ("newt" ,newt))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config))) + (synopsis "Guile bindings to Newt") + (description + "This package provides bindings for Newt, a programming library for +color text mode, widget based user interfaces. The bindings are written in pure +Scheme by using Guile’s foreign function interface.") + (home-page "https://gitlab.com/mothacehe/guile-newt") + (license license:gpl3+)))) + ;;; guile.scm ends here -- cgit v1.2.3 From f4e8bc5f250bcf5f7daf5eb28b0b9f1131e4ac61 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 28 Oct 2018 11:01:03 +0900 Subject: services: kmscon: Do not switch to vt at start. * gnu/services/base.scm (kmscon-service-type): Add "--no-switchvt" to kmscon command. --- gnu/services/base.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 47c7d8bb27..5b30cedde0 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -2057,6 +2057,7 @@ This service is not part of @var{%base-services}." #~(list #$(file-append kmscon "/bin/kmscon") "--login" "--vt" #$virtual-terminal + "--no-switchvt" ;Prevent a switch to the virtual terminal. #$@(if hardware-acceleration? '("--hwaccel") '()) "--" #$login-program #$@login-arguments)) -- cgit v1.2.3 From 2d9dace8c297c957953fa77bfef785b9dc7b4d2e Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 28 Oct 2018 11:10:52 +0900 Subject: services: kmscon: Add an auto-login option. Add an auto-login option that behaves as the one of mingetty-service. * gnu/services/base.scm (kmscon-configuration)[auto-login]: New field. (kmscon-service-type): Pass it to kmscon command. * doc/guix.texi (Base Services): Document it. --- gnu/services/base.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 5b30cedde0..3409bd352c 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2016 David Craven ;;; Copyright © 2016 Ricardo Wurmus +;;; Copyright © 2018 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -2040,6 +2041,8 @@ This service is not part of @var{%base-services}." (default (file-append shadow "/bin/login"))) (login-arguments kmscon-configuration-login-arguments (default '("-p"))) + (auto-login kmscon-configuration-auto-login + (default #f)) (hardware-acceleration? kmscon-configuration-hardware-acceleration? (default #f))) ; #t causes failure @@ -2051,6 +2054,7 @@ This service is not part of @var{%base-services}." (virtual-terminal (kmscon-configuration-virtual-terminal config)) (login-program (kmscon-configuration-login-program config)) (login-arguments (kmscon-configuration-login-arguments config)) + (auto-login (kmscon-configuration-auto-login config)) (hardware-acceleration? (kmscon-configuration-hardware-acceleration? config))) (define kmscon-command @@ -2059,7 +2063,11 @@ This service is not part of @var{%base-services}." "--vt" #$virtual-terminal "--no-switchvt" ;Prevent a switch to the virtual terminal. #$@(if hardware-acceleration? '("--hwaccel") '()) - "--" #$login-program #$@login-arguments)) + "--login" "--" + #$login-program #$@login-arguments + #$@(if auto-login + #~(#$auto-login) + #~()))) (shepherd-service (documentation "kmscon virtual terminal") -- cgit v1.2.3 From a7903ca1500e2385bc26db5e8a139539c0c2294c Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 28 Oct 2018 11:27:52 +0900 Subject: gnu: terminals: Change libtsm and kmscon repositories. Those two packages (from the same author) are no longer maintained and do not even compile. Switch to a fork that is maintained even if it does not have any release yet. * gnu/packages/terminals.scm (libtsm)[origin]: Use "https://github.com/Aetf/libtsm" as new origin and switch to git-fetch method. (kmscon)[origin]: Use "https://github.com/Aetf/kmscon" as new origin and switch to git-fetch method. --- gnu/packages/terminals.scm | 178 ++++++++++++++++++++++++--------------------- 1 file changed, 97 insertions(+), 81 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 5cdc081398..116377c8fa 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -187,96 +187,112 @@ text-based approach to terminal recording.") (license license:gpl3))) (define-public libtsm - (package - (name "libtsm") - (version "3") - (source (origin - (method url-fetch) - (uri (string-append - "https://freedesktop.org/software/kmscon/releases/" - "libtsm-" version ".tar.xz")) - (sha256 - (base32 - "01ygwrsxfii0pngfikgqsb4fxp8n1bbs47l7hck81h9b9bc1ah8i")))) - (build-system gnu-build-system) - (native-inputs - `(("pkg-config" ,pkg-config))) - (inputs - `(("libxkbcommon" ,libxkbcommon))) - (synopsis "Xterm state machine library") - (description "TSM is a state machine for DEC VT100-VT520 compatible + (let ((commit "f70e37982f382b03c6939dac3d5f814450bda253") + (revision "1")) + (package + (name "libtsm") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + ;; The freedesktop repository is no longer maintained. + (uri (git-reference + (url (string-append "https://github.com/Aetf/" name)) + (commit commit))) + (sha256 + (base32 + "0mwn91i5h5d518i1s05y7hzv6bc13vzcvxszpfh77473iwg4wprx")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags '("-DBUILD_TESTING=ON"))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("libxkbcommon" ,libxkbcommon) + ("check" ,check))) + (synopsis "Xterm state machine library") + (description "TSM is a state machine for DEC VT100-VT520 compatible terminal emulators. It tries to support all common standards while keeping compatibility to existing emulators like xterm, gnome-terminal, konsole, etc.") - (home-page "https://www.freedesktop.org/wiki/Software/libtsm") - ;; Hash table implementation is lgpl2.1+ licensed. - ;; The wcwidth implementation in external/wcwidth.{h,c} uses a license - ;; derived from ISC. - ;; UCS-4 to UTF-8 encoding is copied from "terminology" which is released - ;; under the bsd 2 license. - (license (list license:expat license:lgpl2.1+ license:isc license:bsd-2)))) + (home-page "https://www.freedesktop.org/wiki/Software/libtsm") + ;; Hash table implementation is lgpl2.1+ licensed. + ;; The wcwidth implementation in external/wcwidth.{h,c} uses a license + ;; derived from ISC. + ;; UCS-4 to UTF-8 encoding is copied from "terminology" which is released + ;; under the bsd 2 license. + (license (list license:expat license:lgpl2.1+ license:isc license:bsd-2))))) (define-public kmscon - (package - (name "kmscon") - (version "8") - (source (origin - (method url-fetch) - (uri (string-append - "https://freedesktop.org/software/kmscon/releases/" - "kmscon-" version ".tar.xz")) - (sha256 - (base32 - "0axfwrp3c8f4gb67ap2sqnkn75idpiw09s35wwn6kgagvhf1rc0a")) - (modules '((guix build utils))) - (snippet - ;; Use elogind instead of systemd. - '(begin - (substitute* "configure" - (("libsystemd-daemon libsystemd-login") - "libelogind")) - (substitute* "src/uterm_systemd.c" - (("#include ") - "#include ") - ;; We don't have this header. - (("#include ") - "") - ;; Replace the call to 'sd_booted' by the truth value. - (("sd_booted\\(\\)") - "1")) - #t)))) - (build-system gnu-build-system) - (native-inputs - `(("pkg-config" ,pkg-config) - ("libxslt" ,libxslt) ;to build the man page - ("libxml2" ,libxml2) ;for XML_CATALOG_FILES - ("docbook-xsl" ,docbook-xsl))) - (inputs - `(("libdrm" ,libdrm) - ("libtsm" ,libtsm) - ("libxkbcommon" ,libxkbcommon) - ("logind" ,elogind) - ("mesa" ,mesa) - ("pango" ,pango) - ("udev" ,eudev))) - (synopsis "Linux KMS-based terminal emulator") - (description "Kmscon is a terminal emulator based on Linux's @dfn{kernel + (let ((commit "01dd0a231e2125a40ceba5f59fd945ff29bf2cdc") + (revision "1")) + (package + (name "kmscon") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + ;; The freedesktop repository is no longer maintained. + (uri (git-reference + (url (string-append "https://github.com/Aetf/" name)) + (commit commit))) + (sha256 + (base32 + "0q62kjsvy2iwy8adfiygx2bfwlh83rphgxbis95ycspqidg9py87")) + (modules '((guix build utils))))) + (build-system gnu-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'autogen.sh + (lambda _ + (zero? (system* "sh" "autogen.sh")))) + ;; Use elogind instead of systemd. + (add-before 'configure 'remove-systemd + (lambda _ + (substitute* "configure" + (("libsystemd-daemon libsystemd-login") + "libelogind")) + (substitute* "src/uterm_systemd.c" + (("#include ") + "#include ") + ;; We don't have this header. + (("#include ") + "") + ;; Replace the call to 'sd_booted' by the truth value. + (("sd_booted\\(\\)") + "1"))))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("libxslt" ,libxslt) ;to build the man page + ("libxml2" ,libxml2) ;for XML_CATALOG_FILES + ("docbook-xsl" ,docbook-xsl))) + (inputs + `(("libdrm" ,libdrm) + ("libtsm" ,libtsm) + ("libxkbcommon" ,libxkbcommon) + ("logind" ,elogind) + ("mesa" ,mesa) + ("pango" ,pango) + ("udev" ,eudev))) + (synopsis "Linux KMS-based terminal emulator") + (description "Kmscon is a terminal emulator based on Linux's @dfn{kernel mode setting} (KMS). It can replace the in-kernel virtual terminal (VT) implementation with a user-space console. Compared to the Linux console, kmscon provides enhanced features including XKB-compatible internationalized keyboard support, UTF-8 input/font support, hardware-accelerated rendering, multi-seat support, a replacement for @command{mingetty}, and more.") - (home-page "https://www.freedesktop.org/wiki/Software/kmscon") - ;; Hash table implementation is lgpl2.1+ licensed. - ;; The wcwidth implementation in external/wcwidth.{h,c} uses a license - ;; derived from ISC. - ;; UCS-4 to UTF-8 encoding is copied from "terminology" which is released - ;; under the bsd 2 license. - ;; Unifont-Font is from http://unifoundry.com/unifont.html and licensed - ;; under the terms of the GNU GPL. - (license (list license:expat license:lgpl2.1+ license:bsd-2 - license:gpl2+)) - (supported-systems (filter (cut string-suffix? "-linux" <>) - %supported-systems)))) + (home-page "https://www.freedesktop.org/wiki/Software/kmscon") + ;; Hash table implementation is lgpl2.1+ licensed. + ;; The wcwidth implementation in external/wcwidth.{h,c} uses a license + ;; derived from ISC. + ;; UCS-4 to UTF-8 encoding is copied from "terminology" which is released + ;; under the bsd 2 license. + ;; Unifont-Font is from http://unifoundry.com/unifont.html and licensed + ;; under the terms of the GNU GPL. + (license (list license:expat license:lgpl2.1+ license:bsd-2 + license:gpl2+)) + (supported-systems (filter (cut string-suffix? "-linux" <>) + %supported-systems))))) (define-public libtermkey (package -- cgit v1.2.3 From 8243f4e55a9f87821370eb2198fa9b5c8eac6648 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 28 Oct 2018 11:33:20 +0900 Subject: gnu: slang: Use a correct location for terminfo dirs. As termcap is disabled and no terminfo directory is given, slang is not able to query terminal capabilities. Specifying a correct path for terminfo will automatically disable termcap support in the configuration. * gnu/packages/slang.scm (slang)[source]: Remove the snippet disabling termcap. [arguments]: Set MISC_TERMINFO_DIRS to a correct location. --- gnu/packages/slang.scm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/slang.scm b/gnu/packages/slang.scm index 24eb5fa137..185d441919 100644 --- a/gnu/packages/slang.scm +++ b/gnu/packages/slang.scm @@ -50,13 +50,21 @@ '(begin (substitute* "src/Makefile.in" (("/bin/ln") "ln")) - (substitute* "configure" - (("-ltermcap") "")) #t)))) (build-system gnu-build-system) (arguments '(#:parallel-tests? #f - #:parallel-build? #f)) ; there's at least one race + #:parallel-build? #f ; there's at least one race + #:phases + (modify-phases %standard-phases + (add-before 'configure 'substitute-before-config + (lambda* (#:key inputs #:allow-other-keys) + (let ((ncurses (assoc-ref inputs "ncurses"))) + (substitute* "configure" + (("MISC_TERMINFO_DIRS=\"\"") + (string-append "MISC_TERMINFO_DIRS=" + "\"" ncurses "/share/terminfo" "\""))) + #t)))))) (inputs `(("readline" ,readline) ("zlib" ,zlib) -- cgit v1.2.3 From bfa5662e38de7bd02c493e52796c05359a984c66 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:27:16 +0100 Subject: gnu: Add r-rcppannoy. * gnu/packages/cran.scm (r-rcppannoy): New variable. --- gnu/packages/cran.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8fed911360..43ff292cb2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7253,3 +7253,30 @@ estimates from interaction terms in regressions (and multiply imputed regressions). NOTE: Weighted partial correlation calculations pulled to address a bug.") (license license:gpl2+))) + +(define-public r-rcppannoy + (package + (name "r-rcppannoy") + (version "0.0.11") + (source + (origin + (method url-fetch) + (uri (cran-uri "RcppAnnoy" version)) + (sha256 + (base32 + "1ik50ancfgcvh03n4jsqwjk8lf056rbgd70q4l4didmvh5kcyjd1")))) + (properties `((upstream-name . "RcppAnnoy"))) + (build-system r-build-system) + (propagated-inputs + `(("r-rcpp" ,r-rcpp))) + (native-inputs + `(("r-knitr" ,r-knitr))) ; for vignettes + (home-page "https://cran.r-project.org/web/packages/RcppAnnoy/") + (synopsis "Rcpp bindings for Annoy, a library for Approximate Nearest Neighbors") + (description + "Annoy is a small C++ library for Approximate Nearest Neighbors written +for efficient memory usage as well an ability to load from and save to disk. +This package provides an R interface.") + ;; Annoy is released under ASL 2.0, but this wrapper is released under + ;; GPLv2+. + (license (list license:gpl2+ license:asl2.0)))) -- cgit v1.2.3 From b58940cb0345705a9681f2c47d668f252d00a699 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:27:41 +0100 Subject: gnu: Add r-ncdf4. * gnu/packages/cran.scm (r-ncdf4): New variable. --- gnu/packages/cran.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 43ff292cb2..11f7717bd8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7280,3 +7280,30 @@ This package provides an R interface.") ;; Annoy is released under ASL 2.0, but this wrapper is released under ;; GPLv2+. (license (list license:gpl2+ license:asl2.0)))) + +(define-public r-ncdf4 + (package + (name "r-ncdf4") + (version "1.16") + (source + (origin + (method url-fetch) + (uri (cran-uri "ncdf4" version)) + (sha256 + (base32 + "0lwjjis0b83c4l3xvqai4ckzrskd6mychck1iwxcxgjvh0d77mgd")))) + (build-system r-build-system) + (inputs + `(("netcdf" ,netcdf) + ("zlib" ,zlib))) + (home-page "https://cran.r-project.org/web/packages/ncdf4/index.html") + (synopsis "R interface to Unidata netCDF format data files") + (description + "This package provides a high-level R interface to data files written +using Unidata's netCDF library (version 4 or earlier), which are binary data +files that are portable across platforms and include metadata information in +addition to the data sets. Using this package, netCDF files can be opened and +data sets read in easily. It is also easy to create new netCDF dimensions, +variables, and files, in either version 3 or 4 format, and manipulate existing +netCDF files.") + (license license:gpl3+))) -- cgit v1.2.3 From 1e605c030feaab4d3c24075f5c5b3783454973f8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:28:09 +0100 Subject: gnu: Add r-biocmanager. * gnu/packages/cran.scm (r-biocmanager): New variable. --- gnu/packages/cran.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 11f7717bd8..ffad46be01 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7307,3 +7307,23 @@ data sets read in easily. It is also easy to create new netCDF dimensions, variables, and files, in either version 3 or 4 format, and manipulate existing netCDF files.") (license license:gpl3+))) + +(define-public r-biocmanager + (package + (name "r-biocmanager") + (version "1.30.3") + (source + (origin + (method url-fetch) + (uri (cran-uri "BiocManager" version)) + (sha256 + (base32 + "0mfvx1xzsgiag9p42kdyqg8fvajyakrdy3z2smhdlaawzbi0qmax")))) + (properties `((upstream-name . "BiocManager"))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/web/packages/BiocManager/") + (synopsis "Access the Bioconductor project package repository") + (description + "This package provides a convenient tool to install and update +Bioconductor packages.") + (license license:artistic2.0))) -- cgit v1.2.3 From 6168692159812724b1a0233167fd1a02b44aba19 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:43:05 +0100 Subject: gnu: r-hpar: Update to 1.24.0. * gnu/packages/bioconductor.scm (r-hpar): Update to 1.24.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 6ce5c0dc96..797d7d4f91 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -201,14 +201,14 @@ genomes and gene ID formats, largely based on the UCSC table browser.") (define-public r-hpar (package (name "r-hpar") - (version "1.22.2") + (version "1.24.0") (source (origin (method url-fetch) (uri (bioconductor-uri "hpar" version)) (sha256 (base32 - "1b72hvzasf6q739gmx6jblbzzyq22l7crrkbbfkihv3v7s94g388")))) + "1pm3k8apgynmdzv2d0chca3b636kcai3b1x861fyv1m3xs6msgxn")))) (build-system r-build-system) (home-page "https://bioconductor.org/packages/hpar/") (synopsis "Human Protein Atlas in R") -- cgit v1.2.3 From 98652568a42fcdb09c05e137fba96196b00d6c4e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:43:32 +0100 Subject: gnu: r-diffbind: Update to 2.10.0. * gnu/packages/bioconductor.scm (r-diffbind): Update to 2.10.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 797d7d4f91..72e43ae82d 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -247,14 +247,14 @@ region sets and other genomic features.") (define-public r-diffbind (package (name "r-diffbind") - (version "2.8.0") + (version "2.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "DiffBind" version)) (sha256 (base32 - "1w1hybzd732ccg3q8zhirwfilq8sx3frv1x98zfyj3svzw98fish")))) + "0j8pal40lr1gv8sss96hhkj7l1qn9sy4q4l2kqd4rfwl7qrcnfw5")))) (properties `((upstream-name . "DiffBind"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From f1c606ce8c4214f41944f93da4c8a4a30ec71e8a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:43:55 +0100 Subject: gnu: r-marray: Update to 1.60.0. * gnu/packages/bioconductor.scm (r-marray): Update to 1.60.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 72e43ae82d..adc4749ba2 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -465,12 +465,12 @@ enrichedGO (addGeneIDs).") (define-public r-marray (package (name "r-marray") - (version "1.58.0") + (version "1.60.0") (source (origin (method url-fetch) (uri (bioconductor-uri "marray" version)) (sha256 - (base32 "0539flh3y1qy5b1bamkfwbskis765c5s33v1y9j51n33mxb9h08d")))) + (base32 "1sh7l3c28x6zhdv99c9x05ii2yxmh9alkazp98kdi4fdb23rlzky")))) (build-system r-build-system) (propagated-inputs `(("r-limma" ,r-limma))) -- cgit v1.2.3 From 46cdceef4c13f8d5f57f093e1aded95a1e04a265 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:44:12 +0100 Subject: gnu: r-cghbase: Update to 1.42.0. * gnu/packages/bioconductor.scm (r-cghbase): Update to 1.42.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index adc4749ba2..22140ef587 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -484,12 +484,12 @@ normalization and quality checking.") (define-public r-cghbase (package (name "r-cghbase") - (version "1.40.0") + (version "1.42.0") (source (origin (method url-fetch) (uri (bioconductor-uri "CGHbase" version)) (sha256 - (base32 "1hf44vma3kgwr61kjbszvfxkava8bjqnam1mdncqvczbypb2xwaq")))) + (base32 "0ghxp49xdi09p3f2qwrdrq2p4qjafj4z1rr08ycgbf11gb22h1sc")))) (properties `((upstream-name . "CGHbase"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 9add0933d0a4dc5c142ce28fa424a0525e25390f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:44:29 +0100 Subject: gnu: r-cghcall: Update to 2.44.0. * gnu/packages/bioconductor.scm (r-cghcall): Update to 2.44.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 22140ef587..7293d17719 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -504,12 +504,12 @@ the @code{arrayCGH} packages.") (define-public r-cghcall (package (name "r-cghcall") - (version "2.42.0") + (version "2.44.0") (source (origin (method url-fetch) (uri (bioconductor-uri "CGHcall" version)) (sha256 - (base32 "0y71vfxv9x0am3xvv520yr95cb7m7y92dhdx1vkqki80jrmf12dz")))) + (base32 "1k65kaiqvjyllzbpa2367n6f6kkmsy463kpflzs66hqhx2fshsmi")))) (properties `((upstream-name . "CGHcall"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From a92f523026a4b774b8da3b3d4dff2fb65f002a43 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:44:50 +0100 Subject: gnu: r-qdnaseq: Update to 1.18.0. * gnu/packages/bioconductor.scm (r-qdnaseq): Update to 1.18.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 7293d17719..165832a57b 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -527,12 +527,12 @@ the @code{arrayCGH} packages.") (define-public r-qdnaseq (package (name "r-qdnaseq") - (version "1.16.0") + (version "1.18.0") (source (origin (method url-fetch) (uri (bioconductor-uri "QDNAseq" version)) (sha256 - (base32 "1pj69mfyxwfd0d7h4kls9xq96sdc55y3rv20qpla50hw9libcwwd")))) + (base32 "04ff9nbckzrlb45mr2j0c3mlh1wcggq5bbl81zklhq203c5x1wc2")))) (properties `((upstream-name . "QDNAseq"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 95ee4a466bbeb06d5815f9950f5b0a5ce830d7b5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:45:35 +0100 Subject: gnu: r-multtest: Update to 2.38.0. * gnu/packages/bioconductor.scm (r-multtest): Update to 2.38.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 165832a57b..d4ff89d8a7 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -325,14 +325,14 @@ processing to visualization and annotation.") (define-public r-multtest (package (name "r-multtest") - (version "2.36.0") + (version "2.38.0") (source (origin (method url-fetch) (uri (bioconductor-uri "multtest" version)) (sha256 (base32 - "11949h2kglw13x8haaj4clg4jim1mwh5n98n9zxp9mmgn01z1lp0")))) + "0lq62jw81hz9k840969n5byj57pwd0jqga3hqvhb6abb3g10yz7k")))) (build-system r-build-system) (propagated-inputs `(("r-survival" ,r-survival) -- cgit v1.2.3 From 14520b640eec571241d9f5b4dbd2fe237027b55d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:45:51 +0100 Subject: gnu: r-graph: Update to 1.60.0. * gnu/packages/bioconductor.scm (r-graph): Update to 1.60.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index d4ff89d8a7..d4b336dfab 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -363,13 +363,13 @@ expressed genes in DNA microarray experiments.") (define-public r-graph (package (name "r-graph") - (version "1.58.2") + (version "1.60.0") (source (origin (method url-fetch) (uri (bioconductor-uri "graph" version)) (sha256 (base32 - "07smbb3c30pr5r425g181xsg0rs5jx6x2q6xpwb5dqgicxrz30ga")))) + "1kgnsm6f0vmb9qbkmmrnvxbwqc0gar17dq5gv1v10hrksw6mh64i")))) (build-system r-build-system) (propagated-inputs `(("r-biocgenerics" ,r-biocgenerics))) -- cgit v1.2.3 From 57d2fcd9eeb0c7b04db0fa890c1d23e9c796a868 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:46:21 +0100 Subject: gnu: r-chippeakanno: Update to 3.16.0. * gnu/packages/bioconductor.scm (r-chippeakanno): Update to 3.16.0. [propagated-inputs]: Remove r-biocinstaller; add r-biocmanager. --- gnu/packages/bioconductor.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index d4b336dfab..368691d1cc 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -410,18 +410,19 @@ determining dependencies between variables, code improvement suggestions.") (define-public r-chippeakanno (package (name "r-chippeakanno") - (version "3.14.2") + (version "3.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ChIPpeakAnno" version)) (sha256 (base32 - "13rksc65lxxzyw11galh6xzvgzp5ii0gwiwpvrm395v2r17rhwsc")))) + "09fhh1355diip3v3c0skmp1336vclipkm5nv02qvp5902v4262y3")))) (properties `((upstream-name . "ChIPpeakAnno"))) (build-system r-build-system) (propagated-inputs `(("r-biocgenerics" ,r-biocgenerics) + ("r-biocmanager" ,r-biocmanager) ("r-biostrings" ,r-biostrings) ("r-delayedarray" ,r-delayedarray) ("r-go-db" ,r-go-db) @@ -437,7 +438,6 @@ determining dependencies between variables, code improvement suggestions.") ("r-multtest" ,r-multtest) ("r-rbgl" ,r-rbgl) ("r-graph" ,r-graph) - ("r-biocinstaller" ,r-biocinstaller) ("r-regioner" ,r-regioner) ("r-dbi" ,r-dbi) ("r-ensembldb" ,r-ensembldb) -- cgit v1.2.3 From 4728e2751168eda6b2e211c9c74be21c22fe6f6b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:46:58 +0100 Subject: gnu: r-bayseq: Update to 2.16.0. * gnu/packages/bioconductor.scm (r-bayseq): Update to 2.16.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 368691d1cc..82733645b8 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -559,14 +559,14 @@ respectively.") (define-public r-bayseq (package (name "r-bayseq") - (version "2.14.0") + (version "2.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "baySeq" version)) (sha256 (base32 - "0hbmm01a8libara9mbxknpk0wzarwfngnfwlmhpww91a0cmy5klg")))) + "0f6yckihm5cwh3dycv2g54hf7nddhcqya4yrqwbir96y5k1d1km5")))) (properties `((upstream-name . "baySeq"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From aa802eafb66fc861f70292eb6674540aeac8db1a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:47:22 +0100 Subject: gnu: r-chipcomp: Update to 1.12.0. * gnu/packages/bioconductor.scm (r-chipcomp): Update to 1.12.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 82733645b8..8de8d5b233 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -585,14 +585,14 @@ more complex hypotheses) via empirical Bayesian methods.") (define-public r-chipcomp (package (name "r-chipcomp") - (version "1.10.0") + (version "1.12.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ChIPComp" version)) (sha256 (base32 - "0j9nif7z33qdxf347r9wa62hhz8qs09r2p96x3hg5yz30a10ahqs")))) + "1sypdsvwzssraanlhddhzpf9p0xs3qlflc0hp7yfbp0aplsifx85")))) (properties `((upstream-name . "ChIPComp"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From e9427b2c7852cbc02b06e91b1d5503f5f02211d4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:47:38 +0100 Subject: gnu: r-ripseeker: Update to 1.22.0. * gnu/packages/bioconductor.scm (r-ripseeker): Update to 1.22.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 8de8d5b233..7c95847400 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -292,14 +292,14 @@ occupancy (overlap) analysis and plotting functions.") (define-public r-ripseeker (package (name "r-ripseeker") - (version "1.20.0") + (version "1.22.0") (source (origin (method url-fetch) (uri (bioconductor-uri "RIPSeeker" version)) (sha256 (base32 - "0y9cvzqslfxj3z9mnp47mknff0pky2g5x8x1z1s5yjcx35q89xfi")))) + "1x2n1iyik4s67bxq0fl6fpf602k51g4pxjpjpxkgx1a5fsk61f2i")))) (properties `((upstream-name . "RIPSeeker"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From e22e462b3394a230400387b9c47b51a4f6bbb997 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:48:03 +0100 Subject: gnu: r-riboprofiling: Update to 1.12.0. * gnu/packages/bioconductor.scm (r-riboprofiling): Update to 1.12.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 7c95847400..ae72e43686 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -619,14 +619,14 @@ datasets.") (define-public r-riboprofiling (package (name "r-riboprofiling") - (version "1.10.0") + (version "1.12.0") (source (origin (method url-fetch) (uri (bioconductor-uri "RiboProfiling" version)) (sha256 (base32 - "04yjklqdjkim7yxyk3cyvf0mmwyxyfvw2mmfzgwaaqbiyg29sli0")))) + "1njvkd1khmf3rbp3dkz5z63wp79z4wmk4kzd3p3amky3w5by070z")))) (properties `((upstream-name . "RiboProfiling"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From c4fed658a934b97d1feaed4970e51f496cc39b23 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:48:22 +0100 Subject: gnu: r-riboseqr: Update to 1.16.0. * gnu/packages/bioconductor.scm (r-riboseqr): Update to 1.16.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index ae72e43686..e079e63636 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -658,14 +658,14 @@ assessment, principal component analysis on codon coverage.") (define-public r-riboseqr (package (name "r-riboseqr") - (version "1.14.0") + (version "1.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "riboSeqR" version)) (sha256 (base32 - "0xavd1cdhi8qfjn9a1hjhflyg6jq1ydvv56z12gjz572pwz2knvn")))) + "1nacsbsz77fw4a10nqj2ncsf25q3aaa0gd5w1q0ray2prx7qmlqb")))) (properties `((upstream-name . "riboSeqR"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From bbc4787cf26e3ecf695915fb7ed1e47ecee31ba6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:48:38 +0100 Subject: gnu: r-interactionset: Update to 1.10.0. * gnu/packages/bioconductor.scm (r-interactionset): Update to 1.10.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index e079e63636..f522735252 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -686,14 +686,14 @@ parsing of genetic sequencing data from ribosome profiling experiments.") (define-public r-interactionset (package (name "r-interactionset") - (version "1.8.0") + (version "1.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "InteractionSet" version)) (sha256 (base32 - "0xngraq7ic80jr98i1wqp8bxdgidq6py60m2wfk82n1ixpcdck8n")))) + "0wirfhmpmkmnmhbqslw4bzvi2msqyqpjy1rrwr5qbd9k5rhx3bzb")))) (properties `((upstream-name . "InteractionSet"))) (build-system r-build-system) -- cgit v1.2.3 From 5f2d0e635e07039774422a1103e773a401dd87d0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:48:55 +0100 Subject: gnu: r-genomicinteractions: Update to 1.16.0. * gnu/packages/bioconductor.scm (r-genomicinteractions): Update to 1.16.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index f522735252..ee37d98974 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -718,14 +718,14 @@ experiments.") (define-public r-genomicinteractions (package (name "r-genomicinteractions") - (version "1.14.0") + (version "1.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicInteractions" version)) (sha256 (base32 - "0cnagprxj0b7p6s29iyhqwxj7hgmrh75gj52y4dlil790d1bmq2q")))) + "0zy5isp2lqpjm0n0n1gly5bs4izn22yciibyqrnlrr60rmn5s67q")))) (properties `((upstream-name . "GenomicInteractions"))) (build-system r-build-system) -- cgit v1.2.3 From b858338c7690bf7119feda9e59fb44d7888065c3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:49:13 +0100 Subject: gnu: r-ctc: Update to 1.56.0. * gnu/packages/bioconductor.scm (r-ctc): Update to 1.56.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index ee37d98974..dec94a09f4 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -757,14 +757,14 @@ information and producing various plots and statistics.") (define-public r-ctc (package (name "r-ctc") - (version "1.54.0") + (version "1.56.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ctc" version)) (sha256 (base32 - "0sadplm4n9n3z6inmn6y3d6qbr4hllljqh700x5fygrnfacnckk9")))) + "0yp7c0abk48jx1wf8n1gawh7dm15idahqc8va24v8cm0bzxgnmh2")))) (build-system r-build-system) (propagated-inputs `(("r-amap" ,r-amap))) (home-page "https://bioconductor.org/packages/ctc/") -- cgit v1.2.3 From 6ea9ae9c3945d0ec6245ace9d0330f7821b64ed8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:49:28 +0100 Subject: gnu: r-goseq: Update to 1.34.0. * gnu/packages/bioconductor.scm (r-goseq): Update to 1.34.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index dec94a09f4..0f88b37ccf 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -777,14 +777,14 @@ trees and clusters to other programs.") (define-public r-goseq (package (name "r-goseq") - (version "1.32.0") + (version "1.34.0") (source (origin (method url-fetch) (uri (bioconductor-uri "goseq" version)) (sha256 (base32 - "0xmbb8ma32lrfy810r82y34gkspq4fqiqxykic9j4rq9rg9n9x2l")))) + "1401x0jn5f8hqc12r3gd1wammp1nxir3is1k5ldd03ln97x00i7a")))) (build-system r-build-system) (propagated-inputs `(("r-annotationdbi" ,r-annotationdbi) -- cgit v1.2.3 From 016afac30f0279a5b19e88765c1cefbbd47f62dc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:49:45 +0100 Subject: gnu: r-glimma: Update to 1.10.0. * gnu/packages/bioconductor.scm (r-glimma): Update to 1.10.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 0f88b37ccf..4a61854a9b 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -803,14 +803,14 @@ defined categories which are over/under represented in RNA-seq data.") (define-public r-glimma (package (name "r-glimma") - (version "1.8.2") + (version "1.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Glimma" version)) (sha256 (base32 - "0kfia60vrlys6amdchdix01iwbkwyb7nfjqn5hczsxp8rhmbg25s")))) + "0cbsi6g8k1whkh21jxfn22sj7wry2g3rshiracf5nyvrl2fnl947")))) (properties `((upstream-name . "Glimma"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From c348cfed74793864126d14b95a0d036b02e44b49 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:49:59 +0100 Subject: gnu: r-rots: Update to 1.10.0. * gnu/packages/bioconductor.scm (r-rots): Update to 1.10.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 4a61854a9b..18b08b739b 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -830,14 +830,14 @@ information.") (define-public r-rots (package (name "r-rots") - (version "1.8.0") + (version "1.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ROTS" version)) (sha256 (base32 - "12jvdqanyk86ihpcylp105zip22y0gkbksmyxy00q7iad0jhaqp3")))) + "137c06g5w7mjw3b1mly7b7n9iix4fcy23c7a9ym9iz8dazwhzwn5")))) (properties `((upstream-name . "ROTS"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 6f1e1d0f884b6e79543d46abf5c94aee50838f4f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:50:14 +0100 Subject: gnu: r-inspect: Update to 1.12.0. * gnu/packages/bioconductor.scm (r-inspect): Update to 1.12.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 18b08b739b..576ab185b5 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -854,14 +854,14 @@ in omics data.") (define-public r-inspect (package (name "r-inspect") - (version "1.10.0") + (version "1.12.0") (source (origin (method url-fetch) (uri (bioconductor-uri "INSPEcT" version)) (sha256 (base32 - "1gk0pwyimkswrvgb2xr3c2zy4myi448a2shr5ap65rq9pcpp0l8p")))) + "0b671x5v2wyq5np2flq2m1fnjz32f303yjlw64a1inwc9k2w2pz2")))) (properties `((upstream-name . "INSPEcT"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 318bcbc4511ee1fcb7c71f74493443e0bb57f0d1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:50:30 +0100 Subject: gnu: r-dnabarcodes: Update to 1.12.0. * gnu/packages/bioconductor.scm (r-dnabarcodes): Update to 1.12.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 576ab185b5..5855b02630 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -890,14 +890,14 @@ modeling the rates that determines changes in mature mRNA levels.") (define-public r-dnabarcodes (package (name "r-dnabarcodes") - (version "1.10.0") + (version "1.12.0") (source (origin (method url-fetch) (uri (bioconductor-uri "DNABarcodes" version)) (sha256 (base32 - "0xhna7f0kr7pp2hqwara5i57m9mdr65shflfxiyw6yy3g90pgb5x")))) + "0g6j7ish0fk9jcib94wssjgp1m8ldcp42hyyg1ypr945fa3xghx0")))) (properties `((upstream-name . "DNABarcodes"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 286157dc49d9b32ccb918759719f9bbbd5ff99bd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:50:52 +0100 Subject: gnu: Add r-biocneighbors. * gnu/packages/bioconductor.scm (r-biocneighbors): New variable. --- gnu/packages/bioconductor.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 5855b02630..065dbdb6d5 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -939,3 +939,32 @@ demultiplexed, i.e. assigned to their original reference barcode.") of Risso et al. (2014) for the normalization of RNA-Seq read counts between samples.") (license license:artistic2.0))) + +(define-public r-biocneighbors + (package + (name "r-biocneighbors") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "BiocNeighbors" version)) + (sha256 + (base32 + "1fsb96acidlxwf0h65xv7fnwdi58ckmq00gmwykrlawh88wgn1ll")))) + (properties `((upstream-name . "BiocNeighbors"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biocparallel" ,r-biocparallel) + ("r-rcpp" ,r-rcpp) + ("r-rcppannoy" ,r-rcppannoy) + ("r-s4vectors" ,r-s4vectors))) + (home-page "https://bioconductor.org/packages/BiocNeighbors") + (synopsis "Nearest Neighbor Detection for Bioconductor packages") + (description + "This package implements exact and approximate methods for nearest +neighbor detection, in a framework that allows them to be easily switched +within Bioconductor packages or workflows. The exact algorithm is implemented +using pre-clustering with the k-means algorithm. Functions are also provided +to search for all neighbors within a given distance. Parallelization is +achieved for all methods using the BiocParallel framework.") + (license license:gpl3))) -- cgit v1.2.3 From ed35d7ca1fad410cf8ffaf664ca0800f403fb902 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:51:06 +0100 Subject: gnu: r-ruvseq: Update to 1.16.0. * gnu/packages/bioconductor.scm (r-ruvseq): Update to 1.16.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 065dbdb6d5..ef5c799917 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -917,14 +917,14 @@ demultiplexed, i.e. assigned to their original reference barcode.") (define-public r-ruvseq (package (name "r-ruvseq") - (version "1.14.0") + (version "1.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "RUVSeq" version)) (sha256 (base32 - "16i5sm5af761k4zvspfi8jknsgln48bn538hxqqmlaq7wvlfxqxj")))) + "0xb3bj3n06cb9xddkv77a8svhg4fl1azlfmibwrm9mq9464kgf0m")))) (properties `((upstream-name . "RUVSeq"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From d639d8884c85584e2487ed08fd8b1faca826e982 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:51:30 +0100 Subject: gnu: r-regioner: Update to 1.14.0. * gnu/packages/bioconductor.scm (r-regioner): Update to 1.14.0. [propagated-inputs]: Add r-biostrings. --- gnu/packages/bioconductor.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index ef5c799917..bab6b2b64d 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -219,23 +219,24 @@ the Human Protein Atlas project.") (define-public r-regioner (package (name "r-regioner") - (version "1.12.0") + (version "1.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "regioneR" version)) (sha256 (base32 - "09bzlaqdgy7wmzly3zc9y2da50d07mlixlnpaxdxpiwdk8qmhxsb")))) + "19la74swgzxp90z2nr3pzsgkxd7wp70zl6i2ipv3plg841f6k5zd")))) (properties `((upstream-name . "regioneR"))) (build-system r-build-system) (propagated-inputs - `(("r-memoise" ,r-memoise) - ("r-genomicranges" ,r-genomicranges) + `(("r-biostrings" ,r-biostrings) ("r-bsgenome" ,r-bsgenome) - ("r-rtracklayer" ,r-rtracklayer) ("r-genomeinfodb" ,r-genomeinfodb) + ("r-genomicranges" ,r-genomicranges) ("r-iranges" ,r-iranges) + ("r-memoise" ,r-memoise) + ("r-rtracklayer" ,r-rtracklayer) ("r-s4vectors" ,r-s4vectors))) (home-page "https://bioconductor.org/packages/regioneR/") (synopsis "Association analysis of genomic regions") -- cgit v1.2.3 From bb47aca5e75b32874d7b7b16902bcd085e54547e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:52:08 +0100 Subject: gnu: Add hdf5-1.10. * gnu/packages/maths.scm (hdf5-1.10): New variable. --- gnu/packages/maths.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index d14e61f26f..808ab5345b 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -884,6 +884,25 @@ extremely large and complex data collections.") (license (license:x11-style "http://www.hdfgroup.org/ftp/HDF5/current/src/unpacked/COPYING")))) +(define-public hdf5-1.10 + (package (inherit hdf5) + (version "1.10.4") + (source + (origin + (method url-fetch) + (uri (list (string-append "https://support.hdfgroup.org/ftp/HDF5/releases/" + "hdf5-" (version-major+minor version) + "/hdf5-" version "/src/hdf5-" + version ".tar.bz2") + (string-append "https://support.hdfgroup.org/ftp/HDF5/" + "current" + (apply string-append + (take (string-split version #\.) 2)) + "/src/hdf5-" version ".tar.bz2"))) + (sha256 + (base32 "1pr85fa1sh2ky6ai2hs3f21lp252grl2cq3wbyi4rh7dm83gyrqj")) + (patches (list (search-patch "hdf5-config-date.patch"))))))) + (define-public hdf-java (package (name "hdf-java") -- cgit v1.2.3 From 269182b0f119a3d8cb2c5ca35e2c176c94c6159e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:52:27 +0100 Subject: gnu: r-rgraphviz: Update to 2.26.0. * gnu/packages/graph.scm (r-rgraphviz): Update to 2.26.0. --- gnu/packages/graph.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index cb314719b7..67b306de6d 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -156,14 +156,14 @@ model.") (define-public r-rgraphviz (package (name "r-rgraphviz") - (version "2.24.0") + (version "2.26.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Rgraphviz" version)) (sha256 (base32 - "1037hzfxxcn46w6y88wm3kk2nixj0s8bk0hkmnshpxih3kmnvqby")))) + "0bp6517xsih0wng2rgkh9z4r1afqhwl3h04z6ssm7p4cdj0ahm4y")))) (properties `((upstream-name . "Rgraphviz"))) (build-system r-build-system) ;; FIXME: Rgraphviz bundles the sources of an older variant of -- cgit v1.2.3 From 0dd84df1210250631554361f735db79f3fa93669 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:52:45 +0100 Subject: gnu: r-ps: Update to 1.2.1. * gnu/packages/cran.scm (r-ps): Update to 1.2.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ffad46be01..28fa6adc6f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -492,13 +492,13 @@ print, summary, plot, update, etc. (define-public r-ps (package (name "r-ps") - (version "1.2.0") + (version "1.2.1") (source (origin (method url-fetch) (uri (cran-uri "ps" version)) (sha256 - (base32 "0ai8igdkysmks1ihbp3h3s552da2hskxqwrvp4cx7vwn91x9f3wd")))) + (base32 "1zxylcb0nr4qb5v6j199mc2pfgf2bpf00jrw47jajmv59qb0fwmx")))) (build-system r-build-system) (home-page "http://ps.r-lib.org") (synopsis "List, query, and manipulate system processes") -- cgit v1.2.3 From 65dd0e67483e79fb4511646ce727f22ebf65a347 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:53:00 +0100 Subject: gnu: r-pkgload: Update to 1.0.2. * gnu/packages/cran.scm (r-pkgload): Update to 1.0.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 28fa6adc6f..dc5e0123ad 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -539,14 +539,14 @@ is configured appropriately so R can use them.") (define-public r-pkgload (package (name "r-pkgload") - (version "1.0.1") + (version "1.0.2") (source (origin (method url-fetch) (uri (cran-uri "pkgload" version)) (sha256 (base32 - "0mm0avvan528zbrcrxigl5fkd7za01fb0qhlqrqvm3ar0115cqa8")))) + "0z7jvharafahi2gv5547mk1n499isjzw06kfwymmxc0gd575d1ii")))) (build-system r-build-system) (propagated-inputs `(("r-desc" ,r-desc) -- cgit v1.2.3 From ec0ee08576d3b4bee4e1b55b481356439e42b699 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:53:09 +0100 Subject: gnu: r-ffbase: Update to 0.12.7. * gnu/packages/cran.scm (r-ffbase): Update to 0.12.7. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index dc5e0123ad..7e604ee197 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -891,14 +891,14 @@ in main memory.") (define-public r-ffbase (package (name "r-ffbase") - (version "0.12.5") + (version "0.12.7") (source (origin (method url-fetch) (uri (cran-uri "ffbase" version)) (sha256 (base32 - "1h5x6rbb1nrpzf4ywkizn8ij0bz3mlz46byh46ylxhicg1ribi24")))) + "04kxx2f3f0743c5nvpb7x1x0pcd220dazpd5ag1pidxbz3xa85nw")))) (build-system r-build-system) (propagated-inputs `(("r-bit" ,r-bit) -- cgit v1.2.3 From 56af171ffd965c179b2516b1e311a3bfb3f3de4c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:53:20 +0100 Subject: gnu: r-ipred: Update to 0.9-8. * gnu/packages/cran.scm (r-ipred): Update to 0.9-8. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 7e604ee197..9af9fc9df7 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1762,14 +1762,14 @@ provided.") (define-public r-ipred (package (name "r-ipred") - (version "0.9-7") + (version "0.9-8") (source (origin (method url-fetch) (uri (cran-uri "ipred" version)) (sha256 (base32 - "0q53cqs46501wsd4cmfsmr78l8nv1hkbamk9m0ns5qy02df5r254")))) + "01xcg3c121ndfpz9dirqxszknh4yb1p222p7f1wbwwhdrg1i27cw")))) (build-system r-build-system) (propagated-inputs `(("r-class" ,r-class) -- cgit v1.2.3 From 5d986a3b418a29d83dd6d3ddc1556694bc10e9eb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:53:30 +0100 Subject: gnu: r-psych: Update to 1.8.10. * gnu/packages/cran.scm (r-psych): Update to 1.8.10. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9af9fc9df7..5dc45a8b72 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1789,14 +1789,14 @@ problems as well as resampling based estimators of prediction error.") (define-public r-psych (package (name "r-psych") - (version "1.8.4") + (version "1.8.10") (source (origin (method url-fetch) (uri (cran-uri "psych" version)) (sha256 (base32 - "1kzv9nc7rwn1sj1zxd8xrbs6c7qlka7j2c8lsr4f20znkd3qx8gf")))) + "0n3frgzsfmnan6cp3yyq5h6c28v5pd7q5a42pp6byaa7n7d1v478")))) (build-system r-build-system) (propagated-inputs `(("r-foreign" ,r-foreign) -- cgit v1.2.3 From cea8a6074766de4228e75c3d6d5985a20fbe48cb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:53:39 +0100 Subject: gnu: r-xts: Update to 0.11-2. * gnu/packages/cran.scm (r-xts): Update to 0.11-2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 5dc45a8b72..a29117b433 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2319,14 +2319,14 @@ training models for classification or ranking.") (define-public r-xts (package (name "r-xts") - (version "0.11-1") + (version "0.11-2") (source (origin (method url-fetch) (uri (cran-uri "xts" version)) (sha256 (base32 - "17d3g14xkxa1a5z5gd3gk1xjqfkjg1ik3i12q0arina8frql3jhd")))) + "1f0kxrvn13py3hk2gh2m56cqm39x3bqp1i350r5viddacrm2yxqj")))) (build-system r-build-system) (propagated-inputs `(("r-zoo" ,r-zoo))) (home-page "https://github.com/joshuaulrich/xts") -- cgit v1.2.3 From 84d0d860e1113bb1e0c2be88a5d03be252de8b28 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:53:51 +0100 Subject: gnu: r-sjmisc: Update to 2.7.6. * gnu/packages/cran.scm (r-sjmisc): Update to 2.7.6. [propagated-inputs]: Remove r-pillar, r-tibble, and r-tidyselect. --- gnu/packages/cran.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a29117b433..5afad23dd4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4814,14 +4814,14 @@ vice versa), or to deal with multiple declared missing values.") (define-public r-sjmisc (package (name "r-sjmisc") - (version "2.7.5") + (version "2.7.6") (source (origin (method url-fetch) (uri (cran-uri "sjmisc" version)) (sha256 (base32 - "05fjqfr2rfk11065zqkzb9mbqd6mgdkw9jdhq3by425a7f8m2dcg")))) + "1jhrigikjpkdar3jxvi7qhqsg6lgjkjqhqll9vaay98b88rfc2im")))) (build-system r-build-system) (propagated-inputs `(("r-broom" ,r-broom) @@ -4829,15 +4829,12 @@ vice versa), or to deal with multiple declared missing values.") ("r-dplyr" ,r-dplyr) ("r-haven" ,r-haven) ("r-magrittr" ,r-magrittr) - ("r-pillar" ,r-pillar) ("r-purrr" ,r-purrr) ("r-rlang" ,r-rlang) ("r-sjlabelled" ,r-sjlabelled) ("r-stringdist" ,r-stringdist) ("r-stringr" ,r-stringr) - ("r-tibble" ,r-tibble) - ("r-tidyr" ,r-tidyr) - ("r-tidyselect" ,r-tidyselect))) + ("r-tidyr" ,r-tidyr))) (home-page "https://github.com/strengejacke/sjmisc") (synopsis "Data and variable transformation functions") (description -- cgit v1.2.3 From 244a5c43ec0a140a7c06cde36af11c821e0f9dee Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:54:23 +0100 Subject: gnu: r-flextable: Update to 0.4.6. * gnu/packages/cran.scm (r-flextable): Update to 0.4.6. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 5afad23dd4..9f195cf416 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4896,14 +4896,14 @@ functions.") (define-public r-flextable (package (name "r-flextable") - (version "0.4.5") + (version "0.4.6") (source (origin (method url-fetch) (uri (cran-uri "flextable" version)) (sha256 (base32 - "09j2y0z7rkc0w1cl9pp1cpk6fnzzfr6245mxa3ca42z9k2cy2jfl")))) + "0fa42dvf0wyl91w4v0rywm3xgw9n03cfyl28ficrv8iabz4k4382")))) (build-system r-build-system) (propagated-inputs `(("r-gdtools" ,r-gdtools) -- cgit v1.2.3 From 3d6fa1a3ad2f7c5d473b45ad478e213c399f9f00 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:54:34 +0100 Subject: gnu: r-sessioninfo: Update to 1.1.1. * gnu/packages/cran.scm (r-sessioninfo): Update to 1.1.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9f195cf416..e24adb496f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6820,14 +6820,14 @@ Rcpp, RStudio projects, and more.") (define-public r-sessioninfo (package (name "r-sessioninfo") - (version "1.1.0") + (version "1.1.1") (source (origin (method url-fetch) (uri (cran-uri "sessioninfo" version)) (sha256 (base32 - "01c0m8yzadpwd825hky6as0f8ka4xyz7zfy0ih2iy7qqw11w6qn5")))) + "0j5f3l58fynxx3v0w62vqpii7miabszgljpja36xx9s8hikh8sqn")))) (build-system r-build-system) (propagated-inputs `(("r-cli" ,r-cli) -- cgit v1.2.3 From fc532b452f1cc23fe74749f9f6e1e3ed014e15f0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:54:42 +0100 Subject: gnu: r-remotes: Update to 2.0.2. * gnu/packages/cran.scm (r-remotes): Update to 2.0.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e24adb496f..dc7162beab 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6843,14 +6843,14 @@ more information about packages, and where they were installed from.") (define-public r-remotes (package (name "r-remotes") - (version "2.0.1") + (version "2.0.2") (source (origin (method url-fetch) (uri (cran-uri "remotes" version)) (sha256 (base32 - "1xkzlciv68jyf4j8hads0i47nxbgsy1kv7258c6zzyq66z0amhss")))) + "0rsjxmhwpr51ilsdjfqn06mj8yr2d7nckcn3arv1ljn23qfkpcxa")))) (build-system r-build-system) (home-page "https://github.com/r-lib/remotes#readme") (synopsis "R package installation from remote repositories") -- cgit v1.2.3 From 7466c3bb06c2e1162fe352815c26a5c2e514029b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:54:53 +0100 Subject: gnu: r-rcmdcheck: Update to 1.3.1. * gnu/packages/cran.scm (r-rcmdcheck): Update to 1.3.1. [propagated-inputs]: Add r-sessioninfo. --- gnu/packages/cran.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index dc7162beab..2521651bd1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6885,14 +6885,14 @@ directories or URLs with their associated programs.") (define-public r-rcmdcheck (package (name "r-rcmdcheck") - (version "1.3.0") + (version "1.3.1") (source (origin (method url-fetch) (uri (cran-uri "rcmdcheck" version)) (sha256 (base32 - "13liz9lmx9xgc0f7pjiz3sp8ygvazx2zslbiwz3p9fimfsx1yfsg")))) + "1ga19jqix0zs7xyz2j155zyagwbv22r6dgv55g6wdjigc67qfsix")))) (build-system r-build-system) (propagated-inputs `(("r-callr" ,r-callr) @@ -6904,6 +6904,7 @@ directories or URLs with their associated programs.") ("r-prettyunits" ,r-prettyunits) ("r-r6" ,r-r6) ("r-rprojroot" ,r-rprojroot) + ("r-sessioninfo" ,r-sessioninfo) ("r-withr" ,r-withr) ("r-xopen" ,r-xopen))) (home-page "https://github.com/r-Lib/rcmdcheck#readme") -- cgit v1.2.3 From a44f8b00fe0d0e1dd88c1d2f2f3e54bb04788b10 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:55:11 +0100 Subject: gnu: r-pander: Update to 0.6.3. * gnu/packages/cran.scm (r-pander): Update to 0.6.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2521651bd1..ec950ce0ac 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6941,14 +6941,14 @@ quick reporting.") (define-public r-pander (package (name "r-pander") - (version "0.6.2") + (version "0.6.3") (source (origin (method url-fetch) (uri (cran-uri "pander" version)) (sha256 (base32 - "0gd7rqkpbraznip8jmri9lqa8ajg1sryyplhd6m633wg91whiipi")))) + "1bd9sdghlsppmff18k5fg3i0visq9f4wc82rlhwq5m82bmgdgnyi")))) (build-system r-build-system) (propagated-inputs `(("r-digest" ,r-digest) -- cgit v1.2.3 From 600a25eb04dea83eaafb6dc6a7bee96f6004c86e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:55:21 +0100 Subject: gnu: r-mass: Update to 7.3-51.1. * gnu/packages/statistics.scm (r-mass): Update to 7.3-51.1. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 3ca0d01d35..39e6ae669a 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -339,14 +339,14 @@ D.V. Hinkley (1997, CUP), originally written by Angelo Canty for S.") (define-public r-mass (package (name "r-mass") - (version "7.3-51") + (version "7.3-51.1") (source (origin (method url-fetch) (uri (cran-uri "MASS" version)) (sha256 (base32 - "0yp5ssfm9mahrp30y1hkqgjg70mzs6w065ba8h7j5ky1z6msdsdy")))) + "14907ia8418mp3p1rs1i2f1x5b6kk5z998dk353a29j3xqf3ybyq")))) (properties `((upstream-name . "MASS"))) (build-system r-build-system) (home-page "http://www.stats.ox.ac.uk/pub/MASS4/") -- cgit v1.2.3 From 1966d8ffc733a6b2c6b6e95177040b79859a8f4d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:55:33 +0100 Subject: gnu: r-lattice: Update to 0.20-38. * gnu/packages/statistics.scm (r-lattice): Update to 0.20-38. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 39e6ae669a..be3bd07509 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -467,13 +467,13 @@ estimation) corresponding to the book: Wand, M.P. and Jones, M.C. (1995) (define-public r-lattice (package (name "r-lattice") - (version "0.20-35") + (version "0.20-38") (source (origin (method url-fetch) (uri (cran-uri "lattice" version)) (sha256 (base32 - "0pcnmaz3lr62ly0dcy5hnnqxshc4yqd43hrvlz3almgc9l7sna88")))) + "0b8abkz7syscq883mrgv63pkwaqkcpwfx8rgbqy9vgfva0z5xszx")))) (build-system r-build-system) (home-page "http://lattice.r-forge.r-project.org/") (synopsis "High-level data visualization system") -- cgit v1.2.3 From 83ca17d8e8713168b09d6ca84a94b0d73af19e80 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:55:43 +0100 Subject: gnu: r-matrix: Update to 1.2-15. * gnu/packages/statistics.scm (r-matrix): Update to 1.2-15. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index be3bd07509..82d3601e41 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -487,14 +487,14 @@ also flexible enough to handle most nonstandard requirements.") (define-public r-matrix (package (name "r-matrix") - (version "1.2-14") + (version "1.2-15") (source (origin (method url-fetch) (uri (cran-uri "Matrix" version)) (sha256 (base32 - "15hknim84nj3f54vkchca5ac0c3ip15v1by18k5parmn8wsl19j9")))) + "1mshhyia6imh939p8labxi0wv21lal7csmccxi42klpgdh1j89kv")))) (properties `((upstream-name . "Matrix"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 0de3ebb099ec0db59663582440de745a288a3170 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:55:51 +0100 Subject: gnu: r-survival: Update to 2.43-1. * gnu/packages/statistics.scm (r-survival): Update to 2.43-1. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 82d3601e41..a5e668fd17 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -614,14 +614,14 @@ analysis.") (define-public r-survival (package (name "r-survival") - (version "2.42-6") + (version "2.43-1") (source (origin (method url-fetch) (uri (cran-uri "survival" version)) (sha256 (base32 - "1bsxc2fir9pbvdzy9n474fkl7har606h9zhspp0z67wnjpp48g73")))) + "0220fjsq4ycx1n5zc5h39wdbj5j6xr8rzqbcixx2p25akzdn7kqk")))) (build-system r-build-system) (propagated-inputs `(("r-matrix" ,r-matrix))) -- cgit v1.2.3 From 9094eb892c486d0205d2ac860220fc324f8ea6a9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:56:01 +0100 Subject: gnu: r-roxygen2: Update to 6.1.1. * gnu/packages/statistics.scm (r-roxygen2): Update to 6.1.1. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index a5e668fd17..19b8048789 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2233,13 +2233,13 @@ tables, autolinks and strikethrough text.") (define-public r-roxygen2 (package (name "r-roxygen2") - (version "6.1.0") + (version "6.1.1") (source (origin (method url-fetch) (uri (cran-uri "roxygen2" version)) (sha256 (base32 - "0ji9k4s1bvfbl8wimfqj1lqr33h1claaz30vb5pgksxyg77j5xaa")))) + "0wq29ilqas8yn2z8v49fk0hbgchg29nmyyhwczgdipz0cbhbfipd")))) (build-system r-build-system) (propagated-inputs `(("r-brew" ,r-brew) -- cgit v1.2.3 From 466397c35b3f47fa44eef980848cda7fe13c5df4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:56:13 +0100 Subject: gnu: r-dt: Update to 0.5. * gnu/packages/statistics.scm (r-dt): Update to 0.5. [propagated-inputs]: Add r-promises. --- gnu/packages/statistics.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 19b8048789..780b963ec0 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3085,13 +3085,13 @@ using the multicore functionality of the parallel package.") (define-public r-dt (package (name "r-dt") - (version "0.4") + (version "0.5") (source (origin (method url-fetch) (uri (cran-uri "DT" version)) (sha256 (base32 - "06gsqz7p2fv6hc3fm3759gaa50krcfrqrmy7qbxyam6a36w9daix")))) + "1s5d3sld4l8zygpkvprvlbqa0pm2cv1bm7h7p999wxlap28vnnqf")))) (properties `((upstream-name . "DT"))) (build-system r-build-system) @@ -3099,7 +3099,8 @@ using the multicore functionality of the parallel package.") `(("r-crosstalk" ,r-crosstalk) ("r-htmltools" ,r-htmltools) ("r-htmlwidgets" ,r-htmlwidgets) - ("r-magrittr" ,r-magrittr))) + ("r-magrittr" ,r-magrittr) + ("r-promises" ,r-promises))) (home-page "http://rstudio.github.io/DT") (synopsis "R wrapper of the DataTables JavaScript library") (description -- cgit v1.2.3 From 1b3552310d664585a29c757b9b9623fddf43c878 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:56:32 +0100 Subject: gnu: r-tidyr: Update to 0.8.2. * gnu/packages/statistics.scm (r-tidyr): Update to 0.8.2. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 780b963ec0..6e43057e0d 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3666,14 +3666,14 @@ selection.") (define-public r-tidyr (package (name "r-tidyr") - (version "0.8.1") + (version "0.8.2") (source (origin (method url-fetch) (uri (cran-uri "tidyr" version)) (sha256 (base32 - "0485f19mkkglc4bv57y6bm6l9rfgd878hsz2xdg1nwgbqchjhgix")))) + "03s9dv6c2dj65a769h8fgy9878y46rdq7x65i53kd44kag80i9cr")))) (build-system r-build-system) (propagated-inputs `(("r-dplyr" ,r-dplyr) -- cgit v1.2.3 From 9bd78484a2cb2d766fa8053f000da88ea5d77c6d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:56:42 +0100 Subject: gnu: r-preprocesscore: Update to 1.44.0. * gnu/packages/statistics.scm (r-preprocesscore): Update to 1.44.0. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 6e43057e0d..e1a5d75d9d 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4032,14 +4032,14 @@ hierarchical clustering dendrograms.") (define-public r-preprocesscore (package (name "r-preprocesscore") - (version "1.42.0") + (version "1.44.0") (source (origin (method url-fetch) (uri (bioconductor-uri "preprocessCore" version)) (sha256 (base32 - "1afar1z7959v7mbzsqa77vqfh0yc7y3nv5ayx71485a8scwsfwbk")))) + "0ijyjqi8mxxf350dhvgp36swwww5ag7ac9a6r6ymihc5syjr4w4j")))) (properties `((upstream-name . "preprocessCore"))) (build-system r-build-system) -- cgit v1.2.3 From 00281ea3cd7dd1f4f9cc6a51b03dcc6a7f2b82d7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:56:51 +0100 Subject: gnu: r-modelmetrics: Update to 1.2.2. * gnu/packages/statistics.scm (r-modelmetrics): Update to 1.2.2. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index e1a5d75d9d..258daeac19 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5017,14 +5017,14 @@ decompositions of such matrices, and solutions of linear systems.") (define-public r-modelmetrics (package (name "r-modelmetrics") - (version "1.2.0") + (version "1.2.2") (source (origin (method url-fetch) (uri (cran-uri "ModelMetrics" version)) (sha256 (base32 - "1sgdyrf6fbsn18gk8slir4a1yhv133kfhyg2crfs759nff4aw89h")))) + "158ddbw2snlyzd2q6mdaif5i67kq4qfvadylwjxgv1w2cmszrmk6")))) (properties `((upstream-name . "ModelMetrics"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 090d4c0159eb9be5e7bcbfc5c58a0d41d6100122 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:57:03 +0100 Subject: gnu: r-annotate: Update to 1.60.0. * gnu/packages/bioinformatics.scm (r-annotate): Update to 1.60.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 1cf1de1ae5..79d85d9ff4 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6322,14 +6322,14 @@ data types as well.") (define-public r-annotate (package (name "r-annotate") - (version "1.58.0") + (version "1.60.0") (source (origin (method url-fetch) (uri (bioconductor-uri "annotate" version)) (sha256 (base32 - "1qmncyvy147a1ll3iri45p822kcs3s7583jfnq9jf6sz9ilk8cjf")))) + "0p6c96lay23a67dyirgnwzm2yw22m592z780vy6p4nqwla8ha18n")))) (build-system r-build-system) (propagated-inputs `(("r-annotationdbi" ,r-annotationdbi) -- cgit v1.2.3 From dadd682c536b2c63868196cf0c47883e72a8a2c0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:57:14 +0100 Subject: gnu: r-copynumber: Update to 1.22.0. * gnu/packages/bioinformatics.scm (r-copynumber): Update to 1.22.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 79d85d9ff4..97311f7ca0 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6349,13 +6349,13 @@ microarrays.") (define-public r-copynumber (package (name "r-copynumber") - (version "1.20.0") + (version "1.22.0") (source (origin (method url-fetch) (uri (bioconductor-uri "copynumber" version)) (sha256 (base32 - "0y9nnwb0psphp3ix88wj2f8z5gr45r5znf55w892ysm27isdpmms")))) + "0ipwj9i5p1bwhg5d80jdjagm02krpj2v0j47qdgw41h8wncdyal3")))) (build-system r-build-system) (propagated-inputs `(("r-s4vectors" ,r-s4vectors) -- cgit v1.2.3 From f4a95a0d15dba757302888731ba2beea0ece2346 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:57:25 +0100 Subject: gnu: r-geneplotter: Update to 1.60.0. * gnu/packages/bioinformatics.scm (r-geneplotter): Update to 1.60.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 97311f7ca0..a363fa83f9 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6372,14 +6372,14 @@ penalized least squares regression method.") (define-public r-geneplotter (package (name "r-geneplotter") - (version "1.58.0") + (version "1.60.0") (source (origin (method url-fetch) (uri (bioconductor-uri "geneplotter" version)) (sha256 (base32 - "055g28xgiazl4l0gkg8xiamks64f5yckjjyvw1abd6d6qjavwx0g")))) + "10khr0pznxf3m0f5gzck9ymljrwcv3vamfmpskd51yjh36lhllqz")))) (build-system r-build-system) (propagated-inputs `(("r-annotate" ,r-annotate) -- cgit v1.2.3 From 85fb33a05128463fc5d4531fd0d76e52e8a45711 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:57:37 +0100 Subject: gnu: r-genefilter: Update to 1.64.0. * gnu/packages/bioinformatics.scm (r-genefilter): Update to 1.64.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a363fa83f9..95e39435b7 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6397,14 +6397,14 @@ penalized least squares regression method.") (define-public r-genefilter (package (name "r-genefilter") - (version "1.62.0") + (version "1.64.0") (source (origin (method url-fetch) (uri (bioconductor-uri "genefilter" version)) (sha256 (base32 - "14l0ff02spmjwxj0m1czhg5vlkgwcfi73cym8m2n9vn6i7bjdaqi")))) + "0p64s1n1627yafnp25wjr4b22p34lqw574fx2qg4s1m0lffh1z6i")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) -- cgit v1.2.3 From b5c552e6542cbee3b94dd4177f5a5d0bcb60308c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:57:56 +0100 Subject: gnu: r-deseq2: Update to 1.22.1. * gnu/packages/bioinformatics.scm (r-deseq2): Update to 1.22.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 95e39435b7..37bbcfecd2 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6424,14 +6424,14 @@ high-throughput sequencing experiments.") (define-public r-deseq2 (package (name "r-deseq2") - (version "1.20.0") + (version "1.22.1") (source (origin (method url-fetch) (uri (bioconductor-uri "DESeq2" version)) (sha256 (base32 - "1wjnfpb41a9mmf9a22bz4zh7r1d4id50vpdc1mn5vfzrz7li9qik")))) + "1b2bmvcsfzvks47d7w46zplcwz0kgcdhx5xmx3x9lp2gvx2p84r5")))) (properties `((upstream-name . "DESeq2"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 856444a0a14dc9a6e2db5ee59918f3d97e8b5119 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:58:07 +0100 Subject: gnu: r-dexseq: Update to 1.28.0. * gnu/packages/bioinformatics.scm (r-dexseq): Update to 1.28.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 37bbcfecd2..b175e219dc 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6461,14 +6461,14 @@ distribution.") (define-public r-dexseq (package (name "r-dexseq") - (version "1.26.0") + (version "1.28.0") (source (origin (method url-fetch) (uri (bioconductor-uri "DEXSeq" version)) (sha256 (base32 - "1mqb3mdxcsi3largsl7k27bvqrgps9ixv806xvmf29pw0xn05sg1")))) + "0jh1640cnzpk8x3155cqc8dvrs1rciw3d6nv2k70baw96bhrynp8")))) (properties `((upstream-name . "DEXSeq"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 2ff6604a531e06095432ab497b5efd1fb671c37d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:58:17 +0100 Subject: gnu: r-annotationforge: Update to 1.24.0. * gnu/packages/bioinformatics.scm (r-annotationforge): Update to 1.24.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b175e219dc..5a72f1c41b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6504,14 +6504,14 @@ exploration of the results.") (define-public r-annotationforge (package (name "r-annotationforge") - (version "1.22.2") + (version "1.24.0") (source (origin (method url-fetch) (uri (bioconductor-uri "AnnotationForge" version)) (sha256 (base32 - "17kmy7nvpyyj6w5jyrjciw87rydmmmc8q6cnwqjv1j7li9bp09gr")))) + "13yvhf3yskmvhs8szs6rkw93h81h5xqa3h19h91pp6nprhc8s3ll")))) (properties `((upstream-name . "AnnotationForge"))) (build-system r-build-system) -- cgit v1.2.3 From 19a6149190e1eed5216ec9ffcb5170994d8f2572 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:58:31 +0100 Subject: gnu: r-rbgl: Update to 1.58.0. * gnu/packages/bioinformatics.scm (r-rbgl): Update to 1.58.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 5a72f1c41b..f10189f9c6 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6534,14 +6534,14 @@ databases. Packages produced are intended to be used with AnnotationDbi.") (define-public r-rbgl (package (name "r-rbgl") - (version "1.56.0") + (version "1.58.0") (source (origin (method url-fetch) (uri (bioconductor-uri "RBGL" version)) (sha256 (base32 - "0hj972mmqpyi5fx1rq33kysavdyz4nspi6gcffzi3rv339m0anhf")))) + "0jy95m38c4qp0a12097hhm2gg63k96k6ydhb11dy379h3ziapcar")))) (properties `((upstream-name . "RBGL"))) (build-system r-build-system) (propagated-inputs `(("r-graph" ,r-graph))) -- cgit v1.2.3 From 6dfb0b25ae4bdce3ebd3578cc5a3028670504082 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:58:43 +0100 Subject: gnu: r-gseabase: Update to 1.44.0. * gnu/packages/bioinformatics.scm (r-gseabase): Update to 1.44.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index f10189f9c6..555d4aebb8 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6555,14 +6555,14 @@ the graph algorithms contained in the Boost library.") (define-public r-gseabase (package (name "r-gseabase") - (version "1.42.0") + (version "1.44.0") (source (origin (method url-fetch) (uri (bioconductor-uri "GSEABase" version)) (sha256 (base32 - "11bv92svik399q677jv96b71i4bq68xxyxn1yijpdik2lq4hgl7a")))) + "110al7x0ig8plzrprvhwc7xshi1jzpj2n8llhhg2fh6v6k0k6awr")))) (properties `((upstream-name . "GSEABase"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 95ae5acc89d2a609794f2e7cd43a895d28a74193 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:58:53 +0100 Subject: gnu: r-category: Update to 2.48.0. * gnu/packages/bioinformatics.scm (r-category): Update to 2.48.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 555d4aebb8..f8f9102716 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6582,14 +6582,14 @@ Enrichment Analysis} (GSEA).") (define-public r-category (package (name "r-category") - (version "2.46.0") + (version "2.48.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Category" version)) (sha256 (base32 - "03wfqa8d1dgwsm327zl2mpkq7dq3mzhq12598qz3ylfhrwplbgx0")))) + "1jdm83bwdfhpfm1y6hwgvxzj6l83h1bdkqv23799kzywnwm016kv")))) (properties `((upstream-name . "Category"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 4a4b5b8537914e7fa5394b4b7f2891e772a0443a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:59:04 +0100 Subject: gnu: r-gostats: Update to 2.48.0. * gnu/packages/bioinformatics.scm (r-gostats): Update to 2.48.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index f8f9102716..b97710e35a 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6613,14 +6613,14 @@ analysis.") (define-public r-gostats (package (name "r-gostats") - (version "2.46.0") + (version "2.48.0") (source (origin (method url-fetch) (uri (bioconductor-uri "GOstats" version)) (sha256 (base32 - "1i5mydz5d95w2k28qr9j01hmbnl2id55jq94jvcpcyp1pvinkdq0")))) + "0wlqqgfynwqnqhckhsfjwg9zkj6hkmzwd5y76dhqz720vy21rcln")))) (properties `((upstream-name . "GOstats"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 9adf78c21ee51bde525d56777641aa245f88d3ef Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:59:16 +0100 Subject: gnu: r-shortread: Update to 1.40.0. * gnu/packages/bioinformatics.scm (r-shortread): Update to 1.40.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b97710e35a..c55dd08708 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6644,14 +6644,14 @@ testing and other simple calculations.") (define-public r-shortread (package (name "r-shortread") - (version "1.38.0") + (version "1.40.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ShortRead" version)) (sha256 (base32 - "038z3z7qaw5bpgjzy91sjkybsny6jwjjsrnnq4gdqdw9ss1qy1fb")))) + "0iks123i1adkb9i2q4wvfqdmmj9dy867jvngj9757y8gj6xbcpy1")))) (properties `((upstream-name . "ShortRead"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From bf25930cf65021e93f6215239cb0001289fb0313 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:59:27 +0100 Subject: gnu: r-systempiper: Update to 1.16.0. * gnu/packages/bioinformatics.scm (r-systempiper): Update to 1.16.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index c55dd08708..f2a29e6935 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6686,14 +6686,14 @@ ungapped alignment formats.") (define-public r-systempiper (package (name "r-systempiper") - (version "1.14.0") + (version "1.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "systemPipeR" version)) (sha256 (base32 - "1550pd63mmky0vgkmpni7zf14kqz1741wv63nfaw29kcmhh3m5lm")))) + "0l26q8zjdmzg84g7f25gv9z60sykybahlpg5bg9bmpbg5lzcsx04")))) (properties `((upstream-name . "systemPipeR"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 5c996cab4cd0d1265b3baa624fd9ab529a013145 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:59:42 +0100 Subject: gnu: r-grohmm: Update to 1.16.0. * gnu/packages/bioinformatics.scm (r-grohmm): Update to 1.16.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index f2a29e6935..e7c6eca968 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6732,14 +6732,14 @@ annotation infrastructure.") (define-public r-grohmm (package (name "r-grohmm") - (version "1.14.0") + (version "1.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "groHMM" version)) (sha256 (base32 - "1kjb14apyly44qdlx2ld6gr69wlazd4mbhs58l35hir12aphgrzp")))) + "1ph92fv44b90v7mk4b1mjvv0dlrhl8ba01klxbnd0vs4qn9zxplh")))) (properties `((upstream-name . "groHMM"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 2f28ffd81d72307fb3ddf775662c74bac92101a5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 11:59:53 +0100 Subject: gnu: r-biocgenerics: Update to 0.28.0. * gnu/packages/bioinformatics.scm (r-biocgenerics): Update to 0.28.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index e7c6eca968..5dac828de1 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7051,13 +7051,13 @@ barplots or heatmaps.") (define-public r-biocgenerics (package (name "r-biocgenerics") - (version "0.26.0") + (version "0.28.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocGenerics" version)) (sha256 (base32 - "19qxhy2cd3pykkhzbb5q3crgaxf65cpzf2mkfsz16gqhi8flj72p")))) + "0cvpsrhg7sn7lpqgxvqrsagv6j7xj5rafq5xdjfd8zc4gxrs5rb8")))) (properties `((upstream-name . "BiocGenerics"))) (build-system r-build-system) -- cgit v1.2.3 From 36d7d823a43c77001f39aaceeac27e4b5a7c1563 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:00:06 +0100 Subject: gnu: r-biocinstaller: Update to 1.32.1. * gnu/packages/bioinformatics.scm (r-biocinstaller): Update to 1.32.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 5dac828de1..b912e9a999 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7071,13 +7071,13 @@ packages.") (define-public r-biocinstaller (package (name "r-biocinstaller") - (version "1.30.0") + (version "1.32.1") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocInstaller" version)) (sha256 (base32 - "1xg1gi1hf5vflp71ji21gnmr4kcjpx8a6c47cllpc7yqnjv5nfg0")))) + "1s1f9qhyf3mc73ir25x2zlgi9hf45a37lg4z8fbva4i21hqisgsl")))) (properties `((upstream-name . "BiocInstaller"))) (build-system r-build-system) -- cgit v1.2.3 From c8dbb5fa7f332b40058538fb91a97b4fba8b51b4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:00:23 +0100 Subject: gnu: r-biocviews: Update to 1.50.1. * gnu/packages/bioinformatics.scm (r-biocviews): Update to 1.50.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b912e9a999..a66c908edc 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7090,13 +7090,13 @@ Bioconductor, CRAN, and Github.") (define-public r-biocviews (package (name "r-biocviews") - (version "1.48.3") + (version "1.50.1") (source (origin (method url-fetch) (uri (bioconductor-uri "biocViews" version)) (sha256 (base32 - "1rxvwikqivsgxjjcazlszy8xgz346lfh5rw4llxw6fz38fjgb0k5")))) + "0hjm3r58i0r9qhyar9pk250cx7sfijg0lnvi12a9s6brmmbip1a3")))) (properties `((upstream-name . "biocViews"))) (build-system r-build-system) -- cgit v1.2.3 From 6087f5ce3745d9f1c92c64fbb5f86c587abe9661 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:00:36 +0100 Subject: gnu: r-biocstyle: Update to 2.10.0. * gnu/packages/bioinformatics.scm (r-biocstyle): Update to 2.10.0. [propagated-inputs]: Add biocmanager. --- gnu/packages/bioinformatics.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a66c908edc..31ded7cec3 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7140,19 +7140,20 @@ authoring books and technical documents with R Markdown.") (define-public r-biocstyle (package - (name "r-biocstyle") - (version "2.8.2") + (name "r-biocstyle") + (version "2.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocStyle" version)) (sha256 (base32 - "17m901ylz00w1a3nq5f910v55zixm1nr6rb3qrsbhqd94qzr0l2p")))) + "01lm8xljilj666fcl3wnw82dxkcxnlr294lddr553rm8xr5nwg31")))) (properties `((upstream-name . "BiocStyle"))) (build-system r-build-system) (propagated-inputs - `(("r-bookdown" ,r-bookdown) + `(("r-biocmanager" ,r-biocmanager) + ("r-bookdown" ,r-bookdown) ("r-knitr" ,r-knitr) ("r-rmarkdown" ,r-rmarkdown) ("r-yaml" ,r-yaml))) -- cgit v1.2.3 From a127d3522ad0a9c17c7ced74d15f4309d2fe22f3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:01:03 +0100 Subject: gnu: r-bioccheck: Update to 1.18.0. * gnu/packages/bioinformatics.scm (r-bioccheck): Update to 1.18.0. [propagated-inputs]: Add r-knitr and r-biocmanager; remove r-biocinstaller. --- gnu/packages/bioinformatics.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 31ded7cec3..2806fe60ba 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7167,13 +7167,13 @@ functionality.") (define-public r-bioccheck (package (name "r-bioccheck") - (version "1.16.0") + (version "1.18.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocCheck" version)) (sha256 (base32 - "1srp1g809f1nn0fyqknr7r6dq89bw1xpjvmygr7cw6ffknbc671s")))) + "0zamvs5jar38293ff27imvwy0ra25y64ls9z8w3q1y4jcp8p8pg7")))) (properties `((upstream-name . "BiocCheck"))) (build-system r-build-system) @@ -7200,8 +7200,9 @@ functionality.") `(("r-codetools" ,r-codetools) ("r-graph" ,r-graph) ("r-httr" ,r-httr) + ("r-knitr" ,r-knitr) ("r-optparse" ,r-optparse) - ("r-biocinstaller" ,r-biocinstaller) + ("r-biocmanager" ,r-biocmanager) ("r-biocviews" ,r-biocviews) ("r-stringdist" ,r-stringdist))) (home-page "https://bioconductor.org/packages/BiocCheck") -- cgit v1.2.3 From 70f2758f71149ca3b58e12c2b7a3b4eb332a4a2a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:01:37 +0100 Subject: gnu: r-dnacopy: Update to 1.56.0. * gnu/packages/bioinformatics.scm (r-dnacopy): Update to 1.56.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 2806fe60ba..1a49f95e1f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7237,13 +7237,13 @@ that accept short and long options.") (define-public r-dnacopy (package (name "r-dnacopy") - (version "1.54.0") + (version "1.56.0") (source (origin (method url-fetch) (uri (bioconductor-uri "DNAcopy" version)) (sha256 (base32 - "03hfhmmc5y60r2gcgm367w2fr7qj115l74m9bp3h9qpn5yci0d8n")))) + "04cqdqxhva66xwh1s2vffi56b9fcrqd4slcrvqasj5lp2rkjli82")))) (properties `((upstream-name . "DNAcopy"))) (build-system r-build-system) -- cgit v1.2.3 From a037453554b05e799f6dbf08ec10ee84c8c20894 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:01:52 +0100 Subject: gnu: r-s4vectors: Update to 0.20.0. * gnu/packages/bioinformatics.scm (r-s4vectors): Update to 0.20.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 1a49f95e1f..df07843c55 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7259,13 +7259,13 @@ abnormal copy number.") (define-public r-s4vectors (package (name "r-s4vectors") - (version "0.18.3") + (version "0.20.0") (source (origin (method url-fetch) (uri (bioconductor-uri "S4Vectors" version)) (sha256 (base32 - "02bps2rpjqx2npwxq3x62ncwi9ggr165cwi56h6hld28bw2gddy8")))) + "0qgiykjhnsvvpcp3zwmrnpx3bv3msvj0szchyvb1yb0fxw716xc5")))) (properties `((upstream-name . "S4Vectors"))) (build-system r-build-system) -- cgit v1.2.3 From 9a8dd5197982a76a511af37454e9f5eddd125daa Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:02:08 +0100 Subject: gnu: r-iranges: Update to 2.16.0. * gnu/packages/bioinformatics.scm (r-iranges): Update to 2.16.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index df07843c55..41a0373fab 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7311,13 +7311,13 @@ utilities for sequence data management under the ACNUC system.") (define-public r-iranges (package (name "r-iranges") - (version "2.14.12") + (version "2.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "IRanges" version)) (sha256 (base32 - "1ar8sqqgjdy00dbgrxnacqy6gwir5xax76yf0vjxi2vj2skqb0kn")))) + "0ljppsk611xi72gc8mbdx1311b63b1ijd401jz5xmxk5frla1nc1")))) (properties `((upstream-name . "IRanges"))) (build-system r-build-system) -- cgit v1.2.3 From 12871693feedf5315d0c4fe78ea444abd8a9dc02 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:02:19 +0100 Subject: gnu: r-genomeinfodb: Update to 1.18.0. * gnu/packages/bioinformatics.scm (r-genomeinfodb): Update to 1.18.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 41a0373fab..923b1ae7c9 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7363,13 +7363,13 @@ ID and species. It is used by functions in the GenomeInfoDb package.") (define-public r-genomeinfodb (package (name "r-genomeinfodb") - (version "1.16.0") + (version "1.18.0") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomeInfoDb" version)) (sha256 (base32 - "0yhnqhaydmmq7ihmhj3rbal4afq5p993l2qqrd0n5wmbyg7glg2d")))) + "1xqpgngd8by0yn627v9kz26a03v5a1lhcfwlnx2i0ivplk9bd40s")))) (properties `((upstream-name . "GenomeInfoDb"))) (build-system r-build-system) -- cgit v1.2.3 From 08cd2d5b59f1c58aa557ab1dcf9060247b4b88ef Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:02:33 +0100 Subject: gnu: r-edger: Update to 3.24.0. * gnu/packages/bioinformatics.scm (r-edger): Update to 3.24.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 923b1ae7c9..722d037463 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7391,13 +7391,13 @@ names in their natural, rather than lexicographic, order.") (define-public r-edger (package (name "r-edger") - (version "3.22.5") + (version "3.24.0") (source (origin (method url-fetch) (uri (bioconductor-uri "edgeR" version)) (sha256 (base32 - "0pkcdkh8mwdaca6xa8a7vwdfh46r03rkxwkrf17pwwd4557j7lj7")))) + "0ihihgzrgb4q3xc8xkzp1v76ndgihrj4gas00fa25vggfs1v6hvg")))) (properties `((upstream-name . "edgeR"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From ca2945c3160b68f593e3d61571934a3a4365febb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:02:44 +0100 Subject: gnu: r-variantannotation: Update to 1.28.1. * gnu/packages/bioinformatics.scm (r-variantannotation): Update to 1.28.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 722d037463..85e2155d50 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7419,13 +7419,13 @@ CAGE.") (define-public r-variantannotation (package (name "r-variantannotation") - (version "1.26.1") + (version "1.28.1") (source (origin (method url-fetch) (uri (bioconductor-uri "VariantAnnotation" version)) (sha256 (base32 - "1r55ki951dj81qvy73knfcy69ik5vzkd56wnk3f6vvf9vngqb8jr")))) + "0gvah258mkaafhbna81zwknx8qr3lidbcx5qvwk39q3yswr9mi49")))) (properties `((upstream-name . "VariantAnnotation"))) (inputs -- cgit v1.2.3 From 78d2ffdc73e1e26261aee1b4a352356247f28690 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:02:55 +0100 Subject: gnu: r-limma: Update to 3.38.2. * gnu/packages/bioinformatics.scm (r-limma): Update to 3.38.2. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 85e2155d50..621cdf0c13 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7457,13 +7457,13 @@ coding changes and predict coding outcomes.") (define-public r-limma (package (name "r-limma") - (version "3.36.5") + (version "3.38.2") (source (origin (method url-fetch) (uri (bioconductor-uri "limma" version)) (sha256 (base32 - "0d13w95si7l6fqfsdf6k50v4l573hhfva6mvd94v26iba24p2f6x")))) + "1wkh362rmn24q7bkinb6nx62a31wl3r3myg5l326gx65wpwdnx97")))) (build-system r-build-system) (home-page "http://bioinf.wehi.edu.au/limma") (synopsis "Package for linear models for microarray and RNA-seq data") -- cgit v1.2.3 From fb10fb72ba83a16a907e8607f1c97d1ad5fa4011 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:03:06 +0100 Subject: gnu: r-xvector: Update to 0.22.0. * gnu/packages/bioinformatics.scm (r-xvector): Update to 0.22.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 621cdf0c13..a169183e5c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7476,13 +7476,13 @@ different technologies, including microarrays, RNA-seq, and quantitative PCR.") (define-public r-xvector (package (name "r-xvector") - (version "0.20.0") + (version "0.22.0") (source (origin (method url-fetch) (uri (bioconductor-uri "XVector" version)) (sha256 (base32 - "1zjlhh9lsyhg0js1858csyw2389kbrzdqnqnha833wazkwxilp3f")))) + "01fph1ydd6g0rl5mcw54spx22glq2kqv7wyw8bqw0plmabzcwwdm")))) (properties `((upstream-name . "XVector"))) (build-system r-build-system) -- cgit v1.2.3 From 8d3906a95f8e111322469578685859ba8afb46d0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:03:18 +0100 Subject: gnu: r-genomicranges: Update to 1.34.0. * gnu/packages/bioinformatics.scm (r-genomicranges): Update to 1.34.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a169183e5c..50e6e1e5c8 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7512,13 +7512,13 @@ different technologies, including microarrays, RNA-seq, and quantitative PCR.") (define-public r-genomicranges (package (name "r-genomicranges") - (version "1.32.7") + (version "1.34.0") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicRanges" version)) (sha256 (base32 - "1lh54asabrmk982636avpp1kcfzakwxi31cbj3jc8mkhar1mkyrx")))) + "0bgh14d15dpf2iy36qinw45r6n45rqkf0ghazrdl3jfva6vbrb29")))) (properties `((upstream-name . "GenomicRanges"))) (build-system r-build-system) -- cgit v1.2.3 From 5b82e12a99611223f1b432d4300ddd2ae8d7372d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:03:44 +0100 Subject: gnu: r-biobase: Update to 2.42.0. * gnu/packages/bioinformatics.scm (r-biobase): Update to 2.42.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 50e6e1e5c8..6603dfa83d 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7541,13 +7541,13 @@ manipulating genomic intervals and variables defined along a genome.") (define-public r-biobase (package (name "r-biobase") - (version "2.40.0") + (version "2.42.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Biobase" version)) (sha256 (base32 - "1iwds2a5ir29k19dbpynlc7nn836cw2gamchhgpi2jf2xar9m9jz")))) + "10nr6nrkj5vlq8hsgbhbhv669z0dbpz4m3vz9k32rx1czbrrqwin")))) (properties `((upstream-name . "Biobase"))) (build-system r-build-system) -- cgit v1.2.3 From 3986e0dee5ac064f4392f7591f39387e93ff9b4a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:03:56 +0100 Subject: gnu: r-annotationdbi: Update to 1.44.0. * gnu/packages/bioinformatics.scm (r-annotationdbi): Update to 1.44.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 6603dfa83d..1b2119e605 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7563,13 +7563,13 @@ on Bioconductor or which replace R functions.") (define-public r-annotationdbi (package (name "r-annotationdbi") - (version "1.42.1") + (version "1.44.0") (source (origin (method url-fetch) (uri (bioconductor-uri "AnnotationDbi" version)) (sha256 (base32 - "0afkbzli08vq02r2pr9phrz3rxd6ilp1w7yw8y99nbjiz14f8b1c")))) + "1954vimkx5yb9irppq8vssq0f3yjkg36w38b9r0rqmijx1ps7x5d")))) (properties `((upstream-name . "AnnotationDbi"))) (build-system r-build-system) -- cgit v1.2.3 From 3359d44210a704df85ec0d8849428b73c862e89d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:04:09 +0100 Subject: gnu: r-biomart: Update to 2.38.0. * gnu/packages/bioinformatics.scm (r-biomart): Update to 2.38.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 1b2119e605..0f32c52fb7 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7590,13 +7590,13 @@ annotation data packages using SQLite data storage.") (define-public r-biomart (package (name "r-biomart") - (version "2.36.1") + (version "2.38.0") (source (origin (method url-fetch) (uri (bioconductor-uri "biomaRt" version)) (sha256 (base32 - "0b70s350ffc74v3xz5c3jpazr9zxdb7gjmjfj7aghlsrizrspill")))) + "1lshkknp7dmr3p6dd2zbv86cc71h53ggh9ji83jcjym8sgbbspl2")))) (properties `((upstream-name . "biomaRt"))) (build-system r-build-system) -- cgit v1.2.3 From cd8828918f68b624c32bcdc3b3c5475a23a79824 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:04:21 +0100 Subject: gnu: r-biocparallel: Update to 1.16.0. * gnu/packages/bioinformatics.scm (r-biocparallel): Update to 1.16.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 0f32c52fb7..ca66cf8fc6 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7623,13 +7623,13 @@ powerful online queries from gene annotation to database mining.") (define-public r-biocparallel (package (name "r-biocparallel") - (version "1.14.2") + (version "1.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocParallel" version)) (sha256 (base32 - "1llb5a62hn4yxpdgqdh2l7i5zd06mjkk8hagsna69cq65wv6iifm")))) + "0g16cy0vjapqkb188z63r1b6y96m9g8vx0a3v2qavzxc177k0cja")))) (properties `((upstream-name . "BiocParallel"))) (build-system r-build-system) -- cgit v1.2.3 From 4804c59227643b51ebd063a9e15ec74dc5fee39e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:04:33 +0100 Subject: gnu: r-biostrings: Update to 2.50.0. * gnu/packages/bioinformatics.scm (r-biostrings): Update to 2.50.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index ca66cf8fc6..5d8d8a4800 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7648,13 +7648,13 @@ objects.") (define-public r-biostrings (package (name "r-biostrings") - (version "2.48.0") + (version "2.50.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Biostrings" version)) (sha256 (base32 - "118b490jk87ydigm6ln25ms4kskzkw0akmh77clzznhzpqnxsi6j")))) + "0zw0dj67fnpbz4iqnam5fxs92c1c8w8d7mzl0rkq4ksx0xl8vgg7")))) (properties `((upstream-name . "Biostrings"))) (build-system r-build-system) -- cgit v1.2.3 From 7f3778eb06c73ca52455ae421b8a12a6fd6b63fe Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:04:45 +0100 Subject: gnu: r-rsamtools: Update to 1.34.0. * gnu/packages/bioinformatics.scm (r-rsamtools): Update to 1.34.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 5d8d8a4800..56e3c6d6e7 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7674,13 +7674,13 @@ biological sequences or sets of sequences.") (define-public r-rsamtools (package (name "r-rsamtools") - (version "1.32.3") + (version "1.34.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Rsamtools" version)) (sha256 (base32 - "1hpjr22h33pf4fgv0sj83rqzv6l5l7s6fpmmqvchh45ikks1mnhq")))) + "01v4bjhj2i126pwyk0v9lvmfp2ih495xsq903k3xa2z24bjxphbi")))) (properties `((upstream-name . "Rsamtools"))) (build-system r-build-system) -- cgit v1.2.3 From de4c38f80b9ee38ea3565d6b3e501d48015d9581 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:04:56 +0100 Subject: gnu: r-delayedarray: Update to 0.8.0. * gnu/packages/bioinformatics.scm (r-delayedarray): Update to 0.8.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 56e3c6d6e7..8fadbfddd1 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7718,13 +7718,13 @@ files.") (define-public r-delayedarray (package (name "r-delayedarray") - (version "0.6.6") + (version "0.8.0") (source (origin (method url-fetch) (uri (bioconductor-uri "DelayedArray" version)) (sha256 (base32 - "0rkp0mfsq3wfnib389dh3i44ab0wiz8skkjcv4596dwgq50jqpf2")))) + "0cl5anqkjwvqx19snjhz0zj8cp8ibckiifl28h821h50g62nvb2f")))) (properties `((upstream-name . "DelayedArray"))) (build-system r-build-system) -- cgit v1.2.3 From 9fd4350e5a698cc5090a230355db1a4ed73807f6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:05:07 +0100 Subject: gnu: r-summarizedexperiment: Update to 1.12.0. * gnu/packages/bioinformatics.scm (r-summarizedexperiment): Update to 1.12.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 8fadbfddd1..31aa7eb650 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7749,13 +7749,13 @@ array-like objects like @code{DataFrame} objects (typically with Rle columns), (define-public r-summarizedexperiment (package (name "r-summarizedexperiment") - (version "1.10.1") + (version "1.12.0") (source (origin (method url-fetch) (uri (bioconductor-uri "SummarizedExperiment" version)) (sha256 (base32 - "0v3zxl9cqsv79ag5cnvzlhvgaz5cr8f4rn7flmwnwpqd508cznl1")))) + "07805572xhpj5mfwq6kw1ha21wgalqvhh4ydvafyl1bnf3r20vps")))) (properties `((upstream-name . "SummarizedExperiment"))) (build-system r-build-system) -- cgit v1.2.3 From 52b95337e88e28f08e942923957b494b212a2852 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:05:18 +0100 Subject: gnu: r-genomicalignments: Update to 1.18.0. * gnu/packages/bioinformatics.scm (r-genomicalignments): Update to 1.18.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 31aa7eb650..c76c3b461c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7780,13 +7780,13 @@ samples.") (define-public r-genomicalignments (package (name "r-genomicalignments") - (version "1.16.0") + (version "1.18.0") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicAlignments" version)) (sha256 (base32 - "00pi2cnkkbj2023fg2x2cmglkdalwzy1vr3glsikwz7ix9yylcaw")))) + "0a3zhwripfw2508fvgx3wzqa8nq8vnslg97a911znpwvxh53jl24")))) (properties `((upstream-name . "GenomicAlignments"))) (build-system r-build-system) -- cgit v1.2.3 From c5f1d1ce80b185e1fb2801afaee1237253b31a8f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:05:42 +0100 Subject: gnu: r-rtracklayer: Update to 1.42.0. * gnu/packages/bioinformatics.scm (r-rtracklayer): Update to 1.42.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index c76c3b461c..76c441def6 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7813,13 +7813,13 @@ alignments.") (define-public r-rtracklayer (package (name "r-rtracklayer") - (version "1.40.6") + (version "1.42.0") (source (origin (method url-fetch) (uri (bioconductor-uri "rtracklayer" version)) (sha256 (base32 - "1wxxxlyps19dw3i0pw4mlm3kinnswsc35rgvlnbwvpnpjbca6w4l")))) + "0a4mhd926w9slkfil5xgngjsfdj024a4w57w2bm3d4r0pj8y5da7")))) (build-system r-build-system) (arguments `(#:phases -- cgit v1.2.3 From 8a0d57d26eafbfc3663c617153fb8efa1f183723 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:05:53 +0100 Subject: gnu: r-genomicfeatures: Update to 1.34.1. * gnu/packages/bioinformatics.scm (r-genomicfeatures): Update to 1.34.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 76c441def6..17845cf90b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7860,13 +7860,13 @@ as well as query and modify the browser state, such as the current viewport.") (define-public r-genomicfeatures (package (name "r-genomicfeatures") - (version "1.32.3") + (version "1.34.1") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicFeatures" version)) (sha256 (base32 - "06prj5iih3ywsgq00lgfl29p3f8j23a0kqqhzhqcgjrrwsp94588")))) + "0slq6hv5bmc3bgrl824jzmr6db3fvaj6b7ihwmdn76pgqqbq2fq6")))) (properties `((upstream-name . "GenomicFeatures"))) (build-system r-build-system) -- cgit v1.2.3 From 44fa14dfa38ca5dc2c84d3c79e38cb7d2595e707 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:06:06 +0100 Subject: gnu: r-topgo: Update to 2.34.0. * gnu/packages/bioinformatics.scm (r-topgo): Update to 2.34.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 17845cf90b..9b36603d24 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7925,13 +7925,13 @@ information about the latest version of the Gene Ontologies.") (define-public r-topgo (package (name "r-topgo") - (version "2.32.0") + (version "2.34.0") (source (origin (method url-fetch) (uri (bioconductor-uri "topGO" version)) (sha256 (base32 - "05yxnkid8bgw9lkm90if9fg63djhgvbailfa3qsfqa5c0zjmixw1")))) + "1j1jcd16j564kr6qz28140fzmnh9xasi84v1c1fi98sqv30zq9bh")))) (properties `((upstream-name . "topGO"))) (build-system r-build-system) -- cgit v1.2.3 From 78ecdbc00a5f8d9b0f430e7045206959aabcc9f9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:06:18 +0100 Subject: gnu: r-bsgenome: Update to 1.50.0. * gnu/packages/bioinformatics.scm (r-bsgenome): Update to 1.50.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9b36603d24..fab8723369 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7958,13 +7958,13 @@ dependencies between GO terms can be implemented and applied.") (define-public r-bsgenome (package (name "r-bsgenome") - (version "1.48.0") + (version "1.50.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BSgenome" version)) (sha256 (base32 - "1rk2piqq5dppkd51ln3r872d7ng3rvq98071mnd0xdv2xwnyn5g8")))) + "07z4zxx0khrc86qqvc7vxww8df9fh6pyks9ajxkc9gdqr5nn79j7")))) (properties `((upstream-name . "BSgenome"))) (build-system r-build-system) -- cgit v1.2.3 From d11bc259a80c6631be3ec4cab971f0cb9f4f2945 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:06:30 +0100 Subject: gnu: r-impute: Update to 1.56.0. * gnu/packages/bioinformatics.scm (r-impute): Update to 1.56.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index fab8723369..5d00589af3 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8019,13 +8019,13 @@ genome data packages and support for efficient SNP representation.") (define-public r-impute (package (name "r-impute") - (version "1.54.0") + (version "1.56.0") (source (origin (method url-fetch) (uri (bioconductor-uri "impute" version)) (sha256 (base32 - "1d3cpfaqlq2gnb3hsc2yhxwkrnbd7m6ifif32yp0ya0jr5brl4hr")))) + "08z0pj1dz5iq967nwj67qyka7ir7m5an2ggv7bsrlz3apzfsla33")))) (inputs `(("gfortran" ,gfortran))) (build-system r-build-system) -- cgit v1.2.3 From 45ba2caedbc100600c99a27fa448ccceec57ea3b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:06:41 +0100 Subject: gnu: r-seqpattern: Update to 1.14.0. * gnu/packages/bioinformatics.scm (r-seqpattern): Update to 1.14.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 5d00589af3..b8dbe63065 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8039,13 +8039,13 @@ microarray data, using nearest neighbor averaging.") (define-public r-seqpattern (package (name "r-seqpattern") - (version "1.12.0") + (version "1.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "seqPattern" version)) (sha256 (base32 - "0dw0yldfcf0ibvpqxlpx1ijnjf9lma47w9w22siszzhw09i0wp3w")))) + "0di83qi83mrlw7i12khsq55d03hlazcywaa9m9pki1sfhafpq733")))) (properties `((upstream-name . "seqPattern"))) (build-system r-build-system) -- cgit v1.2.3 From c5b0815c444b0d31e7495b09be88a0c25454b137 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:06:53 +0100 Subject: gnu: r-genomation: Update to 1.14.0. * gnu/packages/bioinformatics.scm (r-genomation): Update to 1.14.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b8dbe63065..c9221b2e8a 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8066,13 +8066,13 @@ reference point and sorted by a user defined feature.") (define-public r-genomation (package (name "r-genomation") - (version "1.12.0") + (version "1.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "genomation" version)) (sha256 (base32 - "1vdmdyrq0n7pf8cvy2950v7hrcrcbd9zl4fg7dcmyly3iiwdyirp")))) + "0g0v4alfpqlinqinjnyzl3mrjnpbdx9ri34mcaiqbvbvg8ic8wvg")))) (build-system r-build-system) (propagated-inputs `(("r-biostrings" ,r-biostrings) -- cgit v1.2.3 From 34f1c60c784a9461d5b5c839fda919ea45ad64c4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:07:04 +0100 Subject: gnu: r-seqlogo: Update to 1.48.0. * gnu/packages/bioinformatics.scm (r-seqlogo): Update to 1.48.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index c9221b2e8a..5dcf3568e3 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8244,14 +8244,14 @@ annotations for the genome of the model mouse Mus musculus.") (define-public r-seqlogo (package (name "r-seqlogo") - (version "1.46.0") + (version "1.48.0") (source (origin (method url-fetch) (uri (bioconductor-uri "seqLogo" version)) (sha256 (base32 - "16xvqcdknix9vjm8mrixi6nyfsr45jm844jh1x90m8044lwrsic1")))) + "022vr9ydwcivs7rw7kwj73gfk5gc7ckwa1q66vhd4kw9ylh70v68")))) (properties `((upstream-name . "seqLogo"))) (build-system r-build-system) (home-page "https://bioconductor.org/packages/seqLogo") -- cgit v1.2.3 From 2919fefe12c6638e7fba8eda60f55c4f7c7ab4d8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:07:17 +0100 Subject: gnu: r-motifrg: Update to 1.26.0. * gnu/packages/bioinformatics.scm (r-motifrg): Update to 1.26.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 5dcf3568e3..a2c231aab9 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8490,14 +8490,14 @@ Biostrings objects.") (define-public r-motifrg (package (name "r-motifrg") - (version "1.24.0") + (version "1.26.0") (source (origin (method url-fetch) (uri (bioconductor-uri "motifRG" version)) (sha256 (base32 - "0mxhyidkyd2zqahdbg69y20r550z78lvr1r3pbjymnwfg4hcfq1p")))) + "1wxww6i0jgyapqclcwy0zzf9kqjvrvylr89z7yhg1izi7jnw2fka")))) (properties `((upstream-name . "motifRG"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 7d7c702c03b1f1d1e86b48fe44147227c6447a82 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:07:32 +0100 Subject: gnu: r-zlibbioc: Update to 1.28.0. * gnu/packages/bioinformatics.scm (r-zlibbioc): Update to 1.28.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a2c231aab9..b349ddbd0a 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8542,13 +8542,13 @@ two-dimensional genome scans.") (define-public r-zlibbioc (package (name "r-zlibbioc") - (version "1.26.0") + (version "1.28.0") (source (origin (method url-fetch) (uri (bioconductor-uri "zlibbioc" version)) (sha256 (base32 - "1rwr0mci8a712q0isavi4jmhm94gwivc4nr8j7r4kw05flp4g7gz")))) + "0bjvzy24kab7ank02cc1qk2ikcz4dllgf66wpsdl0d3zp4gn3l2h")))) (properties `((upstream-name . "zlibbioc"))) (build-system r-build-system) -- cgit v1.2.3 From 48196899cd838df12304088935d68e9d8e82efd0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:07:44 +0100 Subject: gnu: r-rhtslib: Update to 1.14.0. * gnu/packages/bioinformatics.scm (r-rhtslib): Update to 1.14.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b349ddbd0a..8c71c47989 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8584,14 +8584,14 @@ secondary structure and comparative analysis in R.") (define-public r-rhtslib (package (name "r-rhtslib") - (version "1.12.1") + (version "1.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Rhtslib" version)) (sha256 (base32 - "16ywnb8cmr2xabd1i21b92rfziw7xfbv25yv16ipw617p41wa39z")))) + "1h4q54f8za3aaxgy186zf2165sar5c3cgxkk44lq5hzx5pxkl5wn")))) (properties `((upstream-name . "Rhtslib"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 338f860cc6b663d1efe5da62dad8f84e78f735c5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:07:56 +0100 Subject: gnu: r-bamsignals: Update to 1.14.0. * gnu/packages/bioinformatics.scm (r-bamsignals): Update to 1.14.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 8c71c47989..70d5809a22 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8611,14 +8611,14 @@ of other R packages who wish to make use of HTSlib.") (define-public r-bamsignals (package (name "r-bamsignals") - (version "1.12.1") + (version "1.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "bamsignals" version)) (sha256 (base32 - "141q3p4lzwiqk1mfxi8q1q84axjl0gyiqg59xd3sp4viny4jqmgv")))) + "19irfx1y1izf903vq59wxsdbf88g143zy9l89gxqawh7jfxds8w8")))) (build-system r-build-system) (propagated-inputs `(("r-biocgenerics" ,r-biocgenerics) -- cgit v1.2.3 From ad90921ddc889a317983bae35071fbc929181356 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:08:14 +0100 Subject: gnu: r-mutationalpatterns: Update to 1.8.0. * gnu/packages/bioinformatics.scm (r-mutationalpatterns): Update to 1.8.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 70d5809a22..5d43151a5a 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8741,14 +8741,14 @@ library implementing most of the pipeline's features.") (define-public r-mutationalpatterns (package (name "r-mutationalpatterns") - (version "1.6.1") + (version "1.8.0") (source (origin (method url-fetch) (uri (bioconductor-uri "MutationalPatterns" version)) (sha256 (base32 - "1yq7351j42mjxn8fd3c5bdxzb2l5s4lvqhjdvv4rwj4f600n6wj9")))) + "0w9lg1zs106h6rqvy8mhikq6q6q9syw6c1prcxr38ssh85rcih12")))) (build-system r-build-system) (propagated-inputs `(("r-biocgenerics" ,r-biocgenerics) -- cgit v1.2.3 From d2b60be596ddfc20e26958748227dca50b609182 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:08:26 +0100 Subject: gnu: r-tximport: Update to 1.10.0. * gnu/packages/bioinformatics.scm (r-tximport): Update to 1.10.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 5d43151a5a..9d09290197 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8917,13 +8917,13 @@ kernels, including: gkmSVM, kmer-SVM, mismatch kernel and wildcard kernel.") (define-public r-tximport (package (name "r-tximport") - (version "1.8.0") + (version "1.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "tximport" version)) (sha256 (base32 - "1qjc7ah9dzccpvcjrp9k4qnaz13x6kvy1c1xpdj503km6k528lip")))) + "0za2js8hqjgz8ria09cglynffj4w9vrzg85nmn1xgpvmc1xk813h")))) (build-system r-build-system) (home-page "https://bioconductor.org/packages/tximport") (synopsis "Import and summarize transcript-level estimates for gene-level analysis") -- cgit v1.2.3 From cec8f0920be5e4aba00bf6cb0b33fcdacdc6d6ad Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:08:43 +0100 Subject: gnu: r-annotationfilter: Update to 1.6.0. * gnu/packages/bioinformatics.scm (r-annotationfilter): Update to 1.6.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9d09290197..5f498bdcbb 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8966,13 +8966,13 @@ the available RAM.") (define-public r-annotationfilter (package (name "r-annotationfilter") - (version "1.4.0") + (version "1.6.0") (source (origin (method url-fetch) (uri (bioconductor-uri "AnnotationFilter" version)) (sha256 (base32 - "1w8ypfdz4g7vnwfrvnhjcpm8waciqyq2cn883ajdwg4vv7a5mj9a")))) + "0wrr10cxjzmxx46vjzq2nsf6xlqz1sqwx4xm0sk3d77ff8wmph4x")))) (properties `((upstream-name . "AnnotationFilter"))) (build-system r-build-system) -- cgit v1.2.3 From 2e9d8116fb8d8990ec020df90e1c29ad0741a5b6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:09:17 +0100 Subject: gnu: r-chipseq: Update to 1.32.0. * gnu/packages/bioinformatics.scm (r-chipseq): Update to 1.32.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 5f498bdcbb..1119557b4d 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9269,14 +9269,14 @@ common bioinformatics tools.") (define-public r-chipseq (package (name "r-chipseq") - (version "1.30.0") + (version "1.32.0") (source (origin (method url-fetch) (uri (bioconductor-uri "chipseq" version)) (sha256 (base32 - "09f8dgl5ni75qkf7nvvppwr3irpplv4xb3ks59ld7l8i2mplcrx7")))) + "1pp1rm5fs3hlar5x4dl3a3b4gara7qwf81dbvka6r1n78hrf9x1b")))) (build-system r-build-system) (propagated-inputs `(("r-biocgenerics" ,r-biocgenerics) -- cgit v1.2.3 From 739a856db8d573a208c58c0ca8d62d0c475eebfb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:09:30 +0100 Subject: gnu: r-copywriter: Update to 2.14.0. * gnu/packages/bioinformatics.scm (r-copywriter): Update to 2.14.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 1119557b4d..4b859c8446 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9321,14 +9321,14 @@ GenomicRanges Bioconductor package.") (define-public r-copywriter (package (name "r-copywriter") - (version "2.12.0") + (version "2.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "CopywriteR" version)) (sha256 (base32 - "0b7xwq1va2zclb54f07c5ipmmq4iv2hrlph3j93jz5hmyayv50z3")))) + "0aamxafdk98n7s92jyqs65d6ljpnc2463vanvsw80p44qn6l6awn")))) (properties `((upstream-name . "CopywriteR"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 18604a76e44846fadb00ac54c135f4cf88500283 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:09:42 +0100 Subject: gnu: r-methylkit: Update to 1.8.0. * gnu/packages/bioinformatics.scm (r-methylkit): Update to 1.8.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 4b859c8446..f5406e53f2 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9361,13 +9361,13 @@ number detection tools.") (define-public r-methylkit (package (name "r-methylkit") - (version "1.6.3") + (version "1.8.0") (source (origin (method url-fetch) (uri (bioconductor-uri "methylKit" version)) (sha256 (base32 - "1nla74d2sjs51yyvvxf038a03mhw9appvjzj60vr2vd3p5lhqn9k")))) + "0mz6lil1wax931incnw5byx0v9i8ryhwq9mv0nv8s48ai33ch3x6")))) (properties `((upstream-name . "methylKit"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 8af86883391c620960087f8487813d97d587a02e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:09:54 +0100 Subject: gnu: r-sva: Update to 3.30.0. * gnu/packages/bioinformatics.scm (r-sva): Update to 3.30.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index f5406e53f2..7934c73010 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9407,14 +9407,14 @@ TAB-Seq.") (define-public r-sva (package (name "r-sva") - (version "3.28.0") + (version "3.30.0") (source (origin (method url-fetch) (uri (bioconductor-uri "sva" version)) (sha256 (base32 - "0a3jqbz0jp1jxrnjkqfpmca840yqcdwxprdl608bzzx2zb4jl52s")))) + "1xf0hlrqjxl0y3x13mrkxghiv39fd9v2g8gq3qzbf1wj7il6bph3")))) (build-system r-build-system) (propagated-inputs `(("r-genefilter" ,r-genefilter) -- cgit v1.2.3 From 691ce09fd37d30e64ed639102c99f3fce0d39ea1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:10:07 +0100 Subject: gnu: r-protgenerics: Update to 1.14.0. * gnu/packages/bioinformatics.scm (r-protgenerics): Update to 1.14.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 7934c73010..581a6d46b6 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9517,14 +9517,14 @@ as allowing spectra with different resolutions.") (define-public r-protgenerics (package (name "r-protgenerics") - (version "1.12.0") + (version "1.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ProtGenerics" version)) (sha256 (base32 - "05jbadw2aiwy8vi2ia0jxg06cmwhly2cq4dy1ag7kdxf1c5i9ccn")))) + "053mmxhzncqgigl2iqjlq56qzimlw2zzw31wpzw19rf7rld1vi3b")))) (properties `((upstream-name . "ProtGenerics"))) (build-system r-build-system) (home-page "https://github.com/lgatto/ProtGenerics") -- cgit v1.2.3 From 511abd7addb03434114cb851367a3a39387b42a0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:10:24 +0100 Subject: gnu: r-affyio: Update to 1.52.0. * gnu/packages/bioinformatics.scm (r-affyio): Update to 1.52.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 581a6d46b6..0258ba33d9 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9589,14 +9589,14 @@ previously been used in XCMS.") (define-public r-affyio (package (name "r-affyio") - (version "1.50.0") + (version "1.52.0") (source (origin (method url-fetch) (uri (bioconductor-uri "affyio" version)) (sha256 (base32 - "0sh5wnnchyfpq5n6rchbqmb27byn7kdzn5rgran6i39c81i5z22n")))) + "1s4zp1211vf0krxzch9v3q3r6vs8hihqppq18i2fpvwlknfja7c1")))) (build-system r-build-system) (propagated-inputs `(("r-zlibbioc" ,r-zlibbioc))) -- cgit v1.2.3 From 2b085484c02bf920d6994d0d441badb0bf1e3f17 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:10:37 +0100 Subject: gnu: r-affy: Update to 1.60.0. * gnu/packages/bioinformatics.scm (r-affy): Update to 1.60.0. [propagated-inputs]: Remove r-biocinstaller; add r-biocmanager. --- gnu/packages/bioinformatics.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 0258ba33d9..f6ed11ac0e 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9613,20 +9613,20 @@ CDF file formats.") (define-public r-affy (package (name "r-affy") - (version "1.58.0") + (version "1.60.0") (source (origin (method url-fetch) (uri (bioconductor-uri "affy" version)) (sha256 (base32 - "0sxq875sigm21sf3qncrfrwfdz9nqw1vldxn3d3hj6aq64jg1ki6")))) + "0x8h4fk2igv7vykqfvf6v9whmx3344v5rf3gyfajd431xkjldz6k")))) (build-system r-build-system) (propagated-inputs `(("r-affyio" ,r-affyio) ("r-biobase" ,r-biobase) ("r-biocgenerics" ,r-biocgenerics) - ("r-biocinstaller" ,r-biocinstaller) + ("r-biocmanager" ,r-biocmanager) ("r-preprocesscore" ,r-preprocesscore) ("r-zlibbioc" ,r-zlibbioc))) (inputs -- cgit v1.2.3 From 0e16fc469948a71033c69f2ffe01119816bd6922 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:11:06 +0100 Subject: gnu: r-vsn: Update to 3.50.0. * gnu/packages/bioinformatics.scm (r-vsn): Update to 3.50.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index f6ed11ac0e..ad998d3778 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9641,14 +9641,14 @@ analysis.") (define-public r-vsn (package (name "r-vsn") - (version "3.48.1") + (version "3.50.0") (source (origin (method url-fetch) (uri (bioconductor-uri "vsn" version)) (sha256 (base32 - "0k6mah3g3zqbfap31xmvig4fn452a18xwwa5y0mfj5mj8588p57h")))) + "1g6qkpykw99jm2wv2i61dg2ffwk0n8fm4s5pm2q4c024vw5c9b69")))) (build-system r-build-system) (propagated-inputs `(("r-affy" ,r-affy) -- cgit v1.2.3 From 2c4311dc7c2125790a19f9b7638ee7b67f4d327a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:11:22 +0100 Subject: gnu: r-mzid: Update to 1.20.0. * gnu/packages/bioinformatics.scm (r-mzid): Update to 1.20.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index ad998d3778..8050936c9e 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9675,14 +9675,14 @@ and specific in detecting differential transcription.") (define-public r-mzid (package (name "r-mzid") - (version "1.18.0") + (version "1.20.0") (source (origin (method url-fetch) (uri (bioconductor-uri "mzID" version)) (sha256 (base32 - "060k0xlhg8q802c6zsb4b8ps0ccd9ybyaz0gnsvqkxb786i2vk40")))) + "08jbq223viwknsmsi30hyxyxslvmb0l4wx3vmqlkl6qk4vfmxzjz")))) (properties `((upstream-name . "mzID"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 73d747524629e7ffa38c2e1302bcafa299d3fcee Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:11:36 +0100 Subject: gnu: r-pcamethods: Update to 1.74.0. * gnu/packages/bioinformatics.scm (r-pcamethods): Update to 1.74.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 8050936c9e..f53dbdf3bc 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9705,14 +9705,14 @@ specific parser.") (define-public r-pcamethods (package (name "r-pcamethods") - (version "1.72.0") + (version "1.74.0") (source (origin (method url-fetch) (uri (bioconductor-uri "pcaMethods" version)) (sha256 (base32 - "0v99yf8m7ryh6z0r3z0ggpqfnflcq5bn1q1i1cl9b7q4p6b4sa07")))) + "0ik82s9bsdj4a1mmv0a3k6yisa92mxx7maf3dvip1r8gqlm3dyng")))) (properties `((upstream-name . "pcaMethods"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 762aca727065d8dc0a03e9ca2c456f1616decb58 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:11:49 +0100 Subject: gnu: r-msnbase: Update to 2.8.0. * gnu/packages/bioinformatics.scm (r-msnbase): Update to 2.8.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index f53dbdf3bc..00e7f0f529 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9735,14 +9735,14 @@ structure (pcaRes) to provide a common interface to the PCA results.") (define-public r-msnbase (package (name "r-msnbase") - (version "2.6.4") + (version "2.8.0") (source (origin (method url-fetch) (uri (bioconductor-uri "MSnbase" version)) (sha256 (base32 - "1civd8b1rd5n6ys52dazw5m1yy2wq7049dbbyhzv7pjpa1m2x1rm")))) + "0nnlydpklmv9kwlk3gkjgabx7l6y4gav3imq98w8wskb1fhm50c0")))) (properties `((upstream-name . "MSnbase"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 675d91a0359b61dffcafb59f5572b99e982fd4f0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:12:02 +0100 Subject: gnu: r-msnid: Update to 1.16.0. * gnu/packages/bioinformatics.scm (r-msnid): Update to 1.16.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 00e7f0f529..f9b2a3760c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9778,14 +9778,14 @@ of mass spectrometry based proteomics data.") (define-public r-msnid (package (name "r-msnid") - (version "1.14.0") + (version "1.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "MSnID" version)) (sha256 (base32 - "172q5chi44104iz4y0g42wrimfp7hlhrfa8vzybx6m0ccrkkhl17")))) + "0hgq4argllhh5hvxqi8vkf1blc3nibsslhx4zsv2mcv4yj75bv4n")))) (properties `((upstream-name . "MSnID"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 800954eba412d292035e1f916b0b697798177add Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:12:14 +0100 Subject: gnu: r-aroma-light: Update to 3.12.0. * gnu/packages/bioinformatics.scm (r-aroma-light): Update to 3.12.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index f9b2a3760c..817c59f2c5 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9880,14 +9880,14 @@ discovery of differentially expressed genes and markers.") (define-public r-aroma-light (package (name "r-aroma-light") - (version "3.10.0") + (version "3.12.0") (source (origin (method url-fetch) (uri (bioconductor-uri "aroma.light" version)) (sha256 (base32 - "1dxsiwsrwcq9mj573f9vpdzrhagdqzal328ma8076px4gg6khxkn")))) + "0vfifgpqxjjncbiv6gvlk9jmj14j90r9f30bqk3ks9v1csjnjhrb")))) (properties `((upstream-name . "aroma.light"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 7812e6b82e15c50fa65dbc96fbd0dffaf556cfc3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:12:27 +0100 Subject: gnu: r-deseq: Update to 1.34.0. * gnu/packages/bioinformatics.scm (r-deseq): Update to 1.34.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 817c59f2c5..958519c36e 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9907,14 +9907,14 @@ classes.") (define-public r-deseq (package (name "r-deseq") - (version "1.32.0") + (version "1.34.0") (source (origin (method url-fetch) (uri (bioconductor-uri "DESeq" version)) (sha256 (base32 - "0ykxw8ksif026xy25wx50j2sdsrp156aqkmhcgfjkpgcw699glnm")))) + "1klv1xrh3173srywr6dnq6i7m9djn4gc9aflr1p3a6yjlqcq6fya")))) (properties `((upstream-name . "DESeq"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From b03951f26b30a58c7a318a118e9932737a7576a0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:12:41 +0100 Subject: gnu: r-edaseq: Update to 2.16.0. * gnu/packages/bioinformatics.scm (r-edaseq): Update to 2.16.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 958519c36e..d95c7d9d9f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9938,14 +9938,14 @@ distribution.") (define-public r-edaseq (package (name "r-edaseq") - (version "2.14.1") + (version "2.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "EDASeq" version)) (sha256 (base32 - "0970w9d5ddqw1qxqqafdidkxh6hmcv9j5djwgnpz3fgl05kmysg8")))) + "1gjqzn1kg9qwyz2gwjyy9xzzr1lnc7xd5zwdyvzkadz97gckzxwf")))) (properties `((upstream-name . "EDASeq"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From d7ea34bf99a7dbdf06d86c52e8ed98399c837ac6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:12:51 +0100 Subject: gnu: r-interactivedisplaybase: Update to 1.20.0. * gnu/packages/bioinformatics.scm (r-interactivedisplaybase): Update to 1.20.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index d95c7d9d9f..4282996542 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9976,14 +9976,14 @@ global-scaling and full-quantile normalization.") (define-public r-interactivedisplaybase (package (name "r-interactivedisplaybase") - (version "1.18.0") + (version "1.20.0") (source (origin (method url-fetch) (uri (bioconductor-uri "interactiveDisplayBase" version)) (sha256 (base32 - "05w58z3i9vkma4jd6rhjaxls4yiq4kwrppgcdq9xrr1pxp99k575")))) + "04xz3dkwan2s5ic1mwkdfnggm0l41mgqfagx160bcsrpkw6z7ark")))) (properties `((upstream-name . "interactiveDisplayBase"))) (build-system r-build-system) -- cgit v1.2.3 From 147633d4c10e9eeacec6289f759d137ebd1db5e0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:13:04 +0100 Subject: gnu: r-annotationhub: Update to 2.14.1. * gnu/packages/bioinformatics.scm (r-annotationhub): Update to 2.14.1. [propagated-inputs]: Remove r-biocinstaller; add r-biocmanager. --- gnu/packages/bioinformatics.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 4282996542..88b2257c98 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10000,20 +10000,20 @@ Shiny-based display methods for Bioconductor objects.") (define-public r-annotationhub (package (name "r-annotationhub") - (version "2.12.1") + (version "2.14.1") (source (origin (method url-fetch) (uri (bioconductor-uri "AnnotationHub" version)) (sha256 (base32 - "02ls279k1qlch147vw8kwvlhcqyzvi495bgv110m0xnnbpgbln6g")))) + "00288x3na0izpmbcvsqac1br1qwry86vwc2slj1l47crdfb7za6c")))) (properties `((upstream-name . "AnnotationHub"))) (build-system r-build-system) (propagated-inputs `(("r-annotationdbi" ,r-annotationdbi) ("r-biocgenerics" ,r-biocgenerics) - ("r-biocinstaller" ,r-biocinstaller) + ("r-biocmanager" ,r-biocmanager) ("r-curl" ,r-curl) ("r-httr" ,r-httr) ("r-interactivedisplaybase" ,r-interactivedisplaybase) -- cgit v1.2.3 From 95df764c0131fdde106394a3dcc69bdc844f0ede Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:13:36 +0100 Subject: gnu: r-fastseg: Update to 1.28.0. * gnu/packages/bioinformatics.scm (r-fastseg): Update to 1.28.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 88b2257c98..cd2a54e8aa 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10035,14 +10035,14 @@ by the user, helping with quick and reproducible access.") (define-public r-fastseg (package (name "r-fastseg") - (version "1.26.0") + (version "1.28.0") (source (origin (method url-fetch) (uri (bioconductor-uri "fastseg" version)) (sha256 (base32 - "1yw6hai6hb8qy7akdm4frfp6h4zy93zb68kdj094sanm7kgqmgik")))) + "1l8mdjpfpgwqdss2ywjkb8b4h55wf8v6kmyxdlvy04ds2hj16sb1")))) (build-system r-build-system) (propagated-inputs `(("r-biobase" ,r-biobase) -- cgit v1.2.3 From 49842127865e480b122b0f148389128abbfac4aa Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:13:50 +0100 Subject: gnu: r-keggrest: Update to 1.22.0. * gnu/packages/bioinformatics.scm (r-keggrest): Update to 1.22.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index cd2a54e8aa..f2f1cbe660 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10065,14 +10065,14 @@ microarrays or GRanges for sequencing data.") (define-public r-keggrest (package (name "r-keggrest") - (version "1.20.2") + (version "1.22.0") (source (origin (method url-fetch) (uri (bioconductor-uri "KEGGREST" version)) (sha256 (base32 - "0whmmbkq8bmc3ll20l4cv6hhxjgzbkrs97japljzg07ncn1fffsa")))) + "0blpd5a7whd2sswfhqd17h58hg06ymaf80gapdr9ja43hnnlj309")))) (properties `((upstream-name . "KEGGREST"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 122e099e7289df39723a536163acb2a58f3f5500 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:14:06 +0100 Subject: gnu: r-gage: Update to 2.32.0. * gnu/packages/bioinformatics.scm (r-gage): Update to 2.32.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index f2f1cbe660..c755f300f6 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10089,14 +10089,14 @@ microarrays or GRanges for sequencing data.") (define-public r-gage (package (name "r-gage") - (version "2.30.0") + (version "2.32.0") (source (origin (method url-fetch) (uri (bioconductor-uri "gage" version)) (sha256 (base32 - "0j3cqxy97lpf146wkmdfaq9680gicmzxvhp6w5pxq3j7ipiy7262")))) + "07b098wvryxf0zd423nk6h52s3gyngwjcx2vplqybpbpgl8h2931")))) (build-system r-build-system) (propagated-inputs `(("r-annotationdbi" ,r-annotationdbi) -- cgit v1.2.3 From d78c6aca557232dd1960cc13cb8f8aa954786858 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:14:18 +0100 Subject: gnu: r-genomicfiles: Update to 1.18.0. * gnu/packages/bioinformatics.scm (r-genomicfiles): Update to 1.18.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index c755f300f6..eccea89a6b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10118,14 +10118,14 @@ analysis using other methods.") (define-public r-genomicfiles (package (name "r-genomicfiles") - (version "1.16.0") + (version "1.18.0") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicFiles" version)) (sha256 (base32 - "0bhsq5czigrjyl9gkb2kpkpl367b3ac5g8s280adkcxggn9g7sxq")))) + "0qf2yj4lfnnk64fk125n8sqms01shfqiik04nasx2z3k129ykpxp")))) (properties `((upstream-name . "GenomicFiles"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 5ae5a8ebfcfe25e0ff58c1d64e46e9beeaa54b35 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:14:30 +0100 Subject: gnu: r-complexheatmap: Update to 1.20.0. * gnu/packages/bioinformatics.scm (r-complexheatmap): Update to 1.20.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index eccea89a6b..141a6fddeb 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10151,14 +10151,14 @@ provide added flexibility for data combination and manipulation.") (define-public r-complexheatmap (package (name "r-complexheatmap") - (version "1.18.1") + (version "1.20.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ComplexHeatmap" version)) (sha256 (base32 - "0qjwz1hzpjnc90jiinjkikfnr0shi72q3zfdjjz7pxydy0mglq8n")))) + "0s01dzcfj1lmpqfpsbqw7r4858krfzy499lz4cwx4fq3mbyvy2aj")))) (properties `((upstream-name . "ComplexHeatmap"))) (build-system r-build-system) -- cgit v1.2.3 From 0c96e4b29022d87c77a975ce641571321b5ccfcd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:14:44 +0100 Subject: gnu: r-dirichletmultinomial: Update to 1.24.0. * gnu/packages/bioinformatics.scm (r-dirichletmultinomial): Update to 1.24.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 141a6fddeb..a6520167c1 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10181,14 +10181,14 @@ self-defined annotation graphics.") (define-public r-dirichletmultinomial (package (name "r-dirichletmultinomial") - (version "1.22.0") + (version "1.24.0") (source (origin (method url-fetch) (uri (bioconductor-uri "DirichletMultinomial" version)) (sha256 (base32 - "0vcyp81b90in4ls5nbadc66cw2g9aydr94aqifq5j4b7diq74yfs")))) + "19bzn0a5jal1xv0ad6wikxc7wrk582hczqamlln0vb2ffwkj1z3f")))) (properties `((upstream-name . "DirichletMultinomial"))) (build-system r-build-system) -- cgit v1.2.3 From e8e78c4966c35de621ce09cb8525fe107b9c804b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:14:58 +0100 Subject: gnu: r-ensembldb: Update to 2.6.0. * gnu/packages/bioinformatics.scm (r-ensembldb): Update to 2.6.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a6520167c1..ea93c7c6f4 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10210,14 +10210,14 @@ originally made available by Holmes, Harris, and Quince, 2012, PLoS ONE 7(2): (define-public r-ensembldb (package (name "r-ensembldb") - (version "2.4.1") + (version "2.6.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ensembldb" version)) (sha256 (base32 - "1l2b4cxiycv05mz4z4f3dhx57r9ksha02psc114h30ldm5rxz8w6")))) + "12jqz9h6w4mxyfr43w5qbwmacn512aw0mnl0zvhsg5i7p4qj45ks")))) (build-system r-build-system) (propagated-inputs `(("r-annotationdbi" ,r-annotationdbi) -- cgit v1.2.3 From cdab2dcfead7c4f9251e171859cfc650a8dbc6d8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:15:15 +0100 Subject: gnu: r-organismdbi: Update to 1.24.0. * gnu/packages/bioinformatics.scm (r-organismdbi): Update to 1.24.0. [propagated-inputs]: Remove r-biocinstaller; add r-biocmanager. --- gnu/packages/bioinformatics.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index ea93c7c6f4..165992e331 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10253,21 +10253,21 @@ chromosome region or transcript models of lincRNA genes.") (define-public r-organismdbi (package (name "r-organismdbi") - (version "1.22.0") + (version "1.24.0") (source (origin (method url-fetch) (uri (bioconductor-uri "OrganismDbi" version)) (sha256 (base32 - "0hb9ni41bjfy5s5ryw2qmqs2sx3i7j47w1g0l8g1pvn7ppnxb6cv")))) + "11pyv56cy4iy095h40k6k0mpjdlh6gsb4ld3s57nfa9nd4ypx3yi")))) (properties `((upstream-name . "OrganismDbi"))) (build-system r-build-system) (propagated-inputs `(("r-annotationdbi" ,r-annotationdbi) ("r-biobase" ,r-biobase) ("r-biocgenerics" ,r-biocgenerics) - ("r-biocinstaller" ,r-biocinstaller) + ("r-biocmanager" ,r-biocmanager) ("r-dbi" ,r-dbi) ("r-genomicfeatures" ,r-genomicfeatures) ("r-genomicranges" ,r-genomicranges) -- cgit v1.2.3 From e7a0bc1ccf1adcdd6091c15208f826b34152c360 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:15:45 +0100 Subject: gnu: r-biovizbase: Update to 1.30.0. * gnu/packages/bioinformatics.scm (r-biovizbase): Update to 1.30.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 165992e331..b9532b9b36 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10285,14 +10285,14 @@ the fact that each of these packages implements a select methods.") (define-public r-biovizbase (package (name "r-biovizbase") - (version "1.28.2") + (version "1.30.0") (source (origin (method url-fetch) (uri (bioconductor-uri "biovizBase" version)) (sha256 (base32 - "0wc45j3hfn01i44bkkxjj3n8b8xzbkkcdv35mrkzb1f9yprkf8gq")))) + "0v54mcn3rnnfx8dmcrms5z3rgq19n3hp4r23azlgzwq6hjw7cccx")))) (properties `((upstream-name . "biovizBase"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From f20c7664136b48ab8d1b06115ccf3fee8138f18d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:15:58 +0100 Subject: gnu: r-ggbio: Update to 1.30.0. * gnu/packages/bioinformatics.scm (r-ggbio): Update to 1.30.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b9532b9b36..5d09fe90b9 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10327,14 +10327,14 @@ effort and encourages consistency.") (define-public r-ggbio (package (name "r-ggbio") - (version "1.28.5") + (version "1.30.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ggbio" version)) (sha256 (base32 - "19s2v40fycwf44fl3lm791y635xzw67b30sq2g0qq4a6phjik42d")))) + "0wq49qqzkcn8s19xgaxf2s1j1a563d7pbhhvris6fhxfdjsz4934")))) (build-system r-build-system) (propagated-inputs `(("r-annotationdbi" ,r-annotationdbi) -- cgit v1.2.3 From 181a84314363d838dd43f7dd412db453f36709eb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:16:08 +0100 Subject: gnu: r-gqtlbase: Update to 1.14.0. * gnu/packages/bioinformatics.scm (r-gqtlbase): Update to 1.14.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 5d09fe90b9..c4a8fb09c5 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10404,14 +10404,14 @@ organisms via the @code{g:Profiler} toolkit.") (define-public r-gqtlbase (package (name "r-gqtlbase") - (version "1.12.0") + (version "1.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "gQTLBase" version)) (sha256 (base32 - "1m3ajpqjhw1nwwsn372r44xfxq0a9a0pzsnrprzdjp6mh52p9b5m")))) + "1lbk1m1mkvbk30flk5pf3pcrnm2s0sj5r48kbjgad39dsvd8zgqx")))) (properties `((upstream-name . "gQTLBase"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 220ac15e3faf4fcb446aae4989f9eaf9d5a06f21 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:16:21 +0100 Subject: gnu: r-snpstats: Update to 1.32.0. * gnu/packages/bioinformatics.scm (r-snpstats): Update to 1.32.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index c4a8fb09c5..e2675eba4e 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10439,14 +10439,14 @@ and more.") (define-public r-snpstats (package (name "r-snpstats") - (version "1.30.0") + (version "1.32.0") (source (origin (method url-fetch) (uri (bioconductor-uri "snpStats" version)) (sha256 (base32 - "0iydgfnm053iw860qa1bbh4f6nwzlsf3vhgq92gvl2v4xsz1jbbs")))) + "1pplx4pf9bqi7v5v1l74yknc1s61carvbqkf327ky7vbvp0bck33")))) (properties `((upstream-name . "snpStats"))) (build-system r-build-system) (inputs `(("zlib" ,zlib))) -- cgit v1.2.3 From 4b91335566c7752e948f13e007d810eeaf835e21 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:16:35 +0100 Subject: gnu: r-erma: Update to 0.14.0. * gnu/packages/bioinformatics.scm (r-erma): Update to 0.14.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index e2675eba4e..e1a368b10f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10498,14 +10498,14 @@ several related annotation packages.") (define-public r-erma (package (name "r-erma") - (version "0.12.0") + (version "0.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "erma" version)) (sha256 (base32 - "1ka68n18yizlyvb8bpwwcl4hqbsasg8hw8jb3vgy3cd4szji87hh")))) + "0hj9iz904rr1y66442lkxjywkw1ydyxxlhmjirawbf09ic5ad4g9")))) (build-system r-build-system) (propagated-inputs `(("r-annotationdbi" ,r-annotationdbi) -- cgit v1.2.3 From da679b5202973cd1bf37f971030a16b62f598e64 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:16:46 +0100 Subject: gnu: r-ldblock: Update to 1.12.0. * gnu/packages/bioinformatics.scm (r-ldblock): Update to 1.12.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index e1a368b10f..d0e74c89c0 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10536,14 +10536,14 @@ by Ernst and Kellis.") (define-public r-ldblock (package (name "r-ldblock") - (version "1.10.0") + (version "1.12.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ldblock" version)) (sha256 (base32 - "0c24zvnwsp39d3q0bps13sc441jj9ms2zi34xsb8c392lqmbypvd")))) + "0xbf4pmhrk5fnd1iz5wzjvdr75v114bwpznhcig4wiqmxc27sips")))) (build-system r-build-system) (propagated-inputs `(("r-biocgenerics" ,r-biocgenerics) -- cgit v1.2.3 From ea55326dc7a7f72cfc8e6aaa6faab91781e90f5b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:16:57 +0100 Subject: gnu: r-gqtlstats: Update to 1.14.0. * gnu/packages/bioinformatics.scm (r-gqtlstats): Update to 1.14.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index d0e74c89c0..fdc3559276 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10568,14 +10568,14 @@ defining LD blocks.") (define-public r-gqtlstats (package (name "r-gqtlstats") - (version "1.12.0") + (version "1.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "gQTLstats" version)) (sha256 (base32 - "19g8qhfgngdc14cw9k4i44cxhs3qva87x56gjzmn25k1yj8qgsp1")))) + "1sg9kw59dlayj7qxql9pd93d4hmml504sa3kkfpzfh3xri7m5pxf")))) (properties `((upstream-name . "gQTLstats"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From d57445c9b20e4aae0ea82bf48c0256a719157235 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:17:09 +0100 Subject: gnu: r-gviz: Update to 1.26.0. * gnu/packages/bioinformatics.scm (r-gviz): Update to 1.26.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index fdc3559276..7a81f4ee30 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10622,14 +10622,14 @@ family of feature/genome hypotheses.") (define-public r-gviz (package (name "r-gviz") - (version "1.24.0") + (version "1.26.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Gviz" version)) (sha256 (base32 - "1fhli7ahkl5r43j0hc89ib41mfadj6qyrg36i03ncz8zs6iqwpx4")))) + "05zk9hf30afg6rjg97lzn5v8xij90v8zm09y9vcz0asmc3c8xs0a")))) (properties `((upstream-name . "Gviz"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 85b16c05e8142c8367e1af9d543c9e78f774babe Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:17:22 +0100 Subject: gnu: r-gwascat: Update to 2.14.0. * gnu/packages/bioinformatics.scm (r-gwascat): Update to 2.14.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 7a81f4ee30..202bb19b80 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10668,14 +10668,14 @@ with your data.") (define-public r-gwascat (package (name "r-gwascat") - (version "2.12.0") + (version "2.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "gwascat" version)) (sha256 (base32 - "08ba9il4vbjjwlbwmqg4ai6ya1p09js9agn95sw0dhc9gqln42hx")))) + "1fnyjydhicq4ayrv0lqjv48h9bd72h40s6l82g1h2ng0icwz38g0")))) (build-system r-build-system) (propagated-inputs `(("r-annotationdbi" ,r-annotationdbi) -- cgit v1.2.3 From 7468a76480322462c47157e5d3cb7d34cd65c157 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:17:34 +0100 Subject: gnu: r-sushi: Update to 1.20.0. * gnu/packages/bioinformatics.scm (r-sushi): Update to 1.20.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 202bb19b80..86092a8847 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10708,13 +10708,13 @@ EMBL-EBI GWAS catalog.") (define-public r-sushi (package (name "r-sushi") - (version "1.18.0") + (version "1.20.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Sushi" version)) (sha256 (base32 - "1m15hmg4k0qhshyn65xfj5hx7xbaf0kxqw70lxisak6pj1w00l41")))) + "0dv5di0hgbvk9cxnqhyf18mdjl50k6bk00a89r6zgp83rbxwr1r8")))) (properties `((upstream-name . "Sushi"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 80239129343cec889e7ce6818a201d4b3c3b1aaf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:17:44 +0100 Subject: gnu: r-fithic: Update to 1.8.0. * gnu/packages/bioinformatics.scm (r-fithic): Update to 1.8.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 86092a8847..d6c982fbde 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10730,13 +10730,13 @@ visualizations for publication-quality multi-panel figures.") (define-public r-fithic (package (name "r-fithic") - (version "1.6.0") + (version "1.8.0") (source (origin (method url-fetch) (uri (bioconductor-uri "FitHiC" version)) (sha256 (base32 - "06w4q836bi1mvkbl1saghv4r5p4hxpjg8cp7kgad13ls450kqmyd")))) + "15xd8mz7660q4zr9p74mq1pqps4iz7pxp8f9ifn21gwg94aq1avn")))) (properties `((upstream-name . "FitHiC"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From d055f199a979a57ac942067285d8c3293e35910e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:17:58 +0100 Subject: gnu: r-hitc: Update to 1.26.0. * gnu/packages/bioinformatics.scm (r-hitc): Update to 1.26.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index d6c982fbde..7f48c6fcc9 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10754,13 +10754,13 @@ assays such as Hi-C.") (define-public r-hitc (package (name "r-hitc") - (version "1.24.0") + (version "1.26.0") (source (origin (method url-fetch) (uri (bioconductor-uri "HiTC" version)) (sha256 (base32 - "0qkk5139f51lwwy1yh7nbkflh5d69prirmhniwam34nlg9rzjm2z")))) + "11f96k1707g6milpjgnrjf3b5r42hsrxhb5d8znkcr3y3mrskdbj")))) (properties `((upstream-name . "HiTC"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From edb91244c37cce805feafbe22c7f705136d9c9f5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:18:09 +0100 Subject: gnu: r-qvalue: Update to 2.14.0. * gnu/packages/bioinformatics.scm (r-qvalue): Update to 2.14.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 7f48c6fcc9..c8fb8775f4 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10783,14 +10783,14 @@ provided.") (define-public r-qvalue (package (name "r-qvalue") - (version "2.12.0") + (version "2.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "qvalue" version)) (sha256 (base32 - "1ndwkj0hh7v4lwylq1v0fkxqs7mfmbcj8kxbdpj1wkvf131z2ns8")))) + "03qxshqwwq1rj23p6pjrz08jm3ziikvy9badi4mz2rcwy2nz783a")))) (build-system r-build-system) (propagated-inputs `(("r-ggplot2" ,r-ggplot2) -- cgit v1.2.3 From 3c833608f37ef67eb3ea514f48a852482b479f92 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:18:24 +0100 Subject: gnu: r-beachmat: Update to 1.4.0. * gnu/packages/bioinformatics.scm (r-beachmat): Update to 1.4.0. [propagated-inputs]: Add r-biocgenerics. --- gnu/packages/bioinformatics.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index c8fb8775f4..21cb9d03e7 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10903,20 +10903,21 @@ packages.") (define-public r-beachmat (package (name "r-beachmat") - (version "1.2.1") + (version "1.4.0") (source (origin (method url-fetch) (uri (bioconductor-uri "beachmat" version)) (sha256 (base32 - "1w90v0jx1zgrfxzx99gdkk0dz2vi25hr51jml1bvq33i64rj7996")))) + "07zgmms0qg8gw7x0js46965bbhpfj2aa1h5ixdz9r332bxv9cdmr")))) (build-system r-build-system) (inputs `(("hdf5" ,hdf5) ("zlib" ,zlib))) (propagated-inputs - `(("r-delayedarray" ,r-delayedarray) + `(("r-biocgenerics" ,r-biocgenerics) + ("r-delayedarray" ,r-delayedarray) ("r-hdf5array" ,r-hdf5array) ("r-rcpp" ,r-rcpp) ("r-rhdf5" ,r-rhdf5) -- cgit v1.2.3 From f93ec63ccff888c1b42934bae6d4ee5fe2bf453d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:18:46 +0100 Subject: gnu: r-singlecellexperiment: Update to 1.4.0. * gnu/packages/bioinformatics.scm (r-singlecellexperiment): Update to 1.4.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 21cb9d03e7..d8b248814d 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10932,14 +10932,14 @@ matrices.") (define-public r-singlecellexperiment (package (name "r-singlecellexperiment") - (version "1.2.0") + (version "1.4.0") (source (origin (method url-fetch) (uri (bioconductor-uri "SingleCellExperiment" version)) (sha256 (base32 - "0mz3chia250v8v6q8r5cqv5fc4bpcw1hhrfr3p7l5i4xi85scpka")))) + "19r4r7djrn46qlijkj1g926vcklxzcrxjlxv6cg43m9j9jgfs3dj")))) (properties `((upstream-name . "SingleCellExperiment"))) (build-system r-build-system) -- cgit v1.2.3 From 48f27914966b00958dc9d4b26fd24a6a7f1874d1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:19:04 +0100 Subject: gnu: r-scater: Update to 1.10.0. * gnu/packages/bioinformatics.scm (r-scater): Update to 1.10.0. [propagated-inputs]: Add r-biocparallel; remove r-biobase, r-data-table, r-edger, r-limma, r-rhdf5, r-rjson, r-shiny, r-shinydashboard, and r-tximport. --- gnu/packages/bioinformatics.scm | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index d8b248814d..f359983bf2 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10959,39 +10959,31 @@ libraries.") (define-public r-scater (package (name "r-scater") - (version "1.8.4") + (version "1.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "scater" version)) (sha256 (base32 - "173lfpas2fqsp4xxsw01wkxd4496c5p8himw9b4r9z4npxkfyv16")))) + "1kwa9n70c5j0xcj6nkmlkzjr63cnj78mp8nhg58n07fq1ijm4ns3")))) (build-system r-build-system) (propagated-inputs `(("r-beachmat" ,r-beachmat) - ("r-biobase" ,r-biobase) ("r-biocgenerics" ,r-biocgenerics) - ("r-data-table" ,r-data-table) + ("r-biocparallel" ,r-biocparallel) ("r-delayedarray" ,r-delayedarray) ("r-delayedmatrixstats" ,r-delayedmatrixstats) ("r-dplyr" ,r-dplyr) - ("r-edger" ,r-edger) ("r-ggbeeswarm" ,r-ggbeeswarm) ("r-ggplot2" ,r-ggplot2) - ("r-limma" ,r-limma) ("r-matrix" ,r-matrix) ("r-plyr" ,r-plyr) ("r-rcpp" ,r-rcpp) ("r-reshape2" ,r-reshape2) - ("r-rhdf5" ,r-rhdf5) ("r-rhdf5lib" ,r-rhdf5lib) - ("r-rjson" ,r-rjson) ("r-s4vectors" ,r-s4vectors) - ("r-shiny" ,r-shiny) - ("r-shinydashboard" ,r-shinydashboard) ("r-singlecellexperiment" ,r-singlecellexperiment) ("r-summarizedexperiment" ,r-summarizedexperiment) - ("r-tximport" ,r-tximport) ("r-viridis" ,r-viridis))) (home-page "https://github.com/davismcc/scater") (synopsis "Single-cell analysis toolkit for gene expression data in R") -- cgit v1.2.3 From 70a3a76ba7aed0c0bed4ce7ac4ed3fca9abc2c45 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:20:03 +0100 Subject: gnu: r-scran: Update to 1.10.1. * gnu/packages/bioinformatics.scm (r-scran): Update to 1.10.1. [propagated-inputs]: Add r-biocneighbors; remove r-dt, r-fnn, r-ggplot2, r-shiny, and r-viridis. --- gnu/packages/bioinformatics.scm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index f359983bf2..fa572d4a3d 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10995,26 +10995,24 @@ quality control.") (define-public r-scran (package (name "r-scran") - (version "1.8.4") + (version "1.10.1") (source (origin (method url-fetch) (uri (bioconductor-uri "scran" version)) (sha256 (base32 - "17vq9vb9ak7n4mcqpwnm9x3z91vmr7xnsgj8f45b8dbj7m0v126j")))) + "1viyzrwfm9vccsf54c6g7k1dn7skkfx4ml1jy12q67wa20sx8l03")))) (build-system r-build-system) (propagated-inputs `(("r-beachmat" ,r-beachmat) ("r-biocgenerics" ,r-biocgenerics) + ("r-biocneighbors" ,r-biocneighbors) ("r-biocparallel" ,r-biocparallel) ("r-delayedarray" ,r-delayedarray) ("r-delayedmatrixstats" ,r-delayedmatrixstats) - ("r-dt" ,r-dt) ("r-dynamictreecut" ,r-dynamictreecut) ("r-edger" ,r-edger) - ("r-fnn" ,r-fnn) - ("r-ggplot2" ,r-ggplot2) ("r-igraph" ,r-igraph) ("r-limma" ,r-limma) ("r-matrix" ,r-matrix) @@ -11022,11 +11020,9 @@ quality control.") ("r-rhdf5lib" ,r-rhdf5lib) ("r-s4vectors" ,r-s4vectors) ("r-scater" ,r-scater) - ("r-shiny" ,r-shiny) ("r-singlecellexperiment" ,r-singlecellexperiment) ("r-statmod" ,r-statmod) - ("r-summarizedexperiment" ,r-summarizedexperiment) - ("r-viridis" ,r-viridis))) + ("r-summarizedexperiment" ,r-summarizedexperiment))) (home-page "https://bioconductor.org/packages/scran") (synopsis "Methods for single-cell RNA-Seq data analysis") (description "This package implements a variety of low-level analyses of -- cgit v1.2.3 From 900ce2bafd4cbaef0f0cd9a5cff6162911a78130 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:21:06 +0100 Subject: gnu: r-delayedmatrixstats: Update to 1.4.0. * gnu/packages/bioinformatics.scm (r-delayedmatrixstats): Update to 1.4.0. [propagated-inputs]: Add r-biocparallel and r-hdf5array. --- gnu/packages/bioinformatics.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index fa572d4a3d..dc09316ea5 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11034,19 +11034,21 @@ variable and significantly correlated genes.") (define-public r-delayedmatrixstats (package (name "r-delayedmatrixstats") - (version "1.2.0") + (version "1.4.0") (source (origin (method url-fetch) (uri (bioconductor-uri "DelayedMatrixStats" version)) (sha256 (base32 - "1dasghfy8x27zzmd0igag4mc1gxxxbchsl4hpc1050dj3wnw9w3y")))) + "03fk2avl1vyjv2wslczkc82qr0zmp1ra8iimd47pbmnnm839ly4w")))) (properties `((upstream-name . "DelayedMatrixStats"))) (build-system r-build-system) (propagated-inputs - `(("r-delayedarray" ,r-delayedarray) + `(("r-biocparallel" ,r-biocparallel) + ("r-delayedarray" ,r-delayedarray) + ("r-hdf5array" ,r-hdf5array) ("r-iranges" ,r-iranges) ("r-matrix" ,r-matrix) ("r-matrixstats" ,r-matrixstats) -- cgit v1.2.3 From a1c2bf8e54cac0d805f71e5f46a38b2d6ee364bb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:22:08 +0100 Subject: gnu: r-rcas: Update to 1.8.0. * gnu/packages/bioinformatics.scm (r-rcas): Update to 1.8.0. [native-inputs]: Remove r-testthat and ghc-pandoc-citeproc. [propagated-inputs]: Add r-annotationdbi, r-genomeinfodb, and r-genomicranges; remove r-bsgenome-mmusculus-ucsc-mm9, r-bsgenome-celegans-ucsc-ce10, r-bsgenome-dmelanogaster-ucsc-dm3, r-org-ce-eg-db, r-org-dm-eg-db, and r-org-mm-eg-db. --- gnu/packages/bioinformatics.scm | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index dc09316ea5..e439979005 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8641,41 +8641,33 @@ paired-end data.") (define-public r-rcas (package (name "r-rcas") - (version "1.6.0") + (version "1.8.0") (source (origin (method url-fetch) (uri (bioconductor-uri "RCAS" version)) (sha256 (base32 - "0vmn7a0rm2ban0kaxrf5danhss2r4hfhnwh5889fjcgqy300fdd5")))) + "0ss5hcg2m7gjji6dd23zxa5bd5a7knwcnada4qs5q2l4clgk39ad")))) (build-system r-build-system) - (native-inputs - `(("r-testthat" ,r-testthat) - ;; During vignette building knitr checks that "pandoc-citeproc" - ;; is in the PATH. - ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc))) (propagated-inputs - `(("r-biocgenerics" ,r-biocgenerics) + `(("r-annotationdbi" ,r-annotationdbi) + ("r-biocgenerics" ,r-biocgenerics) ("r-biomart" ,r-biomart) ("r-biostrings" ,r-biostrings) ("r-bsgenome-hsapiens-ucsc-hg19" ,r-bsgenome-hsapiens-ucsc-hg19) - ("r-bsgenome-mmusculus-ucsc-mm9" ,r-bsgenome-mmusculus-ucsc-mm9) - ("r-bsgenome-celegans-ucsc-ce10" ,r-bsgenome-celegans-ucsc-ce10) - ("r-bsgenome-dmelanogaster-ucsc-dm3" ,r-bsgenome-dmelanogaster-ucsc-dm3) ("r-cowplot" ,r-cowplot) ("r-data-table" ,r-data-table) ("r-dbi" ,r-dbi) ("r-dt" ,r-dt) ("r-genomation" ,r-genomation) + ("r-genomeinfodb" ,r-genomeinfodb) ("r-genomicfeatures" ,r-genomicfeatures) + ("r-genomicranges" ,r-genomicranges) ("r-ggplot2" ,r-ggplot2) ("r-ggseqlogo" ,r-ggseqlogo) ("r-knitr" ,r-knitr) ("r-motifrg" ,r-motifrg) ("r-org-hs-eg-db" ,r-org-hs-eg-db) - ("r-org-ce-eg-db" ,r-org-ce-eg-db) - ("r-org-dm-eg-db" ,r-org-dm-eg-db) - ("r-org-mm-eg-db" ,r-org-mm-eg-db) ("r-pbapply" ,r-pbapply) ("r-pheatmap" ,r-pheatmap) ("r-plotly" ,r-plotly) -- cgit v1.2.3 From 611a255d2b0a7d91e5a6748c50fbef38868bef53 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:23:35 +0100 Subject: gnu: r-rhdf5: Update to 2.26.0. * gnu/packages/bioinformatics.scm (r-rhdf5): Update to 2.26.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index e439979005..f405f41ec8 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8931,13 +8931,13 @@ of gene-level counts.") (define-public r-rhdf5 (package (name "r-rhdf5") - (version "2.24.0") + (version "2.26.0") (source (origin (method url-fetch) (uri (bioconductor-uri "rhdf5" version)) (sha256 (base32 - "15cmmchhk8bnp94gxg0zk9qyzdjx5kv16dzpbnb62mkq7ydmifx6")))) + "0xmpkfdsmgl79ffffj7cf9fx3zxki2rk0xn25k778kr3s0sbmhis")))) (build-system r-build-system) (propagated-inputs `(("r-rhdf5lib" ,r-rhdf5lib))) -- cgit v1.2.3 From 8e48d36f26fd6943c118945a33e14f2c321231cf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:23:53 +0100 Subject: gnu: r-hdf5array: Update to 1.10.0. * gnu/packages/bioinformatics.scm (r-hdf5array): Update to 1.10.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index f405f41ec8..213c5c803c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10804,14 +10804,14 @@ problems in genomics, brain imaging, astrophysics, and data mining.") (define-public r-hdf5array (package (name "r-hdf5array") - (version "1.8.1") + (version "1.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "HDF5Array" version)) (sha256 (base32 - "1s44zgm9jg82bk4b8k3dh7xw7mxychlfm3grs8516mxnw91zpvy5")))) + "1w7ad8cfsbh5xx82m3l4lc0vbmj9lcsqxxpiy3ana2ycgn1bqv3g")))) (properties `((upstream-name . "HDF5Array"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 37200dbcc37ac210609f1452e14c9ba0a98a97ee Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:24:12 +0100 Subject: gnu: r-rhdf5lib: Update to 1.4.0. * gnu/packages/bioinformatics.scm (r-rhdf5lib): Update to 1.4.0. [source]: Add snippet to remove bundled binaries. [arguments]: Replace references to hdf5 with references to hdf5-1.10. [native-inputs]: Likewise. [propagated-inputs]: Replace hdf5 with hdf5-1.10. --- gnu/packages/bioinformatics.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 213c5c803c..9f2dd6cf64 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10830,14 +10830,20 @@ block processing.") (define-public r-rhdf5lib (package (name "r-rhdf5lib") - (version "1.2.1") + (version "1.4.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Rhdf5lib" version)) (sha256 (base32 - "1y59acac6v8hrhv84gghn9ifsni9xxxacaj177rrl4frmkrz4x3c")))) + "01gpz780g850ql20b2ql6pvr678ydk4nq4sn5iiih94a4crb9lz1")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Delete bundled binaries + (delete-file-recursively "src/winlib/") + #t)))) (properties `((upstream-name . "Rhdf5lib"))) (build-system r-build-system) (arguments @@ -10854,7 +10860,7 @@ block processing.") "'%s/libhdf5.a %s/libhdf5.a -lz'")) (with-directory-excursion "src" (invoke "tar" "xvf" (assoc-ref inputs "hdf5-source")) - (rename-file (string-append "hdf5-" ,(package-version hdf5)) + (rename-file (string-append "hdf5-" ,(package-version hdf5-1.10)) "hdf5") ;; Remove timestamp and host system information to make ;; the build reproducible. @@ -10883,9 +10889,9 @@ block processing.") (inputs `(("zlib" ,zlib))) (propagated-inputs - `(("hdf5" ,hdf5))) + `(("hdf5" ,hdf5-1.10))) (native-inputs - `(("hdf5-source" ,(package-source hdf5)))) + `(("hdf5-source" ,(package-source hdf5-1.10)))) (home-page "https://bioconductor.org/packages/Rhdf5lib") (synopsis "HDF5 library as an R package") (description "This package provides C and C++ HDF5 libraries for use in R -- cgit v1.2.3 From 9255198423294d16a6dfc2d1c71ce834d5496436 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 12:25:18 +0100 Subject: gnu: r-mzr: Update to 2.16.0. * gnu/packages/bioinformatics.scm (r-mzr): Update to 2.16.0. [inputs]: Remove netcdf. [propagated-inputs]: Add r-ncdf4. --- gnu/packages/bioinformatics.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9f2dd6cf64..8ae07ba12a 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9529,14 +9529,14 @@ proteomics packages.") (define-public r-mzr (package (name "r-mzr") - (version "2.14.0") + (version "2.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "mzR" version)) (sha256 (base32 - "190m2bq5bqxhljaj4f7vz9wj5h5laaxd8zp5jampnql6xc4zmarg")) + "0li1y6p95ljiva4lvfmql9sipn4dq42sknbh60b36ycjppnf8lj5")) (modules '((guix build utils))) (snippet '(begin @@ -9558,11 +9558,11 @@ proteomics packages.") #t))))) (inputs `(("boost" ,boost) ; use this instead of the bundled boost sources - ("netcdf" ,netcdf) ("zlib" ,zlib))) (propagated-inputs `(("r-biobase" ,r-biobase) ("r-biocgenerics" ,r-biocgenerics) + ("r-ncdf4" ,r-ncdf4) ("r-protgenerics" ,r-protgenerics) ("r-rcpp" ,r-rcpp) ("r-rhdf5lib" ,r-rhdf5lib) -- cgit v1.2.3 From 970c9993f124789cb181f399d4981cdcf5d3fc26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 7 Nov 2018 15:51:38 +0100 Subject: linux-initrd: Make sure 'build-initrd' can delete files. Fixes . Reported by Mark H Weaver . This fixes a regression introduced in 72dc64f8f720268930eed448abfc15d2a0eca3cf, which made files read-only. * gnu/build/linux-initrd.scm (build-initrd): Call 'make-file-writable' on all the files under contents/. --- gnu/build/linux-initrd.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/build/linux-initrd.scm b/gnu/build/linux-initrd.scm index c65b5aacfa..fb8a1f5b2b 100644 --- a/gnu/build/linux-initrd.scm +++ b/gnu/build/linux-initrd.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2018 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -139,6 +139,12 @@ REFERENCES-GRAPHS." (write-cpio-archive output "." #:gzip gzip)) + ;; Make sure directories are writable so we can delete files. + (for-each make-file-writable + (find-files "contents" + (lambda (file stat) + (eq? 'directory (stat:type stat))) + #:directories? #t)) (delete-file-recursively "contents")) ;;; linux-initrd.scm ends here -- cgit v1.2.3 From 08759829cfcafe459b14803dbbdaf884a1659f79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 7 Nov 2018 15:56:08 +0100 Subject: gnu: cuirass: Update to 0b40dca. * gnu/packages/ci.scm (cuirass): Update to 0b40dca. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 1cac8b9fb4..30d86bd09f 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -186,8 +186,8 @@ their dependencies.") (license l:gpl3+)))) (define-public cuirass - (let ((commit "fe2b73c2353d106431ed0659345391f14ed64600") - (revision "20")) + (let ((commit "0b40dca734468e8b12b3ff58e3e779679f17d38e") + (revision "21")) (package (name "cuirass") (version (string-append "0.0.1-" revision "." (string-take commit 7))) @@ -199,7 +199,7 @@ their dependencies.") (file-name (string-append name "-" version)) (sha256 (base32 - "00ldbig2p14qpwrl2i2hnhb9idgbbf0kqnlh4n79rmz96blm7463")))) + "1kdxs8dzdyldfs4wsz5hb64hprkbrnq5ljdll631f3bj8pbvvvc1")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From dcb45127e01ce2eeabc9270b64e817aa1d644672 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 7 Nov 2018 16:01:17 +0100 Subject: services: cuirass: Add 'ttl' configuration field. * gnu/services/cuirass.scm ()[ttl]: New field. (cuirass-shepherd-service): Honor it. --- gnu/services/cuirass.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm index 496b2d06c8..36e90fc825 100644 --- a/gnu/services/cuirass.scm +++ b/gnu/services/cuirass.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Mathieu Lirzin -;;; Copyright © 2016, 2017 Ludovic Courtès +;;; Copyright © 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 Jan Nieuwenhuizen ;;; Copyright © 2018 Ricardo Wurmus @@ -54,6 +54,8 @@ (default "/var/log/cuirass.log")) (cache-directory cuirass-configuration-cache-directory ;string (dir-name) (default "/var/cache/cuirass")) + (ttl cuirass-configuration-ttl ;integer + (default (* 30 24 3600))) (user cuirass-configuration-user ;string (default "cuirass")) (group cuirass-configuration-group ;string @@ -86,6 +88,7 @@ (group (cuirass-configuration-group config)) (interval (cuirass-configuration-interval config)) (database (cuirass-configuration-database config)) + (ttl (cuirass-configuration-ttl config)) (port (cuirass-configuration-port config)) (host (cuirass-configuration-host config)) (specs (cuirass-configuration-specifications config)) @@ -102,6 +105,7 @@ "--specifications" #$(scheme-file "cuirass-specs.scm" specs) "--database" #$database + "--ttl" #$(string-append (number->string ttl) "s") "--port" #$(number->string port) "--listen" #$host "--interval" #$(number->string interval) -- cgit v1.2.3 From 8dd36658832b405ee8c04d29b96381519920ed91 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 27 Sep 2018 17:24:33 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From e2568df74e46b6ab5b9d63a78dd805f8018848ab Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 27 Sep 2018 17:27:31 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From fff67cc8a7233179cc5e6eacb9659e7e79134111 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 17:01:19 +0100 Subject: gnu: prodigal: Fetch sources from git. * gnu/packages/bioinformatics.scm (prodigal)[source]: Fetch from git. --- gnu/packages/bioinformatics.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 8ae07ba12a..2755dba521 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4679,14 +4679,14 @@ different command-line tools: (name "prodigal") (version "2.6.3") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/hyattpd/Prodigal/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/hyattpd/Prodigal.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "17srxkqd3jc77xk15pfbgg1a9xahqg7337w95mrsia7mpza4l2c9")))) + "1fs1hqk83qjbjhrvhw6ni75zakx5ki1ayy3v6wwkn3xvahc9hi5s")))) (build-system gnu-build-system) (arguments `(#:tests? #f ;no check target -- cgit v1.2.3 From 21335fdbec68b4cfb19d8a0ae0877ec81c84ad9c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 17:17:48 +0100 Subject: gnu: ngless: Install links to required tools. * gnu/packages/bioinformatics.scm (ngless)[arguments]: Install links to tools. [inputs]: Add prodigal, bwa, samtools, and minimap2. --- gnu/packages/bioinformatics.scm | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 2755dba521..d9f0fe773f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -14123,9 +14123,30 @@ absolute GSEA.") #:phases (modify-phases %standard-phases (add-after 'unpack 'create-cabal-file - (lambda _ (invoke "hpack") #t))))) + (lambda _ (invoke "hpack") #t)) + ;; These tools are expected to be installed alongside ngless. + (add-after 'install 'link-tools + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref outputs "out") "/bin/"))) + (symlink (string-append (assoc-ref inputs "prodigal") + "/bin/prodigal") + (string-append bin "ngless-" ,version "-prodigal")) + (symlink (string-append (assoc-ref inputs "minimap2") + "/bin/minimap2") + (string-append bin "ngless-" ,version "-minimap2")) + (symlink (string-append (assoc-ref inputs "samtools") + "/bin/samtools") + (string-append bin "ngless-" ,version "-samtools")) + (symlink (string-append (assoc-ref inputs "bwa") + "/bin/bwa") + (string-append bin "ngless-" ,version "-bwa")) + #t)))))) (inputs - `(("ghc-aeson" ,ghc-aeson) + `(("prodigal" ,prodigal) + ("bwa" ,bwa) + ("samtools" ,samtools) + ("minimap2" ,minimap2) + ("ghc-aeson" ,ghc-aeson) ("ghc-ansi-terminal" ,ghc-ansi-terminal) ("ghc-async" ,ghc-async) ("ghc-atomic-write" ,ghc-atomic-write) -- cgit v1.2.3 From 8e58319c455a22f2f7bbeb9a1ae68a48de1f1505 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 18:44:30 +0100 Subject: gnu: bamtools: Fetch sources from git. * gnu/packages/bioinformatics.scm (bamtools)[source]: Fetch from git. --- gnu/packages/bioinformatics.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index d9f0fe773f..da76c397f1 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -262,14 +262,14 @@ instance, it implements several methods to assess contig-wise read coverage.") (name "bamtools") (version "2.5.1") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/pezmaster31/bamtools/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/pezmaster31/bamtools.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1z3kg24qrwq13a88n9d86izngrar4fll7gr6phddb2faw75pdgaa")))) + "0nfb2ypcx9959xnbz6wxh6py3xfizgmg8nrknxl95c507m9hmq8b")))) (build-system cmake-build-system) (arguments `(#:tests? #f ;no "check" target -- cgit v1.2.3 From 20ee3e8b76e7197164267b186b0a0b5ec93d50dc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 18:52:46 +0100 Subject: gnu: bedtools-2.18: Fetch sources from stable URL. * gnu/packages/bioinformatics.scm (bedtools-2.18)[source]: Use stable release tarball instead of generated tag tarball. --- gnu/packages/bioinformatics.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index da76c397f1..505f98836b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -438,11 +438,11 @@ BED, GFF/GTF, VCF.") (source (origin (method url-fetch) (uri (string-append "https://github.com/arq5x/bedtools2/" - "archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + "releases/download/v" version + "/bedtools-" version ".tar.gz")) (sha256 (base32 - "05vrnr8yp7swfagshzpgqmzk1blnwnq8pq5pckzi1m26w98d63vf")))) + "11rvca19ncg03kxd0wzlfx5ws7r3nisd0z8s9j9n182d8ksp2pxz")))) (arguments '(#:test-target "test" #:phases -- cgit v1.2.3 From 383cb7b8e6f15ec4191a55d84a90d2e0ed570fe3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 19:06:30 +0100 Subject: gnu: bioawk: Fetch sources from git. * gnu/packages/bioinformatics.scm (bioawk)[source]: Fetch from git. --- gnu/packages/bioinformatics.scm | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 505f98836b..ab317aa72c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -563,12 +563,14 @@ independently with transcriptional regulation.") (name "bioawk") (version "1.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/lh3/bioawk/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "1daizxsk17ahi9n58fj8vpgwyhzrzh54bzqhanjanp88kgrz7gjw")))) + (method git-fetch) + (uri (git-reference + (url "https://github.com/lh3/bioawk.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1pxc3zdnirxbf9a0az698hd8xdik7qkhypm7v6hn922x8y9qmspm")))) (build-system gnu-build-system) (inputs `(("zlib" ,zlib))) @@ -582,13 +584,13 @@ independently with transcriptional regulation.") (modify-phases %standard-phases (delete 'configure) ; There is no configure phase. (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (man (string-append out "/share/man/man1"))) - (mkdir-p man) - (copy-file "awk.1" (string-append man "/bioawk.1")) - (install-file "bioawk" bin))))))) + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (man (string-append out "/share/man/man1"))) + (mkdir-p man) + (copy-file "awk.1" (string-append man "/bioawk.1")) + (install-file "bioawk" bin))))))) (home-page "https://github.com/lh3/bioawk") (synopsis "AWK with bioinformatics extensions") (description "Bioawk is an extension to Brian Kernighan's awk, adding the -- cgit v1.2.3 From 007a81d5cf3194bd96c7bacdd552d5708340d126 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 19:10:36 +0100 Subject: gnu: python-biom-format: Fetch source from git. * gnu/packages/bioinformatics.scm (python-biom-format)[source]: Fetch from git. --- gnu/packages/bioinformatics.scm | 59 +++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 29 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index ab317aa72c..52f6af6504 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -690,38 +690,39 @@ Python.") (define-public python-biom-format (package - (name "python-biom-format") - (version "2.1.6") - (source - (origin - (method url-fetch) - ;; Use GitHub as source because PyPI distribution does not contain - ;; test data: https://github.com/biocore/biom-format/issues/693 - (uri (string-append "https://github.com/biocore/biom-format/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "08cr7wpahk6zb31h4bs7jmzpvxcqv9s13xz40h6y2h656jvdvnpj")))) - (build-system python-build-system) - (propagated-inputs - `(("python-numpy" ,python-numpy) - ("python-scipy" ,python-scipy) - ("python-future" ,python-future) - ("python-click" ,python-click) - ("python-h5py" ,python-h5py) - ("python-pandas" ,python-pandas))) - (native-inputs - `(("python-nose" ,python-nose))) - (home-page "http://www.biom-format.org") - (synopsis "Biological Observation Matrix (BIOM) format utilities") - (description - "The BIOM file format is designed to be a general-use format for + (name "python-biom-format") + (version "2.1.6") + (source + (origin + (method git-fetch) + ;; Use GitHub as source because PyPI distribution does not contain + ;; test data: https://github.com/biocore/biom-format/issues/693 + (uri (git-reference + (url "https://github.com/biocore/biom-format.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "00yi8hkj3n7vdz8p8x93bi810f7cpm8rb0dd3kfhr2cpbmd2rsql")))) + (build-system python-build-system) + (propagated-inputs + `(("python-numpy" ,python-numpy) + ("python-scipy" ,python-scipy) + ("python-future" ,python-future) + ("python-click" ,python-click) + ("python-h5py" ,python-h5py) + ("python-pandas" ,python-pandas))) + (native-inputs + `(("python-nose" ,python-nose))) + (home-page "http://www.biom-format.org") + (synopsis "Biological Observation Matrix (BIOM) format utilities") + (description + "The BIOM file format is designed to be a general-use format for representing counts of observations e.g. operational taxonomic units, KEGG orthology groups or lipid types, in one or more biological samples e.g. microbiome samples, genomes, metagenomes.") - (license license:bsd-3) - (properties `((python2-variant . ,(delay python2-biom-format)))))) + (license license:bsd-3) + (properties `((python2-variant . ,(delay python2-biom-format)))))) (define-public python2-biom-format (let ((base (package-with-python2 (strip-python2-variant python-biom-format)))) -- cgit v1.2.3 From 239716fb0ba0a7cd81f9d59dcf5a2261b8efe4fa Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 19:47:07 +0100 Subject: gnu: python-biom-format: Update to 2.1.7. * gnu/packages/bioinformatics.scm (python-biom-format): Update to 2.1.7. [arguments]: Add phases "use-cython", "disable-broken-test", and "make-files-writable". [propagated-inputs]: Add python-flake8. [native-inputs]: Add python-cython, python-pytest, and python-pytest-cov. --- gnu/packages/bioinformatics.scm | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 52f6af6504..e32bf60e66 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -691,7 +691,7 @@ Python.") (define-public python-biom-format (package (name "python-biom-format") - (version "2.1.6") + (version "2.1.7") (source (origin (method git-fetch) @@ -703,17 +703,40 @@ Python.") (file-name (git-file-name name version)) (sha256 (base32 - "00yi8hkj3n7vdz8p8x93bi810f7cpm8rb0dd3kfhr2cpbmd2rsql")))) + "1rna16lyk5aqhnv0dp77wwaplias93f1vw28ad3jmyw6hwkai05v")))) (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'use-cython + (lambda _ (setenv "USE_CYTHON" "1") #t)) + (add-after 'unpack 'disable-broken-test + (lambda _ + (substitute* "biom/tests/test_cli/test_validate_table.py" + (("^(.+)def test_invalid_hdf5" m indent) + (string-append indent + "@npt.dec.skipif(True, msg='Guix')\n" + m))) + #t)) + (add-before 'reset-gzip-timestamps 'make-files-writable + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (for-each (lambda (file) (chmod file #o644)) + (find-files out "\\.gz")) + #t)))))) (propagated-inputs `(("python-numpy" ,python-numpy) ("python-scipy" ,python-scipy) + ("python-flake8" ,python-flake8) ("python-future" ,python-future) ("python-click" ,python-click) ("python-h5py" ,python-h5py) ("python-pandas" ,python-pandas))) (native-inputs - `(("python-nose" ,python-nose))) + `(("python-cython" ,python-cython) + ("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov) + ("python-nose" ,python-nose))) (home-page "http://www.biom-format.org") (synopsis "Biological Observation Matrix (BIOM) format utilities") (description -- cgit v1.2.3 From 7ca49ab57ae3ba80c8ba395d90c046d9220886c8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 19:48:21 +0100 Subject: gnu: ribodiff: Fetch sources from git. * gnu/packages/bioinformatics.scm (ribodiff)[source]: Fetch from git. --- gnu/packages/bioinformatics.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index e32bf60e66..088d3f5dcb 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -520,13 +520,14 @@ provides the Ribotaper pipeline.") (version "0.2.2") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/ratschlab/RiboDiff/" - "archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/ratschlab/RiboDiff.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0wpbwmfv05wdjxv7ikm664f7s7p7cqr8jnw99zrda0q67rl50aaj")))) + "0x75nlp7qnmm64jasbi6l21f2cy99r2cjyl6b4hr8zf2bq22drnz")))) (build-system python-build-system) (arguments `(#:python ,python-2 -- cgit v1.2.3 From 91b71cfbba03ea484cc6028b3384bf4609cbcf14 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 19:55:50 +0100 Subject: gnu: fxtract: Fetch sources from git. * gnu/packages/bioinformatics.scm (fxtract)[source]: Fetch from git. --- gnu/packages/bioinformatics.scm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 088d3f5dcb..9f0b8025da 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2768,16 +2768,14 @@ genes in incomplete assemblies or complete genomes.") (version "2.3") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/ctSkennerton/fxtract/archive/" - version ".tar.gz")) - (file-name (string-append "ctstennerton-util-" - (string-take util-commit 7) - "-checkout")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/ctSkennerton/fxtract.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0275cfdhis8517hm01is62062swmi06fxzifq7mr3knbbxjlaiwj")))) + "0hab3gpwf4w9s87qlbswq6ws1qqybh4dcqk79q1ahyldzai5fgp5")))) (build-system gnu-build-system) (arguments `(#:make-flags (list -- cgit v1.2.3 From f09e8abc5e6b115e497d49bdf7e1fb98ebfd8caf Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Wed, 7 Nov 2018 09:31:18 +0000 Subject: gnu: clementine: Build with sqlite-with-column-metadata. * gnu/packages/music.scm (clementine)[inputs]: Use sqlite-with-column-metadata. Signed-off-by: Leo Famulari --- gnu/packages/music.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index cdd06647e1..7f1d124233 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -284,7 +284,7 @@ score, keyboard, guitar, drum and controller views.") ("pulseaudio" ,pulseaudio) ("qtbase" ,qtbase) ("qtx11extras" ,qtx11extras) - ("sqlite" ,sqlite) + ("sqlite" ,sqlite-with-column-metadata) ("sparsehash" ,sparsehash) ("taglib" ,taglib))) (home-page "http://clementine-player.org") -- cgit v1.2.3 From b113f39019913ad8eda4d72624ce9769920d22cb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 19:59:56 +0100 Subject: gnu: gemma: Fetch sources from git. * gnu/packages/bioinformatics.scm (gemma)[source]: Fetch from git. --- gnu/packages/bioinformatics.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9f0b8025da..3cd0e03587 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2831,13 +2831,14 @@ comment or quality sections.") (name "gemma") (version "0.96") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/xiangzhou/GEMMA/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/xiangzhou/GEMMA.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "055ynn16gd12pf78n4vr2a9jlwsbwzajpdnf2y2yilg1krfff222")) + "0sa4mllp7890v5pss0mm02ik8yixl7az3vprcw3kp7qmr9gwrdai")) (patches (search-patches "gemma-intel-compat.patch")))) (inputs `(("gsl" ,gsl) -- cgit v1.2.3 From 152bebd9e0c7fc0863d6b82af014e61a8cb6a488 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 20:24:18 +0100 Subject: gnu: gemma: Update to 0.98. * gnu/local.mk (dist_patch_DATA): Remove patch. * gnu/packages/patches/gemma-intel-compat.patch: Remove file. * gnu/packages/bioinformatics.scm (gemma): Update to 0.98. [source]: Remove patch. [inputs]: Add eigen, gfortran:lib, and openblas. [arguments]: Add phase "find-eigen". --- gnu/local.mk | 1 - gnu/packages/bioinformatics.scm | 19 +++++++++--- gnu/packages/patches/gemma-intel-compat.patch | 44 --------------------------- 3 files changed, 15 insertions(+), 49 deletions(-) delete mode 100644 gnu/packages/patches/gemma-intel-compat.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index bfe93159dc..9a8330aa41 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -722,7 +722,6 @@ dist_patch_DATA = \ %D%/packages/patches/gd-fix-tests-on-i686.patch \ %D%/packages/patches/gd-freetype-test-failure.patch \ %D%/packages/patches/gdm-CVE-2018-14424.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 \ %D%/packages/patches/ghc-dont-pass-linker-flags-via-response-files.patch \ diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 3cd0e03587..5337b7bf02 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2829,7 +2829,7 @@ comment or quality sections.") (define-public gemma (package (name "gemma") - (version "0.96") + (version "0.98") (source (origin (method git-fetch) (uri (git-reference @@ -2838,11 +2838,13 @@ comment or quality sections.") (file-name (git-file-name name version)) (sha256 (base32 - "0sa4mllp7890v5pss0mm02ik8yixl7az3vprcw3kp7qmr9gwrdai")) - (patches (search-patches "gemma-intel-compat.patch")))) + "1s3ncnbn45r2hh1cvrqky1kbqq6546biypr4f5mkw1kqlrgyh0yg")))) (inputs - `(("gsl" ,gsl) + `(("eigen" ,eigen) + ("gfortran" ,gfortran "lib") + ("gsl" ,gsl) ("lapack" ,lapack) + ("openblas" ,openblas) ("zlib" ,zlib))) (build-system gnu-build-system) (arguments @@ -2857,6 +2859,15 @@ comment or quality sections.") #:phases (modify-phases %standard-phases (delete 'configure) + (add-after 'unpack 'find-eigen + (lambda* (#:key inputs #:allow-other-keys) + ;; Ensure that Eigen headers can be found + (setenv "CPLUS_INCLUDE_PATH" + (string-append (getenv "CPLUS_INCLUDE_PATH") + ":" + (assoc-ref inputs "eigen") + "/include/eigen3")) + #t)) (add-before 'build 'bin-mkdir (lambda _ (mkdir-p "bin") diff --git a/gnu/packages/patches/gemma-intel-compat.patch b/gnu/packages/patches/gemma-intel-compat.patch deleted file mode 100644 index f12ec56d9b..0000000000 --- a/gnu/packages/patches/gemma-intel-compat.patch +++ /dev/null @@ -1,44 +0,0 @@ -From da1ed24209121f7b0f03f360b1029d7125a38e70 Mon Sep 17 00:00:00 2001 -From: Efraim Flashner -Date: Tue, 4 Jul 2017 12:44:53 +0300 -Subject: [PATCH] Add NO_INTEL_COMPAT flag to Makefile. - -see also: https://github.com/xiangzhou/GEMMA/pull/47 - ---- - Makefile | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index 5bb8748..712b1ad 100644 ---- a/Makefile -+++ b/Makefile -@@ -11,6 +11,7 @@ - SYS = LNX - # Leave blank after "=" to disable; put "= 1" to enable - WITH_LAPACK = 1 -+NO_INTEL_COMPAT = - FORCE_32BIT = - FORCE_DYNAMIC = - DIST_NAME = gemma-0.96 -@@ -64,10 +65,13 @@ endif - HDR += $(SRC_DIR)/lapack.h - endif - --ifdef FORCE_32BIT -- CPPFLAGS += -m32 --else -- CPPFLAGS += -m64 -+ifdef NO_INTEL_COMPAT -+ else -+ ifdef FORCE_32BIT -+ CPPFLAGS += -m32 -+ else -+ CPPFLAGS += -m64 -+ endif - endif - - ifdef FORCE_DYNAMIC --- -2.13.2 - -- cgit v1.2.3 From 8d75adbf03ea8840d4c1e41a548861066e9ff8c3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 20:27:10 +0100 Subject: gnu: grit: Fetch sources from git. * gnu/packages/bioinformatics.scm (grit)[source]: Fetch from git. --- gnu/packages/bioinformatics.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 5337b7bf02..c7848b6ece 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2893,14 +2893,14 @@ association studies (GWAS).") (name "grit") (version "2.0.2") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/nboley/grit/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/nboley/grit.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "157in84dj70wimbind3x7sy1whs3h57qfgcnj2s6lrd38fbrb7mj")))) + "0b1lhf87n1qd0faw19s4r6i3cfz7k68xnnn0l7r97lqc5i3hg2rr")))) (build-system python-build-system) (arguments `(#:python ,python-2 -- cgit v1.2.3 From c8f02c1dcb36eca7ef0fd58239dcbf1d4c67f63c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 20:30:44 +0100 Subject: gnu: grit: Update to 2.0.5. * gnu/packages/bioinformatics.scm (grit): Update to 2.0.5. [arguments]: Simplify. --- gnu/packages/bioinformatics.scm | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index c7848b6ece..fb147a79c6 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2891,7 +2891,7 @@ association studies (GWAS).") (define-public grit (package (name "grit") - (version "2.0.2") + (version "2.0.5") (source (origin (method git-fetch) (uri (git-reference @@ -2900,7 +2900,7 @@ association studies (GWAS).") (file-name (git-file-name name version)) (sha256 (base32 - "0b1lhf87n1qd0faw19s4r6i3cfz7k68xnnn0l7r97lqc5i3hg2rr")))) + "1l5v8vfvfbrpmgnrvbrbv40d0arhxcnmxgv2f1mlcqfa3q6bkqm9")))) (build-system python-build-system) (arguments `(#:python ,python-2 @@ -2912,13 +2912,7 @@ association studies (GWAS).") (delete-file "grit/sparsify_support_fns.c") (delete-file "grit/call_peaks_support_fns.c") (substitute* "setup.py" - (("Cython.Setup") "Cython.Build") - ;; Add numpy include path to fix compilation - (("pyx\", \\]") - (string-append "pyx\", ], include_dirs = ['" - (assoc-ref inputs "python-numpy") - "/lib/python2.7/site-packages/numpy/core/include/" - "']"))) + (("Cython.Setup") "Cython.Build")) #t))))) (inputs `(("python-scipy" ,python2-scipy) -- cgit v1.2.3 From 57be690d912ad9e1683f80d4de2e1076ae27948d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 20:32:29 +0100 Subject: gnu: hisat2: Use versioned source URL. * gnu/packages/bioinformatics.scm (hisat2)[source]: Use versioned URL. --- gnu/packages/bioinformatics.scm | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index fb147a79c6..eae5236cad 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -3006,16 +3006,11 @@ particular, reads spanning multiple exons.") (source (origin (method url-fetch) - ;; FIXME: a better source URL is - ;; (string-append "ftp://ftp.ccb.jhu.edu/pub/infphilo/hisat2" - ;; "/downloads/hisat2-" version "-source.zip") - ;; with hash "0lywnr8kijwsc2aw10dwxic0n0yvip6fl3rjlvc8zzwahamy4x7g" - ;; but it is currently unavailable. - (uri "https://github.com/infphilo/hisat2/archive/cba6e8cb.tar.gz") - (file-name (string-append name "-" version ".tar.gz")) + (uri (string-append "ftp://ftp.ccb.jhu.edu/pub/infphilo/hisat2" + "/downloads/hisat2-" version "-source.zip")) (sha256 (base32 - "1mf2hdsyv7cd97xm9mp9a4qws02yrj95y6w6f6cdwnq0klp81r50")))) + "0lywnr8kijwsc2aw10dwxic0n0yvip6fl3rjlvc8zzwahamy4x7g")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target -- cgit v1.2.3 From b8a6230df3fbbeeddb7a0e6976e0b8581bd0ab6e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 20:36:07 +0100 Subject: gnu: java-htsjdk: Fetch sources from git. * gnu/packages/bioinformatics.scm (java-htsjdk)[source]: Fetch from git. --- gnu/packages/bioinformatics.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index eae5236cad..28d66a1826 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -3117,14 +3117,14 @@ from high-throughput sequencing assays.") (name "java-htsjdk") (version "2.3.0") ; last version without build dependency on gradle (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/samtools/htsjdk/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/samtools/htsjdk.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1ibhzzxsfc38nqyk9r8zqj6blfc1kh26iirypd4q6n90hs2m6nyq")) + "1b178ixcabanm834ydjl3jiakpyxdmki32hqfv2abrzn3rcwa28i")) (modules '((guix build utils))) (snippet ;; Delete pre-built binaries -- cgit v1.2.3 From f0731591a5f63917f757d7a9ebde081616a85b6a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 20:41:58 +0100 Subject: gnu: idr: Fetch sources from git. * gnu/packages/bioinformatics.scm (idr)[source]: Fetch from git. --- gnu/packages/bioinformatics.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 28d66a1826..4d2b29c0ab 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -3681,14 +3681,14 @@ data. It also provides the @command{bgzip}, @command{htsfile}, and (name "idr") (version "2.0.3") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/nboley/idr/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/nboley/idr.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1rjdly6daslw66r43g9md8znizlscn1sphycqyldzsidkc4vxqv3")) + "04j876h6z444v2q79drxx283d3k5snd72kj895wbalnl42206x9g")) ;; Delete generated C code. (snippet '(begin (delete-file "idr/inv_cdf.c") #t)))) -- cgit v1.2.3 From 6fe323bf2ef7d3fd665ed4ed4f27498d67aa3655 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 20:44:11 +0100 Subject: gnu: kaiju: Fetch sources from git. * gnu/packages/bioinformatics.scm (kaiju)[source]: Fetch from git. [arguments]: Remove redundant installation step. --- gnu/packages/bioinformatics.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 4d2b29c0ab..ce11066b54 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -3828,14 +3828,14 @@ data.") (name "kaiju") (version "1.6.2") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/bioinformatics-centre/kaiju/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/bioinformatics-centre/kaiju") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1kdn4rxs0kr9ibmrgrfcci71aa6j6gr71dbc8pff7731rpab6kj7")))) + "1c6gqir9djm3wpvfjm43i5vvvf36k3rsvr9fph76wlcy9aghpbah")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; There are no tests. @@ -3849,8 +3849,7 @@ data.") (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) (mkdir-p bin) (chdir "..") - (copy-recursively "bin" bin) - (copy-recursively "util" bin)) + (copy-recursively "bin" bin)) #t))))) (inputs `(("perl" ,perl) -- cgit v1.2.3 From 2dc28391f3a52d5940d4920eb4c7e69b5a60bde6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 20:47:22 +0100 Subject: gnu: kaiju: Update to 1.6.3. * gnu/packages/bioinformatics.scm (kaiju): Update to 1.6.3. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index ce11066b54..1fac960eff 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -3826,7 +3826,7 @@ data.") (define-public kaiju (package (name "kaiju") - (version "1.6.2") + (version "1.6.3") (source (origin (method git-fetch) (uri (git-reference @@ -3835,7 +3835,7 @@ data.") (file-name (git-file-name name version)) (sha256 (base32 - "1c6gqir9djm3wpvfjm43i5vvvf36k3rsvr9fph76wlcy9aghpbah")))) + "119pzi0ddzv9mjg4wwa6han0cwr3k3ssn7kirvsjfcq05mi5ka0x")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; There are no tests. -- cgit v1.2.3 From 1badc85068ee0be2a028c1b94a3dd285901bc391 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 27 Sep 2018 18:41:50 +0200 Subject: 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 +- gnu/packages/patches/ceph-detect-rocksdb.patch | 24 +++++++++ gnu/packages/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 (limited to 'gnu') 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) -- cgit v1.2.3 From b31e1561611ebe4916890183b24e6e13cb83bf59 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 7 Nov 2018 16:10:58 +0100 Subject: gnu: fio: Update to 3.11. * gnu/packages/benchmark.scm (fio): Update to 3.11. [source]: Use bz2 compressed tarball. --- gnu/packages/benchmark.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index be3662798b..9d792021bd 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -35,14 +35,14 @@ (define-public fio (package (name "fio") - (version "3.7") + (version "3.11") (source (origin (method url-fetch) (uri (string-append "http://brick.kernel.dk/snaps/" - "fio-" version ".tar.gz")) + "fio-" version ".tar.bz2")) (sha256 (base32 - "0rw9jf2ikm19lq4jizavdvvp3vfvlm3annq7jsxl2y5nf1pi2qr7")))) + "0s8m0wcz5j6sa1hblj80wk3syy5b4shg7y3gabvm9xa3wj0lzasa")))) (build-system gnu-build-system) (arguments '(#:test-target "test" -- cgit v1.2.3 From 497fc04d8fe7adfc74646f2e3f3baba0410a3ae3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 20:49:19 +0100 Subject: gnu: mash: Fetch sources from git. * gnu/packages/bioinformatics.scm (mash)[source]: Fetch from git. --- gnu/packages/bioinformatics.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 1fac960eff..625c074349 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -3979,14 +3979,14 @@ sequences).") (name "mash") (version "2.0") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/marbl/mash/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/marbl/mash.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "00fx14vpmgsijwxd1xql3if934l82v8ckqgjjyyhnr36qb9qrskv")) + "13h6v4wzfflb5raxwlqmkl2km54m3izm30f1w9p9scjmfrnfn0wx")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 5c1f35e71ba4176904b1909c7738d43c61eea475 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 20:51:55 +0100 Subject: gnu: mash: Update to 2.1. * gnu/packages/bioinformatics.scm (mash): Update to 2.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 625c074349..5cd5d744cb 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -3977,7 +3977,7 @@ sequences).") (define-public mash (package (name "mash") - (version "2.0") + (version "2.1") (source (origin (method git-fetch) (uri (git-reference @@ -3986,7 +3986,7 @@ sequences).") (file-name (git-file-name name version)) (sha256 (base32 - "13h6v4wzfflb5raxwlqmkl2km54m3izm30f1w9p9scjmfrnfn0wx")) + "049hwcc059p2fd9vwndn63laifvvsi0wmv84i6y1fr79k15dxwy6")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From b58d9e4aa29d90ae47748c4134e9da53f82c13f6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 20:52:44 +0100 Subject: gnu: metabat: Fetch sources from git. * gnu/packages/bioinformatics.scm (metabat)[source]: Fetch from git. --- gnu/packages/bioinformatics.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 5cd5d744cb..e729c173e8 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4040,13 +4040,14 @@ form of assemblies or reads.") (version "2.12.1") (source (origin - (method url-fetch) - (uri (string-append "https://bitbucket.org/berkeleylab/metabat/get/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://bitbucket.org/berkeleylab/metabat.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1hmvdalz3zj5sqqklg0l4npjdv37cv2hsdi1al9iby2ndxjs1b73")) + "0hyg2smw1nz69mfvjpk45xyyychmda92c80a0cv7baji84ri4iyn")) (patches (search-patches "metabat-fix-compilation.patch")))) (build-system scons-build-system) (arguments -- cgit v1.2.3 From 9d94ca0ebf3d17e3bcf3f9322038e9f29798a9e7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 20:59:28 +0100 Subject: gnu: minced: Fetch sources from git. * gnu/packages/bioinformatics.scm (minced)[source]: Fetch from git. --- gnu/packages/bioinformatics.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index e729c173e8..a2eb264a59 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4112,14 +4112,14 @@ probabilistic distances of genome abundance and tetranucleotide frequency.") (name "minced") (version "0.2.0") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/ctSkennerton/minced/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/ctSkennerton/minced.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0wxmlsapxfpxfd3ps9636h7i2xy6la8i42mwh0j2lsky63h63jp1")))) + "04qp70vawbbp0q5q4hp6vjcgzfhhdrdcaxkn58av9hj79p9gfq2q")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From 6052264b56856a9769cc648ac21c1811934f6211 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 21:01:59 +0100 Subject: gnu: minced: Update to 0.3.2. * gnu/packages/bioinformatics.scm (minced): Update to 0.3.2. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a2eb264a59..7b50cebd2a 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4110,7 +4110,7 @@ probabilistic distances of genome abundance and tetranucleotide frequency.") (define-public minced (package (name "minced") - (version "0.2.0") + (version "0.3.2") (source (origin (method git-fetch) (uri (git-reference @@ -4119,7 +4119,7 @@ probabilistic distances of genome abundance and tetranucleotide frequency.") (file-name (git-file-name name version)) (sha256 (base32 - "04qp70vawbbp0q5q4hp6vjcgzfhhdrdcaxkn58av9hj79p9gfq2q")))) + "1f5h9him0gd355cnx7p6pnxpknhckd4g0v62mg8zyhfbx9as25fv")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From a2b9d6a8d05aff0acba2d40ac45790d282c814bf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 21:15:28 +0100 Subject: gnu: pplacer: Fetch sources from git. * gnu/packages/bioinformatics.scm (pplacer)[source]: Fetch from git. [arguments]: Make files writable; use INVOKE. --- gnu/packages/bioinformatics.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 7b50cebd2a..62683ad07f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4310,19 +4310,20 @@ interrupted by stop codons. OrfM finds and prints these ORFs.") (license license:lgpl3+))) (define-public pplacer - (let ((commit "g807f6f3")) + (let ((commit "807f6f3")) (package (name "pplacer") ;; The commit should be updated with each version change. (version "1.1.alpha19") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/matsen/pplacer/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/matsen/pplacer.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "0z1lnd2s8sh6kpzg106wzbh2szw7h0hvq8syd5a6wv4rmyyz6x0f")))) + (base32 "11ppbbbx20p2g9wj3ff64dhnarb12q79v7qh4rk0gj6lkbz4n7cn")))) (build-system ocaml-build-system) (arguments `(#:ocaml ,ocaml-4.01 @@ -4339,11 +4340,12 @@ interrupted by stop codons. OrfM finds and prints these ORFs.") (local-dir "cddlib_guix")) (mkdir local-dir) (with-directory-excursion local-dir - (system* "tar" "xvf" cddlib-src)) + (invoke "tar" "xvf" cddlib-src)) (let ((cddlib-src-folder (string-append local-dir "/" (list-ref (scandir local-dir) 2) "/lib-src"))) + (for-each make-file-writable (find-files "cdd_src" ".*")) (for-each (lambda (file) (copy-file file -- cgit v1.2.3 From 1a20bcadf3d75cfce0750c58dee3d5ab23327b99 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 21:25:12 +0100 Subject: gnu: r-seqgl: Fetch sources from git. * gnu/packages/bioinformatics.scm (r-seqgl)[source]: Fetch from git. --- gnu/packages/bioinformatics.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 62683ad07f..c65937ad6c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8877,13 +8877,14 @@ Sequences.") (version "1.1.4") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/ManuSetty/SeqGL/" - "archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/ManuSetty/SeqGL.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0pnk1p3sci5yipyc8xnb6jbmydpl80fld927xgnbcv104hy8h8yh")))) + "1r6ywvhxl3ffv48lgj7sbd582mcc6dha3ksgc2qjlvjrnkbj3799")))) (build-system r-build-system) (propagated-inputs `(("r-biostrings" ,r-biostrings) -- cgit v1.2.3 From 4257c10ad28bbac98a4ffe86d02c9ef83cfa1a8b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 21:29:40 +0100 Subject: gnu: kentutils: Fetch sources from git. * gnu/packages/bioinformatics.scm (kentutils)[source]: Fetch from git. [arguments]: Add phase "fix-permissions". --- gnu/packages/bioinformatics.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index c65937ad6c..b5523c31fd 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11570,13 +11570,14 @@ models. TADbit is complemented by TADkit for visualizing 3D models.") (version "302.0.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/ENCODE-DCC/kentUtils/" - "archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/ENCODE-DCC/kentUtils.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "134aja3k1cj32kbk1nnw0q9gxjb2krr15q6sga8qldzvc0585rmm")) + "0n1wbyjpzii2b9qhyp9r1q76j623cggpg3y8fmw78ld3z4y7ivha")) (modules '((guix build utils) (srfi srfi-26) (ice-9 ftw))) @@ -11627,6 +11628,8 @@ models. TADbit is complemented by TADkit for visualizing 3D models.") #:tests? #f #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-permissions + (lambda _ (make-file-writable "src/inc/localEnvironment.mk") #t)) (add-after 'unpack 'fix-paths (lambda _ (substitute* "Makefile" -- cgit v1.2.3 From 55698df26013bff8646f8c7f1ca135102dad3cb8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 21:37:43 +0100 Subject: gnu: libgff: Fetch sources from git. * gnu/packages/bioinformatics.scm (libgff)[source]: Fetch from git. --- gnu/packages/bioinformatics.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b5523c31fd..4682d26279 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11925,14 +11925,14 @@ accurate as existing quantification tools.") (name "libgff") (version "1.0") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/Kingsford-Group/" - "libgff/archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/Kingsford-Group/libgff.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0vc4nxyhlm6g9vvmx5l4lfs5pnvixsv1hiiy4kddf2y3p6jna8ls")))) + "0n6vfjnq7a2mianipscbshrvbncss8z4zkgkbjw754p9043nfkps")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; no tests included (home-page "https://github.com/Kingsford-Group/libgff") -- cgit v1.2.3 From 2b773a9273882b270306154223067a56e1e89e38 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 21:41:20 +0100 Subject: gnu: sra-tools: Fetch sources from git. * gnu/packages/bioinformatics.scm (sra-tools)[source]: Fetch from git. --- gnu/packages/bioinformatics.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 4682d26279..0bcfcd4dcf 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5654,14 +5654,14 @@ sequence itself can be retrieved from these databases.") (version "2.8.2-1") (source (origin - (method url-fetch) - (uri - (string-append "https://github.com/ncbi/sra-tools/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/ncbi/sra-tools.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1camsijmvv2s45mb4iyf44ghl4gkd4rl0viphpcgl3ccchy32a0g")))) + "12ln0pk8yajhmmj9xsfwa1qgv5m05ji40jsg17wdcls62zz6fwrk")))) (build-system gnu-build-system) (arguments `(#:parallel-build? #f ; not supported -- cgit v1.2.3 From b44b1f08f6945ea8370746cfdadb44c7dea9ea3e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 7 Nov 2018 23:13:02 +0200 Subject: gnu: hplip: Remove bundled non-free blobs. This fixes . * gnu/packages/cups.scm (hplip)[source]: Add patch. Update snippet to remove non-free code and binary blobs. * gnu/packages/patches/hplip-remove-imageprocessor.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/cups.scm | 6 +- .../patches/hplip-remove-imageprocessor.patch | 232 +++++++++++++++++++++ 3 files changed, 238 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/hplip-remove-imageprocessor.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 9a8330aa41..c627577e41 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -808,6 +808,7 @@ dist_patch_DATA = \ %D%/packages/patches/higan-remove-march-native-flag.patch \ %D%/packages/patches/hubbub-sort-entities.patch \ %D%/packages/patches/hurd-fix-eth-multiplexer-dependency.patch \ + %D%/packages/patches/hplip-remove-imageprocessor.patch \ %D%/packages/patches/hydra-disable-darcs-test.patch \ %D%/packages/patches/icecat-avoid-bundled-libraries.patch \ %D%/packages/patches/icecat-CVE-2018-12383.patch \ diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 4259648c69..04a533de02 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -405,9 +405,13 @@ device-specific programs to convert and print many types of files.") (base32 "0g3q5mm2crjyc1z4z6gv4lam6sc5d3diz704djrnpqadk4q3h290")) (modules '((guix build utils))) + (patches (search-patches "hplip-remove-imageprocessor.patch")) (snippet - ;; Fix type mismatch. '(begin + ;; Delete non-free blobs + (for-each delete-file (find-files "." "\\.so$")) + (delete-file "prnt/hpcups/ImageProcessor.h") + ;; Fix type mismatch. (substitute* "prnt/hpcups/genPCLm.cpp" (("boolean") "bool")) #t)))) diff --git a/gnu/packages/patches/hplip-remove-imageprocessor.patch b/gnu/packages/patches/hplip-remove-imageprocessor.patch new file mode 100644 index 0000000000..cde3ecba2d --- /dev/null +++ b/gnu/packages/patches/hplip-remove-imageprocessor.patch @@ -0,0 +1,232 @@ +This patch is based heavily on the Debian patch. + +https://salsa.debian.org/printing-team/hplip/raw/debian/3.18.10+dfsg0-1/debian/patches/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch + +--- + Makefile.am | 22 +++------------------- + Makefile.in | 33 +++++---------------------------- + prnt/hpcups/HPCupsFilter.cpp | 21 --------------------- + 3 files changed, 8 insertions(+), 68 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index ef6480f..ecada5c 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -166,7 +166,7 @@ if !HPLIP_CLASS_DRIVER + dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py + endif #HPLIP_CLASS_DRIVER + +-dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template prnt/hpcups/libImageProcessor-x86_64.so prnt/hpcups/libImageProcessor-x86_32.so ++dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template + dist_noinst_SCRIPTS += dat2drv.py install.py hplip-install init-suse-firewall init-iptables-firewall class_rpm_build.sh hplipclassdriver.spec createPPD.sh Makefile_dat2drv hpijs-drv + + if !HPLIP_CLASS_DRIVER +@@ -590,11 +590,10 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/HPCupsFilter.h prnt/hp + prnt/hpcups/flate_colorspace.h prnt/hpcups/RunLenEncoding.h prnt/hpcups/common_defines.h \ + prnt/hpcups/genPCLm.h \ + common/utils.c common/utils.h prnt/hpcups/Hbpl1_Wrapper.cpp prnt/hpcups/genPCLm.cpp \ +- prnt/hpcups/genJPEGStrips.cpp prnt/hpcups/RunLenEncoding.cpp \ +- prnt/hpcups/ImageProcessor.h ++ prnt/hpcups/genJPEGStrips.cpp prnt/hpcups/RunLenEncoding.cpp + + hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS) +-hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS) ++hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lcups -lcupsimage -lz $(DBUS_LIBS) + #else + #hpcupsdir = $(cupsfilterdir) + #hpcups_PROGRAMS = hpcups +@@ -679,21 +678,10 @@ printpluginsdir=$(cupsfilterdir) + + + dist_filter_DATA = hpcups hpps dat2drv +-dist_printplugins_DATA = prnt/plugins/hbpl1-arm32.so prnt/plugins/hbpl1-arm64.so prnt/plugins/hbpl1-x86_32.so prnt/plugins/hbpl1-x86_64.so prnt/plugins/lj-arm32.so prnt/plugins/lj-arm64.so prnt/plugins/lj-x86_32.so prnt/plugins/lj-x86_64.so + endif #HPLIP_CLASS_DRIVER + + install-data-hook: + if HPLIP_BUILD +- if [ \( "$(UNAME)" = "x86_64" -a -d "$(libdir)/" \) ]; then \ +- cp prnt/hpcups/libImageProcessor-x86_64.so $(libdir)/ ; \ +- chmod 775 $(libdir)/libImageProcessor-x86_64.so ; \ +- ln -sf $(libdir)/libImageProcessor-x86_64.so $(libdir)/libImageProcessor.so ; \ +- fi; \ +- if [ \( \( "$(UNAME)" = "i686" -o "$(UNAME)" = "i386" \) -a -d "$(libdir)/" \) ]; then \ +- cp prnt/hpcups/libImageProcessor-x86_32.so $(libdir)/ ; \ +- chmod 775 $(libdir)/libImageProcessor-x86_32.so ; \ +- ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \ +- fi + if !HPLIP_CLASS_DRIVER + # If scanner build, add hpaio entry to sane dll.conf. + if [ "$(scan_build)" = "yes" ]; then \ +@@ -874,10 +862,6 @@ if HPLIP_CLASS_DRIVER + rm -rf $(distdir)/setup.py + rm -rf $(distdir)/systray.py + rm -rf $(distdir)/timedate.py +- rm -rf $(distdir)/prnt/plugins/lj-arm32.so +- rm -rf $(distdir)/prnt/plugins/lj-arm64.so +- rm -rf $(distdir)/prnt/plugins/lj-x86_32.so +- rm -rf $(distdir)/prnt/plugins/lj-x86_64.so + rm -rf $(distdir)/hpijs-drv + rm -rf $(distdir)/prnt/hpcups/ + rm -rf $(distdir)/prnt/ps/ +diff --git a/Makefile.in b/Makefile.in +index 910a268..cd44203 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -103,7 +103,7 @@ DIST_COMMON = $(am__configure_deps) \ + + # ip library + @HPLIP_BUILD_TRUE@am__append_12 = libhpip.la +-@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_13 = prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template prnt/hpcups/libImageProcessor-x86_64.so prnt/hpcups/libImageProcessor-x86_32.so ++@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_13 = prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template + @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_14 = dat2drv.py install.py hplip-install init-suse-firewall init-iptables-firewall class_rpm_build.sh hplipclassdriver.spec createPPD.sh Makefile_dat2drv hpijs-drv + @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@am__append_15 = scan/sane/hpaio.desc \ + @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ installer/text_install.py \ +@@ -500,8 +500,7 @@ am__hpcups_SOURCES_DIST = prnt/hpcups/HPCupsFilter.cpp \ + prnt/hpcups/RunLenEncoding.h prnt/hpcups/common_defines.h \ + prnt/hpcups/genPCLm.h common/utils.c common/utils.h \ + prnt/hpcups/Hbpl1_Wrapper.cpp prnt/hpcups/genPCLm.cpp \ +- prnt/hpcups/genJPEGStrips.cpp prnt/hpcups/RunLenEncoding.cpp \ +- prnt/hpcups/ImageProcessor.h ++ prnt/hpcups/genJPEGStrips.cpp prnt/hpcups/RunLenEncoding.cpp + @HPCUPS_INSTALL_TRUE@am_hpcups_OBJECTS = \ + @HPCUPS_INSTALL_TRUE@ hpcups-HPCupsFilter.$(OBJEXT) \ + @HPCUPS_INSTALL_TRUE@ hpcups-dbuscomm.$(OBJEXT) \ +@@ -723,8 +722,7 @@ am__dist_locatedriver_DATA_DIST = locatedriver + am__dist_models_DATA_DIST = data/models/models.dat + am__dist_noinst_DATA_DIST = prnt/drv/hpijs.drv.in.template \ + prnt/drv/hpcups.drv.in.template \ +- prnt/hpcups/libImageProcessor-x86_64.so \ +- prnt/hpcups/libImageProcessor-x86_32.so scan/sane/hpaio.desc \ ++ scan/sane/hpaio.desc \ + installer/text_install.py data/localization/hplip_de.ts \ + data/localization/hplip_es.ts data/localization/hplip_fr.ts \ + data/localization/hplip_it.ts data/localization/hplip_pt.ts \ +@@ -1932,11 +1930,6 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-designjet_z6810ps_42in-ps.ppd.gz \ + ppd/classppd/ps/hp-postscript-inkjet.ppd.gz \ + ppd/classppd/ps/hp-postscript-laserjet-pro.ppd.gz \ + ppd/classppd/ps/hp-postscript-laserjet.ppd.gz +-am__dist_printplugins_DATA_DIST = prnt/plugins/hbpl1-arm32.so \ +- prnt/plugins/hbpl1-arm64.so prnt/plugins/hbpl1-x86_32.so \ +- prnt/plugins/hbpl1-x86_64.so prnt/plugins/lj-arm32.so \ +- prnt/plugins/lj-arm64.so prnt/plugins/lj-x86_32.so \ +- prnt/plugins/lj-x86_64.so + am__dist_prnt_DATA_DIST = prnt/cups.py prnt/__init__.py prnt/ldl.py \ + prnt/pcl.py prnt/colorcal.py + am__dist_rules_DATA_DIST = data/rules/56-hpmud.rules \ +@@ -4665,11 +4658,10 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpijs + @HPCUPS_INSTALL_TRUE@ prnt/hpcups/flate_colorspace.h prnt/hpcups/RunLenEncoding.h prnt/hpcups/common_defines.h \ + @HPCUPS_INSTALL_TRUE@ prnt/hpcups/genPCLm.h \ + @HPCUPS_INSTALL_TRUE@ common/utils.c common/utils.h prnt/hpcups/Hbpl1_Wrapper.cpp prnt/hpcups/genPCLm.cpp \ +-@HPCUPS_INSTALL_TRUE@ prnt/hpcups/genJPEGStrips.cpp prnt/hpcups/RunLenEncoding.cpp \ +-@HPCUPS_INSTALL_TRUE@ prnt/hpcups/ImageProcessor.h ++@HPCUPS_INSTALL_TRUE@ prnt/hpcups/genJPEGStrips.cpp prnt/hpcups/RunLenEncoding.cpp + + @HPCUPS_INSTALL_TRUE@hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS) +-@HPCUPS_INSTALL_TRUE@hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS) ++@HPCUPS_INSTALL_TRUE@hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lcups -lcupsimage -lz $(DBUS_LIBS) + #else + #hpcupsdir = $(cupsfilterdir) + #hpcups_PROGRAMS = hpcups +@@ -4717,7 +4709,6 @@ ppddir = $(hpppddir) + @HPLIP_CLASS_DRIVER_TRUE@filterdir = $(cupsfilterdir) + @HPLIP_CLASS_DRIVER_TRUE@printpluginsdir = $(cupsfilterdir) + @HPLIP_CLASS_DRIVER_TRUE@dist_filter_DATA = hpcups hpps dat2drv +-@HPLIP_CLASS_DRIVER_TRUE@dist_printplugins_DATA = prnt/plugins/hbpl1-arm32.so prnt/plugins/hbpl1-arm64.so prnt/plugins/hbpl1-x86_32.so prnt/plugins/hbpl1-x86_64.so prnt/plugins/lj-arm32.so prnt/plugins/lj-arm64.so prnt/plugins/lj-x86_32.so prnt/plugins/lj-x86_64.so + all: all-am + + .SUFFIXES: +@@ -9380,16 +9371,6 @@ uninstall-am: uninstall-apparmor_abstractionDATA \ + + + install-data-hook: +-@HPLIP_BUILD_TRUE@ if [ \( "$(UNAME)" = "x86_64" -a -d "$(libdir)/" \) ]; then \ +-@HPLIP_BUILD_TRUE@ cp prnt/hpcups/libImageProcessor-x86_64.so $(libdir)/ ; \ +-@HPLIP_BUILD_TRUE@ chmod 775 $(libdir)/libImageProcessor-x86_64.so ; \ +-@HPLIP_BUILD_TRUE@ ln -sf $(libdir)/libImageProcessor-x86_64.so $(libdir)/libImageProcessor.so ; \ +-@HPLIP_BUILD_TRUE@ fi; \ +-@HPLIP_BUILD_TRUE@ if [ \( \( "$(UNAME)" = "i686" -o "$(UNAME)" = "i386" \) -a -d "$(libdir)/" \) ]; then \ +-@HPLIP_BUILD_TRUE@ cp prnt/hpcups/libImageProcessor-x86_32.so $(libdir)/ ; \ +-@HPLIP_BUILD_TRUE@ chmod 775 $(libdir)/libImageProcessor-x86_32.so ; \ +-@HPLIP_BUILD_TRUE@ ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \ +-@HPLIP_BUILD_TRUE@ fi + # If scanner build, add hpaio entry to sane dll.conf. + @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ if [ "$(scan_build)" = "yes" ]; then \ + @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ $(mkinstalldirs) $(DESTDIR)/etc/sane.d; \ +@@ -9556,10 +9537,6 @@ dist-hook: + @HPLIP_CLASS_DRIVER_TRUE@ rm -rf $(distdir)/setup.py + @HPLIP_CLASS_DRIVER_TRUE@ rm -rf $(distdir)/systray.py + @HPLIP_CLASS_DRIVER_TRUE@ rm -rf $(distdir)/timedate.py +-@HPLIP_CLASS_DRIVER_TRUE@ rm -rf $(distdir)/prnt/plugins/lj-arm32.so +-@HPLIP_CLASS_DRIVER_TRUE@ rm -rf $(distdir)/prnt/plugins/lj-arm64.so +-@HPLIP_CLASS_DRIVER_TRUE@ rm -rf $(distdir)/prnt/plugins/lj-x86_32.so +-@HPLIP_CLASS_DRIVER_TRUE@ rm -rf $(distdir)/prnt/plugins/lj-x86_64.so + @HPLIP_CLASS_DRIVER_TRUE@ rm -rf $(distdir)/hpijs-drv + @HPLIP_CLASS_DRIVER_TRUE@ rm -rf $(distdir)/prnt/hpcups/ + @HPLIP_CLASS_DRIVER_TRUE@ rm -rf $(distdir)/prnt/ps/ +diff --git a/prnt/hpcups/HPCupsFilter.cpp b/prnt/hpcups/HPCupsFilter.cpp +index 5b282d8..0bacfaf 100644 +--- a/prnt/hpcups/HPCupsFilter.cpp ++++ b/prnt/hpcups/HPCupsFilter.cpp +@@ -31,7 +31,6 @@ + \*****************************************************************************/ + + #include "HPCupsFilter.h" +-#include "ImageProcessor.h" + + #include + #include +@@ -637,16 +636,10 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster) + + + sprintf(hpPreProcessedRasterFile, "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name); +- image_processor_t* imageProcessor = imageProcessorCreate(); + + while (cupsRasterReadHeader2(cups_raster, &cups_header)) + { + +- IMAGE_PROCESSOR_ERROR result = imageProcessorStartPage(imageProcessor, &cups_header); +- if (result != IPE_SUCCESS){ +- dbglog("DEBUG: imageProcessorStartPage failed result = %d\n", result); +- } +- + current_page_number++; + + if (current_page_number == 1) { +@@ -745,12 +738,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster) + color_raster = rgbRaster; + black_raster = kRaster; + +- result = imageProcessorProcessLine(imageProcessor, m_pPrinterBuffer, cups_header.cupsBytesPerLine); +- if (result != IPE_SUCCESS){ +- dbglog("DEBUG: imageProcessorProcessLine failed result = %d\n", result); +- } +- +- + if ((y == 0) && !is_ljmono) { + //For ljmono, make sure that first line is not a blankRaster line.Otherwise printer + //may not skip blank lines before actual data +@@ -780,12 +767,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster) + } + } // for() loop end + +- result = imageProcessorEndPage(imageProcessor); +- if (result != IPE_SUCCESS){ +- dbglog("DEBUG: imageProcessorEndPage failed result = %d\n", result); +- } +- +- + m_Job.NewPage(); + if (err != NO_ERROR) { + break; +@@ -800,8 +781,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster) + rgbRaster = NULL; + } + +- imageProcessorDestroy(imageProcessor); +- + unlink(hpPreProcessedRasterFile); + return ret_status; + } +-- +2.19.1 + -- cgit v1.2.3 From 5e242b02c37e8c5189a52136a32067bca0767082 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 22:17:58 +0100 Subject: gnu: pyicoteo: Fetch sources from git. * gnu/packages/bioinformatics.scm (pyicoteo)[source]: Fetch from git. --- gnu/packages/bioinformatics.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 0bcfcd4dcf..9217a58154 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4670,13 +4670,14 @@ large-scale data and can be applied to hundreds of species at once.") (version "2.0.7") (source (origin - (method url-fetch) - (uri (string-append "https://bitbucket.org/regulatorygenomicsupf/" - "pyicoteo/get/v" version ".tar.bz2")) - (file-name (string-append name "-" version ".tar.bz2")) + (method git-fetch) + (uri (git-reference + (url "https://bitbucket.org/regulatorygenomicsupf/pyicoteo.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0d6087f29xp8wxwlj111c3sylli98n0l8ry58c51ixzq0zfm50wa")))) + "0hz5g8d25lbjy1wpscr490l0lmyvaix893hhax4fxnh1h9w34w8p")))) (build-system python-build-system) (arguments `(#:python ,python-2 ; does not work with Python 3 -- cgit v1.2.3 From 4715d4af171bed48c60dd6d40ea2d4a0688d4f8a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 22:24:34 +0100 Subject: gnu: raxml: Fetch sources from git. * gnu/packages/bioinformatics.scm (raxml)[source]: Fetch from git. --- gnu/packages/bioinformatics.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9217a58154..fa8d873b49 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4856,15 +4856,14 @@ extremely diverse sets of genomes.") (version "8.2.10") (source (origin - (method url-fetch) - (uri - (string-append - "https://github.com/stamatak/standard-RAxML/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/stamatak/standard-RAxML.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "13s7aspfdcfr6asynwdg1x6vznys6pzap5f8wsffbnnwpkkg9ya8")))) + "1crf5xwchzlals3ypgb9gkm3yzllfp6bn571abdjc21q8c4x7v7k")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; There are no tests. -- cgit v1.2.3 From d9ba126d17b98fbfb5fd68e63375232d2a5120d6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 22:25:13 +0100 Subject: gnu: python2-biom-format: Fix build. This is a follow-up to commit 239716fb0ba0a7cd81f9d59dcf5a2261b8efe4fa. * gnu/packages/bioinformatics.scm (python2-biom-format)[arguments]: Modify phases of base package. --- gnu/packages/bioinformatics.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index fa8d873b49..d212d2e8b8 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -753,15 +753,15 @@ e.g. microbiome samples, genomes, metagenomes.") (package (inherit base) (arguments - `(#:phases - (modify-phases %standard-phases - ;; Do not require the unmaintained pyqi library. - (add-after 'unpack 'remove-pyqi - (lambda _ - (substitute* "setup.py" - (("install_requires.append\\(\"pyqi\"\\)") "pass")) - #t))) - ,@(package-arguments base)))))) + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases) + `(modify-phases ,phases + ;; Do not require the unmaintained pyqi library. + (add-after 'unpack 'remove-pyqi + (lambda _ + (substitute* "setup.py" + (("install_requires.append\\(\"pyqi\"\\)") "pass")) + #t))))))))) (define-public bioperl-minimal (let* ((inputs `(("perl-module-build" ,perl-module-build) -- cgit v1.2.3 From b9d0c3564b279c6bfbbd3d9bf3f3ffcf5d161440 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 22:26:19 +0100 Subject: gnu: raxml: Update to 8.2.12. * gnu/packages/bioinformatics.scm (raxml): Update to 8.2.12. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index d212d2e8b8..a5554aed7f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4853,7 +4853,7 @@ extremely diverse sets of genomes.") (define-public raxml (package (name "raxml") - (version "8.2.10") + (version "8.2.12") (source (origin (method git-fetch) @@ -4863,7 +4863,7 @@ extremely diverse sets of genomes.") (file-name (git-file-name name version)) (sha256 (base32 - "1crf5xwchzlals3ypgb9gkm3yzllfp6bn571abdjc21q8c4x7v7k")))) + "1jqjzhch0rips0vp04prvb8vmc20c5pdmsqn8knadcf91yy859fh")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; There are no tests. -- cgit v1.2.3 From 019fcdf20af9de5860d7005fe5fb7adef222ce59 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 22:33:06 +0100 Subject: gnu: seqtk: Fetch sources from git. * gnu/packages/bioinformatics.scm (seqtk)[source]: Fetch from git. --- gnu/packages/bioinformatics.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a5554aed7f..b98be8eb51 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5870,15 +5870,15 @@ is one that takes arguments.") (name "seqtk") (version "1.2") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/lh3/seqtk/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/lh3/seqtk.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0ywdyzpmfiz2wp6ampbzqg4y8bj450nfgqarpamg045b8mk32lxx")) - (modules '((guix build utils))) + "1mdkgmzdy734a0na9hxbl4k41jjkm87bvjbm7bdbh50fsra86f93")) + (modules '((guix build utils))) (snippet '(begin ;; Remove extraneous header files, as is done in the seqtk -- cgit v1.2.3 From 63f3255e13be8d1352031c78a37131c2c6644bdb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 22:34:41 +0100 Subject: gnu: seqtk: Update to 1.3. * gnu/packages/bioinformatics.scm (seqtk): Update to 1.3. [source]: Remove outdated snippet. [arguments]: Use INVOKE and return #T unconditionally. --- gnu/packages/bioinformatics.scm | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b98be8eb51..670bea5cd4 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5868,7 +5868,7 @@ is one that takes arguments.") (define-public seqtk (package (name "seqtk") - (version "1.2") + (version "1.3") (source (origin (method git-fetch) (uri (git-reference @@ -5877,15 +5877,7 @@ is one that takes arguments.") (file-name (git-file-name name version)) (sha256 (base32 - "1mdkgmzdy734a0na9hxbl4k41jjkm87bvjbm7bdbh50fsra86f93")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Remove extraneous header files, as is done in the seqtk - ;; master branch. - (for-each (lambda (file) (delete-file file)) - (list "ksort.h" "kstring.h" "kvec.h")) - #t)))) + "1bfzlqa84b5s1qi22blmmw2s8xdyp9h9ydcq22pfjhh5gab3yz6l")))) (build-system gnu-build-system) (arguments `(#:phases @@ -5893,11 +5885,12 @@ is one that takes arguments.") (delete 'configure) (replace 'check ;; There are no tests, so we just run a sanity check. - (lambda _ (zero? (system* "./seqtk" "seq")))) + (lambda _ (invoke "./seqtk" "seq") #t)) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let ((bin (string-append (assoc-ref outputs "out") "/bin/"))) - (install-file "seqtk" bin))))))) + (install-file "seqtk" bin) + #t)))))) (inputs `(("zlib" ,zlib))) (home-page "https://github.com/lh3/seqtk") -- cgit v1.2.3 From 37e285be43dcbbb060d07132884b23f597a20b94 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 22:38:53 +0100 Subject: gnu: preseq: Fetch sources from git. * gnu/packages/bioinformatics.scm (preseq)[source]: Fetch from git. --- gnu/packages/bioinformatics.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 670bea5cd4..82a4cbd9ec 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5556,12 +5556,13 @@ structures, classes for genomic regions, mapped sequencing reads, etc.") (name "preseq") (version "2.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/smithlabcode/" - "preseq/archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/smithlabcode/preseq.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "08r684l50pnxjpvmhzjgqq56yv9rfw90k8vx0nsrnrzk8mf9hsdq")) + (base32 "09mwj7x3zavnk1j6cax66madxgfaxjpq4c11mf93lsgg7z46znkm")) (modules '((guix build utils))) (snippet '(begin ;; Remove bundled samtools. -- cgit v1.2.3 From 67caa4b7730da1450d49cbf8b6ac4f87de9ef60f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 22:42:21 +0100 Subject: gnu: preseq: Update to 2.0.3. * gnu/packages/bioinformatics.scm (preseq): Update to 2.0.3. --- gnu/packages/bioinformatics.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 82a4cbd9ec..d761d164b5 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5554,15 +5554,14 @@ structures, classes for genomic regions, mapped sequencing reads, etc.") (define-public preseq (package (name "preseq") - (version "2.0") + (version "2.0.3") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/smithlabcode/preseq.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (string-append "https://github.com/smithlabcode/preseq/" + "releases/download/v" version + "/preseq_v" version ".tar.bz2")) (sha256 - (base32 "09mwj7x3zavnk1j6cax66madxgfaxjpq4c11mf93lsgg7z46znkm")) + (base32 "149x9xmk1wy1gff85325yfzqc0qk4sgp1w6gbyj9cnji4x1dszbl")) (modules '((guix build utils))) (snippet '(begin ;; Remove bundled samtools. -- cgit v1.2.3 From 273df99d7d986c4417940d423c649aec727c744e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 22:46:48 +0100 Subject: gnu: vsearch: Fetch source from git. * gnu/packages/bioinformatics.scm (vsearch)[source]: Fetch from git. --- gnu/packages/bioinformatics.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index d761d164b5..744eec571e 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6838,14 +6838,14 @@ SELECT or UPDATE queries to an end-point.") (version "2.8.0") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/torognes/vsearch/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/torognes/vsearch.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "15pbirgzhvflj4pi5n82vybbzjy9mlb0lv5l3qhrmdkfzpbyahw3")) + "0lrw6n75gmqkxl053yi2pwwvnzwf1r79ypzxgv6m0kw6df5fwv6r")) (patches (search-patches "vsearch-unbundle-cityhash.patch")) (snippet '(begin -- cgit v1.2.3 From 62365244092576f62931e3178c4ea5598fd91e7b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 23:02:55 +0100 Subject: gnu: sortmerna: Fetch sources from git. * gnu/packages/bioinformatics.scm (sortmerna)[source]: Fetch from git. --- gnu/packages/bioinformatics.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 744eec571e..a571d72bb5 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5948,14 +5948,14 @@ of these reads to align data quickly through a hash-based indexing scheme.") (version "2.1b") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/biocore/sortmerna/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/biocore/sortmerna.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1ghaghvd82af9j5adavxh77g7hm247d1r69m3fbi6f1jdivj5ldk")))) + "0j3mbz4n25738yijmjbr5r4fyvkgm8v5vn3sshyfvmyqf5q9byqf")))) (build-system gnu-build-system) (outputs '("out" ;for binaries "db")) ;for sequence databases -- cgit v1.2.3 From e0a8fc85dd1ee9e9ceef790b311691068a664a28 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 23:06:28 +0100 Subject: gnu: snap-aligner: Fetch sources from git. * gnu/packages/bioinformatics.scm (snap-aligner)[source]: Fetch from git. [arguments]: Use INVOKE. --- gnu/packages/bioinformatics.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a571d72bb5..3d230a1036 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5906,20 +5906,20 @@ optionally compressed by gzip.") (name "snap-aligner") (version "1.0beta.18") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/amplab/snap/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/amplab/snap.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1vnsjwv007k1fl1q7d681kbwn6bc66cgw6h16hym6gvyy71qv2ly")))) + "01w3qq4wm07z73vky0cfwlmrbf50n3w722cxrlzxfi99mnb808d8")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (delete 'configure) - (replace 'check (lambda _ (zero? (system* "./unit_tests")))) + (replace 'check (lambda _ (invoke "./unit_tests") #t)) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From 7145f4e519d47ad0a02f320be38d135d96e74792 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 23:10:31 +0100 Subject: gnu: ritornello: Fetch sources from git. * gnu/packages/bioinformatics.scm (ritornello)[source]: Fetch from git. --- gnu/packages/bioinformatics.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 3d230a1036..fa455c5125 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11258,14 +11258,14 @@ sort, markdup, and depth.") (name "ritornello") (version "1.0.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/KlugerLab/" - "Ritornello/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/KlugerLab/Ritornello.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "02nik86gq9ljjriv6pamwlmqnfky3ads1fpklx6mc3hx6k40pg38")))) + "1xpki1pkxwmn7n5n23vv64zvikss4fj53vlzhnp3j34wrmxik3h8")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; there are no tests -- cgit v1.2.3 From 3b888065da0480a9c716929230bd1ffdb82c7e2f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 23:12:08 +0100 Subject: gnu: ritornello: Update to 2.0.1. * gnu/packages/bioinformatics.scm (ritornello): Update to 2.0.1. [arguments]: Adjust file patching. --- gnu/packages/bioinformatics.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index fa455c5125..64b7dd2586 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11256,7 +11256,7 @@ sort, markdup, and depth.") (define-public ritornello (package (name "ritornello") - (version "1.0.0") + (version "2.0.1") (source (origin (method git-fetch) (uri (git-reference @@ -11265,7 +11265,7 @@ sort, markdup, and depth.") (file-name (git-file-name name version)) (sha256 (base32 - "1xpki1pkxwmn7n5n23vv64zvikss4fj53vlzhnp3j34wrmxik3h8")))) + "1xahvq215qld7x1w8vpa5zbrsj6p9crb9shqa2x89sb0aaxa02jk")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; there are no tests @@ -11274,7 +11274,7 @@ sort, markdup, and depth.") (add-after 'unpack 'patch-samtools-references (lambda* (#:key inputs #:allow-other-keys) (substitute* '("src/SamStream.h" - "src/BufferedGenomeReader.h") + "src/FLD.cpp") (("") "")) #t)) (delete 'configure) -- cgit v1.2.3 From f3f34b132cdbf830e2233f448f0268f3ad529c5f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 23:15:58 +0100 Subject: gnu: filevercmp: Fetch sources from git. * gnu/packages/bioinformatics.scm (filevercmp)[source]: Fetch from git. [arguments]: Add #T to the end of the install phase. --- gnu/packages/bioinformatics.scm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 64b7dd2586..0c2e0b50c1 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9212,12 +9212,14 @@ group or two ChIP groups run under different conditions.") (name "filevercmp") (version (string-append "0-1." (string-take commit 7))) (source (origin - (method url-fetch) - (uri (string-append "https://github.com/ekg/filevercmp/archive/" - commit ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "0yp5jswf5j2pqc6517x277s4s6h1ss99v57kxw9gy0jkfl3yh450")))) + (method git-fetch) + (uri (git-reference + (url "https://github.com/ekg/filevercmp.git") + (commit commit))) + (file-name (git-file-name name commit)) + (sha256 + (base32 + "1j9vxsy0y050v59h0q1d6501fcw1kjvj0d18l1xk2zyg0jzj247c")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; There are no tests to run. @@ -9227,7 +9229,8 @@ group or two ChIP groups run under different conditions.") (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) - (install-file "filevercmp" bin))))))) + (install-file "filevercmp" bin) + #t)))))) (home-page "https://github.com/ekg/filevercmp") (synopsis "This program compares version strings") (description "This program compares version strings. It intends to be a -- cgit v1.2.3 From e2f36385d3b31086f88a5c1bbb26daddbf70fe64 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Wed, 7 Nov 2018 10:23:18 -0500 Subject: gnu: Add spread-sheet-widget. * gnu/packages/gtk.scm (spread-sheet-widget): New public variable. --- gnu/packages/gtk.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 8c25922c9e..640bd75da4 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1630,6 +1630,33 @@ it does not deal with windowing system surfaces, drawing, scene graphs, or input.") (license license:expat))) +(define-public spread-sheet-widget + (package + (name "spread-sheet-widget") + (version "0.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://alpha.gnu.org/gnu/ssw/" + name "-" version ".tar.gz")) + (sha256 + (base32 "1h93yyh2by6yrmkwqg38nd5knids05k5nqzcihc1hdwgzg3c4b8y")))) + (build-system gnu-build-system) + (native-inputs + `(("glib" ,glib "bin") ; for glib-genmarshal, etc. + ("pkg-config" ,pkg-config))) + ;; In 'Requires' of spread-sheet-widget.pc. + (propagated-inputs + `(("glib" ,glib) + ("gtk+" ,gtk+))) + (home-page "https://www.gnu.org/software/ssw/") + (synopsis "Gtk+ widget for dealing with 2-D tabular data") + (description + "GNU Spread Sheet Widget is a library for Gtk+ which provides a widget for +viewing and manipulating 2 dimensional tabular data in a manner similar to many +popular spread sheet programs.") + (license license:gpl3+))) + (define-public yad (package (name "yad") -- cgit v1.2.3 From ed33049cdc4231baa35de4197646a7117d4082df Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Wed, 7 Nov 2018 10:24:53 -0500 Subject: gnu: pspp: Update to 1.2.0. * gnu/packages/statistics.scm (pspp): Update to 1.2.0. [inputs]: Add spread-sheet-widget. [native-inputs]: Add autoconf, python-2, and texinfo. --- gnu/packages/statistics.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 258daeac19..642fa2d423 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -39,6 +39,7 @@ #:use-module (guix build-system trivial) #:use-module (gnu packages) #:use-module (gnu packages algebra) + #:use-module (gnu packages autotools) #:use-module (gnu packages bash) #:use-module (gnu packages check) #:use-module (gnu packages compression) @@ -75,7 +76,7 @@ (define-public pspp (package (name "pspp") - (version "1.0.1") + (version "1.2.0") (source (origin (method url-fetch) @@ -83,7 +84,7 @@ version ".tar.gz")) (sha256 (base32 - "1r8smr5057993h90nx0mdnff8nxw9x546zzh6qpy4h3xblp1la5s")))) + "07pp27zycrb5x927jwaj9r3q7hy915jh51xs85zxby6gfiwl63m5")))) (build-system gnu-build-system) (inputs `(("cairo" ,cairo) @@ -94,11 +95,15 @@ ("readline" ,readline) ("gtk" ,gtk+) ("gtksourceview" ,gtksourceview) + ("spread-sheet-widget" ,spread-sheet-widget) ("zlib" ,zlib))) (native-inputs - `(("glib" ,glib "bin") ;for glib-genmarshal + `(("autoconf" ,autoconf) ;for tests + ("glib" ,glib "bin") ;for glib-genmarshal ("perl" ,perl) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("python" ,python-2) ;for tests + ("texinfo" ,texinfo))) (home-page "https://www.gnu.org/software/pspp/") (synopsis "Statistical analysis") (description -- cgit v1.2.3 From e0f1aa2d2b09d9baa69cd6b69735671f694b1f8b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Nov 2018 23:28:10 +0100 Subject: gnu: tadbit: Fetch sources from git. * gnu/packages/bioinformatics.scm (tadbit)[source]: Fetch from git. [version]: Use "2.0.0" instead of "2.0". --- gnu/packages/bioinformatics.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 0c2e0b50c1..bbdecbff43 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11503,15 +11503,16 @@ applications for tackling some common problems in a user-friendly way.") (define-public tadbit (package (name "tadbit") - (version "0.2") + (version "0.2.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/3DGenomes/TADbit/" - "archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/3DGenomes/TADbit.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1cnfqrl4685zar4nnw94j94nhvl2h29jm448nadqi1h05z6fdk4f")))) + "07g3aj648prmsvxp9caz5yl41k0y0647vxh0f5p3w8376mfiljd0")))) (build-system python-build-system) (arguments `(;; Tests are included and must be run after installation, but -- cgit v1.2.3 From 3398dfb764f309ad4d0cace5c80ae4c6b69b12f6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Nov 2018 08:34:01 +0100 Subject: gnu: ncbi-vdb: Fetch sources from git. * gnu/packages/bioinformatics.scm (ncbi-vdb)[source]: Fetch from git. [arguments]: Add phase to make checkout writable. --- gnu/packages/bioinformatics.scm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index bbdecbff43..6ef4adb305 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5303,22 +5303,23 @@ simultaneously.") (package (name "ncbi-vdb") (version "2.8.2") - (source - (origin - (method url-fetch) - (uri - (string-append "https://github.com/ncbi/ncbi-vdb/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1acn4bv81mfl137qnbn9995mjjhwd36pm0b7qli1iw5skrxa9j8m")))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ncbi/ncbi-vdb.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1ssy5wlqdm86pmbv9mfdjx518lbsk32wfv2qgr7m1z77kaicw7zq")))) (build-system gnu-build-system) (arguments `(#:parallel-build? #f ; not supported #:tests? #f ; no "check" target #:phases (modify-phases %standard-phases + (add-after 'unpack 'make-files-writable + (lambda _ (for-each make-file-writable (find-files "." ".*")) #t)) (add-before 'configure 'set-perl-search-path (lambda _ ;; Work around "dotless @INC" build failure. -- cgit v1.2.3 From 6a7d9ee39fe58184191f922f8add8c9a99a99caf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Nov 2018 08:34:42 +0100 Subject: gnu: ncbi-vdb: Use INVOKE and end phases on #T. * gnu/packages/bioinformatics.scm (ncbi-vdb)[arguments]: Use INVOKE and unconditionally end phases with #T. --- gnu/packages/bioinformatics.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 6ef4adb305..0f28dfe37e 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5353,8 +5353,7 @@ simultaneously.") ;; The 'configure' script doesn't recognize things like ;; '--enable-fast-install'. - (zero? (system* - "./configure" + (invoke "./configure" (string-append "--build-prefix=" (getcwd) "/build") (string-append "--prefix=" (assoc-ref outputs "out")) (string-append "--debug") @@ -5363,7 +5362,8 @@ simultaneously.") (string-append "--with-ngs-sdk-prefix=" (assoc-ref inputs "ngs-sdk")) (string-append "--with-hdf5-prefix=" - (assoc-ref inputs "hdf5"))))))) + (assoc-ref inputs "hdf5"))) + #t))) (add-after 'install 'install-interfaces (lambda* (#:key outputs #:allow-other-keys) ;; Install interface libraries. On i686 the interface libraries -- cgit v1.2.3 From 4031e7f1ec1deac8ebf76c047b40b1ac4ffeaab2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Nov 2018 08:35:20 +0100 Subject: gnu: ngs-sdk: Fetch sources from git. * gnu/packages/bioinformatics.scm (ngs-sdk)[source]: Fetch from git. --- gnu/packages/bioinformatics.scm | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 0f28dfe37e..065f3adc11 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5237,16 +5237,15 @@ Roche 454, Ion Torrent and Pacific BioSciences SMRT.") (package (name "ngs-sdk") (version "1.3.0") - (source - (origin - (method url-fetch) - (uri - (string-append "https://github.com/ncbi/ngs/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1wiyf4c6nm2j87pv015cbi0qny5byf3pbvcw3likifz5dl56ag40")))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ncbi/ngs.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1l8p81azb9p6nsdfai0hvyai33z6nsgy7hj30arh9b5kb6m443dx")))) (build-system gnu-build-system) (arguments `(#:parallel-build? #f ; not supported -- cgit v1.2.3 From c098c49b3e249011bfd81b3623608ee85fef879f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Nov 2018 08:42:15 +0100 Subject: gnu: sailfish: Fetch sources from git. * gnu/packages/bioinformatics.scm (sailfish)[source]: Fetch from git. --- gnu/packages/bioinformatics.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 065f3adc11..aa2ae6c449 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11974,14 +11974,14 @@ bytes of memory space, where n is the length of the string.") (name "sailfish") (version "0.10.1") (source (origin - (method url-fetch) - (uri - (string-append "https://github.com/kingsfordgroup/" - "sailfish/archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/kingsfordgroup/sailfish.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1inn60dxiwsz8g9w7kvfhjxj4bwfb0r12dyhpzzhfbig712dkmm0")) + "1amcc5hqvsl42hg4x19bi9vy47cl874s0lw1fmi0hwsdk9i8c03v")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From e438c9655808c0c3f1a56b7c5a17954670fd365d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Nov 2018 08:58:46 +0100 Subject: gnu: fraggenescan: Use INVOKE. * gnu/packages/bioinformatics.scm (fraggenescan)[arguments]: Use INVOKE in build phases and return #T unconditionally. --- gnu/packages/bioinformatics.scm | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index aa2ae6c449..e1ed7117f2 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2716,8 +2716,10 @@ Illumina, Roche 454, and the SOLiD platform.") (string-append " strcpy(train_dir, \"" share "/train/\");")))) #t)) (replace 'build - (lambda _ (and (zero? (system* "make" "clean")) - (zero? (system* "make" "fgs"))))) + (lambda _ + (invoke "make" "clean") + (invoke "make" "fgs") + #t)) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (string-append (assoc-ref outputs "out"))) @@ -2734,21 +2736,24 @@ Illumina, Roche 454, and the SOLiD platform.") (let* ((out (string-append (assoc-ref outputs "out"))) (bin (string-append out "/bin/")) (frag (string-append bin "run_FragGeneScan.pl"))) - (and (zero? (system* frag ; Test complete genome. - "-genome=./example/NC_000913.fna" - "-out=./test2" - "-complete=1" - "-train=complete")) - (file-exists? "test2.faa") - (file-exists? "test2.ffn") - (file-exists? "test2.gff") - (file-exists? "test2.out") - (zero? (system* ; Test incomplete sequences. - frag - "-genome=./example/NC_000913-fgs.ffn" - "-out=out" - "-complete=0" - "-train=454_30"))))))))) + ;; Test complete genome. + (invoke frag + "-genome=./example/NC_000913.fna" + "-out=./test2" + "-complete=1" + "-train=complete") + (unless (and (file-exists? "test2.faa") + (file-exists? "test2.ffn") + (file-exists? "test2.gff") + (file-exists? "test2.out")) + (error "Expected files do not exist.")) + ;; Test incomplete sequences. + (invoke frag + "-genome=./example/NC_000913-fgs.ffn" + "-out=out" + "-complete=0" + "-train=454_30") + #t)))))) (inputs `(("perl" ,perl) ("python" ,python-2))) ;not compatible with python 3. -- cgit v1.2.3 From c527d36f0250b9815507e4ac28c3d7cfb6b87b20 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Nov 2018 09:02:34 +0100 Subject: gnu: java-picard-1.113: Use INVOKE. * gnu/packages/bioinformatics.scm (java-picard-1.113)[arguments]: Use INVOKE and return #T unconditionally. --- gnu/packages/bioinformatics.scm | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index e1ed7117f2..70597e2bcb 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -3476,26 +3476,28 @@ VCF.") (lambda* (#:key inputs #:allow-other-keys) (mkdir-p "lib/jni") (mkdir-p "jdk-src") - (and (zero? (system* "tar" "--strip-components=1" "-C" "jdk-src" - "-xf" (assoc-ref inputs "jdk-src"))) - (zero? (system* "javah" "-jni" - "-classpath" "classes" - "-d" "lib/" - "net.sf.samtools.util.zip.IntelDeflater")) - (with-directory-excursion "src/c/inteldeflater" - (zero? (system* "gcc" "-I../../../lib" "-I." - (string-append "-I" (assoc-ref inputs "jdk") - "/include/linux") - "-I../../../jdk-src/src/share/native/common/" - "-I../../../jdk-src/src/solaris/native/common/" - "-c" "-O3" "-fPIC" "IntelDeflater.c")) - (zero? (system* "gcc" "-shared" - "-o" "../../../lib/jni/libIntelDeflater.so" - "IntelDeflater.o" "-lz" "-lstdc++")))))) + (invoke "tar" "--strip-components=1" "-C" "jdk-src" + "-xf" (assoc-ref inputs "jdk-src")) + (invoke "javah" "-jni" + "-classpath" "classes" + "-d" "lib/" + "net.sf.samtools.util.zip.IntelDeflater") + (with-directory-excursion "src/c/inteldeflater" + (invoke "gcc" "-I../../../lib" "-I." + (string-append "-I" (assoc-ref inputs "jdk") + "/include/linux") + "-I../../../jdk-src/src/share/native/common/" + "-I../../../jdk-src/src/solaris/native/common/" + "-c" "-O3" "-fPIC" "IntelDeflater.c") + (invoke "gcc" "-shared" + "-o" "../../../lib/jni/libIntelDeflater.so" + "IntelDeflater.o" "-lz" "-lstdc++")) + #t)) ;; We can only build everything else after building the JNI library. (add-after 'build-jni 'build-rest (lambda* (#:key make-flags #:allow-other-keys) - (zero? (apply system* `("ant" "all" ,@make-flags))))) + (apply invoke `("ant" "all" ,@make-flags)) + #t)) (add-before 'build 'set-JAVA6_HOME (lambda _ (setenv "JAVA6_HOME" (getenv "JAVA_HOME")) -- cgit v1.2.3 From 31c41a8cfeb6c488cb60139ab809f6332a52679c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Nov 2018 09:04:34 +0100 Subject: gnu: vsearch: Remove custom autogen phase. * gnu/packages/bioinformatics.scm (vsearch)[arguments]: Remove. --- gnu/packages/bioinformatics.scm | 5 ----- 1 file changed, 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 70597e2bcb..ff6cd03b21 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6863,11 +6863,6 @@ SELECT or UPDATE queries to an end-point.") (delete-file "src/city.cc") #t)))) (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'autogen - (lambda _ (zero? (system* "autoreconf" "-vif"))))))) (inputs `(("zlib" ,zlib) ("bzip2" ,bzip2) -- cgit v1.2.3 From e35dce017090685d07aedf10c9899c0cdcc70d9e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Nov 2018 09:10:20 +0100 Subject: gnu: mash: Remove custom autoconf phase. * gnu/packages/bioinformatics.scm (mash)[arguments]: Remove autoconf phase. --- gnu/packages/bioinformatics.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index ff6cd03b21..91f87a759e 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4018,9 +4018,7 @@ sequences).") "src/mash/CommandScreen.cpp") (("^#include \"kseq\\.h\"") "#include \"htslib/kseq.h\"")) - #t)) - (add-after 'fix-includes 'autoconf - (lambda _ (zero? (system* "autoconf"))))))) + #t))))) (native-inputs `(("autoconf" ,autoconf) ;; Capnproto and htslib are statically embedded in the final -- cgit v1.2.3 From 0881d62f2528187420ea049200138d15984d6c05 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Nov 2018 09:10:58 +0100 Subject: gnu: newick-utils: Remove custom autoconf phase. * gnu/packages/bioinformatics.scm (newick-utils)[arguments]: Remove. --- gnu/packages/bioinformatics.scm | 5 ----- 1 file changed, 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 91f87a759e..8b1170fd47 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4266,11 +4266,6 @@ program for nucleotide and protein sequences.") (base32 "1hkw21rq1mwf7xp0rmbb2gqc0i6p11108m69i7mr7xcjl268pxnb")))) (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'autoconf - (lambda _ (zero? (system* "autoreconf" "-vif"))))))) (inputs ;; XXX: TODO: Enable Lua and Guile bindings. ;; https://github.com/tjunier/newick_utils/issues/13 -- cgit v1.2.3 From 179416467fce3b66fa4746e3ed92795b27e1f192 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Nov 2018 09:11:38 +0100 Subject: gnu: muscle: Use INVOKE. * gnu/packages/bioinformatics.scm (muscle)[arguments]: Use INVOKE and return #T unconditionally. --- gnu/packages/bioinformatics.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 8b1170fd47..b453b46873 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4236,12 +4236,13 @@ that a read originated from a particular isoform.") (delete 'configure) (replace 'check ;; There are no tests, so just test if it runs. - (lambda _ (zero? (system* "./muscle" "-version")))) + (lambda _ (invoke "./muscle" "-version") #t)) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin"))) - (install-file "muscle" bin))))))) + (install-file "muscle" bin) + #t)))))) (home-page "http://www.drive5.com/muscle") (synopsis "Multiple sequence alignment program") (description -- cgit v1.2.3 From 2e2d88539ceb52369c0f20566786603f4d368c94 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Nov 2018 09:12:43 +0100 Subject: gnu: sra-tools: Use INVOKE. * gnu/packages/bioinformatics.scm (sra-tools)[arguments]: Use INVOKE and return #T unconditionally. --- gnu/packages/bioinformatics.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b453b46873..2947b51d03 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5712,8 +5712,7 @@ sequence itself can be retrieved from these databases.") ;; The 'configure' script doesn't recognize things like ;; '--enable-fast-install'. - (zero? (system* - "./configure" + (invoke "./configure" (string-append "--build-prefix=" (getcwd) "/build") (string-append "--prefix=" (assoc-ref outputs "out")) (string-append "--debug") @@ -5731,7 +5730,8 @@ sequence itself can be retrieved from these databases.") (string-append "--with-ngs-sdk-prefix=" (assoc-ref inputs "ngs-sdk")) (string-append "--with-hdf5-prefix=" - (assoc-ref inputs "hdf5")))))) + (assoc-ref inputs "hdf5"))) + #t)) ;; This version of sra-tools fails to build with glibc because of a ;; naming conflict. glibc-2.25/include/bits/mathcalls.h already ;; contains a definition of "canonicalize", so we rename it. -- cgit v1.2.3 From 8b685c47200ad146632cb452aea2dc9f077d882b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Nov 2018 09:13:35 +0100 Subject: gnu: taxtastic: Use INVOKE. * gnu/packages/bioinformatics.scm (taxtastic)[arguments]: Use INVOKE and return #T unconditionally. --- gnu/packages/bioinformatics.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 2947b51d03..a3d37af78a 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6202,8 +6202,7 @@ Cuffdiff or Ballgown programs.") #:phases (modify-phases %standard-phases (replace 'check - (lambda _ - (zero? (system* "python" "-m" "unittest" "discover" "-v"))))))) + (lambda _ (invoke "python" "-m" "unittest" "discover" "-v") #t))))) (propagated-inputs `(("python-sqlalchemy" ,python2-sqlalchemy) ("python-decorator" ,python2-decorator) -- cgit v1.2.3 From e78e54d029869f82fd13958b959ed549f73b7aa9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Nov 2018 09:14:09 +0100 Subject: gnu: emboss: Use INVOKE. * gnu/packages/bioinformatics.scm (emboss)[arguments]: Use INVOKE and return #T unconditionally. --- gnu/packages/bioinformatics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a3d37af78a..eef42bc0f9 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9034,7 +9034,7 @@ AM_CONDITIONAL(AMPNG, true)")) (("\\$\\(bindir\\)/embossupdate") "")) #t)) (add-after 'disable-update-check 'autogen - (lambda _ (zero? (system* "autoreconf" "-vif"))))))) + (lambda _ (invoke "autoreconf" "-vif") #t))))) (inputs `(("perl" ,perl) ("libpng" ,libpng) -- cgit v1.2.3 From 3da3cedf76b4f19af5db5a6122a6d98f6fa7fa67 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Nov 2018 09:15:05 +0100 Subject: gnu: ngs-sdk: Use INVOKE. * gnu/packages/bioinformatics.scm (ngs-sdk)[arguments]: Use INVOKE and return #T unconditionally. --- gnu/packages/bioinformatics.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index eef42bc0f9..c501736c4b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5262,9 +5262,10 @@ Roche 454, Ion Torrent and Pacific BioSciences SMRT.") ;; The 'configure' script doesn't recognize things like ;; '--enable-fast-install'. - (zero? (system* "./configure" - (string-append "--build-prefix=" (getcwd) "/build") - (string-append "--prefix=" out)))))) + (invoke "./configure" + (string-append "--build-prefix=" (getcwd) "/build") + (string-append "--prefix=" out)) + #t))) (add-after 'unpack 'enter-dir (lambda _ (chdir "ngs-sdk") #t))))) (native-inputs `(("perl" ,perl))) -- cgit v1.2.3 From 8d3eaa92623efab8af21bbf3002406c46197590f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Nov 2018 09:29:58 +0100 Subject: gnu: ngs-sdk: Update to 2.9.3. * gnu/packages/bioinformatics.scm (ngs-sdk): Update to 2.9.3. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index c501736c4b..493f11f943 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5237,7 +5237,7 @@ Roche 454, Ion Torrent and Pacific BioSciences SMRT.") (define-public ngs-sdk (package (name "ngs-sdk") - (version "1.3.0") + (version "2.9.3") (source (origin (method git-fetch) (uri (git-reference @@ -5246,7 +5246,7 @@ Roche 454, Ion Torrent and Pacific BioSciences SMRT.") (file-name (git-file-name name version)) (sha256 (base32 - "1l8p81azb9p6nsdfai0hvyai33z6nsgy7hj30arh9b5kb6m443dx")))) + "17c0v1nah3g3d2ib5bbi0vhma1ghd6vb9xycavqsh64lhp840rk3")))) (build-system gnu-build-system) (arguments `(#:parallel-build? #f ; not supported -- cgit v1.2.3 From 87408854ecd4e89961539d7091c72fd53ca59a20 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Nov 2018 09:30:16 +0100 Subject: gnu: ncbi-vdb: Update to 2.9.3. * gnu/packages/bioinformatics.scm (ncbi-vdb): Update to 2.9.3. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 493f11f943..924b671712 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5303,7 +5303,7 @@ simultaneously.") (define-public ncbi-vdb (package (name "ncbi-vdb") - (version "2.8.2") + (version "2.9.3") (source (origin (method git-fetch) (uri (git-reference @@ -5312,7 +5312,7 @@ simultaneously.") (file-name (git-file-name name version)) (sha256 (base32 - "1ssy5wlqdm86pmbv9mfdjx518lbsk32wfv2qgr7m1z77kaicw7zq")))) + "1l4ny67nxwv1lagk9wwjbrgm7ln7adci6dnpc7k1yaln6shj0qpm")))) (build-system gnu-build-system) (arguments `(#:parallel-build? #f ; not supported -- cgit v1.2.3 From b17333414ff75db6e909533b383171721d60702e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Nov 2018 09:30:59 +0100 Subject: gnu: plink-ng: Fetch sources from git. * gnu/packages/bioinformatics.scm (plink-ng)[source]: Fetch from git. --- gnu/packages/bioinformatics.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 924b671712..057151be05 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5469,12 +5469,13 @@ subsequent visualization, annotation and storage of results.") (version "1.90b4") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/chrchang/plink-ng/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/chrchang/plink-ng.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "09ixrds009aczjswxr2alcb774mksq5g0v78dgjjn1h4dky0kf9a")))) + (base32 "02npdwgkpfkdnhw819rhj5kw02a5k5m90b14zq9zzya4hyg929c0")))) (build-system gnu-build-system) (arguments '(#:tests? #f ;no "check" target -- cgit v1.2.3 From 15c9609482aa26bd179d1316dcf62f6292223c96 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Nov 2018 09:46:05 +0100 Subject: gnu: sra-tools: Update to 2.9.3. * gnu/packages/bioinformatics.scm (sra-tools): Update to 2.9.3. [arguments]: Remove build phase patch-away-glibc-conflict. --- gnu/packages/bioinformatics.scm | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 057151be05..9954fcf20b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5654,7 +5654,7 @@ sequence itself can be retrieved from these databases.") (define-public sra-tools (package (name "sra-tools") - (version "2.8.2-1") + (version "2.9.3") (source (origin (method git-fetch) @@ -5664,7 +5664,7 @@ sequence itself can be retrieved from these databases.") (file-name (git-file-name name version)) (sha256 (base32 - "12ln0pk8yajhmmj9xsfwa1qgv5m05ji40jsg17wdcls62zz6fwrk")))) + "0663gcdxkziwsmlznjxysb00621rllpbz6jwsfifq7z3dj3lwm8b")))) (build-system gnu-build-system) (arguments `(#:parallel-build? #f ; not supported @@ -5733,18 +5733,6 @@ sequence itself can be retrieved from these databases.") (assoc-ref inputs "ngs-sdk")) (string-append "--with-hdf5-prefix=" (assoc-ref inputs "hdf5"))) - #t)) - ;; This version of sra-tools fails to build with glibc because of a - ;; naming conflict. glibc-2.25/include/bits/mathcalls.h already - ;; contains a definition of "canonicalize", so we rename it. - ;; - ;; See upstream bug report: - ;; https://github.com/ncbi/sra-tools/issues/67 - (add-after 'unpack 'patch-away-glibc-conflict - (lambda _ - (substitute* "tools/bam-loader/bam.c" - (("canonicalize\\(" line) - (string-append "sra_tools_" line))) #t))))) (native-inputs `(("perl" ,perl))) (inputs -- cgit v1.2.3 From 86c6928ea39aff622124030c20404ce94dae9b49 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Nov 2018 09:46:42 +0100 Subject: gnu: vsearch: Update to 2.9.1. * gnu/packages/bioinformatics.scm (vsearch): Update to 2.9.1. * gnu/packages/patches/vsearch-unbundle-cityhash.patch: Update. --- gnu/packages/bioinformatics.scm | 4 ++-- gnu/packages/patches/vsearch-unbundle-cityhash.patch | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9954fcf20b..d9362ea4c6 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6825,7 +6825,7 @@ SELECT or UPDATE queries to an end-point.") (define-public vsearch (package (name "vsearch") - (version "2.8.0") + (version "2.9.1") (source (origin (method git-fetch) @@ -6835,7 +6835,7 @@ SELECT or UPDATE queries to an end-point.") (file-name (git-file-name name version)) (sha256 (base32 - "0lrw6n75gmqkxl053yi2pwwvnzwf1r79ypzxgv6m0kw6df5fwv6r")) + "0vhrpjfdf75ba04b24xknp41790cvcgwl0vgpy7qbzj5xh2521ss")) (patches (search-patches "vsearch-unbundle-cityhash.patch")) (snippet '(begin diff --git a/gnu/packages/patches/vsearch-unbundle-cityhash.patch b/gnu/packages/patches/vsearch-unbundle-cityhash.patch index b1ecb1f063..2a2ab13a73 100644 --- a/gnu/packages/patches/vsearch-unbundle-cityhash.patch +++ b/gnu/packages/patches/vsearch-unbundle-cityhash.patch @@ -6,7 +6,7 @@ index e56a8a2..4adcc48 100644 if TARGET_PPC AM_CXXFLAGS=-Wall -Wsign-compare -O3 -g -mcpu=power8 else --AM_CXXFLAGS=-Wall -Wsign-compare -O3 -g +-AM_CXXFLAGS=-Wall -Wsign-compare -O3 -g -march=x86-64 -mtune=generic +AM_CXXFLAGS=-Wall -Wsign-compare -O3 -g -lcityhash endif @@ -39,7 +39,7 @@ index e56a8a2..4adcc48 100644 - if TARGET_WIN --libcityhash_a_CXXFLAGS = -Wall -Wno-sign-compare -O3 -g -D_MSC_VER +-libcityhash_a_CXXFLAGS = $(AM_CXXFLAGS) -Wno-sign-compare -D_MSC_VER -__top_builddir__bin_vsearch_LDFLAGS = -static -__top_builddir__bin_vsearch_LDADD = libregex.a libcityhash.a libcpu_ssse3.a libcpu_sse2.a +__top_builddir__bin_vsearch_LDFLAGS = -static -lcityhash @@ -47,7 +47,7 @@ index e56a8a2..4adcc48 100644 else --libcityhash_a_CXXFLAGS = -Wall -Wno-sign-compare -O3 -g +-libcityhash_a_CXXFLAGS = $(AM_CXXFLAGS) -Wno-sign-compare - if TARGET_PPC -__top_builddir__bin_vsearch_LDADD = libcityhash.a libcpu.a -- cgit v1.2.3 From 9f527c91990c4f620c88bb609e95589809a1354c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Nov 2018 09:52:46 +0100 Subject: gnu: sailfish: Use INVOKE. * gnu/packages/bioinformatics.scm (sailfish)[arguments]: Use INVOKE instead of SYSTEM*. --- gnu/packages/bioinformatics.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index d9362ea4c6..c175227997 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -12014,10 +12014,10 @@ bytes of memory space, where n is the length of the string.") (include "external/install/include/rapmap/") (rapmap (assoc-ref inputs "rapmap"))) (mkdir-p "/tmp/rapmap") - (system* "tar" "xf" - (assoc-ref inputs "rapmap") - "-C" "/tmp/rapmap" - "--strip-components=1") + (invoke "tar" "xf" + (assoc-ref inputs "rapmap") + "-C" "/tmp/rapmap" + "--strip-components=1") (mkdir-p src) (mkdir-p include) (for-each (lambda (file) -- cgit v1.2.3 From a9542937c8361b3aabda482bfdb40b07d92fba86 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Nov 2018 09:54:22 +0100 Subject: gnu: seek: Use INVOKE. * gnu/packages/bioinformatics.scm (seek)[arguments]: Use INVOKE and return #T unconditionally; patch "gen_tools_am" shebang in "bootstrap" phase. --- gnu/packages/bioinformatics.scm | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index c175227997..1ceb40cb95 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5057,21 +5057,24 @@ distribution, coverage uniformity, strand specificity, etc.") (modify-phases %standard-phases (replace 'bootstrap (lambda _ - (invoke "bash" "gen_auto"))) + (substitute* "gen_tools_am" + (("/usr/bin/env.*") (which "perl"))) + (invoke "bash" "gen_auto") + #t)) (add-after 'build 'build-additional-tools (lambda* (#:key make-flags #:allow-other-keys) - (every (lambda (dir) - (with-directory-excursion (string-append "tools/" dir) - (zero? (apply system* "make" make-flags)))) - dirs))) + (for-each (lambda (dir) + (with-directory-excursion (string-append "tools/" dir) + (apply invoke "make" make-flags))) + dirs) + #t)) (add-after 'install 'install-additional-tools (lambda* (#:key make-flags #:allow-other-keys) - (fold (lambda (dir result) - (with-directory-excursion (string-append "tools/" dir) - (and result - (zero? (apply system* - `("make" ,@make-flags "install")))))) - #t dirs))))))) + (for-each (lambda (dir) + (with-directory-excursion (string-append "tools/" dir) + (apply invoke `("make" ,@make-flags "install")))) + dirs) + #t)))))) (inputs `(("gsl" ,gsl) ("boost" ,boost) -- cgit v1.2.3 From ce49fdcce91803c873b899b088f9ed2ce22f1cd3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Nov 2018 09:58:05 +0100 Subject: gnu: roary: Use INVOKE. * gnu/packages/bioinformatics.scm (roary)[arguments]: Use INVOKE and return #T unconditionally. --- gnu/packages/bioinformatics.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 1ceb40cb95..94b82660c9 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4762,10 +4762,11 @@ partial genes, and identifies translation initiation sites.") (getenv "PATH"))) (setenv "PERL5LIB" (string-append (getcwd) "/lib" ":" (getenv "PERL5LIB"))) - (zero? (length (filter (lambda (file) - (display file)(display "\n") - (not (zero? (system* "perl" file)))) - (find-files "t" ".*\\.t$")))))) + (for-each (lambda (file) + (display file)(display "\n") + (invoke "perl" file)) + (find-files "t" ".*\\.t$")) + #t)) (replace 'install ;; There is no 'install' target in the Makefile. (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From a1e83a9856100b7d1993ad7917e11d8bb37c2646 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Nov 2018 10:06:35 +0100 Subject: gnu: pplacer-scripts: Use INVOKE. * gnu/packages/bioinformatics.scm (pplacer-scripts)[arguments]: Use INVOKE and return #T unconditionally. --- gnu/packages/bioinformatics.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 94b82660c9..8820ba0d8e 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4410,8 +4410,7 @@ downstream analysis.") (add-after 'unpack 'enter-scripts-dir (lambda _ (chdir "scripts"))) (replace 'check - (lambda _ - (zero? (system* "python" "-m" "unittest" "discover" "-v")))) + (lambda _ (invoke "python" "-m" "unittest" "discover" "-v") #t)) (add-after 'install 'wrap-executables (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From 9c30cba431ccc36462f91652b624ae0068d77491 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Nov 2018 10:08:09 +0100 Subject: gnu: pcc: Use INVOKE. * gnu/packages/c.scm (pcc)[arguments]: Use INVOKE and return #T unconditionally. --- gnu/packages/c.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 83268e871c..d89b6ea00d 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2018 Ludovic Courtès -;;; Copyright © 2016, 2017 Ricardo Wurmus +;;; Copyright © 2016, 2017, 2018 Ricardo Wurmus ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Pierre Neidhardt ;;; @@ -160,8 +160,7 @@ standard.") `(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ - (zero? (system* "make" "-C" "cc/cpp" "test"))))))) + (lambda _ (invoke "make" "-C" "cc/cpp" "test") #t))))) (native-inputs `(("bison" ,bison) ("flex" ,flex))) -- cgit v1.2.3 From ec618c2005a1dc5e5154d25e9599313cea1ce6e9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Nov 2018 10:09:32 +0100 Subject: gnu: cmus: Use INVOKE. * gnu/packages/music.scm (cmus)[arguments]: Use INVOKE and return #T unconditionally. --- gnu/packages/music.scm | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 7f1d124233..af7589c23d 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -322,16 +322,14 @@ playing your music.") `(#:tests? #f ; cmus does not include tests #:phases (modify-phases %standard-phases - (replace - 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - - ;; It's an idiosyncratic configure script that doesn't - ;; understand --prefix=..; it wants prefix=.. instead. - (zero? - (system* "./configure" - (string-append "prefix=" out))))))))) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; It's an idiosyncratic configure script that doesn't + ;; understand --prefix=..; it wants prefix=.. instead. + (invoke "./configure" + (string-append "prefix=" out)) + #t)))))) ;; TODO: cmus optionally supports the following formats, which haven't yet ;; been added to Guix: ;; -- cgit v1.2.3 From 4e8294688877ebe2c312b0939421f895755ae52f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Nov 2018 10:10:06 +0100 Subject: gnu: cmus: Fetch sources from git. * gnu/packages/music.scm (cmus)[source]: Fetch from git. --- gnu/packages/music.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index af7589c23d..fe4d9df085 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -309,14 +309,14 @@ playing your music.") (name "cmus") (version "2.7.1") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/" name "/" name "/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/cmus/cmus.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0raixgjavkm7hxppzsc5zqbfbh2bhjcmbiplhnsxsmyj8flafyc1")))) + "0xd96py21bl869qlv1353zw7xsgq6v5s8szr0ldr63zj5fgc2ps5")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; cmus does not include tests -- cgit v1.2.3 From 9ab90ead36af854950c420b53ee9202d802da09d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Nov 2018 10:14:08 +0100 Subject: gnu: pd: Remove custom autoconf phase. * gnu/packages/music.scm (pd)[arguments]: Remove custom autoconf phase. --- gnu/packages/music.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index fe4d9df085..ad6ace1f3f 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1748,9 +1748,7 @@ export.") (lambda _ (substitute* "tcl/pd-gui.tcl" (("exec wish ") (string-append "exec " (which "wish8.6") " "))) - #t)) - (add-after 'unpack 'autoconf - (lambda _ (zero? (system* "bash" "./autogen.sh"))))))) + #t))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- cgit v1.2.3 From 69cb939ee756eb81659371be49152b4e5d510c95 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Nov 2018 10:17:15 +0100 Subject: gnu: libmusicbrainz: Use INVOKE. * gnu/packages/music.scm (libmusicbrainz)[arguments]: Use INVOKE and return #T unconditionally. --- gnu/packages/music.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index ad6ace1f3f..25928d2cdd 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4066,14 +4066,15 @@ ISRCs and the MCN (=UPC/EAN) from disc.") (base32 "0ikb9igyyk28jm34raxfzkw2qyn4nzzwsymdyprp7cmvi6g2ajb7")))) (build-system cmake-build-system) - (arguments `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - (and - ;; requires network connections - ;; (zero? (system* "tests/mbtest")) - (zero? (system* "tests/ctest")))))))) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + ;; requires network connections + ;; (invoke "tests/mbtest") + (invoke "tests/ctest") + #t))))) (inputs `(("neon" ,neon) ("libxml2" ,libxml2))) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 195e081b43f2a9469e426bd7b3938a7e741faa0d Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 5 Nov 2018 19:36:57 +0000 Subject: gnu: Add python-pyelftools. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python.scm (python-pyelftools): New public variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 54ea0caac3..ea439b7ac3 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -10578,6 +10578,31 @@ useful as a validator for JSON data.") (define-public python2-validictory (package-with-python2 python-validictory)) +(define-public python-pyelftools + (package + (name "python-pyelftools") + (version "0.25") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pyelftools" version)) + (sha256 + (base32 + "090vdksbz341f7ljvr0zswblw4lspa8qaiikzyjkf318arpxmil9")))) + (build-system python-build-system) + ;; Test suite requires python-setuptools + (native-inputs + `(("python-setuptools" ,python-setuptools))) + (home-page + "https://github.com/eliben/pyelftools") + (synopsis + "Analyze binary and library file information") + (description "This Python library provides interfaces for parsing and +analyzing two binary and library file formats; the Executable and Linking +Format (ELF), and debugging information in the Debugging With Attributed +Record Format (DWARF).") + (license license:public-domain))) + (define-public python-pyev (package (name "python-pyev") -- cgit v1.2.3 From 9870b9f7f8a10192ad960f898d967bacd7ad0422 Mon Sep 17 00:00:00 2001 From: Luther Thompson Date: Tue, 6 Nov 2018 17:40:51 -0500 Subject: gnu: python-ilinkedlist: Update to 0.3.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python.scm (python-ilinkedlist): Update to 0.3.1. Signed-off-by: Ludovic Courtès --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ea439b7ac3..5f81c428ff 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -14537,14 +14537,14 @@ run on top of the dynamic task schedulers. ") (define-public python-ilinkedlist (package (name "python-ilinkedlist") - (version "0.2.0") + (version "0.3.1") (source (origin (method url-fetch) (uri (pypi-uri "ilinkedlist" version)) (sha256 (base32 - "0klb846q5vs62d8f89my7wan1sji4yjj6pjhjch9dha3p8vlncd2")))) + "04wpv7km8jggrngc4bjg3nm615czd3bjdvpsy2icg6c1c8162zyg")))) (build-system python-build-system) (native-inputs `(("python-pytest" ,python-pytest))) (inputs `(("python" ,python))) -- cgit v1.2.3 From ec868631136d19ca3748e2f6f82d157f943cd7ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Stefanovi=C4=87?= Date: Wed, 7 Nov 2018 16:37:34 +0100 Subject: services: elogind: Fix spelling errors of left value fields in elogind config file. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/services/desktop.scm (elogind-configuration-file)[ini-file]: Fix spelling of left value fields: InhibitDelayMaxSecs, HoldoffTimeoutSecs, IdleActionSeconds, RemoveIpc. Signed-off-by: Ludovic Courtès --- gnu/services/desktop.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index e038f97683..47d1096c6d 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -672,7 +672,7 @@ include the @command{udisksctl} command, part of UDisks, and GNOME Disks." ("KillUserProcesses" (yesno elogind-kill-user-processes?)) ("KillOnlyUsers" (user-name-list elogind-kill-only-users)) ("KillExcludeUsers" (user-name-list elogind-kill-exclude-users)) - ("InhibitDelayMaxSecs" (non-negative-integer elogind-inhibit-delay-max-seconds)) + ("InhibitDelayMaxSec" (non-negative-integer elogind-inhibit-delay-max-seconds)) ("HandlePowerKey" (handle-action elogind-handle-power-key)) ("HandleSuspendKey" (handle-action elogind-handle-suspend-key)) ("HandleHibernateKey" (handle-action elogind-handle-hibernate-key)) @@ -682,16 +682,16 @@ include the @command{udisksctl} command, part of UDisks, and GNOME Disks." ("SuspendKeyIgnoreInhibited" (yesno elogind-suspend-key-ignore-inhibited?)) ("HibernateKeyIgnoreInhibited" (yesno elogind-hibernate-key-ignore-inhibited?)) ("LidSwitchIgnoreInhibited" (yesno elogind-lid-switch-ignore-inhibited?)) - ("HoldoffTimeoutSecs" (non-negative-integer elogind-holdoff-timeout-seconds)) + ("HoldoffTimeoutSec" (non-negative-integer elogind-holdoff-timeout-seconds)) ("IdleAction" (handle-action elogind-idle-action)) - ("IdleActionSeconds" (non-negative-integer elogind-idle-action-seconds)) + ("IdleActionSec" (non-negative-integer elogind-idle-action-seconds)) ("RuntimeDirectorySize" (identity (lambda (config) (match (elogind-runtime-directory-size-percent config) (#f (non-negative-integer (elogind-runtime-directory-size config))) (percent (string-append (non-negative-integer percent) "%")))))) - ("RemoveIpc" (yesno elogind-remove-ipc?)) + ("RemoveIPC" (yesno elogind-remove-ipc?)) "[Sleep]" ("SuspendState" (sleep-list elogind-suspend-state)) ("SuspendMode" (sleep-list elogind-suspend-mode)) -- cgit v1.2.3 From 988b78ba28b5104407ec14e6f07ab80df31d17d8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 8 Nov 2018 11:53:03 +0200 Subject: gnu: Add fstrcmp. * gnu/packages/kodi.scm (fstrcmp): New variable. --- gnu/packages/kodi.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index 6729f1f322..f0aa3bd476 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017 Oleg Pykhalov ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -48,6 +49,7 @@ #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gperf) + #:use-module (gnu packages groff) #:use-module (gnu packages gnunet) #:use-module (gnu packages gnupg) #:use-module (gnu packages image) @@ -233,6 +235,35 @@ generator library for C++.") (description (package-description libdvdcss)) (license license:gpl2+)))) +(define-public fstrcmp + (package + (name "fstrcmp") + (version "0.7.D001") + (source + (origin + (method url-fetch) + (uri (string-append "http://fstrcmp.sourceforge.net/fstrcmp-" + version ".tar.gz")) + (sha256 + (base32 + "0xilghiy3mz78bjmfldi39qyy7jvw5b6wafsx370lw401y2qw0g4")))) + (build-system gnu-build-system) + (home-page "http://fstrcmp.sourceforge.net/") + (arguments + '(#:configure-flags '("SH=sh"))) + (native-inputs + `(("ghostscript" ,ghostscript) ; ps2pdf + ("groff" ,groff) + ("libtool" ,libtool) + ("which" ,which))) + (synopsis "fuzzy comparison of strings") + (description + "The fstrcmp project provides a library that is used to make fuzzy +comparisons of strings and byte arrays, including multi-byte character strings. +This can be useful in error messages, enabling the suggestion of likely valid +alternatives. In compilers, this can reduce the cascade of secondary errors.") + (license license:gpl3+))) + (define-public kodi ;; We package the git version because the current released ;; version was cut while the cmake transition was in turmoil. -- cgit v1.2.3 From e3407254d5e23cfd2741b51d48297bad01864311 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 8 Nov 2018 11:55:38 +0200 Subject: gnu: kodi: Update to 18.0b5. * gnu/packages/kodi.scm (kodi): Update to 18.0b5. [source]: Update snippet. [inputs]: Add flatbuffers, fstrcmp. (crossguid): Update to commit fef89a4174a7bf8cd99fa9154864ce9e8e3bf989. (libdvdnav/kodi, libdvdread/kodi): Update to 6.0.0-Leia-Alpha-3. (libdvdcss/kodi): Update to 1.4.2-Leia-Beta-5. --- gnu/packages/kodi.scm | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index f0aa3bd476..fe7f93fa53 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -64,6 +64,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages samba) #:use-module (gnu packages sdl) + #:use-module (gnu packages serialization) #:use-module (gnu packages ssh) #:use-module (gnu packages swig) #:use-module (gnu packages textutils) @@ -77,11 +78,12 @@ #:use-module (gnu packages assembly)) (define-public crossguid - (let ((commit "8f399e8bd4252be9952f3dfa8199924cc8487ca4")) + (let ((commit "fef89a4174a7bf8cd99fa9154864ce9e8e3bf989") + (revision "2")) (package (name "crossguid") - (version (string-append "0.0-1." (string-take commit 7))) - ;; There's no official release. Just a Git repository. + (version (string-append "0.0-" revision "." (string-take commit 7))) + ;; This is the commit that Kodi wants. (source (origin (method git-fetch) (uri (git-reference @@ -90,13 +92,12 @@ (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1i29y207qqddvaxbn39pk2fbh3gx8zvdprfp35wasj9rw2wjk3s9")))) + "1blrkc7zcqrqcr5msvhyhm98s2jvm9hr0isqs4288q2r4mdnrfq0")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (delete 'configure) ; no configure script - ;; There's no build system here, so we have to do it ourselves. (replace 'build (lambda _ (invoke "g++" "-c" "guid.cpp" "-o" "guid.o" @@ -131,7 +132,7 @@ generator library for C++.") ;; of the standard build process. To make things easier, we bootstrap ;; and patch shebangs here, so we don't have to worry about it later. (define libdvdnav/kodi - (let ((commit "6.0.0-Leia-Alpha-1")) + (let ((commit "6.0.0-Leia-Alpha-3")) (package (name "libdvdnav-bootstrapped") (version commit) @@ -143,7 +144,7 @@ generator library for C++.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1xiyfgf8v8aknlxlzsvk6pbzkhclz0hbh3s1b0w6ivkng2k310j9")))) + "0qwlf4lgahxqxk1r2pzl866mi03pbp7l1fc0rk522sc0ak2s9jhb")))) (build-system gnu-build-system) (arguments '(#:tests? #f @@ -166,7 +167,7 @@ generator library for C++.") (license license:gpl2+)))) (define libdvdread/kodi - (let ((commit "6.0.0-Leia-Alpha-1")) + (let ((commit "6.0.0-Leia-Alpha-3")) (package (name "libdvdread-bootstrapped") (version commit) @@ -178,7 +179,7 @@ generator library for C++.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1c3g18n2vwhgcfz3dka1pmw58bnv2ram7xjvizfiykb3sgi9zfwp")))) + "1xxn01mhkdnp10cqdr357wx77vyzfb5glqpqyg8m0skyi75aii59")))) (build-system gnu-build-system) (arguments '(#:tests? #f @@ -201,7 +202,7 @@ generator library for C++.") (license (list license:gpl2+ license:lgpl2.1+))))) (define libdvdcss/kodi - (let ((commit "1.4.1-Leia-Alpha-1")) + (let ((commit "1.4.2-Leia-Beta-5")) (package (name "libdvdcss-bootstrapped") (version commit) @@ -213,7 +214,7 @@ generator library for C++.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0adafwsawxssj3nilkql447v0l4a2584rdpmy5rfjmznh91lykgh")))) + "0j41ydzx0imaix069s3z07xqw9q95k7llh06fc27dcn6f7b8ydyl")))) (build-system gnu-build-system) (arguments '(#:tests? #f @@ -265,27 +266,23 @@ alternatives. In compilers, this can reduce the cascade of secondary errors.") (license license:gpl3+))) (define-public kodi - ;; We package the git version because the current released - ;; version was cut while the cmake transition was in turmoil. - (let ((commit "ec16dbca4dcf2923f53f819695a6d47c52e68d74") - (revision "8")) (package (name "kodi") - (version (git-version "18.0_alpha" revision commit)) + (version "18.0b5") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/xbmc/xbmc.git") - (commit commit))) + (commit (string-append version "-Leia")))) (file-name (git-file-name name version)) (sha256 (base32 - "1rxg752cl59124cfpfwmyjldn6qpq5jginxddpzvgagfadf10i4d")) + "042qzvhys3sajby6ywgmrsymhji37qk0iqgppznrvm53vrizwsam")) (snippet '(begin (use-modules (guix build utils)) (for-each delete-file-recursively - '("project/BuildDependencies/bin/" + '("project/BuildDependencies/" ;; TODO: Purge these jars. ;;"tools/codegenerator/groovy" ;; And these sources: @@ -401,10 +398,12 @@ alternatives. In compilers, this can reduce the cascade of secondary errors.") ("eudev" ,eudev) ("ffmpeg" ,ffmpeg) ("flac" ,flac) + ("flatbuffers" ,flatbuffers) ("fmt" ,fmt) ("fontconfig" ,fontconfig) ("freetype" ,freetype) ("fribidi" ,fribidi) + ("fstrcmp" ,fstrcmp) ("giflib" ,giflib) ("glew" ,glew) ("gnutls" ,gnutls) @@ -458,7 +457,7 @@ plug-in system.") license:expat ;cpluff, dbwrappers license:public-domain ;cpluff/examples license:bsd-3 ;misc, gtest - license:bsd-2))))) ;xbmc/freebsd + license:bsd-2)))) ;xbmc/freebsd (define-public kodi-cli (let ((commit "104dc23b2a993c8e6db8c46f4f8bec24b146549b") ; Add support for -- cgit v1.2.3 From 2705780f3f4d15740cbd9d54a5133aced15a7200 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 8 Nov 2018 13:08:26 +0100 Subject: gnu: Add emacs-clang-format. * gnu/packages/emacs.scm (emacs-clang-format): New variable. --- gnu/packages/emacs.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 4821c18f6e..3c7d902e11 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -12463,3 +12463,40 @@ correctly.") @item helm-slime-repl-history: Select an input from the SLIME REPL history and insert it. @end itemize\n") (license license:gpl3+)))) + +(define-public emacs-clang-format + (let ((commit "5556c31528af2661bed3011bd63ffc0ed44e18a0")) + (package + (name "emacs-clang-format") + (version (git-version "0.0.0" "1" commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacsorphanage/clang-format") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ynvnp3vrcpngmwakb23xv4xn7jbkg43s196q7pg9nkl13x4n2nq")))) + (build-system emacs-build-system) + (inputs + `(("clang" ,clang))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'configure + (lambda* (#:key inputs #:allow-other-keys) + (let ((clang (assoc-ref inputs "clang"))) + ;; Repo is read-only. + (chmod "clang-format.el" #o644) + (emacs-substitute-variables "clang-format.el" + ("clang-format-executable" + (string-append clang "/bin/clang-format")))) + #t))))) + (home-page "https://github.com/emacsorphanage/clang-format") + (synopsis "Format code using clang-format") + (description "This package allows to filter code through clang-format to +fix its formatting. @command{clang-format} is a tool that formats C/C++/Obj-C +code according to a set of style options, see +@url{http://clang.llvm.org/docs/ClangFormatStyleOptions.html}.") + (license license:gpl3+)))) -- cgit v1.2.3 From 41d2b7f50b82469177c0ae2429571db6a5c1c3f0 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 8 Nov 2018 13:24:35 -0500 Subject: gnu: PostgreSQL 9: Update to 9.6.11 [fixes CVE-2018-16850]. * gnu/packages/databases.scm (postgresql-9.6): Update to 9.6.11. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 87fb170e5d..dc7e2aa53d 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -849,14 +849,14 @@ pictures, sounds, or video.") (package (inherit postgresql) (name "postgresql") - (version "9.6.9") + (version "9.6.11") (source (origin (method url-fetch) (uri (string-append "https://ftp.postgresql.org/pub/source/v" version "/postgresql-" version ".tar.bz2")) (sha256 (base32 - "0biy8j69dbvdmrag55pdszpc0702agzqhhcwdx21xp02mzim4ydr")))))) + "0c55akrkzqd6p6a8hr0338wk246hl76r9j16p4zn3s51d7f0l99q")))))) (define-public python-pymysql (package -- cgit v1.2.3 From e4b62e229e9dfb7da158a3a5c7a26b149b41c8ab Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 9 Nov 2018 01:06:21 -0500 Subject: gnu: wxmaxima: Update to 18.10.1. * gnu/packages/maths.scm (wxmaxima): Update to 18.10.1. [source]: Update URL and remove patch. * gnu/packages/patches/wxmaxima-do-not-use-old-gnuplot-parameters.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove patch. --- gnu/local.mk | 1 - gnu/packages/maths.scm | 10 ++++----- ...xmaxima-do-not-use-old-gnuplot-parameters.patch | 26 ---------------------- 3 files changed, 4 insertions(+), 33 deletions(-) delete mode 100644 gnu/packages/patches/wxmaxima-do-not-use-old-gnuplot-parameters.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index c627577e41..68a87b1255 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1228,7 +1228,6 @@ dist_patch_DATA = \ %D%/packages/patches/wpa-supplicant-fix-zeroed-keys.patch \ %D%/packages/patches/wpa-supplicant-fix-nonce-reuse.patch \ %D%/packages/patches/wpa-supplicant-krack-followups.patch \ - %D%/packages/patches/wxmaxima-do-not-use-old-gnuplot-parameters.patch \ %D%/packages/patches/x265-detect512-all-arches.patch \ %D%/packages/patches/xboing-CVE-2004-0149.patch \ %D%/packages/patches/xf86-video-ark-remove-mibstore.patch \ diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 808ab5345b..0d040bf296 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2763,18 +2763,16 @@ point numbers.") (define-public wxmaxima (package (name "wxmaxima") - (version "18.02.0") + (version "18.10.1") (source (origin (method url-fetch) - (uri (string-append "https://github.com/andrejv/" name "/archive" - "/Version-" version ".tar.gz")) + (uri (string-append "https://github.com/wxMaxima-developers/" name + "/archive/Version-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "03kr2rgfp4hcf3is8m8d8f9hj660c3xgrc50vrrfpixx4syh6wvj")) - (patches - (search-patches "wxmaxima-do-not-use-old-gnuplot-parameters.patch")))) + "0c2blq65r0am509p3rjqpwqk6vl5r2yg1p9nh2jczf80vhi3ldas")))) (build-system cmake-build-system) (native-inputs `(("gettext" ,gettext-minimal))) diff --git a/gnu/packages/patches/wxmaxima-do-not-use-old-gnuplot-parameters.patch b/gnu/packages/patches/wxmaxima-do-not-use-old-gnuplot-parameters.patch deleted file mode 100644 index 345101bd3a..0000000000 --- a/gnu/packages/patches/wxmaxima-do-not-use-old-gnuplot-parameters.patch +++ /dev/null @@ -1,26 +0,0 @@ -This fixes the wxplot2d plotting issue found at -https://github.com/andrejv/wxmaxima/issues/973. - -From 5a0693c97ceaa4935b908f1e478126896952f399 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Gunter=20K=C3=B6nigsmann?= -Date: Mon, 19 Feb 2018 05:37:35 +0100 -Subject: [PATCH] Seems I accidentally made wxMaxima to default to parameters - for old gnuplots. Resolves #973 - ---- - data/wxmathml.lisp.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/wxmathml.lisp.in b/data/wxmathml.lisp.in -index a32e3fc3..4e19acaf 100644 ---- a/data/wxmathml.lisp.in -+++ b/data/wxmathml.lisp.in -@@ -43,7 +43,7 @@ - (defvar $wxsubscripts t - "Recognize TeX-style subscripts") - (defvar $wxplot_pngcairo nil "Use gnuplot's pngcairo terminal for new plots?") --(defmvar $wxplot_old_gnuplot t) -+(defmvar $wxplot_old_gnuplot nil) - - (defun $wxstatusbar (status) - (format t "~a~%" status)) -- cgit v1.2.3 From b1b82aed5d5947eaa1ebf300f8c592e660555a3c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 9 Nov 2018 08:36:42 +0100 Subject: gnu: powertabeditor: Use INVOKE. * gnu/packages/music.scm (powertabeditor)[arguments]: Use INVOKE and return #T unconditionally. --- gnu/packages/music.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 25928d2cdd..7df29deabd 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1182,14 +1182,14 @@ add_library( rapidjson INTERFACE IMPORTED )")) (modify-phases %standard-phases (replace 'check (lambda _ - (zero? (system* "bin/pte_tests" - ;; FIXME: these tests fail - "exclude:Actions/EditStaff" - "exclude:Formats/PowerTabOldImport/MergeMultiBarRests" - "exclude:Score/ViewFilter/FilterRule" - "exclude:Score/ViewFilter/ViewFilter" - "exclude:Formats/PowerTabOldImport/Directions" - )))) + (invoke "bin/pte_tests" + ;; FIXME: these tests fail + "exclude:Actions/EditStaff" + "exclude:Formats/PowerTabOldImport/MergeMultiBarRests" + "exclude:Score/ViewFilter/FilterRule" + "exclude:Score/ViewFilter/ViewFilter" + "exclude:Formats/PowerTabOldImport/Directions") + #t)) ;; FIXME: This bug has been fixed upstream, but no release has been ;; made yet. See https://github.com/powertab/powertabeditor/issues/257 (add-after 'unpack 'fix-boost-bug -- cgit v1.2.3 From 1b12b572a5df2b8c6f67ad0515a87543da098a09 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 9 Nov 2018 08:37:12 +0100 Subject: gnu: powertabeditor: Fetch sources from git. * gnu/packages/music.scm (powertabeditor)[source]: Fetch from git. --- gnu/packages/music.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 7df29deabd..3f0498ee53 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1141,14 +1141,14 @@ your own lessons.") (name "powertabeditor") (version "2.0.0-alpha10") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/powertab/powertabeditor/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/powertab/powertabeditor.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1fr14ql0yhlqvh6y08yaanszm2nvca5i50rqym396kfvga3ky18x")) + "1z4fhdp71ck9synr12rg1p6365xnypd8ih40c5icj4si36khvksk")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 97f33b05ec90deecaf43587467ed3fbbcb36bd2a Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 9 Nov 2018 19:33:00 +0900 Subject: gnu: guile-newt: Update to revision 1. * gnu/packages/guile.scm (guile-newt): Update to revision 1. --- gnu/packages/guile.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 3c8d2e58f9..8c55c749d8 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -2289,8 +2289,8 @@ tracker's SOAP service, such as @url{https://bugs.gnu.org}.") ;; There has not been any release yet. (define-public guile-newt - (let ((commit "596ad760bee1be419d71271732f0f30eaee55143") - (revision "0")) + (let ((commit "4eaa3cf84b9b426cc0ff7bec48b76cca6ca3ec83") + (revision "1")) (package (name "guile-newt") (version (string-append "0-" revision "." (string-take commit 9))) @@ -2302,7 +2302,7 @@ tracker's SOAP service, such as @url{https://bugs.gnu.org}.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "18qqbi0bc7vp2vlrhib3p3wwgn7wrlv5728dn0avirhw4fxxivnf")))) + "0ww7jbdsmjlsxm60ym6cb5s5kc4ljz8bn4y2lvcqnap0aihqfk10")))) (build-system gnu-build-system) (arguments '(#:make-flags -- cgit v1.2.3 From 2cce23bfb8fbb57c3f11780a939d74b5bd9ed3a2 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 9 Nov 2018 11:31:17 +0100 Subject: gnu: Add xmlrpc-c. * gnu/packages/xml.scm (xmlrpc-c): New variable. --- gnu/packages/xml.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index c1f14d720e..347ac878a3 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2017 Alex Vong ;;; Copyright © 2017 Petter ;;; Copyright © 2017 Stefan Reichör +;;; Copyright © 2018 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; @@ -39,6 +40,7 @@ #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages compression) + #:use-module (gnu packages curl) #:use-module (gnu packages gnupg) #:use-module (gnu packages java) #:use-module (gnu packages gnuzilla) @@ -2095,3 +2097,39 @@ derivations of regular expressions.") "The Haskell XML Toolbox bases on the ideas of HaXml and HXML, but introduces a more general approach for processing XML with Haskell.") (license license:expat))) + +(define-public xmlrpc-c + (package + (name "xmlrpc-c") + (version "1.43.08") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/xmlrpc-c/Xmlrpc-c%20Super%20Stable/" + version "/xmlrpc-c-" version ".tgz")) + (sha256 + (base32 + "18zwbj6i2hpcn5riiyp8i6rml0sfv60dd7phw1x8g4r4lj2bbxf9")))) + (build-system gnu-build-system) + (inputs + `(("curl" ,curl))) + (native-inputs + `(;; For tools, if ever needed. + ("perl" ,perl))) + (arguments + `(#:make-flags ; Add $libdir to the RUNPATH of all the executables. + (list (string-append "LDFLAGS_PERSONAL=-Wl,-rpath=" %output "/lib")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-/bin/sh-in-tests + (lambda _ + (substitute* "GNUmakefile" + (("#! /bin/sh") (which "sh"))) + #t))))) + (home-page "http://xmlrpc-c.sourceforge.net/") + (synopsis "Lightweight RPC library based on XML and HTTP") + (description + "XML-RPC is a quick-and-easy way to make procedure calls over the Internet. +It converts the procedure call into an XML document, sends it to a remote +server using HTTP, and gets back the response as XML. This library provides a +modular implementation of XML-RPC for C and C++.") + (license (list license:psfl license:expat)))) -- cgit v1.2.3 From ddd925f608bf7bf9af367447ef937e92d531a941 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 9 Nov 2018 11:32:25 +0100 Subject: gnu: Add emacs-gtk-look. * gnu/packages/emacs.scm (emacs-gtk-look): New variable. --- gnu/packages/emacs.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 3c7d902e11..c6008e6a94 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -12500,3 +12500,41 @@ fix its formatting. @command{clang-format} is a tool that formats C/C++/Obj-C code according to a set of style options, see @url{http://clang.llvm.org/docs/ClangFormatStyleOptions.html}.") (license license:gpl3+)))) + +(define-public emacs-gtk-look + (package + (name "emacs-gtk-look") + (version "29") + (source (origin + (method url-fetch) + (uri "https://download.tuxfamily.org/user42/gtk-look.el") + (sha256 + (base32 + "14p2nwrd51cr1v06fxbjjn6jdrkf9d6vcxhmscm0kl677s25ypsp")))) + (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'configure + (lambda _ + ;; File is read-only. + (chmod "gtk-look.el" #o644) + (emacs-substitute-variables "gtk-look.el" + ("gtk-lookup-devhelp-indices" + '(list (expand-file-name "~/.guix-profile/share/gtk-doc/html/*/*.devhelp*")))) + #t))))) + (home-page "http://user42.tuxfamily.org/gtk-look/index.html") + (synopsis "Find and display HTML documentation for GTK, GNOME and Glib") + (description "@command{gtk-look} finds and displays HTML documentation for +GTK, GNOME and Glib functions and variables in Emacs, similar to what +info-lookup-symbol does for info files (C-h S). The documentation is expected +to be devhelp indexes with HTML files. The location of the indexes can be +customized. In addition to C code development @command{gtk-look} is good for + +@itemize +@item @command{perl-gtk2}, recognising class funcs like +@command{Gtk2::Label->new} and bare method names like @command{set_text}. +@item @command{guile-gnome}, recognising methods like @command{set-text} and +classes like @command{}. +@end itemize\n") + (license license:gpl3+))) -- cgit v1.2.3 From 2eaaadb4d67977773d7f39ab0025acdffc135cc0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 9 Nov 2018 10:47:05 +0100 Subject: gnu: r-with-tests: Use INVOKE. * gnu/packages/statistics.scm (r-with-tests)[arguments]: Use INVOKE and return #T unconditionally. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 642fa2d423..e76bc7cfc7 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -218,9 +218,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") #t)) (add-after 'build 'install-info - (lambda _ (zero? (system* "make" "install-info"))))) + (lambda _ (invoke "make" "install-info") #t))) #: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 -- cgit v1.2.3 From cee9ab244f9ba9f3156b6aa50927418bae951096 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 9 Nov 2018 10:47:34 +0100 Subject: gnu: r-with-tests: Update to 3.5.1. * gnu/packages/statistics.scm (r-with-tests): Update to 3.5.1. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index e76bc7cfc7..5b494c4829 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -121,7 +121,7 @@ be output in text, PostScript, PDF or HTML.") (define r-with-tests (package (name "r-with-tests") - (version "3.5.0") + (version "3.5.1") (source (origin (method url-fetch) (uri (string-append "mirror://cran/src/base/R-" @@ -129,7 +129,7 @@ be output in text, PostScript, PDF or HTML.") version ".tar.gz")) (sha256 (base32 - "0w38865laqg28cdhikxdxhx4rfp0kgcn72gakwypsy91br9ja5zx")))) + "1vap2k8kj5icy9naw61f9zyphf4rs0c9rxvil0zxkwx0xvsvyqq4")))) (build-system gnu-build-system) (arguments `(#:disallowed-references (,tzdata-for-tests) -- cgit v1.2.3 From 8a587c89af55d7fa858a65fe717cfbfbe84b0e1e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 9 Nov 2018 16:45:21 +0100 Subject: gnu: Add r-savr. * gnu/packages/bioconductor.scm (r-savr): New variable. --- gnu/packages/bioconductor.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index bab6b2b64d..bc13460299 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -969,3 +969,29 @@ using pre-clustering with the k-means algorithm. Functions are also provided to search for all neighbors within a given distance. Parallelization is achieved for all methods using the BiocParallel framework.") (license license:gpl3))) + +(define-public r-savr + (package + (name "r-savr") + (version "1.20.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "savR" version)) + (sha256 + (base32 + "13bwq2a2pygdkmhrcmvz525wsi5i01j911711zgs6x93wj20b2w7")))) + (properties `((upstream-name . "savR"))) + (build-system r-build-system) + (propagated-inputs + `(("r-ggplot2" ,r-ggplot2) + ("r-gridextra" ,r-gridextra) + ("r-reshape2" ,r-reshape2) + ("r-scales" ,r-scales) + ("r-xml" ,r-xml))) + (home-page "https://github.com/bcalder/savR") + (synopsis "Parse and analyze Illumina SAV files") + (description + "This package provides tools to parse Illumina Sequence Analysis +Viewer (SAV) files, access data, and generate QC plots.") + (license license:agpl3+))) -- cgit v1.2.3 From 3a4c6288c81d91ce48200a310ad0d83bddfb7a5a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 9 Nov 2018 16:53:15 +0100 Subject: gnu: Add r-aggregation. * gnu/packages/cran.scm (r-aggregation): New variable. --- gnu/packages/cran.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ec950ce0ac..33dda347b5 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3071,6 +3071,26 @@ Analysis for Physical Applications, Donald B. Percival and Andrew T. Walden, Cambridge University Press, 1993.") (license license:gpl2))) +(define-public r-aggregation + (package + (name "r-aggregation") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "aggregation" version)) + (sha256 + (base32 + "0j9g604m2ccc7hcy02539yja9cf3xcbl25gvp838bp4x8w18my46")))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/web/packages/aggregation/") + (synopsis "Methods for p-value aggregation") + (description + "This package contains functionality for performing the following methods +of p-value aggregation: Fisher's method, the Lancaster method (weighted +Fisher's method), and Sidak correction.") + (license license:gpl3))) + (define-public r-quantmod (package (name "r-quantmod") -- cgit v1.2.3 From ff939ef4d53af151683fbbae389cf60d76aef6ae Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 9 Nov 2018 16:55:06 +0100 Subject: gnu: Add r-h5. * gnu/packages/cran.scm (r-h5): New variable. --- gnu/packages/cran.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 33dda347b5..e22c5010d9 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -32,6 +32,7 @@ #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system r) + #:use-module (gnu packages base) #:use-module (gnu packages compression) #:use-module (gnu packages gcc) #:use-module (gnu packages gnome) @@ -3472,6 +3473,36 @@ dendrograms.") ;; Either version of the license. (license (list license:gpl2 license:gpl3)))) +(define-public r-h5 + (package + (name "r-h5") + (version "0.9.9") + (source + (origin + (method url-fetch) + (uri (cran-uri "h5" version)) + (sha256 + (base32 + "14p7i1sj24ky87kd7qr3n9fc9l64s0bp0rwbyl6i2x69xn75gpsx")))) + (build-system r-build-system) + (inputs + `(("zlib" ,zlib) + ("hdf5" ,hdf5))) + (native-inputs + `(("which" ,which))) + (propagated-inputs + `(("r-rcpp" ,r-rcpp))) + (home-page "https://github.com/mannau/h5") + (synopsis "Interface to the HDF5 Library") + (description + "This package provides an S4 interface to the HDF5 library supporting +fast storage and retrieval of R-objects like vectors, matrices and arrays to +binary files in a language independent format. The HDF5 format can therefore +be used as an alternative to R's save/load mechanism. Since h5 is able to +access only subsets of stored data it can also handle data sets which do not +fit into memory.") + (license license:bsd-2))) + (define-public r-cgdsr (package (name "r-cgdsr") -- cgit v1.2.3 From a961ae469cf81797df34f22eef0f0f5ca1a21e07 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 9 Nov 2018 17:09:14 +0100 Subject: gnu: Add r-destiny. * gnu/packages/bioconductor.scm (r-destiny): New variable. --- gnu/packages/bioconductor.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index bc13460299..95c722ac40 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -970,6 +970,41 @@ to search for all neighbors within a given distance. Parallelization is achieved for all methods using the BiocParallel framework.") (license license:gpl3))) +(define-public r-destiny + (package + (name "r-destiny") + (version "2.12.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "destiny" version)) + (sha256 + (base32 + "1iay17mrhsfmpwl920rh1nip5b6ybva4h6bna0yld04paq5yva67")))) + (build-system r-build-system) + (propagated-inputs + `(("r-biobase" ,r-biobase) + ("r-biocgenerics" ,r-biocgenerics) + ("r-fnn" ,r-fnn) + ("r-ggthemes" ,r-ggthemes) + ("r-hmisc" ,r-hmisc) + ("r-igraph" ,r-igraph) + ("r-matrix" ,r-matrix) + ("r-proxy" ,r-proxy) + ("r-rcpp" ,r-rcpp) + ("r-rcppeigen" ,r-rcppeigen) + ("r-scales" ,r-scales) + ("r-scatterplot3d" ,r-scatterplot3d) + ("r-smoother" ,r-smoother) + ("r-summarizedexperiment" ,r-summarizedexperiment) + ("r-vim" ,r-vim))) + (home-page "https://bioconductor.org/packages/destiny/") + (synopsis "Create and plot diffusion maps") + (description "This package provides tools to create and plot diffusion +maps.") + ;; Any version of the GPL + (license license:gpl3+))) + (define-public r-savr (package (name "r-savr") -- cgit v1.2.3 From f338e4807f71503071da1af54b887e7f08a078da Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 9 Nov 2018 16:46:29 +0100 Subject: gnu: Add r-rgl. * gnu/packages/cran.scm (r-rgl): New variable. --- gnu/packages/cran.scm | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e22c5010d9..6840a2fc66 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -34,10 +34,13 @@ #:use-module (guix build-system r) #:use-module (gnu packages base) #:use-module (gnu packages compression) + #:use-module (gnu packages fontutils) #:use-module (gnu packages gcc) + #:use-module (gnu packages gl) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) #:use-module (gnu packages haskell) + #:use-module (gnu packages image) #:use-module (gnu packages machine-learning) #:use-module (gnu packages maths) #:use-module (gnu packages mpi) @@ -46,7 +49,8 @@ #:use-module (gnu packages python) #:use-module (gnu packages statistics) #:use-module (gnu packages tls) - #:use-module (gnu packages web)) + #:use-module (gnu packages web) + #:use-module (gnu packages xorg)) (define-public r-clipr (package @@ -7376,3 +7380,45 @@ netCDF files.") "This package provides a convenient tool to install and update Bioconductor packages.") (license license:artistic2.0))) + +(define-public r-rgl + (package + (name "r-rgl") + (version "0.99.16") + (source + (origin + (method url-fetch) + (uri (cran-uri "rgl" version)) + (sha256 + (base32 + "0q8sg8fr0140ilssqhscaxkjc29w1rpp6f4k50amw3zzs9g58ak9")))) + (build-system r-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("freetype" ,freetype) + ("libpng" ,libpng) + ("glu" ,glu) + ("libx11" ,libx11) + ("ghc-pandoc" ,ghc-pandoc) + ("zlib" ,zlib))) + (propagated-inputs + `(("r-crosstalk" ,r-crosstalk) + ("r-htmltools" ,r-htmltools) + ("r-htmlwidgets" ,r-htmlwidgets) + ("r-jsonlite" ,r-jsonlite) + ("r-knitr" ,r-knitr) + ("r-magrittr" ,r-magrittr) + ("r-manipulatewidget" ,r-manipulatewidget) + ("r-shiny" ,r-shiny))) + (home-page "https://r-forge.r-project.org/projects/rgl/") + (synopsis "3D visualization using OpenGL") + (description + "This package provides medium to high level functions for 3D interactive graphics, +including functions modelled on base graphics (@code{plot3d()}, etc.) as well +as functions for constructing representations of geometric +objects (@code{cube3d()}, etc.). Output may be on screen using OpenGL, or to +various standard 3D file formats including WebGL, PLY, OBJ, STL as well as 2D +image formats, including PNG, Postscript, SVG, PGF.") + ;; Any version of the GPL. + (license (list license:gpl2+ license:gpl3+)))) -- cgit v1.2.3 From 213e72a18dc20ba4ae1275e1f48104737c2a7526 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 9 Nov 2018 16:46:41 +0100 Subject: gnu: Add r-multicool. * gnu/packages/cran.scm (r-multicool): New variable. --- gnu/packages/cran.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6840a2fc66..06bdaa8d61 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7422,3 +7422,24 @@ various standard 3D file formats including WebGL, PLY, OBJ, STL as well as 2D image formats, including PNG, Postscript, SVG, PGF.") ;; Any version of the GPL. (license (list license:gpl2+ license:gpl3+)))) + +(define-public r-multicool + (package + (name "r-multicool") + (version "0.1-10") + (source + (origin + (method url-fetch) + (uri (cran-uri "multicool" version)) + (sha256 + (base32 + "1ybg9piya9psqg42w9i3zsnavbxhkfklfwl7cb420i5nkq6wpc2v")))) + (build-system r-build-system) + (propagated-inputs `(("r-rcpp" ,r-rcpp))) + (home-page "https://cran.r-project.org/web/packages/multicool/") + (synopsis "Permutations of multisets in cool-lex order") + (description + "This package provides a set of tools to permute multisets without loops +or hash tables and to generate integer partitions. Cool-lex order is similar +to colexicographical order.") + (license license:gpl2))) -- cgit v1.2.3 From 4106e6ad87cb9b4bd571bc1a91cb026719770095 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 9 Nov 2018 16:46:51 +0100 Subject: gnu: Add r-misc3d. * gnu/packages/cran.scm (r-misc3d): New variable. --- gnu/packages/cran.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 06bdaa8d61..604ba951c6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7443,3 +7443,23 @@ image formats, including PNG, Postscript, SVG, PGF.") or hash tables and to generate integer partitions. Cool-lex order is similar to colexicographical order.") (license license:gpl2))) + +(define-public r-misc3d + (package + (name "r-misc3d") + (version "0.8-4") + (source + (origin + (method url-fetch) + (uri (cran-uri "misc3d" version)) + (sha256 + (base32 + "0qjzpw3h09qi2gfz52b7nhzd95p7yyxsd03fldc9wzzn6wi3vpkm")))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/web/packages/misc3d/") + (synopsis "Miscellaneous 3D Plots") + (description + "This package provides a collection of miscellaneous 3d plots, including +isosurfaces.") + ;; Any version of the GPL. + (license (list license:gpl2+ license:gpl3+)))) -- cgit v1.2.3 From da256afb9ed35bb15e7cab01a3aab76f1ec5639d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 9 Nov 2018 16:47:03 +0100 Subject: gnu: Add r-ks. * gnu/packages/cran.scm (r-ks): New variable. --- gnu/packages/cran.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 604ba951c6..8c5c9258a9 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7463,3 +7463,35 @@ to colexicographical order.") isosurfaces.") ;; Any version of the GPL. (license (list license:gpl2+ license:gpl3+)))) + +(define-public r-ks + (package + (name "r-ks") + (version "1.11.3") + (source + (origin + (method url-fetch) + (uri (cran-uri "ks" version)) + (sha256 + (base32 + "0z749c3xzpf6n0g7xcfplrhap1di8k7kcfr7vigh95ywnigyhs8d")))) + (build-system r-build-system) + (propagated-inputs + `(("r-fnn" ,r-fnn) + ("r-kernlab" ,r-kernlab) + ("r-kernsmooth" ,r-kernsmooth) + ("r-matrix" ,r-matrix) + ("r-mclust" ,r-mclust) + ("r-mgcv" ,r-mgcv) + ("r-misc3d" ,r-misc3d) + ("r-multicool" ,r-multicool) + ("r-mvtnorm" ,r-mvtnorm))) + (home-page "http://www.mvstat.net/tduong/") + (synopsis "Kernel smoothing") + (description + "This package provides kernel smoothers for univariate and multivariate +data, including density functions, density derivatives, cumulative +distributions, modal clustering, discriminant analysis, and two-sample +hypothesis testing.") + ;; Either version of the GPL. + (license (list license:gpl2 license:gpl3)))) -- cgit v1.2.3 From cf383cf08ff1b68a9610cddf66c1851b2aeddaab Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 9 Nov 2018 16:47:12 +0100 Subject: gnu: Add r-feature. * gnu/packages/cran.scm (r-feature): New variable. --- gnu/packages/cran.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8c5c9258a9..ef3c148da1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7495,3 +7495,29 @@ distributions, modal clustering, discriminant analysis, and two-sample hypothesis testing.") ;; Either version of the GPL. (license (list license:gpl2 license:gpl3)))) + +(define-public r-feature + (package + (name "r-feature") + (version "1.2.13") + (source + (origin + (method url-fetch) + (uri (cran-uri "feature" version)) + (sha256 + (base32 + "07hkw0bv38naj2hdsx4xxrm2dngi6w3rbvgr7s50bjic8hlgy1ra")))) + (build-system r-build-system) + (propagated-inputs + `(("r-ks" ,r-ks) + ("r-misc3d" ,r-misc3d) + ("r-rgl" ,r-rgl))) + (home-page "http://www.mvstat.net/tduong/") + (synopsis "Inferential feature significance for kernel density estimation") + (description + "The feature package contains functions to display and compute kernel +density estimates, significant gradient and significant curvature regions. +Significant gradient and/or curvature regions often correspond to significant +features (e.g. local modes).") + ;; Either version of the GPL. + (license (list license:gpl2 license:gpl3)))) -- cgit v1.2.3 From 06bc7b82f7c6cb623911867f55b58b3316d3ddfc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 9 Nov 2018 16:47:19 +0100 Subject: gnu: Add r-arm. * gnu/packages/cran.scm (r-arm): New variable. --- gnu/packages/cran.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ef3c148da1..83d8f510a1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7521,3 +7521,30 @@ Significant gradient and/or curvature regions often correspond to significant features (e.g. local modes).") ;; Either version of the GPL. (license (list license:gpl2 license:gpl3)))) + +(define-public r-arm + (package + (name "r-arm") + (version "1.10-1") + (source + (origin + (method url-fetch) + (uri (cran-uri "arm" version)) + (sha256 + (base32 + "0vvp90jygajd6ydky57z66wqjq9msfbl88irj5jbsray574mh4bg")))) + (build-system r-build-system) + (propagated-inputs + `(("r-abind" ,r-abind) + ("r-coda" ,r-coda) + ("r-lme4" ,r-lme4) + ("r-mass" ,r-mass) + ("r-matrix" ,r-matrix) + ("r-nlme" ,r-nlme))) + (home-page "https://cran.r-project.org/web/packages/arm/") + (synopsis "Data analysis using regression and multilevel/hierarchical models") + (description + "This package provides functions to accompany A. Gelman and J. Hill, +Data Analysis Using Regression and Multilevel/Hierarchical Models, Cambridge +University Press, 2007.") + (license license:gpl3+))) -- cgit v1.2.3 From f87a18e66079a540beea99fe6475fccb49a9ff68 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 9 Nov 2018 18:58:47 +0100 Subject: gnu: r-rcpp: Update to 1.0.0. * gnu/packages/cran.scm (r-rcpp): Update to 1.0.0. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 83d8f510a1..4ecd1c6a21 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -571,14 +571,16 @@ you to rapidly iterate while developing a package.") (define-public r-rcpp (package (name "r-rcpp") - (version "0.12.19") + (version "1.0.0") (source (origin (method url-fetch) (uri (cran-uri "Rcpp" version)) (sha256 - (base32 "10mmiaawv9iwglc6z4y51mdpsfb1sivqmwr6xnfqkllcnpabdbk3")))) + (base32 "1hlbw4k79q9ich4w27b01gsvwrsnrflii8zjlcmgfzm1vpq8ndxp")))) (build-system r-build-system) + (native-inputs + `(("r-knitr" ,r-knitr))) ; for vignettes (home-page "http://www.rcpp.org") (synopsis "Seamless R and C++ integration") (description -- cgit v1.2.3 From fccb24501a88d10352a106d160bcf11c284144c1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 9 Nov 2018 18:59:32 +0100 Subject: gnu: r-jomo: Update to 2.6-5. * gnu/packages/cran.scm (r-jomo): Update to 2.6-5. [propagated-inputs]: Add r-mass. --- gnu/packages/cran.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4ecd1c6a21..ecead0c5a4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2049,17 +2049,18 @@ Laplace approximation and adaptive Gauss-Hermite quadrature.") (define-public r-jomo (package (name "r-jomo") - (version "2.6-4") + (version "2.6-5") (source (origin (method url-fetch) (uri (cran-uri "jomo" version)) (sha256 (base32 - "05g2rj9g7rgyb22b0gybw042nydyqsqsb31v05hifzavri8ij01x")))) + "109q5m69clrvvialxdxznd0wdb54ajhx84nj8slx8bf909a427mj")))) (build-system r-build-system) (propagated-inputs `(("r-lme4" ,r-lme4) + ("r-mass" ,r-mass) ("r-ordinal" ,r-ordinal) ("r-survival" ,r-survival))) (home-page "https://cran.r-project.org/web/packages/jomo/") -- cgit v1.2.3 From 492ec49890f020c1d4ad4eaf3e21e235b79e989d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 9 Nov 2018 18:59:50 +0100 Subject: gnu: r-tmb: Update to 1.7.15. * gnu/packages/cran.scm (r-tmb): Update to 1.7.15. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ecead0c5a4..45526c7072 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6565,14 +6565,14 @@ Bayesian modeling.") (define-public r-tmb (package (name "r-tmb") - (version "1.7.14") + (version "1.7.15") (source (origin (method url-fetch) (uri (cran-uri "TMB" version)) (sha256 (base32 - "0bpc504nz8xfwr8ack52dj4hpjcykn6zyf8n228z32dw9d5n96dl")))) + "1r2d8c5iazihba42sn33yarv0dcfiy989sx64zcf14zr8k6cgjzs")))) (properties `((upstream-name . "TMB"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 5174f06b0c3bf96dda4ed2b1d85c4e70fbce7ab2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 9 Nov 2018 19:00:05 +0100 Subject: gnu: r-rgooglemaps: Update to 1.4.3. * gnu/packages/geo.scm (r-rgooglemaps): Update to 1.4.3. --- gnu/packages/geo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 4481e21ddf..fa2b259d7c 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -549,14 +549,14 @@ coordinates.") (define-public r-rgooglemaps (package (name "r-rgooglemaps") - (version "1.4.2") + (version "1.4.3") (source (origin (method url-fetch) (uri (cran-uri "RgoogleMaps" version)) (sha256 (base32 - "112mdm53qx92n2m4ms02sbppckp44l1z19vy99j6gw3jrdprjydl")))) + "06ab3lg1rwm93hkshf1vxfm8mlxq5qsjan0wx43lhnrysay65js4")))) (properties `((upstream-name . "RgoogleMaps"))) (build-system r-build-system) (propagated-inputs `(("r-png" ,r-png))) -- cgit v1.2.3 From 317f5a5a9113f0e04622f75b66db432b3b0b0c04 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 9 Nov 2018 19:00:14 +0100 Subject: gnu: r-sn: Update to 1.5-3. * gnu/packages/statistics.scm (r-sn): Update to 1.5-3. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 5b494c4829..f363d9a473 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5325,14 +5325,14 @@ first and second order derivatives.") (define-public r-sn (package (name "r-sn") - (version "1.5-2") + (version "1.5-3") (source (origin (method url-fetch) (uri (cran-uri "sn" version)) (sha256 (base32 - "16gwr68zzj5v83bqfmzxnzwig3dnjrkxdhs6clri1caqkvrq6aig")))) + "10via4lg0vx9pzq350vwhz5wv1dhzxr2l3r6jq99nk37vmyvj8fc")))) (build-system r-build-system) (propagated-inputs `(("r-mnormt" ,r-mnormt) -- cgit v1.2.3 From 77bea84ba128ac2c7d55530d2c581021e8d16884 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 9 Nov 2018 19:00:23 +0100 Subject: gnu: r-biocviews: Update to 1.50.5. * gnu/packages/bioinformatics.scm (r-biocviews): Update to 1.50.5. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 8820ba0d8e..9147a9866b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7099,13 +7099,13 @@ Bioconductor, CRAN, and Github.") (define-public r-biocviews (package (name "r-biocviews") - (version "1.50.1") + (version "1.50.5") (source (origin (method url-fetch) (uri (bioconductor-uri "biocViews" version)) (sha256 (base32 - "0hjm3r58i0r9qhyar9pk250cx7sfijg0lnvi12a9s6brmmbip1a3")))) + "0rc1n89n04ylvy9gvsgvizcs77bh70jg1nkjjsjs7rqbr3zzdysz")))) (properties `((upstream-name . "biocViews"))) (build-system r-build-system) -- cgit v1.2.3 From 88514b912427691272650195ad1941f7ead1ac36 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 9 Nov 2018 19:00:33 +0100 Subject: gnu: r-biostrings: Update to 2.50.1. * gnu/packages/bioinformatics.scm (r-biostrings): Update to 2.50.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9147a9866b..3b1b9c2c96 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7657,13 +7657,13 @@ objects.") (define-public r-biostrings (package (name "r-biostrings") - (version "2.50.0") + (version "2.50.1") (source (origin (method url-fetch) (uri (bioconductor-uri "Biostrings" version)) (sha256 (base32 - "0zw0dj67fnpbz4iqnam5fxs92c1c8w8d7mzl0rkq4ksx0xl8vgg7")))) + "1qyv1ps7vy6gy78pm2rcikg0bgf1mv7falahjp3pkwqq1272hrl8")))) (properties `((upstream-name . "Biostrings"))) (build-system r-build-system) -- cgit v1.2.3 From 03a415365a1cfcc263f56d309f33a1a581790ca7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 9 Nov 2018 19:00:42 +0100 Subject: gnu: r-ensembldb: Update to 2.6.1. * gnu/packages/bioinformatics.scm (r-ensembldb): Update to 2.6.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 3b1b9c2c96..55631530ca 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10215,14 +10215,14 @@ originally made available by Holmes, Harris, and Quince, 2012, PLoS ONE 7(2): (define-public r-ensembldb (package (name "r-ensembldb") - (version "2.6.0") + (version "2.6.1") (source (origin (method url-fetch) (uri (bioconductor-uri "ensembldb" version)) (sha256 (base32 - "12jqz9h6w4mxyfr43w5qbwmacn512aw0mnl0zvhsg5i7p4qj45ks")))) + "1js05dcv1dj4g2vj7lzlg0rgjcjlk2irdr9rxqpwxmivm8nbvf36")))) (build-system r-build-system) (propagated-inputs `(("r-annotationdbi" ,r-annotationdbi) -- cgit v1.2.3 From 005ec8d09c6b8f22457fad330c30ff0ccf495e34 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 10 Nov 2018 19:26:09 +0200 Subject: 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(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e52c35fdb9..9bf995bdfc 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))))) -- cgit v1.2.3 From 8754ea483dbdac7eef8e885d6bd8c28b4a8a5373 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 10 Nov 2018 19:26:09 +0200 Subject: 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(-) (limited to 'gnu') 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))))) -- cgit v1.2.3 From 2529c8381f622b78b02e53a4e95dd6ad65b1f8e4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 10 Nov 2018 19:57:26 +0200 Subject: 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(+) (limited to 'gnu') 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 -- cgit v1.2.3 From efe0a4a2a7ece13c855a1f316ad49bcdbfa1596f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 10 Nov 2018 19:58:28 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From f268b744b84734b374a15feae1f02b9f2c4085c7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 10 Nov 2018 20:07:48 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 8d9bb4b4d05a20bef1cf7b1da2b1c5fb05f9b071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Lassieur?= Date: Sat, 10 Nov 2018 15:14:28 +0100 Subject: services: dovecot: Allow to set 'client-limit'. * doc/guix.texi (Mail Services): Update accordingly. * gnu/services/mail.scm (service-configuration)[client-limit]: New field. (dovecot-configuration)[services]: Set 'client-limit' to its correct default value. --- gnu/services/mail.scm | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm index 573efa0433..abc1c15cfe 100644 --- a/gnu/services/mail.scm +++ b/gnu/services/mail.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Andy Wingo -;;; Copyright © 2017 Clément Lassieur +;;; Copyright © 2017, 2018 Clément Lassieur ;;; Copyright © 2017 Carlo Zancanaro ;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; @@ -290,6 +290,12 @@ the section name.") "Listeners for the service. A listener is either an @code{unix-listener-configuration}, a @code{fifo-listener-configuration}, or an @code{inet-listener-configuration}.") + (client-limit + (non-negative-integer 0) + "Maximum number of simultaneous client connections per process. Once this +number of connections is received, the next incoming connection will prompt +Dovecot to spawn another process. If set to 0, @code{default-client-limit} is +used instead.") (service-count (non-negative-integer 1) "Number of connections to handle before starting a new process. @@ -475,6 +481,7 @@ complex, customize the address and port fields of the (list (service-configuration (kind "imap-login") + (client-limit 0) (listeners (list (inet-listener-configuration (protocol "imap") (port 143) (ssl? #f)) @@ -487,10 +494,15 @@ complex, customize the address and port fields of the (inet-listener-configuration (protocol "pop3s") (port 995) (ssl? #t))))) (service-configuration (kind "lmtp") + (client-limit 1) (listeners (list (unix-listener-configuration (path "lmtp") (mode "0666"))))) - (service-configuration (kind "imap")) - (service-configuration (kind "pop3")) + (service-configuration + (kind "imap") + (client-limit 1)) + (service-configuration + (kind "pop3") + (client-limit 1)) (service-configuration (kind "auth") ;; In what could be taken to be a bug, the default value of 1 for ;; service-count makes it so that a PAM auth worker can't fork off @@ -501,10 +513,15 @@ complex, customize the address and port fields of the ;; is the default for all other services. As a hack, bump this value to ;; 30. (service-count 30) + (client-limit 0) (listeners (list (unix-listener-configuration (path "auth-userdb"))))) - (service-configuration (kind "auth-worker")) - (service-configuration (kind "dict") + (service-configuration + (kind "auth-worker") + (client-limit 1)) + (service-configuration + (kind "dict") + (client-limit 1) (listeners (list (unix-listener-configuration (path "dict"))))))) "List of services to enable. Available services include @samp{imap}, @samp{imap-login}, @samp{pop3}, @samp{pop3-login}, @samp{auth}, and -- cgit v1.2.3 From be8dd4a5fec804f2f004dd3a87c2872af44dc88d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Lassieur?= Date: Sat, 10 Nov 2018 18:45:27 +0100 Subject: services: dovecot: Allow to set 'process-limit'. * doc/guix.texi (Mail Services): Update accordingly. * gnu/services/mail.scm (service-configuration)[process-limit]: New field. (dovecot-configuration)[services]: Set 'process-limit' to its correct default value. --- gnu/services/mail.scm | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm index abc1c15cfe..dfbdf6d6cc 100644 --- a/gnu/services/mail.scm +++ b/gnu/services/mail.scm @@ -301,6 +301,10 @@ used instead.") "Number of connections to handle before starting a new process. Typically the only useful values are 0 (unlimited) or 1. 1 is more secure, but 0 is faster. .") + (process-limit + (non-negative-integer 0) + "Maximum number of processes that can exist for this service. If set to 0, +@code{default-process-limit} is used instead.") (process-min-avail (non-negative-integer 0) "Number of processes to always keep waiting for more connections.") @@ -482,6 +486,7 @@ complex, customize the address and port fields of the (service-configuration (kind "imap-login") (client-limit 0) + (process-limit 0) (listeners (list (inet-listener-configuration (protocol "imap") (port 143) (ssl? #f)) @@ -495,14 +500,17 @@ complex, customize the address and port fields of the (service-configuration (kind "lmtp") (client-limit 1) + (process-limit 0) (listeners (list (unix-listener-configuration (path "lmtp") (mode "0666"))))) (service-configuration (kind "imap") - (client-limit 1)) + (client-limit 1) + (process-limit 1024)) (service-configuration (kind "pop3") - (client-limit 1)) + (client-limit 1) + (process-limit 1024)) (service-configuration (kind "auth") ;; In what could be taken to be a bug, the default value of 1 for ;; service-count makes it so that a PAM auth worker can't fork off @@ -514,14 +522,17 @@ complex, customize the address and port fields of the ;; 30. (service-count 30) (client-limit 0) + (process-limit 1) (listeners (list (unix-listener-configuration (path "auth-userdb"))))) (service-configuration (kind "auth-worker") - (client-limit 1)) + (client-limit 1) + (process-limit 0)) (service-configuration (kind "dict") (client-limit 1) + (process-limit 0) (listeners (list (unix-listener-configuration (path "dict"))))))) "List of services to enable. Available services include @samp{imap}, @samp{imap-login}, @samp{pop3}, @samp{pop3-login}, @samp{auth}, and -- cgit v1.2.3 From a7553a7360ac07ff114b807fc3026f08158d34c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Lassieur?= Date: Sat, 10 Nov 2018 18:37:55 +0100 Subject: services: dovecot: Set correct default value for the "auth" service. * gnu/services/mail.scm (dovecot-configuration): Set 'service-count' to 0 for the "auth" service. --- gnu/services/mail.scm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm index dfbdf6d6cc..fcaedd038b 100644 --- a/gnu/services/mail.scm +++ b/gnu/services/mail.scm @@ -511,16 +511,9 @@ complex, customize the address and port fields of the (kind "pop3") (client-limit 1) (process-limit 1024)) - (service-configuration (kind "auth") - ;; In what could be taken to be a bug, the default value of 1 for - ;; service-count makes it so that a PAM auth worker can't fork off - ;; subprocesses for making blocking queries. The result is that nobody - ;; can log in -- very secure, but not very useful! If we simply omit - ;; the service-count, it will default to the value of - ;; auth-worker-max-count, which is 30, instead of defaulting to 1, which - ;; is the default for all other services. As a hack, bump this value to - ;; 30. - (service-count 30) + (service-configuration + (kind "auth") + (service-count 0) (client-limit 0) (process-limit 1) (listeners -- cgit v1.2.3 From 9829e0699b6b0373c1742393f18db261a6ae67a8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 10 Nov 2018 20:13:20 +0200 Subject: 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(-) (limited to 'gnu') 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")) -- cgit v1.2.3 From 211db9caf7ffdaa9f2abc7d6216f239f96312545 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 10 Nov 2018 20:14:36 +0200 Subject: 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(-) (limited to 'gnu') 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))) -- cgit v1.2.3 From 1de2937283b3f19abf50af77f955a5dc4313755a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 10 Nov 2018 20:18:08 +0200 Subject: 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(-) (limited to 'gnu') 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/") -- cgit v1.2.3 From e8b9aaf0b167812dee6be26772837ef2a271a843 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 10 Nov 2018 20:54:00 +0200 Subject: mtd-utils: Update to 2.0.2. * gnu/packages/linux.scm (mtd-utils): Update to 2.0.2. [arguments]: Remove 'test-target, 'make-flags. Re-enable 'configure phase. Add 'configure-flag for the unit-tests. [native-inputs]: Add cmocka, pkg-config. --- gnu/packages/linux.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9bf995bdfc..7d1987b0d7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3949,7 +3949,7 @@ are exceeded.") (define-public mtd-utils (package (name "mtd-utils") - (version "1.5.2") + (version "2.0.2") (source (origin (method url-fetch) (uri (string-append @@ -3957,18 +3957,18 @@ are exceeded.") "mtd-utils-" version ".tar.bz2")) (sha256 (base32 - "007lhsd8yb34l899r4m37whhzdw815cz4fnjbpnblfha524p7dax")))) + "1f30jszknc5v6ykmil8ajxgksmcg54q3rsp84jsancp9x0dycggv")))) + (arguments + '(#:configure-flags '("--enable-unit-tests"))) + (native-inputs + `(("cmocka" ,cmocka) + ("pkg-config" ,pkg-config))) (inputs - `(("acl" ,acl) + `(("acl" ,acl) ; for XATTR ("libuuid" ,util-linux) ("lzo" ,lzo) ("zlib" ,zlib))) (build-system gnu-build-system) - (arguments - `(#:test-target "tests" - #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) - #:phases (modify-phases %standard-phases - (delete 'configure)))) (synopsis "MTD Flash Storage Utilities") (description "This package provides utilities for testing, partitioning, etc of flash storage.") -- cgit v1.2.3 From c1ab1590854e4a1af2436c0c60b8dd570b219598 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 10 Nov 2018 21:48:26 +0200 Subject: 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(-) (limited to 'gnu') 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") -- cgit v1.2.3 From 1a392ee7aed74e345f5263063fdde9a739082af4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 10 Nov 2018 22:34:56 +0200 Subject: 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(+) (limited to 'gnu') 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 -- cgit v1.2.3 From 95906eee1813058e83b44f9f0f893481f8e34b33 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 10 Nov 2018 20:33:02 +0100 Subject: gnu: guile-ics: Remove custom bootstrap phase. * gnu/packages/guile.scm (guile-ics)[arguments]: Remove. --- gnu/packages/guile.scm | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 8c55c749d8..133a338c6e 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014, 2015, 2018 Mark H Weaver ;;; Copyright © 2015, 2017 Christopher Allan Webber ;;; Copyright © 2016 Alex Sassmannshausen -;;; Copyright © 2016, 2017 Ricardo Wurmus +;;; Copyright © 2016, 2017, 2018 Ricardo Wurmus ;;; Copyright © 2016 Erik Edrosa ;;; Copyright © 2016 Eraim Flashner ;;; Copyright © 2016, 2017 Alex Kost @@ -860,14 +860,6 @@ provides tight coupling to Guix.") (base32 "0qjjvadr7gibdq9jvwkmlkb4afsw9n2shfj9phpiadinxk3p4m2g")))) (build-system gnu-build-system) - (arguments - '(#:phases (modify-phases %standard-phases - (add-after 'unpack 'autoreconf - (lambda _ - ;; Repository comes with a broken symlink - (delete-file "README") - (symlink "README.org" "README") - (zero? (system* "autoreconf" "-fi"))))))) (native-inputs `(("autoconf" ,autoconf-wrapper) ("automake" ,automake) -- cgit v1.2.3 From 745378562488c051f7f20cb2722c3a61b81d0189 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 10 Nov 2018 22:35:01 +0100 Subject: gnu: Add guile-email. * gnu/packages/guile.scm (guile-email): New variable. --- gnu/packages/guile.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 133a338c6e..747317429e 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -2279,6 +2279,35 @@ using S-expressions.") tracker's SOAP service, such as @url{https://bugs.gnu.org}.") (license license:gpl3+))) +(define-public guile-email + (let ((commit "fa52eac55e5946db89621a6c583d2aa357864dee") + (revision "1")) + (package + (name "guile-email") + (version (git-version "0.1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.systemreboot.net/guile-email") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1037mbz7qd9bzaqp8ysyhnl9ipd97fmj3b9jr8qfzx9179vvsj63")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("autoconf" ,autoconf) + ("automake" ,automake))) + (inputs + `(("guile" ,guile-2.2.4))) + (home-page "https://git.systemreboot.net/guile-email") + (synopsis "Guile email parser") + (description "This package provides an email parser written in pure +Guile.") + (license license:agpl3+)))) + ;; There has not been any release yet. (define-public guile-newt (let ((commit "4eaa3cf84b9b426cc0ff7bec48b76cca6ca3ec83") -- cgit v1.2.3 From 2d900b046487ab9805a54f9be02d08c9553367de Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 10 Nov 2018 22:35:16 +0100 Subject: gnu: Add guile-debbugs-next. * gnu/packages/guile.scm (guile-debbugs-next): New variable. --- gnu/packages/guile.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 747317429e..6ae0fe2e77 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -2308,6 +2308,31 @@ tracker's SOAP service, such as @url{https://bugs.gnu.org}.") Guile.") (license license:agpl3+)))) +(define-public guile-debbugs-next + (let ((commit "75a331d561c8b6f8efcf16216dab961c17759efe") + (revision "1")) + (package (inherit guile-debbugs) + (name "guile-debbugs") + (version (git-version "0.0.3" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/guile-debbugs.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0br3mgbw41bpc9x57jlghl0i8dz9nl63r4wzs5l47aqszf84870y")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("texinfo" ,texinfo))) + (inputs + `(("guile" ,guile-2.2.4) + ("guile-email" ,guile-email)))))) + ;; There has not been any release yet. (define-public guile-newt (let ((commit "4eaa3cf84b9b426cc0ff7bec48b76cca6ca3ec83") -- cgit v1.2.3 From e3a4703174d949181d20fb64dde6f9b9e9576df7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 10 Nov 2018 22:35:50 +0100 Subject: gnu: Add mumi. * gnu/packages/mail.scm (mumi): New variable. --- gnu/packages/mail.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 35b7d27df3..f670a63ee7 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -119,6 +119,7 @@ #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix build-system gnu) + #:use-module (guix build-system guile) #:use-module (guix build-system perl) #:use-module (guix build-system python) #:use-module (guix build-system trivial)) @@ -2640,3 +2641,50 @@ replacement for the @code{urlview} program.") "TNEF is a tar-like program that unpacks MIME attachments of type @code{application/ms-tnef}.") (license gpl2+))) + +(define-public mumi + (let ((commit "648311b9b9d9d974fb2d76dacfe956fc7b842401") + (revision "1")) + (package + (name "mumi") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.elephly.net/software/mumi.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "081yvjhy8ig3xyixkdklrzf3bf2bczn92g5hpxmsl8m9cpcj77vv")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-executable + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (scm (string-append out "/share/guile/site/2.2")) + (go (string-append out "/lib/guile/2.2/site-ccache"))) + (wrap-program (string-append bin "/mumi") + `("GUILE_LOAD_PATH" ":" prefix + (,scm ,(getenv "GUILE_LOAD_PATH"))) + `("GUILE_LOAD_COMPILED_PATH" ":" prefix + (,go ,(getenv "GUILE_LOAD_COMPILED_PATH")))) + #t)))))) + (inputs + `(("guile-debbugs" ,guile-debbugs-next) + ("guile-email" ,guile-email) + ("guile-fibers" ,guile-fibers) + ("guile-json" ,guile-json) + ("guile-syntax-highlight" ,guile-syntax-highlight) + ("guile" ,guile-2.2.4))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config))) + (home-page "https://git.elephly.net/software/mumi.git") + (synopsis "Debbugs web interface") + (description "Mumi is a Debbugs web interface.") + (license agpl3+)))) -- cgit v1.2.3 From 74c903edabdc9a654f957a1a0eb3a97ea144e1f4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 10 Nov 2018 22:37:07 +0100 Subject: Add missing license import. * gnu/packages/mail.scm: Import agpl3+. --- gnu/packages/mail.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index f670a63ee7..978b22333e 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -110,7 +110,9 @@ #:use-module (gnu packages xorg) #:use-module (gnu packages docbook) #:use-module ((guix licenses) - #:select (fdl1.1+ gpl2 gpl2+ gpl3 gpl3+ lgpl2.1 lgpl2.1+ lgpl3+ + #:select (fdl1.1+ + agpl3+ + gpl2 gpl2+ gpl3 gpl3+ lgpl2.1 lgpl2.1+ lgpl3+ non-copyleft (expat . license:expat) bsd-3 public-domain bsd-4 isc (openssl . license:openssl) bsd-2 x11-style agpl3 asl2.0 perl-license)) -- cgit v1.2.3 From 79b8341292de460864e56829d1ec5ed1861cbb57 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 10 Nov 2018 23:27:05 +0100 Subject: gnu: emacs-circe: Update to 2.10. * gnu/packages/emacs.scm (emacs-circe): Update to 2.10. --- gnu/packages/emacs.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index c6008e6a94..e3808071a2 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -7688,17 +7688,17 @@ value of the access token.") (define-public emacs-circe (package (name "emacs-circe") - (version "2.6") + (version "2.10") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/jorgenschaefer/circe.git") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 - "19h3983zy3f15cgs86irvbdzz55qyjm48qd7gjlzcxplr7vnnh0j")))) + "10gi14kwxd81blddpvqh95lgmpbfgp0m955naxix3bs3r6a75n4s")))) (build-system emacs-build-system) ;; In order to securely connect to an IRC server using TLS, Circe requires ;; the GnuTLS binary. -- cgit v1.2.3 From ca364e7a3caef120ce19f38aa36edd491f226a82 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 10 Nov 2018 22:41:11 +0100 Subject: gnu: jalv-select: Fetch sources from git. * gnu/packages/music.scm (jalv-select)[source]: Fetch from git. [arguments]: Add phase make-manpages-writable. --- gnu/packages/music.scm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 3f0498ee53..28a40839b6 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1254,12 +1254,14 @@ Editor. It is compatible with Power Tab Editor 1.7 and Guitar Pro.") (name "jalv-select") (version "0.8") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/brummer10/jalv_select/" - "archive/V" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/brummer10/jalv_select.git") + (commit (string-append "V" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0zraagwr681b5s3qifxf399c7q93jz23c8sr42gmff9zqnvxc75q")))) + "0gqh768sbvn9ffyx1vqg9i57py9x9v4l65bk6wjsvgga4d7m83k1")))) (build-system gnu-build-system) (arguments `(#:make-flags @@ -1274,6 +1276,13 @@ Editor. It is compatible with Power Tab Editor 1.7 and Guitar Pro.") (string-append "ls -1 " (assoc-ref inputs "jalv") "/bin"))) (substitute* "jalv.select.h" (("gtkmm.h") "gtkmm-2.4/gtkmm.h")) + #t)) + (add-before 'reset-gzip-timestamps 'make-manpages-writable + (lambda* (#:key outputs #:allow-other-keys) + (for-each make-file-writable + (find-files (string-append (assoc-ref outputs "out") + "/share/man") + ".*\\.gz$")) #t))))) (inputs `(("lilv" ,lilv) -- cgit v1.2.3 From 57906fad59a8527f0eb912b293941968c77aa9f0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 10 Nov 2018 22:43:05 +0100 Subject: gnu: portmidi-for-extempore: Fetch sources from git. * gnu/packages/music.scm (portmidi-for-extempore)[source]: Fetch from git. --- gnu/packages/music.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 28a40839b6..5e545e20d1 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1865,13 +1865,14 @@ using a system-independent interface.") (name "portmidi-for-extempore") (version "217") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/extemporelang/portmidi/" - "archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/extemporelang/portmidi.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0gjikwciyr8kk4y3qiv1pcq58xpgw38ql1m2gs6g0qc1s8sx4235")))) + "1inriyrjf7xx2b7r54x0vmf9ngyqgr7g5060c22bwkbsgg53apzv")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; no tests (native-inputs '()) -- cgit v1.2.3 From 78eff857708b527adfaa9d5964e4a73aaf7854bd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 10 Nov 2018 22:43:55 +0100 Subject: gnu: ams-lv2: Fetch sources from git. * gnu/packages/music.scm (ams-lv2)[source]: Fetch from git. --- gnu/packages/music.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 5e545e20d1..dffcd9441c 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2288,13 +2288,14 @@ follows a traditional multi-track tape recorder control paradigm.") (version "1.2.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/blablack/ams-lv2/" - "archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (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 - "1xacxyzqcj83g9c1gwfn36gg1c6yi15v7km4vidfidrjzb4x27fq")))) + "1n1dnqnj24xhiy9323lj52nswr5120cj56fpckg802miss05sr6x")))) (build-system waf-build-system) (arguments `(#:phases -- cgit v1.2.3 From b255365cd162920ff51c62f319370283218bfcb3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 10 Nov 2018 22:44:57 +0100 Subject: gnu: lvtk: Fetch sources from git. * gnu/packages/audio.scm (lvtk)[source]: Fetch from git. --- gnu/packages/audio.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index ee18b00226..5e02291502 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1879,14 +1879,14 @@ software.") (name "lvtk") (version "1.2.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/lvtk/lvtk/archive/" - version - ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/lvtk/lvtk.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "03nbj2cqcklqwh50zj2gwm07crh5iwqbpxbpzwbg5hvgl4k4rnjd")))) + "1b01zvzl70ana6l1kn8fgyr7msnn3c7x61cgw7fdpp50322352p8")))) (build-system waf-build-system) (arguments `(#:tests? #f ; no check target -- cgit v1.2.3 From 917dc89672b09c969297b36a2e2ce637d3358785 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 10 Nov 2018 22:47:17 +0100 Subject: gnu: csound: Fetch sources from git. * gnu/packages/audio.scm (csound)[source]: Fetch from git. --- gnu/packages/audio.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 5e02291502..56a8a4b541 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -654,14 +654,14 @@ emulation (valve, tape), bit fiddling (decimator, pointer-cast), etc.") (name "csound") (version "6.11.0") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/csound/csound/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/csound/csound.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "072pk5h9w0vhw0ncc9dn90haw1yv18v04iwwjn8nsp6930w7dvxd")))) + "1hlkrnv3gghx4v382nl6v6k2k1dzm5ddk35m5g3q6pzc959726s7")))) (build-system cmake-build-system) (inputs `(("alsa-lib" ,alsa-lib) -- cgit v1.2.3 From 2ae2395422fe2fa8046ace78e6b06e073c8f6539 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 10 Nov 2018 22:49:57 +0100 Subject: gnu: swh-plugins-lv2: Fetch sources from git. * gnu/packages/audio.scm (swh-plugins-lv2)[source]: Fetch from git. --- gnu/packages/audio.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 56a8a4b541..cdfea7fc02 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -610,13 +610,14 @@ envelope follower, distortion effects, tape effects and more.") (name "swh-plugins-lv2") (version "1.0.16") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/swh/" - "lv2/archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/swh/lv2.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0j1mih0lp4fds07knp5i32in515sh0df1qi6694pmyz2wqnm295w")))) + "0y7nnww864mm4k6ayy2lhcws3wlbhb2gkyjbrwk921fvc18qk9mz")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target -- cgit v1.2.3 From 0b8db035040dc404be966306cbd2ba321ef56d99 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 10 Nov 2018 22:55:48 +0100 Subject: gnu: infamous-plugins: Fetch sources from git. * gnu/packages/audio.scm (infamous-plugins)[source]: Fetch from git. --- gnu/packages/audio.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index cdfea7fc02..1e6484ebf1 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -572,13 +572,14 @@ based on human speech recordings.") (name "infamous-plugins") (version "0.2.04") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/ssj71/infamousPlugins/" - "archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/ssj71/infamousPlugins.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1n6rhqsmvad7692w2h01niw5gqg5yk7a09wxl5ivs77zyp93vf7z")))) + "0hmqk80w4qxq09iag7b7srf2g0wigkyhzq0ywxvhz2iz0hq9k0dh")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; there are no tests -- cgit v1.2.3 From eca7729301a7c10886bc6790cf499acb534286d3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 10 Nov 2018 22:57:28 +0100 Subject: gnu: rtmidi: Fetch sources from git. * gnu/packages/audio.scm (rtmidi)[source]: Fetch from git. --- gnu/packages/audio.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 1e6484ebf1..b383c4785d 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2274,14 +2274,14 @@ tempo and pitch of an audio recording independently of one another.") (name "rtmidi") (version "2.1.0") (source (origin - (method url-fetch) - (uri - (string-append "https://github.com/powertab/rtmidi/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/powertab/rtmidi.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0d49lapnmdgmjxh4vw57h6xk74nn5r0zwysv7jbd7m8kqhpq5rjj")))) + "106v177y3nrjv2l1yskch4phpqd8h97b67zj0jiq9pc3c69jr1ay")))) (build-system gnu-build-system) (arguments `(#:tests? #f ;no "check" target -- cgit v1.2.3 From 458baefb4008d04d1423c654c8f7e2999a6be317 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 10 Nov 2018 23:12:38 +0100 Subject: gnu: rsound: Fetch sources from git. * gnu/packages/audio.scm (rsound)[source]: Fetch from git. --- gnu/packages/audio.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index b383c4785d..61081521d5 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2812,12 +2812,13 @@ synthesizer written in C++.") (version "1.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/Themaister/RSound/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/Themaister/RSound.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "1wzs40c0k5zpkmm5ffl6c17xmr399sxli7ys0fbb9ib0fd334knx")))) + (base32 "0gspmr3klwnq98h17p5hc6ifygya4p80g4g8r7a1qavm3mv19waf")))) (build-system gnu-build-system) (inputs `(("alsa-lib" ,alsa-lib) -- cgit v1.2.3 From 8e5995e3979d846972dfbdf7658aa2d3b2cb2395 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 10 Nov 2018 23:15:41 +0100 Subject: gnu: xjackfreak: Fetch sources from git. * gnu/packages/audio.scm (xjackfreak)[source]: Fetch from git. --- gnu/packages/audio.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 61081521d5..489ec4bfb7 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2851,14 +2851,14 @@ with a much different focus than most other audio daemons.") (name "xjackfreak") (version "1.0") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/johnhldavis/xjackfreak/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/johnhldavis/xjackfreak.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0xj6gpxfnw9jbdgwgm0x23xgfvj2kwmwb1nk0drw8lxgcchkq7d9")))) + "18c546qidbrj0f5wfiq5llii2192xpln0ab3r4vpr7i3wybxqjfz")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit v1.2.3 From 4289a306b7256cb4dbf3a7a193f38c5da17db788 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 10 Nov 2018 23:21:37 +0100 Subject: gnu: cuetools: Fetch sources from git. * gnu/packages/audio.scm (cuetools)[source]: Fetch from git. --- gnu/packages/audio.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 489ec4bfb7..8486072ebf 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3026,15 +3026,16 @@ point audio data.") (name "cuetools") (version "1.4.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/svend/cuetools/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/svend/cuetools.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "01xi3rvdmil9nawsha04iagjylqr1l9v9vlzk99scs8c207l58i4")))) + "02ksv1ahf1v4cr2xbclsfv5x17m9ivzbssb5r8xjm97yh8a7spa3")))) (build-system gnu-build-system) - ;; The source tarball is not bootstrapped. + ;; The source checkout is not bootstrapped. (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- cgit v1.2.3 From b249ff5d37311577d73ffd4999f6e6726e098a0f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 10 Nov 2018 23:26:18 +0100 Subject: gnu: dcadec: Fetch sources from git. * gnu/packages/audio.scm (dcadec)[source]: Fetch from git. --- gnu/packages/audio.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 8486072ebf..08e3c8b542 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3076,13 +3076,14 @@ use them split WAVE data into multiple files.") (name "dcadec") (version "0.2.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/foo86/dcadec/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/foo86/dcadec.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0i0dpypgqkhhi4v1fmsp2way6w9kbcix3c7q79pmg39yvrzj17gd")))) + "07nd0ajizrp1w02bsyfcv18431r8m8rq8gjfmz9wmckpg7cxj2hs")))) (build-system gnu-build-system) (arguments ;; Test files are missing: https://github.com/foo86/dcadec/issues/53 -- cgit v1.2.3 From c2a2d364dff53daddaa036cf50bbaf9b7bd42d8c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 10 Nov 2018 23:27:03 +0100 Subject: gnu: cli-visualizer: Fetch sources from git. * gnu/packages/audio.scm (cli-visualizer)[source]: Fetch from git. --- gnu/packages/audio.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 08e3c8b542..613e2a31b8 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3388,13 +3388,14 @@ the following features: (version "1.6") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/dpayne/cli-visualizer/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/dpayne/cli-visualizer.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "07zkm87f2fr8kc6531zrkya7q81sdanm6813y2f54mg13g41y6hi")))) + "0mirp8bk398di5xyq95iprmdyvplfghxqmrfj7jdnpy554vx7ppc")))) (build-system gnu-build-system) (native-inputs `(("which" ,which))) -- cgit v1.2.3 From a7fde1a86d35d1c2542bd637b2b6eeabd7b9dde8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 10 Nov 2018 23:27:50 +0100 Subject: gnu: cava: Fetch sources from git. * gnu/packages/audio.scm (cava)[source]: Fetch from git. --- gnu/packages/audio.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 613e2a31b8..5848411087 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3443,14 +3443,14 @@ representations.") (name "cava") (version "0.6.1") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/karlstav/cava/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/karlstav/cava.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "13d72swnjs894llf0paandmhf1lf90dz6ygkcdw4bv84wzkq1f4q")))) + "1kvhqgijs29909w3sq9m0bslx2zxxn4b3i07kdz4hb0dqkppxpjy")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From bed4eb373ecfc2cb63bdecf4e18bbd7106e98fe3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 10 Nov 2018 23:28:45 +0100 Subject: gnu: gxtuner: Fetch sources from git. * gnu/packages/music.scm (gxtuner)[source]: Fetch from git. --- gnu/packages/music.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index dffcd9441c..c405ea8511 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2330,13 +2330,14 @@ and hold, etc.") (name "gxtuner") (version "2.4") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/brummer10/gxtuner/" - "archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/brummer10/gxtuner.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1hn5qjac7qd00v0sp7ijhhc3sb26ks9bni06nngivva21h61xrjr")))) + "1fxd2akan2njlr7fpkh84830783qhh1gg7yakswqk5dd466dcn96")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit v1.2.3 From 37ebc19cfbfdb248e8d36cbb587a89780e2e93c1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 10 Nov 2018 23:30:52 +0100 Subject: gnu: msgpack: Remove custom bootstrap phase. * gnu/packages/serialization.scm (msgpack)[arguments]: Remove. --- gnu/packages/serialization.scm | 8 -------- 1 file changed, 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 40b3d1bae0..2df0ce1364 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -99,7 +99,6 @@ arbitrary data types and reversibly turns them into different representations, such as compact binary encodings, XML, or JSON.") (license license:bsd-3))) - (define-public msgpack (package (name "msgpack") @@ -132,13 +131,6 @@ such as compact binary encodings, XML, or JSON.") ;; zbuffer.hpp) which #include . However, 'guix gc --references' ;; does not detect a store reference to zlib since these headers are not ;; compiled. - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'autoconf - (lambda _ - (invoke "autoreconf" "-vfi") - #t))))) (home-page "https://www.msgpack.org") (synopsis "Binary serialization library") (description "Msgpack is a library for C/C++ that implements binary -- cgit v1.2.3 From 30288ae57e77cf39c90276708e4920f4f1aea2ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 10 Nov 2018 16:24:30 +0100 Subject: gnu: mdadm: Update to 4.1. * gnu/packages/linux.scm (mdadm): Update to 4.1. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7d1987b0d7..b1021d5624 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2917,7 +2917,7 @@ MPEG-2 and audio over Linux IEEE 1394.") (define-public mdadm (package (name "mdadm") - (version "4.0") + (version "4.1") (source (origin (method url-fetch) (uri (string-append @@ -2925,7 +2925,7 @@ MPEG-2 and audio over Linux IEEE 1394.") version ".tar.xz")) (sha256 (base32 - "1ad3mma641946wn5lsllwf0lifw9lps34fv1nnkhyfpd9krffshx")))) + "0jjgjgqijpdp7ijh8slzzjjw690kydb1jjadf0x5ilq85628hxmb")))) (build-system gnu-build-system) (inputs `(("udev" ,eudev))) -- cgit v1.2.3 From 9d466489cdbbfb2097ec3e211351d7b34fb70b60 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Mon, 29 Oct 2018 11:17:50 +0800 Subject: gnu: Add marisa. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/datastructures.scm (marisa): New variable. Co-authored-by: Ludovic Courtès --- gnu/packages/datastructures.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/datastructures.scm b/gnu/packages/datastructures.scm index 8517654def..4e5e59a2e3 100644 --- a/gnu/packages/datastructures.scm +++ b/gnu/packages/datastructures.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016 Ricardo Wurmus ;;; Copyright © 2016, 2017 Tobias Geerinckx-Rice +;;; Copyright © 2018 Meiyo Peng ;;; ;;; This file is part of GNU Guix. ;;; @@ -48,6 +49,29 @@ binary trees, binary search trees, red-black trees, 2D arrays, permutations and heaps.") (license license:gpl2+))) +(define-public marisa + (package + (name "marisa") + (version "0.2.5") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/s-yata/marisa-trie" + "/releases/download/v" version "/" name "-" + version ".tar.gz")) + (sha256 + (base32 "19ifrcmnbr9whaaf4ly3s9ndyiq9sjqhnfkrxbz9zsb44w2n36hf")))) + (build-system gnu-build-system) + (home-page "https://github.com/s-yata/marisa-trie") + (synopsis "Trie data structure C++ library") + (description "Matching Algorithm with Recursively Implemented +StorAge (MARISA) is a static and space-efficient trie data structure C++ +library.") + + ;; Dual-licensed, according to docs/readme.en.html (source files lack + ;; copyright/license headers.) + (license (list license:bsd-2 license:lgpl2.1+)))) + (define-public sparsehash (package (name "sparsehash") -- cgit v1.2.3 From 1a0363cf0794bb7f8149800b665f80728b3635ff Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Mon, 29 Oct 2018 11:22:55 +0800 Subject: gnu: Add opencc. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/textutils.scm (opencc): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/textutils.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 084017dbde..1d498b5a75 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2017 Alex Vong ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Pierre Neidhardt +;;; Copyright © 2018 Meiyo Peng ;;; ;;; This file is part of GNU Guix. ;;; @@ -756,3 +757,26 @@ indentation. @end itemize\n") (home-page "http://docx2txt.sourceforge.net") (license license:gpl3+))) + +(define-public opencc + (package + (name "opencc") + (version "1.0.5") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/BYVoid/OpenCC" + "/archive/ver." version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "01870gbkf711msirf3206k0ajaabypjhnx3fny5wikw0ladn9q8w")))) + (build-system cmake-build-system) + (native-inputs + `(("python" ,python-wrapper))) + (home-page "https://github.com/BYVoid/OpenCC") + (synopsis "Convert between Traditional Chinese and Simplified Chinese") + (description "Open Chinese Convert (OpenCC) converts between Traditional +Chinese and Simplified Chinese, supporting character-level conversion, +phrase-level conversion, variant conversion, and regional idioms among +Mainland China, Taiwan, and Hong-Kong.") + (license license:asl2.0))) -- cgit v1.2.3 From 2f968763c350ddbacfa84a96b9716e4eb5c8f942 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Mon, 29 Oct 2018 13:20:18 +0800 Subject: gnu: ibus: Indent code properly. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ibus.scm (ibus, ibus-libpinyin): Indent code properly. Signed-off-by: Ludovic Courtès --- gnu/packages/ibus.scm | 308 +++++++++++++++++++++++++------------------------- 1 file changed, 154 insertions(+), 154 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 08fce5f6fb..40fa930293 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -43,166 +43,166 @@ (define-public ibus (package - (name "ibus") - (version "1.5.19") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/ibus/ibus/" - "releases/download/" - version "/ibus-" version ".tar.gz")) - (sha256 - (base32 - "0a94bnpm24581317hdnihwr4cniriml10p4ffgxg14xhvaccfrjb")))) - (build-system glib-or-gtk-build-system) - (arguments - `(#:tests? #f ; tests fail because there's no connection to dbus - #:configure-flags `("--disable-emoji-dict" ; cannot find emoji.json path - "--disable-python2" - "--enable-python-library" - ,(string-append "--with-ucd-dir=" - (getcwd) "/ucd") - "--enable-wayland") - #:make-flags - (list "CC=gcc" - (string-append "pyoverridesdir=" - (assoc-ref %outputs "out") - "/lib/python3.6/site-packages/gi/overrides/")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'prepare-ucd-dir - (lambda* (#:key inputs #:allow-other-keys) - (mkdir-p "../ucd") - (symlink (assoc-ref inputs "unicode-blocks") "../ucd/Blocks.txt") - (symlink (assoc-ref inputs "unicode-nameslist") "../ucd/NamesList.txt") - #t)) - (add-before 'configure 'disable-dconf-update - (lambda _ - (substitute* "data/dconf/Makefile.in" - (("dconf update") "echo dconf update")) - #t)) - (add-after 'unpack 'delete-generated-files - (lambda _ - (for-each (lambda (file) - (let ((c (string-append (string-drop-right file 4) "c"))) - (when (file-exists? c) - (format #t "deleting ~a\n" c) - (delete-file c)))) - (find-files "." "\\.vala")) - #t)) - (add-after 'unpack 'fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/ibusenginesimple.c" - (("/usr/share/X11/locale") - (string-append (assoc-ref inputs "libx11") - "/share/X11/locale"))) - (substitute* "ui/gtk3/xkblayout.vala" - (("\"(setxkbmap|xmodmap)\"" _ prog) - (string-append "\"" (assoc-ref inputs prog) "\""))) - #t)) - (add-after 'wrap-program 'wrap-with-additional-paths - (lambda* (#:key outputs #:allow-other-keys) - ;; Make sure 'ibus-setup' runs with the correct PYTHONPATH and - ;; GI_TYPELIB_PATH. - (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/bin/ibus-setup") - `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))) - `("GI_TYPELIB_PATH" ":" prefix - (,(getenv "GI_TYPELIB_PATH") - ,(string-append out "/lib/girepository-1.0"))))) - #t))))) - (inputs - `(("dbus" ,dbus) - ("dconf" ,dconf) - ("gconf" ,gconf) - ("gtk2" ,gtk+-2) - ("gtk+" ,gtk+) - ("intltool" ,intltool) - ("json-glib" ,json-glib) - ("libnotify" ,libnotify) - ("libx11" ,libx11) - ("setxkbmap" ,setxkbmap) - ("wayland" ,wayland) - ("xmodmap" ,xmodmap) - ("iso-codes" ,iso-codes) - ("pygobject2" ,python-pygobject) - ("python" ,python))) - (native-inputs - `(("glib" ,glib "bin") ; for glib-genmarshal - ("gobject-introspection" ,gobject-introspection) ; for g-ir-compiler - ("unicode-nameslist" - ,(origin - (method url-fetch) - (uri "https://www.unicode.org/Public/UNIDATA/NamesList.txt") - (sha256 - (base32 "0yr2h0nfqhirfi3bxl33z6cc94qqshlpgi06c25xh9754irqsgv8")))) - ("unicode-blocks" - ,(origin - (method url-fetch) - (uri "https://www.unicode.org/Public/UNIDATA/Blocks.txt") - (sha256 - (base32 "0lnh9iazikpr548bd7nkaq9r3vfljfvz0rg2462prac8qxk7ni8b")))) - ("vala" ,vala) - ("pkg-config" ,pkg-config))) - (native-search-paths - (list (search-path-specification - (variable "IBUS_COMPONENT_PATH") - (files '("share/ibus/component"))))) - (synopsis "Input method framework") - (description - "IBus is an input framework providing a full-featured and user-friendly + (name "ibus") + (version "1.5.19") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/ibus/ibus/" + "releases/download/" + version "/ibus-" version ".tar.gz")) + (sha256 + (base32 + "0a94bnpm24581317hdnihwr4cniriml10p4ffgxg14xhvaccfrjb")))) + (build-system glib-or-gtk-build-system) + (arguments + `(#:tests? #f ; tests fail because there's no connection to dbus + #:configure-flags `("--disable-emoji-dict" ; cannot find emoji.json path + "--disable-python2" + "--enable-python-library" + ,(string-append "--with-ucd-dir=" + (getcwd) "/ucd") + "--enable-wayland") + #:make-flags + (list "CC=gcc" + (string-append "pyoverridesdir=" + (assoc-ref %outputs "out") + "/lib/python3.6/site-packages/gi/overrides/")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'prepare-ucd-dir + (lambda* (#:key inputs #:allow-other-keys) + (mkdir-p "../ucd") + (symlink (assoc-ref inputs "unicode-blocks") "../ucd/Blocks.txt") + (symlink (assoc-ref inputs "unicode-nameslist") "../ucd/NamesList.txt") + #t)) + (add-before 'configure 'disable-dconf-update + (lambda _ + (substitute* "data/dconf/Makefile.in" + (("dconf update") "echo dconf update")) + #t)) + (add-after 'unpack 'delete-generated-files + (lambda _ + (for-each (lambda (file) + (let ((c (string-append (string-drop-right file 4) "c"))) + (when (file-exists? c) + (format #t "deleting ~a\n" c) + (delete-file c)))) + (find-files "." "\\.vala")) + #t)) + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/ibusenginesimple.c" + (("/usr/share/X11/locale") + (string-append (assoc-ref inputs "libx11") + "/share/X11/locale"))) + (substitute* "ui/gtk3/xkblayout.vala" + (("\"(setxkbmap|xmodmap)\"" _ prog) + (string-append "\"" (assoc-ref inputs prog) "\""))) + #t)) + (add-after 'wrap-program 'wrap-with-additional-paths + (lambda* (#:key outputs #:allow-other-keys) + ;; Make sure 'ibus-setup' runs with the correct PYTHONPATH and + ;; GI_TYPELIB_PATH. + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/ibus-setup") + `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))) + `("GI_TYPELIB_PATH" ":" prefix + (,(getenv "GI_TYPELIB_PATH") + ,(string-append out "/lib/girepository-1.0"))))) + #t))))) + (inputs + `(("dbus" ,dbus) + ("dconf" ,dconf) + ("gconf" ,gconf) + ("gtk2" ,gtk+-2) + ("gtk+" ,gtk+) + ("intltool" ,intltool) + ("json-glib" ,json-glib) + ("libnotify" ,libnotify) + ("libx11" ,libx11) + ("setxkbmap" ,setxkbmap) + ("wayland" ,wayland) + ("xmodmap" ,xmodmap) + ("iso-codes" ,iso-codes) + ("pygobject2" ,python-pygobject) + ("python" ,python))) + (native-inputs + `(("glib" ,glib "bin") ; for glib-genmarshal + ("gobject-introspection" ,gobject-introspection) ; for g-ir-compiler + ("unicode-nameslist" + ,(origin + (method url-fetch) + (uri "https://www.unicode.org/Public/UNIDATA/NamesList.txt") + (sha256 + (base32 "0yr2h0nfqhirfi3bxl33z6cc94qqshlpgi06c25xh9754irqsgv8")))) + ("unicode-blocks" + ,(origin + (method url-fetch) + (uri "https://www.unicode.org/Public/UNIDATA/Blocks.txt") + (sha256 + (base32 "0lnh9iazikpr548bd7nkaq9r3vfljfvz0rg2462prac8qxk7ni8b")))) + ("vala" ,vala) + ("pkg-config" ,pkg-config))) + (native-search-paths + (list (search-path-specification + (variable "IBUS_COMPONENT_PATH") + (files '("share/ibus/component"))))) + (synopsis "Input method framework") + (description + "IBus is an input framework providing a full-featured and user-friendly input method user interface. It comes with multilingual input support. It may also simplify input method development.") - (home-page "https://github.com/ibus/ibus/wiki") - (license lgpl2.1+))) + (home-page "https://github.com/ibus/ibus/wiki") + (license lgpl2.1+))) (define-public ibus-libpinyin (package - (name "ibus-libpinyin") - (version "1.10.0") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/libpinyin/ibus-libpinyin/" - "releases/download/" version - "/ibus-libpinyin-" version ".tar.gz")) - (sha256 - (base32 - "0yq8aw4lddiviag8cnik6fp52vvk8lxv6bym13a3xya84c6zii3c")))) - (build-system glib-or-gtk-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'wrap-program 'wrap-with-additional-paths - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Make sure 'ibus-setup-libpinyin' runs with the correct - ;; PYTHONPATH and GI_TYPELIB_PATH. - (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/libexec/ibus-setup-libpinyin") - `("PYTHONPATH" ":" prefix - (,(getenv "PYTHONPATH") - ,(string-append (assoc-ref inputs "ibus") - "/lib/girepository-1.0"))) - `("GI_TYPELIB_PATH" ":" prefix - (,(string-append (assoc-ref inputs "ibus") - "/lib/girepository-1.0")))) - #t)))))) - (inputs - `(("ibus" ,ibus) - ("libpinyin" ,libpinyin) - ("bdb" ,bdb) - ("sqlite" ,sqlite) - ("python" ,python) - ("pyxdg" ,python-pyxdg) - ("gtk+" ,gtk+))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("intltool" ,intltool) - ("glib" ,glib "bin"))) - (synopsis "Chinese pinyin and ZhuYin input methods for IBus") - (description - "This package includes a Chinese pinyin input method and a Chinese + (name "ibus-libpinyin") + (version "1.10.0") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/libpinyin/ibus-libpinyin/" + "releases/download/" version + "/ibus-libpinyin-" version ".tar.gz")) + (sha256 + (base32 + "0yq8aw4lddiviag8cnik6fp52vvk8lxv6bym13a3xya84c6zii3c")))) + (build-system glib-or-gtk-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'wrap-program 'wrap-with-additional-paths + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Make sure 'ibus-setup-libpinyin' runs with the correct + ;; PYTHONPATH and GI_TYPELIB_PATH. + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/libexec/ibus-setup-libpinyin") + `("PYTHONPATH" ":" prefix + (,(getenv "PYTHONPATH") + ,(string-append (assoc-ref inputs "ibus") + "/lib/girepository-1.0"))) + `("GI_TYPELIB_PATH" ":" prefix + (,(string-append (assoc-ref inputs "ibus") + "/lib/girepository-1.0")))) + #t)))))) + (inputs + `(("ibus" ,ibus) + ("libpinyin" ,libpinyin) + ("bdb" ,bdb) + ("sqlite" ,sqlite) + ("python" ,python) + ("pyxdg" ,python-pyxdg) + ("gtk+" ,gtk+))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("glib" ,glib "bin"))) + (synopsis "Chinese pinyin and ZhuYin input methods for IBus") + (description + "This package includes a Chinese pinyin input method and a Chinese ZhuYin (Bopomofo) input method based on libpinyin for IBus.") - (home-page "https://github.com/libpinyin/ibus-libpinyin") - (license gpl2+))) + (home-page "https://github.com/libpinyin/ibus-libpinyin") + (license gpl2+))) (define-public libpinyin (package -- cgit v1.2.3 From 78209a165be9dca931a9d7828c842d9babd5ed98 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Mon, 29 Oct 2018 11:29:33 +0800 Subject: gnu: Add librime. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ibus.scm (librime): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/ibus.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 40fa930293..f689c02baa 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016 Chris Marusich ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Meiyo Peng ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,21 +25,27 @@ #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) #:use-module (gnu packages) #:use-module (gnu packages anthy) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages boost) #:use-module (gnu packages databases) + #:use-module (gnu packages datastructures) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) #:use-module (gnu packages iso-codes) + #:use-module (gnu packages logging) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages serialization) + #:use-module (gnu packages textutils) #:use-module (gnu packages xorg)) (define-public ibus @@ -279,3 +286,33 @@ applications allow text input via IBus, installing this package will enable Japanese language input in most graphical applications.") (home-page "https://github.com/fujiwarat/ibus-anthy") (license gpl2+))) + +(define-public librime + (package + (name "librime") + (version "1.3.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/rime/" name + "/archive/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0qh0hy8bvj17bnzaxk0bmv4gsnbsd6jx8csr84936xmhkrysdday")))) + (build-system cmake-build-system) + (inputs + `(("boost" ,boost) + ("glog" ,glog) + ("leveldb" ,leveldb) + ("marisa" ,marisa) + ("opencc" ,opencc) + ("yaml-cpp" ,yaml-cpp))) + (home-page "https://rime.im/") + (synopsis "The core library of Rime Input Method Engine") + (description "@dfn{librime} is the core library of Rime Input Method +Engine, which is a lightweight, extensible input method engine supporting +various input schemas including glyph-based input methods, romanization-based +input methods as well as those for Chinese dialects. It has the ability to +compose phrases and sentences intelligently and provide very accurate +traditional Chinese output.") + (license bsd-3))) -- cgit v1.2.3 From 1329f095bb1f79db1c9a86581bfa1e13dffc2520 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Mon, 29 Oct 2018 11:35:20 +0800 Subject: gnu: Add rime-data. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ibus.scm (rime-data): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/ibus.scm | 277 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 277 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index f689c02baa..afb7602930 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -25,6 +25,7 @@ #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) @@ -316,3 +317,279 @@ input methods as well as those for Chinese dialects. It has the ability to compose phrases and sentences intelligently and provide very accurate traditional Chinese output.") (license bsd-3))) + +(define-public rime-data + (package + (name "rime-data") + (version "0.38.20181029") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rime/plum.git") + (commit "fb4f829da2007f2dbb37d60a79bc67c25ea16568"))) + (file-name "plum-checkout") + (sha256 + (base32 "1m1wiv9j5bay4saga58c7dj4h8gqivsbyp16y245ifvxvp9czj67")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no tests + #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) + "no_update=1") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + ;; Set .DEFAULT_GOAL to `all'. + ;; Don't build binary schemas. The output is not deterministic. + (substitute* "Makefile" + (("^\\.DEFAULT_GOAL := preset") + ".DEFAULT_GOAL := all")) + #t)) + ;; Add schema packages into "package/rime" directory. + (add-after 'unpack 'add-packages + (lambda* (#:key inputs #:allow-other-keys) + (let* ((dest-dir "package/rime")) + (mkdir-p dest-dir) + (for-each (lambda (pkg) + (symlink (assoc-ref inputs pkg) + (string-append dest-dir "/" pkg))) + '("array" + "bopomofo" + "cangjie" + "combo-pinyin" + "double-pinyin" + "emoji" + "essay" + "ipa" + "jyutping" + "luna-pinyin" + "middle-chinese" + "pinyin-simp" + "prelude" + "quick" + "scj" + "soutzoe" + "stenotype" + "stroke" + "terra-pinyin" + "wubi" + "wugniu"))) + #t)) + (delete 'configure)))) + (native-inputs + `(("array" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rime/rime-array.git") + (commit "906e923902147584b0b0247028a782abbfbfd8a0"))) + (file-name "rime-array-checkout") + (sha256 + (base32 + "1alk6ghn4ji4kvp7lfm57bwm2gjh99i79r0w9naz6wkdim8idvb1")))) + ("bopomofo" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rime/rime-bopomofo.git") + (commit "8dc44ca1b6ef4e45b452e070b9da737f5da165e3"))) + (file-name "rime-bopomofo-checkout") + (sha256 + (base32 + "16k6wfhcrw3a77rmbrp21ca0gmsmb3f68s193c1cfwr8i68k46nf")))) + ("cangjie" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rime/rime-cangjie.git") + (commit "ab085e90856b3399b374dc3c8b4cb40d11f307a8"))) + (file-name "rime-cangjie-checkout") + (sha256 + (base32 + "11fgj0rbv9nyzfijwm2l8pm8fznhif4h27ndrrcaaylkp7p5zsx2")))) + ("combo-pinyin" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rime/rime-combo-pinyin.git") + (commit "f1bae63f20504f2b8113c5cbdf2700e858aa91eb"))) + (file-name "rime-combo-pinyin-checkout") + (sha256 + (base32 + "1l1079akwm1hw4kkn0q6x9fpylnl2ka6z2fn7lmdpfpsr0xgn0n7")))) + ("double-pinyin" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rime/rime-double-pinyin.git") + (commit "2101a5cd40e511ec38835769aa66d2dddf059c2e"))) + (file-name "rime-double-pinyin-checkout") + (sha256 + (base32 + "19hh2qm0njbfk2js678hfm2hw9b796s43vs11yy3m1v9m0gk2vi7")))) + ("emoji" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rime/rime-emoji.git") + (commit "6e6611b315f03ee4c33f958f9dbe960b13a0ed19"))) + (file-name "rime-emoji-checkout") + (sha256 + (base32 + "1brfs3214w36j3345di9ygp468hbvbqdqpkjxxs1dbp437rayhyy")))) + ("essay" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rime/rime-essay.git") + (commit "5e5c7a0ef41c9b030abdad81a9df07b56b1661e9"))) + (file-name "rime-essay-checkout") + (sha256 + (base32 + "0ana9is0zhh79m4gjshvmaxbrg3jiqysydx5bpm151i7i6vw5y1i")))) + ("ipa" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rime/rime-ipa.git") + (commit "02a9e2c181921a2e95e1a81f88188c41132755c3"))) + (file-name "rime-ipa-checkout") + (sha256 + (base32 + "1szrxgvqlgmxapj2aflw2cvbv0p6pl0sw0gyxa13dvdhhf7s9rvr")))) + ("jyutping" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rime/rime-jyutping.git") + (commit "1402ec3d6cc0973f952fe3f9ef531294e4ffe9e0"))) + (file-name "rime-jyutping-checkout") + (sha256 + (base32 + "17g03dy4gw6vyc9da1wjn3iy9hx64dfnwiwsfc7bkzan22x2m4dv")))) + ("luna-pinyin" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rime/rime-luna-pinyin.git") + (commit "3b05132576f5c347ff8a70857d2dae080936ac3b"))) + (file-name "rime-luna-pinyin-checkout") + (sha256 + (base32 + "0kgnpxjn10dm2d9718r12rdjlwqd2s2h84jvkhxhh5v0dkv1anl2")))) + ("middle-chinese" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rime/rime-middle-chinese.git") + (commit "9ba8d70330654b9a730f882d35cfad7dbeddfd75"))) + (file-name "rime-middle-chinese-checkout") + (sha256 + (base32 + "0hwg5zby5kphh0bcfay8mfxwr5bwqhamiw3cmmmf7kp9fbns5s23")))) + ("pinyin-simp" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rime/rime-pinyin-simp.git") + (commit "74357ffd62c05fb60edf6eab5b86bc8c8c1907d0"))) + (file-name "rime-pinyin-simp-checkout") + (sha256 + (base32 + "1paw3c7pv5bl54abnp9pidfxrkchdacyxy5m9zb311p5sgm7fhxh")))) + ("prelude" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rime/rime-prelude.git") + (commit "33040568c3ddb2ee6340c9b669494317db21b77c"))) + (file-name "rime-prelude-checkout") + (sha256 + (base32 + "1gwcasyyg6f0ib6s4qsrrjcqr1lcs7j3xqxl65rznsw44nhnbwwq")))) + ("quick" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rime/rime-quick.git") + (commit "910a97d403ad8e72f322488da146da79c19d623f"))) + (file-name "rime-quick-checkout") + (sha256 + (base32 + "0yrq3gbfmm29xlr52rmxc41mqfrb0295q7sdhbc3ax71677mpr0y")))) + ("scj" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rime/rime-scj.git") + (commit "e0eae889f4376d2a434ac3b38523e0da7400db68"))) + (file-name "rime-scj-checkout") + (sha256 + (base32 + "1whnv9zs349kvy0zi7dnmpqwil8i6gqwrzvhy3qdrjzy58y6gwxn")))) + ("soutzoe" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rime/rime-soutzoe.git") + (commit "e47841a8ad6341731c41cdb814b7a25c837603c4"))) + (file-name "rime-soutzoe-checkout") + (sha256 + (base32 + "1rgpmkxa72jy6gyy44fn8azpk3amk9s9lrdf7za03nv95d0fvm0p")))) + ("stenotype" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rime/rime-stenotype.git") + (commit "d4ff379314fd95283853d1734854979cf3cbd287"))) + (file-name "rime-stenotype-checkout") + (sha256 + (base32 + "1kckpi4l4884hvydr3d6vid3v7rsc1app29kmk7v8jf8vn16afhl")))) + ("stroke" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rime/rime-stroke.git") + (commit "cfd29c675c46cf70b7a7f0a3836a913059316a0a"))) + (file-name "rime-stroke-checkout") + (sha256 + (base32 + "135is9c1p4lm98fd9l1gxyflkm69cv5an129ka7sk614bq84m08d")))) + ("terra-pinyin" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rime/rime-terra-pinyin.git") + (commit "15b5c73a796571cd6f9ef6c89f96656cb9df86f9"))) + (file-name "rime-terra-pinyin-checkout") + (sha256 + (base32 + "1xsd84h1zw417h5hr4dbgyk5009zi7q2p9774w3ccr5sxgc3i3cm")))) + ("wubi" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rime/rime-wubi.git") + (commit "d44403728a0b1cd8b47cb1f81b83f58e5f790b74"))) + (file-name "rime-wubi-checkout") + (sha256 + (base32 + "0ld31bdn94lncxd1ka44w4sbl03skh08mc927dhdmwq5bpvrgn36")))) + ("wugniu" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rime/rime-wugniu.git") + (commit "65bcc354ada3839591d7546a64c71dbdd0592b02"))) + (file-name "rime-wugniu-checkout") + (sha256 + (base32 + "0g31awp40s778sp5c290x40s8np86n8aw011s17sslxrqhhb0bkx")))))) + (home-page "https://rime.im/") + (synopsis "Schema data of Rime Input Method Engine") + (description "@dfn{rime-data} provides the schema data of Rime Input +Method Engine.") + (license lgpl3+))) -- cgit v1.2.3 From d5b23d2b7ddcd94f073f3bac8d860895263e23c3 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Mon, 29 Oct 2018 11:46:03 +0800 Subject: gnu: Add ibus-rime. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ibus.scm (ibus-rime): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/ibus.scm | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index afb7602930..8ad1e09856 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -34,6 +34,7 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages boost) + #:use-module (gnu packages cmake) #:use-module (gnu packages databases) #:use-module (gnu packages datastructures) #:use-module (gnu packages freedesktop) @@ -593,3 +594,61 @@ traditional Chinese output.") (description "@dfn{rime-data} provides the schema data of Rime Input Method Engine.") (license lgpl3+))) + +(define-public ibus-rime + (package + (name "ibus-rime") + (version "1.3.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/rime/" name + "/archive/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0mfbz0vwky7n4wvxrwabnn1i9n9adnql0dd1rx57w1anaslr5amj")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no tests + #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Define RIME_DATA_DIR. It's required but not used by the code. + (substitute* "Makefile" + (("cmake") + (string-append "cmake -DRIME_DATA_DIR=" + (assoc-ref inputs "rime-data") + "/share/rime-data"))) + ;; rime_config.h defines the actual data directory. + (substitute* "rime_config.h" + (("^#define IBUS_RIME_INSTALL_PREFIX .*$") + (string-append "#define IBUS_RIME_INSTALL_PREFIX \"" + (assoc-ref outputs "out") + "\"\n")) + (("^#define IBUS_RIME_SHARED_DATA_DIR .*$") + (string-append "#define IBUS_RIME_SHARED_DATA_DIR \"" + (assoc-ref inputs "rime-data") + "/share/rime-data\"\n"))) + #t)) + (delete 'configure)))) + (inputs + `(("gdk-pixbuf" ,gdk-pixbuf) + ("glib" ,glib) + ("ibus" ,ibus) + ("libnotify" ,libnotify) + ("librime" ,librime) + ("rime-data" ,rime-data))) + (native-inputs + `(("cmake" ,cmake) + ("pkg-config" ,pkg-config))) + (home-page "https://rime.im/") + (synopsis "Rime Input Method Engine for IBus") + (description "@dfn{ibus-rime} provides the Rime input method engine for +IBus. Rime is a lightweight, extensible input method engine supporting +various input schemas including glyph-based input methods, romanization-based +input methods as well as those for Chinese dialects. It has the ability to +compose phrases and sentences intelligently and provide very accurate +traditional Chinese output.") + (license gpl3+))) -- cgit v1.2.3 From 78e3d554d15a565514d78a09d5dcd7f29e2f91ec Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sat, 3 Nov 2018 10:28:37 +0000 Subject: gnu: Add emacs-ivy-rich. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs.scm (emacs-ivy-rich): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index e3808071a2..3e32998a9f 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -40,6 +40,7 @@ ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2018 Alex Branham ;;; Copyright © 2018 Thorsten Wilms +;;; Copyright © 2018 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -3848,6 +3849,31 @@ use it, call @code{M-x ivy-yasnippet} (but make sure you have enabled @code{yas-minor-mode} first).") (license license:gpl3+)))) +(define-public emacs-ivy-rich + (package + (name "emacs-ivy-rich") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/Yevgnen/ivy-rich/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "14r3mx5rkd4wz0ls5pv5w6c7la3z9iy93d3jfind3xyg4kywy95c")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-ivy" ,emacs-ivy))) + (home-page "https://github.com/Yevgnen/ivy-rich") + (synopsis "More friendly interface for @code{ivy}") + (description + "This package extends @code{ivy} by showing more information in the +minibuffer for each candidate. It adds columns showing buffer modes, file +sizes, docstrings, etc. If @code{emacs-all-the-icons} is installed, it can +show icons as well.") + (license license:gpl3+))) + (define-public emacs-avy (package (name "emacs-avy") -- cgit v1.2.3 From cdb4048d7201e509862b7e2a74e60c1d65a2ba42 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 10 Nov 2018 23:34:53 +0100 Subject: gnu: portaudio: Remove custom bootstrap phase. * gnu/packages/audio.scm (portaudio)[arguments]: Remove autoreconf phase. --- gnu/packages/audio.scm | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 5848411087..bf5ee3c65f 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2753,20 +2753,14 @@ portions of LAME.") ;; TODO: Add ASIHPI. `(("alsa-lib" ,alsa-lib) ("jack" ,jack-1))) + ;; Autoreconf is necessary because the audacity-compat patch modifies .in + ;; files. (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) ("libtool" ,libtool) ("pkg-config" ,pkg-config))) - (arguments - '(#:phases - ;; Autoreconf is necessary because the audacity-compat patch modifies - ;; .in files. - (modify-phases %standard-phases - (add-after 'unpack 'autoreconf - (lambda _ - (invoke "autoreconf" "-vif")))) - #:tests? #f)) ;no 'check' target + (arguments '(#:tests? #f)) ;no 'check' target (home-page "http://www.portaudio.com/") (synopsis "Audio I/O library") (description -- cgit v1.2.3 From 7db147ec455b11c9717c4ac3730bf1139b370897 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 10 Nov 2018 23:36:05 +0100 Subject: gnu: rtmidi: Remove custom bootstrap phase. * gnu/packages/audio.scm (rtmidi)[arguments]: Remove autoconf phase. --- gnu/packages/audio.scm | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index bf5ee3c65f..e5b8f9ed79 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2285,25 +2285,21 @@ tempo and pitch of an audio recording independently of one another.") (build-system gnu-build-system) (arguments `(#:tests? #f ;no "check" target - #:phases (modify-phases %standard-phases - (add-after - 'unpack 'autoconf - (lambda _ (invoke "autoreconf" "-vfi"))) - (add-before - 'build 'fix-makefile - (lambda _ - (substitute* "Makefile" - (("/bin/ln") "ln") - (("RtMidi.h RtError.h") "RtMidi.h")) - #t)) - (add-before - 'install 'make-target-dirs - (lambda _ - (let ((out (assoc-ref %outputs "out"))) - (mkdir-p (string-append out "/bin")) - (mkdir (string-append out "/lib")) - (mkdir (string-append out "/include"))) - #t))))) + #:phases + (modify-phases %standard-phases + (add-before 'build 'fix-makefile + (lambda _ + (substitute* "Makefile" + (("/bin/ln") "ln") + (("RtMidi.h RtError.h") "RtMidi.h")) + #t)) + (add-before 'install 'make-target-dirs + (lambda _ + (let ((out (assoc-ref %outputs "out"))) + (mkdir-p (string-append out "/bin")) + (mkdir (string-append out "/lib")) + (mkdir (string-append out "/include"))) + #t))))) (inputs `(("jack" ,jack-1) ("alsa-lib" ,alsa-lib))) -- cgit v1.2.3 From e17f867c62c687779a82d05db73ab63c25d49c4e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 10 Nov 2018 23:37:48 +0100 Subject: gnu: wmbattery: Remove custom bootstrap phase. * gnu/packages/gnustep.scm (wmbattery)[arguments]: Remove autoconf phase. --- gnu/packages/gnustep.scm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnustep.scm b/gnu/packages/gnustep.scm index bd28ceaa00..3cc5540ae7 100644 --- a/gnu/packages/gnustep.scm +++ b/gnu/packages/gnustep.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2014 Ludovic Courtès ;;; Copyright © 2016, 2017 Kei Kebreau ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -167,14 +168,7 @@ interface. It is fast, feature rich, easy to configure, and easy to use.") (base32 "084a3irxbmgms4bqaga80mlx9wgvlkx6d2w0ns939yrpfzg87laj")))) (build-system gnu-build-system) - (arguments - `(#:tests? #f ; no "check" target - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'autoconf - (lambda _ - (invoke "autoreconf" "-vfi") - #t))))) + (arguments '(#:tests? #f)) ; no "check" target (inputs `(("glib" ,glib) ("libx11" ,libx11) -- cgit v1.2.3 From f116e1fcae18d07c116d5d96bdb4de20cd783b5f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 10 Nov 2018 23:40:14 +0100 Subject: gnu: wmclock: Remove custom bootstrap phase. * gnu/packages/gnustep.scm (wmclock)[arguments]: Remove. --- gnu/packages/gnustep.scm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnustep.scm b/gnu/packages/gnustep.scm index 3cc5540ae7..dd7c67d553 100644 --- a/gnu/packages/gnustep.scm +++ b/gnu/packages/gnustep.scm @@ -256,18 +256,11 @@ on.") (base32 "1lx276ba8r2yydhmwj1g586jdqg695ad89ng36fr3mb067gvb2rz")))) (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'autoconf - (lambda _ - (invoke "autoreconf" "-vfi") - #t))))) - ;; wmclock requires autoreconf to generate its configure script. (inputs `(("libx11" ,libx11) ("libxext" ,libxext) ("libxpm" ,libxpm))) + ;; wmclock requires autoreconf to generate its configure script. (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- cgit v1.2.3 From 4cbbb16045d930b074268e9bc72922578ce31059 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 10 Nov 2018 23:41:30 +0100 Subject: gnu: nxbelld: Remove custom bootstrap phase. * gnu/packages/xdisorg.scm (nxbelld)[arguments]: Remove autoreconf phase. --- gnu/packages/xdisorg.scm | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index cf3e33eb5b..c54282b985 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2015 xd1le ;;; Copyright © 2015 Florian Paul Schmidt ;;; Copyright © 2016 Christopher Allan Webber -;;; Copyright © 2016 Ricardo Wurmus +;;; Copyright © 2016, 2018 Ricardo Wurmus ;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2016 Alex Kost @@ -1338,15 +1338,11 @@ invert colors on a specific display/screen.") (build-system gnu-build-system) (arguments '(#:configure-flags `("--enable-sound" "--enable-wave" - "--enable-alsa") - #:phases (modify-phases %standard-phases - (add-before 'configure 'autoreconf - (lambda _ - (invoke "autoreconf" "-vfi")))))) - (native-inputs `(("autoconf" ,autoconf) - ("automake" ,automake) - ("pkg-config" ,pkg-config) - ("perl" ,perl))) + "--enable-alsa"))) + (native-inputs `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config) + ("perl" ,perl))) (inputs `(("libx11" ,libx11) ("alsa-lib" ,alsa-lib))) (synopsis "Daemon that performs an action every time the X11 bell is rung") -- cgit v1.2.3 From fc43d6d4d9df9672b3a1047e5c81bed511dad8e4 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 10 Nov 2018 20:22:30 -0500 Subject: gnu: linux-libre@4.4: Update to 4.4.163. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.163. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b1021d5624..cd7f61803d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -445,8 +445,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.162" - "1anb2k9i03369lvbwlw24vimxvk8zpcql4ryz0ydvf3pxv8lirm2" + (make-linux-libre "4.4.163" + "05j0dm0cxilanp5z40n8kgjz9vn1p4rg63kksicd2v48w8ka82z6" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From 62168a555872aafccbc75d5681063c3f90d9a928 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 10 Nov 2018 20:23:15 -0500 Subject: gnu: linux-libre@4.9: Update to 4.9.136. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.136. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index cd7f61803d..132bc0d827 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -439,8 +439,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.135" - "07v5s6hl08ls2z9xdkbqq1s210mqayfchqbckhp8hlaw089ap71f" + (make-linux-libre "4.9.136" + "1kk6px1jcwbgkpfmf9pdklk6kz90h5l8fvdqwmvnk4bz6b2xrrfp" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From e22842f5ca7e8db772e9a8522d21b63bb7c81c4f Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 10 Nov 2018 20:23:57 -0500 Subject: gnu: linux-libre@4.14: Update to 4.14.80. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.80. (%linux-libre-4.14-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 132bc0d827..b1dd5adc88 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -429,8 +429,8 @@ It has been modified to remove all non-free binary blobs.") #:patches %linux-libre-4.19-patches #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.79") -(define %linux-libre-4.14-hash "000rd4h2yk6k68wjg37v53hqnqw1mgwhdxbcvy8iywy8za9r12c8") +(define %linux-libre-4.14-version "4.14.80") +(define %linux-libre-4.14-hash "0h4hi5lqizdx5nk0f3immbcv2n7p5jh26m80v4x6bw4wi5b44fra") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.2.3 From 3b144946164641f806fbbf27ac592c7c717ea6c6 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 10 Nov 2018 13:42:50 -0500 Subject: gnu: icecat: Update to 60.3.0-gnu1. * gnu/packages/gnuzilla.scm (icecat): Update to 60.3.0-gnu1. [source]: Switch back to the normal source URI. Remove patches that are no longer applicable. * gnu/packages/patches/icecat-CVE-2018-12383.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/gnuzilla.scm | 68 +-------------- gnu/packages/patches/icecat-CVE-2018-12383.patch | 103 ----------------------- 3 files changed, 3 insertions(+), 169 deletions(-) delete mode 100644 gnu/packages/patches/icecat-CVE-2018-12383.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 68a87b1255..48ee438a6e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -811,7 +811,6 @@ dist_patch_DATA = \ %D%/packages/patches/hplip-remove-imageprocessor.patch \ %D%/packages/patches/hydra-disable-darcs-test.patch \ %D%/packages/patches/icecat-avoid-bundled-libraries.patch \ - %D%/packages/patches/icecat-CVE-2018-12383.patch \ %D%/packages/patches/icecat-use-system-graphite2+harfbuzz.patch \ %D%/packages/patches/icecat-use-system-media-libs.patch \ %D%/packages/patches/icedtea-6-hotspot-gcc-segfault-workaround.patch \ diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 1dd0e930d3..36ac0dfe6a 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -482,83 +482,21 @@ security standards.") (define-public icecat (package (name "icecat") - (version "60.2.0-gnu1") + (version "60.3.0-gnu1") (source (origin (method url-fetch) - ;; Temporary URL pending official release: - (uri "https://alpha.gnu.org/gnu/gnuzilla/60.2.0/icecat-60.2.0-gnu1.tar.bz2") - #; (uri (string-append "mirror://gnu/gnuzilla/" (first (string-split version #\-)) "/" name "-" version ".tar.bz2")) (sha256 (base32 - "0lqx7g79x15941rhjr3qsfwsny6vzc7d7abdmvjy6jjbqkqlc1zl")) + "0icnl64nxcyf7dprpdpygxhabsvyhps8c3ixysj9bcdlj9q34ib1")) (patches (list (search-patch "icecat-avoid-bundled-libraries.patch") (search-patch "icecat-use-system-graphite2+harfbuzz.patch") - (search-patch "icecat-use-system-media-libs.patch") - (mozilla-patch "icecat-CVE-2018-12385.patch" "80a4a7ef2813" "1vgcbimpnfjqj934v0cryq1g13xac3wfmd4jyhcb5s60x8xyssf5") - (search-patch "icecat-CVE-2018-12383.patch") - (mozilla-patch "icecat-bug-1489744.patch" "6546ee839d30" "11mhvj77r789b428bfxqq5wdx8yr7lbrdjzr8qjj6fw197pldn51") - (mozilla-patch "icecat-CVE-2018-12386.patch" "4808fcb2e6ca" "05sc881l7sh8bag8whd2ggdn198lskqcxq8f41scfpqscw6xs5d5") - (mozilla-patch "icecat-CVE-2018-12387.patch" "b8f5c37486e1" "0lvmbh126m695kgdbasy1y5xh9n1j08cwdhn071mgvj6yn8cns5z") - (mozilla-patch "icecat-bug-1464751.patch" "d5d00faf0465" "1mj7dbb06brwrk0mvap0z4lfl2hwz1cj6dwjvdrisxm046pdw98i") - (mozilla-patch "icecat-bug-1472538.patch" "11462f2b98f2" "1nxgh0plzilylx8r73r7d74pv66qwjqxmd7nqii33p0snl2jjfzs") - (mozilla-patch "icecat-bug-1478685.patch" "098585dc86fc" "1b0x4qdh6isvffmibvc8ad8z62m3iky9q6jq0z6gyvn8q252cqal") - (mozilla-patch "icecat-bug-1486080.patch" "3f8d57d936ea" "0pz2c18wcgj44v0j8my9xbm90m4bsjcvzmavj569fi8bh6s6zz8p") - (mozilla-patch "icecat-bug-1423278.patch" "878ceaee5634" "0i47s5nvrx9vqbnj6s9y9f4ffww20p8nviqa6frg676y1188xlyl") - (mozilla-patch "icecat-CVE-2018-12390-pt01.patch" "87be1b98ec9a" "15f4l18c7hz9aqn89gg3dwmdidfwgn10dywgpzydm8mps45amx7j") - (mozilla-patch "icecat-bug-1484559.patch" "99e58b5307ce" "02fdgbliwzi2r2376wg6k1rky1isfka0smac4ii2cll01jhpfrn6") - (mozilla-patch "icecat-CVE-2018-12390-pt02.patch" "f25ce451a492" "18nzg39iyxza1686180qk9cc88l5j2hf1h35d62lrqmdgd9vcj33") - (mozilla-patch "icecat-CVE-2018-12390-pt03.patch" "35c26bc231df" "0qh8d4z6y03h5xh7djci26a01l6zq667lg2k11f6zzg7z2j0h67x") - (mozilla-patch "icecat-bug-1488061.patch" "050d0cfa8e3d" "05ql798ynbyz5pvyri4b95j4ixmgnny3zl7sd2ckfrrbm9mxh627") - (mozilla-patch "icecat-bug-1434963-pt1.patch" "1e6dad87efed" "1v00a6cmgswjk54041jyv1ib129fxshpzwk6mn6lr0v5hylk3bx9") - (mozilla-patch "icecat-bug-1434963-pt2.patch" "6558c46df9ea" "0vdy9dm9w5k1flhcfxwvvff0aa415b5mgmmq5r37i83686768xfb") - (mozilla-patch "icecat-bug-1434963-pt3.patch" "686fcfa8abd6" "0ihqr11aq4b0y7mx7bwn8yzn25mv3k2gdphm951mj1g85qg35ann") - (mozilla-patch "icecat-bug-1491132.patch" "14120e0c74d6" "188c5fbhqqhmlk88p70l6d97skh7xy4jhqdby1ri3h9ix967515j") - (mozilla-patch "icecat-bug-1492065.patch" "ec4b5969c6ae" "18gfwn15kh0826vlg6lhrx3q4gv82i7v1k3y5jp72mvrjq154gy0") - (mozilla-patch "icecat-bug-1492064.patch" "528cabdd9665" "0rdwpkfma24hn8namfb9saw4rgi9yyyj4af5h2ijrvadw6r8lyyn") - (mozilla-patch "icecat-bug-1489757.patch" "46f19852aaa6" "0dga7mw847klm8x6il2fyzpjxqxxgx1q5cya658f1w66kxms1f29") - (mozilla-patch "icecat-bug-1492897.patch" "c3a48066f383" "09n6sdck4jzzmznzrq0iixg5nsgrc5ibpdfsh3i7ppwad3fsy2m3") - (mozilla-patch "icecat-bug-1492915.patch" "2d280e557331" "11x2n61pw5way9cg8lbrfl3lqvgfnbmcs1fwm78i06kmfwj0msk3") - (mozilla-patch "icecat-CVE-2018-12390-pt04.patch" "b80f94262165" "1hw43h4sgf77x323745rixyp6cci3fb6d3fnp33q82m4ssdb5623") - (mozilla-patch "icecat-bug-1492484.patch" "1b3e6759cf3a" "1yn2cd2227ncg90c88ymdi5fyfs4hk335bd16vkkgljs0924yy0m") - (mozilla-patch "icecat-bug-1493590.patch" "d9fe3b2025fc" "06783hj1aqms2f9a3mp18bk8hgijk3pz70bpccn173v4w0zlbbd4") - (mozilla-patch "icecat-CVE-2018-12390-pt05.patch" "20c59797e994" "1vxnhpirjsj040hrq9xmq2xhkpq4l5mnnzqy0nda92dfh47zvidj") - (mozilla-patch "icecat-CVE-2018-12390-pt06.patch" "1749661dfd28" "0g0sj2fgp3asj0yvxksnhrc59yxncn35bz5nzlvkpgdf7h06gscd") - (mozilla-patch "icecat-CVE-2018-12390-pt07.patch" "a511a9242406" "1hhfrvdmkccnhs4skbi06174x37rmvf4ic86xawyyzr67yga73b2") - (mozilla-patch "icecat-bug-1495404.patch" "3232bb3b622f" "1pnaxf8r9h0wldjc4qgl7z3rk34fpz9h1vd3zmhswa6mvyln5jhg") - (mozilla-patch "icecat-bug-1465388.patch" "a9577451dcc2" "0v29s0v3vv9vblkcachhh46qvwjcrmv2bkcdb7sj2asc503l0lqv") - (mozilla-patch "icecat-CVE-2018-12390-pt08.patch" "e965f6f6ed75" "0hh091854xj5j0x1r8pg46xmn00fqi5n212xhzbdpgyf96rsf513") - (mozilla-patch "icecat-bug-1445528.patch" "8a503e022a29" "1y2ll3h0yz8sfdddjmk90qjfxcr1ffhw7a9ww3yw26gyhnbpg404") - (mozilla-patch "icecat-bug-1409570.patch" "8d326641d1c0" "0w29s6dixi7b7q3nicshrp29n9sj5awssdln00yx664m8a8a8ihs") - (mozilla-patch "icecat-bug-1496094.patch" "6cdd6d88eca9" "1ssqa4fy2xpbr63ph3av3hkpl92g4yszx402fq9d2xn9482q43dp") - (mozilla-patch "icecat-CVE-2018-12391.patch" "0fa07c704ca4" "055xdyb3g2l4rj188235i579qnr50v19q36jjpliws9nik129iqy") - (mozilla-patch "icecat-bug-1462162.patch" "739e898cb7c8" "17m9y0pskmqx15dkgkw4k93njph14mpsf37wb1azwkq3xx7s0fhx") - (mozilla-patch "icecat-bug-1492764.patch" "16310ab35452" "1kq5r3w9i4n6q9msmw2qsqa0jd4qw1mjlyyz8aq14fwlbkhvv199") - (mozilla-patch "icecat-CVE-2018-12390-pt09.patch" "9b669d047d55" "063ig49gx9468nvc9w8259j819qfdjvq0sbbz8n4kj5r6hcxjc5l") - (mozilla-patch "icecat-CVE-2018-12390-pt10.patch" "9d51e65c797a" "0m23cq9zl22w80dvx5rlgpbam1l3d6v56h7g9wzamzl21bwxq9fv") - (mozilla-patch "icecat-CVE-2018-12390-pt11.patch" "efc0596dd381" "1alvbb6wvawxxh6isisk9c40vhdiv59fy0af0n10yn1dgy8ffv5i") - (mozilla-patch "icecat-CVE-2018-12393.patch" "c4fb48bb5d28" "09izww9dsg9n8cish8f3y7phxibsnd12bfkcxd7rzcdhg10nr4pl") - (mozilla-patch "icecat-CVE-2018-12390-pt12.patch" "b3359becd7b1" "188byxmbgrvrid2fcz34w5xdvaw571frxx1c6nqaa9k03iljdzjr") - (mozilla-patch "icecat-CVE-2018-12390-pt13.patch" "791c8ecf252d" "02h37594aba0pklxm3g7w1wv8vz9xmcf30fd0az8pfaccsklmx74") - (mozilla-patch "icecat-bug-1494328.patch" "333276fac37c" "0qyq42jl0al63m6pwj9gva7nj82l76szzbj7sklsygx0a9mqs13z") - (mozilla-patch "icecat-CVE-2018-12397.patch" "cb73374a0e4e" "0x2s1nwgwdag9df5hkwzvjj0qznp5c3d6w6y63rn2y287jn9m3vl") - (mozilla-patch "icecat-CVE-2018-12392.patch" "f6bb138ad0ab" "0f0z9dsyw2a11p4p31mdyic571153jpfgy2q04i4v6dmmcz76pm3") - (mozilla-patch "icecat-CVE-2018-12396.patch" "f27145bd5502" "0vznmlm1fbl3ynax2zpi6xxzr9qp9b83afr3mv90jgrhlgpzdbcz") - (mozilla-patch "icecat-CVE-2018-12395-pt1.patch" "133a99a8f3ca" "0im7m4jmc273mg9kih0i70hxsgzy04j6ydm9zmaz2933hkhdf4iw") - (mozilla-patch "icecat-CVE-2018-12395-pt2.patch" "82176a4a9b14" "0g3yqx4854d4mx5a0ghb7p7saj6y5d5bm2lfhabvkwybcd477zmc") - (mozilla-patch "icecat-bug-1474265.patch" "e8abd9a8ce6e" "1q2sv5h081rvnhsx6g1y8a43hwv6hsg0cr6zdcij58mkgzf6hyvd") - (mozilla-patch "icecat-bug-1492737-pt1.patch" "eeb9060379dc" "1d2mf0x4rni7anvi0sgra4dg87fmc6g7zhizzl9jv2x8va27ycbp") - (mozilla-patch "icecat-bug-1492737-pt2.patch" "99eae0d15092" "0f9j6cvhrbrrxa95p4pkcn285r9wmi9yj13nwj5x0gkglwx6idbk") - (mozilla-patch "icecat-CVE-2018-12389-pt1.patch" "23b23e12c548" "0nsdycggki5rhh59yvmh41nf1ahjmgii89fx38jryprhspy3wg62") - (mozilla-patch "icecat-CVE-2018-12390-pt14.patch" "023133ff02ec" "1g22qxnmgiy8bgrn2nv6har6vpz4p2h5pdas8ib1yyz7p2ic8652") - (mozilla-patch "icecat-CVE-2018-12390-pt15.patch" "9461988ff462" "0yq2cr5grqskr0kz4nxcwmnywy9g0xyv6k6q44i490jcj8x2y1vw") - (mozilla-patch "icecat-CVE-2018-12390-pt16.patch" "09939be135d8" "1546xlk368v4hnjd3hf4w868i6m8r4wfd34qxz4wg1cdpr4m5mik") - (mozilla-patch "icecat-CVE-2018-12389-pt2.patch" "ea9412b18ca8" "0fmdncrylbmjh0bcb6dmw1rq7zww8a0v9v9p1pxqfz0vbc6v9l5d"))) + (search-patch "icecat-use-system-media-libs.patch"))) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/icecat-CVE-2018-12383.patch b/gnu/packages/patches/icecat-CVE-2018-12383.patch deleted file mode 100644 index 17ca0f3773..0000000000 --- a/gnu/packages/patches/icecat-CVE-2018-12383.patch +++ /dev/null @@ -1,103 +0,0 @@ -Based on upstream changeset: - https://hg.mozilla.org/releases/mozilla-esr60/rev/300efdbc9fe1 -but with the git binary patch and related test changes omitted, -and adapted to apply cleanly to GNU IceCat. - -# HG changeset patch -# User David Keeler -# Date 1531860660 25200 -# Node ID 300efdbc9fe1f9165428c7934861033935b5abfa -# Parent 80a4a7ef281374dbb2afda8edac54665b14b9ef8 -Bug 1475775 - Clean up old NSS DB file after upgrade if necessary. r=franziskus, r=mattn, a=RyanVM - -Reviewers: franziskus, mattn - -Bug #: 1475775 - -Differential Revision: https://phabricator.services.mozilla.com/D2202 - -diff --git a/security/manager/ssl/nsNSSComponent.cpp b/security/manager/ssl/nsNSSComponent.cpp ---- a/security/manager/ssl/nsNSSComponent.cpp -+++ b/security/manager/ssl/nsNSSComponent.cpp -@@ -1935,16 +1935,61 @@ AttemptToRenameBothPKCS11ModuleDBVersion - NS_NAMED_LITERAL_CSTRING(sqlModuleDBFilename, "pkcs11.txt"); - nsresult rv = AttemptToRenamePKCS11ModuleDB(profilePath, - legacyModuleDBFilename); - if (NS_FAILED(rv)) { - return rv; - } - return AttemptToRenamePKCS11ModuleDB(profilePath, sqlModuleDBFilename); - } -+ -+// When we changed from the old dbm database format to the newer sqlite -+// implementation, the upgrade process left behind the existing files. Suppose a -+// user had not set a password for the old key3.db (which is about 99% of -+// users). After upgrading, both the old database and the new database are -+// unprotected. If the user then sets a password for the new database, the old -+// one will not be protected. In this scenario, we should probably just remove -+// the old database (it would only be relevant if the user downgraded to a -+// version of IceCat before 58, but we have to trade this off against the -+// user's old private keys being unexpectedly unprotected after setting a -+// password). -+// This was never an issue on Android because we always used the new -+// implementation. -+static void -+MaybeCleanUpOldNSSFiles(const nsACString& profilePath) -+{ -+ UniquePK11SlotInfo slot(PK11_GetInternalKeySlot()); -+ if (!slot) { -+ return; -+ } -+ // Unfortunately we can't now tell the difference between "there already was a -+ // password when the upgrade happened" and "there was not a password but then -+ // the user added one after upgrading". -+ bool hasPassword = PK11_NeedLogin(slot.get()) && -+ !PK11_NeedUserInit(slot.get()); -+ if (!hasPassword) { -+ return; -+ } -+ nsCOMPtr dbFile = do_CreateInstance("@mozilla.org/file/local;1"); -+ if (!dbFile) { -+ return; -+ } -+ nsresult rv = dbFile->InitWithNativePath(profilePath); -+ if (NS_FAILED(rv)) { -+ return; -+ } -+ NS_NAMED_LITERAL_CSTRING(keyDBFilename, "key3.db"); -+ rv = dbFile->AppendNative(keyDBFilename); -+ if (NS_FAILED(rv)) { -+ return; -+ } -+ // Since this isn't a directory, the `recursive` argument to `Remove` is -+ // irrelevant. -+ Unused << dbFile->Remove(false); -+} - #endif // ifndef ANDROID - - // Given a profile directory, attempt to initialize NSS. If nocertdb is true, - // (or if we don't have a profile directory) simply initialize NSS in no DB mode - // and return. Otherwise, first attempt to initialize in read/write mode, and - // then read-only mode if that fails. If both attempts fail, we may be failing - // to initialize an NSS DB collection that has FIPS mode enabled. Attempt to - // ascertain if this is the case, and if so, rename the offending PKCS#11 module -@@ -1966,16 +2011,19 @@ InitializeNSSWithFallbacks(const nsACStr - - // Try read/write mode. If we're in safeMode, we won't load PKCS#11 modules. - #ifndef ANDROID - PRErrorCode savedPRErrorCode1; - #endif // ifndef ANDROID - SECStatus srv = ::mozilla::psm::InitializeNSS(profilePath, false, !safeMode); - if (srv == SECSuccess) { - MOZ_LOG(gPIPNSSLog, LogLevel::Debug, ("initialized NSS in r/w mode")); -+#ifndef ANDROID -+ MaybeCleanUpOldNSSFiles(profilePath); -+#endif // ifndef ANDROID - return NS_OK; - } - #ifndef ANDROID - savedPRErrorCode1 = PR_GetError(); - PRErrorCode savedPRErrorCode2; - #endif // ifndef ANDROID - // That failed. Try read-only mode. - srv = ::mozilla::psm::InitializeNSS(profilePath, true, !safeMode); -- cgit v1.2.3 From 717d29e25bab351c08e3bf391056f3b2e5edfdba Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 10 Nov 2018 13:43:22 -0500 Subject: gnu: icecat: Add more fixes from mozilla-esr60. * gnu/packages/gnuzilla.scm (icecat)[source]: Add selected fixes from the upstream mozilla-esr60 source repository. --- gnu/packages/gnuzilla.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 36ac0dfe6a..e1abe8c2cd 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -496,7 +496,19 @@ security standards.") (list (search-patch "icecat-avoid-bundled-libraries.patch") (search-patch "icecat-use-system-graphite2+harfbuzz.patch") - (search-patch "icecat-use-system-media-libs.patch"))) + (search-patch "icecat-use-system-media-libs.patch") + (mozilla-patch "icecat-bug-1464061.patch" "d28761dbff18" "1f58rzwx4s1af66fdwn9lgkcd1ksmq8kn8imvf78p90jqi24h7b4") + (mozilla-patch "icecat-bug-1479853.patch" "4faeb696dd06" "12891xx9c15s6kby6d3zk64v5nqgaq7sw597zv1fkd3a6x69hlva") + (mozilla-patch "icecat-bug-1488295.patch" "12ba39f69876" "1piyq44f0xa0a9z2748aqwpaziaxwp61d86gyhalbyag8lcxfb3p") + (mozilla-patch "icecat-bug-1500011.patch" "a0adabeedf26" "0f5wazha3zxzhy2j8f93hx62l9p02b1p40vi07qah3ar67h4ccj9") + (mozilla-patch "icecat-bug-1503082.patch" "19604eb26230" "1wqxgph4z14ijhk2j2m4av5p6gx72d02lzz83q6yy0k065kw8psb") + (mozilla-patch "icecat-bug-1499861.patch" "98737ab09270" "0fyl6wv0jxcxpkfpsff46y93k49n8lrw0k7c1p45g8da015dx27a") + (mozilla-patch "icecat-bug-1504452.patch" "1cf7d80355d5" "19jp4x32vyxam54d1r9fm7jwf6krhhf3xazfqmxb9aw4iwdil7dl") + (mozilla-patch "icecat-bug-1494752.patch" "c264774b8913" "1hxyi131x8jwawrq90cgkph833iv9ixrdrgzl1r978gbzwq10xz2") + (mozilla-patch "icecat-bug-1477773.patch" "ec13fda7c9b0" "0zj7aylgw55g0y7plaafn5gq8jwcsdr1bpdxacs0hq914nm8zy9z") + (mozilla-patch "icecat-bug-1500759.patch" "5e1a9644aeef" "1qimrpgyrd8zkiri7w57j0aymk20y9b34am5w7rvr6qj1lhrbfla") + (mozilla-patch "icecat-bug-1485655.patch" "9055726e2d89" "1pppxr94zqh6zmi2mn1ih21qap09vk5ivbhnwxqr8iszvygjg44g") + (mozilla-patch "icecat-bug-1410214.patch" "9e641345e2ef" "0542xss2jdb8drh4g50cfy32l300x69dyywgx3dqs03vgr3qplxy"))) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From cab70d4c2ae8c92337501b19dd938792447ad5b8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 10 Nov 2018 21:48:26 +0200 Subject: 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(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index f556d19f3c..cbdf070e89 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -364,7 +364,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) @@ -372,7 +372,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") -- cgit v1.2.3 From 5528b8e7885834e80e41fe876b9c501c7d95bc6a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 11 Nov 2018 08:48:18 +0200 Subject: 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(+) (limited to 'gnu') 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) -- cgit v1.2.3 From 01029e20430c54333bdc50d2b6db8fa5f389f331 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 11 Nov 2018 08:55:28 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 28b24e9975967119620e272662b8ffc4a3f783aa Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 11 Nov 2018 08:56:49 +0200 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From 863742856c663aace968f2c84876b4528074dd2c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 09:58:55 +0100 Subject: gnu: librime: Fetch sources from git. * gnu/packages/ibus.scm (librime)[source]: Fetch from git. --- gnu/packages/ibus.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 8ad1e09856..3abdd4fab0 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -295,12 +295,13 @@ Japanese language input in most graphical applications.") (version "1.3.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/rime/" name - "/archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/rime/librime.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "0qh0hy8bvj17bnzaxk0bmv4gsnbsd6jx8csr84936xmhkrysdday")))) + (base32 "1y0h3nnz97smx9z8h5fzk4c27mvrwv8kajxffqc43bhyvxvb2jd6")))) (build-system cmake-build-system) (inputs `(("boost" ,boost) -- cgit v1.2.3 From 487e3f5a807581c5b1558590e3f54cd06b7214d7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 09:59:28 +0100 Subject: gnu: ibus-rime: Fetch sources from git. * gnu/packages/ibus.scm (ibus-rime)[source]: Fetch from git. --- gnu/packages/ibus.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 3abdd4fab0..a2687ac8c3 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -602,12 +602,13 @@ Method Engine.") (version "1.3.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/rime/" name - "/archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/rime/ibus-rime.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "0mfbz0vwky7n4wvxrwabnn1i9n9adnql0dd1rx57w1anaslr5amj")))) + (base32 "1nqi7ymv34a9kx24say3xj98lkrs9nkpv1n2ijb91wdz3cr012ly")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests -- cgit v1.2.3 From 1410e178bb66479de1ae859b03f8a00be6ddfdd3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 10:02:40 +0100 Subject: gnu: pianobar: Fetch sources from git. * gnu/packages/music.scm (pianobar)[source]: Fetch from git. --- gnu/packages/music.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index c405ea8511..be988b107a 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2443,13 +2443,14 @@ tune-in sender list from @url{http://opml.radiotime.com}.") (name "pianobar") (version "2016.06.02") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/PromyLOPh/" - name "/archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/PromyLOPh/pianobar.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1hi5rr6jcr0kwf4xfz007ndwkjkp287lhwlsgfz6iryqa5n6jzcp")))) + "058fbdxp7n35hxwy3b8slfy4pb4n63cb173vfmywqa06wh1dv6f6")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests -- cgit v1.2.3 From f626b7192394b96b012d5872cc623ef6adbb8981 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 10:05:56 +0100 Subject: gnu: mdbtools: Remove custom bootstrap phase. * gnu/packages/databases.scm (mdbtools)[arguments]: Remove. --- gnu/packages/databases.scm | 6 ------ 1 file changed, 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index dc7e2aa53d..aacf5465c1 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2088,12 +2088,6 @@ for ODBC.") ("pkg-config" ,pkg-config) ("txt2man" ,txt2man) ("which" ,which))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'autoreconf - (lambda _ - (zero? (system* "autoreconf" "-vfi"))))))) (home-page "http://mdbtools.sourceforge.net/") (synopsis "Read Microsoft Access databases") (description "MDB Tools is a set of tools and applications to read the -- cgit v1.2.3 From f1f1cebdd3f2ca18d77e8f8a1f5760a65e7137fb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 10:09:54 +0100 Subject: gnu: mdbtools: Fetch sources from git. * gnu/packages/databases.scm (mdbtools)[source]: Fetch from git. --- gnu/packages/databases.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index aacf5465c1..46bd728b1b 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2071,13 +2071,14 @@ for ODBC.") (version "0.7.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/brianb/mdbtools/archive/" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/brianb/mdbtools.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "05hbmxcq173kzb899gdi3bz2qcc1vi3n1qbbkwpsvrq7ggf11wyw")) - (file-name (string-append name "-" version ".tar.gz")))) + "0gwcpp9y09xhs21g7my2fs8ncb8i6ahlyixcx8jd3q97jbzj441l")))) (build-system gnu-build-system) (inputs `(("glib" ,glib))) -- cgit v1.2.3 From c92d056a8b83aa51c2223cc3d840e3d9775e64b7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 11 Nov 2018 09:36:17 +0200 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From 5ac2b2717f8d4b05c39c5717843d40bb1a493364 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 11 Nov 2018 10:29:56 +0200 Subject: 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 (limited to 'gnu') 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") -- cgit v1.2.3 From 95176544d54cbc8c7c2bacd96e19b4a1411afbff Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 11 Nov 2018 10:41:32 +0200 Subject: 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 - .../patches/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 (limited to 'gnu') 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") -- cgit v1.2.3 From 8189ce6f05ebc49fc85934bdd1c81f8d43496a93 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 11 Nov 2018 11:07:21 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 261e4214592709d5e4be1c8a7abdd92e9b1d253c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 11 Nov 2018 11:12:37 +0200 Subject: 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(-) (limited to 'gnu') 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") -- cgit v1.2.3 From a49b5322c56cd5b7778a8c8ffea95f9c28339cc7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 10:16:43 +0100 Subject: gnu: lxsession: Remove custom bootstrap phase. * gnu/packages/lxde.scm (lxsession)[arguments]: Remove autoreconf phase and end rm-stamp phase with #T. --- gnu/packages/lxde.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index c45beb8bbb..1f32ec3bb1 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ison111 ;;; Copyright © 2018 Ludovic Courtès +;;; Copyright © 2018 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -419,10 +420,10 @@ in LXDE.") (modify-phases %standard-phases (add-after 'unpack 'rm-stamp (lambda _ - (for-each delete-file (find-files "." "\\.stamp$")))) - (add-after 'rm-stamp 'autoreconf - (lambda _ - (zero? (system* "autoreconf" "-vfi"))))))) + (for-each delete-file (find-files "." "\\.stamp$")) + ;; Force regeneration of configure script. + (delete-file "configure") + #t))))) (inputs `(("gtk+-2" ,gtk+-2) ("polkit" ,polkit))) -- cgit v1.2.3 From 974056c05e3515deb9cf616c2a4d1265a0d55f17 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 10:20:36 +0100 Subject: gnu: opendht: Fetch sources from git. * gnu/packages/crypto.scm (opendht)[source]: Fetch from git. --- gnu/packages/crypto.scm | 47 ++++++++++++++++++++++------------------------- 1 file changed, 22 insertions(+), 25 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 29d9a3d6ab..393d8f84b9 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 David Thompson -;;; Copyright © 2015, 2017 Ricardo Wurmus +;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus ;;; Copyright © 2016, 2017, 2018 Leo Famulari ;;; Copyright © 2016 Lukas Gradl ;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice @@ -164,34 +164,31 @@ OpenBSD tool of the same name.") "See base64.c in the distribution for the license from IBM."))))) - (define-public opendht (package (name "opendht") (version "0.6.1") - (source - (origin - (method url-fetch) - (uri - (string-append - "https://github.com/savoirfairelinux/" name - "/archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (modules '((guix build utils))) - (snippet - '(begin - (delete-file-recursively "src/argon2") - (substitute* "src/Makefile.am" - (("./argon2/libargon2.la") "") - (("SUBDIRS = argon2") "")) - (substitute* "src/crypto.cpp" - (("argon2/argon2.h") "argon2.h")) - (substitute* "configure.ac" - (("src/argon2/Makefile") "")) - #t)) - (sha256 - (base32 - "09yvkmbqbym3b5md4n96qc1s9sf2n8ji404hagih45rmsj49599x")))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/savoirfairelinux/opendht.git") + (commit version))) + (file-name (git-file-name name version)) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "src/argon2") + (substitute* "src/Makefile.am" + (("./argon2/libargon2.la") "") + (("SUBDIRS = argon2") "")) + (substitute* "src/crypto.cpp" + (("argon2/argon2.h") "argon2.h")) + (substitute* "configure.ac" + (("src/argon2/Makefile") "")) + #t)) + (sha256 + (base32 + "1akk613f18rc8kqs0cxdm34iq7wwc9kffhgp5rng09arwlw8gw3w")))) (build-system gnu-build-system) (inputs `(("gnutls" ,gnutls) -- cgit v1.2.3 From 5ad728e04c652d157039128ac7fc510a8530076c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 10:21:02 +0100 Subject: gnu: opendht: Remove custom bootstrap phase. * gnu/packages/crypto.scm (opendht)[arguments]: Remove autoconf phase. --- gnu/packages/crypto.scm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 393d8f84b9..e8062f0e1f 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -203,11 +203,7 @@ OpenBSD tool of the same name.") ("automake" ,automake) ("libtool" ,libtool))) (arguments - `(#:configure-flags '("--disable-tools" "--disable-python") - #:phases (modify-phases %standard-phases - (add-after 'unpack 'autoconf - (lambda _ - (zero? (system* "autoreconf" "-vfi"))))))) + `(#:configure-flags '("--disable-tools" "--disable-python"))) (home-page "https://github.com/savoirfairelinux/opendht/") (synopsis "Distributed Hash Table (DHT) library") (description "OpenDHT is a Distributed Hash Table (DHT) library. It may -- cgit v1.2.3 From 34da5c394bb8aedb9a054d4738dc8d471f8b77cd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 10:22:45 +0100 Subject: gnu: guile-dsv: Remove custom bootstrap phase. * gnu/packages/guile.scm (guile-dsv)[arguments]: Remove autoreconf phase. --- gnu/packages/guile.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 6ae0fe2e77..cbdd5b1e0f 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -1573,10 +1573,7 @@ $(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)\n")) (("^guilesitedir =.*$") "guilesitedir = \ $(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)\n")) - #t)) - (add-after 'unpack 'autoreconf - (lambda _ - (zero? (system* "autoreconf" "-vfi"))))))) + #t))))) (home-page "https://github.com/artyom-poptsov/guile-dsv") (synopsis "DSV module for Guile") (description -- cgit v1.2.3 From 2cabd29323382d72cc3bc5f21a81c293df84ea3f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 10:38:00 +0100 Subject: gnu: guildhall: Remove custom bootstrap phase. * gnu/packages/guile.scm (guildhall)[arguments]: Remove autogen phase. --- gnu/packages/guile.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index cbdd5b1e0f..c41c27466b 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -517,10 +517,7 @@ AM_SCM_LOG_FLAGS = --no-auto-compile -s") ;; FIXME: one of the database tests fails for unknown ;; reasons. It does not fail when run outside of Guix. (("tests/database.scm") "")) - #t)) - (add-after 'fix-bug-22 'autogen - (lambda _ - (zero? (system* "sh" "autogen.sh"))))))) + #t))))) (inputs `(("guile" ,guile-2.0))) (native-inputs -- cgit v1.2.3 From 22d04ceda000b16881071094e4a1c8cddbe09dfb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 11 Nov 2018 11:47:57 +0200 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From 2bdca673517c566d55f5f3a540160b22fc51039e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 11 Nov 2018 11:53:15 +0200 Subject: 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(-) (limited to 'gnu') 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") -- cgit v1.2.3 From d212ed2f00e6639c95b4185685617285c8cafdfd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 11:21:55 +0100 Subject: gnu: lrdf: Fetch sources from git. * gnu/packages/rdf.scm (lrdf)[source]: Fetch from git. --- gnu/packages/rdf.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm index 48dc3cddb9..e48a4fb08c 100644 --- a/gnu/packages/rdf.scm +++ b/gnu/packages/rdf.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015 Andreas Enge -;;; Copyright © 2015, 2016 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2018 Ricardo Wurmus ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -22,6 +22,7 @@ #:use-module ((guix licenses) #:select (non-copyleft isc gpl2 lgpl2.1 lgpl2.1+)) #:use-module (guix packages) + #:use-module (guix git-download) #:use-module (guix download) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) @@ -122,13 +123,14 @@ Java Lucene text search engine API to C++.") (name "lrdf") (version "0.6.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/swh/LRDF/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/swh/LRDF.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1vxii4mlcpyi16dizcmnqfl2j9gffgr986yd8ic67hvs8xy42yfm")))) + "00wzkfb8y0aqd519ypz067cq099dpc89w69zw8ln39vl6f9x2pd4")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From a69cc70deaa641baa50d580fb1315a69615cc381 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 11:22:22 +0100 Subject: gnu: lrdf: Replace bootstrap phase. * gnu/packages/rdf.scm (lrdf)[arguments]: Remove autoreconf phase; replace bootstrap phase instead. --- gnu/packages/rdf.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm index e48a4fb08c..22ea21dd94 100644 --- a/gnu/packages/rdf.scm +++ b/gnu/packages/rdf.scm @@ -142,9 +142,9 @@ Java Lucene text search engine API to C++.") (("instances_test remove_test") "instances_test") (("\\$\\(TESTS\\) remove_test") "$(TESTS)")) #t)) - (add-after 'remove-out-of-tree-references 'autoreconf - (lambda _ - (zero? (system* "autoreconf" "-vfi"))))))) + ;; The default bootstrap phase executes autogen.sh, which fails. + (replace 'bootstrap + (lambda _ (invoke "autoreconf" "-vif") #t))))) (inputs `(("raptor" ,raptor2) ("cyrus-sasl" ,cyrus-sasl) -- cgit v1.2.3 From 4cd6ab1b1f6808b9146105a81a2b28620939aa44 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 11:23:39 +0100 Subject: gnu: libjaylink: Remove custom bootstrap phase. * gnu/packages/embedded.scm (libjaylink)[arguments]: Remove. --- gnu/packages/embedded.scm | 6 ------ 1 file changed, 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 38c76cd737..ddf3c340ab 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -321,12 +321,6 @@ languages are C and C++.") ("pkg-config" ,pkg-config))) (inputs `(("libusb" ,libusb))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'autoreconf - (lambda _ - (zero? (system* "autoreconf" "-vfi"))))))) (home-page "http://repo.or.cz/w/libjaylink.git") (synopsis "Library to interface Segger J-Link devices") (description "libjaylink is a shared library written in C to access -- cgit v1.2.3 From 867d9de690c77b232af843106779523fe5d370cc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 11:32:12 +0100 Subject: gnu: openocd: Use INVOKE. * gnu/packages/embedded.scm (openocd)[arguments]: Use INVOKE and return #T unconditionally. --- gnu/packages/embedded.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index ddf3c340ab..f20d1e17c7 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -398,9 +398,9 @@ language.") "presto" "openjtag"))) #:phases (modify-phases %standard-phases + ;; Required because of patched sources. (add-before 'configure 'autoreconf - (lambda _ - (zero? (system* "autoreconf" "-vfi")))) + (lambda _ (invoke "autoreconf" "-vfi") #t)) (add-after 'autoreconf 'change-udev-group (lambda _ (substitute* "contrib/60-openocd.rules" @@ -411,7 +411,8 @@ language.") (install-file "contrib/60-openocd.rules" (string-append (assoc-ref outputs "out") - "/lib/udev/rules.d/"))))))) + "/lib/udev/rules.d/")) + #t))))) (home-page "http://openocd.org") (synopsis "On-Chip Debugger") (description "OpenOCD provides on-chip programming and debugging support -- cgit v1.2.3 From fab455840ea883237d2715bde313e07558f4bfba Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 11:33:39 +0100 Subject: gnu: libtoxcore: Remove custom bootstrap phase. * gnu/packages/messaging.scm (libtoxcore)[arguments]: Remove autoconf phase. --- gnu/packages/messaging.scm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index de33d737e2..1a7560bd72 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -855,13 +855,7 @@ protocols.") `(("libsodium" ,libsodium) ("opus" ,opus) ("libvpx" ,libvpx))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'autoconf - (lambda _ - (zero? (system* "autoreconf" "-vfi"))))) - #:tests? #f)) ; FIXME: Testsuite fails, reasons unspecific. + (arguments `(#:tests? #f)) ; FIXME: Testsuite fails, reasons unspecific. (synopsis "Library for the Tox encrypted messenger protocol") (description "C library implementation of the Tox encrypted messenger protocol.") -- cgit v1.2.3 From d68a15806b26ee23bf83c92ed29d2d4b1024b919 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 11:34:55 +0100 Subject: gnu: libgtextutils: Remove custom bootstrap phase. * gnu/packages/textutils.scm (libgtextutils)[arguments]: Remove. --- gnu/packages/textutils.scm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 1d498b5a75..d4e306483e 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer -;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus ;;; Copyright © 2015, 2016 Ben Woodcroft ;;; Copyright © 2015 Roel Janssen ;;; Copyright © 2016 Jelle Licht @@ -198,11 +198,6 @@ encoding, supporting Unicode version 9.0.0.") (sha256 (base32 "0jiybkb2z58wa2msvllnphr4js2hvjvh988pavb3mzkgr6ihwbkr")))) (build-system gnu-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'autoreconf - (lambda _ (zero? (system* "autoreconf" "-vif"))))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- cgit v1.2.3 From 7a52d0e075baebe2c04331b82d5974f2db9bf9f0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 11:36:39 +0100 Subject: gnu: dotconf: Remove custom bootstrap phase. * gnu/packages/textutils.scm (dotconf)[arguments]: Remove autoreconf phase. --- gnu/packages/textutils.scm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index d4e306483e..c814e988b1 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -577,13 +577,7 @@ categories.") (base32 "0lsnh0yaw44psmx59hq94cj1932gscp5h8d3cnh05l0svr0cy7kz")))) (build-system gnu-build-system) - (arguments - `(#:tests? #f ; FIXME maketest.sh does not work. - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'autoreconf - (lambda _ - (zero? (system* "autoreconf" "-vif"))))))) + (arguments `(#:tests? #f)) ; FIXME maketest.sh does not work. (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- cgit v1.2.3 From 08bc7f26653a407ccd7f07c07a81a538e9f44313 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 11:37:01 +0100 Subject: gnu: dotconf: Fetch sources from git. * gnu/packages/textutils.scm (dotconf)[source]: Fetch from git. --- gnu/packages/textutils.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index c814e988b1..e9a4ab3d68 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -568,14 +568,14 @@ categories.") (name "dotconf") (version "1.3") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/williamh/dotconf/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/williamh/dotconf.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0lsnh0yaw44psmx59hq94cj1932gscp5h8d3cnh05l0svr0cy7kz")))) + "1sc95hw5k2xagpafny0v35filmcn05k1ds5ghkldfpf6xw4hakp7")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; FIXME maketest.sh does not work. (native-inputs -- cgit v1.2.3 From caa39e56f7d10f00893b00279e28c9c834a9a53f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 11:44:24 +0100 Subject: gnu: milkytracker: Fetch sources from git. * gnu/packages/music.scm (milkytracker)[source]: Fetch from git. --- gnu/packages/music.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index be988b107a..479b9e40ff 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2731,14 +2731,14 @@ of tools for manipulating and accessing your music.") (name "milkytracker") (version "1.02.00") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/milkytracker/" - "MilkyTracker/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/milkytracker/MilkyTracker.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "08v0l4ipvvwkwv4ywkc6c8a6xnpkyb02anj36w8q6gikxrs6xjvb")) + "05a6d7l98k9i82dwrgi855dnccm3f2lkb144gi244vhk1156n0ca")) (modules '((guix build utils))) ;; Remove non-FSDG compliant sample songs. (snippet -- cgit v1.2.3 From 3a0592ae314184b44ea96cb10ff57710cca10af1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 12:00:55 +0100 Subject: gnu: lmms: Fetch sources from git. * gnu/packages/music.scm (lmms)[source]: Fetch from git. --- gnu/packages/music.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 479b9e40ff..af24c96600 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3532,13 +3532,14 @@ are a C compiler and glib. Full API documentation and examples are included.") (version "1.1.3") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/LMMS/lmms/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/LMMS/lmms.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1g76z7ha3hd53vbqaq9n1qg6s3lw8zzaw51iny6y2bz0j1xqwcsr")))) + "03hhymc6d73fa3wbcqb7rm1l03zkw605k5i9kvkvjmv488bqh3pd")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; no tests -- cgit v1.2.3 From 234a1825b20ebee516cbd23af1dbcb07be7f2be8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 12:01:25 +0100 Subject: gnu: clyrics: Fetch sources from git. * gnu/packages/music.scm (clyrics)[source]: Fetch from git. [native-inputs]: Remove. [arguments]: Adjust builder. --- gnu/packages/music.scm | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index af24c96600..012d67ae67 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4156,17 +4156,15 @@ at @code{musicbrainz.org}.") (version "0.10") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/trizen/clyrics/archive/" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/trizen/clyrics.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1l0cg26afnjv8cgk0jbiavbyvq55q1djyigzmi526rpcjjwq9jwn")) - (file-name (string-append name "-" version ".tar.gz")))) + "1qvj4dyipkkdccx5hci4z0q23i54ldk6hh7x5m35a7f70rrj6fbk")))) (build-system trivial-build-system) - (native-inputs `(("tar" ,tar) - ("gzip" ,gzip))) (inputs `(("bash" ,bash) ;for the wrapped program ("perl" ,perl) @@ -4183,17 +4181,12 @@ at @code{musicbrainz.org}.") (ice-9 match) (srfi srfi-26)) (let* ((source (assoc-ref %build-inputs "source")) - (tar (assoc-ref %build-inputs "tar")) - (gzip (assoc-ref %build-inputs "gzip")) (output (assoc-ref %outputs "out"))) (setenv "PATH" (string-append - (assoc-ref %build-inputs "gzip") "/bin" ":" (assoc-ref %build-inputs "bash") "/bin" ":" (assoc-ref %build-inputs "perl") "/bin" ":")) - (invoke (string-append tar "/bin/tar") "xvf" - source) - (chdir ,(string-append "clyrics-" version)) + (copy-recursively source (getcwd)) (patch-shebang "clyrics") (substitute* "clyrics" (("/usr/share") output)) -- cgit v1.2.3 From 3b9e9415faec1566dc989493030a76fc382e0a41 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 12:07:21 +0100 Subject: gnu: schismtracker: Fetch sources from git. * gnu/packages/music.scm (schismtracker)[source]: Fetch from git. --- gnu/packages/music.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 012d67ae67..3b7fd54f31 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2773,14 +2773,14 @@ for improved Amiga ProTracker 2/3 compatibility.") (name "schismtracker") (version "20180513") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/" name "/" name "/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/schismtracker/schismtracker.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1yjfd02arb51n0vyv11qgpn6imh7hcqnc3953cbvgwb4cnrswk9f")) + "0fayix1zbl96zhkfszgj71qr25dnddgy9hr6149nslww4gl7jk36")) (modules '((guix build utils))) (snippet ;; Remove use of __DATE__ and __TIME__ for reproducibility. -- cgit v1.2.3 From 88659738487e553447f66177b2df722db0e84ff9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 12:15:03 +0100 Subject: gnu: lilypond: Use INVOKE. * gnu/packages/music.scm (lilypond)[arguments]: Use INVOKE and return #T unconditionally. --- gnu/packages/music.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 3b7fd54f31..7474dac74b 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -886,9 +886,10 @@ Sega Master System/Mark III, Sega Genesis/Mega Drive, BBC Micro #t)) (add-after 'install 'install-info (lambda _ - (zero? (system* "make" - "-j" (number->string (parallel-job-count)) - "conf=www" "install-info"))))))) + (invoke "make" + "-j" (number->string (parallel-job-count)) + "conf=www" "install-info") + #t))))) (inputs `(("guile" ,guile-1.8) ("font-dejavu" ,font-dejavu) -- cgit v1.2.3 From cbb6a15056bd90c3fa9d03a50a347ac148ab64d9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 12:19:23 +0100 Subject: gnu: schismtracker: Remove custom bootstrap phase. * gnu/packages/music.scm (schismtracker)[arguments]: Remove autoconf phase. --- gnu/packages/music.scm | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 7474dac74b..b789d67f7f 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2794,8 +2794,6 @@ for improved Amiga ProTracker 2/3 compatibility.") (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'autoconf - (lambda _ (invoke "autoreconf" "-vfi"))) (add-before 'configure 'link-libm (lambda _ (setenv "LIBS" "-lm") #t))))) (native-inputs -- cgit v1.2.3 From 2fef54fd64495148e0c546ef4ecaacf9503e62db Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 12:27:01 +0100 Subject: gnu: hpcguix-web: Do not re-bootstrap. * gnu/packages/web.scm (hpcguix-web)[arguments]: Do not run autoreconf after the bootstrap phase; remove "autoconf" phase to "set-variables"; end phase with #T. --- gnu/packages/web.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index b0ab4add8d..03deab422d 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6761,14 +6761,14 @@ compressed JSON header blocks. (srfi srfi-26) (ice-9 popen) (ice-9 rdelim)) - #:phases (modify-phases %standard-phases - (add-before 'configure 'autoconf + (add-before 'configure 'set-variables (lambda _ + ;; This prevents a few warnings (setenv "GUILE_AUTO_COMPILE" "0") (setenv "XDG_CACHE_HOME" (getcwd)) - (invoke "autoreconf" "-vif"))) + #t)) (add-after 'install 'wrap-program (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From 5cdbdc2b138b0dd6237f9116af894b9d7dbf429b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 12:31:18 +0100 Subject: gnu: par2cmdline: Fetch sources from git. * gnu/packages/backup.scm (par2cmdline)[source]: Fetch from git. --- gnu/packages/backup.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 52afcbc676..b81d790642 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2018 Mark H Weaver ;;; Copyright © 2018 Oleg Pykhalov +;;; Copyright © 2018 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,6 +31,7 @@ (define-module (gnu packages backup) #:use-module (guix packages) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix git-download) #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system gnu) @@ -132,13 +134,14 @@ spying and/or modification by the server.") (name "par2cmdline") (version "0.8.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/Parchive/par2cmdline/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/Parchive/par2cmdline.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1jpshmmcr81mxly0md2rr231qz9c8c680bbvcmhh100dg9i4a6s6")))) + "0f1jsd5sw2wynjzi7yjqjaf13yhyjfdid91p8yh0jn32y03kjyrz")))) (native-inputs `(("automake" ,automake) ("autoconf" ,autoconf))) -- cgit v1.2.3 From 2286107f60e403c8d2f41cc4ba66ed89d14ab762 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 12:31:35 +0100 Subject: gnu: par2cmdline: Remove custom bootstrap phase. * gnu/packages/backup.scm (par2cmdline)[arguments]: Remove. --- gnu/packages/backup.scm | 5 ----- 1 file changed, 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index b81d790642..ab95aea727 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -146,11 +146,6 @@ spying and/or modification by the server.") `(("automake" ,automake) ("autoconf" ,autoconf))) (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'autoreconf - (lambda _ (invoke "autoreconf" "-vfi")))))) (synopsis "File verification and repair tools") (description "Par2cmdline uses Reed-Solomon error-correcting codes to generate and verify PAR2 recovery files. These files can be distributed -- cgit v1.2.3 From 88f9fea72395ea7c00ce4070c1e55f6a82aa7357 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 12:36:15 +0100 Subject: gnu: inotify-tools: Fetch sources from git. * gnu/packages/linux.scm (inotify-tools)[source]: Fetch from git. --- gnu/packages/linux.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b1dd5adc88..9833ff543d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1967,14 +1967,14 @@ for systems using the Linux kernel. This includes commands such as (name "inotify-tools") (version "3.20.1") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/rvoicilas/inotify-tools/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/rvoicilas/inotify-tools.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1b22c8x4pjnz3abx4dikpbj43zprjw79pdkd4xw111dsxlfwqcx4")))) + "14dci1i4mhsd5sa33k8h3ayphk19kizynh5ql9ryibdpmcanfiyq")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 4078beab938d5043098d42cd051a6db1e85c5d2b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 12:36:35 +0100 Subject: gnu: inotify-tools: Remove custom bootstrap phase. * gnu/packages/linux.scm (inotify-tools)[arguments]: Remove. --- gnu/packages/linux.scm | 5 ----- 1 file changed, 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9833ff543d..6b7aa89931 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1976,11 +1976,6 @@ for systems using the Linux kernel. This includes commands such as (base32 "14dci1i4mhsd5sa33k8h3ayphk19kizynh5ql9ryibdpmcanfiyq")))) (build-system gnu-build-system) - (arguments - `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'bootstrap - (lambda _ - (invoke "autoreconf" "-vif")))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- cgit v1.2.3 From 34789459484993becfef3c4996b76709dcedb164 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 12:45:52 +0100 Subject: gnu: minizip: Remove custom bootstrap phase. * gnu/packages/compression.scm (minizip)[arguments]: Remove autoreconf phase. --- gnu/packages/compression.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 464402ec6c..2beda19a10 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -124,10 +124,7 @@ in compression.") `(#:phases (modify-phases %standard-phases (add-after 'unpack 'enter-source - (lambda _ (chdir "contrib/minizip") #t)) - (add-after 'enter-source 'autoreconf - (lambda _ - (invoke "autoreconf" "-vif")))))) + (lambda _ (chdir "contrib/minizip") #t))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- cgit v1.2.3 From 112fcafbae40cbae66b55eac02119799051fc354 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 12:47:51 +0100 Subject: gnu: libtar: Remove custom bootstrap phase. * gnu/packages/compression.scm (libtar)[arguments]: Remove autoconf phase. --- gnu/packages/compression.scm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 2beda19a10..f831535578 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -176,12 +176,7 @@ utility. Instead of being written in Java, FastJar is written in C.") "02cihzl77ia0dcz7z2cga2412vyhhs5pa2355q4wpwbyga2lrwjh")) (patches (search-patches "libtar-CVE-2013-4420.patch")))) (build-system gnu-build-system) - (arguments - `(#:tests? #f ;no "check" target - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'autoconf - (lambda _ (invoke "sh" "autoreconf" "-vfi")))))) + (arguments `(#:tests? #f)) ; no "check" target (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- cgit v1.2.3 From 0633c77b1bea9ca671dc1e6495bd1835b99e18fb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 12:52:30 +0100 Subject: gnu: xdelta: Fetch sources from git. * gnu/packages/compression.scm (xdelta)[source]: Fetch from git. --- gnu/packages/compression.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index f831535578..3fd219e5f4 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1047,13 +1047,14 @@ smaller than those produced by @code{Xdelta}.") (version "3.1.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/jmacd/xdelta/archive/v" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/jmacd/xdelta.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "17g2pbbqy6h20qgdjq7ykib7kg5ajh8fwbsfgyjqg8pwg19wy5bm")) - (file-name (string-append name "-" version ".tar.gz")) + "09mmsalc7dwlvgrda56s2k927rpl3a5dzfa88aslkqcjnr790wjy")) (snippet ;; This file isn't freely distributable and has no effect on building. '(begin -- cgit v1.2.3 From e5ff963a6d89e4c4902e1f5ffeef2319b05d5d57 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 12:52:46 +0100 Subject: gnu: xdelta: Remove custom bootstrap phase. * gnu/packages/compression.scm (xdelta)[arguments]: Remove autoconf phase. --- gnu/packages/compression.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 3fd219e5f4..9c94ff09cd 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1068,9 +1068,7 @@ smaller than those produced by @code{Xdelta}.") `(#:phases (modify-phases %standard-phases (add-after 'unpack 'enter-build-directory - (lambda _ (chdir "xdelta3") #t)) - (add-after 'enter-build-directory 'autoconf - (lambda _ (invoke "autoreconf" "-vfi")))))) + (lambda _ (chdir "xdelta3") #t))))) (home-page "http://xdelta.org") (synopsis "Delta encoder for binary files") (description "xdelta encodes only the differences between two binary files -- cgit v1.2.3 From bc74e9e4cd409ec31a227ad3c6ddd1c45a3e5d36 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 12:56:22 +0100 Subject: gnu: scsh: Remove custom bootstrap phase. * gnu/packages/shells.scm (scsh)[arguments]: Remove autoreconf phase. --- gnu/packages/shells.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 3e9d797e2c..38eeaa7831 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015 Jeff Mickey ;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2016 Stefan Reichör -;;; Copyright © 2017 Ricardo Wurmus +;;; Copyright © 2017, 2018 Ricardo Wurmus ;;; Copyright © 2017, 2018 Nils Gillmann ;;; Copyright © 2017, 2018 Leo Famulari ;;; Copyright © 2017 Arun Isaac @@ -414,10 +414,7 @@ use of experts and novices alike.") "/rx"))) (delete-file-recursively "rx") (symlink rxpath "rx")) - #t)) - (add-after 'unpack 'autoreconf - (lambda _ - (invoke "autoreconf")))))) + #t))))) (inputs `(("scheme48" ,scheme48) ("scheme48-rx" ,scheme48-rx))) -- cgit v1.2.3 From 2b2ab39cfc694e3c0cb37c0136bb606b20d41661 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 13:00:35 +0100 Subject: gnu: libharu: Fetch sources from git. * gnu/packages/pdf.scm (libharu)[source]: Fetch from git. --- gnu/packages/pdf.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 1d37de70d7..1ecd49215b 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -223,15 +223,16 @@ Poppler PDF rendering library.") (name "libharu") (version "2.3.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/libharu/libharu/archive/" - "RELEASE_" - (string-join (string-split version #\.) "_") - ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/libharu/libharu.git") + (commit (string-append + "RELEASE_" + (string-join (string-split version #\.) "_"))))) + (file-name (git-file-name name version)) (sha256 (base32 - "1lm4v539y9cb1lvbq387j57sy7yxda3yv8b1pk8m6zazbp66i7lg")))) + "15s9hswnl3qqi7yh29jyrg0hma2n99haxznvcywmsp8kjqlyg75q")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 6f3dd09f8d5e2bd16bd26891d71829f4dd19f772 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 13:00:53 +0100 Subject: gnu: libharu: Remove custom bootstrap phase. * gnu/packages/pdf.scm (libharu)[arguments]: Remove autogen phase. --- gnu/packages/pdf.scm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 1ecd49215b..dc966b64d8 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -239,11 +239,7 @@ Poppler PDF rendering library.") (list (string-append "--with-zlib=" (assoc-ref %build-inputs "zlib")) (string-append "--with-png=" - (assoc-ref %build-inputs "libpng"))) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'autogen - (lambda _ (invoke "autoreconf" "-vif")))))) + (assoc-ref %build-inputs "libpng"))))) (inputs `(("zlib" ,zlib) ("libpng" ,libpng))) -- cgit v1.2.3 From 5a103bb84ecc1ddc221bdcdba4f3cdf79117a2f0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 13:04:08 +0100 Subject: gnu: libiax2: Remove custom bootstrap phase. * gnu/packages/telephony.scm (libiax2)[arguments]: Remove. --- gnu/packages/telephony.scm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 05916cde5c..15c07beed9 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016 Lukas Gradl ;;; Copyright © 2016 Francesco Frassinelli ;;; Copyright © 2016, 2017 Nils Gillmann -;;; Copyright © 2017 Ricardo Wurmus +;;; Copyright © 2017, 2018 Ricardo Wurmus ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Jovany Leandro G.C ;;; @@ -310,11 +310,6 @@ protocol (RFC 3550).") `(("autoconf" ,autoconf) ("automake" ,automake) ("libtool" ,libtool))) - (arguments - `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'autoconf - (lambda _ - (invoke "autoreconf" "-vfi")))))) (home-page "https://gitlab.savoirfairelinux.com/sflphone/libiax2") (synopsis "Inter-Asterisk-Protocol library") (description "LibIAX2 implements the Inter-Asterisk-Protocol for relaying -- cgit v1.2.3 From cd1f661e827dd6fd5b05f8219a61aa466069a5a5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 13:06:31 +0100 Subject: gnu: libiax2: Fetch sources from git. * gnu/packages/telephony.scm (libiax2)[source]: Fetch from git. --- gnu/packages/telephony.scm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 15c07beed9..63709935c3 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -295,16 +295,14 @@ protocol (RFC 3550).") (version (string-append "0.0.0-1." (string-take commit 7))) (source (origin - (method url-fetch) - (uri - (string-append - "https://gitlab.savoirfairelinux.com/sflphone/libiax2/" - "repository/archive.tar.gz?ref=" - commit)) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.savoirfairelinux.com/sflphone/libiax2.git") + (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 - "0cj5293bixp3k5x3hjwyd0iq7z8w5p7yavxvvkqk5817hjq386y2")))) + "0d269474kk1933c55hx4azw3sak5ycfrxkw6ida0sb2cm00kfich")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From 2b61cd37b44400c881ec2dc20202f3505ef1d25b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 13:08:56 +0100 Subject: gnu: cifs-utils: Remove autoreconf phase. * gnu/packages/samba.scm (cifs-utils)[arguments]: Remove autoreconf phase. --- gnu/packages/samba.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 458ff50ae8..ff237c96ce 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017, 2018 Marius Bakke ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -73,10 +74,6 @@ (arguments `(#:phases (modify-phases %standard-phases - ;; The 6.7 tarball is missing ‘install.sh’. Create it. - (add-after 'unpack 'autoreconf - (lambda _ - (invoke "autoreconf" "-i"))) (add-before 'configure 'set-root-sbin (lambda _ ; Don't try to install in "/sbin". (setenv "ROOTSBINDIR" -- cgit v1.2.3 From 9066424778d2b7b7b73968a91e64ce2b53a163fe Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 13:10:56 +0100 Subject: gnu: privoxy: Remove custom bootstrap phase. * gnu/packages/tor.scm (privoxy)[arguments]: Remove autoconf phase. --- gnu/packages/tor.scm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index 61b0c82e30..e28a6d4f48 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Eric Bavier ;;; Copyright © 2017 Rutger Helling +;;; Copyright © 2018 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -140,14 +141,6 @@ rejects UDP traffic from the application you're using.") #:configure-flags (list (string-append "--sysconfdir=" (assoc-ref %outputs "out") "/etc/privoxy")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'autoconf - (lambda _ - ;; Unfortunately, this is not a tarball produced by - ;; "make dist". - (invoke "autoreconf" "-vfi") - #t))) #:tests? #f)) (inputs `(("w3m" ,w3m) -- cgit v1.2.3 From 902068b43664b862dfcbb9172f41778d576e3ae0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 13:18:27 +0100 Subject: gnu: tiled: Fetch sources from git. * gnu/packages/game-development.scm (tiled)[source]: Fetch from git. --- gnu/packages/game-development.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index da1675820b..1f73025db7 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -399,13 +399,14 @@ support.") (name "tiled") (version "1.2.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/bjorn/tiled/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/bjorn/tiled.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "13dlf5kzvhhjkhy19118x3diakmraz4m9kxrsdam8dms6xivb6lp")))) + "1rra48hlkcgqxwxi802fb182p1q0723c9hhfvkd5inz9467idd4c")))) (build-system gnu-build-system) (inputs `(("qtbase" ,qtbase) -- cgit v1.2.3 From 4ad3786b7b61073005f024f33465e6b7a4a952ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Lassieur?= Date: Sun, 11 Nov 2018 12:26:44 +0100 Subject: gnu: Add python-precis-i18n. * gnu/packages/messaging.scm (python-precis-i18n): New variable. --- gnu/packages/python.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 5f81c428ff..b6b0ad75a4 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -14611,3 +14611,22 @@ on regular expressions.") (propagated-inputs `(("python2-enum34" ,python2-enum34) ,@(package-propagated-inputs reparser)))))) + +(define-public python-precis-i18n + (package + (name "python-precis-i18n") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "precis_i18n" version)) + (sha256 + (base32 + "0gjhvwd8aifx94rl1ag08vlmndyx2q3fkyqb0c4i46x3p2bc2yi2")))) + (build-system python-build-system) + (home-page "https://github.com/byllyfish/precis_i18n") + (synopsis "Implementation of the PRECIS framework") + (description + "This module implements the PRECIS Framework as described in RFC 8264, +RFC 8265 and RFC 8266.") + (license license:expat))) -- cgit v1.2.3 From a311f42e1bcb71b59e3ce51ee3c8f6148d939168 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Lassieur?= Date: Sun, 11 Nov 2018 12:26:03 +0100 Subject: gnu: python-nbxmpp: Update to 0.6.8. * gnu/packages/messaging.scm (python-nbxmpp): Update to 0.6.8. --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 1a7560bd72..987426794b 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -549,14 +549,14 @@ simultaneously and therefore appear under the same nickname on IRC.") (define-public python-nbxmpp (package (name "python-nbxmpp") - (version "0.6.7") + (version "0.6.8") (source (origin (method url-fetch) (uri (pypi-uri "nbxmpp" version)) (sha256 (base32 - "0fas4iawjfdmkz8vr042wpq6b2qispi6fy35g4a62jw50jb1saav")))) + "1iip8ijxp86fx4bl1h67p2lp02p2zm1ga2p3q43nv30smj54nawc")))) (build-system python-build-system) (arguments `(#:tests? #f)) ; no tests -- cgit v1.2.3 From 992a496503a49ef7977f097a1390f8536b06dee4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Lassieur?= Date: Thu, 8 Nov 2018 10:13:44 +0100 Subject: gnu: gajim: Update to 1.1.0. * gnu/packages/messaging.scm (gajim): Update to 1.1.0. [arguments]: Set #:test-target to "test_nogui". Remove the 'remove-test-resolver' and 'start-xserver' phases. [inputs]: Remove python-pyasn1. Add python-cssutils, python-keyring and python-precis-i18n. --- gnu/packages/messaging.scm | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 987426794b..5f1aa7ce58 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -574,7 +574,7 @@ was initially a fork of xmpppy, but uses non-blocking sockets.") (define-public gajim (package (name "gajim") - (version "1.0.3") + (version "1.1.0") (source (origin (method url-fetch) (uri (string-append "https://gajim.org/downloads/" @@ -582,10 +582,11 @@ was initially a fork of xmpppy, but uses non-blocking sockets.") "/gajim-" version ".tar.bz2")) (sha256 (base32 - "0ds4rqwfrpj89a489w6yih8gx5zi7qa4ffgld950fk7s0qxvcfnb")))) + "1qis8vs7y7g1zn5i5dshwrszidc22qpflycwb4nixvp9lbmkq0va")))) (build-system python-build-system) (arguments - `(#:phases + `(#:test-target "test_nogui" + #:phases (modify-phases %standard-phases (add-after 'install 'wrap-program (lambda* (#:key outputs #:allow-other-keys) @@ -598,20 +599,6 @@ was initially a fork of xmpppy, but uses non-blocking sockets.") `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))) '("gajim" "gajim-remote" "gajim-history-manager"))) #t)) - (add-before 'check 'remove-test-resolver - ;; This test requires network access. - (lambda _ - (substitute* "test/runtests.py" - (("'integration.test_resolver',") "")) - #t)) - (add-before 'check 'start-xserver - ;; Tests require a running X server. - (lambda* (#:key inputs #:allow-other-keys) - (let ((xorg-server (assoc-ref inputs "xorg-server")) - (display ":1")) - (setenv "DISPLAY" display) - (zero? (system (string-append xorg-server "/bin/Xvfb " - display " &")))))) (add-after 'install 'install-icons (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -648,12 +635,14 @@ was initially a fork of xmpppy, but uses non-blocking sockets.") ("hicolor-icon-theme" ,hicolor-icon-theme) ("libsecret" ,libsecret) ("python-axolotl" ,python-axolotl) + ("python-cssutils" ,python-cssutils) ("python-dbus" ,python-dbus) ("python-docutils" ,python-docutils) ("python-gnupg" ,python-gnupg) + ("python-keyring" ,python-keyring) ("python-nbxmpp" ,python-nbxmpp) ("python-pillow" ,python-pillow) - ("python-pyasn1" ,python-pyasn1) + ("python-precis-i18n" ,python-precis-i18n) ("python-pycairo" ,python-pycairo) ("python-pygobject" ,python-pygobject) ("python-pyopenssl" ,python-pyopenssl) -- cgit v1.2.3 From 60c5b4448961ce1745b7f0bfada1e7620f238ea0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Lassieur?= Date: Sun, 11 Nov 2018 15:34:06 +0100 Subject: gnu: gajim: Get the second 'wrap-program' phase to return #t. * gnu/packages/messaging.scm (gajim)[arguments]: Get the second 'wrap-program' phase to return #t. --- gnu/packages/messaging.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 5f1aa7ce58..c276bc03ea 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -623,7 +623,8 @@ was initially a fork of xmpppy, but uses non-blocking sockets.") ;; For GtkFileChooserDialog. `("GSETTINGS_SCHEMA_DIR" = (,(string-append (assoc-ref inputs "gtk+") - "/share/glib-2.0/schemas"))))))))) + "/share/glib-2.0/schemas")))) + #t))))) (native-inputs `(("intltool" ,intltool) ("xorg-server" ,xorg-server))) -- cgit v1.2.3 From 37a350eccee7b36cba779c6a6841448b8deaed72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Lassieur?= Date: Sun, 11 Nov 2018 15:24:00 +0100 Subject: gnu: gajim: Move python-docutils from inputs to native-inputs. * gnu/packages/messaging.scm (gajim): Move python-docutils from inputs to native-inputs. --- gnu/packages/messaging.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index c276bc03ea..9d652486f2 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -627,6 +627,7 @@ was initially a fork of xmpppy, but uses non-blocking sockets.") #t))))) (native-inputs `(("intltool" ,intltool) + ("python-docutils" ,python-docutils) ("xorg-server" ,xorg-server))) (inputs `(("adwaita-icon-theme" ,adwaita-icon-theme) @@ -638,7 +639,6 @@ was initially a fork of xmpppy, but uses non-blocking sockets.") ("python-axolotl" ,python-axolotl) ("python-cssutils" ,python-cssutils) ("python-dbus" ,python-dbus) - ("python-docutils" ,python-docutils) ("python-gnupg" ,python-gnupg) ("python-keyring" ,python-keyring) ("python-nbxmpp" ,python-nbxmpp) -- cgit v1.2.3 From 89c7894805329023754512c9b30e67ceb1753cb0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 16:18:24 +0100 Subject: gnu: faust-2: Update to 2.5.23. * gnu/packages/audio.scm (faust-2): Update to 2.5.23. [native-inputs]: Replace llvm-with-rtti with llvm-3.8-with-rtti. * gnu/packages/llvm.scm (llvm-with-rtti): Rename this variable... (llvm-3.8-with-rtti): ...to this variable; inherit from llvm-3.8. --- gnu/packages/audio.scm | 18 +++++++----------- gnu/packages/llvm.scm | 23 ++++++++++++----------- 2 files changed, 19 insertions(+), 22 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index e5b8f9ed79..91f55a3544 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1176,19 +1176,15 @@ PS, and DAB+.") (define-public faust-2 (package (inherit faust) - (version "2.1.0") + (version "2.5.23") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/grame-cncm/faust.git") - (commit (string-append "v" - (string-map (lambda (c) - (if (char=? c #\.) #\- c)) - version))))) - (file-name (string-append "faust-" version "-checkout")) + (method url-fetch) + (uri (string-append "https://github.com/grame-cncm/faust/" + "releases/download/" version + "/faust-" version ".tar.gz")) (sha256 (base32 - "06km0ygwxxwgw1lqldccqidxhmjfz8ck0wnbd95qk5sg8sbpc068")))) + "1yz5jnr76hh7rmxkpdi7gyrw1wp4gyqfpq8zyl97qdi5ga5gjznq")))) (build-system gnu-build-system) (arguments (substitute-keyword-arguments (package-arguments faust) @@ -1196,7 +1192,7 @@ PS, and DAB+.") `(list (string-append "prefix=" (assoc-ref %outputs "out")) "world")))) (native-inputs - `(("llvm" ,llvm-with-rtti) + `(("llvm" ,llvm-3.8-with-rtti) ("which" ,which) ("xxd" ,xxd) ("ctags" ,emacs-minimal) ; for ctags diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index d0791d00cc..a809180e29 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -90,17 +90,6 @@ languages is in development. The compiler infrastructure includes mirror sets of programming tools as well as libraries with equivalent functionality.") (license license:ncsa))) -(define-public llvm-with-rtti - (package (inherit llvm) - (name "llvm-with-rtti") - (arguments - (substitute-keyword-arguments (package-arguments llvm) - ((#:configure-flags flags) - `(append '("-DCMAKE_SKIP_BUILD_RPATH=FALSE" - "-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE" - "-DLLVM_REQUIRES_RTTI=1") - ,flags)))))) - (define* (clang-runtime-from-llvm llvm hash #:optional (patches '())) (package @@ -290,6 +279,18 @@ code analysis tools.") (base32 "1ybmnid4pw2hxn12ax5qa5kl1ldfns0njg8533y3mzslvd5cx0kf")))))) +;; This is for Faust 2 +(define-public llvm-3.8-with-rtti + (package (inherit llvm-3.8) + (name "llvm-with-rtti") + (arguments + (substitute-keyword-arguments (package-arguments llvm) + ((#:configure-flags flags) + `(append '("-DCMAKE_SKIP_BUILD_RPATH=FALSE" + "-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE" + "-DLLVM_REQUIRES_RTTI=1") + ,flags)))))) + (define-public clang-runtime-3.8 (clang-runtime-from-llvm llvm-3.8 -- cgit v1.2.3 From 50ee7e93fcd881d3bf996954bcd5176aa7c54d21 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 9 Nov 2018 19:17:05 +0100 Subject: gnu: gtk-doc: Use local docbook-xsl. * gnu/packages/gtk.scm (gtk-doc): Use local docbook-xsl. --- gnu/packages/gtk.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 640bd75da4..0d62b80833 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2018 Arun Isaac +;;; Copyright © 2018 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; @@ -1411,7 +1412,12 @@ information.") (string-append (assoc-ref inputs "docbook-xsl") "/xml/xsl/docbook-xsl-" ,(package-version docbook-xsl) - "/html/chunk.xsl"))) + "/html/chunk.xsl")) + (("http://docbook.sourceforge.net/release/xsl/current/common/en.xml") + (string-append (assoc-ref inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-" + ,(package-version docbook-xsl) + "/common/en.xml"))) #t)) (add-after 'patch-gtk-doc-scan 'patch-test-out (lambda _ -- cgit v1.2.3 From 0ead0b4d2c025ad1b4a293fb6cbb8a578b7dd87d Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 9 Nov 2018 19:18:55 +0100 Subject: gnu: webkitgtk: Include documentation. * gnu/packages/webkit.scm (webkitgtk): Include documentation. --- gnu/packages/webkit.scm | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index d1890c8b32..dfff53c627 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2015 Ricardo Wurmus ;;; Copyright © 2015, 2016, 2017, 2018 Mark H Weaver ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,6 +32,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages bison) #:use-module (gnu packages databases) + #:use-module (gnu packages docbook) #:use-module (gnu packages enchant) #:use-module (gnu packages flex) #:use-module (gnu packages gcc) @@ -66,11 +68,13 @@ (base32 "147r7an41920zl4x9srdva7fxvw2znjin5ldjkhay1cndv9gih0m")))) (build-system cmake-build-system) + (outputs '("out" "doc")) (arguments '(#:tests? #f ; no tests #:build-type "Release" ; turn off debugging symbols to save space #:configure-flags (list "-DPORT=GTK" + "-DENABLE_GTKDOC=ON" ; No doc by default (string-append ; uses lib64 by default "-DLIB_INSTALL_DIR=" (assoc-ref %outputs "out") "/lib") @@ -87,7 +91,28 @@ ;; XXX Disable WOFF2 ‘web fonts’. These were never ;; supported in our previous builds. Enabling them ;; requires building libwoff2 and possibly woff2dec. - "-DUSE_WOFF2=OFF"))) + "-DUSE_WOFF2=OFF") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-gtk-doc-scan + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/docs/webkitdomgtk-docs.sgml" + (("http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/docbookx.dtd"))) + (substitute* "Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml" + (("http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/docbookx.dtd"))) + #t)) + (add-after 'install 'move-doc-files + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (mkdir-p (string-append doc "/share")) + (rename-file (string-append out "/share/gtk-doc") + (string-append doc "/share/gtk-doc")) + #t)))))) (native-inputs `(("bison" ,bison) ("gettext" ,gettext-minimal) @@ -97,6 +122,8 @@ ("perl" ,perl) ("pkg-config" ,pkg-config) ("python" ,python-2) ; incompatible with Python 3 (print syntax) + ("gtk-doc" ,gtk-doc) ; For documentation generation + ("docbook-xml" ,docbook-xml) ; For documentation generation ("ruby" ,ruby))) (propagated-inputs `(("gtk+" ,gtk+) -- cgit v1.2.3 From 8c5749f1b5255e37a6ef7b43e48fe0bbc57ce209 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 11 Nov 2018 16:59:53 +0100 Subject: 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 (limited to 'gnu') 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): -- cgit v1.2.3 From ec350676315e3ec5fb4b5a9865b8cc3aa76d2681 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 8 Nov 2018 13:22:52 -0500 Subject: gnu: PostgreSQL: Update to 10.6 [fixes CVE-2018-16850]. * gnu/packages/databases.scm (postgresql): Update to 10.6. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 46bd728b1b..7258622f42 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -804,14 +804,14 @@ as a drop-in replacement of MySQL.") (define-public postgresql (package (name "postgresql") - (version "10.5") + (version "10.6") (source (origin (method url-fetch) (uri (string-append "https://ftp.postgresql.org/pub/source/v" version "/postgresql-" version ".tar.bz2")) (sha256 (base32 - "04a07jkvc5s6zgh6jr78149kcjmsxclizsqabjw44ld4j5n633kc")))) + "0jv26y3f10svrjxzsgqxg956c86b664azyk2wppzpa5x11pjga38")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-uuid=e2fs") -- cgit v1.2.3 From e874f34d3f65ced7bee226b07210cdfc81dece30 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 20:48:34 +0100 Subject: gnu: mumi: Update to 0.0.0-2.bfd96ce7. * gnu/packages/mail.scm (mumi): Update to 0.0.0-2.bfd96ce7. --- gnu/packages/mail.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 978b22333e..fa545da3b2 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2645,8 +2645,8 @@ replacement for the @code{urlview} program.") (license gpl2+))) (define-public mumi - (let ((commit "648311b9b9d9d974fb2d76dacfe956fc7b842401") - (revision "1")) + (let ((commit "bfd96ce76b4600ae232e6548b26c9365095fd174") + (revision "2")) (package (name "mumi") (version (git-version "0.0.0" revision commit)) @@ -2658,7 +2658,7 @@ replacement for the @code{urlview} program.") (file-name (git-file-name name version)) (sha256 (base32 - "081yvjhy8ig3xyixkdklrzf3bf2bczn92g5hpxmsl8m9cpcj77vv")))) + "05miwfi1bh0v9x2gvn15bwkb3gn4xy53z506ysjzns2y497zkc5h")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From aaf0e47f6dbe4245ef5d38f69e0e4eb2855de15b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 20:50:30 +0100 Subject: gnu: libtoxcore: Update to 0.0.0-2.bf69b54. * gnu/packages/messaging.scm (libtoxcore): Update to 0.0.0-2.bf69b54. [native-inputs]: Add check. --- gnu/packages/messaging.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 9d652486f2..a7b868ccc0 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -818,8 +818,8 @@ protocols.") (license license:x11))) (define-public libtoxcore - (let ((revision "1") - (commit "755f084e8720b349026c85afbad58954cb7ff1d4")) + (let ((revision "2") + (commit "bf69b54f64003d160d759068f4816b2d9b2e1e21")) (package (name "libtoxcore") (version (string-append "0.0.0" "-" @@ -832,20 +832,19 @@ protocols.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0ap1gvlyihnfivv235dbrgsxsiiz70bhlmlr5gn1027w3h5kqz8w")))) + "11lqra4yd7v293cp286ynff5lqz1pprzg8vn3wq6vryj08g88zqb")))) (build-system gnu-build-system) + (arguments `(#:tests? #f)) ; FIXME: tests hang, some fail. (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) ("libtool" ,libtool) - ;; TODO: Add when test suite is capable of passing. - ;; ("check" ,check) + ("check" ,check) ("pkg-config" ,pkg-config))) (inputs `(("libsodium" ,libsodium) ("opus" ,opus) ("libvpx" ,libvpx))) - (arguments `(#:tests? #f)) ; FIXME: Testsuite fails, reasons unspecific. (synopsis "Library for the Tox encrypted messenger protocol") (description "C library implementation of the Tox encrypted messenger protocol.") -- cgit v1.2.3 From a509b180870cf7bffe65a1cd6099487469fae39f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 11 Nov 2018 18:09:55 +0100 Subject: gnu: webkitgtk@2.22: Adjust to documentation output. This is a follow-up to commit 0ead0b4d2c025ad1b4a293fb6cbb8a578b7dd87d. * gnu/packages/webkit.scm (webkitgtk)[arguments]: Remove hard coded file list. (webkitgtk-2.22)[arguments]: Inherit phases using SUBSTITUTE-KEYWORD-ARGUMENTS. --- gnu/packages/webkit.scm | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index dfff53c627..82f03c7f94 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -96,14 +96,12 @@ (modify-phases %standard-phases (add-after 'unpack 'patch-gtk-doc-scan (lambda* (#:key inputs #:allow-other-keys) - (substitute* "Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/docs/webkitdomgtk-docs.sgml" - (("http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd") - (string-append (assoc-ref inputs "docbook-xml") - "/xml/dtd/docbook/docbookx.dtd"))) - (substitute* "Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml" - (("http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd") - (string-append (assoc-ref inputs "docbook-xml") - "/xml/dtd/docbook/docbookx.dtd"))) + (for-each (lambda (file) + (substitute* file + (("http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/docbookx.dtd")))) + (find-files "Source" "\\.sgml$")) #t)) (add-after 'install 'move-doc-files (lambda* (#:key outputs #:allow-other-keys) @@ -182,12 +180,13 @@ HTML/CSS applications to full-fledged web browsers.") `(("gcc" ,gcc-7) ; webkitgtk-2.22 requires gcc-6 or newer ,@(package-native-inputs webkitgtk))) (arguments - `(#:phases (modify-phases %standard-phases - (add-before 'configure 'work-around-gcc-7-include-path-issue - ;; FIXME: Work around a problem with gcc-7 includes (see - ;; ). - (lambda _ - (unsetenv "C_INCLUDE_PATH") - (unsetenv "CPLUS_INCLUDE_PATH") - #t))) - ,@(package-arguments webkitgtk))))) + (substitute-keyword-arguments (package-arguments webkitgtk) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'configure 'work-around-gcc-7-include-path-issue + ;; FIXME: Work around a problem with gcc-7 includes (see + ;; ). + (lambda _ + (unsetenv "C_INCLUDE_PATH") + (unsetenv "CPLUS_INCLUDE_PATH") + #t)))))))) -- cgit v1.2.3 From 7865c8c460272b1375b8dc544459d8c282ef3984 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 23:11:19 +0100 Subject: gnu: r-lme4: Update to 1.1-19. * gnu/packages/statistics.scm (r-lme4): Update to 1.1-19. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index f363d9a473..b5d230d02a 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5123,14 +5123,14 @@ algorithms.") (define-public r-lme4 (package (name "r-lme4") - (version "1.1-18-1") + (version "1.1-19") (source (origin (method url-fetch) (uri (cran-uri "lme4" version)) (sha256 (base32 - "01ar4fak8zj7c1vmh9m576wchxj5qzpfqn637s7fh3fl6cpz0alq")))) + "0j8xhkkcdv45ilab960s9jrcjk6jbzvd7w7myswv5fmalrpq52pf")))) (build-system r-build-system) (native-inputs `(("r-rcpp" ,r-rcpp) -- cgit v1.2.3 From 23dd886a95379a8aaed5d58025e603e7f9ea659e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 23:11:33 +0100 Subject: gnu: r-rtsne: Update to 0.15. * gnu/packages/statistics.scm (r-rtsne): Update to 0.15. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index b5d230d02a..71472cb974 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3268,14 +3268,14 @@ the way current RNG settings can be changed.") (define-public r-rtsne (package (name "r-rtsne") - (version "0.13") + (version "0.15") (source (origin (method url-fetch) (uri (cran-uri "Rtsne" version)) (sha256 (base32 - "17crbdi80q4g2pwp9v7j3bdaznk96qlrqx01zvj3wwqippizyfqw")))) + "0v17vxizrs1msay24xl2bckfajr2c82wpqj07lyssbrq197nwdsn")))) (properties `((upstream-name . "Rtsne"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 41d2c26e675cad3240fe7a5ddd5a286ceb9bc710 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 23:11:43 +0100 Subject: gnu: r-rcpparmadillo: Update to 0.9.200.4.0. * gnu/packages/statistics.scm (r-rcpparmadillo): Update to 0.9.200.4.0. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 71472cb974..024e90f3e5 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2528,13 +2528,13 @@ well as additional utilities such as panel and axis annotation functions.") (define-public r-rcpparmadillo (package (name "r-rcpparmadillo") - (version "0.9.100.5.0") + (version "0.9.200.4.0") (source (origin (method url-fetch) (uri (cran-uri "RcppArmadillo" version)) (sha256 (base32 - "1iyjqhfjip1nxrkllzh7r1m01jjnx7cahqkf3s557w34p987f2l1")))) + "1ayvpyi4hgaqrhx1kqi640iillc2byj4kam7vydlgqmdrzpgrfvz")))) (properties `((upstream-name . "RcppArmadillo"))) (build-system r-build-system) (native-inputs -- cgit v1.2.3 From 441cf11de1ddbe7b9d4b5b70d9b67456ac6bfa63 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 23:11:57 +0100 Subject: gnu: r-dplyr: Update to 0.7.8. * gnu/packages/statistics.scm (r-dplyr): Update to 0.7.8. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 024e90f3e5..bd581c154b 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1620,13 +1620,13 @@ and printing capabilities than traditional data frames.") (define-public r-dplyr (package (name "r-dplyr") - (version "0.7.7") + (version "0.7.8") (source (origin (method url-fetch) (uri (cran-uri "dplyr" version)) (sha256 (base32 - "196lwck3i3m25jnn1f1nrda9svnjqqi89s0is79gbrphamddnlq5")))) + "06p59nhli8c1sarghzxq0y4pk6lyyz3xwkarp55b252dfg2rly9p")))) (build-system r-build-system) (propagated-inputs `(("r-assertthat" ,r-assertthat) -- cgit v1.2.3 From 2a4c5877a996007f2c6e058fb973fa7d5dcfdbff Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 23:12:10 +0100 Subject: gnu: r-ggpubr: Update to 0.1.9. * gnu/packages/cran.scm (r-ggpubr): Update to 0.1.9. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 45526c7072..2c1151bf6e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4450,14 +4450,14 @@ and adds the annotation to the plot.") (define-public r-ggpubr (package (name "r-ggpubr") - (version "0.1.8") + (version "0.1.9") (source (origin (method url-fetch) (uri (cran-uri "ggpubr" version)) (sha256 (base32 - "0psl2zndm4wk6nnj1nv305islpxfvfgd87gjh2ph8yqn4mxpnfi1")))) + "0rvfgii2gxarra7d33n6c63ky0mivxxyx35acsrn94xkbd8mbcsj")))) (build-system r-build-system) (propagated-inputs `(("r-cowplot" ,r-cowplot) -- cgit v1.2.3 From 06910a86896aba25adad104c96303624e7479938 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 23:12:22 +0100 Subject: gnu: r-rcmdcheck: Update to 1.3.2. * gnu/packages/cran.scm (r-rcmdcheck): Update to 1.3.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2c1151bf6e..a74ffa773f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6943,14 +6943,14 @@ directories or URLs with their associated programs.") (define-public r-rcmdcheck (package (name "r-rcmdcheck") - (version "1.3.1") + (version "1.3.2") (source (origin (method url-fetch) (uri (cran-uri "rcmdcheck" version)) (sha256 (base32 - "1ga19jqix0zs7xyz2j155zyagwbv22r6dgv55g6wdjigc67qfsix")))) + "0ys1nd7690mhwzslyzg8fq1wxr28nz8g6av5iykkrshb8lkxg7ly")))) (build-system r-build-system) (propagated-inputs `(("r-callr" ,r-callr) -- cgit v1.2.3 From 5f9b38ba3438c7bba9203757391c256507573b7b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 23:12:32 +0100 Subject: gnu: r-s4vectors: Update to 0.20.1. * gnu/packages/bioinformatics.scm (r-s4vectors): Update to 0.20.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 55631530ca..bf49f4e1dc 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7268,13 +7268,13 @@ abnormal copy number.") (define-public r-s4vectors (package (name "r-s4vectors") - (version "0.20.0") + (version "0.20.1") (source (origin (method url-fetch) (uri (bioconductor-uri "S4Vectors" version)) (sha256 (base32 - "0qgiykjhnsvvpcp3zwmrnpx3bv3msvj0szchyvb1yb0fxw716xc5")))) + "18whrw67nxn82xshckl2pjy7d14sa3c27h3n9naqyqwz88lr6dzg")))) (properties `((upstream-name . "S4Vectors"))) (build-system r-build-system) -- cgit v1.2.3 From 9a65a052016572b61e3c4247fcdf9e0478656f71 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 11 Nov 2018 22:02:18 +0100 Subject: gnu: go: Update default to 1.11. * gnu/packages/golang.scm (go): Update default to 1.11. --- gnu/packages/golang.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index e49372d435..5b84ced804 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -528,7 +528,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") (setenv "GOGC" "400") #t))))))))) -(define-public go go-1.9) +(define-public go go-1.11) (define-public go-github-com-alsm-ioprogress (let ((commit "063c3725f436e7fba0c8f588547bee21ffec7ac5") -- cgit v1.2.3 From 46a37b5966298e26d91d2a660c3f2c84f111f826 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 6 Nov 2018 18:09:16 +0100 Subject: gnu: go-github-com-prometheus-common-expfmt: Fix tests for go-1.11. * gnu/packages/syncthing.scm (go-github-com-prometheus-common-expfmt): Fix tests for go-1.11. --- gnu/packages/syncthing.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 5d681b816e..46211d27d8 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -1097,7 +1097,14 @@ message streaming.") (string-append (assoc-ref outputs "out") "/src/github.com/prometheus/common/expfmt/testdata/") ".*\\.gz$")) - #t))))) + #t)) + (replace 'check + ;; Tests don't pass "vet" on go-1.11. See + ;; https://github.com/syncthing/syncthing/issues/5311. + (lambda* (#:key import-path #:allow-other-keys) + (invoke "go" "test" + "-vet=off" + import-path)))))) (propagated-inputs `(("go-github-com-golang-protobuf-proto" ,go-github-com-golang-protobuf-proto) -- cgit v1.2.3 From d4780c82387f226658bc8bf073ce8610bf37433b Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 6 Nov 2018 18:10:09 +0100 Subject: gnu: go-github-com-audriusbutkevicius-cli: Fix tests for go-1.11. * gnu/packages/syncthing.scm (go-github-com-audriusbutkevicius-cli): Fix tests for go-1.11. --- gnu/packages/syncthing.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 46211d27d8..7e4ff0ed84 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -900,7 +900,16 @@ the current goroutine's ID.") "0bg26pfg25vr16jmczig2m493mja2nxjxyswz3hha7avxw20rpi5")))) (build-system go-build-system) (arguments - '(#:import-path "github.com/AudriusButkevicius/cli")) + '(#:import-path "github.com/AudriusButkevicius/cli" + ;; Tests don't pass "vet" on go-1.11. See + ;; https://github.com/AudriusButkevicius/cli/pull/1. + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key import-path #:allow-other-keys) + (invoke "go" "test" + "-vet=off" + import-path)))))) (synopsis "Library for building command-line interfaces in Go") (description "This package provides a library for building command-line interfaces in Go.") -- cgit v1.2.3 From 66fa8f0f77ac26766e5547ffdaa67cf6c261bd8e Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 6 Nov 2018 18:10:42 +0100 Subject: gnu: go-gopkg.in-asn1-ber.v1: Fix tests for go-1.11. * gnu/packages/syncthing.scm (go-gopkg.in-asn1-ber.v1): Fix tests for go-1.11. --- gnu/packages/syncthing.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 7e4ff0ed84..c29c88a588 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -1267,7 +1267,16 @@ Prometheus HTTP API.") "1y8bvzbxpw0lfnn7pbcdwzqj4l90qj6xf88dvv9pxd9yl5g6cskx")))) (build-system go-build-system) (arguments - '(#:import-path "gopkg.in/asn1-ber.v1")) + '(#:import-path "gopkg.in/asn1-ber.v1" + ;; Tests don't pass "vet" on go-1.11. See + ;; https://github.com/go-asn1-ber/asn1-ber/issues/20. + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key import-path #:allow-other-keys) + (invoke "go" "test" + "-vet=off" + import-path)))))) (synopsis "ASN.1 BER encoding and decoding in Go") (description "This package provides ASN.1 BER encoding and decoding in the Go language.") -- cgit v1.2.3 From 46a4ae2212d72d38dc55188e35a7441964694f91 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 6 Nov 2018 18:11:21 +0100 Subject: gnu: go-github-com-wtolson-go-taglib: Fix tests and build for go-1.11. * gnu/packages/golang.scm (go-github-com-wtolson-go-taglib)[arguments]: Fix tests for go-1.11. [native-inputs]: Remove pkg-config and taglib. [propagated-inputs]: Add pkg-config and taglib. --- gnu/packages/golang.scm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 5b84ced804..2fd8bf487c 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2419,11 +2419,24 @@ and lookup requests. Browse requests are not supported yet.") (base32 "1cpjqnrviwflz150g78iir5ndrp3hh7a93zbp4dwbg6sb2q141p2")))) (build-system go-build-system) - (native-inputs + ;; From go-1.10 onward, "pkg" compiled libraries are not re-used, so + ;; when this package required as input for another one, it will have to + ;; be built again. Thus its CGO requirements must be made available in + ;; the environment, that is, they must be propagated. + (propagated-inputs `(("pkg-config" ,pkg-config) ("taglib" ,taglib))) (arguments - `(#:import-path "github.com/wtolson/go-taglib")) + `(#:import-path "github.com/wtolson/go-taglib" + ;; Tests don't pass "vet" on go-1.11. See + ;; https://github.com/wtolson/go-taglib/issues/12. + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key import-path #:allow-other-keys) + (invoke "go" "test" + "-vet=off" + import-path)))))) (home-page "https://github.com/wtolson/go-taglib") (synopsis "Go wrapper for taglib") (description "Go wrapper for taglib") -- cgit v1.2.3 From 5c4758415d4b2565d3ec4a6d89c525d85dafb53a Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 11 Nov 2018 22:28:05 +0100 Subject: gnu: go-github-com-aarzilli-golua: Fix for go-1.11. * gnu/packages/golang.scm (go-github-com-aarzilli-golua)[arguments]: Fix for go-1.11. [native-inputs]: Remove lua. [propagated-inputs]: Add lua. --- gnu/packages/golang.scm | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 2fd8bf487c..38df23a6c1 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2152,26 +2152,28 @@ generate ANSI colored strings.") (base32 "1d9hr29i36cza98afj3g6rs3l7xbkprwzz0blcxsr9dd7nak20di")))) (build-system go-build-system) - (native-inputs + ;; From go-1.10 onward, "pkg" compiled libraries are not re-used, so + ;; when this package required as input for another one, it will have to + ;; be built again. Thus its CGO requirements must be made available in + ;; the environment, that is, they must be propagated. + (propagated-inputs `(("lua" ,lua))) (arguments `(#:unpack-path "github.com/aarzilli/golua" #:import-path "github.com/aarzilli/golua/lua" #:phases (modify-phases %standard-phases - (replace 'build - (lambda* (#:key import-path #:allow-other-keys) - (invoke "go" "install" - "-v" ; print the name of packages as they are compiled - "-x" ; print each command as it is invoked - "-ldflags=-s -w" ; strip the symbol table and debug - "-tags" "llua" ; Latest Lua on Guix does not have a version number. - import-path))) - (replace 'check - (lambda* (#:key import-path #:allow-other-keys) - (invoke "go" "test" - "-tags" "llua" ; Latest Lua on Guix does not have a version number. - import-path)))))) + ;; While it's possible to fix the CGO_LDFLAGS with the "-tags" + ;; command line argument, go-1.10+ does not re-use the produced pkg + ;; for dependencies, which means we would need to propagate the + ;; same "-tags" argument to all golua referrers. A substitution is + ;; more convenient here. We also need to propagate the lua + ;; dependency to make it available to referrers. + (add-after 'unpack 'fix-lua-ldflags + (lambda _ + (substitute* "src/github.com/aarzilli/golua/lua/lua.go" + (("#cgo linux,!llua,!luaa LDFLAGS: -llua5.3") + "#cgo linux,!llua,!luaa LDFLAGS: -llua"))))))) (home-page "https://github.com/aarzilli/golua") (synopsis "Go Bindings for the Lua C API") (description "This package provides @code{lua}, a Go module that can -- cgit v1.2.3 From 53bcee9ea7e885e756ad4689381aa2bdfbac97ef Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 12 Nov 2018 12:36:15 +0200 Subject: gnu: vifm: Update to 0.10. * gnu/packages/vim.scm (vifm): Update to 0.10. --- gnu/packages/vim.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index c6906b12cf..c974ebc439 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -718,7 +718,7 @@ refactor Vim in order to: (define-public vifm (package (name "vifm") - (version "0.9.1") + (version "0.10") (source (origin (method url-fetch) @@ -729,7 +729,7 @@ refactor Vim in order to: "vifm-" version ".tar.bz2"))) (sha256 (base32 - "1cz7vjjmghgdxd1lvsdwv85gvx4kz8idq14qijpwkpfrf2va9f98")))) + "1f380xcyjnm4xmcdazs6dj064bwddhywvn3mgm36k7r7b2gnjnp0")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-build-timestamp") -- cgit v1.2.3 From e740a902281bb3bde369cc04f26656de608d3614 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Mon, 12 Nov 2018 22:09:12 +0530 Subject: gnu: youtube-dl: Update to 2018.11.07. * gnu/packages/video.scm (youtube-dl): Update to 2018.11.07. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index a482ef2515..94c5cf3a67 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1269,7 +1269,7 @@ access to mpv's powerful playback capabilities.") (define-public youtube-dl (package (name "youtube-dl") - (version "2018.11.03") + (version "2018.11.07") (source (origin (method url-fetch) (uri (string-append "https://yt-dl.org/downloads/" @@ -1277,7 +1277,7 @@ access to mpv's powerful playback capabilities.") version ".tar.gz")) (sha256 (base32 - "11phhwhr1g050h4625d5jsgcsjnnv7jc6xcrbn7zdzd32f6gy2lj")))) + "1rvc2m2kbm2kycqsa7fkcg5gql9f0w3hn1a7jg48zzl06ayggxk9")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion -- cgit v1.2.3 From 0dd60c1c9bb07bb3488761c95b5f4aab16061602 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 12 Nov 2018 23:56:22 +0100 Subject: gnu: php: Update to 7.2.12. * gnu/packages/php.scm (php): Update to 7.2.12. --- gnu/packages/php.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index c78902c97c..a22591d377 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -63,7 +63,7 @@ (define-public php (package (name "php") - (version "7.2.10") + (version "7.2.12") (home-page "https://secure.php.net/") (source (origin (method url-fetch) @@ -71,7 +71,7 @@ name "-" version ".tar.xz")) (sha256 (base32 - "1w0432i5wjga9z8x3rhc72h2ij1jd2aimg5xmhc0hg4f7951bhh1")) + "1qbz2j9kzqxxp0mmx02zavvz20ji7izqdnri25g1mrwyhz60974q")) (modules '((guix build utils))) (snippet '(with-directory-excursion "ext" @@ -186,6 +186,11 @@ (substitute* "ext/standard/tests/streams/bug60602.phpt" (("'ls'") (string-append "'" (which "ls") "'"))) + ;; The expected output is slightly different from what is given, + ;; in a section that's not related to the actual test + (substitute* "sapi/cli/tests/upload_2G.phpt" + (("Test\\\\n") "Test\n\n")) + ;; Drop tests that are known to fail. (for-each delete-file '("ext/posix/tests/posix_getgrgid.phpt" ; Requires /etc/group. -- cgit v1.2.3 From 7fed5481fe4029e4f85d90ee163a0fb1c5d617f5 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Tue, 13 Nov 2018 10:23:15 +0100 Subject: gnu: wine-staging: Update to 3.20. * gnu/packages/wine.scm (wine-staging-patchset-data): Update to 3.20. * gnu/packages/wine.scm (wine-staging): Update to 3.20. --- gnu/packages/wine.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 60b2a81de8..85c71b5abb 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -225,7 +225,7 @@ integrate Windows applications into your desktop.") (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") - (version "3.19") + (version "3.20") (source (origin (method git-fetch) @@ -235,7 +235,7 @@ integrate Windows applications into your desktop.") (file-name (git-file-name name version)) (sha256 (base32 - "0nmlhc6jamz0zb4b1w165l8j1a1b0j5ad1sv06aasc9jy8s12b22")))) + "049cwllf4aybrhj4l2i3vd5jvagjz4d448404zkyy0lfxr08id3p")))) (build-system trivial-build-system) (native-inputs `(("bash" ,bash) @@ -281,7 +281,7 @@ integrate Windows applications into your desktop.") (file-name (string-append name "-" version ".tar.xz")) (sha256 (base32 - "0slwgbxclx2dx0glj8az3mv0bqxmx119v9s0jvg1b5zhmqkcc8gg")))) + "063garmflbna3mhph8k0dv0bkzq8x75x5xrd0j8y0mjh10i13mik")))) (inputs `(("autoconf" ,autoconf) ; for autoreconf ("gtk+" ,gtk+) ("libva" ,libva) -- cgit v1.2.3 From 6018683683ac49765ee0eda4cb09606f1d3689fe Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Nov 2018 10:51:21 +0100 Subject: gnu: c-toxcore: Fetch sources from git. * gnu/packages/messaging.scm (c-toxcore)[source]: Fetch from git. --- gnu/packages/messaging.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index a7b868ccc0..c22cacfd36 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -860,13 +860,14 @@ protocols.") (version "0.2.8") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/TokTok/c-toxcore/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/TokTok/c-toxcore.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0qlkimlvbd24nlj7w9b5rpz1r807magqxmfylc1mlxsqhmfi5zj7")))) + "0xgnraysz25fbws5zwjk92mwnl8k1yih701qam8kgm3rxh50kyhm")))) (arguments `(#:tests? #f)) ; FIXME: Testsuite seems to stay stuck on test 3. Disable ; for now. -- cgit v1.2.3 From 155956449af6d42cdf739b0922b34bdaae639aa7 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Tue, 13 Nov 2018 15:03:15 +0300 Subject: gnu: restic: Fix build phase. * gnu/packages/backup.scm (restic)[arguments]: Set "HOME" environment variable in build phase. --- gnu/packages/backup.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index ab95aea727..c927a14673 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -887,6 +887,7 @@ is like a time machine for your data. ") ,version) ;; Disable 'restic self-update'. It makes little sense in Guix. (substitute* "build.go" (("selfupdate") "")) + (setenv "HOME" (getcwd)) ; for $HOME/.cache/go-build (invoke "go" "run" "build.go")))) (replace 'check -- cgit v1.2.3 From 190877748eeadff475dca822847fb3a5cc4467b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 13 Nov 2018 10:36:37 +0100 Subject: services: mcron: Fix typo in comment. * gnu/services/mcron.scm (shepherd-schedule-action): Fix typo in comment. --- gnu/services/mcron.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/services/mcron.scm b/gnu/services/mcron.scm index 5757bf8cf6..120b663e3e 100644 --- a/gnu/services/mcron.scm +++ b/gnu/services/mcron.scm @@ -86,7 +86,7 @@ files." (lambda () (zero? (close-pipe pipe))) (lambda args - ;; There's with race between the SIGCHLD handler, which + ;; There's a race with the SIGCHLD handler, which ;; could call 'waitpid' before 'close-pipe' above does. If ;; we get ECHILD, that means we lost the race, but that's ;; fine. -- cgit v1.2.3 From d3f75179e5741db29358e3e723146fd20ec79de9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 13 Nov 2018 11:02:13 +0100 Subject: services: nscd: Add 'invalidate' and 'statistics' actions. * gnu/services/base.scm (nscd-action-procedure, nscd-actions): New procedures. (nscd-shepherd-service): Add 'modules' and 'actions' fields. * gnu/tests/base.scm (run-basic-test)["nscd invalidate action"] ["nscd invalidate action, wrong table"]: New tests. * doc/guix.texi (Services): Mention 'herd doc nscd action'. (Base Services): Document the actions. --- gnu/services/base.scm | 54 ++++++++++++++++++++++++++++++++++++++++++++++----- gnu/tests/base.scm | 14 +++++++++++++ 2 files changed, 63 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 3409bd352c..228d3c5926 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -1252,18 +1252,57 @@ the tty to run, among other things." (string-concatenate (map cache->config caches))))))) +(define (nscd-action-procedure nscd config option) + ;; XXX: This is duplicated from mcron; factorize. + #~(lambda (_ . args) + ;; Run 'nscd' in a pipe so we can explicitly redirect its output to + ;; 'current-output-port', which at this stage is bound to the client + ;; connection. + (let ((pipe (apply open-pipe* OPEN_READ #$nscd + "-f" #$config #$option args))) + (let loop () + (match (read-line pipe 'concat) + ((? eof-object?) + (catch 'system-error + (lambda () + (zero? (close-pipe pipe))) + (lambda args + ;; There's a race with the SIGCHLD handler, which could + ;; call 'waitpid' before 'close-pipe' above does. If we + ;; get ECHILD, that means we lost the race, but that's + ;; fine. + (or (= ECHILD (system-error-errno args)) + (apply throw args))))) + (line + (display line) + (loop))))))) + +(define (nscd-actions nscd config) + "Return Shepherd actions for NSCD." + ;; Make this functionality available as actions because that's a simple way + ;; to run the right 'nscd' binary with the right config file. + (list (shepherd-action + (name 'statistics) + (documentation "Display statistics about nscd usage.") + (procedure (nscd-action-procedure nscd config "--statistics"))) + (shepherd-action + (name 'invalidate) + (documentation + "Invalidate the given cache--e.g., 'hosts' for host name lookups.") + (procedure (nscd-action-procedure nscd config "--invalidate"))))) + (define (nscd-shepherd-service config) "Return a shepherd service for CONFIG, an object." - (let ((nscd.conf (nscd.conf-file config)) + (let ((nscd (file-append (nscd-configuration-glibc config) + "/sbin/nscd")) + (nscd.conf (nscd.conf-file config)) (name-services (nscd-configuration-name-services config))) (list (shepherd-service (documentation "Run libc's name service cache daemon (nscd).") (provision '(nscd)) (requirement '(user-processes)) (start #~(make-forkexec-constructor - (list #$(file-append (nscd-configuration-glibc config) - "/sbin/nscd") - "-f" #$nscd.conf "--foreground") + (list #$nscd "-f" #$nscd.conf "--foreground") ;; Wait for the PID file. However, the PID file is ;; written before nscd is actually listening on its @@ -1277,7 +1316,12 @@ the tty to run, among other things." (string-append dir "/lib")) (list #$@name-services)) ":"))))) - (stop #~(make-kill-destructor)))))) + (stop #~(make-kill-destructor)) + (modules `((ice-9 popen) ;for the actions + (ice-9 rdelim) + (ice-9 match) + ,@%default-modules)) + (actions (nscd-actions nscd nscd.conf)))))) (define nscd-activation ;; Actions to take before starting nscd. diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm index 896d4a8f88..02882f4b46 100644 --- a/gnu/tests/base.scm +++ b/gnu/tests/base.scm @@ -335,6 +335,20 @@ info --version") (x (pk 'failure x #f)))) + (test-equal "nscd invalidate action" + '(#t) ;one value, #t + (marionette-eval '(with-shepherd-action 'nscd ('invalidate "hosts") + result + result) + marionette)) + + (test-equal "nscd invalidate action, wrong table" + '(#f) ;one value, #f + (marionette-eval '(with-shepherd-action 'nscd ('invalidate "xyz") + result + result) + marionette)) + (test-equal "host not found" #f (marionette-eval -- cgit v1.2.3 From 3483f8241354935ffd56c03005f407b39c4cea45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 13 Nov 2018 15:44:25 +0100 Subject: gnu: guix: Update to f5a2724. * gnu/packages/package-management.scm (guix): Update to f5a2724. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 28437224c4..1fd071b32f 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -102,8 +102,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "0.15.0") - (commit "f9a8fce10f2d99efec7cb1dd0f6c5f0df9d1b2df") - (revision 6)) + (commit "f5a2724ae453f4a4b55ff848f4ad7e30efb6eef8") + (revision 7)) (package (name "guix") @@ -119,7 +119,7 @@ (commit commit))) (sha256 (base32 - "1733d5id0h44rrkyj9xw4fcqr1wawcfi8igpgk5wsn1iq4qqwv5f")) + "12glmvifbwvl6lmxh1mc8nbcp0f5qgw40rmf8n1icxvj0mnjrwp4")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 8263b9f71f2ee4f8b0d765b0c38b1d812ea8168c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 12 Nov 2018 13:27:56 -0500 Subject: gnu: certbot, python-acme: Update to 0.28.0. * gnu/packages/tls.scm (certbot, python-acme): Update to 0.28.0. --- gnu/packages/tls.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 715148c432..6c2c11501f 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -538,13 +538,13 @@ netcat implementation that supports TLS.") (package (name "python-acme") ;; Remember to update the hash of certbot when updating python-acme. - (version "0.27.1") + (version "0.28.0") (source (origin (method url-fetch) (uri (pypi-uri "acme" version)) (sha256 (base32 - "142gynlfx7yv0sdba3gpdxlnhg9chhz7hpdxdrp630z17h1bk9ri")))) + "11dvcbdifn5d02p4k5li8r6r39bl3p5ap9p3zjwvasm24hf2yz5z")))) (build-system python-build-system) (arguments `(#:phases @@ -595,7 +595,7 @@ netcat implementation that supports TLS.") (uri (pypi-uri name version)) (sha256 (base32 - "0anh3vjy9sif1bkp25nj76ii37xx8hh0igcx60ppag12xlabsw1m")))) + "02h959qkq7z0s13ivgf7jyl3gnc55wcck6n546k0kh155bpf5qri")))) (build-system python-build-system) (arguments `(,@(substitute-keyword-arguments (package-arguments python-acme) -- cgit v1.2.3 From 021bf6af182099dbb0178e19a2f461aeb0eef686 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 13 Nov 2018 10:33:27 -0500 Subject: gnu: Poppler: Fix CVE-2018-19149. * gnu/packages/patches/poppler-CVE-2018-19149.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/pdf.scm (poppler)[replacement]: New field. (poppler/fixed): New variable. (poppler-qt4, poppler-qt5): Use package/inherit. --- gnu/local.mk | 1 + gnu/packages/patches/poppler-CVE-2018-19149.patch | 80 +++++++++++++++++++++++ gnu/packages/pdf.scm | 13 +++- 3 files changed, 92 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/poppler-CVE-2018-19149.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 48ee438a6e..23a6cb34b5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1046,6 +1046,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/poppler-CVE-2018-19149.patch \ %D%/packages/patches/portaudio-audacity-compat.patch \ %D%/packages/patches/portmidi-modular-build.patch \ %D%/packages/patches/potrace-tests.patch \ diff --git a/gnu/packages/patches/poppler-CVE-2018-19149.patch b/gnu/packages/patches/poppler-CVE-2018-19149.patch new file mode 100644 index 0000000000..3641f5f078 --- /dev/null +++ b/gnu/packages/patches/poppler-CVE-2018-19149.patch @@ -0,0 +1,80 @@ +Fix CVE-2018-19149: + +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-19149 +https://gitlab.freedesktop.org/poppler/poppler/issues/664 + +Patch copied from upstream source repository: + +https://gitlab.freedesktop.org/poppler/poppler/commit/f162ecdea0dda5dbbdb45503c1d55d9afaa41d44 + +From f162ecdea0dda5dbbdb45503c1d55d9afaa41d44 Mon Sep 17 00:00:00 2001 +From: Marek Kasik +Date: Fri, 20 Apr 2018 11:38:13 +0200 +Subject: [PATCH] Fix crash on missing embedded file + +Check whether an embedded file is actually present in the PDF +and show warning in that case. + +https://bugs.freedesktop.org/show_bug.cgi?id=106137 +https://gitlab.freedesktop.org/poppler/poppler/issues/236 +--- + glib/poppler-attachment.cc | 26 +++++++++++++++++--------- + glib/poppler-document.cc | 3 ++- + 2 files changed, 19 insertions(+), 10 deletions(-) + +diff --git a/glib/poppler-attachment.cc b/glib/poppler-attachment.cc +index c6502e9d..11ba5bb5 100644 +--- a/glib/poppler-attachment.cc ++++ b/glib/poppler-attachment.cc +@@ -111,17 +111,25 @@ _poppler_attachment_new (FileSpec *emb_file) + attachment->description = _poppler_goo_string_to_utf8 (emb_file->getDescription ()); + + embFile = emb_file->getEmbeddedFile(); +- attachment->size = embFile->size (); ++ if (embFile != NULL && embFile->streamObject()->isStream()) ++ { ++ attachment->size = embFile->size (); + +- if (embFile->createDate ()) +- _poppler_convert_pdf_date_to_gtime (embFile->createDate (), (time_t *)&attachment->ctime); +- if (embFile->modDate ()) +- _poppler_convert_pdf_date_to_gtime (embFile->modDate (), (time_t *)&attachment->mtime); ++ if (embFile->createDate ()) ++ _poppler_convert_pdf_date_to_gtime (embFile->createDate (), (time_t *)&attachment->ctime); ++ if (embFile->modDate ()) ++ _poppler_convert_pdf_date_to_gtime (embFile->modDate (), (time_t *)&attachment->mtime); + +- if (embFile->checksum () && embFile->checksum ()->getLength () > 0) +- attachment->checksum = g_string_new_len (embFile->checksum ()->getCString (), +- embFile->checksum ()->getLength ()); +- priv->obj_stream = embFile->streamObject()->copy(); ++ if (embFile->checksum () && embFile->checksum ()->getLength () > 0) ++ attachment->checksum = g_string_new_len (embFile->checksum ()->getCString (), ++ embFile->checksum ()->getLength ()); ++ priv->obj_stream = embFile->streamObject()->copy(); ++ } ++ else ++ { ++ g_warning ("Missing stream object for embedded file"); ++ g_clear_object (&attachment); ++ } + + return attachment; + } +diff --git a/glib/poppler-document.cc b/glib/poppler-document.cc +index 83f6aea6..ea319344 100644 +--- a/glib/poppler-document.cc ++++ b/glib/poppler-document.cc +@@ -670,7 +670,8 @@ poppler_document_get_attachments (PopplerDocument *document) + attachment = _poppler_attachment_new (emb_file); + delete emb_file; + +- retval = g_list_prepend (retval, attachment); ++ if (attachment != NULL) ++ retval = g_list_prepend (retval, attachment); + } + return g_list_reverse (retval); + } +-- +2.19.1 + diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index dc966b64d8..9ffc5cb9bb 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -82,6 +82,7 @@ (define-public poppler (package (name "poppler") + (replacement poppler/fixed) (version "0.63.0") (source (origin (method url-fetch) @@ -127,6 +128,14 @@ (license license:gpl2+) (home-page "https://poppler.freedesktop.org/"))) +(define poppler/fixed + (package + (inherit poppler) + (source (origin + (inherit (package-source poppler)) + (patches (append (origin-patches (package-source poppler)) + (search-patches "poppler-CVE-2018-19149.patch"))))))) + (define-public poppler-data (package (name "poppler-data") @@ -158,14 +167,14 @@ When present, Poppler is able to correctly render CJK and Cyrillic text.") license:gpl2)))) (define-public poppler-qt4 - (package (inherit poppler) + (package/inherit poppler (name "poppler-qt4") (inputs `(("qt-4" ,qt-4) ,@(package-inputs poppler))) (synopsis "Qt4 frontend for the Poppler PDF rendering library"))) (define-public poppler-qt5 - (package (inherit poppler) + (package/inherit poppler (name "poppler-qt5") (inputs `(("qtbase" ,qtbase) ,@(package-inputs poppler))) -- cgit v1.2.3 From 978d59737acaadbb0d2aa02ed071bb5d3f555973 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 13 Nov 2018 11:25:54 -0500 Subject: gnu: direnv: Build with Go 1.9. * gnu/packages/shellutils.scm (direnv)[native-inputs]: Remove go. [inputs]: Add go-1.9. --- gnu/packages/shellutils.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 3020fdd210..0978300c9b 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -116,9 +116,10 @@ are already there.") '(#:test-target "test" #:make-flags (list (string-append "DESTDIR=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases (delete 'configure)))) + (inputs + `(("go" ,go-1.9))) (native-inputs - `(("go" ,go) - ("which" ,which))) + `(("which" ,which))) (home-page "https://direnv.net/") (synopsis "Environment switcher for the shell") (description -- cgit v1.2.3 From d5401375099f6e4562b849121265bb1c3e85874f Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 13 Nov 2018 11:43:16 -0500 Subject: gnu: libssh: Fetch source over HTTPS. * gnu/packages/ssh.scm (libssh)[source]: Use HTTPS URL. --- gnu/packages/ssh.scm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 80564a9e19..5ea5148cbc 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -71,13 +71,7 @@ (source (origin (method git-fetch) (uri (git-reference - ;; git.libssh.org does not support the fast "smart" HTTP - ;; Git protocol. The "dumb" HTTP Git protocol is extremely - ;; slow, and does not support shallow clones, so we use the - ;; plain Git protocol despite its flaws. This offers an - ;; incredible speedup and reduces the size of the the - ;; source by more than half. - (url "git://git.libssh.org/projects/libssh.git") + (url "https://git.libssh.org/projects/libssh.git") (commit (string-append "libssh-" version)))) (patches (search-patches "libssh-hostname-parser-bug.patch")) (sha256 -- cgit v1.2.3 From c991806a7d9817c8c204dfd0813144aa0ea96c57 Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Mon, 12 Nov 2018 03:53:50 +0800 Subject: gnu: ImageMagick: Update to 6.9.10-14. * gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.10-14. --- gnu/packages/imagemagick.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index e29ec6255b..fe0923f479 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2016 Mark H Weaver ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Alex Vong ;;; ;;; This file is part of GNU Guix. ;;; @@ -47,14 +48,14 @@ ;; The 7 release series has an incompatible API, while the 6 series is still ;; maintained. Don't update to 7 until we've made sure that the ImageMagick ;; users are ready for the 7-series API. - (version "6.9.10-12") + (version "6.9.10-14") (source (origin (method url-fetch) (uri (string-append "mirror://imagemagick/ImageMagick-" version ".tar.xz")) (sha256 (base32 - "0ri96yqihdk921k5qx23y2sbhraxbp2avdccxiy6m3srjkirym2l")))) + "0vcfjvdk9in92x808djvy94l5gylpgds4a7mlr8jrxsv9snx88yi")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch") -- cgit v1.2.3 From 3f995aaf2101c1c7b00d473a7a81881dd50973e3 Mon Sep 17 00:00:00 2001 From: Taegil Bae Date: Tue, 13 Nov 2018 15:23:22 -0500 Subject: gnu: spice-vdagent: Fix typo in desktop file. Fixes . * gnu/packages/spice.scm (spice-vdagent)[arguments]: Fix typo in 'patch-spice-vdagent.desktop' phase. --- gnu/packages/spice.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index e708d726bb..fb121a0581 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -250,7 +250,7 @@ Internet and from a wide variety of machine architectures.") (add-after 'unpack 'patch-spice-vdagent.desktop (lambda* (#:key outputs #:allow-other-keys) (substitute* "data/spice-vdagent.desktop" - (("Exec=/usr/bin/spice-vdagent\n") + (("Exec=/usr/bin/spice-vdagent") (string-append "Exec=" (assoc-ref outputs "out") "/bin/spice-vdagent"))) #t))))) -- cgit v1.2.3 From 13a574652bf2f9843b37a9ec6ae2c9204a3662b4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Nov 2018 23:27:06 +0100 Subject: gnu: r-genomeinfodbdata: Update to 1.2.0. * gnu/packages/bioinformatics.scm (r-genomeinfodbdata): Update to 1.2.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index bf49f4e1dc..f48b6bd0e3 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7349,7 +7349,7 @@ possible.") (define-public r-genomeinfodbdata (package (name "r-genomeinfodbdata") - (version "1.1.0") + (version "1.2.0") (source (origin (method url-fetch) ;; We cannot use bioconductor-uri here because this tarball is @@ -7359,7 +7359,7 @@ possible.") version ".tar.gz")) (sha256 (base32 - "0k1hsjx6n2i1sf14hyrgdhxqxm5mxk0bgnivhiax944whcicmzbf")))) + "0di6nlqpsyqf693k2na65ayqldih563x3zfrczpqc5q2hl5kg35c")))) (properties `((upstream-name . "GenomeInfoDbData"))) (build-system r-build-system) -- cgit v1.2.3 From 13e70f6304e9b13bdadc15bff33357f44173fe89 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Nov 2018 23:27:24 +0100 Subject: gnu: r-go-db: Update to 3.7.0. * gnu/packages/bioinformatics.scm (r-go-db): Update to 3.7.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index f48b6bd0e3..2b3fc0acd8 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7910,7 +7910,7 @@ extracting the desired features in a convenient format.") (define-public r-go-db (package (name "r-go-db") - (version "3.6.0") + (version "3.7.0") (source (origin (method url-fetch) (uri (string-append "https://www.bioconductor.org/packages/" @@ -7918,7 +7918,7 @@ extracting the desired features in a convenient format.") version ".tar.gz")) (sha256 (base32 - "0fi2qywr9apg5lwfqfq9qq6bgrnv4rdhxx25656qn4bsy62i838j")))) + "0i3wcf5h3n0dawzc1hy0kv74f06j80c47n4p3g3fmrcxlhi3jpa5")))) (properties `((upstream-name . "GO.db"))) (build-system r-build-system) -- cgit v1.2.3 From cb9e6ed7029a546202f6ddebe49aafd9287ff85a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Nov 2018 23:27:36 +0100 Subject: gnu: r-genomationdata: Update to 1.14.0. * gnu/packages/bioinformatics.scm (r-genomationdata): Update to 1.14.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 2b3fc0acd8..7101f28ba0 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8121,7 +8121,7 @@ genomic intervals. In addition, it can use BAM or BigWig files as input.") (define-public r-genomationdata (package (name "r-genomationdata") - (version "1.10.0") + (version "1.14.0") (source (origin (method url-fetch) ;; We cannot use bioconductor-uri here because this tarball is @@ -8131,7 +8131,7 @@ genomic intervals. In addition, it can use BAM or BigWig files as input.") "genomationData_" version ".tar.gz")) (sha256 (base32 - "0h7g5x3kyb50qlblz5hc85lfm6n6f5nb68i146way3ggs04sqvla")))) + "10xyb8akjrhmak2i0mnv1agny2ipy364q9nlibyplpzc7vdb6bw7")))) (build-system r-build-system) ;; As this package provides little more than large data files, it doesn't ;; make sense to build substitutes. -- cgit v1.2.3 From fc7683fa30035221612d883dea82413c048f3454 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Nov 2018 23:27:49 +0100 Subject: gnu: r-org-hs-eg-db: Update to 3.7.0. * gnu/packages/bioinformatics.scm (r-org-hs-eg-db): Update to 3.7.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 7101f28ba0..b7f1970ad5 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8149,7 +8149,7 @@ downloaded from Encode.") (define-public r-org-hs-eg-db (package (name "r-org-hs-eg-db") - (version "3.5.0") + (version "3.7.0") (source (origin (method url-fetch) ;; We cannot use bioconductor-uri here because this tarball is @@ -8159,7 +8159,7 @@ downloaded from Encode.") "org.Hs.eg.db_" version ".tar.gz")) (sha256 (base32 - "1v6wa5613cjq59xd7x1qz8lr9nb2abm9abl2cci1khrnrlpla927")))) + "1qxz9l80yg3qdqszs6dsscp7lrpfi1bgd0pxh9j7q34vprzwhdim")))) (properties `((upstream-name . "org.Hs.eg.db"))) (build-system r-build-system) -- cgit v1.2.3 From 76bd16bcf6e42e3192b8aaefce26cef56d8bfc40 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Nov 2018 23:28:05 +0100 Subject: gnu: r-org-ce-eg-db: Update to 3.7.0. * gnu/packages/bioinformatics.scm (r-org-ce-eg-db): Update to 3.7.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b7f1970ad5..fe61fc601e 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8175,7 +8175,7 @@ on mapping using Entrez Gene identifiers.") (define-public r-org-ce-eg-db (package (name "r-org-ce-eg-db") - (version "3.5.0") + (version "3.7.0") (source (origin (method url-fetch) ;; We cannot use bioconductor-uri here because this tarball is @@ -8185,7 +8185,7 @@ on mapping using Entrez Gene identifiers.") "org.Ce.eg.db_" version ".tar.gz")) (sha256 (base32 - "02ggchixlmzywhsbr0h2ms4dravv7m5964cjxqcjxqs16vjwlbk9")))) + "1w5br1ss4ha8wv4v2saj7cmbjc2jw0dyj2f2y269l078z31wcnaz")))) (properties `((upstream-name . "org.Ce.eg.db"))) (build-system r-build-system) -- cgit v1.2.3 From 314511b86273ff1cb61a476cdb825f80b96dde0b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Nov 2018 23:28:19 +0100 Subject: gnu: r-org-dm-eg-db: Update to 3.7.0. * gnu/packages/bioinformatics.scm (r-org-dm-eg-db): Update to 3.7.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index fe61fc601e..a4402b2737 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8201,7 +8201,7 @@ annotations for the genome of the model worm Caenorhabditis elegans.") (define-public r-org-dm-eg-db (package (name "r-org-dm-eg-db") - (version "3.5.0") + (version "3.7.0") (source (origin (method url-fetch) ;; We cannot use bioconductor-uri here because this tarball is @@ -8211,7 +8211,7 @@ annotations for the genome of the model worm Caenorhabditis elegans.") "org.Dm.eg.db_" version ".tar.gz")) (sha256 (base32 - "033qak1d3wwz17va0bh8z8p8arx0aw2va6gm1qfwsvdkj9cd9d7d")))) + "1pqjrzlyg72bjpy8zsxvaglc7jsv176bnyi87xdajmkvsgxpm7b3")))) (properties `((upstream-name . "org.Dm.eg.db"))) (build-system r-build-system) -- cgit v1.2.3 From d34959b8d4f4f20b3110fa6d6c54fa6f755a7a7c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Nov 2018 23:28:33 +0100 Subject: gnu: r-org-mm-eg-db: Update to 3.7.0. * gnu/packages/bioinformatics.scm (r-org-mm-eg-db): Update to 3.7.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a4402b2737..a1d87fc686 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8227,7 +8227,7 @@ annotations for the genome of the model fruit fly Drosophila melanogaster.") (define-public r-org-mm-eg-db (package (name "r-org-mm-eg-db") - (version "3.5.0") + (version "3.7.0") (source (origin (method url-fetch) ;; We cannot use bioconductor-uri here because this tarball is @@ -8237,7 +8237,7 @@ annotations for the genome of the model fruit fly Drosophila melanogaster.") "org.Mm.eg.db_" version ".tar.gz")) (sha256 (base32 - "11q21p3ki4bn4hb3aix0g775l45l66jmas6m94nfhqqnpjhv4d6g")))) + "1i3nvrd3wjigf1rmgxq1p5xxc3p8v02h5gwi62s30rkrsyjjfjxx")))) (properties `((upstream-name . "org.Mm.eg.db"))) (build-system r-build-system) -- cgit v1.2.3 From 51b262f3109fe8aba112b7cc49521c5c6810ce54 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Nov 2018 23:28:46 +0100 Subject: gnu: r-txdb-mmusculus-ucsc-mm10-knowngene: Update to 3.4.4. * gnu/packages/bioinformatics.scm (r-txdb-mmusculus-ucsc-mm10-knowngene): Update to 3.4.4. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a1d87fc686..674bbb107d 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8368,7 +8368,7 @@ in Biostrings objects.") (define-public r-txdb-mmusculus-ucsc-mm10-knowngene (package (name "r-txdb-mmusculus-ucsc-mm10-knowngene") - (version "3.4.0") + (version "3.4.4") (source (origin (method url-fetch) ;; We cannot use bioconductor-uri here because this tarball is @@ -8379,7 +8379,7 @@ in Biostrings objects.") version ".tar.gz")) (sha256 (base32 - "08gava9wsvpcqz51k2sni3pj03n5155v32d9riqbf305nbirqbkb")))) + "01lgxc1fx5nhlpbwjd5zqghkkbmh6axd98ikx4b0spv0jdg6gf39")))) (properties `((upstream-name . "TxDb.Mmusculus.UCSC.mm10.knownGene"))) (build-system r-build-system) -- cgit v1.2.3 From 0bca8643a2afa3e88333d86a4a5194edc7a60455 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 14 Nov 2018 14:33:06 +0100 Subject: gnu: Add jags. * gnu/packages/statistics.scm (jags): New variable. --- gnu/packages/statistics.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index bd581c154b..0020dd02d0 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -115,6 +115,36 @@ can be imported from spreadsheets, text files and database sources and it can be output in text, PostScript, PDF or HTML.") (license license:gpl3+))) +(define-public jags + (package + (name "jags") + (version "4.3.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/mcmc-jags/JAGS/" + (version-major version) ".x/Source/" + "JAGS-" version ".tar.gz")) + (sha256 + (base32 + "1z3icccg2ic56vmhyrpinlsvpq7kcaflk1731rgpvz9bk1bxvica")))) + (build-system gnu-build-system) + (home-page "http://mcmc-jags.sourceforge.net/") + (native-inputs + `(("gfortran" ,gfortran) + ("lapack" ,lapack))) + (synopsis "Gibbs sampler") + (description "JAGS is Just Another Gibbs Sampler. It is a program for +analysis of Bayesian hierarchical models using Markov Chain Monte Carlo (MCMC) +simulation not wholly unlike BUGS. JAGS was written with three aims in mind: + +@enumerate +@item To have a cross-platform engine for the BUGS language; +@item To be extensible, allowing users to write their own functions, + distributions and samplers; +@item To be a platform for experimentation with ideas in Bayesian modelling. +@end enumerate\n") + (license license:gpl2))) + ;; Update this package together with the set of recommended packages: r-boot, ;; r-class, r-cluster, r-codetools, r-foreign, r-kernsmooth, r-lattice, ;; r-mass, r-matrix, r-mgcv, r-nlme, r-nnet, r-rpart, r-spatial, r-survival. -- cgit v1.2.3 From 0c92f3734e64086599940cf32a37b4cdd3be3648 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 14 Nov 2018 14:32:54 +0100 Subject: gnu: Add r-rjags. * gnu/packages/cran.scm (r-rjags): New variable. --- gnu/packages/cran.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a74ffa773f..093c51ee9a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4728,6 +4728,32 @@ Extract argument descriptions and other parts of the help pages of functions.") (license license:gpl2+))) +(define-public r-rjags + (package + (name "r-rjags") + (version "4-8") + (source + (origin + (method url-fetch) + (uri (cran-uri "rjags" version)) + (sha256 + (base32 + "17xmjksj69f9wk4x71jxk4cgiqhaf2fj6bjm0mgzp4qln5x84a8m")))) + (build-system r-build-system) + (propagated-inputs + `(("r-coda" ,r-coda))) + (inputs + `(("jags" ,jags))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "http://mcmc-jags.sourceforge.net") + (synopsis "Bayesian graphical models using MCMC") + (description + "This package provides an R interface to the JAGS MCMC library. JAGS is +Just Another Gibbs Sampler. It is a program for analysis of Bayesian +hierarchical models using Markov Chain Monte Carlo (MCMC) simulation.") + (license license:gpl2))) + (define-public r-rdpack (package (name "r-rdpack") -- cgit v1.2.3 From 488dc4e1e27327831d08cb8f33a9128dc1b7eb26 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 12 Nov 2018 16:22:28 +0100 Subject: gnu: Add r-abn. * gnu/packages/cran.scm (r-abn): New variable. --- gnu/packages/cran.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 093c51ee9a..446062cce6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4816,6 +4816,43 @@ be added or removed. When working with Word documents, a cursor can be used to help insert or delete content at a specific location in the document.") (license license:gpl3))) +(define-public r-abn + (package + (name "r-abn") + (version "1.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "abn" version)) + (sha256 + (base32 + "00k0razgdb5y5f62622fm7rxkcxrxg470nyyb02dvpfp60254kvs")))) + (build-system r-build-system) + (inputs + `(("gsl" ,gsl))) + (propagated-inputs + `(("r-cairo" ,r-cairo) + ("r-lme4" ,r-lme4) + ("r-mass" ,r-mass) + ("r-nnet" ,r-nnet) + ("r-rcpp" ,r-rcpp) + ("r-rcpparmadillo" ,r-rcpparmadillo) + ("r-rjags" ,r-rjags))) + (home-page "http://www.r-bayesian-networks.org") + (synopsis "Modelling multivariate data with additive bayesian networks") + (description + "Bayesian network analysis is a form of probabilistic graphical models +which derives from empirical data a directed acyclic graph, DAG, describing +the dependency structure between random variables. An additive Bayesian +network model consists of a form of a DAG where each node comprises a +@dfn{generalized linear model} (GLM). Additive Bayesian network models are +equivalent to Bayesian multivariate regression using graphical modelling, they +generalises the usual multivariable regression, GLM, to multiple dependent +variables. This package provides routines to help determine optimal Bayesian +network models for a given data set, where these models are used to identify +statistical dependencies in messy, complex data.") + (license license:gpl2+))) + (define-public r-snakecase (package (name "r-snakecase") -- cgit v1.2.3 From ffdeda3ce06ada0f50455e1bf70c9a2329f2d660 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 12 Nov 2018 16:22:37 +0100 Subject: gnu: Add r-acd. * gnu/packages/cran.scm (r-acd): New variable. --- gnu/packages/cran.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 446062cce6..a5cdbe31b6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4853,6 +4853,26 @@ network models for a given data set, where these models are used to identify statistical dependencies in messy, complex data.") (license license:gpl2+))) +(define-public r-acd + (package + (name "r-acd") + (version "1.5.3") + (source + (origin + (method url-fetch) + (uri (cran-uri "ACD" version)) + (sha256 + (base32 + "1a67bi3hklq8nlc50r0qnyr4k7m9kpvijy8sqqpm54by5hsysfd6")))) + (properties `((upstream-name . "ACD"))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/web/packages/ACD/") + (synopsis "Categorical data analysis with complete or missing responses") + (description + "This package provides tools for categorical data analysis with complete +or missing responses.") + (license license:gpl2+))) + (define-public r-snakecase (package (name "r-snakecase") -- cgit v1.2.3 From acbf23da447d7f0f7acec4eeef83db9bac800b03 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 12 Nov 2018 16:22:46 +0100 Subject: gnu: Add r-acdm. * gnu/packages/cran.scm (r-acdm): New variable. --- gnu/packages/cran.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a5cdbe31b6..d7b331f674 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4873,6 +4873,34 @@ statistical dependencies in messy, complex data.") or missing responses.") (license license:gpl2+))) +(define-public r-acdm + (package + (name "r-acdm") + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (cran-uri "ACDm" version)) + (sha256 + (base32 + "0b4f02ga5ra66mbrm79g0bnlzmii82rks9kmxixxqgf18yhlyjil")))) + (properties `((upstream-name . "ACDm"))) + (build-system r-build-system) + (propagated-inputs + `(("r-dplyr" ,r-dplyr) + ("r-ggplot2" ,r-ggplot2) + ("r-plyr" ,r-plyr) + ("r-rsolnp" ,r-rsolnp) + ("r-zoo" ,r-zoo))) + (home-page "https://cran.r-project.org/web/packages/ACDm/") + (synopsis "Tools for Autoregressive Conditional Duration Models") + (description + "ACDm is a package for Autoregressive Conditional Duration (ACD, Engle +and Russell, 1998) models. It creates trade, price or volume durations from +transactions (tic) data, performs diurnal adjustments, fits various ACD models +and tests them.") + (license license:gpl2+))) + (define-public r-snakecase (package (name "r-snakecase") -- cgit v1.2.3 From 08bf097a0bdd60042195abe89d361b8b664f5a94 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 12 Nov 2018 16:22:54 +0100 Subject: gnu: Add r-overlap. * gnu/packages/cran.scm (r-overlap): New variable. --- gnu/packages/cran.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d7b331f674..b7b1100423 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4901,6 +4901,27 @@ transactions (tic) data, performs diurnal adjustments, fits various ACD models and tests them.") (license license:gpl2+))) +(define-public r-overlap + (package + (name "r-overlap") + (version "0.3.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "overlap" version)) + (sha256 + (base32 + "1j3m6ir1chdz0si2fhcw6gs7c9h09bv0chz18rpzxsywww6d4rzy")))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/web/packages/overlap/") + (synopsis "Estimates of coefficient of overlapping for animal activity patterns") + (description + "This package provides functions to fit kernel density functions to data +on temporal activity patterns of animals; estimate coefficients of overlapping +of densities for two species; and calculate bootstrap estimates of confidence +intervals.") + (license license:gpl3+))) + (define-public r-snakecase (package (name "r-snakecase") -- cgit v1.2.3 From 3cef715a46c1f74e478e3c672e3e587cef3c18bb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 12 Nov 2018 16:23:04 +0100 Subject: gnu: Add r-circular. * gnu/packages/cran.scm (r-circular): New variable. --- gnu/packages/cran.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b7b1100423..73ad9a8bda 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7683,3 +7683,28 @@ features (e.g. local modes).") Data Analysis Using Regression and Multilevel/Hierarchical Models, Cambridge University Press, 2007.") (license license:gpl3+))) + +(define-public r-circular + (package + (name "r-circular") + (version "0.4-93") + (source + (origin + (method url-fetch) + (uri (cran-uri "circular" version)) + (sha256 + (base32 + "0hki85rs8wc5950pjaw28q54rly2napfbcrx3pchlfap6wwy5kkn")))) + (build-system r-build-system) + (propagated-inputs + `(("r-boot" ,r-boot) + ("r-mvtnorm" ,r-mvtnorm))) + (native-inputs + `(("gfortran" ,gfortran))) + (home-page "https://cran.r-project.org/web/packages/circular/") + (synopsis "Circular statistics") + (description + "This package provides tools for circular statistics, from \"Topics in +circular Statistics\" (2001) S. Rao Jammalamadaka and A. SenGupta, World +Scientific.") + (license license:gpl2+))) -- cgit v1.2.3 From 10483a64eebf753ae17695d3c027e5fefa0df644 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 12 Nov 2018 16:23:16 +0100 Subject: gnu: Add r-activity. * gnu/packages/cran.scm (r-activity): New variable. --- gnu/packages/cran.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 73ad9a8bda..8513dff4f5 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7708,3 +7708,29 @@ University Press, 2007.") circular Statistics\" (2001) S. Rao Jammalamadaka and A. SenGupta, World Scientific.") (license license:gpl2+))) + +(define-public r-activity + (package + (name "r-activity") + (version "1.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "activity" version)) + (sha256 + (base32 + "1lqajgxfps2h6amz1791vp3f52rs9ghmanq1nqfxqd2jmk3idkrx")))) + (build-system r-build-system) + (propagated-inputs + `(("r-circular" ,r-circular) + ("r-overlap" ,r-overlap) + ("r-pbapply" ,r-pbapply))) + (home-page "https://cran.r-project.org/web/packages/activity/") + (synopsis "Animal activity statistics") + (description + "This package provides functions to fit kernel density functions to +animal activity time data; plot activity distributions; quantify overall +levels of activity; statistically compare activity metrics through +bootstrapping; and evaluate variation in linear variables with time (or other +circular variables).") + (license license:gpl3))) -- cgit v1.2.3 From e4f4a04a51c657fd9cedcc8c08e8fad858533777 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 12 Nov 2018 16:23:26 +0100 Subject: gnu: Add r-ouch. * gnu/packages/cran.scm (r-ouch): New variable. --- gnu/packages/cran.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8513dff4f5..6ce9bdd16f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7734,3 +7734,23 @@ levels of activity; statistically compare activity metrics through bootstrapping; and evaluate variation in linear variables with time (or other circular variables).") (license license:gpl3))) + +(define-public r-ouch + (package + (name "r-ouch") + (version "2.11-1") + (source + (origin + (method url-fetch) + (uri (cran-uri "ouch" version)) + (sha256 + (base32 + "0xkwwi62vdahlcg3k32zb1nfwsx87zdssk79mvcxgfsw9bw4gahx")))) + (build-system r-build-system) + (propagated-inputs `(("r-subplex" ,r-subplex))) + (home-page "http://kingaa.github.io/ouch/") + (synopsis "Ornstein-Uhlenbeck models for phylogenetic comparative hypotheses") + (description + "This package provides tools to fit and compare Ornstein-Uhlenbeck models +for evolution along a phylogenetic tree.") + (license license:gpl2+))) -- cgit v1.2.3 From ee66a13563dc0ca03865ec3d3d36f8c55e885ac0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 14 Nov 2018 13:56:54 +0100 Subject: gnu: Add jamm. * gnu/packages/bioinformatics.scm (jamm): New variable. --- gnu/packages/bioinformatics.scm | 79 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 674bbb107d..58cee5cbbe 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -14118,6 +14118,85 @@ enrichment analysis (GSEA) calculation with or without the absolute filtering. absolute GSEA.") (license license:gpl2))) +(define-public jamm + (package + (name "jamm") + (version "1.0.7.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mahmoudibrahim/JAMM.git") + (commit (string-append "JAMMv" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ls889jcma1ch9h21jjhnkadgszgqj41842hhcjh6cg88f85qf3i")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; there are none + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "JAMM.sh" + (("^sPath=.*") + (string-append ""))) + #t)) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (libexec (string-append out "/libexec/jamm")) + (bin (string-append out "/bin"))) + (substitute* '("JAMM.sh" + "SignalGenerator.sh") + (("^sPath=.*") + (string-append "sPath=\"" libexec "\"\n"))) + (for-each (lambda (file) + (install-file file libexec)) + (list "bincalculator.r" + "peakfinder.r" + "peakhelper.r" + "signalmaker.r" + "xcorr.r" + "xcorrhelper.r" + ;; Perl scripts + "peakfilter.pl" + "readshifter.pl")) + + (for-each + (lambda (script) + (chmod script #o555) + (install-file script bin) + (wrap-program (string-append bin "/" script) + `("PATH" ":" prefix + (,(string-append (assoc-ref inputs "coreutils") "/bin") + ,(string-append (assoc-ref inputs "gawk") "/bin") + ,(string-append (assoc-ref inputs "perl") "/bin") + ,(string-append (assoc-ref inputs "r-minimal") "/bin"))) + `("PERL5LIB" ":" prefix (,(getenv "PERL5LIB"))) + `("R_LIBS_SITE" ":" prefix (,(getenv "R_LIBS_SITE"))))) + (list "JAMM.sh" "SignalGenerator.sh"))) + #t))))) + (inputs + `(("bash" ,bash) + ("coreutils" ,coreutils) + ("gawk" ,gawk) + ("perl" ,perl) + ("r-minimal" ,r-minimal) + ;;("r-parallel" ,r-parallel) + ("r-signal" ,r-signal) + ("r-mclust" ,r-mclust))) + (home-page "https://github.com/mahmoudibrahim/JAMM") + (synopsis "Peak finder for NGS datasets") + (description + "JAMM is a peak finder for next generation sequencing datasets (ChIP-Seq, +ATAC-Seq, DNase-Seq, etc.) that can integrate replicates and assign peak +boundaries accurately. JAMM is applicable to both broad and narrow +datasets.") + (license license:gpl3+))) + (define-public ngless (package (name "ngless") -- cgit v1.2.3 From bac2974e8600c1a9b22f17d8b1cd75340731347f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 14 Nov 2018 15:40:19 +0100 Subject: gnu: feh: Update to 3.0. * gnu/packages/image-viewers.scm (feh): Update to 3.0. --- gnu/packages/image-viewers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 518417707f..029d5b5443 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -60,7 +60,7 @@ (define-public feh (package (name "feh") - (version "2.28.1") + (version "3.0") (home-page "https://feh.finalrewind.org/") (source (origin (method url-fetch) @@ -68,7 +68,7 @@ name "-" version ".tar.bz2")) (sha256 (base32 - "0wian0gnx0yfxf8x9b8wr57fjd6rnmi3y3xj83ni6x0xqrjnf1lp")))) + "00fwf8yz7k8vzd30ly5ndlj6ax9w85dkjzjnlk95vd0zdrf4wyxn")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (delete 'configure)) -- cgit v1.2.3 From d63f58848601cf45f60c88d9bb0f789ac1aa8438 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 14 Nov 2018 19:32:41 +0100 Subject: gnu: sudo: Update to 1.8.26. * gnu/packages/admin.scm (sudo): Update to 1.8.26. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index fa60cadd01..2247902898 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -979,7 +979,7 @@ system administrator.") (define-public sudo (package (name "sudo") - (version "1.8.25p1") + (version "1.8.26") (source (origin (method url-fetch) (uri @@ -989,7 +989,7 @@ system administrator.") version ".tar.gz"))) (sha256 (base32 - "0nqri46d4dpycj96zin2f2wszmhm7q9mr68hhj9sp81pgmx9rjcx")) + "1qpyyfga8rs02p3186sns8qvh2bzwa48ka845nrcqh83dyd23nj0")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 7939387da83437918b87d00b06b19b7c987ed171 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 14 Nov 2018 19:54:10 +0100 Subject: gnu: nano: Update to 3.2. * gnu/packages/nano.scm (nano): Update to 3.2. --- gnu/packages/nano.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/nano.scm b/gnu/packages/nano.scm index 8f96b605a6..057e8c3bd9 100644 --- a/gnu/packages/nano.scm +++ b/gnu/packages/nano.scm @@ -30,7 +30,7 @@ (define-public nano (package (name "nano") - (version "3.1") + (version "3.2") (source (origin (method url-fetch) @@ -38,7 +38,7 @@ version ".tar.xz")) (sha256 (base32 - "17kinzyv6vwgyx2d0ym1kp65qbf7kxzwpyg21ic1rijv1aj2rh0l")))) + "0jb3zq0v84xb0chyynkcp2jhs9660wmpkic294p4p6c96npp69yi")))) (build-system gnu-build-system) (inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From 24dd6ec38ae6b54d4b9dc91fc2fe1119816a0a90 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 14 Nov 2018 20:19:07 +0100 Subject: gnu: mtools: Update to 4.0.20. * gnu/packages/mtools.scm (mtools): Update to 4.0.20. [source](uri): Change to 'bz2' compressed tarball. --- gnu/packages/mtools.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mtools.scm b/gnu/packages/mtools.scm index e4750f579f..5e3c3dd378 100644 --- a/gnu/packages/mtools.scm +++ b/gnu/packages/mtools.scm @@ -28,15 +28,15 @@ (define-public mtools (package (name "mtools") - (version "4.0.19") + (version "4.0.20") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/mtools/mtools-" - version ".tar.gz")) + version ".tar.bz2")) (sha256 (base32 - "003qnj4rs22v2sih3is55scvav8xq9p1dp5b7gnyl67a60ky516r")))) + "1vcahr9s6zv1hnrx2bgjnzcas2y951q90r1jvvv4q9v5kwfd6qb0")))) (build-system gnu-build-system) (home-page "https://www.gnu.org/software/mtools/") (synopsis "Access MS-DOS disks without mounting") -- cgit v1.2.3 From e921993c25626541385f191f0463cad8e5e5c5c7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 14 Nov 2018 20:52:39 +0100 Subject: gnu: xf86-video-r128: Update to 6.12.0. * gnu/packages/xorg.scm (xf86-video-r128): Update to 6.12.0. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 49baef5f04..19ec6f5370 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3174,14 +3174,14 @@ This driver is intended for the spice qxl virtio device.") (define-public xf86-video-r128 (package (name "xf86-video-r128") - (version "6.11.0") + (version "6.12.0") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/driver/" name "-" version ".tar.bz2")) (sha256 (base32 - "0snvwmrh8dqyyaq7ggicym6yrsg4brygkx9156r0m095m7fp3rav")))) + "0mz0v5mqmmbncr2drd5zvia1fb7frz2xqwflhhqbnaxx5j48c740")))) (build-system gnu-build-system) (inputs `(("mesa" ,mesa) ("xorgproto" ,xorgproto) -- cgit v1.2.3 From 7d9d521fbcf1423f66d6f33208c03d5dacb7ba50 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 12 Nov 2018 20:23:17 +0100 Subject: 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(+) (limited to 'gnu') 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 -- cgit v1.2.3 From 7a54b2281d1f60fd0ae2e058c219c5a600ad756b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 14 Nov 2018 17:42:33 +0100 Subject: gnu: guix-daemon: Install 'guix-authenticate'. Fixes . Reported by Konrad Hinsen . * gnu/packages/package-management.scm (guix-daemon)[arguments]: In 'install' phase, build "install-nodist_libexecSCRIPTS" target to install 'guix-authenticate'. --- gnu/packages/package-management.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 1fd071b32f..dc265060b7 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -345,7 +345,8 @@ the Nix package manager.") (replace 'install (lambda* (#:key outputs #:allow-other-keys) (invoke "make" "install-binPROGRAMS" - "install-nodist_pkglibexecSCRIPTS") + "install-nodist_pkglibexecSCRIPTS" + "install-nodist_libexecSCRIPTS") ;guix-authenticate ;; We need to tell 'guix-daemon' which 'guix' command to use. ;; Here we use a questionable hack where we hard-code root's -- cgit v1.2.3 From 54fcd547b330423c91559ad384092c1a4a786065 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Mon, 12 Nov 2018 16:00:33 +0000 Subject: gnu: Add python-mpi4py. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/mpi.scm (python-mpi4py): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/mpi.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index fc8aadef29..f08a7f5f88 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2017 Dave Love ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Paul Garlick ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,6 +30,7 @@ #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system gnu) + #:use-module (guix build-system python) #:use-module (gnu packages) #:use-module (gnu packages gcc) #:use-module (gnu packages linux) @@ -263,3 +265,43 @@ only provides @code{MPI_THREAD_FUNNELED}."))) ;; in the build environment than the package wants while testing. (setenv "OMPI_MCA_rmaps_base_oversubscribe" "yes") #t)) + +(define-public python-mpi4py + (package + (name "python-mpi4py") + (version "3.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "mpi4py" version)) + (sha256 + (base32 + "1mzgd26dfv4vwbci8gq77ss9f0x26i9aqzq9b9vs9ndxhlnv0mxl")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'build 'mpi-setup + ,%openmpi-setup) + (add-before 'check 'pre-check + (lambda _ + ;; Skip BaseTestSpawn class (causes error 'ompi_dpm_dyn_init() + ;; failed --> Returned "Unreachable"' in chroot environment). + (substitute* "test/test_spawn.py" + (("unittest.skipMPI\\('openmpi\\(<3.0.0\\)'\\)") + "unittest.skipMPI('openmpi')")) + #t))))) + (inputs + `(("openmpi" ,openmpi))) + (home-page "https://bitbucket.org/mpi4py/mpi4py/") + (synopsis "Python bindings for the Message Passing Interface standard") + (description "MPI for Python (mpi4py) provides bindings of the Message +Passing Interface (MPI) standard for the Python programming language, allowing +any Python program to exploit multiple processors. + +mpi4py is constructed on top of the MPI-1/MPI-2 specification and provides an +object oriented interface which closely follows MPI-2 C++ bindings. It +supports point-to-point and collective communications of any picklable Python +object as well as optimized communications of Python objects (such as NumPy +arrays) that expose a buffer interface.") + (license bsd-3))) -- cgit v1.2.3 From 90ff287401f6b143e4b91de58e985f2597e30fc6 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Mon, 12 Nov 2018 16:00:34 +0000 Subject: gnu: Add python-petsc4py. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (python-petsc4py): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/maths.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 0d040bf296..e36a5744d8 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1808,6 +1808,41 @@ scientific applications modeled by partial differential equations.") ,@(delete "--with-mpi=0" ,cf))))) (synopsis "Library to solve PDEs (with complex scalars and MPI support)"))) +(define-public python-petsc4py + (package + (name "python-petsc4py") + (version "3.9.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "petsc4py" version)) + (sha256 + (base32 + "1f8zd1ac9irsgkyqmzq30d9kl10fy1nh6zk312dhs43g449fkkhc")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'pre-build + (lambda _ + ;; Define path to PETSc installation. + (setenv "PETSC_DIR" (assoc-ref %build-inputs "petsc")) + #t)) + (add-before 'check 'mpi-setup + ,%openmpi-setup)))) + (inputs + `(("petsc" ,petsc-openmpi) + ("python-numpy" ,python-numpy))) + (home-page "https://bitbucket.org/petsc/petsc4py/") + (synopsis "Python bindings for PETSc") + (description "PETSc, the Portable, Extensible Toolkit for +Scientific Computation, is a suite of data structures and routines for +the scalable (parallel) solution of scientific applications modeled by +partial differential equations. It employs the MPI standard for all +message-passing communication. @code{petsc4py} provides Python +bindings to almost all functions of PETSc.") + (license license:bsd-3))) + (define-public python-kiwisolver (package (name "python-kiwisolver") -- cgit v1.2.3 From 6b5687d053a4d0211e6ded1a8d129d065c71430c Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Mon, 12 Nov 2018 16:00:35 +0000 Subject: gnu: Add python-slepc4py. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (python-slepc4py): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/maths.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index e36a5744d8..b1cddfd80a 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1974,6 +1974,43 @@ arising after the discretization of partial differential equations.") ,@(alist-delete "petsc" (package-propagated-inputs slepc-openmpi)))) (synopsis "Scalable library for eigenproblems (with complex scalars and MPI support)"))) +(define-public python-slepc4py + (package + (name "python-slepc4py") + (version "3.9.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "slepc4py" version)) + (sha256 + (base32 + "02xr0vndgibgkz3rgprqk05n3mk5mpgqw550sr4681vcsgz4zvb7")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'pre-build + (lambda _ + ;; Define path to PETSc installation. + (setenv "PETSC_DIR" (assoc-ref %build-inputs "petsc")) + ;; Define path to SLEPc installation. + (setenv "SLEPC_DIR" (assoc-ref %build-inputs "slepc")) + #t)) + (add-before 'check 'mpi-setup + ,%openmpi-setup)))) + (inputs + `(("python-numpy" ,python-numpy) + ("python-petsc4py" ,python-petsc4py) + ("slepc" ,slepc-openmpi))) + (home-page "https://bitbucket.org/slepc/slepc4py/") + (synopsis "Python bindings for SLEPc") + (description "SLEPc, the Scalable Library for Eigenvalue Problem +Computations, is based on PETSc, the Portable, Extensible Toolkit for +Scientific Computation. It employs the MPI standard for all +message-passing communication. @code{slepc4py} provides Python +bindings to almost all functions of SLEPc.") + (license license:bsd-3))) + (define-public mumps (package (name "mumps") -- cgit v1.2.3 From f7a4757a4cabfe70f07216ab3f7eac60a80b82ad Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Mon, 12 Nov 2018 16:00:36 +0000 Subject: gnu: Add python-fenics-dijitso. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/simulation.scm (python-fenics-dijitso): New varaible. Signed-off-by: Ludovic Courtès --- gnu/packages/simulation.scm | 51 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index a5b661e34d..86b1aba695 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017 Paul Garlick +;;; Copyright © 2017, 2018 Paul Garlick ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,6 +22,7 @@ #:use-module (gnu packages bash) #:use-module (gnu packages bison) #:use-module (gnu packages boost) + #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages flex) #:use-module (gnu packages gettext) @@ -35,6 +36,7 @@ #:use-module (gnu packages mpi) #:use-module (gnu packages multiprecision) #:use-module (gnu packages ncurses) + #:use-module (gnu packages python) #:use-module (gnu packages readline) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) @@ -43,6 +45,7 @@ #:use-module (guix download) #:use-module (guix build utils) #:use-module (guix build-system gnu) + #:use-module (guix build-system python) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) @@ -221,3 +224,49 @@ with gas/liquid interfaces. Large problems may be split into smaller, connected problems for efficient solution on parallel systems.") (license license:gpl3+) (home-page "https://openfoam.org"))) + +(define-public python-fenics-dijitso + (package + (name "python-fenics-dijitso") + (version "2018.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "fenics-dijitso" version)) + (sha256 + (base32 + "1qax2f52qsjbd1h5lk5i5shp448qlakxabjjybrfc1w823p0yql9")))) + (build-system python-build-system) + (inputs + `(("openmpi" ,openmpi) + ("python-numpy" ,python-numpy))) + (native-inputs + `(("python-pytest-cov" ,python-pytest-cov))) + (propagated-inputs + `(("python-mpi4py" ,python-mpi4py))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'build 'mpi-setup + ,%openmpi-setup) + (replace 'check + (lambda _ + (setenv "HOME" "/tmp") + (setenv "PYTHONPATH" + (string-append (getcwd) ":" (getenv "PYTHONPATH"))) + (with-directory-excursion "test" + (invoke "./runtests.sh")) + #t))))) + (home-page "https://bitbucket.org/fenics-project/dijitso/") + (synopsis "Distributed just-in-time building of shared libraries") + (description + "Dijitso provides a core component of the @code{FEniCS} framework, +namely the just-in-time compilation of C++ code that is generated from +Python modules. It is called from within a C++ library, using ctypes +to import the dynamic shared library directly. + +As long as the compiled code can provide a simple factory function to +a class implementing a predefined C++ interface, there is no limit to +the complexity of that interface. Parallel support depends on the +@code{mpi4py} interface.") + (license license:lgpl3+))) -- cgit v1.2.3 From 3941cf5afa8cca3852651defb8e55dec89dee19c Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Mon, 12 Nov 2018 16:00:37 +0000 Subject: gnu: Add python-fenics-ufl. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/simulation.scm (python-fenics-ufl): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/simulation.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 86b1aba695..7165fb55fb 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -270,3 +270,40 @@ a class implementing a predefined C++ interface, there is no limit to the complexity of that interface. Parallel support depends on the @code{mpi4py} interface.") (license license:lgpl3+))) + +(define-public python-fenics-ufl + (package + (name "python-fenics-ufl") + (version "2018.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "fenics-ufl" version)) + (sha256 + (base32 + "1fq8yc86s1s3c8c0b1rc2vf265q0hrkzg57100fg1nghcz0p4vla")))) + (build-system python-build-system) + (inputs + `(("python-numpy" ,python-numpy))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (setenv "PYTHONPATH" + (string-append (getcwd) ":" (getenv "PYTHONPATH"))) + (with-directory-excursion "test" + (invoke "py.test")) + #t))))) + (home-page "https://bitbucket.org/fenics-project/ufl/") + (synopsis "Unified language for form-compilers") + (description "The Unified Form Language (UFL) is a domain specific +language for declaration of finite element discretizations of +variational forms. More precisely, it defines a flexible interface +for choosing finite element spaces and defining expressions for weak +forms in a notation close to mathematical notation. + +UFL is part of the FEniCS Project.") + (license license:lgpl3+))) -- cgit v1.2.3 From 0fc499834f7357a8bb76cca06b8979c67961b316 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Mon, 12 Nov 2018 16:00:38 +0000 Subject: gnu: Add python-fenics-fiat. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/simulation.scm (python-fenics-fiat): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/simulation.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 7165fb55fb..ecdb2b2020 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -307,3 +307,45 @@ forms in a notation close to mathematical notation. UFL is part of the FEniCS Project.") (license license:lgpl3+))) + +(define-public python-fenics-fiat + (package + (name "python-fenics-fiat") + (version "2018.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "fenics-fiat" version)) + (sha256 + (base32 + "0fmjd93r6bwf6xs8csw86qzphrnr66xwv7f372w59gmq8mg6rljc")))) + (build-system python-build-system) + (native-inputs + `(("python-pytest" ,python-pytest))) + (propagated-inputs + `(("python-numpy" ,python-numpy) + ("python-sympy" ,python-sympy))) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (setenv "PYTHONPATH" + (string-append (getcwd) ":" (getenv "PYTHONPATH"))) + (with-directory-excursion "test" + (invoke "py.test" "unit/")) + #t))))) + (home-page "https://bitbucket.org/fenics-project/fiat/") + (synopsis "Tabulation of finite element function spaces") + (description + "The FInite element Automatic Tabulator (FIAT) supports +generation of arbitrary order instances of the Lagrange elements on +lines, triangles, and tetrahedra. It is also capable of generating +arbitrary order instances of Jacobi-type quadrature rules on the same +element shapes. Further, H(div) and H(curl) conforming finite element +spaces such as the families of Raviart-Thomas, Brezzi-Douglas-Marini +and Nedelec are supported on triangles and tetrahedra. Upcoming +versions will also support Hermite and nonconforming elements. + +FIAT is part of the FEniCS Project.") + (license license:lgpl3+))) -- cgit v1.2.3 From 6b7f1f8afa996e8882d2ca9145d39bbabf85c160 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Mon, 12 Nov 2018 16:00:39 +0000 Subject: gnu: Add python-fenics-ffc. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/simulation.scm (python-fenics-ffc): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/simulation.scm | 52 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index ecdb2b2020..d1a5e46264 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -349,3 +349,55 @@ versions will also support Hermite and nonconforming elements. FIAT is part of the FEniCS Project.") (license license:lgpl3+))) + +(define-public python-fenics-ffc + (package + (name "python-fenics-ffc") + (version "2018.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "fenics-ffc" version)) + (sha256 + (base32 + "1b2ia5vlkw298x7rf0k2p3ihlpwkwgc98p3s6sbpds3hqmfrzdz9")))) + (build-system python-build-system) + (native-inputs + `(("python-pytest" ,python-pytest))) + (propagated-inputs + `(("python-fenics-dijitso" ,python-fenics-dijitso) + ("python-fenics-fiat" ,python-fenics-fiat) + ("python-fenics-ufl" ,python-fenics-ufl))) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (setenv "HOME" (getcwd)) + (setenv "PYTHONPATH" + (string-append (getcwd) ":" (getenv "PYTHONPATH"))) + (with-directory-excursion "test" + ;; FIXME: the tests in subdirectory + ;; 'unit/ufc/finite_element' require the ffc_factory + ;; extension module. This module, located in the 'libs' + ;; subdirectory, needs to be built and made accessible + ;; prior to running the tests. + (invoke "py.test" "unit/" "--ignore=unit/ufc/") + (with-directory-excursion "uflacs" + (invoke "py.test" "unit/"))) + #t))))) + (home-page "https://bitbucket.org/fenics-project/ffc/") + (synopsis "Compiler for finite element variational forms") + (description "The FEniCS Form Compiler (FFC) is a compiler for +finite element variational forms. From a high-level description of +the form, it generates efficient low-level C++ code that can be used +to assemble the corresponding discrete operator (tensor). In +particular, a bilinear form may be assembled into a matrix and a +linear form may be assembled into a vector. FFC may be used either +from the command line (by invoking the @code{ffc} command) or as a +Python module (@code{import ffc}). + +FFC is part of the FEniCS Project.") + ;; There are two files released with a public domain licence; + ;; ufc.h and ufc_geometry.h, in subdirectory 'ffc/backends/ufc'. + (license (list license:public-domain license:lgpl3+)))) -- cgit v1.2.3 From 0ace6c0b842660563b961069824ef0f823e6b24d Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Mon, 12 Nov 2018 16:00:40 +0000 Subject: gnu: Add fenics-dolfin. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/simulation.scm (fenics-dolfin): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/simulation.scm | 191 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 191 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index d1a5e46264..bd139d3b21 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -18,11 +18,13 @@ (define-module (gnu packages simulation) #:use-module (gnu packages) + #:use-module (gnu packages algebra) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bison) #:use-module (gnu packages boost) #:use-module (gnu packages check) + #:use-module (gnu packages cmake) #:use-module (gnu packages compression) #:use-module (gnu packages flex) #:use-module (gnu packages gettext) @@ -36,6 +38,7 @@ #:use-module (gnu packages mpi) #:use-module (gnu packages multiprecision) #:use-module (gnu packages ncurses) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages readline) #:use-module (gnu packages tls) @@ -44,6 +47,7 @@ #:use-module (gnu packages xorg) #:use-module (guix download) #:use-module (guix build utils) + #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module ((guix licenses) #:prefix license:) @@ -401,3 +405,190 @@ FFC is part of the FEniCS Project.") ;; There are two files released with a public domain licence; ;; ufc.h and ufc_geometry.h, in subdirectory 'ffc/backends/ufc'. (license (list license:public-domain license:lgpl3+)))) + +(define-public fenics-dolfin + (package + (name "fenics-dolfin") + (version "2018.1.0.post1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://bitbucket.org/fenics-project/dolfin/get/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "12zkk8j3xsg6l8p0ggwsl03084vlcivw4h99b7z9kndg7k89b3ya")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Make sure we don't use the bundled test framework. + (delete-file-recursively "test/unit/cpp/catch") + (substitute* "test/unit/cpp/main.cpp" + ;; Use standard search paths for 'catch' header file. + (("#include.*") + "#include \n")) + (substitute* "test/unit/cpp/CMakeLists.txt" + ;; Add extra include directories required by the unit tests. + (("(^target_link_libraries.*)" line) + (string-append line "\n" + "target_include_directories(" + "unittests PRIVATE " + "${DOLFIN_SOURCE_DIR} " + "${DOLFIN_SOURCE_DIR}/dolfin " + "${DOLFIN_BINARY_DIR})\n")) + (("(^set\\(CATCH_INCLUDE_DIR ).*(/catch\\))" _ front back) + (string-append front + "$ENV{CATCH_DIR}" + "/include" back "\n"))) + (substitute* "demo/CMakeLists.txt" + ;; Add extra include directories required by the demo tests. + (("(^#find_package.*)" line) + (string-append line "\n" + "include_directories(" + "${DOLFIN_SOURCE_DIR} " + "${DOLFIN_SOURCE_DIR}/dolfin " + "${DOLFIN_BINARY_DIR})\n"))) + #t)))) + (build-system cmake-build-system) + (inputs + `(("blas" ,openblas) + ("boost" ,boost) + ("eigen" ,eigen) + ("hdf5" ,hdf5-parallel-openmpi) + ("lapack" ,lapack) + ("libxml2" ,libxml2) + ("openmpi" ,openmpi) + ("python" ,python-3) + ("scotch" ,pt-scotch32) + ("suitesparse" ,suitesparse) + ("sundials" ,sundials-openmpi) + ("zlib" ,zlib))) + (native-inputs + `(("catch" ,catch-framework2) + ("pkg-config" ,pkg-config))) + (propagated-inputs + `(("ffc" ,python-fenics-ffc) + ("petsc" ,petsc-openmpi) + ("slepc" ,slepc-openmpi))) + (arguments + `(#:configure-flags + `("-DDOLFIN_ENABLE_DOCS:BOOL=OFF" + "-DDOLFIN_ENABLE_HDF5:BOOL=ON" + "-DDOLFIN_ENABLE_MPI:BOOL=ON" + "-DDOLFIN_ENABLE_PARMETIS:BOOL=OFF" + "-DDOLFIN_ENABLE_SCOTCH:BOOL=ON" + "-DDOLFIN_ENABLE_SUNDIALS:BOOL=ON" + "-DDOLFIN_ENABLE_TRILINOS:BOOL=OFF") + #:phases + (modify-phases %standard-phases + (add-after 'patch-usr-bin-file 'mpi-setup + ,%openmpi-setup) + (add-after 'patch-source-shebangs 'set-paths + (lambda _ + ;; Define paths to store locations. + (setenv "BLAS_DIR" (assoc-ref %build-inputs "blas")) + (setenv "CATCH_DIR" (assoc-ref %build-inputs "catch")) + (setenv "LAPACK_DIR" (assoc-ref %build-inputs "lapack")) + (setenv "PETSC_DIR" (assoc-ref %build-inputs "petsc")) + (setenv "SLEPC_DIR" (assoc-ref %build-inputs "slepc")) + (setenv "SCOTCH_DIR" (assoc-ref %build-inputs "scotch")) + (setenv "SUNDIALS_DIR" (assoc-ref %build-inputs "sundials")) + (setenv "UMFPACK_DIR" (assoc-ref %build-inputs "suitesparse")) + #t)) + (add-before 'check 'pre-check + (lambda _ + ;; The Dolfin repository uses git-lfs, whereby web links are + ;; substituted for large files. Guix does not currently support + ;; git-lfs, so only the links are downloaded. The tests that + ;; require the absent meshes cannot run and are skipped. + ;; + ;; Two other serial tests fail and are skipped. + ;; i) demo_stokes-iterative_serial, + ;; The MPI_Comm_rank() function was called before MPI_INIT was + ;; invoked + ;; ii) demo_multimesh-stokes_serial: + ;; Warning: Found no facets matching domain for boundary + ;; condition. + ;; + ;; One mpi test fails and is skipped. + ;; i) demo_stokes-iterative_mpi: + ;; The MPI_Comm_rank() function was called before MPI_INIT was + ;; invoked + (call-with-output-file "CTestCustom.cmake" + (lambda (port) + (display + (string-append + "set(CTEST_CUSTOM_TESTS_IGNORE " + "demo_bcs_serial " + "demo_bcs_mpi " + "demo_eigenvalue_serial " + "demo_eigenvalue_mpi " + "demo_navier-stokes_serial " + "demo_navier-stokes_mpi " + "demo_stokes-taylor-hood_serial " + "demo_stokes-taylor-hood_mpi " + "demo_subdomains_serial " + "demo_advection-diffusion_serial " + "demo_advection-diffusion_mpi " + "demo_auto-adaptive-navier-stokes_serial " + "demo_contact-vi-snes_serial " + "demo_contact-vi-snes_mpi " + "demo_contact-vi-tao_serial " + "demo_contact-vi-tao_mpi " + "demo_curl-curl_serial " + "demo_curl-curl_mpi " + "demo_dg-advection-diffusion_serial " + "demo_dg-advection-diffusion_mpi " + "demo_elasticity_serial " + "demo_elasticity_mpi " + "demo_elastodynamics_serial " + "demo_elastodynamics_mpi " + "demo_lift-drag_serial " + "demo_lift-drag_mpi " + "demo_mesh-quality_serial " + "demo_mesh-quality_mpi " + "demo_multimesh-stokes_serial " + "demo_stokes-iterative_serial " + "demo_stokes-iterative_mpi " + ")\n") port))) + #t)) + (replace 'check + (lambda _ + (and (invoke "make" "unittests") + (invoke "make" "demos") + (invoke "ctest" "-R" "unittests") + (invoke "ctest" "-R" "demo" "-R" "serial") + (invoke "ctest" "-R" "demo" "-R" "mpi"))))))) + (home-page "https://bitbucket.org/fenics-project/dolfin/") + (synopsis "Problem solving environment for differential equations") + (description + "DOLFIN is a computational framework for finding numerical +solutions to problems described by differential equations. Numerical +models in DOLFIN are constructed using general families of finite +elements. Data structures are provided for discretizing the governing +system on a computational mesh. A compact syntax, similar to +mathematical notation, is made available for defining function spaces +and expressing variational forms. Interfaces to specialized matrix +solvers are provided for solving the resultant linear systems. + +@code{fenics-dolfin} is part of the FEniCS project. It is the C++ +user interface to the FEniCS core components and external libraries.") + ;; The source code for the DOLFIN C++ library is licensed under the + ;; GNU Lesser General Public License, version 3 or later, with the + ;; following exceptions: + ;; + ;; public-domain: dolfin/geometry/predicates.cpp + ;; dolfin/geometry/predicates.h + ;; + ;; zlib: dolfin/io/base64.cpp + ;; dolfin/io/base64.h + ;; + ;; expat: dolfin/io/pugiconfig.hpp + ;; dolfin/io/pugixml.cpp + ;; dolfin/io/pugixml.hpp + (license (list license:public-domain + license:zlib + license:expat + license:lgpl3+)))) -- cgit v1.2.3 From ae0f1dd1a496d489aab5a2ea46f916a9b96d3618 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Mon, 12 Nov 2018 16:00:41 +0000 Subject: gnu: Add fenics. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/simulation.scm (fenics): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/simulation.scm | 117 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index bd139d3b21..6144e236a7 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -592,3 +592,120 @@ user interface to the FEniCS core components and external libraries.") license:zlib license:expat license:lgpl3+)))) + +(define-public fenics + (package (inherit fenics-dolfin) + (name "fenics") + (build-system python-build-system) + (inputs + `(("pybind11" ,pybind11) + ("python-matplotlib" ,python-matplotlib) + ,@(alist-delete "python" (package-inputs fenics-dolfin)))) + (native-inputs + `(("cmake" ,cmake) + ("ply" ,python-ply) + ("pytest" ,python-pytest) + ("python-decorator" ,python-decorator) + ("python-pkgconfig" ,python-pkgconfig) + ,@(package-native-inputs fenics-dolfin))) + (propagated-inputs + `(("dolfin" ,fenics-dolfin) + ("petsc4py" ,python-petsc4py) + ("slepc4py" ,python-slepc4py))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'patch-source-shebangs 'set-paths + (lambda _ + ;; Define paths to store locations. + (setenv "PYBIND11_DIR" (assoc-ref %build-inputs "pybind11")) + ;; Move to python sub-directory. + (chdir "python") + #t)) + (add-after 'build 'mpi-setup + ,%openmpi-setup) + (add-before 'check 'pre-check + (lambda _ + ;; Exclude tests that require meshes supplied by git-lfs. + (substitute* "demo/test.py" + (("(.*stem !.*)" line) + (string-append + line "\n" + "excludeList = [\n" + "'multimesh-quadrature', \n" + "'multimesh-marking', \n" + "'mixed-poisson-sphere', \n" + "'mesh-quality', \n" + "'lift-drag', \n" + "'elastodynamics', \n" + "'dg-advection-diffusion', \n" + "'contact-vi-tao', \n" + "'contact-vi-snes', \n" + "'collision-detection', \n" + "'buckling-tao', \n" + "'auto-adaptive-navier-stokes', \n" + "'advection-diffusion', \n" + "'subdomains', \n" + "'stokes-taylor-hood', \n" + "'stokes-mini', \n" + "'navier-stokes', \n" + "'eigenvalue']\n" + "demos = [" + "d for d in demos if d[0].stem not in " + "excludeList]\n"))) + (setenv "HOME" (getcwd)) + (setenv "PYTHONPATH" + (string-append + (getcwd) "/build/lib.linux-x86_64-" + ,(version-major+minor (package-version python)) ":" + (getenv "PYTHONPATH"))) + ;; Restrict OpenBLAS to MPI-only in preference to MPI+OpenMP. + (setenv "OPENBLAS_NUM_THREADS" "1") + #t)) + (replace 'check + (lambda _ + (with-directory-excursion "test" + ;; Note: The test test_snes_set_from_options() in the file + ;; unit/nls/test_PETScSNES_solver.py fails and is ignored. + (and (invoke "py.test" "unit" "--ignore" + "unit/nls/test_PETScSNES_solver.py") + (invoke "mpirun" "-np" "3" "python" "-B" "-m" + "pytest" "unit" "--ignore" + "unit/nls/test_PETScSNES_solver.py"))) + (with-directory-excursion "demo" + ;; Check demos. + (invoke "python" "generate-demo-files.py") + (and (invoke "python" "-m" "pytest" "-v" "test.py") + (invoke "python" "-m" "pytest" "-v" "test.py" + "--mpiexec=mpiexec" "--num-proc=3"))) + #t)) + (add-after 'install 'install-demo-files + (lambda* (#:key outputs #:allow-other-keys) + (let* ((demos (string-append + (assoc-ref outputs "out") + "/share/python-dolfin/demo"))) + (mkdir-p demos) + (with-directory-excursion "demo" + (for-each (lambda (file) + (let* ((dir (dirname file)) + (tgt-dir (string-append demos "/" dir))) + (unless (equal? "." dir) + (mkdir-p tgt-dir) + (install-file file tgt-dir)))) + (find-files "." ".*\\.(py|gz|xdmf)$")))) + #t))))) + (home-page "https://fenicsproject.org/") + (synopsis "High-level environment for solving differential equations") + (description + "@code{fenics} is a computing platform for solving general classes of +problems that involve differential equations. @code{fenics} facilitates +access to efficient methods for dealing with ordinary differential +equations (ODEs) and partial differential equations (PDEs). Systems of +equations such as these are commonly encountered in areas of engineering, +mathematics and the physical sciences. It is particularly well-suited to +problems that can be solved using the Finite Element Method (FEM). + +@code{fenics} is the top level of the set of packages that are developed +within the FEniCS project. It provides the python user interface to the +FEniCS core components and external libraries.") + (license license:lgpl3+))) -- cgit v1.2.3 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: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 6a1cff70bce9a144bcf2c503e44485c7e6656315 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 14 Nov 2018 19:13:46 -0500 Subject: gnu: linux-libre@4.9: Update to 4.9.137. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.137. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 6b7aa89931..ff3cca3640 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -439,8 +439,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.136" - "1kk6px1jcwbgkpfmf9pdklk6kz90h5l8fvdqwmvnk4bz6b2xrrfp" + (make-linux-libre "4.9.137" + "1d8313r2k0qr4x7nqlnbwn5lzfc7dz6w8sfg47jml1q38c2fyjf2" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From 24ba798731076923462de35db0567bcb0cefb7ab Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 14 Nov 2018 19:14:39 -0500 Subject: gnu: linux-libre@4.14: Update to 4.14.81. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.81. (%linux-libre-4.14-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ff3cca3640..7148299188 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -429,8 +429,8 @@ It has been modified to remove all non-free binary blobs.") #:patches %linux-libre-4.19-patches #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.80") -(define %linux-libre-4.14-hash "0h4hi5lqizdx5nk0f3immbcv2n7p5jh26m80v4x6bw4wi5b44fra") +(define %linux-libre-4.14-version "4.14.81") +(define %linux-libre-4.14-hash "0vxs8k7ka8aqnn1fcr88bhr07wa5jg83pq1rcjby9k422mbv254q") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.2.3 From 7413c316934d2cfb24412805f9f9a0a9e047f980 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 14 Nov 2018 19:16:24 -0500 Subject: gnu: linux-libre: Update to 4.19.2. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.19.2. (%linux-libre-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7148299188..28c699cce4 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -406,8 +406,8 @@ It has been modified to remove all non-free binary blobs.") ;; supports qemu "virt" machine and possibly a large number of ARM boards. ;; See : https://wiki.debian.org/DebianKernel/ARMMP. -(define %linux-libre-version "4.19.1") -(define %linux-libre-hash "12mrrgg2ih4jiylpy45q5nsd8afj3nya0klr543s0mcga88v9527") +(define %linux-libre-version "4.19.2") +(define %linux-libre-hash "1yh4ll9qh4wmf9r62ksyic57g1iy1b84qbv855l545ilk12znbmj") (define %linux-libre-4.19-patches (list %boot-logo-patch -- cgit v1.2.3 From cb8ba848d2d0fc1ccd7b64a70858fdcc3e1b084a Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 27 Jun 2018 19:14:51 -0400 Subject: 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(-) (limited to 'gnu') 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: -- cgit v1.2.3 From fccacffbf46ca51e76f67e4c51eb0fb081e12576 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 27 Jun 2018 20:42:35 -0400 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 9922278b25d552ea5bfc4a3a94f2837dc41eaa9d Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 27 Jun 2018 20:46:38 -0400 Subject: 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(-) (limited to 'gnu') 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")) -- cgit v1.2.3 From 366c1cbbc623fd94de05bde7c67e61ec0360aded Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 27 Jun 2018 20:51:35 -0400 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From 4851af9ebe3949354a2d22ca932bbecb072c5024 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 27 Jun 2018 21:01:27 -0400 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 9dcfd6aac97044474b3df9aeb67a56e2fdaa87fb Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 27 Jun 2018 21:08:56 -0400 Subject: 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(-) (limited to 'gnu') 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))) -- cgit v1.2.3 From aa6f87a2b984039229abbaba08c06415a782badc Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 27 Jun 2018 21:13:52 -0400 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From c6bf07d14a42a0d7d67ce045c7654547cba0bd34 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 27 Jun 2018 21:16:30 -0400 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From ee527187a651210522ebf0c930cb22077b8d37cc Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 27 Jun 2018 21:21:56 -0400 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 29594404a154b35431609d5f72154c2b69c11dff Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 27 Jun 2018 22:03:33 -0400 Subject: 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(-) (limited to 'gnu') 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))) -- cgit v1.2.3 From 9f6f726c7f43b9504d132471e0d13b2b0fdf6505 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 27 Jun 2018 22:14:34 -0400 Subject: 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(-) (limited to 'gnu') 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") -- cgit v1.2.3 From 96272e2822046519e9d6a89bfac0d29936ef2766 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 27 Jun 2018 22:24:08 -0400 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From 2e0f69057a58a5cf2abb2f2b2c8d1a705d297c25 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 27 Jun 2018 19:52:54 -0400 Subject: 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(-) (limited to 'gnu') 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" -- cgit v1.2.3 From 2d86eaff5bb8ca8c8ca74b47a6a7d964ec7c8b22 Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Thu, 15 Nov 2018 13:09:01 +0100 Subject: gnu: sambamba: Update to 0.6.8. * gnu/packages/bioinformatics.scm (sambamba): Update to 0.6.8. --- gnu/packages/bioinformatics.scm | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 58cee5cbbe..1a7199241a 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11158,7 +11158,7 @@ droplet sequencing. It has been particularly tailored for Drop-seq.") (define-public sambamba (package (name "sambamba") - (version "0.6.7-10-g223fa20") + (version "0.6.8") (source (origin (method git-fetch) @@ -11168,7 +11168,7 @@ droplet sequencing. It has been particularly tailored for Drop-seq.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1zb9hrxglxqh13ava9wwri30cvf85hjnbn8ccnr8l60a3k5avczn")))) + "0k0cz3qcv98p6cq09zlbgnjsggxcqbcmzxg5zikgcgbr2nfq4lry")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; there is no test target @@ -11179,9 +11179,10 @@ droplet sequencing. It has been particularly tailored for Drop-seq.") (add-after 'unpack 'fix-ldc-version (lambda _ (substitute* "gen_ldc_version_info.py" - (("/usr/bin/env.*") (which "python"))) + (("/usr/bin/env.*") (which "python3"))) (substitute* "Makefile" - (("\\$\\(shell which ldmd2\\)") (which "ldmd2"))) + ;; We use ldc2 instead of ldmd2 to compile sambamba. + (("\\$\\(shell which ldmd2\\)") (which "ldc2"))) #t)) (add-after 'unpack 'place-biod-and-undead (lambda* (#:key inputs #:allow-other-keys) @@ -11193,21 +11194,21 @@ droplet sequencing. It has been particularly tailored for Drop-seq.") (substitute* "Makefile" (("htslib/libhts.a lz4/lib/liblz4.a") "-L-lhts -L-llz4") - ((" htslib-static lz4-static") "")) + ((" lz4-static htslib-static") "")) #t)) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin"))) (mkdir-p bin) - (install-file "build/sambamba" bin) + (install-file "bin/sambamba" bin) #t)))))) (native-inputs `(("ldc" ,ldc) ("rdmd" ,rdmd) - ("python" ,python2-minimal) + ("python" ,python-minimal) ("biod" - ,(let ((commit "c778e4f2d8bacea7499283ce39f5577b232732c6")) + ,(let ((commit "4f1a7d2fb7ef3dfe962aa357d672f354ebfbe42e")) (origin (method git-fetch) (uri (git-reference @@ -11218,20 +11219,20 @@ droplet sequencing. It has been particularly tailored for Drop-seq.") "-checkout")) (sha256 (base32 - "1z90562hg47i63gx042wb3ak2vqjg5z7hwgn9bp2pdxfg3nxrw37"))))) + "1k5pdjv1qvi0a3rwd1sfq6zbj37l86i7bf710m4c0y6737lxj426"))))) ("undead" - ,(let ((commit "92803d25c88657e945511f0976a0c79d8da46e89")) + ,(let ((commit "9be93876982b5f14fcca60832563b3cd767dd84d")) (origin (method git-fetch) (uri (git-reference - (url "https://github.com/dlang/undeaD.git") + (url "https://github.com/biod/undeaD.git") (commit commit))) (file-name (string-append "undead-" (string-take commit 9) "-checkout")) (sha256 (base32 - "0vq6n81vzqvgphjw54lz2isc1j8lcxwjdbrhqz1h5gwrvw9w5138"))))))) + "1xfarj0nqlmi5jd1vmcmm7pabzaf9hxyvk6hp0d6jslb5k9r8r3d"))))))) (inputs `(("lz4" ,lz4) ("htslib" ,htslib-for-sambamba))) -- cgit v1.2.3 From 30f0d21b407756e88cd960a9678b6af0a1ad80e9 Mon Sep 17 00:00:00 2001 From: pimi Date: Mon, 12 Nov 2018 21:59:49 +0100 Subject: gnu: Add nanopolish. * gnu/packages/bioinformatics.scm (nanopolish): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/bioinformatics.scm | 74 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 1a7199241a..dc36cedb0c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -14362,3 +14362,77 @@ both read length (longer is better) and read identity (higher is better) when choosing which reads pass the filter.") (license (list license:gpl3 ;filtlong license:asl2.0))))) ;histogram.py + +(define-public nanopolish + ;; The recommended way to install is to clone the git repository + ;; . + ;; Also, the differences between release and current version seem to be + ;; significant. + (let ((commit "50e8b5cc62f9b46f5445f5c5e8c5ab7263ea6d9d") + (revision "1")) + (package + (name "nanopolish") + (version (git-version "0.10.2" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jts/nanopolish.git") + (commit commit) + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 "09j5gz57yr9i34a27vbl72i4g8syv2zzgmsfyjq02yshmnrvkjs6")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags + `("HDF5=noinstall" "EIGEN=noinstall" "HTS=noinstall" "CC=gcc") + #:tests? #f ; no check target + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'find-eigen + (lambda* (#:key inputs #:allow-other-keys) + (setenv "CPATH" + (string-append (assoc-ref inputs "eigen") + "/include/eigen3")) + #t)) + (delete 'configure) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (scripts (string-append out "/share/nanopolish/scripts"))) + + (install-file "nanopolish" bin) + (for-each (lambda (file) (install-file file scripts)) + (find-files "scripts" ".*")) + #t))) + (add-after 'install 'wrap-programs + (lambda* (#:key outputs #:allow-other-keys) + (for-each (lambda (file) + (wrap-program file `("PYTHONPATH" ":" prefix (,path)))) + (find-files "/share/nanopolish/scripts" "\\.py")) + (for-each (lambda (file) + (wrap-program file `("PERL5LIB" ":" prefix (,path)))) + (find-files "/share/nanopolish/scripts" "\\.pl")) + #t))))) + (inputs + `(("eigen" ,eigen) + ("hdf5" ,hdf5) + ("htslib" ,htslib) + ("perl" ,perl) + ("python" ,python) + ("python-biopython" ,python-biopython) + ("python-numpy" ,python-numpy) + ("python-pysam" ,python-pysam) + ("python-scikit-learn" , python-scikit-learn) + ("python-scipy" ,python-scipy) + ("zlib" ,zlib))) + (home-page "https://github.com/jts/nanopolish") + (synopsis "Signal-level analysis of Oxford Nanopore sequencing data") + (description + "This package analyses the Oxford Nanopore sequencing data at signal-level. +Nanopolish can calculate an improved consensus sequence for a draft genome +assembly, detect base modifications, call SNPs (Single nucleotide +polymorphisms) and indels with respect to a reference genome and more.") + (license license:expat)))) -- cgit v1.2.3 From 03592a6f882f5b4309f77c3dc3e65559d7b7cb75 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 31 Oct 2018 00:24:04 -0400 Subject: gnu: emacs-realgud: Patch configure.ac to repair the build. This fixes https://bugs.gnu.org/33196, a build problem caused by a defective Elisp snippet in a check in configure.ac. * gnu/packages/patches/emacs-realgud-fix-configure-ac.patch: Add patch. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/emacs.scm (emacs-realgud)[source]: Use it. --- gnu/local.mk | 2 ++ gnu/packages/emacs.scm | 6 ++++- .../patches/emacs-realgud-fix-configure-ac.patch | 27 ++++++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/emacs-realgud-fix-configure-ac.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 23a6cb34b5..2a90a85a6c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -19,6 +19,7 @@ # Copyright © 2018 Amirouche Boubekki # Copyright © 2018 Oleg Pykhalov # Copyright © 2018 Stefan Stefanović +# Copyright © 2018 Maxim Cournoyer # # This file is part of GNU Guix. # @@ -663,6 +664,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-highlight-stages-add-gexp.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 \ %D%/packages/patches/enlightenment-fix-setuid-path.patch \ %D%/packages/patches/erlang-man-path.patch \ %D%/packages/patches/eudev-rules-directory.patch \ diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 3e32998a9f..ce1add3915 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -3659,7 +3659,11 @@ after buffer changes.") version ".tar")) (sha256 (base32 - "108wgxg7fb4byaiasgvbxv2hq7b00biq9f0mh9hy6vw4160y5w24")))) + "108wgxg7fb4byaiasgvbxv2hq7b00biq9f0mh9hy6vw4160y5w24")) + (patches + ;; Patch awaiting inclusion upstream (see: + ;; https://github.com/realgud/realgud/pull/226). + (search-patches "emacs-realgud-fix-configure-ac.patch")))) (build-system emacs-build-system) (arguments `(#:tests? #t diff --git a/gnu/packages/patches/emacs-realgud-fix-configure-ac.patch b/gnu/packages/patches/emacs-realgud-fix-configure-ac.patch new file mode 100644 index 0000000000..8165857c87 --- /dev/null +++ b/gnu/packages/patches/emacs-realgud-fix-configure-ac.patch @@ -0,0 +1,27 @@ +From a293690f29407ac54a218d6d20c2142e1a0319d1 Mon Sep 17 00:00:00 2001 +From: Maxim Cournoyer +Date: Wed, 31 Oct 2018 00:08:34 -0400 +Subject: [PATCH] configure.ac: Fix NO_CHECK_EMACS_PACKAGES elisp. + +Remove the extraneous trailing parenthesis. +--- + configure.ac | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index de0d932..69bcea7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -25,8 +25,7 @@ AC_MSG_NOTICE("Checking prerequiste packages") + $EMACS -batch -q --no-site-file -eval \ + '(dolist (package + (quote (cl-lib loc-changes load-relative test-simple))) +- (require package)) +- )' ++ (require package))' + fi + if test $? -ne 0 ; then + AC_MSG_ERROR([Can't continue until above error is corrected.]) +-- +2.19.0 + -- cgit v1.2.3 From 44ff80fc0ed8ac74523ed350982f5cfbbd150772 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 16 Nov 2018 08:48:05 +0100 Subject: gnu: gp2c: Update to 0.0.11pl1. * gnu/packages/algebra.scm (gp2c): Update to 0.0.11pl1. --- gnu/packages/algebra.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index d8a061b642..e54b8e3512 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -179,7 +179,7 @@ PARI is also available as a C library to allow for faster computations.") (define-public gp2c (package (name "gp2c") - (version "0.0.11") + (version "0.0.11pl1") (source (origin (method url-fetch) (uri (string-append @@ -187,7 +187,7 @@ PARI is also available as a C library to allow for faster computations.") version ".tar.gz")) (sha256 (base32 - "1z69xj2dpd8yyi8108rz26c50xpv0k2j8qnk0bzy1c5lw3pd1adm")))) + "1c6f6vmncw032kfzrfyr8bynw6yd3faxpy2285r009fmr0zxfs5s")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) (inputs `(("pari-gp" ,pari-gp))) -- cgit v1.2.3 From eea7cd751988733159f86e10e82525fab014e060 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 16 Nov 2018 09:06:31 +0100 Subject: gnu: Add cmh. * gnu/packages/algebra.scm (cmh): New variable. --- gnu/packages/algebra.scm | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index e54b8e3512..103594364e 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Andreas Enge +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Andreas Enge ;;; Copyright © 2013, 2015, 2017, 2018 Ludovic Courtès ;;; Copyright © 2016, 2017, 2018 Nicolas Goaziou ;;; Copyright © 2014, 2018 Mark H Weaver @@ -210,6 +210,36 @@ GP2C, the GP to C compiler, translates GP scripts to PARI programs.") (license license:gpl2) (home-page "https://pari.math.u-bordeaux.fr/"))) +(define-public cmh + (package + (name "cmh") + (version "1.0") + (source (origin + (method url-fetch) + (uri (string-append + "https://gforge.inria.fr/frs/download.php/33497/cmh-" + version ".tar.gz")) + (sha256 + (base32 + "1a28xr9bs0igms0ik99x0w8lnb0jyfcmvyi26pbyh9ggcdivd33p")))) + (build-system gnu-build-system) + (inputs + `(("gmp" ,gmp) + ("mpfr" ,mpfr) + ("mpc" ,mpc) + ("mpfrcx" ,mpfrcx) + ("fplll" ,fplll) + ("pari-gp" ,pari-gp))) + (synopsis "Igusa class polynomial computations") + (description + "The CMH software computes Igusa (genus 2) class polynomials, which +parameterize the CM points in the moduli space of 2-dimensional abelian +varieties, i.e. Jacobians of hyperelliptic curves. +It can also be used to compute theta constants at arbitrary +precision.") + (license license:gpl3+) + (home-page "http://cmh.gforge.inria.fr/"))) + (define-public giac-xcas (package (name "giac-xcas") -- cgit v1.2.3 From 2aee2a96b6c5505ec54c8544ae1f1fe1e3e2d188 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 16 Nov 2018 17:40:14 +0900 Subject: guile: newt: Update revision to 2. * gnu/packages/guile.scm (guile-newt): Update revision to 2. --- gnu/packages/guile.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index c41c27466b..f95641ab13 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -2329,8 +2329,8 @@ Guile.") ;; There has not been any release yet. (define-public guile-newt - (let ((commit "4eaa3cf84b9b426cc0ff7bec48b76cca6ca3ec83") - (revision "1")) + (let ((commit "a73889c57b0572347f7641facdb1bcf08922feff") + (revision "2")) (package (name "guile-newt") (version (string-append "0-" revision "." (string-take commit 9))) @@ -2342,7 +2342,7 @@ Guile.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0ww7jbdsmjlsxm60ym6cb5s5kc4ljz8bn4y2lvcqnap0aihqfk10")))) + "0k37vir22r2sq121lyy74grfai4643s7kr55z01k4j0bh27i06c3")))) (build-system gnu-build-system) (arguments '(#:make-flags -- cgit v1.2.3 From a7b7d48cc70cee61b0212b531461430cd4c099ad Mon Sep 17 00:00:00 2001 From: David Thompson Date: Fri, 16 Nov 2018 10:34:29 -0500 Subject: gnu: tiled: Update to 1.2.1. * gnu/packages/game-development.scm (tiled): Update to 1.2.1. --- gnu/packages/game-development.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 1f73025db7..34a015bdf7 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -397,7 +397,7 @@ support.") (define-public tiled (package (name "tiled") - (version "1.2.0") + (version "1.2.1") (source (origin (method git-fetch) (uri (git-reference @@ -406,7 +406,7 @@ support.") (file-name (git-file-name name version)) (sha256 (base32 - "1rra48hlkcgqxwxi802fb182p1q0723c9hhfvkd5inz9467idd4c")))) + "1dl06k2p0r7l20ghxcq5sn7j0jl2l8q4m27vmfs2qfgvldjll2h3")))) (build-system gnu-build-system) (inputs `(("qtbase" ,qtbase) -- cgit v1.2.3 From 7a44e8752e0020e67dede343e333bfef875e2442 Mon Sep 17 00:00:00 2001 From: Thorsten Wilms Date: Mon, 12 Nov 2018 18:27:29 +0100 Subject: gnu: Add caps-plugins-lv2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/audio.scm (caps-plugins-lv2): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/audio.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 91f55a3544..3258bf3a67 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2018 Clément Lassieur ;;; Copyright © 2018 Brett Gilio ;;; Copyright © 2018 Marius Bakke +;;; Copyright © 2018 Thorsten Wilms ;;; ;;; This file is part of GNU Guix. ;;; @@ -514,6 +515,47 @@ tools (analyzer, mono/stereo tools, crossovers).") ;; The plugins are released under LGPLv2.1+ (license (list license:lgpl2.1+ license:gpl2+)))) +(define-public caps-plugins-lv2 + (package + (name "caps-plugins-lv2") + (version "0.9.24") ; version that has been ported. + (source + (origin + ;; The Github project hasn't tagged a release. + (method git-fetch) + (uri (git-reference + ;; Actually https://github.com/moddevices/caps-lv2.git, but it's + ;; missing fixes for newer glibc, so using the origin of a pull + ;; request regarding this issue: + (url "https://github.com/jujudusud/caps-lv2.git") + (commit "9c9478b7fbd8f9714f552ebe2a6866398b0babfb"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1idfnazin3cca41zw1a8vwgnxjnkrap7bxxjamjqvgpmvydgcam1")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no check target + #:phases + (modify-phases %standard-phases + ;; no configure script + (delete 'configure) + (add-after 'unpack 'override-target-directory + (lambda* (#:key outputs #:allow-other-keys) + (substitute* (find-files "plugins" "Makefile") + (("/usr/local")(assoc-ref outputs "out"))) + #t))))) + (inputs + `(("lv2" ,lv2))) + ;; home-page of the original LADSPA version: http://quitte.de/dsp/caps.html + (home-page "https://github.com/moddevices/caps-lv2") + (synopsis "LV2 port of the CAPS audio plugin colection") + (description + "LV2 port of CAPS, a collection of audio plugins comprising basic virtual +guitar amplification and a small range of classic effects, signal processors and +generators of mostly elementary and occasionally exotic nature.") + (license license:gpl3+))) + (define-public espeak (package (name "espeak") -- cgit v1.2.3 From 243bdcc12e40c8dbd1129fa5b613d8f247744f31 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Mon, 12 Nov 2018 16:24:23 -0500 Subject: gnu: Add git-when-merged. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/version-control.scm (git-when-merged): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/version-control.scm | 52 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 04d28044dd..fd90513000 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -2279,3 +2279,55 @@ used to keep a folder in sync between computers.") ;; The web app is released under the AGPLv3+. (license (list license:gpl3+ license:agpl3+)))) + +(define-public git-when-merged + ;; Use an unreleased version to get a PY3 compatibility fix. + (let ((commit "ab6af7865a0ba55ba364a6c507e0be6f84f31c6d")) + (package + (name "git-when-merged") + (version (string-append "1.2.0-" (string-take commit 7))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mhagger/git-when-merged/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0iyk2psf97bc9h43m89p3xjmm79fsx99i7px29g4lcnmdy5kmz0p")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; there are no tests + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (install-file "bin/git-when-merged" + (string-append (assoc-ref outputs "out") + "/bin")) + #t)) + (add-before 'install 'patch-git + (lambda* (#:key inputs #:allow-other-keys) + (let ((git (string-append (assoc-ref inputs "git") + "/bin/git"))) + (substitute* "bin/git-when-merged" + (("'git'") (string-append "'" git "'"))) + #t))) + (add-after 'install 'wrap-script + (lambda* (#:key outputs #:allow-other-keys) + (wrap-program (string-append (assoc-ref outputs "out") + "/bin/git-when-merged") + `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH")))) + #t))))) + (inputs + `(("git" ,git) + ("python" ,python-wrapper))) + (home-page "https://github.com/mhagger/git-when-merged") + (synopsis "Determine when a commit was merged into a Git branch") + (description "This Git extension defines a subcommand, +@code{when-merged}, whose core operation is to find the merge that brought a +given commit into the specified ref(s). It has various options that control +how information about the merge is displayed.") + (license license:gpl2)))) -- cgit v1.2.3 From 0c7707d53e66839a2beae8c05eddc91ac5a6d5e1 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 14 Nov 2018 14:23:21 -0800 Subject: gnu: u-boot: Update to 2018.11. * gnu/packages/bootloaders.scm (u-boot): Update to 2018.11. (u-boot)[native-inputs]: Add lz4. --- gnu/packages/bootloaders.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index bce12d324d..2fa50a89b4 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -34,6 +34,7 @@ #:use-module (gnu packages bison) #:use-module (gnu packages cdrom) #:use-module (gnu packages check) + #:use-module (gnu packages compression) #:use-module (gnu packages cross-base) #:use-module (gnu packages disk) #:use-module (gnu packages firmware) @@ -360,7 +361,7 @@ tree binary files. These are board description files used by Linux and BSD.") (define u-boot (package (name "u-boot") - (version "2018.09") + (version "2018.11") (source (origin (method url-fetch) (uri (string-append @@ -368,12 +369,13 @@ tree binary files. These are board description files used by Linux and BSD.") "u-boot-" version ".tar.bz2")) (sha256 (base32 - "0s122kyz1svvs2yjzj4j9qravl3ra4vn0fjqgski7rlczqyg56w3")))) + "0znkwljfwwn4y7j20pzz4ilqw8znphrfxns0x1lwdzh3xbr96z3k")))) (native-inputs `(("bc" ,bc) ("bison" ,bison) ("dtc" ,dtc) ("flex" ,flex) + ("lz4" ,lz4) ("openssl" ,openssl) ("python-2" ,python-2) ("python2-coverage" ,python2-coverage) -- cgit v1.2.3 From fc9dbf41311d99d0fd8befc789ea7c0e35911890 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Fri, 5 Oct 2018 22:58:43 -0500 Subject: llvm: Build with RTTI by default. Increases size of llvm@6 by 2.5MiB (2.5%), but saves building specialized llvm's with rtti enabled for packages that require RTTI when linking with the llvm libraries. * gnu/packages/llvm.scm (llvm-3.8-with-rtti): Remove variable. (llvm)[arguments]: Add '-DLLVM_REQUIRES_RTTI=1' to #:configure-flags. * gnu/packages/audio.scm (faust-2)[native-inputs]: 'llvm-3.8-with-rtti' -> 'llvm-3.8'. --- gnu/packages/audio.scm | 2 +- gnu/packages/llvm.scm | 15 ++------------- 2 files changed, 3 insertions(+), 14 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 3258bf3a67..6795ddd21c 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1234,7 +1234,7 @@ PS, and DAB+.") `(list (string-append "prefix=" (assoc-ref %outputs "out")) "world")))) (native-inputs - `(("llvm" ,llvm-3.8-with-rtti) + `(("llvm" ,llvm-3.8) ("which" ,which) ("xxd" ,xxd) ("ctags" ,emacs-minimal) ; for ctags diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index a809180e29..beca92650e 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2016 Eric Bavier +;;; Copyright © 2014, 2016, 2018 Eric Bavier ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2015, 2017, 2018 Ludovic Courtès ;;; Copyright © 2016 Dennis Mungai @@ -65,6 +65,7 @@ "-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE" "-DBUILD_SHARED_LIBS:BOOL=TRUE" "-DLLVM_ENABLE_FFI:BOOL=TRUE" + "-DLLVM_REQUIRES_RTTI=1" ; For some third-party utilities "-DLLVM_INSTALL_UTILS=ON") ; Needed for rustc. ;; Don't use '-g' during the build, to save space. @@ -279,18 +280,6 @@ code analysis tools.") (base32 "1ybmnid4pw2hxn12ax5qa5kl1ldfns0njg8533y3mzslvd5cx0kf")))))) -;; This is for Faust 2 -(define-public llvm-3.8-with-rtti - (package (inherit llvm-3.8) - (name "llvm-with-rtti") - (arguments - (substitute-keyword-arguments (package-arguments llvm) - ((#:configure-flags flags) - `(append '("-DCMAKE_SKIP_BUILD_RPATH=FALSE" - "-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE" - "-DLLVM_REQUIRES_RTTI=1") - ,flags)))))) - (define-public clang-runtime-3.8 (clang-runtime-from-llvm llvm-3.8 -- cgit v1.2.3 From 7ed018e8a2f885246461ad65420bf39d741d343c Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Thu, 20 Oct 2016 23:26:49 -0500 Subject: gnu: Add TomsFastMath. * gnu/packages/multiprecision.scm (tomsfastmath): New variable. * gnu/packages/patches/tomsfastmath-constness.patch: New patch. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/multiprecision.scm | 66 ++++++++++++++++++++ gnu/packages/patches/tomsfastmath-constness.patch | 76 +++++++++++++++++++++++ 3 files changed, 143 insertions(+) create mode 100644 gnu/packages/patches/tomsfastmath-constness.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 2a90a85a6c..e3aa0cd4cd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1178,6 +1178,7 @@ dist_patch_DATA = \ %D%/packages/patches/tk-find-library.patch \ %D%/packages/patches/ttf2eot-cstddef.patch \ %D%/packages/patches/ttfautohint-source-date-epoch.patch \ + %D%/packages/patches/tomsfastmath-constness.patch \ %D%/packages/patches/totem-meson-easy-codec.patch \ %D%/packages/patches/tuxpaint-stamps-path.patch \ %D%/packages/patches/twinkle-include-qregexpvalidator.patch \ diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index 4f5eac16b9..71e1efcd8c 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -26,6 +26,7 @@ (define-module (gnu packages multiprecision) #:use-module (guix licenses) #:use-module (gnu packages) + #:use-module (gnu packages autotools) #:use-module (gnu packages m4) #:use-module (gnu packages gcc) #:use-module (guix packages) @@ -225,3 +226,68 @@ minor changes to the source code. In most cases only a few type statements and (for Fortran-90 programs) read/write statements need to be changed. PSLQ and numerical quadrature programs are included.") (license bsd-3))) + +(define-public tomsfastmath + (package + (name "tomsfastmath") + (version "0.13.0") + (synopsis "Large integer arithmetic library") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/libtom/tomsfastmath/" + "releases/download/v" version "/" + "tfm-" (version-major+minor version) ".tar.bz2")) + (sha256 + (base32 + "01rlsvp6lskk2a0gfdi24ak5h8vdwi6kqbvbwjnmb92r0zrfdvwd")) + (patches (search-patches "tomsfastmath-constness.patch")))) + (build-system gnu-build-system) + (native-inputs + `(("libtool" ,libtool))) + (arguments + `(#:make-flags (list "-f" "makefile.shared" + (string-append "LIBPATH=" %output "/lib") + (string-append "INCPATH=" %output "/include") + "GROUP=root" "USER=root" + "CC=gcc") + #:phases + (modify-phases %standard-phases + (delete 'configure) ;no configuration + (replace 'check + (lambda* (#:key make-flags #:allow-other-keys) + (and (zero? (apply system* "make" + "stest" "test_standalone" + make-flags)) + (zero? (system* "./stest")) + (zero? (system* "./test"))))) + (add-before 'install 'install-nogroup + (lambda _ + ;; Let permissions inherit from the current process + (substitute* "makefile.shared" + (("-g \\$\\(GROUP\\) -o \\$\\(USER\\)") "")) + #t)) + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (let ((docdir (string-append (assoc-ref outputs "out") + "/share/doc/tomsfastmath"))) + (install-file "doc/tfm.pdf" docdir) + #t))) + (add-after 'install 'install-pc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (pc-dir (string-append out "/lib/pkgconfig"))) + (call-with-output-file "tomsfastmath.pc" + (lambda (port) + (format port "~ +Name: TomsFastMath +Description: ~a +Version: ~a +Libs: -L~a/lib -ltfm~%" + ,synopsis ,version out))) + (install-file "tomsfastmath.pc" pc-dir) + #t)))))) + (home-page "http://www.libtom.org/TomsFastMath/") + (description "TomsFastMath is a large integer library written in portable +ISO C. It is a port of LibTomMath with optional support for inline assembler +multiplies.") + (license public-domain))) diff --git a/gnu/packages/patches/tomsfastmath-constness.patch b/gnu/packages/patches/tomsfastmath-constness.patch new file mode 100644 index 0000000000..7c6ab5bbec --- /dev/null +++ b/gnu/packages/patches/tomsfastmath-constness.patch @@ -0,0 +1,76 @@ +From dac089515901d6bf315cd15a6e744b8d2c02c1cb Mon Sep 17 00:00:00 2001 +From: Sebastian Andrzej Siewior +Date: Sat, 31 Oct 2015 22:48:07 +0100 +Subject: [PATCH] tfm: make a few functions static + +clamav expects them to be static and it does not seem bad to do so. + +Signed-off-by: Sebastian Andrzej Siewior +--- + src/bin/fp_read_radix.c | 2 +- + src/bin/fp_read_signed_bin.c | 2 +- + src/bin/fp_read_unsigned_bin.c | 2 +- + src/headers/tfm.h | 6 +++--- + 4 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/bin/fp_read_radix.c b/src/bin/fp_read_radix.c +index 0b5e826..431afa0 100644 +--- a/src/bin/fp_read_radix.c ++++ b/src/bin/fp_read_radix.c +@@ -9,7 +9,7 @@ + */ + #include + +-int fp_read_radix(fp_int *a, char *str, int radix) ++int fp_read_radix(fp_int *a, const char *str, int radix) + { + int y, neg; + char ch; +diff --git a/src/bin/fp_read_signed_bin.c b/src/bin/fp_read_signed_bin.c +index e2b8003..6467d19 100644 +--- a/src/bin/fp_read_signed_bin.c ++++ b/src/bin/fp_read_signed_bin.c +@@ -9,7 +9,7 @@ + */ + #include + +-void fp_read_signed_bin(fp_int *a, unsigned char *b, int c) ++void fp_read_signed_bin(fp_int *a, const unsigned char *b, int c) + { + /* read magnitude */ + fp_read_unsigned_bin (a, b + 1, c - 1); +diff --git a/src/bin/fp_read_unsigned_bin.c b/src/bin/fp_read_unsigned_bin.c +index 3ee64c0..2ee89cb 100644 +--- a/src/bin/fp_read_unsigned_bin.c ++++ b/src/bin/fp_read_unsigned_bin.c +@@ -9,7 +9,7 @@ + */ + #include + +-void fp_read_unsigned_bin(fp_int *a, unsigned char *b, int c) ++void fp_read_unsigned_bin(fp_int *a, const unsigned char *b, int c) + { + /* zero the int */ + fp_zero (a); +diff --git a/src/headers/tfm.h b/src/headers/tfm.h +index af87b56..f406388 100644 +--- a/src/headers/tfm.h ++++ b/src/headers/tfm.h +@@ -467,14 +467,14 @@ int fp_prime_random_ex(fp_int *a, int t, int size, int flags, tfm_prime_callback + int fp_count_bits(fp_int *a); + + int fp_unsigned_bin_size(fp_int *a); +-void fp_read_unsigned_bin(fp_int *a, unsigned char *b, int c); ++void fp_read_unsigned_bin(fp_int *a, const unsigned char *b, int c); + void fp_to_unsigned_bin(fp_int *a, unsigned char *b); + + int fp_signed_bin_size(fp_int *a); +-void fp_read_signed_bin(fp_int *a, unsigned char *b, int c); ++void fp_read_signed_bin(fp_int *a, const unsigned char *b, int c); + void fp_to_signed_bin(fp_int *a, unsigned char *b); + +-int fp_read_radix(fp_int *a, char *str, int radix); ++int fp_read_radix(fp_int *a, const char *str, int radix); + + int fp_radix_size(fp_int *a, int radix, int *size); + int fp_toradix(fp_int *a, char *str, int radix); -- cgit v1.2.3 From 0a41123f01d5d2466d6f533be3644ac8c9a2bdf9 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Fri, 28 Oct 2016 22:42:59 -0500 Subject: gnu: Add ClamAV. * gnu/packages/antivirus.scm: New file. * gnu/packages/patches/clamav-system-tomsfastmath.patch, gnu/packages/patches/clamav-config-llvm-libs.patch: New files. * gnu/local.mk (GNU_SYSTEM_MODULES): Add new module. (dist_patch_DATA): Add patches. Co-authored-by: Christopher Baines --- gnu/local.mk | 4 +- gnu/packages/antivirus.scm | 156 +++++++++++++++++++++ gnu/packages/patches/clamav-config-llvm-libs.patch | 14 ++ .../patches/clamav-system-tomsfastmath.patch | 102 ++++++++++++++ 4 files changed, 275 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/antivirus.scm create mode 100644 gnu/packages/patches/clamav-config-llvm-libs.patch create mode 100644 gnu/packages/patches/clamav-system-tomsfastmath.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index e3aa0cd4cd..7073416633 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -61,6 +61,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/android.scm \ %D%/packages/animation.scm \ %D%/packages/anthy.scm \ + %D%/packages/antivirus.scm \ %D%/packages/apl.scm \ %D%/packages/apr.scm \ %D%/packages/aspell.scm \ @@ -614,7 +615,8 @@ dist_patch_DATA = \ %D%/packages/patches/ceph-skip-collect-sys-info-test.patch \ %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/clamav-config-llvm-libs.patch \ + %D%/packages/patches/clamav-system-tomsfastmath.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/antivirus.scm b/gnu/packages/antivirus.scm new file mode 100644 index 0000000000..95749761bd --- /dev/null +++ b/gnu/packages/antivirus.scm @@ -0,0 +1,156 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2016, 2017, 2018 Eric Bavier +;;; Copyright © 2018 Christopher Baines +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages antivirus) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix build-system gnu) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix utils) + #:use-module (gnu packages) + #:use-module (gnu packages autotools) + #:use-module (gnu packages bison) + #:use-module (gnu packages check) + #:use-module (gnu packages compression) + #:use-module (gnu packages curl) + #:use-module (gnu packages cyrus-sasl) + #:use-module (gnu packages flex) + #:use-module (gnu packages llvm) + #:use-module (gnu packages multiprecision) + #:use-module (gnu packages ncurses) + #:use-module (gnu packages pcre) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages tls) + #:use-module (gnu packages web) + #:use-module (gnu packages xml)) + +(define-public clamav + (package + (name "clamav") + (version "0.100.2") + (source (origin + (method url-fetch) + (uri (string-append "https://www.clamav.net/downloads/production/" + "clamav-" version ".tar.gz")) + (sha256 + (base32 + "1mkd41sxbjkfjinpx5b9kb85q529gj2s3d0klysssqhysh64ybja")) + (modules '((guix build utils))) + (snippet + '(begin + (for-each delete-file-recursively + '("win32" ;unnecessary + "libclamav/c++/llvm" ;use system llvm + "libclamunrar")))) ;non-free license + (patches + (search-patches "clamav-system-tomsfastmath.patch" + "clamav-config-llvm-libs.patch")))) + (build-system gnu-build-system) + (native-inputs + `(("bison" ,bison) + ("check" ,check) ;for tests + ("flex" ,flex) + ("pkg-config" ,pkg-config) + ;; The tomsfastmath patch touches configure.ac and Makefile.am + ("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) + (inputs + `(("bzip2" ,bzip2) + ("libcurl" ,curl) + ("libjson" ,json-c) + ("libltdl" ,libltdl) + ("libmspack" ,libmspack) + ("llvm" ,llvm-3.6) ;requires <3.7, for JIT/verifier + ("ncurses" ,ncurses) + ("openssl" ,libressl) + ("pcre" ,pcre "bin") ;for pcre-config + ("sasl" ,cyrus-sasl) ;for linking curl with libtool + ("tomsfastmath" ,tomsfastmath) + ("xml" ,libxml2) + ("zlib" ,zlib))) + (arguments + `(#:configure-flags + (let-syntax ((with (syntax-rules () + ((_ name) + (string-append "--with-" name "=" + (assoc-ref %build-inputs name)))))) + (list "--disable-unrar" + "--enable-llvm" + "--with-system-llvm" + "--with-system-libmspack" + "--without-included-ltdl" + (with "xml") + (with "openssl") + (with "libjson") + (with "pcre") + (with "zlib") + (with "libcurl") + ;; For sanity, specifying --enable-* flags turns + ;; "support unavailable" warnings into errors. + "--enable-bzip2" + "--enable-check" + "--sysconfdir=/etc/clamav" + ;; Default database directory needs to be writeable + "--with-dbdir=/var/db/clamav")) + ;; install sample .conf files to %output/etc rather than /etc/clamav + #:make-flags (list (string-append "sysconfdir=" %output "/etc")) + #:phases (modify-phases %standard-phases + (add-after 'unpack 'reconf + (lambda _ (zero? (system* "autoreconf" "-vfi")))) + (add-before 'configure 'patch-llvm-config + (lambda _ + (substitute* '("libclamav/c++/detect.cpp" + "libclamav/c++/ClamBCRTChecks.cpp" + "libclamav/c++/bytecode2llvm.cpp") + (("llvm/Config/config.h") "llvm/Config/llvm-config.h")) + ;; `llvm-config --libfiles` inappropriately lists lib*.a + ;; libraries, rather than the lib*.so's that our llvm + ;; contains. They're used only for listing extra build + ;; dependencies, so ignore them until that's fixed. + (substitute* "libclamav/c++/Makefile.in" + (("@LLVMCONFIG_LIBFILES@") "")) + #t)) + (add-before 'check 'skip-clamd-tests + ;; XXX: The check?_clamd tests fail inside the build + ;; chroot, but pass outside. + (lambda _ + (substitute* "unit_tests/Makefile" + (("check2_clamd.sh.*check4_clamd.sh") "")) + #t))))) + (home-page "https://www.clamav.net") + (synopsis "Antivirus engine") + (description + "Clam AntiVirus is an anti-virus toolkit, designed especially for e-mail +scanning on mail gateways. It provides a number of utilities including a +flexible and scalable multi-threaded daemon, a command line scanner, and +advanced tool for automatic database updates. The core of the package is an +anti-virus engine available in the form of a shared library.") + (license (list license:gpl2+ ;ClamAV itself + license:lgpl2.1 ;libclamav/mspack.[ch] + license:public-domain ;libclamav/7z/*, libclamav/rijndael.[ch], etc... + (package-license bzip2) ;modified bzip2 source in libclamav/nsis + license:bsd-2 ;several files in libclamav + license:bsd-3 ;libclamav/{regex,qsort.c,swf.[ch] + license:ncsa ;libclamav/c++/PointerTracking.cpp + license:zlib ;libclamav/inf*.h + license:x11 ;libclamav/lzw + (license:non-copyleft "libclamav/strlcat.c") ;"OpenBSD" license + license:asl2.0 ;libclamav/yara* + license:expat)))) ;shared/getopt.[ch] diff --git a/gnu/packages/patches/clamav-config-llvm-libs.patch b/gnu/packages/patches/clamav-config-llvm-libs.patch new file mode 100644 index 0000000000..054264ee2e --- /dev/null +++ b/gnu/packages/patches/clamav-config-llvm-libs.patch @@ -0,0 +1,14 @@ +Our llvm does not contain a single top-level library, so consult llvm-config +for the libraries that need to be linked against. + +--- clamav-0.100.2/libclamav/c++/configure.ac 2018-09-19 14:29:07.000000000 -0500 ++++ clamav-0.100.2/libclamav/c++/configure.ac 2018-10-06 21:45:09.377249158 -0500 +@@ -105,7 +105,7 @@ + + if test "x$llvm_linking" = "xdynamic"; then + AC_SUBST(LLVMCONFIG_LDFLAGS, [`$llvmconfig --ldflags`]) +- AC_SUBST(LLVMCONFIG_LIBS, [-lLLVM-$llvmver]) ++ AC_SUBST(LLVMCONFIG_LIBS, [`$llvmconfig --libs $llvmcomp`]) + AC_SUBST(LLVMCONFIG_LIBFILES, []) + else + if test $llvmver_test -ge 350; then diff --git a/gnu/packages/patches/clamav-system-tomsfastmath.patch b/gnu/packages/patches/clamav-system-tomsfastmath.patch new file mode 100644 index 0000000000..07ab79f3f7 --- /dev/null +++ b/gnu/packages/patches/clamav-system-tomsfastmath.patch @@ -0,0 +1,102 @@ +From 756ff89526b5ffaa7a4f49b1bbecf2ecbd6f85f9 Mon Sep 17 00:00:00 2001 +From: Andreas Cadhalpun +Date: Wed, 11 Mar 2015 20:03:15 +0100 +Subject: add support for system tomsfastmath + +Patch-Name: add-support-for-system-tomsfastmath.patch +--- + configure.ac | 2 ++ + libclamav/Makefile.am | 10 ++++++++-- + libclamav/bignum.h | 6 +++++- + libclamav/xdp.c | 2 +- + m4/reorganization/libs/tomsfastmath.m4 | 12 ++++++++++++ + 5 files changed, 28 insertions(+), 4 deletions(-) + create mode 100644 m4/reorganization/libs/tomsfastmath.m4 + +--- a/configure.ac ++++ b/configure.ac +@@ -82,6 +82,7 @@ m4_include([m4/reorganization/libs/xml.m + m4_include([m4/reorganization/libs/openssl.m4]) + m4_include([m4/reorganization/libs/json.m4]) + m4_include([m4/reorganization/libs/pcre.m4]) ++m4_include([m4/reorganization/libs/tomsfastmath.m4]) + + AM_MAINTAINER_MODE + m4_include([m4/reorganization/libs/libz.m4]) +@@ -285,6 +286,7 @@ else + fi + CL_MSG_STATUS([yara ],[$enable_yara],[$enable_yara]) + CL_MSG_STATUS([fts ],[yes],[$lfs_fts_msg]) ++CL_MSG_STATUS([tomsfastmath],[yes],[$tomsfastmath_msg]) + + + # Yep, downgrading the compiler avoids the bug too: +--- a/libclamav/Makefile.am ++++ b/libclamav/Makefile.am +@@ -496,8 +496,10 @@ libclamav_la_SOURCES += yara_arena.c \ + yara_clam.h + endif + +-libclamav_la_SOURCES += bignum.h\ +- bignum_fast.h\ ++libclamav_la_SOURCES += bignum.h ++ ++if !SYSTEM_TOMSFASTMATH ++libclamav_la_SOURCES += bignum_fast.h\ + tomsfastmath/addsub/fp_add.c\ + tomsfastmath/addsub/fp_add_d.c\ + tomsfastmath/addsub/fp_addmod.c\ +@@ -579,6 +581,10 @@ libclamav_la_SOURCES += bignum.h\ + tomsfastmath/sqr/fp_sqr_comba_generic.c\ + tomsfastmath/sqr/fp_sqr_comba_small_set.c\ + tomsfastmath/sqr/fp_sqrmod.c ++else ++libclamav_la_CFLAGS += $(TOMSFASTMATH_CFLAGS) ++libclamav_la_LIBADD += $(TOMSFASTMATH_LIBS) ++endif + + .PHONY: version.h.tmp + version.c: version.h +--- a/libclamav/bignum.h ++++ b/libclamav/bignum.h +@@ -1,9 +1,13 @@ + #ifndef BIGNUM_H_ + #define BIGNUM_H_ + ++#if HAVE_SYSTEM_TOMSFASTMATH ++#include ++#else + #define TFM_CHECK +- + #include "bignum_fast.h" ++#endif ++ + typedef fp_int mp_int; + #define mp_cmp fp_cmp + #define mp_toradix_n(a,b,c,d) fp_toradix_n(a,b,c,d) +--- a/libclamav/xdp.c ++++ b/libclamav/xdp.c +@@ -57,7 +57,7 @@ + #include "scanners.h" + #include "conv.h" + #include "xdp.h" +-#include "bignum_fast.h" ++#include "bignum.h" + #include "filetypes.h" + + static char *dump_xdp(cli_ctx *ctx, const char *start, size_t sz); +--- /dev/null ++++ b/m4/reorganization/libs/tomsfastmath.m4 +@@ -0,0 +1,12 @@ ++dnl Check for system tomsfastmath ++PKG_CHECK_MODULES([TOMSFASTMATH], [tomsfastmath], [have_system_tomsfastmath=yes], [have_system_tomsfastmath=no]) ++ ++AM_CONDITIONAL([SYSTEM_TOMSFASTMATH], [test "x$have_system_tomsfastmath" = "xyes"]) ++ ++if test "x$have_system_tomsfastmath" = "xyes"; then ++ AC_DEFINE([HAVE_SYSTEM_TOMSFASTMATH], [1], [link against system-wide tomsfastmath library]) ++ tomsfastmath_msg="External, $TOMSFASTMATH_CFLAGS $TOMSFASTMATH_LIBS" ++else ++ AC_DEFINE([HAVE_SYSTEM_TOMSFASTMATH], [0], [don't link against system-wide tomsfastmath library]) ++ tomsfastmath_msg="Internal" ++fi -- cgit v1.2.3 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: gnu: Add libfaketime. * gnu/packages/check.scm (libfaketime): New variable. --- gnu/packages/check.scm | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) (limited to 'gnu') 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))) -- cgit v1.2.3 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: 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(-) (limited to 'gnu') 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. -- cgit v1.2.3 From f8cba3ff4fc6aed0c539700aa47b6e8f4c25c34d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 17 Nov 2018 22:54:03 +0100 Subject: gnu: mesa: Stay on RTTI-less LLVM. * gnu/packages/llvm.scm (llvm-without-rtti): New public variable. * gnu/packages/gl.scm (mesa)[inputs]: Use that instead of LLVM. --- gnu/packages/gl.scm | 3 ++- gnu/packages/llvm.scm | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index b88fab4929..11c89b3d88 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -259,7 +259,8 @@ also known as DXTn or DXTC) for Mesa.") ("libxvmc" ,libxvmc) ,@(match (%current-system) ((or "x86_64-linux" "i686-linux") - `(("llvm" ,llvm))) + ;; FIXME: Change to 'llvm' in the next rebuild cycle. + `(("llvm" ,llvm-without-rtti))) (_ `())) ("makedepend" ,makedepend) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index beca92650e..d237a05a84 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -91,6 +91,26 @@ languages is in development. The compiler infrastructure includes mirror sets of programming tools as well as libraries with equivalent functionality.") (license license:ncsa))) +;; FIXME: This package is here to prevent many rebuilds on x86_64 and i686 +;; from commit fc9dbf41311d99d0fd8befc789ea7c0e35911890. Update users of +;; this in the next rebuild cycle. +(define-public llvm-without-rtti + (package + (inherit llvm) + (arguments + `(#:configure-flags '("-DCMAKE_SKIP_BUILD_RPATH=FALSE" + "-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE" + "-DBUILD_SHARED_LIBS:BOOL=TRUE" + "-DLLVM_ENABLE_FFI:BOOL=TRUE" + "-DLLVM_INSTALL_UTILS=ON") + #:build-type "Release" + #:phases (modify-phases %standard-phases + (add-before 'build 'shared-lib-workaround + (lambda _ + (setenv "LD_LIBRARY_PATH" + (string-append (getcwd) "/lib")) + #t))))))) + (define* (clang-runtime-from-llvm llvm hash #:optional (patches '())) (package -- cgit v1.2.3 From e005ddc223683f030d4dc64588968e474328eb65 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 18 Nov 2018 10:14:57 +0200 Subject: 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(+) (limited to 'gnu') 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) -- cgit v1.2.3 From d22ba64276c0bbacb77d0670635f67f053a16c6b Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 18 Nov 2018 10:38:54 +0100 Subject: gnu: ccl: Include x86-headers and remove missing "contrib" folder. * gnu/packages/lisp.scm (ccl): Include x86-headers and remove missing "contrib" folder. --- gnu/packages/lisp.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 9fb25a15a2..dcdd551884 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -530,8 +530,12 @@ statistical profiler, a code coverage tool, and many other extensions.") (install-file kernel libdir) (install-file heap libdir) - (let ((dirs '("lib" "library" "examples" "contrib" - "tools" "objc-bridge"))) + (let ((dirs '("lib" "library" "examples" "tools" "objc-bridge" + ,(match (%current-system) + ("x86_64-linux" + "x86-headers64") + ("i686-linux" + "x86-headers"))))) (for-each copy-recursively dirs (map (cut string-append libdir <>) dirs))) -- cgit v1.2.3 From 45a2346f329935bd6837e5fa3eca6232ef694242 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 18 Nov 2018 11:39:09 +0200 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From 74854d11ceb6d54c5ba27a7554a69577ddc983fa Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 18 Nov 2018 11:40:29 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 774f8bbeb1f3515c3af08e67f24e508e7c4cc067 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 18 Nov 2018 11:54:53 +0200 Subject: 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(+) (limited to 'gnu') 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")))) -- cgit v1.2.3 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: 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 (limited to 'gnu') 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 -- cgit v1.2.3 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: gnu: spice: Run tests sequentially. * gnu/packages/spice.scm (spice)[arguments]: Add #:parallel-tests?. --- gnu/packages/spice.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu') 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))))) -- cgit v1.2.3 From 1472d19abf49352c404c285546526457898de113 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 8 Nov 2018 17:01:59 -0500 Subject: gnu: maxima: Fix tests on i686 and x86_64. * gnu/packages/maths.scm (maxima)[arguments]: Replace check phase. --- gnu/packages/maths.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index b1cddfd80a..05570789a0 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2788,6 +2788,18 @@ to BMP, JPEG or PNG image formats.") (lambda _ (chmod "src/maxima" #o555) #t)) + (replace 'check + (lambda _ + ;; This is derived from the testing code in the "debian/rules" file + ;; of Debian's Maxima package. + ;; If Maxima can successfully run this, the binary to be installed + ;; should be fine. + (zero? + (system + (string-append "./maxima-local " + "--lisp=gcl " + "--batch-string=\"run_testsuite();\" " + "| grep -q \"No unexpected errors found\""))))) ;; Make sure the doc and emacs files are found in the ;; standard location. Also configure maxima to find gnuplot ;; without having it on the PATH. -- cgit v1.2.3 From 564cf93f2aca60171b4b97559ffc6c952e73e8ed Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 17 Nov 2018 17:55:44 +0100 Subject: gnu: ocaml: Update to 4.7.0. Update ocaml to the latest version and fixes dependent packages by updating them or by adding new inputs, such as ocaml-num and ocamlbuild, that were removed from the core ocaml package. Rename packages that cannot be built with the new compiler with an ocaml4.02 prefix. Add ocaml4.02 dependencies. * gnu/packages/ocaml.scm (ocaml): Update to 4.7.0. (ocaml-4.02, ocamlbuild, camlp4-4.02, ocaml-num, ocaml4.02-menhir) (ocaml4.02-lablgtk, ocaml4.02-findlib, ocaml4.02-ounit, ocaml4.02-camlzip) (ocaml4.02-ocamlmod, ocaml4.02-zarith, ocaml4.02-qcheck, ocaml4.02-qtest) (ocaml4.02-stringext, ocaml4.02-bisect, dune, ocaml-migrate-parsetree) (ocaml-ppx-tools-versioned, ocaml-ppx-tools-versioned) (ocaml4.02-bitstring, ocaml4.02-result, ocaml4.02-topkg, ocaml4.02-rresult) (ocaml4.02-sqlite3, ocaml4.02-csv, ocaml4.02-mtime, ocaml4.02-cmdliner) (ocaml4.02-fmt, ocaml4.02-astring, ocaml4.02-alcotest, ocaml4.02-ppx-tools) (ocaml4.02-react, ocaml4.02-ssl, ocaml4.02-lwt, ocaml-lwt-log) (ocaml4.02-lwt-log, ocaml4.02-logs, ocaml4.02-fpath, ocaml4.02-bos) (ocaml4.02-xmlm, ocaml4.02-ulex, ocaml4.02-uchar, ocaml4.02-uutf) (ocaml4.02-jsonm, ocaml4.02-ocurl, ocaml4.02-base64, ocaml4.02-omake) (ocaml4.02-batteries, ocaml4.02-pcre, ocaml4.02-oasis) (ocaml4.02-js-build-tools, ocaml4.02-cppo, ocaml-seq, ocaml4.02-seq) (ocaml4.02-re, ocaml4.02-ocplib-endian, ocaml4.02-easy-format) (ocaml4.02-piqilib, ocaml4.02-uuidm, ocaml4.02-graph, ocaml4.02-piqi) (ocaml4.02-camomile, ocaml4.02-zed, ocaml4.02-lambda-term): New packages. (opam): Update to 2.0.0. (camlp4): Update to 4.07+1. (camlp5): Update to 7.06. (hevea): Update to 2.32. (coq)[inputs]: Add ocaml-num. (emacs-tuareg): Update to 2.2.0. (ocaml-menhir)[native-inputs]: Add ocamlbuild. (ocaml-lablgtk): Update to 2.18.6. (unison)[inputs]: Use ocaml-4.02. (ocaml-findlib): Update to 1.8.0. (ocaml-ounit)[native-inputs]: Add ocamlbuild. (ocamlmod): Update to 0.0.9. (ocaml-frontc)[arguments]: Use ocaml-4.02. (ocaml-qcheck)[native-inputs]: Add ocamlbuild. (ocaml-qtest)[native-inputs]: Remove ocaml-findlib and add ocamlbuild. (ocaml-stringext)[native-inputs]: Add ocamlbuild. (ocaml-bisect): Update to 1.3.1. (ocaml4.01-bisect): Downgrade to 1.3. (ocaml-bitstring): Update to 3.1.0. (ocaml-topkg)[native-inputs]: Add ocamlbuild. (ocaml-rresult)[native-inputs]: Add ocamlbuild. (ocaml-sqlite3)[native-inputs]: Add ocamlbuild. (ocaml-csv)[native-inputs]: Add ocamlbuild. (ocaml-mtime)[native-inputs]: Add ocamlbuild. (ocaml-cmdliner)[native-inputs]: Add ocamlbuild. (ocaml-fmt)[native-inputs]: Add ocamlbuild. (ocaml-astring)[native-inputs]: Add ocamlbuild. (ocaml-alcotest)[native-inputs]: Add ocamlbuild. (ocaml-ppx-tools)[native-inputs]: Add ocamlbuild. (ocaml-react)[native-inputs]: Add ocamlbuild. (ocaml-ssl)[arguments]: Return #t in phases. (ocaml-lwt): Update to 4.1.0. (ocaml-logs)[native-inputs]: Add ocamlbuild. (ocaml-fpath)[native-inputs]: Add ocamlbuild. (ocaml-bos)[native-inputs]: Add ocamlbuild. (ocaml-xmlm): Update to 1.3.0. (ocaml-ulex): Update to 1.2.0. (ocaml-uchar)[native-inputs]: Add ocamlbuild. (ocaml-uutf): Update to 1.0.1. (ocaml-jsonm): Update to 1.0.1. (ocaml-ocurl): Update to 0.8.2. (ocaml-base64)[native-inputs]: Add ocamlbuild. (ocamlify)[native-inputs]: Use ocaml-4.02. (omake): Update to 0.10.3. (ocaml-batteries): Update to 2.9.0. (ocaml-pcre)[native-inputs]: Add ocamlbuild. (ocaml-expect): Update 0.0.6. (ocaml4.02-fileutils): Update to 0.5.3. (ocaml-oasis): Update 0.4.11. (ocaml-js-build-tools)[native-inputs]: Add ocamlbuild. (ocaml-bin-prot): Rename to ocaml4.02-bin-prot. (ocaml-fieldslib): Rename to ocaml4.02-fieldslib. (ocaml-ppx-core): Rename to ocaml4.02-ppx-core. (ocaml-ppx-optcomp): Rename to ocaml4.02-ppx-optcomp. (ocaml-ppx-driver): Rename to ocaml4.02-ppx-driver. (ocaml-cppo): Update to 1.6.5. (ocaml-ppx-deriving): Rename to ocaml4.02-ppx-deriving. (ocaml-ppx-type-conv): Rename to ocaml4.02-ppx-type-conv. (ocaml-ppx-inline-test): Rename to ocaml4.02-ppx-inline-test. (ocaml-ppx-bench): Rename to ocaml4.02-ppx-bench. (ocaml-ppx-compare): Rename to ocaml4.02-ppx-compare. (ocaml-sexplib): Rename to ocaml4.02-sexplib. (ocaml-typerep): Rename to ocaml4.02-typerep. (ocaml-variantslib): Rename to ocaml4.02-variantslib. (ocaml-ppx-sexp-conv): Rename to ocaml4.02-ppx-sexp-conv. (ocaml-ppx-variants-conv): Rename to ocaml4.02-ppx-variants-conv. (ocaml-ppx-here): Rename to ocaml4.02-ppx-here. (ocaml-ppx-assert): Rename to ocaml4.02-ppx-assert. (ocaml-ppx-enumerate): Rename to ocaml4.02-ppx-enumerate. (ocaml-ppx-let): Rename to ocaml4.02-ppx-let. (ocaml-ppx-typerep-conv): Rename to ocaml4.02-ppx-typerep-conv. (ocaml-ppx-sexp-value): Rename to ocaml4.02-ppx-sexp-value. (ocaml-ppx-pipebang): Rename to ocaml4.02-ppx-pipebang. (ocaml-ppx-bin-prot): Rename to ocaml4.02-ppx-bin-prot. (ocaml-ppx-fail): Rename to ocaml4.02-ppx-fail. (ocaml-ppx-custom-printf): Rename to ocaml4.02-ppx-custom-printf. (ocaml-ppx-sexp-message): Rename to ocaml4.02-ppx-sexp-message. (ocaml-ppx-fields-conv): Rename to ocaml4.02-ppx-fields-conv. (ocaml-re): Update to 1.8.0. (ocaml-ppx-expect): Rename to ocaml4.02-ppx-expect. (ocaml-ppx-jane): Rename to ocaml4.02-ppx-jane. (ocaml-core-kernel): Rename to ocaml4.02-core-kernel. (ocaml-async-kernel): Rename to ocaml4.02-async-kernel. (ocaml-async-rpc-kernel): Rename to ocaml4.02-async-rpc-kernel. (ocaml-core): Rename to ocaml4.02-core. (ocaml-async-unix): Rename to ocaml4.02-async-unix. (ocaml-async-extra): Rename to ocaml4.02-async-extra. (ocaml-async): Rename to ocaml4.02-async. (ocaml-ocplib-endian)[native-inputs]: Update to 1.0. (ocaml-cstruct): Rename to ocaml4.02-cstruct. (ocaml-hex): Rename to ocaml4.02-hex. (ocaml-ezjsonm): Rename to ocaml4.02-ezjsonm. (ocaml-uri): Rename to ocaml4.02-uri. (optcomp): Use ocaml-4.02. (ocaml-piqilib): Update to 0.6.14. (ocaml-uuidm)[native-inputs]: Add ocamlbuild. (ocaml-graph): Update to 1.8.8. (ocaml-piqi): Update to 0.7.6. (bap): Update to 1.3.0. (ocaml-camomile): Update to 1.0.1. (ocaml-jbuilder): Use ocaml-4.02. (ocaml-lambda-term): Update to 1.13. (ocaml-utop): Update to 2.2.0. (ocaml-integers)[native-inputs]: Add ocamlbuild. (ocaml-ctypes): Update to 0.14.0. (ocaml-ocb-stubblr)[native-inputs]: Add ocamlbuild. (ocaml-tsdl)[native-inputs]: Add ocamlbuild. * gnu/packages/machine-learning.scm (ocaml-mcl): Use ocaml-4.02. * gnu/packages/maths.scm (cubicle): Update to 1.1.2. * gnu/packages/patches/ocaml-bisect-fix-camlp4-in-another-directory.patch: Update patch. * guix/build-system/ocaml.scm: (default-ocaml4.02, default-ocaml4.02-findlib) (package-with-ocaml4.02, strip-ocaml4.02-variant): New variables. --- gnu/packages/machine-learning.scm | 5 +- gnu/packages/maths.scm | 30 +- gnu/packages/ocaml.scm | 2328 ++++++++++++++------ ...ml-bisect-fix-camlp4-in-another-directory.patch | 246 ++- 4 files changed, 1870 insertions(+), 739 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 990a6c771a..09c525ff20 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2018 Mark Meyer ;;; Copyright © 2018 Ben Woodcroft ;;; Copyright © 2018 Fis Trivial +;;; Copyright © 2018 Julien Lepiller ;;; ;;; This file is part of GNU Guix. ;;; @@ -300,7 +301,9 @@ networks) based on simulation of (stochastic) flow in graphs.") "1l5jbhwjpsj38x8b9698hfpkv75h8hn3kj0gihjhn8ym2cwwv110")))) (build-system ocaml-build-system) (arguments - `(#:phases + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib + #:phases (modify-phases %standard-phases (add-before 'configure 'patch-paths (lambda _ diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 05570789a0..82abc22994 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -28,6 +28,7 @@ ;;; Copyright © 2018 Adam Massmann ;;; Copyright © 2018 Marius Bakke ;;; Copyright © 2018 Eric Brown +;;; Copyright © 2018 Julien Lepiller ;;; ;;; This file is part of GNU Guix. ;;; @@ -3988,37 +3989,52 @@ theories} (SMT) solver. It provides a C/C++ API, as well as Python bindings.") (define-public cubicle (package (name "cubicle") - (version "1.1.1") + (version "1.1.2") (source (origin (method url-fetch) (uri (string-append "http://cubicle.lri.fr/cubicle-" version ".tar.gz")) (sha256 (base32 - "1sny9c4fm14k014pk62ibpwbrjjirkx8xmhs9jg7q1hk7y7x3q2h")))) + "10kk80jdmpdvql88sdjsh7vqzlpaphd8vip2lp47aarxjkwjlz1q")))) (build-system gnu-build-system) (native-inputs - `(("ocaml" ,ocaml) + `(("automake" ,automake) + ("ocaml" ,ocaml) ("which" ,(@@ (gnu packages base) which)))) (propagated-inputs - `(("z3" ,z3))) + `(("ocaml-num" ,ocaml-num) + ("z3" ,z3))) (arguments `(#:configure-flags (list "--with-z3") + #:make-flags (list "QUIET=") #:tests? #f #:phases (modify-phases %standard-phases (add-before 'configure 'configure-for-release (lambda _ (substitute* "Makefile.in" - (("SVNREV=") "#SVNREV=")))) + (("SVNREV=") "#SVNREV=")) + #t)) (add-before 'configure 'fix-/bin/sh (lambda _ (substitute* "configure" - (("/bin/sh") (which "sh"))))) + (("-/bin/sh") (string-append "-" (which "sh")))) + #t)) (add-before 'configure 'fix-smt-z3wrapper.ml (lambda _ (substitute* "Makefile.in" - (("\\\\n") ""))))))) + (("\\\\n") "")) + #t)) + (add-before 'configure 'fix-ocaml-num + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "Makefile.in" + (("= \\$\\(FUNCTORYLIB\\)") + (string-append "= -I " + (assoc-ref inputs "ocaml-num") + "/lib/ocaml/site-lib" + " $(FUNCTORYLIB)"))) + #t))))) (home-page "http://cubicle.lri.fr/") (synopsis "Model checker for array-based systems") (description "Cubicle is a model checker for verifying safety properties diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 6b55e84fed..e1323582a2 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016 Eric Bavier ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016, 2018 Efraim Flashner -;;; Copyright © 2016, 2017 Julien Lepiller +;;; Copyright © 2016-2018 Julien Lepiller ;;; Copyright © 2017 Ben Woodcroft ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Peter Kreye @@ -120,7 +120,7 @@ "/lib/ocaml/site-lib")) #:phases (modify-phases %standard-phases (delete 'configure)))) -(define-public ocaml +(define-public ocaml-4.02 (package (name "ocaml") (version "4.02.3") @@ -145,7 +145,8 @@ (files (list "lib/ocaml" "lib/ocaml/site-lib"))) (search-path-specification (variable "CAML_LD_LIBRARY_PATH") - (files (list "lib/ocaml/site-lib/stubslibs"))))) + (files (list "lib/ocaml/site-lib/stubslibs" + "lib/ocaml/site-lib/stublibs"))))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config))) @@ -228,7 +229,7 @@ functional, imperative and object-oriented styles of programming.") (define-public ocaml-4.01 (package - (inherit ocaml) + (inherit ocaml-4.02) (version "4.01.0") (source (origin (method url-fetch) @@ -240,7 +241,7 @@ functional, imperative and object-oriented styles of programming.") (base32 "03d7ida94s1gpr3gadf4jyhmh5rrszd5s4m4z59daaib25rvfyv7")))) (arguments - (substitute-keyword-arguments (package-arguments ocaml) + (substitute-keyword-arguments (package-arguments ocaml-4.02) ((#:phases phases) `(modify-phases ,phases (replace 'build @@ -256,10 +257,78 @@ functional, imperative and object-oriented styles of programming.") (string-append "TOPDIR=" (getcwd) "/..")))))))))))) +(define-public ocaml-4.07 + (package + (inherit ocaml-4.02) + (version "4.07.0") + (source (origin + (method url-fetch) + (uri (string-append + "http://caml.inria.fr/pub/distrib/ocaml-" + (version-major+minor version) + "/ocaml-" version ".tar.xz")) + (sha256 + (base32 + "03wzkzv6w4rdiiva20g5amz0n4x75swpjl8d80468p6zm8hgfnzl")))) + (arguments + (substitute-keyword-arguments (package-arguments ocaml-4.02) + ((#:phases phases) + `(modify-phases ,phases + (delete 'prepare-socket-test) + (replace 'check + (lambda _ + (with-directory-excursion "testsuite" + (invoke "make" "all")) + #t)))))))) + +(define-public ocaml ocaml-4.07) + +(define-public ocamlbuild + (package + (name "ocamlbuild") + (version "0.13.1") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/ocaml/ocamlbuild/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1320cfkixs1xlng5av04pa5qjb3ynvi2kl3k1ngqzg5fpi29b0vr")))) + (build-system gnu-build-system) + (arguments + `(#:test-target "test" + #:tests? #f; tests require findlib + #:make-flags + (list (string-append "OCAMLBUILD_PREFIX=" (assoc-ref %outputs "out")) + (string-append "OCAMLBUILD_BINDIR=" (assoc-ref %outputs "out") + "/bin") + (string-append "OCAMLBUILD_LIBDIR=" (assoc-ref %outputs "out") + "/lib/ocaml/site-lib") + (string-append "OCAMLBUILD_MANDIR=" (assoc-ref %outputs "out") + "/share/man")) + #:phases + (modify-phases %standard-phases + (delete 'bootstrap) + (delete 'configure) + (add-before 'build 'findlib-environment + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (setenv "OCAMLFIND_DESTDIR" (string-append out "/lib/ocaml/site-lib")) + (setenv "OCAMLFIND_LDCONF" "ignore") + #t)))))) + (native-inputs + `(("ocaml" ,ocaml))) + (home-page "https://github.com/ocaml/ocamlbuild") + (synopsis "OCaml build tool") + (description "OCamlbuild is a generic build tool, that has built-in rules + for building OCaml library and programs.") + (license license:lgpl2.1+))) + (define-public opam (package (name "opam") - (version "1.2.2") + (version "2.0.0") (source (origin (method url-fetch) ;; Use the '-full' version, which includes all the dependencies. @@ -271,7 +340,7 @@ functional, imperative and object-oriented styles of programming.") ) (sha256 (base32 - "004gwn6rbpcb53y3rpb3v23vk39rp2xmf0liyd5iy12ij8bigrhm")))) + "09gdpxiqmyr6z78l85d7pwhiwrycdi2xi1b2mafqr1sk9z5lzbcx")))) (build-system gnu-build-system) (arguments '(;; Sometimes, 'make -jX' would fail right after ./configure with @@ -321,7 +390,7 @@ Git-friendly development workflow.") ;; The 'LICENSE' file waives some requirements compared to LGPLv3. (license license:lgpl3))) -(define-public camlp4 +(define-public camlp4-4.02 (package (name "camlp4") (version "4.02+6") @@ -334,9 +403,9 @@ Git-friendly development workflow.") "0icdfzhsbgf89925gc8gl3fm8z2xzszzlib0v9dj5wyzkyv3a342")) (file-name (string-append name "-" version ".tar.gz")))) (build-system gnu-build-system) - (native-inputs `(("ocaml" ,ocaml) + (native-inputs `(("ocaml" ,ocaml-4.02) ("which" ,which))) - (inputs `(("ocaml" ,ocaml))) + (inputs `(("ocaml" ,ocaml-4.02))) (arguments '(#:tests? #f ;no documented test target ;; a race-condition will lead byte and native targets to mkdir _build @@ -377,17 +446,42 @@ syntax of OCaml.") ;; against the library to be released under any terms. (license license:lgpl2.0))) +(define-public camlp4-4.07 + (package + (inherit camlp4-4.02) + (name "camlp4") + (version "4.07+1") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/ocaml/camlp4/archive/" + version ".tar.gz")) + (sha256 + (base32 + "143hhxv1i6aq413z0i1pynrjcfl2g5gnh5r3863v6h9z0riqknzc")) + (file-name (string-append name "-" version ".tar.gz")))) + (properties + `((ocaml4.02-variant . ,(delay camlp4-4.02)))) + (native-inputs + `(("ocaml" ,ocaml-4.07) + ("ocamlbuild" ,ocamlbuild) + ("which" ,which))) + (inputs + `(("ocaml" ,ocaml-4.07))))) + +(define-public camlp4 camlp4-4.07) + (define-public camlp5 (package (name "camlp5") - (version "6.14") + (version "7.06") (source (origin (method url-fetch) - (uri (string-append "http://camlp5.gforge.inria.fr/distrib/src/" - name "-" version ".tgz")) + (uri (string-append "https://github.com/camlp5/camlp5/archive/rel" + (string-delete #\. version) ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1ql04iyvclpyy9805kpddc4ndjb5d0qg4shhi2fc6bixi49fvy89")))) + "08kr0h2rq3jh3kzqh5f6pr589bqw3y76z8k59ad2kdh50fjgp8xy")))) (build-system gnu-build-system) (inputs `(("ocaml" ,ocaml))) @@ -404,6 +498,11 @@ syntax of OCaml.") (invoke "./configure" "--prefix" out "--mandir" mandir)))) + (add-before 'build 'fix-/bin-references + (lambda _ + (substitute* "config/Makefile" + (("/bin/rm") "rm")) + #t)) (replace 'build (lambda _ (invoke "make" "-j" (number->string @@ -427,17 +526,19 @@ concrete syntax of the language (Quotations, Syntax Extensions).") (define-public hevea (package (name "hevea") - (version "2.28") + (version "2.32") (source (origin (method url-fetch) (uri (string-append "http://hevea.inria.fr/old/" name "-" version ".tar.gz")) (sha256 (base32 - "14fns13wlnpiv9i05841kvi3cq4b9v2sw5x3ff6ziws28q701qnd")))) + "1s4yqphfcr1pf5mcj5c84mvmd107k525iiym5jdwsxz0ka0ccmfy")))) (build-system gnu-build-system) (inputs `(("ocaml" ,ocaml))) + (native-inputs + `(("ocamlbuild" ,ocamlbuild))) (arguments `(#:tests? #f ; no test suite #:make-flags (list (string-append "PREFIX=" %output)) @@ -455,6 +556,50 @@ concrete syntax of the language (Quotations, Syntax Extensions).") written in Objective Caml.") (license license:qpl))) +(define-public ocaml-num + (package + (name "ocaml-num") + (version "1.1") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/ocaml/num/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1xlkd0svc0mgq5s7nrm2rjrsvg15i9wxqkc1kvwjp6sv8vv8bb04")))) + (build-system ocaml-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'fix-makefile + (lambda* (#:key outputs #:allow-other-keys) + ;; This package supposes we install to the same directory as + ;; the ocaml package. + (substitute* "src/META" + (("\"\\^\"") (string-append "\"" (assoc-ref outputs "out") + "/lib/ocaml/site-lib\""))) + (substitute* "src/Makefile" + (("\\) \\$\\(STDLIBDIR\\)") + (string-append ") " (assoc-ref outputs "out") + "/lib/ocaml/site-lib"))) + #t)) + (add-after 'install 'fix-stubslib + (lambda* (#:key outputs #:allow-other-keys) + (format #t "~a~%" (find-files "." ".*.so")) + (let ((stubdir (string-append (assoc-ref outputs "out") + "/lib/ocaml/site-lib"))) + (mkdir-p stubdir) + (install-file "src/dllnums.so" stubdir)) + #t))))) + (home-page "https://github.com/ocaml/num") + (synopsis "Arbitrary-precision integer and rational arithmetic") + (description "OCaml-Num contains the legacy Num library for +arbitrary-precision integer and rational arithmetic that used to be part of +the OCaml core distribution.") + (license license:lgpl2.1+))); with linking exception + (define-public coq (package (name "coq") @@ -478,7 +623,8 @@ written in Objective Caml.") (inputs `(("lablgtk" ,lablgtk) ("python" ,python-2) - ("camlp5" ,camlp5))) + ("camlp5" ,camlp5) + ("ocaml-num" ,ocaml-num))) (arguments `(#:phases (modify-phases %standard-phases @@ -598,7 +744,7 @@ provers.") (define-public emacs-tuareg (package (name "emacs-tuareg") - (version "2.0.10") + (version "2.2.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/ocaml/tuareg/archive/" @@ -606,7 +752,7 @@ provers.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1r2smclcs63n74lcyckbp90j09wyjdngn816cqzfkw54iwh3hd7q")))) + "1ynpfc170f9jqx49biji9npfkvfpflbm29xf24wc7fnxxayr49ig")))) (build-system gnu-build-system) (native-inputs `(("emacs" ,emacs-minimal) ("opam" ,opam))) @@ -650,6 +796,8 @@ Emacs.") (build-system gnu-build-system) (inputs `(("ocaml" ,ocaml))) + (native-inputs + `(("ocamlbuild" ,ocamlbuild))) (arguments `(#:parallel-build? #f ; Parallel build causes failure #:tests? #f ; No check target @@ -660,6 +808,8 @@ Emacs.") (let ((out (assoc-ref outputs "out"))) (setenv "PREFIX" out)) #t))))) + (properties + `((ocaml4.02-variant . ,(delay ocaml4.02-menhir)))) (home-page "http://gallium.inria.fr/~fpottier/menhir") (synopsis "Parser generator") (description "Menhir is a parser generator. It turns high-level grammar @@ -671,17 +821,26 @@ Knuth’s LR(1) parser construction technique.") ;; are QPL licensed. (license (list license:gpl2+ license:qpl)))) +(define-public ocaml4.02-menhir + (package + (inherit ocaml-menhir) + (name "ocaml4.02-menhir") + (inputs `(("ocaml" ,ocaml-4.02))) + (native-inputs '()))) + (define-public lablgtk (package (name "lablgtk") - (version "2.18.5") + (version "2.18.6") (source (origin (method url-fetch) - (uri (ocaml-forge-uri name version 1627)) + (uri (ocaml-forge-uri name version 1726)) (sha256 (base32 - "0cyj6sfdvzx8hw7553lhgwc0krlgvlza0ph3dk9gsxy047dm3wib")))) + "1y38fdvswy6hmppm65qvgdk4pb3ghhnvz7n4ialf46340r1s5p2d")))) (build-system gnu-build-system) + (properties + `((ocaml4.02-variant . ,(delay ocaml4.02-lablgtk)))) (native-inputs `(("camlp4" ,camlp4) ("ocaml" ,ocaml) @@ -732,6 +891,23 @@ libglade (and it an generate OCaml code from .glade files), libpanel, librsvg and quartz.") (license license:lgpl2.1))) +(define-public ocaml4.02-lablgtk + (package + (inherit lablgtk) + (name "ocaml4.02-lablgtk") + (version "2.18.5") + (source (origin + (method url-fetch) + (uri (ocaml-forge-uri name version 1627)) + (sha256 + (base32 + "0cyj6sfdvzx8hw7553lhgwc0krlgvlza0ph3dk9gsxy047dm3wib")))) + (native-inputs + `(("camlp4" ,camlp4-4.02) + ("ocaml" ,ocaml-4.02) + ("findlib" ,ocaml4.02-findlib) + ("pkg-config" ,pkg-config))))) + (define-public unison (package (name "unison") @@ -792,12 +968,13 @@ libpanel, librsvg and quartz.") (outputs '("out" "doc")) ; 1.9 MiB of documentation (native-inputs - `(("ocaml" ,ocaml) + `(("ocaml" ,ocaml-4.02) ;; For documentation ("ghostscript" ,ghostscript) ("texlive" ,texlive) ("hevea" ,hevea) - ("lynx" ,lynx))) + ("lynx" ,lynx) + ("which" ,which))) (arguments `(#:parallel-build? #f #:parallel-tests? #f @@ -827,6 +1004,14 @@ libpanel, librsvg and quartz.") (let ((doc (string-append (assoc-ref outputs "doc") "/share/doc/unison"))) (mkdir-p doc) + ;; This is a workaround to prevent a build failure. Running + ;; make docs somehow allows it to pass, but the generated + ;; documentation is not pretty. + (catch #t + (lambda _ + (invoke "make" "docs" + "TEXDIRECTIVES=\\\\draftfalse")) + (lambda _ #t)) ;; This file needs write-permissions, because it's ;; overwritten by 'docs' during documentation generation. (chmod "src/strings.ml" #o600) @@ -856,14 +1041,14 @@ to the other.") (define-public ocaml-findlib (package (name "ocaml-findlib") - (version "1.7.3") + (version "1.8.0") (source (origin (method url-fetch) (uri (string-append "http://download.camlcity.org/download/" "findlib" "-" version ".tar.gz")) (sha256 (base32 - "12xx8si1qv3xz90qsrpazjjk4lc1989fzm97rsmc4diwla7n15ni")))) + "1b97zqjdriqd2ikgh4rmqajgxwdwn013riji5j53y3xvcmnpsyrb")))) (build-system gnu-build-system) (native-inputs `(("camlp4" ,camlp4) @@ -912,6 +1097,15 @@ compilation and linkage, there are new frontends of the various OCaml compilers that can directly deal with packages.") (license license:x11))) +(define-public ocaml4.02-findlib + (package + (inherit ocaml-findlib) + (name "ocaml4.02-findlib") + (native-inputs + `(("camlp4" ,camlp4-4.02) + ("m4" ,m4) + ("ocaml" ,ocaml-4.02))))) + (define-public ocaml4.01-findlib (package (inherit ocaml-findlib) @@ -933,7 +1127,8 @@ compilers that can directly deal with packages.") "03ifp9hjcxg4m5j190iy373jcn4039d3vy10kmd8p4lfciwzwc1f")))) (build-system ocaml-build-system) (native-inputs - `(("libxml2" ,libxml2))) ; for xmllint + `(("libxml2" ,libxml2) ; for xmllint + ("ocamlbuild" ,ocamlbuild))) (arguments `(#:phases (modify-phases %standard-phases @@ -947,6 +1142,9 @@ other XUnit testing frameworks.") (define-public ocaml4.01-ounit (package-with-ocaml4.01 ocaml-ounit)) +(define-public ocaml4.02-ounit + (package-with-ocaml4.02 ocaml-ounit)) + (define-public camlzip (package (name "camlzip") @@ -1007,19 +1205,23 @@ files in these formats.") (base32 "0syh72jk9s0qwjmmfrkqchaj98m020ii082jn38pwnmb6v3p02wk"))))))) +(define-public ocaml4.02-camlzip + (package-with-ocaml4.02 camlzip)) + (define-public ocamlmod (package (name "ocamlmod") - (version "0.0.8") + (version "0.0.9") (source (origin (method url-fetch) - (uri (ocaml-forge-uri name version 1544)) + (uri (ocaml-forge-uri name version 1702)) (sha256 (base32 - "1w0w8lfyymvk300dv13gvhrddpcyknvyp4g2yvq2vaw7khkhjs9g")))) + "0cgp9qqrq7ayyhddrmqmq1affvfqcn722qiakjq4dkywvp67h4aa")))) (build-system ocaml-build-system) (native-inputs - `(("ounit" ,ocaml-ounit))) + `(("ounit" ,ocaml-ounit) + ("ocamlbuild" ,ocamlbuild))) (arguments `(#:phases (modify-phases %standard-phases @@ -1030,6 +1232,9 @@ files in these formats.") (description "Generate modules from OCaml source files.") (license license:lgpl2.1+))) ; with an exception +(define-public ocaml4.02-ocamlmod + (package-with-ocaml4.02 ocamlmod)) + (define-public ocaml-zarith (package (name "ocaml-zarith") @@ -1060,6 +1265,9 @@ over big integers. Small integers are represented as Caml unboxed integers, for speed and space economy.") (license license:lgpl2.1+))) ; with an exception +(define-public ocaml4.02-zarith + (package-with-ocaml4.02 ocaml-zarith)) + (define-public ocaml-frontc (package (name "ocaml-frontc") @@ -1073,7 +1281,9 @@ for speed and space economy.") "16dz153s92dgbw1rrfwbhscy73did87kfmjwyh3qpvs748h1sc4g")))) (build-system ocaml-build-system) (arguments - `(#:phases + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib + #:phases (modify-phases %standard-phases (delete 'configure) (add-after 'install 'install-meta @@ -1116,7 +1326,8 @@ GNU CC attributes. It provides also a C pretty printer as an example of use.") "1zs1pg5cb1iry554v3cdmmiglsrwmsqa9x8zxmzb118fnk5d3ha6")))) (build-system ocaml-build-system) (native-inputs - `(("ounit" ,ocaml-ounit))) + `(("ounit" ,ocaml-ounit) + ("ocamlbuild" ,ocamlbuild))) (home-page "https://github.com/c-cube/qcheck") (synopsis "QuickCheck inspired property-based testing for OCaml") (description "QuickCheck inspired property-based testing for OCaml. This @@ -1125,6 +1336,9 @@ generated instances of the type. It provides combinators for generating instances and printing them.") (license license:lgpl3+))) +(define-public ocaml4.02-qcheck + (package-with-ocaml4.02 ocaml-qcheck)) + (define-public ocaml-qtest (package (name "ocaml-qtest") @@ -1139,7 +1353,7 @@ instances and printing them.") "1ff4if64mc9c7wmhjdgnlnh6k6a713piqzr4043zzj4s5pw7smxk")))) (build-system ocaml-build-system) (native-inputs - `(("findlib" ,ocaml-findlib))) + `(("ocamlbuild" ,ocamlbuild))) (propagated-inputs `(("ounit" ,ocaml-ounit) ("qcheck" ,ocaml-qcheck))) @@ -1161,6 +1375,9 @@ to use -- to sophisticated random generation of test cases.") (define-public ocaml4.01-qtest (package-with-ocaml4.01 ocaml-qtest)) +(define-public ocaml4.02-qtest + (package-with-ocaml4.02 ocaml-qtest)) + (define-public ocaml-stringext (package (name "ocaml-stringext") @@ -1175,7 +1392,8 @@ to use -- to sophisticated random generation of test cases.") "19g6lfn03iki9f8h91hi0yiqn0b3wkxyq08b3y23wgv6jw6mssfh")))) (build-system ocaml-build-system) (native-inputs - `(("qtest" ,ocaml-qtest))) + `(("ocamlbuild" ,ocamlbuild) + ("qtest" ,ocaml-qtest))) (home-page "https://github.com/rgrinberg/stringext") (synopsis "Extra string functions for OCaml") (description "Provides a single module named Stringext that provides a grab @@ -1185,17 +1403,21 @@ full_split, cut, rcut, etc..") ;; where it says `mit'. (license license:expat))) +(define-public ocaml4.02-stringext + (package-with-ocaml4.02 ocaml-stringext)) (define-public ocaml-bisect (package (name "ocaml-bisect") - (version "1.3") + (version "1.3.1") (source (origin (method url-fetch) - (uri (ocaml-forge-uri "bisect" version 1051)) + (uri (string-append "https://github.com/gasche/bisect/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0kcg2rh0qlkfpbv3nhcb75n62b04gbrz0zasq15ynln91zd5qrg0")) + "0p67fppk5ifb63b00kxwrb1xg75hrqhknng3bsdyw3gxxqyjlpmx")) (patches (search-patches "ocaml-bisect-fix-camlp4-in-another-directory.patch")))) @@ -1203,6 +1425,7 @@ full_split, cut, rcut, etc..") (native-inputs `(("camlp4" ,camlp4) ("libxml2" ,libxml2) + ("ocamlbuild" ,ocamlbuild) ("which" ,which))) (propagated-inputs `(("camlp4" ,camlp4))) @@ -1215,9 +1438,11 @@ full_split, cut, rcut, etc..") #:phases (modify-phases %standard-phases (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (zero? (system* "./configure" "-prefix" - (assoc-ref outputs "out")))))))) + (lambda* (#:key inputs outputs #:allow-other-keys) + (invoke "./configure" "-prefix" (assoc-ref outputs "out") + "-ocaml-prefix" (assoc-ref inputs "ocaml") + "-camlp4-prefix" (assoc-ref inputs "camlp4")) + #t))))) (home-page "http://bisect.x9c.fr") (synopsis "Code coverage tool for the OCaml language") (description "Bisect is a code coverage tool for the OCaml language. It is @@ -1225,46 +1450,260 @@ a camlp4-based tool that allows to instrument your application before running tests. After application execution, it is possible to generate a report in HTML format that is the replica of the application source code annotated with code coverage information.") - (properties `((ocaml4.01-variant . ,(delay ocaml4.01-bisect)))) + (properties + `((ocaml4.01-variant . ,(delay ocaml4.01-bisect)) + (ocaml4.02-variant . ,(delay ocaml4.02-bisect)))) (license license:gpl3+))) (define-public ocaml4.01-bisect (let ((base (package-with-ocaml4.01 (strip-ocaml4.01-variant ocaml-bisect)))) (package (inherit base) + (version "1.3") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/gasche/bisect/archive/" + version ".tar.gz")) + (file-name (string-append "ocaml-bisect-" version ".tar.gz")) + (sha256 + (base32 + "1ip49jqf0kkbrqf8qspmfjbg9ap9fhvjkg718myzix88dg5rv8d4")))) (arguments `(#:ocaml ,ocaml-4.01 - ;; Camlp4 is included with OCaml 4.01, so do not include it as a - ;; separate input. - ,@(strip-keyword-arguments '(#:make-flags) (package-arguments base)))) + ,@(substitute-keyword-arguments (package-arguments ocaml-bisect) + ((#:make-flags flags) + `(list "all")) + ((#:phases phases) + `(modify-phases ,phases + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (invoke "./configure" + "-ocaml-prefix" (assoc-ref inputs "ocaml")) + #t))))))) (native-inputs `(,@(alist-delete "camlp4" (package-native-inputs base)))) (propagated-inputs `(,@(alist-delete "camlp4" (package-propagated-inputs base))))))) +(define-public ocaml4.02-bisect + (let ((base (package-with-ocaml4.02 (strip-ocaml4.02-variant ocaml-bisect)))) + (package + (inherit base) + (native-inputs + `(("camlp4" ,camlp4-4.02) + ("libxml2" ,libxml2) + ("which" ,which))) + (propagated-inputs + `(("camlp4" ,camlp4-4.02)))))) + +(define-public dune + (package + (name "dune") + (version "1.2.1") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/ocaml/dune/releases/" + "download/" version "/dune-" version ".tbz")) + (sha256 + (base32 + "00c5dbm4hkdapc2i7pg07b2lj8sv6ly38qr7zid58cdmbmzq21z9")))) + (build-system ocaml-build-system) + (arguments + `(#:tests? #f; require odoc + #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (invoke "./configure") + #t))))) + (home-page "https://github.com/ocaml/dune") + (synopsis "OCaml build system") + (description "Dune is a build system that was designed to simplify the +release of Jane Street packages. It reads metadata from @file{dune} files +following a very simple s-expression syntax.") + (license license:expat))) + +(define-public ocaml-migrate-parsetree + (package + (name "ocaml-migrate-parsetree") + (version "1.1.0") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/ocaml-ppx/" + "ocaml-migrate-parsetree/releases/download/v" + version "/ocaml-migrate-parsetree-" + version ".tbz")) + (sha256 + (base32 + "01zjp1q4hryqaxv4apkjd868fycz2kf887r6lkb6x2a545h1lh7f")))) + (build-system ocaml-build-system) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda _ + (invoke "jbuilder" "build" "@install") + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (invoke "jbuilder" "install" + "--prefix" (assoc-ref outputs "out")) + #t))))) + (propagated-inputs + `(("ocamlbuild" ,ocamlbuild) + ("ocaml-result" ,ocaml-result))) + (native-inputs + `(("dune" ,dune))) + (home-page "https://github.com/ocaml-ppx/ocaml-migrate-parsetree") + (synopsis "OCaml parsetree convertor") + (description "This library converts between parsetrees of different OCaml +versions. For each version, there is a snapshot of the parsetree and conversion +functions to the next and/or previous version.") + (license license:lgpl2.1+))) + +(define-public ocaml-ppx-tools-versioned + (package + (name "ocaml-ppx-tools-versioned") + (version "5.2.1") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/ocaml-ppx/" + "ppx_tools_versioned/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1x2xfjpkzbcz4rza1d7gh3ipliw6jqfcklbsln82v3561qgkqgmh")))) + (build-system ocaml-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda _ + (invoke "dune" "build" "@install") + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (invoke "dune" "install" + "--prefix" (assoc-ref outputs "out")) + #t))))) + (native-inputs + `(("dune" ,dune))) + (propagated-inputs + `(("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree))) + (home-page "https://github.com/let-def/ppx_tools_versioned") + (synopsis "Variant of ppx_tools") + (description "This package is a variant of ppx_tools based on +ocaml-migrate-parsetree") + (license license:expat))) + +(define-public ocaml-ppx-tools-versioned + (package + (name "ocaml-ppx-tools-versioned") + (version "5.2.1") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/ocaml-ppx/" + "ppx_tools_versioned/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1x2xfjpkzbcz4rza1d7gh3ipliw6jqfcklbsln82v3561qgkqgmh")))) + (build-system ocaml-build-system) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda _ + (invoke "dune" "build" "@install") + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (invoke "dune" "install" + "--prefix" (assoc-ref outputs "out")) + #t))))) + (native-inputs + `(("dune" ,dune))) + (propagated-inputs + `(("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree))) + (home-page "https://github.com/let-def/ppx_tools_versioned") + (synopsis "Variant of ppx_tools") + (description "This package is a variant of ppx_tools based on +ocaml-migrate-parsetree") + (license license:expat))) + (define-public ocaml-bitstring (package (name "ocaml-bitstring") - (version "2.1.1") + (version "3.1.0") (source (origin (method url-fetch) - (uri (string-append "https://github.com/xguerin/bitstring" - "/archive/v" version ".tar.gz")) + (uri (string-append "https://bitbucket.org/thanatonauts/bitstring/" + "get/v" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0vy8ibrxccii1jbsk5q6yh1kxjigqvi7lhhcmizvd5gfhf7mfyc8")) - (patches (search-patches "ocaml-bitstring-fix-configure.patch")))) + "15jjk2pq1vx311gl49s5ag6x5y0654x35w75z07g7kr2q334hqps")))) (build-system ocaml-build-system) (native-inputs `(("camlp4" ,camlp4) ("time" ,time) ("autoconf" ,autoconf) ("automake" ,automake) - ("bisect" ,ocaml-bisect))) + ("bisect" ,ocaml-bisect) + ("dune" ,dune))) (propagated-inputs - `(("camlp4" ,camlp4))) + `(("camlp4" ,camlp4) + ("ocaml-ppx-tools-versioned" ,ocaml-ppx-tools-versioned))) (arguments - `(#:configure-flags + `(#:tests? #f; Tests fail to build + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda _ + (invoke "jbuilder" "build" "@install") + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (invoke "dune" "install" + "--prefix" (assoc-ref outputs "out")) + #t))))) + (properties + `((ocaml4.02-variant . ,(delay ocaml4.02-bitstring)))) + (home-page "https://github.com/xguerin/bitstring") + (synopsis "Bitstrings and bitstring matching for OCaml") + (description "Adds Erlang-style bitstrings and matching over bitstrings as +a syntax extension and library for OCaml. You can use this module to both parse +and generate binary formats, files and protocols. Bitstring handling is added +as primitives to the language, making it exceptionally simple to use and very +powerful.") + (license license:isc))) + +(define-public ocaml4.02-bitstring + (let ((base (package-with-ocaml4.02 (strip-ocaml4.02-variant ocaml-bitstring)))) + (package + (inherit base) + (version "2.1.1") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/xguerin/bitstring" + "/archive/v" version ".tar.gz")) + (file-name (string-append "ocaml-bitstring-" version ".tar.gz")) + (sha256 + (base32 + "0vy8ibrxccii1jbsk5q6yh1kxjigqvi7lhhcmizvd5gfhf7mfyc8")) + (patches (search-patches "ocaml-bitstring-fix-configure.patch")))) + (arguments + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib + #:configure-flags (list "CAMLP4OF=camlp4of" "--enable-coverage") #:make-flags (list (string-append "BISECTLIB=" @@ -1280,14 +1719,6 @@ coverage information.") "$(BISECTLIB)/bisect")) #:phases (modify-phases %standard-phases - (add-before 'configure 'fix-configure - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "Makefile.in" - (("@abs_top_builddir@") - (string-append "@abs_top_builddir@:" (getenv "LIBRARY_PATH")))) - (substitute* "configure" - (("-/bin/sh") (string-append "-" (assoc-ref inputs "bash") - "/bin/sh"))))) (add-after 'install 'link-lib (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -1297,15 +1728,24 @@ coverage information.") "/lib/ocaml/site-lib/bitstring"))) (mkdir-p stubs) (symlink (string-append lib "/dllbitstring.so") - (string-append stubs "/dllbitstring.so")))))))) - (home-page "https://github.com/xguerin/bitstring") - (synopsis "Bitstrings and bitstring matching for OCaml") - (description "Adds Erlang-style bitstrings and matching over bitstrings as -a syntax extension and library for OCaml. You can use this module to both parse -and generate binary formats, files and protocols. Bitstring handling is added -as primitives to the language, making it exceptionally simple to use and very -powerful.") - (license license:isc))) + (string-append stubs "/dllbitstring.so"))) + #t)) + (add-before 'configure 'fix-configure + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "Makefile.in" + (("@abs_top_builddir@") + (string-append "@abs_top_builddir@:" (getenv "LIBRARY_PATH")))) + (substitute* "configure" + (("-/bin/sh") (string-append "-" (assoc-ref inputs "bash") + "/bin/sh")))))))) + (native-inputs + `(("camlp4" ,camlp4-4.02) + ("time" ,time) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("bisect" ,ocaml4.02-bisect))) + (propagated-inputs + `(("camlp4" ,camlp4-4.02)))))) (define-public ocaml-result (package @@ -1331,6 +1771,9 @@ powerful.") staying compatible with older version of OCaml should use the Result module defined in this library.") (license license:bsd-3))) + +(define-public ocaml4.02-result + (package-with-ocaml4.02 ocaml-result)) (define-public ocaml-topkg (package @@ -1345,7 +1788,8 @@ defined in this library.") "18rrh6fmf708z7dd30amljmcgaypj3kk49jrmrj68r4wnw8004j8")))) (build-system ocaml-build-system) (native-inputs - `(("opam" ,opam))) + `(("opam" ,opam) + ("ocamlbuild" ,ocamlbuild))) (propagated-inputs `(("result" ,ocaml-result))) (arguments @@ -1361,6 +1805,9 @@ provides an API to describe the files a package installs in a given build configuration and to specify information about the package's distribution, creation and publication procedures.") (license license:isc))) + +(define-public ocaml4.02-topkg + (package-with-ocaml4.02 ocaml-topkg)) (define-public ocaml-rresult (package @@ -1375,7 +1822,8 @@ creation and publication procedures.") "1xxycxhdhaq8p9vhwi93s2mlxjwgm44fcxybx5vghzgbankz9yhm")))) (build-system ocaml-build-system) (native-inputs - `(("opam" ,opam))) + `(("opam" ,opam) + ("ocamlbuild" ,ocamlbuild))) (propagated-inputs `(("topkg" ,ocaml-topkg))) (arguments @@ -1392,6 +1840,9 @@ to operate on the result type available from OCaml 4.03 in the standard library.") (license license:isc))) +(define-public ocaml4.02-rresult + (package-with-ocaml4.02 ocaml-rresult)) + (define-public ocaml-sqlite3 (package (name "ocaml-sqlite3") @@ -1407,7 +1858,8 @@ library.") "14c1nir7c6bivajg0vyx853y7la7r5d25g1v5hjb2wfi73r15p1m")))) (build-system ocaml-build-system) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("ocamlbuild" ,ocamlbuild) + ("pkg-config" ,pkg-config))) (inputs `(("sqlite" ,sqlite))) (home-page "https://mmottl.github.io/sqlite3-ocaml") @@ -1424,6 +1876,9 @@ coexistence with the old (version 2) SQLite and its OCaml wrapper (define-public ocaml4.01-sqlite3 (package-with-ocaml4.01 ocaml-sqlite3)) +(define-public ocaml4.02-sqlite3 + (package-with-ocaml4.02 ocaml-sqlite3)) + (define-public ocaml-csv (package (name "ocaml-csv") @@ -1439,6 +1894,8 @@ coexistence with the old (version 2) SQLite and its OCaml wrapper (base32 "0rv7x843vn6scxj87hzl01yqrl26rc27lr8s7z6rp9vs745g05zj")))) (build-system ocaml-build-system) + (native-inputs + `(("ocamlbuild" ,ocamlbuild))) (home-page "https://github.com/Chris00/ocaml-csv") (synopsis "Pure OCaml functions to read and write CSV") (description @@ -1451,6 +1908,9 @@ manipulate such data.") (define-public ocaml4.01-csv (package-with-ocaml4.01 ocaml-csv)) +(define-public ocaml4.02-csv + (package-with-ocaml4.02 ocaml-csv)) + (define-public ocaml-mtime (package (name "ocaml-mtime") @@ -1464,7 +1924,8 @@ manipulate such data.") "1hfx4ny2dkw6jf3jppz0640dafl5xgn8r2si9kpwzhmibal8qrah")))) (build-system ocaml-build-system) (native-inputs - `(("opam" ,opam))) + `(("ocamlbuild" ,ocamlbuild) + ("opam" ,opam))) (propagated-inputs `(("topkg" ,ocaml-topkg))) (arguments @@ -1480,6 +1941,9 @@ manipulate such data.") spans without being subject to operating system calendar time adjustments.") (license license:isc))) +(define-public ocaml4.02-mtime + (package-with-ocaml4.02 ocaml-mtime)) + (define-public ocaml-cmdliner (package (name "ocaml-cmdliner") @@ -1493,7 +1957,8 @@ spans without being subject to operating system calendar time adjustments.") "0hdxlkgiwjml9dpaa80282a8350if7mc1m6yz2mrd7gci3fszykx")))) (build-system ocaml-build-system) (native-inputs - `(("opam" ,opam))) + `(("ocamlbuild" ,ocamlbuild) + ("opam" ,opam))) (arguments `(#:tests? #f #:build-flags '("native=true" "native-dynlink=true") @@ -1510,6 +1975,9 @@ generation. It supports programs with single or multiple commands and respects most of the POSIX and GNU conventions.") (license license:bsd-3))) +(define-public ocaml4.02-cmdliner + (package-with-ocaml4.02 ocaml-cmdliner)) + (define-public ocaml-fmt (package (name "ocaml-fmt") @@ -1522,10 +1990,13 @@ most of the POSIX and GNU conventions.") (sha256 (base32 "16y7ibndnairb53j8a6qgipyqwjxncn4pl9jiw5bxjfjm59108px")))) (build-system ocaml-build-system) - (native-inputs `(("opam" ,opam) - ("topkg" ,ocaml-topkg))) - (propagated-inputs `(("result" ,ocaml-result) - ("cmdliner" ,ocaml-cmdliner))) + (native-inputs + `(("ocamlbuild" ,ocamlbuild) + ("opam" ,opam) + ("topkg" ,ocaml-topkg))) + (propagated-inputs + `(("result" ,ocaml-result) + ("cmdliner" ,ocaml-cmdliner))) (arguments `(#:tests? #f #:build-flags (list "build" "--with-base-unix" "true" "--with-cmdliner" "true") @@ -1538,6 +2009,9 @@ most of the POSIX and GNU conventions.") functions.") (license license:isc))) +(define-public ocaml4.02-fmt + (package-with-ocaml4.02 ocaml-fmt)) + (define-public ocaml-astring (package (name "ocaml-astring") @@ -1550,13 +2024,16 @@ functions.") (sha256 (base32 "0ixjwc3plrljvj24za3l9gy0w30lsbggp8yh02lwrzw61ls4cri0")))) (build-system ocaml-build-system) - (native-inputs `(("opam" ,opam) - ("topkg" ,ocaml-topkg))) - (arguments `(#:tests? #f - #:build-flags (list "build") - #:phases - (modify-phases %standard-phases - (delete 'configure)))) + (native-inputs + `(("ocamlbuild" ,ocamlbuild) + ("opam" ,opam) + ("topkg" ,ocaml-topkg))) + (arguments + `(#:tests? #f + #:build-flags (list "build") + #:phases + (modify-phases %standard-phases + (delete 'configure)))) (home-page "http://erratique.ch/software/astring") (synopsis "Alternative String module for OCaml") (description "Astring exposes an alternative String module for OCaml. This @@ -1568,6 +2045,9 @@ adds a few missing functions and fully exploits OCaml's newfound string immutability.") (license license:isc))) +(define-public ocaml4.02-astring + (package-with-ocaml4.02 ocaml-astring)) + (define-public ocaml-alcotest (package (name "ocaml-alcotest") @@ -1580,15 +2060,19 @@ immutability.") (base32 "0g5lzk0gpfx4q8hyhr460gr4lab5wakfxsmhfwvb3yinxwzs95gc")))) (build-system ocaml-build-system) - (arguments `(#:tests? #f - #:build-flags (list "build") - #:phases - (modify-phases %standard-phases - (delete 'configure)))) - (native-inputs `(("opam" ,opam) - ("topkg" ,ocaml-topkg))) - (propagated-inputs `(("fmt" ,ocaml-fmt) - ("astring" ,ocaml-astring))) + (arguments + `(#:tests? #f + #:build-flags (list "build") + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (native-inputs + `(("ocamlbuild" ,ocamlbuild) + ("opam" ,opam) + ("topkg" ,ocaml-topkg))) + (propagated-inputs + `(("fmt" ,ocaml-fmt) + ("astring" ,ocaml-astring))) (home-page "https://github.com/mirage/alcotest") (synopsis "Lightweight OCaml test framework") (description "Alcotest exposes simple interface to perform unit tests. It @@ -1599,25 +2083,44 @@ displayed at the end of the run (with the full logs ready to inspect), with a simple (yet expressive) query language to select the tests to run.") (license license:isc))) +(define-public ocaml4.02-alcotest + (package-with-ocaml4.02 ocaml-alcotest)) + (define-public ocaml-ppx-tools (package (name "ocaml-ppx-tools") - (version "5.0+4.02.0") + (version "5.1+4.06.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/alainfrisch/ppx_tools/archive/" version ".tar.gz")) (sha256 (base32 - "0rjg4rngi8k9873z4zq95zn9hj8qyw1vcrf11y15aqasfpqq16rc")))) + "0mncpy9v2mcjgnj7s2vqpp2b1ixv54djicfx66ic9wny9d202gj1")))) (build-system ocaml-build-system) - (arguments `(#:phases (modify-phases %standard-phases (delete 'configure)) - #:tests? #f)) + (arguments + `(#:phases (modify-phases %standard-phases (delete 'configure)) + #:tests? #f)) + (properties + `((ocaml4.02-variant . ,(delay ocaml4.02-ppx-tools)))) (home-page "https://github.com/alainfrisch/ppx_tools") (synopsis "Tools for authors of ppx rewriters and other syntactic tools") (description "Tools for authors of ppx rewriters and other syntactic tools.") (license license:expat))) +(define-public ocaml4.02-ppx-tools + (let ((base (package-with-ocaml4.02 (strip-ocaml4.02-variant ocaml-ppx-tools)))) + (package + (inherit base) + (version "5.0+4.02.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/alainfrisch/ppx_tools/archive/" + version ".tar.gz")) + (sha256 (base32 + "0rjg4rngi8k9873z4zq95zn9hj8qyw1vcrf11y15aqasfpqq16rc"))))))) + (define-public ocaml-react (package (name "ocaml-react") @@ -1630,12 +2133,15 @@ simple (yet expressive) query language to select the tests to run.") (sha256 (base32 "0knhgbngphv5sp1yskfd97crf169qhpc0igr6w7vqw0q36lswyl8")))) (build-system ocaml-build-system) - (native-inputs `(("opam" ,opam))) - (arguments `(#:tests? #f - #:build-flags (list "native=true" "native-dynlink=true") - #:phases - (modify-phases %standard-phases - (delete 'configure)))) + (native-inputs + `(("ocamlbuild" ,ocamlbuild) + ("opam" ,opam))) + (arguments + `(#:tests? #f + #:build-flags (list "native=true" "native-dynlink=true") + #:phases + (modify-phases %standard-phases + (delete 'configure)))) (home-page "http://erratique.ch/software/react") (synopsis "Declarative events and signals for OCaml") (description "React is an OCaml module for functional reactive programming @@ -1644,6 +2150,9 @@ events and signals. React doesn't define any primitive event or signal, it lets the client choose the concrete timeline.") (license license:bsd-3))) +(define-public ocaml4.02-react + (package-with-ocaml4.02 ocaml-react)) + (define-public ocaml-ssl (package (name "ocaml-ssl") @@ -1658,20 +2167,23 @@ lets the client choose the concrete timeline.") (sha256 (base32 "0fviq8xhp3qk7pmkl7knchywsipxgb7p0z489hj8qnf2sx8xzdmy")))) (build-system ocaml-build-system) - (arguments `(#:tests? #f - #:make-flags (list "OCAMLFIND_LDCONF=ignore") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'bootstrap - (lambda* (#:key #:allow-other-keys) - (system* "sh" "bootstrap") - (substitute* "src/OCamlMakefile" - (("/bin/sh") (which "bash"))) - (substitute* "configure" - (("/bin/sh") (which "bash")))))))) - (native-inputs `(("autoconf" ,autoconf) - ("automake" ,automake) - ("which" ,which))) + (arguments + `(#:tests? #f + #:make-flags (list "OCAMLFIND_LDCONF=ignore") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'bootstrap + (lambda* (#:key #:allow-other-keys) + (system* "sh" "bootstrap") + (substitute* "src/OCamlMakefile" + (("/bin/sh") (which "bash"))) + (substitute* "configure" + (("/bin/sh") (which "bash"))) + #t))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("which" ,which))) (propagated-inputs `(("openssl" ,openssl))) (home-page "https://github.com/savonet/ocaml-ssl/") (synopsis "OCaml bindings for OpenSSL") @@ -1680,10 +2192,13 @@ lets the client choose the concrete timeline.") through Transport Layer Security (@dfn{TLS}) encrypted connections.") (license license:lgpl2.1))) +(define-public ocaml4.02-ssl + (package-with-ocaml4.02 ocaml-ssl)) + (define-public ocaml-lwt (package (name "ocaml-lwt") - (version "2.6.0") + (version "4.1.0") (source (origin (method url-fetch) @@ -1691,35 +2206,37 @@ through Transport Layer Security (@dfn{TLS}) encrypted connections.") ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1gbw0g8a5a4b16diqrmlhc8ilnikrm4w3jjm1zq310maqg8z0zxz")))) + "0mhh019bjkg5xfvpy1pxs4xdxb759fyydmgb6l4j0qww1qgr8klp")))) (build-system ocaml-build-system) (arguments - `(#:configure-flags - (list "--enable-ssl" "--enable-glib" "--enable-react" - "--enable-ppx") + `(#:tests? #f; require lwt_ppx #:phases (modify-phases %standard-phases - (add-before 'configure 'disable-some-checks - (lambda* (#:key #:allow-other-keys) - (substitute* "tests/unix/main.ml" - (("Test_mcast.suite;") "")))) - (add-after 'install 'link-stubs + (replace 'configure + (lambda _ + (invoke "ocaml" "src/util/configure.ml" "-use-libev" "true") + #t)) + (replace 'build + (lambda _ + (invoke "jbuilder" "build" "@install") + #t)) + (replace 'install (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (stubs (string-append out "/lib/ocaml/site-lib/stubslibs")) - (lib (string-append out "/lib/ocaml/site-lib/lwt"))) - (mkdir-p stubs) - (symlink (string-append lib "/dlllwt-glib_stubs.so") - (string-append stubs "/dlllwt-glib_stubs.so")) - (symlink (string-append lib "/dlllwt-unix_stubs.so") - (string-append stubs "/dlllwt-unix_stubs.so")))))))) - (native-inputs `(("pkg-config" ,pkg-config) - ("ppx-tools" ,ocaml-ppx-tools))) - (inputs `(("libev" ,libev) - ("glib" ,glib))) - (propagated-inputs `(("result" ,ocaml-result) - ("ocaml-ssl" ,ocaml-ssl) - ("ocaml-react" ,ocaml-react))) + (invoke "jbuilder" "install" "--prefix" (assoc-ref outputs "out")) + #t))))) + (native-inputs + `(("dune" ,dune) + ("ocaml-cppo" ,ocaml-cppo) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("pkg-config" ,pkg-config) + ("ppx-tools-versioned" ,ocaml-ppx-tools-versioned))) + (inputs + `(("libev" ,libev) + ("glib" ,glib))) + (propagated-inputs + `(("result" ,ocaml-result) + ("ocaml-ssl" ,ocaml-ssl) + ("ocaml-react" ,ocaml-react))) (home-page "https://github.com/ocsigen/lwt") (synopsis "Cooperative threads and I/O in monadic style") (description "Lwt provides typed, composable cooperative threads. These @@ -1728,6 +2245,48 @@ process. Also, in many cases, Lwt threads can interact without the need for locks or other synchronization primitives.") (license license:lgpl2.1))) +(define-public ocaml4.02-lwt + (package-with-ocaml4.02 ocaml-lwt)) + +(define-public ocaml-lwt-log + (package + (name "ocaml-lwt-log") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/aantron/lwt_log/archive/" version + ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 (base32 + "1lr62j2266pbsi54xmzsfvl2z7fi7smhak7fp1ybl8hssxwi6in2")))) + (build-system ocaml-build-system) + (arguments + `(#:tests? #f; require lwt_ppx + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda _ + (invoke "jbuilder" "build" "@install") + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (invoke "jbuilder" "install" "--prefix" (assoc-ref outputs "out")) + #t))))) + (native-inputs + `(("dune" ,dune))) + (propagated-inputs + `(("lwt" ,ocaml-lwt))) + (home-page "https://github.com/aantron/lwt_log") + (synopsis "Logging library") + (description "This package provides a deprecated logging component for +ocaml lwt.") + (license license:lgpl2.1))) + +(define-public ocaml4.02-lwt-log + (package-with-ocaml4.02 ocaml-lwt-log)) + (define-public ocaml-logs (package (name "ocaml-logs") @@ -1740,18 +2299,22 @@ locks or other synchronization primitives.") (base32 "1khbn7jqpid83zn8rvyh1x1sirls7zc878zj4fz985m5xlsfy853")))) (build-system ocaml-build-system) - (arguments `(#:tests? #f - #:build-flags (list "build" "--with-js_of_ocaml" "false") - #:phases - (modify-phases %standard-phases - (delete 'configure)))) - (native-inputs `(("opam" ,opam))) - (propagated-inputs `(("fmt" ,ocaml-fmt) - ("lwt" ,ocaml-lwt) - ("mtime" ,ocaml-mtime) - ("result" ,ocaml-result) - ("cmdliner" ,ocaml-cmdliner) - ("topkg" ,ocaml-topkg))) + (arguments + `(#:tests? #f + #:build-flags (list "build" "--with-js_of_ocaml" "false") + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (native-inputs + `(("ocamlbuild" ,ocamlbuild) + ("opam" ,opam))) + (propagated-inputs + `(("fmt" ,ocaml-fmt) + ("lwt" ,ocaml-lwt) + ("mtime" ,ocaml-mtime) + ("result" ,ocaml-result) + ("cmdliner" ,ocaml-cmdliner) + ("topkg" ,ocaml-topkg))) (home-page "http://erratique.ch/software/logs") (synopsis "Logging infrastructure for OCaml") (description "Logs provides a logging infrastructure for OCaml. Logging is @@ -1759,6 +2322,9 @@ performed on sources whose reporting level can be set independently. Log message report is decoupled from logging and is handled by a reporter.") (license license:isc))) +(define-public ocaml4.02-logs + (package-with-ocaml4.02 ocaml-logs)) + (define-public ocaml-fpath (package (name "ocaml-fpath") @@ -1771,14 +2337,18 @@ message report is decoupled from logging and is handled by a reporter.") (base32 "05134ij27xjl6gaqsc65yl19vfj6cjxq3mbm9bf4mija8grdpn6g")))) (build-system ocaml-build-system) - (arguments `(#:tests? #f - #:build-flags (list "build") - #:phases - (modify-phases %standard-phases - (delete 'configure)))) - (native-inputs `(("opam" ,opam))) - (propagated-inputs `(("topkg" ,ocaml-topkg) - ("astring" ,ocaml-astring))) + (arguments + `(#:tests? #f + #:build-flags (list "build") + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (native-inputs + `(("ocamlbuild" ,ocamlbuild) + ("opam" ,opam))) + (propagated-inputs + `(("topkg" ,ocaml-topkg) + ("astring" ,ocaml-astring))) (home-page "http://erratique.ch/software/fpath") (synopsis "File system paths for OCaml") (description "Fpath is an OCaml module for handling file system paths with @@ -1786,6 +2356,9 @@ POSIX or Windows conventions. Fpath processes paths without accessing the file system and is independent from any system library.") (license license:isc))) +(define-public ocaml4.02-fpath + (package-with-ocaml4.02 ocaml-fpath)) + (define-public ocaml-bos (package (name "ocaml-bos") @@ -1798,18 +2371,22 @@ file system and is independent from any system library.") (base32 "1ly66lysk4w6mdy4k1n3ynlpfpq7lw4wshcpzgx58v6x613w5s7q")))) (build-system ocaml-build-system) - (arguments `(#:tests? #f - #:build-flags (list "build") - #:phases - (modify-phases %standard-phases - (delete 'configure)))) - (native-inputs `(("opam" ,opam))) - (propagated-inputs `(("topkg" ,ocaml-topkg) - ("astring" ,ocaml-astring) - ("fmt" ,ocaml-fmt) - ("fpath" ,ocaml-fpath) - ("logs" ,ocaml-logs) - ("rresult" ,ocaml-rresult))) + (arguments + `(#:tests? #f + #:build-flags (list "build") + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (native-inputs + `(("ocamlbuild" ,ocamlbuild) + ("opam" ,opam))) + (propagated-inputs + `(("topkg" ,ocaml-topkg) + ("astring" ,ocaml-astring) + ("fmt" ,ocaml-fmt) + ("fpath" ,ocaml-fpath) + ("logs" ,ocaml-logs) + ("rresult" ,ocaml-rresult))) (home-page "http://erratique.ch/software/bos") (synopsis "Basic OS interaction for OCaml") (description "Bos provides support for basic and robust interaction with @@ -1818,26 +2395,31 @@ environment, parse command line arguments, interact with the file system and run command line programs.") (license license:isc))) +(define-public ocaml4.02-bos + (package-with-ocaml4.02 ocaml-bos)) + (define-public ocaml-xmlm (package (name "ocaml-xmlm") - (version "1.2.0") + (version "1.3.0") (source (origin (method url-fetch) (uri (string-append "http://erratique.ch/software/xmlm/releases/" "xmlm-" version ".tbz")) (sha256 (base32 - "1jywcrwn5z3gkgvicr004cxmdaqfmq8wh72f81jqz56iyn5024nh")))) + "1rrdxg5kh9zaqmgapy9bhdqyxbbvxxib3bdfg1vhw4rrkp1z0x8n")))) (build-system ocaml-build-system) - (arguments `(#:tests? #f - #:phases - (modify-phases %standard-phases - (delete 'configure) - (replace 'build - (lambda* (#:key #:allow-other-keys) - (zero? (system* "pkg/build" "true"))))))) - (native-inputs `(("opam" ,opam))) + (arguments + `(#:tests? #f + #:build-flags (list "build") + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (native-inputs + `(("ocamlbuild" ,ocamlbuild) + ("ocaml-topkg" ,ocaml-topkg) + ("opam" ,opam))) (home-page "http://erratique.ch/software/xmlm") (synopsis "Streaming XML codec for OCaml") (description "Xmlm is a streaming codec to decode and encode the XML data @@ -1848,32 +2430,41 @@ representation of the data.") (define-public ocaml4.01-xmlm (package-with-ocaml4.01 ocaml-xmlm)) +(define-public ocaml4.02-xmlm + (package-with-ocaml4.02 ocaml-xmlm)) + (define-public ocaml-ulex (package (name "ocaml-ulex") - (version "1.1") + (version "1.2") (source (origin (method url-fetch) - (uri (string-append "http://www.cduce.org/download/ulex-" + (uri (string-append "https://github.com/whitequark/ulex/archive/v" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0fjlkwps14adfgxdrbb4yg65fhyimplvjjs1xqj5np197cig67x0")))) + "16gnbhqs6y2v89vw4igzvxdf2g8ybh5643636824aldcv8sscac0")))) (build-system ocaml-build-system) - (arguments `(#:phases (modify-phases %standard-phases (delete 'configure)) - #:tests? #f - #:make-flags - (list "all.opt" - (string-append "OCAMLBUILD=ocamlbuild -byte-plugin " - "-cflags -I," - (assoc-ref %build-inputs "camlp4") - "/lib/ocaml/site-lib/camlp4")))) - (native-inputs `(("camlp4" ,camlp4))) + (arguments + `(#:phases (modify-phases %standard-phases (delete 'configure)) + #:tests? #f + #:make-flags + (list "all.opt" + (string-append "OCAMLBUILD=ocamlbuild -byte-plugin " + "-cflags -I," (assoc-ref %build-inputs "camlp4") + "/lib/ocaml/site-lib/camlp4")))) + (native-inputs + `(("camlp4" ,camlp4) + ("ocamlbuild" ,ocamlbuild))) (home-page "http://www.cduce.org/download.html#side") (synopsis "Lexer generator for Unicode and OCaml") (description "Lexer generator for Unicode and OCaml.") (license license:expat))) +(define-public ocaml4.02-ulex + (package-with-ocaml4.02 ocaml-ulex)) + (define-public ocaml-uchar (package (name "ocaml-uchar") @@ -1886,39 +2477,49 @@ representation of the data.") (sha256 (base32 "0ficw1x7ymbd6m8hqw3w1aycwm1hbwd6bad3c5pspwnzh3qlikhi")))) (build-system ocaml-build-system) - (arguments `(#:tests? #f - #:build-flags (list "native=true" "native-dynlink=true") - #:phases - (modify-phases %standard-phases - (delete 'configure)))) - (native-inputs `(("opam" ,opam))) + (arguments + `(#:tests? #f + #:build-flags (list "native=true" "native-dynlink=true") + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (native-inputs + `(("ocamlbuild" ,ocamlbuild) + ("opam" ,opam))) (home-page "https://github.com/ocaml/uchar") (synopsis "Compatibility library for OCaml's Uchar module") (description "The uchar package provides a compatibility library for the `Uchar` module introduced in OCaml 4.03.") (license license:lgpl2.1))) +(define-public ocaml4.02-uchar + (package-with-ocaml4.02 ocaml-uchar)) + (define-public ocaml-uutf (package (name "ocaml-uutf") - (version "1.0.0") + (version "1.0.1") (source (origin (method url-fetch) (uri (string-append "http://erratique.ch/software/uutf/releases/" "uutf-" version ".tbz")) (sha256 (base32 - "08i0cw02cxw4mi2rs01v9xi307qshs6fnd1dlqyb52kcxzblpp37")))) + "1gp96dcggq7s84934vimxh89caaxa77lqiff1yywbwkilkkjcfqj")))) (build-system ocaml-build-system) - (arguments `(#:tests? #f - #:build-flags (list "build") - #:phases - (modify-phases %standard-phases - (delete 'configure)))) - (native-inputs `(("opam" ,opam) - ("topkg" ,ocaml-topkg))) - (propagated-inputs `(("uchar" ,ocaml-uchar) - ("cmdliner" ,ocaml-cmdliner))) + (arguments + `(#:tests? #f + #:build-flags (list "build") + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (native-inputs + `(("ocamlbuild" ,ocamlbuild) + ("opam" ,opam) + ("topkg" ,ocaml-topkg))) + (propagated-inputs + `(("uchar" ,ocaml-uchar) + ("cmdliner" ,ocaml-cmdliner))) (home-page "http://erratique.ch/software/uutf") (synopsis "Non-blocking streaming Unicode codec for OCaml") (description "Uutf is a non-blocking streaming codec to decode and encode @@ -1930,27 +2531,34 @@ Functions are also provided to fold over the characters of UTF encoded OCaml string values and to directly encode characters in OCaml Buffer.t values.") (license license:isc))) +(define-public ocaml4.02-uutf + (package-with-ocaml4.02 ocaml-uutf)) + (define-public ocaml-jsonm (package (name "ocaml-jsonm") - (version "1.0.0") + (version "1.0.1") (source (origin (method url-fetch) (uri (string-append "http://erratique.ch/software/jsonm/releases/" "jsonm-" version ".tbz")) (sha256 (base32 - "1v3ln6d965lplj28snjdqdqablpp1kx8bw2cfx0m6i157mqyln62")))) + "1176dcmxb11fnw49b7yysvkjh0kpzx4s48lmdn5psq9vshp5c29w")))) (build-system ocaml-build-system) - (arguments `(#:tests? #f - #:build-flags (list "build") - #:phases - (modify-phases %standard-phases - (delete 'configure)))) - (native-inputs `(("opam" ,opam) - ("topkg" ,ocaml-topkg))) - (propagated-inputs `(("uutf" ,ocaml-uutf) - ("cmdliner" ,ocaml-cmdliner))) + (arguments + `(#:tests? #f + #:build-flags (list "build") + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (native-inputs + `(("ocamlbuild" ,ocamlbuild) + ("opam" ,opam) + ("topkg" ,ocaml-topkg))) + (propagated-inputs + `(("uutf" ,ocaml-uutf) + ("cmdliner" ,ocaml-cmdliner))) (home-page "http://erratique.ch/software/jsonm") (synopsis "Non-blocking streaming JSON codec for OCaml") (description "Jsonm is a non-blocking streaming codec to decode and encode @@ -1958,25 +2566,30 @@ the JSON data format. It can process JSON text without blocking on IO and without a complete in-memory representation of the data.") (license license:isc))) +(define-public ocaml4.02-jsonm + (package-with-ocaml4.02 ocaml-jsonm)) + (define-public ocaml-ocurl (package (name "ocaml-ocurl") - (version "0.7.9") + (version "0.8.2") (source (origin (method url-fetch) (uri (string-append "http://ygrek.org.ua/p/release/ocurl/ocurl-" version ".tar.gz")) (sha256 (base32 - "0pm6nm33wi0p9h765k6zb94ljpknryam4qd1hmb2rsk2y0y1181n")))) + "1ax3xdlzgb1zg7d0wr9nwgmh6a45a764m0wk8p6mx07ad94hz0q9")))) (build-system ocaml-build-system) - (arguments `(#:phases - (modify-phases %standard-phases - (add-before 'configure 'fix-/bin/sh - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "configure" - (("-/bin/sh") (string-append "-" (which "bash"))))))))) - (native-inputs `(("pkg-config" ,pkg-config))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'fix-/bin/sh + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "configure" + (("-/bin/sh") (string-append "-" (which "bash"))))))))) + (native-inputs + `(("pkg-config" ,pkg-config))) (inputs `(("curl" ,curl))) (home-page "http://ocurl.forge.ocamlcore.org/") (synopsis "OCaml bindings for libcurl") @@ -1984,6 +2597,9 @@ without a complete in-memory representation of the data.") multitude of other network protocols (FTP/SMTP/RTSP/etc).") (license license:isc))) +(define-public ocaml4.02-ocurl + (package-with-ocaml4.02 ocaml-ocurl)) + (define-public ocaml-base64 (package (name "ocaml-base64") @@ -2005,6 +2621,7 @@ multitude of other network protocols (FTP/SMTP/RTSP/etc).") (delete 'configure)))) (native-inputs `(("topkg" ,ocaml-topkg) + ("ocamlbuild" ,ocamlbuild) ("opam" ,opam) ("rresult" ,ocaml-rresult) ("bos" ,ocaml-bos) @@ -2016,6 +2633,9 @@ that represent binary data in an ASCII string format by translating it into a radix-64 representation. It is specified in RFC 4648.") (license license:isc))) +(define-public ocaml4.02-base64 + (package-with-ocaml4.02 ocaml-base64)) + (define-public ocamlify (package (name "ocamlify") @@ -2029,7 +2649,9 @@ radix-64 representation. It is specified in RFC 4648.") (build-system ocaml-build-system) ; tests are done during build (arguments - `(#:phases + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib + #:phases (modify-phases %standard-phases (delete 'check)))) (home-page "https://forge.ocamlcore.org/projects/ocamlify") @@ -2043,14 +2665,14 @@ OCaml code.") (define-public omake (package (name "omake") - (version "0.10.1") + (version "0.10.3") (source (origin (method url-fetch) (uri (string-append "http://download.camlcity.org/download/" "omake-" version ".tar.gz")) (sha256 (base32 - "093ansbppms90hiqvzar2a46fj8gm9iwnf8gn38s6piyp70lrbsj")) + "07bdg1h5i7qnlv9xq81ad5hfypl10hxm771h4rjyl5cn8plhfcgz")) (patches (search-patches "omake-fix-non-determinism.patch")))) (build-system ocaml-build-system) (arguments @@ -2063,6 +2685,8 @@ OCaml code.") (lambda* (#:key outputs #:allow-other-keys) (substitute* "mk/osconfig_unix.mk" (("CC = cc") "CC = gcc"))))))) + (properties + `((ocaml4.02-variant . ,(delay ocaml4.02-omake)))) (native-inputs `(("hevea" ,hevea))) (home-page "http://projects.camlcity.org/projects/omake.html") (synopsis "Build system designed for scalability and portability") @@ -2084,28 +2708,66 @@ many additional enhancements, including: license:gpl2)))) ; OMake itself, with ocaml linking exception ; see LICENSE.OMake +(define-public ocaml4.02-omake + (let ((base (package-with-ocaml4.02 (strip-ocaml4.02-variant omake)))) + (package + (inherit base) + (version "0.10.2") + (source (origin + (method url-fetch) + (uri (string-append "http://download.camlcity.org/download/" + "omake-" version ".tar.gz")) + (sha256 + (base32 + "1znnlkpz89hk44byvnl1pr92ym6hwfyyw2qm9clq446r6l2z4m64")) + (patches (search-patches "omake-fix-non-determinism.patch"))))))) + (define-public ocaml-batteries (package (name "ocaml-batteries") - (version "2.5.3") + (version "2.9.0") (source (origin (method url-fetch) - (uri (ocaml-forge-uri "batteries" version 1650)) + (uri (string-append "https://github.com/ocaml-batteries-team/" + "batteries-included/releases/download/v" + version "/batteries-" version ".tar.gz")) (sha256 (base32 - "1a97w3x2l1jr5x9kj5gqm1x6b0q9fjqdcsvls7arnl3bvzgsia0n")))) + "0lkdmv2my5hirkswmci2cch341n6wkkj2q8apjhs83sg6528caxi")))) (build-system ocaml-build-system) (native-inputs - `(("qtest" ,ocaml-qtest) + `(("ocamlbuild" ,ocamlbuild) + ("qtest" ,ocaml-qtest) ("bisect" ,ocaml-bisect) ("ounit" ,ocaml-ounit))) + (propagated-inputs + `(("ocaml-num" ,ocaml-num))) (arguments `(#:phases (modify-phases %standard-phases (delete 'check) ; tests are run by the build phase (replace 'build - (lambda* (#:key outputs #:allow-other-keys) - (zero? (system* "ocaml" "setup.ml" "-build"))))))) + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((files + (map (lambda (str) + (substring str 0 (- (string-length str) 1))) + (append + (find-files "src" ".*.mliv") + (find-files "src" ".*.mlv") + (find-files "src" ".*.mlp"))))) + (apply invoke "ocamlbuild" "-no-links" "-use-ocamlfind" "-I" "num" + "-lflag" "-dllpath-all" files) + (for-each (lambda (file) + (copy-file (string-append "_build/" file) file)) + files)) + (invoke "ocamlbuild" "-no-links" "-use-ocamlfind" "-I" "num" + "-lflag" "-dllpath-all" "build/mkconf.byte") + (copy-file "_build/build/mkconf.byte" "build/mkconf.byte") + (invoke "make" "all") + #t))))) + (properties + `((ocaml4.01-variant . ,(delay ocaml4.01-batteries)) + (ocaml4.02-variant . ,(delay ocaml4.02-batteries)))) (home-page "http://batteries.forge.ocamlcore.org/") (synopsis "Development platform for the OCaml programming language") (description "Define a standard set of libraries which may be expected on @@ -2113,8 +2775,24 @@ every compliant installation of OCaml and organize these libraries into a hierarchy of modules.") (license license:lgpl2.1+))) +(define-public ocaml4.02-batteries + (let ((base (package-with-ocaml4.02 (strip-ocaml4.02-variant ocaml-batteries)))) + (package + (inherit base) + (version "2.5.3") + (source (origin + (method url-fetch) + (uri (ocaml-forge-uri "batteries" version 1650)) + (sha256 + (base32 + "1a97w3x2l1jr5x9kj5gqm1x6b0q9fjqdcsvls7arnl3bvzgsia0n")))) + (propagated-inputs '())))) + (define-public ocaml4.01-batteries - (package-with-ocaml4.01 ocaml-batteries)) + (let ((base (package-with-ocaml4.01 (strip-ocaml4.01-variant ocaml4.02-batteries)))) + (package + (inherit base) + (name "ocaml4.01-batteries")))) (define-public ocaml-pcre (package @@ -2139,9 +2817,11 @@ hierarchy of modules.") (lib (string-append out "/lib/ocaml/site-lib/pcre"))) (mkdir-p stubs) (symlink (string-append lib "/dllpcre_stubs.so") - (string-append stubs "/dllpcre_stubs.so")))))))) + (string-append stubs "/dllpcre_stubs.so"))) + #t))))) (native-inputs `(("batteries" ,ocaml-batteries) + ("ocamlbuild" ,ocamlbuild) ("pcre:bin" ,pcre "bin"))) (propagated-inputs `(("pcre" ,pcre))) (home-page "https://mmottl.github.io/pcre-ocaml") @@ -2151,19 +2831,26 @@ matching and substitution, similar to the functionality offered by the Perl language.") (license license:lgpl2.1+))); with the OCaml link exception +(define-public ocaml4.02-pcre + (package-with-ocaml4.02 ocaml-pcre)) + (define-public ocaml-expect (package (name "ocaml-expect") - (version "0.0.5") + (version "0.0.6") (source (origin (method url-fetch) - (uri (ocaml-forge-uri name version 1372)) + (uri (ocaml-forge-uri name version 1736)) (sha256 (base32 - "07xq8w2x2vffc32z7vk6y14jwbfb1cw0m2lm1jzi60hnr1dvg8by")))) + "098qvg9d4yrqzr5ax291y3whrpax0m3sx4gi6is0mblc96r9yqk0")))) + (arguments + `(#:tests? #f)) (build-system ocaml-build-system) (native-inputs - `(("ocaml-pcre" ,ocaml-pcre) + `(("ocamlbuild" ,ocamlbuild) + ("ocaml-num" ,ocaml-num) + ("ocaml-pcre" ,ocaml-pcre) ("ounit" ,ocaml-ounit))) (propagated-inputs `(("batteries" ,ocaml-batteries))) (home-page "https://forge.ocamlcore.org/projects/ocaml-expect/") @@ -2172,18 +2859,22 @@ language.") can match the question using a regular expression or a timeout.") (license license:lgpl2.1+))) ; with the OCaml static compilation exception -(define-public ocaml-fileutils +(define-public ocaml4.02-fileutils (package - (name "ocaml-fileutils") - (version "0.5.1") + (name "ocaml4.02-fileutils") + (version "0.5.3") (source (origin (method url-fetch) - (uri (ocaml-forge-uri name version 1651)) + (uri (ocaml-forge-uri name version 1728)) (sha256 (base32 - "0g6zx2rcvacklxyli19ixcf6ich9ipxsps4k3jz98f5zlaab0a7g")))) + "1rc4cqlvdhbs55i85zfbfhz938fsy4fj6kwlkfm3ra7bpwn8bmpd")))) (build-system ocaml-build-system) - (native-inputs `(("ounit" ,ocaml-ounit))) + (arguments + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib)) + (native-inputs + `(("ounit" ,ocaml4.02-ounit))) (home-page "http://ocaml-fileutils.forge.ocamlcore.org") (synopsis "Pure OCaml functions to manipulate real file and filename") (description "Library to provide pure OCaml functions to manipulate real @@ -2193,20 +2884,20 @@ file (POSIX like) and filename.") (define-public ocaml-oasis (package (name "ocaml-oasis") - (version "0.4.8") + (version "0.4.11") (source (origin (method url-fetch) - (uri (ocaml-forge-uri name version 1669)) + (uri (ocaml-forge-uri name version 1757)) (sha256 (base32 - "1ln7vc7ip6s5xbi20mhnn087xi4a2m5vqawx0703qqnfkzhmslqy")) + "0bn13mzfa98dq3y0jwzzndl55mnywaxv693z6f1rlvpdykp3vdqq")) (modules '((guix build utils))) (snippet '(begin (substitute* "test/test-main/Test.ml" ;; most of these tests fail because ld cannot find crti.o, but according ;; to the log file, the environment variables {LD_,}LIBRARY_PATH - ;; are set correctly whene LD_LIBRARY_PATH is defined beforhand. + ;; are set correctly when LD_LIBRARY_PATH is defined beforhand. (("TestBaseCompat.tests;") "") (("TestExamples.tests;") "") (("TestFull.tests;") "") @@ -2216,17 +2907,12 @@ file (POSIX like) and filename.") (("TestPluginOMake.tests;") "")) #t)))) (build-system ocaml-build-system) + (arguments + `(#:tests? #f)) (native-inputs - `(("ocamlify" ,ocamlify) - ("ocamlmod" ,ocamlmod) - ("ounit" ,ocaml-ounit) - ("omake" ,omake) - ("ocaml-expect" ,ocaml-expect) - ("ocaml-pcre" ,ocaml-pcre) - ("ocaml-fileutils" ,ocaml-fileutils) - ("camlp4" ,camlp4) - ("texlive" ,texlive) - ("pkg-config" ,pkg-config))) + `(("ocamlbuild" ,ocamlbuild) + ("ocamlify" ,ocamlify) + ("ocamlmod" ,ocamlmod))) (home-page "https://oasis.forge.ocamlcore.org") (synopsis "Integrates a configure, build, install system in OCaml projects") (description "OASIS is a tool to integrate a configure, build and install @@ -2234,6 +2920,9 @@ system in your OCaml projects. It helps to create standard entry points in your build system and allows external tools to analyse your project easily.") (license license:lgpl2.1+))) ; with ocaml static compilation exception +(define-public ocaml4.02-oasis + (package-with-ocaml4.02 ocaml-oasis)) + (define-public ocaml-js-build-tools (package (name "ocaml-js-build-tools") @@ -2242,6 +2931,7 @@ build system and allows external tools to analyse your project easily.") "0r8z4fz8iy5y6hkdlkpwf6rk4qigcr3dzyv35585xgg2ahf12zy6")) (native-inputs `(("oasis" ,ocaml-oasis) + ("ocamlbuild" ,ocamlbuild) ("opam" ,opam))) (build-system ocaml-build-system) (arguments janestreet-arguments) @@ -2256,17 +2946,23 @@ from the oasis build log @end enumerate") (license license:asl2.0))) -(define-public ocaml-bin-prot +(define-public ocaml4.02-js-build-tools + (package-with-ocaml4.02 ocaml-js-build-tools)) + +(define-public ocaml4.02-bin-prot (package - (name "ocaml-bin-prot") + (name "ocaml4.02-bin-prot") (version "113.33.03") (source (janestreet-origin "bin_prot" version "1ws8c017z8nbj3vw92ndvjk9011f71rmp3llncbv8r5fc76wqv3l")) + (build-system ocaml-build-system) (native-inputs - `(("js-build-tools" ,ocaml-js-build-tools) + `(("js-build-tools" ,ocaml4.02-js-build-tools) ("opam" ,opam))) - (build-system ocaml-build-system) - (arguments janestreet-arguments) + (arguments + (ensure-keyword-arguments janestreet-arguments + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib))) (home-page "https://github.com/janestreet/bin_prot/") (synopsis "Binary protocol generator") (description "This library contains functionality for reading and writing @@ -2277,17 +2973,20 @@ protocol is also heavily optimized for size, making it ideal for long-term storage of large amounts of data.") (license license:asl2.0))) -(define-public ocaml-fieldslib +(define-public ocaml4.02-fieldslib (package - (name "ocaml-fieldslib") + (name "ocaml4.02-fieldslib") (version "113.33.03") (source (janestreet-origin "fieldslib" version "1rm3bn54bzk2hlq8f3w067ak8s772w4a8f78i3yh79vxfzq8ncvv")) + (build-system ocaml-build-system) (native-inputs - `(("js-build-tools" ,ocaml-js-build-tools) + `(("js-build-tools" ,ocaml4.02-js-build-tools) ("opam" ,opam))) - (build-system ocaml-build-system) - (arguments janestreet-arguments) + (arguments + (ensure-keyword-arguments janestreet-arguments + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib))) (home-page "https://github.com/janestreet/fieldslib/") (synopsis "Syntax extension to record fields") (description "Syntax extension to define first class values representing @@ -2295,18 +2994,21 @@ record fields, to get and set record fields, iterate and fold over all fields of a record and create new record values.") (license license:asl2.0))) -(define-public ocaml-ppx-core +(define-public ocaml4.02-ppx-core (package - (name "ocaml-ppx-core") + (name "ocaml4.02-ppx-core") (version "113.33.03") (source (janestreet-origin "ppx_core" version "0f69l4czhgssnhb5ds2j9dbqjyz8dp1y3i3x0i4h6pxnms20zbxa")) (build-system ocaml-build-system) (native-inputs - `(("js-build-tools" ,ocaml-js-build-tools) + `(("js-build-tools" ,ocaml4.02-js-build-tools) ("opam" ,opam))) - (inputs `(("ppx-tools" ,ocaml-ppx-tools))) - (arguments janestreet-arguments) + (inputs `(("ppx-tools" ,ocaml4.02-ppx-tools))) + (arguments + (ensure-keyword-arguments janestreet-arguments + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib))) (home-page "https://github.com/janestreet/ppx_core/") (synopsis "Standard library for ppx rewriters") (description "Ppx_core is a standard library for OCaml AST transformers. @@ -2319,20 +3021,23 @@ It contains: @end enumerate") (license license:asl2.0))) -(define-public ocaml-ppx-optcomp +(define-public ocaml4.02-ppx-optcomp (package - (name "ocaml-ppx-optcomp") + (name "ocaml4.02-ppx-optcomp") (version "113.33.03") (source (janestreet-origin "ppx_optcomp" version "13an8p2r7sd0d5lv54mlzrxdni47408bwqi3bjcx4m6005170q30")) (build-system ocaml-build-system) (native-inputs - `(("js-build-tools" ,ocaml-js-build-tools) + `(("js-build-tools" ,ocaml4.02-js-build-tools) ("opam" ,opam))) (propagated-inputs - `(("ppx-tools" ,ocaml-ppx-tools) - ("ppx-core" ,ocaml-ppx-core))) - (arguments janestreet-arguments) + `(("ppx-tools" ,ocaml4.02-ppx-tools) + ("ppx-core" ,ocaml4.02-ppx-core))) + (arguments + (ensure-keyword-arguments janestreet-arguments + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib))) (home-page "https://github.com/janestreet/ppx_optcomp/") (synopsis "Optional compilation for OCaml") (description "Ppx_optcomp stands for Optional Compilation. It is a tool @@ -2340,21 +3045,24 @@ used to handle optional compilations of pieces of code depending of the word size, the version of the compiler, ...") (license license:asl2.0))) -(define-public ocaml-ppx-driver +(define-public ocaml4.02-ppx-driver (package - (name "ocaml-ppx-driver") + (name "ocaml4.02-ppx-driver") (version "113.33.03") (source (janestreet-origin "ppx_driver" version "011zzr45897j49b7iiybb29k7pspcx36mlnp7nh6pxb8b0ga76fh")) (build-system ocaml-build-system) (native-inputs - `(("js-build-tools" ,ocaml-js-build-tools) + `(("js-build-tools" ,ocaml4.02-js-build-tools) ("opam" ,opam) - ("ppx-optcomp" ,ocaml-ppx-optcomp))) + ("ppx-optcomp" ,ocaml4.02-ppx-optcomp))) (propagated-inputs - `(("ppx-optcomp" ,ocaml-ppx-optcomp) - ("ppx-core" ,ocaml-ppx-core))) - (arguments janestreet-arguments) + `(("ppx-optcomp" ,ocaml4.02-ppx-optcomp) + ("ppx-core" ,ocaml4.02-ppx-core))) + (arguments + (ensure-keyword-arguments janestreet-arguments + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib))) (home-page "https://github.com/janestreet/ppx_driver/") (synopsis "Feature-full driver for OCaml AST transformers") (description "A driver is an executable created from a set of OCaml AST @@ -2372,21 +3080,33 @@ provide a tool that can be used to: (define-public ocaml-cppo (package (name "ocaml-cppo") - (version "1.4.1") + (version "1.6.5") (source (origin (method url-fetch) (uri (string-append "https://github.com/mjambon/cppo/archive/v" version ".tar.gz")) (sha256 (base32 - "02gma6nw09vfnd6h7bl3n70lwz7m9z2svplxyfh6h5bf4lqgqzjv")) + "1dkm3d5h6h56y937gcdk2wixlpzl59vv5pmiafglr89p20kf7gqf")) (file-name (string-append name "-" version ".tar.gz")))) (build-system ocaml-build-system) (arguments - `(#:phases (modify-phases %standard-phases (delete 'configure)) - #:make-flags (list (string-append "BINDIR=" - (assoc-ref %outputs "out") "/bin")) + `(#:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda _ + (invoke "dune" "build" "@install" "--profile" "release") + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (invoke "dune" "install" + "--prefix" (assoc-ref outputs "out")) + #t))) #:tests? #f)) + (native-inputs + `(("dune" ,dune) + ("ocamlbuild" ,ocamlbuild))) (home-page "https://github.com/mjambon/cppo") (synopsis "Equivalent of the C preprocessor for OCaml programs") (description "Cppo is an equivalent of the C preprocessor for OCaml @@ -2399,11 +3119,14 @@ programs. It allows the definition of simple macros and file inclusion. Cpp oi @end enumerate") (license license:bsd-3))) +(define-public ocaml4.02-cppo + (package-with-ocaml4.02 ocaml-cppo)) + ;; this package is not reproducible. This is related to temporary filenames ;; such as findlib_initxxxxx where xxxxx is random. -(define-public ocaml-ppx-deriving +(define-public ocaml4.02-ppx-deriving (package - (name "ocaml-ppx-deriving") + (name "ocaml4.02-ppx-deriving") (version "4.1") (source (origin @@ -2415,15 +3138,17 @@ programs. It allows the definition of simple macros and file inclusion. Cpp oi (file-name (string-append name "-" version ".tar.gz")))) (build-system ocaml-build-system) (native-inputs - `(("js-build-tools" ,ocaml-js-build-tools) - ("cppo" ,ocaml-cppo) - ("ounit" ,ocaml-ounit) + `(("js-build-tools" ,ocaml4.02-js-build-tools) + ("cppo" ,ocaml4.02-cppo) + ("ounit" ,ocaml4.02-ounit) ("opam" ,opam))) (propagated-inputs - `(("result" ,ocaml-result) - ("ppx-tools" ,ocaml-ppx-tools))) + `(("result" ,ocaml4.02-result) + ("ppx-tools" ,ocaml4.02-ppx-tools))) (arguments - `(#:phases + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib + #:phases (modify-phases %standard-phases (delete 'configure) (add-before 'install 'fix-environment @@ -2438,90 +3163,100 @@ programs. It allows the definition of simple macros and file inclusion. Cpp oi code based on type definitions, and a set of useful plugins for common tasks.") (license license:expat))) -(define-public ocaml-ppx-type-conv +(define-public ocaml4.02-ppx-type-conv (package - (name "ocaml-ppx-type-conv") + (name "ocaml4.02-ppx-type-conv") (version "113.33.03") (source (janestreet-origin "ppx_type_conv" version "1sp602ads2f250nv4d4rgw54d14k7flyhb4w8ff084f657hhmxv2")) (build-system ocaml-build-system) (native-inputs - `(("js-build-tools" ,ocaml-js-build-tools) + `(("js-build-tools" ,ocaml4.02-js-build-tools) ("opam" ,opam))) (propagated-inputs - `(("ppx-deriving" ,ocaml-ppx-deriving) - ("ppx-tools" ,ocaml-ppx-tools) - ("result" ,ocaml-result) - ("ppx-core" ,ocaml-ppx-core) - ("ppx-driver" ,ocaml-ppx-driver))) - (arguments janestreet-arguments) + `(("ppx-deriving" ,ocaml4.02-ppx-deriving) + ("ppx-core" ,ocaml4.02-ppx-core) + ("ppx-driver" ,ocaml4.02-ppx-driver))) + (arguments + (ensure-keyword-arguments janestreet-arguments + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib))) (home-page "https://github.com/janestreet/ppx_type_conv/") (synopsis "Support Library for type-driven code generators") (description "The type_conv library factors out functionality needed by different preprocessors that generate code from type specifications.") (license license:asl2.0))) -(define-public ocaml-ppx-inline-test +(define-public ocaml4.02-ppx-inline-test (package - (name "ocaml-ppx-inline-test") + (name "ocaml4.02-ppx-inline-test") (version "113.33.03") (source (janestreet-origin "ppx_inline_test" version "0859ni43fl39dd5g6cxfhq0prxmx59bd2bfq8jafp593ba4q0icq")) (build-system ocaml-build-system) (native-inputs - `(("js-build-tools" ,ocaml-js-build-tools) + `(("js-build-tools" ,ocaml4.02-js-build-tools) ("opam" ,opam) - ("ppx-core" ,ocaml-ppx-core))) + ("ppx-core" ,ocaml4.02-ppx-core))) (propagated-inputs - `(("ppx-driver" ,ocaml-ppx-driver) - ("ppx-tools" ,ocaml-ppx-tools) - ("ppx-core" ,ocaml-ppx-core))) - (arguments janestreet-arguments) + `(("ppx-driver" ,ocaml4.02-ppx-driver) + ("ppx-tools" ,ocaml4.02-ppx-tools) + ("ppx-core" ,ocaml4.02-ppx-core))) + (arguments + (ensure-keyword-arguments janestreet-arguments + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib))) (home-page "https://github.com/janestreet/ppx_inline_test/") (synopsis "Syntax extension for writing in-line tests in ocaml code") (description "Syntax extension for writing in-line tests in ocaml code.") (license license:asl2.0))) -(define-public ocaml-ppx-bench +(define-public ocaml4.02-ppx-bench (package - (name "ocaml-ppx-bench") + (name "ocaml4.02-ppx-bench") (version "113.33.03") (source (janestreet-origin "ppx_bench" version "1hky3y17qpb925rymf97wv54di9gaqdmkix7wpkjw14qzl512b68")) (build-system ocaml-build-system) (native-inputs - `(("js-build-tools" ,ocaml-js-build-tools) + `(("js-build-tools" ,ocaml4.02-js-build-tools) ("opam" ,opam) - ("ppx-core" ,ocaml-ppx-core))) + ("ppx-core" ,ocaml4.02-ppx-core))) (propagated-inputs - `(("ppx-driver" ,ocaml-ppx-driver) - ("ppx-tools" ,ocaml-ppx-tools) - ("ppx-inline-test" ,ocaml-ppx-inline-test) - ("ppx-core" ,ocaml-ppx-core))) - (arguments janestreet-arguments) + `(("ppx-driver" ,ocaml4.02-ppx-driver) + ("ppx-tools" ,ocaml4.02-ppx-tools) + ("ppx-inline-test" ,ocaml4.02-ppx-inline-test) + ("ppx-core" ,ocaml4.02-ppx-core))) + (arguments + (ensure-keyword-arguments janestreet-arguments + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib))) (home-page "https://github.com/janestreet/ppx_bench/") (synopsis "Syntax extension for writing in-line benchmarks in ocaml code") (description "Syntax extension for writing in-line benchmarks in ocaml code.") (license license:asl2.0))) -(define-public ocaml-ppx-compare +(define-public ocaml4.02-ppx-compare (package - (name "ocaml-ppx-compare") + (name "ocaml4.02-ppx-compare") (version "113.33.03") (source (janestreet-origin "ppx_compare" version "0bfhi33kq9l4q6zzc6svki2csracz5j4731c3npcy6cs73jynn0z")) (build-system ocaml-build-system) (native-inputs - `(("js-build-tools" ,ocaml-js-build-tools) + `(("js-build-tools" ,ocaml4.02-js-build-tools) ("opam" ,opam) - ("ppx-core" ,ocaml-ppx-core))) + ("ppx-core" ,ocaml4.02-ppx-core))) (propagated-inputs - `(("ppx-driver" ,ocaml-ppx-driver) - ("ppx-tools" ,ocaml-ppx-tools) - ("ppx-core" ,ocaml-ppx-core) - ("ppx-type-conv" ,ocaml-ppx-type-conv))) - (arguments janestreet-arguments) + `(("ppx-driver" ,ocaml4.02-ppx-driver) + ("ppx-tools" ,ocaml4.02-ppx-tools) + ("ppx-core" ,ocaml4.02-ppx-core) + ("ppx-type-conv" ,ocaml4.02-ppx-type-conv))) + (arguments + (ensure-keyword-arguments janestreet-arguments + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib))) (home-page "https://github.com/janestreet/ppx_compare/") (synopsis "Generation of comparison functions from types") (description "Generation of fast comparison functions from type expressions @@ -2532,94 +3267,109 @@ flexibility by allowing you to override them for a specific type and more safety by making sure that you only compare comparable values.") (license license:asl2.0))) -(define-public ocaml-sexplib +(define-public ocaml4.02-sexplib (package - (name "ocaml-sexplib") + (name "ocaml4.02-sexplib") (version "113.33.03") (source (janestreet-origin "sexplib" version "1ffjmj8if9lyv965cgn2ld1xv7g52qsr8mqflbm515ck1i8l2ima")) (build-system ocaml-build-system) (native-inputs - `(("js-build-tools" ,ocaml-js-build-tools) + `(("js-build-tools" ,ocaml4.02-js-build-tools) ("opam" ,opam))) - (arguments janestreet-arguments) + (arguments + (ensure-keyword-arguments janestreet-arguments + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib))) (home-page "https://github.com/janestreet/sexplib/") (synopsis "Library for serializing OCaml values to and from S-expressions") (description "Sexplib contains functionality for parsing and pretty-printing s-expressions.") (license license:asl2.0))) -(define-public ocaml-typerep +(define-public ocaml4.02-typerep (package - (name "ocaml-typerep") + (name "ocaml4.02-typerep") (version "113.33.03") (source (janestreet-origin "typerep" version "1b9v5bmi824a9d4sx0f40ixq0yfcbiqxafg4a1jx95xg9199zafy")) + (build-system ocaml-build-system) (native-inputs - `(("js-build-tools" ,ocaml-js-build-tools) + `(("js-build-tools" ,ocaml4.02-js-build-tools) ("opam" ,opam))) - (build-system ocaml-build-system) - (arguments janestreet-arguments) + (arguments + (ensure-keyword-arguments janestreet-arguments + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib))) (home-page "https://github.com/janestreet/typerep/") (synopsis "Typerep is a library for runtime types") (description "Typerep is a library for runtime types.") (license license:asl2.0))) -(define-public ocaml-variantslib +(define-public ocaml4.02-variantslib (package - (name "ocaml-variantslib") + (name "ocaml4.02-variantslib") (version "113.33.03") (source (janestreet-origin "variantslib" version "05vp799vl38fvl98ga5miwbzh09cnnpapi6q6gdvwyqi6w7s919n")) + (build-system ocaml-build-system) (native-inputs - `(("js-build-tools" ,ocaml-js-build-tools) + `(("js-build-tools" ,ocaml4.02-js-build-tools) ("opam" ,opam))) - (build-system ocaml-build-system) - (arguments janestreet-arguments) + (arguments + (ensure-keyword-arguments janestreet-arguments + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib))) (home-page "https://github.com/janestreet/variantslib") (synopsis "OCaml variants as first class values") (description "OCaml variants as first class values.") (license license:asl2.0))) -(define-public ocaml-ppx-sexp-conv +(define-public ocaml4.02-ppx-sexp-conv (package - (name "ocaml-ppx-sexp-conv") + (name "ocaml4.02-ppx-sexp-conv") (version "113.33.03") (source (janestreet-origin "ppx_sexp_conv" version "1rbj6d5dl625gdxih34xcrdvikci6h8i2dl9x3wraa4qrgishiw7")) (build-system ocaml-build-system) (native-inputs - `(("js-build-tools" ,ocaml-js-build-tools) + `(("js-build-tools" ,ocaml4.02-js-build-tools) ("opam" ,opam) - ("ppx-core" ,ocaml-ppx-core))) + ("ppx-core" ,ocaml4.02-ppx-core))) (propagated-inputs - `(("sexplib" ,ocaml-sexplib) - ("ppx-core" ,ocaml-ppx-core) - ("ppx-type-conv" ,ocaml-ppx-type-conv) - ("ppx-tools" ,ocaml-ppx-tools))) - (arguments janestreet-arguments) + `(("sexplib" ,ocaml4.02-sexplib) + ("ppx-core" ,ocaml4.02-ppx-core) + ("ppx-type-conv" ,ocaml4.02-ppx-type-conv) + ("ppx-tools" ,ocaml4.02-ppx-tools))) + (arguments + (ensure-keyword-arguments janestreet-arguments + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib))) (home-page "https://github.com/janestreet/ppx_sexp_conv") (synopsis "Generation of S-expression conversion functions from type definitions") (description "Generation of S-expression conversion functions from type definitions.") (license license:asl2.0))) -(define-public ocaml-ppx-variants-conv +(define-public ocaml4.02-ppx-variants-conv (package - (name "ocaml-ppx-variants-conv") + (name "ocaml4.02-ppx-variants-conv") (version "113.33.03") (source (janestreet-origin "ppx_variants_conv" version "0vnn2l1118cj72413d3f7frlw6yc09l8f64jlzkzbgb9bxpalx34")) (build-system ocaml-build-system) (native-inputs - `(("js-build-tools" ,ocaml-js-build-tools) + `(("js-build-tools" ,ocaml4.02-js-build-tools) ("opam" ,opam))) (propagated-inputs - `(("ppx-core" ,ocaml-ppx-core) - ("variantslib" ,ocaml-variantslib) - ("ppx-tools" ,ocaml-ppx-tools) - ("ppx-type-conv" ,ocaml-ppx-type-conv))) - (arguments janestreet-arguments) + `(("ppx-core" ,ocaml4.02-ppx-core) + ("variantslib" ,ocaml4.02-variantslib) + ("ppx-tools" ,ocaml4.02-ppx-tools) + ("ppx-type-conv" ,ocaml4.02-ppx-type-conv))) + (arguments + (ensure-keyword-arguments janestreet-arguments + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib))) (home-page "https://github.com/janestreet/ppx_variants_conv") (synopsis "Generation of accessor and iteration functions for ocaml variant types") @@ -2627,65 +3377,74 @@ types") variant types.") (license license:asl2.0))) -(define-public ocaml-ppx-here +(define-public ocaml4.02-ppx-here (package - (name "ocaml-ppx-here") + (name "ocaml4.02-ppx-here") (version "113.33.03") (source (janestreet-origin "ppx_here" version "1ay8lfxi0qg3ib2zkwh4h0vqk3gjmxaz572gzab0bbxyqn3z86v7")) (build-system ocaml-build-system) (native-inputs - `(("js-build-tools" ,ocaml-js-build-tools) + `(("js-build-tools" ,ocaml4.02-js-build-tools) ("opam" ,opam))) (propagated-inputs - `(("ppx-driver" ,ocaml-ppx-driver) - ("ppx-core" ,ocaml-ppx-core))) - (arguments janestreet-arguments) + `(("ppx-driver" ,ocaml4.02-ppx-driver) + ("ppx-core" ,ocaml4.02-ppx-core))) + (arguments + (ensure-keyword-arguments janestreet-arguments + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib))) (home-page "https://github.com/janestreet/ppx_here") (synopsis "Expands [%here] into its location") (description "Expands [%here] into its location.") (license license:asl2.0))) -(define-public ocaml-ppx-assert +(define-public ocaml4.02-ppx-assert (package - (name "ocaml-ppx-assert") + (name "ocaml4.02-ppx-assert") (version "113.33.03") (source (janestreet-origin "ppx_assert" version "1k5kxmqkibp5fk25pgz81f3c1r4mgvb5byzf6bnmxd24y60wn46p")) (build-system ocaml-build-system) (native-inputs - `(("js-build-tools" ,ocaml-js-build-tools) + `(("js-build-tools" ,ocaml4.02-js-build-tools) ("opam" ,opam))) (propagated-inputs - `(("ppx-compare" ,ocaml-ppx-compare) - ("ppx-core" ,ocaml-ppx-core) - ("ppx-driver" ,ocaml-ppx-driver) - ("ppx-sexp-conv" ,ocaml-ppx-sexp-conv) - ("ppx-tools" ,ocaml-ppx-tools) - ("ppx-type-conv" ,ocaml-ppx-type-conv) - ("ppx-sexplib" ,ocaml-sexplib) - ("ppx-here" ,ocaml-ppx-here))) - (arguments janestreet-arguments) + `(("ppx-compare" ,ocaml4.02-ppx-compare) + ("ppx-core" ,ocaml4.02-ppx-core) + ("ppx-driver" ,ocaml4.02-ppx-driver) + ("ppx-sexp-conv" ,ocaml4.02-ppx-sexp-conv) + ("ppx-tools" ,ocaml4.02-ppx-tools) + ("ppx-type-conv" ,ocaml4.02-ppx-type-conv) + ("ppx-sexplib" ,ocaml4.02-sexplib) + ("ppx-here" ,ocaml4.02-ppx-here))) + (arguments + (ensure-keyword-arguments janestreet-arguments + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib))) (home-page "https://github.com/janestreet/ppx_assert") (synopsis "Assert-like extension nodes that raise useful errors on failure") (description "Assert-like extension nodes that raise useful errors on failure.") (license license:asl2.0))) -(define-public ocaml-ppx-enumerate +(define-public ocaml4.02-ppx-enumerate (package - (name "ocaml-ppx-enumerate") + (name "ocaml4.02-ppx-enumerate") (version "113.33.03") (source (janestreet-origin "ppx_enumerate" version "15g7yfv9wg2h9r6k6q1zrhygmsl4xrfn25mrb0i4czjjivzmxjh4")) (build-system ocaml-build-system) (native-inputs - `(("js-build-tools" ,ocaml-js-build-tools) + `(("js-build-tools" ,ocaml4.02-js-build-tools) ("opam" ,opam))) (propagated-inputs - `(("ppx-tools" ,ocaml-ppx-tools) - ("ppx-type-conv" ,ocaml-ppx-type-conv) - ("ppx-core" ,ocaml-ppx-core))) - (arguments janestreet-arguments) + `(("ppx-tools" ,ocaml4.02-ppx-tools) + ("ppx-type-conv" ,ocaml4.02-ppx-type-conv) + ("ppx-core" ,ocaml4.02-ppx-core))) + (arguments + (ensure-keyword-arguments janestreet-arguments + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib))) (home-page "https://github.com/janestreet/ppx_enumerate") (synopsis "Generate a list containing all values of a finite type") (description "Ppx_enumerate is a ppx rewriter which generates a definition @@ -2693,174 +3452,198 @@ for the list of all values of a type (for a type which only has finitely many values).") (license license:asl2.0))) -(define-public ocaml-ppx-let +(define-public ocaml4.02-ppx-let (package - (name "ocaml-ppx-let") + (name "ocaml4.02-ppx-let") (version "113.33.03") (source (janestreet-origin "ppx_let" version "0gd6d3gdaqfwjcs7gaw1qxc30i584q6a86ndaj1bx1q63xqd6yx9")) (build-system ocaml-build-system) (native-inputs - `(("js-build-tools" ,ocaml-js-build-tools) + `(("js-build-tools" ,ocaml4.02-js-build-tools) ("opam" ,opam))) (propagated-inputs - `(("ppx-driver" ,ocaml-ppx-driver) - ("ppx-core" ,ocaml-ppx-core))) - (arguments janestreet-arguments) + `(("ppx-driver" ,ocaml4.02-ppx-driver) + ("ppx-core" ,ocaml4.02-ppx-core))) + (arguments + (ensure-keyword-arguments janestreet-arguments + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib))) (home-page "https://github.com/janestreet/ppx_let") (synopsis "Monadic let-bindings") (description "A ppx rewriter for monadic and applicative let bindings, match expressions, and if expressions.") (license license:asl2.0))) -(define-public ocaml-ppx-typerep-conv +(define-public ocaml4.02-ppx-typerep-conv (package - (name "ocaml-ppx-typerep-conv") + (name "ocaml4.02-ppx-typerep-conv") (version "113.33.03") (source (janestreet-origin "ppx_typerep_conv" version "0g0xqm9s1b2jjvxb8yp69281q2s3bwz6sibn10fvgcdawpa0rmrg")) (build-system ocaml-build-system) (native-inputs - `(("js-build-tools" ,ocaml-js-build-tools) + `(("js-build-tools" ,ocaml4.02-js-build-tools) ("opam" ,opam))) (propagated-inputs - `(("ppx-tools" ,ocaml-ppx-tools) - ("ppx-type-conv" ,ocaml-ppx-type-conv) - ("ppx-core" ,ocaml-ppx-core) - ("typerep" ,ocaml-typerep))) - (arguments janestreet-arguments) + `(("ppx-tools" ,ocaml4.02-ppx-tools) + ("ppx-type-conv" ,ocaml4.02-ppx-type-conv) + ("ppx-core" ,ocaml4.02-ppx-core) + ("typerep" ,ocaml4.02-typerep))) + (arguments + (ensure-keyword-arguments janestreet-arguments + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib))) (home-page "https://github.com/janestreet/ppx_typerep_conv") (synopsis "Generation of runtime types from type declarations") (description "Automatic generation of runtime types from type definitions.") (license license:asl2.0))) -(define-public ocaml-ppx-sexp-value +(define-public ocaml4.02-ppx-sexp-value (package - (name "ocaml-ppx-sexp-value") + (name "ocaml4.02-ppx-sexp-value") (version "113.33.03") (source (janestreet-origin "ppx_sexp_value" version "0m3ag23mbqm0i2pv1dzilfks15ipa5q60mf57a0cd3p0pvarq10g")) (build-system ocaml-build-system) (native-inputs - `(("js-build-tools" ,ocaml-js-build-tools) + `(("js-build-tools" ,ocaml4.02-js-build-tools) ("opam" ,opam))) (propagated-inputs - `(("ppx-driver" ,ocaml-ppx-driver) - ("ppx-here" ,ocaml-ppx-here) - ("ppx-sexp-conv" ,ocaml-ppx-sexp-conv) - ("ppx-tools" ,ocaml-ppx-tools) - ("ppx-core" ,ocaml-ppx-core))) - (arguments janestreet-arguments) + `(("ppx-driver" ,ocaml4.02-ppx-driver) + ("ppx-here" ,ocaml4.02-ppx-here) + ("ppx-sexp-conv" ,ocaml4.02-ppx-sexp-conv) + ("ppx-tools" ,ocaml4.02-ppx-tools) + ("ppx-core" ,ocaml4.02-ppx-core))) + (arguments + (ensure-keyword-arguments janestreet-arguments + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib))) (home-page "https://github.com/janestreet/ppx_sexp_value/") (synopsis "Simplify building s-expressions from ocaml values") (description "A ppx rewriter that simplifies building s-expressions from ocaml values.") (license license:asl2.0))) -(define-public ocaml-ppx-pipebang +(define-public ocaml4.02-ppx-pipebang (package - (name "ocaml-ppx-pipebang") + (name "ocaml4.02-ppx-pipebang") (version "113.33.03") (source (janestreet-origin "ppx_pipebang" version "1965c7hymp26ncmjs0pfxi2s5jlj60z2c9b194lgcwxqiav56pcw")) (build-system ocaml-build-system) (native-inputs - `(("js-build-tools" ,ocaml-js-build-tools) + `(("js-build-tools" ,ocaml4.02-js-build-tools) ("opam" ,opam))) (propagated-inputs - `(("ppx-driver" ,ocaml-ppx-driver) - ("ppx-tools" ,ocaml-ppx-tools) - ("ppx-core" ,ocaml-ppx-core))) - (arguments janestreet-arguments) + `(("ppx-driver" ,ocaml4.02-ppx-driver) + ("ppx-tools" ,ocaml4.02-ppx-tools) + ("ppx-core" ,ocaml4.02-ppx-core))) + (arguments + (ensure-keyword-arguments janestreet-arguments + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib))) (home-page "https://github.com/janestreet/ppx_pipebang/") (synopsis "Inline reverse application operators `|>` and `|!`") (description "A ppx rewriter that inlines reverse application operators @code{|>} and @code{|!}.") (license license:asl2.0))) -(define-public ocaml-ppx-bin-prot +(define-public ocaml4.02-ppx-bin-prot (package - (name "ocaml-ppx-bin-prot") + (name "ocaml4.02-ppx-bin-prot") (version "113.33.03") (source (janestreet-origin "ppx_bin_prot" version "173kjv36giik11zgfvsbzwfbpr66dm2pcha9vf990jgzh8hqz39h")) (build-system ocaml-build-system) (native-inputs - `(("js-build-tools" ,ocaml-js-build-tools) + `(("js-build-tools" ,ocaml4.02-js-build-tools) ("opam" ,opam))) (propagated-inputs - `(("bin-prot" ,ocaml-bin-prot) - ("ppx-tools" ,ocaml-ppx-tools) - ("ppx-type-conv" ,ocaml-ppx-type-conv) - ("ppx-core" ,ocaml-ppx-core))) - (arguments janestreet-arguments) + `(("bin-prot" ,ocaml4.02-bin-prot) + ("ppx-tools" ,ocaml4.02-ppx-tools) + ("ppx-type-conv" ,ocaml4.02-ppx-type-conv) + ("ppx-core" ,ocaml4.02-ppx-core))) + (arguments + (ensure-keyword-arguments janestreet-arguments + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib))) (home-page "https://github.com/janestreet/ppx_bin_prot/") (synopsis "Generation of bin_prot readers and writers from types") (description "Generation of binary serialization and deserialization functions from type definitions.") (license license:asl2.0))) -(define-public ocaml-ppx-fail +(define-public ocaml4.02-ppx-fail (package - (name "ocaml-ppx-fail") + (name "ocaml4.02-ppx-fail") (version "113.33.03") (source (janestreet-origin "ppx_fail" version "1dwgad0f05gqp5rnwf9dcasidpfi7q3mrpazsw3a2vijjblbhjgn")) (build-system ocaml-build-system) (native-inputs - `(("js-build-tools" ,ocaml-js-build-tools) + `(("js-build-tools" ,ocaml4.02-js-build-tools) ("opam" ,opam))) (propagated-inputs - `(("ppx-driver" ,ocaml-ppx-driver) - ("ppx-tools" ,ocaml-ppx-tools) - ("ppx-here" ,ocaml-ppx-here) - ("ppx-core" ,ocaml-ppx-core))) - (arguments janestreet-arguments) + `(("ppx-driver" ,ocaml4.02-ppx-driver) + ("ppx-tools" ,ocaml4.02-ppx-tools) + ("ppx-here" ,ocaml4.02-ppx-here) + ("ppx-core" ,ocaml4.02-ppx-core))) + (arguments + (ensure-keyword-arguments janestreet-arguments + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib))) (home-page "https://github.com/janestreet/ppx_fail/") (synopsis "Add location to calls to failwiths") (description "Syntax extension that makes [failwiths] always include a position.") (license license:asl2.0))) -(define-public ocaml-ppx-custom-printf +(define-public ocaml4.02-ppx-custom-printf (package - (name "ocaml-ppx-custom-printf") + (name "ocaml4.02-ppx-custom-printf") (version "113.33.03") (source (janestreet-origin "ppx_custom_printf" version "11jlx0n87g2j1vyyp343dibx7lvvwig5j5q0nq0b80kbsq0k6yr8")) (build-system ocaml-build-system) (native-inputs - `(("js-build-tools" ,ocaml-js-build-tools) + `(("js-build-tools" ,ocaml4.02-js-build-tools) ("opam" ,opam))) (propagated-inputs - `(("ppx-sexp-conv" ,ocaml-ppx-sexp-conv) - ("ppx-tools" ,ocaml-ppx-tools) - ("ppx-core" ,ocaml-ppx-core) - ("ppx-driver" ,ocaml-ppx-driver))) - (arguments janestreet-arguments) + `(("ppx-sexp-conv" ,ocaml4.02-ppx-sexp-conv) + ("ppx-tools" ,ocaml4.02-ppx-tools) + ("ppx-core" ,ocaml4.02-ppx-core) + ("ppx-driver" ,ocaml4.02-ppx-driver))) + (arguments + (ensure-keyword-arguments janestreet-arguments + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib))) (home-page "https://github.com/janestreet/ppx_custom_printf/") (synopsis "Printf-style format-strings for user-defined string conversion") (description "Extensions to printf-style format-strings for user-defined string conversion.") (license license:asl2.0))) -(define-public ocaml-ppx-sexp-message +(define-public ocaml4.02-ppx-sexp-message (package - (name "ocaml-ppx-sexp-message") + (name "ocaml4.02-ppx-sexp-message") (version "113.33.03") (source (janestreet-origin "ppx_sexp_message" version "084w1l3gnyw4ri9vbn7bv9b2xkw1520qczfxpxdarfivdrz8xr68")) (build-system ocaml-build-system) (native-inputs - `(("js-build-tools" ,ocaml-js-build-tools) + `(("js-build-tools" ,ocaml4.02-js-build-tools) ("opam" ,opam))) (propagated-inputs - `(("ppx-driver" ,ocaml-ppx-driver) - ("ppx-here" ,ocaml-ppx-here) - ("ppx-sexp-conv" ,ocaml-ppx-sexp-conv) - ("ppx-tools" ,ocaml-ppx-tools) - ("ppx-core" ,ocaml-ppx-core))) - (arguments janestreet-arguments) + `(("ppx-driver" ,ocaml4.02-ppx-driver) + ("ppx-here" ,ocaml4.02-ppx-here) + ("ppx-sexp-conv" ,ocaml4.02-ppx-sexp-conv) + ("ppx-tools" ,ocaml4.02-ppx-tools) + ("ppx-core" ,ocaml4.02-ppx-core))) + (arguments + (ensure-keyword-arguments janestreet-arguments + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib))) (home-page "https://github.com/janestreet/ppx_sexp_message/") (synopsis "A ppx rewriter for easy construction of s-expressions") (description "Ppx_sexp_message aims to ease the creation of s-expressions @@ -2869,23 +3652,26 @@ where one needs to construct a s-expression based on various element of the context such as function arguments.") (license license:asl2.0))) -(define-public ocaml-ppx-fields-conv +(define-public ocaml4.02-ppx-fields-conv (package - (name "ocaml-ppx-fields-conv") + (name "ocaml4.02-ppx-fields-conv") (version "113.33.03") (source (janestreet-origin "ppx_fields_conv" version "1vzbdz27g5qhhfs7wx6rjf979q4xyssxqbmp6sc1sxknbghslbdv")) (build-system ocaml-build-system) (native-inputs - `(("js-build-tools" ,ocaml-js-build-tools) + `(("js-build-tools" ,ocaml4.02-js-build-tools) ("opam" ,opam) - ("ppx-core" ,ocaml-ppx-core))) + ("ppx-core" ,ocaml4.02-ppx-core))) (propagated-inputs - `(("fieldslib" ,ocaml-fieldslib) - ("ppx-tools" ,ocaml-ppx-tools) - ("ppx-core" ,ocaml-ppx-core) - ("ppx-type-conv" ,ocaml-ppx-type-conv))) - (arguments janestreet-arguments) + `(("fieldslib" ,ocaml4.02-fieldslib) + ("ppx-tools" ,ocaml4.02-ppx-tools) + ("ppx-core" ,ocaml4.02-ppx-core) + ("ppx-type-conv" ,ocaml4.02-ppx-type-conv))) + (arguments + (ensure-keyword-arguments janestreet-arguments + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib))) (home-page "https://github.com/janestreet/ppx_fields_conv/") (synopsis "Generation of accessor and iteration functions for ocaml records") (description "Ppx_fields_conv is a ppx rewriter that can be used to define @@ -2894,10 +3680,59 @@ and set record fields, iterate and fold over all fields of a record and create new record values.") (license license:asl2.0))) +(define-public ocaml-seq + (package + (name "ocaml-seq") + (version "0.1") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/c-cube/seq/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "02lb2d9i12bxrz2ba5wygk2bycan316skqlyri0597q7j9210g8r")))) + (build-system ocaml-build-system) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((install-dir (string-append (assoc-ref outputs "out") + "/lib/ocaml/site-lib/seq"))) + (mkdir-p install-dir) + (with-output-to-file (string-append install-dir "/META") + (lambda _ + (display "name=\"seq\" +version=\"[distributed with ocaml]\" +description=\"dummy package for compatibility\" +requires=\"\""))) + #t)))))) + (properties + `((ocaml4.02-variant . ,(delay ocaml4.02-seq)))) + (home-page "https://github.com/c-cube/seq") + (synopsis "OCaml's standard iterator type") + (description "This package is a compatibility package for OCaml's +standard iterator type starting from 4.07.") + (license license:lgpl2.1+))) + +(define-public ocaml4.02-seq + (let ((base (package-with-ocaml4.02 (strip-ocaml4.02-variant ocaml-seq)))) + (package + (inherit base) + (arguments + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib + #:tests? #f; no tests + #:phases (modify-phases %standard-phases (delete 'configure))))))) + (define-public ocaml-re (package (name "ocaml-re") - (version "1.7.1") + (version "1.8.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/ocaml/ocaml-re//archive/" @@ -2905,9 +3740,27 @@ new record values.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1s3rcr76cgm4p1xmaazc58arkg2lz3zfcp1icm00m6s5ccnkh67b")))) + "1pdb0mr6z5ax6szblr3f5lbdnqq9grm97cmsfjmdma60yrx2rqhd")))) (build-system ocaml-build-system) - (native-inputs `(("ounit" ,ocaml-ounit))) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda _ + (invoke "dune" "build" "@install" "--profile" "release") + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (invoke "dune" "install" + "--prefix" (assoc-ref outputs "out")) + #t))))) + (propagated-inputs + `(("ocaml-seq" ,ocaml-seq))) + (native-inputs + `(("dune" ,dune) + ("ounit" ,ocaml-ounit))) (home-page "https://github.com/ocaml/ocaml-re/") (synopsis "Regular expression library for OCaml") (description "Pure OCaml regular expressions with: @@ -2920,32 +3773,38 @@ new record values.") @end enumerate") (license license:expat))) -(define-public ocaml-ppx-expect +(define-public ocaml4.02-re + (package-with-ocaml4.02 ocaml-re)) + +(define-public ocaml4.02-ppx-expect (package - (name "ocaml-ppx-expect") + (name "ocaml4.02-ppx-expect") (version "113.33.03") (source (janestreet-origin "ppx_expect" version "03sbs4s5i8l9syr45v25f5hzy7msd2b47k2a9wsq9m43d4imgkrc")) (build-system ocaml-build-system) (native-inputs - `(("js-build-tools" ,ocaml-js-build-tools) + `(("js-build-tools" ,ocaml4.02-js-build-tools) ("opam" ,opam))) (propagated-inputs - `(("fieldslib" ,ocaml-fieldslib) - ("ppx-tools" ,ocaml-ppx-tools) - ("ppx-assert" ,ocaml-ppx-assert) - ("ppx-compare" ,ocaml-ppx-compare) - ("ppx-core" ,ocaml-ppx-core) - ("ppx-custom-printf" ,ocaml-ppx-custom-printf) - ("ppx-driver" ,ocaml-ppx-driver) - ("ppx-fields-conv" ,ocaml-ppx-fields-conv) - ("ppx-inline-test" ,ocaml-ppx-inline-test) - ("ppx-sexp-conv" ,ocaml-ppx-sexp-conv) - ("ppx-variants-conv" ,ocaml-ppx-variants-conv) - ("re" ,ocaml-re) - ("sexplib" ,ocaml-sexplib) - ("variantslib" ,ocaml-variantslib))) - (arguments janestreet-arguments) + `(("fieldslib" ,ocaml4.02-fieldslib) + ("ppx-tools" ,ocaml4.02-ppx-tools) + ("ppx-assert" ,ocaml4.02-ppx-assert) + ("ppx-compare" ,ocaml4.02-ppx-compare) + ("ppx-core" ,ocaml4.02-ppx-core) + ("ppx-custom-printf" ,ocaml4.02-ppx-custom-printf) + ("ppx-driver" ,ocaml4.02-ppx-driver) + ("ppx-fields-conv" ,ocaml4.02-ppx-fields-conv) + ("ppx-inline-test" ,ocaml4.02-ppx-inline-test) + ("ppx-sexp-conv" ,ocaml4.02-ppx-sexp-conv) + ("ppx-variants-conv" ,ocaml4.02-ppx-variants-conv) + ("re" ,ocaml4.02-re) + ("sexplib" ,ocaml4.02-sexplib) + ("variantslib" ,ocaml4.02-variantslib))) + (arguments + (ensure-keyword-arguments janestreet-arguments + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib))) (home-page "https://github.com/janestreet/ppx_expect/") (synopsis "Cram like framework for OCaml") (description "Expect-test is a framework for writing tests in OCaml, similar @@ -2955,66 +3814,72 @@ output-generating code, interleaved with %expect extension expressions to denote the expected output.") (license license:asl2.0))) -(define-public ocaml-ppx-jane +(define-public ocaml4.02-ppx-jane (package - (name "ocaml-ppx-jane") + (name "ocaml4.02-ppx-jane") (version "113.33.03") (source (janestreet-origin "ppx_jane" version "0bjxkhmzgm6x9dcvjwybbccn34khbvyyjimcbaja30fp6qcqk5yl")) (build-system ocaml-build-system) (native-inputs - `(("js-build-tools" ,ocaml-js-build-tools) + `(("js-build-tools" ,ocaml4.02-js-build-tools) ("opam" ,opam))) (propagated-inputs - `(("ppx-assert" ,ocaml-ppx-assert) - ("ppx-bench" ,ocaml-ppx-bench) - ("ppx-bin-prot" ,ocaml-ppx-bin-prot) - ("ppx-compare" ,ocaml-ppx-compare) - ("ppx-custom-printf" ,ocaml-ppx-custom-printf) - ("ppx-deriving" ,ocaml-ppx-deriving) - ("ppx-enumerate" ,ocaml-ppx-enumerate) - ("ppx-expect" ,ocaml-ppx-expect) - ("ppx-fail" ,ocaml-ppx-fail) - ("ppx-fields-conv" ,ocaml-ppx-fields-conv) - ("ppx-here" ,ocaml-ppx-here) - ("ppx-inline-test" ,ocaml-ppx-inline-test) - ("ppx-let" ,ocaml-ppx-let) - ("ppx-pipebang" ,ocaml-ppx-pipebang) - ("ppx-sexp-conv" ,ocaml-ppx-sexp-conv) - ("ppx-sexp-message" ,ocaml-ppx-sexp-message) - ("ppx-sexp-value" ,ocaml-ppx-sexp-value) - ("ppx-typerep-conv" ,ocaml-ppx-typerep-conv) - ("ppx-variants-conv" ,ocaml-ppx-variants-conv))) - (arguments janestreet-arguments) + `(("ppx-assert" ,ocaml4.02-ppx-assert) + ("ppx-bench" ,ocaml4.02-ppx-bench) + ("ppx-bin-prot" ,ocaml4.02-ppx-bin-prot) + ("ppx-compare" ,ocaml4.02-ppx-compare) + ("ppx-custom-printf" ,ocaml4.02-ppx-custom-printf) + ("ppx-deriving" ,ocaml4.02-ppx-deriving) + ("ppx-enumerate" ,ocaml4.02-ppx-enumerate) + ("ppx-expect" ,ocaml4.02-ppx-expect) + ("ppx-fail" ,ocaml4.02-ppx-fail) + ("ppx-fields-conv" ,ocaml4.02-ppx-fields-conv) + ("ppx-here" ,ocaml4.02-ppx-here) + ("ppx-inline-test" ,ocaml4.02-ppx-inline-test) + ("ppx-let" ,ocaml4.02-ppx-let) + ("ppx-pipebang" ,ocaml4.02-ppx-pipebang) + ("ppx-sexp-conv" ,ocaml4.02-ppx-sexp-conv) + ("ppx-sexp-message" ,ocaml4.02-ppx-sexp-message) + ("ppx-sexp-value" ,ocaml4.02-ppx-sexp-value) + ("ppx-typerep-conv" ,ocaml4.02-ppx-typerep-conv) + ("ppx-variants-conv" ,ocaml4.02-ppx-variants-conv))) + (arguments + (ensure-keyword-arguments janestreet-arguments + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib))) (home-page "https://github.com/janestreet/ppx_jane/") (synopsis "Standard Jane Street ppx rewriters") (description "Ppx_jane is a ppx_driver including all standard ppx rewriters.") (license license:asl2.0))) -(define-public ocaml-core-kernel +(define-public ocaml4.02-core-kernel (package - (name "ocaml-core-kernel") + (name "ocaml4.02-core-kernel") (version "113.33.03") (source (janestreet-origin "core_kernel" version "0fl23jrwivixawhxinbwaw9cabqnzn7fini7dxpxjjvkxdc8ip5y")) (native-inputs - `(("js-build-tools" ,ocaml-js-build-tools) - ("ppx-jane" ,ocaml-ppx-jane) + `(("js-build-tools" ,ocaml4.02-js-build-tools) + ("ppx-jane" ,ocaml4.02-ppx-jane) ("opam" ,opam))) (propagated-inputs - `(("bin_prot" ,ocaml-bin-prot) - ("ppx-assert" ,ocaml-ppx-assert) - ("ppx-bench" ,ocaml-ppx-bench) - ("ppx-driver" ,ocaml-ppx-driver) - ("ppx-expect" ,ocaml-ppx-expect) - ("ppx-inline-test" ,ocaml-ppx-inline-test) - ("typerep" ,ocaml-typerep) - ("sexplib" ,ocaml-sexplib) - ("variantslib" ,ocaml-variantslib) - ("result" ,ocaml-result) - ("fieldslib" ,ocaml-fieldslib))) + `(("bin_prot" ,ocaml4.02-bin-prot) + ("ppx-assert" ,ocaml4.02-ppx-assert) + ("ppx-bench" ,ocaml4.02-ppx-bench) + ("ppx-driver" ,ocaml4.02-ppx-driver) + ("ppx-expect" ,ocaml4.02-ppx-expect) + ("ppx-inline-test" ,ocaml4.02-ppx-inline-test) + ("typerep" ,ocaml4.02-typerep) + ("sexplib" ,ocaml4.02-sexplib) + ("variantslib" ,ocaml4.02-variantslib) + ("result" ,ocaml4.02-result) + ("fieldslib" ,ocaml4.02-fieldslib))) (build-system ocaml-build-system) - (arguments janestreet-arguments) + (arguments + (ensure-keyword-arguments janestreet-arguments + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib))) (home-page "https://github.com/janestreet/core_kernel/") (synopsis "Portable standard library for OCaml") (description "Core is an alternative to the OCaml standard library. @@ -3023,127 +3888,145 @@ Core_kernel is the system-independent part of Core. It is aimed for cases when the full Core is not available, such as in Javascript.") (license license:asl2.0))) -(define-public ocaml-async-kernel +(define-public ocaml4.02-async-kernel (package - (name "ocaml-async-kernel") + (name "ocaml4.02-async-kernel") (version "113.33.03") (source (janestreet-origin "async_kernel" version "04bjsaa23j831r09r38x6xx9nhryvp0z5ihickvhxqa4fb2snyvd")) (native-inputs `(("oasis" ,ocaml-oasis) - ("js-build-tools" ,ocaml-js-build-tools) - ("ppx-jane" ,ocaml-ppx-jane) + ("js-build-tools" ,ocaml4.02-js-build-tools) + ("ppx-jane" ,ocaml4.02-ppx-jane) ("opam" ,opam))) (propagated-inputs - `(("core-kernel" ,ocaml-core-kernel))) + `(("core-kernel" ,ocaml4.02-core-kernel))) (build-system ocaml-build-system) - (arguments janestreet-arguments) + (arguments + (ensure-keyword-arguments janestreet-arguments + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib))) (home-page "https://github.com/janestreet/async_kernel/") (synopsis "Monadic concurrency library") (description "Async-kernel is a library for concurrent programming in OCaml.") (license license:asl2.0))) -(define-public ocaml-async-rpc-kernel +(define-public ocaml4.02-async-rpc-kernel (package - (name "ocaml-async-rpc-kernel") + (name "ocaml4.02-async-rpc-kernel") (version "113.33.03") (source (janestreet-origin "async_rpc_kernel" version "0y97h9pkb00v7jpf87m8cbb0ffkclj9g26ph6sq97q8dpisnkjwh")) (native-inputs `(("oasis" ,ocaml-oasis) - ("js-build-tools" ,ocaml-js-build-tools) - ("ppx-jane" ,ocaml-ppx-jane) + ("js-build-tools" ,ocaml4.02-js-build-tools) + ("ppx-jane" ,ocaml4.02-ppx-jane) ("opam" ,opam))) (propagated-inputs - `(("async-kernel" ,ocaml-async-kernel))) + `(("async-kernel" ,ocaml4.02-async-kernel))) (build-system ocaml-build-system) - (arguments janestreet-arguments) + (arguments + (ensure-keyword-arguments janestreet-arguments + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib))) (home-page "https://github.com/janestreet/async_rpc_kernel/") (synopsis "Platform-independent core of the Async RPC library") (description "Async_rpc_kernel is the platform-independent core of the Async RPC library.") (license license:asl2.0))) -(define-public ocaml-core +(define-public ocaml4.02-core (package - (name "ocaml-core") + (name "ocaml4.02-core") (version "113.33.03") (source (janestreet-origin "core" version "1znll157qg56g9d3247fjibv1hxv3r9wxgr4nhy19j2vzdh6a268")) (native-inputs `(("oasis" ,ocaml-oasis) - ("js-build-tools" ,ocaml-js-build-tools) - ("ppx-jane" ,ocaml-ppx-jane) + ("js-build-tools" ,ocaml4.02-js-build-tools) + ("ppx-jane" ,ocaml4.02-ppx-jane) ("opam" ,opam))) (propagated-inputs - `(("core-kernel" ,ocaml-core-kernel))) + `(("core-kernel" ,ocaml4.02-core-kernel))) (build-system ocaml-build-system) - (arguments janestreet-arguments) + (arguments + (ensure-keyword-arguments janestreet-arguments + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib))) (home-page "https://github.com/janestreet/core/") (synopsis "Alternative to OCaml's standard library") (description "The Core suite of libraries is an alternative to OCaml's standard library that was developed by Jane Street.") (license license:asl2.0))) -(define-public ocaml-async-unix +(define-public ocaml4.02-async-unix (package - (name "ocaml-async-unix") + (name "ocaml4.02-async-unix") (version "113.33.03") (source (janestreet-origin "async_unix" version "1fwl0lfrizllcfjk8hk8m7lsz9ha2jg6qgk4gssfyz377qvpcq4h")) (native-inputs `(("oasis" ,ocaml-oasis) - ("js-build-tools" ,ocaml-js-build-tools) - ("ppx-jane" ,ocaml-ppx-jane) + ("js-build-tools" ,ocaml4.02-js-build-tools) + ("ppx-jane" ,ocaml4.02-ppx-jane) ("opam" ,opam))) (propagated-inputs - `(("async-kernel" ,ocaml-async-kernel) - ("core" ,ocaml-core))) + `(("async-kernel" ,ocaml4.02-async-kernel) + ("core" ,ocaml4.02-core))) (build-system ocaml-build-system) - (arguments janestreet-arguments) + (arguments + (ensure-keyword-arguments janestreet-arguments + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib))) (home-page "https://github.com/janestreet/async_unix") (synopsis "Asynchronous execution library for Unix") (description "Async_unix is an asynchronous execution library for Unix.") (license license:asl2.0))) -(define-public ocaml-async-extra +(define-public ocaml4.02-async-extra (package - (name "ocaml-async-extra") + (name "ocaml4.02-async-extra") (version "113.33.03") (source (janestreet-origin "async_extra" version "1si8jgiq5xh5sl9f2b7f9p17p7zx5h1pg557x2cxywi2x7pxqg4f")) (native-inputs `(("oasis" ,ocaml-oasis) - ("js-build-tools" ,ocaml-js-build-tools) - ("ppx-jane" ,ocaml-ppx-jane) + ("js-build-tools" ,ocaml4.02-js-build-tools) + ("ppx-jane" ,ocaml4.02-ppx-jane) ("opam" ,opam))) (propagated-inputs - `(("async-rpc-kernel" ,ocaml-async-rpc-kernel) - ("async-unix" ,ocaml-async-unix) - ("core" ,ocaml-core))) + `(("async-rpc-kernel" ,ocaml4.02-async-rpc-kernel) + ("async-unix" ,ocaml4.02-async-unix) + ("core" ,ocaml4.02-core))) (build-system ocaml-build-system) - (arguments janestreet-arguments) + (arguments + (ensure-keyword-arguments janestreet-arguments + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib))) (home-page "https://github.com/janestreet/async_extra") (synopsis "Extra functionnalities for the async library") (description "Async_extra provides additional functionnalities for the async library.") (license license:asl2.0))) -(define-public ocaml-async +(define-public ocaml4.02-async (package - (name "ocaml-async") + (name "ocaml4.02-async") (version "113.33.03") (source (janestreet-origin "async" version "0210fyhcs12kpmmd26015bgivkfd2wqkyn3c5wd7688d0f872y25")) (native-inputs `(("oasis" ,ocaml-oasis) - ("js-build-tools" ,ocaml-js-build-tools) - ("ppx-jane" ,ocaml-ppx-jane) + ("js-build-tools" ,ocaml4.02-js-build-tools) + ("ppx-jane" ,ocaml4.02-ppx-jane) ("opam" ,opam))) (propagated-inputs - `(("async-extra" ,ocaml-async-extra))) + `(("async-extra" ,ocaml4.02-async-extra))) (build-system ocaml-build-system) - (arguments janestreet-arguments) + (arguments + (ensure-keyword-arguments janestreet-arguments + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib))) (home-page "https://github.com/janestreet/async") (synopsis "Monadic concurrency library") (description "Async is a library for concurrent programming in OCaml.") @@ -3162,7 +4045,9 @@ async library.") "0hwj09rnzjs0m0kazz5h2mgs6p95j0zlga8cda5srnzqmzhniwkn")) (file-name (string-append name "-" version ".tar.gz")))) (build-system ocaml-build-system) - (native-inputs `(("cppo" ,ocaml-cppo))) + (native-inputs + `(("cppo" ,ocaml-cppo) + ("ocamlbuild" ,ocamlbuild))) (home-page "https://github.com/OCamlPro/ocplib-endian") (synopsis "Optimised functions to read and write int16/32/64 from strings and bigarrays") @@ -3172,9 +4057,12 @@ strings, bytes and bigstring (Bigarrys of chars), and provides submodules for big- and little-endian, with their unsafe counter-parts.") (license license:lgpl2.1))) -(define-public ocaml-cstruct +(define-public ocaml4.02-ocplib-endian + (package-with-ocaml4.02 ocaml-ocplib-endian)) + +(define-public ocaml4.02-cstruct (package - (name "ocaml-cstruct") + (name "ocaml4.02-cstruct") (version "2.3.1") (source (origin (method url-fetch) @@ -3186,7 +4074,9 @@ big- and little-endian, with their unsafe counter-parts.") (file-name (string-append name "-" version ".tar.gz")))) (build-system ocaml-build-system) (arguments - `(#:configure-flags + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib + #:configure-flags (list "--enable-lwt" "--enable-async") #:phases (modify-phases %standard-phases @@ -3199,14 +4089,14 @@ big- and little-endian, with their unsafe counter-parts.") (symlink (string-append lib "/dllcstruct_stubs.so") (string-append stubs "/dllcstruct_stubs.so")))))))) (native-inputs - `(("ounit" ,ocaml-ounit) - ("ppx-tools" ,ocaml-ppx-tools) - ("camlp4" ,camlp4))) + `(("ounit" ,ocaml4.02-ounit) + ("ppx-tools" ,ocaml4.02-ppx-tools) + ("camlp4" ,camlp4-4.02))) (propagated-inputs - `(("ocplib-endian" ,ocaml-ocplib-endian) - ("lwt" ,ocaml-lwt) - ("async" ,ocaml-async) - ("sexplib" ,ocaml-sexplib))) + `(("ocplib-endian" ,ocaml4.02-ocplib-endian) + ("lwt" ,ocaml4.02-lwt) + ("async" ,ocaml4.02-async) + ("sexplib" ,ocaml4.02-sexplib))) (home-page "https://github.com/mirage/ocaml-cstruct") (synopsis "Access C structures via a camlp4 extension") (description "Cstruct is a library and syntax extension to make it easier @@ -3214,9 +4104,9 @@ to access C-like structures directly from OCaml. It supports both reading and writing to these structures, and they are accessed via the Bigarray module.") (license license:isc))) -(define-public ocaml-hex +(define-public ocaml4.02-hex (package - (name "ocaml-hex") + (name "ocaml4.02-hex") (version "1.0.0") (source (origin (method url-fetch) @@ -3227,15 +4117,19 @@ writing to these structures, and they are accessed via the Bigarray module.") "0s63g0b8gfv2xm6fv6xg7bva8h76b5pcjb0zw3f8cygs0lq9072v")) (file-name (string-append name "-" version ".tar.gz")))) (build-system ocaml-build-system) - (propagated-inputs `(("cstruct" ,ocaml-cstruct))) + (arguments + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib)) + (propagated-inputs + `(("cstruct" ,ocaml4.02-cstruct))) (home-page "https://github.com/mirage/ocaml-hex/") (synopsis "Minimal library providing hexadecimal converters") (description "Hex is a minimal library providing hexadecimal converters.") (license license:isc))) -(define-public ocaml-ezjsonm +(define-public ocaml4.02-ezjsonm (package - (name "ocaml-ezjsonm") + (name "ocaml4.02-ezjsonm") (version "0.4.3") (source (origin (method url-fetch) @@ -3247,14 +4141,16 @@ writing to these structures, and they are accessed via the Bigarray module.") (file-name (string-append name "-" version ".tar.gz")))) (build-system ocaml-build-system) (native-inputs - `(("alcotest" ,ocaml-alcotest))) + `(("alcotest" ,ocaml4.02-alcotest))) (propagated-inputs - `(("hex" ,ocaml-hex) - ("jsonm" ,ocaml-jsonm) - ("lwt" ,ocaml-lwt) - ("sexplib" ,ocaml-sexplib))) + `(("hex" ,ocaml4.02-hex) + ("jsonm" ,ocaml4.02-jsonm) + ("lwt" ,ocaml4.02-lwt) + ("sexplib" ,ocaml4.02-sexplib))) (arguments - `(#:configure-flags (list "--enable-lwt"))) + `(#:configure-flags (list "--enable-lwt") + #:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib)) (home-page "https://github.com/mirage/ezjsonm/") (synopsis "Read and write JSON data") (description "Ezjsonm provides more convenient (but far less flexible) input @@ -3263,9 +4159,9 @@ the need to write signal code, which is useful for quick scripts that manipulate JSON.") (license license:isc))) -(define-public ocaml-uri +(define-public ocaml4.02-uri (package - (name "ocaml-uri") + (name "ocaml4.02-uri") (version "1.9.2") (source (origin (method url-fetch) @@ -3276,14 +4172,17 @@ JSON.") "02bzrag79prx261rxf9mlak749pwf4flpfl8p012x1xznv9m0clc")) (file-name (string-append name "-" version ".tar.gz")))) (build-system ocaml-build-system) + (arguments + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib)) (native-inputs - `(("ounit" ,ocaml-ounit))) + `(("ounit" ,ocaml4.02-ounit))) (propagated-inputs - `(("ppx-sexp-conv" ,ocaml-ppx-sexp-conv) - ("re" ,ocaml-re) - ("ppx-deriving" ,ocaml-ppx-deriving) - ("sexplib" ,ocaml-sexplib) - ("stringext" ,ocaml-stringext))) + `(("ppx-sexp-conv" ,ocaml4.02-ppx-sexp-conv) + ("re" ,ocaml4.02-re) + ("ppx-deriving" ,ocaml4.02-ppx-deriving) + ("sexplib" ,ocaml4.02-sexplib) + ("stringext" ,ocaml4.02-stringext))) (home-page "https://github.com/mirage/ocaml-uri") (synopsis "RFC3986 URI/URL parsing library") (description "OCaml-uri is a library for parsing URI/URL in the RFC3986 format.") @@ -3312,6 +4211,9 @@ JSON.") Format module of the OCaml standard library.") (license license:bsd-3))) +(define-public ocaml4.02-easy-format + (package-with-ocaml4.02 ocaml-easy-format)) + (define-public optcomp (package (name "optcomp") @@ -3326,13 +4228,15 @@ Format module of the OCaml standard library.") (file-name (string-append name "-" version ".tar.gz")))) (build-system ocaml-build-system) (arguments - `(#:use-make? #t + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib + #:use-make? #t #:make-flags (list (string-append "BUILDFLAGS=\"-cflags -I," (assoc-ref %build-inputs "camlp4") "/lib/ocaml/site-lib/camlp4/Camlp4Parsers\"")))) - (native-inputs `(("camlp4" ,camlp4))) - (propagated-inputs `(("camlp4" ,camlp4))) + (native-inputs `(("camlp4" ,camlp4-4.02))) + (propagated-inputs `(("camlp4" ,camlp4-4.02))) (home-page "https://github.com/diml/optcomp") (synopsis "Optional compilation for OCaml") (description "Optcomp provides an optional compilation facility with @@ -3342,14 +4246,14 @@ cpp-like directives.") (define-public ocaml-piqilib (package (name "ocaml-piqilib") - (version "0.6.13") + (version "0.6.14") (source (origin (method url-fetch) (uri (string-append "https://github.com/alavrik/piqi/archive/v" version ".tar.gz")) (sha256 (base32 - "1whqr2bb3gds2zmrzqnv8vqka9928w4lx6mi6g244kmbwb2h8d8l")) + "1ssccnwqzfyf7syfq2fv4zyhwayxwd75rhq9y28mvq1w6qbww4l7")) (file-name (string-append name "-" version ".tar.gz")))) (build-system ocaml-build-system) (arguments @@ -3365,14 +4269,17 @@ cpp-like directives.") (let ((out (assoc-ref outputs "out"))) (substitute* "make/OCamlMakefile" (("/bin/sh") (which "bash"))) - (zero? (system* "./configure" "--prefix" out "--ocaml-libdir" - (string-append out "/lib/ocaml/site-lib")))))) + (invoke "./configure" "--prefix" out "--ocaml-libdir" + (string-append out "/lib/ocaml/site-lib"))) + #t)) (add-after 'build 'build-ocaml (lambda* (#:key outputs #:allow-other-keys) - (zero? (system* "make" "ocaml")))) + (invoke "make" "ocaml") + #t)) (add-after 'install 'install-ocaml (lambda* (#:key outputs #:allow-other-keys) - (zero? (system* "make" "ocaml-install")))) + (invoke "make" "ocaml-install") + #t)) (add-after 'install-ocaml 'link-stubs (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -3388,15 +4295,18 @@ cpp-like directives.") (propagated-inputs `(("xmlm" ,ocaml-xmlm) ("ulex" ,ocaml-ulex) - ("optcomp" ,optcomp) ("easy-format" ,ocaml-easy-format) ("base64" ,ocaml-base64))) + (home-page "http://www.cduce.org/download.html#side") (home-page "http://piqi.org") (synopsis "Data serialization and conversion library") (description "Piqilib is the common library used by the piqi command-line tool and piqi-ocaml.") (license license:asl2.0))) +(define-public ocaml4.02-piqilib + (package-with-ocaml4.02 ocaml-piqilib)) + (define-public ocaml-uuidm (package (name "ocaml-uuidm") @@ -3416,7 +4326,8 @@ tool and piqi-ocaml.") (modify-phases %standard-phases (delete 'configure)))) (native-inputs - `(("opam" ,opam))) + `(("ocamlbuild" ,ocamlbuild) + ("opam" ,opam))) (propagated-inputs `(("cmdliner" ,ocaml-cmdliner) ("topkg" ,ocaml-topkg))) @@ -3427,21 +4338,24 @@ unique identifiers (UUIDs) version 3, 5 (named based with MD5, SHA-1 hashing) and 4 (random based) according to RFC 4122.") (license license:isc))) +(define-public ocaml4.02-uuidm + (package-with-ocaml4.02 ocaml-uuidm)) + (define-public ocaml-graph (package (name "ocaml-graph") - (version "1.8.7") + (version "1.8.8") (source (origin (method url-fetch) (uri (string-append "http://ocamlgraph.lri.fr/download/" "ocamlgraph-" version ".tar.gz")) (sha256 (base32 - "1845r537swjil2fcj7lgbibc2zybfwqqasrd2s7bncajs83cl1nz")) - (patches (search-patches "ocaml-graph-honor-source-date-epoch.patch")))) + "0m9g16wrrr86gw4fz2fazrh8nkqms0n863w7ndcvrmyafgxvxsnr")))) (build-system ocaml-build-system) (arguments `(#:install-target "install-findlib" + #:tests? #f #:phases (modify-phases %standard-phases (add-before 'configure 'set-shell @@ -3454,10 +4368,13 @@ and 4 (random based) according to RFC 4122.") (description "OCamlgraph is a generic graph library for OCaml.") (license license:lgpl2.1))) +(define-public ocaml4.02-graph + (package-with-ocaml4.02 ocaml-graph)) + (define-public ocaml-piqi (package (name "ocaml-piqi") - (version "0.7.5") + (version "0.7.6") (source (origin (method url-fetch) (uri (string-append "https://github.com/alavrik/piqi-ocaml/" @@ -3465,7 +4382,7 @@ and 4 (random based) according to RFC 4122.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0ngz6y8i98i5v2ma8nk6mc83pdsmf2z0ks7m3xi6clfg3zqbddrv")))) + "0da0v2v28aj65b0cwpvvmcqyrfvz94pp3j5zgfdr1jrl5s37c21g")))) (build-system ocaml-build-system) (arguments `(#:make-flags @@ -3477,9 +4394,13 @@ and 4 (random based) according to RFC 4122.") (delete 'configure)))) (native-inputs `(("which" ,which) + ("camlp4" ,camlp4) ("protobuf" ,protobuf))) ; for tests (propagated-inputs - `(("piqilib" ,ocaml-piqilib))) + `(("num" ,ocaml-num) + ("piqilib" ,ocaml-piqilib))) + (properties + `((ocaml4.02-variant . ,(delay ocaml4.02-piqi)))) (home-page "https://github.com/alavrik/piqi-ocaml") (synopsis "Protocol serialization system for OCaml") (description "Piqi is a multi-format data serialization system for OCaml. @@ -3487,67 +4408,73 @@ It provides a uniform interface for serializing OCaml data structures to JSON, XML and Protocol Buffers formats.") (license license:asl2.0))) +(define-public ocaml4.02-piqi + (let ((base (package-with-ocaml4.02 (strip-ocaml4.02-variant ocaml-piqi)))) + (package + (inherit base) + (propagated-inputs + `(("piqilib" ,ocaml4.02-piqilib)))))) + (define-public bap (package (name "bap") - (version "1.1.0") + (version "1.3.0") (home-page "https://github.com/BinaryAnalysisPlatform/bap") (source (origin (method url-fetch) (uri (string-append home-page "/archive/v" version ".tar.gz")) (sha256 (base32 - "1ms95m4j1qrmy7zqmsn2izh7gq68lnmssl7chyhk977kd3sxj66m")) + "0v95v9mp7mg8fj25ry0w7566zd9xp6cs8nnqj4l38q54fb1hfav9")) (file-name (string-append name "-" version ".tar.gz")))) (build-system ocaml-build-system) (native-inputs - `(("oasis" ,ocaml-oasis) + `(("oasis" ,ocaml4.02-oasis) ("clang" ,clang-3.8) - ("ounit" ,ocaml-ounit))) + ("ounit" ,ocaml4.02-ounit))) (propagated-inputs - `(("core-kernel" ,ocaml-core-kernel) - ("ppx-driver" ,ocaml-ppx-driver) - ("uri" ,ocaml-uri) + `(("core-kernel" ,ocaml4.02-core-kernel) + ("ppx-driver" ,ocaml4.02-ppx-driver) + ("bin-prot" ,ocaml4.02-bin-prot) + ("uri" ,ocaml4.02-uri) ("llvm" ,llvm-3.8) ("gmp" ,gmp) ("clang-runtime" ,clang-runtime) - ("fileutils" ,ocaml-fileutils) - ("cmdliner" ,ocaml-cmdliner) - ("zarith" ,ocaml-zarith) - ("uuidm" ,ocaml-uuidm) - ("camlzip" ,camlzip) + ("fileutils" ,ocaml4.02-fileutils) + ("cmdliner" ,ocaml4.02-cmdliner) + ("zarith" ,ocaml4.02-zarith) + ("uuidm" ,ocaml4.02-uuidm) + ("camlzip" ,ocaml4.02-camlzip) ("frontc" ,ocaml-frontc) - ("ezjsonm" ,ocaml-ezjsonm) - ("ocurl" ,ocaml-ocurl) - ("piqi" ,ocaml-piqi) - ("ocamlgraph" ,ocaml-graph) - ("bitstring" ,ocaml-bitstring) - ("ppx-jane" ,ocaml-ppx-jane) - ("re" ,ocaml-re))) + ("ezjsonm" ,ocaml4.02-ezjsonm) + ("ocurl" ,ocaml4.02-ocurl) + ("piqi" ,ocaml4.02-piqi) + ("ocamlgraph" ,ocaml4.02-graph) + ("bitstring" ,ocaml4.02-bitstring) + ("ppx-jane" ,ocaml4.02-ppx-jane) + ("re" ,ocaml4.02-re))) (inputs `(("llvm" ,llvm-3.8))) (arguments - `(#:use-make? #t + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib + #:use-make? #t #:phases (modify-phases %standard-phases (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (zero? (system* "./configure" "--prefix" - (assoc-ref outputs "out") - "--libdir" - (string-append - (assoc-ref outputs "out") - "/lib/ocaml/site-lib") - "--with-llvm-version=3.8" - "--with-llvm-config=llvm-config" - "--enable-everything")))) - (add-after 'install 'link-stubs - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (stubs (string-append out "/lib/ocaml/site-lib/stubslibs")) - (lib (string-append out "/lib/ocaml/site-lib/bap-plugin-llvm"))) - (mkdir-p stubs) - (symlink (string-append lib "/dllllvm_plugin_stubs.so") - (string-append stubs "/dllllvm_plugin_stubs.so")))))))) + (lambda* (#:key outputs inputs #:allow-other-keys) + (invoke "./configure" "--prefix" + (assoc-ref outputs "out") + "--libdir" + (string-append + (assoc-ref outputs "out") + "/lib/ocaml/site-lib") + "--with-llvm-version=3.8" + "--with-llvm-config=llvm-config" + "--enable-everything") + (substitute* "plugins/objdump/objdump_main.ml" + (("Re_perl") "Re.Perl")) + (substitute* "oasis/objdump" + (("re.pcre") "re.pcre, re.perl"))))))) (synopsis "Binary Analysis Platform") (description "Binary Analysis Platform is a framework for writing program analysis tools, that target binary files. The framework consists of a plethora @@ -3558,23 +4485,33 @@ the plugins facilitate extensibility, and the frontends serve as entry points.") (define-public ocaml-camomile (package (name "ocaml-camomile") - (version "0.8.5") + (version "1.0.1") (home-page "https://github.com/yoriyuki/Camomile") (source (origin (method url-fetch) - (uri (string-append home-page "/releases/download/rel-" version - "/camomile-" version ".tar.bz2")) + (uri (string-append home-page "/releases/download/" version + "/camomile-" version ".tbz")) (sha256 (base32 - "003ikpvpaliy5hblhckfmln34zqz0mk3y2m1fqvbjngh3h2np045")))) + "01ssjrqz41jvrqh27jxnh9cx7ywi9b5sgsykd00i7z9nrcwhlfy2")))) (build-system ocaml-build-system) - (native-inputs `(("camlp4" ,camlp4))) + (native-inputs + `(("camlp4" ,camlp4) + ("dune" ,dune))) (arguments `(#:phases (modify-phases %standard-phases - (add-before 'configure 'fix-bin/sh + (delete 'configure) + (replace 'build (lambda _ - (setenv "CONFIG_SHELL" (which "bash"))))))) + (invoke "dune" "build" "@install" "--profile" "release") + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (invoke "dune" "install" + "--prefix" (assoc-ref outputs "out")) + #t))) + #:tests? #f)) (synopsis "Comprehensive Unicode library") (description "Camomile is a Unicode library for OCaml. Camomile provides Unicode character type, UTF-8, UTF-16, UTF-32 strings, conversion to/from about @@ -3583,6 +4520,9 @@ library is currently designed for Unicode Standard 3.2.") ;; with an exception for linked libraries to use a different license (license license:lgpl2.0+))) +(define-public ocaml4.02-camomile + (package-with-ocaml4.02 ocaml-camomile)) + (define-public ocaml-jbuilder (package (name "ocaml-jbuilder") @@ -3595,10 +4535,12 @@ library is currently designed for Unicode Standard 3.2.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0gcy52y0mkg450yxwszp3lww303a1154566r8jb4hh5l61dh4dwj")))) + "1cy07pwvbrlysszs938yd74yyvvbgkffpb82qrjph77zf0h2gdi7")))) (build-system ocaml-build-system) (arguments - `(#:phases + `(#:ocaml ,ocaml-4.02 + #:findlib ,ocaml4.02-findlib + #:phases (modify-phases %standard-phases (replace 'configure (lambda* (#:key outputs #:allow-other-keys) @@ -3606,7 +4548,7 @@ library is currently designed for Unicode Standard 3.2.") (setenv "PREFIX" out)) #t))))) (native-inputs - `(("menhir" ,ocaml-menhir))) + `(("menhir" ,ocaml4.02-menhir))) (propagated-inputs `(("opam" ,opam))) (home-page "https://github.com/janestreet/jbuilder") @@ -3654,10 +4596,13 @@ to write text editors, edition widgets, readlines, etc. You just have to connect an engine to your inputs and rendering functions to get an editor.") (license license:bsd-3))) +(define-public ocaml4.02-zed + (package-with-ocaml4.02 ocaml-zed)) + (define-public ocaml-lambda-term (package (name "ocaml-lambda-term") - (version "1.11") + (version "1.13") (source (origin (method url-fetch) @@ -3665,26 +4610,27 @@ connect an engine to your inputs and rendering functions to get an editor.") version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "10lx1jqgmmfwwlv64di4a8nia9l53v7179z70n9fx6aq5l7r8nba")))) + (base32 "1hy5ryagqclgdm9lzh1qil5mrynlypv7mn6qm858hdcnmz9zzn0l")))) (build-system ocaml-build-system) (arguments - `(#:test-target "test" - #:phases + `(#:phases (modify-phases %standard-phases (delete 'configure) - ;; currently, ocaml-lwt is an old version of lwt from before lwt.react - ;; was split into a separate module called lwt_react - (add-before 'build 'use-old-lwt-react-name + (replace 'build (lambda _ - (substitute* "src/jbuild" (("lwt_react") "lwt.react")))) + (invoke "dune" "build" "@install" "--profile" "release") + #t)) (replace 'install (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (zero? (system* "jbuilder" "install" "--prefix" out)))))))) + (invoke "dune" "install" + "--prefix" (assoc-ref outputs "out")) + #t))) + #:tests? #f)) (native-inputs - `(("jbuilder" ,ocaml-jbuilder))) + `(("dune" ,dune))) (propagated-inputs `(("lwt" ,ocaml-lwt) + ("lwt-log" ,ocaml-lwt-log) ("zed" ,ocaml-zed))) (home-page "https://github.com/diml/lambda-term") (synopsis "Terminal manipulation library for OCaml") @@ -3696,18 +4642,21 @@ manipulation than, for example, ncurses, by providing a native OCaml interface instead of bindings to a C library.") (license license:bsd-3))) +(define-public ocaml4.02-lambda-term + (package-with-ocaml4.02 ocaml-lambda-term)) + (define-public ocaml-utop (package (name "ocaml-utop") - (version "2.0.2") + (version "2.2.0") (source (origin (method url-fetch) - (uri (string-append "https://github.com/diml/utop/archive/" + (uri (string-append "https://github.com/ocaml-community/utop/archive/" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0rglznh4prcix8spi3f060jz2gngk7x8vkd291fxs10b88aqcpxf")))) + "1414snwmqaxs1x8wbpjf6fn3jsl01hq0phrr7639xmb5vh15mgd4")))) (build-system gnu-build-system) (arguments `(#:test-target "test" @@ -3761,6 +4710,8 @@ sensitive completion, colors, and more.") #:phases (modify-phases %standard-phases (delete 'configure)))) + (native-inputs + `(("ocamlbuild" ,ocamlbuild))) (inputs `(("topkg" ,ocaml-topkg) ("opam" ,opam))) @@ -3773,7 +4724,7 @@ long and size_t whose sizes depend on the host platform.") (define-public ocaml-ctypes (package (name "ocaml-ctypes") - (version "0.13.1") + (version "0.14.0") (home-page "https://github.com/ocamllabs/ocaml-ctypes") (source (origin (method url-fetch) @@ -3781,10 +4732,11 @@ long and size_t whose sizes depend on the host platform.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "17w0pr5k0zjcjns4y9n36rjpfl35zhvp3h8ggqs9lz12qhshdk2m")))) + "0zrsd42q2nciyg9375g2kydqax6ay299rhyfgms59qiw7d9ylyp9")))) (build-system ocaml-build-system) (arguments - `(#:make-flags + `(#:tests? #f; require an old lwt + #:make-flags (list (string-append "INSTALL_HEADERS = $(wildcard $($(PROJECT).dir)/*.h)")) #:phases (modify-phases %standard-phases @@ -3832,7 +4784,8 @@ without writing or generating any C!") `(("topkg" ,ocaml-topkg) ("opam" ,opam))) (native-inputs - `(("astring" ,ocaml-astring))) + `(("astring" ,ocaml-astring) + ("ocamlbuild" ,ocamlbuild))) (synopsis "OCamlbuild plugin for C stubs") (description "Ocb-stubblr is about ten lines of code that you need to repeat over, over, over and over again if you are using ocamlbuild to build @@ -3860,7 +4813,8 @@ OCaml projects that contain C stubs.") (modify-phases %standard-phases (delete 'configure)))) (native-inputs - `(("opam" ,opam) + `(("ocamlbuild" ,ocamlbuild) + ("opam" ,opam) ("pkg-config" ,pkg-config))) (inputs `(("topkg" ,ocaml-topkg) diff --git a/gnu/packages/patches/ocaml-bisect-fix-camlp4-in-another-directory.patch b/gnu/packages/patches/ocaml-bisect-fix-camlp4-in-another-directory.patch index 2056b42356..fd9a4c9401 100644 --- a/gnu/packages/patches/ocaml-bisect-fix-camlp4-in-another-directory.patch +++ b/gnu/packages/patches/ocaml-bisect-fix-camlp4-in-another-directory.patch @@ -1,16 +1,28 @@ -From 26cac62fe0154cf65c06faaee10805531e9dade8 Mon Sep 17 00:00:00 2001 +From bc3b353cb2f26cf10aa5c5caebddf6d3d5b1e318 Mon Sep 17 00:00:00 2001 From: Julien Lepiller -Date: Wed, 14 Dec 2016 14:14:59 +0100 +Date: Fri, 21 Sep 2018 22:31:29 +0200 Subject: [PATCH] fix camlp4 in another directory --- - Makefile | 11 ++++++----- - configure | 13 ++++++++++++- - myocamlbuild.ml | 2 +- - 3 files changed, 19 insertions(+), 7 deletions(-) + Makefile | 11 ++++++----- + configure | 13 ++++++++++++- + tests/Makefile | 2 +- + tests/camlp4-comments/Makefile | 2 +- + tests/camlp4-exclude-file/Makefile | 2 +- + tests/camlp4-exclude/Makefile | 2 +- + tests/camlp4-instrument-fast/Makefile | 2 +- + tests/camlp4-instrument/Makefile | 2 +- + tests/combine-expr/Makefile | 2 +- + tests/ppx-comments/Makefile | 2 +- + tests/ppx-exclude-file/Makefile | 2 +- + tests/ppx-exclude/Makefile | 2 +- + tests/ppx-instrument-fast/Makefile | 2 +- + tests/ppx-instrument/Makefile | 2 +- + tests/report/Makefile | 2 +- + 15 files changed, 31 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile -index 4a8ce17..d94a6d5 100644 +index b0980ee..6697922 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ PATH_BUILD=$(PATH_BASE)/_build @@ -19,12 +31,12 @@ index 4a8ce17..d94a6d5 100644 PATH_TESTS=$(PATH_BASE)/tests -PATH_INSTALL=$(PATH_OCAML_PREFIX)/lib/ocaml/bisect +PATH_INSTALL=$(PREFIX)/lib/ocaml/bisect - - + + # DEFINITIONS @@ -33,7 +33,8 @@ PATH_INSTALL=$(PATH_OCAML_PREFIX)/lib/ocaml/bisect PROJECT_NAME=bisect - OCAMLBUILD=$(PATH_OCAML_PREFIX)/bin/ocamlbuild + OCAMLBUILD=ocamlbuild OCAMLBUILD_ENV=WARNINGS=$(WARNINGS) PATH_OCAML_PREFIX=$(PATH_OCAML_PREFIX) -OCAMLBUILD_FLAGS=-classic-display -no-links +CAMLP4_INCLUDE=$(shell test -z $(CAMLP4_LIBDIR) || echo "-cflags -I,$(CAMLP4_LIBDIR)") @@ -33,22 +45,22 @@ index 4a8ce17..d94a6d5 100644 MODULES_MLPACK=$(PROJECT_NAME).mlpack MODULES_MLPACK_PP=$(PROJECT_NAME)_pp.mlpack @@ -80,11 +81,11 @@ veryclean: clean - rm -f $(PATH_OCAMLDOC)/*.html $(PATH_OCAMLDOC)/*.css - + rm -f $(PATH_OCAMLDOC)/*.html $(PATH_OCAMLDOC)/*.css + install: FORCE - cp $(PATH_BUILD)/src/report/report.byte $(PATH_OCAML_PREFIX)/bin/bisect-report; \ + cp $(PATH_BUILD)/src/report/report.byte $(PREFIX)/bin/bisect-report; \ - if [ "$(PPX)" = "TRUE" ]; then \ + if [ "$(PPX)" = "TRUE" ]; then \ - cp $(PATH_BUILD)/src/syntax/bisect_ppx.byte $(PATH_OCAML_PREFIX)/bin; \ + cp $(PATH_BUILD)/src/syntax/bisect_ppx.byte $(PREFIX)/bin; \ - fi; \ -- (test -x $(PATH_OCAML_PREFIX)/bin/ocamlopt && cp $(PATH_BUILD)/src/report/report.native $(PATH_OCAML_PREFIX)/bin/bisect-report.opt || true); \ -+ (test -x $(PATH_OCAML_PREFIX)/bin/ocamlopt && cp $(PATH_BUILD)/src/report/report.native $(PREFIX)/bin/bisect-report.opt || true); \ - if [ -x "$(PATH_OCAMLFIND)" ]; then \ - $(PATH_OCAMLFIND) query $(PROJECT_NAME) && $(PATH_OCAMLFIND) remove $(PROJECT_NAME) || true; \ - $(PATH_OCAMLFIND) install $(PROJECT_NAME) META -optional \ + fi; \ +- (which ocamlopt && cp $(PATH_BUILD)/src/report/report.native $(PATH_OCAML_PREFIX)/bin/bisect-report.opt || true); \ ++ (which ocamlopt && cp $(PATH_BUILD)/src/report/report.native $(PREFIX)/bin/bisect-report.opt || true); \ + if [ -x "$(PATH_OCAMLFIND)" ]; then \ + $(PATH_OCAMLFIND) query $(PROJECT_NAME) && $(PATH_OCAMLFIND) remove $(PROJECT_NAME) || true; \ + $(PATH_OCAMLFIND) install $(PROJECT_NAME) META -optional \ diff --git a/configure b/configure -index bb7ebf4..61a3095 100755 +index bb7ebf4..43ef46b 100755 --- a/configure +++ b/configure @@ -21,7 +21,9 @@ @@ -79,47 +91,193 @@ index bb7ebf4..61a3095 100755 ppx='TRUE';; *) - echo "usage: $0 [-ocaml-prefix ] [-ocamlfind ] [-no-native-dynlink] [-devel]"; -+ echo "usage: $0 [-prefix ] [-ocaml-prefix ] [-ocamlfind ] [-no-native-dynlink] [-devel]"; ++ echo "usage: $0 [-prefix ] [-ocaml-prefix ] [-camlp4-prefix ] [-ocamlfind ] [-no-native-dynlink] [-devel]"; exit 1;; esac shift @@ -57,6 +63,9 @@ if [ "$no_camlp4" = "TRUE" -a "$ppx" = "FALSE" ]; then exit 1 fi - + +# prefix default value +test -z $prefix && prefix=$ocaml_prefix + # make options make_quiet=`make -f - < Makefile.config ++echo "PREFIX=$prefix" >> Makefile.config echo "PATH_OCAML_PREFIX=$ocaml_prefix" >> Makefile.config +echo "PATH_CAMLP4_PREFIX=$camlp4_prefix" >> Makefile.config echo "PATH_OCAMLFIND=$ocamlfind" >> Makefile.config echo "NATIVE_DYNLINK=$native_dynlink" >> Makefile.config echo "WARNINGS=$devel" >> Makefile.config - echo "NO_CAMLP4=$no_camlp4" >> Makefile.config - echo "PPX=$ppx" >> Makefile.config - echo "MAKE_QUIET=$make_quiet" >> Makefile.config -+echo "PREFIX=$prefix" >> Makefile.config - echo "" >> Makefile.config - echo 'Makefile.config successfully created' -diff --git a/myocamlbuild.ml b/myocamlbuild.ml -index 8aa25fd..09a7d48 100644 ---- a/myocamlbuild.ml -+++ b/myocamlbuild.ml -@@ -70,7 +70,7 @@ let () = - | After_rules -> - let camlp4of = - try -- let path_bin = Filename.concat (Sys.getenv "PATH_OCAML_PREFIX") "bin" in -+ let path_bin = Filename.concat (Sys.getenv "PATH_CAMLP4_PREFIX") "bin" in - Filename.concat path_bin "camlp4of" - with _ -> "camlp4of" in - flag ["ocaml"; "compile"; "pp_camlp4of"] (S[A"-pp"; A camlp4of]); --- -2.7.4 +diff --git a/tests/Makefile b/tests/Makefile +index 1aba27f..9642323 100644 +--- a/tests/Makefile ++++ b/tests/Makefile +@@ -41,7 +41,7 @@ one: FORCE + else \ + echo "Running tests for '$(NAME)'..." | tee -a _log; \ + (cd $(NAME) && \ +- $(MAKE) PATH_OCAML_BIN=$(PATH_OCAML_PREFIX)/bin \ ++ $(MAKE) PATH_OCAML_BIN=$(PATH_OCAML_PREFIX)/bin PATH_CAMLP4_PREFIX=$(PATH_CAMLP4_PREFIX) \ + COMPILER=ocamlc EXECUTABLE=bytecode RUN=./ LIB_EXT=cma EXE_SUFFIX='' \ + REPORT=../../_build/src/report/report.byte && \ + cd ..) || echo '*** error' >> _log; \ +diff --git a/tests/camlp4-comments/Makefile b/tests/camlp4-comments/Makefile +index 33fca72..a918118 100644 +--- a/tests/camlp4-comments/Makefile ++++ b/tests/camlp4-comments/Makefile +@@ -2,7 +2,7 @@ default: + @rm -fr *.result *.cmp + @for file in *.ml; do \ + echo " testing '$$file' ..."; \ +- $(PATH_OCAML_BIN)/camlp4o$(EXE_SUFFIX) str.cma ../../_build/bisect_pp.cmo $$file -o $$file.result; \ ++ $(PATH_CAMLP4_PREFIX)/bin/camlp4o$(EXE_SUFFIX) str.cma ../../_build/bisect_pp.cmo $$file -o $$file.result; \ + diff -q $$file.reference $$file.result || exit 1; \ + done + @rm -fr *.result *.cmp +diff --git a/tests/camlp4-exclude-file/Makefile b/tests/camlp4-exclude-file/Makefile +index ab13983..e2520fa 100644 +--- a/tests/camlp4-exclude-file/Makefile ++++ b/tests/camlp4-exclude-file/Makefile +@@ -2,7 +2,7 @@ default: + @rm -fr *.result *.cmp + @for file in *.ml; do \ + echo " testing '$$file' ..."; \ +- $(PATH_OCAML_BIN)/camlp4o$(EXE_SUFFIX) str.cma ../../_build/bisect_pp.cmo $$file -exclude-file exclusions -o $$file.result; \ ++ $(PATH_CAMLP4_PREFIX)/bin/camlp4o$(EXE_SUFFIX) str.cma ../../_build/bisect_pp.cmo $$file -exclude-file exclusions -o $$file.result; \ + diff -q $$file.reference $$file.result || exit 1; \ + done + @rm -fr *.result *.cmp +diff --git a/tests/camlp4-exclude/Makefile b/tests/camlp4-exclude/Makefile +index 18aada4..d71a7bc 100644 +--- a/tests/camlp4-exclude/Makefile ++++ b/tests/camlp4-exclude/Makefile +@@ -2,7 +2,7 @@ default: + @rm -fr *.result *.cmp + @for file in *.ml; do \ + echo " testing '$$file' ..."; \ +- $(PATH_OCAML_BIN)/camlp4o$(EXE_SUFFIX) str.cma ../../_build/bisect_pp.cmo $$file -exclude 'f.*' -o $$file.result; \ ++ $(PATH_CAMLP4_PREFIX)/bin/camlp4o$(EXE_SUFFIX) str.cma ../../_build/bisect_pp.cmo $$file -exclude 'f.*' -o $$file.result; \ + diff -q $$file.reference $$file.result || exit 1; \ + done + @rm -fr *.result *.cmp +diff --git a/tests/camlp4-instrument-fast/Makefile b/tests/camlp4-instrument-fast/Makefile +index f60767f..8506e38 100644 +--- a/tests/camlp4-instrument-fast/Makefile ++++ b/tests/camlp4-instrument-fast/Makefile +@@ -2,7 +2,7 @@ default: + @rm -fr *.result *.cmp + @for file in *.ml; do \ + echo " testing '$$file' ..."; \ +- $(PATH_OCAML_BIN)/camlp4o$(EXE_SUFFIX) str.cma ../../_build/bisect_pp.cmo -mode fast $$file -o $$file.result; \ ++ $(PATH_CAMLP4_PREFIX)/bin/camlp4o$(EXE_SUFFIX) str.cma ../../_build/bisect_pp.cmo -mode fast $$file -o $$file.result; \ + diff -q $$file.reference $$file.result || exit 1; \ + done + @rm -fr *.result *.cmp +diff --git a/tests/camlp4-instrument/Makefile b/tests/camlp4-instrument/Makefile +index 33fca72..a918118 100644 +--- a/tests/camlp4-instrument/Makefile ++++ b/tests/camlp4-instrument/Makefile +@@ -2,7 +2,7 @@ default: + @rm -fr *.result *.cmp + @for file in *.ml; do \ + echo " testing '$$file' ..."; \ +- $(PATH_OCAML_BIN)/camlp4o$(EXE_SUFFIX) str.cma ../../_build/bisect_pp.cmo $$file -o $$file.result; \ ++ $(PATH_CAMLP4_PREFIX)/bin/camlp4o$(EXE_SUFFIX) str.cma ../../_build/bisect_pp.cmo $$file -o $$file.result; \ + diff -q $$file.reference $$file.result || exit 1; \ + done + @rm -fr *.result *.cmp +diff --git a/tests/combine-expr/Makefile b/tests/combine-expr/Makefile +index 46ae9eb..e8e2af2 100644 +--- a/tests/combine-expr/Makefile ++++ b/tests/combine-expr/Makefile +@@ -1,4 +1,4 @@ +-COMPILE_FLAGS=-I ../../_build -pp '$(PATH_OCAML_BIN)/camlp4o str.cma -I ../../_build bisect_pp.cmo' bisect.$(LIB_EXT) $(FLAGS) ++COMPILE_FLAGS=-I ../../_build -pp '$(PATH_CAMLP4_PREFIX)/bin/camlp4o str.cma -I ../../_build bisect_pp.cmo' bisect.$(LIB_EXT) $(FLAGS) + + default: clean compile run report + +diff --git a/tests/ppx-comments/Makefile b/tests/ppx-comments/Makefile +index f8c645a..667526f 100644 +--- a/tests/ppx-comments/Makefile ++++ b/tests/ppx-comments/Makefile +@@ -2,7 +2,7 @@ default: + @rm -fr *.result *.cm* + @for file in *.ml; do \ + echo " testing '$$file' ..."; \ +- $(PATH_OCAML_BIN)/ocamlc -c -I ../../_build -ppx '../../_build/src/syntax/bisect_ppx.byte' -dsource $$file 2> $$file.result; \ ++ $(PATH_CAMLP4_PREFIX)/bin/ocamlc -c -I ../../_build -ppx '../../_build/src/syntax/bisect_ppx.byte' -dsource $$file 2> $$file.result; \ + diff -q $$file.reference $$file.result || exit 1; \ + done + @rm -fr *.result *.cm* +diff --git a/tests/ppx-exclude-file/Makefile b/tests/ppx-exclude-file/Makefile +index a575a77..0dd1a20 100644 +--- a/tests/ppx-exclude-file/Makefile ++++ b/tests/ppx-exclude-file/Makefile +@@ -2,7 +2,7 @@ default: + @rm -fr *.result *.cm* + @for file in *.ml; do \ + echo " testing '$$file' ..."; \ +- $(PATH_OCAML_BIN)/ocamlc -c -I ../../_build -ppx '../../_build/src/syntax/bisect_ppx.byte -exclude-file exclusions' -dsource $$file 2> $$file.result; \ ++ $(PATH_CAMLP4_PREFIX)/bin/ocamlc -c -I ../../_build -ppx '../../_build/src/syntax/bisect_ppx.byte -exclude-file exclusions' -dsource $$file 2> $$file.result; \ + diff -q $$file.reference $$file.result || exit 1; \ + done + @rm -fr *.result *.cm* +diff --git a/tests/ppx-exclude/Makefile b/tests/ppx-exclude/Makefile +index a517af4..f502a42 100644 +--- a/tests/ppx-exclude/Makefile ++++ b/tests/ppx-exclude/Makefile +@@ -2,7 +2,7 @@ default: + @rm -fr *.result *.cm* + @for file in *.ml; do \ + echo " testing '$$file' ..."; \ +- $(PATH_OCAML_BIN)/ocamlc -c -I ../../_build -ppx "../../_build/src/syntax/bisect_ppx.byte -exclude 'f.*'" -dsource $$file 2> $$file.result; \ ++ $(PATH_CAMLP4_PREFIX)/bin/ocamlc -c -I ../../_build -ppx "../../_build/src/syntax/bisect_ppx.byte -exclude 'f.*'" -dsource $$file 2> $$file.result; \ + diff -q $$file.reference $$file.result || exit 1; \ + done + @rm -fr *.result *.cm* +diff --git a/tests/ppx-instrument-fast/Makefile b/tests/ppx-instrument-fast/Makefile +index da78bb6..1195988 100644 +--- a/tests/ppx-instrument-fast/Makefile ++++ b/tests/ppx-instrument-fast/Makefile +@@ -2,7 +2,7 @@ default: + @rm -fr *.result *.cm* + @for file in *.ml; do \ + echo " testing '$$file' ..."; \ +- $(PATH_OCAML_BIN)/ocamlc -c -I ../../_build -ppx '../../_build/src/syntax/bisect_ppx.byte -mode fast' -dsource $$file 2> $$file.result; \ ++ $(PATH_CAMLP4_PREFIX)/bin/ocamlc -c -I ../../_build -ppx '../../_build/src/syntax/bisect_ppx.byte -mode fast' -dsource $$file 2> $$file.result; \ + diff -q $$file.reference $$file.result || exit 1; \ + done + @rm -fr *.result *.cm* +diff --git a/tests/ppx-instrument/Makefile b/tests/ppx-instrument/Makefile +index f8c645a..667526f 100644 +--- a/tests/ppx-instrument/Makefile ++++ b/tests/ppx-instrument/Makefile +@@ -2,7 +2,7 @@ default: + @rm -fr *.result *.cm* + @for file in *.ml; do \ + echo " testing '$$file' ..."; \ +- $(PATH_OCAML_BIN)/ocamlc -c -I ../../_build -ppx '../../_build/src/syntax/bisect_ppx.byte' -dsource $$file 2> $$file.result; \ ++ $(PATH_CAMLP4_PREFIX)/bin/ocamlc -c -I ../../_build -ppx '../../_build/src/syntax/bisect_ppx.byte' -dsource $$file 2> $$file.result; \ + diff -q $$file.reference $$file.result || exit 1; \ + done + @rm -fr *.result *.cm* +diff --git a/tests/report/Makefile b/tests/report/Makefile +index a7ffe44..a968bf9 100644 +--- a/tests/report/Makefile ++++ b/tests/report/Makefile +@@ -1,4 +1,4 @@ +-COMPILE_FLAGS=-I ../../_build -pp '$(PATH_OCAML_BIN)/camlp4o str.cma -I ../../_build bisect_pp.cmo' bisect.$(LIB_EXT) $(FLAGS) ++COMPILE_FLAGS=-I ../../_build -pp '$(PATH_CAMLP4_PREFIX)/bin/camlp4o str.cma -I ../../_build bisect_pp.cmo' bisect.$(LIB_EXT) $(FLAGS) + XMLLINT=$(shell which xmllint) + + default: clean compile run report +-- +2.18.0 -- cgit v1.2.3 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: 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(-) (limited to 'gnu') 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") -- cgit v1.2.3 From b297934437932de730432629b361fcb422accbb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 18 Nov 2018 23:34:19 +0100 Subject: activation: Aways pass '-d HOME' to 'useradd'. Fixes . Reported by fps. * gnu/build/activation.scm (add-user): Always pass "-d HOME" when HOME is true. Pass "--create-home" only when HOME, CREATE-HOME?, and SYSTEM? are true. (activate-users+groups): Pass #:create-home? create-home? to 'ensure-user'. * gnu/tests/base.scm (run-basic-test)["accounts"]: Test 'passwd:dir' as well. --- gnu/build/activation.scm | 17 +++++++++-------- gnu/tests/base.scm | 11 ++++++++--- 2 files changed, 17 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/build/activation.scm b/gnu/build/activation.scm index 68ecd6bc71..0e77677de1 100644 --- a/gnu/build/activation.scm +++ b/gnu/build/activation.scm @@ -148,11 +148,15 @@ properties. Return #t on success." `("-G" ,(string-join supplementary-groups ",")) '()) ,@(if comment `("-c" ,comment) '()) - ,@(if (and home create-home?) - (if (file-exists? home) - `("-d" ,home) ; avoid warning from 'useradd' - `("-d" ,home "--create-home")) + ,@(if home `("-d" ,home) '()) + + ;; Home directories of non-system accounts are created by + ;; 'activate-user-home'. + ,@(if (and home create-home? system? + (not (file-exists? home))) + '("--create-home") '()) + ,@(if shell `("-s" ,shell) '()) ,@(if password `("-p" ,password) '()) ,@(if system? '("--system") '()) @@ -229,10 +233,7 @@ numeric gid or #f." #:supplementary-groups supplementary-groups #:comment comment #:home home - - ;; Home directories of non-system accounts are created by - ;; 'activate-user-home'. - #:create-home? (and create-home? system?) + #:create-home? create-home? #:shell shell #:password password) diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm index 02882f4b46..03392cef38 100644 --- a/gnu/tests/base.scm +++ b/gnu/tests/base.scm @@ -154,10 +154,15 @@ info --version") (#f (reverse result)) (x (loop (cons x result)))))) marionette))) - (lset= string=? - (map passwd:name users) + (lset= equal? + (map (lambda (user) + (list (passwd:name user) + (passwd:dir user))) + users) (list - #$@(map user-account-name + #$@(map (lambda (account) + `(list ,(user-account-name account) + ,(user-account-home-directory account))) (operating-system-user-accounts os)))))) (test-assert "shepherd services" -- cgit v1.2.3 From 46c296dcc4817f15a4b4ef7e5ef622306b4db62e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 15 Nov 2018 13:32:07 +0100 Subject: bootloader: De-monadify configuration file generators. * gnu/bootloader/extlinux.scm: Remove unneeded imports. (extlinux-configuration-file): Use 'computed-file' instead of 'gexp->derivation'. * gnu/bootloader/grub.scm (svg->png): Likewise. (grub-background-image, eye-candy): Adjust accordingly, return non-monadically. (grub-configuration-file): Likewise, and use 'computed-file' instead of 'gexp->derivation'. * gnu/bootloader/u-boot.scm: Remove unneeded imports. * gnu/system.scm: Add 'lower-object' call. --- gnu/bootloader/extlinux.scm | 6 +-- gnu/bootloader/grub.scm | 104 ++++++++++++++++++++------------------------ gnu/bootloader/u-boot.scm | 5 --- gnu/system.scm | 10 +++-- 4 files changed, 56 insertions(+), 69 deletions(-) (limited to 'gnu') diff --git a/gnu/bootloader/extlinux.scm b/gnu/bootloader/extlinux.scm index 8b7a95a6fc..b48596c496 100644 --- a/gnu/bootloader/extlinux.scm +++ b/gnu/bootloader/extlinux.scm @@ -19,12 +19,8 @@ (define-module (gnu bootloader extlinux) #:use-module (gnu bootloader) - #:use-module (gnu system) - #:use-module (gnu build bootloader) #:use-module (gnu packages bootloaders) #:use-module (guix gexp) - #:use-module (guix monads) - #:use-module (guix records) #:use-module (guix utils) #:export (extlinux-bootloader extlinux-bootloader-gpt)) @@ -78,7 +74,7 @@ TIMEOUT ~a~%" (format port "~%")) #~()))))) - (gexp->derivation "extlinux.conf" builder)) + (computed-file "extlinux.conf" builder)) diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index 06856dd58c..161e8b3d02 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -20,26 +20,18 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu bootloader grub) - #:use-module (guix store) - #:use-module (guix packages) - #:use-module (guix derivations) #:use-module (guix records) - #:use-module (guix monads) + #:use-module ((guix utils) #:select (%current-system)) #:use-module (guix gexp) - #:use-module (guix download) #:use-module (gnu artwork) - #:use-module (gnu system) #:use-module (gnu bootloader) #:use-module (gnu system uuid) #:use-module (gnu system file-systems) #:autoload (gnu packages bootloaders) (grub) - #:autoload (gnu packages compression) (gzip) #:autoload (gnu packages gtk) (guile-cairo guile-rsvg) - #:autoload (gnu packages guile) (guile-2.2) #:use-module (ice-9 match) #:use-module (ice-9 regex) #:use-module (srfi srfi-1) - #:use-module (rnrs bytevectors) #:export (grub-image grub-image? grub-image-aspect-ratio @@ -121,14 +113,14 @@ otherwise." (define* (svg->png svg #:key width height) "Build a PNG of HEIGHT x WIDTH from SVG." - (gexp->derivation "grub-image.png" - (with-imported-modules '((gnu build svg)) - (with-extensions (list guile-rsvg guile-cairo) - #~(begin - (use-modules (gnu build svg)) - (svg->png #+svg #$output - #:width #$width - #:height #$height)))))) + (computed-file "grub-image.png" + (with-imported-modules '((gnu build svg)) + (with-extensions (list guile-rsvg guile-cairo) + #~(begin + (use-modules (gnu build svg)) + (svg->png #+svg #$output + #:width #$width + #:height #$height)))))) (define* (grub-background-image config #:key (width 1024) (height 768)) "Return the GRUB background image defined in CONFIG with a ratio of @@ -138,15 +130,13 @@ WIDTH/HEIGHT, or #f if none was found." (= (grub-image-aspect-ratio image) ratio)) (grub-theme-images (bootloader-theme config))))) - (if image - (svg->png (grub-image-file image) - #:width width #:height height) - (with-monad %store-monad - (return #f))))) + (and image + (svg->png (grub-image-file image) + #:width width #:height height)))) (define* (eye-candy config store-device store-mount-point #:key system port) - "Return in %STORE-MONAD a gexp that writes to PORT (a port-valued gexp) the + "Return a gexp that writes to PORT (a port-valued gexp) the 'grub.cfg' part concerned with graphics mode, background images, colors, and all that. STORE-DEVICE designates the device holding the store, and STORE-MOUNT-POINT is its mount point; these are used to determine where the @@ -194,9 +184,11 @@ fi~%" #$font-file) (strip-mount-point store-mount-point (file-append grub "/share/grub/unicode.pf2"))) - (mlet* %store-monad ((image (grub-background-image config))) - (return (and image - #~(format #$port " + (define image + (grub-background-image config)) + + (and image + #~(format #$port " function setup_gfxterm {~a} # Set 'root' to the partition that contains /gnu/store. @@ -213,14 +205,14 @@ else set menu_color_normal=cyan/blue set menu_color_highlight=white/blue fi~%" - #$setup-gfxterm-body - #$(grub-root-search store-device font-file) - #$(setup-gfxterm config font-file) - #$(grub-setup-io config) + #$setup-gfxterm-body + #$(grub-root-search store-device font-file) + #$(setup-gfxterm config font-file) + #$(grub-setup-io config) - #$(strip-mount-point store-mount-point image) - #$(theme-colors grub-theme-color-normal) - #$(theme-colors grub-theme-color-highlight)))))) + #$(strip-mount-point store-mount-point image) + #$(theme-colors grub-theme-color-normal) + #$(theme-colors grub-theme-color-highlight)))) ;;; @@ -331,36 +323,36 @@ entries corresponding to old generations of the system." #$(grub-root-search device kernel) #$kernel (string-join (list #$@arguments)) #$initrd)))) - (mlet %store-monad ((sugar (eye-candy config - (menu-entry-device - (first all-entries)) - (menu-entry-device-mount-point - (first all-entries)) - #:system system - #:port #~port))) - (define builder - #~(call-with-output-file #$output - (lambda (port) - (format port - "# This file was generated from your GuixSD configuration. Any changes + (define sugar + (eye-candy config + (menu-entry-device (first all-entries)) + (menu-entry-device-mount-point (first all-entries)) + #:system system + #:port #~port)) + + (define builder + #~(call-with-output-file #$output + (lambda (port) + (format port + "# This file was generated from your GuixSD configuration. Any changes # will be lost upon reconfiguration. ") - #$sugar - (format port " + #$sugar + (format port " set default=~a set timeout=~a~%" - #$(bootloader-configuration-default-entry config) - #$(bootloader-configuration-timeout config)) - #$@(map menu-entry->gexp all-entries) + #$(bootloader-configuration-default-entry config) + #$(bootloader-configuration-timeout config)) + #$@(map menu-entry->gexp all-entries) - #$@(if (pair? old-entries) - #~((format port " + #$@(if (pair? old-entries) + #~((format port " submenu \"GNU system, old configurations...\" {~%") - #$@(map menu-entry->gexp old-entries) - (format port "}~%")) - #~())))) + #$@(map menu-entry->gexp old-entries) + (format port "}~%")) + #~())))) - (gexp->derivation "grub.cfg" builder))) + (computed-file "grub.cfg" builder)) diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm index 0157fde3da..b5fab14e14 100644 --- a/gnu/bootloader/u-boot.scm +++ b/gnu/bootloader/u-boot.scm @@ -20,13 +20,8 @@ (define-module (gnu bootloader u-boot) #:use-module (gnu bootloader extlinux) #:use-module (gnu bootloader) - #:use-module (gnu system) - #:use-module (gnu build bootloader) #:use-module (gnu packages bootloaders) #:use-module (guix gexp) - #:use-module (guix monads) - #:use-module (guix records) - #:use-module (guix utils) #:export (u-boot-bootloader u-boot-a20-olinuxino-lime-bootloader u-boot-a20-olinuxino-lime2-bootloader diff --git a/gnu/system.scm b/gnu/system.scm index 99bc09873d..93340cccd2 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -948,9 +948,13 @@ listed in OS. The C library expects to find it under (params (operating-system-boot-parameters os system root-device)) (entry -> (boot-parameters->menu-entry params)) (bootloader-conf -> (operating-system-bootloader os))) - ((bootloader-configuration-file-generator - (bootloader-configuration-bootloader bootloader-conf)) - bootloader-conf (list entry) #:old-entries old-entries))) + (define generate-config-file + (bootloader-configuration-file-generator + (bootloader-configuration-bootloader bootloader-conf))) + + ;; TODO: Remove the 'lower-object' call to make it non-monadic. + (lower-object (generate-config-file bootloader-conf (list entry) + #:old-entries old-entries)))) (define (operating-system-boot-parameters os system.drv root-device) "Return a monadic record that describes the boot parameters -- cgit v1.2.3 From a7ef45d9de8c6b0d584769404c8754cd3da8fe29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 15 Nov 2018 14:36:16 +0100 Subject: system: Simplify kernel argument handling. * gnu/system.scm (bootable-kernel-arguments): Remove 'kernel-arguments' parameter and return only the base list of kernel arguments. Rename 'system.drv' to 'system'. (operating-system-kernel-arguments): Adjust accordingly and remove 'system.drv' parameter. (read-boot-parameters-file): Adjust accordingly. Remove 'if params' since dominating code assumed PARAMS is always true. (operating-system-boot-parameters): Remove 'system.drv' parameter; add #:system-kernel-arguments? instead and honor it. (operating-system-bootcfg): Adjust accordingly. (operating-system-boot-parameters-file): Likewise. * gnu/system/vm.scm (system-qemu-image/shared-store-script): Remove 'os-drv' variable. Adjust call to 'operating-system-kernel-arguments'. --- gnu/system.scm | 93 +++++++++++++++++++++++++++---------------------------- gnu/system/vm.scm | 5 ++- 2 files changed, 48 insertions(+), 50 deletions(-) (limited to 'gnu') diff --git a/gnu/system.scm b/gnu/system.scm index 93340cccd2..b218efc875 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -127,23 +127,21 @@ ;;; ;;; Code: -(define (bootable-kernel-arguments kernel-arguments system.drv root-device) - "Prepend extra arguments to KERNEL-ARGUMENTS that allow SYSTEM.DRV to be -booted from ROOT-DEVICE" - (cons* (string-append "--root=" - (cond ((uuid? root-device) - - ;; Note: Always use the DCE format because that's - ;; what (gnu build linux-boot) expects for the - ;; '--root' kernel command-line option. - (uuid->string (uuid-bytevector root-device) - 'dce)) - ((file-system-label? root-device) - (file-system-label->string root-device)) - (else root-device))) - #~(string-append "--system=" #$system.drv) - #~(string-append "--load=" #$system.drv "/boot") - kernel-arguments)) +(define (bootable-kernel-arguments system root-device) + "Return a list of kernel arguments (gexps) to boot SYSTEM from ROOT-DEVICE." + (list (string-append "--root=" + (cond ((uuid? root-device) + + ;; Note: Always use the DCE format because that's + ;; what (gnu build linux-boot) expects for the + ;; '--root' kernel command-line option. + (uuid->string (uuid-bytevector root-device) + 'dce)) + ((file-system-label? root-device) + (file-system-label->string root-device)) + (else root-device))) + #~(string-append "--system=" #$system) + #~(string-append "--load=" #$system "/boot"))) ;; System-wide configuration. ;; TODO: Add per-field docstrings/stexi. @@ -209,12 +207,11 @@ booted from ROOT-DEVICE" (sudoers-file operating-system-sudoers-file ; file-like (default %sudoers-specification))) -(define (operating-system-kernel-arguments os system.drv root-device) +(define (operating-system-kernel-arguments os root-device) "Return all the kernel arguments, including the ones not specified directly by the user." - (bootable-kernel-arguments (operating-system-user-kernel-arguments os) - system.drv - root-device)) + (append (bootable-kernel-arguments os root-device) + (operating-system-user-kernel-arguments os))) ;;; @@ -328,14 +325,11 @@ format is unrecognized. The object has its kernel-arguments extended in order to make it bootable." (let* ((file (string-append system "/parameters")) (params (call-with-input-file file read-boot-parameters)) - (root (boot-parameters-root-device params)) - (kernel-arguments (boot-parameters-kernel-arguments params))) - (if params - (boot-parameters - (inherit params) - (kernel-arguments (bootable-kernel-arguments kernel-arguments - system root))) - #f))) + (root (boot-parameters-root-device params))) + (boot-parameters + (inherit params) + (kernel-arguments (append (bootable-kernel-arguments system root) + (boot-parameters-kernel-arguments params)))))) (define (boot-parameters->menu-entry conf) (menu-entry @@ -942,10 +936,11 @@ listed in OS. The C library expects to find it under "Return the bootloader configuration file for OS. Use OLD-ENTRIES (which is a list of ) to populate the \"old entries\" menu." (mlet* %store-monad - ((system (operating-system-derivation os)) - (root-fs -> (operating-system-root-file-system os)) + ((root-fs -> (operating-system-root-file-system os)) (root-device -> (file-system-device root-fs)) - (params (operating-system-boot-parameters os system root-device)) + (params (operating-system-boot-parameters os root-device + #:system-kernel-arguments? + #t)) (entry -> (boot-parameters->menu-entry params)) (bootloader-conf -> (operating-system-bootloader os))) (define generate-config-file @@ -956,10 +951,11 @@ listed in OS. The C library expects to find it under (lower-object (generate-config-file bootloader-conf (list entry) #:old-entries old-entries)))) -(define (operating-system-boot-parameters os system.drv root-device) - "Return a monadic record that describes the boot parameters -of OS. SYSTEM.DRV is either a derivation or #f. If it's a derivation, adds -kernel arguments for that derivation to ." +(define* (operating-system-boot-parameters os root-device + #:key system-kernel-arguments?) + "Return a monadic record that describes the boot +parameters of OS. When SYSTEM-KERNEL-ARGUMENTS? is true, add kernel arguments +such as '--root' and '--load' to ." (mlet* %store-monad ((initrd (operating-system-initrd-file os)) (store -> (operating-system-store-file-system os)) @@ -972,9 +968,9 @@ kernel arguments for that derivation to ." (root-device root-device) (kernel (operating-system-kernel-file os)) (kernel-arguments - (if system.drv - (operating-system-kernel-arguments os system.drv root-device) - (operating-system-user-kernel-arguments os))) + (if system-kernel-arguments? + (operating-system-kernel-arguments os root-device) + (operating-system-user-kernel-arguments os))) (initrd initrd) (bootloader-name bootloader-name) (store-device (ensure-not-/dev (file-system-device store))) @@ -990,19 +986,22 @@ kernel arguments for that derivation to ." (_ device))) -(define* (operating-system-boot-parameters-file os #:optional (system.drv #f)) +(define* (operating-system-boot-parameters-file os + #:key system-kernel-arguments?) "Return a file that describes the boot parameters of OS. The primary use of this file is the reconstruction of GRUB menu entries for old configurations. -SYSTEM.DRV is optional. If given, adds kernel arguments for that system to the -returned file (since the returned file is then usually stored into the -content-addressed \"system\" directory, it's usually not a good idea -to give it because the content hash would change by the content hash + +When SYSTEM-KERNEL-ARGUMENTS? is true, add kernel arguments such as '--root' +and '--load' to the returned file (since the returned file is then usually +stored into the content-addressed \"system\" directory, it's usually not a +good idea to give it because the content hash would change by the content hash being stored into the \"parameters\" file)." (mlet* %store-monad ((root -> (operating-system-root-file-system os)) (device -> (file-system-device root)) - (params (operating-system-boot-parameters os - system.drv - device))) + (params (operating-system-boot-parameters + os device + #:system-kernel-arguments? + system-kernel-arguments?))) (gexp->file "parameters" #~(boot-parameters (version 0) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index a1b595d45d..d43b71cbaf 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -897,21 +897,20 @@ bootloader; otherwise it directly starts the operating system kernel. The DISK-IMAGE-SIZE parameter specifies the size in bytes of the root disk image; it is mostly useful when FULL-BOOT? is true." (mlet* %store-monad ((os -> (virtualized-operating-system os mappings full-boot?)) - (os-drv (operating-system-derivation os)) (image (system-qemu-image/shared-store os #:full-boot? full-boot? #:disk-image-size disk-image-size))) (define kernel-arguments #~(list #$@(if graphic? #~() #~("console=ttyS0")) - #+@(operating-system-kernel-arguments os os-drv "/dev/vda1"))) + #+@(operating-system-kernel-arguments os "/dev/vda1"))) (define qemu-exec #~(list (string-append #$qemu "/bin/" #$(qemu-command (%current-system))) #$@(if full-boot? #~() #~("-kernel" #$(operating-system-kernel-file os) - "-initrd" #$(file-append os-drv "/initrd") + "-initrd" #$(file-append os "/initrd") (format #f "-append ~s" (string-join #$kernel-arguments " ")))) #$@(common-qemu-options image -- cgit v1.2.3 From e34ae75dc14acb97f661a2787a3c626d7ce65b24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 15 Nov 2018 18:39:18 +0100 Subject: linux-initrd: Return file-like objects instead of monadic values. This is an incompatible change visible to users via the 'initrd' field of 'operating-system'. However, assuming the user's 'initrd' value tail-calls to 'raw-initrd' or 'base-initrd', the switch to non-monadic style is invisible. * gnu/system/linux-initrd.scm (expression->initrd): Use 'computed-file' instead of 'gexp->derivation'. (raw-initrd, base-initrd): Adjust docstring to mention non-monadic return. * gnu/system/vm.scm (expression->derivation-in-linux-vm): Adjust accordingly. * gnu/system.scm (operating-system-directory-base-entries) (operating-system-initrd-file) (operating-system-boot-parameters): Adjust accordingly. * doc/guix.texi (operating-system Reference) (Initial RAM Disk): Update. --- gnu/system.scm | 18 +++++++++--------- gnu/system/linux-initrd.scm | 13 ++++++------- gnu/system/vm.scm | 14 ++++++-------- 3 files changed, 21 insertions(+), 24 deletions(-) (limited to 'gnu') diff --git a/gnu/system.scm b/gnu/system.scm index b218efc875..4ea9391c4a 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -154,7 +154,7 @@ (default '())) ; list of gexps/strings (bootloader operating-system-bootloader) ; - (initrd operating-system-initrd ; (list fs) -> M derivation + (initrd operating-system-initrd ; (list fs) -> file-like (default base-initrd)) (initrd-modules operating-system-initrd-modules ; list of strings (thunked) ; it's system-dependent @@ -442,7 +442,7 @@ value of the SYSTEM-SERVICE-TYPE service." (return `(("locale" ,locale))) (mlet %store-monad ((kernel -> (operating-system-kernel os)) - (initrd (operating-system-initrd-file os)) + (initrd -> (operating-system-initrd-file os)) (params (operating-system-boot-parameters-file os))) (return `(("kernel" ,kernel) ("parameters" ,params) @@ -870,12 +870,12 @@ hardware-related operations as necessary when booting a Linux container." (define make-initrd (operating-system-initrd os)) - (mlet %store-monad ((initrd (make-initrd boot-file-systems - #:linux (operating-system-kernel os) - #:linux-modules - (operating-system-initrd-modules os) - #:mapped-devices mapped-devices))) - (return (file-append initrd "/initrd")))) + (let ((initrd (make-initrd boot-file-systems + #:linux (operating-system-kernel os) + #:linux-modules + (operating-system-initrd-modules os) + #:mapped-devices mapped-devices))) + (file-append initrd "/initrd"))) (define (locale-name->definition* name) "Variant of 'locale-name->definition' that raises an error upon failure." @@ -957,7 +957,7 @@ listed in OS. The C library expects to find it under parameters of OS. When SYSTEM-KERNEL-ARGUMENTS? is true, add kernel arguments such as '--root' and '--load' to ." (mlet* %store-monad - ((initrd (operating-system-initrd-file os)) + ((initrd -> (operating-system-initrd-file os)) (store -> (operating-system-store-file-system os)) (bootloader -> (bootloader-configuration-bootloader (operating-system-bootloader os))) diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index a5a111908f..a53d3cb106 100644 --- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -20,8 +20,6 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu system linux-initrd) - #:use-module (guix monads) - #:use-module (guix store) #:use-module (guix gexp) #:use-module (guix utils) #:use-module ((guix store) @@ -63,7 +61,7 @@ (gzip gzip) (name "guile-initrd") (system (%current-system))) - "Return a derivation that builds a Linux initrd (a gzipped cpio archive) + "Return as a file-like object a Linux initrd (a gzipped cpio archive) containing GUILE and that evaluates EXP, a G-expression, upon booting. All the derivations referenced by EXP are automatically copied to the initrd." @@ -100,8 +98,9 @@ the derivations referenced by EXP are automatically copied to the initrd." #:references-graphs '("closure") #:gzip (string-append #$gzip "/bin/gzip"))))) - (gexp->derivation name builder - #:references-graphs `(("closure" ,init)))) + (computed-file name builder + #:options + `(#:references-graphs (("closure" ,init))))) (define (flat-linux-module-directory linux modules) "Return a flat directory containing the Linux kernel modules listed in @@ -143,7 +142,7 @@ MODULES and taken from LINUX." qemu-networking? volatile-root? (on-error 'debug)) - "Return a monadic derivation that builds a raw initrd, with kernel + "Return as a file-like object a raw initrd, with kernel modules taken from LINUX. FILE-SYSTEMS is a list of file-systems to be mounted by the initrd, possibly in addition to the root file system specified on the kernel command line via '--root'. LINUX-MODULES is a list of kernel @@ -294,7 +293,7 @@ FILE-SYSTEMS." volatile-root? (extra-modules '()) ;deprecated (on-error 'debug)) - "Return a monadic derivation that builds a generic initrd, with kernel + "Return as a file-like object a generic initrd, with kernel modules taken from LINUX. FILE-SYSTEMS is a list of file-systems to be mounted by the initrd, possibly in addition to the root file system specified on the kernel command line via '--root'. MAPPED-DEVICES is a list of device diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index d43b71cbaf..6064e0f899 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -189,14 +189,12 @@ made available under the /xchg CIFS share." #~(when (zero? (system* #$user-builder)) (reboot)))) - (mlet* %store-monad - ((initrd (if initrd ; use the default initrd? - (return initrd) - (base-initrd file-systems - #:on-error 'backtrace - #:linux linux - #:linux-modules %base-initrd-modules - #:qemu-networking? #t)))) + (let ((initrd (or initrd + (base-initrd file-systems + #:on-error 'backtrace + #:linux linux + #:linux-modules %base-initrd-modules + #:qemu-networking? #t)))) (define builder ;; Code that launches the VM that evaluates EXP. -- cgit v1.2.3 From 35b4468127a766c2f543033880635affa99a4040 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 15 Nov 2018 18:52:38 +0100 Subject: system: De-monadify 'operating-system-boot-parameters'. * gnu/system.scm (operating-system-boot-parameters): Turn to direct style instead of monadic. (operating-system-bootcfg): Adjust accordingly. (operating-system-boot-parameters-file): Likewise. --- gnu/system.scm | 55 +++++++++++++++++++++++++++---------------------------- 1 file changed, 27 insertions(+), 28 deletions(-) (limited to 'gnu') diff --git a/gnu/system.scm b/gnu/system.scm index 4ea9391c4a..d4ce0d8e24 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -938,9 +938,9 @@ listed in OS. The C library expects to find it under (mlet* %store-monad ((root-fs -> (operating-system-root-file-system os)) (root-device -> (file-system-device root-fs)) - (params (operating-system-boot-parameters os root-device - #:system-kernel-arguments? - #t)) + (params -> (operating-system-boot-parameters os root-device + #:system-kernel-arguments? + #t)) (entry -> (boot-parameters->menu-entry params)) (bootloader-conf -> (operating-system-bootloader os))) (define generate-config-file @@ -956,25 +956,24 @@ listed in OS. The C library expects to find it under "Return a monadic record that describes the boot parameters of OS. When SYSTEM-KERNEL-ARGUMENTS? is true, add kernel arguments such as '--root' and '--load' to ." - (mlet* %store-monad - ((initrd -> (operating-system-initrd-file os)) - (store -> (operating-system-store-file-system os)) - (bootloader -> (bootloader-configuration-bootloader - (operating-system-bootloader os))) - (bootloader-name -> (bootloader-name bootloader)) - (label -> (kernel->boot-label (operating-system-kernel os)))) - (return (boot-parameters - (label label) - (root-device root-device) - (kernel (operating-system-kernel-file os)) - (kernel-arguments - (if system-kernel-arguments? - (operating-system-kernel-arguments os root-device) - (operating-system-user-kernel-arguments os))) - (initrd initrd) - (bootloader-name bootloader-name) - (store-device (ensure-not-/dev (file-system-device store))) - (store-mount-point (file-system-mount-point store)))))) + (let* ((initrd (operating-system-initrd-file os)) + (store (operating-system-store-file-system os)) + (bootloader (bootloader-configuration-bootloader + (operating-system-bootloader os))) + (bootloader-name (bootloader-name bootloader)) + (label (kernel->boot-label (operating-system-kernel os)))) + (boot-parameters + (label label) + (root-device root-device) + (kernel (operating-system-kernel-file os)) + (kernel-arguments + (if system-kernel-arguments? + (operating-system-kernel-arguments os root-device) + (operating-system-user-kernel-arguments os))) + (initrd initrd) + (bootloader-name bootloader-name) + (store-device (ensure-not-/dev (file-system-device store))) + (store-mount-point (file-system-mount-point store))))) (define (device->sexp device) "Serialize DEVICE as an sexp (really, as an object with a read syntax.)" @@ -996,12 +995,12 @@ and '--load' to the returned file (since the returned file is then usually stored into the content-addressed \"system\" directory, it's usually not a good idea to give it because the content hash would change by the content hash being stored into the \"parameters\" file)." - (mlet* %store-monad ((root -> (operating-system-root-file-system os)) - (device -> (file-system-device root)) - (params (operating-system-boot-parameters - os device - #:system-kernel-arguments? - system-kernel-arguments?))) + (let* ((root (operating-system-root-file-system os)) + (device (file-system-device root)) + (params (operating-system-boot-parameters + os device + #:system-kernel-arguments? + system-kernel-arguments?))) (gexp->file "parameters" #~(boot-parameters (version 0) -- cgit v1.2.3 From 5ece56dc7385e45542fabc290df420ed6a527918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 16 Nov 2018 08:39:07 +0100 Subject: system: Please Emacs. * gnu/system.scm (operating-system-bootcfg): Remove opening parenthesis at the beginning of the line in the docstring to placate Emacs. --- gnu/system.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/system.scm b/gnu/system.scm index d4ce0d8e24..96b3b7d0e0 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -933,8 +933,8 @@ listed in OS. The C library expects to find it under (store-file-system (operating-system-file-systems os))) (define* (operating-system-bootcfg os #:optional (old-entries '())) - "Return the bootloader configuration file for OS. Use OLD-ENTRIES -(which is a list of ) to populate the \"old entries\" menu." + "Return the bootloader configuration file for OS. Use OLD-ENTRIES, +a list of , to populate the \"old entries\" menu." (mlet* %store-monad ((root-fs -> (operating-system-root-file-system os)) (root-device -> (file-system-device root-fs)) -- cgit v1.2.3 From 9782c82217f5bdfe8d47a5a3e14af47e3c3e5dd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 16 Nov 2018 08:50:44 +0100 Subject: system: De-monadify 'operating-system-bootcfg'. * gnu/system.scm (operating-system-bootcfg): Remove 'mlet*' and 'lower-object' call. * gnu/system/vm.scm (system-disk-image) (system-qemu-image/shared-store): Adjust accordingly. * guix/scripts/system.scm (perform-action): Add 'lower-object' call for BOOTCFG. --- gnu/system.scm | 20 +++++++++----------- gnu/system/vm.scm | 10 +++++----- 2 files changed, 14 insertions(+), 16 deletions(-) (limited to 'gnu') diff --git a/gnu/system.scm b/gnu/system.scm index 96b3b7d0e0..1766c8f90f 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -935,21 +935,19 @@ listed in OS. The C library expects to find it under (define* (operating-system-bootcfg os #:optional (old-entries '())) "Return the bootloader configuration file for OS. Use OLD-ENTRIES, a list of , to populate the \"old entries\" menu." - (mlet* %store-monad - ((root-fs -> (operating-system-root-file-system os)) - (root-device -> (file-system-device root-fs)) - (params -> (operating-system-boot-parameters os root-device - #:system-kernel-arguments? - #t)) - (entry -> (boot-parameters->menu-entry params)) - (bootloader-conf -> (operating-system-bootloader os))) + (let* ((root-fs (operating-system-root-file-system os)) + (root-device (file-system-device root-fs)) + (params (operating-system-boot-parameters + os root-device + #:system-kernel-arguments? #t)) + (entry (boot-parameters->menu-entry params)) + (bootloader-conf (operating-system-bootloader os))) (define generate-config-file (bootloader-configuration-file-generator (bootloader-configuration-bootloader bootloader-conf))) - ;; TODO: Remove the 'lower-object' call to make it non-monadic. - (lower-object (generate-config-file bootloader-conf (list entry) - #:old-entries old-entries)))) + (generate-config-file bootloader-conf (list entry) + #:old-entries old-entries))) (define* (operating-system-boot-parameters os root-device #:key system-kernel-arguments?) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 6064e0f899..e6f0f78120 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -648,8 +648,8 @@ to USB sticks meant to be read-only." (type file-system-type)) file-systems-to-keep))))) - (mlet* %store-monad ((os-drv (operating-system-derivation os)) - (bootcfg (operating-system-bootcfg os))) + (mlet* %store-monad ((os-drv (operating-system-derivation os)) + (bootcfg -> (operating-system-bootcfg os))) (if (string=? "iso9660" file-system-type) (iso9660-image #:name name #:file-system-label root-label @@ -713,7 +713,7 @@ of the GNU system as described by OS." file-systems-to-keep))))) (mlet* %store-monad ((os-drv (operating-system-derivation os)) - (bootcfg (operating-system-bootcfg os))) + (bootcfg -> (operating-system-bootcfg os))) (qemu-image #:os-drv os-drv #:bootcfg-drv bootcfg #:bootloader (bootloader-configuration-bootloader @@ -827,8 +827,8 @@ bootloader refers to: OS kernel, initrd, bootloader data, etc." ;; Use a fixed UUID to improve determinism. (operating-system-uuid os 'dce)) - (mlet* %store-monad ((os-drv (operating-system-derivation os)) - (bootcfg (operating-system-bootcfg os))) + (mlet* %store-monad ((os-drv (operating-system-derivation os)) + (bootcfg -> (operating-system-bootcfg os))) ;; XXX: When FULL-BOOT? is true, we end up creating an image that contains ;; BOOTCFG and all its dependencies, including the output of OS-DRV. ;; This is more than needed (we only need the kernel, initrd, GRUB for its -- cgit v1.2.3 From 8bff7dc2adeaac7ed1b7f46efc0623e6476fb5c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 16 Nov 2018 09:05:45 +0100 Subject: vm: Remove explicit calls to 'operating-system-derivation'. * gnu/system/vm.scm (iso9660-image): Change 'os-drv' to 'os' and remove call to 'operating-system-derivation'. (system-qemu-image): Likewise. (system-qemu-image/shared-store): Likewise. --- gnu/system/vm.scm | 191 +++++++++++++++++++++++++++--------------------------- 1 file changed, 94 insertions(+), 97 deletions(-) (limited to 'gnu') diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index e6f0f78120..8e310a1607 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -252,7 +252,7 @@ made available under the /xchg CIFS share." file-system-uuid (system (%current-system)) (qemu qemu-minimal) - os-drv + os bootcfg-drv bootloader register-closures? @@ -300,7 +300,7 @@ INPUTS is a list of inputs (as for packages)." (set-path-environment-variable "PATH" '("bin" "sbin") inputs) (make-iso9660-image #$(bootloader-package bootloader) #$bootcfg-drv - #$os-drv + #$os "/xchg/guixsd.iso" #:register-closures? #$register-closures? #:closures graphs @@ -329,7 +329,7 @@ INPUTS is a list of inputs (as for packages)." (file-system-type "ext4") file-system-label file-system-uuid - os-drv + os bootcfg-drv bootloader (register-closures? #t) @@ -395,7 +395,7 @@ the image." #:closures graphs #:copy-closures? #$copy-inputs? #:register-closures? #$register-closures? - #:system-directory #$os-drv + #:system-directory #$os ;; Disable deduplication to speed things up, ;; and because it doesn't help much for a @@ -625,56 +625,54 @@ to USB sticks meant to be read-only." (string=? (file-system-mount-point fs) "/")) (operating-system-file-systems os))) - (let ((os (operating-system (inherit os) - ;; Since this is meant to be used on real hardware, don't - ;; install QEMU networking or anything like that. Assume USB - ;; mass storage devices (usb-storage.ko) are available. - (initrd (lambda (file-systems . rest) - (apply (operating-system-initrd os) - file-systems - #:volatile-root? #t - rest))) - - (bootloader (if (string=? "iso9660" file-system-type) - (bootloader-configuration - (inherit (operating-system-bootloader os)) - (bootloader grub-mkrescue-bootloader)) - (operating-system-bootloader os))) - - ;; Force our own root file system. - (file-systems (cons (file-system - (mount-point "/") - (device root-uuid) - (type file-system-type)) - file-systems-to-keep))))) - - (mlet* %store-monad ((os-drv (operating-system-derivation os)) - (bootcfg -> (operating-system-bootcfg os))) - (if (string=? "iso9660" file-system-type) - (iso9660-image #:name name - #:file-system-label root-label - #:file-system-uuid root-uuid - #:os-drv os-drv - #:register-closures? #t - #:bootcfg-drv bootcfg - #:bootloader (bootloader-configuration-bootloader - (operating-system-bootloader os)) - #:inputs `(("system" ,os-drv) - ("bootcfg" ,bootcfg))) - (qemu-image #:name name - #:os-drv os-drv - #:bootcfg-drv bootcfg - #:bootloader (bootloader-configuration-bootloader - (operating-system-bootloader os)) - #:disk-image-size disk-image-size - #:disk-image-format "raw" - #:file-system-type file-system-type - #:file-system-label root-label - #:file-system-uuid root-uuid - #:copy-inputs? #t - #:register-closures? #t - #:inputs `(("system" ,os-drv) - ("bootcfg" ,bootcfg))))))) + (let* ((os (operating-system (inherit os) + ;; Since this is meant to be used on real hardware, don't + ;; install QEMU networking or anything like that. Assume USB + ;; mass storage devices (usb-storage.ko) are available. + (initrd (lambda (file-systems . rest) + (apply (operating-system-initrd os) + file-systems + #:volatile-root? #t + rest))) + + (bootloader (if (string=? "iso9660" file-system-type) + (bootloader-configuration + (inherit (operating-system-bootloader os)) + (bootloader grub-mkrescue-bootloader)) + (operating-system-bootloader os))) + + ;; Force our own root file system. + (file-systems (cons (file-system + (mount-point "/") + (device root-uuid) + (type file-system-type)) + file-systems-to-keep)))) + (bootcfg (operating-system-bootcfg os))) + (if (string=? "iso9660" file-system-type) + (iso9660-image #:name name + #:file-system-label root-label + #:file-system-uuid root-uuid + #:os os + #:register-closures? #t + #:bootcfg-drv bootcfg + #:bootloader (bootloader-configuration-bootloader + (operating-system-bootloader os)) + #:inputs `(("system" ,os) + ("bootcfg" ,bootcfg))) + (qemu-image #:name name + #:os os + #:bootcfg-drv bootcfg + #:bootloader (bootloader-configuration-bootloader + (operating-system-bootloader os)) + #:disk-image-size disk-image-size + #:disk-image-format "raw" + #:file-system-type file-system-type + #:file-system-label root-label + #:file-system-uuid root-uuid + #:copy-inputs? #t + #:register-closures? #t + #:inputs `(("system" ,os) + ("bootcfg" ,bootcfg)))))) (define* (system-qemu-image os #:key @@ -700,30 +698,28 @@ of the GNU system as described by OS." 'dce))) - (let ((os (operating-system (inherit os) - ;; Assume we have an initrd with the whole QEMU shebang. - - ;; Force our own root file system. Refer to it by UUID so that - ;; it works regardless of how the image is used ("qemu -hda", - ;; Xen, etc.). - (file-systems (cons (file-system - (mount-point "/") - (device root-uuid) - (type file-system-type)) - file-systems-to-keep))))) - (mlet* %store-monad - ((os-drv (operating-system-derivation os)) - (bootcfg -> (operating-system-bootcfg os))) - (qemu-image #:os-drv os-drv - #:bootcfg-drv bootcfg - #:bootloader (bootloader-configuration-bootloader - (operating-system-bootloader os)) - #:disk-image-size disk-image-size - #:file-system-type file-system-type - #:file-system-uuid root-uuid - #:inputs `(("system" ,os-drv) - ("bootcfg" ,bootcfg)) - #:copy-inputs? #t)))) + (let* ((os (operating-system (inherit os) + ;; Assume we have an initrd with the whole QEMU shebang. + + ;; Force our own root file system. Refer to it by UUID so that + ;; it works regardless of how the image is used ("qemu -hda", + ;; Xen, etc.). + (file-systems (cons (file-system + (mount-point "/") + (device root-uuid) + (type file-system-type)) + file-systems-to-keep)))) + (bootcfg (operating-system-bootcfg os))) + (qemu-image #:os os + #:bootcfg-drv bootcfg + #:bootloader (bootloader-configuration-bootloader + (operating-system-bootloader os)) + #:disk-image-size disk-image-size + #:file-system-type file-system-type + #:file-system-uuid root-uuid + #:inputs `(("system" ,os) + ("bootcfg" ,bootcfg)) + #:copy-inputs? #t))) ;;; @@ -827,25 +823,26 @@ bootloader refers to: OS kernel, initrd, bootloader data, etc." ;; Use a fixed UUID to improve determinism. (operating-system-uuid os 'dce)) - (mlet* %store-monad ((os-drv (operating-system-derivation os)) - (bootcfg -> (operating-system-bootcfg os))) - ;; XXX: When FULL-BOOT? is true, we end up creating an image that contains - ;; BOOTCFG and all its dependencies, including the output of OS-DRV. - ;; This is more than needed (we only need the kernel, initrd, GRUB for its - ;; font, and the background image), but it's hard to filter that. - (qemu-image #:os-drv os-drv - #:bootcfg-drv bootcfg - #:bootloader (bootloader-configuration-bootloader - (operating-system-bootloader os)) - #:disk-image-size disk-image-size - #:file-system-uuid root-uuid - #:inputs (if full-boot? - `(("bootcfg" ,bootcfg)) - '()) - - ;; XXX: Passing #t here is too slow, so let it off by default. - #:register-closures? #f - #:copy-inputs? full-boot?))) + (define bootcfg + (operating-system-bootcfg os)) + + ;; XXX: When FULL-BOOT? is true, we end up creating an image that contains + ;; BOOTCFG and all its dependencies, including the output of OS. + ;; This is more than needed (we only need the kernel, initrd, GRUB for its + ;; font, and the background image), but it's hard to filter that. + (qemu-image #:os os + #:bootcfg-drv bootcfg + #:bootloader (bootloader-configuration-bootloader + (operating-system-bootloader os)) + #:disk-image-size disk-image-size + #:file-system-uuid root-uuid + #:inputs (if full-boot? + `(("bootcfg" ,bootcfg)) + '()) + + ;; XXX: Passing #t here is too slow, so let it off by default. + #:register-closures? #f + #:copy-inputs? full-boot?)) (define* (common-qemu-options image shared-fs) "Return the a string-value gexp with the common QEMU options to boot IMAGE, -- cgit v1.2.3 From 5c40a69f7123f8f6ec4f1792bea73bb345a445b0 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 12 Nov 2018 12:09:56 -0500 Subject: gnu: Add libfdk 'FDK AAC' library. * gnu/packages/audio.scm (libfdk): New variable. --- gnu/packages/audio.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 6795ddd21c..d74f50fac5 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3549,3 +3549,37 @@ using ALSA, MPD, PulseAudio, or a FIFO buffer as its input.") (synopsis "Pro-quality GM soundfont") (description "Fluid-3 is Frank Wen's pro-quality GM soundfont.") (license license:expat)))) + +(define-public libfdk + (let ((commit "2326faaf8f2cdf2c3a9108ccdaf1d7551aec543e") + (revision "0")) + (package + (name "libfdk") + ;; The latest upstream revision, with many bug fixes. + (version (git-version "0.1.6" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mstorsjo/fdk-aac") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0yy6ndd9d61bwl283vl1r5kva2a4acc0f4r9g0sza156f2abr9ws")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) + (home-page "https://github.com/mstorsjo/fdk-aac") + (synopsis "Fraunhofer FDK AAC library") + (description "FDK is a library for encoding and decoding Advanced Audio +Coding (AAC) format audio, developed by Fraunhofer IIS, and included as part of +Android. It supports several Audio Object Types including MPEG-2 and MPEG-4 AAC +LC, HE-AAC (AAC LC + SBR), HE-AACv2 (LC + SBR + PS) as well AAC-LD (low delay) +and AAC-ELD (enhanced low delay) for real-time communication. The encoding +library supports sample rates up to 96 kHz and up to eight channels (7.1 +surround).") + (license (license:fsf-free "https://github.com/mstorsjo/fdk-aac/blob/master/NOTICE" + "https://www.gnu.org/licenses/license-list.html#fdk"))))) -- cgit v1.2.3 From c39f3e1c43aab832b7c24b074b22468079757832 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 19 Nov 2018 09:44:06 +0100 Subject: gnu: diffoscope: Update to 105. * gnu/packages/package-management.scm (diffoscope): Update to 105. --- gnu/packages/package-management.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index dc265060b7..dd83d75874 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -571,13 +571,13 @@ transactions from C or Python.") (define-public diffoscope (package (name "diffoscope") - (version "104") + (version "105") (source (origin (method url-fetch) (uri (pypi-uri name version)) (sha256 (base32 - "0vnfhnvqvdwgh1sh2lmwad8jk2vjvq76p5xm3pfgxdik2yblmvqd")))) + "0bqkwvrvlvybqfi73qv1k5xic2qzw5lv20imqadf1wc4l8vc0vq3")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 1372754dc0a5b67612961d88f2087572b792dbe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 19 Nov 2018 09:44:22 +0100 Subject: gnu: fuse-exfat: Update to 1.3.0. * gnu/packages/linux.scm (fuse-exfat): Update to 1.3.0. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 28c699cce4..5f5d55b691 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3188,7 +3188,7 @@ is flexible, efficient and uses a modular implementation.") (define-public fuse-exfat (package (name "fuse-exfat") - (version "1.2.8") + (version "1.3.0") (source (origin (method url-fetch) (uri (string-append @@ -3196,7 +3196,7 @@ is flexible, efficient and uses a modular implementation.") version "/" name "-" version ".tar.gz")) (sha256 (base32 - "1jwnxw0bg9v5ij8xvbg4xpjr50nykq8a1lmc2xkblz204rq7wd8z")))) + "1lz00q8g4590mrdqmf13ba1s9zrqq645ymgm5p9y99ad0qv22r87")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 5e9ce98af74d96bc4f2caf965de3bcd4aa8d8d2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 19 Nov 2018 09:47:06 +0100 Subject: gnu: help2man: Add 1.47.8. * gnu/packages/man.scm (help2man/latest): New variable. --- gnu/packages/man.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index 58e26d82ff..b640884933 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2014, 2015, 2017 Ludovic Courtès +;;; Copyright © 2012, 2014, 2015, 2017, 2018 Ludovic Courtès ;;; Copyright © 2014 David Thompson ;;; Copyright © 2015, 2016 Ricardo Wurmus ;;; Copyright © 2015 Alex Kost @@ -216,6 +216,18 @@ Linux kernel and C library interfaces employed by user-space programs.") automatically.") (license gpl3+))) +(define-public help2man/latest + (package + (inherit help2man) + (version "1.47.8") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/help2man/help2man-" + version ".tar.xz")) + (sha256 + (base32 + "1p5830h88cx0zn0snwaj0vpph81xicpsirfwlxmcgjrlmn0nm3sj")))))) + (define-public txt2man (package (name "txt2man") -- cgit v1.2.3 From f4ee41c9605726462f2ce29972fd4264cf0aaa20 Mon Sep 17 00:00:00 2001 From: "Jovany Leandro G.C" Date: Mon, 19 Nov 2018 00:05:57 -0500 Subject: gnu: python-kivy: Update to 1.10.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python.scm (python-kivy): Update to 1.10.1. Signed-off-by: Ludovic Courtès --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b6b0ad75a4..2b7482a3ec 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -9942,7 +9942,7 @@ and/or Xon/Xoff. The port is accessed in RAW mode.") (define-public python-kivy (package (name "python-kivy") - (version "1.10.0") + (version "1.10.1") (source (origin (method url-fetch) @@ -9950,7 +9950,7 @@ and/or Xon/Xoff. The port is accessed in RAW mode.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1394zh6kvf7k5d8vlzxcsfcailr3q59xwg9b1n7qaf25bvyq1h98")))) + "1zzxjdp78hfjjiklzr82l4zwibwcq4j6kgicspqs6iyyfn5yisbw")))) (build-system python-build-system) (arguments `(#:tests? #f ; Tests require many optional packages -- cgit v1.2.3 From 28e32b14e4b3139a8bda294d3cc0efd33f286998 Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Fri, 12 Oct 2018 17:58:00 +0800 Subject: gnu: clojure: Move from java to lisp. * gnu/packages/java.scm (clojure): Move from here... * gnu/packages/lisp.scm (clojure): ...to here. --- gnu/packages/java.scm | 145 ------------------------------------------------- gnu/packages/lisp.scm | 147 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 147 insertions(+), 145 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index f6d72edeea..cea3c4e333 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1803,151 +1803,6 @@ new Date();")) `(("java-junit" ,java-junit) ,@(package-inputs ant/java8))))) -(define-public clojure - (let* ((remove-archives '(begin - (for-each delete-file - (find-files "." ".*\\.(jar|zip)")) - #t)) - (submodule (lambda (prefix version hash) - (origin - (method url-fetch) - (uri (string-append "https://github.com/clojure/" - prefix version ".tar.gz")) - (sha256 (base32 hash)) - (modules '((guix build utils))) - (snippet remove-archives))))) - (package - (name "clojure") - (version "1.9.0") - (source - (origin - (method url-fetch) - (uri - (string-append "https://github.com/clojure/clojure/archive/clojure-" - version ".tar.gz")) - (sha256 - (base32 "0xjbzcw45z32vsn9pifp7ndysjzqswp5ig0jkjpivigh2ckkdzha")) - (modules '((guix build utils))) - (snippet remove-archives))) - (build-system ant-build-system) - (arguments - `(#:modules ((guix build ant-build-system) - (guix build utils) - (ice-9 ftw) - (ice-9 regex) - (srfi srfi-1) - (srfi srfi-26)) - #:test-target "test" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'unpack-submodule-sources - (lambda* (#:key inputs #:allow-other-keys) - (for-each - (lambda (name) - (mkdir-p name) - (with-directory-excursion name - (invoke "tar" - ;; Use xz for repacked tarball. - "--xz" - "--extract" - "--verbose" - "--file" (assoc-ref inputs name) - "--strip-components=1")) - (copy-recursively (string-append name "/src/main/clojure/") - "src/clj/")) - '("core-specs-alpha-src" - "data-generators-src" - "spec-alpha-src" - "test-check-src" - "test-generative-src" - "tools-namespace-src")) - #t)) - (add-after 'unpack 'fix-manifest-classpath - (lambda _ - (substitute* "build.xml" - (("") "")) - #t)) - ;; The javadoc target is not built by default. - (add-after 'build 'build-doc - (lambda _ - (invoke "ant" "javadoc"))) - ;; Needed since no install target is provided. - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((java-dir (string-append (assoc-ref outputs "out") - "/share/java/"))) - ;; Install versioned to avoid collisions. - (install-file (string-append "clojure-" ,version ".jar") - java-dir) - #t))) - ;; Needed since no install-doc target is provided. - (add-after 'install 'install-doc - (lambda* (#:key outputs #:allow-other-keys) - (let ((doc-dir (string-append (assoc-ref outputs "out") - "/share/doc/clojure-" - ,version "/"))) - (copy-recursively "doc/clojure" doc-dir) - (copy-recursively "target/javadoc/" - (string-append doc-dir "javadoc/")) - (for-each (cut install-file <> doc-dir) - (filter (cut string-match - ".*\\.(html|markdown|md|txt)" - <>) - (scandir "./"))) - #t)))))) - ;; The native-inputs below are needed to run the tests. - (native-inputs - `(("core-specs-alpha-src" - ,(submodule "core.specs.alpha/archive/core.specs.alpha-" - "0.1.24" - "0v2a0svf1ar2y42ajxwsjr7zmm5j7pp2zwrd2jh3k7xzd1p9x1fv")) - ("data-generators-src" - ,(submodule "data.generators/archive/data.generators-" - "0.1.2" - "0kki093jp4ckwxzfnw8ylflrfqs8b1i1wi9iapmwcsy328dmgzp1")) - ("spec-alpha-src" - ,(submodule "spec.alpha/archive/spec.alpha-" - "0.1.143" - "00alf0347licdn773w2jarpllyrbl52qz4d8mw61anjksacxylzz")) - ("test-check-src" - ,(submodule "test.check/archive/test.check-" - "0.9.0" - "0p0mnyhr442bzkz0s4k5ra3i6l5lc7kp6ajaqkkyh4c2k5yck1md")) - ("test-generative-src" - ,(submodule "test.generative/archive/test.generative-" - "0.5.2" - "1pjafy1i7yblc7ixmcpfq1lfbyf3jaljvkgrajn70sws9xs7a9f8")) - ("tools-namespace-src" - ,(submodule "tools.namespace/archive/tools.namespace-" - "0.2.11" - "10baak8v0hnwz2hr33bavshm7y49mmn9zsyyms1dwjz45p5ymhy0")))) - (home-page "https://clojure.org/") - (synopsis "Lisp dialect running on the JVM") - (description "Clojure is a dynamic, general-purpose programming language, -combining the approachability and interactive development of a scripting -language with an efficient and robust infrastructure for multithreaded -programming. Clojure is a compiled language, yet remains completely dynamic -– every feature supported by Clojure is supported at runtime. Clojure -provides easy access to the Java frameworks, with optional type hints and type -inference, to ensure that calls to Java can avoid reflection. - -Clojure is a dialect of Lisp, and shares with Lisp the code-as-data philosophy -and a powerful macro system. Clojure is predominantly a functional programming -language, and features a rich set of immutable, persistent data structures. -When mutable state is needed, Clojure offers a software transactional memory -system and reactive Agent system that ensure clean, correct, multithreaded -designs.") - ;; Clojure is licensed under EPL1.0 - ;; ASM bytecode manipulation library is licensed under BSD-3 - ;; Guava Murmur3 hash implementation is licensed under APL2.0 - ;; src/clj/repl.clj is licensed under CPL1.0 - ;; - ;; See readme.html or readme.txt for details. - (license (list license:epl1.0 - license:bsd-3 - license:asl2.0 - license:cpl1.0))))) - (define-public javacc-4 (package (name "javacc") diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index dcdd551884..0e07e1969e 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2017, 2018 Efraim Flashner ;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; Copyright © 2018 Benjamin Slade +;;; Copyright © 2018 Alex Vong ;;; ;;; This file is part of GNU Guix. ;;; @@ -34,6 +35,7 @@ #:use-module (guix hg-download) #:use-module (guix utils) #:use-module (guix build-system gnu) + #:use-module (guix build-system ant) #:use-module (guix build-system asdf) #:use-module (guix build-system trivial) #:use-module (gnu packages admin) @@ -563,6 +565,151 @@ interface.") (license (list license:lgpl2.1 license:clarified-artistic)))) ;TRIVIAL-LDAP package +(define-public clojure + (let* ((remove-archives '(begin + (for-each delete-file + (find-files "." ".*\\.(jar|zip)")) + #t)) + (submodule (lambda (prefix version hash) + (origin + (method url-fetch) + (uri (string-append "https://github.com/clojure/" + prefix version ".tar.gz")) + (sha256 (base32 hash)) + (modules '((guix build utils))) + (snippet remove-archives))))) + (package + (name "clojure") + (version "1.9.0") + (source + (origin + (method url-fetch) + (uri + (string-append "https://github.com/clojure/clojure/archive/clojure-" + version ".tar.gz")) + (sha256 + (base32 "0xjbzcw45z32vsn9pifp7ndysjzqswp5ig0jkjpivigh2ckkdzha")) + (modules '((guix build utils))) + (snippet remove-archives))) + (build-system ant-build-system) + (arguments + `(#:modules ((guix build ant-build-system) + (guix build utils) + (ice-9 ftw) + (ice-9 regex) + (srfi srfi-1) + (srfi srfi-26)) + #:test-target "test" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'unpack-submodule-sources + (lambda* (#:key inputs #:allow-other-keys) + (for-each + (lambda (name) + (mkdir-p name) + (with-directory-excursion name + (invoke "tar" + ;; Use xz for repacked tarball. + "--xz" + "--extract" + "--verbose" + "--file" (assoc-ref inputs name) + "--strip-components=1")) + (copy-recursively (string-append name "/src/main/clojure/") + "src/clj/")) + '("core-specs-alpha-src" + "data-generators-src" + "spec-alpha-src" + "test-check-src" + "test-generative-src" + "tools-namespace-src")) + #t)) + (add-after 'unpack 'fix-manifest-classpath + (lambda _ + (substitute* "build.xml" + (("") "")) + #t)) + ;; The javadoc target is not built by default. + (add-after 'build 'build-doc + (lambda _ + (invoke "ant" "javadoc"))) + ;; Needed since no install target is provided. + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((java-dir (string-append (assoc-ref outputs "out") + "/share/java/"))) + ;; Install versioned to avoid collisions. + (install-file (string-append "clojure-" ,version ".jar") + java-dir) + #t))) + ;; Needed since no install-doc target is provided. + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (let ((doc-dir (string-append (assoc-ref outputs "out") + "/share/doc/clojure-" + ,version "/"))) + (copy-recursively "doc/clojure" doc-dir) + (copy-recursively "target/javadoc/" + (string-append doc-dir "javadoc/")) + (for-each (cut install-file <> doc-dir) + (filter (cut string-match + ".*\\.(html|markdown|md|txt)" + <>) + (scandir "./"))) + #t)))))) + ;; The native-inputs below are needed to run the tests. + (native-inputs + `(("core-specs-alpha-src" + ,(submodule "core.specs.alpha/archive/core.specs.alpha-" + "0.1.24" + "0v2a0svf1ar2y42ajxwsjr7zmm5j7pp2zwrd2jh3k7xzd1p9x1fv")) + ("data-generators-src" + ,(submodule "data.generators/archive/data.generators-" + "0.1.2" + "0kki093jp4ckwxzfnw8ylflrfqs8b1i1wi9iapmwcsy328dmgzp1")) + ("spec-alpha-src" + ,(submodule "spec.alpha/archive/spec.alpha-" + "0.1.143" + "00alf0347licdn773w2jarpllyrbl52qz4d8mw61anjksacxylzz")) + ("test-check-src" + ,(submodule "test.check/archive/test.check-" + "0.9.0" + "0p0mnyhr442bzkz0s4k5ra3i6l5lc7kp6ajaqkkyh4c2k5yck1md")) + ("test-generative-src" + ,(submodule "test.generative/archive/test.generative-" + "0.5.2" + "1pjafy1i7yblc7ixmcpfq1lfbyf3jaljvkgrajn70sws9xs7a9f8")) + ("tools-namespace-src" + ,(submodule "tools.namespace/archive/tools.namespace-" + "0.2.11" + "10baak8v0hnwz2hr33bavshm7y49mmn9zsyyms1dwjz45p5ymhy0")))) + (home-page "https://clojure.org/") + (synopsis "Lisp dialect running on the JVM") + (description "Clojure is a dynamic, general-purpose programming language, +combining the approachability and interactive development of a scripting +language with an efficient and robust infrastructure for multithreaded +programming. Clojure is a compiled language, yet remains completely dynamic +– every feature supported by Clojure is supported at runtime. Clojure +provides easy access to the Java frameworks, with optional type hints and type +inference, to ensure that calls to Java can avoid reflection. + +Clojure is a dialect of Lisp, and shares with Lisp the code-as-data philosophy +and a powerful macro system. Clojure is predominantly a functional programming +language, and features a rich set of immutable, persistent data structures. +When mutable state is needed, Clojure offers a software transactional memory +system and reactive Agent system that ensure clean, correct, multithreaded +designs.") + ;; Clojure is licensed under EPL1.0 + ;; ASM bytecode manipulation library is licensed under BSD-3 + ;; Guava Murmur3 hash implementation is licensed under APL2.0 + ;; src/clj/repl.clj is licensed under CPL1.0 + ;; + ;; See readme.html or readme.txt for details. + (license (list license:epl1.0 + license:bsd-3 + license:asl2.0 + license:cpl1.0))))) + (define-public femtolisp (let ((commit "68c5b1225572ecf2c52baf62f928063e5a30511b") (revision "1")) -- cgit v1.2.3 From df0a180421b34b6f1f3395652291f94a37303988 Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Sat, 13 Oct 2018 18:32:14 +0800 Subject: gnu: clojure: Remove 'remove-archives' snippet. This is no longer needed since clojure now makes official source releases in github. * gnu/packages/lisp.scm (clojure)[source]: Remove it. [native-inputs]: Remove it in 'submodule'. [arguments]: Adjust 'unpack-submodule-sources' phase accordingly. --- gnu/packages/lisp.scm | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 0e07e1969e..f963dfb5de 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -566,18 +566,12 @@ interface.") license:clarified-artistic)))) ;TRIVIAL-LDAP package (define-public clojure - (let* ((remove-archives '(begin - (for-each delete-file - (find-files "." ".*\\.(jar|zip)")) - #t)) - (submodule (lambda (prefix version hash) - (origin - (method url-fetch) - (uri (string-append "https://github.com/clojure/" - prefix version ".tar.gz")) - (sha256 (base32 hash)) - (modules '((guix build utils))) - (snippet remove-archives))))) + (let ((submodule (lambda (prefix version hash) + (origin + (method url-fetch) + (uri (string-append "https://github.com/clojure/" + prefix version ".tar.gz")) + (sha256 (base32 hash)))))) (package (name "clojure") (version "1.9.0") @@ -588,9 +582,7 @@ interface.") (string-append "https://github.com/clojure/clojure/archive/clojure-" version ".tar.gz")) (sha256 - (base32 "0xjbzcw45z32vsn9pifp7ndysjzqswp5ig0jkjpivigh2ckkdzha")) - (modules '((guix build utils))) - (snippet remove-archives))) + (base32 "0xjbzcw45z32vsn9pifp7ndysjzqswp5ig0jkjpivigh2ckkdzha")))) (build-system ant-build-system) (arguments `(#:modules ((guix build ant-build-system) @@ -609,8 +601,6 @@ interface.") (mkdir-p name) (with-directory-excursion name (invoke "tar" - ;; Use xz for repacked tarball. - "--xz" "--extract" "--verbose" "--file" (assoc-ref inputs name) -- cgit v1.2.3 From 8da9187a5a2477e3e7114e5a25ae8ae57bf73271 Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Sun, 14 Oct 2018 00:08:29 +0800 Subject: gnu: clojure: Refactor to ensure there's a single list of libraries. This avoids having to update multiple lists. * gnu/packages/lisp.scm (clojure)[native-inputs]: Use new local variable. [arguments]: Adjust build phases accordingly. --- gnu/packages/lisp.scm | 101 ++++++++++++++++++++++++-------------------------- 1 file changed, 49 insertions(+), 52 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index f963dfb5de..24738f3f13 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -566,12 +566,40 @@ interface.") license:clarified-artistic)))) ;TRIVIAL-LDAP package (define-public clojure - (let ((submodule (lambda (prefix version hash) - (origin - (method url-fetch) - (uri (string-append "https://github.com/clojure/" - prefix version ".tar.gz")) - (sha256 (base32 hash)))))) + (let* ((lib (lambda (prefix version hash) + (origin (method url-fetch) + (uri (string-append "https://github.com/clojure/" + prefix version ".tar.gz")) + (sha256 (base32 hash))))) + ;; The libraries below are needed to run the tests. + (libraries + `(("core-specs-alpha-src" + ,(lib "core.specs.alpha/archive/core.specs.alpha-" + "0.1.24" + "0v2a0svf1ar2y42ajxwsjr7zmm5j7pp2zwrd2jh3k7xzd1p9x1fv")) + ("data-generators-src" + ,(lib "data.generators/archive/data.generators-" + "0.1.2" + "0kki093jp4ckwxzfnw8ylflrfqs8b1i1wi9iapmwcsy328dmgzp1")) + ("spec-alpha-src" + ,(lib "spec.alpha/archive/spec.alpha-" + "0.1.143" + "00alf0347licdn773w2jarpllyrbl52qz4d8mw61anjksacxylzz")) + ("test-check-src" + ,(lib "test.check/archive/test.check-" + "0.9.0" + "0p0mnyhr442bzkz0s4k5ra3i6l5lc7kp6ajaqkkyh4c2k5yck1md")) + ("test-generative-src" + ,(lib "test.generative/archive/test.generative-" + "0.5.2" + "1pjafy1i7yblc7ixmcpfq1lfbyf3jaljvkgrajn70sws9xs7a9f8")) + ("tools-namespace-src" + ,(lib "tools.namespace/archive/tools.namespace-" + "0.2.11" + "10baak8v0hnwz2hr33bavshm7y49mmn9zsyyms1dwjz45p5ymhy0")))) + (library-names (match libraries + (((library-name _) ...) + library-name)))) (package (name "clojure") (version "1.9.0") @@ -594,27 +622,21 @@ interface.") #:test-target "test" #:phases (modify-phases %standard-phases - (add-after 'unpack 'unpack-submodule-sources + (add-after 'unpack 'unpack-library-sources (lambda* (#:key inputs #:allow-other-keys) - (for-each - (lambda (name) - (mkdir-p name) - (with-directory-excursion name - (invoke "tar" - "--extract" - "--verbose" - "--file" (assoc-ref inputs name) - "--strip-components=1")) - (copy-recursively (string-append name "/src/main/clojure/") - "src/clj/")) - '("core-specs-alpha-src" - "data-generators-src" - "spec-alpha-src" - "test-check-src" - "test-generative-src" - "tools-namespace-src")) + (define (extract-library name) + (mkdir-p name) + (with-directory-excursion name + (invoke "tar" + "--extract" + "--verbose" + "--file" (assoc-ref inputs name) + "--strip-components=1")) + (copy-recursively (string-append name "/src/main/clojure/") + "src/clj/")) + (for-each extract-library ',library-names) #t)) - (add-after 'unpack 'fix-manifest-classpath + (add-after 'unpack-library-sources 'fix-manifest-classpath (lambda _ (substitute* "build.xml" (("") "")) @@ -647,32 +669,7 @@ interface.") <>) (scandir "./"))) #t)))))) - ;; The native-inputs below are needed to run the tests. - (native-inputs - `(("core-specs-alpha-src" - ,(submodule "core.specs.alpha/archive/core.specs.alpha-" - "0.1.24" - "0v2a0svf1ar2y42ajxwsjr7zmm5j7pp2zwrd2jh3k7xzd1p9x1fv")) - ("data-generators-src" - ,(submodule "data.generators/archive/data.generators-" - "0.1.2" - "0kki093jp4ckwxzfnw8ylflrfqs8b1i1wi9iapmwcsy328dmgzp1")) - ("spec-alpha-src" - ,(submodule "spec.alpha/archive/spec.alpha-" - "0.1.143" - "00alf0347licdn773w2jarpllyrbl52qz4d8mw61anjksacxylzz")) - ("test-check-src" - ,(submodule "test.check/archive/test.check-" - "0.9.0" - "0p0mnyhr442bzkz0s4k5ra3i6l5lc7kp6ajaqkkyh4c2k5yck1md")) - ("test-generative-src" - ,(submodule "test.generative/archive/test.generative-" - "0.5.2" - "1pjafy1i7yblc7ixmcpfq1lfbyf3jaljvkgrajn70sws9xs7a9f8")) - ("tools-namespace-src" - ,(submodule "tools.namespace/archive/tools.namespace-" - "0.2.11" - "10baak8v0hnwz2hr33bavshm7y49mmn9zsyyms1dwjz45p5ymhy0")))) + (native-inputs libraries) (home-page "https://clojure.org/") (synopsis "Lisp dialect running on the JVM") (description "Clojure is a dynamic, general-purpose programming language, @@ -693,7 +690,7 @@ designs.") ;; ASM bytecode manipulation library is licensed under BSD-3 ;; Guava Murmur3 hash implementation is licensed under APL2.0 ;; src/clj/repl.clj is licensed under CPL1.0 - ;; + ;; See readme.html or readme.txt for details. (license (list license:epl1.0 license:bsd-3 -- cgit v1.2.3 From d0ad97115abb548195b920e83ce2769b5020884d Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Sun, 14 Oct 2018 02:52:41 +0800 Subject: gnu: clojure: Use (guix build java-utils) to simplify build phases. * gnu/packages/lisp.scm (clojure)[arguments]: Use 'ant-build-javadoc', 'install-jars' and 'install-javadoc' in build phases. --- gnu/packages/lisp.scm | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 24738f3f13..c33e4187c7 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -614,10 +614,10 @@ interface.") (build-system ant-build-system) (arguments `(#:modules ((guix build ant-build-system) + (guix build java-utils) (guix build utils) (ice-9 ftw) (ice-9 regex) - (srfi srfi-1) (srfi srfi-26)) #:test-target "test" #:phases @@ -641,34 +641,22 @@ interface.") (substitute* "build.xml" (("") "")) #t)) - ;; The javadoc target is not built by default. - (add-after 'build 'build-doc - (lambda _ - (invoke "ant" "javadoc"))) - ;; Needed since no install target is provided. - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((java-dir (string-append (assoc-ref outputs "out") - "/share/java/"))) - ;; Install versioned to avoid collisions. - (install-file (string-append "clojure-" ,version ".jar") - java-dir) - #t))) - ;; Needed since no install-doc target is provided. + (add-after 'build 'build-javadoc ant-build-javadoc) + (replace 'install (install-jars "./")) (add-after 'install 'install-doc (lambda* (#:key outputs #:allow-other-keys) (let ((doc-dir (string-append (assoc-ref outputs "out") "/share/doc/clojure-" ,version "/"))) (copy-recursively "doc/clojure" doc-dir) - (copy-recursively "target/javadoc/" - (string-append doc-dir "javadoc/")) (for-each (cut install-file <> doc-dir) (filter (cut string-match ".*\\.(html|markdown|md|txt)" <>) (scandir "./"))) - #t)))))) + #t))) + (add-after 'install-doc 'install-javadoc + (install-javadoc "target/javadoc/"))))) (native-inputs libraries) (home-page "https://clojure.org/") (synopsis "Lisp dialect running on the JVM") -- cgit v1.2.3 From 53f316ab904196cf20673f34209664b6249cb646 Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Mon, 19 Nov 2018 12:05:19 +0100 Subject: guix: Add clojure-utils. * guix/build/clojure-utils.scm: New file. * gnu/packages/lisp.scm (clojure)[arguments]: Use it. * Makefile.am (MODULES): Add it. --- gnu/packages/lisp.scm | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index c33e4187c7..6b0de63986 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -600,6 +600,7 @@ interface.") (library-names (match libraries (((library-name _) ...) library-name)))) + (package (name "clojure") (version "1.9.0") @@ -613,11 +614,13 @@ interface.") (base32 "0xjbzcw45z32vsn9pifp7ndysjzqswp5ig0jkjpivigh2ckkdzha")))) (build-system ant-build-system) (arguments - `(#:modules ((guix build ant-build-system) + `(#:imported-modules ((guix build clojure-utils) + (guix build guile-build-system) + ,@%ant-build-system-modules) + #:modules ((guix build ant-build-system) + (guix build clojure-utils) (guix build java-utils) (guix build utils) - (ice-9 ftw) - (ice-9 regex) (srfi srfi-26)) #:test-target "test" #:phases @@ -643,18 +646,8 @@ interface.") #t)) (add-after 'build 'build-javadoc ant-build-javadoc) (replace 'install (install-jars "./")) - (add-after 'install 'install-doc - (lambda* (#:key outputs #:allow-other-keys) - (let ((doc-dir (string-append (assoc-ref outputs "out") - "/share/doc/clojure-" - ,version "/"))) - (copy-recursively "doc/clojure" doc-dir) - (for-each (cut install-file <> doc-dir) - (filter (cut string-match - ".*\\.(html|markdown|md|txt)" - <>) - (scandir "./"))) - #t))) + (add-after 'install-license-files 'install-doc + (cut install-doc #:doc-dirs '("doc/clojure/") <...>)) (add-after 'install-doc 'install-javadoc (install-javadoc "target/javadoc/"))))) (native-inputs libraries) -- cgit v1.2.3 From d2a659e5bf05297f67a54b4c46143ed4115a3941 Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Sun, 14 Oct 2018 04:17:14 +0800 Subject: gnu: Add clojure-instaparse. * gnu/packages/lisp.scm (clojure-instaparse): New public variable. --- gnu/packages/lisp.scm | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 6b0de63986..7ed4359271 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -36,6 +36,7 @@ #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system ant) + #:use-module (guix build-system clojure) #:use-module (guix build-system asdf) #:use-module (guix build-system trivial) #:use-module (gnu packages admin) @@ -1607,6 +1608,58 @@ compressor. It works on data produced by @code{parse-js} to generate a ("sbcl-cl-uglify-js" ,sbcl-cl-uglify-js))) (synopsis "JavaScript compressor"))) +(define-public clojure-instaparse + (let ((commit "dcfffad5b065e750f0f5835f017cdd8188b8ca2e") + (version "1.4.9")) ; upstream forget to tag this release + (package + (name "clojure-instaparse") + (version version) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Engelberg/instaparse.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "002mrgin4z3dqy88r1lak7smd0m7x8d22vmliw0m6w6mh5pa17lk")))) + (build-system clojure-build-system) + (arguments + '(#:doc-dirs '("docs/"))) + (synopsis "No grammar left behind") + (description + "Instaparse aims to be the simplest way to build parsers in Clojure. + +@itemize +@item Turns @emph{standard EBNF or ABNF notation} for context-free grammars +into an executable parser that takes a string as an input and produces a parse +tree for that string. + +@item @dfn{No Grammar Left Behind}: Works for @emph{any} context-free grammar, +including @emph{left-recursive}, @emph{right-recursive}, and @emph{ambiguous} +grammars. + +@item Extends the power of context-free grammars with PEG-like syntax for +lookahead and negative lookahead. + +@item Supports both of Clojure's most popular tree formats (hiccup and enlive) +as output targets + +@item Detailed reporting of parse errors. + +@item Optionally produces lazy sequence of all parses (especially useful for +diagnosing and debugging ambiguous grammars). + +@item ``Total parsing'' mode where leftover string is embedded in the parse +tree. + +@item Optional combinator library for building grammars programmatically. + +@item Performant. +@end itemize") + (home-page "https://github.com/Engelberg/instaparse") + (license license:epl1.0)))) + (define-public confusion-mdl (let* ((commit "12a055581fc262225272df43287dae48281900f5")) (package -- cgit v1.2.3 From c784ffa0c46a822cdacda4b480f131276b86c924 Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Sun, 14 Oct 2018 18:08:26 +0800 Subject: gnu: Add clojure-core-match. * gnu/packages/lisp.scm (clojure-core-match): New public variable. --- gnu/packages/lisp.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 7ed4359271..a9ddb3c01b 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1608,6 +1608,33 @@ compressor. It works on data produced by @code{parse-js} to generate a ("sbcl-cl-uglify-js" ,sbcl-cl-uglify-js))) (synopsis "JavaScript compressor"))) +(define-public clojure-core-match + (let ((commit "1837ffbd4a150e8f3953b2d9ed5cf4a4ad3720a7") + (revision "1")) ; this is the 1st commit buildable with clojure 1.9 + (package + (name "clojure-core-match") + (version (git-version "0.3.0-alpha5" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/clojure/core.match.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "04bdlp5dgkrqzrz0lw3mfwmygj2218qnm1cz3dkb9wy4m0238s4d")))) + (build-system clojure-build-system) + (arguments + '(#:source-dirs '("src/main/clojure") + #:test-dirs '("src/test/clojure") + #:doc-dirs '())) + (synopsis "Optimized pattern matching for Clojure") + (description + "An optimized pattern matching library for Clojure. +It supports Clojure 1.5.1 and later as well as ClojureScript.") + (home-page "https://github.com/clojure/core.match") + (license license:epl1.0)))) + (define-public clojure-instaparse (let ((commit "dcfffad5b065e750f0f5835f017cdd8188b8ca2e") (version "1.4.9")) ; upstream forget to tag this release -- cgit v1.2.3 From eea5530c9f3ad9fb749f218015482c011a734696 Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Sun, 14 Oct 2018 19:06:52 +0800 Subject: gnu: Add clojure-algo-generic. * gnu/packages/lisp.scm (clojure-algo-generic): New public variable. --- gnu/packages/lisp.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index a9ddb3c01b..ddd912f957 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1608,6 +1608,30 @@ compressor. It works on data produced by @code{parse-js} to generate a ("sbcl-cl-uglify-js" ,sbcl-cl-uglify-js))) (synopsis "JavaScript compressor"))) +(define-public clojure-algo-generic + (package + (name "clojure-algo-generic") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri + (string-append "https://github.com/clojure/algo.generic/archive" + "/algo.generic-" version ".tar.gz")) + (sha256 + (base32 "12w9681i545gp1af4576z1qbixwps1j13c16fmcc7zsb0bd1zr7w")))) + (build-system clojure-build-system) + (arguments + '(#:source-dirs '("src/main/clojure/") + #:test-dirs '("src/test/clojure/") + #:doc-dirs '())) + (synopsis "Generic versions of common functions") + (description + "Generic versions of commonly used functions, implemented as multimethods +that can be implemented for any data type.") + (home-page "https://github.com/clojure/algo.generic") + (license license:epl1.0))) + (define-public clojure-core-match (let ((commit "1837ffbd4a150e8f3953b2d9ed5cf4a4ad3720a7") (revision "1")) ; this is the 1st commit buildable with clojure 1.9 -- cgit v1.2.3 From 2cab1d4a7d0aa3d4d3d10d745d4bb8762f93f90b Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Sun, 14 Oct 2018 19:37:40 +0800 Subject: gnu: Add clojure-tools-macro. * gnu/packages/lisp.scm (clojure-tools-macro): New public variable. --- gnu/packages/lisp.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index ddd912f957..3d0fce4e7a 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1711,6 +1711,28 @@ tree. (home-page "https://github.com/Engelberg/instaparse") (license license:epl1.0)))) +(define-public clojure-tools-macro + (package + (name "clojure-tools-macro") + (version "0.1.5") + (source + (origin + (method url-fetch) + (uri + (string-append "https://github.com/clojure/tools.macro/archive" + "/tools.macro-" version ".tar.gz")) + (sha256 + (base32 "0fs64a0g63xx6g7sj6vrsqknhl90s0isf6k053nw8vv5prfzc7v6")))) + (build-system clojure-build-system) + (arguments + '(#:source-dirs '("src/main/clojure/") + #:test-dirs '("src/test/clojure/") + #:doc-dirs '())) + (synopsis "Utilities for macro writers") + (description "Tools for writing macros.") + (home-page "https://github.com/clojure/tools.macro") + (license license:epl1.0))) + (define-public confusion-mdl (let* ((commit "12a055581fc262225272df43287dae48281900f5")) (package -- cgit v1.2.3 From 5497214d80b5c2569e0cd72fd9c702c01d231152 Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Sun, 14 Oct 2018 20:15:02 +0800 Subject: gnu: Add clojure-algo-monads. * gnu/packages/lisp.scm (clojure-algo-monads): New public variable. --- gnu/packages/lisp.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 3d0fce4e7a..6849cdd2bf 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1632,6 +1632,33 @@ that can be implemented for any data type.") (home-page "https://github.com/clojure/algo.generic") (license license:epl1.0))) +(define-public clojure-algo-monads + (package + (name "clojure-algo-monads") + (version "0.1.6") + (source + (origin + (method url-fetch) + (uri + (string-append "https://github.com/clojure/algo.monads/archive" + "/algo.monads-" version ".tar.gz")) + (sha256 + (base32 "14gbvfgmrda990h45yn7zag83vp1kdkz4f4yzmyvkr0sjihlgdmq")))) + (build-system clojure-build-system) + (arguments + '(#:source-dirs '("src/main/clojure/") + #:test-dirs '("src/test/clojure/") + #:doc-dirs '())) + (native-inputs + `(("clojure-tools-macro" ,clojure-tools-macro))) + (synopsis + "Monad Macros and Definitions") + (description + "This library contains the most commonly used monads as well as macros for +defining and using monads and useful monadic functions.") + (home-page "https://github.com/clojure/algo.monads") + (license license:epl1.0))) + (define-public clojure-core-match (let ((commit "1837ffbd4a150e8f3953b2d9ed5cf4a4ad3720a7") (revision "1")) ; this is the 1st commit buildable with clojure 1.9 -- cgit v1.2.3 From 4535a7b0f5912fee5ff38f8ec41e83fe9f2b35e9 Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Mon, 19 Nov 2018 16:33:35 +0100 Subject: gnu: r-genomeinfodb: Update to 1.18.1. * gnu/packages/bioinformatics.scm (r-genomeinfodb): Update to 1.18.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index dc36cedb0c..89d9c4168f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7372,13 +7372,13 @@ ID and species. It is used by functions in the GenomeInfoDb package.") (define-public r-genomeinfodb (package (name "r-genomeinfodb") - (version "1.18.0") + (version "1.18.1") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomeInfoDb" version)) (sha256 (base32 - "1xqpgngd8by0yn627v9kz26a03v5a1lhcfwlnx2i0ivplk9bd40s")))) + "049pyzr8iszv3g7wdqf3pz7vg7bzd450c20ln6fgw4g5xnkkr10s")))) (properties `((upstream-name . "GenomeInfoDb"))) (build-system r-build-system) -- cgit v1.2.3 From e0388191381a6882e00394100b41b6ee14745d60 Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Mon, 19 Nov 2018 16:46:00 +0100 Subject: gnu: r-msnbase: Update to 2.8.1. * gnu/packages/bioinformatics.scm (r-msnbase): Update to 2.8.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 89d9c4168f..f07c01be46 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9740,14 +9740,14 @@ structure (pcaRes) to provide a common interface to the PCA results.") (define-public r-msnbase (package (name "r-msnbase") - (version "2.8.0") + (version "2.8.1") (source (origin (method url-fetch) (uri (bioconductor-uri "MSnbase" version)) (sha256 (base32 - "0nnlydpklmv9kwlk3gkjgabx7l6y4gav3imq98w8wskb1fhm50c0")))) + "0y658anh06vnvbkfs7r8q40gqgyqr2r8kj7jlpnp33fy1lvp1nv7")))) (properties `((upstream-name . "MSnbase"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From c2e26dc15650a4326f54b91f5846467be4cfe088 Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Mon, 19 Nov 2018 16:46:32 +0100 Subject: gnu: r-ensembldb: Update to 2.6.2. * gnu/packages/bioinformatics.scm (r-ensembldb): Update to 2.6.2. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index f07c01be46..782af294e0 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10215,14 +10215,14 @@ originally made available by Holmes, Harris, and Quince, 2012, PLoS ONE 7(2): (define-public r-ensembldb (package (name "r-ensembldb") - (version "2.6.1") + (version "2.6.2") (source (origin (method url-fetch) (uri (bioconductor-uri "ensembldb" version)) (sha256 (base32 - "1js05dcv1dj4g2vj7lzlg0rgjcjlk2irdr9rxqpwxmivm8nbvf36")))) + "0hdz1f34v7sas2v4225icwl3wd4sf17ykpd5dkbx1hc7wcy4w3np")))) (build-system r-build-system) (propagated-inputs `(("r-annotationdbi" ,r-annotationdbi) -- cgit v1.2.3 From e21659c70bf06c138f936270f9dd693d3e95f9af Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Mon, 19 Nov 2018 17:16:35 +0100 Subject: gnu: r-dimred: Update to 0.2.2. * gnu/packages/cran.scm (r-dimred): Update to 0.2.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6ce9bdd16f..150b3ea90a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1593,14 +1593,14 @@ the Kaplan-Meier and Aalen-Johansen methods.") (define-public r-dimred (package (name "r-dimred") - (version "0.1.0") + (version "0.2.2") (source (origin (method url-fetch) (uri (cran-uri "dimRed" version)) (sha256 (base32 - "0fasca5fsbrxdwv30hch7vb9snb844l7l8p5fjf239dq45xfy37v")))) + "0ssy2qriiy6zdawriqcbl67qiq68ipml3frq7aqlq70r2fqyyw48")))) (properties `((upstream-name . "dimRed"))) (build-system r-build-system) (propagated-inputs `(("r-drr" ,r-drr))) -- cgit v1.2.3 From e396b378220624254a55ec0b2869e68b23a6c9d4 Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Mon, 19 Nov 2018 17:17:03 +0100 Subject: gnu: r-recipes: Update to 0.1.4. * gnu/packages/cran.scm (r-recipes): Update to 0.1.4. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 150b3ea90a..87b9ee29f1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1864,14 +1864,14 @@ provides a one-row summary of model-level statistics.") (define-public r-recipes (package (name "r-recipes") - (version "0.1.3") + (version "0.1.4") (source (origin (method url-fetch) (uri (cran-uri "recipes" version)) (sha256 (base32 - "1vqh3pxs4n1azhnd1lzg91vasya6g323kllhbrw177j7kdxqyimy")))) + "0bwijw4427v2k5z3qci2kyr5dyzql8b3lvf88rwy16p741jckjsn")))) (build-system r-build-system) (propagated-inputs `(("r-broom" ,r-broom) -- cgit v1.2.3 From 1659c5dd27578e7be0d923fc4dde032ff043adab Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Mon, 19 Nov 2018 17:17:25 +0100 Subject: gnu: r-ggpubr: Update to 0.2. * gnu/packages/cran.scm (r-ggpubr): Update to 0.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 87b9ee29f1..dccc23d1f0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4450,14 +4450,14 @@ and adds the annotation to the plot.") (define-public r-ggpubr (package (name "r-ggpubr") - (version "0.1.9") + (version "0.2") (source (origin (method url-fetch) (uri (cran-uri "ggpubr" version)) (sha256 (base32 - "0rvfgii2gxarra7d33n6c63ky0mivxxyx35acsrn94xkbd8mbcsj")))) + "0rkpcjb1x7lvhj68aam5airbi534jqyiq12x5xk40a25iifhghq6")))) (build-system r-build-system) (propagated-inputs `(("r-cowplot" ,r-cowplot) -- cgit v1.2.3 From fba7dbe76c5d8c111b9d76ebea873c0d514c1aed Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Mon, 19 Nov 2018 17:17:54 +0100 Subject: gnu: r-sjstats: Update to 0.17.2. * gnu/packages/cran.scm (r-sjstats): Update to 0.17.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index dccc23d1f0..22305b9cfd 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6725,14 +6725,14 @@ detection, parallelism through BLAS and parallel user templates.") (define-public r-sjstats (package (name "r-sjstats") - (version "0.17.1") + (version "0.17.2") (source (origin (method url-fetch) (uri (cran-uri "sjstats" version)) (sha256 (base32 - "0s9b0xr8gmcm0kh48jkwk8ns0lqknd8kpys4f7czf0xwzmcx2n1z")))) + "0c7g35vn7r9rylhp0gj1yfslg7jybwrhpqpp7vdcd90xfccih24r")))) (build-system r-build-system) (propagated-inputs `(("r-bayesplot" ,r-bayesplot) -- cgit v1.2.3 From 278e0f65064dcf7f8c029c94b143429e7f787135 Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Mon, 19 Nov 2018 17:18:19 +0100 Subject: gnu: r-ggeffects: Update to 0.7.0. * gnu/packages/cran.scm (r-ggeffects): Update to 0.7.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 22305b9cfd..2b9629058d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6803,14 +6803,14 @@ differentiation.") (define-public r-ggeffects (package (name "r-ggeffects") - (version "0.6.0") + (version "0.7.0") (source (origin (method url-fetch) (uri (cran-uri "ggeffects" version)) (sha256 (base32 - "00l02g7yssqxmcmbrzk2wsj3i9ywd0xsy0rmbfh57q1qi76a1wq1")))) + "070c3fxmzajq2fy816s5pfqdyjlnzkabj97z7fcsva4h5rnqi9d6")))) (build-system r-build-system) (propagated-inputs `(("r-crayon" ,r-crayon) -- cgit v1.2.3 From 749872a5ed6b5ad20b64799c00ea8c13433366c1 Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Mon, 19 Nov 2018 17:18:41 +0100 Subject: gnu: r-biocmanager: Update to 1.30.4. * gnu/packages/cran.scm (r-biocmanager): Update to 1.30.4. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2b9629058d..f08a204fb8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7499,14 +7499,14 @@ netCDF files.") (define-public r-biocmanager (package (name "r-biocmanager") - (version "1.30.3") + (version "1.30.4") (source (origin (method url-fetch) (uri (cran-uri "BiocManager" version)) (sha256 (base32 - "0mfvx1xzsgiag9p42kdyqg8fvajyakrdy3z2smhdlaawzbi0qmax")))) + "0kxs76pixk1d2lpvkyrq6nnvv1rqf55ph5f7igkadyyqirf3y2ah")))) (properties `((upstream-name . "BiocManager"))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/BiocManager/") -- cgit v1.2.3 From 185663e568994b14700af00fc6e6ae56f5265549 Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Mon, 19 Nov 2018 17:19:15 +0100 Subject: gnu: r-openssl: Update to 1.1. * gnu/packages/statistics.scm (r-openssl): Update to 1.1. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 0020dd02d0..9ed01b5b6d 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2300,14 +2300,14 @@ collation, and NAMESPACE files.") (define-public r-openssl (package (name "r-openssl") - (version "1.0.2") + (version "1.1") (source (origin (method url-fetch) (uri (cran-uri "openssl" version)) (sha256 (base32 - "1djfpnphkcxx8idk5rjfzg8r8dnqsgc0shh2pw8lns5hap2wc5rc")))) + "0ldxgcr33lawwr8wp14kdk2678gpkvqkzv6g333bhck1hn6qspzv")))) (build-system r-build-system) (inputs `(("libressl" ,libressl))) -- cgit v1.2.3 From 0adf04a2d3bb986fb2c15c283e99e3cb1d264a3c Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Mon, 19 Nov 2018 17:19:44 +0100 Subject: gnu: r-mclust: Update to 5.4.2. * gnu/packages/statistics.scm (r-mclust): Update to 5.4.2. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 9ed01b5b6d..2e75981de3 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4706,14 +4706,14 @@ models, generalized linear models and model-based clustering.") (define-public r-mclust (package (name "r-mclust") - (version "5.4.1") + (version "5.4.2") (source (origin (method url-fetch) (uri (cran-uri "mclust" version)) (sha256 (base32 - "1vcl4nl8by2vj2k9k84imy5m850khkgd8q02a8ica1h8vz9ijgn4")))) + "09152swfpa3fzhmrq5cwb5kxgvrxvigv1m4v6rhcibrdhfd1x8x4")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) -- cgit v1.2.3 From 4db71841ee3f3423a9174bcfcd23464eb17dc4e6 Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Mon, 19 Nov 2018 17:20:05 +0100 Subject: gnu: r-shinyfiles: Update to 0.7.2. * gnu/packages/web.scm (r-shinyfiles): Update to 0.7.2. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 03deab422d..73219c864f 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5645,14 +5645,14 @@ application framework for R, making it easy to create attractive dashboards.") (define-public r-shinyfiles (package (name "r-shinyfiles") - (version "0.7.1") + (version "0.7.2") (source (origin (method url-fetch) (uri (cran-uri "shinyFiles" version)) (sha256 (base32 - "1cbg09l7w2zbgxb4qjm9p873p0lzrihlzsk5xxi3cpxdckn6zsrm")))) + "0dlcjrw96x72grg6j915070x8x98l7629pn86gf148iknflm7gd5")))) (properties `((upstream-name . "shinyFiles"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 887437ee0e817fc1d464c79c9a95c2915b6ff7a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 19 Nov 2018 22:18:31 +0100 Subject: gnu: git-when-merged: Fix license. Reported by Mark H Weaver . * gnu/packages/version-control.scm (git-when-merged)[license]: Change to GPL2+. --- gnu/packages/version-control.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index fd90513000..e0ad6248a5 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -2330,4 +2330,4 @@ used to keep a folder in sync between computers.") @code{when-merged}, whose core operation is to find the merge that brought a given commit into the specified ref(s). It has various options that control how information about the merge is displayed.") - (license license:gpl2)))) + (license license:gpl2+)))) -- cgit v1.2.3 From c3276dbecb2bb40a4afb3a5e2f3b3ee477a93775 Mon Sep 17 00:00:00 2001 From: Thorsten Wilms Date: Sat, 10 Nov 2018 21:22:28 +0100 Subject: gnu: Add autotalent. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/audio.scm (autotalent): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/audio.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index d74f50fac5..1f83c49f4d 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -428,6 +428,46 @@ and editing digital audio. It features digital effects and spectrum analysis tools.") (license license:gpl2+))) +(define-public autotalent + (package + (name "autotalent") + (version "0.2") + (source (origin + (method url-fetch) + (uri (string-append "http://tombaran.info/autotalent-" + version ".tar.gz")) + (sha256 + (base32 + "1n04qm66f14195ly6gsy3ra7v2j7zad5n19d8dwfmh0qs6h9hphh")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no check target + #:phases + (modify-phases %standard-phases + ;; no configure script + (delete 'configure) + (add-before 'install 'prepare-target-directory + (lambda* (#:key outputs #:allow-other-keys) + (mkdir-p (string-append (assoc-ref outputs "out") "/lib/ladspa")) + #t)) + (add-after 'unpack 'override-target-directory + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "Makefile" + (("/usr/lib64/ladspa") + (string-append (assoc-ref outputs "out") "/lib/ladspa"))) + #t))))) + (inputs + `(("ladspa" ,ladspa))) + (home-page "http://tombaran.info/autotalent.html") + (synopsis "Pitch-correction LADSPA audio plugin") + (description + "Autotalent is a LADSPA plugin for real-time pitch-correction. Among its +controls are allowable notes, strength of correction, LFO for vibrato and +formant warp.") + ;; All code except the FFT routine is licensed under GPLv2+. + ;; The FFT routine is under BSD-3. + (license (list license:gpl2+)))) + (define-public azr3 (package (name "azr3") -- cgit v1.2.3 From cc661cb348818da41e7f6ef3dc86bbb66f1e14a1 Mon Sep 17 00:00:00 2001 From: Pkill -9 Date: Mon, 12 Nov 2018 03:14:15 +0000 Subject: gnu: xonotic: Symlink to xonotic data instead of copying into xonotic. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/games.scm (xonotic)[arguments]: Modify the phase 'install-data so it creates a symlink to xonotic's data instead of copying it into the xonotic package. Signed-off-by: Ludovic Courtès --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 3679aa09c6..bc5d3d581b 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5606,8 +5606,8 @@ quotation from a collection of quotes.") (lambda* (#:key outputs inputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (data (assoc-ref inputs "xonotic-data"))) - (copy-recursively (string-append data "/share/xonotic") - (string-append out "/share/xonotic")) + (symlink (string-append data "/share/xonotic") + (string-append out "/share/xonotic")) #t))) (add-after 'install-binaries 'wrap-binaries (lambda* (#:key outputs inputs #:allow-other-keys) -- cgit v1.2.3 From fb525bfd83ac1721e138420a01e7075c25b137c4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 17 Nov 2018 21:18:43 +0100 Subject: gnu: z3: Fetch source using git. * gnu/packages/maths.scm (z3)[source]: Change to GIT-FETCH. --- gnu/packages/maths.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 82abc22994..22451c3da1 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3947,14 +3947,14 @@ as equations, scalars, vectors, and matrices.") (package (name "z3") (version "4.5.0") + (home-page "https://github.com/Z3Prover/z3") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/Z3Prover/z3/archive/z3-" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference (url home-page) + (commit (string-append "z3-" version)))) (sha256 (base32 - "032a5lvji2liwmc25jv52bdrhimqflvqbpg77ccaq1jykhiivbmf")))) + "0ssp190ksak93hiz61z90x6hy9hcw1ywp8b2dzmbhn6fbd4bnxzp")))) (build-system cmake-build-system) (arguments `(#:configure-flags @@ -3983,7 +3983,6 @@ as equations, scalars, vectors, and matrices.") (synopsis "Theorem prover") (description "Z3 is a theorem prover and @dfn{satisfiability modulo theories} (SMT) solver. It provides a C/C++ API, as well as Python bindings.") - (home-page "https://github.com/Z3Prover/z3") (license license:expat))) (define-public cubicle -- cgit v1.2.3 From 4a4f3e771b74601b0696a25ef8d82dd1081caea9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 17 Nov 2018 21:20:27 +0100 Subject: gnu: z3: Update to 4.8.1. * gnu/packages/maths.scm (z3): Update to 4.8.1. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 22451c3da1..cc4635b4a9 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3946,7 +3946,7 @@ as equations, scalars, vectors, and matrices.") (define-public z3 (package (name "z3") - (version "4.5.0") + (version "4.8.1") (home-page "https://github.com/Z3Prover/z3") (source (origin (method git-fetch) @@ -3954,7 +3954,7 @@ as equations, scalars, vectors, and matrices.") (commit (string-append "z3-" version)))) (sha256 (base32 - "0ssp190ksak93hiz61z90x6hy9hcw1ywp8b2dzmbhn6fbd4bnxzp")))) + "1vr57bwx40sd5riijyrhy70i2wnv9xrdihf6y5zdz56yq88rl48f")))) (build-system cmake-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 89d88b8530d1cdaa6be785a289aed65ba087d546 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 18 Nov 2018 03:14:01 +0100 Subject: gnu: python-natsort: Update to 5.4.1. * gnu/packages/python.scm (python-natsort): Update to 5.4.1. [arguments]: Add #:modules. Replace 'check' phase with custom pytest invokation. [native-inputs]: Remove PYTHON-PYTEST-CACHE, PYTHON-PYTEST-FLAKES and PYTHON-PYTEST-PEP8. Add PYTHON-PYTEST and PYTHON-PYTEST-MOCK. (python2-natsort)[native-inputs]: Remove PYTHON2-ENUM34 and PYTHON2-MOCK. --- gnu/packages/python.scm | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 2b7482a3ec..463a325a0b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -10193,26 +10193,41 @@ Python to manipulate OpenDocument 1.2 files.") (define-public python-natsort (package (name "python-natsort") - (version "5.0.2") + (version "5.4.1") (source (origin (method url-fetch) (uri (pypi-uri "natsort" version)) (sha256 (base32 - "0bh6j0l8iapjnsgg3bs6q075cnzjl6zw1vlgqyv3qrygm2cxypkn")))) + "0i732amg6yzkx4g4c9j09jmqq39q377x9cl2nbkm5hax2c2v0wxf")))) (build-system python-build-system) (arguments - `(#:phases + `(#:modules ((guix build utils) + (guix build python-build-system) + (srfi srfi-1) + (srfi srfi-26) + (ice-9 ftw)) + #:phases (modify-phases %standard-phases (add-before 'check 'set-cachedir ;; Tests require write access to $HOME by default - (lambda _ (setenv "PYTHON_EGG_CACHE" "/tmp") #t))))) + (lambda _ (setenv "PYTHON_EGG_CACHE" "/tmp") #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"))) + (invoke "pytest" "-v"))))))) (native-inputs `(("python-hypothesis" ,python-hypothesis) - ("python-pytest-cache" ,python-pytest-cache) ("python-pytest-cov" ,python-pytest-cov) - ("python-pytest-flakes" ,python-pytest-flakes) - ("python-pytest-pep8" ,python-pytest-pep8))) + ("python-pytest-mock" ,python-pytest-mock) + ("python-pytest" ,python-pytest))) (propagated-inputs ; TODO: Add python-fastnumbers. `(("python-pyicu" ,python-pyicu))) (home-page "https://github.com/SethMMorton/natsort") @@ -10234,8 +10249,6 @@ functionality in the command line.") (package (inherit base) (native-inputs `(("python2-pathlib" ,python2-pathlib) - ("python2-mock" ,python2-mock) - ("python2-enum34" ,python2-enum34) ,@(package-native-inputs base)))))) (define-public python-glances -- cgit v1.2.3 From ff43d95807887030cd1d3538da614545116dfe25 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 18 Nov 2018 03:26:36 +0100 Subject: gnu: python-joblib: Update to 0.13.0. * gnu/packages/python.scm (python-joblib): Update to 0.13.0. [source](snippet): Remove. [arguments]: Remove 'disable-failing-tests' phase. Add custom check phase. [native-inputs]: Remove PYTHON-NOSE, PYTHON-SPHINX, PYTHON-DOCUTILS and PYTHON-NUMPYDOC. Add PYTHON-PYTEST. --- gnu/packages/python.scm | 36 +++++------------------------------- 1 file changed, 5 insertions(+), 31 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 463a325a0b..c7ec7915c9 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2401,47 +2401,21 @@ logic-free templating system Mustache.") (define-public python-joblib (package (name "python-joblib") - (version "0.10.3") + (version "0.13.0") (source (origin (method url-fetch) (uri (pypi-uri "joblib" version)) (sha256 (base32 - "0787k919zlfmgymprz5bzv0v1df5bbirlf3awrghmjgvkrd9dci9")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Remove pre-compiled .pyc files from source. - (for-each delete-file-recursively - (find-files "." "__pycache__" #:directories? #t)) - (for-each delete-file (find-files "." "\\.pyc$")) - #t)))) + "0612nazad8dxmn3xghfrmjax6456l4xy6hn9cngs7vydi14ds7v5")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-before 'check 'disable-failing-tests - (lambda _ - ;; This numpydoc tests fails for unknown reasons - (delete-file "doc/sphinxext/numpydoc/tests/test_docscrape.py") - ;; This numpydoc test depends on matplotlib, which is not a - ;; required input. - (delete-file "doc/sphinxext/numpydoc/tests/test_plot_directive.py") - ;; These tests fail to execute sys.executable - (substitute* "joblib/test/test_parallel.py" - (("import nose" line) - (string-append "from nose.plugins.skip import SkipTest\n" line)) - (("def test_nested_parallel_warnings" line) - (string-append "@SkipTest\n" line)) - (("def test_parallel_with_interactively_defined_functions" line) - (string-append "@SkipTest\n" line))) - #t))))) - ;; Provide nose to enable tests command + (replace 'check + (lambda _ (invoke "pytest" "-v" "joblib")))))) (native-inputs - `(("python-nose" ,python-nose) - ("python-sphinx" ,python-sphinx) - ("python-docutils" ,python-docutils) - ("python-numpydoc" ,python-numpydoc))) + `(("python-pytest" ,python-pytest))) (home-page "http://pythonhosted.org/joblib/") (synopsis "Using Python functions as pipeline jobs") (description -- cgit v1.2.3 From 352401efb80f036177ed8de026748bd981a76574 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 18 Nov 2018 03:30:23 +0100 Subject: gnu: python-joblib: Update home page. * gnu/packages/python.scm (python-joblib)[home-page]: Update to current. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c7ec7915c9..4ae97078e6 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2416,7 +2416,7 @@ logic-free templating system Mustache.") (lambda _ (invoke "pytest" "-v" "joblib")))))) (native-inputs `(("python-pytest" ,python-pytest))) - (home-page "http://pythonhosted.org/joblib/") + (home-page "https://joblib.readthedocs.io/") (synopsis "Using Python functions as pipeline jobs") (description "Joblib is a set of tools to provide lightweight pipelining in Python. -- cgit v1.2.3 From 7882cc55bcc262ebd7122f662677a81ed22175db Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 19 Nov 2018 20:25:26 +0100 Subject: gnu: fluidsynth: Update to 2.0.2. * gnu/packages/audio.scm (fluidsynth): Update to 2.0.2. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 1f83c49f4d..d8a3c3c455 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1126,7 +1126,7 @@ follower.") (define-public fluidsynth (package (name "fluidsynth") - (version "2.0.1") + (version "2.0.2") (source (origin (method git-fetch) (uri (git-reference @@ -1135,7 +1135,7 @@ follower.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1mqyym5qkh8xd1rqj3yhfxbw5dxjcrljb6nkfqzvcarlv4h6rjn7")))) + "02vs5sfsyh1dl7wlcvgs4w3x0qcmsl7vi000qgp99ynwh3wjb274")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; no check target -- cgit v1.2.3 From 30f0feff1964aea0524747b50180d021591956f6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 19 Nov 2018 20:25:45 +0100 Subject: gnu: libwebp: Update to 1.0.1. * gnu/packages/image.scm (libwebp): Update to 1.0.1. --- gnu/packages/image.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 9bf9bd7e5e..e88609a7ca 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -919,7 +919,7 @@ language bindings to VIGRA.") (define-public libwebp (package (name "libwebp") - (version "1.0.0") + (version "1.0.1") (source (origin ;; No tarballs are provided for >0.6.1. @@ -930,7 +930,7 @@ language bindings to VIGRA.") (file-name (git-file-name name version)) (sha256 (base32 - "1w8jzdbr1s4238ygyrlxryycss3f2z6d9amxdq8m82nl3l6skar4")))) + "09l4pq4k2acglkmwr96arn79rssl54sv7vrdrgsxqlg7v8c882zh")))) (build-system gnu-build-system) (inputs `(("freeglut" ,freeglut) -- cgit v1.2.3 From 9acfe275adf1bc27483ba58c6d86a84ba20aa08f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 20 Nov 2018 01:11:26 +0100 Subject: gnu: Add missing patch to local.mk. This line was removed by accident in 0a41123f01d5d2466d6f533be3644ac8c9a2bdf9. * gnu/local.mk (dist_patch_DATA): Add "clang-3.5-libc-search-path.patch". --- gnu/local.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 7073416633..d2f085eaa5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -617,6 +617,7 @@ dist_patch_DATA = \ %D%/packages/patches/chmlib-inttypes.patch \ %D%/packages/patches/clamav-config-llvm-libs.patch \ %D%/packages/patches/clamav-system-tomsfastmath.patch \ + %D%/packages/patches/clang-3.5-libc-search-path.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 \ -- cgit v1.2.3 From 5e369f8ab9e230193194b4d5846a5c78bbc89943 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 12 Nov 2018 15:55:05 +0200 Subject: gnu: Add pinentry-efl. * gnu/packages/gnupg.scm (pinentry-efl): New variable. * gnu/packages/patches/pinentry-efl.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/gnupg.scm | 30 ++ gnu/packages/patches/pinentry-efl.patch | 798 ++++++++++++++++++++++++++++++++ 3 files changed, 829 insertions(+) create mode 100644 gnu/packages/patches/pinentry-efl.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index d2f085eaa5..7fc8fb0620 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1045,6 +1045,7 @@ dist_patch_DATA = \ %D%/packages/patches/pinball-missing-separators.patch \ %D%/packages/patches/pinball-src-deps.patch \ %D%/packages/patches/pinball-system-ltdl.patch \ + %D%/packages/patches/pinentry-efl.patch \ %D%/packages/patches/pingus-sdl-libs-config.patch \ %D%/packages/patches/pius.patch \ %D%/packages/patches/pixman-CVE-2016-5296.patch \ diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index a9169b25af..46ca812a13 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -40,6 +40,8 @@ #:use-module (gnu packages curl) #:use-module (gnu packages crypto) #:use-module (gnu packages emacs) + #:use-module (gnu packages enlightenment) + #:use-module (gnu packages gettext) #:use-module (gnu packages guile) #:use-module (gnu packages openldap) #:use-module (gnu packages perl) @@ -863,6 +865,34 @@ software."))) "Pinentry provides a console and a Qt GUI that allows users to enter a passphrase when @code{gpg} is run and needs it."))) +(define-public pinentry-efl + (package + (inherit pinentry-tty) + (name "pinentry-efl") + (source + (origin + (inherit (package-source pinentry-tty)) + (patches (search-patches "pinentry-efl.patch")))) + (arguments + '(#:configure-flags '("--enable-pinentry-efl") + #:phases + (modify-phases %standard-phases + (replace 'bootstrap + (lambda _ + (invoke "sh" "autogen.sh")))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("gettext" ,gettext-minimal) + ,@(package-native-inputs pinentry-tty))) + (inputs + `(("efl" ,efl) + ,@(package-inputs pinentry-tty))) + (description + "Pinentry provides a console and a graphical interface for the +@dfn{Enlightenment Foundation Libraries} (EFL) that allows users to enter a +passphrase when @code{gpg} is run and needs it."))) + (define-public pinentry (package (inherit pinentry-gtk2) (name "pinentry"))) diff --git a/gnu/packages/patches/pinentry-efl.patch b/gnu/packages/patches/pinentry-efl.patch new file mode 100644 index 0000000000..5ba79e28df --- /dev/null +++ b/gnu/packages/patches/pinentry-efl.patch @@ -0,0 +1,798 @@ +https://git.gnupg.org/cgi-bin/gitweb.cgi?p=pinentry.git;a=commit;h=948105b7a34ec9a9e5479d376b7c86bafee50a01 +This patch can be removed with the next release of pinentry. + +From 948105b7a34ec9a9e5479d376b7c86bafee50a01 Mon Sep 17 00:00:00 2001 +From: "William L. Thomson Jr" +Date: Tue, 29 May 2018 22:50:47 +0100 +Subject: [PATCH] efl: Add an EFL-based pinentry. + +* NEWS: Update. +* Makefile.am: Add new efl subdirectory. +* configure.ac: Add --enable-pinentry-efl option. +* efl/Makefile.am: New file. +* efl/pinentry-efl.c: New file. + +Signed-off-by: Damien Goutte-Gattat +--- + Makefile.am | 8 +- + configure.ac | 44 +++- + efl/Makefile.am | 38 ++++ + efl/pinentry-efl.c | 623 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 6 files changed, 716 insertions(+), 2 deletions(-) + create mode 100644 efl/Makefile.am + create mode 100644 efl/pinentry-efl.c + +diff --git a/Makefile.am b/Makefile.am +index 8c8b8e5..b8fd0e1 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -82,10 +82,16 @@ else + pinentry_fltk = + endif + ++if BUILD_PINENTRY_EFL ++pinentry_efl = efl ++else ++pinentry_efl = ++endif ++ + SUBDIRS = m4 secmem pinentry ${pinentry_curses} ${pinentry_tty} \ + ${pinentry_emacs} ${pinentry_gtk_2} ${pinentry_gnome_3} \ + ${pinentry_qt} ${pinentry_tqt} ${pinentry_w32} \ +- ${pinentry_fltk} doc ++ ${pinentry_fltk} ${pinentry_efl} doc + + + install-exec-local: +diff --git a/configure.ac b/configure.ac +index ff6c2e0..e305e44 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -419,6 +419,42 @@ fi + + + dnl ++dnl Check for EFL pinentry programs. ++dnl ++AC_ARG_ENABLE(pinentry-efl, ++ AC_HELP_STRING([--enable-pinentry-efl], [build EFL pinentry]), ++ pinentry_efl=$enableval, pinentry_efl=maybe) ++ ++dnl check for pkg-config ++if test "$pinentry_efl" != "no"; then ++ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) ++ if test x"${PKG_CONFIG}" = xno ; then ++ pinentry_efl=no ++ fi ++fi ++ ++if test "$pinentry_efl" != "no"; then ++ AC_MSG_CHECKING([for efl]) ++ "${PKG_CONFIG}" --exists 'elementary >= 1.18' ++ if test $? -ne 0 ; then ++ AC_MSG_RESULT([no]) ++ AC_MSG_WARN([efl >= 1.18 is required for efl pinentry]) ++ pinentry_efl=no ++ else ++ AC_MSG_RESULT([yes]) ++ EFL_CFLAGS=`"${PKG_CONFIG}" --cflags ecore-x elementary` ++ EFL_LIBS=`"${PKG_CONFIG}" --libs ecore-x elementary` ++ AC_SUBST(EFL_CFLAGS) ++ AC_SUBST(EFL_LIBS) ++ if test "$pinentry_efl" != "no" ++ then ++ pinentry_efl=yes ++ fi ++ fi ++fi ++AM_CONDITIONAL(BUILD_PINENTRY_EFL, test "$pinentry_efl" = "yes") ++ ++dnl + dnl Check for GTK+-2 / GNOME3 pinentry programs. + dnl + AC_ARG_ENABLE(pinentry-gtk2, +@@ -645,7 +681,11 @@ else + if test "$pinentry_tqt" = "yes"; then + PINENTRY_DEFAULT=pinentry-tqt + else +- AC_MSG_ERROR([[No pinentry enabled.]]) ++ if test "$pinentry_efl" = "yes"; then ++ PINENTRY_DEFAULT=pinentry-efl ++ else ++ AC_MSG_ERROR([[No pinentry enabled.]]) ++ fi + fi + fi + fi +@@ -721,6 +761,7 @@ secmem/Makefile + pinentry/Makefile + curses/Makefile + tty/Makefile ++efl/Makefile + emacs/Makefile + gtk+-2/Makefile + gnome3/Makefile +@@ -744,6 +785,7 @@ AC_MSG_NOTICE([ + Curses Pinentry ..: $pinentry_curses + TTY Pinentry .....: $pinentry_tty + Emacs Pinentry ...: $pinentry_emacs ++ EFL Pinentry .....: $pinentry_efl + GTK+-2 Pinentry ..: $pinentry_gtk_2 + GNOME 3 Pinentry .: $pinentry_gnome_3 + Qt Pinentry ......: $pinentry_qt $pinentry_qt_lib_version +diff --git a/efl/Makefile.am b/efl/Makefile.am +new file mode 100644 +index 0000000..b986a04 +--- /dev/null ++++ b/efl/Makefile.am +@@ -0,0 +1,38 @@ ++# Makefile.am - PIN entry EFL frontend. ++# Copyright (C) 2017 Obsidian-Studios, Inc. ++# Author William L. Thomson Jr. ++# ++# This file is part of PINENTRY. ++# ++# PINENTRY is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# PINENTRY is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA ++ ++## Process this file with automake to produce Makefile.in ++ ++bin_PROGRAMS = pinentry-efl ++ ++if FALLBACK_CURSES ++ncurses_include = $(NCURSES_INCLUDE) ++libcurses = ../pinentry/libpinentry-curses.a $(LIBCURSES) $(LIBICONV) ++else ++ncurses_include = ++libcurses = ++endif ++ ++AM_CPPFLAGS = $(COMMON_CFLAGS) $(EFL_CFLAGS) $(ncurses_include) \ ++ -I$(top_srcdir)/secmem -I$(top_srcdir)/pinentry ++LDADD = ../pinentry/libpinentry.a ../secmem/libsecmem.a \ ++ $(COMMON_LIBS) $(LIBCAP) $(EFL_LIBS) $(libcurses) ++ ++pinentry_efl_SOURCES = pinentry-efl.c +diff --git a/efl/pinentry-efl.c b/efl/pinentry-efl.c +new file mode 100644 +index 0000000..ca99693 +--- /dev/null ++++ b/efl/pinentry-efl.c +@@ -0,0 +1,623 @@ ++/* pinentry-efl.c ++ Copyright (C) 2017 Obsidian-Studios, Inc. ++ Author William L. Thomson Jr. ++ ++ Based on pinentry-gtk2.c ++ Copyright (C) 1999 Robert Bihlmeyer ++ Copyright (C) 2001, 2002, 2007, 2015 g10 Code GmbH ++ Copyright (C) 2004 by Albrecht Dreß ++ ++ pinentry-efl is a pinentry application for the EFL widget set. ++ It tries to follow the Gnome Human Interface Guide as close as ++ possible. ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 2 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ */ ++ ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++#include ++#include ++#include ++#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7) ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wstrict-prototypes" ++#endif ++#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7) ++#pragma GCC diagnostic pop ++#endif ++ ++#ifdef HAVE_GETOPT_H ++#include ++#else ++#include "getopt.h" ++#endif /* HAVE_GETOPT_H */ ++ ++#include "pinentry.h" ++ ++#ifdef FALLBACK_CURSES ++#include "pinentry-curses.h" ++#endif ++ ++#define PGMNAME "pinentry-efl" ++ ++#ifndef VERSION ++#define VERSION ++#endif ++ ++#define ENTRY_HIDE "Hide entry" ++#define ENTRY_SHOW "Show entry" ++ ++typedef enum { CONFIRM_CANCEL, CONFIRM_OK, CONFIRM_NOTOK } confirm_value_t; ++ ++static const int WIDTH = 480; ++static const int BUTTON_HEIGHT = 27; ++static const int BUTTON_WIDTH = 70; ++static const int BUTTON_ICON_SIZE = 13; ++static const int PADDING = 5; ++ ++static Eina_Bool got_input; ++static Ecore_Timer *timer; ++static Evas_Object *check_label; ++static Evas_Object *error_label; ++static Evas_Object *entry; ++static Evas_Object *repeat_entry; ++static Evas_Object *qualitybar; ++static Evas_Object *win; ++static char **pargv; ++static int grab_failed; ++static int passphrase_ok; ++static int confirm_mode; ++static int pargc; ++static confirm_value_t confirm_value; ++static pinentry_t pinentry; ++ ++pinentry_cmd_handler_t pinentry_cmd_handler; ++ ++static void ++quit (void) ++{ ++ evas_object_del(win); ++ elm_exit(); ++ ecore_main_loop_quit (); ++} ++ ++static void ++delete_event (void *data EINA_UNUSED, ++ Evas_Object *obj EINA_UNUSED, ++ void *event EINA_UNUSED) ++{ ++ pinentry->close_button = 1; ++ quit (); ++} ++ ++static void ++changed_text_handler (void *data EINA_UNUSED, ++ Evas_Object *obj, ++ void *event EINA_UNUSED) ++{ ++ const char *s; ++ int length; ++ int percent; ++ ++ got_input = EINA_TRUE; ++ ++ if (pinentry->repeat_passphrase && repeat_entry) ++ { ++ elm_object_text_set (repeat_entry, ""); ++ elm_object_text_set (error_label, ""); ++ } ++ ++ if (!qualitybar || !pinentry->quality_bar) ++ return; ++ ++ s = elm_object_text_get (obj); ++ if (!s) ++ s = ""; ++ length = strlen (s); ++ percent = length? pinentry_inq_quality (pinentry, s, length) : 0; ++ evas_object_color_set(qualitybar, ++ 255 - ( 2.55 * percent ), ++ 2.55 * percent, 0, 255); ++ elm_progressbar_value_set (qualitybar, (double) percent / 100.0); ++} ++ ++static void ++on_check (void *data EINA_UNUSED, Evas_Object *obj, void *event EINA_UNUSED) ++{ ++ if(elm_check_state_get(obj)) ++ { ++ elm_entry_password_set(entry, EINA_FALSE); ++ elm_object_text_set(check_label,ENTRY_HIDE); ++ } ++ else ++ { ++ elm_entry_password_set(entry, EINA_TRUE); ++ elm_object_text_set(check_label,ENTRY_SHOW); ++ } ++ evas_object_size_hint_min_set(check_label, ++ ELM_SCALE_SIZE(BUTTON_WIDTH), ++ ELM_SCALE_SIZE(BUTTON_HEIGHT)); ++ evas_object_size_hint_align_set(check_label, 0, 1); ++} ++ ++static void ++on_click (void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) ++{ ++ if (confirm_mode) ++ { ++ confirm_value = (confirm_value_t) data; ++ quit (); ++ return; ++ } ++ ++ if (data) ++ { ++ const char *s; ++ const char *s2; ++ ++ s = elm_entry_entry_get (entry); ++ if (!s) ++ s = ""; ++ ++ if (pinentry->repeat_passphrase && repeat_entry) ++ { ++ s2 = elm_entry_entry_get (repeat_entry); ++ if (!s2) ++ s2 = ""; ++ if (strcmp (s, s2)) ++ { ++ elm_object_text_set(error_label, ++ pinentry->repeat_error_string? ++ pinentry->repeat_error_string: ++ "not correctly repeated"); ++ elm_object_focus_set(entry,EINA_TRUE); ++ return; ++ } ++ pinentry->repeat_okay = 1; ++ } ++ ++ passphrase_ok = 1; ++ pinentry_setbufferlen (pinentry, strlen (s) + 1); ++ if (pinentry->pin) ++ strncpy (pinentry->pin, s, strlen(s) + 1); ++ } ++ quit (); ++} ++ ++static void ++enter_callback (void *data, Evas_Object * obj, void *event_info EINA_UNUSED) ++{ ++ if (data) ++ elm_object_focus_set (data, 1); ++ else ++ on_click ((void *) CONFIRM_OK, obj, NULL); ++} ++ ++static Eina_Bool ++timeout_cb (const void * data) ++{ ++ pinentry_t pe = (pinentry_t)data; ++ if (!got_input) ++ { ++ ecore_main_loop_quit(); ++ if (pe) ++ pe->specific_err = gpg_error (GPG_ERR_TIMEOUT); ++ } ++ ++ timer = NULL; ++ return ECORE_CALLBACK_DONE; ++} ++ ++static void ++create_window (void) ++{ ++ char *txt; ++ Evas_Object *icon; ++ Evas_Object *obj; ++ Evas_Object *table; ++ int btn_txt_len = 0; ++ int row = 0; ++ int ok_len = 0; ++ ++ win = elm_win_util_dialog_add(NULL,"pinentry","enter pin"); ++ elm_win_autodel_set(win, EINA_TRUE); ++ elm_win_center(win,EINA_TRUE,EINA_TRUE); ++ evas_object_smart_callback_add(win, "delete,request", delete_event, NULL); ++ ++ table = elm_table_add(win); ++ elm_table_padding_set(table,ELM_SCALE_SIZE(PADDING),0); ++ evas_object_size_hint_padding_set (table, ++ ELM_SCALE_SIZE(PADDING), ++ ELM_SCALE_SIZE(PADDING), ++ ELM_SCALE_SIZE(PADDING), ++ ELM_SCALE_SIZE(PADDING)); ++ evas_object_show(table); ++ ++ if (pinentry->title) ++ { ++ txt = pinentry_utf8_to_local (pinentry->lc_ctype, ++ pinentry->title); ++ elm_win_title_set ( win, txt ); ++ free (txt); ++ } ++ ++ /* Description Label */ ++ if (pinentry->description) ++ { ++ char* aligned; ++ int len; ++ ++ obj = elm_label_add(table); ++ elm_label_line_wrap_set (obj, ELM_WRAP_WORD); ++ txt = pinentry_utf8_to_local (pinentry->lc_ctype, pinentry->description); ++ len = strlen(txt)+20; // 20 chars for align tag ++ aligned = calloc(len+1,sizeof(char)); ++ if(aligned) ++ { ++ snprintf(aligned,len, "%s",txt); ++ elm_object_text_set(obj,aligned); ++ free (aligned); ++ } else ++ elm_object_text_set(obj,txt); ++ free (txt); ++ evas_object_size_hint_weight_set(obj, EVAS_HINT_EXPAND, 0); ++ evas_object_size_hint_align_set(obj, EVAS_HINT_FILL, 0); ++ elm_table_pack(table, obj, 1, row, 5, 1); ++ evas_object_show(obj); ++ row++; ++ } ++ if (!confirm_mode && (pinentry->error || pinentry->repeat_passphrase)) ++ { ++ /* Error Label */ ++ if (pinentry->error) ++ txt = pinentry_utf8_to_local (pinentry->lc_ctype, pinentry->error); ++ else ++ txt = ""; ++ obj = elm_label_add(table); ++ evas_object_color_set(obj, 255, 0, 0, 255); ++ elm_object_text_set(obj,txt); ++ elm_object_style_set(obj,"slide_bounce"); ++ elm_label_slide_duration_set(obj, 10); ++ elm_label_slide_mode_set(obj, ELM_LABEL_SLIDE_MODE_ALWAYS); ++ elm_label_slide_go(obj); ++ evas_object_size_hint_weight_set(obj, EVAS_HINT_EXPAND, 0); ++ evas_object_size_hint_align_set(obj, EVAS_HINT_FILL, 0); ++ elm_table_pack(table, obj, 1, row, 5, 1); ++ evas_object_show(obj); ++ if (pinentry->error) ++ free (txt); ++ row++; ++ } ++ ++ qualitybar = NULL; ++ ++ if (!confirm_mode) ++ { ++ ++ if (pinentry->prompt) ++ { ++ /* Entry/Prompt Label */ ++ obj = elm_label_add(table); ++ txt = pinentry_utf8_to_local (pinentry->lc_ctype, pinentry->prompt); ++ elm_object_text_set(obj,txt); ++ free (txt); ++ evas_object_size_hint_weight_set(obj, 0, EVAS_HINT_EXPAND); ++ evas_object_size_hint_align_set(obj, 1, EVAS_HINT_FILL); ++ elm_table_pack(table, obj, 1, row, 1, 1); ++ evas_object_show(obj); ++ } ++ ++ entry = elm_entry_add(table); ++ elm_entry_scrollable_set(entry, EINA_TRUE); ++ elm_scroller_policy_set(entry, ++ ELM_SCROLLER_POLICY_OFF, ++ ELM_SCROLLER_POLICY_OFF); ++ elm_entry_password_set(entry, EINA_TRUE); ++ elm_entry_single_line_set(entry, EINA_TRUE); ++ evas_object_size_hint_weight_set(entry, 0, 0); ++ evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, 0); ++ elm_table_pack(table, entry, 2, row, 4, 1); ++ evas_object_smart_callback_add(entry, ++ "changed", ++ changed_text_handler, ++ NULL); ++ evas_object_show(entry); ++ row++; ++ ++ /* Check box */ ++ obj = elm_check_add(table); ++ evas_object_size_hint_align_set(obj, 1, EVAS_HINT_FILL); ++ elm_table_pack(table, obj, 1, row, 1, 1); ++ evas_object_smart_callback_add(obj, "changed", on_check, NULL); ++ evas_object_show(obj); ++ ++ /* Check Label */ ++ check_label = elm_label_add(table); ++ on_check((void *)NULL, obj, (void *)NULL); ++ elm_table_pack(table, check_label, 2, row, 4, 1); ++ evas_object_show(check_label); ++ row++; ++ ++ if (pinentry->quality_bar) ++ { ++ /* Quality Bar Label */ ++ obj = elm_label_add(table); ++ txt = pinentry_utf8_to_local (pinentry->lc_ctype, ++ pinentry->quality_bar); ++ elm_object_text_set(obj,txt); ++ free (txt); ++ evas_object_size_hint_weight_set(obj, 0, EVAS_HINT_EXPAND); ++ evas_object_size_hint_align_set(obj, 1, EVAS_HINT_FILL); ++ elm_table_pack(table, obj, 1, row, 1, 1); ++ evas_object_show(obj); ++ ++ qualitybar = elm_progressbar_add(table); ++ evas_object_color_set(qualitybar, 255, 0, 0, 255); ++ evas_object_show(qualitybar); ++ if (pinentry->quality_bar_tt) ++ elm_object_tooltip_text_set (qualitybar, ++ pinentry->quality_bar_tt); ++ evas_object_size_hint_weight_set(qualitybar, EVAS_HINT_EXPAND, 0); ++ evas_object_size_hint_align_set(qualitybar, EVAS_HINT_FILL, 0); ++ elm_table_pack(table, qualitybar, 2, row, 4, 1); ++ row++; ++ } ++ ++ if (pinentry->repeat_passphrase) ++ { ++ /* Repeat Label */ ++ obj = elm_label_add(table); ++ txt = pinentry_utf8_to_local (pinentry->lc_ctype, ++ pinentry->repeat_passphrase); ++ elm_object_text_set(obj,txt); ++ free (txt); ++ evas_object_size_hint_weight_set(obj, 0, EVAS_HINT_EXPAND); ++ evas_object_size_hint_align_set(obj, 1, EVAS_HINT_FILL); ++ elm_table_pack(table, obj, 1, row, 1, 1); ++ evas_object_show(obj); ++ ++ repeat_entry = elm_entry_add(table); ++ elm_entry_scrollable_set(repeat_entry, EINA_TRUE); ++ elm_scroller_policy_set(repeat_entry, ++ ELM_SCROLLER_POLICY_OFF, ++ ELM_SCROLLER_POLICY_OFF); ++ elm_entry_password_set(repeat_entry, EINA_TRUE); ++ elm_entry_single_line_set(repeat_entry, EINA_TRUE); ++ evas_object_size_hint_weight_set(repeat_entry, 0, 0); ++ evas_object_size_hint_align_set(repeat_entry, EVAS_HINT_FILL, 0); ++ elm_table_pack(table, repeat_entry, 2, row, 4, 1); ++ evas_object_smart_callback_add (repeat_entry, "activated", ++ enter_callback, NULL); ++ evas_object_show(repeat_entry); ++ evas_object_smart_callback_add (entry, ++ "activated", ++ enter_callback, ++ repeat_entry); ++ evas_object_smart_callback_add(repeat_entry, ++ "activated", ++ on_click, ++ (void *) CONFIRM_OK); ++ row++; ++ } ++ else ++ evas_object_smart_callback_add(entry, ++ "activated", ++ on_click, ++ (void *) CONFIRM_OK); ++ } ++ ++ /* Cancel Button */ ++ if (!pinentry->one_button) ++ { ++ obj = elm_button_add(table); ++ icon = elm_icon_add (table); ++ evas_object_size_hint_aspect_set (icon, EVAS_ASPECT_CONTROL_BOTH, 1, 1); ++ if (elm_icon_standard_set (icon, "dialog-cancel") || ++ elm_icon_standard_set (icon, "window-close")) ++ { ++ evas_object_size_hint_min_set(icon, ++ ELM_SCALE_SIZE(BUTTON_ICON_SIZE), ++ ELM_SCALE_SIZE(BUTTON_ICON_SIZE)); ++ elm_object_part_content_set(obj, "icon", icon); ++ evas_object_show (icon); ++ } ++ else ++ evas_object_del(icon); ++ if (pinentry->cancel || pinentry->default_cancel) ++ { ++ if(pinentry->cancel) ++ txt = pinentry_utf8_to_local (pinentry->lc_ctype, pinentry->cancel); ++ else ++ txt = pinentry_utf8_to_local (pinentry->lc_ctype, ++ pinentry->default_cancel); ++ if(txt[0]=='_') ++ elm_object_text_set(obj,txt+1); ++ else ++ elm_object_text_set(obj,txt); ++ btn_txt_len = ELM_SCALE_SIZE(strlen(txt) * (PADDING * 1.5)); ++ free (txt); ++ } ++ else ++ elm_object_text_set(obj, "Cancel"); //STOCK_CANCEL ++ evas_object_size_hint_align_set(obj, 0, 0); ++ if(btn_txt_len>ELM_SCALE_SIZE(BUTTON_WIDTH)) ++ evas_object_size_hint_min_set(obj, ++ btn_txt_len, ++ ELM_SCALE_SIZE(BUTTON_HEIGHT)); ++ else ++ evas_object_size_hint_min_set(obj, ++ ELM_SCALE_SIZE(BUTTON_WIDTH), ++ ELM_SCALE_SIZE(BUTTON_HEIGHT)); ++ elm_table_pack(table, obj, 4, row, 1, 1); ++ evas_object_smart_callback_add(obj, ++ "clicked", ++ on_click, ++ (void *) CONFIRM_CANCEL); ++ evas_object_show(obj); ++ } ++ ++ /* OK Button */ ++ obj = elm_button_add(table); ++ icon = elm_icon_add (table); ++ evas_object_size_hint_aspect_set (icon, EVAS_ASPECT_CONTROL_BOTH, 1, 1); ++ if (elm_icon_standard_set (icon, "dialog-ok") || ++ elm_icon_standard_set (icon, "list-add")) ++ { ++ evas_object_size_hint_min_set(icon, ++ ELM_SCALE_SIZE(BUTTON_ICON_SIZE), ++ ELM_SCALE_SIZE(BUTTON_ICON_SIZE)); ++ elm_object_part_content_set(obj, "icon", icon); ++ evas_object_show (icon); ++ } ++ else ++ evas_object_del(icon); ++ if (pinentry->ok || pinentry->default_ok) ++ { ++ if(pinentry->ok) ++ txt = pinentry_utf8_to_local (pinentry->lc_ctype, pinentry->ok); ++ else ++ txt = pinentry_utf8_to_local (pinentry->lc_ctype, pinentry->default_ok); ++ if(txt[0]=='_') ++ elm_object_text_set(obj,txt+1); ++ else ++ elm_object_text_set(obj,txt); ++ ok_len = ELM_SCALE_SIZE(strlen(txt) * (PADDING * 1.5)); ++ if(ok_len>btn_txt_len) ++ btn_txt_len = ok_len; ++ free (txt); ++ } ++ else ++ elm_object_text_set(obj,"OK"); //STOCK_OK ++ evas_object_size_hint_align_set(obj, 0, 0); ++ if(btn_txt_len>ELM_SCALE_SIZE(BUTTON_WIDTH)) ++ evas_object_size_hint_min_set(obj, ++ btn_txt_len, ++ ELM_SCALE_SIZE(BUTTON_HEIGHT)); ++ else ++ evas_object_size_hint_min_set(obj, ++ ELM_SCALE_SIZE(BUTTON_WIDTH), ++ ELM_SCALE_SIZE(BUTTON_HEIGHT)); ++ elm_table_pack(table, obj, 5, row, 1, 1); ++ evas_object_smart_callback_add(obj, "clicked", on_click, (void *) CONFIRM_OK); ++ evas_object_show(obj); ++ ++ /* Key/Lock Icon */ ++ obj = elm_icon_add (win); ++ evas_object_size_hint_aspect_set (obj, EVAS_ASPECT_CONTROL_BOTH, 1, 1); ++ if (elm_icon_standard_set (obj, "dialog-password")) ++ { ++ double ic_size = WIDTH/5; ++ if(row==0) ++ ic_size = ic_size/3.5; ++ else if(row<4) ++ ic_size = ic_size - ic_size/row; ++ evas_object_size_hint_min_set(obj, ++ ELM_SCALE_SIZE(ic_size), ++ ELM_SCALE_SIZE(ic_size)); ++ evas_object_size_hint_weight_set(obj, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); ++ evas_object_size_hint_align_set(obj, EVAS_HINT_FILL, 0.5); ++ elm_table_pack(table, obj, 0, 0, 1, row? row:1); ++ evas_object_show (obj); ++ } ++ else ++ evas_object_del(obj); ++ ++ /* Box for padding */ ++ obj = elm_box_add (win); ++ elm_box_pack_end (obj, table); ++ evas_object_show (obj); ++ ++ elm_win_resize_object_add(win,obj); ++ evas_object_show(win); ++ ++ if(entry) ++ elm_object_focus_set (entry, EINA_TRUE); ++ ++ if (pinentry->timeout > 0) ++ timer = ecore_timer_add (pinentry->timeout, ++ (Ecore_Task_Cb)timeout_cb, ++ pinentry); ++} ++ ++static int ++efl_cmd_handler (pinentry_t pe) ++{ ++ int want_pass = !!pe->pin; ++ ++ got_input = EINA_FALSE; ++ pinentry = pe; ++ confirm_value = CONFIRM_CANCEL; ++ passphrase_ok = 0; ++ confirm_mode = want_pass ? 0 : 1; ++ /* init ecore-x explicitly using DISPLAY since this can launch ++ * from console ++ */ ++ if (pe->display) ++ ecore_x_init (pe->display); ++ elm_init (pargc, pargv); ++ create_window (); ++ ecore_main_loop_begin (); ++ ++ if (timer) ++ { ++ ecore_timer_del (timer); ++ timer = NULL; ++ } ++ ++ if (confirm_value == CONFIRM_CANCEL || grab_failed) ++ pe->canceled = 1; ++ ++ pinentry = NULL; ++ if (want_pass) ++ { ++ if (passphrase_ok && pe->pin) ++ return strlen (pe->pin); ++ else ++ return -1; ++ } ++ else ++ return (confirm_value == CONFIRM_OK) ? 1 : 0; ++} ++ ++int ++main (int argc, char *argv[]) ++{ ++ pinentry_init (PGMNAME); ++ ++#ifdef FALLBACK_CURSES ++ if (pinentry_have_display (argc, argv)) ++ { ++#endif ++ ++ pinentry_cmd_handler = efl_cmd_handler; ++ pargc = argc; ++ pargv = argv; ++ ++#ifdef FALLBACK_CURSES ++ } ++ else ++ { ++ pinentry_cmd_handler = curses_cmd_handler; ++ } ++#endif ++ ++ pinentry_parse_opts (argc, argv); ++ if (pinentry_loop ()) ++ return 1; ++ ++ return 0; ++} +-- +2.8.0.rc3 + -- cgit v1.2.3 From 662e2285f502b65600b0b5a12c040d050be8999d Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 20 Nov 2018 22:39:37 +0530 Subject: services: wesnothd: Run as wesnothd user and group. * gnu/services/games.scm (wesnothd-shepherd-service): Run as wesnothd user and group. --- gnu/services/games.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/services/games.scm b/gnu/services/games.scm index b9d78e078d..b743f6a4b6 100644 --- a/gnu/services/games.scm +++ b/gnu/services/games.scm @@ -65,7 +65,8 @@ (modules '((gnu build shepherd))) (start #~(make-forkexec-constructor/container (list #$(file-append package "/bin/wesnothd") - "-p" #$(number->string port)))) + "-p" #$(number->string port)) + #:user "wesnothd" #:group "wesnothd")) (stop #~(make-kill-destructor))))))) (define wesnothd-service-type -- cgit v1.2.3 From 242b29baa16552f3cb6f564da4ad8a729cd3e38f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 20 Nov 2018 13:46:09 +0100 Subject: gnu: autotalent: Simplify 'license'. * gnu/packages/audio.scm (autotalent)[license]: Remove unnecessary 'list'. --- gnu/packages/audio.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index d8a3c3c455..52769921ee 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -466,7 +466,7 @@ controls are allowable notes, strength of correction, LFO for vibrato and formant warp.") ;; All code except the FFT routine is licensed under GPLv2+. ;; The FFT routine is under BSD-3. - (license (list license:gpl2+)))) + (license license:gpl2+))) (define-public azr3 (package -- cgit v1.2.3 From e11462c2e4d7189f8b2a69fcc19d3dbf68569fe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 20 Nov 2018 18:35:33 +0100 Subject: Revert "gnu: ccl: Include x86-headers and remove missing "contrib" folder." This reverts commit d22ba64276c0bbacb77d0670635f67f053a16c6b, which broke evaluations for armhf-linux. --- gnu/packages/lisp.scm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 6849cdd2bf..d401e5c456 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -533,12 +533,8 @@ statistical profiler, a code coverage tool, and many other extensions.") (install-file kernel libdir) (install-file heap libdir) - (let ((dirs '("lib" "library" "examples" "tools" "objc-bridge" - ,(match (%current-system) - ("x86_64-linux" - "x86-headers64") - ("i686-linux" - "x86-headers"))))) + (let ((dirs '("lib" "library" "examples" "contrib" + "tools" "objc-bridge"))) (for-each copy-recursively dirs (map (cut string-append libdir <>) dirs))) -- cgit v1.2.3 From 3c4103c84f80acf3de31bd9e86f0b57a9e4f65af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 20 Nov 2018 18:39:22 +0100 Subject: gnu: java-jansi-native: Add "mips64el-linux" case. * gnu/packages/java.scm (java-jansi-native)[arguments]: Add "mips64el-linux" in 'match' clause. --- gnu/packages/java.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index cea3c4e333..0c7b9a9855 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -9203,7 +9203,8 @@ that is part of the SWT Tools project.") ,(match (%current-system) ((or "i686-linux" "armhf-linux") "linux32") - ((or "x86_64-linux" "aarch64-linux") + ((or "x86_64-linux" "aarch64-linux" + "mips64el-linux") "linux64"))))) (install-file "src/main/native-package/src/libjansi.so" dir)) #t)) -- cgit v1.2.3 From ea80fd1ff52abbf66499871ada990edbca374c08 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Tue, 20 Nov 2018 11:54:37 -0500 Subject: gnu: libmspack: Update to 0.9.1. * gnu/packages/compression.scm (libmspack): Update to 0.9.1. --- gnu/packages/compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 9c94ff09cd..fb39ddab80 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -637,13 +637,13 @@ sfArk file format to the uncompressed sf2 format.") (package (name "libmspack") (home-page "https://cabextract.org.uk/libmspack/") - (version "0.8") + (version "0.9.1") (source (origin (method url-fetch) (uri (string-append home-page name "-" version "alpha.tar.gz")) (sha256 - (base32 "1byx98jajv927f0a7np0hvs8lxzccny6pj8vrrgmldv1jlp7jcq5")))) + (base32 "0h1f5w8rjnq7dcqpqm1mpx5m8q80691kid6f7npqlqwqqzckd8v2")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-static"))) -- cgit v1.2.3 From b3175c709d7fb2e8519902c3dd66608436d0f0ff Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Tue, 20 Nov 2018 13:52:00 -0500 Subject: gnu: cabextract: Update to 1.9. * gnu/packages/compression.scm (cabextract): Update to 1.9. [arguments]: Add phase "unpack-libmspack". [inputs]: Add libmspack-source. --- gnu/packages/compression.scm | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index fb39ddab80..e775052b7a 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1017,13 +1017,13 @@ smaller than those produced by @code{Xdelta}.") (package (name "cabextract") (home-page "https://cabextract.org.uk/") - (version "1.7") + (version "1.9") (source (origin (method url-fetch) (uri (string-append home-page name "-" version ".tar.gz")) (sha256 (base32 - "1g86wmb8lkjiv2jarfz979ngbgg7d3si8x5il4g801604v406wi9")) + "1hf4zhjxfdgq9x172r5zfdnafma9q0zf7372syn8hcn7hcypkg0v")) (modules '((guix build utils))) (snippet '(begin @@ -1031,11 +1031,27 @@ smaller than those produced by @code{Xdelta}.") (delete-file-recursively "mspack") #t)))) (build-system gnu-build-system) - (arguments '(#:configure-flags '("--with-external-libmspack"))) + (arguments + '(#:configure-flags '("--with-external-libmspack") + #:phases + (modify-phases %standard-phases + ;; cabextract needs some of libmspack's header files. + ;; These are located in the "mspack" directory of libmspack. + (add-before 'build 'unpack-libmspack + (lambda* (#:key inputs #:allow-other-keys) + (let ((dir-name "libmspack-src")) + (mkdir dir-name) + (invoke "tar" "-xvf" (assoc-ref inputs "libmspack-source") + "-C" dir-name "--strip-components" "1") + (rename-file (string-append dir-name "/mspack") + "mspack") + (delete-file-recursively dir-name) + #t)))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("libmspack" ,libmspack))) + `(("libmspack" ,libmspack) + ("libmspack-source" ,(package-source libmspack)))) (synopsis "Tool to unpack Cabinet archives") (description "Extracts files out of Microsoft Cabinet (.cab) archives") ;; Some source files specify gpl2+, lgpl2+, however COPYING is gpl3. -- cgit v1.2.3 From 90b9c5adea950c7daff3ab14e69601dc78803d6d Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 27 Oct 2018 20:37:07 +0100 Subject: gnu: Add python-jsmin. * gnu/packages/python-web.scm (python-jsmin, python2-jsmin): New variables. --- gnu/packages/python-web.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index eda796e01c..161fe6eac2 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2168,6 +2168,25 @@ It comes with safe defaults and easily configurable options.") (define-public python2-flask-htmlmin (package-with-python2 python-flask-htmlmin)) +(define-public python-jsmin + (package + (name "python-jsmin") + (version "2.2.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "jsmin" version)) + (sha256 + (base32 + "0fsmqbjvpxvff0984x7c0y8xmf49ax9mncz48b9xjx8wrnr9kpxn")))) + (build-system python-build-system) + (home-page "https://github.com/tikitu/jsmin/") + (synopsis "Python JavaScript minifier") + (description + "@code{jsmin} is a JavaScript minifier, usable from both Python code and +on the command line.") + (license license:expat))) + (define-public python-flask-login (package (name "python-flask-login") -- cgit v1.2.3 From 9c98d588c2e20fe7434b4ad74c16abbbb28eeb88 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 27 Oct 2018 20:37:30 +0100 Subject: gnu: Add python-slimit. * gnu/packages/python-web.scm (python-slimit, python2-slimit): New variables. --- gnu/packages/python-web.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 161fe6eac2..55b8942ac9 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1983,6 +1983,31 @@ transfers.") `(("python2-futures" ,python2-futures) ,@(package-native-inputs base)))))) +(define-public python-slimit + (package + (name "python-slimit") + (version "0.8.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "slimit" version ".zip")) + (sha256 + (base32 + "02vj2x728rs1127q2nc27frrqra4fczivnb7gch6n5lzi7pxqczl")))) + (build-system python-build-system) + (native-inputs + `(("unzip" ,unzip))) + (propagated-inputs + `(("python-ply" ,python-ply))) + (home-page "https://slimit.readthedocs.io/") + (synopsis "JavaScript minifier, parser and lexer written in Python") + (description + "SlimIt is a JavaScript minifier written in Python. It compiles +JavaScript into more compact code so that it downloads and runs faster. +SlimIt also provides a library that includes a JavaScript parser, lexer, +pretty printer and a tree visitor.") + (license license:expat))) + (define-public python-flask-restful (package (name "python-flask-restful") -- cgit v1.2.3 From 6cd1bbd0b16f97493ff4235f938ac81f4b2f8b92 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 27 Oct 2018 17:43:39 +0100 Subject: gnu: Add python-django-pipeline. * gnu/packages/django.scm (python-django-pipeline, python2-django-pipeline): New variables. --- gnu/packages/django.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index dea925e568..e476d7015c 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -518,6 +518,46 @@ project.") (define-public python2-django-overextends (package-with-python2 python-django-overextends)) +(define-public python-django-pipeline + (package + (name "python-django-pipeline") + (version "1.6.14") + (source + (origin + (method url-fetch) + (uri (pypi-uri "django-pipeline" version)) + (sha256 + (base32 + "1a207y71r7za033ira0qmh2yrgp5rq0l04gw2fg9b8jri7sslrzg")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + (substitute* "tests/tests/test_compiler.py" + (("\\/usr\\/bin\\/env") + (which "env"))))) + (replace 'check + (lambda*(#:key tests? #:allow-other-keys) + (or + (not tests?) + (begin + (setenv "DJANGO_SETTINGS_MODULE" "tests.settings") + (invoke "django-admin" "test" "tests")))))))) + (propagated-inputs + `(("python-django" ,python-django) + ("python-slimit" ,python-slimit) + ("python-jsmin" ,python-jsmin))) + (home-page + "https://github.com/jazzband/django-pipeline") + (synopsis "Asset packaging library for Django") + (description + "Pipeline is an asset packaging library for Django, providing both CSS +and JavaScript concatenation and compression, built-in JavaScript template +support, and optional data-URI image and font embedding.") + (license license:expat))) + (define-public python-django-redis (package (name "python-django-redis") -- cgit v1.2.3 From a2e925969726552651b8fe827cf3b447d2fe236d Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 27 Oct 2018 17:43:08 +0100 Subject: gnu: Add python-django-jinja. * gnu/packages/django.scm (python-django-jinja, python2-django-jinja): New variables. --- gnu/packages/django.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index e476d7015c..02ad63bf4f 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -338,6 +338,47 @@ merging, minifying and compiling CSS and Javascript files.") (define-public python2-django-assets (package-with-python2 python-django-assets)) +(define-public python-django-jinja + (package + (name "python-django-jinja") + (version "2.4.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/niwinz/django-jinja/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0bzrb4m6wx9ph5cpvz7wpvg5k6ksvj0dnxlg0nhhqskhvp46brs1")))) + (build-system python-build-system) + (propagated-inputs + `(("python-django" ,python-django) + ("python-jinja2" ,python-jinja2) + ("python-pytz" ,python-pytz) + ("python-django-pipeline" ,python-django-pipeline))) + (arguments + '(;; TODO Tests currently fail due to issues with the configuration for + ;; django-pipeline + #:tests? #f + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (or + (not tests?) + (with-directory-excursion "testing" + (invoke "python" "runtests.py")))))))) + (home-page + "https://niwinz.github.io/django-jinja/latest/") + (synopsis "Simple jinja2 templating backend for Django") + (description + "This package provides a templating backend for Django, using Jinja2. It +provides certain advantages over the builtin Jinja2 backend in Django, for +example, explicit calls to callables from templates and better performance.") + (license license:bsd-3))) + (define-public python-django-jsonfield (package (name "python-django-jsonfield") -- cgit v1.2.3 From be02d4df84d859adad5f0dd58eb951a36734b582 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 27 Oct 2018 17:43:27 +0100 Subject: gnu: Add python-django-debug-toolbar. * gnu/packages/django.scm (python-django-debug-toolbar, python2-django-debug-toolbar): New variables. --- gnu/packages/django.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 02ad63bf4f..59bef9a8d1 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -265,6 +265,41 @@ account authentication.") (define-public python2-django-allauth (package-with-python2 python-django-allauth)) +(define-public python-django-debug-toolbar + (package + (name "python-django-debug-toolbar") + (version "1.10.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/jazzband/django-debug-toolbar/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1rww056hyzks8spbgf4h7kf6ybxlc5p08a2b6gn1nqrrzs4yx9sy")))) + (build-system python-build-system) + (propagated-inputs + `(("python-sqlparse" ,python-sqlparse) + ("python-django" ,python-django))) + (native-inputs + `(("python-django-jinja" ,python-django-jinja) + ("python-html5lib" ,python-html5lib))) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "make" "test")))))) + (home-page + "https://github.com/jazzband/django-debug-toolbar") + (synopsis "Toolbar to help with developing Django applications") + (description + "A configurable set of panels that display information about the current +request and response as a toolbar on the rendered page.") + (license license:bsd-3))) + (define-public python-django-gravatar2 (package (name "python-django-gravatar2") -- cgit v1.2.3 From 725b077e400afec6a34b3494b14e7b899b31ed81 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 5 Nov 2018 21:58:02 +0000 Subject: gnu: arm-trusted-firmware-pine64-plus: Update to 2.0-1.cabe0a3. * gnu/packages/firmware.scm (arm-trusted-firmware-pine64-plus): Use platform name from upstream ("sun50i_a64"). [version]: Update to 2.0-1.cabe0a3, [source](uri): Use upstream git repository. Signed-off-by: Danny Milosavljevic --- gnu/packages/firmware.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 0b5a82e9e5..90797e013f 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -447,24 +447,25 @@ such as: license:bsd-2)))) ; libfdt (define-public arm-trusted-firmware-pine64-plus - (let ((base (make-arm-trusted-firmware "sun50iw1p1")) - ;; Vendor's arm trusted firmware branch hasn't been upstreamed yet. - (commit "ae78724247a01560164d607ed66db111c74d8df0") + (let ((base (make-arm-trusted-firmware "sun50i_a64")) + ;; Use unreleased version which enables additional features needed for + ;; LCD support + (commit "cabe0a31801e99e7abb84d2114ded6bb56f3c71e") (revision "1")) (package (inherit base) (name "arm-trusted-firmware-pine64-plus") - (version (string-append "1.2-" revision "." (string-take commit 7))) + (version (git-version "2.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/apritzel/arm-trusted-firmware.git") + (url "https://github.com/ARM-software/arm-trusted-firmware.git") (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 - "0r4xnlq7v9khjfcg6gqp7nmrmnw4z1r8bipwdr07png1dcbb8214"))))))) + "0srw2zj3vn5d2fwzjpwa5h70d5bwvb79jnpdvmd395npv0gxshdz"))))))) (define-public arm-trusted-firmware-puma-rk3399 (let ((base (make-arm-trusted-firmware "rk3399")) -- cgit v1.2.3 From 95d91986064ef2b03d8c55286e47d2a2280db152 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 14 Nov 2018 16:53:14 +0000 Subject: gnu: arm-trusted-firmware-pine64-plus: Rename variable to arm-trusted-firmware-sun50i-a64. * gnu/packages/firmware (arm-trusted-firmware-pine64-plus): Rename to... (arm-trusted-firmware-sun50i-a64): ...this. * gnu/packages/bootloaders (u-boot-pine64-plus)[native-inputs]: Use it. Signed-off-by: Danny Milosavljevic --- gnu/packages/bootloaders.scm | 2 +- gnu/packages/firmware.scm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 2fa50a89b4..3e4c8bb0bc 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -573,7 +573,7 @@ board-independent tools."))) ) #t)))))) (native-inputs - `(("firmware" ,arm-trusted-firmware-pine64-plus) + `(("firmware" ,arm-trusted-firmware-sun50i-a64) ,@(package-native-inputs base)))))) (define-public u-boot-bananapi-m2-ultra diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 90797e013f..c396cd644f 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -446,7 +446,7 @@ such as: (license (list license:bsd-3 license:bsd-2)))) ; libfdt -(define-public arm-trusted-firmware-pine64-plus +(define-public arm-trusted-firmware-sun50i-a64 (let ((base (make-arm-trusted-firmware "sun50i_a64")) ;; Use unreleased version which enables additional features needed for ;; LCD support @@ -454,7 +454,7 @@ such as: (revision "1")) (package (inherit base) - (name "arm-trusted-firmware-pine64-plus") + (name "arm-trusted-firmware-sun50i-a64") (version (git-version "2.0" revision commit)) (source (origin -- cgit v1.2.3 From 0da3526d583b56a9560369ec4d426b45126457d2 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 19 Nov 2018 21:04:48 -0800 Subject: gnu: u-boot-pine64-plus: Refactor package definition. * gnu/packages/bootloaders.scm (make-u-boot-sunxi64-package): New procedure. (u-boot-pine64-plus): Use it. Signed-off-by: Danny Milosavljevic --- gnu/packages/bootloaders.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 3e4c8bb0bc..328e834bc2 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -554,8 +554,8 @@ board-independent tools."))) (define-public u-boot-beagle-bone-black (make-u-boot-package "am335x_boneblack" "arm-linux-gnueabihf")) -(define-public u-boot-pine64-plus - (let ((base (make-u-boot-package "pine64_plus" "aarch64-linux-gnu"))) +(define-public (make-u-boot-sunxi64-package board triplet) + (let ((base (make-u-boot-package board triplet))) (package (inherit base) (arguments @@ -576,6 +576,9 @@ board-independent tools."))) `(("firmware" ,arm-trusted-firmware-sun50i-a64) ,@(package-native-inputs base)))))) +(define-public u-boot-pine64-plus + (make-u-boot-sunxi64-package "pine64_plus" "aarch64-linux-gnu")) + (define-public u-boot-bananapi-m2-ultra (make-u-boot-package "Bananapi_M2_Ultra" "arm-linux-gnueabihf")) -- cgit v1.2.3 From 56ddcf041464f9b2d2a76c7abf88f1a832a96b4b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 20 Nov 2018 23:57:58 -0500 Subject: gnu: emacs-elpy: Update to 1.26.0. * gnu/packages/emacs.scm (emacs-elpy): Update to 1.26.0. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index ce1add3915..98a20028f6 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -4696,7 +4696,7 @@ indentation (space indentation only). (define-public emacs-elpy (package (name "emacs-elpy") - (version "1.24.0") + (version "1.26.0") (source (origin (method git-fetch) (uri (git-reference @@ -4705,7 +4705,7 @@ indentation (space indentation only). (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0rsg8a9nwqfkv0xcs11jzfp10ij7jm0v2ikx19zv2v7awqy0q5wf")))) + "0wynzp5xmrgiggmam82n6lfaiqmfl4n3ccpsgnh86r6pbsmssxjk")))) (build-system emacs-build-system) (arguments `(#:include (cons* "^elpy/[^/]+\\.py$" "^snippets\\/" %default-include) -- cgit v1.2.3 From d09e84c271f8cf6da483e97e6bf99484ee402755 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 21 Nov 2018 10:02:56 +0200 Subject: gnu: thermald: Don't use unstable tarball. * gnu/packages/admin.scm (thermald)[source]: Download source using git-fetch. --- gnu/packages/admin.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 2247902898..88b6f615ff 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2016 Pjotr Prins ;;; Copyright © 2016, 2017 Ricardo Wurmus -;;; Copyright © 2016, 2017 Efraim Flashner +;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2016 Peter Feigl ;;; Copyright © 2016 John J. Foerch ;;; Copyright © 2016, 2017 Nils Gillmann @@ -2452,12 +2452,14 @@ make it a perfect utility on modern distros.") (version "1.7.2") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/01org/thermal_daemon/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 (base32 - "15a6vb67y5wsmf0irrq7sxam18yqpz64130k83ryf24mp40h661b")))) + (method git-fetch) + (uri (git-reference + (url "https://github.com/01org/thermal_daemon") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1cs2pq8xvfnsvrhg2bxawk4kn3z1qmfrnpnhs178pvfbglzh15hc")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 1200783972cdadc4d418888d54e67a0b4c4750ba Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 21 Nov 2018 10:05:28 +0200 Subject: gnu: thermald: Clean up package definition. * gnu/packages/admin.scm (thermald)[arguments]: Remove redundant 'bootstrap phase. Remove unnecessary udev configure flag. --- gnu/packages/admin.scm | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 88b6f615ff..28961ecf88 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2462,18 +2462,10 @@ make it a perfect utility on modern distros.") "1cs2pq8xvfnsvrhg2bxawk4kn3z1qmfrnpnhs178pvfbglzh15hc")))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'bootstrap - (lambda _ - (invoke "sh" "autogen.sh") - #t))) - #:configure-flags + `(#:configure-flags (let ((out (assoc-ref %outputs "out"))) (list (string-append "--sysconfdir=" out "/etc") - (string-append "--with-udev-dir=" - out "/lib/udev") (string-append "--with-dbus-sys-dir=" out "/etc/dbus-1/system.d") "--localstatedir=/var")))) -- cgit v1.2.3 From 4e94cdb652ca30b74ad68153da976827c8ea16a2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 21 Nov 2018 11:57:12 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From ab5d91dd50e6b8711f21051427aaf343d326ab3b Mon Sep 17 00:00:00 2001 From: swedebugia Date: Tue, 20 Nov 2018 00:07:19 +0100 Subject: gnu: Add python-wikidata. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python.scm (python-wikidata): New variable. Co-authored-by: Ludovic Courtès --- gnu/packages/python.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 4ae97078e6..d87b1315e6 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -14617,3 +14617,25 @@ on regular expressions.") "This module implements the PRECIS Framework as described in RFC 8264, RFC 8265 and RFC 8266.") (license license:expat))) + +(define-public python-wikidata + (package + (name "python-wikidata") + (version "0.6.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "Wikidata" version)) + (sha256 + (base32 + "08nlnydddfp1jj0cdmshvld1irzngbp3dij928wqsg9ziklm6mw9")))) + (build-system python-build-system) + (propagated-inputs + `(("python-babel" ,python-babel))) + (home-page "https://github.com/dahlia/wikidata") + (synopsis "Wikidata client library") + (description + "This package provides a Python interface to +@url{https://www.wikidata.org/, Wikidata}.") + (properties '((upstream-name . "Wikidata"))) + (license license:gpl3+))) -- cgit v1.2.3 From 96cae1b48c12b7b5b4a68d86ac9d714cab2d9881 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 19 Nov 2018 18:57:27 +0100 Subject: gnu: font-ubuntu: Update url. * gnu/packages/fonts.scm (font-ubuntu): Use new url, update hash. --- gnu/packages/fonts.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 1195695d7a..f9f8428202 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -99,13 +99,14 @@ in print. With attention to detail for high resolution rendering.") (name "font-ubuntu") (version "0.83") (source (origin - (method url-fetch) - (uri (string-append - "http://font.ubuntu.com/download/ubuntu-font-family-" - version ".zip")) + (method git-fetch) + (uri (git-reference + (url "https://salsa.debian.org/fonts-team/fonts-ubuntu") + (commit (string-append "upstream/" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0hjvq2x758dx0sfwqhzflns0ns035qm7h6ygskbx1svzg517sva5")))) + "1d2xrjpxy70f3nsgqiggwv6pj06qglf5vj2847pqx60w3ygi903g")))) (build-system font-build-system) (home-page "http://font.ubuntu.com/") (synopsis "The Ubuntu Font Family") -- cgit v1.2.3 From a2aa746cfe38076b87d9cde2252904c0bddd9f9e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 21 Nov 2018 15:17:12 +0200 Subject: 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(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index d87b1315e6..c3d3c02684 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5692,9 +5692,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 94c5cf3a67..e9a49df787 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" -- cgit v1.2.3 From 24a2e19c432580a1a4900417ce81a4826e41e8f4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 21 Nov 2018 15:17:12 +0200 Subject: 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(-) (limited to 'gnu') 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" -- cgit v1.2.3 From 4cf879fefbce0a4e960f8c90e1f8b598d7a6e3df Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 21 Nov 2018 15:38:52 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 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: 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 + .../patches/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 (limited to 'gnu') 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) -- cgit v1.2.3 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: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 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: 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 +- gnu/packages/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 (limited to 'gnu') 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; + } -- cgit v1.2.3 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: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 6e35bad0a9d00f1eb94bb427ad856c219655e95d Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Mon, 12 Nov 2018 01:55:05 +0800 Subject: gnu: Add pnglite. * gnu/packages/image.scm (pnglite): New variable. --- gnu/packages/image.scm | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index e88609a7ca..8168a225fc 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Marius Bakke ;;; Copyright © 2018 Pierre-Antoine Rouby +;;; Copyright © 2018 Alex Vong ;;; ;;; This file is part of GNU Guix. ;;; @@ -253,6 +254,61 @@ files. It can compress them as much as 40% losslessly.") ;; This package used to be wrongfully name "pngcrunch". (deprecated-package "pngcrunch" pngcrush)) +(define-public pnglite + (let ((commit "11695c56f7d7db806920bd9229b69f230e6ffb38") + (revision "1")) + (package + (name "pnglite") + ;; The project was moved from sourceforge to github. + ;; The latest version in sourceforge was 0.1.17: + ;; https://sourceforge.net/projects/pnglite/files/pnglite/ + ;; No releases are made in github. + (version (git-version "0.1.17" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dankar/pnglite") + (commit commit))) + (sha256 + (base32 + "1lmmkdxby5b8z9kx3zrpgpk33njpcf2xx8z9bgqag855sjsqbbby")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no tests + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda _ + ;; common build flags for building shared libraries + (let ((cflags '("-O2" "-g" "-fPIC")) + (ldflags '("-shared"))) + (apply invoke + `("gcc" + "-o" "libpnglite.so" + ,@cflags + ,@ldflags + "pnglite.c")) + #t))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib/")) + (include (string-append out "/include/")) + (doc (string-append out "/share/doc/" + ,name "-" ,version "/"))) + (install-file "libpnglite.so" lib) + (install-file "pnglite.h" include) + (install-file "README.md" doc) + #t)))))) + (inputs `(("zlib" ,zlib))) + (home-page "https://github.com/dankar/pnglite") + (synopsis "Pretty small png library") + (description "A pretty small png library. +Currently all documentation resides in @file{pnglite.h}.") + (license license:zlib)))) + (define-public libjpeg (package (name "libjpeg") -- cgit v1.2.3 From 078e2edf1d3ce8e208dbb891ae662a0db3376c1e Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Mon, 12 Nov 2018 02:23:27 +0800 Subject: gnu: Add json-parser. * gnu/packages/web.scm (json-parser): New variable. --- gnu/packages/web.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 73219c864f..eeaaa85702 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -28,6 +28,7 @@ ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2018 Gábor Boskovits ;;; Copyright © 2018 Mădălin Ionel Patrașcu +;;; Copyright © 2018 Alex Vong ;;; ;;; This file is part of GNU Guix. ;;; @@ -582,6 +583,37 @@ It aims to conform to RFC 7159.") (("-Werror") "")) #t)))))) +(define-public json-parser + (package + (name "json-parser") + (version "1.1.0") + (source (origin + ;; do not use auto-generated tarballs + (method git-fetch) + (uri (git-reference + (url "https://github.com/udp/json-parser.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1ls7z4fx0sq633s5bc0j1gh36sv087gmrgr7rza22wjq2d4606yf")))) + ;; FIXME: we should build the python bindings in a separate package + (build-system gnu-build-system) + ;; the tests are written for the python bindings which are not built here + (arguments '(#:tests? #f)) + (home-page "https://github.com/udp/json-parser") + (synopsis "JSON parser written in ANSI C") + (description "This package provides a very low footprint JSON parser +written in portable ANSI C. + +@itemize +@item BSD licensed with no dependencies (i.e. just drop the C file into your +project) +@item Never recurses or allocates more memory than it needs +@item Very simple API with operator sugar for C++ +@end itemize") + (license l:bsd-2))) + (define-public qjson (package (name "qjson") -- cgit v1.2.3 From 53367e17b66e84eee0deb77e18df77c1108b3177 Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Thu, 8 Nov 2018 10:53:43 +0800 Subject: gnu: bam: Update to 0.5.1. * gnu/packages/build-tools.scm (bam): Update to 0.5.1. [source]: Switch to git-fetch. [arguments]: Use newly provided Makefile. [inputs]: Add lua. --- gnu/packages/build-tools.scm | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 42de56f8c3..a52ee480ac 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2018 Fis Trivial ;;; Copyright © 2018 Tomáš Čech ;;; Copyright © 2018 Marius Bakke +;;; Copyright © 2018 Alex Vong ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,6 +31,7 @@ #:use-module (guix build-system cmake) #:use-module (gnu packages) #:use-module (gnu packages compression) + #:use-module (gnu packages lua) #:use-module (gnu packages python) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) @@ -40,33 +42,30 @@ (define-public bam (package (name "bam") - (version "0.4.0") + (version "0.5.1") (source (origin - (method url-fetch) - (uri (string-append "http://github.com/downloads/matricks/" - "bam/bam-" version ".tar.bz2")) + ;; do not use auto-generated tarballs + (method git-fetch) + (uri (git-reference + (url "https://github.com/matricks/bam.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0z90wvyd4nfl7mybdrv9dsd4caaikc6fxw801b72gqi1m9q0c0sn")))) + "13br735ig7lygvzyfd15fc2rdygrqm503j6xj5xkrl1r7w2wipq6")))) (build-system gnu-build-system) (arguments - `(#:phases + `(#:make-flags `("CC=gcc" + ,(string-append "INSTALL_PREFIX=" + (assoc-ref %outputs "out"))) + #:test-target "test" + #:phases (modify-phases %standard-phases - (delete 'configure) - (replace 'build - (lambda _ - (zero? (system* "bash" "make_unix.sh")))) - (replace 'check - (lambda _ - (zero? (system* "python" "scripts/test.py")))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) - (mkdir-p bin) - (install-file "bam" bin) - #t)))))) + (delete 'configure)))) (native-inputs `(("python" ,python-2))) + (inputs + `(("lua" ,lua))) (home-page "https://matricks.github.io/bam/") (synopsis "Fast and flexible build system") (description "Bam is a fast and flexible build system. Bam uses Lua to -- cgit v1.2.3 From f9e5caf9bae93fdafbaa6732b3b4eb45f0126656 Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Mon, 12 Nov 2018 02:42:25 +0800 Subject: gnu: teeworlds: Update to 0.7.0 [fixes CVE-2018-18541]. * gnu/packages/games.scm (teeworlds): Update to 0.7.0. [source]: Switch to git-fetch. Remove all bundled libraries except md5. [arguments]: Adjust accordingly. [inputs]: Use sdl2 instead of sdl and python-wrapper instead of python-2. Add json-parser and pnglite. * gnu/packages/patches/teeworlds-use-latest-wavpack.patch: Update it. --- gnu/packages/games.scm | 116 ++++++++++++++------- .../patches/teeworlds-use-latest-wavpack.patch | 72 ++++++++++--- 2 files changed, 136 insertions(+), 52 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index bc5d3d581b..b025dfe232 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -35,6 +35,7 @@ ;;; Copyright © 2018 Tim Gesthuizen ;;; Copyright © 2018 Madalin Ionel-Patrascu ;;; Copyright © 2018 Benjamin Slade +;;; Copyright © 2018 Alex Vong ;;; ;;; This file is part of GNU Guix. ;;; @@ -4139,31 +4140,54 @@ small robot living in the nano world, repair its maker.") (define-public teeworlds (package (name "teeworlds") - (version "0.6.4") + (version "0.7.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/teeworlds/teeworlds/" - "archive/" version "-release.tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + ;; do not use auto-generated tarballs + (method git-fetch) + (uri (git-reference + (url "https://github.com/teeworlds/teeworlds.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1mqhp6xjl75l49050cid36wxyjn1qr0vjx1c709dfg1lkvmgs6l3")) - (modules '((guix build utils))) - (snippet - '(begin - (for-each delete-file-recursively - '("src/engine/external/wavpack/" - "src/engine/external/zlib/")) + "0jigg2yikihbivzs7hpljr0mghx1l9v4f1cdr8fbmqv2wb51ah8q")) + (modules '((guix build utils) + (ice-9 ftw) + (ice-9 regex) + (srfi srfi-1) + (srfi srfi-26))) + (snippet ; remove bundled libraries except md5 + '(let ((base-dir "src/engine/external/")) + (for-each (compose (cut delete-file-recursively <>) + (cut string-append base-dir <>)) + (remove (cut string-match "(^.)|(^md5$)" <>) + (scandir base-dir))) #t)) (patches (search-patches "teeworlds-use-latest-wavpack.patch")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests included + #:modules ((guix build gnu-build-system) + (guix build utils) + (srfi srfi-26)) #:phases (modify-phases %standard-phases (replace 'configure (lambda* (#:key outputs #:allow-other-keys) + ;; The bundled json-parser uses an old API. + ;; To use the latest non-bundled version, we need to pass the + ;; length of the data in all 'json_parse_ex' calls. + (define (use-latest-json-parser file) + (substitute* file + (("engine/external/json-parser/json\\.h") + "json-parser/json.h") + (("json_parse_ex\\(&JsonSettings, pFileData, aError\\);") + "json_parse_ex(&JsonSettings, + pFileData, + strlen(pFileData), + aError);"))) + ;; Embed path to assets. (substitute* "src/engine/shared/storage.cpp" (("#define DATA_DIR.*") @@ -4173,50 +4197,68 @@ small robot living in the nano world, repair its maker.") "\""))) ;; Bam expects all files to have a recent time stamp. - (for-each (lambda (file) - (utime file 1 1)) + (for-each (cut utime <> 1 1) (find-files ".")) ;; Do not use bundled libraries. (substitute* "bam.lua" - (("if config.zlib.value == 1 then") - "if true then") - (("wavpack = .*") - "wavpack = {} -settings.link.libs:Add(\"wavpack\")\n")) + (("local json = Compile.+$") + "local json = nil +settings.link.libs:Add(\"jsonparser\")") + (("local png = Compile.+$") + "local png = nil +settings.link.libs:Add(\"pnglite\")") + (("local wavpack = Compile.+$") + "local wavpack = nil +settings.link.libs:Add(\"wavpack\")") + (("if config\\.zlib\\.value == 1") + "if config.zlib.value")) + (substitute* "src/engine/client/graphics_threaded.cpp" + (("engine/external/pnglite/pnglite\\.h") + "pnglite.h")) (substitute* "src/engine/client/sound.cpp" - (("#include ") - "#include ")) + (("engine/external/wavpack/wavpack\\.h") + "wavpack/wavpack.h")) + (for-each use-latest-json-parser + '("src/game/client/components/countryflags.cpp" + "src/game/client/components/menus_settings.cpp" + "src/game/client/components/skins.cpp" + "src/game/client/localization.cpp" + "src/game/editor/auto_map.h" + "src/game/editor/editor.cpp")) #t)) (replace 'build (lambda _ - (zero? (system* "bam" "-a" "-v" "release")))) + (invoke "bam" "-a" "-v" "conf=release"))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (data (string-append out "/share/teeworlds/data"))) - (mkdir-p bin) - (mkdir-p data) - (for-each (lambda (file) - (install-file file bin)) - '("teeworlds" "teeworlds_srv")) - (copy-recursively "data" data) + (let* ((arch ,(system->linux-architecture + (or (%current-target-system) + (%current-system)))) + (build (string-append "build/" arch "/release/")) + (data-built (string-append build "data/")) + (out (assoc-ref outputs "out")) + (bin (string-append out "/bin/")) + (data (string-append out "/share/teeworlds/data/"))) + (for-each (cut install-file <> bin) + (map (cut string-append build <>) + '("teeworlds" "teeworlds_srv"))) + (copy-recursively data-built data) #t)))))) - ;; FIXME: teeworlds bundles the sources of "pnglite", a two-file PNG - ;; library without a build system. (inputs `(("freetype" ,freetype) ("glu" ,glu) + ("json-parser" ,json-parser) ("mesa" ,mesa) - ("sdl-union" ,(sdl-union (list sdl - sdl-mixer - sdl-image))) + ("pnglite" ,pnglite) + ("sdl2" ,sdl2) + ("sdl2-image" ,sdl2-image) + ("sdl2-mixer" ,sdl2-mixer) ("wavpack" ,wavpack) ("zlib" ,zlib))) (native-inputs `(("bam" ,bam) - ("python" ,python-2) + ("python" ,python-wrapper) ("pkg-config" ,pkg-config))) (home-page "https://www.teeworlds.com") (synopsis "2D retro multiplayer shooter game") diff --git a/gnu/packages/patches/teeworlds-use-latest-wavpack.patch b/gnu/packages/patches/teeworlds-use-latest-wavpack.patch index e9fd991087..3ad1340d2e 100644 --- a/gnu/packages/patches/teeworlds-use-latest-wavpack.patch +++ b/gnu/packages/patches/teeworlds-use-latest-wavpack.patch @@ -1,10 +1,20 @@ -Downloaded from https://anonscm.debian.org/cgit/pkg-games/teeworlds.git/plain/debian/patches/new-wavpack.patch. +Downloaded from https://salsa.debian.org/games-team/teeworlds/raw/master/debian/patches/new-wavpack.patch. -This patch lets us build teeworlds with wavpack 5.1.0. +From: Markus Koschany +Date: Thu, 25 Oct 2018 20:52:27 +0200 +Subject: new-wavpack +Make wavpack compatible with Debian's version. +--- + src/engine/client/sound.cpp | 33 +++++++++++++++------------------ + src/engine/client/sound.h | 4 ---- + 2 files changed, 15 insertions(+), 22 deletions(-) + +diff --git a/src/engine/client/sound.cpp b/src/engine/client/sound.cpp +index 048ec24..80de3c5 100644 --- a/src/engine/client/sound.cpp +++ b/src/engine/client/sound.cpp -@@ -328,17 +328,14 @@ void CSound::RateConvert(int SampleID) +@@ -325,10 +325,6 @@ void CSound::RateConvert(int SampleID) pSample->m_NumFrames = NumFrames; } @@ -12,10 +22,10 @@ This patch lets us build teeworlds with wavpack 5.1.0. -{ - return io_read(ms_File, pBuffer, Size); -} -- - int CSound::LoadWV(const char *pFilename) + + ISound::CSampleHandle CSound::LoadWV(const char *pFilename) { - CSample *pSample; +@@ -336,6 +332,8 @@ ISound::CSampleHandle CSound::LoadWV(const char *pFilename) int SampleID = -1; char aError[100]; WavpackContext *pContext; @@ -24,17 +34,18 @@ This patch lets us build teeworlds with wavpack 5.1.0. // don't waste memory on sound when we are stress testing if(g_Config.m_DbgStress) -@@ -351,19 +348,23 @@ int CSound::LoadWV(const char *pFilename - if(!m_pStorage) - return -1; +@@ -349,25 +347,29 @@ ISound::CSampleHandle CSound::LoadWV(const char *pFilename) + return CSampleHandle(); + lock_wait(m_SoundLock); - ms_File = m_pStorage->OpenFile(pFilename, IOFLAG_READ, IStorage::TYPE_ALL); - if(!ms_File) + File = m_pStorage->OpenFile(pFilename, IOFLAG_READ, IStorage::TYPE_ALL, aWholePath, sizeof(aWholePath)); + if(!File) { dbg_msg("sound/wv", "failed to open file. filename='%s'", pFilename); - return -1; + lock_unlock(m_SoundLock); + return CSampleHandle(); } + else + { @@ -43,7 +54,14 @@ This patch lets us build teeworlds with wavpack 5.1.0. SampleID = AllocID(); if(SampleID < 0) - return -1; + { +- io_close(ms_File); +- ms_File = 0; ++ io_close(File); ++ File = 0; + lock_unlock(m_SoundLock); + return CSampleHandle(); + } pSample = &m_aSamples[SampleID]; - pContext = WavpackOpenFileInput(ReadData, aError); @@ -51,7 +69,29 @@ This patch lets us build teeworlds with wavpack 5.1.0. if (pContext) { int m_aSamples = WavpackGetNumSamples(pContext); -@@ -419,9 +420,6 @@ int CSound::LoadWV(const char *pFilename +@@ -385,8 +387,8 @@ ISound::CSampleHandle CSound::LoadWV(const char *pFilename) + if(pSample->m_Channels > 2) + { + dbg_msg("sound/wv", "file is not mono or stereo. filename='%s'", pFilename); +- io_close(ms_File); +- ms_File = 0; ++ io_close(File); ++ File = 0; + lock_unlock(m_SoundLock); + return CSampleHandle(); + } +@@ -401,8 +403,8 @@ ISound::CSampleHandle CSound::LoadWV(const char *pFilename) + if(BitsPerSample != 16) + { + dbg_msg("sound/wv", "bps is %d, not 16, filname='%s'", BitsPerSample, pFilename); +- io_close(ms_File); +- ms_File = 0; ++ io_close(File); ++ File = 0; + lock_unlock(m_SoundLock); + return CSampleHandle(); + } +@@ -429,9 +431,6 @@ ISound::CSampleHandle CSound::LoadWV(const char *pFilename) dbg_msg("sound/wv", "failed to open %s: %s", pFilename, aError); } @@ -61,14 +101,16 @@ This patch lets us build teeworlds with wavpack 5.1.0. if(g_Config.m_Debug) dbg_msg("sound/wv", "loaded %s", pFilename); -@@ -527,7 +525,5 @@ void CSound::StopAll() - lock_unlock(m_SoundLock); +@@ -560,7 +559,5 @@ bool CSound::IsPlaying(CSampleHandle SampleID) + return Ret; } -IOHANDLE CSound::ms_File = 0; - IEngineSound *CreateEngineSound() { return new CSound; } +diff --git a/src/engine/client/sound.h b/src/engine/client/sound.h +index ff357c0..cec2cde 100644 --- a/src/engine/client/sound.h +++ b/src/engine/client/sound.h @@ -21,10 +21,6 @@ public: @@ -81,4 +123,4 @@ This patch lets us build teeworlds with wavpack 5.1.0. - virtual bool IsSoundEnabled() { return m_SoundEnabled != 0; } - virtual int LoadWV(const char *pFilename); + virtual CSampleHandle LoadWV(const char *pFilename); -- cgit v1.2.3 From aa9eb25983b0f5a7145e85843a436f7396778b57 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 21 Nov 2018 22:23:47 +0100 Subject: gnu: feh: Update to 3.1. * gnu/packages/image-viewers.scm (feh): Update to 3.1. --- gnu/packages/image-viewers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 029d5b5443..fce2b021bd 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -60,7 +60,7 @@ (define-public feh (package (name "feh") - (version "3.0") + (version "3.1") (home-page "https://feh.finalrewind.org/") (source (origin (method url-fetch) @@ -68,7 +68,7 @@ name "-" version ".tar.bz2")) (sha256 (base32 - "00fwf8yz7k8vzd30ly5ndlj6ax9w85dkjzjnlk95vd0zdrf4wyxn")))) + "01rrl009m1kxwvqqr98y4wk8m1al18fkxwv8cds2k7n4qiv6xdb7")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (delete 'configure)) -- cgit v1.2.3 From dca7d8a25cf6eb2e4c2c0c77a65002a4aaa58ea1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 21 Nov 2018 22:24:35 +0100 Subject: gnu: git: Update to 2.19.2. * gnu/packages/version-control.scm (git): Update to 2.19.2. --- gnu/packages/version-control.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index e0ad6248a5..ecd5789397 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -146,14 +146,14 @@ as well as the classic centralized workflow.") (name "git") ;; XXX When updating Git, check if the special 'git-source' input to cgit ;; needs to be updated as well. - (version "2.19.1") + (version "2.19.2") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/scm/git/git-" version ".tar.xz")) (sha256 (base32 - "1dfv43lmdnxz42504jc89sihbv1d4d6kgqcz3c5ji140kfm5cl1l")))) + "1scbggzghkzzfqg4ky3qh7h9w87c3zya4ls5disz7dbx56is7sgw")))) (build-system gnu-build-system) (native-inputs `(("native-perl" ,perl) @@ -166,7 +166,7 @@ as well as the classic centralized workflow.") version ".tar.xz")) (sha256 (base32 - "1vn6pi9yvw7rnb9dvi1yjrvv39fqd1m9mwbaffqwizs3gaf91br7")))) + "1sqhllkabylm46paswg0j54fiar44fmcdmkjkysmjn2gj6hqpz95")))) ;; For subtree documentation. ("asciidoc" ,asciidoc) ("docbook-xsl" ,docbook-xsl) -- cgit v1.2.3 From da15325e3650bff11a17320fdbd5f4b1ca71598f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 21 Nov 2018 22:24:51 +0100 Subject: gnu: webkitgtk: Update to 2.22.4. * gnu/packages/webkit.scm (webkitgtk-2.22): Update to 2.22.4. --- gnu/packages/webkit.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 82f03c7f94..b56cdd8938 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -168,14 +168,14 @@ HTML/CSS applications to full-fledged web browsers.") (define-public webkitgtk-2.22 (package/inherit webkitgtk (name "webkitgtk") - (version "2.22.3") + (version "2.22.4") (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" name "-" version ".tar.xz")) (sha256 (base32 - "0wnddhm2bihmmkmi919lyxskvjk2wrzx6azkiypyjfwm08lm9zcx")))) + "1f2335hjzsvjxjf6hy5cyypsn65wykpx2pbk1sp548w0hclbxdgs")))) (native-inputs `(("gcc" ,gcc-7) ; webkitgtk-2.22 requires gcc-6 or newer ,@(package-native-inputs webkitgtk))) -- cgit v1.2.3 From b96386501f24cd40c9c63f50fbb2704ffbf7565c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 21 Nov 2018 22:42:25 +0100 Subject: gnu: python-numpy: Update to 1.14.6. * gnu/packages/python.scm (python-numpy): Update to 1.14.6. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c3d3c02684..bf3a939570 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3004,7 +3004,7 @@ between language specification and implementation aspects.") (define-public python-numpy (package (name "python-numpy") - (version "1.14.5") + (version "1.14.6") (source (origin (method url-fetch) @@ -3013,7 +3013,7 @@ between language specification and implementation aspects.") version "/numpy-" version ".tar.gz")) (sha256 (base32 - "0admjpkih63lm19zbbilq8ck4f6ny5kqi03dk3m6b2mnixsh4jhv")))) + "1k426vnmmd4pds09zgn75g6w92823ry75zrzwjhzjvg7s63ipc31")))) (build-system python-build-system) (inputs `(("openblas" ,openblas) -- cgit v1.2.3 From afd90f8d62de252931be9c1fa3a5c6e3b1074b04 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 21 Nov 2018 22:57:14 +0100 Subject: gnu: vte-ng: Add a home page. * gnu/packages/gnome.scm (vte-ng)[home-page]: New field. --- gnu/packages/gnome.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4a118fe0fc..1420a55f24 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2116,6 +2116,7 @@ editors, IDEs, etc.") (inherit vte) (name "vte-ng") (version "0.52.2.a") + (home-page "https://github.com/thestinger/vte-ng") (native-inputs `(("gtk-doc" ,gtk-doc) ("gperf" ,gperf) -- cgit v1.2.3 From 6bc00737b067617481ca207fc8e6aaa6fe441b3a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 21 Nov 2018 22:57:48 +0100 Subject: gnu: vte-ng: Fetch source using git. * gnu/packages/gnome.scm (vte-ng)[source]: Rewrite in terms of GIT-FETCH. --- gnu/packages/gnome.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1420a55f24..692e3dedef 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2117,6 +2117,13 @@ editors, IDEs, etc.") (name "vte-ng") (version "0.52.2.a") (home-page "https://github.com/thestinger/vte-ng") + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1csmjrw3c2avh711xcrn3khqwp4cwz97c3fmyirq2rg0hndng4s3")))) (native-inputs `(("gtk-doc" ,gtk-doc) ("gperf" ,gperf) @@ -2124,14 +2131,6 @@ editors, IDEs, etc.") ("automake" ,automake) ("libtool" ,libtool) ,@(package-native-inputs vte))) - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/thestinger/" - name "/archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1fd65mk7c87k03vhnb2ixkjvv9nja04mfq813iyjji1b11f2sh7v")))) (arguments `(#:phases (modify-phases %standard-phases (replace 'bootstrap -- cgit v1.2.3 From b069c30b52c7c9e2609d3a2f93cc561119932d0d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 21 Nov 2018 22:59:27 +0100 Subject: gnu: vte-ng: Update to 0.54.2.a. * gnu/packages/gnome.scm (vte-ng): Update to 0.54.2.a. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 692e3dedef..06ec28b342 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2115,7 +2115,7 @@ editors, IDEs, etc.") (package (inherit vte) (name "vte-ng") - (version "0.52.2.a") + (version "0.54.2.a") (home-page "https://github.com/thestinger/vte-ng") (source (origin (method git-fetch) @@ -2123,7 +2123,7 @@ editors, IDEs, etc.") (file-name (git-file-name name version)) (sha256 (base32 - "1csmjrw3c2avh711xcrn3khqwp4cwz97c3fmyirq2rg0hndng4s3")))) + "1r7d9m07cpdr4f7rw3yx33hmp4jmsk0dn5byq5wgksb2qjbc4ags")))) (native-inputs `(("gtk-doc" ,gtk-doc) ("gperf" ,gperf) -- cgit v1.2.3 From b344a3a9376f01c45985392f200c90a2526e8479 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 21 Nov 2018 23:01:38 +0100 Subject: gnu: termite: Update to 14. * gnu/packages/terminals.scm (termite): Update to 14. --- gnu/packages/terminals.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 116377c8fa..0f11fa650a 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -104,7 +104,7 @@ configurable through a graphical wizard.") (define-public termite (package (name "termite") - (version "13") + (version "14") (source (origin (method git-fetch) @@ -116,7 +116,7 @@ configurable through a graphical wizard.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "02cn70ygl93ghhkhs3xdxn5b1yadc255v3yp8cmhhyzsv5027hvj")))) + "0dmz9rpc2fdvcwhcmjnhb48ixn403gxpq03g334d1hgjw2hsyx7x")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From d9f8e846b69fc89356d9497c0a51c53cb2e53a5e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 21 Nov 2018 23:06:08 +0100 Subject: gnu: mbedtls-apache: Update to 2.14.0. * gnu/packages/tls.scm (mbedtls-apache): Update to 2.14.0. --- gnu/packages/tls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 6c2c11501f..2da4874e79 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -842,7 +842,7 @@ then ported to the GNU / Linux environment.") (define-public mbedtls-apache (package (name "mbedtls-apache") - (version "2.13.0") + (version "2.14.0") (source (origin (method url-fetch) @@ -852,7 +852,7 @@ then ported to the GNU / Linux environment.") version "-apache.tgz")) (sha256 (base32 - "1nh6xfyxs3mnnpgc6pancvdhv6ihz9lhsxdlg90gqa8n5r6lwfsr")))) + "0bf8mf8w5dyikbwpckcxgdi0l086adk7pailqds10bkzrcg59y42")))) (build-system cmake-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 148caae0499028c12a0f51ca2f435124c06d46ee Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 21 Nov 2018 22:43:40 +0100 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From d422cbb3d6a1cc7e4553a2335b113475a05d68ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 21 Nov 2018 16:19:09 +0100 Subject: linux-initrd: 'expression->initrd' returns the complete file name. Previously 'expression->initrd' would return the directory that contains the 'initrd' file; now it returns the complete file name for that file. * gnu/system/linux-initrd.scm (expression->initrd)[builder]: Change output file name to "initrd.cpio.gz". Tail-call 'file-append' to return the complete file name. * gnu/system.scm (operating-system-initrd-file): Remove 'file-append' call. * gnu/build/linux-initrd.scm (write-cpio-archive): Check whether OUTPUT already has the ".gz" suffix; rename if before invoking GZIP if it does, and otherwise after. * gnu/system/vm.scm (expression->derivation-in-linux-vm)[builder]: Do not append "/initrd" to #$initrd. --- gnu/build/linux-initrd.scm | 22 +++++++++++++++++----- gnu/system.scm | 11 +++++------ gnu/system/linux-initrd.scm | 9 +++++---- gnu/system/vm.scm | 2 +- 4 files changed, 28 insertions(+), 16 deletions(-) (limited to 'gnu') diff --git a/gnu/build/linux-initrd.scm b/gnu/build/linux-initrd.scm index fb8a1f5b2b..3aaa06d3a0 100644 --- a/gnu/build/linux-initrd.scm +++ b/gnu/build/linux-initrd.scm @@ -72,11 +72,23 @@ COMPRESS? is true, compress it using GZIP. On success, return OUTPUT." #:file->header cpio:file->cpio-header*))) (or (not compress?) - ;; Use '--no-name' so that gzip records neither a file name nor a time - ;; stamp in its output. - (and (zero? (system* gzip "--best" "--no-name" output)) - (rename-file (string-append output ".gz") - output)) + + ;; Gzip insists on adding a '.gz' suffix and does nothing if the input + ;; file already has that suffix. Shuffle files around to placate it. + (let* ((gz-suffix? (string-suffix? ".gz" output)) + (sans-gz (if gz-suffix? + (string-drop-right output 3) + output))) + (when gz-suffix? + (rename-file output sans-gz)) + ;; Use '--no-name' so that gzip records neither a file name nor a time + ;; stamp in its output. + (and (zero? (system* gzip "--best" "--no-name" sans-gz)) + (begin + (unless gz-suffix? + (rename-file (string-append output ".gz") output)) + output))) + output)) (define (cache-compiled-file-name file) diff --git a/gnu/system.scm b/gnu/system.scm index 1766c8f90f..a5a8f40d66 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -870,12 +870,11 @@ hardware-related operations as necessary when booting a Linux container." (define make-initrd (operating-system-initrd os)) - (let ((initrd (make-initrd boot-file-systems - #:linux (operating-system-kernel os) - #:linux-modules - (operating-system-initrd-modules os) - #:mapped-devices mapped-devices))) - (file-append initrd "/initrd"))) + (make-initrd boot-file-systems + #:linux (operating-system-kernel os) + #:linux-modules + (operating-system-initrd-modules os) + #:mapped-devices mapped-devices)) (define (locale-name->definition* name) "Variant of 'locale-name->definition' that raises an error upon failure." diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index a53d3cb106..983c6d81c8 100644 --- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -91,16 +91,17 @@ the derivations referenced by EXP are automatically copied to the initrd." (lambda (port) (simple-format port "~A\n" #$guile))) - (build-initrd (string-append #$output "/initrd") + (build-initrd (string-append #$output "/initrd.cpio.gz") #:guile #$guile #:init #$init ;; Copy everything INIT refers to into the initrd. #:references-graphs '("closure") #:gzip (string-append #$gzip "/bin/gzip"))))) - (computed-file name builder - #:options - `(#:references-graphs (("closure" ,init))))) + (file-append (computed-file name builder + #:options + `(#:references-graphs (("closure" ,init)))) + "/initrd.cpio.gz")) (define (flat-linux-module-directory linux modules) "Return a flat directory containing the Linux kernel modules listed in diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 8e310a1607..9400e6310d 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -213,7 +213,7 @@ made available under the /xchg CIFS share." (let* ((inputs '#$(list qemu (canonical-package coreutils))) (linux (string-append #$linux "/" #$(system-linux-image-file-name))) - (initrd (string-append #$initrd "/initrd")) + (initrd #$initrd) (loader #$loader) (graphs '#$(match references-graphs (((graph-files . _) ...) graph-files) -- cgit v1.2.3 From 437c78bcfb268fe9d4e6116b2eb083ed873215f4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 22 Nov 2018 00:00:44 +0100 Subject: 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(+) (limited to 'gnu') 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 -- cgit v1.2.3 From 910ac0effe886a5aa2b3315b43c01df3baff081d Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 22 Nov 2018 11:42:01 +0100 Subject: gnu: ccl: Properly include x86-headers and remove missing "contrib" folder. * gnu/packages/lisp.scm (ccl): Include x86-headers and remove missing "contrib" folder. [home-page]: Use HTTPS. --- gnu/packages/lisp.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index d401e5c456..c0f8ff0204 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -533,8 +533,13 @@ statistical profiler, a code coverage tool, and many other extensions.") (install-file kernel libdir) (install-file heap libdir) - (let ((dirs '("lib" "library" "examples" "contrib" - "tools" "objc-bridge"))) + (let ((dirs '("lib" "library" "examples" "tools" "objc-bridge" + ,@(match (%current-system) + ("x86_64-linux" + '("x86-headers64")) + ("i686-linux" + '("x86-headers")) + (_ '()))))) (for-each copy-recursively dirs (map (cut string-append libdir <>) dirs))) @@ -551,7 +556,7 @@ statistical profiler, a code coverage tool, and many other extensions.") (chmod wrapper #o755)) #t))))) (supported-systems '("i686-linux" "x86_64-linux" "armhf-linux")) - (home-page "http://ccl.clozure.com/") + (home-page "https://ccl.clozure.com/") (synopsis "Common Lisp implementation") (description "Clozure CL (often called CCL for short) is a Common Lisp implementation featuring fast compilation speed, native threads, a precise, -- cgit v1.2.3 From 90d5ec55aeb30d08ac109184fc83f1059b34d038 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 15 Oct 2018 23:10:11 +0200 Subject: gnu: giac-xcas: Update to 1.5.0-19. * gnu/packages/algebra.scm (giac-xcas): Update to 1.5.0-19. --- gnu/packages/algebra.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 103594364e..fdae3ac55b 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -243,7 +243,7 @@ precision.") (define-public giac-xcas (package (name "giac-xcas") - (version "1.4.9-59") + (version "1.5.0-19") (source (origin (method url-fetch) ;; "~parisse/giac" is not used because the maintainer regularly @@ -255,16 +255,22 @@ precision.") "source/giac_" version ".tar.gz")) (sha256 (base32 - "0dv5p5y6gkrsmz3xa7fw87rjyabwdwk09mqb09kb7gai9n9dgayk")))) + "0ds1zh712sr20qh0fih8jnm4nlv90andllp8n263qs7rlhblz551")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases (add-after 'unpack 'patch-bin-cp + ;; Some Makefiles contain hard-coded "/bin/cp". (lambda _ - ;; Some Makefiles contain hard-coded "/bin/cp". (substitute* (find-files "doc" "^Makefile") (("/bin/cp") (which "cp"))) + #t)) + (add-after 'unpack 'disable-failing-test + ;; FIXME: Test failing. Not sure why. + (lambda _ + (substitute* "check/Makefile.in" + (("chk_fhan11") "")) #t))))) (inputs `(("fltk" ,fltk) -- cgit v1.2.3 From af90cc45aec1aa03ce25feae403e5d7eb90a9a01 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 21 Oct 2018 21:12:00 +0200 Subject: gnu: giac-xcas: Add a "doc" output * gnu/packages/algebra.scm (giac-xcas): Add "doc" output. [arguments]: Add phase to install documentation in the appropriate directory. --- gnu/packages/algebra.scm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index fdae3ac55b..cc1a8f25d0 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -257,8 +257,12 @@ precision.") (base32 "0ds1zh712sr20qh0fih8jnm4nlv90andllp8n263qs7rlhblz551")))) (build-system gnu-build-system) + (outputs '("out" "doc")) ;77MiB of documentation (arguments - `(#:phases + `(#:modules ((ice-9 ftw) + (guix build utils) + (guix build gnu-build-system)) + #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-bin-cp ;; Some Makefiles contain hard-coded "/bin/cp". @@ -271,6 +275,28 @@ precision.") (lambda _ (substitute* "check/Makefile.in" (("chk_fhan11") "")) + #t)) + (add-after 'install 'install-doc + ;; Setting --docdir to "doc" output isn't sufficient as + ;; documentation and examples are scattered throughout the source. + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc")) + (docdir (string-append doc + "/share/doc/" + (string-append ,name "-" ,version)))) + ;; For some reason, the install process moves + ;; "share/giac/examples" instead of "share/giac/doc" to + ;; "$(docdir)". Clean up the mess and start over. + (delete-file-recursively (string-append doc "/share")) + (mkdir-p docdir) + (with-directory-excursion out + (for-each (lambda (f) + (unless (member f '("." "..")) + (copy-recursively (string-append "share/giac/" f) + (string-append docdir "/" f)))) + (scandir "share/giac")) + (delete-file-recursively "share/giac"))) #t))))) (inputs `(("fltk" ,fltk) -- cgit v1.2.3 From 561e3c1d0db2089bde24a7b2c5413cdbea2d48ac Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 22 Nov 2018 13:00:15 +0100 Subject: gnu: supercollider: Update to 3.9.3. * gnu/packages/audio.scm (supercollider): Update to 3.9.3. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 52769921ee..45d20ca46a 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2174,7 +2174,7 @@ background file post-processing.") (define-public supercollider (package (name "supercollider") - (version "3.9.2") + (version "3.9.3") (source (origin (method url-fetch) (uri (string-append @@ -2183,7 +2183,7 @@ background file post-processing.") "/SuperCollider-" version "-Source-linux.tar.bz2")) (sha256 (base32 - "0d3cb6dw8jz7ijriqn3rlwin24gffczp69hl17pzxj1d5w57yj44")))) + "1d8ixfl100jvlialxdizp8wqsl1mp5pi2bam25vp97bhjd59cfdr")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-DSYSTEM_BOOST=on" "-DSYSTEM_YAMLCPP=on" -- cgit v1.2.3 From 7ff3f3d22caaf03948a60ae691313db28f4fab06 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 22 Nov 2018 01:47:36 +0100 Subject: 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 +++++----------------- ...hon-scikit-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 (limited to 'gnu') 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 -- cgit v1.2.3 From e3a2dd5559180c3ed28b5be7ca1db49e3b184213 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sat, 28 Jul 2018 17:27:26 +0530 Subject: gnu: gajim: Rename wrap-program phases. * gnu/packages/messaging.scm (gajim)[arguments]: Rename wrap-program phases to wrap-gi-typelib-path and wrap-gsettings-schema-dir. --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index c22cacfd36..e34f725a40 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -588,7 +588,7 @@ was initially a fork of xmpppy, but uses non-blocking sockets.") `(#:test-target "test_nogui" #:phases (modify-phases %standard-phases - (add-after 'install 'wrap-program + (add-after 'install 'wrap-gi-typelib-path (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (for-each @@ -616,7 +616,7 @@ was initially a fork of xmpppy, but uses non-blocking sockets.") (symlink adwaita "Adwaita") (copy-recursively hicolor "hicolor"))) #t)) - (add-after 'install-icons 'wrap-program + (add-after 'install-icons 'wrap-gsettings-schema-dir (lambda* (#:key inputs outputs #:allow-other-keys) (wrap-program (string-append (assoc-ref outputs "out") "/bin/gajim") -- cgit v1.2.3 From eff8e0b4d9d4b818150f64e151227e03fdcb5aab Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 22 Nov 2018 19:39:07 +0100 Subject: gnu: ccl: Fix missing command line argument support in wrapper. * gnu/packages/lisp.scm (ccl): Fix missing command line argument support in wrapper. --- gnu/packages/lisp.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index c0f8ff0204..caa90d5a0a 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -550,9 +550,8 @@ statistical profiler, a code coverage tool, and many other extensions.") (display (string-append "#!" bash "/bin/sh\n" - "CCL_DEFAULT_DIRECTORY=" libdir "\n" - "export CCL_DEFAULT_DIRECTORY\n" - "exec " libdir kernel "\n")))) + "export CCL_DEFAULT_DIRECTORY=" libdir "\n" + "exec -a \"$0\" " libdir kernel " \"$@\"\n")))) (chmod wrapper #o755)) #t))))) (supported-systems '("i686-linux" "x86_64-linux" "armhf-linux")) -- cgit v1.2.3 From 691d39a267be141edbafce77472afd2415b12cd4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 22 Nov 2018 22:06:15 +0200 Subject: 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(+) (limited to 'gnu') 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 -- cgit v1.2.3 From 37751b480fccde4db000fc4072f5e23af46fa829 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 22 Nov 2018 21:55:29 +0100 Subject: 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 (limited to 'gnu') 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) -- cgit v1.2.3 From 74e35e8c94193a03cb1db61934340540ce0884a3 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Tue, 20 Nov 2018 16:32:16 -0800 Subject: gnu: Add u-boot-pinebook. * gnu/packages/patches/u-boot-pinebook-a64-update-dts.patch: New file. * gnu/packages/patches/u-boot-pinebook-syscon-node.patch: New file. * gnu/packages/patches/u-boot-pinebook-mmc-calibration.patch: New file. * gnu/packages/patches/u-boot-pinebook-video-bridge.patch: New file. * gnu/packages/patches/u-boot-pinebook-r_i2c-controller.patch: New file. * gnu/packages/patches/u-boot-pinebook-dts.patch: New file. * gnu/local.mk (dist_patch_DATA): Add them. * gnu/packages/bootloaders.scm (u-boot-pinebook): New exported variable. * gnu/bootloader/u-boot.scm (u-boot-pinebook-bootloader): New exported variable. * gnu/system/install.scm (pinebook-installation-os): New exported variable. --- gnu/bootloader/u-boot.scm | 6 + gnu/local.mk | 6 + gnu/packages/bootloaders.scm | 16 + .../patches/u-boot-pinebook-a64-update-dts.patch | 1485 ++++++++++++++++++++ gnu/packages/patches/u-boot-pinebook-dts.patch | 388 +++++ .../patches/u-boot-pinebook-mmc-calibration.patch | 98 ++ .../patches/u-boot-pinebook-r_i2c-controller.patch | 70 + .../patches/u-boot-pinebook-syscon-node.patch | 38 + .../patches/u-boot-pinebook-video-bridge.patch | 50 + gnu/system/install.scm | 6 + 10 files changed, 2163 insertions(+) create mode 100644 gnu/packages/patches/u-boot-pinebook-a64-update-dts.patch create mode 100644 gnu/packages/patches/u-boot-pinebook-dts.patch create mode 100644 gnu/packages/patches/u-boot-pinebook-mmc-calibration.patch create mode 100644 gnu/packages/patches/u-boot-pinebook-r_i2c-controller.patch create mode 100644 gnu/packages/patches/u-boot-pinebook-syscon-node.patch create mode 100644 gnu/packages/patches/u-boot-pinebook-video-bridge.patch (limited to 'gnu') diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm index b5fab14e14..1c6f322bc4 100644 --- a/gnu/bootloader/u-boot.scm +++ b/gnu/bootloader/u-boot.scm @@ -32,6 +32,7 @@ u-boot-nintendo-nes-classic-edition-bootloader u-boot-novena-bootloader u-boot-pine64-plus-bootloader + u-boot-pinebook-bootloader u-boot-puma-rk3399-bootloader u-boot-wandboard-bootloader)) @@ -168,6 +169,11 @@ (inherit u-boot-allwinner64-bootloader) (package u-boot-pine64-plus))) +(define u-boot-pinebook-bootloader + (bootloader + (inherit u-boot-allwinner64-bootloader) + (package u-boot-pinebook))) + (define u-boot-puma-rk3399-bootloader (bootloader (inherit u-boot-bootloader) diff --git a/gnu/local.mk b/gnu/local.mk index 7fc8fb0620..c56278e933 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1186,6 +1186,12 @@ dist_patch_DATA = \ %D%/packages/patches/totem-meson-easy-codec.patch \ %D%/packages/patches/tuxpaint-stamps-path.patch \ %D%/packages/patches/twinkle-include-qregexpvalidator.patch \ + %D%/packages/patches/u-boot-pinebook-a64-update-dts.patch \ + %D%/packages/patches/u-boot-pinebook-mmc-calibration.patch \ + %D%/packages/patches/u-boot-pinebook-r_i2c-controller.patch \ + %D%/packages/patches/u-boot-pinebook-dts.patch \ + %D%/packages/patches/u-boot-pinebook-syscon-node.patch \ + %D%/packages/patches/u-boot-pinebook-video-bridge.patch \ %D%/packages/patches/unrtf-CVE-2016-10091.patch \ %D%/packages/patches/unzip-CVE-2014-8139.patch \ %D%/packages/patches/unzip-CVE-2014-8140.patch \ diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 328e834bc2..0c11639150 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -579,6 +579,22 @@ board-independent tools."))) (define-public u-boot-pine64-plus (make-u-boot-sunxi64-package "pine64_plus" "aarch64-linux-gnu")) +(define-public u-boot-pinebook + (let ((base (make-u-boot-sunxi64-package "pinebook" "aarch64-linux-gnu"))) + (package + (inherit base) + (source (origin + (inherit (package-source u-boot)) + (patches (search-patches + ;; Add patches to enable Pinebook support from sunxi + ;; maintainer tree: git://git.denx.de/u-boot-sunxi.git + "u-boot-pinebook-a64-update-dts.patch" + "u-boot-pinebook-syscon-node.patch" + "u-boot-pinebook-mmc-calibration.patch" + "u-boot-pinebook-video-bridge.patch" + "u-boot-pinebook-r_i2c-controller.patch" + "u-boot-pinebook-dts.patch"))))))) + (define-public u-boot-bananapi-m2-ultra (make-u-boot-package "Bananapi_M2_Ultra" "arm-linux-gnueabihf")) diff --git a/gnu/packages/patches/u-boot-pinebook-a64-update-dts.patch b/gnu/packages/patches/u-boot-pinebook-a64-update-dts.patch new file mode 100644 index 0000000000..9d0a08c8bf --- /dev/null +++ b/gnu/packages/patches/u-boot-pinebook-a64-update-dts.patch @@ -0,0 +1,1485 @@ +From 1b39a1834ed182bbd8036a5cd74a9ea111fa4691 Mon Sep 17 00:00:00 2001 +From: Andre Przywara +Date: Mon, 29 Oct 2018 00:56:47 +0000 +Subject: [PATCH 03/13] sunxi: A64: Update .dts/.dtsi files +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Update the .dts/.dtsi file from the Linux sunxi/dt64-for-4.20 tree: +commit 679294497be31596e1c9c61507746d72b6b05f26 +Author: Rodrigo Exterckötter Tjäder +Date: Wed Sep 26 19:48:24 2018 +0000 + arm64: dts: allwinner: a64: a64-olinuxino: set the PHY TX delay + +Signed-off-by: Andre Przywara +Acked-by: Maxime Ripard +Reviewed-by: Jagan Teki +--- + arch/arm/dts/sun50i-a64-amarula-relic.dts | 168 +++++++++++++- + arch/arm/dts/sun50i-a64-bananapi-m64.dts | 34 ++- + arch/arm/dts/sun50i-a64-nanopi-a64.dts | 89 +++++++- + arch/arm/dts/sun50i-a64-olinuxino.dts | 103 ++++++++- + arch/arm/dts/sun50i-a64-orangepi-win.dts | 179 ++++++++++++++- + arch/arm/dts/sun50i-a64-pine64.dts | 32 ++- + arch/arm/dts/sun50i-a64-sopine-baseboard.dts | 32 ++- + arch/arm/dts/sun50i-a64-sopine.dtsi | 15 ++ + arch/arm/dts/sun50i-a64.dtsi | 313 +++++++++++++++++++++++++-- + 9 files changed, 920 insertions(+), 45 deletions(-) + +diff --git a/arch/arm/dts/sun50i-a64-amarula-relic.dts b/arch/arm/dts/sun50i-a64-amarula-relic.dts +index f3b4e93ece..6cb2b7f0c8 100644 +--- a/arch/arm/dts/sun50i-a64-amarula-relic.dts ++++ b/arch/arm/dts/sun50i-a64-amarula-relic.dts +@@ -22,11 +22,11 @@ + stdout-path = "serial0:115200n8"; + }; + +- reg_vcc3v3: vcc3v3 { +- compatible = "regulator-fixed"; +- regulator-name = "vcc3v3"; +- regulator-min-microvolt = <3300000>; +- regulator-max-microvolt = <3300000>; ++ wifi_pwrseq: wifi-pwrseq { ++ compatible = "mmc-pwrseq-simple"; ++ clocks = <&rtc 1>; ++ clock-names = "ext_clock"; ++ reset-gpios = <&r_pio 0 2 GPIO_ACTIVE_LOW>; /* WL-PMU-EN: PL2 */ + }; + }; + +@@ -34,10 +34,34 @@ + status = "okay"; + }; + ++&mmc1 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&mmc1_pins>; ++ vmmc-supply = <®_dcdc1>; ++ /* ++ * Schematic shows both dldo4 and eldo1 connected for vcc-io-wifi, but ++ * dldo4 connection shows DNP(Do Not Populate) and eldo1 connected with ++ * 0Ohm register to vcc-io-wifi so eldo1 is used. ++ */ ++ vqmmc-supply = <®_eldo1>; ++ mmc-pwrseq = <&wifi_pwrseq>; ++ bus-width = <4>; ++ non-removable; ++ status = "okay"; ++ ++ brcmf: wifi@1 { ++ reg = <1>; ++ compatible = "brcm,bcm4329-fmac"; ++ interrupt-parent = <&r_pio>; ++ interrupts = <0 3 IRQ_TYPE_LEVEL_LOW>; /* WL-WAKE-AP: PL3 */ ++ interrupt-names = "host-wake"; ++ }; ++}; ++ + &mmc2 { + pinctrl-names = "default"; + pinctrl-0 = <&mmc2_pins>; +- vmmc-supply = <®_vcc3v3>; ++ vmmc-supply = <®_dcdc1>; + bus-width = <8>; + non-removable; + cap-mmc-hw-reset; +@@ -48,9 +72,138 @@ + status = "okay"; + }; + ++&r_rsb { ++ status = "okay"; ++ ++ axp803: pmic@3a3 { ++ compatible = "x-powers,axp803"; ++ reg = <0x3a3>; ++ interrupt-parent = <&r_intc>; ++ interrupts = <0 IRQ_TYPE_LEVEL_LOW>; ++ x-powers,drive-vbus-en; /* set N_VBUSEN as output pin */ ++ }; ++}; ++ ++#include "axp803.dtsi" ++ ++®_aldo1 { ++ regulator-always-on; ++ regulator-min-microvolt = <2800000>; ++ regulator-max-microvolt = <2800000>; ++ regulator-name = "avdd-csi"; ++}; ++ ++®_aldo2 { ++ regulator-always-on; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-name = "vcc-pl"; ++}; ++ ++®_aldo3 { ++ regulator-always-on; ++ regulator-min-microvolt = <3000000>; ++ regulator-max-microvolt = <3000000>; ++ regulator-name = "vcc-pll-avcc"; ++}; ++ ++®_dcdc1 { ++ regulator-always-on; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-name = "vcc-3v3"; ++}; ++ ++®_dcdc2 { ++ regulator-always-on; ++ regulator-min-microvolt = <1040000>; ++ regulator-max-microvolt = <1300000>; ++ regulator-name = "vdd-cpux"; ++}; ++ ++/* DCDC3 is polyphased with DCDC2 */ ++ ++®_dcdc5 { ++ regulator-always-on; ++ regulator-min-microvolt = <1500000>; ++ regulator-max-microvolt = <1500000>; ++ regulator-name = "vcc-dram"; ++}; ++ ++®_dcdc6 { ++ regulator-always-on; ++ regulator-min-microvolt = <1100000>; ++ regulator-max-microvolt = <1100000>; ++ regulator-name = "vdd-sys"; ++}; ++ ++®_dldo1 { ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-name = "vcc-hdmi-dsi-sensor"; ++}; ++ ++®_dldo2 { ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-name = "vcc-mipi"; ++}; ++ ++®_dldo3 { ++ regulator-min-microvolt = <2800000>; ++ regulator-max-microvolt = <2800000>; ++ regulator-name = "dovdd-csi"; ++}; ++ ++®_dldo4 { ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-name = "vcc-wifi-io"; ++}; ++ ++®_drivevbus { ++ regulator-name = "usb0-vbus"; ++ status = "okay"; ++}; ++ ++®_eldo1 { ++ regulator-always-on; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ regulator-name = "cpvdd"; ++}; ++ ++®_eldo3 { ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ regulator-name = "dvdd-csi"; ++}; ++ ++®_fldo1 { ++ regulator-min-microvolt = <1200000>; ++ regulator-max-microvolt = <1200000>; ++ regulator-name = "vcc-1v2-hsic"; ++}; ++ ++/* ++ * The A64 chip cannot work without this regulator off, although ++ * it seems to be only driving the AR100 core. ++ * Maybe we don't still know well about CPUs domain. ++ */ ++®_fldo2 { ++ regulator-always-on; ++ regulator-min-microvolt = <1100000>; ++ regulator-max-microvolt = <1100000>; ++ regulator-name = "vdd-cpus"; ++}; ++ ++®_rtc_ldo { ++ regulator-name = "vcc-rtc"; ++}; ++ + &uart0 { + pinctrl-names = "default"; +- pinctrl-0 = <&uart0_pins_a>; ++ pinctrl-0 = <&uart0_pb_pins>; + status = "okay"; + }; + +@@ -61,5 +214,6 @@ + + &usbphy { + usb0_id_det-gpios = <&pio 7 9 GPIO_ACTIVE_HIGH>; /* PH9 */ ++ usb0_vbus-supply = <®_drivevbus>; + status = "okay"; + }; +diff --git a/arch/arm/dts/sun50i-a64-bananapi-m64.dts b/arch/arm/dts/sun50i-a64-bananapi-m64.dts +index 0716b14411..ef1c90401b 100644 +--- a/arch/arm/dts/sun50i-a64-bananapi-m64.dts ++++ b/arch/arm/dts/sun50i-a64-bananapi-m64.dts +@@ -60,6 +60,17 @@ + stdout-path = "serial0:115200n8"; + }; + ++ hdmi-connector { ++ compatible = "hdmi-connector"; ++ type = "a"; ++ ++ port { ++ hdmi_con_in: endpoint { ++ remote-endpoint = <&hdmi_out_con>; ++ }; ++ }; ++ }; ++ + leds { + compatible = "gpio-leds"; + +@@ -86,6 +97,10 @@ + }; + }; + ++&de { ++ status = "okay"; ++}; ++ + &ehci0 { + status = "okay"; + }; +@@ -103,6 +118,17 @@ + status = "okay"; + }; + ++&hdmi { ++ hvcc-supply = <®_dldo1>; ++ status = "okay"; ++}; ++ ++&hdmi_out { ++ hdmi_out_con: endpoint { ++ remote-endpoint = <&hdmi_con_in>; ++ }; ++}; ++ + &i2c1 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c1_pins>; +@@ -151,7 +177,7 @@ + + &mmc2 { + pinctrl-names = "default"; +- pinctrl-0 = <&mmc2_pins>; ++ pinctrl-0 = <&mmc2_pins>, <&mmc2_ds_pin>; + vmmc-supply = <®_dcdc1>; + bus-width = <8>; + non-removable; +@@ -296,9 +322,13 @@ + regulator-name = "vcc-rtc"; + }; + ++&simplefb_hdmi { ++ vcc-hdmi-supply = <®_dldo1>; ++}; ++ + &uart0 { + pinctrl-names = "default"; +- pinctrl-0 = <&uart0_pins_a>; ++ pinctrl-0 = <&uart0_pb_pins>; + status = "okay"; + }; + +diff --git a/arch/arm/dts/sun50i-a64-nanopi-a64.dts b/arch/arm/dts/sun50i-a64-nanopi-a64.dts +index e2dce48fa2..31884dbc88 100644 +--- a/arch/arm/dts/sun50i-a64-nanopi-a64.dts ++++ b/arch/arm/dts/sun50i-a64-nanopi-a64.dts +@@ -51,12 +51,44 @@ + compatible = "friendlyarm,nanopi-a64", "allwinner,sun50i-a64"; + + aliases { ++ ethernet0 = &emac; + serial0 = &uart0; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; ++ ++ hdmi-connector { ++ compatible = "hdmi-connector"; ++ type = "a"; ++ ++ port { ++ hdmi_con_in: endpoint { ++ remote-endpoint = <&hdmi_out_con>; ++ }; ++ }; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ ++ blue { ++ label = "nanopi-a64:blue:status"; ++ gpios = <&pio 3 24 GPIO_ACTIVE_LOW>; /* PD24 */ ++ }; ++ }; ++ ++ wifi_pwrseq: wifi_pwrseq { ++ compatible = "mmc-pwrseq-simple"; ++ clocks = <&rtc 1>; ++ clock-names = "ext_clock"; ++ reset-gpios = <&r_pio 0 2 GPIO_ACTIVE_LOW>; /* PL2 */ ++ }; ++}; ++ ++&de { ++ status = "okay"; + }; + + &ehci0 { +@@ -67,6 +99,26 @@ + status = "okay"; + }; + ++&emac { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&rgmii_pins>; ++ phy-mode = "rgmii"; ++ phy-handle = <&ext_rgmii_phy>; ++ phy-supply = <®_dcdc1>; ++ status = "okay"; ++}; ++ ++&hdmi { ++ hvcc-supply = <®_dldo1>; ++ status = "okay"; ++}; ++ ++&hdmi_out { ++ hdmi_out_con: endpoint { ++ remote-endpoint = <&hdmi_con_in>; ++ }; ++}; ++ + /* i2c1 connected with gpio headers like pine64, bananapi */ + &i2c1 { + pinctrl-names = "default"; +@@ -78,6 +130,13 @@ + bias-pull-up; + }; + ++&mdio { ++ ext_rgmii_phy: ethernet-phy@1 { ++ compatible = "ethernet-phy-ieee802.3-c22"; ++ reg = <7>; ++ }; ++}; ++ + &mmc0 { + pinctrl-names = "default"; + pinctrl-0 = <&mmc0_pins>; +@@ -88,6 +147,24 @@ + status = "okay"; + }; + ++&mmc1 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&mmc1_pins>; ++ vmmc-supply = <®_dcdc1>; ++ vqmmc-supply = <®_dldo4>; ++ mmc-pwrseq = <&wifi_pwrseq>; ++ bus-width = <4>; ++ non-removable; ++ status = "okay"; ++ ++ rtl8189etv: wifi@1 { ++ reg = <1>; ++ interrupt-parent = <&r_pio>; ++ interrupts = <0 3 IRQ_TYPE_LEVEL_LOW>; /* PL3 */ ++ interrupt-names = "host-wake"; ++ }; ++}; ++ + &ohci0 { + status = "okay"; + }; +@@ -125,9 +202,9 @@ + + ®_dcdc1 { + regulator-always-on; +- regulator-min-microvolt = <3000000>; +- regulator-max-microvolt = <3000000>; +- regulator-name = "vcc-3v"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-name = "vcc-3v3"; + }; + + ®_dcdc2 { +@@ -195,9 +272,13 @@ + regulator-name = "vcc-rtc"; + }; + ++&simplefb_hdmi { ++ vcc-hdmi-supply = <®_dldo1>; ++}; ++ + &uart0 { + pinctrl-names = "default"; +- pinctrl-0 = <&uart0_pins_a>; ++ pinctrl-0 = <&uart0_pb_pins>; + status = "okay"; + }; + +diff --git a/arch/arm/dts/sun50i-a64-olinuxino.dts b/arch/arm/dts/sun50i-a64-olinuxino.dts +index 3b3081b10e..f7a4bccaa5 100644 +--- a/arch/arm/dts/sun50i-a64-olinuxino.dts ++++ b/arch/arm/dts/sun50i-a64-olinuxino.dts +@@ -51,6 +51,7 @@ + compatible = "olimex,a64-olinuxino", "allwinner,sun50i-a64"; + + aliases { ++ ethernet0 = &emac; + serial0 = &uart0; + }; + +@@ -58,12 +59,74 @@ + stdout-path = "serial0:115200n8"; + }; + ++ hdmi-connector { ++ compatible = "hdmi-connector"; ++ type = "a"; ++ ++ port { ++ hdmi_con_in: endpoint { ++ remote-endpoint = <&hdmi_out_con>; ++ }; ++ }; ++ }; ++ ++ reg_usb1_vbus: usb1-vbus { ++ compatible = "regulator-fixed"; ++ regulator-name = "usb1-vbus"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ regulator-boot-on; ++ enable-active-high; ++ gpio = <&pio 6 9 GPIO_ACTIVE_HIGH>; /* PG9 */ ++ status = "okay"; ++ }; ++ + wifi_pwrseq: wifi_pwrseq { + compatible = "mmc-pwrseq-simple"; + reset-gpios = <&r_pio 0 2 GPIO_ACTIVE_LOW>; /* PL2 */ + }; + }; + ++&de { ++ status = "okay"; ++}; ++ ++&ehci0 { ++ status = "okay"; ++}; ++ ++&ehci1 { ++ status = "okay"; ++}; ++ ++&emac { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&rgmii_pins>; ++ phy-mode = "rgmii"; ++ phy-handle = <&ext_rgmii_phy>; ++ phy-supply = <®_dcdc1>; ++ allwinner,tx-delay-ps = <600>; ++ status = "okay"; ++}; ++ ++&hdmi { ++ hvcc-supply = <®_dldo1>; ++ status = "okay"; ++}; ++ ++&hdmi_out { ++ hdmi_out_con: endpoint { ++ remote-endpoint = <&hdmi_con_in>; ++ }; ++}; ++ ++&mdio { ++ ext_rgmii_phy: ethernet-phy@1 { ++ compatible = "ethernet-phy-ieee802.3-c22"; ++ reg = <1>; ++ }; ++}; ++ + &mmc0 { + pinctrl-names = "default"; + pinctrl-0 = <&mmc0_pins>; +@@ -92,6 +155,14 @@ + }; + }; + ++&ohci0 { ++ status = "okay"; ++}; ++ ++&ohci1 { ++ status = "okay"; ++}; ++ + &r_rsb { + status = "okay"; + +@@ -100,6 +171,7 @@ + reg = <0x3a3>; + interrupt-parent = <&r_intc>; + interrupts = <0 IRQ_TYPE_LEVEL_LOW>; ++ x-powers,drive-vbus-en; /* set N_VBUSEN as output pin */ + }; + }; + +@@ -142,10 +214,14 @@ + + /* DCDC3 is polyphased with DCDC2 */ + ++/* ++ * The board uses DDR3L DRAM chips. 1.36V is the closest to the nominal ++ * 1.35V that the PMIC can drive. ++ */ + ®_dcdc5 { + regulator-always-on; +- regulator-min-microvolt = <1500000>; +- regulator-max-microvolt = <1500000>; ++ regulator-min-microvolt = <1360000>; ++ regulator-max-microvolt = <1360000>; + regulator-name = "vcc-ddr3"; + }; + +@@ -180,6 +256,11 @@ + regulator-name = "vcc-wifi-io"; + }; + ++®_drivevbus { ++ regulator-name = "usb0-vbus"; ++ status = "okay"; ++}; ++ + ®_eldo1 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; +@@ -214,8 +295,24 @@ + regulator-name = "vcc-rtc"; + }; + ++&simplefb_hdmi { ++ vcc-hdmi-supply = <®_dldo1>; ++}; ++ + &uart0 { + pinctrl-names = "default"; +- pinctrl-0 = <&uart0_pins_a>; ++ pinctrl-0 = <&uart0_pb_pins>; ++ status = "okay"; ++}; ++ ++&usb_otg { ++ dr_mode = "otg"; ++ status = "okay"; ++}; ++ ++&usbphy { + status = "okay"; ++ usb0_id_det-gpios = <&pio 7 9 GPIO_ACTIVE_HIGH>; /* PH9 */ ++ usb0_vbus-supply = <®_drivevbus>; ++ usb1_vbus-supply = <®_usb1_vbus>; + }; +diff --git a/arch/arm/dts/sun50i-a64-orangepi-win.dts b/arch/arm/dts/sun50i-a64-orangepi-win.dts +index bf42690a33..b0c64f7579 100644 +--- a/arch/arm/dts/sun50i-a64-orangepi-win.dts ++++ b/arch/arm/dts/sun50i-a64-orangepi-win.dts +@@ -1,5 +1,6 @@ + /* + * Copyright (C) 2017 Jagan Teki ++ * Copyright (C) 2017-2018 Samuel Holland + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual +@@ -51,23 +52,127 @@ + compatible = "xunlong,orangepi-win", "allwinner,sun50i-a64"; + + aliases { ++ ethernet0 = &emac; + serial0 = &uart0; ++ serial1 = &uart1; ++ serial2 = &uart2; ++ serial3 = &uart3; ++ serial4 = &uart4; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; ++ ++ hdmi-connector { ++ compatible = "hdmi-connector"; ++ type = "a"; ++ ++ port { ++ hdmi_con_in: endpoint { ++ remote-endpoint = <&hdmi_out_con>; ++ }; ++ }; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ ++ status { ++ label = "orangepi:green:status"; ++ gpios = <&pio 7 11 GPIO_ACTIVE_HIGH>; /* PH11 */ ++ }; ++ }; ++ ++ reg_gmac_3v3: gmac-3v3 { ++ compatible = "regulator-fixed"; ++ regulator-name = "gmac-3v3"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-boot-on; ++ enable-active-high; ++ gpio = <&pio 3 14 GPIO_ACTIVE_HIGH>; /* PD14 */ ++ status = "okay"; ++ }; ++ ++ reg_usb1_vbus: usb1-vbus { ++ compatible = "regulator-fixed"; ++ regulator-name = "usb1-vbus"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ regulator-boot-on; ++ enable-active-high; ++ gpio = <&pio 3 7 GPIO_ACTIVE_HIGH>; /* PD7 */ ++ status = "okay"; ++ }; ++ ++ wifi_pwrseq: wifi_pwrseq { ++ compatible = "mmc-pwrseq-simple"; ++ reset-gpios = <&r_pio 0 8 GPIO_ACTIVE_LOW>; /* PL8 */ ++ }; ++}; ++ ++&de { ++ status = "okay"; ++}; ++ ++&ehci0 { ++ status = "okay"; + }; + + &ehci1 { + status = "okay"; + }; + ++&emac { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&rgmii_pins>; ++ phy-mode = "rgmii"; ++ phy-handle = <&ext_rgmii_phy>; ++ phy-supply = <®_gmac_3v3>; ++ status = "okay"; ++}; ++ ++&hdmi { ++ hvcc-supply = <®_dldo1>; ++ status = "okay"; ++}; ++ ++&hdmi_out { ++ hdmi_out_con: endpoint { ++ remote-endpoint = <&hdmi_con_in>; ++ }; ++}; ++ ++&mdio { ++ ext_rgmii_phy: ethernet-phy@1 { ++ compatible = "ethernet-phy-ieee802.3-c22"; ++ reg = <1>; ++ }; ++}; ++ + &mmc0 { + pinctrl-names = "default"; + pinctrl-0 = <&mmc0_pins>; + vmmc-supply = <®_dcdc1>; +- cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; ++ cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */ ++ disable-wp; ++ bus-width = <4>; ++ status = "okay"; ++}; ++ ++&mmc1 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&mmc1_pins>; ++ vmmc-supply = <®_dldo2>; ++ vqmmc-supply = <®_dldo4>; ++ mmc-pwrseq = <&wifi_pwrseq>; ++ bus-width = <4>; ++ non-removable; ++ status = "okay"; ++}; ++ ++&ohci0 { + status = "okay"; + }; + +@@ -89,9 +194,8 @@ + #include "axp803.dtsi" + + ®_aldo1 { +- regulator-always-on; +- regulator-min-microvolt = <1800000>; +- regulator-max-microvolt = <3300000>; ++ regulator-min-microvolt = <2800000>; ++ regulator-max-microvolt = <2800000>; + regulator-name = "afvcc-csi"; + }; + +@@ -163,12 +267,23 @@ + regulator-name = "vcc-wifi-io"; + }; + ++®_drivevbus { ++ regulator-name = "usb0-vbus"; ++ status = "okay"; ++}; ++ + ®_eldo1 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-name = "cpvdd"; + }; + ++®_eldo3 { ++ regulator-min-microvolt = <1500000>; ++ regulator-max-microvolt = <1800000>; ++ regulator-name = "dvdd-csi"; ++}; ++ + ®_fldo1 { + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; +@@ -191,13 +306,65 @@ + regulator-name = "vcc-rtc"; + }; + ++&simplefb_hdmi { ++ vcc-hdmi-supply = <®_dldo1>; ++}; ++ ++&spi0 { ++ status = "okay"; ++ ++ spi-flash@0 { ++ compatible = "mxicy,mx25l1606e", "jedec,spi-nor"; ++ reg = <0>; ++ spi-max-frequency = <80000000>; ++ m25p,fast-read; ++ status = "okay"; ++ }; ++}; ++ ++/* On debug connector */ + &uart0 { + pinctrl-names = "default"; +- pinctrl-0 = <&uart0_pins_a>; ++ pinctrl-0 = <&uart0_pb_pins>; + status = "okay"; + }; + +-&usbphy { ++/* Bluetooth */ ++&uart1 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>; ++ status = "okay"; ++}; ++ ++/* On Pi-2 connector, RTS/CTS optional */ ++&uart2 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&uart2_pins>; ++ status = "disabled"; ++}; ++ ++/* On Pi-2 connector, RTS/CTS optional */ ++&uart3 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&uart3_pins>; ++ status = "disabled"; ++}; ++ ++/* On Pi-2 connector (labeled for SPI1), RTS/CTS optional */ ++&uart4 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&uart4_pins>; ++ status = "disabled"; ++}; ++ ++&usb_otg { ++ dr_mode = "otg"; + status = "okay"; + }; + ++&usbphy { ++ usb0_id_det-gpios = <&pio 7 9 GPIO_ACTIVE_HIGH>; /* PH9 */ ++ usb0_vbus-supply = <®_drivevbus>; ++ usb1_vbus-supply = <®_usb1_vbus>; ++ status = "okay"; ++}; +diff --git a/arch/arm/dts/sun50i-a64-pine64.dts b/arch/arm/dts/sun50i-a64-pine64.dts +index a75825798a..c077b6c1f4 100644 +--- a/arch/arm/dts/sun50i-a64-pine64.dts ++++ b/arch/arm/dts/sun50i-a64-pine64.dts +@@ -62,6 +62,21 @@ + chosen { + stdout-path = "serial0:115200n8"; + }; ++ ++ hdmi-connector { ++ compatible = "hdmi-connector"; ++ type = "a"; ++ ++ port { ++ hdmi_con_in: endpoint { ++ remote-endpoint = <&hdmi_out_con>; ++ }; ++ }; ++ }; ++}; ++ ++&de { ++ status = "okay"; + }; + + &ehci0 { +@@ -82,6 +97,17 @@ + + }; + ++&hdmi { ++ hvcc-supply = <®_dldo1>; ++ status = "okay"; ++}; ++ ++&hdmi_out { ++ hdmi_out_con: endpoint { ++ remote-endpoint = <&hdmi_con_in>; ++ }; ++}; ++ + &i2c1 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c1_pins>; +@@ -229,6 +255,10 @@ + regulator-name = "vcc-rtc"; + }; + ++&simplefb_hdmi { ++ vcc-hdmi-supply = <®_dldo1>; ++}; ++ + /* On Euler connector */ + &spdif { + status = "disabled"; +@@ -237,7 +267,7 @@ + /* On Exp and Euler connectors */ + &uart0 { + pinctrl-names = "default"; +- pinctrl-0 = <&uart0_pins_a>; ++ pinctrl-0 = <&uart0_pb_pins>; + status = "okay"; + }; + +diff --git a/arch/arm/dts/sun50i-a64-sopine-baseboard.dts b/arch/arm/dts/sun50i-a64-sopine-baseboard.dts +index abe179de35..53fcc9098d 100644 +--- a/arch/arm/dts/sun50i-a64-sopine-baseboard.dts ++++ b/arch/arm/dts/sun50i-a64-sopine-baseboard.dts +@@ -61,6 +61,17 @@ + stdout-path = "serial0:115200n8"; + }; + ++ hdmi-connector { ++ compatible = "hdmi-connector"; ++ type = "a"; ++ ++ port { ++ hdmi_con_in: endpoint { ++ remote-endpoint = <&hdmi_out_con>; ++ }; ++ }; ++ }; ++ + reg_vcc1v8: vcc1v8 { + compatible = "regulator-fixed"; + regulator-name = "vcc1v8"; +@@ -69,6 +80,10 @@ + }; + }; + ++&de { ++ status = "okay"; ++}; ++ + &ehci0 { + status = "okay"; + }; +@@ -86,6 +101,17 @@ + status = "okay"; + }; + ++&hdmi { ++ hvcc-supply = <®_dldo1>; ++ status = "okay"; ++}; ++ ++&hdmi_out { ++ hdmi_out_con: endpoint { ++ remote-endpoint = <&hdmi_con_in>; ++ }; ++}; ++ + &mdio { + ext_rgmii_phy: ethernet-phy@1 { + compatible = "ethernet-phy-ieee802.3-c22"; +@@ -134,9 +160,13 @@ + regulator-name = "vcc-wifi"; + }; + ++&simplefb_hdmi { ++ vcc-hdmi-supply = <®_dldo1>; ++}; ++ + &uart0 { + pinctrl-names = "default"; +- pinctrl-0 = <&uart0_pins_a>; ++ pinctrl-0 = <&uart0_pb_pins>; + status = "okay"; + }; + +diff --git a/arch/arm/dts/sun50i-a64-sopine.dtsi b/arch/arm/dts/sun50i-a64-sopine.dtsi +index 43418bd881..6723b8695e 100644 +--- a/arch/arm/dts/sun50i-a64-sopine.dtsi ++++ b/arch/arm/dts/sun50i-a64-sopine.dtsi +@@ -45,6 +45,8 @@ + + #include "sun50i-a64.dtsi" + ++#include ++ + &mmc0 { + pinctrl-names = "default"; + pinctrl-0 = <&mmc0_pins>; +@@ -52,6 +54,7 @@ + non-removable; + disable-wp; + bus-width = <4>; ++ cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */ + status = "okay"; + }; + +@@ -66,6 +69,18 @@ + }; + }; + ++&spi0 { ++ status = "okay"; ++ ++ flash@0 { ++ #address-cells = <1>; ++ #size-cells = <1>; ++ compatible = "jedec,spi-nor"; ++ reg = <0>; ++ spi-max-frequency = <40000000>; ++ }; ++}; ++ + #include "axp803.dtsi" + + ®_aldo2 { +diff --git a/arch/arm/dts/sun50i-a64.dtsi b/arch/arm/dts/sun50i-a64.dtsi +index 7a083637c4..f3a66f8882 100644 +--- a/arch/arm/dts/sun50i-a64.dtsi ++++ b/arch/arm/dts/sun50i-a64.dtsi +@@ -43,9 +43,12 @@ + */ + + #include ++#include + #include + #include + #include ++#include ++#include + + / { + interrupt-parent = <&gic>; +@@ -57,17 +60,21 @@ + #size-cells = <1>; + ranges; + +-/* +- * The pipeline mixer0-lcd0 depends on clock CLK_MIXER0 from DE2 CCU. +- * However there is no support for this clock on A64 yet, so we depend +- * on the upstream clocks here to keep them (and thus CLK_MIXER0) up. +- */ + simplefb_lcd: framebuffer-lcd { + compatible = "allwinner,simple-framebuffer", + "simple-framebuffer"; + allwinner,pipeline = "mixer0-lcd0"; + clocks = <&ccu CLK_TCON0>, +- <&ccu CLK_DE>, <&ccu CLK_BUS_DE>; ++ <&display_clocks CLK_MIXER0>; ++ status = "disabled"; ++ }; ++ ++ simplefb_hdmi: framebuffer-hdmi { ++ compatible = "allwinner,simple-framebuffer", ++ "simple-framebuffer"; ++ allwinner,pipeline = "mixer1-lcd1-hdmi"; ++ clocks = <&display_clocks CLK_MIXER1>, ++ <&ccu CLK_TCON1>, <&ccu CLK_HDMI>; + status = "disabled"; + }; + }; +@@ -81,6 +88,7 @@ + device_type = "cpu"; + reg = <0>; + enable-method = "psci"; ++ next-level-cache = <&L2>; + }; + + cpu1: cpu@1 { +@@ -88,6 +96,7 @@ + device_type = "cpu"; + reg = <1>; + enable-method = "psci"; ++ next-level-cache = <&L2>; + }; + + cpu2: cpu@2 { +@@ -95,6 +104,7 @@ + device_type = "cpu"; + reg = <2>; + enable-method = "psci"; ++ next-level-cache = <&L2>; + }; + + cpu3: cpu@3 { +@@ -102,7 +112,20 @@ + device_type = "cpu"; + reg = <3>; + enable-method = "psci"; ++ next-level-cache = <&L2>; + }; ++ ++ L2: l2-cache { ++ compatible = "cache"; ++ cache-level = <2>; ++ }; ++ }; ++ ++ de: display-engine { ++ compatible = "allwinner,sun50i-a64-display-engine"; ++ allwinner,pipelines = <&mixer0>, ++ <&mixer1>; ++ status = "disabled"; + }; + + osc24M: osc24M_clk { +@@ -168,10 +191,92 @@ + #size-cells = <1>; + ranges; + ++ de2@1000000 { ++ compatible = "allwinner,sun50i-a64-de2"; ++ reg = <0x1000000 0x400000>; ++ allwinner,sram = <&de2_sram 1>; ++ #address-cells = <1>; ++ #size-cells = <1>; ++ ranges = <0 0x1000000 0x400000>; ++ ++ display_clocks: clock@0 { ++ compatible = "allwinner,sun50i-a64-de2-clk"; ++ reg = <0x0 0x100000>; ++ clocks = <&ccu CLK_DE>, ++ <&ccu CLK_BUS_DE>; ++ clock-names = "mod", ++ "bus"; ++ resets = <&ccu RST_BUS_DE>; ++ #clock-cells = <1>; ++ #reset-cells = <1>; ++ }; ++ ++ mixer0: mixer@100000 { ++ compatible = "allwinner,sun50i-a64-de2-mixer-0"; ++ reg = <0x100000 0x100000>; ++ clocks = <&display_clocks CLK_BUS_MIXER0>, ++ <&display_clocks CLK_MIXER0>; ++ clock-names = "bus", ++ "mod"; ++ resets = <&display_clocks RST_MIXER0>; ++ ++ ports { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ mixer0_out: port@1 { ++ reg = <1>; ++ ++ mixer0_out_tcon0: endpoint { ++ remote-endpoint = <&tcon0_in_mixer0>; ++ }; ++ }; ++ }; ++ }; ++ ++ mixer1: mixer@200000 { ++ compatible = "allwinner,sun50i-a64-de2-mixer-1"; ++ reg = <0x200000 0x100000>; ++ clocks = <&display_clocks CLK_BUS_MIXER1>, ++ <&display_clocks CLK_MIXER1>; ++ clock-names = "bus", ++ "mod"; ++ resets = <&display_clocks RST_MIXER1>; ++ ++ ports { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ mixer1_out: port@1 { ++ reg = <1>; ++ ++ mixer1_out_tcon1: endpoint { ++ remote-endpoint = <&tcon1_in_mixer1>; ++ }; ++ }; ++ }; ++ }; ++ }; ++ + syscon: syscon@1c00000 { +- compatible = "allwinner,sun50i-a64-system-controller", +- "syscon"; ++ compatible = "allwinner,sun50i-a64-system-control"; + reg = <0x01c00000 0x1000>; ++ #address-cells = <1>; ++ #size-cells = <1>; ++ ranges; ++ ++ sram_c: sram@18000 { ++ compatible = "mmio-sram"; ++ reg = <0x00018000 0x28000>; ++ #address-cells = <1>; ++ #size-cells = <1>; ++ ranges = <0 0x00018000 0x28000>; ++ ++ de2_sram: sram-section@0 { ++ compatible = "allwinner,sun50i-a64-sram-c"; ++ reg = <0x0000 0x28000>; ++ }; ++ }; + }; + + dma: dma-controller@1c02000 { +@@ -185,6 +290,75 @@ + #dma-cells = <1>; + }; + ++ tcon0: lcd-controller@1c0c000 { ++ compatible = "allwinner,sun50i-a64-tcon-lcd", ++ "allwinner,sun8i-a83t-tcon-lcd"; ++ reg = <0x01c0c000 0x1000>; ++ interrupts = ; ++ clocks = <&ccu CLK_BUS_TCON0>, <&ccu CLK_TCON0>; ++ clock-names = "ahb", "tcon-ch0"; ++ clock-output-names = "tcon-pixel-clock"; ++ resets = <&ccu RST_BUS_TCON0>, <&ccu RST_BUS_LVDS>; ++ reset-names = "lcd", "lvds"; ++ ++ ports { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ tcon0_in: port@0 { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ reg = <0>; ++ ++ tcon0_in_mixer0: endpoint@0 { ++ reg = <0>; ++ remote-endpoint = <&mixer0_out_tcon0>; ++ }; ++ }; ++ ++ tcon0_out: port@1 { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ reg = <1>; ++ }; ++ }; ++ }; ++ ++ tcon1: lcd-controller@1c0d000 { ++ compatible = "allwinner,sun50i-a64-tcon-tv", ++ "allwinner,sun8i-a83t-tcon-tv"; ++ reg = <0x01c0d000 0x1000>; ++ interrupts = ; ++ clocks = <&ccu CLK_BUS_TCON1>, <&ccu CLK_TCON1>; ++ clock-names = "ahb", "tcon-ch1"; ++ resets = <&ccu RST_BUS_TCON1>; ++ reset-names = "lcd"; ++ ++ ports { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ tcon1_in: port@0 { ++ reg = <0>; ++ ++ tcon1_in_mixer1: endpoint { ++ remote-endpoint = <&mixer1_out_tcon1>; ++ }; ++ }; ++ ++ tcon1_out: port@1 { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ reg = <1>; ++ ++ tcon1_out_hdmi: endpoint@1 { ++ reg = <1>; ++ remote-endpoint = <&hdmi_in_tcon1>; ++ }; ++ }; ++ }; ++ }; ++ + mmc0: mmc@1c0f000 { + compatible = "allwinner,sun50i-a64-mmc"; + reg = <0x01c0f000 0x1000>; +@@ -227,6 +401,11 @@ + #size-cells = <0>; + }; + ++ sid: eeprom@1c14000 { ++ compatible = "allwinner,sun50i-a64-sid"; ++ reg = <0x1c14000 0x400>; ++ }; ++ + usb_otg: usb@1c19000 { + compatible = "allwinner,sun8i-a33-musb"; + reg = <0x01c19000 0x0400>; +@@ -356,7 +535,7 @@ + }; + + mmc2_pins: mmc2-pins { +- pins = "PC1", "PC5", "PC6", "PC8", "PC9", ++ pins = "PC5", "PC6", "PC8", "PC9", + "PC10","PC11", "PC12", "PC13", + "PC14", "PC15", "PC16"; + function = "mmc2"; +@@ -364,6 +543,18 @@ + bias-pull-up; + }; + ++ mmc2_ds_pin: mmc2-ds-pin { ++ pins = "PC1"; ++ function = "mmc2"; ++ drive-strength = <30>; ++ bias-pull-up; ++ }; ++ ++ pwm_pin: pwm_pin { ++ pins = "PD22"; ++ function = "pwm"; ++ }; ++ + rmii_pins: rmii_pins { + pins = "PD10", "PD11", "PD13", "PD14", "PD17", + "PD18", "PD19", "PD20", "PD22", "PD23"; +@@ -394,7 +585,7 @@ + function = "spi1"; + }; + +- uart0_pins_a: uart0 { ++ uart0_pb_pins: uart0-pb-pins { + pins = "PB8", "PB9"; + function = "uart0"; + }; +@@ -474,15 +665,6 @@ + status = "disabled"; + }; + +- pwm: pwm@1c21400 { +- compatible = "allwinner,sun50i-a64-pwm", +- "allwinner,sun5i-a13-pwm"; +- reg = <0x01c21400 0x8>; +- clocks = <&osc24M>; +- #pwm-cells = <3>; +- status = "disabled"; +- }; +- + uart0: serial@1c28000 { + compatible = "snps,dw-apb-uart"; + reg = <0x01c28000 0x400>; +@@ -617,8 +799,6 @@ + clocks = <&ccu CLK_BUS_EMAC>; + clock-names = "stmmaceth"; + status = "disabled"; +- #address-cells = <1>; +- #size-cells = <0>; + + mdio: mdio { + compatible = "snps,dwmac-mdio"; +@@ -638,11 +818,69 @@ + #interrupt-cells = <3>; + }; + ++ pwm: pwm@1c21400 { ++ compatible = "allwinner,sun50i-a64-pwm", ++ "allwinner,sun5i-a13-pwm"; ++ reg = <0x01c21400 0x400>; ++ clocks = <&osc24M>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pwm_pin>; ++ #pwm-cells = <3>; ++ status = "disabled"; ++ }; ++ ++ hdmi: hdmi@1ee0000 { ++ compatible = "allwinner,sun50i-a64-dw-hdmi", ++ "allwinner,sun8i-a83t-dw-hdmi"; ++ reg = <0x01ee0000 0x10000>; ++ reg-io-width = <1>; ++ interrupts = ; ++ clocks = <&ccu CLK_BUS_HDMI>, <&ccu CLK_HDMI_DDC>, ++ <&ccu CLK_HDMI>; ++ clock-names = "iahb", "isfr", "tmds"; ++ resets = <&ccu RST_BUS_HDMI1>; ++ reset-names = "ctrl"; ++ phys = <&hdmi_phy>; ++ phy-names = "hdmi-phy"; ++ status = "disabled"; ++ ++ ports { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ hdmi_in: port@0 { ++ reg = <0>; ++ ++ hdmi_in_tcon1: endpoint { ++ remote-endpoint = <&tcon1_out_hdmi>; ++ }; ++ }; ++ ++ hdmi_out: port@1 { ++ reg = <1>; ++ }; ++ }; ++ }; ++ ++ hdmi_phy: hdmi-phy@1ef0000 { ++ compatible = "allwinner,sun50i-a64-hdmi-phy"; ++ reg = <0x01ef0000 0x10000>; ++ clocks = <&ccu CLK_BUS_HDMI>, <&ccu CLK_HDMI_DDC>, ++ <&ccu 7>; ++ clock-names = "bus", "mod", "pll-0"; ++ resets = <&ccu RST_BUS_HDMI0>; ++ reset-names = "phy"; ++ #phy-cells = <0>; ++ }; ++ + rtc: rtc@1f00000 { + compatible = "allwinner,sun6i-a31-rtc"; + reg = <0x01f00000 0x54>; + interrupts = , + ; ++ clock-output-names = "rtc-osc32k", "rtc-osc32k-out"; ++ clocks = <&osc32k>; ++ #clock-cells = <1>; + }; + + r_intc: interrupt-controller@1f00c00 { +@@ -664,6 +902,29 @@ + #reset-cells = <1>; + }; + ++ r_i2c: i2c@1f02400 { ++ compatible = "allwinner,sun50i-a64-i2c", ++ "allwinner,sun6i-a31-i2c"; ++ reg = <0x01f02400 0x400>; ++ interrupts = ; ++ clocks = <&r_ccu CLK_APB0_I2C>; ++ resets = <&r_ccu RST_APB0_I2C>; ++ status = "disabled"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ }; ++ ++ r_pwm: pwm@1f03800 { ++ compatible = "allwinner,sun50i-a64-pwm", ++ "allwinner,sun5i-a13-pwm"; ++ reg = <0x01f03800 0x400>; ++ clocks = <&osc24M>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&r_pwm_pin>; ++ #pwm-cells = <3>; ++ status = "disabled"; ++ }; ++ + r_pio: pinctrl@1f02c00 { + compatible = "allwinner,sun50i-a64-r-pinctrl"; + reg = <0x01f02c00 0x400>; +@@ -675,6 +936,16 @@ + interrupt-controller; + #interrupt-cells = <3>; + ++ r_i2c_pl89_pins: r-i2c-pl89-pins { ++ pins = "PL8", "PL9"; ++ function = "s_i2c"; ++ }; ++ ++ r_pwm_pin: pwm { ++ pins = "PL10"; ++ function = "s_pwm"; ++ }; ++ + r_rsb_pins: rsb { + pins = "PL0", "PL1"; + function = "s_rsb"; +-- +2.11.0 + diff --git a/gnu/packages/patches/u-boot-pinebook-dts.patch b/gnu/packages/patches/u-boot-pinebook-dts.patch new file mode 100644 index 0000000000..48c004fdfc --- /dev/null +++ b/gnu/packages/patches/u-boot-pinebook-dts.patch @@ -0,0 +1,388 @@ +From b972831c3cd24f3c9bb0995ed61db8f8239f3391 Mon Sep 17 00:00:00 2001 +From: Vasily Khoruzhick +Date: Mon, 5 Nov 2018 20:24:31 -0800 +Subject: [PATCH 10/13] sunxi: DT: add support for Pinebook + +Pinebook is a laptop produced by Pine64, with USB-connected keyboard, +USB-connected touchpad and an eDP LCD panel connected via a RGB-eDP +bridge from Analogix. + +Signed-off-by: Vasily Khoruzhick +Acked-by: Maxime Ripard +Tested-by: Maxime Ripard +Cc: Vagrant Cascadian +Reviewed-by: Jagan Teki +--- + arch/arm/dts/Makefile | 1 + + arch/arm/dts/sun50i-a64-pinebook-u-boot.dtsi | 15 ++ + arch/arm/dts/sun50i-a64-pinebook.dts | 294 +++++++++++++++++++++++++++ + configs/pinebook_defconfig | 22 ++ + 4 files changed, 332 insertions(+) + create mode 100644 arch/arm/dts/sun50i-a64-pinebook-u-boot.dtsi + create mode 100644 arch/arm/dts/sun50i-a64-pinebook.dts + create mode 100644 configs/pinebook_defconfig + +diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile +index 3093c1185e..eae6b9ee5d 100644 +--- a/arch/arm/dts/Makefile ++++ b/arch/arm/dts/Makefile +@@ -406,6 +406,7 @@ dtb-$(CONFIG_MACH_SUN50I) += \ + sun50i-a64-orangepi-win.dtb \ + sun50i-a64-pine64-plus.dtb \ + sun50i-a64-pine64.dtb \ ++ sun50i-a64-pinebook.dtb \ + sun50i-a64-sopine-baseboard.dtb + dtb-$(CONFIG_MACH_SUN9I) += \ + sun9i-a80-optimus.dtb \ +diff --git a/arch/arm/dts/sun50i-a64-pinebook-u-boot.dtsi b/arch/arm/dts/sun50i-a64-pinebook-u-boot.dtsi +new file mode 100644 +index 0000000000..a99b7171d0 +--- /dev/null ++++ b/arch/arm/dts/sun50i-a64-pinebook-u-boot.dtsi +@@ -0,0 +1,15 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (C) 2018 Vasily Khoruzhick ++ * ++ */ ++ ++/* The ANX6345 eDP-bridge is on r_i2c */ ++&r_i2c { ++ anx6345: edp-bridge@38 { ++ compatible = "analogix,anx6345"; ++ reg = <0x38>; ++ reset-gpios = <&pio 3 24 GPIO_ACTIVE_LOW>; /* PD24 */ ++ status = "okay"; ++ }; ++}; +diff --git a/arch/arm/dts/sun50i-a64-pinebook.dts b/arch/arm/dts/sun50i-a64-pinebook.dts +new file mode 100644 +index 0000000000..ec537c5297 +--- /dev/null ++++ b/arch/arm/dts/sun50i-a64-pinebook.dts +@@ -0,0 +1,294 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (C) 2017 Icenowy Zheng ++ * Copyright (C) 2018 Vasily Khoruzhick ++ * ++ */ ++ ++/dts-v1/; ++ ++#include "sun50i-a64.dtsi" ++ ++#include ++#include ++#include ++ ++/ { ++ model = "Pinebook"; ++ compatible = "pine64,pinebook", "allwinner,sun50i-a64"; ++ ++ aliases { ++ serial0 = &uart0; ++ ethernet0 = &rtl8723cs; ++ }; ++ ++ vdd_bl: regulator@0 { ++ compatible = "regulator-fixed"; ++ regulator-name = "bl-3v3"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ gpio = <&pio 7 6 GPIO_ACTIVE_HIGH>; /* PH6 */ ++ enable-active-high; ++ }; ++ ++ backlight: backlight { ++ compatible = "pwm-backlight"; ++ pwms = <&pwm 0 50000 0>; ++ brightness-levels = <0 5 10 15 20 30 40 55 70 85 100>; ++ default-brightness-level = <2>; ++ enable-gpios = <&pio 3 23 GPIO_ACTIVE_HIGH>; /* PD23 */ ++ power-supply = <&vdd_bl>; ++ }; ++ ++ chosen { ++ stdout-path = "serial0:115200n8"; ++ ++ framebuffer-lcd { ++ panel-supply = <®_dc1sw>; ++ dvdd25-supply = <®_dldo2>; ++ dvdd12-supply = <®_fldo1>; ++ }; ++ }; ++ ++ gpio_keys { ++ compatible = "gpio-keys"; ++ ++ lid_switch { ++ label = "Lid Switch"; ++ gpios = <&r_pio 0 12 GPIO_ACTIVE_LOW>; /* PL12 */ ++ linux,input-type = ; ++ linux,code = ; ++ linux,can-disable; ++ wakeup-source; ++ }; ++ }; ++ ++ reg_vcc3v3: vcc3v3 { ++ compatible = "regulator-fixed"; ++ regulator-name = "vcc3v3"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ }; ++ ++ wifi_pwrseq: wifi_pwrseq { ++ compatible = "mmc-pwrseq-simple"; ++ reset-gpios = <&r_pio 0 2 GPIO_ACTIVE_LOW>; /* PL2 */ ++ }; ++}; ++ ++&ehci0 { ++ phys = <&usbphy 0>; ++ phy-names = "usb"; ++ status = "okay"; ++}; ++ ++&ehci1 { ++ status = "okay"; ++}; ++ ++&mmc0 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&mmc0_pins>; ++ vmmc-supply = <®_dcdc1>; ++ cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; ++ disable-wp; ++ bus-width = <4>; ++ status = "okay"; ++}; ++ ++&mmc1 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&mmc1_pins>; ++ vmmc-supply = <®_dldo4>; ++ vqmmc-supply = <®_eldo1>; ++ mmc-pwrseq = <&wifi_pwrseq>; ++ bus-width = <4>; ++ non-removable; ++ status = "okay"; ++ ++ rtl8723cs: wifi@1 { ++ reg = <1>; ++ }; ++}; ++ ++&mmc2 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&mmc2_pins>, <&mmc2_ds_pin>; ++ vmmc-supply = <®_dcdc1>; ++ vqmmc-supply = <®_eldo1>; ++ bus-width = <8>; ++ non-removable; ++ cap-mmc-hw-reset; ++ mmc-hs200-1_8v; ++ status = "okay"; ++}; ++ ++&ohci0 { ++ phys = <&usbphy 0>; ++ phy-names = "usb"; ++ status = "okay"; ++}; ++ ++&ohci1 { ++ status = "okay"; ++}; ++ ++&pwm { ++ status = "okay"; ++}; ++ ++&r_rsb { ++ status = "okay"; ++ ++ axp803: pmic@3a3 { ++ compatible = "x-powers,axp803"; ++ reg = <0x3a3>; ++ interrupt-parent = <&r_intc>; ++ interrupts = <0 IRQ_TYPE_LEVEL_LOW>; ++ }; ++}; ++ ++/* The ANX6345 eDP-bridge is on r_i2c */ ++&r_i2c { ++ clock-frequency = <100000>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&r_i2c_pl89_pins>; ++ status = "okay"; ++}; ++ ++#include "axp803.dtsi" ++ ++®_aldo1 { ++ regulator-min-microvolt = <2800000>; ++ regulator-max-microvolt = <2800000>; ++ regulator-name = "vcc-csi"; ++}; ++ ++®_aldo2 { ++ regulator-always-on; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-name = "vcc-pl"; ++}; ++ ++®_aldo3 { ++ regulator-always-on; ++ regulator-min-microvolt = <2700000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-name = "vcc-pll-avcc"; ++}; ++ ++®_dc1sw { ++ regulator-name = "vcc-lcd"; ++}; ++ ++®_dcdc1 { ++ regulator-always-on; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-name = "vcc-3v3"; ++}; ++ ++®_dcdc2 { ++ regulator-always-on; ++ regulator-min-microvolt = <1000000>; ++ regulator-max-microvolt = <1300000>; ++ regulator-name = "vdd-cpux"; ++}; ++ ++/* DCDC3 is polyphased with DCDC2 */ ++ ++®_dcdc5 { ++ regulator-always-on; ++ regulator-min-microvolt = <1200000>; ++ regulator-max-microvolt = <1200000>; ++ regulator-name = "vcc-dram"; ++}; ++ ++®_dcdc6 { ++ regulator-always-on; ++ regulator-min-microvolt = <1100000>; ++ regulator-max-microvolt = <1100000>; ++ regulator-name = "vdd-sys"; ++}; ++ ++®_dldo1 { ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-name = "vcc-hdmi"; ++}; ++ ++®_dldo2 { ++ regulator-min-microvolt = <2500000>; ++ regulator-max-microvolt = <2500000>; ++ regulator-name = "vcc-edp"; ++}; ++ ++®_dldo3 { ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-name = "avdd-csi"; ++}; ++ ++®_dldo4 { ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-name = "vcc-wifi"; ++}; ++ ++®_eldo1 { ++ regulator-always-on; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ regulator-name = "cpvdd"; ++}; ++ ++®_eldo3 { ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ regulator-name = "vdd-1v8-csi"; ++}; ++ ++®_fldo1 { ++ regulator-min-microvolt = <1200000>; ++ regulator-max-microvolt = <1200000>; ++ regulator-name = "vcc-1v2-hsic"; ++}; ++ ++®_fldo2 { ++ regulator-always-on; ++ regulator-min-microvolt = <1100000>; ++ regulator-max-microvolt = <1100000>; ++ regulator-name = "vdd-cpus"; ++}; ++ ++®_ldo_io0 { ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-name = "vcc-usb"; ++ status = "okay"; ++}; ++ ++®_rtc_ldo { ++ regulator-name = "vcc-rtc"; ++}; ++ ++&simplefb_hdmi { ++ vcc-hdmi-supply = <®_dldo1>; ++}; ++ ++&uart0 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&uart0_pb_pins>; ++ status = "okay"; ++}; ++ ++&usb_otg { ++ dr_mode = "host"; ++}; ++ ++&usbphy { ++ usb0_vbus-supply = <®_ldo_io0>; ++ usb1_vbus-supply = <®_ldo_io0>; ++ status = "okay"; ++}; +diff --git a/configs/pinebook_defconfig b/configs/pinebook_defconfig +new file mode 100644 +index 0000000000..5294dbd2eb +--- /dev/null ++++ b/configs/pinebook_defconfig +@@ -0,0 +1,22 @@ ++CONFIG_ARM=y ++CONFIG_ARCH_SUNXI=y ++CONFIG_SPL=y ++CONFIG_MACH_SUN50I=y ++CONFIG_SUNXI_DRAM_LPDDR3_STOCK=y ++CONFIG_DRAM_CLK=552 ++CONFIG_DRAM_ZQ=3881949 ++CONFIG_MMC_SUNXI_SLOT_EXTRA=2 ++CONFIG_R_I2C_ENABLE=y ++# CONFIG_CMD_FLASH is not set ++# CONFIG_SPL_DOS_PARTITION is not set ++# CONFIG_SPL_EFI_PARTITION is not set ++CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-pinebook" ++CONFIG_DM_REGULATOR=y ++CONFIG_DM_REGULATOR_FIXED=y ++CONFIG_DM_PWM=y ++CONFIG_PWM_SUNXI=y ++CONFIG_USB_EHCI_HCD=y ++CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y ++# CONFIG_USB_GADGET is not set ++CONFIG_VIDEO_BRIDGE=y ++CONFIG_VIDEO_BRIDGE_ANALOGIX_ANX6345=y +-- +2.11.0 + diff --git a/gnu/packages/patches/u-boot-pinebook-mmc-calibration.patch b/gnu/packages/patches/u-boot-pinebook-mmc-calibration.patch new file mode 100644 index 0000000000..118bdf8e0c --- /dev/null +++ b/gnu/packages/patches/u-boot-pinebook-mmc-calibration.patch @@ -0,0 +1,98 @@ +From 20940ef2a397446a209350900d3bd618c3fd5b94 Mon Sep 17 00:00:00 2001 +From: Vasily Khoruzhick +Date: Mon, 5 Nov 2018 20:24:28 -0800 +Subject: [PATCH 07/13] mmc: sunxi: add support for automatic delay calibration + +A64 and H6 support automatic delay calibration and Linux driver uses it +instead of hardcoded delays. Add support for it to u-boot driver. + +Fixes eMMC instability on Pinebook + +Signed-off-by: Vasily Khoruzhick +Acked-by: Maxime Ripard +Tested-by: Maxime Ripard +Reviewed-by: Andre Przywara +Cc: Vagrant Cascadian +Reviewed-by: Jagan Teki +--- + arch/arm/include/asm/arch-sunxi/mmc.h | 6 +++++- + drivers/mmc/sunxi_mmc.c | 21 ++++++++++++++++++++- + 2 files changed, 25 insertions(+), 2 deletions(-) + +diff --git a/arch/arm/include/asm/arch-sunxi/mmc.h b/arch/arm/include/asm/arch-sunxi/mmc.h +index d98c53faaa..f2deafddd2 100644 +--- a/arch/arm/include/asm/arch-sunxi/mmc.h ++++ b/arch/arm/include/asm/arch-sunxi/mmc.h +@@ -46,7 +46,9 @@ struct sunxi_mmc { + u32 cbda; /* 0x94 */ + u32 res2[26]; + #if defined(CONFIG_SUNXI_GEN_SUN6I) || defined(CONFIG_MACH_SUN50I_H6) +- u32 res3[64]; ++ u32 res3[17]; ++ u32 samp_dl; ++ u32 res4[46]; + #endif + u32 fifo; /* 0x100 / 0x200 FIFO access address */ + }; +@@ -130,5 +132,7 @@ struct sunxi_mmc { + #define SUNXI_MMC_COMMON_CLK_GATE (1 << 16) + #define SUNXI_MMC_COMMON_RESET (1 << 18) + ++#define SUNXI_MMC_CAL_DL_SW_EN (0x1 << 7) ++ + struct mmc *sunxi_mmc_init(int sdc_no); + #endif /* _SUNXI_MMC_H */ +diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c +index 39f15eb423..147eb9b4d5 100644 +--- a/drivers/mmc/sunxi_mmc.c ++++ b/drivers/mmc/sunxi_mmc.c +@@ -99,11 +99,16 @@ static int mmc_set_mod_clk(struct sunxi_mmc_priv *priv, unsigned int hz) + { + unsigned int pll, pll_hz, div, n, oclk_dly, sclk_dly; + bool new_mode = false; ++ bool calibrate = false; + u32 val = 0; + + if (IS_ENABLED(CONFIG_MMC_SUNXI_HAS_NEW_MODE) && (priv->mmc_no == 2)) + new_mode = true; + ++#if defined(CONFIG_MACH_SUN50I) || defined(CONFIG_MACH_SUN50I_H6) ++ calibrate = true; ++#endif ++ + /* + * The MMC clock has an extra /2 post-divider when operating in the new + * mode. +@@ -174,7 +179,11 @@ static int mmc_set_mod_clk(struct sunxi_mmc_priv *priv, unsigned int hz) + val = CCM_MMC_CTRL_MODE_SEL_NEW; + setbits_le32(&priv->reg->ntsr, SUNXI_MMC_NTSR_MODE_SEL_NEW); + #endif +- } else { ++ } else if (!calibrate) { ++ /* ++ * Use hardcoded delay values if controller doesn't support ++ * calibration ++ */ + val = CCM_MMC_CTRL_OCLK_DLY(oclk_dly) | + CCM_MMC_CTRL_SCLK_DLY(sclk_dly); + } +@@ -228,6 +237,16 @@ static int mmc_config_clock(struct sunxi_mmc_priv *priv, struct mmc *mmc) + rval &= ~SUNXI_MMC_CLK_DIVIDER_MASK; + writel(rval, &priv->reg->clkcr); + ++#if defined(CONFIG_MACH_SUN50I) || defined(CONFIG_MACH_SUN50I_H6) ++ /* A64 supports calibration of delays on MMC controller and we ++ * have to set delay of zero before starting calibration. ++ * Allwinner BSP driver sets a delay only in the case of ++ * using HS400 which is not supported by mainline U-Boot or ++ * Linux at the moment ++ */ ++ writel(SUNXI_MMC_CAL_DL_SW_EN, &priv->reg->samp_dl); ++#endif ++ + /* Re-enable Clock */ + rval |= SUNXI_MMC_CLK_ENABLE; + writel(rval, &priv->reg->clkcr); +-- +2.11.0 + diff --git a/gnu/packages/patches/u-boot-pinebook-r_i2c-controller.patch b/gnu/packages/patches/u-boot-pinebook-r_i2c-controller.patch new file mode 100644 index 0000000000..824a16b9db --- /dev/null +++ b/gnu/packages/patches/u-boot-pinebook-r_i2c-controller.patch @@ -0,0 +1,70 @@ +From 31a4ac4d79d75baeede3edfa95515fd4169ef502 Mon Sep 17 00:00:00 2001 +From: Vasily Khoruzhick +Date: Mon, 5 Nov 2018 20:24:30 -0800 +Subject: [PATCH 09/13] sun50i: A64: add support for R_I2C controller + +Allwinner A64 has a I2C controller, which is in the R_ MMIO zone and has +two groups of pinmuxes on PL bank, so it's called R_I2C. + +Add support for this I2C controller and the pinmux which doesn't conflict +with RSB. + +Signed-off-by: Vasily Khoruzhick +Acked-by: Maxime Ripard +Tested-by: Maxime Ripard +Cc: Vagrant Cascadian +Acked-by: Jagan Teki +--- + arch/arm/include/asm/arch-sunxi/gpio.h | 1 + + arch/arm/mach-sunxi/Kconfig | 1 + + board/sunxi/board.c | 6 ++++++ + 3 files changed, 8 insertions(+) + +diff --git a/arch/arm/include/asm/arch-sunxi/gpio.h b/arch/arm/include/asm/arch-sunxi/gpio.h +index 6a5eafc3d3..2daf23f6f5 100644 +--- a/arch/arm/include/asm/arch-sunxi/gpio.h ++++ b/arch/arm/include/asm/arch-sunxi/gpio.h +@@ -211,6 +211,7 @@ enum sunxi_gpio_number { + #define SUN8I_H3_GPL_R_TWI 2 + #define SUN8I_A23_GPL_R_TWI 3 + #define SUN8I_GPL_R_UART 2 ++#define SUN50I_GPL_R_TWI 2 + + #define SUN9I_GPN_R_RSB 3 + +diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig +index 6277abc3cc..560dc9b25d 100644 +--- a/arch/arm/mach-sunxi/Kconfig ++++ b/arch/arm/mach-sunxi/Kconfig +@@ -278,6 +278,7 @@ config MACH_SUN50I + select ARM64 + select DM_I2C + select PHY_SUN4I_USB ++ select SUN6I_PRCM + select SUNXI_DE2 + select SUNXI_GEN_SUN6I + select SUPPORT_SPL +diff --git a/board/sunxi/board.c b/board/sunxi/board.c +index b196d48674..64ccbc7245 100644 +--- a/board/sunxi/board.c ++++ b/board/sunxi/board.c +@@ -168,10 +168,16 @@ void i2c_init_board(void) + #endif + + #ifdef CONFIG_R_I2C_ENABLE ++#ifdef CONFIG_MACH_SUN50I ++ clock_twi_onoff(5, 1); ++ sunxi_gpio_set_cfgpin(SUNXI_GPL(8), SUN50I_GPL_R_TWI); ++ sunxi_gpio_set_cfgpin(SUNXI_GPL(9), SUN50I_GPL_R_TWI); ++#else + clock_twi_onoff(5, 1); + sunxi_gpio_set_cfgpin(SUNXI_GPL(0), SUN8I_H3_GPL_R_TWI); + sunxi_gpio_set_cfgpin(SUNXI_GPL(1), SUN8I_H3_GPL_R_TWI); + #endif ++#endif + } + + #if defined(CONFIG_ENV_IS_IN_MMC) && defined(CONFIG_ENV_IS_IN_FAT) +-- +2.11.0 + diff --git a/gnu/packages/patches/u-boot-pinebook-syscon-node.patch b/gnu/packages/patches/u-boot-pinebook-syscon-node.patch new file mode 100644 index 0000000000..9289645bec --- /dev/null +++ b/gnu/packages/patches/u-boot-pinebook-syscon-node.patch @@ -0,0 +1,38 @@ +From ababb5920e8992c9bb7956df3cc85dc68d27dfe8 Mon Sep 17 00:00:00 2001 +From: Andre Przywara +Date: Mon, 29 Oct 2018 00:56:48 +0000 +Subject: [PATCH 04/13] sunxi: A64: Re-add syscon to DT node + +The sun50i-a64.dtsi changes introduced in Linux v4.19-rc1 changed the +compatible name for the syscon controller, dropping the generic "syscon" +fallback. Using this new DT node will make the Ethernet driver in every +older kernel (or non-Linux kernels) fail to initialise the MAC device. + +To allow booting distribution kernels (from installer images via UEFI, +for instance), re-add the syscon compatible string as a fallback. This +works with both older and newer kernels. + +Signed-off-by: Andre Przywara +Acked-by: Maxime Ripard +Reviewed-by: Jagan Teki +--- + arch/arm/dts/sun50i-a64.dtsi | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/arch/arm/dts/sun50i-a64.dtsi b/arch/arm/dts/sun50i-a64.dtsi +index f3a66f8882..ff41abc96a 100644 +--- a/arch/arm/dts/sun50i-a64.dtsi ++++ b/arch/arm/dts/sun50i-a64.dtsi +@@ -259,7 +259,8 @@ + }; + + syscon: syscon@1c00000 { +- compatible = "allwinner,sun50i-a64-system-control"; ++ compatible = "allwinner,sun50i-a64-system-control", ++ "syscon"; + reg = <0x01c00000 0x1000>; + #address-cells = <1>; + #size-cells = <1>; +-- +2.11.0 + diff --git a/gnu/packages/patches/u-boot-pinebook-video-bridge.patch b/gnu/packages/patches/u-boot-pinebook-video-bridge.patch new file mode 100644 index 0000000000..8c6ca8a992 --- /dev/null +++ b/gnu/packages/patches/u-boot-pinebook-video-bridge.patch @@ -0,0 +1,50 @@ +From 8336a43792a103c13d939b3925cb75322911f7fb Mon Sep 17 00:00:00 2001 +From: Vasily Khoruzhick +Date: Mon, 5 Nov 2018 20:24:29 -0800 +Subject: [PATCH 08/13] dm: video: bridge: don't fail to activate bridge if + reset or sleep GPIO is missing + +Both GPIOs are optional, so we shouldn't fail if any is missing. +Without this fix reset is not deasserted if sleep GPIO is missing. + +Signed-off-by: Vasily Khoruzhick +Acked-by: Maxime Ripard +Tested-by: Maxime Ripard +Reviewed-by: Andre Przywara +Cc: Vagrant Cascadian +--- + drivers/video/bridge/video-bridge-uclass.c | 16 +++++++++++----- + 1 file changed, 11 insertions(+), 5 deletions(-) + +diff --git a/drivers/video/bridge/video-bridge-uclass.c b/drivers/video/bridge/video-bridge-uclass.c +index cd4959cc71..5fecb4cfd5 100644 +--- a/drivers/video/bridge/video-bridge-uclass.c ++++ b/drivers/video/bridge/video-bridge-uclass.c +@@ -106,13 +106,19 @@ static int video_bridge_pre_probe(struct udevice *dev) + int video_bridge_set_active(struct udevice *dev, bool active) + { + struct video_bridge_priv *uc_priv = dev_get_uclass_priv(dev); +- int ret; ++ int ret = 0; + + debug("%s: %d\n", __func__, active); +- ret = dm_gpio_set_value(&uc_priv->sleep, !active); +- if (ret) +- return ret; +- if (active) { ++ if (uc_priv->sleep.dev) { ++ ret = dm_gpio_set_value(&uc_priv->sleep, !active); ++ if (ret) ++ return ret; ++ } ++ ++ if (!active) ++ return 0; ++ ++ if (uc_priv->reset.dev) { + ret = dm_gpio_set_value(&uc_priv->reset, true); + if (ret) + return ret; +-- +2.11.0 + diff --git a/gnu/system/install.scm b/gnu/system/install.scm index a648ddf95e..45b3a0c839 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -53,6 +53,7 @@ nintendo-nes-classic-edition-installation-os novena-installation-os pine64-plus-installation-os + pinebook-installation-os rk3399-puma-installation-os wandboard-installation-os os-with-u-boot)) @@ -473,6 +474,11 @@ The bootloader BOOTLOADER is installed to BOOTLOADER-TARGET." "/dev/mmcblk0" ; SD card storage "ttyS0")) +(define pinebook-installation-os + (embedded-installation-os u-boot-pinebook-bootloader + "/dev/mmcblk0" ; SD card storage + "ttyS0")) + (define rk3399-puma-installation-os (embedded-installation-os u-boot-puma-rk3399-bootloader "/dev/mmcblk0" ; SD card storage -- cgit v1.2.3 From a605e3c68c8ed9c9375274dae5f53fe74383c7ad Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Fri, 23 Nov 2018 13:54:24 +0100 Subject: gnu: xpra: Update to 2.4.2. * gnu/packages/xorg.scm (xpra): Update to 2.4.2. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 19ec6f5370..1b54296dc1 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5988,7 +5988,7 @@ basic eye-candy effects.") (define-public xpra (package (name "xpra") - (version "2.4.1") + (version "2.4.2") (source (origin (method url-fetch) @@ -5996,7 +5996,7 @@ basic eye-candy effects.") version ".tar.xz")) (sha256 (base32 - "1bhk6vydsrhlngvrv5w55arqf69cr3yw84xscnnl7km2g1iswkrs")))) + "01x4ri0arfq9cn01bh80h232lsj95jp6j1zw0z0q7a6mwrw4gr6i")))) (build-system python-build-system) (inputs `(("ffmpeg" ,ffmpeg) ("flac" ,flac) -- cgit v1.2.3 From 332443d4290278cb40203a2edf5337aba4bb7b46 Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Thu, 22 Nov 2018 07:56:00 +0800 Subject: gnu: emacs-picpocket: Update to 40. Fix version string as well: . * gnu/packages/emacs.scm (emacs-picpocket): Update to 40. --- gnu/packages/emacs.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 98a20028f6..95a3370c3a 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -11735,8 +11735,8 @@ file.") (license license:gpl3+)))) (define-public emacs-picpocket - (let ((version "20180610.1059") ; taken from melpa - (commit "ce4b6ed088384f2414af82e8e4eae5b92c2874bf")) + (let ((version "40") + (commit "6fd88b8711c4370662c0f9c462170187d092a046")) (package (name "emacs-picpocket") (version version) @@ -11748,7 +11748,7 @@ file.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "15vpbcv83mc4j1pvrk7xic0klh2bl9gzg2xxs7c2lmnix52hy8mv")))) + (base32 "1mdzzxf7xm7zwrpnqqxa27d1cr31pd72d7ilbwljv13qp177a3yw")))) (build-system emacs-build-system) (arguments ; needed for running tests `(#:tests? #t -- cgit v1.2.3 From 93d229cb868575b2c89bea2b4f61214d0838fe8b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 23 Nov 2018 15:59:44 +0100 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 72ffb5123159ab403b2882d6b6b90609fa49136b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 23 Nov 2018 16:01:07 +0100 Subject: gnu: Add python-objgraph. * gnu/packages/python.scm (python-objgraph): New variable. --- gnu/packages/python.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') 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") -- cgit v1.2.3 From 936ea3d664b3c9f87824f145ef8649c07287863d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 23 Nov 2018 16:01:21 +0100 Subject: 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(-) (limited to 'gnu') 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))) -- cgit v1.2.3 From c068d0074672c0f6375773de0ef950e3a6e2ac10 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 23 Nov 2018 16:29:35 +0100 Subject: 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(-) (limited to 'gnu') 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))) -- cgit v1.2.3 From 92d9a1e2c6c6b60efef2ad1b7425c0f921760665 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 23 Nov 2018 16:30:16 +0100 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From d57ec906ba5b1e2581842c4dbcbfdfbc58cdad83 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 23 Nov 2018 16:30:48 +0100 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 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: =?UTF-8?q?gnu:=20pt-scotch,=20pt-scotch32:=20Add=20Open=C2=A0MPI?= =?UTF-8?q?=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(-) (limited to 'gnu') 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)"))) -- cgit v1.2.3 From dc240b6aa53df1ef07f00ea75eb88e35b4a9a649 Mon Sep 17 00:00:00 2001 From: Luther Thompson Date: Wed, 21 Nov 2018 19:46:26 -0500 Subject: gnu: python-ilinkedlist: Update to 0.4.0. * gnu/packages/python.scm (python-ilinkedlist): Update to 0.4.0. Signed-off-by: Marius Bakke --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index bf3a939570..868fa70e19 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -14527,14 +14527,14 @@ run on top of the dynamic task schedulers. ") (define-public python-ilinkedlist (package (name "python-ilinkedlist") - (version "0.3.1") + (version "0.4.0") (source (origin (method url-fetch) (uri (pypi-uri "ilinkedlist" version)) (sha256 (base32 - "04wpv7km8jggrngc4bjg3nm615czd3bjdvpsy2icg6c1c8162zyg")))) + "0nrw4sr3afldrp7073hvc0rgdz282s0l819jdmj1i6nn05v33h0l")))) (build-system python-build-system) (native-inputs `(("python-pytest" ,python-pytest))) (inputs `(("python" ,python))) -- cgit v1.2.3 From e6951e4ee09373d14789dd9ab054822f0262ceee Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Thu, 22 Nov 2018 20:40:07 +0000 Subject: gnu: petsc: Update to 3.10.2 * gnu/packages/maths.scm (petsc): Update to 3.10.2. Signed-off-by: Marius Bakke --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index cc4635b4a9..b4cbcab1e0 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1655,7 +1655,7 @@ September 2004}") (define-public petsc (package (name "petsc") - (version "3.9.3") + (version "3.10.2") (source (origin (method url-fetch) @@ -1663,7 +1663,7 @@ September 2004}") (uri (string-append "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/" "petsc-lite-" version ".tar.gz")) (sha256 - (base32 "1fwkbwv4g7zf2lc8fw865xd0bl9anb6jaczfis5dff7h449gwa48")))) + (base32 "0bl64pydak3rblnjffi482r8bin4xim9sb37ksl2jkcxf0i0irsi")))) (outputs '("out" ;libraries and headers "examples")) ;~30MiB of examples (build-system gnu-build-system) -- cgit v1.2.3 From e93da160ca3154846a8197c6c7090ad91e909416 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Thu, 22 Nov 2018 20:40:08 +0000 Subject: gnu: slepc: Update to 3.10.1. * gnu/packages/maths.scm (slepc): Update to 3.10.1. Signed-off-by: Marius Bakke --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index b4cbcab1e0..6053d7642e 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1871,7 +1871,7 @@ savings are consistently > 5x.") (define-public slepc (package (name "slepc") - (version "3.9.2") + (version "3.10.1") (source (origin (method url-fetch) @@ -1879,7 +1879,7 @@ savings are consistently > 5x.") version ".tar.gz")) (sha256 (base32 - "0gmhdqac8zm3jx43h935z7bflazjnpvqxjv4jh5za2y1z2rqax94")))) + "188j1a133q91h8pivpnzwcf78kz8dvz2nzf6ndnjygdbqb48fizn")))) (build-system gnu-build-system) (native-inputs `(("python" ,python-2))) -- cgit v1.2.3 From cd3681a237ec6abb690eec5a32ad909ef1c99e61 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Thu, 22 Nov 2018 20:40:09 +0000 Subject: gnu: python-petsc4py: Update to 3.10.0. * gnu/packages/maths.scm (python-petsc4py): Update to 3.10.0. Signed-off-by: Marius Bakke --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 6053d7642e..12d2e63317 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1812,14 +1812,14 @@ scientific applications modeled by partial differential equations.") (define-public python-petsc4py (package (name "python-petsc4py") - (version "3.9.1") + (version "3.10.0") (source (origin (method url-fetch) (uri (pypi-uri "petsc4py" version)) (sha256 (base32 - "1f8zd1ac9irsgkyqmzq30d9kl10fy1nh6zk312dhs43g449fkkhc")))) + "0ch3g6dsvxl7qi984fcssv7cxfbif4bw04gkvxl2l1b8wrmvrm25")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 57d30004e51dfed92dfa0c53717b8445dffe368c Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Thu, 22 Nov 2018 20:40:10 +0000 Subject: gnu: python-slepc4py: Update to 3.10.0. * gnu/packages/maths.scm (python-slepc4py): Update to 3.10.0. Signed-off-by: Marius Bakke --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 12d2e63317..0cf8916abe 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1978,14 +1978,14 @@ arising after the discretization of partial differential equations.") (define-public python-slepc4py (package (name "python-slepc4py") - (version "3.9.0") + (version "3.10.0") (source (origin (method url-fetch) (uri (pypi-uri "slepc4py" version)) (sha256 (base32 - "02xr0vndgibgkz3rgprqk05n3mk5mpgqw550sr4681vcsgz4zvb7")))) + "0x049dyc8frgh79fvvavf4vlbqp4mgm61nsaivzdav4316vvlv1j")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 87470116e6e6ca306925cc4f57d923ff07bf9dd4 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 10 Nov 2018 22:36:43 +0100 Subject: gnu: Add emacs-ov. * gnu/packages/emacs.scm (emacs-ov): New variable. --- gnu/packages/emacs.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 95a3370c3a..cef70ccae3 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -12568,3 +12568,23 @@ customized. In addition to C code development @command{gtk-look} is good for classes like @command{}. @end itemize\n") (license license:gpl3+))) + +(define-public emacs-ov + (package + (name "emacs-ov") + (version "1.0.6") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ShingoFukuyama/ov.el.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0qxk2rf84j86syxi8xknsq252irwg7sz396v3bb4wqz4prpj0kzc")))) + (build-system emacs-build-system) + (home-page "https://github.com/ShingoFukuyama/ov.el") + (synopsis "Overlay library for Emacs Lisp") + (description "@code{ov.el} provides a simple way to manipulate overlays in +Emacs.") + (license license:gpl3+))) -- cgit v1.2.3 From 8fc78612b58b65587d8e0917c0a01fa1d25f5758 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 10 Nov 2018 23:20:13 +0100 Subject: gnu: Add emacs-tracking. * gnu/packages/emacs.scm (emacs-tracking): New variable. --- gnu/packages/emacs.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index cef70ccae3..8508fb28b6 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -7742,6 +7742,22 @@ activity in channels in the status bar so it stays out of your way unless you want to use it.") (license license:gpl3+))) +(define-public emacs-tracking + (package + (inherit emacs-circe) + (name "emacs-tracking") + (arguments + ;; "tracking.el" is a library extracted from Circe package. It requires + ;; "shorten.el". + `(#:include '("^shorten.el$" "^tracking.el$") + #:tests? #f)) ;tests require buttercup + (home-page "https://github.com/jorgenschaefer/circe/wiki/Tracking") + (synopsis "Buffer tracking library") + (description "@code{tracking.el} provides a way for different modes to +notify the user that a buffer needs attention. The user then can cycle +through them using @key{C-c C-SPC}.") + (license license:gpl3+))) + (define-public emacs-slack (let ((commit "d90395482d26175ce38fd935e978c428be8af9a0") (revision "4")) -- cgit v1.2.3 From d4f7b7e127e2392db93afc7252d0758c22361f06 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 10 Nov 2018 23:50:20 +0100 Subject: gnu: Add emacs-a. * gnu/packages/emacs.scm (emacs-a): New variable. --- gnu/packages/emacs.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 8508fb28b6..f95534d520 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -811,6 +811,29 @@ different tools. It highlights errors and warnings inline in the buffer, and provides an optional IDE-like error list.") (license license:gpl3+))) ;+GFDLv1.3+ for the manual +(define-public emacs-a + (package + (name "emacs-a") + (version "0.1.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/plexus/a.el.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "00v9w6qg3bkwdhypq0ssf0phdh0f4bcq59c20lngd6vhk0204dqi")))) + (build-system emacs-build-system) + (home-page "https://github.com/plexus/a.el/") + (synopsis + "Emacs library for dealing with association lists and hash tables") + (description "@code{emacs-a} provides Emacs Lisp functions for dealing +with associative structures in a uniform and functional way. These functions +can take association lists, hash tables, and in some cases vectors (where the +index is considered the key).") + (license license:gpl3+))) + ;;; ;;; Web browsing. -- cgit v1.2.3 From f12f70b1f24f1a2e1993d99e6af9ee541746497f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 10 Nov 2018 23:56:53 +0100 Subject: gnu: Add emacs-matrix-client. * gnu/packages/emacs.scm (emacs-matrix-client): New variable. --- gnu/packages/emacs.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index f95534d520..4e096ea8c5 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -12627,3 +12627,35 @@ classes like @command{}. (description "@code{ov.el} provides a simple way to manipulate overlays in Emacs.") (license license:gpl3+))) + +(define-public emacs-matrix-client + (let ((commit "3eab4c28280feff18ee1ddd7db66ada4f135cbf8")) + (package + (name "emacs-matrix-client") + (version (git-version "0.0.0" "1" commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jgkamat/matrix-client-el.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1k6721jz0m22vpb78881k087mpx8hf3s2219ic75v5mhgx355f7m")))) + (build-system emacs-build-system) + (propagated-inputs + `(("a" ,emacs-a) + ("dash" ,emacs-dash) + ("esxml" ,emacs-esxml) + ("f" ,emacs-f) + ("ht" ,emacs-ht) + ("ov" ,emacs-ov) + ("request" ,emacs-request) + ("s" ,emacs-s) + ("tracking" ,emacs-tracking))) + (home-page "https://github.com/jgkamat/matrix-client-el") + (synopsis "Matrix client for Emacs") + (description "@code{matrix-client} is a simple chat UI to Matrix.org +rooms. It also provides an API which allows Emacs to seamlessly create +RPC channels with users and other software.") + (license license:gpl3+)))) -- cgit v1.2.3 From 8afe166dd7e8baf710a92f0c6e295e66bb44e606 Mon Sep 17 00:00:00 2001 From: Nam Nguyen Date: Thu, 22 Nov 2018 01:49:07 -0800 Subject: gnu: Add python-service-identity. * gnu/packages/python-crypto.scm (python-service-identity, python2-service-identity): New variables. Signed-off-by: Marius Bakke --- gnu/packages/python-crypto.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 1a70f943a3..1d08578c3d 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2018 Tomáš Čech ;;; Copyright © 2018 Nicolas Goaziou ;;; Copyright © 2018 Vagrant Cascadian +;;; Copyright © 2018 Nam Nguyen ;;; ;;; This file is part of GNU Guix. ;;; @@ -970,3 +971,33 @@ been constructed to maintain extensive documentation on how to use (description "This is a set of Python bindings for the scrypt key derivation function.") (license license:bsd-2))) + +(define-public python-service-identity + (package + (name "python-service-identity") + (version "17.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "service_identity" version)) + (sha256 + (base32 + "1aq24cn3nnsjr9g797dayhx4g653h6bd41ksqhidzq0rvarzn0a0")))) + (build-system python-build-system) + (propagated-inputs + `(("python-attrs" ,python-attrs) + ("python-pyasn1" ,python-pyasn1) + ("python-pyasn1-modules" ,python-pyasn1-modules) + ("python-pyopenssl" ,python-pyopenssl))) + (home-page "https://service-identity.readthedocs.io/") + (synopsis "Service identity verification for PyOpenSSL") + (description + "@code{service_identity} aspires to give you all the tools you need +for verifying whether a certificate is valid for the intended purposes. +In the simplest case, this means host name verification. However, +service_identity implements RFC 6125 fully and plans to add other +relevant RFCs too.") + (license license:expat))) + +(define-public python2-service-identity + (package-with-python2 python-service-identity)) -- cgit v1.2.3 From 39da44c2c0f78730a08bd9803bd681209124b78f Mon Sep 17 00:00:00 2001 From: Nam Nguyen Date: Thu, 22 Nov 2018 01:49:06 -0800 Subject: gnu: libtorrent-rasterbar: Compile Python bindings in C++11 mode. * gnu/packages/bittorrent.scm (libtorrent-rasterbar)[arguments]: Add phase to substitute setup.py. Co-authored-by: Marius Bakke --- gnu/packages/bittorrent.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 59fbd6906b..e66f089cf8 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Jelle Licht ;;; Copyright © 2018 Fis Trivial +;;; Copyright © 2018 Nam Nguyen ;;; ;;; This file is part of GNU Guix. ;;; @@ -393,7 +394,18 @@ and will take advantage of multiple processor cores where possible.") "CXXFLAGS=-std=c++11") ; Use std::chrono instead of boost #:make-flags (list (string-append "LDFLAGS=-Wl,-rpath=" - (assoc-ref %outputs "out") "/lib")))) + (assoc-ref %outputs "out") "/lib")) + #:phases (modify-phases %standard-phases + (add-after 'unpack 'compile-python-c++11 + (lambda _ + ;; Make sure the Python bindings are compiled in C++ mode to + ;; avoid undefined references as mentioned in + ;; . + ;; XXX: This can be removed for 1.2+. + (substitute* "bindings/python/setup.py" + (("\\+ target_specific\\(\\)\\,") + "+ target_specific() + ['-std=c++11'],")) + #t))))) (inputs `(("boost" ,boost) ("openssl" ,openssl))) (native-inputs `(("python" ,python-2) -- cgit v1.2.3 From c2be790fb114ae516718a1fce0abd285611c9c87 Mon Sep 17 00:00:00 2001 From: Nam Nguyen Date: Thu, 22 Nov 2018 01:49:05 -0800 Subject: gnu: Add deluge. * gnu/packages/bittorrent.scm (deluge): New variable. Co-authored-by: Mike Rosset Signed-off-by: Marius Bakke --- gnu/packages/bittorrent.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index e66f089cf8..e0206ae516 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -43,6 +43,7 @@ #:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages databases) #:use-module (gnu packages file) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) @@ -55,6 +56,7 @@ #:use-module (gnu packages ncurses) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-crypto) #:use-module (gnu packages qt) #:use-module (gnu packages ssh) #:use-module (gnu packages tls) @@ -460,3 +462,40 @@ It aims to be a good alternative to all other BitTorrent clients out there. qBittorrent is fast, stable and provides unicode support as well as many features.") (license l:gpl2+))) + +(define-public deluge + (package + (name "deluge") + (version "1.3.15") + (source + (origin + (method url-fetch) + (uri (string-append + "http://download.deluge-torrent.org/source/deluge-" + version ".tar.xz")) + (sha256 + (base32 + "0b7rri4x0wrcj7rjghrnw1kfrsd5i7i6aq85dsg5dg1w1qa0ar59")))) + (build-system python-build-system) + (inputs + `(("libtorrent" ,libtorrent-rasterbar) + ("python2-chardet" ,python2-chardet) + ("python2-pygtk" ,python2-pygtk) + ("python2-pyopenssl" ,python2-pyopenssl) + ("python2-pyxdg" ,python2-pyxdg) + ("python2-service-identity" ,python2-service-identity) + ("python2-twisted" ,python2-twisted))) + (native-inputs + `(("intltool" ,intltool))) + (arguments + `(#:python ,python-2)) + (home-page "https://www.deluge-torrent.org/") + (synopsis "Fully-featured cross-platform ​BitTorrent client") + (description + "Deluge contains the common features to BitTorrent clients such as +Protocol Encryption, DHT, Local Peer Discovery (LSD), Peer Exchange +(PEX), UPnP, NAT-PMP, Proxy support, Web seeds, global and per-torrent +speed limits. Deluge heavily utilises the ​libtorrent library. It is +designed to run as both a normal standalone desktop application and as a +​client-server.") + (license l:gpl3+))) -- cgit v1.2.3 From 43bcf392a7635ec0d1dc09c3f933984d8d96ce61 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 23 Nov 2018 23:09:13 +0100 Subject: gnu: libtorrent-rasterbar: Update to 1.1.11. * gnu/packages/bittorrent.scm (libtorrent-rasterbar): Update to 1.1.11. --- gnu/packages/bittorrent.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index e0206ae516..9df5a8e119 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -374,17 +374,17 @@ and will take advantage of multiple processor cores where possible.") (define-public libtorrent-rasterbar (package (name "libtorrent-rasterbar") - (version "1.1.8") + (version "1.1.11") (source (origin (method url-fetch) (uri (string-append - "https://github.com/arvidn/libtorrent/releases/download/libtorrent-" + "https://github.com/arvidn/libtorrent/releases/download/libtorrent_" (string-join (string-split version #\.) "_") "/libtorrent-rasterbar-" version ".tar.gz")) (sha256 (base32 - "0pcdy26l5ivcs78y2bqh2qca83ikzjfchw5815xh69qf8g88zgvb")))) + "0isqidr11fnhybr0wvk0qxd97jaikmh8fx9h89b84yd2gyxdw8vw")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From dc4851093ce6f3bd2ac71fa189ad87cd740cb656 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 24 Nov 2018 01:47:38 +0100 Subject: gnu: libraw: Update to 0.19.1. * gnu/packages/photo.scm (libraw): Update to 0.19.1. --- gnu/packages/photo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 1cd789b802..afa5022c37 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -69,14 +69,14 @@ (define-public libraw (package (name "libraw") - (version "0.19.0") + (version "0.19.1") (source (origin (method url-fetch) (uri (string-append "https://www.libraw.org/data/LibRaw-" version ".tar.gz")) (sha256 (base32 - "0nfj7s7qmgfy1cl8s3ck7dxjvprfq5glfi6iidmvmy8r7gl52gz8")))) + "1xjyw4n9gfr2r637pjbpbi3h98h9mdjn61b0hsxwqynq2vdij452")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 52b24ba495d674946587419c58192d940f13be4a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 23 Nov 2018 22:47:42 +0100 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 01cef16f8594956a06824751f5f2a0be8b823627 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 22 Nov 2018 14:27:55 +0100 Subject: 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(-) (limited to 'gnu') 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* _ -- cgit v1.2.3 From 5d46c8b47a5bf9fe02fe3930e376f80ce7165a58 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 24 Nov 2018 02:17:46 +0100 Subject: gnu: freedesktop.scm: Sort imports and remove duplicates. * gnu/packages/freedesktop.scm: Sort imports alphabetically. --- gnu/packages/freedesktop.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 5cc2699ad8..431cbd0c30 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -67,16 +67,14 @@ #:use-module (gnu packages m4) #:use-module (gnu packages perl) #:use-module (gnu packages perl-check) - #:use-module (gnu packages polkit) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages perl) - #:use-module (gnu packages perl-check) + #:use-module (gnu packages polkit) #:use-module (gnu packages python) #:use-module (gnu packages valgrind) #:use-module (gnu packages w3m) #:use-module (gnu packages web) - #:use-module (gnu packages xml) #:use-module (gnu packages xdisorg) + #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (srfi srfi-1)) -- cgit v1.2.3 From f3d1a0463ae8627a0aa471e0d1a52b3d35a88064 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 23 Nov 2018 21:01:49 -0500 Subject: gnu: linux-libre@4.4: Update to 4.4.164. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.164. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 5f5d55b691..b4571fbc14 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -445,8 +445,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.163" - "05j0dm0cxilanp5z40n8kgjz9vn1p4rg63kksicd2v48w8ka82z6" + (make-linux-libre "4.4.164" + "04w4x97bkd2javjws9pzv1shfcrhyn4nf9w8b6qk6zdaj45fzasb" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From 268ba4cbcfdae3f5571b51d7c77830247821b74a Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 23 Nov 2018 21:02:53 -0500 Subject: gnu: linux-libre@4.9: Update to 4.9.140. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.140. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b4571fbc14..f80b84d440 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -439,8 +439,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.137" - "1d8313r2k0qr4x7nqlnbwn5lzfc7dz6w8sfg47jml1q38c2fyjf2" + (make-linux-libre "4.9.140" + "12amh7m0khjx5q3bcv8sq59xkanaxa5xnw4m1iql7503nk4pgg9a" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From 245139cd0d3b7ef092022c5101ce58855207c880 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 23 Nov 2018 21:03:29 -0500 Subject: gnu: linux-libre@4.14: Update to 4.14.83. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.83. (%linux-libre-4.14-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f80b84d440..8e264cb7bd 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -429,8 +429,8 @@ It has been modified to remove all non-free binary blobs.") #:patches %linux-libre-4.19-patches #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.81") -(define %linux-libre-4.14-hash "0vxs8k7ka8aqnn1fcr88bhr07wa5jg83pq1rcjby9k422mbv254q") +(define %linux-libre-4.14-version "4.14.83") +(define %linux-libre-4.14-hash "0x6r09bqdrcqigyjx922vji3pdv36l24pl0j33xs8b7xawkvii9g") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.2.3 From 318507a6f6fabf1a70bc83238e1e920582a37aa2 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 23 Nov 2018 21:05:18 -0500 Subject: gnu: linux-libre: Update to 4.19.4. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.19.4. (%linux-libre-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8e264cb7bd..8eec8a73a8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -406,8 +406,8 @@ It has been modified to remove all non-free binary blobs.") ;; supports qemu "virt" machine and possibly a large number of ARM boards. ;; See : https://wiki.debian.org/DebianKernel/ARMMP. -(define %linux-libre-version "4.19.2") -(define %linux-libre-hash "1yh4ll9qh4wmf9r62ksyic57g1iy1b84qbv855l545ilk12znbmj") +(define %linux-libre-version "4.19.4") +(define %linux-libre-hash "0m5k14a89bf5avr3kdh3909qjfnd051fbsb0v7a52d54dkg2nbp6") (define %linux-libre-4.19-patches (list %boot-logo-patch -- cgit v1.2.3 From 083ce0ad5ecd10c6033bbdef5ddfcc2f58a7b800 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 11 Nov 2018 18:29:48 -0500 Subject: gnu: Add APFS-FUSE. * gnu/packages/file-systems.scm (apfs-fuse): New variable. --- gnu/packages/file-systems.scm | 49 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index f250719bbd..93d1561948 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Gábor Boskovits ;;; Copyright © 2017, 2018 Ricardo Wurmus +;;; Copyright © 2018 Leo Famulari ;;; ;;; This file is part of GNU Guix. ;;; @@ -23,6 +24,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix utils) #:use-module (gnu packages) @@ -245,3 +247,50 @@ All of this is accomplished without a centralized metadata server.") (description "This is a file system client based on the FTP File Transfer Protocol.") (license license:gpl2+))) + +(define-public apfs-fuse + (let ((commit "c7036a3030d128bcecefc1eabc47c039ccfdcec9") + (revision "0")) + (package + (name "apfs-fuse") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sgan81/apfs-fuse") + (recursive? #t) ; for lzfse + (commit commit))) + (sha256 + (base32 + "1akd4cx1f9cyq6sfk9ybv4chhjwjlnqi8ic4z5ajnd5x0g76nz3r")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; No test suite + #:phases + (modify-phases %standard-phases + ;; No 'install' target in CMakeLists.txt + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (lib (string-append out "/lib")) + (doc (string-append out "/share/doc/" + (string-append ,name "-" ,version)))) + (install-file "apfs-dump" bin) + (install-file "apfs-dump-quick" bin) + (install-file "apfs-fuse" bin) + (install-file "libapfs.a" lib) + (install-file "../source/LICENSE" doc) + #t)))))) + (inputs + `(("bzip2" ,bzip2) + ("fuse" ,fuse) + ("zlib" ,zlib))) + (synopsis "Read-only FUSE driver for the APFS filesystem") + (description "APFS-FUSE is a read-only FUSE driver for the @dfn{Apple File +System} (APFS). It is currently in an experimental state — it may not be able +to read all files, and it does not support all the compression methods in +APFS.") + (home-page "https://github.com/sgan81/apfs-fuse") + (license license:gpl2+)))) -- cgit v1.2.3 From e83c7d1abaf4fc56165e8307c8b49327b98327f8 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 24 Nov 2018 15:11:37 +0100 Subject: gnu: femtolisp: Move to scheme.scm. * gnu/packages/lisp.scm (femtolisp): Remove. * gnu/packages/scheme.scm (femtolisp): Add. --- gnu/packages/lisp.scm | 51 ------------------------------------------------- gnu/packages/scheme.scm | 51 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 51 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index caa90d5a0a..741eaf2a45 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -69,7 +69,6 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages webkit) #:use-module (ice-9 match) - #:use-module (srfi srfi-1) #:use-module (srfi srfi-19)) (define (asdf-substitutions lisp) @@ -679,56 +678,6 @@ designs.") license:asl2.0 license:cpl1.0))))) -(define-public femtolisp - (let ((commit "68c5b1225572ecf2c52baf62f928063e5a30511b") - (revision "1")) - (package - (name "femtolisp") - (version (string-append "0.0.0-" revision "." (string-take commit 7))) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/JeffBezanson/femtolisp.git") - (commit commit))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "04rnwllxnl86zw8c6pwxznn49bvkvh0f1lfliy085vjzvlq3rgja")))) - ;; See "utils.h" for supported systems. Upstream bug: - ;; https://github.com/JeffBezanson/femtolisp/issues/25 - (supported-systems - (fold delete %supported-systems - '("armhf-linux" "mips64el-linux" "aarch64-linux"))) - (build-system gnu-build-system) - (arguments - `(#:make-flags '("CC=gcc" "release") - #:test-target "test" - #:phases - (modify-phases %standard-phases - (delete 'configure) ; No configure script - (replace 'install ; Makefile has no 'install phase - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (install-file "flisp" bin) - #t))) - ;; The flisp binary is now available, run bootstrap to - ;; generate flisp.boot and afterwards runs make test. - (add-after 'install 'bootstrap-gen-and-test - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (and - (zero? (system* "./bootstrap.sh")) - (install-file "flisp.boot" bin)))))))) - (synopsis "Scheme-like lisp implementation") - (description - "@code{femtolisp} is a scheme-like lisp implementation with a -simple, elegant Scheme dialect. It is a lisp-1 with lexical scope. -The core is 12 builtin special forms and 33 builtin functions.") - (home-page "https://github.com/JeffBezanson/femtolisp") - (license license:bsd-3)))) - (define-public lush2 (package (name "lush2") diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 9654fe36f5..c03c53b91f 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -66,6 +66,7 @@ #:use-module (gnu packages tls) #:use-module (gnu packages gl) #:use-module (gnu packages libedit) + #:use-module (srfi srfi-1) #:use-module (ice-9 match)) (define (mit-scheme-source-directory system version) @@ -1095,3 +1096,53 @@ in-lining, unboxing, and flow-directed program-specific and program-point-specific low-level representation selection and code generation.") (license gpl2+)))) + +(define-public femtolisp + (let ((commit "68c5b1225572ecf2c52baf62f928063e5a30511b") + (revision "1")) + (package + (name "femtolisp") + (version (string-append "0.0.0-" revision "." (string-take commit 7))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JeffBezanson/femtolisp.git") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "04rnwllxnl86zw8c6pwxznn49bvkvh0f1lfliy085vjzvlq3rgja")))) + ;; See "utils.h" for supported systems. Upstream bug: + ;; https://github.com/JeffBezanson/femtolisp/issues/25 + (supported-systems + (fold delete %supported-systems + '("armhf-linux" "mips64el-linux" "aarch64-linux"))) + (build-system gnu-build-system) + (arguments + `(#:make-flags '("CC=gcc" "release") + #:test-target "test" + #:phases + (modify-phases %standard-phases + (delete 'configure) ; No configure script + (replace 'install ; Makefile has no 'install phase + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (install-file "flisp" bin) + #t))) + ;; The flisp binary is now available, run bootstrap to + ;; generate flisp.boot and afterwards runs make test. + (add-after 'install 'bootstrap-gen-and-test + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (and + (zero? (system* "./bootstrap.sh")) + (install-file "flisp.boot" bin)))))))) + (synopsis "Scheme-like lisp implementation") + (description + "@code{femtolisp} is a scheme-like lisp implementation with a +simple, elegant Scheme dialect. It is a lisp-1 with lexical scope. +The core is 12 builtin special forms and 33 builtin functions.") + (home-page "https://github.com/JeffBezanson/femtolisp") + (license bsd-3)))) -- cgit v1.2.3 From 96cfa168e50c3e61ba83899ef25808f0066fff72 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 24 Nov 2018 15:18:12 +0100 Subject: gnu: clojure: Move to new clojure.scm. * gnu/local.mk (clojure): Include new clojure.scm. * gnu/packages/clojure.scm: Add clojure, clojure-algo-generic, clojure-algo-monads, clojure-core-match, clojure-instaparse, clojure-tools-macro. * gnu/packages/lisp.scm: Remove clojure, clojure-algo-generic, clojure-algo-monads, clojure-core-match, clojure-instaparse, clojure-tools-macro. --- gnu/local.mk | 1 + gnu/packages/clojure.scm | 293 +++++++++++++++++++++++++++++++++++++++++++++++ gnu/packages/lisp.scm | 266 ------------------------------------------ 3 files changed, 294 insertions(+), 266 deletions(-) create mode 100644 gnu/packages/clojure.scm (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index c56278e933..3350e5abac 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -101,6 +101,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/chez.scm \ %D%/packages/ci.scm \ %D%/packages/cinnamon.scm \ + %D%/packages/clojure.scm \ %D%/packages/cluster.scm \ %D%/packages/cmake.scm \ %D%/packages/cobol.scm \ diff --git a/gnu/packages/clojure.scm b/gnu/packages/clojure.scm new file mode 100644 index 0000000000..1dba4cef87 --- /dev/null +++ b/gnu/packages/clojure.scm @@ -0,0 +1,293 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2018 Alex Vong +;;; Copyright © 2018 Pierre Neidhardt +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages clojure) + #:use-module (gnu packages) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (guix build-system ant) + #:use-module (guix build-system clojure) + #:use-module (ice-9 match)) + +(define-public clojure + (let* ((lib (lambda (prefix version hash) + (origin (method url-fetch) + (uri (string-append "https://github.com/clojure/" + prefix version ".tar.gz")) + (sha256 (base32 hash))))) + ;; The libraries below are needed to run the tests. + (libraries + `(("core-specs-alpha-src" + ,(lib "core.specs.alpha/archive/core.specs.alpha-" + "0.1.24" + "0v2a0svf1ar2y42ajxwsjr7zmm5j7pp2zwrd2jh3k7xzd1p9x1fv")) + ("data-generators-src" + ,(lib "data.generators/archive/data.generators-" + "0.1.2" + "0kki093jp4ckwxzfnw8ylflrfqs8b1i1wi9iapmwcsy328dmgzp1")) + ("spec-alpha-src" + ,(lib "spec.alpha/archive/spec.alpha-" + "0.1.143" + "00alf0347licdn773w2jarpllyrbl52qz4d8mw61anjksacxylzz")) + ("test-check-src" + ,(lib "test.check/archive/test.check-" + "0.9.0" + "0p0mnyhr442bzkz0s4k5ra3i6l5lc7kp6ajaqkkyh4c2k5yck1md")) + ("test-generative-src" + ,(lib "test.generative/archive/test.generative-" + "0.5.2" + "1pjafy1i7yblc7ixmcpfq1lfbyf3jaljvkgrajn70sws9xs7a9f8")) + ("tools-namespace-src" + ,(lib "tools.namespace/archive/tools.namespace-" + "0.2.11" + "10baak8v0hnwz2hr33bavshm7y49mmn9zsyyms1dwjz45p5ymhy0")))) + (library-names (match libraries + (((library-name _) ...) + library-name)))) + + (package + (name "clojure") + (version "1.9.0") + (source + (origin + (method url-fetch) + (uri + (string-append "https://github.com/clojure/clojure/archive/clojure-" + version ".tar.gz")) + (sha256 + (base32 "0xjbzcw45z32vsn9pifp7ndysjzqswp5ig0jkjpivigh2ckkdzha")))) + (build-system ant-build-system) + (arguments + `(#:imported-modules ((guix build clojure-utils) + (guix build guile-build-system) + ,@%ant-build-system-modules) + #:modules ((guix build ant-build-system) + (guix build clojure-utils) + (guix build java-utils) + (guix build utils) + (srfi srfi-26)) + #:test-target "test" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'unpack-library-sources + (lambda* (#:key inputs #:allow-other-keys) + (define (extract-library name) + (mkdir-p name) + (with-directory-excursion name + (invoke "tar" + "--extract" + "--verbose" + "--file" (assoc-ref inputs name) + "--strip-components=1")) + (copy-recursively (string-append name "/src/main/clojure/") + "src/clj/")) + (for-each extract-library ',library-names) + #t)) + (add-after 'unpack-library-sources 'fix-manifest-classpath + (lambda _ + (substitute* "build.xml" + (("") "")) + #t)) + (add-after 'build 'build-javadoc ant-build-javadoc) + (replace 'install (install-jars "./")) + (add-after 'install-license-files 'install-doc + (cut install-doc #:doc-dirs '("doc/clojure/") <...>)) + (add-after 'install-doc 'install-javadoc + (install-javadoc "target/javadoc/"))))) + (native-inputs libraries) + (home-page "https://clojure.org/") + (synopsis "Lisp dialect running on the JVM") + (description "Clojure is a dynamic, general-purpose programming language, +combining the approachability and interactive development of a scripting +language with an efficient and robust infrastructure for multithreaded +programming. Clojure is a compiled language, yet remains completely dynamic +– every feature supported by Clojure is supported at runtime. Clojure +provides easy access to the Java frameworks, with optional type hints and type +inference, to ensure that calls to Java can avoid reflection. + +Clojure is a dialect of Lisp, and shares with Lisp the code-as-data philosophy +and a powerful macro system. Clojure is predominantly a functional programming +language, and features a rich set of immutable, persistent data structures. +When mutable state is needed, Clojure offers a software transactional memory +system and reactive Agent system that ensure clean, correct, multithreaded +designs.") + ;; Clojure is licensed under EPL1.0 + ;; ASM bytecode manipulation library is licensed under BSD-3 + ;; Guava Murmur3 hash implementation is licensed under APL2.0 + ;; src/clj/repl.clj is licensed under CPL1.0 + + ;; See readme.html or readme.txt for details. + (license (list license:epl1.0 + license:bsd-3 + license:asl2.0 + license:cpl1.0))))) + +(define-public clojure-algo-generic + (package + (name "clojure-algo-generic") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri + (string-append "https://github.com/clojure/algo.generic/archive" + "/algo.generic-" version ".tar.gz")) + (sha256 + (base32 "12w9681i545gp1af4576z1qbixwps1j13c16fmcc7zsb0bd1zr7w")))) + (build-system clojure-build-system) + (arguments + '(#:source-dirs '("src/main/clojure/") + #:test-dirs '("src/test/clojure/") + #:doc-dirs '())) + (synopsis "Generic versions of common functions") + (description + "Generic versions of commonly used functions, implemented as multimethods +that can be implemented for any data type.") + (home-page "https://github.com/clojure/algo.generic") + (license license:epl1.0))) + +(define-public clojure-algo-monads + (package + (name "clojure-algo-monads") + (version "0.1.6") + (source + (origin + (method url-fetch) + (uri + (string-append "https://github.com/clojure/algo.monads/archive" + "/algo.monads-" version ".tar.gz")) + (sha256 + (base32 "14gbvfgmrda990h45yn7zag83vp1kdkz4f4yzmyvkr0sjihlgdmq")))) + (build-system clojure-build-system) + (arguments + '(#:source-dirs '("src/main/clojure/") + #:test-dirs '("src/test/clojure/") + #:doc-dirs '())) + (native-inputs + `(("clojure-tools-macro" ,clojure-tools-macro))) + (synopsis + "Monad Macros and Definitions") + (description + "This library contains the most commonly used monads as well as macros for +defining and using monads and useful monadic functions.") + (home-page "https://github.com/clojure/algo.monads") + (license license:epl1.0))) + +(define-public clojure-core-match + (let ((commit "1837ffbd4a150e8f3953b2d9ed5cf4a4ad3720a7") + (revision "1")) ; this is the 1st commit buildable with clojure 1.9 + (package + (name "clojure-core-match") + (version (git-version "0.3.0-alpha5" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/clojure/core.match.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "04bdlp5dgkrqzrz0lw3mfwmygj2218qnm1cz3dkb9wy4m0238s4d")))) + (build-system clojure-build-system) + (arguments + '(#:source-dirs '("src/main/clojure") + #:test-dirs '("src/test/clojure") + #:doc-dirs '())) + (synopsis "Optimized pattern matching for Clojure") + (description + "An optimized pattern matching library for Clojure. +It supports Clojure 1.5.1 and later as well as ClojureScript.") + (home-page "https://github.com/clojure/core.match") + (license license:epl1.0)))) + +(define-public clojure-instaparse + (let ((commit "dcfffad5b065e750f0f5835f017cdd8188b8ca2e") + (version "1.4.9")) ; upstream forget to tag this release + (package + (name "clojure-instaparse") + (version version) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Engelberg/instaparse.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "002mrgin4z3dqy88r1lak7smd0m7x8d22vmliw0m6w6mh5pa17lk")))) + (build-system clojure-build-system) + (arguments + '(#:doc-dirs '("docs/"))) + (synopsis "No grammar left behind") + (description + "Instaparse aims to be the simplest way to build parsers in Clojure. + +@itemize +@item Turns @emph{standard EBNF or ABNF notation} for context-free grammars +into an executable parser that takes a string as an input and produces a parse +tree for that string. + +@item @dfn{No Grammar Left Behind}: Works for @emph{any} context-free grammar, +including @emph{left-recursive}, @emph{right-recursive}, and @emph{ambiguous} +grammars. + +@item Extends the power of context-free grammars with PEG-like syntax for +lookahead and negative lookahead. + +@item Supports both of Clojure's most popular tree formats (hiccup and enlive) +as output targets + +@item Detailed reporting of parse errors. + +@item Optionally produces lazy sequence of all parses (especially useful for +diagnosing and debugging ambiguous grammars). + +@item ``Total parsing'' mode where leftover string is embedded in the parse +tree. + +@item Optional combinator library for building grammars programmatically. + +@item Performant. +@end itemize") + (home-page "https://github.com/Engelberg/instaparse") + (license license:epl1.0)))) + +(define-public clojure-tools-macro + (package + (name "clojure-tools-macro") + (version "0.1.5") + (source + (origin + (method url-fetch) + (uri + (string-append "https://github.com/clojure/tools.macro/archive" + "/tools.macro-" version ".tar.gz")) + (sha256 + (base32 "0fs64a0g63xx6g7sj6vrsqknhl90s0isf6k053nw8vv5prfzc7v6")))) + (build-system clojure-build-system) + (arguments + '(#:source-dirs '("src/main/clojure/") + #:test-dirs '("src/test/clojure/") + #:doc-dirs '())) + (synopsis "Utilities for macro writers") + (description "Tools for writing macros.") + (home-page "https://github.com/clojure/tools.macro") + (license license:epl1.0))) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 741eaf2a45..37ce6fa983 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -36,7 +36,6 @@ #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system ant) - #:use-module (guix build-system clojure) #:use-module (guix build-system asdf) #:use-module (guix build-system trivial) #:use-module (gnu packages admin) @@ -565,119 +564,6 @@ interface.") (license (list license:lgpl2.1 license:clarified-artistic)))) ;TRIVIAL-LDAP package -(define-public clojure - (let* ((lib (lambda (prefix version hash) - (origin (method url-fetch) - (uri (string-append "https://github.com/clojure/" - prefix version ".tar.gz")) - (sha256 (base32 hash))))) - ;; The libraries below are needed to run the tests. - (libraries - `(("core-specs-alpha-src" - ,(lib "core.specs.alpha/archive/core.specs.alpha-" - "0.1.24" - "0v2a0svf1ar2y42ajxwsjr7zmm5j7pp2zwrd2jh3k7xzd1p9x1fv")) - ("data-generators-src" - ,(lib "data.generators/archive/data.generators-" - "0.1.2" - "0kki093jp4ckwxzfnw8ylflrfqs8b1i1wi9iapmwcsy328dmgzp1")) - ("spec-alpha-src" - ,(lib "spec.alpha/archive/spec.alpha-" - "0.1.143" - "00alf0347licdn773w2jarpllyrbl52qz4d8mw61anjksacxylzz")) - ("test-check-src" - ,(lib "test.check/archive/test.check-" - "0.9.0" - "0p0mnyhr442bzkz0s4k5ra3i6l5lc7kp6ajaqkkyh4c2k5yck1md")) - ("test-generative-src" - ,(lib "test.generative/archive/test.generative-" - "0.5.2" - "1pjafy1i7yblc7ixmcpfq1lfbyf3jaljvkgrajn70sws9xs7a9f8")) - ("tools-namespace-src" - ,(lib "tools.namespace/archive/tools.namespace-" - "0.2.11" - "10baak8v0hnwz2hr33bavshm7y49mmn9zsyyms1dwjz45p5ymhy0")))) - (library-names (match libraries - (((library-name _) ...) - library-name)))) - - (package - (name "clojure") - (version "1.9.0") - (source - (origin - (method url-fetch) - (uri - (string-append "https://github.com/clojure/clojure/archive/clojure-" - version ".tar.gz")) - (sha256 - (base32 "0xjbzcw45z32vsn9pifp7ndysjzqswp5ig0jkjpivigh2ckkdzha")))) - (build-system ant-build-system) - (arguments - `(#:imported-modules ((guix build clojure-utils) - (guix build guile-build-system) - ,@%ant-build-system-modules) - #:modules ((guix build ant-build-system) - (guix build clojure-utils) - (guix build java-utils) - (guix build utils) - (srfi srfi-26)) - #:test-target "test" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'unpack-library-sources - (lambda* (#:key inputs #:allow-other-keys) - (define (extract-library name) - (mkdir-p name) - (with-directory-excursion name - (invoke "tar" - "--extract" - "--verbose" - "--file" (assoc-ref inputs name) - "--strip-components=1")) - (copy-recursively (string-append name "/src/main/clojure/") - "src/clj/")) - (for-each extract-library ',library-names) - #t)) - (add-after 'unpack-library-sources 'fix-manifest-classpath - (lambda _ - (substitute* "build.xml" - (("") "")) - #t)) - (add-after 'build 'build-javadoc ant-build-javadoc) - (replace 'install (install-jars "./")) - (add-after 'install-license-files 'install-doc - (cut install-doc #:doc-dirs '("doc/clojure/") <...>)) - (add-after 'install-doc 'install-javadoc - (install-javadoc "target/javadoc/"))))) - (native-inputs libraries) - (home-page "https://clojure.org/") - (synopsis "Lisp dialect running on the JVM") - (description "Clojure is a dynamic, general-purpose programming language, -combining the approachability and interactive development of a scripting -language with an efficient and robust infrastructure for multithreaded -programming. Clojure is a compiled language, yet remains completely dynamic -– every feature supported by Clojure is supported at runtime. Clojure -provides easy access to the Java frameworks, with optional type hints and type -inference, to ensure that calls to Java can avoid reflection. - -Clojure is a dialect of Lisp, and shares with Lisp the code-as-data philosophy -and a powerful macro system. Clojure is predominantly a functional programming -language, and features a rich set of immutable, persistent data structures. -When mutable state is needed, Clojure offers a software transactional memory -system and reactive Agent system that ensure clean, correct, multithreaded -designs.") - ;; Clojure is licensed under EPL1.0 - ;; ASM bytecode manipulation library is licensed under BSD-3 - ;; Guava Murmur3 hash implementation is licensed under APL2.0 - ;; src/clj/repl.clj is licensed under CPL1.0 - - ;; See readme.html or readme.txt for details. - (license (list license:epl1.0 - license:bsd-3 - license:asl2.0 - license:cpl1.0))))) - (define-public lush2 (package (name "lush2") @@ -1557,158 +1443,6 @@ compressor. It works on data produced by @code{parse-js} to generate a ("sbcl-cl-uglify-js" ,sbcl-cl-uglify-js))) (synopsis "JavaScript compressor"))) -(define-public clojure-algo-generic - (package - (name "clojure-algo-generic") - (version "0.1.3") - (source - (origin - (method url-fetch) - (uri - (string-append "https://github.com/clojure/algo.generic/archive" - "/algo.generic-" version ".tar.gz")) - (sha256 - (base32 "12w9681i545gp1af4576z1qbixwps1j13c16fmcc7zsb0bd1zr7w")))) - (build-system clojure-build-system) - (arguments - '(#:source-dirs '("src/main/clojure/") - #:test-dirs '("src/test/clojure/") - #:doc-dirs '())) - (synopsis "Generic versions of common functions") - (description - "Generic versions of commonly used functions, implemented as multimethods -that can be implemented for any data type.") - (home-page "https://github.com/clojure/algo.generic") - (license license:epl1.0))) - -(define-public clojure-algo-monads - (package - (name "clojure-algo-monads") - (version "0.1.6") - (source - (origin - (method url-fetch) - (uri - (string-append "https://github.com/clojure/algo.monads/archive" - "/algo.monads-" version ".tar.gz")) - (sha256 - (base32 "14gbvfgmrda990h45yn7zag83vp1kdkz4f4yzmyvkr0sjihlgdmq")))) - (build-system clojure-build-system) - (arguments - '(#:source-dirs '("src/main/clojure/") - #:test-dirs '("src/test/clojure/") - #:doc-dirs '())) - (native-inputs - `(("clojure-tools-macro" ,clojure-tools-macro))) - (synopsis - "Monad Macros and Definitions") - (description - "This library contains the most commonly used monads as well as macros for -defining and using monads and useful monadic functions.") - (home-page "https://github.com/clojure/algo.monads") - (license license:epl1.0))) - -(define-public clojure-core-match - (let ((commit "1837ffbd4a150e8f3953b2d9ed5cf4a4ad3720a7") - (revision "1")) ; this is the 1st commit buildable with clojure 1.9 - (package - (name "clojure-core-match") - (version (git-version "0.3.0-alpha5" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/clojure/core.match.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "04bdlp5dgkrqzrz0lw3mfwmygj2218qnm1cz3dkb9wy4m0238s4d")))) - (build-system clojure-build-system) - (arguments - '(#:source-dirs '("src/main/clojure") - #:test-dirs '("src/test/clojure") - #:doc-dirs '())) - (synopsis "Optimized pattern matching for Clojure") - (description - "An optimized pattern matching library for Clojure. -It supports Clojure 1.5.1 and later as well as ClojureScript.") - (home-page "https://github.com/clojure/core.match") - (license license:epl1.0)))) - -(define-public clojure-instaparse - (let ((commit "dcfffad5b065e750f0f5835f017cdd8188b8ca2e") - (version "1.4.9")) ; upstream forget to tag this release - (package - (name "clojure-instaparse") - (version version) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Engelberg/instaparse.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "002mrgin4z3dqy88r1lak7smd0m7x8d22vmliw0m6w6mh5pa17lk")))) - (build-system clojure-build-system) - (arguments - '(#:doc-dirs '("docs/"))) - (synopsis "No grammar left behind") - (description - "Instaparse aims to be the simplest way to build parsers in Clojure. - -@itemize -@item Turns @emph{standard EBNF or ABNF notation} for context-free grammars -into an executable parser that takes a string as an input and produces a parse -tree for that string. - -@item @dfn{No Grammar Left Behind}: Works for @emph{any} context-free grammar, -including @emph{left-recursive}, @emph{right-recursive}, and @emph{ambiguous} -grammars. - -@item Extends the power of context-free grammars with PEG-like syntax for -lookahead and negative lookahead. - -@item Supports both of Clojure's most popular tree formats (hiccup and enlive) -as output targets - -@item Detailed reporting of parse errors. - -@item Optionally produces lazy sequence of all parses (especially useful for -diagnosing and debugging ambiguous grammars). - -@item ``Total parsing'' mode where leftover string is embedded in the parse -tree. - -@item Optional combinator library for building grammars programmatically. - -@item Performant. -@end itemize") - (home-page "https://github.com/Engelberg/instaparse") - (license license:epl1.0)))) - -(define-public clojure-tools-macro - (package - (name "clojure-tools-macro") - (version "0.1.5") - (source - (origin - (method url-fetch) - (uri - (string-append "https://github.com/clojure/tools.macro/archive" - "/tools.macro-" version ".tar.gz")) - (sha256 - (base32 "0fs64a0g63xx6g7sj6vrsqknhl90s0isf6k053nw8vv5prfzc7v6")))) - (build-system clojure-build-system) - (arguments - '(#:source-dirs '("src/main/clojure/") - #:test-dirs '("src/test/clojure/") - #:doc-dirs '())) - (synopsis "Utilities for macro writers") - (description "Tools for writing macros.") - (home-page "https://github.com/clojure/tools.macro") - (license license:epl1.0))) - (define-public confusion-mdl (let* ((commit "12a055581fc262225272df43287dae48281900f5")) (package -- cgit v1.2.3 From 59a1aa595bfcd997ae9186cbc644df436afed97c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 24 Nov 2018 02:59:09 +0100 Subject: 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(-) (limited to 'gnu') 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. -- cgit v1.2.3 From 15b5f9f718e29ccd884658bb8cfbd4104d9c4026 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 24 Nov 2018 02:33:40 +0100 Subject: 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(-) (limited to 'gnu') 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") -- cgit v1.2.3 From f028823c0f8083bdca2dceb9672a67408318117d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 24 Nov 2018 15:54:03 +0100 Subject: 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(+) (limited to 'gnu') 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") -- cgit v1.2.3 From 68f2e552060a9c94f1eb56246e7f14103ca119dc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 24 Nov 2018 15:55:29 +0100 Subject: 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(+) (limited to 'gnu') 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") -- cgit v1.2.3 From 60667159d329b1f07d01b5bd03e3b289208ad406 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 24 Nov 2018 15:56:55 +0100 Subject: 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(-) (limited to 'gnu') 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))) -- cgit v1.2.3 From 27ebd5c4f9361a3964f2cde647f5afa70fd9f2af Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 24 Nov 2018 15:43:41 +0100 Subject: gnu: gcl: Remove unnecessary texlive input. * gnu/packages/lisp.scm (gcl)[native-inputs]: Remove texlive. --- gnu/packages/lisp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 37ce6fa983..ea839ef58b 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; Copyright © 2018 Benjamin Slade ;;; Copyright © 2018 Alex Vong +;;; Copyright © 2018 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; @@ -168,8 +169,7 @@ (native-inputs `(("gcc" ,gcc-4.9) ("m4" ,m4) - ("texinfo" ,texinfo) - ("texlive" ,texlive))) + ("texinfo" ,texinfo))) (home-page "https://www.gnu.org/software/gcl/") (synopsis "A Common Lisp implementation") (description "GCL is an implementation of the Common Lisp language. It -- cgit v1.2.3 From 4bddcae94bb9d19112354f8f0b93f6e381e67768 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 24 Nov 2018 18:34:22 +0100 Subject: gnu: sbcl: Update to 1.4.13. * gnu/packages/lisp.scm (sbcl): Update to 1.4.13. [native-inputs]: Use minimal texlive-union instead of full texlive. [native-inputs]: Use CCL instead of buggy CLISP. [arguments]: Replace all (zero? (system* ...)) by invoke. --- gnu/packages/lisp.scm | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index ea839ef58b..a3649e5bd6 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -316,14 +316,14 @@ an interpreter, a compiler, a debugger, and much more.") (define-public sbcl (package (name "sbcl") - (version "1.4.4") + (version "1.4.13") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/sbcl/sbcl/" version "/sbcl-" version "-source.tar.bz2")) (sha256 - (base32 "1k6v5b8qv7vyxvh8asx6phf2hbapx5pp5p5j47hgnq123fwnh4fa")) + (base32 "120rnnz8367lk7ljqlf8xidm4b0d738xqsib4kq0q5ms5r7fzgvm")) (modules '((guix build utils))) (snippet ;; Add sbcl-bundle-systems to 'default-system-source-registry'. @@ -335,11 +335,20 @@ an interpreter, a compiler, a debugger, and much more.") (outputs '("out" "doc")) ;; Bootstrap with CLISP. (native-inputs - `(("clisp" ,clisp) + ;; From INSTALL: + ;; Supported build hosts are: + ;; SBCL + ;; CMUCL + ;; CCL (formerly known as OpenMCL) + ;; ABCL (recent versions only) + ;; CLISP (only some versions: 2.44.1 is OK, 2.47 is not) + ;; XCL + ;; CCL seems ideal then. + `(("ccl" ,ccl) ("which" ,which) ("inetutils" ,inetutils) ;for hostname(1) ("ed" ,ed) - ("texlive" ,texlive) + ("texlive" ,(texlive-union (list texlive-tex-texinfo))) ("texinfo" ,texinfo))) (arguments '(#:modules ((guix build gnu-build-system) @@ -394,20 +403,24 @@ an interpreter, a compiler, a debugger, and much more.") (string-append "#+nil ;disabled by Guix\n" all)) (("\\(deftest grent\\.[12]" all) (string-append "#+nil ;disabled by Guix\n" all)))))) + ;; FIXME: the texlive-union insists on regenerating fonts. It stores + ;; them in HOME, so it needs to be writeable. + (add-before 'build 'set-HOME + (lambda _ (setenv "HOME" "/tmp") #t)) (replace 'build (lambda* (#:key outputs #:allow-other-keys) (setenv "CC" "gcc") - (zero? (system* "sh" "make.sh" "clisp" - (string-append "--prefix=" - (assoc-ref outputs "out")))))) + (invoke "sh" "make.sh" "ccl" + (string-append "--prefix=" + (assoc-ref outputs "out"))))) (replace 'install (lambda _ - (zero? (system* "sh" "install.sh")))) + (invoke "sh" "install.sh"))) (add-after 'build 'build-doc (lambda _ (with-directory-excursion "doc/manual" - (and (zero? (system* "make" "info")) - (zero? (system* "make" "dist")))))) + (and (invoke "make" "info") + (invoke "make" "dist"))))) (add-after 'install 'install-doc (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From 799d4bac62038cf253aacdcfa93fe8f5755fc60f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 24 Nov 2018 18:36:45 +0100 Subject: 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(-) (limited to 'gnu') 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") -- cgit v1.2.3 From 366cd7fcba3ef7a26c17f20fe07a65308d8f9186 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 17 Nov 2018 21:59:46 +0100 Subject: 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(-) (limited to 'gnu') 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, -- cgit v1.2.3 From 45bc4b7ecb1a5a2aef379a36f20fc74ba3c5b10b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 24 Nov 2018 18:42:29 +0100 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 5ff6e06763fb5df48465298588a2920ae84c5a3a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 24 Nov 2018 19:26:01 +0100 Subject: 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(+) (limited to 'gnu') 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" -- cgit v1.2.3 From e1d97c4efc42a661bd2772041371303e4070aa4f Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 5 Nov 2018 04:04:45 -0500 Subject: gnu: rhythmbox: Update hash of patch. * gnu/packages/gnome.scm (rhythmbox)[source]: Update hash of the applied patch. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 06ec28b342..376cf5ad39 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3746,7 +3746,7 @@ which can read a large number of file formats.") "b182c6b9e1d09e601bac0b703cc5f8b159ebbc3a.patch")) (sha256 (base32 - "17j45vyyr071ka3nckj2gycgyyv1j08fyrxw89jfdq2442nzrsiy"))))) + "06n87xgf927djmv1vshal84nqx7g8nwgljza3g2vydhy7g2n1csq"))))) (sha256 (base32 "0hzcns8gf5yb0rm4ss8jd8qzarcaplp5cylk6plwilsqfvxj4xn2")))) -- cgit v1.2.3 From 1b3083267cbacc9ef48bbc9ff95864065894b082 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 24 Nov 2018 02:21:42 -0500 Subject: gnu: ocaml-piqilib: Remove duplicate 'home-page' field. This is a followup to commit 564cf93f2aca60171b4b97559ffc6c952e73e8ed. * gnu/packages/ocaml.scm (ocaml-piqilib)[home-page]: Remove duplicate field. --- gnu/packages/ocaml.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index e1323582a2..8c6e1da7d1 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4297,7 +4297,6 @@ cpp-like directives.") ("ulex" ,ocaml-ulex) ("easy-format" ,ocaml-easy-format) ("base64" ,ocaml-base64))) - (home-page "http://www.cduce.org/download.html#side") (home-page "http://piqi.org") (synopsis "Data serialization and conversion library") (description "Piqilib is the common library used by the piqi command-line -- cgit v1.2.3 From 4b2d1dc4dc48c38ac440aafd384e60565d638cf6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 24 Nov 2018 19:32:48 +0100 Subject: 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(-) (limited to 'gnu') 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/") -- cgit v1.2.3 From 12618049852bcbfd6390b5ff2779cdadf35618db Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 24 Nov 2018 19:43:18 +0100 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From 682c2918992a5d2d716cdc6a9cc7db62cd994e1e Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Sat, 24 Nov 2018 00:12:14 -0600 Subject: gnu: sqlcipher: Update to 3.4.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/databases.scm (sqlcipher): Update to 3.4.2. Signed-off-by: Ludovic Courtès --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 7258622f42..ac1b23a327 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1963,14 +1963,14 @@ can autogenerate peewee models using @code{pwiz}, a model generator.") (define-public sqlcipher (package (name "sqlcipher") - (version "3.3.1") + (version "3.4.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/sqlcipher/" name "/archive/v" version ".tar.gz")) (sha256 - (base32 "1gv58dlbpzrmznly52yqbxgvii0ib88zr3aszla1bsypwjr6flff")) + (base32 "1nxarwbci8jx99f1d0y1ivxcv25s78l1p7q6qy28lkpkcx8pm2b9")) (file-name (string-append name "-" version ".tar.gz")))) (build-system gnu-build-system) (inputs -- cgit v1.2.3 From 61d6451372eaa641fec8475b551f46f9c4884a37 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Sat, 24 Nov 2018 00:18:55 -0600 Subject: gnu: emacs-zenburn-theme: Update to 2.6. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs.scm (emacs-zenburn-theme): Update to 2.6. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 4e096ea8c5..fa79a26e79 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -3391,7 +3391,7 @@ organizer.") (define-public emacs-zenburn-theme (package (name "emacs-zenburn-theme") - (version "2.5") + (version "2.6") (source (origin (method url-fetch) (uri (string-append @@ -3400,7 +3400,7 @@ organizer.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "03kfhzgbbbl8ivpzzky6qxw4j9mmp452m1sk7wikxmcalfnix0gn")))) + "0qc9d1rwq55yzh8shbppyd6izy1grpyr8kqh5zdgm7c5jccngpr4")))) (build-system emacs-build-system) (home-page "https://github.com/bbatsov/zenburn-emacs") (synopsis "Low contrast color theme for Emacs") -- cgit v1.2.3 From 71a78ba65b00ad1f27086a3dcdded7dc4326ade1 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Sat, 24 Nov 2018 13:43:54 -0600 Subject: gnu: emacs-company: Update to 0.9.7. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs.scm (emacs-company): Update to 0.9.7. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index fa79a26e79..9112902548 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -2771,7 +2771,7 @@ build jobs.") (define-public emacs-company (package (name "emacs-company") - (version "0.9.6") + (version "0.9.7") (source (origin (method url-fetch) @@ -2780,7 +2780,7 @@ build jobs.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0a7zvmfvxh9w67myvcj2511ayk0fvkm06cdg38y8khnsx63jrr4k")))) + "19flv38f2qhxda8lbk2ckywvibd72vbzmn4hchqz6d8acsknh4sb")))) (build-system emacs-build-system) (arguments `(#:phases -- cgit v1.2.3 From 254602cdf884379231793c4d793b25c9ebd6c806 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 25 Nov 2018 01:19:21 +0100 Subject: gnu: guix: Update to 71a78ba. * gnu/packages/package-management.scm (guix): Update to 71a78ba. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index dd83d75874..d277d81acb 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -102,8 +102,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "0.15.0") - (commit "f5a2724ae453f4a4b55ff848f4ad7e30efb6eef8") - (revision 7)) + (commit "71a78ba65b00ad1f27086a3dcdded7dc4326ade1") + (revision 8)) (package (name "guix") @@ -119,7 +119,7 @@ (commit commit))) (sha256 (base32 - "12glmvifbwvl6lmxh1mc8nbcp0f5qgw40rmf8n1icxvj0mnjrwp4")) + "0isagzccfxjqrc38wamknvh0jzv1pjh0wq5baj9jzwl07xkrc0hc")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From c1d80c7a9c87e1f3b03f6ec9eec94ce391674e3d Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 25 Nov 2018 12:53:52 +0100 Subject: 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(+) (limited to 'gnu') 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" -- cgit v1.2.3 From 07fdf96140da4531ffdc4ed7b18ebde9ad012737 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 25 Nov 2018 12:55:07 +0100 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 96ce8b5507166e67bb2ed8128889d333a2963124 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 25 Nov 2018 12:35:04 +0100 Subject: gnu: Add cl-markup. * gnu/packages/lisp.scm (cl-markup, ecl-cl-markup, sbcl-cl-markup): New variables. --- gnu/packages/lisp.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index a3649e5bd6..1d8b0f0cdd 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -3494,3 +3494,39 @@ Lisp, featuring: (define-public ecl-lparallel (sbcl-package->ecl-package sbcl-lparallel)) + +(define-public sbcl-cl-markup + (let ((commit "e0eb7debf4bdff98d1f49d0f811321a6a637b390")) + (package + (name "sbcl-cl-markup") + (version (git-version "0.1" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/arielnetworks/cl-markup/") + (commit commit))) + (file-name (git-file-name "cl-markup" version)) + (sha256 + (base32 + "10l6k45971dl13fkdmva7zc6i453lmq9j4xax2ci6pjzlc6xjhp7")))) + (build-system asdf-build-system/sbcl) + (home-page "https://github.com/arielnetworks/cl-markup/") + (synopsis "Markup generation library for Common Lisp") + (description + "A modern markup generation library for Common Lisp that features: + +@itemize +@item Fast (even faster through compiling the code) +@item Safety +@item Support for multiple document types (markup, xml, html, html5, xhtml) +@item Output with doctype +@item Direct output to stream +@end itemize\n") + (license license:lgpl3+)))) + +(define-public cl-markup + (sbcl-package->cl-source-package sbcl-cl-markup)) + +(define-public ecl-cl-markup + (sbcl-package->ecl-package sbcl-cl-markup)) -- cgit v1.2.3 From 9eeef6abb2452725a4595279078ed530dc4c5679 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 25 Nov 2018 12:40:32 +0100 Subject: gnu: Add cl-css. * gnu/packages/lisp.scm (cl-css, ecl-cl-css, sbcl-cl-css): New variables. --- gnu/packages/lisp.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 1d8b0f0cdd..b049fb485d 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -3530,3 +3530,33 @@ Lisp, featuring: (define-public ecl-cl-markup (sbcl-package->ecl-package sbcl-cl-markup)) + +(define-public sbcl-cl-css + (let ((commit "8fe654c8f0cf95b300718101cce4feb517f78e2f")) + (package + (name "sbcl-cl-css") + (version (git-version "0.1" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/inaimathi/cl-css/") + (commit commit))) + (file-name (git-file-name "cl-css" version)) + (sha256 + (base32 + "1lc42zi2sw11fl2589sc19nr5sd2p0wy7wgvgwaggxa5f3ajhsmd")))) + (build-system asdf-build-system/sbcl) + (home-page "https://github.com/inaimathi/cl-css/") + (synopsis "Non-validating, inline CSS generator for Common Lisp") + (description + "This is a dead-simple, non validating, inline CSS generator for Common +Lisp. Its goals are axiomatic syntax, simple implementation to support +portability, and boilerplate reduction in CSS.") + (license license:expat)))) + +(define-public cl-css + (sbcl-package->cl-source-package sbcl-cl-css)) + +(define-public ecl-cl-markup + (sbcl-package->ecl-package sbcl-cl-css)) -- cgit v1.2.3 From 9fabcb6ce24a2fa497dedd35967507df0f1c6b58 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 25 Nov 2018 13:30:35 +0100 Subject: gnu: Add portable-threads. * gnu/packages/lisp.scm (cl-portable-threads, ecl-portable-threads, sbcl-portable-threads): New variables. --- gnu/packages/lisp.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index b049fb485d..42ce0bbf67 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -3560,3 +3560,35 @@ portability, and boilerplate reduction in CSS.") (define-public ecl-cl-markup (sbcl-package->ecl-package sbcl-cl-css)) + +(define-public sbcl-portable-threads + (let ((commit "c0e61a1faeb0583c80fd3f20b16cc4c555226920")) + (package + (name "sbcl-portable-threads") + (version (git-version "2.3" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/binghe/portable-threads/") + (commit commit))) + (file-name (git-file-name "portable-threads" version)) + (sha256 + (base32 + "03fmxyarc0xf4kavwkfa0a2spkyfrz6hbgbi9y4q7ny5aykdyfaq")))) + (build-system asdf-build-system/sbcl) + (arguments + `(;; Tests seem broken. + #:tests? #f)) + (home-page "https://github.com/binghe/portable-threads") + (synopsis "Portable threads (and scheduled and periodic functions) API for Common Lisp") + (description + "Portable Threads (and Scheduled and Periodic Functions) API for Common +Lisp (from GBBopen project).") + (license license:asl2.0)))) + +(define-public cl-portable-threads + (sbcl-package->cl-source-package sbcl-portable-threads)) + +(define-public ecl-portable-threada + (sbcl-package->ecl-package sbcl-portable-threads)) -- cgit v1.2.3 From 75c95c7652916319f00ffdb563b17de373756bbd Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 25 Nov 2018 13:31:54 +0100 Subject: gnu: Add sbcl-usocket-boot0. * gnu/packages/lisp.scm (sbcl-usocket-boot0): New variable. --- gnu/packages/lisp.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 42ce0bbf67..23438003c4 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -3592,3 +3592,34 @@ Lisp (from GBBopen project).") (define-public ecl-portable-threada (sbcl-package->ecl-package sbcl-portable-threads)) + +(define-public sbcl-usocket-boot0 + ;; usocket's test rely on usocket-server which depends on usocket itself. + ;; We break this cyclic dependency with -boot0 that packages usocket. + (let ((commit "86e7efbfe50101931edf4b67cdcfa7e221ecfde9")) + (package + (name "sbcl-usocket-boot0") + (version (git-version "0.7.1" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/usocket/usocket/") + (commit commit))) + (file-name (git-file-name "usocket" version)) + (sha256 + (base32 + "1lk6ipakrib7kdgzw44hrgmls9akp5pz4h35yynw0k5zwmmq6374")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("split-sequence" ,sbcl-split-sequence))) + (arguments + `(#:tests? #f + #:asd-system-name "usocket")) + (home-page "https://common-lisp.net/project/usocket/") + (synopsis "Universal socket library for Common Lisp (server side)") + (description + "This library strives to provide a portable TCP/IP and UDP/IP socket +interface for as many Common Lisp implementations as possible, while keeping +the abstraction and portability layer as thin as possible.") + (license license:expat)))) -- cgit v1.2.3 From be01e79caa2fdf5ff66adf31a1edf071d2f830ca Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 25 Nov 2018 13:32:12 +0100 Subject: gnu: Add usocket-server. * gnu/packages/lisp.scm (cl-usocket-server, ecl-usocket-server, sbcl-usocket-server): New variables. --- gnu/packages/lisp.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 23438003c4..359f8376d5 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -3623,3 +3623,20 @@ Lisp (from GBBopen project).") interface for as many Common Lisp implementations as possible, while keeping the abstraction and portability layer as thin as possible.") (license license:expat)))) + +(define-public sbcl-usocket-server + (package + (inherit sbcl-usocket-boot0) + (name "sbcl-usocket-server") + (inputs + `(("usocket" ,sbcl-usocket-boot0) + ("portable-threads" ,sbcl-portable-threads))) + (arguments + '(#:asd-system-name "usocket-server")) + (synopsis "Universal socket library for Common Lisp (server side)"))) + +(define-public cl-usocket-server + (sbcl-package->cl-source-package sbcl-usocket-server)) + +(define-public ecl-socket-server + (sbcl-package->ecl-package sbcl-usocket-server)) -- cgit v1.2.3 From 79dc47c9c937ecf08680dace26cca029d7de4a2e Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 25 Nov 2018 13:32:49 +0100 Subject: gnu: Add usocket. * gnu/packages/lisp.scm (cl-usocket, ecl-usocket, sbcl-usocket): New variables. --- gnu/packages/lisp.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 359f8376d5..06d1e6fe46 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -3640,3 +3640,21 @@ the abstraction and portability layer as thin as possible.") (define-public ecl-socket-server (sbcl-package->ecl-package sbcl-usocket-server)) + +(define-public sbcl-usocket + (package + (inherit sbcl-usocket-boot0) + (name "sbcl-usocket") + (arguments + ;; FIXME: Tests need network access? + `(#:tests? #f)) + (native-inputs + ;; Testing only. + `(("usocket-server" ,sbcl-usocket-server) + ("rt" ,sbcl-rt))))) + +(define-public cl-usocket + (sbcl-package->cl-source-package sbcl-usocket)) + +(define-public ecl-socket + (sbcl-package->ecl-package sbcl-usocket)) -- cgit v1.2.3 From c931f8098c85fdaa44e4603f39acad86a609079c Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 25 Nov 2018 13:47:54 +0100 Subject: gnu: Add s-xml. * gnu/packages/lisp.scm (cl-s-xml, ecl-s-xml, sbcl-s-xml): New variables. --- gnu/packages/lisp.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 06d1e6fe46..ceb2cfc472 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -3658,3 +3658,51 @@ the abstraction and portability layer as thin as possible.") (define-public ecl-socket (sbcl-package->ecl-package sbcl-usocket)) + +(define-public sbcl-s-xml + (package + (name "sbcl-s-xml") + (version "3") + (source + (origin + (method url-fetch) + (uri "https://common-lisp.net/project/s-xml/s-xml.tgz") + (sha256 + (base32 + "061qcr0dzshsa38s5ma4ay924cwak2nq9gy59dw6v9p0qb58nzjf")))) + (build-system asdf-build-system/sbcl) + (home-page "https://common-lisp.net/project/s-xml/") + (synopsis "Simple XML parser implemented in Common Lisp") + (description + "S-XML is a simple XML parser implemented in Common Lisp. This XML +parser implementation has the following features: + +@itemize +@item It works (handling many common XML usages). +@item It is very small (the core is about 700 lines of code, including +comments and whitespace). +@item It has a core API that is simple, efficient and pure functional, much +like that from SSAX (see also http://ssax.sourceforge.net). +@item It supports different DOM models: an XSML-based one, an LXML-based one +and a classic xml-element struct based one. +@item It is reasonably time and space efficient (internally avoiding garbage +generatation as much as possible). +@item It does support CDATA. +@item It should support the same character sets as your Common Lisp +implementation. +@item It does support XML name spaces. +@end itemize + +This XML parser implementation has the following limitations: + +@itemize +@item It does not support any special tags (like processing instructions). +@item It is not validating, even skips DTD's all together. +@end itemize\n") + (license license:lgpl3+))) + +(define-public cl-s-xml + (sbcl-package->cl-source-package sbcl-s-xml)) + +(define-public ecl-s-xml + (sbcl-package->ecl-package sbcl-s-xml)) -- cgit v1.2.3 From 8c5160dbd5d4f6b5f414a4d563355a11a6afce59 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 25 Nov 2018 13:48:28 +0100 Subject: gnu: Add s-xml-rpc. * gnu/packages/lisp.scm (cl-s-xml-rpc, ecl-s-xml-rpc, sbcl-s-xml-rpc): New variables. --- gnu/packages/lisp.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index ceb2cfc472..87ba39b986 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -3706,3 +3706,30 @@ This XML parser implementation has the following limitations: (define-public ecl-s-xml (sbcl-package->ecl-package sbcl-s-xml)) + +(define-public sbcl-s-xml-rpc + (package + (name "sbcl-s-xml-rpc") + (version "7") + (source + (origin + (method url-fetch) + (uri "https://common-lisp.net/project/s-xml-rpc/s-xml-rpc.tgz") + (sha256 + (base32 + "02z7k163d51v0pzk8mn1xb6h5s6x64gjqkslhwm3a5x26k2gfs11")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("s-xml" ,sbcl-s-xml))) + (home-page "https://common-lisp.net/project/s-xml-rpc/") + (synopsis "Implementation of XML-RPC in Common Lisp for both client and server") + (description + "S-XML-RPC is an implementation of XML-RPC in Common Lisp for both +client and server.") + (license license:lgpl3+))) + +(define-public cl-s-xml-rpc + (sbcl-package->cl-source-package sbcl-s-xml-rpc)) + +(define-public ecl-s-xml-rpc + (sbcl-package->ecl-package sbcl-s-xml-rpc)) -- cgit v1.2.3 From 34843fe9238a041616f063038557d85cd8a30165 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 25 Nov 2018 14:41:16 +0100 Subject: gnu: uncrustify: Update to 0.68.1. * gnu/packages/code.scm (uncrustify): Update to 0.68.1. --- gnu/packages/code.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 72503254e6..1e863b0df1 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -540,7 +540,7 @@ independent targets.") (define-public uncrustify (package (name "uncrustify") - (version "0.67") + (version "0.68.1") (source (origin (method url-fetch) (uri (string-append @@ -548,10 +548,11 @@ independent targets.") "uncrustify-" version ".zip")) (sha256 (base32 - "0n13kq0nsm35fxhdp0f275n4x0w88hdv3bdjy0hgvv42x0dx5zyp")))) + "1jb3hmm11m2mgnypapak2lgyyvspnmx9bxd9dxis5swaja2ddxlg")))) (build-system cmake-build-system) (native-inputs - `(("unzip" ,unzip))) + `(("unzip" ,unzip) + ("python" ,python-wrapper))) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 9b3e11f6a874be3412aacd94634de74e1c70cd53 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 25 Nov 2018 16:56:26 +0100 Subject: 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(+) (limited to 'gnu') 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++ -- cgit v1.2.3 From 07d4200c1c4e6c82c1369289e67311e1837bbd3d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 1 Sep 2018 11:00:57 +0200 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 5895437c619bb40fd24d680571ae67e5229f01d5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 1 Sep 2018 11:01:25 +0200 Subject: 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(-) (limited to 'gnu') 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))) -- cgit v1.2.3 From b64665d1d31d618014f72be6a21a6a6b1825b2d7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 1 Sep 2018 11:01:47 +0200 Subject: 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(-) (limited to 'gnu') 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))) -- cgit v1.2.3 From 06dd29ef4f64109cbdaa611729eabe38ce1a5379 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 1 Sep 2018 13:43:56 +0200 Subject: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From b01e89593da524f131d3c38a9ac0eb95467455f0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 23 Nov 2018 22:00:42 +0100 Subject: 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(-) (limited to 'gnu') 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. -- cgit v1.2.3 From 71cfb437d2997fb50bc6abbe2fdad65fcba6801b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 25 Nov 2018 18:08:50 +0200 Subject: gnu: mtools: Update to 4.0.21. * gnu/packages/mtools.scm (mtools): Update to 4.0.21. --- gnu/packages/mtools.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mtools.scm b/gnu/packages/mtools.scm index 5e3c3dd378..32eb1dba47 100644 --- a/gnu/packages/mtools.scm +++ b/gnu/packages/mtools.scm @@ -28,7 +28,7 @@ (define-public mtools (package (name "mtools") - (version "4.0.20") + (version "4.0.21") (source (origin (method url-fetch) @@ -36,7 +36,7 @@ version ".tar.bz2")) (sha256 (base32 - "1vcahr9s6zv1hnrx2bgjnzcas2y951q90r1jvvv4q9v5kwfd6qb0")))) + "1kybydx74qgbwpnjvjn49msf8zipchl43d4cq8zzwcyvfkdzw7h2")))) (build-system gnu-build-system) (home-page "https://www.gnu.org/software/mtools/") (synopsis "Access MS-DOS disks without mounting") -- cgit v1.2.3 From 0a9d1c5ab713bf525972f651c3cb63570e8c083d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 25 Nov 2018 17:08:04 +0100 Subject: gnu: guix-daemon: Adjust 'install' phase to latest update. Fixes . Reported by Brett Gilio . This is a followup to commit 254602cdf884379231793c4d793b25c9ebd6c806. * gnu/packages/package-management.scm (guix-daemon)[arguments]: In 'install' phase, remove use of "install-nodist_pkglibexecSCRIPTS" target. --- gnu/packages/package-management.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index d277d81acb..141d0e52f7 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -345,8 +345,7 @@ the Nix package manager.") (replace 'install (lambda* (#:key outputs #:allow-other-keys) (invoke "make" "install-binPROGRAMS" - "install-nodist_pkglibexecSCRIPTS" - "install-nodist_libexecSCRIPTS") ;guix-authenticate + "install-nodist_pkglibexecSCRIPTS") ;; We need to tell 'guix-daemon' which 'guix' command to use. ;; Here we use a questionable hack where we hard-code root's -- cgit v1.2.3 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: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From bc6062aef563726fdb1bb7199f2c5628ad967534 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 25 Nov 2018 17:56:51 +0100 Subject: gnu: dovecot: Update to 2.3.4. * gnu/packages/mail.scm (dovecot): Update to 2.3.4. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index fa545da3b2..7fd36c5d7e 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1202,7 +1202,7 @@ facilities for checking incoming mail.") (define-public dovecot (package (name "dovecot") - (version "2.3.2.1") + (version "2.3.4") (source (origin (method url-fetch) @@ -1210,7 +1210,7 @@ facilities for checking incoming mail.") (version-major+minor version) "/" name "-" version ".tar.gz")) (sha256 (base32 - "0d2ffbicgl3wswbnyjbw6qigz7r1aqzprpchbwp5cynw122i2raa")))) + "01ggzf7b3jpl89mjiqr7xbpbs181g2gjf6wzg70qaqfzz3ppc6yr")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 1e92d311c3e43827a76f5bc9a43def7f7690f8c1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 25 Nov 2018 20:36:44 +0100 Subject: 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 +++- .../patches/randomjungle-disable-static-build.patch | 14 ++++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/randomjungle-disable-static-build.patch (limited to 'gnu') 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 -- cgit v1.2.3 From f6e55da06ab09a603de8e32c7383f89a41f5ffd6 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 25 Nov 2018 17:01:22 +0100 Subject: gnu: Add bubblewrap. * gnu/packages/virtualization.scm (bubblewrap): New variable. --- gnu/packages/virtualization.scm | 56 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index e3b9925059..2f8e541d40 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Danny Milosavljevic ;;; Copyright © 2018 Sou Bunnbu +;;; Copyright © 2018 Julien Lepiller ;;; ;;; This file is part of GNU Guix. ;;; @@ -998,3 +999,58 @@ the image. @code{vagrant} command line executable, allowing programmatic control of Vagrant virtual machines.") (license license:expat))) + +(define-public bubblewrap + (package + (name "bubblewrap") + (version "0.3.1") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/projectatomic/bubblewrap/" + "releases/download/v" version "/bubblewrap-" + version ".tar.xz")) + (sha256 + (base32 + "1y2bdlxnlr84xcbf31lzirc292c5ak9bd2wvcvh4ppsliih6pjny")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-test + (lambda* (#:key outputs #:allow-other-keys) + ;; Tests try to access /var/tmp, which is not possible in our build + ;; environment. Let's give them another directory. + ;; /tmp gets overriden in some tests, so we need another directory. + ;; the only possibility is the output directory. + (let ((tmp-dir (string-append (assoc-ref outputs "out") "/tmp"))) + (mkdir-p tmp-dir) + (substitute* "tests/test-run.sh" + (("/var/tmp") tmp-dir) + ;; Tests create a temporary python script, so fix its shebang. + (("/usr/bin/env python") (which "python")) + ;; Some tests try to access /usr, but that doesn't exist. + ;; Give them /gnu instead. + (("/usr") "/gnu") + ((" */bin/bash") (which "bash")) + (("/bin/sh") (which "sh")) + (("findmnt") (which "findmnt")))) + #t)) + ;; Remove the directory we gave to tests to have a clean package. + (add-after 'check 'remove-tmp-dir + (lambda* (#:key outputs #:allow-other-keys) + (delete-file-recursively (string-append (assoc-ref outputs "out") "/tmp")) + #t))))) + (inputs + `(("libcap" ,libcap))) + (native-inputs + `(("python-2" ,python-2) + ("util-linux" ,util-linux))) + (home-page "https://github.com/projectatomic/bubblewrap") + (synopsis "Unprivileged sandboxing tool") + (description "Bubblewrap is aimed at running applications in a sandbox, +where it has restricted access to parts of the operating system or user data +such as the home directory. Bubblewrap always creates a new mount namespace, +and the user can specify exactly what parts of the filesystem should be visible +in the sandbox. Any such directories specified is mounted nodev by default, +and can be made readonly.") + (license license:lgpl2.0+))) -- cgit v1.2.3 From 7a1d25c400c6271363096669b6d969565bebfd70 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 25 Nov 2018 17:02:14 +0100 Subject: gnu: opam: Update to 2.0.1. gnu/packages/ocaml.scm (opam): Update to 2.0.1. [arguments]: Use invoke, return #t and use store paths for dependencies. [inputs]: Add bubblewrap. --- gnu/packages/ocaml.scm | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 8c6e1da7d1..9c0ab94f3e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -59,6 +59,7 @@ #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) + #:use-module (gnu packages virtualization) #:use-module (gnu packages web-browsers) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) @@ -328,7 +329,7 @@ functional, imperative and object-oriented styles of programming.") (define-public opam (package (name "opam") - (version "2.0.0") + (version "2.0.1") (source (origin (method url-fetch) ;; Use the '-full' version, which includes all the dependencies. @@ -340,7 +341,7 @@ functional, imperative and object-oriented styles of programming.") ) (sha256 (base32 - "09gdpxiqmyr6z78l85d7pwhiwrycdi2xi1b2mafqr1sk9z5lzbcx")))) + "0z6r9qr4awcdn7wyrl5y5jm34jsjlnzd00py893f1hd0c6vg3xw1")))) (build-system gnu-build-system) (arguments '(;; Sometimes, 'make -jX' would fail right after ./configure with @@ -361,17 +362,29 @@ functional, imperative and object-oriented styles of programming.") #:phases (modify-phases %standard-phases (add-before 'build 'pre-build (lambda* (#:key inputs make-flags #:allow-other-keys) - (let ((bash (assoc-ref inputs "bash"))) + (let ((bash (assoc-ref inputs "bash")) + (bwrap (string-append (assoc-ref inputs "bubblewrap") + "/bin/bwrap"))) (substitute* "src/core/opamSystem.ml" (("\"/bin/sh\"") - (string-append "\"" bash "/bin/sh\""))) + (string-append "\"" bash "/bin/sh\"")) + (("getconf") + (which "getconf"))) + ;; Use bwrap from the store directly. + (substitute* "src/state/shellscripts/bwrap.sh" + (("-v bwrap") (string-append "-v " bwrap)) + (("exec bwrap") (string-append "exec " bwrap))) + (substitute* "src/client/opamInitDefaults.ml" + (("\"bwrap\"") (string-append "\"" bwrap "\""))) ;; Build dependencies - (zero? (apply system* "make" "lib-ext" make-flags))))) + (apply invoke "make" "lib-ext" make-flags) + #t))) (add-before 'check 'pre-check (lambda _ (setenv "HOME" (getcwd)) - (and (system "git config --global user.email guix@gnu.org") - (system "git config --global user.name Guix"))))))) + (invoke "git" "config" "--global" "user.email" "guix@gnu.org") + (invoke "git" "config" "--global" "user.name" "Guix") + #t))))) (native-inputs `(("git" ,git) ;for the tests ("python" ,python) ;for the tests @@ -379,7 +392,8 @@ functional, imperative and object-oriented styles of programming.") (inputs `(("ocaml" ,ocaml) ("ncurses" ,ncurses) - ("curl" ,curl))) + ("curl" ,curl) + ("bubblewrap" ,bubblewrap))) (home-page "http://opam.ocamlpro.com/") (synopsis "Package manager for OCaml") (description -- cgit v1.2.3 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: 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 (limited to 'gnu') 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 -- cgit v1.2.3 From e6c64d0a3f0f615d12518b4797ec0b8f174269f2 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 26 Nov 2018 09:43:09 +0100 Subject: gnu: wine-staging: Update to 3.21. * gnu/packages/wine.scm (wine-staging-patchset-data): Update to 3.21. * gnu/packages/wine.scm (wine-staging): Update to 3.21. --- gnu/packages/wine.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 85c71b5abb..26d5f497e3 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -225,7 +225,7 @@ integrate Windows applications into your desktop.") (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") - (version "3.20") + (version "3.21") (source (origin (method git-fetch) @@ -235,7 +235,7 @@ integrate Windows applications into your desktop.") (file-name (git-file-name name version)) (sha256 (base32 - "049cwllf4aybrhj4l2i3vd5jvagjz4d448404zkyy0lfxr08id3p")))) + "1bxryvqw5rvhcx8vjl714jaj0rjsrh95kh3sn499rrljc3c8qsbl")))) (build-system trivial-build-system) (native-inputs `(("bash" ,bash) @@ -281,7 +281,7 @@ integrate Windows applications into your desktop.") (file-name (string-append name "-" version ".tar.xz")) (sha256 (base32 - "063garmflbna3mhph8k0dv0bkzq8x75x5xrd0j8y0mjh10i13mik")))) + "1h70wb7kysbzv36i3fblyiihvalwhy6sj4s2a8nf21nz2mhc0k58")))) (inputs `(("autoconf" ,autoconf) ; for autoreconf ("gtk+" ,gtk+) ("libva" ,libva) -- cgit v1.2.3 From c23cf1832aba44c03ba50a6f318b0415a4437d53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 26 Nov 2018 10:35:41 +0100 Subject: gnu: Add 'git-minimal'. * gnu/packages/version-control.scm (git-minimal): New variable. --- gnu/packages/version-control.scm | 64 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index ecd5789397..cec3e5fc6c 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -457,6 +457,70 @@ everything from small to very large projects with speed and efficiency.") (license license:gpl2) (home-page "https://git-scm.com/"))) +(define-public git-minimal + ;; The size of the closure of 'git-minimal' is two thirds that of 'git'. + ;; Its test suite runs slightly faster and most importantly it doesn't + ;; depend on packages that are expensive to build such as Subversion. + (package + (inherit git) + (name "git-minimal") + (arguments + (substitute-keyword-arguments (package-arguments git) + ((#:phases phases) + `(modify-phases ,phases + (replace 'patch-makefiles + (lambda _ + (substitute* "Makefile" + (("/usr/bin/perl") (which "perl"))) + #t)) + (delete 'build-subtree) + (delete 'split) + (delete 'install-man-pages) + (delete 'install-subtree) + (delete 'install-credential-netrc) + (add-before 'check 'delete-svn-test + (lambda _ + ;; This test cannot run since we are not building 'git-svn'. + (delete-file "t/t9020-remote-svn.sh") + #t)) + (add-after 'install 'remove-unusable-perl-commands + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (libexec (string-append out "/libexec"))) + (for-each (lambda (file) + (delete-file (string-append libexec + "/git-core/" file))) + '("git-svn" "git-cvsimport" "git-archimport" + "git-cvsserver" "git-request-pull" + "git-add--interactive" "git-cvsexportcommit" + "git-instaweb" "git-send-email")) + (delete-file (string-append bin "/git-cvsserver")) + + ;; These templates typically depend on Perl. Remove them. + (delete-file-recursively + (string-append out "/share/git-core/templates/hooks")) + + ;; Gitweb depends on Perl as well. + (delete-file-recursively + (string-append out "/share/gitweb")) + #t))))) + ((#:configure-flags flags) + ''()) + ((#:disallowed-references lst '()) + `(,perl ,@lst)))) + (outputs '("out")) + (native-inputs + `(("native-perl" ,perl) + ("gettext" ,gettext-minimal))) + (inputs + `(("curl" ,curl) ;for HTTP(S) access + ("expat" ,expat) ;for 'git push' over HTTP(S) + ("openssl" ,openssl) + ("perl" ,perl) + ("zlib" ,zlib) + ("bash-for-tests" ,bash))))) + (define-public libgit2 (package (name "libgit2") -- cgit v1.2.3 From 0c17f72070cbfb04f311b776a080849b369aac25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 24 Nov 2018 16:07:30 +0100 Subject: services: openssh: Install OpenSSH in the system profile. This ensures one can scp to or from the GuixSD machine that uses the service. * gnu/services/ssh.scm (openssh-service-type)[extensions]: Add PROFILE-SERVICE-TYPE extension. * gnu/system/examples/bare-bones.tmpl : Remove OPENSSH. * doc/guix.texi (Using the Configuration System): Adjust accordingly. --- gnu/services/ssh.scm | 10 +++++++++- gnu/system/examples/bare-bones.tmpl | 4 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm index 056602248f..bb94c5f41a 100644 --- a/gnu/services/ssh.scm +++ b/gnu/services/ssh.scm @@ -518,7 +518,15 @@ of user-name/file-like tuples." (service-extension activation-service-type openssh-activation) (service-extension account-service-type - (const %openssh-accounts)))) + (const %openssh-accounts)) + + ;; Install OpenSSH in the system profile. That way, + ;; 'scp' is found when someone tries to copy to or from + ;; this machine. + (service-extension profile-service-type + (lambda (config) + (list (openssh-configuration-openssh + config)))))) (compose concatenate) (extend extend-openssh-authorized-keys) (default-value (openssh-configuration)))) diff --git a/gnu/system/examples/bare-bones.tmpl b/gnu/system/examples/bare-bones.tmpl index 889dcabe64..902dacbe57 100644 --- a/gnu/system/examples/bare-bones.tmpl +++ b/gnu/system/examples/bare-bones.tmpl @@ -3,7 +3,7 @@ (use-modules (gnu)) (use-service-modules networking ssh) -(use-package-modules screen ssh) +(use-package-modules screen) (operating-system (host-name "komputilo") @@ -40,7 +40,7 @@ %base-user-accounts)) ;; Globally-installed packages. - (packages (cons* screen openssh %base-packages)) + (packages (cons screen %base-packages)) ;; Add services to the baseline: a DHCP client and ;; an SSH server. -- cgit v1.2.3 From 4bd610f09e4f2080c4b5989240d4dc614165e477 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 26 Nov 2018 12:21:54 +0200 Subject: gnu: efl: Build with 'release' profile. * gnu/packages/enlightenment.scm (efl)[arguments]: Add 'configure-flag to build the 'release' profile. --- gnu/packages/enlightenment.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 1a0ebba304..4427dd033b 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -139,6 +139,7 @@ (arguments `(#:configure-flags '("--disable-silent-rules" "--disable-systemd" + "--with-profile=release" "--enable-liblz4" "--enable-xinput22" "--enable-image-loader-webp" -- cgit v1.2.3 From 3b160bdccfd541660b9df7337979d88c3ce9bb25 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 26 Nov 2018 12:23:05 +0200 Subject: gnu: efl: Build with full opengl support except on armhf-linux. * gnu/packages/enlightenment.scm (efl)[arguments]: Add 'configure-flags to use full opengl on all architectures except for armhf-linux, which will continue to use opengl-es. --- gnu/packages/enlightenment.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 4427dd033b..fb77642f5f 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -58,7 +58,8 @@ #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages xdisorg) - #:use-module (gnu packages xorg)) + #:use-module (gnu packages xorg) + #:use-module (ice-9 match)) (define-public efl (package @@ -144,8 +145,11 @@ "--enable-xinput22" "--enable-image-loader-webp" "--enable-multisense" - "--with-opengl=es" - "--enable-egl" + ,@(match (%current-system) + ("armhf-linux" + '("--with-opengl=es" "--with-egl")) + (_ + '("--with-opengl=full"))) "--enable-harfbuzz" ;; for wayland "--enable-wayland" -- cgit v1.2.3 From 7628ff1fc04e2a338660e9c40c094e914e0f4b62 Mon Sep 17 00:00:00 2001 From: Tim Gesthuizen Date: Mon, 12 Nov 2018 22:27:41 +0100 Subject: gnu: emacs-clang-format: Inherit from clang. * gnu/packages/emacs.scm (emacs-clang-format): Remove. * gnu/packages/llvm.scm (emacs-clang-format): Add. --- gnu/packages/emacs.scm | 37 ------------------------------------- gnu/packages/llvm.scm | 27 +++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 37 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 9112902548..e69121aef7 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -12533,43 +12533,6 @@ correctly.") @end itemize\n") (license license:gpl3+)))) -(define-public emacs-clang-format - (let ((commit "5556c31528af2661bed3011bd63ffc0ed44e18a0")) - (package - (name "emacs-clang-format") - (version (git-version "0.0.0" "1" commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/emacsorphanage/clang-format") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0ynvnp3vrcpngmwakb23xv4xn7jbkg43s196q7pg9nkl13x4n2nq")))) - (build-system emacs-build-system) - (inputs - `(("clang" ,clang))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'configure - (lambda* (#:key inputs #:allow-other-keys) - (let ((clang (assoc-ref inputs "clang"))) - ;; Repo is read-only. - (chmod "clang-format.el" #o644) - (emacs-substitute-variables "clang-format.el" - ("clang-format-executable" - (string-append clang "/bin/clang-format")))) - #t))))) - (home-page "https://github.com/emacsorphanage/clang-format") - (synopsis "Format code using clang-format") - (description "This package allows to filter code through clang-format to -fix its formatting. @command{clang-format} is a tool that formats C/C++/Obj-C -code according to a set of style options, see -@url{http://clang.llvm.org/docs/ClangFormatStyleOptions.html}.") - (license license:gpl3+)))) - (define-public emacs-gtk-look (package (name "emacs-gtk-look") diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index d237a05a84..6a452f48c6 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -7,6 +7,8 @@ ;;; Copyright © 2017 Roel Janssen ;;; Copyright © 2018 Marius Bakke ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Tim Gesthuizen +;;; Copyright © 2018 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,6 +32,7 @@ #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) + #:use-module (guix build-system emacs) #:use-module (guix build-system python) #:use-module (gnu packages) #:use-module (gnu packages gcc) @@ -433,3 +436,27 @@ code analysis tools.") (description "This package provides a Python binding to LLVM for use in Numba.") (license license:bsd-3))) + +(define-public emacs-clang-format + (package + (inherit clang) + (name "emacs-clang-format") + (build-system emacs-build-system) + (inputs + `(("clang" ,clang))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'configure + (lambda* (#:key inputs #:allow-other-keys) + (let ((clang (assoc-ref inputs "clang"))) + (copy-file "tools/clang-format/clang-format.el" "clang-format.el") + (emacs-substitute-variables "clang-format.el" + ("clang-format-executable" + (string-append clang "/bin/clang-format")))) + #t))))) + (synopsis "Format code using clang-format") + (description "This package allows to filter code through @code{clang-format} +to fix its formatting. @code{clang-format} is a tool that formats +C/C++/Obj-C code according to a set of style options, see +@url{http://clang.llvm.org/docs/ClangFormatStyleOptions.html}."))) -- cgit v1.2.3 From 51002b723dbd24805f5071c895b0c9cd6c7bf395 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 26 Nov 2018 12:42:39 +0100 Subject: gnu: Add emacs-clang-rename. * gnu/packages/llvm.scm (emacs-clang-rename): New variable. --- gnu/packages/llvm.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 6a452f48c6..276a89c2a0 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -460,3 +460,25 @@ code analysis tools.") to fix its formatting. @code{clang-format} is a tool that formats C/C++/Obj-C code according to a set of style options, see @url{http://clang.llvm.org/docs/ClangFormatStyleOptions.html}."))) + +(define-public emacs-clang-rename + (package + (inherit clang) + (name "emacs-clang-rename") + (build-system emacs-build-system) + (inputs + `(("clang" ,clang))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'configure + (lambda* (#:key inputs #:allow-other-keys) + (let ((clang (assoc-ref inputs "clang"))) + (copy-file "tools/clang-rename/clang-rename.el" "clang-rename.el") + (emacs-substitute-variables "clang-rename.el" + ("clang-rename-binary" + (string-append clang "/bin/clang-rename")))) + #t))))) + (synopsis "Rename every occurrence of a symbol using clang-rename") + (description "This package renames every occurrence of a symbol at point +using @code{clang-rename}."))) -- cgit v1.2.3 From 1c7372a5aadea84165376a4b8e2664b67a663c56 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 26 Nov 2018 14:51:40 +0100 Subject: gnu: clang-from-llvm: Clean up share/clang folder. * gnu/packages/llvm.scm (clang-from-llvm): Remove useless files, install completion. --- gnu/packages/llvm.scm | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 276a89c2a0..0b12f736a9 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -235,7 +235,26 @@ compiler. In LLVM this library is called \"compiler-rt\".") (substitute* "lib/Driver/ToolChains.cpp" (("@GLIBC_LIBDIR@") (string-append libc "/lib"))))) - #t)))))) + #t))) + (add-after 'install 'install-clean-up-/share/clang + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (compl-dir (string-append + out "/etc/bash_completion.d"))) + (with-directory-excursion (string-append out + "/share/clang") + ;; Delete extensions for proprietary text editors. + (delete-file "clang-format-bbedit.applescript") + (delete-file "clang-format-sublime.py") + ;; Delete Emacs extensions: see their respective Emacs + ;; Guix package instead. + (delete-file "clang-rename.el") + (delete-file "clang-format.el") + ;; Install bash completion. + (mkdir-p compl-dir) + (rename-file "bash-autocomplete.sh" + (string-append compl-dir "/clang")))) + #t))))) ;; Clang supports the same environment variables as GCC. (native-search-paths -- cgit v1.2.3 From 176f1436c7af95eff6c8e63a0d0ba6922927a9da Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 21 Nov 2018 14:38:06 +0100 Subject: gnu: python-seaborn: Update to 0.9.0. * gnu/packages/python.scm (python-seaborn): Update to 0.9.0. [arguments]: Enable tests. [propagated-inputs]: Add python-numpy. [native-inputs]: Add python-pytest and xorg-server. [properties]: Remove. (python2-seaborn)[propagated-inputs]: Remove python2-pytz. --- gnu/packages/python.scm | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 868fa70e19..54f9495e36 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5387,20 +5387,34 @@ SVG, EPS, PNG and terminal output.") (define-public python-seaborn (package (name "python-seaborn") - (version "0.7.1") + (version "0.9.0") (source (origin (method url-fetch) (uri (pypi-uri "seaborn" version)) (sha256 - (base32 "0pawrqc3mxpwd5g9pvi9gba02637bh5c8ldpp8izfwpfn52469zs")))) + (base32 "0bqysi3fxfjl1866m5jq8z7mynhqbqnikim74dmzn8539iwkzj3n")))) (build-system python-build-system) (arguments - '(#:tests? #f)) ; Tests requires a running X11 server. + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'start-xserver + (lambda* (#:key inputs #:allow-other-keys) + (let ((xorg-server (assoc-ref inputs "xorg-server"))) + ;; There must be a running X server and make check doesn't + ;; start one. Therefore we must do it. + (system (format #f "~a/bin/Xvfb :1 &" xorg-server)) + (setenv "DISPLAY" ":1") + #t))) + (replace 'check (lambda _ (invoke "pytest" "seaborn") #t))))) (propagated-inputs `(("python-pandas" ,python-pandas) ("python-matplotlib" ,python-matplotlib) + ("python-numpy" ,python-numpy) ("python-scipy" ,python-scipy))) + (native-inputs + `(("python-pytest" ,python-pytest) + ("xorg-server" ,xorg-server))) (home-page "http://stanford.edu/~mwaskom/software/seaborn/") (synopsis "Statistical data visualization") (description @@ -5408,15 +5422,10 @@ SVG, EPS, PNG and terminal output.") graphics in Python. It is built on top of matplotlib and tightly integrated with the PyData stack, including support for numpy and pandas data structures and statistical routines from scipy and statsmodels.") - (license license:bsd-3) - (properties `((python2-variant . ,(delay python2-seaborn)))))) + (license license:bsd-3))) (define-public python2-seaborn - (let ((base (package-with-python2 (strip-python2-variant python-seaborn)))) - (package - (inherit base) - (propagated-inputs `(("python2-pytz" ,python2-pytz) - ,@(package-propagated-inputs base)))))) + (package-with-python2 python-seaborn)) (define-public python-mpmath (package -- cgit v1.2.3 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: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 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: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From de42429040d1754301fe76e5de53deda3e973027 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 26 Nov 2018 19:31:15 +0100 Subject: 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(+) (limited to 'gnu') 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" -- cgit v1.2.3 From 5a1ac6138d31f5e48c273b4f9292292d76d7432a Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 26 Nov 2018 20:09:14 +0100 Subject: 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(-) (limited to 'gnu') 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))) -- cgit v1.2.3 From aaff78bef9d5ebcde965890fad442e25d8af4a2e Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 26 Nov 2018 20:35:35 +0100 Subject: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 8160baf8b755cc6217ac263a61724c789fcf49e8 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 26 Nov 2018 21:48:03 +0100 Subject: 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(-) (limited to 'gnu') 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. -- cgit v1.2.3 From bc0d24292d776826b8ce9c9aa9d620e33160d1ed Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 27 Nov 2018 00:23:03 +0100 Subject: 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 (limited to 'gnu') 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); + } + -- cgit v1.2.3 From 152859388613f3ae65793f763f72868147b2a6be Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 26 Nov 2018 19:02:46 -0500 Subject: gnu: Mutt: Update to 1.11.0. * gnu/packages/mail.scm (mutt): Update to 1.11.0. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 7fd36c5d7e..bc544cc503 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -257,14 +257,14 @@ aliasing facilities to work just as they would on normal mail.") (define-public mutt (package (name "mutt") - (version "1.10.1") + (version "1.11.0") (source (origin (method url-fetch) (uri (string-append "https://bitbucket.org/mutt/mutt/downloads/" "mutt-" version ".tar.gz")) (sha256 (base32 - "182lkbkpd3q3l1x6bvyds90ycp38gyyxhf35ry0d3hwf2n1khjkk")) + "1qqhkhlzvjj0iih8vm0wfagv4fzqqy1wnsb4sqsfv7w06ccjdjcj")) (patches (search-patches "mutt-store-references.patch")))) (build-system gnu-build-system) (inputs -- cgit v1.2.3 From 0995a5692cb85418b2d5f21c24d46ee4aa9fb7c9 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Sun, 25 Nov 2018 22:30:35 -0600 Subject: qtwebkit: Fix pri install directory. * gnu/packages/qt.scm (qtwebkit)[arguments]: Add "ECM_MKSPECS_INSTALL_DIR" to #:configure-flags. --- gnu/packages/qt.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index d487699827..d8860e79a4 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Nicolas Goaziou ;;; Copyright © 2018 Hartmut Goebel +;;; Copyright © 2018 Eric Bavier ;;; ;;; This file is part of GNU Guix. ;;; @@ -2171,7 +2172,10 @@ different kinds of sliders, and much more.") #:configure-flags (list ;"-DENABLE_API_TESTS=TRUE" "-DPORT=Qt" "-DUSE_LIBHYPHEN=OFF" - "-DUSE_SYSTEM_MALLOC=ON"))) + "-DUSE_SYSTEM_MALLOC=ON" + ;; XXX: relative dir installs to build dir? + (string-append "-DECM_MKSPECS_INSTALL_DIR=" + %output "/lib/qt5/mkspecs/modules")))) (home-page "https://www.webkit.org") (synopsis "Web browser engine and classes to render and interact with web content") -- cgit v1.2.3 From ebdb15bc3540b1901f223bc0689bae51a2f88fc4 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Sun, 25 Nov 2018 22:31:29 -0600 Subject: qtwebkit: Reduce RAM requirements for linking. * gnu/packages/qt.scm (qtwebkit)[arguments]: Link shared libraries and executables with "--no-keep-memory". --- gnu/packages/qt.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index d8860e79a4..36f8aef694 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2175,7 +2175,12 @@ different kinds of sliders, and much more.") "-DUSE_SYSTEM_MALLOC=ON" ;; XXX: relative dir installs to build dir? (string-append "-DECM_MKSPECS_INSTALL_DIR=" - %output "/lib/qt5/mkspecs/modules")))) + %output "/lib/qt5/mkspecs/modules") + ;; Sacrifice a little speed in order to link + ;; libraries and test executables in a + ;; reasonable amount of memory. + "-DCMAKE_SHARED_LINKER_FLAGS=-Wl,--no-keep-memory" + "-DCMAKE_EXE_LINKER_FLAGS=-Wl,--no-keep-memory"))) (home-page "https://www.webkit.org") (synopsis "Web browser engine and classes to render and interact with web content") -- cgit v1.2.3 From ef8517f29d7412f78e6481b3df56fd81041e3e3a Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Mon, 19 Jun 2017 22:55:39 -0500 Subject: gnu: Add libopenshot-audio. * gnu/packages/audio.scm (libopenshot-audio): New variable. --- gnu/packages/audio.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 45d20ca46a..b58d574fcc 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2018 Brett Gilio ;;; Copyright © 2018 Marius Bakke ;;; Copyright © 2018 Thorsten Wilms +;;; Copyright © 2018 Eric Bavier ;;; ;;; This file is part of GNU Guix. ;;; @@ -3623,3 +3624,38 @@ library supports sample rates up to 96 kHz and up to eight channels (7.1 surround).") (license (license:fsf-free "https://github.com/mstorsjo/fdk-aac/blob/master/NOTICE" "https://www.gnu.org/licenses/license-list.html#fdk"))))) + +(define-public libopenshot-audio + (package + (name "libopenshot-audio") + (version "0.1.7") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/OpenShot/libopenshot-audio") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "08a8wbi28kwrdz4h0rs1b9vsr28ldfi8g75q54rj676y1vwg3qys")))) + (build-system cmake-build-system) + (inputs + `(("alsa-lib" ,alsa-lib) + ;; The following are for JUCE GUI components: + ("libx11" ,libx11) + ("freetype" ,freetype) + ("libxrandr" ,libxrandr) + ("libxinerama" ,libxinerama) + ("libxcursor" ,libxcursor))) + (arguments + `(#:tests? #f ;there are no tests + #:configure-flags + (list (string-append "-DCMAKE_CXX_FLAGS=-I" + (assoc-ref %build-inputs "freetype") + "/include/freetype2")))) + (home-page "https://openshot.org") + (synopsis "Audio editing and playback for OpenShot") + (description "OpenShot Audio Library (libopenshot-audio) allows +high-quality editing and playback of audio, and is based on the JUCE +library.") + (license license:lgpl3+))) -- cgit v1.2.3 From 579a9cdec7673d9007ef924bb345f42527aa0a72 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 28 Jun 2017 22:05:24 -0500 Subject: gnu: Add libopenshot. * gnu/packages/video.scm (libopenshot): New variable. * gnu/packages/patches/libopenshot-tests-with-system-libs.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + .../libopenshot-tests-with-system-libs.patch | 95 ++++++++++++++++++++++ gnu/packages/video.scm | 65 ++++++++++++++- 3 files changed, 160 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/libopenshot-tests-with-system-libs.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 3350e5abac..0cd9fad2e5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -890,6 +890,7 @@ dist_patch_DATA = \ %D%/packages/patches/libffi-3.2.1-complex-alpha.patch \ %D%/packages/patches/libjxr-fix-function-signature.patch \ %D%/packages/patches/libjxr-fix-typos.patch \ + %D%/packages/patches/libopenshot-tests-with-system-libs.patch \ %D%/packages/patches/libotr-test-auth-fix.patch \ %D%/packages/patches/libmad-armv7-thumb-pt1.patch \ %D%/packages/patches/libmad-armv7-thumb-pt2.patch \ diff --git a/gnu/packages/patches/libopenshot-tests-with-system-libs.patch b/gnu/packages/patches/libopenshot-tests-with-system-libs.patch new file mode 100644 index 0000000000..a18c4b8bba --- /dev/null +++ b/gnu/packages/patches/libopenshot-tests-with-system-libs.patch @@ -0,0 +1,95 @@ +Combination of two patches that fix libopenshot tests when built with +system-provided ffmpeg and jsoncpp. See + + https://github.com/OpenShot/libopenshot/pull/163 + +From 0d7691ab53433e1583f6a66ea96683b0f7af8a57 Mon Sep 17 00:00:00 2001 +From: "FeRD (Frank Dana)" +Date: Mon, 17 Sep 2018 14:04:40 -0400 +Subject: [PATCH] tests/CMakeFiles: Use FFMpeg like src/ + +--- + tests/CMakeLists.txt | 32 +++++++++++++++++++++++++++++++- + 1 file changed, 31 insertions(+), 1 deletion(-) + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 2c45550..4df8464 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -79,7 +79,37 @@ ENDIF (ImageMagick_FOUND) + FIND_PACKAGE(FFmpeg REQUIRED) + + # Include FFmpeg headers (needed for compile) +-include_directories(${FFMPEG_INCLUDE_DIR}) ++message('AVCODEC_FOUND: ${AVCODEC_FOUND}') ++message('AVCODEC_INCLUDE_DIRS: ${AVCODEC_INCLUDE_DIRS}') ++message('AVCODEC_LIBRARIES: ${AVCODEC_LIBRARIES}') ++ ++IF (AVCODEC_FOUND) ++ include_directories(${AVCODEC_INCLUDE_DIRS}) ++ENDIF (AVCODEC_FOUND) ++IF (AVDEVICE_FOUND) ++ include_directories(${AVDEVICE_INCLUDE_DIRS}) ++ENDIF (AVDEVICE_FOUND) ++IF (AVFORMAT_FOUND) ++ include_directories(${AVFORMAT_INCLUDE_DIRS}) ++ENDIF (AVFORMAT_FOUND) ++IF (AVFILTER_FOUND) ++ include_directories(${AVFILTER_INCLUDE_DIRS}) ++ENDIF (AVFILTER_FOUND) ++IF (AVUTIL_FOUND) ++ include_directories(${AVUTIL_INCLUDE_DIRS}) ++ENDIF (AVUTIL_FOUND) ++IF (POSTPROC_FOUND) ++ include_directories(${POSTPROC_INCLUDE_DIRS}) ++ENDIF (POSTPROC_FOUND) ++IF (SWSCALE_FOUND) ++ include_directories(${SWSCALE_INCLUDE_DIRS}) ++ENDIF (SWSCALE_FOUND) ++IF (SWRESAMPLE_FOUND) ++ include_directories(${SWRESAMPLE_INCLUDE_DIRS}) ++ENDIF (SWRESAMPLE_FOUND) ++IF (AVRESAMPLE_FOUND) ++ include_directories(${AVRESAMPLE_INCLUDE_DIRS}) ++ENDIF (AVRESAMPLE_FOUND) + + ################# LIBOPENSHOT-AUDIO ################### + # Find JUCE-based openshot Audio libraries + + +From e9e85cdfd036587adb86341f7f81619dc69f102c Mon Sep 17 00:00:00 2001 +From: "FeRD (Frank Dana)" +Date: Mon, 17 Sep 2018 19:23:25 -0400 +Subject: [PATCH] Use system jsoncpp in tests, too + +The tests/ build needs to use the same jsoncpp as the src/ build, +or tests in Clip_Tests.cpp can fail. +--- + tests/CMakeLists.txt | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 4df8464..a1a0356 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -180,12 +180,18 @@ endif(OPENMP_FOUND) + # Find ZeroMQ library (used for socket communication & logging) + FIND_PACKAGE(ZMQ REQUIRED) + +-# Include FFmpeg headers (needed for compile) ++# Include ZeroMQ headers (needed for compile) + include_directories(${ZMQ_INCLUDE_DIRS}) + + ################### JSONCPP ##################### + # Include jsoncpp headers (needed for JSON parsing) +-include_directories("../thirdparty/jsoncpp/include") ++if (USE_SYSTEM_JSONCPP) ++ find_package(JsonCpp REQUIRED) ++ include_directories(${JSONCPP_INCLUDE_DIRS}) ++else() ++ message("Using embedded JsonCpp") ++ include_directories("../thirdparty/jsoncpp/include") ++endif(USE_SYSTEM_JSONCPP) + + IF (NOT DISABLE_TESTS) + ############### SET TEST SOURCE FILES ################# diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index e9a49df787..bc8e625d72 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2016 Dmitry Nikolaev ;;; Copyright © 2016 Andy Patterson ;;; Copyright © 2016, 2017 Nils Gillmann -;;; Copyright © 2016 Eric Bavier +;;; Copyright © 2016, 2018 Eric Bavier ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2017 Feng Shu ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice @@ -112,6 +112,7 @@ #:use-module (gnu packages man) #:use-module (gnu packages mp3) #:use-module (gnu packages ncurses) + #:use-module (gnu packages networking) #:use-module (gnu packages ocr) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -128,6 +129,7 @@ #:use-module (gnu packages serialization) #:use-module (gnu packages shells) #:use-module (gnu packages ssh) + #:use-module (gnu packages swig) #:use-module (gnu packages texinfo) #:use-module (gnu packages textutils) #:use-module (gnu packages tls) @@ -3077,3 +3079,64 @@ as surfing, skiing, riding and walking while shooting videos are especially prone to erratic camera shakes. Vidstab targets these video contents to help create smoother and stable videos.") (license license:gpl2+))) + +(define-public libopenshot + (package + (name "libopenshot") + (version "0.2.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/OpenShot/libopenshot") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1x4kv05pdq1pglb6y056aa7llc6iyibyhzg93k7zwj0q08cp5ixd")) + (modules '((guix build utils))) + (snippet '(begin + ;; Allow overriding of the python installation dir + (substitute* "src/bindings/python/CMakeLists.txt" + (("(SET\\(PYTHON_MODULE_PATH.*)\\)" _ set) + (string-append set " CACHE PATH " + "\"Python bindings directory\")"))) + #t)) + (patches (search-patches "libopenshot-tests-with-system-libs.patch")))) + (build-system cmake-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("python" ,python) + ("swig" ,swig) + ("unittest++" ,unittest-cpp))) + (propagated-inputs ;all referenced in installed headers + `(("cppzmq" ,cppzmq) + ("ffmpeg" ,ffmpeg) + ("imagemagick" ,imagemagick) + ("jsoncpp" ,jsoncpp) + ("libopenshot-audio" ,libopenshot-audio) + ("qt" ,qt) ;widgets, core, gui, multimedia, and multimediawidgets + ("zeromq" ,zeromq))) + (arguments + `(#:configure-flags + (list (string-append "-DPYTHON_MODULE_PATH:PATH=" %output "/lib/python" + ,(version-major+minor (package-version python)) + "/site-packages") + "-DUSE_SYSTEM_JSONCPP:BOOL=ON") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'set-vars + (lambda* (#:key inputs #:allow-other-keys) + (setenv "LIBOPENSHOT_AUDIO_DIR" + (assoc-ref inputs "libopenshot-audio")) + (setenv "ZMQDIR" + (assoc-ref inputs "zeromq")) + (setenv "UNITTEST_DIR" + (string-append (assoc-ref inputs "unittest++") + "/include/UnitTest++")) + #t))))) + (home-page "https://openshot.org") + (synopsis "Video-editing, animation, and playback library") + (description "OpenShot Library (libopenshot) is a powerful C++ video +editing library with a multi-threaded and feature rich video editing +API. It includes bindings for Python, Ruby, and other languages.") + (license license:lgpl3+))) -- cgit v1.2.3 From 69a3fcc086f0582d82f3b2d19ad94e12c67070fa Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 28 Jun 2017 22:05:53 -0500 Subject: gnu: Add OpenShot. * gnu/packages/video.scm (openshot-qt): New variable. --- gnu/packages/video.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index bc8e625d72..bf1f6d36fa 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3140,3 +3140,49 @@ create smoother and stable videos.") editing library with a multi-threaded and feature rich video editing API. It includes bindings for Python, Ruby, and other languages.") (license license:lgpl3+))) + +(define-public openshot + (package + (name "openshot") + (version "2.4.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/OpenShot/openshot-qt") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1qdw1mli4y9qhrnllnkaf6ydgw5vfvdb90chs4i679k0x0jyb9a2")))) + (build-system python-build-system) + (inputs + `(("ffmpeg" ,ffmpeg) + ("libopenshot" ,libopenshot) + ("python" ,python) + ("python-pyqt" ,python-pyqt) + ("python-pyzmq" ,python-pyzmq) + ("python-requests" ,python-requests) + ("qtsvg" ,qtsvg))) + (arguments + `(#:tests? #f ;no tests + #:phases (modify-phases %standard-phases + (delete 'build) ;install phase does all the work + (add-before 'install 'set-tmp-home + (lambda _ + ;; src/classes/info.py "needs" to create several + ;; directories in $HOME when loaded during build + (setenv "HOME" "/tmp") + #t)) + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (wrap-program (string-append (assoc-ref outputs "out") + "/bin/openshot-qt") + `("QT_PLUGIN_PATH" prefix + ,(list (string-append (assoc-ref inputs "qtsvg") + "/lib/qt5/plugins/"))))))))) + (home-page "https://openshot.org") + (synopsis "Video editor") + (description "OpenShot takes your videos, photos, and music files and +helps you create the film you have always dreamed of. Easily add sub-titles, +transitions, and effects and then export your film to many common formats.") + (license license:gpl3+))) -- cgit v1.2.3 From 7cad66d9a7e2c83584b40c7c3bf10812d4af9ed5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 26 Nov 2018 23:20:28 +0100 Subject: gnu: emacs-ivy-yasnippet: Update to 0.1-2.32580b4. * gnu/packages/emacs.scm (emacs-ivy-yasnippet): Update to 0.1-2.32580b4. --- gnu/packages/emacs.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index e69121aef7..02a04c82d7 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -3848,10 +3848,11 @@ expression.") (license license:gpl3+))) (define-public emacs-ivy-yasnippet - (let ((commit "59b32cf8cfb63df906822a17f6f5e8545dac38d4")) + (let ((commit "32580b4fd23ebf9ca7dde96704f7d53df6e253cd") + (revision "2")) (package (name "emacs-ivy-yasnippet") - (version (git-version "0.1" "1" commit)) + (version (git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -3861,7 +3862,7 @@ expression.") (file-name (git-file-name name version)) (sha256 (base32 - "0hghdlxkfwrglvc1nql2ikgp6jj0qdbfwc3yvpb19mrf26hwgp13")))) + "1wfg6mmd5gl1qgvayyzpxlkh9s7jgn20y8l1vh1zbj1czvv51xp8")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-ivy" ,emacs-ivy) -- cgit v1.2.3 From 7af36275f06169e1603a4bc59be4e8027c69b1d7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 27 Nov 2018 09:29:09 +0100 Subject: gnu: emacs-go-mode: Fetch sources from git. * gnu/packages/emacs.scm (emacs-go-mode)[source]: Fetch via git. [arguments]: Add phase "make-writable". --- gnu/packages/emacs.scm | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 02a04c82d7..246bf1bd4d 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1474,14 +1474,22 @@ current match, total matches and exit status. (name "emacs-go-mode") (version "1.5.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/dominikh/go-mode.el/" - "archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/dominikh/go-mode.el.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1adngbjyb8qnwg7n6r2y31djw9j6qf3b9fi63zd85035q7x4ljnm")))) + "1nd2h50yb0493wvf1h7fzplq45rmqn2w7kxpgnlxzhkvq99v8vzf")))) (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'make-writable + (lambda _ + (for-each make-file-writable (find-files "." "\\.el$")) + #t))))) (home-page "https://github.com/dominikh/go-mode.el") (synopsis "Go mode for Emacs") (description -- cgit v1.2.3 From bc84fc4717581eacce5784fb579929c5fb9a7bbb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 27 Nov 2018 09:35:00 +0100 Subject: gnu: emacs-slack: Update to 0.0.2-5.99a5750. * gnu/packages/emacs.scm (emacs-slack): Update to 0.0.2-5.99a5750. [propagated-inputs]: Add emacs-helm. --- gnu/packages/emacs.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 246bf1bd4d..5093c7e975 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -7791,24 +7791,25 @@ through them using @key{C-c C-SPC}.") (license license:gpl3+))) (define-public emacs-slack - (let ((commit "d90395482d26175ce38fd935e978c428be8af9a0") - (revision "4")) + (let ((commit "99a57501629a0329a9ca090c1ea1296462eda02d") + (revision "5")) (package (name "emacs-slack") - (version (string-append "0-" revision "." (string-take commit 7))) + (version (git-version "0.0.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/yuya373/emacs-slack.git") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name commit)) (sha256 (base32 - "14f6wjcbl09cfd3yngr6m1k1d4nr764im666mbnqbk9nmqf50nib")))) + "0jw1diypfw8pmzkq0napgxmfc0gqka7zcccgnw359604lr30k2z2")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-alert" ,emacs-alert) ("emacs-emojify" ,emacs-emojify) + ("emacs-helm" ,emacs-helm) ("emacs-request" ,emacs-request) ("emacs-websocket" ,emacs-websocket) ("emacs-oauth2" ,emacs-oauth2) -- cgit v1.2.3 From 56dc27d62f65d18a434b97c891171ff0872e4ba1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 27 Nov 2018 09:39:42 +0100 Subject: gnu: emacs-polymode: Update to 0.1.5. * gnu/packages/emacs.scm (emacs-polymode): Update to 0.1.5. --- gnu/packages/emacs.scm | 55 ++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 29 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 5093c7e975..fcabbe9143 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -7924,39 +7924,36 @@ contexts. (license license:gpl3+))) (define-public emacs-polymode - ;; There hasn't been a proper release. - (let ((commit "0340f5e7e55235832e59673f027cc79a23cbdcd6") - (revision "1")) - (package - (name "emacs-polymode") - (version (string-append "1.0-" revision "." (string-take commit 7))) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/vspinu/polymode.git") - (commit commit))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "057cybkq3cy07n5s332k071sjiky3mziy003lza4rh75mgqkwhmh")))) - (build-system emacs-build-system) - (arguments - `(#:include (cons* "^modes/.*\\.el$" %default-include) - #:phases - (modify-phases %standard-phases - (add-after 'set-emacs-load-path 'add-modes-subdir-to-load-path - (lambda _ - (setenv "EMACSLOADPATH" - (string-append (getenv "EMACSLOADPATH") - ":" (getcwd) "/modes" ":"))))))) - (home-page "https://github.com/vspinu/polymode") - (synopsis "Framework for multiple Emacs modes based on indirect buffers") - (description "Polymode is an Emacs package that offers generic support + (package + (name "emacs-polymode") + (version "0.1.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vspinu/polymode.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0wwphs54jx48a3ca6x1qaz56j3j9bg4mv8g2akkffrzbdcb8sbc7")))) + (build-system emacs-build-system) + (arguments + `(#:include (cons* "^modes/.*\\.el$" %default-include) + #:phases + (modify-phases %standard-phases + (add-after 'set-emacs-load-path 'add-modes-subdir-to-load-path + (lambda _ + (setenv "EMACSLOADPATH" + (string-append (getenv "EMACSLOADPATH") + ":" (getcwd) "/modes" ":"))))))) + (home-page "https://github.com/vspinu/polymode") + (synopsis "Framework for multiple Emacs modes based on indirect buffers") + (description "Polymode is an Emacs package that offers generic support for multiple major modes inside a single Emacs buffer. It is lightweight, object oriented and highly extensible. Creating a new polymode typically takes only a few lines of code. Polymode also provides extensible facilities for external literate programming tools for exporting, weaving and tangling.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public eless (package -- cgit v1.2.3 From df4c8434d49dba3fd9b96b97b7019cf456c7e548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Tue, 27 Nov 2018 07:41:12 +0100 Subject: gnu: randomjungle: Update homepage and sourc. * gnu/packages/machine-learning.scm (randomjungle)[source]: Update URL. [homepage]: Update URL. --- gnu/packages/machine-learning.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 09c525ff20..a7df9dce06 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2018 Ben Woodcroft ;;; Copyright © 2018 Fis Trivial ;;; Copyright © 2018 Julien Lepiller +;;; Copyright © 2018 Björn Höfling ;;; ;;; This file is part of GNU Guix. ;;; @@ -331,8 +332,8 @@ algorithm.") (origin (method url-fetch) (uri (string-append - "http://www.imbs-luebeck.de/imbs/sites/default/files/u59/" - "randomjungle-" version ".tar_.gz")) + "https://www.imbs.uni-luebeck.de/fileadmin/files/Software" + "/randomjungle/randomjungle-" version ".tar_.gz")) (sha256 (base32 "12c8rf30cla71swx2mf4ww9mfd8jbdw5lnxd7dxhyw1ygrvg6y4w")))) @@ -359,7 +360,7 @@ algorithm.") ;; Non-portable assembly instructions are used so building fails on ;; platforms other than x86_64 or i686. (supported-systems '("x86_64-linux" "i686-linux")) - (home-page "http://www.imbs-luebeck.de/imbs/de/node/227/") + (home-page "https://www.imbs.uni-luebeck.de/forschung/software/details.html#c224") (synopsis "Implementation of the Random Forests machine learning method") (description "Random Jungle is an implementation of Random Forests. It is supposed to -- cgit v1.2.3 From 88e1e9cd3b5f8db6073d19e03115f93e1bbc52c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 27 Nov 2018 10:11:01 +0100 Subject: gnu: guile-simple-zmq: Update to 68bedb6. * gnu/packages/guile.scm (guile-simple-zmq): Update to 68bedb6. --- gnu/packages/guile.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index f95641ab13..837f76f050 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -2096,8 +2096,8 @@ convenient nested tree operations.") (license license:gpl3+))) (define-public guile-simple-zmq - (let ((commit "5bb66a0499f94006cfd18b58e80ad6623f911c31") - (revision "2")) + (let ((commit "68bedb6679716214fb9d3472da57544526f7a618") + (revision "3")) (package (name "guile-simple-zmq") (version (git-version "0.0.0" revision commit)) @@ -2109,7 +2109,7 @@ convenient nested tree operations.") (commit commit))) (sha256 (base32 - "0dj1brjqa7m4k71sf94aq26ca0la3nr894kfmjnqkpawqfp4dyaz")) + "1ad3xg69qqviy1f6dnlw0ysmfdbmp1jq65rfqb8nfd8dsrq2syli")) (file-name (git-file-name name version)))) (build-system guile-build-system) (arguments -- cgit v1.2.3 From 312edcd0a1e9d3c679bb65456a958673d72fe4c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 27 Nov 2018 12:03:10 +0100 Subject: gnu: python-kivy-next, python2-kivy-next: Deprecate. As discussed at . * gnu/packages/python.scm (python-kivy-next, python2-kivy-next): Mark as deprecated. --- gnu/packages/python.scm | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 54f9495e36..3168e0f89d 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -9969,25 +9969,10 @@ hardware-accelerated multitouch applications.") (package-with-python2 python-kivy)) (define-public python-kivy-next - (let ((commit "a988c5e7a47da56263ff39514264a3de516ef2fe") - (revision "1")) - (package (inherit python-kivy) - (name "python-kivy-next") - (version (string-append "1.9.1-" revision "." - (string-take commit 7))) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/kivy/kivy") - (commit commit))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "0jk92b4a8l7blkvkgkjihk171s0dfnq582cckff5srwc8kal5m0p"))))))) + (deprecated-package "python-kivy-next" python-kivy)) (define-public python2-kivy-next - (package-with-python2 python-kivy-next)) + (deprecated-package "python2-kivy-next" python2-kivy)) (define-public python-binaryornot (package -- cgit v1.2.3 From f0c817a7f401812abdbbe373b684d31bf38b509d Mon Sep 17 00:00:00 2001 From: Timo Eisenmann Date: Mon, 26 Nov 2018 22:29:14 +0100 Subject: gnu: Add vimb. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/web-browsers.scm (vimb): New variable. Co-authored-by: Ludovic Courtès --- gnu/packages/web-browsers.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 2c2767dbbc..f63f269ae0 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2017 Eric Bavier ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Rutger Helling +;;; Copyright © 2018 Timo Eisenmann ;;; ;;; This file is part of GNU Guix. ;;; @@ -48,6 +49,7 @@ #:use-module (gnu packages webkit) #:use-module (gnu packages xorg) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system python)) @@ -320,3 +322,40 @@ access.") (description "qutebrowser is a keyboard-focused browser with a minimal GUI. It is based on PyQt5 and QtWebKit.") (license license:gpl3+))) + +(define-public vimb + (package + (name "vimb") + (version "3.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fanglingsu/vimb/") + (commit version))) + (sha256 + (base32 + "1qg18z2gnsli9qgrqfhqfrsi6g9mcgr90w8yab28nxrq4aha6brf")) + (file-name (git-file-name name version)))) + (build-system glib-or-gtk-build-system) + (arguments + '(#:tests? #f ; no tests + #:make-flags (list "CC=gcc" + "DESTDIR=" + (string-append "PREFIX=" %output)) + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (inputs + `(("glib-networking" ,glib-networking) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("webkitgtk" ,webkitgtk))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "https://fanglingsu.github.io/vimb/") + (synopsis "Fast and lightweight Vim-like web browser") + (description "Vimb is a fast and lightweight vim like web browser based on +the webkit web browser engine and the GTK toolkit. Vimb is modal like the great +vim editor and also easily configurable during runtime. Vimb is mostly keyboard +driven and does not detract you from your daily work.") + (license license:gpl3+))) -- cgit v1.2.3 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: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 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: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 From 5df8f0689d4c79264d04b5f0107a463e0b7ea7a5 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 27 Nov 2018 20:10:41 +0530 Subject: gnu: rss-bridge: Update to 2018-11-10. * gnu/packages/web.scm (rss-bridge): Update to 2018-11-10. --- gnu/packages/web.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index eeaaa85702..6b6a1cf9fa 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2016 Clément Lassieur ;;; Copyright © 2016, 2017 Nils Gillmann -;;; Copyright © 2016, 2017 Arun Isaac +;;; Copyright © 2016, 2017, 2018 Arun Isaac ;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2016 Bake Timmons ;;; Copyright © 2017 Thomas Danckaert @@ -5757,7 +5757,7 @@ named elements: the @code{status}, the @code{headers}, and the @code{body}.") (define-public rss-bridge (package (name "rss-bridge") - (version "2018-03-11") + (version "2018-11-10") (source (origin (method url-fetch) @@ -5766,7 +5766,7 @@ named elements: the @code{status}, the @code{headers}, and the @code{body}.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1ix15ck45yb659k63mhwxwia6qnm9nn8jw0bga85abrvk1rchjdn")))) + "1l9a82smh6k37bjvzbmkdlssxywlmr40ig4cykgsns1iiszwv4ia")))) (build-system trivial-build-system) (native-inputs `(("gzip" ,gzip) -- cgit v1.2.3 From bd606fb2ce9ce9ec94fa7e9b078c87790723675c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 27 Nov 2018 19:10:44 +0200 Subject: gnu: x265: Build 10-bit and 12-bit libraries. * gnu/packages/video.scm (x265)[arguments]: Add configure-flag to set %output for the other builds. Add custom 'build-12-bit and 'build-10-bit phases to build their respective versions. Add a custom phase to install the 10-bit and 12-bit libraries. --- gnu/packages/video.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 46 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index bf1f6d36fa..9d3bd3c159 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -412,15 +412,57 @@ and creating Matroska files from other media files (@code{mkvmerge}).") (build-system cmake-build-system) (arguments `(#:tests? #f ; tests are skipped if cpu-optimized code isn't built - ;; Ensure position independent code for everyone. - #:configure-flags '("-DENABLE_PIC=TRUE") + #:configure-flags + ;; Ensure position independent code for everyone. + (list "-DENABLE_PIC=TRUE" + (string-append "-DCMAKE_INSTALL_PREFIX=" + (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases - (add-before 'configure 'prepare-build + (add-after 'unpack 'prepare-build (lambda _ (delete-file-recursively "build") (chdir "source") - #t))))) + #t)) + (add-before 'configure 'build-12-bit + (lambda* (#:key (configure-flags '()) #:allow-other-keys) + (mkdir "../build-12bit") + (with-directory-excursion "../build-12bit" + (apply invoke + "cmake" "../source" + "-DHIGH_BIT_DEPTH=ON" + "-DEXPORT_C_API=OFF" + "-DENABLE_CLI=OFF" + "-DMAIN12=ON" + configure-flags) + (substitute* (cons "cmake_install.cmake" + (append + (find-files "CMakeFiles/x265-shared.dir" ".") + (find-files "CMakeFiles/x265-static.dir" "."))) + (("libx265") "libx265_main12")) + (invoke "make")))) + (add-before 'configure 'build-10-bit + (lambda* (#:key (configure-flags '()) #:allow-other-keys) + (mkdir "../build-10bit") + (with-directory-excursion "../build-10bit" + (apply invoke + "cmake" "../source" + "-DHIGH_BIT_DEPTH=ON" + "-DEXPORT_C_API=OFF" + "-DENABLE_CLI=OFF" + configure-flags) + (substitute* (cons "cmake_install.cmake" + (append + (find-files "CMakeFiles/x265-shared.dir" ".") + (find-files "CMakeFiles/x265-static.dir" "."))) + (("libx265") "libx265_main10")) + (invoke "make")))) + (add-after 'install 'install-more-libs + (lambda _ + (with-directory-excursion "../build-12bit" + (invoke "make" "install")) + (with-directory-excursion "../build-10bit" + (invoke "make" "install"))))))) (home-page "http://x265.org/") (synopsis "Library for encoding h.265/HEVC video streams") (description "x265 is a H.265 / HEVC video encoder application library, -- cgit v1.2.3 From 020d4d2cdc388242da91819cc1b146f1a6cce93b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 27 Nov 2018 19:12:01 +0200 Subject: gnu: x265: Install static libraries in a separate output. This saves more than 50% of the closure size. * gnu/packages/video.scm (x265)[outputs]: New field. [arguments]: Add custom phase to move the static libraries to a new output. --- gnu/packages/video.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 9d3bd3c159..1e1c988c25 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -396,6 +396,7 @@ and creating Matroska files from other media files (@code{mkvmerge}).") (package (name "x265") (version "2.9") + (outputs '("out" "static")) (source (origin (method url-fetch) @@ -462,7 +463,20 @@ and creating Matroska files from other media files (@code{mkvmerge}).") (with-directory-excursion "../build-12bit" (invoke "make" "install")) (with-directory-excursion "../build-10bit" - (invoke "make" "install"))))))) + (invoke "make" "install")))) + (add-before 'strip 'move-static-libs + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (static (assoc-ref outputs "static"))) + (mkdir-p (string-append static "/lib")) + (with-directory-excursion + (string-append out "/lib") + (for-each + (lambda (file) + (rename-file file + (string-append static "/lib/" file))) + (find-files "." "\\.a$")))) + #t))))) (home-page "http://x265.org/") (synopsis "Library for encoding h.265/HEVC video streams") (description "x265 is a H.265 / HEVC video encoder application library, -- cgit v1.2.3 From 8e59c5febd2dad171fe90caf04d8b3eb31ca3b31 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 27 Nov 2018 19:16:24 +0200 Subject: gnu: x265: Fix building on armhf-linux. * gnu/packages/video.scm (x265)[patches]: Add patch. [arguments]: Add a configure-flag to disable assembly. Adjust a custom phase to recognize armv8 as 32-bit arm when masquerading as armhf-linux. --- gnu/local.mk | 1 + gnu/packages/patches/x265-arm-flags.patch | 36 +++++++++++++++++++++++++++++++ gnu/packages/video.scm | 10 ++++++++- 3 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/x265-arm-flags.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 0cd9fad2e5..29d07f5192 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1243,6 +1243,7 @@ dist_patch_DATA = \ %D%/packages/patches/wpa-supplicant-fix-zeroed-keys.patch \ %D%/packages/patches/wpa-supplicant-fix-nonce-reuse.patch \ %D%/packages/patches/wpa-supplicant-krack-followups.patch \ + %D%/packages/patches/x265-arm-flags.patch \ %D%/packages/patches/x265-detect512-all-arches.patch \ %D%/packages/patches/xboing-CVE-2004-0149.patch \ %D%/packages/patches/xf86-video-ark-remove-mibstore.patch \ diff --git a/gnu/packages/patches/x265-arm-flags.patch b/gnu/packages/patches/x265-arm-flags.patch new file mode 100644 index 0000000000..f17e26f6f1 --- /dev/null +++ b/gnu/packages/patches/x265-arm-flags.patch @@ -0,0 +1,36 @@ +https://sources.debian.org/src/x265/2.9-3/debian/patches/0001-Fix-arm-flags.patch/ + +From: Sebastian Ramacher +Date: Wed, 26 Apr 2017 22:05:06 +0200 +Subject: Fix arm* flags + +--- + source/CMakeLists.txt | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt +index 33b6523..25aecbb 100644 +--- a/source/CMakeLists.txt ++++ b/source/CMakeLists.txt +@@ -72,7 +72,7 @@ elseif(ARMMATCH GREATER "-1") + endif() + message(STATUS "Detected ARM target processor") + set(ARM 1) +- add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV6=1) ++ # add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV6=1) + else() + message(STATUS "CMAKE_SYSTEM_PROCESSOR value `${CMAKE_SYSTEM_PROCESSOR}` is unknown") + message(STATUS "Please add this value near ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE}") +@@ -230,12 +230,8 @@ if(GCC) + if(ARM AND CROSS_COMPILE_ARM) + set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC) + elseif(ARM) +- find_package(Neon) + if(CPU_HAS_NEON) +- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC) + add_definitions(-DHAVE_NEON) +- else() +- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm) + endif() + endif() + add_definitions(${ARM_ARGS}) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 1e1c988c25..fc3ee5c72b 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -405,7 +405,8 @@ and creating Matroska files from other media files (@code{mkvmerge}).") (sha256 (base32 "090hp4216isis8q5gb7bwzia8rfyzni54z21jnwm97x3hiy6ibpb")) - (patches (search-patches "x265-detect512-all-arches.patch")) + (patches (search-patches "x265-arm-flags.patch" + "x265-detect512-all-arches.patch")) (modules '((guix build utils))) (snippet '(begin (delete-file-recursively "source/compat/getopt") @@ -416,6 +417,10 @@ and creating Matroska files from other media files (@code{mkvmerge}).") #:configure-flags ;; Ensure position independent code for everyone. (list "-DENABLE_PIC=TRUE" + ,@(if (string-prefix? "armhf" (or (%current-system) + (%current-target-system))) + '("-DENABLE_ASSEMBLY=OFF") + '()) (string-append "-DCMAKE_INSTALL_PREFIX=" (assoc-ref %outputs "out"))) #:phases @@ -424,6 +429,9 @@ and creating Matroska files from other media files (@code{mkvmerge}).") (lambda _ (delete-file-recursively "build") (chdir "source") + ;; recognize armv8 in 32-bit mode as ARM + (substitute* "CMakeLists.txt" + (("armv6l") "armv8l")) #t)) (add-before 'configure 'build-12-bit (lambda* (#:key (configure-flags '()) #:allow-other-keys) -- cgit v1.2.3 From 8b5e2e94afdef6430583c3a0ef02fe2d7fcc16d1 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 25 Nov 2018 01:14:28 +0100 Subject: gnu: Add rclone. * gnu/packages/sync.scm (rclone): New variable. --- gnu/packages/sync.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index e0b0af3d96..22262db2d6 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ludovic Courtès +;;; Copyright © 2018 Nicolas Goaziou ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,6 +23,7 @@ (define-module (gnu packages sync) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system cmake) + #:use-module (guix build-system go) #:use-module (guix build-system meson) #:use-module (guix download) #:use-module (guix git-download) @@ -243,3 +245,45 @@ over the Internet in an HTTP and CDN friendly way; @item An efficient backup system. @end itemize\n") (license license:lgpl2.1+))) + +(define-public rclone + (package + (name "rclone") + (version "1.45") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ncw/rclone.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "06xg0ibv9pnrnmabh1kblvxx1pk8h5rmkr9mjbymv497sx3zgz26")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/ncw/rclone" + #:install-source? #f + (modify-phases %standard-phases + ;; Fix failure during "check" phase: "/homeless-shelter: permission + ;; denied". + (add-after 'unpack 'set-home-directory + (lambda _ (setenv "HOME" "/tmp") #t))))) + (synopsis "@code{rsync} for cloud storage") + (description "@code{Rclone} is a command line program to sync files and +directories to and from different cloud storage providers. + +Features include: +@itemize +@item MD5/SHA1 hashes checked at all times for file integrity +@item Timestamps preserved on files +@item Partial syncs supported on a whole file basis +@item Copy mode to just copy new/changed files +@item Sync (one way) mode to make a directory identical +@item Check mode to check for file hash equality +@item Can sync to and from network, e.g., two different cloud accounts +@item Optional encryption (Crypt) +@item Optional cache (Cache) +@item Optional FUSE mount (rclone mount) +@end itemize") + (home-page "https://rclone.org/") + (license license:expat))) -- cgit v1.2.3 From 4236959de8200bba4eeb2c23519fc736b3c50a23 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 27 Nov 2018 23:22:20 +0100 Subject: gnu: scribus: Fix build with recent Poppler. Suggested by ngz on #guix. * gnu/packages/patches/scribus-poppler.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/scribus.scm (scribus)[source]: Add patch. --- gnu/local.mk | 1 + gnu/packages/patches/scribus-poppler.patch | 72 ++++++++++++++++++++++++++++++ gnu/packages/scribus.scm | 4 +- 3 files changed, 75 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/scribus-poppler.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 29d07f5192..772002c9cf 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1145,6 +1145,7 @@ dist_patch_DATA = \ %D%/packages/patches/scotch-build-parallelism.patch \ %D%/packages/patches/scotch-graph-diam-64.patch \ %D%/packages/patches/scotch-graph-induce-type-64.patch \ + %D%/packages/patches/scribus-poppler.patch \ %D%/packages/patches/sdl-libx11-1.6.patch \ %D%/packages/patches/seq24-rename-mutex.patch \ %D%/packages/patches/sharutils-CVE-2018-1000097.patch \ diff --git a/gnu/packages/patches/scribus-poppler.patch b/gnu/packages/patches/scribus-poppler.patch new file mode 100644 index 0000000000..9b969e4cb6 --- /dev/null +++ b/gnu/packages/patches/scribus-poppler.patch @@ -0,0 +1,72 @@ +Fix build with recent Poppler. + +From d867ec3c386baaed1b8e076dd70b278863411480 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Mon, 30 Apr 2018 09:19:33 +0000 +Subject: [PATCH] =?UTF-8?q?#15289:=20FTBFS=201.5.4=20with=20error:=20inval?= + =?UTF-8?q?id=20conversion=20from=20=E2=80=98const=20GooString*=E2=80=99?= + =?UTF-8?q?=20to=20=E2=80=98GooString*=E2=80=99?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +git-svn-id: svn://scribus.net/trunk/Scribus@22498 11d20701-8431-0410-a711-e3c959e3b870 +--- + scribus/plugins/import/pdf/importpdf.cpp | 2 +- + scribus/plugins/import/pdf/importpdf.h | 2 +- + scribus/plugins/import/pdf/slaoutput.cpp | 2 +- + scribus/plugins/import/pdf/slaoutput.h | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/scribus/plugins/import/pdf/importpdf.cpp b/scribus/plugins/import/pdf/importpdf.cpp +index c1802861aa..d4c5a9ba49 100644 +--- a/scribus/plugins/import/pdf/importpdf.cpp ++++ b/scribus/plugins/import/pdf/importpdf.cpp +@@ -1081,7 +1081,7 @@ QRectF PdfPlug::getCBox(int box, int pgNum) + return cRect; + } + +-QString PdfPlug::UnicodeParsedString(GooString *s1) ++QString PdfPlug::UnicodeParsedString(const GooString *s1) + { + if ( !s1 || s1->getLength() == 0 ) + return QString(); +diff --git a/scribus/plugins/import/pdf/importpdf.h b/scribus/plugins/import/pdf/importpdf.h +index c8c5efcd0d..5249562692 100644 +--- a/scribus/plugins/import/pdf/importpdf.h ++++ b/scribus/plugins/import/pdf/importpdf.h +@@ -81,7 +81,7 @@ class PdfPlug : public QObject + private: + bool convert(const QString& fn); + QRectF getCBox(int box, int pgNum); +- QString UnicodeParsedString(GooString *s1); ++ QString UnicodeParsedString(const GooString *s1); + + QList Elements; + double baseX, baseY; +diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp +index be1815dc29..17b6357246 100644 +--- a/scribus/plugins/import/pdf/slaoutput.cpp ++++ b/scribus/plugins/import/pdf/slaoutput.cpp +@@ -4252,7 +4252,7 @@ void SlaOutputDev::pushGroup(QString maskName, GBool forSoftMask, GBool alpha, b + m_groupStack.push(gElements); + } + +-QString SlaOutputDev::UnicodeParsedString(GooString *s1) ++QString SlaOutputDev::UnicodeParsedString(const GooString *s1) + { + if ( !s1 || s1->getLength() == 0 ) + return QString(); +diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h +index 20e8b2d311..6698c030e0 100644 +--- a/scribus/plugins/import/pdf/slaoutput.h ++++ b/scribus/plugins/import/pdf/slaoutput.h +@@ -266,7 +266,7 @@ class SlaOutputDev : public OutputDev + int getBlendMode(GfxState *state); + void applyMask(PageItem *ite); + void pushGroup(QString maskName = "", GBool forSoftMask = gFalse, GBool alpha = gFalse, bool inverted = false); +- QString UnicodeParsedString(GooString *s1); ++ QString UnicodeParsedString(const GooString *s1); + bool checkClip(); + bool pathIsClosed; + QString CurrColorFill; diff --git a/gnu/packages/scribus.scm b/gnu/packages/scribus.scm index dca1dc86e1..615d7e23a2 100644 --- a/gnu/packages/scribus.scm +++ b/gnu/packages/scribus.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015 Ricardo Wurmus +;;; Copyright © 2015, 2018 Ricardo Wurmus ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2017, 2018 Nicolas Goaziou ;;; Copyright © 2018 Clément Lassieur @@ -56,7 +56,7 @@ (sha256 (base32 "00ys0p6h3iq77kh72dkl0qrf7qvznq18qdrgiq10gfxja1995034")) - (modules '((guix build utils))))) + (patches (search-patches "scribus-poppler.patch")))) (build-system cmake-build-system) (arguments `(#:tests? #f ;no test target -- cgit v1.2.3 From 41ffc214e4839aa50e9957388749772e91a3f533 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 27 Nov 2018 23:23:20 +0100 Subject: gnu: Add r-chipexoqual. * gnu/packages/bioconductor.scm (r-chipexoqual): New variable. --- gnu/packages/bioconductor.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 95c722ac40..e7f11dead3 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1030,3 +1030,41 @@ maps.") "This package provides tools to parse Illumina Sequence Analysis Viewer (SAV) files, access data, and generate QC plots.") (license license:agpl3+))) + +(define-public r-chipexoqual + (package + (name "r-chipexoqual") + (version "1.6.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "ChIPexoQual" version)) + (sha256 + (base32 + "1773bpiybn4g9jlv46z29x19q4dpcvn7lairr3lq5pdqbqmz5hnp")))) + (properties `((upstream-name . "ChIPexoQual"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biocparallel" ,r-biocparallel) + ("r-biovizbase" ,r-biovizbase) + ("r-broom" ,r-broom) + ("r-data-table" ,r-data-table) + ("r-dplyr" ,r-dplyr) + ("r-genomeinfodb" ,r-genomeinfodb) + ("r-genomicalignments" ,r-genomicalignments) + ("r-genomicranges" ,r-genomicranges) + ("r-ggplot2" ,r-ggplot2) + ("r-hexbin" ,r-hexbin) + ("r-iranges" ,r-iranges) + ("r-rcolorbrewer" ,r-rcolorbrewer) + ("r-rmarkdown" ,r-rmarkdown) + ("r-rsamtools" ,r-rsamtools) + ("r-s4vectors" ,r-s4vectors) + ("r-scales" ,r-scales) + ("r-viridis" ,r-viridis))) + (home-page "https://github.com/keleslab/ChIPexoQual") + (synopsis "Quality control pipeline for ChIP-exo/nexus data") + (description + "This package provides a quality control pipeline for ChIP-exo/nexus +sequencing data.") + (license license:gpl2+))) -- cgit v1.2.3 From c93b77ad37eec647be922377fed2ccb47969938f Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Tue, 27 Nov 2018 22:11:48 -0500 Subject: gnu: wxmaxima: Update to 18.11.4. * gnu/packages/maths.scm (wxmaxima): Update to 18.11.4. [source]: Switch to git-fetch. --- gnu/packages/maths.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 0cf8916abe..b08f6b41ba 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2848,16 +2848,17 @@ point numbers.") (define-public wxmaxima (package (name "wxmaxima") - (version "18.10.1") + (version "18.11.4") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/wxMaxima-developers/" name - "/archive/Version-" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/wxMaxima-developers/wxmaxima.git") + (commit (string-append "Version-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0c2blq65r0am509p3rjqpwqk6vl5r2yg1p9nh2jczf80vhi3ldas")))) + "1sz8n9v23q442l7yjj67pjh0dk78rl4cbcc3j8m1bm88anlfxl9r")))) (build-system cmake-build-system) (native-inputs `(("gettext" ,gettext-minimal))) -- cgit v1.2.3 From de96f6610f742a33475a81f901223527bb28d3a7 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 27 Nov 2018 22:44:16 -0500 Subject: gnu: linux-libre@4.4: Update to 4.4.165. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.165. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8eec8a73a8..58c395e59a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -445,8 +445,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.164" - "04w4x97bkd2javjws9pzv1shfcrhyn4nf9w8b6qk6zdaj45fzasb" + (make-linux-libre "4.4.165" + "1adpj8hbly5z3j7mlnydnm2kx2isi3194n1hszzwxki8gj0xnqk4" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From 32f39fb9e291ba2161cbdfa34dab585151f47a8c Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 27 Nov 2018 22:44:58 -0500 Subject: gnu: linux-libre@4.9: Update to 4.9.141. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.141. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 58c395e59a..f19ac3be2a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -439,8 +439,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.140" - "12amh7m0khjx5q3bcv8sq59xkanaxa5xnw4m1iql7503nk4pgg9a" + (make-linux-libre "4.9.141" + "1cjyni2wf1m9l8nvfl4gcswxlk9rwhpr0q3lvhnlg20761kvixp4" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From 71e48a6371589f4fe6034826b869d93c4d4a42cb Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 27 Nov 2018 22:45:43 -0500 Subject: gnu: linux-libre@4.14: Update to 4.14.84. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.84. (%linux-libre-4.14-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f19ac3be2a..0e96c03467 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -429,8 +429,8 @@ It has been modified to remove all non-free binary blobs.") #:patches %linux-libre-4.19-patches #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.83") -(define %linux-libre-4.14-hash "0x6r09bqdrcqigyjx922vji3pdv36l24pl0j33xs8b7xawkvii9g") +(define %linux-libre-4.14-version "4.14.84") +(define %linux-libre-4.14-hash "0mdf436bxlrsv0jbnzwd5bblpavv9vk5qx7h2x55jp0iy9pvp3n2") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.2.3 From f04a5391690c69c3721117c082f682f83c550015 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 27 Nov 2018 22:47:24 -0500 Subject: gnu: linux-libre: Update to 4.19.5. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.19.5. (%linux-libre-hash): Update hash. (%linux-libre-4.19-patches): Rename patch (4.18 -> 4.19). --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0e96c03467..28e2c7388f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -406,8 +406,8 @@ It has been modified to remove all non-free binary blobs.") ;; supports qemu "virt" machine and possibly a large number of ARM boards. ;; See : https://wiki.debian.org/DebianKernel/ARMMP. -(define %linux-libre-version "4.19.4") -(define %linux-libre-hash "0m5k14a89bf5avr3kdh3909qjfnd051fbsb0v7a52d54dkg2nbp6") +(define %linux-libre-version "4.19.5") +(define %linux-libre-hash "1ailss05c3p9aw2ysv75kj9j7qk04rc0cn9y9dk6fmjhnbnw9abm") (define %linux-libre-4.19-patches (list %boot-logo-patch @@ -418,7 +418,7 @@ It has been modified to remove all non-free binary blobs.") "/raw/34a7d9011fcfcfa38b68282fd2b1a8797e6834f0" "/debian/patches/bugfix/arm/" "arm-mm-export-__sync_icache_dcache-for-xen-privcmd.patch")) - (file-name "linux-libre-4.18-arm-export-__sync_icache_dcache.patch") + (file-name "linux-libre-4.19-arm-export-__sync_icache_dcache.patch") (sha256 (base32 "1ifnfhpakzffn4b8n7x7w5cps9mzjxlkcfz9zqak2vaw8nzvl39f"))))) -- cgit v1.2.3 From e5ace9dd78e455543792671c76c8d78b81f1216c Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 27 Nov 2018 23:57:52 -0500 Subject: Revert "gnu: Add rclone." This reverts commit 8b5e2e94afdef6430583c3a0ef02fe2d7fcc16d1. --- gnu/packages/sync.scm | 44 -------------------------------------------- 1 file changed, 44 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 22262db2d6..e0b0af3d96 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -3,7 +3,6 @@ ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ludovic Courtès -;;; Copyright © 2018 Nicolas Goaziou ;;; ;;; This file is part of GNU Guix. ;;; @@ -23,7 +22,6 @@ (define-module (gnu packages sync) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system cmake) - #:use-module (guix build-system go) #:use-module (guix build-system meson) #:use-module (guix download) #:use-module (guix git-download) @@ -245,45 +243,3 @@ over the Internet in an HTTP and CDN friendly way; @item An efficient backup system. @end itemize\n") (license license:lgpl2.1+))) - -(define-public rclone - (package - (name "rclone") - (version "1.45") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ncw/rclone.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "06xg0ibv9pnrnmabh1kblvxx1pk8h5rmkr9mjbymv497sx3zgz26")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/ncw/rclone" - #:install-source? #f - (modify-phases %standard-phases - ;; Fix failure during "check" phase: "/homeless-shelter: permission - ;; denied". - (add-after 'unpack 'set-home-directory - (lambda _ (setenv "HOME" "/tmp") #t))))) - (synopsis "@code{rsync} for cloud storage") - (description "@code{Rclone} is a command line program to sync files and -directories to and from different cloud storage providers. - -Features include: -@itemize -@item MD5/SHA1 hashes checked at all times for file integrity -@item Timestamps preserved on files -@item Partial syncs supported on a whole file basis -@item Copy mode to just copy new/changed files -@item Sync (one way) mode to make a directory identical -@item Check mode to check for file hash equality -@item Can sync to and from network, e.g., two different cloud accounts -@item Optional encryption (Crypt) -@item Optional cache (Cache) -@item Optional FUSE mount (rclone mount) -@end itemize") - (home-page "https://rclone.org/") - (license license:expat))) -- cgit v1.2.3 From 01e7ca5410e45f63a39f16a6e8156f3e0898141a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Nov 2018 11:22:03 +0200 Subject: gnu: parallel: Update to 20181122. * gnu/packages/parallel.scm (parallel): Update to 20181122. --- gnu/packages/parallel.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 1970eb169b..df8ac180b3 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -48,7 +48,7 @@ (define-public parallel (package (name "parallel") - (version "20181022") + (version "20181122") (source (origin (method url-fetch) @@ -56,7 +56,7 @@ version ".tar.bz2")) (sha256 (base32 - "1v6vrfnn6acjjlp8xiizvcrb3zzs94av5xcl6xm8zfvcapixx11f")))) + "1mcqymf6vg8jhnjv71sswcz5xrwpq2h2ishi8m1hz8rwhc65h1ig")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From ad8a4a666d1012f1ace44fc55d35e8f87a0c8cf9 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 28 Nov 2018 13:41:50 +0100 Subject: gnu: clang-from-llvm: Fix install for clang-3.*. * gnu/packages/llvm.scm (clang-from-llvm): Fix install for clang-3.*. --- gnu/packages/llvm.scm | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 0b12f736a9..dace546a47 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -243,17 +243,21 @@ compiler. In LLVM this library is called \"compiler-rt\".") out "/etc/bash_completion.d"))) (with-directory-excursion (string-append out "/share/clang") - ;; Delete extensions for proprietary text editors. - (delete-file "clang-format-bbedit.applescript") - (delete-file "clang-format-sublime.py") - ;; Delete Emacs extensions: see their respective Emacs - ;; Guix package instead. - (delete-file "clang-rename.el") - (delete-file "clang-format.el") + (for-each + (lambda (file) + (when (file-exists? file) + (delete-file file))) + ;; Delete extensions for proprietary text editors. + '("clang-format-bbedit.applescript" + "clang-format-sublime.py" + ;; Delete Emacs extensions: see their respective Emacs + ;; Guix package instead. + "clang-rename.el" "clang-format.el")) ;; Install bash completion. - (mkdir-p compl-dir) - (rename-file "bash-autocomplete.sh" - (string-append compl-dir "/clang")))) + (when (file-exists? "bash-autocomplete.sh") + (mkdir-p compl-dir) + (rename-file "bash-autocomplete.sh" + (string-append compl-dir "/clang"))))) #t))))) ;; Clang supports the same environment variables as GCC. -- cgit v1.2.3 From a5d474d798b5f3071017ff32aade11bc3ebe9150 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Wed, 28 Nov 2018 10:56:04 -0500 Subject: gnu: maxima: Update to 5.42.1. * gnu/packages/maths.scm (maxima): Update to 5.42.1. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index b08f6b41ba..3dabef441e 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2749,7 +2749,7 @@ to BMP, JPEG or PNG image formats.") (define-public maxima (package (name "maxima") - (version "5.42.0") + (version "5.42.1") (source (origin (method url-fetch) @@ -2757,7 +2757,7 @@ to BMP, JPEG or PNG image formats.") version "-source/" name "-" version ".tar.gz")) (sha256 (base32 - "0d5pdihvcbwb7r4i4qs5qqgsz46hxlq33qj8is053llrgn9ylpyn")) + "1ka0xf70a55ndgmyrq7p5xxbd78pq7bfkqhgxsivaqdw6gn5lmcg")) (patches (search-patches "maxima-defsystem-mkdir.patch")))) (build-system gnu-build-system) (inputs -- cgit v1.2.3 From 1fe1bb96f2d7cf32e056496661bb5bed20b48edc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 28 Nov 2018 22:55:12 +0100 Subject: gnu: bigloo: Update to "4.3b2". Fixes . * gnu/packages/scheme.scm (bigloo): Update to "4.3b2". --- gnu/packages/scheme.scm | 182 +++++++++++++++++++++++++----------------------- 1 file changed, 93 insertions(+), 89 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index c03c53b91f..7267afd709 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -206,98 +206,102 @@ features an integrated Emacs-like editor and a large runtime library.") (properties '((ftp-directory . "/gnu/mit-scheme/stable.pkg"))))) (define-public bigloo - (package - (name "bigloo") - (version "4.3b") - (source (origin - (method url-fetch) - (uri (string-append "ftp://ftp-sop.inria.fr/indes/fp/Bigloo/bigloo" - version ".tar.gz")) - (sha256 - (base32 - "1x7xdgsls277zlf6gcaxs2cj62xj6yvb0qxh0ddmxfamvxba0cf4")) - ;; Remove bundled libraries. - (modules '((guix build utils))) - (snippet - '(begin - (for-each delete-file-recursively - '("gc" "gmp" "libuv")) - #t)))) - (build-system gnu-build-system) - (arguments - `(#:test-target "test" - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Upstream modifies source tarballs in place, making significant changes + ;; long after the initial publication: . For + ;; transparency, we give this "second 4.3b" release a different version + ;; number. + (let ((upstream-version "4.3b")) + (package + (name "bigloo") + (version "4.3b2") + (source (origin + (method url-fetch) + (uri (string-append "ftp://ftp-sop.inria.fr/indes/fp/Bigloo/bigloo" + upstream-version ".tar.gz")) + (sha256 + (base32 + "02s0wrz5b1p0yqk9x6kax1vwzil7g9cyxfvl3vmy7fzznsza9gs4")) + ;; Remove bundled libraries. + (modules '((guix build utils))) + (snippet + '(begin + (for-each delete-file-recursively + '("gc" "gmp" "libuv")) + #t)))) + (build-system gnu-build-system) + (arguments + `(#:test-target "test" + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) - (substitute* "configure" - (("^shell=.*$") - (string-append "shell=" (which "bash") "\n")) - (("`date`") "0")) - (substitute* "autoconf/runtest.in" - ((", @DATE@") "")) - (substitute* "autoconf/osversion" - (("^version.*$") "version=\"\"\n")) - (substitute* "comptime/Makefile" - (("\\$\\(LDCOMPLIBS\\)") - "$(LDCOMPLIBS) $(LDFLAGS)")) + (substitute* "configure" + (("^shell=.*$") + (string-append "shell=" (which "bash") "\n")) + (("`date`") "0")) + (substitute* "autoconf/runtest.in" + ((", @DATE@") "")) + (substitute* "autoconf/osversion" + (("^version.*$") "version=\"\"\n")) + (substitute* "comptime/Makefile" + (("\\$\\(LDCOMPLIBS\\)") + "$(LDCOMPLIBS) $(LDFLAGS)")) - ;; The `configure' script doesn't understand options - ;; of those of Autoconf. - (let ((out (assoc-ref outputs "out"))) - (invoke "./configure" - (string-append "--prefix=" out) - ; use system libraries - "--customgc=no" - "--customunistring=no" - "--customlibuv=no" - (string-append"--mv=" (which "mv")) - (string-append "--rm=" (which "rm")) - "--cflags=-fPIC" - (string-append "--ldflags=-Wl,-rpath=" - (assoc-ref outputs "out") - "/lib/bigloo/" ,version) - (string-append "--lispdir=" out - "/share/emacs/site-lisp") - "--sharedbde=yes" - "--sharedcompiler=yes" - "--disable-patch")))) - (add-after 'install 'install-emacs-modes - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (dir (string-append out "/share/emacs/site-lisp"))) - (invoke "make" "-C" "bmacs" "all" "install" - (string-append "EMACSBRAND=emacs25") - (string-append "EMACSDIR=" dir)))))))) - (inputs - `(("emacs" ,emacs) ;UDE needs the X version of Emacs - ("libgc" ,libgc) - ("libunistring" ,libunistring) - ("libuv" ,libuv) - ("openssl" ,openssl) - ("sqlite" ,sqlite) + ;; The `configure' script doesn't understand options + ;; of those of Autoconf. + (let ((out (assoc-ref outputs "out"))) + (invoke "./configure" + (string-append "--prefix=" out) + ; use system libraries + "--customgc=no" + "--customunistring=no" + "--customlibuv=no" + (string-append"--mv=" (which "mv")) + (string-append "--rm=" (which "rm")) + "--cflags=-fPIC" + (string-append "--ldflags=-Wl,-rpath=" + (assoc-ref outputs "out") + "/lib/bigloo/" ,upstream-version) + (string-append "--lispdir=" out + "/share/emacs/site-lisp") + "--sharedbde=yes" + "--sharedcompiler=yes" + "--disable-patch")))) + (add-after 'install 'install-emacs-modes + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (dir (string-append out "/share/emacs/site-lisp"))) + (invoke "make" "-C" "bmacs" "all" "install" + (string-append "EMACSBRAND=emacs25") + (string-append "EMACSDIR=" dir)))))))) + (inputs + `(("emacs" ,emacs) ;UDE needs the X version of Emacs + ("libgc" ,libgc) + ("libunistring" ,libunistring) + ("libuv" ,libuv) + ("openssl" ,openssl) + ("sqlite" ,sqlite) - ;; Optional APIs for which Bigloo has bindings. - ("avahi" ,avahi) - ("libphidget" ,libphidget) - ("pcre" ,pcre))) - (native-inputs - `(("pkg-config" ,pkg-config))) - (propagated-inputs - `(("gmp" ,gmp))) ; bigloo.h refers to gmp.h - (home-page "http://www-sop.inria.fr/indes/fp/Bigloo/") - (synopsis "Efficient Scheme compiler") - (description - "Bigloo is a Scheme implementation devoted to one goal: enabling -Scheme based programming style where C(++) is usually -required. Bigloo attempts to make Scheme practical by offering -features usually presented by traditional programming languages -but not offered by Scheme and functional programming. Bigloo -compiles Scheme modules. It delivers small and fast stand alone -binary executables. Bigloo enables full connections between -Scheme and C programs and between Scheme and Java programs.") - (license gpl2+))) + ;; Optional APIs for which Bigloo has bindings. + ("avahi" ,avahi) + ("libphidget" ,libphidget) + ("pcre" ,pcre))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (propagated-inputs + `(("gmp" ,gmp))) ; bigloo.h refers to gmp.h + (home-page "http://www-sop.inria.fr/indes/fp/Bigloo/") + (synopsis "Efficient Scheme compiler") + (description + "Bigloo is a Scheme implementation devoted to one goal: enabling Scheme +based programming style where C(++) is usually required. Bigloo attempts to +make Scheme practical by offering features usually presented by traditional +programming languages but not offered by Scheme and functional programming. +Bigloo compiles Scheme modules. It delivers small and fast stand alone binary +executables. Bigloo enables full connections between Scheme and C programs +and between Scheme and Java programs.") + (license gpl2+)))) (define-public hop (package -- cgit v1.2.3 From 5019ee6c2a53d2fafe84bef7bb6059c3622118b4 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Wed, 28 Nov 2018 12:49:06 +0100 Subject: gnu: Add missing patch to local.mk. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This was forgotten in 082d9383d1475b772f104f1a6b363e4c80d91cf9. * gnu/local.mk (dist_patch_DATA): Add "ghc-haddock-library-unbundle.patch". Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 772002c9cf..ac3228dbb1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -731,6 +731,7 @@ 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/ghc-haddock-library-unbundle.patch \ %D%/packages/patches/ghostscript-CVE-2018-16509.patch \ %D%/packages/patches/ghostscript-bug-699708.patch \ %D%/packages/patches/ghostscript-no-header-id.patch \ -- cgit v1.2.3 From c94d2f4d9be3c652e48a29550ecef07cc0247d07 Mon Sep 17 00:00:00 2001 From: Tim Gesthuizen Date: Tue, 27 Nov 2018 17:56:33 +0100 Subject: gnu: Add emacs-company-irony. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs.scm (emacs-company-irony): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index fcabbe9143..ce6f3efbd2 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -2856,6 +2856,28 @@ described on the homepage.") (build-system cmake-build-system) (synopsis "Server for the Emacs @dfn{irony mode}"))) +(define-public emacs-company-irony + (package + (name "emacs-company-irony") + (version "1.1.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Sarcasm/company-irony.git") + (commit (string-append "v" version)))) + (sha256 (base32 + "1qgyam2vyjw90kpxns5cd6bq3qiqjhzpwrlvmi18vyb69qcgqd8a")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (inputs + `(("emacs-irony-mode" ,emacs-irony-mode) + ("emacs-company" ,emacs-company))) + (synopsis "C++ completion backend for Company using irony-mode") + (description "This backend for company-mode allows for C++ code completion +with irony-mode using clang-tooling.") + (home-page "https://github.com/Sarcasm/company-irony") + (license license:gpl3+))) + (define-public emacs-company-quickhelp (package (name "emacs-company-quickhelp") -- cgit v1.2.3 From 0a059eaee8dd304e286580acf95e51eeda0b970a Mon Sep 17 00:00:00 2001 From: Robin Templeton Date: Tue, 27 Nov 2018 20:32:21 -0500 Subject: gnu: Add arcanist. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/phabricator.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 + gnu/packages/phabricator.scm | 124 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 125 insertions(+) create mode 100644 gnu/packages/phabricator.scm (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index ac3228dbb1..bb152cd108 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -348,6 +348,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/perl-check.scm \ %D%/packages/perl-web.scm \ %D%/packages/photo.scm \ + %D%/packages/phabricator.scm \ %D%/packages/php.scm \ %D%/packages/pkg-config.scm \ %D%/packages/plotutils.scm \ diff --git a/gnu/packages/phabricator.scm b/gnu/packages/phabricator.scm new file mode 100644 index 0000000000..6c94a13114 --- /dev/null +++ b/gnu/packages/phabricator.scm @@ -0,0 +1,124 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2018 Robin Templeton +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages phabricator) + #:use-module (gnu packages php) + #:use-module (gnu packages version-control) + #:use-module (guix build-system gnu) + #:use-module (guix git-download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages)) + +(define-public libphutil + (let ((commit "b29d76e1709ef018cc5edc7c03033fd9fdebc578") + (revision "1")) + (package + (name "libphutil") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/phacility/libphutil.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "06j84721r9r8624fmil62b5crs2qs0v6rr3cvv2zvkvwhxwrwv1l")))) + (build-system gnu-build-system) + ;; TODO: Unbundle jsonlint and porter-stemmer. + (arguments + '(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + (lambda _ + (let ((lib (string-append %output "/lib/libphutil"))) + (mkdir-p lib) + (copy-recursively "." lib)) + #t))))) + (inputs + `(("php" ,php))) + (home-page "https://github.com/phacility/libphutil") + (synopsis "PHP utility library") + (description + "@code{libphutil} is a collection of utility classes and functions for +PHP.") + ;; Bundled libraries are expat-licensed. + (license (list license:asl2.0 license:expat))))) + +(define-public arcanist + (let ((commit "45a8d22c74a62624e69f5cd6ce901c9ab2658904") + (revision "1")) + (package + (name "arcanist") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/phacility/arcanist.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "13vswhqy9sap6841y93j4mj71dl27vhcivcn3rzyi0cchkhg2ac9")))) + (build-system gnu-build-system) + (arguments + '(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + (lambda _ + (let ((bin (string-append %output "/bin")) + (lib (string-append %output "/lib/arcanist"))) + (mkdir-p lib) + (copy-recursively "." lib) + (mkdir-p bin) + (symlink (string-append lib "/bin/arc") + (string-append bin "/arc")) + (wrap-program (string-append bin "/arc") + `("ARC_PHUTIL_PATH" = + (,(string-append (assoc-ref %build-inputs "libphutil") + "/lib/libphutil"))) + `("PATH" ":" prefix + (,@(map (lambda (i) + (string-append (assoc-ref %build-inputs i) "/bin")) + '("git" "mercurial" "subversion")))))) + #t)) + (add-before 'reset-gzip-timestamps 'make-compressed-files-writable + (lambda _ + (for-each make-file-writable + (find-files %output ".*\\.t?gz$")) + #t))))) + (inputs + `(("php" ,php) + ("libphutil" ,libphutil) + ("git" ,git) + ("mercurial" ,mercurial) + ("subversion" ,subversion))) + (home-page "https://github.com/phacility/arcanist") + (synopsis "Command-line interface for Phabricator") + (description + "Arcanist is the command-line tool for the Phabricator software +development service. It allows you to interact with Phabricator installs to +send code for review, download patches, transfer files, view status, make API +calls, and various other things.") + (license license:asl2.0)))) -- cgit v1.2.3 From 1e20c25ec5273680f92beafd6e996def99193765 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 29 Nov 2018 11:50:06 +0200 Subject: gnu: kodi: Update to 18.0rc1. * gnu/packages/kodi.scm (kodi): Update to 18.0rc1. --- gnu/packages/kodi.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index fe7f93fa53..822fceb46a 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -268,7 +268,7 @@ alternatives. In compilers, this can reduce the cascade of secondary errors.") (define-public kodi (package (name "kodi") - (version "18.0b5") + (version "18.0rc1") (source (origin (method git-fetch) (uri (git-reference @@ -277,7 +277,7 @@ alternatives. In compilers, this can reduce the cascade of secondary errors.") (file-name (git-file-name name version)) (sha256 (base32 - "042qzvhys3sajby6ywgmrsymhji37qk0iqgppznrvm53vrizwsam")) + "0xzzp4x8l0ywx8aq93a1323il6wwslmgdbhasv0r8zp3w1c0wqf1")) (snippet '(begin (use-modules (guix build utils)) -- cgit v1.2.3 From 76d520facb54f4f86977683fd21bf1d4ac5ba45d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 29 Nov 2018 11:54:57 +0200 Subject: gnu: sbcl: bootstrap with clisp on non-Intel machines. * gnu/packages/lisp.scm (sbcl)[native-inputs]: If the current system is not x86_64-linux or i686-linux, use clisp in place of ccl. [arguments]: In the custom build phase, use the correct bootstrap lisp. --- gnu/packages/lisp.scm | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 87ba39b986..90b57efe74 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -333,7 +333,6 @@ an interpreter, a compiler, a debugger, and much more.") #t)))) (build-system gnu-build-system) (outputs '("out" "doc")) - ;; Bootstrap with CLISP. (native-inputs ;; From INSTALL: ;; Supported build hosts are: @@ -343,15 +342,20 @@ an interpreter, a compiler, a debugger, and much more.") ;; ABCL (recent versions only) ;; CLISP (only some versions: 2.44.1 is OK, 2.47 is not) ;; XCL - ;; CCL seems ideal then. - `(("ccl" ,ccl) + ;; CCL seems ideal then, but it unfortunately only builds reliably + ;; on some architectures. + `(,@(match (%current-system) + ((or "x86_64-linux" "i686-linux") + `(("ccl" ,ccl))) + (_ + `(("clisp" ,clisp)))) ("which" ,which) ("inetutils" ,inetutils) ;for hostname(1) ("ed" ,ed) ("texlive" ,(texlive-union (list texlive-tex-texinfo))) ("texinfo" ,texinfo))) (arguments - '(#:modules ((guix build gnu-build-system) + `(#:modules ((guix build gnu-build-system) (guix build utils) (srfi srfi-1)) #:phases @@ -410,7 +414,11 @@ an interpreter, a compiler, a debugger, and much more.") (replace 'build (lambda* (#:key outputs #:allow-other-keys) (setenv "CC" "gcc") - (invoke "sh" "make.sh" "ccl" + (invoke "sh" "make.sh" ,@(match (%current-system) + ((or "x86_64-linux" "i686-linux") + `("ccl")) + (_ + `("clisp"))) (string-append "--prefix=" (assoc-ref outputs "out"))))) (replace 'install -- cgit v1.2.3 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: 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(-) (limited to 'gnu') 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 -- cgit v1.2.3 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: 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 +- ...roducible-builds-by-forcing-window.search.patch | 25 ---------------------- .../patches/rust-reproducible-builds.patch | 25 ++++++++++++++++++++++ gnu/packages/rust.scm | 4 ++-- 4 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 gnu/packages/patches/rust-mdbook-support-reproducible-builds-by-forcing-window.search.patch create mode 100644 gnu/packages/patches/rust-reproducible-builds.patch (limited to 'gnu') 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-mdbook-support-reproducible-builds-by-forcing-window.search.patch deleted file mode 100644 index ef7bf53b5d..0000000000 --- a/gnu/packages/patches/rust-mdbook-support-reproducible-builds-by-forcing-window.search.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b9ca108fcae2b738ca3f0c88c84ae5dc5a6f843f Mon Sep 17 00:00:00 2001 -From: Tim Ryan -Date: Mon, 14 May 2018 06:22:21 -0400 -Subject: [PATCH] Support reproducible builds by forcing window.search to use - stable key ordering. (#692) -See ---- - src/vendor/mdbook/src/renderer/html_handlebars/search.rs | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/vendor/mdbook/src/renderer/html_handlebars/search.rs b/src/vendor/mdbook/src/renderer/html_handlebars/search.rs -index d49772f8b..1ee66a511 100644 ---- a/src/vendor/mdbook/src/renderer/html_handlebars/search.rs -+++ b/src/vendor/mdbook/src/renderer/html_handlebars/search.rs -@@ -205,6 +205,10 @@ fn write_to_js(index: Index, search_config: &Search) -> Result { - searchoptions, - index, - }; -+ -+ // By converting to serde_json::Value as an intermediary, we use a -+ // BTreeMap internally and can force a stable ordering of map keys. -+ let json_contents = serde_json::to_value(&json_contents)?; - let json_contents = serde_json::to_string(&json_contents)?; - - Ok(format!("window.search = {};", json_contents)) diff --git a/gnu/packages/patches/rust-reproducible-builds.patch b/gnu/packages/patches/rust-reproducible-builds.patch new file mode 100644 index 0000000000..ef7bf53b5d --- /dev/null +++ b/gnu/packages/patches/rust-reproducible-builds.patch @@ -0,0 +1,25 @@ +From b9ca108fcae2b738ca3f0c88c84ae5dc5a6f843f Mon Sep 17 00:00:00 2001 +From: Tim Ryan +Date: Mon, 14 May 2018 06:22:21 -0400 +Subject: [PATCH] Support reproducible builds by forcing window.search to use + stable key ordering. (#692) +See +--- + src/vendor/mdbook/src/renderer/html_handlebars/search.rs | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/vendor/mdbook/src/renderer/html_handlebars/search.rs b/src/vendor/mdbook/src/renderer/html_handlebars/search.rs +index d49772f8b..1ee66a511 100644 +--- a/src/vendor/mdbook/src/renderer/html_handlebars/search.rs ++++ b/src/vendor/mdbook/src/renderer/html_handlebars/search.rs +@@ -205,6 +205,10 @@ fn write_to_js(index: Index, search_config: &Search) -> Result { + searchoptions, + index, + }; ++ ++ // By converting to serde_json::Value as an intermediary, we use a ++ // BTreeMap internally and can force a stable ordering of map keys. ++ let json_contents = serde_json::to_value(&json_contents)?; + let json_contents = serde_json::to_string(&json_contents)?; + + Ok(format!("window.search = {};", json_contents)) 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 -- cgit v1.2.3 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: 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 +- gnu/packages/patches/lirc-reproducible-build.patch | 72 ++++++++++++++++++++++ 3 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/lirc-reproducible-build.patch (limited to 'gnu') 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: 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(-) (limited to 'gnu') 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 _ -- cgit v1.2.3 From b868389357fcfed9f5daba0871a152d808cd837f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 27 Nov 2018 13:51:21 +0100 Subject: gnu: libabigail: Update to 1.5. * gnu/packages/elf.scm (libabigail): Update to 1.5. --- gnu/packages/elf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index d8d7546e3c..2ad868ddc7 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -95,14 +95,14 @@ Executable and Linkable Format (@dfn{ELF}). This includes @command{ld}, (package (name "libabigail") (home-page "https://sourceware.org/libabigail/") - (version "1.4") + (version "1.5") (source (origin (method url-fetch) (uri (string-append "https://sourceware.org/pub/" name "/" name "-" version ".tar.gz")) (sha256 (base32 - "17r8i60lxykvdd9pdidmnvkzgf9k8zman0c1czl3zbx0znhlx497")))) + "0srfnkbm386sl2n85686nl28da6ksbs7jgnfks9k0n61c772aas4")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-static" -- cgit v1.2.3 From 7af6e5daa4ffb1bbda48a4e990815066f21bdadc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 29 Nov 2018 15:44:41 +0100 Subject: gnu: vim: Update to 8.1.0551. * gnu/packages/vim.scm (vim): Update to 8.1.0551. [arguments]: Disable one more test. --- gnu/packages/vim.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index c974ebc439..0ba2f4e7ef 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -61,7 +61,7 @@ (define-public vim (package (name "vim") - (version "8.1.0026") + (version "8.1.0551") (source (origin (method url-fetch) (uri (string-append "https://github.com/vim/vim/archive/v" @@ -69,7 +69,7 @@ (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "14q99dn113czp522j34p71za6g1mkriy04xxwcbm3axnrrpv1y52")))) + "1wi6j9w04wg3hxsch3izl2mxb0065vpvxscz19zjn5ypkfypnm8n")))) (build-system gnu-build-system) (arguments `(#:test-target "test" @@ -85,12 +85,18 @@ "src/testdir/test_terminal.vim") (("/bin/sh") (which "sh"))) #t)) - (add-before 'check 'patch-failing-test + (add-before 'check 'patch-failing-tests (lambda _ ;; XXX A single test fails with “Can't create file /dev/stdout” (at ;; Test_writefile_sync_dev_stdout line 5) while /dev/stdout exists. (substitute* "src/testdir/test_writefile.vim" (("/dev/stdout") "a-regular-file")) + + ;; XXX: This test fails when run in the build container: + ;; . + (substitute* "src/testdir/test_search.vim" + ((".*'Test_incsearch_substitute_03'.*" all) + (string-append "\"" all "\n"))) #t))))) (inputs `(("gawk" ,gawk) -- cgit v1.2.3 From 8eb49ebcf7027f0b1a9738edfe314725fd5d4f75 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 29 Nov 2018 12:17:16 -0500 Subject: gnu: hyperrogue: Update to 10.5. * gnu/packages/games.scm (hyperrogue): Update to 10.5. --- gnu/packages/games.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index b025dfe232..7e74bf4c90 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3645,7 +3645,7 @@ throwing people around in pseudo-randomly generated buildings.") (define-public hyperrogue (package (name "hyperrogue") - (version "10.4x") + (version "10.5") ;; When updating this package, be sure to update the "hyperrogue-data" ;; origin in native-inputs. (source (origin @@ -3656,7 +3656,7 @@ throwing people around in pseudo-randomly generated buildings.") "-src.tgz")) (sha256 (base32 - "0khk7xqdw4aiw1wnf1xrhmd7fklnzmpdavd7ix4mkm510dr5wklm")))) + "04wk50f51xrb9vszwil4ivkfpy7xc6nw3gnp90hbna2zqi2jnvb8")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target @@ -3733,7 +3733,7 @@ throwing people around in pseudo-randomly generated buildings.") "-win.zip")) (sha256 (base32 - "1dv3kdv1n5imh3n9900b55rf0wwbjj7243lhsbk7lcjqsqxia39q")))) + "0r6xvnr7b56iv27n8z10qmxhsz5h7w6ayhxkz3xinlvch84bk708")))) ("unzip" ,unzip))) (inputs `(("font-dejavu" ,font-dejavu) -- cgit v1.2.3 From 19ad4504527cbee18b19b46b1562ce3ba9c69d49 Mon Sep 17 00:00:00 2001 From: David Thompson Date: Thu, 29 Nov 2018 13:05:10 -0500 Subject: gnu: haunt: Update to 0.2.4. * gnu/packages/guile.scm (haunt): Update to 0.2.4. --- gnu/packages/guile.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 837f76f050..41f2b16e0a 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -1162,14 +1162,14 @@ Guile's foreign function interface.") (define-public haunt (package (name "haunt") - (version "0.2.2") + (version "0.2.4") (source (origin (method url-fetch) (uri (string-append "https://files.dthompson.us/haunt/haunt-" version ".tar.gz")) (sha256 (base32 - "0nm00krmqq4zmqi2irh35dbf2cn6al58s620hijmhfvhgvdqznlp")))) + "056z4znikk83nr5mr0x2ac3iinqbywa2bvb37mhr566a1q50isfc")))) (build-system gnu-build-system) (arguments `(#:modules ((ice-9 match) (ice-9 ftw) -- cgit v1.2.3 From b3901381a5bd246ddee1731f71a8e656b782950f Mon Sep 17 00:00:00 2001 From: ng0 Date: Fri, 23 Nov 2018 15:24:57 +0000 Subject: gnu: gnurl: Update to 7.62.0. * gnu/packages/gnunet.scm: Update to 7.62.0. Signed-off-by: ng0 Signed-off-by: Marius Bakke --- gnu/packages/gnunet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index b4c9c463f7..d1dc8fd588 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -186,13 +186,13 @@ authentication and support for SSL3 and TLS.") (define-public gnurl (package (name "gnurl") - (version "7.61.1") + (version "7.62.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gnunet/" name "-" version ".tar.Z")) (sha256 (base32 - "0amnhhmlxaliz2rzp3zf1x6ixjqvgmiq7in0q14gd21rjlk9kvir")))) + "1n258my5q4rxv140xvb1qh6vsh42ii0i8p7f2m15szqabm89487q")))) (build-system gnu-build-system) (outputs '("out" "doc")) ; 1.5 MiB of man3 pages -- cgit v1.2.3 From 8322ecb08075bd8e3f5d881022a9b51f2388e521 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 28 Nov 2018 21:38:16 +0100 Subject: gnu: transmission-remote-cli: Fetch sources from git. * gnu/packages/bittorrent.scm (transmission-remote-cli)[source]: Fetch from git. --- gnu/packages/bittorrent.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 9df5a8e119..80c381d2e7 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -1,14 +1,14 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer ;;; Copyright © 2014, 2015, 2016 Ludovic Courtès -;;; Copyright © 2016, 2018 Leo Famulari -;;; Copyright © 2016, 2017 Leo Famulari +;;; Copyright © 2016, 2017, 2018 Leo Famulari ;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2016 Tomáš Čech ;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Jelle Licht ;;; Copyright © 2018 Fis Trivial ;;; Copyright © 2018 Nam Nguyen +;;; Copyright © 2018 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -217,14 +217,14 @@ Transmission BitTorrent daemon.") (name "transmission-remote-cli") (version "1.7.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/fagga/" - "transmission-remote-cli/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/fagga/transmission-remote-cli.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1y0hkpcjf6jw9xig8yf484hbhy63nip0pkchx401yxj81m25l4z9")))) + "09w9f8vrm61lapin8fmq4rgahr95y3c6wss10g0fgd0kl16f895v")))) (build-system python-build-system) (arguments `(#:python ,python-2 ; only supports Python 2 -- cgit v1.2.3 From 4342a046c9cd7ff493e3f460a68a234840c38767 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 28 Nov 2018 22:17:10 +0100 Subject: gnu: mktorrent: Fetch sources from git. * gnu/packages/bittorrent.scm (mktorrent)[source]: Fetch from git. --- gnu/packages/bittorrent.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 80c381d2e7..e834ba3d2a 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -341,13 +341,14 @@ downloads, download scheduling, download rate limiting.") (name "mktorrent") (version "1.1") (source (origin - (method url-fetch) - (file-name (string-append name "-" version ".tar.gz")) - (uri (string-append "https://github.com/Rudde/mktorrent/archive/v" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/Rudde/mktorrent.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1j9qc4fxa9isnaygqk6jazsiklqywl2wcs95b8dx01963407bx6h")))) + "17pdc5mandl739f8q26n5is8ga56s83aqcrwhlnnplbxwx2inidr")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From d123b0944f39b7deec7881647d88b885a62b983a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Nov 2018 06:23:10 +0100 Subject: gnu: onionshare: Fetch sources from git. * gnu/packages/tor.scm (onionshare)[source]: Fetch from git. --- gnu/packages/tor.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index e28a6d4f48..a9bbebcd13 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -165,13 +165,14 @@ networks.") (version "0.9.2") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/micahflee/onionshare/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/micahflee/onionshare.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "02iv7dg15da57gy3zvfchnwwpr21n1gva7mqwpwr958ni2034smk")))) + "1nzr6m3jp04p1i8b652s27zv0xhybl3zwcn5r6l9h0f7d7x4iglv")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From e784449ef70a28105cf56ec36a7f48d1af31922d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Nov 2018 06:49:16 +0100 Subject: gnu: unilibium: Fetch sources from git. * gnu/packages/terminals.scm (unilibium)[source]: Fetch from git. --- gnu/packages/terminals.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 0f11fa650a..f0bd2ce877 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016, 2017 José Miguel Sánchez García ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Kei Kebreau -;;; Copyright © 2017 Ricardo Wurmus +;;; Copyright © 2017, 2018 Ricardo Wurmus ;;; Copyright © 2017 Petter ;;; Copyright © 2018 Hartmut Goebel ;;; Copyright © 2018 Arun Isaac @@ -399,13 +399,14 @@ has no notion of what's interesing, but it's very good at that notifying part.") (version "1.2.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/mauke/unibilium/" - "archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/mauke/unibilium.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1hbf011d8nzsp7c96fidjiq8yw8zlxf6f1s050ii2yyampvb8ib0")))) + "11mbfijdrvbmdlmxs8j4vij78ki0vna89yg3r9n9g1i6j45hiq2r")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit v1.2.3 From e7c7b10db4fdf174055ecbc4a462481daa616295 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Nov 2018 15:50:38 +0100 Subject: gnu: gst-transcoder: Fetch sources from git. * gnu/packages/video.scm (gst-transcoder)[source]: Fetch from git. --- gnu/packages/video.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index fc3ee5c72b..0d31caed19 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2015 Andy Patterson -;;; Copyright © 2015 Ricardo Wurmus +;;; Copyright © 2015, 2018 Ricardo Wurmus ;;; Copyright © 2015, 2016, 2017, 2018 Alex Vong ;;; Copyright © 2016, 2017 Alex Griffin ;;; Copyright © 2016 Kei Kebreau @@ -2871,13 +2871,14 @@ tools for styling them, including a built-in real-time video preview.") (version "1.12.2") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/pitivi/gst-transcoder/" - "archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/pitivi/gst-transcoder.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0cnwmrsd321s02ff91m3j27ydj7f8wks0jvmp5admlhka6z7zxm9")))) + "0nw1zykqc6c8xs3ri55pm00pwyz93z4y4nd880apfiwj7yv5p3az")))) (build-system meson-build-system) (inputs `(("gobject-introspection" ,gobject-introspection) -- cgit v1.2.3 From 6aa54e23daba46b0c3aca0ec232fe7ad531df62e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Nov 2018 15:58:48 +0100 Subject: gnu: arb: Fetch sources from git. * gnu/packages/algebra.scm (arb)[source]: Fetch from git. --- gnu/packages/algebra.scm | 76 ++++++++++++++++++++++++------------------------ 1 file changed, 38 insertions(+), 38 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index cc1a8f25d0..1f1c7be052 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -376,47 +376,47 @@ fast arithmetic.") (define-public arb (package - (name "arb") - (version "2.14.0") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/fredrik-johansson/arb/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0ncr27nd20xxi18nj30cvpa6r52v59nq7gbi34x3l4xym3p8mlmx")))) - (build-system gnu-build-system) - (propagated-inputs - `(("flint" ,flint))) ; flint.h is included by arf.h - (inputs - `(("gmp" ,gmp) - ("mpfr" ,mpfr))) - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (flint (assoc-ref inputs "flint")) - (gmp (assoc-ref inputs "gmp")) - (mpfr (assoc-ref inputs "mpfr"))) - ;; do not pass "--enable-fast-install", which makes the - ;; homebrew configure process fail - (invoke "./configure" - (string-append "--prefix=" out) - (string-append "--with-flint=" flint) - (string-append "--with-gmp=" gmp) - (string-append "--with-mpfr=" mpfr)))))))) - (synopsis "Arbitrary precision floating-point ball arithmetic") - (description - "Arb is a C library for arbitrary-precision floating-point ball + (name "arb") + (version "2.14.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fredrik-johansson/arb.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1ndxg7h4xvccjgp5l9z2f8b66dsff6fhf86bn5n7f75a1ksd7554")))) + (build-system gnu-build-system) + (propagated-inputs + `(("flint" ,flint))) ; flint.h is included by arf.h + (inputs + `(("gmp" ,gmp) + ("mpfr" ,mpfr))) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (flint (assoc-ref inputs "flint")) + (gmp (assoc-ref inputs "gmp")) + (mpfr (assoc-ref inputs "mpfr"))) + ;; do not pass "--enable-fast-install", which makes the + ;; homebrew configure process fail + (invoke "./configure" + (string-append "--prefix=" out) + (string-append "--with-flint=" flint) + (string-append "--with-gmp=" gmp) + (string-append "--with-mpfr=" mpfr)))))))) + (synopsis "Arbitrary precision floating-point ball arithmetic") + (description + "Arb is a C library for arbitrary-precision floating-point ball arithmetic. It supports efficient high-precision computation with polynomials, power series, matrices and special functions over the real and complex numbers, with automatic, rigorous error control.") - (license license:lgpl2.1+) - (home-page "http://fredrikj.net/arb/"))) + (license license:lgpl2.1+) + (home-page "http://fredrikj.net/arb/"))) (define-public ntl (package -- cgit v1.2.3 From 9774fac480e694806d23bccbc31feda56fa0aef4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Nov 2018 15:59:27 +0100 Subject: gnu: kiss-fft-for-extempore: Fetch sources from git. * gnu/packages/algebra.scm (kiss-fft-for-extempore)[source]: Fetch from git. --- gnu/packages/algebra.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 1f1c7be052..60d99423b2 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -568,13 +568,14 @@ syntax is similar to that of C, so basic usage is familiar. It also includes (name "kiss-fft-for-extempore") (version "1.3.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/extemporelang/kiss_fft/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/extemporelang/kiss_fft.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0hkp9l6l4c92fb1l2sh6a6zv1hynpvb2s4d03vd8vxyvybc0l4pv")))) + "0jasbmqy4wkqrqx3w64s1dfmj34875xmsl72mb26aa4hpyn14bi2")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; no tests included ;; Extempore refuses to build on architectures other than x86_64 -- cgit v1.2.3 From de1830ae6d0a2c33445f20d25c7f8ff6a290c31d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Nov 2018 16:09:22 +0100 Subject: gnu: libcue: Fetch sources from git. * gnu/packages/cdrom.scm (libcue)[source]: Fetch from git. --- gnu/packages/cdrom.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index d8dc9ee6f9..a222652295 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Nils Gillmann ;;; Copyright © 2018 Oleg Pykhalov +;;; Copyright © 2018 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,6 +30,7 @@ (define-module (gnu packages cdrom) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix packages) #:use-module ((guix licenses) #:select (lgpl2.1+ gpl2 gpl2+ gpl3+ cddl1.0)) #:use-module (guix build-system cmake) @@ -421,14 +423,14 @@ graphical interface.") (name "libcue") (version "2.2.1") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/lipnitsk/libcue/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/lipnitsk/libcue.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "000j5xqp7cc7njwlixr9byahz9kn8pcfdgm76afwv4p8nbmw6yzj")))) + "1iqw4n01rv2jyk9lksagyxj8ml0kcfwk67n79zy1r6zv1xfp5ywm")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) -- cgit v1.2.3 From d61236dffd7e6d58aebe08570d6a67b4bb5536d8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Nov 2018 16:13:53 +0100 Subject: gnu: vidstab: Fetch sources from git. * gnu/packages/video.scm (vidstab)[source]: Fetch from git. --- gnu/packages/video.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 0d31caed19..b36eafc711 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3126,12 +3126,14 @@ online.") (name "vidstab") (version "1.1.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/georgmartius/vid.stab/" - "archive/v" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/georgmartius/vid.stab.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1fy03n343djfdi19msac81833v5iivpv635yjzrx9nkfwm9s1lhl")))) + "0a3frpm2kdbx7vszhg64p3alisag73bcspl7fp3a2f1kgq7rbh38")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ; tests are not run as part of standard build process -- cgit v1.2.3 From 45b2eff0aa32315141c84dec915feb0e4dd71ac9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Nov 2018 16:37:41 +0100 Subject: gnu: l-smash: Fetch sources from git. * gnu/packages/video.scm (l-smash)[source]: Fetch from git. --- gnu/packages/video.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index b36eafc711..936b912d2f 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3064,14 +3064,14 @@ save it to the appropriate filename.") (name "l-smash") (version "2.14.5") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/" name "/" name "/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/l-smash/l-smash.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0dary0h65kq6sv93iabv25djlvzr5ckdcp3ywagbix44wqfw7xz6")))) + "0rcq9727im6kd8da8b7kzzbzxdldvmh5nsljj9pvr4m3lj484b02")))) (build-system gnu-build-system) (arguments `(#:tests? #f ;no tests -- cgit v1.2.3 From 69f7d3f424a50372cf153b3a9a382013bc05d352 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Nov 2018 21:44:49 +0100 Subject: gnu: leptonica: Fetch sources from git. * gnu/packages/image.scm (leptonica)[source]: Fetch from git. --- gnu/packages/image.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 8168a225fc..e7b10655e7 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -510,13 +510,13 @@ collection of tools for doing simple manipulations of TIFF images.") (version "1.74.4") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/DanBloomberg/leptonica/archive/" version - ".tar.gz")) - (file-name (string-append "leptonica-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/DanBloomberg/leptonica.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "10pw7pwccd0m0fc9rlrr2m41s7j1qvba2wcrav17pw1gclkf34i0")))) + (base32 "0sfg1ky0lghlq7xx0qii5167bim0wwfnnr83dl4skbj9awyvjiwi")))) (build-system gnu-build-system) (native-inputs `(("gnuplot" ,gnuplot) ;needed for test suite -- cgit v1.2.3 From 5d9e3edd013d245a413543d10ab64f66e1bd2717 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Nov 2018 21:45:34 +0100 Subject: gnu: you-get: Fetch sources from git. * gnu/packages/video.scm (you-get)[source]: Fetch from git. --- gnu/packages/video.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 936b912d2f..496b3277c5 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1456,14 +1456,14 @@ other site that youtube-dl supports.") (name "you-get") (version "0.4.1077") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/soimort/you-get/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/soimort/you-get.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "04vxc91k627qgsqs8dhqajrb6vpj4pw21jlwbha28qakfiz2x11k")))) + "1rwkn3wb3r70b8cqj40qdknkg9kqbgzkvi901hbpy2a8s1b7858n")))) (build-system python-build-system) (inputs `(("ffmpeg" ,ffmpeg))) ; for multi-part and >=1080p videos -- cgit v1.2.3 From 97ef6df5ecec825712c1253551d5be1ab7d89b06 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Nov 2018 21:45:53 +0100 Subject: gnu: vapoursynth: Fetch sources from git. * gnu/packages/video.scm (vapoursynth)[source]: Fetch from git. --- gnu/packages/video.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 496b3277c5..a10551e41b 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1854,14 +1854,14 @@ capabilities.") (name "vapoursynth") (version "37") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/vapoursynth/vapoursynth/archive/R" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/vapoursynth/vapoursynth.git") + (commit (string-append "R" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1g3hc079jw4mz1cmkv2y28pdb556wqc8ql7iravgh1rg8j3f1zi5")))) + "1ma2s7dxk6y6l04qj1jvgwia4xj7999ny3a1yx2vbk5l83giam2p")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From 520b5d06a4e1c6b06d161a420a083616469b5131 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Nov 2018 21:46:17 +0100 Subject: gnu: mlt: Fetch sources from git. * gnu/packages/video.scm (mlt)[source]: Fetch from git. --- gnu/packages/video.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index a10551e41b..2b030fed7a 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2004,13 +2004,14 @@ from sites like Twitch.tv and pipes them into a video player of choice.") (name "mlt") (version "6.10.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/mltframework/mlt/" - "archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/mltframework/mlt.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1zzdj1g3g24q6v8hd0v34lv0pkh37a13fhjpl44h1ffi00mz3577")) + "0ki86yslr5ywa6sz8pjrgd9a4rn2rr4mss2zkmqi7pq8prgsm1fr")) (modules '((guix build utils))) (snippet '(begin ;; As of glibc 2.26, no longer is. -- cgit v1.2.3 From 2f069a1fa7d3ce171a917b340fee8305d12d0f83 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Nov 2018 21:46:49 +0100 Subject: gnu: obs: Fetch sources from git. * gnu/packages/video.scm (obs)[source]: Fetch from git. --- gnu/packages/video.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 2b030fed7a..1fdcecb4d4 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2104,13 +2104,14 @@ be used for realtime video capture via Linux-specific APIs.") (name "obs") (version "20.1.3") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/jp9000/obs-studio" - "/archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/jp9000/obs-studio.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1g5z6z050v25whc7n3xvg6l238wmg5crp7ihvk73qngvzxr8bg28")))) + "0qdpa2xxiiw53ksvlrf80jm8gz6kxsn56sffv2v2ijxvy7kw5zcg")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; no tests -- cgit v1.2.3 From 21309b8b1fafa4267dcbfa85e3b0a416d4fbdb95 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Nov 2018 21:47:14 +0100 Subject: gnu: simplescreenrecorder: Fetch sources from git. * gnu/packages/video.scm (simplescreenrecorder)[source]: Fetch from git. --- gnu/packages/video.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 1fdcecb4d4..d246f402ce 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2267,13 +2267,14 @@ making @dfn{screencasts}.") (version "0.3.11") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/MaartenBaert/ssr/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/MaartenBaert/ssr.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0l6irdadqpajvv0dj3ngs1231n559l0y1pykhs2h7526qm4w7xal")))) + "0n702dnv4qshgn3b90ixvplfafjhgz6040yir5vy8khjdpciysq4")))) (build-system cmake-build-system) ;; Although libx11, libxfixes, libxext are listed as build dependencies in ;; README.md, the program builds and functions properly without them. -- cgit v1.2.3 From 722e6ffeea9ed98fb765ebda1feefd921baefa44 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Nov 2018 21:55:57 +0100 Subject: gnu: ffmpegthumbnailer: Fetch sources from git. * gnu/packages/video.scm (ffmpegthumbnailer)[source]: Fetch from git. --- gnu/packages/video.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index d246f402ce..25b50c5379 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -890,12 +890,14 @@ audio/video codec library.") (name "ffmpegthumbnailer") (version "2.2.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/dirkvdb/" - name "/archive/" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/dirkvdb/ffmpegthumbnailer.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "13qs4iwd4l3iiim30s5051n80z0vgsnikym8vsn321cnm9algiwb")))) + "0kl8aa547icy9b05njps02a8sw4yn4f8fzs228kig247sn09s4cp")))) (build-system cmake-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From ce4ac7d56e6e8abd27fb211a3b6ee378165ce92f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Nov 2018 21:56:16 +0100 Subject: gnu: mpv: Fetch sources from git. * gnu/packages/video.scm (mpv)[source]: Fetch from git. --- gnu/packages/video.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 25b50c5379..41add12be7 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1189,14 +1189,14 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") (name "mpv") (version "0.29.1") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/mpv-player/mpv/archive/v" version - ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/mpv-player/mpv.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "08x63hlpj6s8xixmdbx6raff5p5mih7cnk0bcql9f3wrs5hx9ygr")) - (file-name (string-append name "-" version ".tar.gz")))) + "138921kx8g6qprim558xin09xximjhsj9ss8b71ifg2m6kclym8m")))) (build-system waf-build-system) (native-inputs `(("perl" ,perl) ; for zsh completion file -- cgit v1.2.3 From e0a80ee4428523107386dea34b0d4d85f2d7ba8d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Nov 2018 21:56:32 +0100 Subject: gnu: mps-youtube: Fetch sources from git. * gnu/packages/video.scm (mps-youtube)[source]: Fetch from git. --- gnu/packages/video.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 41add12be7..7ceb8f61ce 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2394,13 +2394,14 @@ Content System specification.") (version "0.2.8") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/mps-youtube/mps-youtube/" - "archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/mps-youtube/mps-youtube.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0x7cmfh199q9j396v7bz81nnvanfllhsg86489i5dw2p3yyc9wnm")))) + "1w1jhw9rg3dx7vp97cwrk5fymipkcy2wrbl1jaa38ivcjhqg596y")))) (build-system python-build-system) (arguments ;; Tests need to be disabled until #556 upstream is fixed. It reads as if the -- cgit v1.2.3 From 940fdd0cbc91d92115403639bf68bb807174d22a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Nov 2018 21:56:51 +0100 Subject: gnu: ffms2: Fetch sources from git. * gnu/packages/video.scm (ffms2)[source]: Fetch from git. --- gnu/packages/video.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 7ceb8f61ce..0dece9f52f 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2789,12 +2789,14 @@ and ITU-T H.222.0.") (version "2.23") (home-page "https://github.com/FFMS/ffms2") (source (origin - (method url-fetch) - (uri (string-append home-page "/archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/FFMS/ffms2.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1vbkab8vrplxz5xgag8ggzkwp4f7nf285pd0l2a7zy66n6i2m6xh")))) + "0dkz5b3gxq5p4xz0qqg6l2sigszrlsinz3skyf0ln4wf3zrvf8m5")))) (build-system gnu-build-system) (arguments '(#:configure-flags -- cgit v1.2.3 From 3962a0469710811f5f9b211772c73cdd8743b60d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Nov 2018 22:07:08 +0100 Subject: gnu: wxwidgets-3.1: Fetch sources from git. * gnu/packages/wxwidgets.scm (wxwidgets-3.1)[source]: Fetch from git. --- gnu/packages/wxwidgets.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm index 6cbfd76e10..b95be3ec14 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer -;;; Copyright © 2016 Ricardo Wurmus +;;; Copyright © 2016, 2018 Ricardo Wurmus ;;; Copyright © 2016 Theodoros Foradis ;;; Copyright © 2016 Danny Milosavljevic ;;; Copyright © 2017 Rene Saavedra @@ -26,6 +26,7 @@ (define-module (gnu packages wxwidgets) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix l:) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system python) @@ -140,12 +141,14 @@ and many other languages.") (version "3.1.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/wxWidgets/wxWidgets/archive/v" - version ".tar.gz")) - (file-name (string-append "wxwidgets-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/wxWidgets/wxWidgets.git") + (commit (string-append "v" version)))) + (file-name (git-file-name "wxwidgets" version)) (sha256 - (base32 "1yan5ysjwh6a7xw82sfjd1xn0nsy1dn2s0cx9ac7cw19191blc3y")))) + (base32 + "14kl1rsngm70v3mbyv1mal15iz2b18k97avjx8jn7s81znha1c7f")))) (inputs `(("gstreamer" ,gstreamer) ("gst-plugins-base" ,gst-plugins-base) ,@(package-inputs wxwidgets))) -- cgit v1.2.3 From 4bb74ed5f275e889477da2e0edc01c82b491d985 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Nov 2018 22:12:27 +0100 Subject: gnu: xcape: Fetch sources from git. * gnu/packages/xdisorg.scm (xcape)[source]: Fetch from git. --- gnu/packages/xdisorg.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index c54282b985..1b05897173 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -848,15 +848,15 @@ within a single process.") (package (name "xcape") (version "1.2") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/alols/" name - "/archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0898zc3vwxia00h9kfknpf7jygxgwggrx8v5mxc31w4lzn2dhzm2")))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alols/xcape.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "09a05cxgrip6nqy1qmwblamp2bhknqnqmxn7i2a1rgxa0nba95dm")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target -- cgit v1.2.3 From 25d09f609e28337a579fecbcb9b53012009d00c2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Nov 2018 22:12:57 +0100 Subject: gnu: slop: Fetch sources from git. * gnu/packages/xdisorg.scm (slop)[source]: Fetch from git. --- gnu/packages/xdisorg.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 1b05897173..780fcd4c7c 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -496,14 +496,14 @@ of the screen selected by mouse.") (name "slop") (version "7.4") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/naelstrof/slop/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/naelstrof/slop.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1kpdrikgpjb4fpxalb6pjcih5njv1w9cnrjj5612ywdv1q5mjs48")))) + "0fgd8a2dqkg64all0f96sca92sdss9r3pzmv5kck46b99z2325z6")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ; no "check" target -- cgit v1.2.3 From 2d8387c364a1c6bc9ede22922da54a7373d05ff1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Nov 2018 22:13:13 +0100 Subject: gnu: xclip: Fetch sources from git. * gnu/packages/xdisorg.scm (xclip)[source]: Fetch from git. --- gnu/packages/xdisorg.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 780fcd4c7c..0ca541d22a 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -131,14 +131,15 @@ program.") (name "xclip") (version "0.13") (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/astrand/xclip" - "/archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0n7pczk9vv30zf8qfln8ba3hnif9yfdxg0m84djac469wc28hnya")))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/astrand/xclip.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0q0hmvcjlv8arhh1pzhja2wglyj6n7z209jnpnzd281kqqv4czcs")))) (build-system gnu-build-system) (arguments '(#:tests? #f)) ;there is no test suite -- cgit v1.2.3 From ab3159f89dad9fedd808e1f884c5fc93cb91bf47 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Nov 2018 22:13:32 +0100 Subject: gnu: maim: Fetch sources from git. * gnu/packages/xdisorg.scm (maim)[source]: Fetch from git. --- gnu/packages/xdisorg.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 0ca541d22a..257b39609b 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -530,14 +530,14 @@ selection's dimensions to stdout.") (name "maim") (version "5.5.2") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/naelstrof/maim/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/naelstrof/maim.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "14zdhsx1cndg5m8wbv1rqmza7wgknwfj5h0knzxg3p2jkjw66i95")))) + "14mfxdm39kc5jk8wysrzx05ag2g4sk9l24i8m5pzqn8j611150v3")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ; no "check" target -- cgit v1.2.3 From cf8478e5d5377cb94531d9808acfe178f6fc11be Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Nov 2018 22:16:46 +0100 Subject: gnu: tilda: Fetch sources from git. * gnu/packages/terminals.scm (tilda)[source]: Fetch from git. --- gnu/packages/terminals.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index f0bd2ce877..89c7230ea8 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -71,12 +71,14 @@ (name "tilda") (version "1.4.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/lanoxx/tilda/archive/" - "tilda-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/lanoxx/tilda.git") + (commit (string-append "tilda-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0w2hry2bqcqrkik4l100b1a9jlsih6sq8zwhfpl8zzfq20i00lfs")))) + "154rsldqjv2m1bddisb930qicb0y35kx7bxq392n2hn68jr2pxkj")))) (build-system glib-or-gtk-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 773c18086bebb24ae2f991779d210be9d85ad22e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Nov 2018 22:17:04 +0100 Subject: gnu: picocom: Fetch sources from git. * gnu/packages/terminals.scm (picocom)[source]: Fetch from git. --- gnu/packages/terminals.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 89c7230ea8..c8f3a17223 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -330,14 +330,14 @@ combining, and so on, with a simple interface.") (name "picocom") (version "2.2") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/npat-efault/picocom" - "/archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/npat-efault/picocom.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1knl6dglnrynx1fhy21nylw56i1q3dkizkgxzkq42mb7ilah8f9y")))) + "06b2ic34dnxc73cprc5imi3iamlhsv623sbg9vj5h5rvs586dwjx")))) (build-system gnu-build-system) (arguments `(#:make-flags '("CC=gcc") -- cgit v1.2.3 From 82a0787c06aca9b6c01295c7f1d3b3f354c83693 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Nov 2018 22:17:22 +0100 Subject: gnu: tmate: Fetch sources from git. * gnu/packages/terminals.scm (tmate)[source]: Fetch from git. --- gnu/packages/terminals.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index c8f3a17223..18da27fbc0 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -875,13 +875,14 @@ per-line fullscreen terminal rendering, and keyboard input event reporting.") (version "2.2.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/tmate-io/tmate/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/tmate-io/tmate.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "01f3hhm3x0sd6apyb1ajkjfdfvq5m2759w00yp2slr9fyicsrhnr")))) + "0pfl9vrswzim9ydi1n652h3rax2zrmy6sqkp0r09yy3lw83h4y1r")))) (build-system gnu-build-system) (inputs `(("libevent" ,libevent) -- cgit v1.2.3 From ec4e9455d3acd4850dd0006216a7df1789e4320d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Nov 2018 22:19:58 +0100 Subject: gnu: polyml: Fetch sources from git. * gnu/packages/sml.scm (polyml)[source]: Fetch from git. --- gnu/packages/sml.scm | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/sml.scm b/gnu/packages/sml.scm index 1d7fd3fb51..0874b81cc7 100644 --- a/gnu/packages/sml.scm +++ b/gnu/packages/sml.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Andy Patterson ;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2018 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,6 +25,7 @@ #:use-module (gnu packages xorg) #:use-module (guix build-system gnu) #:use-module (guix download) + #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages)) @@ -31,14 +33,15 @@ (package (name "polyml") (version "5.7.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/polyml/polyml/archive/v" - version ".tar.gz")) - (sha256 - (base32 "0a3hcv80p9j0fny6726kvgmzjzdmak9xw7f7rv8sxv96nhjdi3fi")) - (file-name (string-append name "-" version ".tar.gz")))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/polyml/polyml.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0j0wv3ijfrjkfngy7dswm4k1dchk3jak9chl5735dl8yrl8mq755")))) (build-system gnu-build-system) (inputs `(("gmp" ,gmp) -- cgit v1.2.3 From 1300dc4be93e599121e1f018d1da8c6453914527 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Nov 2018 22:20:56 +0100 Subject: gnu: pdf2svg: Fetch sources from git. * gnu/packages/pdf.scm (pdf2svg)[source]: Fetch from git. --- gnu/packages/pdf.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 9ffc5cb9bb..9243dcc460 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -872,14 +872,14 @@ the framebuffer.") (name "pdf2svg") (version "0.2.3") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/dawbarton/pdf2svg/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/dawbarton/pdf2svg.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "12pa1pajirnlrkz2il3h4l30lc2prryk1qr132jk6z9y1c3qdcag")))) + "14ffdm4y26imq99wjhkrhy9lp33165xci1l5ndwfia8hz53bl02k")))) (build-system gnu-build-system) (inputs `(("cairo" ,cairo) -- cgit v1.2.3 From 86caf997be3643a1c6c3c8664822e22cd0b4186b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Nov 2018 22:22:51 +0100 Subject: gnu: libdbusmenu-qt: Fetch sources from git. * gnu/packages/lxqt.scm (libdbusmenu-qt)[source]: Fetch from git. --- gnu/packages/lxqt.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index b78b8ac99f..4cb24ebf64 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2017 Nils Gillmann ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Meiyo Peng +;;; Copyright © 2018 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,6 +25,7 @@ (define-module (gnu packages lxqt) #:use-module (guix download) + #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) @@ -68,14 +70,15 @@ (version "0.9.3+16.04.20160218-0ubuntu1") (source (origin - (method url-fetch) - ;; Download from github rather than launchpad beacuse launchpad trunk + (method git-fetch) + ;; Download from github rather than launchpad because launchpad trunk ;; tarball hash is not deterministic. - (uri (string-append "https://github.com/unity8-team/" name - "/archive/" version ".tar.gz")) + (uri (git-reference + (url "https://github.com/unity8-team/libdbusmenu-qt.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "0abwyggnpg50sa9cxphscp5zdkv9nxqnlav55vj21df6q1h3jb5w")) - (file-name (string-append name "-" version ".tar.gz")))) + (base32 "0b7ii1cvmpcyl79gqal9c3va9m55h055s4hx7fpxkhhqs9463ggg")))) (build-system cmake-build-system) (arguments ;; XXX: Tests require a dbus session and some icons. -- cgit v1.2.3 From 92f08e14f279457551db3f909b94ae62a83cc80d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Nov 2018 22:25:11 +0100 Subject: gnu: sxiv: Fetch sources from git. * gnu/packages/image-viewers.scm (sxiv)[source]: Fetch from git. --- gnu/packages/image-viewers.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index fce2b021bd..6a3e688d32 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -28,6 +28,7 @@ (define-module (gnu packages image-viewers) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix packages) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) @@ -191,14 +192,14 @@ It is the default image viewer on LXDE desktop environment.") (name "sxiv") (version "24") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/muennich/sxiv/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/muennich/sxiv.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "044i077li6m4zsz2fswlcdi2m0sbr9mwws1h3k1zjaln29fw87ai")))) + "020n1bdxbzqncprh8a4rnjzc4frp335yxbqh5w6dr970f7n5qm8d")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target -- cgit v1.2.3 From 6f6f9267b6a2b5f70ce376d2268cf138782831a3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Nov 2018 22:25:27 +0100 Subject: gnu: catimg: Fetch sources from git. * gnu/packages/image-viewers.scm (catimg)[source]: Fetch from git. --- gnu/packages/image-viewers.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 6a3e688d32..8e70f1fdfc 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -288,13 +288,14 @@ your images. Among its features are: (version "2.4.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/posva/catimg/archive" - "/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/posva/catimg.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1rwgbq2imd5l4nql5hrz7rr5f4gz8aad1amlf0j3cxir8slpbd1y")))) + "1sk74nfc1aklg784pzknr37dyz4k7h9fck3mifpn43rav5qy2zpy")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; no tests -- cgit v1.2.3 From 872ea4eb69d16c6d34f31e6cbe91f59e1aa06cba Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Nov 2018 22:31:43 +0100 Subject: gnu: s2tc: Fetch sources from git. * gnu/packages/gl.scm (s2tc)[source]: Fetch from git. --- gnu/packages/gl.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 11c89b3d88..c724fff5f2 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2014, 2016 David Thompson ;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver ;;; Copyright © 2016 Nils Gillmann -;;; Copyright © 2016, 2017 Ricardo Wurmus +;;; Copyright © 2016, 2017, 2018 Ricardo Wurmus ;;; Copyright © 2016 David Thompson ;;; Copyright © 2017, 2018 Efraim Flashner ;;; Copyright © 2017 Arun Isaac @@ -49,6 +49,7 @@ #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build utils) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) @@ -177,12 +178,13 @@ Polygon meshes, and Extruded polygon meshes.") (version "1.0") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/divVerent/s2tc/archive/v" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/divVerent/s2tc.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "0ibfdib277fhbqvxzan0bmglwnsl1y1rw2g8skvz82l1sfmmn752")) - (file-name (string-append name "-" version ".tar.gz")))) + (base32 "1fg323fk7wlv2xh6lw66wswgcv6qi8aaadk7c28h2f2lj1s7njnf")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From 11bbf6324b9662bc765805d53701e380d27fccc4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Nov 2018 22:32:08 +0100 Subject: gnu: s2tc: Remove custom bootstrap phase. * gnu/packages/gl.scm (s2tc)[arguments]: Remove. --- gnu/packages/gl.scm | 6 ------ 1 file changed, 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index c724fff5f2..b9dfd7b0f1 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -192,12 +192,6 @@ Polygon meshes, and Extruded polygon meshes.") ("libtool" ,libtool))) (inputs `(("mesa-headers" ,mesa-headers))) - (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'autogen - (lambda _ - (zero? (system* "sh" "autogen.sh"))))))) (home-page "https://github.com/divVerent/s2tc") (synopsis "S3 Texture Compression implementation") (description -- cgit v1.2.3 From bd7daf9c4febd0919101ad8016f28af237887a1c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Nov 2018 22:32:41 +0100 Subject: gnu: virtualgl: Fetch sources from git. * gnu/packages/gl.scm (virtualgl)[source]: Fetch from git. --- gnu/packages/gl.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index b9dfd7b0f1..06c43a0483 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -725,13 +725,14 @@ mixed vector/bitmap output.") (version "2.6") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/VirtualGL/virtualgl/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/VirtualGL/virtualgl.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1ck1d0w19cgyqvrb9mdlj6l5db90xf18yln71kdninlqxvpgj6h7")))) + "0di2igj2bhwb153fndgxks7y57pyhp0gj31n47j93gb7lxc9qcck")))) (arguments `(#:tests? #f ; no tests are available #:configure-flags (list -- cgit v1.2.3 From 94be94cfda780374524e227184efcc88b83f5d5f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Nov 2018 22:37:11 +0100 Subject: gnu: gpick: Fetch sources from git. * gnu/packages/image.scm (gpick)[source]: Fetch from git. --- gnu/packages/image.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index e7b10655e7..11755a7b86 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1392,12 +1392,14 @@ medical image data, e.g. magnetic resonance image (MRI) and functional MRI (name "gpick") (version "0.2.5") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/thezbyg/gpick/archive/" - name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/thezbyg/gpick.git") + (commit (string-append name "-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0mxvxk15xhk2i5vfavjhnkk4j3bnii0gpf8di14rlbpq070hd5rs")))) + "0mcj806zagh122qgrdkrg0macpzby97y89xi2sjyn3bh8vmmyxjy")))) (build-system scons-build-system) (native-inputs `(("boost" ,boost) -- cgit v1.2.3 From d57b017ccc25d3c46b8fe4076f5e9bedb0eeda47 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Nov 2018 22:37:43 +0100 Subject: gnu: jasper: Fetch sources from git. * gnu/packages/image.scm (jasper)[source]: Fetch from git. --- gnu/packages/image.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 11755a7b86..e7a7121f15 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1121,13 +1121,14 @@ convert, manipulate, filter and display a wide variety of image formats.") (name "jasper") (version "2.0.14") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/mdadams/jasper/archive/" - "version-" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/mdadams/jasper.git") + (commit (string-append "version-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0yx9y5y0g6jv142vnqp50j3k8k5yqznz3smrblv192wgfbm6w9l5")))) + "0aarg8nbik9wrm7fx0451sbm5ypfdfr6i169pxzi354mpdp8gg7f")))) (build-system cmake-build-system) (inputs `(("libjpeg" ,libjpeg))) (synopsis "JPEG-2000 library") -- cgit v1.2.3 From ba185e2a63d7f4f48238953bf062d4f84514bc5d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Nov 2018 22:40:38 +0100 Subject: gnu: zimg: Fetch sources from git. * gnu/packages/image.scm (zimg)[source]: Fetch from git. --- gnu/packages/image.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index e7a7121f15..c5347d6082 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1144,13 +1144,14 @@ ISO/IEC 15444-1).") (version "2.5") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/sekrit-twc/zimg/archive/" - "release-" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/sekrit-twc/zimg.git") + (commit (string-append "release-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0kbq2dy659645fmgxpzg38b6y6x82kwkydhc380kdkaikv2brcjh")))) + "05krggiifbl6hyg2j3z8qz2k7si84g1qg9snhsnf1ml7mrhqhhlr")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From 743600e9db44e83819e3212646ad6deaa21453ec Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Nov 2018 22:41:04 +0100 Subject: gnu: flameshot: Fetch sources from git. * gnu/packages/image.scm (flameshot)[source]: Fetch from git. --- gnu/packages/image.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index c5347d6082..33587bf01b 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1457,13 +1457,14 @@ parsing, viewing, modifying, and saving this metadata.") (version "0.5.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/lupoDharkael/flameshot/archive/" - "v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/lupoDharkael/flameshot.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0kp451bqgssvg8n3sg60s3fifplm9l5kxiij0yxkl864p2mhw8im")))) + "13h77np93r796jf289v4r687cmnpqkyqs34dm9gif4akaig74ky0")))) (build-system gnu-build-system) (native-inputs `(("qttools" ,qttools))) -- cgit v1.2.3 From 5bc593dfb7df4927461f257acfc3601a28b3fbe8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Nov 2018 22:42:37 +0100 Subject: gnu: jp2a: Fetch sources from git. * gnu/packages/image.scm (jp2a)[source]: Fetch from git. --- gnu/packages/image.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 33587bf01b..7b72737504 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1567,13 +1567,14 @@ identical visual appearance.") (version "1.0.7") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/cslarsen/jp2a/archive/v" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/cslarsen/jp2a.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0nahpjvrahixcfqqrjj2k4fscc8qs4hqnmj2qgjzsjj3z6xxh2g5")) - (file-name (string-append name "-" version ".tar.gz")))) + "12a1z9ba2j16y67f41y8ax5sgv1wdjd71pg7circdxkj263n78ql")))) (build-system gnu-build-system) (inputs `(("libjpeg" ,libjpeg) -- cgit v1.2.3 From 6a3cf93818aa71b23be5f0dbf168d7f9dd8a333c Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Thu, 29 Nov 2018 22:32:09 +0100 Subject: nu: ocaml: Update to 4.07.1 * gnu/packages/ocaml.scm (ocaml): Update to 4.07.1. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 9c0ab94f3e..c9463d5dcf 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -261,7 +261,7 @@ functional, imperative and object-oriented styles of programming.") (define-public ocaml-4.07 (package (inherit ocaml-4.02) - (version "4.07.0") + (version "4.07.1") (source (origin (method url-fetch) (uri (string-append @@ -270,7 +270,7 @@ functional, imperative and object-oriented styles of programming.") "/ocaml-" version ".tar.xz")) (sha256 (base32 - "03wzkzv6w4rdiiva20g5amz0n4x75swpjl8d80468p6zm8hgfnzl")))) + "1f07hgj5k45cylj1q3k5mk8yi02cwzx849b1fwnwia8xlcfqpr6z")))) (arguments (substitute-keyword-arguments (package-arguments ocaml-4.02) ((#:phases phases) -- cgit v1.2.3 From fa45b22d4e5a64037f63576b99b8a91e5b198e30 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Thu, 29 Nov 2018 22:47:12 +0100 Subject: gnu: camlp5: Update to 7.07. * gnu/packages/ocaml.scm (camlp5): Update to 7.07. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c9463d5dcf..cba1e4e747 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -487,7 +487,7 @@ syntax of OCaml.") (define-public camlp5 (package (name "camlp5") - (version "7.06") + (version "7.07") (source (origin (method url-fetch) (uri (string-append "https://github.com/camlp5/camlp5/archive/rel" @@ -495,7 +495,7 @@ syntax of OCaml.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "08kr0h2rq3jh3kzqh5f6pr589bqw3y76z8k59ad2kdh50fjgp8xy")))) + "148r6p93xlxi6v7kbsqv8i70r6av04cyn0109pwss5xj6fw97i52")))) (build-system gnu-build-system) (inputs `(("ocaml" ,ocaml))) -- cgit v1.2.3 From 477fceb1e3a35e95e53e748fcdf6eed27a7a9120 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Thu, 29 Nov 2018 23:13:01 +0100 Subject: gnu: coq: Update to 8.8.2. * gnu/packages/ocaml.scm (coq): Update to 8.8.2. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index cba1e4e747..08571eb6a9 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -617,7 +617,7 @@ the OCaml core distribution.") (define-public coq (package (name "coq") - (version "8.8.1") + (version "8.8.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/coq/coq/archive/V" @@ -625,7 +625,7 @@ the OCaml core distribution.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "13cyvbg8cgqkg9wz0ax7jq03srj9k0lyvny97fcka4ai1zrzwln8")))) + "0i2hs0i6rp27cy8zd0mx7jscqw5cx2y0diw0pxgij66s3yr47y7r")))) (native-search-paths (list (search-path-specification (variable "COQPATH") -- cgit v1.2.3 From 2b6164f033d3cf3f584d89ac0eb3d681f1c1fcf9 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Mon, 26 Nov 2018 16:31:31 +0300 Subject: gnu: Add emacs-ansible-doc. * gnu/packages/admin.scm (emacs-ansible-doc): New variable. --- gnu/packages/admin.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 28961ecf88..c725fb9a2f 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -45,6 +45,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system cmake) + #:use-module (guix build-system emacs) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) #:use-module (guix build-system perl) @@ -1622,6 +1623,34 @@ ad hoc task execution, and multinode orchestration---including trivializing things like zero-downtime rolling updates with load balancers.") (license license:gpl3+))) +(define-public emacs-ansible-doc + (let ((commit "86083a7bb2ed0468ca64e52076b06441a2f8e9e0")) + (package + (name "emacs-ansible-doc") + (version (git-version "0.4" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/lunaryorn/ansible-doc.el") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0lap404ch74w99n3xip176jr42b38xhyzkfnkyqg0g3wk2cd3aq8")))) + (build-system emacs-build-system) + ;; Unmaintained by upstream. + (home-page "https://github.com/lunaryorn/ansible-doc.el") + (synopsis "Ansible documentation for Emacs") + (description + "This package provides an Ansible documentation for GNU Emacs. + +@code{ansible-doc} allows you to view the documentation of an Ansible +module and @code{ansible-doc-mode} minor mode adds documentation +lookup to YAML Mode. You could enable the mode with @code{(add-hook +'yaml-mode-hook #'ansible-doc-mode)}.") + (license license:gpl3+)))) + (define-public cpulimit (package (name "cpulimit") -- cgit v1.2.3 From bc3ece7d3d839270572149efbb8b67123f0830e8 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Mon, 26 Nov 2018 16:31:59 +0300 Subject: gnu: Add emacs-polymode-ansible. * gnu/packages/emacs.scm (emacs-polymode-ansible): New variable. --- gnu/packages/emacs.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index ce6f3efbd2..76fa9eb55d 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -71,6 +71,7 @@ #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system trivial) #:use-module (gnu packages) + #:use-module (gnu packages admin) #:use-module (gnu packages audio) #:use-module (gnu packages bash) #:use-module (gnu packages cmake) @@ -7977,6 +7978,35 @@ takes only a few lines of code. Polymode also provides extensible facilities for external literate programming tools for exporting, weaving and tangling.") (license license:gpl3+))) +(define-public emacs-polymode-ansible + (let ((commit "b26094d029e25dc797b94254f797e7807a57e4c8")) + (package + (name "emacs-polymode-ansible") + ;; No upstream version release yet. + (version (git-version "0.1" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/mavit/poly-ansible") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "055shddqibib3hx2ykwdz910nrqws40cd407mq946l2bf6v87gj6")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-ansible-doc" ,emacs-ansible-doc) + ("emacs-jinja2-mode" ,emacs-jinja2-mode) + ("emacs-polymode" ,emacs-polymode) + ("emacs-yaml-mode" ,emacs-yaml-mode))) + (properties '((upstream-name . "poly-ansible"))) + (home-page "https://gitlab.com/mavit/poly-ansible/") + (synopsis "Polymode for Ansible - Jinja2 in YAML") + (description + "Edit YAML files for Ansible containing embedded Jinja2 templating.") + (license license:gpl3+)))) + (define-public eless (package (name "eless") -- cgit v1.2.3 From 95c1504758b16f9f509007c17d0dea88ac16f24e Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 29 Nov 2018 21:16:45 -0500 Subject: gnu: schismtracker: Update to 20180810. * gnu/packages/music.scm (schismtracker): Update to 20180810. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index b789d67f7f..071442d773 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2772,7 +2772,7 @@ for improved Amiga ProTracker 2/3 compatibility.") (define-public schismtracker (package (name "schismtracker") - (version "20180513") + (version "20180810") (source (origin (method git-fetch) (uri (git-reference @@ -2781,7 +2781,7 @@ for improved Amiga ProTracker 2/3 compatibility.") (file-name (git-file-name name version)) (sha256 (base32 - "0fayix1zbl96zhkfszgj71qr25dnddgy9hr6149nslww4gl7jk36")) + "0cwp5fna14hjrlf652l96ja5cjq63is3cwg6pp4wbpx43mb7qb2d")) (modules '((guix build utils))) (snippet ;; Remove use of __DATE__ and __TIME__ for reproducibility. -- cgit v1.2.3 From c2d512d3d21550f68040d208afe260097df1650a Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Thu, 29 Nov 2018 21:13:44 -0600 Subject: detox: Update to 1.3.0. * gnu/packages/admin.scm (detox): Update to 1.3.0 [source]: Move to new upstream fork. [inputs]: Remove libpopt. Move flex to... [native-inputs]: ...here, new field. Add autoconf and automake. [arguments]: Remove #:configure-flags. Add 'delete-configure' phase. [home-page]: Adjust for new upstream. --- gnu/packages/admin.scm | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index c725fb9a2f..2f611432c7 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1340,25 +1340,30 @@ system is under heavy load.") (define-public detox (package (name "detox") - (version "1.2.0") + (version "1.3.0") (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/detox/detox/" version - "/detox-" version ".tar.bz2")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/dharple/detox.git") + (commit (string-append "v" version)))) (sha256 (base32 - "1y6vvjqsg54kl49cry73jbfhr04s7wjs779vrr9zrq6kww7dkymb")))) + "1dd608c7g65s5lj02cddvani3q9kzirddgkjqa22ap9d4f8b9xgr")))) (build-system gnu-build-system) - ;; Both flex and popt are used in this case for their runtime libraries - ;; (libfl and libpopt). - (inputs - `(("flex" ,flex) - ("popt" ,popt))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("flex" ,flex))) (arguments - `(#:configure-flags `(,(string-append "--with-popt=" - (assoc-ref %build-inputs "popt"))) - #:tests? #f)) ;no 'check' target - (home-page "http://detox.sourceforge.net") + `(#:tests? #f ;no 'check' target + #:phases (modify-phases %standard-phases + (add-after 'unpack 'delete-configure + ;; The "configure" script is present, but otherwise the + ;; project is not bootstrapped: missing install-sh and + ;; Makefile.in, so delete it so the bootstrap phase will + ;; take over. + (lambda _ (delete-file "configure") #t))))) + (home-page "https://github.com/dharple/detox") (synopsis "Clean up file names") (description "Detox is a program that renames files to make them easier to work with -- cgit v1.2.3 From 71b186ef00e9a027d9a06bb11f1e1e72e2158c32 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Thu, 29 Nov 2018 21:21:17 -0600 Subject: ccache: Update to 3.5. * gnu/packages/ccache.scm (ccache): Update to 3.5. --- gnu/packages/ccache.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ccache.scm b/gnu/packages/ccache.scm index af29cee565..0a1112c310 100644 --- a/gnu/packages/ccache.scm +++ b/gnu/packages/ccache.scm @@ -30,7 +30,7 @@ (define-public ccache (package (name "ccache") - (version "3.4.3") + (version "3.5") (source (origin (method url-fetch) @@ -38,9 +38,9 @@ version ".tar.xz")) (sha256 (base32 - "0jjzq5340qw3jm5gkajjkkb5wd0yqqy1dyjw3mf3jy15cakmazi9")))) + "04n0xram2416pv98qrd7pi5lfsk0bjqyz7zgvvia41j5mrr4pm5x")))) (build-system gnu-build-system) - (native-inputs `(("perl" ,perl) ; for test.sh + (native-inputs `(("perl" ,perl) ; for test/run ("which" ,(@ (gnu packages base) which)))) (inputs `(("zlib" ,zlib))) (arguments -- cgit v1.2.3 From c6aa2ee276e54d0a13ef58adc85d762071e09497 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Thu, 29 Nov 2018 21:22:03 -0600 Subject: tuxpaint: Update to 0.9.23. * gnu/packages/games.scm (tuxpaint): Update to 0.9.23. --- gnu/packages/games.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 7e74bf4c90..620d752d88 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013 John Darrington ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2014, 2016 David Thompson -;;; Copyright © 2014, 2015, 2016, 2017 Eric Bavier +;;; Copyright © 2014, 2015, 2016, 2017, 2018 Eric Bavier ;;; Copyright © 2014 Cyrill Schenkel ;;; Copyright © 2014 Sylvain Beucler ;;; Copyright © 2014, 2015, 2018 Ludovic Courtès @@ -3259,7 +3259,7 @@ safety of the Chromium vessel.") (define-public tuxpaint (package (name "tuxpaint") - (version "0.9.22") ;keep VER_DATE below in sync + (version "0.9.23") ;keep VER_DATE below in sync (source (origin (method url-fetch) @@ -3267,7 +3267,7 @@ safety of the Chromium vessel.") version "/tuxpaint-" version ".tar.gz")) (sha256 (base32 - "1qrbrdck9yxpcg3si6jb9i11w8lw9h4hqad0pfaxgyiniqpr7gca")) + "09k9pxi88r3dx6dyjwf9h85d4qpva4i29qz63dc558hg9v21k69l")) (modules '((guix build utils))) (snippet '(begin @@ -3295,7 +3295,7 @@ safety of the Chromium vessel.") ("sdl" ,(sdl-union (list sdl sdl-mixer sdl-ttf sdl-image))))) ;; TODO: Use system fonts rather than those in data/fonts (arguments - `(#:make-flags `("VER_DATE=2014-08-23" + `(#:make-flags `("VER_DATE=2018-09-02" "GPERF=gperf" "CC=gcc" "SDL_PCNAME=sdl SDL_image SDL_mixer SDL_ttf" ,(string-append "PREFIX=" %output) -- cgit v1.2.3 From 6ade82c29712a4a2e2adfb28375b4f0c0ce2cac9 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Thu, 29 Nov 2018 21:22:35 -0600 Subject: tuxpaint-stamps: Update to 2018.09.01. * gnu/packages/games.scm (tuxpaint-stamps): Update to 2018.09.01. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 620d752d88..14faca9ea9 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3336,7 +3336,7 @@ your child be creative.") (define-public tuxpaint-stamps (package (name "tuxpaint-stamps") - (version "2014.08.23") + (version "2018.09.01") (source (origin (method url-fetch) @@ -3345,7 +3345,7 @@ your child be creative.") "/tuxpaint-stamps-" version ".tar.gz")) (sha256 (base32 - "0rhlwrjz44wp269v3rid4p8pi0i615pzifm1ym6va64gn1bms06q")))) + "1skr23k27yj3vgwfazpzxp90lb2a278gxrkr3bxw7az6zpkmb3yp")))) (build-system trivial-build-system) (native-inputs `(("tar" ,tar) -- cgit v1.2.3 From 7b05e957fa8adfe2c85d7d164b8a2f4c9796fdb2 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Thu, 29 Nov 2018 21:23:06 -0600 Subject: tuxpaint-config: Update to 0.0.14. * gnu/packages/games.scm (tuxpaint-config): Update to 0.0.14. --- gnu/packages/games.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 14faca9ea9..36eaa6c063 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3374,7 +3374,7 @@ with the \"Stamp\" tool within Tux Paint.") (define-public tuxpaint-config (package (name "tuxpaint-config") - (version "0.0.13") ;keep VER_DATE below in sync + (version "0.0.14") ;keep VER_DATE below in sync (source (origin (method url-fetch) @@ -3382,7 +3382,7 @@ with the \"Stamp\" tool within Tux Paint.") version "/tuxpaint-config-" version ".tar.gz")) (sha256 (base32 - "1z12s46mvy87qs3vgq9m0ki9pp21zqc52mmgphahpihw3s7haf6v")))) + "0zkgxk436nqcp43zghkfmh397c7dvh5bwn2as7gwvv208bzyij6g")))) (build-system gnu-build-system) (native-inputs `(("gettext" ,gettext-minimal))) @@ -3394,7 +3394,7 @@ with the \"Stamp\" tool within Tux Paint.") ("libxft" ,libxft) ("mesa" ,mesa))) (arguments - `(#:make-flags `("VER_DATE=2014-08-23" + `(#:make-flags `("VER_DATE=2018-09-01" "CONFDIR=/etc/tuxpaint" ;don't write to store ,(string-append "PREFIX=" %output) "GNOME_PREFIX=$(PREFIX)") -- cgit v1.2.3 From 5f230fb2798e9862fba67228b9de89df8f36e8e0 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Thu, 29 Nov 2018 22:17:40 -0600 Subject: patchutils: Update to 0.3.4. * gnu/packages/patchutils.scm (patchutils): Update to 0.3.4. [arguments]: Simplify 'patch-test-scripts' phase. * gnu/packages/patches/patchutils-xfail-gendiff-tests.patch: Rename to... * gnu/packages/patches/patchutils-test-perms.patch: ...this. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 2 +- gnu/packages/patches/patchutils-test-perms.patch | 14 ++++++++++++ .../patches/patchutils-xfail-gendiff-tests.patch | 26 ---------------------- gnu/packages/patchutils.scm | 12 +++++----- 4 files changed, 20 insertions(+), 34 deletions(-) create mode 100644 gnu/packages/patches/patchutils-test-perms.patch delete mode 100644 gnu/packages/patches/patchutils-xfail-gendiff-tests.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index bb152cd108..70968dbb8e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1026,7 +1026,7 @@ dist_patch_DATA = \ %D%/packages/patches/p7zip-remove-unused-code.patch \ %D%/packages/patches/patchelf-page-size.patch \ %D%/packages/patches/patchelf-rework-for-arm.patch \ - %D%/packages/patches/patchutils-xfail-gendiff-tests.patch \ + %D%/packages/patches/patchutils-test-perms.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 \ diff --git a/gnu/packages/patches/patchutils-test-perms.patch b/gnu/packages/patches/patchutils-test-perms.patch new file mode 100644 index 0000000000..c7652b9af2 --- /dev/null +++ b/gnu/packages/patches/patchutils-test-perms.patch @@ -0,0 +1,14 @@ +Need to mark one of the tests as PHONY to get permissions set correctly on +built scripts. + +--- a/Makefile.in 2011-02-10 09:44:43.000000000 -0600 ++++ b/Makefile.in 2018-11-29 21:52:05.000000000 -0600 +@@ -1106,5 +1108,6 @@ + rm -f $(DESTDIR)$(bindir)/"`echo lsdiff|sed '$(transform)'`" + rm -f $(DESTDIR)$(bindir)/"`echo grepdiff|sed '$(transform)'`" + ++.PHONY: tests/newline1/run-test + tests/newline1/run-test: src/combinediff$(EXEEXT) src/flipdiff$(EXEEXT) \ + src/lsdiff$(EXEEXT) src/grepdiff$(EXEEXT) \ + scripts/splitdiff + diff --git a/gnu/packages/patches/patchutils-xfail-gendiff-tests.patch b/gnu/packages/patches/patchutils-xfail-gendiff-tests.patch deleted file mode 100644 index b2e77d22f2..0000000000 --- a/gnu/packages/patches/patchutils-xfail-gendiff-tests.patch +++ /dev/null @@ -1,26 +0,0 @@ -The gendiff1 and gendiff2 tests need the gendiff script that's distributed -with the rpm package management tool. Without that script, these tests are -expected to fail. - -Need to mark one of the tests as PHONY to get permissions set correctly on -built scripts. - ---- a/Makefile.in 2011-02-10 09:44:43.000000000 -0600 -+++ b/Makefile.in 2014-03-06 17:27:55.610048953 -0600 -@@ -378,6 +378,8 @@ - # These ones don't work yet. - # Feel free to send me patches. :-) - XFAIL_TESTS = \ -+ tests/gendiff1/run-test \ -+ tests/gendiff2/run-test \ - tests/delhunk5/run-test \ - tests/delhunk6/run-test - -@@ -1106,6 +1108,7 @@ - rm -f $(DESTDIR)$(bindir)/"`echo lsdiff|sed '$(transform)'`" - rm -f $(DESTDIR)$(bindir)/"`echo grepdiff|sed '$(transform)'`" - -+.PHONY: tests/combine1/run-test - tests/combine1/run-test: src/combinediff$(EXEEXT) src/flipdiff$(EXEEXT) \ - src/lsdiff$(EXEEXT) src/grepdiff$(EXEEXT) - for script in $(bin_SCRIPTS); do \ diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index 688e62cdc8..fa5ad62e44 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -43,7 +43,7 @@ (define-public patchutils (package (name "patchutils") - (version "0.3.3") + (version "0.3.4") (source (origin (method url-fetch) @@ -51,8 +51,8 @@ name "-" version ".tar.xz")) (sha256 (base32 - "0g5df00cj4nczrmr4k791l7la0sq2wnf8rn981fsrz1f3d2yix4i")) - (patches (search-patches "patchutils-xfail-gendiff-tests.patch")))) + "0xp8mcfyi5nmb5a2zi5ibmyshxkb1zv1dgmnyn413m7ahgdx8mfg")) + (patches (search-patches "patchutils-test-perms.patch")))) (build-system gnu-build-system) (inputs `(("perl" ,perl))) (arguments @@ -61,10 +61,8 @@ (modify-phases %standard-phases (add-before 'check 'patch-test-scripts (lambda _ - (let ((echo (which "echo"))) - (substitute* - (find-files "tests" "^run-test$") - (("/bin/echo") echo))) + (substitute* (find-files "tests" "^run-test$") + (("/bin/echo") (which "echo"))) #t)) (add-after 'install 'wrap-program ;; Point installed scripts to the utilities they need. -- cgit v1.2.3 From 24b765b6a6b2e7080bc9b4e345537e409c0e3b68 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Thu, 29 Nov 2018 22:20:19 -0600 Subject: terminology: Update to 1.3.0. * gnu/packages/enlightenment.scm (terminology): Update to 1.3.0. --- gnu/packages/enlightenment.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index fb77642f5f..43ac388b25 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -183,7 +183,7 @@ removable devices or support for multimedia.") (define-public terminology (package (name "terminology") - (version "1.2.1") + (version "1.3.0") (source (origin (method url-fetch) (uri @@ -191,10 +191,9 @@ removable devices or support for multimedia.") "terminology/terminology-" version ".tar.xz")) (sha256 (base32 - "1ii8332bl88l8md3gvz5dhi9bjpm6shyf14ck9kfyy7d56hp71mc")) + "07vw28inkimi9avp16j0rqcfqjq16081554qsv29pcqhz18xp59r")) (modules '((guix build utils))) ;; Remove the bundled fonts. - ;; TODO: Remove bundled lz4. (snippet '(begin (delete-file-recursively "data/fonts") -- cgit v1.2.3 From 4168e3faf2f4354fe4e469b67dc276e5374d20ad Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Thu, 29 Nov 2018 22:37:23 -0600 Subject: neovim: Update to 0.3.1. * gnu/packages/vim.scm (neovim): Update to 0.3.1. [arguments]: Add #:configure-flags. --- gnu/packages/vim.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 0ba2f4e7ef..28d20af023 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -652,7 +652,7 @@ are detected, the user is notified."))) (define-public neovim (package (name "neovim") - (version "0.2.0") + (version "0.3.1") (source (origin (method url-fetch) @@ -661,12 +661,13 @@ are detected, the user is notified."))) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1db27zm6cldm1aw0570vii1bxc16a34x8lissl1h9rizsbwn7qkj")))) + "08mdffcw4k503bccm1plq8r7hjx4w61w5jyfdj80fr079hnkjpmw")))) (build-system cmake-build-system) (arguments `(#:modules ((srfi srfi-26) (guix build cmake-build-system) (guix build utils)) + #:configure-flags '("-DPREFER_LUA:BOOL=YES") #:phases (modify-phases %standard-phases (add-after 'unpack 'set-lua-paths -- cgit v1.2.3 From 045d77cc0f360d928f6be4cacfe58325c8e90d0c Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Thu, 29 Nov 2018 22:51:58 -0600 Subject: radicale: Update to 1.1.6. * gnu/packages/dav.scm (radicale): Update to 1.1.6. --- gnu/packages/dav.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/dav.scm b/gnu/packages/dav.scm index 1a154ea351..e937d59358 100644 --- a/gnu/packages/dav.scm +++ b/gnu/packages/dav.scm @@ -30,13 +30,13 @@ (define-public radicale (package (name "radicale") - (version "1.1.2") + (version "1.1.6") (source (origin (method url-fetch) (uri (pypi-uri "Radicale" version)) (sha256 (base32 - "1g20p3998f46ywda7swv0py63wjbrhvk0nrafajlbb6wgzxjmqpb")))) + "0ay90nj6fmr2aq8imi0mbjl4m2rzq7a83ikj8qs9gxsylj71j1y0")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; The tests are not distributed in the PyPi release. -- cgit v1.2.3 From 6878890c42c7cb5b394f505731b798899e155c38 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Fri, 30 Nov 2018 00:15:41 -0600 Subject: hugin: Update to 2018.0.0. * gnu/packages/photo.scm (hugin): Update 2018.0.0. --- gnu/packages/photo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index afa5022c37..1aa24b1eed 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -422,7 +422,7 @@ and enhance them.") (define-public hugin (package (name "hugin") - (version "2016.2.0") + (version "2018.0.0") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/hugin/hugin/hugin-" @@ -430,7 +430,7 @@ and enhance them.") "/hugin-" version ".tar.bz2")) (sha256 (base32 - "058zd63vx29yrx2pphbbll7kzcxkai22q26lpw13rn4lvp41pasl")))) + "1jv5wpqbq49fhbl5g521g1qxhdm1rm7acxd18fr3n3n5d830vbyk")))) (build-system cmake-build-system) (native-inputs `(("gettext" ,gnu-gettext) -- cgit v1.2.3 From 4d26987dcbc31f4f6a3c524b22af7d3dac52f39a Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Thu, 22 Nov 2018 19:00:48 +0530 Subject: gnu: Add lynis. * gnu/packages/admin.scm (lynis): New variable. --- gnu/packages/admin.scm | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 2f611432c7..94bf6900ce 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2871,3 +2871,82 @@ support forum. It runs with the @code{/exec} command in most IRC clients.") (description "This package provides tools to manage clients of the Logitech Unifying Receiver.") (license license:gpl2))) + +(define-public lynis + (package + (name "lynis") + (version "2.7.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/CISOfy/lynis") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0rzc0y8lk22bymf56249jzmllki2lh0rz5in4lkrc5fkmp29c2wv")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove proprietary plugins. As of now, all plugins supplied with + ;; lynis are proprietary. In the future, if free plugins are + ;; provided, whitelist them from deletion. + (for-each delete-file (find-files "plugins")) + #t)))) + (build-system gnu-build-system) + (native-inputs + `(;; For tests + ("lynis-sdk" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/CISOfy/lynis-sdk") + (commit "3310aef4f2b3dd97d166c96ad0253c89c4ad390d"))) + (file-name (git-file-name "lynis-sdk" version)) + (sha256 + (base32 + "0sqsrm5wal742yrwps8bqb8a8lxd93n4b93n3kkm1b30nbs25g7y")))))) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "lynis" + (("/usr/share/lynis") + (string-append (assoc-ref outputs "out") "/share/lynis"))) + (substitute* "include/functions" + (("/usr/local/etc/lynis") + (string-append (assoc-ref outputs "out") "/etc/lynis"))) + #t)) + (delete 'build) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (install-file "lynis" (string-append out "/bin/")) + (install-file "default.prf" (string-append out "/etc/lynis")) + (for-each + (lambda (dir) + (copy-recursively dir (string-append out "/share/lynis/" dir))) + (list "db" "include" "plugins")) + (install-file "lynis.8" (string-append out "/share/man/man8")) + #t))) + (replace 'check + (lambda* (#:key inputs #:allow-other-keys) + (copy-recursively (assoc-ref inputs "lynis-sdk") "../lynis-sdk") + (setenv "LANG" "en_US.UTF-8") + (let ((lynis-dir (getcwd))) + (with-directory-excursion "../lynis-sdk" + (substitute* "config" + (("\\.\\./lynis") lynis-dir)) + (substitute* "unit-tests/tests-language-translations.sh" + (("\\.\\./lynis") lynis-dir)) + (invoke "sh" "lynis-devkit" "run" "unit-tests")))))))) + (home-page "https://cisofy.com/lynis/") + (synopsis "Security auditing tool") + (description "Lynis is a security auditing tool. It performs an in-depth +security scan and runs on the system itself. The primary goal is to test +security defenses and provide tips for further system hardening. It will also +scan for general system information, vulnerable software packages, and +possible configuration issues.") + (license license:gpl3+))) -- cgit v1.2.3 From 5deb0c670de30689b7019f00f7b67af84f6056d3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 30 Nov 2018 09:48:16 +0200 Subject: 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 +- gnu/packages/patches/blender-newer-ffmpeg.patch | 80 +++++++++++++++++++++++++ 3 files changed, 84 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/blender-newer-ffmpeg.patch (limited to 'gnu') 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) -- cgit v1.2.3 From 2f24b9ca8bf71be9a1446eb344bb0d5d26eff309 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Fri, 30 Nov 2018 08:13:25 +0100 Subject: gnu: wine: Update to 3.0.4. * gnu/packages/wine.scm (wine): Update to 3.0.4. --- gnu/packages/wine.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 26d5f497e3..802b3dd38f 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -71,7 +71,7 @@ (define-public wine (package (name "wine") - (version "3.0.3") + (version "3.0.4") (source (origin (method url-fetch) (uri (string-append "https://dl.winehq.org/wine/source/" @@ -79,7 +79,7 @@ "/wine-" version ".tar.xz")) (sha256 (base32 - "18add8wqqz7y1aj8x0dcba7pqj9jkbhngwjv4yjmar3gxacmjr7b")))) + "037vlrk80lagy362w7500i2ldwvdwsadrknajzi67cvxpvnqhnnl")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("gettext" ,gettext-minimal) -- cgit v1.2.3 From f07a93ed0351b9fadb208cdc8a704d1c8903ffc2 Mon Sep 17 00:00:00 2001 From: Tim Gesthuizen Date: Tue, 27 Nov 2018 17:57:14 +0100 Subject: gnu: Add emacs-flycheck-irony. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs.scm (emacs-flycheck-irony): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 76fa9eb55d..dc00fb8969 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -2879,6 +2879,29 @@ with irony-mode using clang-tooling.") (home-page "https://github.com/Sarcasm/company-irony") (license license:gpl3+))) +(define-public emacs-flycheck-irony + (package + (name "emacs-flycheck-irony") + (version "0.1.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Sarcasm/flycheck-irony.git") + (commit (string-append "v" version)))) + (sha256 + (base32 "0qa5a8wzvzxwqql92ibc9s43k8sj3vwn7skz9hfr8av0skkhx996")) + (file-name (string-append name "-" version)))) + (build-system emacs-build-system) + (inputs + `(("irony-mode" ,emacs-irony-mode) + ("flycheck-mode" ,emacs-flycheck) + ("emacs-company" ,emacs-company))) + (synopsis "Live syntax checking frontend for Flycheck using irony-mode") + (description "This package provides a frontend for Flycheck that lets +irony-mode do the syntax checking.") + (home-page "https://github.com/Sarcasm/flycheck-irony") + (license license:gpl3+))) + (define-public emacs-company-quickhelp (package (name "emacs-company-quickhelp") -- cgit v1.2.3 From 21446c6d05f79099927fb90db875b945d330f00b Mon Sep 17 00:00:00 2001 From: Tim Gesthuizen Date: Tue, 27 Nov 2018 17:57:28 +0100 Subject: gnu: Add emacs-irony-eldoc. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs.scm (emacs-irony-eldoc): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index dc00fb8969..41775241c3 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -2902,6 +2902,27 @@ irony-mode do the syntax checking.") (home-page "https://github.com/Sarcasm/flycheck-irony") (license license:gpl3+))) +(define-public emacs-irony-eldoc + (package + (name "emacs-irony-eldoc") + (version (package-version emacs-irony-mode)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ikirill/irony-eldoc.git") + (commit "0df5831eaae264a25422b061eb2792aadde8b3f2"))) + (sha256 (base32 "1l5qpr66v1l12fb50yh73grb2rr85xxmbj19mm33b5rdrq2bqmmd")) + (file-name (string-append name "-" version)))) + (build-system emacs-build-system) + (inputs + `(("irony-mode" ,emacs-irony-mode))) + (synopsis "Eldoc integration for irony-mode") + (description "Irony-eldoc is an eldoc extension that shows documentation +for the current function or variable in the minibuffer.") + (home-page "https://github.com/ikirill/irony-eldoc") + (license license:gpl3+))) + (define-public emacs-company-quickhelp (package (name "emacs-company-quickhelp") -- cgit v1.2.3 From f6e952803a55100c52a49960d8201e91453f46ff Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 30 Nov 2018 12:12:01 +0100 Subject: gnu: sbcl-cl-webkit: Update repo owner to jmercouris. * gnu/packages/lisp.scm (sbcl-cl-webkit): Update repo owner to jmercouris. --- gnu/packages/lisp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 90b57efe74..5e8b6fdd3d 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -3427,7 +3427,7 @@ is a library for creating graphical user interfaces.") (origin (method git-fetch) (uri (git-reference - (url "https://github.com/atlas-engineer/cl-webkit") + (url "https://github.com/jmercouris/cl-webkit") (commit commit))) (file-name (git-file-name "cl-webkit" version)) (sha256 @@ -3449,7 +3449,7 @@ is a library for creating graphical user interfaces.") (("libwebkit2gtk" all) (string-append (assoc-ref inputs "webkitgtk") "/lib/" all)))))))) - (home-page "https://github.com/atlas-engineer/cl-webkit") + (home-page "https://github.com/jmercouris/cl-webkit") (synopsis "Binding to WebKitGTK+ for Common Lisp") (description "@command{cl-webkit} is a binding to WebKitGTK+ for Common Lisp, -- cgit v1.2.3 From b5944fcbc3c9275ca0ac8498f24b6e7974bd093c Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 30 Nov 2018 18:23:22 +0100 Subject: gnu: uncrustify: Use git reference instead of GitHub archive. * gnu/packages/code.scm (uncrustify): Use git reference instead of GitHub archive. --- gnu/packages/code.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 1e863b0df1..86070acdf0 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -542,13 +542,14 @@ independent targets.") (name "uncrustify") (version "0.68.1") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/uncrustify/uncrustify/archive/" - "uncrustify-" version ".zip")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/uncrustify/uncrustify/") + (commit (string-append name "-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1jb3hmm11m2mgnypapak2lgyyvspnmx9bxd9dxis5swaja2ddxlg")))) + "0gf6vjcfy8pl7idvwsd500ffj9hri62q0n79kpb6cnfprrqpbgf4")))) (build-system cmake-build-system) (native-inputs `(("unzip" ,unzip) -- cgit v1.2.3 From 37b82ccc390396a078351fd9f7b522cca275a8c9 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Sat, 1 Dec 2018 09:36:43 -0600 Subject: handbrake: Update to 1.1.2. * gnu/packages/video.scm (handbrake): Update to 1.1.2. [source]: Use direct download url. Remove upstreamed patch. Patch make fragments in snippet. [inputs]: Use latest ffmpeg. Add jansson and opus. [arguments]: Remove 'disable-contrib phase, which is now in source snippet. Move 'fix-x265-linking phase fix to #:configure-flags. [license]: Use 'gpl2' as clarified in LICENSE. * gnu/packages/patches/handbrake-pkg-config-path.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - .../patches/handbrake-pkg-config-path.patch | 24 ---------- gnu/packages/video.scm | 52 +++++++++++----------- 3 files changed, 25 insertions(+), 52 deletions(-) delete mode 100644 gnu/packages/patches/handbrake-pkg-config-path.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 70968dbb8e..05c49bbbe9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -799,7 +799,6 @@ dist_patch_DATA = \ %D%/packages/patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch \ %D%/packages/patches/gtkglext-disable-disable-deprecated.patch \ %D%/packages/patches/gzdoom-search-in-installed-share.patch \ - %D%/packages/patches/handbrake-pkg-config-path.patch \ %D%/packages/patches/haskell-mode-unused-variables.patch \ %D%/packages/patches/haskell-mode-make-check.patch \ %D%/packages/patches/hdf4-architectures.patch \ diff --git a/gnu/packages/patches/handbrake-pkg-config-path.patch b/gnu/packages/patches/handbrake-pkg-config-path.patch deleted file mode 100644 index 18f3953eaa..0000000000 --- a/gnu/packages/patches/handbrake-pkg-config-path.patch +++ /dev/null @@ -1,24 +0,0 @@ -Do not clobber PKG_CONFIG_PATH during configure. - ---- HandBrake-0.10.5/gtk/module.rules.orig 2016-02-11 14:14:05.000000000 -0600 -+++ HandBrake-0.10.5/gtk/module.rules 2016-10-29 22:27:50.550960848 -0500 -@@ -15,7 +15,7 @@ - set -e; cd $(GTK.src/); NOCONFIGURE=1 ./autogen.sh - set -e; cd $(GTK.build/); $(call fn.ABSOLUTE,$(GTK.src/))configure \ - $(GTK.CONFIGURE.extra) \ -- PKG_CONFIG_PATH=$(BUILD/)contrib/lib/pkgconfig \ -+ PKG_CONFIG_PATH=$(BUILD/)contrib/lib/pkgconfig$(if $(PKG_CONFIG_PATH),:)$(PKG_CONFIG_PATH) \ - CFLAGS="$(call fn.ARGS,GTK.GCC,.g .O *D ?extra)" \ - LDFLAGS="$(call fn.ARGS,GTK.GCC,?strip .g .O ?extra.exe)" \ - --prefix=$(PREFIX) \ ---- Handbrake-0.10.5-0.77d09e9-checkout/make/include/contrib.defs 1969-12-31 18:00:00.000000000 -0600 -+++ Handbrake-0.10.5-0.77d09e9-checkout/make/include/contrib.defs 2016-11-01 13:11:43.826144311 -0500 -@@ -119,7 +119,7 @@ - endif - $(1).CONFIGURE.env.CPPFLAGS = CPPFLAGS="-I$$(call fn.ABSOLUTE,$(CONTRIB.build/))include $$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra *D)" - $(1).CONFIGURE.env.LDFLAGS = LDFLAGS="-L$$(call fn.ABSOLUTE,$(CONTRIB.build/))lib $$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra.exe *D)" -- $(1).CONFIGURE.env.PKG_CONFIG_PATH = PKG_CONFIG_PATH="$$(call fn.ABSOLUTE,$$(CONTRIB.build/))lib/pkgconfig" -+ $(1).CONFIGURE.env.PKG_CONFIG_PATH = PKG_CONFIG_PATH="$$(call fn.ABSOLUTE,$$(CONTRIB.build/))lib/pkgconfig$(if $(PKG_CONFIG_PATH),:)$(PKG_CONFIG_PATH)" - - $(1).CONFIGURE.env.args = !CC !CFLAGS !CXX !CXXFLAGS !CPPFLAGS !LD !LDFLAGS !PKG_CONFIG_PATH !LOCAL_PATH !CROSS - $(1).CONFIGURE.env = $$(call fn.ARGS,$(1).CONFIGURE.env,$$($(1).CONFIGURE.env.args)) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 0dece9f52f..c80e429ff1 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2426,22 +2426,27 @@ supported players in addition to this package.") (define-public handbrake (package (name "handbrake") - (version "0.10.5") + (version "1.1.2") (source (origin (method url-fetch) - (uri (string-append "https://handbrake.fr/rotation.php?file=" - "HandBrake-" version ".tar.bz2")) - (file-name (string-append "handbrake-" version ".tar.bz2")) + (uri (string-append "https://download.handbrake.fr/releases/" + version "/HandBrake-" version "-source.tar.bz2")) (sha256 (base32 - "1w720y3bplkz187wgvy4a4xm0vpppg45mlni55l6yi8v2bfk14pv")) - (patches (search-patches "handbrake-pkg-config-path.patch")) + "0bny0hwlr55g2c69rsamv0xvwmfh1s4a582b9vq20xv5ly84m6ms")) (modules '((guix build utils))) (snippet - ;; Remove bundled libraries and source not necessary for - ;; running under a GNU environment. + ;; Remove "contrib" and source not necessary for + ;; building/running under a GNU environment. '(begin - (for-each delete-file-recursively '("contrib" "macosx" "win")) + (for-each delete-file-recursively + '("contrib" "macosx" "win")) + (substitute* "make/include/main.defs" + ;; Disable unconditional inclusion of "contrib" libraries + ;; (ffmpeg, libvpx, libdvdread, libdvdnav, and libbluray), + ;; which would lead to fetching and building of these + ;; libraries. Use our own instead. + (("MODULES \\+= contrib") "# MODULES += contrib")) #t)))) (build-system glib-or-gtk-build-system) (native-inputs @@ -2455,13 +2460,14 @@ supported players in addition to this package.") (inputs `(("bzip2" ,bzip2) ("dbus-glib" ,dbus-glib) - ("ffmpeg" ,ffmpeg-3.4) ;compilation errors with ffmpeg-4 + ("ffmpeg" ,ffmpeg) ("fontconfig" ,fontconfig) ("freetype" ,freetype) ("glib" ,glib) ("gstreamer" ,gstreamer) ("gst-plugins-base" ,gst-plugins-base) ("gtk+" ,gtk+) + ("jansson" ,jansson) ("lame" ,lame) ("libass" ,libass) ("libbluray" ,libbluray) @@ -2471,6 +2477,7 @@ supported players in addition to this package.") ("libmpeg2" ,libmpeg2) ("libnotify" ,libnotify) ("libogg" ,libogg) + ("libopus" ,opus) ("libsamplerate" ,libsamplerate) ("libtheora" ,libtheora) ("libvorbis" ,libvorbis) @@ -2481,6 +2488,11 @@ supported players in addition to this package.") ("zlib" ,zlib))) (arguments `(#:tests? #f ;tests require Ruby and claim to be unsupported + #:configure-flags + (list (string-append "CPPFLAGS=-I" + (assoc-ref %build-inputs "libxml2") + "/include/libxml2") + "LDFLAGS=-lx265") #:phases (modify-phases %standard-phases (replace 'bootstrap @@ -2492,21 +2504,6 @@ supported players in addition to this package.") (substitute* "gtk/module.rules" ((".*autogen\\.sh.*") "")) (invoke "sh" "./gtk/autogen.sh"))) - (add-before 'configure 'disable-contrib - (lambda _ - (substitute* "make/include/main.defs" - ;; Disable unconditional inclusion of some "contrib" - ;; libraries (ffmpeg, libvpx, libdvdread, libdvdnav, - ;; and libbluray), which would lead to fetching and - ;; building of these libraries. Use our own instead. - (("MODULES \\+= contrib") "# MODULES += contrib")) - #t)) - (add-before 'configure 'fix-x265-linking - (lambda _ - (substitute* "test/module.defs" - ;; Fix missing library during linking error - (("TEST.GCC.l =") "TEST.GCC.l = x265")) - #t)) (replace 'configure (lambda* (#:key outputs configure-flags #:allow-other-keys) ;; 'configure' is not an autoconf-generated script, and @@ -2523,8 +2520,9 @@ supported players in addition to this package.") (description "HandBrake is a tool for converting video from any format to a selection of modern, widely supported codecs.") - ;; Most under GPL version 2 or later, and portions under BSD 3 Clause - (license (list license:gpl2+ license:bsd-3)))) + ;; Some under GPLv2+, some under LGPLv2.1+, and portions under BSD3. + ;; Combination under GPLv2. See LICENSE. + (license license:gpl2))) (define-public openh264 (package -- cgit v1.2.3 From fb0b645658041c3061d2f70dc1a11a100f569217 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 1 Dec 2018 18:48:41 +0200 Subject: gnu: vim-fugitive: Update to 2.5. * gnu/packages/vim.scm (vim-fugitive): Update to 2.5. [arguments]: Also install the autoload and ftdetect folders. --- gnu/packages/vim.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 28d20af023..ecce4e0ae6 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -459,7 +459,7 @@ trouble using them, because you do not have to remember each snippet name.") (define-public vim-fugitive (package (name "vim-fugitive") - (version "2.3") + (version "2.5") (source (origin (method git-fetch) @@ -469,7 +469,7 @@ trouble using them, because you do not have to remember each snippet name.") (file-name (git-file-name name version)) (sha256 (base32 - "17s94a8g5z0lrs7yy4nyqyvp9ykys5ws2ar3m3c0bjsn0iazd7m3")))) + "17yz7gxn7a49jzndr4z5vnk1y4a6c22qss3mwxzmq4m46fni0k8q")))) (build-system gnu-build-system) (arguments '(#:tests? #f @@ -481,9 +481,13 @@ trouble using them, because you do not have to remember each snippet name.") (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (vimfiles (string-append out "/share/vim/vimfiles")) + (autoload (string-append vimfiles "/autoload")) (doc (string-append vimfiles "/doc")) + (ftdetect (string-append vimfiles "/ftdetect")) (plugin (string-append vimfiles "/plugin"))) + (copy-recursively "autoload" autoload) (copy-recursively "doc" doc) + (copy-recursively "ftdetect" ftdetect) (copy-recursively "plugin" plugin) #t)))))) (home-page "https://github.com/tpope/vim-fugitive") -- cgit v1.2.3 From f88c0ab831e2b14632557373349bfc8e67cb5858 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Sat, 1 Dec 2018 11:13:25 -0600 Subject: tuxpaint: Fix .desktop and icon installation. * gnu/packages/games.scm (tuxpaint)[arguments]: 'GNOME_PREFIX' -> 'KDE_PREFIX'. Add 'no-sys-cache phase. --- gnu/packages/games.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 36eaa6c063..7f84e447bb 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3299,12 +3299,18 @@ safety of the Chromium vessel.") "GPERF=gperf" "CC=gcc" "SDL_PCNAME=sdl SDL_image SDL_mixer SDL_ttf" ,(string-append "PREFIX=" %output) - "GNOME_PREFIX=$(PREFIX)" + "KDE_PREFIX=$(PREFIX)/share/applications" + "KDE_ICON_PREFIX=$(PREFIX)/share/icons/" "COMPLETIONDIR=$(PREFIX)/etc/bash_completion.d") #:parallel-build? #f ;fails on some systems #:tests? #f ;No tests #:phases (modify-phases %standard-phases (delete 'configure) ;no configure phase + (add-before 'install 'no-sys-cache + (lambda _ ;do not rebuild system conf cache + (substitute* "Makefile" + (("kbuildsycoca4") "")) + #t)) (add-after 'install 'fix-import (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From 454e7132d6fffb5c9a5ce086ffd1b687416feb83 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 1 Dec 2018 22:41:19 +0200 Subject: gnu: ocaml@4.01: Remove aarch64-linux from supported-systems. * gnu/packages/ocaml.scm (ocaml@4.01)[supported-systems]: New field. --- gnu/packages/ocaml.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 08571eb6a9..c25f7c0858 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -256,7 +256,8 @@ functional, imperative and object-oriented styles of programming.") "make" "all" (string-append - "TOPDIR=" (getcwd) "/..")))))))))))) + "TOPDIR=" (getcwd) "/..")))))))))) + (supported-systems (delete "aarch64-linux" %supported-systems)))) (define-public ocaml-4.07 (package -- cgit v1.2.3 From 7111ea0d588aca0cdd8ddd204919effa2f2d8283 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 1 Dec 2018 23:32:01 +0200 Subject: gnu: debootstrap: Update build. * gnu/packages/debian.scm (debootstrap)[arguments]: Update the substitutes during the custom 'patch-source phase. Add custom 'wrap-executable phase. [inputs]: Remove coreutils, wget. Add tzdata. [propagated-inputs]: Remove binutils, gnupg. Move perl ... [native-inputs]: ... to here. [description]: Add implementation hint. --- gnu/packages/debian.scm | 44 +++++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 17 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index 622c77b01e..d750380fef 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -27,8 +27,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages compression) #:use-module (gnu packages gnupg) - #:use-module (gnu packages perl) - #:use-module (gnu packages wget)) + #:use-module (gnu packages perl)) (define-public debian-archive-keyring (package @@ -137,46 +136,57 @@ contains the archive keys used for that.") (add-after 'unpack 'patch-source (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) - (coreutils (assoc-ref inputs "coreutils")) - (wget (assoc-ref inputs "wget")) + (tzdata (assoc-ref inputs "tzdata")) (debian (assoc-ref inputs "debian-keyring")) (ubuntu (assoc-ref inputs "ubuntu-keyring"))) (substitute* "Makefile" (("/usr") "") (("-o root -g root") "") (("chown root.*") "\n")) - (substitute* "scripts/sid" + (substitute* '("scripts/etch" + "scripts/potato" + "scripts/sarge" + "scripts/sid" + "scripts/woody" + "scripts/woody.buildd") (("/usr") debian)) (substitute* "scripts/gutsy" (("/usr") ubuntu)) (substitute* "debootstrap" - (("chroot ") (string-append coreutils "/bin/chroot ")) (("=/usr") (string-append "=" out))) - (substitute* "functions" - (("wget ") (string-append wget "/bin/wget "))) + (substitute* (find-files "scripts" ".") + (("/usr/share/zoneinfo") (string-append tzdata "/share/zoneinfo"))) #t))) (add-after 'install 'install-man-file (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (install-file "debootstrap.8" (string-append out "/share/man/man8")) + #t))) + (add-after 'install 'wrap-executable + (lambda* (#:key outputs #:allow-other-keys) + (let ((debootstrap (string-append (assoc-ref outputs "out") + "/sbin/debootstrap")) + (path (getenv "PATH"))) + (wrap-program debootstrap + `("PATH" ":" prefix (,path))) #t)))) #:make-flags (list (string-append "DESTDIR=" (assoc-ref %outputs "out"))) #:tests? #f)) ; no tests (inputs - `(("coreutils" ,coreutils) - ("debian-keyring" ,debian-archive-keyring) + `(("debian-keyring" ,debian-archive-keyring) ("ubuntu-keyring" ,ubuntu-keyring) - ("wget" ,wget))) - ;; The following are required for debootstrap to work correctly - (propagated-inputs - `(("binutils" ,binutils) - ("gnupg" ,gnupg) - ("perl" ,perl))) + ("tzdata" ,tzdata))) + (native-inputs + `(("perl" ,perl))) (home-page "https://tracker.debian.org/pkg/debootstrap") (synopsis "Bootstrap a basic Debian system") (description "Debootstrap is used to create a Debian base system from scratch, without requiring the availability of @code{dpkg} or @code{apt}. It does this by downloading .deb files from a mirror site, and carefully -unpacking them into a directory which can eventually be chrooted into.") +unpacking them into a directory which can eventually be chrooted into. + +It is recommended to run @code{debootstrap --foreign --arch=...} and then +@code{chroot} into the directory, set the PATH and run @code{debootstrap +--second-stage} after.") (license license:gpl2))) -- cgit v1.2.3 From a0e813725ee73f3638078fb99c003e7abe92a5be Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 1 Dec 2018 23:34:25 +0200 Subject: gnu: debootstrap: Update to 1.0.111. * gnu/packages/debian.scm (debootstrap): Update to 1.0.111. --- gnu/packages/debian.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index d750380fef..ba19547898 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -117,7 +117,7 @@ contains the archive keys used for that.") (define-public debootstrap (package (name "debootstrap") - (version "1.0.109") + (version "1.0.111") (source (origin (method git-fetch) @@ -127,7 +127,7 @@ contains the archive keys used for that.") (file-name (git-file-name name version)) (sha256 (base32 - "0bjqlyg605lnsjcn3wjplc6jl75nx7c6miyac2qsahi484rylg5g")))) + "1b8s00a2kvaajqhjlms3q2dk3gqv6g4yq9h843jal1pm66zsx19n")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From f5cc5ead58543d9e56647fd1426109154278bf4e Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 1 Dec 2018 22:28:36 +0100 Subject: gnu: Add java-xmlunit-matchers. * gnu/packages/java.scm (java-xmlunit-matchers): New variable. --- gnu/packages/java.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 0c7b9a9855..d5bd11178b 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -9670,6 +9670,37 @@ against expected outcomes.") (native-inputs `(("java-mockito-1" ,java-mockito-1))))) +(define-public java-xmlunit-matchers + (package + (inherit java-xmlunit) + (name "java-xmlunit-matchers") + (arguments + `(#:jar-name "java-xmlunit-matchers.jar" + #:source-dir "xmlunit-matchers/src/main/java" + #:test-dir "xmlunit-matchers/src/test" + #:test-exclude + ;; Cannot open xsd for http://www.xmlunit.org/test-support/Book.xsd + (list "**/ValidationMatcherTest.java") + #:phases + (modify-phases %standard-phases + (add-before 'build 'copy-test-class + (lambda _ + (copy-file "xmlunit-core/src/test/java/org/xmlunit/TestResources.java" + "xmlunit-matchers/src/test/java/org/xmlunit/TestResources.java") + #t)) + (add-before 'build 'fix-test-resources-path + (lambda _ + (substitute* (find-files "xmlunit-matchers/src/test" ".*.java") + (("../test-resources") "test-resources")) + #t)) + (add-before 'check 'copy-test-resources + (lambda* (#:key inputs #:allow-other-keys) + (copy-recursively (assoc-ref inputs "resources") "test-resources") + #t))))) + (inputs + `(("java-xmlunit" ,java-xmlunit) + ("java-junit" ,java-junit))))) + (define-public java-openchart2 (package (name "java-openchart2") -- cgit v1.2.3 From c5928211ede62ca7abf3e913430e22c066d44292 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 1 Dec 2018 22:50:55 +0100 Subject: gnu: maven: Update to 3.6.0. * gnu/packages/maven.scm (maven-artifact): Update to 3.6.0. (maven-model-builder)[native-inputs]: Add java-xmlunit-matchers, remove java-xmlunit-legacy. --- gnu/packages/maven.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 34fbce0e62..9aafb72c19 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -675,13 +675,13 @@ gets and puts artifacts through HTTP(S) using Apache HttpClient-4.x."))) (define-public maven-artifact (package (name "maven-artifact") - (version "3.5.4") + (version "3.6.0") (source (origin (method url-fetch) (uri (string-append "https://archive.apache.org/dist/maven/" "maven-3/" version "/source/" "apache-maven-" version "-src.tar.gz")) - (sha256 (base32 "1xg20g87svzzscbn7m92c2njvrr61va1dija2x2w7m5v4hdizfpk")) + (sha256 (base32 "17jrqfqwn569jgnv8m4pqc27csssb0rf6mznpq61l5bnbd6hl75k")) (modules '((guix build utils))) (snippet '(begin @@ -915,8 +915,8 @@ inheritance, interpolation, @dots{}"))) ("java-asm" ,java-asm) ("sisu-inject" ,java-eclipse-sisu-inject) ("javax-inject" ,java-javax-inject) - ("xmlunit" ,java-xmlunit) - ("xmlunit" ,java-xmlunit-legacy) + ("java-xmlunit" ,java-xmlunit) + ("java-xmlunit-matchers" ,java-xmlunit-matchers) ("xbean" ,java-geronimo-xbean-reflect) ("classworlds" ,java-plexus-classworlds))) (description "Apache Maven is a software project management and comprehension -- cgit v1.2.3 From 0eab9e139b1dae3a97f1b52058548180418a0ef9 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 1 Dec 2018 22:53:41 +0100 Subject: gnu: maven-resolver: Update to 1.3.1. * gnu/packages/maven.scm (maven-resolver-api): Update to 1.3.1. (maven-resolver-impl)[arguments]: Fix sisu file. (maven-connector-basic, maven-transport-wagon)[inputs]: Add java-slf4j-api. --- gnu/packages/maven.scm | 49 ++++++++++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 21 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 9aafb72c19..5379eb9166 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -77,22 +77,26 @@ provides the Maven plugin generating the component metadata."))) (define-public maven-resolver-api (package (name "maven-resolver-api") - (version "1.1.1") + (version "1.3.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/apache/maven-resolver/" "archive/maven-resolver-" version ".tar.gz")) (sha256 (base32 - "0rpvdg3qr1j88gw0ankf0wnwfyq6238mdlm7s39vf5jrcvhdgwcl")))) + "0gfkf8g5zbjh6ciq3dnby9m5irhrbyc7d2jzic9l8xx6hl61q6mm")))) (build-system ant-build-system) (arguments `(#:jar-name "maven-resolver-api.jar" #:source-dir "maven-resolver-api/src/main/java" #:test-dir "maven-resolver-api/src/test")) (native-inputs - `(("java-junit" ,java-junit) - ("java-hamcrest-core" ,java-hamcrest-core))) + `(("java-asm" ,java-asm) + ("java-cglib" ,java-cglib) + ("java-hamcrest-core" ,java-hamcrest-core) + ("java-junit" ,java-junit) + ("java-mockito-1" ,java-mockito-1) + ("java-objenesis" ,java-objenesis))) (home-page "https://github.com/apache/maven-resolver") (synopsis "Maven repository system API") (description "This package contains the API for the maven repository system.") @@ -164,12 +168,14 @@ ease usage of the repository system."))) (mkdir-p "build/classes/META-INF/sisu") (with-output-to-file "build/classes/META-INF/sisu/javax.inject.Named" (lambda _ - (display "org.eclipse.aether.connector.basic.BasicRepositoryConnectorFactory\n")))))))) + (display "org.eclipse.aether.connector.basic.BasicRepositoryConnectorFactory\n"))) + #t))))) (inputs `(("maven-resolver-api" ,maven-resolver-api) ("maven-resolver-spi" ,maven-resolver-spi) ("maven-resolver-util" ,maven-resolver-util) - ("java-javax-inject" ,java-javax-inject))) + ("java-javax-inject" ,java-javax-inject) + ("java-slf4j-api" ,java-slf4j-api))) (native-inputs `(("java-junit" ,java-junit) ("java-hamcrest-core" ,java-hamcrest-core) @@ -198,28 +204,28 @@ for repositories using URI-based layouts."))) (string-append ;; Build this list by looking for files containing "@Named" "org.eclipse.aether.internal.impl.DefaultArtifactResolver\n" - "org.eclipse.aether.internal.impl.DefaultTransporterProvider\n" - "org.eclipse.aether.internal.impl.DefaultUpdatePolicyAnalyzer\n" - "org.eclipse.aether.internal.impl.slf4j.Slf4jLoggerFactory\n" - "org.eclipse.aether.internal.impl.DefaultRepositorySystem\n" - "org.eclipse.aether.internal.impl.LoggerFactoryProvider\n" + "org.eclipse.aether.internal.impl.collect.DefaultDependencyCollector\n" + "org.eclipse.aether.internal.impl.DefaultChecksumPolicyProvider\n" + "org.eclipse.aether.internal.impl.DefaultDeployer\n" "org.eclipse.aether.internal.impl.DefaultFileProcessor\n" + "org.eclipse.aether.internal.impl.DefaultInstaller\n" "org.eclipse.aether.internal.impl.DefaultLocalRepositoryProvider\n" - "org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory\n" - "org.eclipse.aether.internal.impl.DefaultDeployer\n" "org.eclipse.aether.internal.impl.DefaultMetadataResolver\n" - "org.eclipse.aether.internal.impl.DefaultInstaller\n" - "org.eclipse.aether.internal.impl.Maven2RepositoryLayoutFactory\n" - "org.eclipse.aether.internal.impl.DefaultSyncContextFactory\n" "org.eclipse.aether.internal.impl.DefaultOfflineController\n" - "org.eclipse.aether.internal.impl.EnhancedLocalRepositoryManagerFactory\n" - "org.eclipse.aether.internal.impl.DefaultRepositoryLayoutProvider\n" "org.eclipse.aether.internal.impl.DefaultRemoteRepositoryManager\n" - "org.eclipse.aether.internal.impl.DefaultRepositoryEventDispatcher\n" "org.eclipse.aether.internal.impl.DefaultRepositoryConnectorProvider\n" + "org.eclipse.aether.internal.impl.DefaultRepositoryEventDispatcher\n" + "org.eclipse.aether.internal.impl.DefaultRepositoryLayoutProvider\n" + "org.eclipse.aether.internal.impl.DefaultRepositorySystem\n" + "org.eclipse.aether.internal.impl.DefaultSyncContextFactory\n" + "org.eclipse.aether.internal.impl.DefaultTransporterProvider\n" "org.eclipse.aether.internal.impl.DefaultUpdateCheckManager\n" - "org.eclipse.aether.internal.impl.DefaultChecksumPolicyProvider\n" - "org.eclipse.aether.internal.impl.DefaultDependencyCollector\n")))) + "org.eclipse.aether.internal.impl.DefaultUpdatePolicyAnalyzer\n" + "org.eclipse.aether.internal.impl.EnhancedLocalRepositoryManagerFactory\n" + "org.eclipse.aether.internal.impl.LoggerFactoryProvider\n" + "org.eclipse.aether.internal.impl.Maven2RepositoryLayoutFactory\n" + "org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory\n" + "org.eclipse.aether.internal.impl.slf4j.Slf4jLoggerFactory")))) #t))))) (inputs `(("maven-resolver-api" ,maven-resolver-api) @@ -306,6 +312,7 @@ for repositories using URI-based layouts."))) ("java-plexus-component-annotation" ,java-plexus-component-annotations) ("java-plexus-classworld" ,java-plexus-classworlds) ("java-plexus-plexus-util" ,java-plexus-utils) + ("java-slf4j-api" ,java-slf4j-api) ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject) ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus))) (native-inputs -- cgit v1.2.3 From 47f92fbb1062cb19201347324285fa9aea8e443d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 2 Dec 2018 00:07:41 +0100 Subject: gnu: Add rclone (take 2) * gnu/packages/sync.scm (rclone): New variable. --- gnu/packages/sync.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index e0b0af3d96..a50ff2fee0 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ludovic Courtès +;;; Copyright © 2018 Nicolas Goaziou ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,6 +23,7 @@ (define-module (gnu packages sync) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system cmake) + #:use-module (guix build-system go) #:use-module (guix build-system meson) #:use-module (guix download) #:use-module (guix git-download) @@ -32,6 +34,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages curl) #:use-module (gnu packages databases) + #:use-module (gnu packages golang) #:use-module (gnu packages linux) #:use-module (gnu packages lua) #:use-module (gnu packages perl) @@ -243,3 +246,48 @@ over the Internet in an HTTP and CDN friendly way; @item An efficient backup system. @end itemize\n") (license license:lgpl2.1+))) + +(define-public rclone + (package + (name "rclone") + (version "1.45") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ncw/rclone.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "06xg0ibv9pnrnmabh1kblvxx1pk8h5rmkr9mjbymv497sx3zgz26")))) + ;; FIXME: Rclone bundles some libraries Guix already provides. Need to + ;; un-bundle them. + (build-system go-build-system) + (arguments + '(#:import-path "github.com/ncw/rclone" + #:install-source? #f + #:phases + (modify-phases %standard-phases + ;; Fix failure during "check" phase: "mkdir /homeless-shelter: + ;; permission denied". + (add-after 'unpack 'set-home-directory + (lambda _ (setenv "HOME" "/tmp") #t))))) + (synopsis "@code{rsync} for cloud storage") + (description "@code{Rclone} is a command line program to sync files and +directories to and from different cloud storage providers. + +Features include: +@itemize +@item MD5/SHA1 hashes checked at all times for file integrity +@item Timestamps preserved on files +@item Partial syncs supported on a whole file basis +@item Copy mode to just copy new/changed files +@item Sync (one way) mode to make a directory identical +@item Check mode to check for file hash equality +@item Can sync to and from network, e.g., two different cloud accounts +@item Optional encryption (Crypt) +@item Optional cache (Cache) +@item Optional FUSE mount (rclone mount) +@end itemize") + (home-page "https://rclone.org/") + (license license:expat))) -- cgit v1.2.3 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: 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(-) (limited to 'gnu') 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) -- cgit v1.2.3 From e627052f3c9db4010f2ae8d0d1c04fa710b576fe Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 2 Dec 2018 00:23:55 +0100 Subject: gnu: silkaj: Update to 0.6.0. * gnu/packages/finance.scm (silkaj): Update to 0.6.0. [arguments]: Remove #:phases since upstream improved install process. --- gnu/packages/finance.scm | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 28bfb28f49..73662cc388 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -875,7 +875,7 @@ main features are: (define-public silkaj (package (name "silkaj") - (version "0.5.0") + (version "0.6.0") (source (origin (method git-fetch) @@ -885,30 +885,10 @@ main features are: (file-name (git-file-name name version)) (sha256 (base32 - "0xy25lpgz04nxikjvxlnlckrc9xmsxyiz2qm0bsiid8cnbdqcn12")))) + "02n028rz1pshgh7w0af3b291r8lwvhzskm1q98d991gr8rscvad2")))) (build-system python-build-system) (arguments - `(#:tests? #f ;no test - #:phases - (modify-phases %standard-phases - ;; The program is just a bunch of Python files in "src/" directory. - ;; Many phases are useless. However, `python-build-system' correctly - ;; sets PYTHONPATH and patches Python scripts. - (delete 'configure) - (delete 'build) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (share (string-append out "/share/silkaj")) - (executable (string-append share "/silkaj.py")) - (bin (string-append out "/bin"))) - ;; Install data. - (copy-recursively "src" share) - ;; Install executable. - (mkdir-p bin) - (with-directory-excursion bin - (symlink executable "silkaj"))) - #t))))) + `(#:tests? #f)) ;no test (inputs `(("python-commandlines" ,python-commandlines) ("python-ipaddress" ,python-ipaddress) -- cgit v1.2.3 From b6aeae6e980198ec182e9eb0ac953f750e34d7bd Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 2 Dec 2018 00:50:34 +0100 Subject: gnu: python-async-timeout: Update to 3.0.1. * gnu/packages/python.scm (python-async-timeout): Update to 3.0.1. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 3168e0f89d..535593ce3b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -13785,14 +13785,14 @@ generators and Python 3.7's context managers into Python 3.5.") (define-public python-async-timeout (package (name "python-async-timeout") - (version "2.0.1") + (version "3.0.1") (source (origin (method url-fetch) (uri (pypi-uri "async-timeout" version)) (sha256 (base32 - "1l3kg062m02mph6rf9rdv8r5c5n356clxa6b6mrn0i77vk9g9kq0")))) + "0pscbyr840m7fyfc3r8zv9kgkwdcn9f78p7zsrczciwd09m82g0c")))) (build-system python-build-system) (home-page "https://github.com/aio-libs/async_timeout/") (synopsis "Timeout context manager for asyncio programs") -- cgit v1.2.3 From 62c2cef05c9758e09411d6787cf135ee85d303d9 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 2 Dec 2018 00:57:37 +0100 Subject: gnu: python-aiohttp: Update to 3.4.4. * gnu/packages/python-web.scm (python-aiohttp): Update to 3.4.4. [native-inputs] Remove test-related inputs since tests are not run. --- gnu/packages/python-web.scm | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 55b8942ac9..ecd141efca 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -68,22 +68,17 @@ (define-public python-aiohttp (package (name "python-aiohttp") - (version "3.1.3") + (version "3.4.4") (source (origin (method url-fetch) (uri (pypi-uri "aiohttp" version)) (sha256 (base32 - "1b888lggmyf2d08rfayq9khszzc0pav1z70ssc0b4d9kkr4g1klz")))) + "1ykm6kdjkrg556j0zd7dx2l1rsrbh0d9g27ivr6dmaahz9pyrbsi")))) (build-system python-build-system) (arguments - `(#:tests? #f)) ;FIXME: 2 errors, 2084 passed - (native-inputs - `(("python-async-generator" ,python-async-generator) - ("python-pytest" ,python-pytest) - ("python-pytest-capturelog" ,python-pytest-capturelog) - ("python-pytest-mock" ,python-pytest-mock))) + `(#:tests? #f)) ;missing pytest-timeout (propagated-inputs `(("python-aiodns" ,python-aiodns) ("python-async-timeout" ,python-async-timeout) -- cgit v1.2.3 From 5d7c66a5197b77eefb4c1d4c5d672e81d5a9ea4e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 2 Dec 2018 01:03:56 +0100 Subject: gnu: Add python-attr. * gnu/packages/python.scm (python-attr): New variable. --- gnu/packages/python.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 535593ce3b..cab0112f44 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -14636,3 +14636,21 @@ RFC 8265 and RFC 8266.") @url{https://www.wikidata.org/, Wikidata}.") (properties '((upstream-name . "Wikidata"))) (license license:gpl3+))) + +(define-public python-attr + (package + (name "python-attr") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "attr" version)) + (sha256 + (base32 + "0pbpskvxp5hzdvcaf766ljwpckshir8sf7z6jqji6zyib20594ch")))) + (build-system python-build-system) + (home-page "https://github.com/denis-ryzhkov/attr") + (synopsis "Decorator for attributes of target function or class") + (description "Simple decorator to set attributes of target function or +class in a @acronym{DRY, Don't Repeat Yourself} way.") + (license license:expat))) -- cgit v1.2.3 From 1427d888e0ddfb04991d704daae2d09519b849af Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 2 Dec 2018 01:11:49 +0100 Subject: gnu: python-duniterpy: Update to 0.50.0. * gnu/packages/finance.scm (python-duniterpy): Update to 0.50.0. [arguments]: Drop tests, which are failing. [propagated-inputs]: Add python-attr. --- gnu/packages/finance.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 73662cc388..40df25ef40 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -840,7 +840,7 @@ Luhn and family of ISO/IEC 7064 check digit algorithms. ") (define-public python-duniterpy (package (name "python-duniterpy") - (version "0.43.7") + (version "0.50.0") (source (origin (method git-fetch) @@ -851,10 +851,14 @@ Luhn and family of ISO/IEC 7064 check digit algorithms. ") (file-name (git-file-name name version)) (sha256 (base32 - "19m36z98361bqxjdb65597j2kxbly491927c6p9z47s1vxc3raaq")))) + "0f24ihglmzphy30pgc49w0rxmsjc76mgcggg078cfsz7xrrk13gf")))) (build-system python-build-system) + (arguments + ;; Tests fail with "AttributeError: module 'attr' has no attribute 's'". + `(#:tests? #f)) (propagated-inputs `(("python-aiohttp" ,python-aiohttp) + ("python-attr" ,python-attr) ("python-base58" ,python-base58) ("python-jsonschema" ,python-jsonschema) ("python-libnacl" ,python-libnacl) -- cgit v1.2.3 From 2b16ae4b025a4d0f048972700b8ba06bf040f8d8 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sun, 2 Dec 2018 11:42:21 +0530 Subject: gnu: emacs-howm: Add make-autoloads phase after install phase. * gnu/packages/emacs.scm (emacs-howm)[arguments]: Add make-autoloads phase after install phase, not after the non-existent rename-lispdir phase. --- gnu/packages/emacs.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 41775241c3..297fb3330a 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1361,7 +1361,7 @@ a set of simplified face specifications and a user-supplied color palette") (guix build emacs-utils)) #:phases (modify-phases %standard-phases - (add-after 'rename-lispdir 'make-autoloads + (add-after 'install 'make-autoloads (assoc-ref emacs:%standard-phases 'make-autoloads))))) (home-page "http://howm.osdn.jp/") (synopsis "Note-taking tool for Emacs") -- cgit v1.2.3 From ae2b11815a74fa0e3fd584fba0d975cc9a0069d3 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sun, 2 Dec 2018 12:14:38 +0530 Subject: gnu: emacs-calfw: Update to 1.6. * gnu/packages/emacs.scm (emacs-calfw): Update to 1.6. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 297fb3330a..d9d401d7c9 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1373,7 +1373,7 @@ searches. Unlike code@{emacs-wiki.el}, it can be combined with any format.") (define-public emacs-calfw (package (name "emacs-calfw") - (version "1.5") + (version "1.6") (source (origin (method url-fetch) @@ -1383,7 +1383,7 @@ searches. Unlike code@{emacs-wiki.el}, it can be combined with any format.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "17ssg8gx66yp63nhygjq2r6kgl4h45cacmrxsxs9f0lrfcx37k0l")))) + "1zr91xr0f1xfcv78yxka8vs5ximmq2ixmqf2pkb57kwwnxlypq4i")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-howm" ,emacs-howm))) -- cgit v1.2.3 From d63380aeef719cf96390ffb7675b883f121b4bea Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 2 Dec 2018 02:10:08 -0500 Subject: gnu: linux-libre@4.4: Update to 4.4.166. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.166. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 28e2c7388f..e01956be49 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -445,8 +445,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.165" - "1adpj8hbly5z3j7mlnydnm2kx2isi3194n1hszzwxki8gj0xnqk4" + (make-linux-libre "4.4.166" + "1pb6hk141hzf6yf2423h0jfv9bjq09cynsp1xbm12mxayn637xmm" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From b2d1c75801f452b4df87dde4a60aab10b69d3d42 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 2 Dec 2018 02:10:48 -0500 Subject: gnu: linux-libre@4.9: Update to 4.9.142. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.142. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e01956be49..01d27c9405 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -439,8 +439,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.141" - "1cjyni2wf1m9l8nvfl4gcswxlk9rwhpr0q3lvhnlg20761kvixp4" + (make-linux-libre "4.9.142" + "0a7c41m41p83byn68cfixq460sy73ahwcx9y3xm6cv05grqza8zh" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From 2e34023f5e79dcf0c16d2f16d36f6fbda893667b Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 2 Dec 2018 02:11:22 -0500 Subject: gnu: linux-libre@4.14: Update to 4.14.85. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.85. (%linux-libre-4.14-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 01d27c9405..022d331a77 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -429,8 +429,8 @@ It has been modified to remove all non-free binary blobs.") #:patches %linux-libre-4.19-patches #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.84") -(define %linux-libre-4.14-hash "0mdf436bxlrsv0jbnzwd5bblpavv9vk5qx7h2x55jp0iy9pvp3n2") +(define %linux-libre-4.14-version "4.14.85") +(define %linux-libre-4.14-hash "1jh11y6jakkp3xlq9jbf2myfjzbccjx1iyhd6ny7r9cjkv6r5i5i") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.2.3 From ce31ae397b7d5f8c686e30821d5d2105d32b4986 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 2 Dec 2018 02:12:10 -0500 Subject: gnu: linux-libre: Update to 4.19.6. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.19.6. (%linux-libre-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 022d331a77..b9f2963c12 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -406,8 +406,8 @@ It has been modified to remove all non-free binary blobs.") ;; supports qemu "virt" machine and possibly a large number of ARM boards. ;; See : https://wiki.debian.org/DebianKernel/ARMMP. -(define %linux-libre-version "4.19.5") -(define %linux-libre-hash "1ailss05c3p9aw2ysv75kj9j7qk04rc0cn9y9dk6fmjhnbnw9abm") +(define %linux-libre-version "4.19.6") +(define %linux-libre-hash "1ybi878li06algbv2pdwn81jlh038pfvzz3axn1bzic9p4c9rjhf") (define %linux-libre-4.19-patches (list %boot-logo-patch -- cgit v1.2.3 From b7ed32107b5853904c9b37761b786e70b5c3c081 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 2 Dec 2018 09:47:16 +0100 Subject: gnu: python-pip: Update to 18.1. * gnu/packages/python.scm (python-pip): Update to 18.1. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index cab0112f44..302eb89cf9 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6680,14 +6680,14 @@ responses, rather than doing any computation.") (define-public python-pip (package (name "python-pip") - (version "9.0.1") + (version "18.1") (source (origin (method url-fetch) (uri (pypi-uri "pip" version)) (sha256 (base32 - "03clr9c1dih5n9c00c592zzvf6r1ffimywkaq9agcqdllzhl7wh9")))) + "188fclay154s520n43s7cxxlhdaiysvxf19zk8vr1xbyjyyr58n0")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; there are no tests in the pypi archive. -- cgit v1.2.3 From f764868d374254473d0ffd3b104e560ea91a020e Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sun, 2 Dec 2018 16:20:37 +0530 Subject: gnu: ansible: Update to 2.7.4. * gnu/packages/admin.scm (ansible): Update to 2.7.4. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 94bf6900ce..aeea93f378 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1595,14 +1595,14 @@ of supported upstream metrics systems simultaneously.") (define-public ansible (package (name "ansible") - (version "2.5.7") + (version "2.7.4") (source (origin (method url-fetch) (uri (pypi-uri "ansible" version)) (sha256 (base32 - "0wbsjjx3xjlm8g50a9j9c6p9rn23jx32yn1234bf5rmj1qgy3p85")) + "0p1n6yyc632522fl2r247p0jg4mncc7z4hqngzbh1zxq3dcb12s9")) (patches (search-patches "ansible-wrap-program-hack.patch")))) (build-system python-build-system) (native-inputs -- cgit v1.2.3 From c661f25a944133dbdadcd185fd7cd4762419d254 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 2 Dec 2018 13:04:37 +0200 Subject: gnu: ocaml@4.01: Enable building on aarch64-linux. This reverts 454e7132d6fffb5c9a5ce086ffd1b687416feb83. * gnu/packages/ocaml.scm (ocaml@4.01)[supported-systems]: Remove field. [arguments]: When building on aarch64-linux, replace the custom 'configure script. --- gnu/packages/ocaml.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c25f7c0858..11389440dc 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -249,6 +249,17 @@ functional, imperative and object-oriented styles of programming.") (lambda _ ;; Specifying '-j' at all causes the build to fail. (zero? (system* "make" "world.opt")))) + ,@(if (string=? "aarch64-linux" (%current-system)) + ;; Custom configure script doesn't recongnize aarch64. + '((replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (mandir (string-append out "/share/man"))) + (invoke "./configure" + "--prefix" out + "--mandir" mandir + "-host" "armv8l-unknown-linux-gnu"))))) + '()) (replace 'check (lambda _ (with-directory-excursion "testsuite" @@ -256,8 +267,7 @@ functional, imperative and object-oriented styles of programming.") "make" "all" (string-append - "TOPDIR=" (getcwd) "/..")))))))))) - (supported-systems (delete "aarch64-linux" %supported-systems)))) + "TOPDIR=" (getcwd) "/..")))))))))))) (define-public ocaml-4.07 (package -- cgit v1.2.3 From 18974c1eaa7258cc03206f19b77a6c666ac27d96 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 1 Dec 2018 00:35:16 +0100 Subject: gnu: Add next-gtk-webkit. * gnu/packages/web-browsers.scm (next-gtk-webkit): New variable. --- gnu/packages/web-browsers.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index f63f269ae0..2cc7b90123 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Rutger Helling ;;; Copyright © 2018 Timo Eisenmann +;;; Copyright © 2018 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; @@ -359,3 +360,44 @@ the webkit web browser engine and the GTK toolkit. Vimb is modal like the great vim editor and also easily configurable during runtime. Vimb is mostly keyboard driven and does not detract you from your daily work.") (license license:gpl3+))) + +(define-public next-gtk-webkit + (let ((commit "b8899341bbdefd0a33412608fbb0b1f92f818c65")) + (package + (name "next-gtk-webkit") + (version (git-version "1.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://source.atlas.engineer/public/next") + (commit commit))) + (sha256 + (base32 + "12jmf1b9qr85il9h15mb9vpsfh1wzcln9x9xpn4lps0kkccnpkz9")) + (file-name (git-file-name "next" version)))) + (build-system glib-or-gtk-build-system) + (arguments + `(#:tests? #f ; no tests + #:make-flags (list "gtk-webkit" + "CC=gcc" + (string-append "PREFIX=" %output)) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'install + (lambda* (#:key (make-flags '()) #:allow-other-keys) + (apply invoke "make" "install-gtk-webkit" make-flags)))))) + (inputs + `(("glib-networking" ,glib-networking) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("webkitgtk" ,webkitgtk))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "https://next.atlas.engineer") + (synopsis "Infinitely extensible web-browser (user interface only)") + (description "Next is a keyboard-oriented, extensible web-browser +inspired by Emacs and designed for power users. The application has familiar +key-bindings, is fully configurable and extensible in Lisp, and has powerful +features for productive professionals.") + (license license:bsd-3)))) -- cgit v1.2.3 From acad932e63f357ea88edd393ac9dd670bfd0768c Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 1 Dec 2018 00:35:36 +0100 Subject: gnu: Add sbcl-next. * gnu/packages/web-browsers.scm (sbcl-next): New variable. --- gnu/packages/web-browsers.scm | 69 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 68 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 2cc7b90123..578cfca560 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -37,6 +37,7 @@ #:use-module (gnu packages gnupg) #:use-module (gnu packages libevent) #:use-module (gnu packages libidn) + #:use-module (gnu packages lisp) #:use-module (gnu packages lua) #:use-module (gnu packages gnome) #:use-module (gnu packages ncurses) @@ -53,7 +54,8 @@ #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) - #:use-module (guix build-system python)) + #:use-module (guix build-system python) + #:use-module (guix build-system asdf)) (define-public dillo (package @@ -401,3 +403,68 @@ inspired by Emacs and designed for power users. The application has familiar key-bindings, is fully configurable and extensible in Lisp, and has powerful features for productive professionals.") (license license:bsd-3)))) + +(define-public sbcl-next + (package + (inherit next-gtk-webkit) + (name "sbcl-next") + (build-system asdf-build-system/sbcl) + (outputs '("out" "lib")) + (arguments + `(#:tests? #f ; no tests + #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-platform-port-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "source/ports/gtk-webkit.lisp" + (("\"next-gtk-webkit\"") + (string-append "\"" (assoc-ref inputs "next-gtk-webkit") + "/bin/next-gtk-webkit\""))))) + (add-before 'cleanup 'move-bundle + (lambda* (#:key outputs #:allow-other-keys) + (define lib (assoc-ref outputs "lib")) + (define actual-fasl (string-append + lib + "/lib/sbcl/next.fasl")) + (define expected-fasl (string-append + lib + "/lib/sbcl/next--system.fasl")) + (pk actual-fasl) + (pk expected-fasl) + (copy-file actual-fasl expected-fasl) + #t)) + (add-after 'create-symlinks 'build-program + (lambda* (#:key outputs #:allow-other-keys) + (build-program + (string-append (assoc-ref outputs "out") "/bin/next") + outputs + #:entry-program '((next:start-with-port) 0)))) + (add-before 'build 'install-assets + ;; Since the ASDF build system generates a new .asd with a + ;; possibly suffixed and thus illegal version number, assets + ;; should not be installed after the 'build phase or else + ;; the illegal version will result in NIL in the .desktop + ;; file. + (lambda* (#:key outputs #:allow-other-keys) + (invoke "make" "install-assets" + (string-append "PREFIX=" + (assoc-ref outputs "out")))))))) + (inputs + `(("next-gtk-webkit" ,next-gtk-webkit) + ;; Lisp libraries: + ("trivial-features" ,sbcl-trivial-features) + ("alexandria" ,sbcl-alexandria) + ("cl-strings" ,sbcl-cl-strings) + ("cl-string-match" ,sbcl-cl-string-match) + ("puri" ,sbcl-puri) + ("queues.simple-queue" ,sbcl-queues.simple-queue) + ("sqlite" ,sbcl-cl-sqlite) + ("parenscript" ,sbcl-parenscript) + ("cl-json" ,sbcl-cl-json) + ("swank" ,sbcl-slime-swank) + ("cl-markup" ,sbcl-cl-markup) + ("cl-css" ,sbcl-cl-css) + ("usocket" ,sbcl-usocket) + ("bordeaux-threads" ,sbcl-bordeaux-threads) + ("s-xml-rpc" ,sbcl-s-xml-rpc) + ("unix-opts" ,sbcl-unix-opts))) + (synopsis "Infinitely extensible web-browser (with Lisp development files)"))) -- cgit v1.2.3 From 8cddb0d6363d13f74de5409ef29b7913228f49b9 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sun, 2 Dec 2018 14:13:48 +0100 Subject: 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(-) (limited to 'gnu') 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" -- cgit v1.2.3 From 8757209ec56bcc8d0d57c6608673cb26c2fce805 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 2 Dec 2018 20:53:05 +0100 Subject: gnu: emacs-mu4e-conversation: Update to 20181126. * gnu/packages/emacs.scm (emacs-mu4e-conversation): Update to 20181126. --- gnu/packages/emacs.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index d9d401d7c9..9508636ec5 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -11918,10 +11918,10 @@ file.") (deprecated-package "emacs-wgrep-helm" emacs-wgrep)) (define-public emacs-mu4e-conversation - (let ((commit "54368a009474276247bdf39683e25ea68ae1f943")) + (let ((commit "e7d4bfcb0d392b0aed1f705ccac2419a168d1f5e")) (package (name "emacs-mu4e-conversation") - (version (git-version "20181105" "3" commit)) + (version (git-version "20181126" "4" commit)) (source (origin (method url-fetch) @@ -11932,7 +11932,7 @@ file.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1zqnp1d3cxyvzsd76d5iw40lkif19k9svlbhqy6dvqiaqm0jbd15")))) + "0b52hf9rm2afba9pvgink9bwqm705sk0y5qikp0ff5sk53wqvy29")))) (build-system emacs-build-system) (propagated-inputs `(("mu" ,mu))) -- cgit v1.2.3 From 3855506f8470f6d105fd70759b5c1a6dc53ede68 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Thu, 29 Nov 2018 18:24:51 -0500 Subject: gnu: Add git-imerge. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/version-control.scm (git-imerge): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/version-control.scm | 48 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index cec3e5fc6c..d068c30735 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2014, 2015, 2016 Mark H Weaver ;;; Copyright © 2014, 2016 Eric Bavier ;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner -;;; Copyright © 2015 Kyle Meyer +;;; Copyright © 2015, 2018 Kyle Meyer ;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2016, 2017, 2018 Nils Gillmann @@ -2395,3 +2395,49 @@ used to keep a folder in sync between computers.") given commit into the specified ref(s). It has various options that control how information about the merge is displayed.") (license license:gpl2+)))) + +(define-public git-imerge + (package + (name "git-imerge") + (version "1.1.0") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/mhagger/git-imerge/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0a6ay8fpgz3yd84jc40w41x0rcfpan6bcq4wd1hxiiqwb51jysb2")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; The are only manual test scripts. + #:make-flags (list (string-append "DESTDIR=" %output) + "PREFIX=") + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-before 'install 'patch-git + (lambda* (#:key inputs #:allow-other-keys) + (let ((git (string-append (assoc-ref inputs "git") + "/bin/git"))) + (substitute* "git-imerge" + (("'git'") (string-append "'" git "'"))) + #t))) + (add-after 'install 'wrap-script + (lambda* (#:key outputs #:allow-other-keys) + (wrap-program (string-append (assoc-ref outputs "out") + "/bin/git-imerge") + `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH")))) + #t))))) + (inputs + `(("git" ,git) + ("python" ,python-wrapper))) + (home-page "https://github.com/mhagger/git-imerge") + (synopsis "Incremental merge for Git") + (description "This Git extension defines a subcommand, @code{imerge}, +which performs an incremental merge between two branches. Its two primary +design goals are to reduce the pain of resolving merge conflicts by finding +the smallest possible conflicts and to allow a merge to be saved, tested, +interrupted, published, and collaborated on while in progress.") + (license license:gpl2+))) -- cgit v1.2.3 From 6837deb749cc5a27141bdb3ae778d7500d448e03 Mon Sep 17 00:00:00 2001 From: Mathieu Lirzin Date: Sun, 2 Dec 2018 20:11:42 +0100 Subject: gnu: emacs-google-translate: Update to 0.11.16. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs.scm (emacs-google-translate): Update to 0.11.16. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 9508636ec5..3675c627b0 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -11557,7 +11557,7 @@ the GIF result.") (define-public emacs-google-translate (package (name "emacs-google-translate") - (version "0.11.15") + (version "0.11.16") (source (origin (method url-fetch) @@ -11566,7 +11566,7 @@ the GIF result.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1zxvfagbaf5mxi528mz33c8vxdk86wj0xx5y2jfy97wi8dzrwn3g")))) + "01n9spj1d0gjfj39x526rl3m9c28wnx9afipmf5s8y77cx3mfwhl")))) (build-system emacs-build-system) (home-page "https://github.com/atykhonov/google-translate") (synopsis "Emacs interface to Google Translate") -- cgit v1.2.3 From a7bed894d2dca20071a4738e4fd604bd8b7cf1a3 Mon Sep 17 00:00:00 2001 From: Mathieu Lirzin Date: Sun, 2 Dec 2018 21:09:58 +0100 Subject: gnu: emacs-js2-mode: Update to 20180301. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs.scm (emacs-js2-mode): Update to 20180301. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 3675c627b0..bcd4eafa53 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -4440,7 +4440,7 @@ to all the other commands, too.") (define-public emacs-js2-mode (package (name "emacs-js2-mode") - (version "20150909") + (version "20180301") (source (origin (method url-fetch) (uri (string-append "https://github.com/mooz/js2-mode/archive/" @@ -4448,7 +4448,7 @@ to all the other commands, too.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1nsm36c4kwb473p13i58fgrnlk8fbn3rdhj47d9xz70az4ra44q0")))) + "13aghgwaqrmbf3pbifcry52kya454wnh1gbdh5805n1n6xgjm5w3")))) (build-system emacs-build-system) (home-page "https://github.com/mooz/js2-mode/") (synopsis "Improved JavaScript editing mode for Emacs") -- cgit v1.2.3 From 6776af04d4b65c5a9a07784307a6abe395b6f480 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Sat, 1 Dec 2018 20:46:22 -0600 Subject: Make Guile-JSON a required dependency. * README (Requirements): Remove "optional" verbiage. * doc/guix.texi (Requirements): Move Guile-JSON from optional to required. * configure.ac (HAVE_GUILE_JSON): Remove Automake conditional. (have_guile_json): Error if not "yes". * Makefile.am (MODULE, SCM_TESTS)[HAVE_GUILE_JSON]: Add modules and tests unconditionally. * gnu/packages/package-mangement.scm (guix-minimal)[propagated-inputs]: Leave guile-json input. --- gnu/packages/package-management.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 141d0e52f7..c4e9171022 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -389,7 +389,7 @@ the Nix package manager.") (propagated-inputs (fold alist-delete (package-propagated-inputs guix) - '("guile-json" "guile-ssh"))))))) + '("guile-ssh"))))))) (define (source-file? file stat) "Return true if FILE is likely a source file, false if it is a typical -- cgit v1.2.3 From 6efccabe4e2e3ea1bd14cd0e81bdb83d5f6baaea Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Sun, 2 Dec 2018 17:53:14 -0600 Subject: guile-json: Download source from savannah. * gnu/packages/guile.scm (guile-json)[source]: Download tarball from savannah. Remove 'file-name' field. [native-inputs]: Remove autoconf and automake; tarball is bootstrapped. --- gnu/packages/guile.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 41f2b16e0a..7fcb4a400c 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -929,16 +929,13 @@ for Guile\".") (home-page "https://github.com/aconchillo/guile-json") (source (origin (method url-fetch) - (uri (string-append home-page "/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (uri (string-append "https://download.savannah.nongnu.org/releases/" + name "/" name "-" version ".tar.gz")) (sha256 (base32 - "02kqv0q98fmchn7i4y7ycmrjlh4b2c93ij0z7k036qwpp204w4gh")))) + "15gnb84d7hpazqhskkf3g9z4r6knw54wfj4ch5270kakz1lp70c9")))) (build-system gnu-build-system) - (native-inputs `(("autoconf" ,autoconf) - ("automake" ,automake) - ("pkg-config" ,pkg-config) + (native-inputs `(("pkg-config" ,pkg-config) ("guile" ,guile-2.2))) (inputs `(("guile" ,guile-2.2))) (synopsis "JSON module for Guile") -- cgit v1.2.3 From a03894416e6d2b4b017129d280c4ce83409c622d Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 3 Dec 2018 11:19:20 +0100 Subject: gnu: emacs-helm-company: Update to 0.2.3. * gnu/packages/emacs.scm (emacs-helm-company): Update to 0.2.3. --- gnu/packages/emacs.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index a845c312d6..69392e19d8 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -11578,10 +11578,10 @@ on-line service.") (license license:gpl3+))) (define-public emacs-helm-company - (let ((commit "acc9c7901e094c1591327a0db1ec7a439f67a84d")) + (let ((commit "d3fc093a0e833b4dee6561c00d6df3d62aa50f3f")) (package (name "emacs-helm-company") - (version (git-version "0.2.2" "1" commit)) + (version (git-version "0.2.3" "1" commit)) (source (origin (method git-fetch) @@ -11591,7 +11591,7 @@ on-line service.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1d4q9clp0q56br80c21a4wz1gc4jw3mdy97z9mq07x9i8rhlppzs")))) + "1ciirsanhajdqm5iwl8k9ywf4jha1wdv4sc4d9kslyrfr9zn4q6k")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-helm" ,emacs-helm) -- cgit v1.2.3 From b9914c479445a85b2caf284c50f8a242f0f8f0bd Mon Sep 17 00:00:00 2001 From: Laura Lazzati Date: Sun, 2 Dec 2018 21:48:19 -0300 Subject: doc: Fix "desktop" OS config example. * gnu/system/examples/desktop.tmpl (file-systems): Add 'file-system-label' call in 'device' field. Signed-off-by: Danny Milosavljevic --- gnu/system/examples/desktop.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/system/examples/desktop.tmpl b/gnu/system/examples/desktop.tmpl index ea21e1df66..1b8d46afaf 100644 --- a/gnu/system/examples/desktop.tmpl +++ b/gnu/system/examples/desktop.tmpl @@ -26,7 +26,7 @@ (type luks-device-mapping)))) (file-systems (cons (file-system - (device "my-root") + (device (file-system-label "my-root")) (mount-point "/") (type "ext4") (dependencies mapped-devices)) -- cgit v1.2.3 From 0e02e8193686bce4099da37ede0b1ff3055f2264 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 2 Dec 2018 18:08:42 +0100 Subject: gnu: python-geventhttpclient: Fix test failure. * gnu/packages/python-web.scm (python-geventhttpclient)[arguments]: Add "--import-mode=append" to pytest invokation. --- gnu/packages/python-web.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index f05047bb9c..a5b4b7578d 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1765,7 +1765,10 @@ library.") (add-after 'install 'check (lambda* (#:key inputs outputs #:allow-other-keys) (add-installed-pythonpath inputs outputs) - (invoke "py.test" "src/geventhttpclient/tests" "-v") + (invoke "py.test" "src/geventhttpclient/tests" "-v" + ;; Append the test modules to sys.path to avoid + ;; namespace conflict which breaks SSL tests. + "--import-mode=append") #t))))) (native-inputs `(("python-pytest" ,python-pytest))) -- cgit v1.2.3 From aefcdea1992bbcc6c0ec1107118d08d72af38021 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 2 Dec 2018 18:09:48 +0100 Subject: gnu: python-greenlet: Update to 0.4.15. * gnu/packages/python.scm (python-greenlet): Update to 0.4.15. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c951d6a78b..b0edaf906f 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -9080,13 +9080,13 @@ multiple processes (imagine multiprocessing, billiard, futures, celery etc). (define-public python-greenlet (package (name "python-greenlet") - (version "0.4.14") + (version "0.4.15") (source (origin (method url-fetch) (uri (pypi-uri "greenlet" version)) (sha256 (base32 - "1bsij3bwdhz2chq4ar2v6jqbh69yc7k9ymh41jd8vrdd2n52dk7i")))) + "1g4g1wwc472ds89zmqlpyan3fbnzpa8qm48z3z1y6mlk44z485ll")))) (build-system python-build-system) (home-page "https://greenlet.readthedocs.io/") (synopsis "Lightweight in-process concurrent programming") -- cgit v1.2.3 From 8aaec042d4a7cff68c219443517b55b1d9f0ee9c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 2 Dec 2018 18:33:57 +0100 Subject: gnu: kicad: Fix build with Boost >= 1.68. * gnu/packages/engineering.scm (kicad)[arguments]: Add phase 'adjust-boost-include'. --- gnu/packages/engineering.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 0080356494..8ef9a5c277 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -717,6 +717,13 @@ language.") "-DBUILD_GITHUB_PLUGIN=OFF") #:phases (modify-phases %standard-phases + (add-after 'unpack 'adjust-boost-include + (lambda _ + ;; The location of this header changed in Boost 1.66. + (substitute* "3d-viewer/3d_cache/3d_cache.cpp" + (("boost/uuid/sha1\\.hpp") + "boost/uuid/detail/sha1.hpp")) + #t)) (add-after 'install 'wrap-program ;; Ensure correct Python at runtime. (lambda* (#:key inputs outputs #:allow-other-keys) -- cgit v1.2.3 From 36c90dda38b5324530dc2d09b66569ed6f8541a3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 2 Dec 2018 20:13:39 +0100 Subject: gnu: Add python-pywavelets. * gnu/packages/python.scm (python-pywavelets, python2-pywavelets): New public variables. --- gnu/packages/python.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b0edaf906f..570cfb65e2 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4170,6 +4170,49 @@ a front-end for C compilers or analysis tools.") (define-public python2-pycparser (package-with-python2 python-pycparser)) +(define-public python-pywavelets + (package + (name "python-pywavelets") + (version "1.0.1") + (home-page "https://github.com/PyWavelets/pywt") + (source (origin + (method url-fetch) + (uri (pypi-uri "PyWavelets" version)) + (sha256 + (base32 + "1p3qv2v66ghnqrb1f98wyyhp9dz71jwcd6kfpsax65sfdpiyqp1w")))) + (build-system python-build-system) + (arguments + '(#:modules ((ice-9 ftw) + (srfi srfi-1) + (srfi srfi-26) + (guix build utils) + (guix build python-build-system)) + #:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + (let ((cwd (getcwd)) + (libdir (find (cut string-prefix? "lib." <>) + (scandir "build")))) + (with-directory-excursion (string-append cwd "/build/" libdir) + (invoke "nosetests" "-v" ".")))))))) + (native-inputs + `(("python-matplotlib" ,python-matplotlib) ;for tests + ("python-nose" ,python-nose))) + (propagated-inputs + `(("python-numpy" ,python-numpy))) + (synopsis "Wavelet transforms in Python") + (description + "PyWavelets is a library for wavelet transforms in Python. Wavelets are +mathematical basis functions that are localized in both time and frequency. +Wavelet transforms are time-frequency transforms employing wavelets. They are +similar to Fourier transforms, the difference being that Fourier transforms are +localized only in frequency instead of in time and frequency.") + (license license:expat))) + +(define-public python2-pywavelets + (package-with-python2 python-pywavelets)) + (define-public python-xcffib (package (name "python-xcffib") -- cgit v1.2.3 From 03bfbe2f10a37ac5147e46247c975c46268c9545 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 3 Dec 2018 13:44:19 +0100 Subject: gnu: python-cloudpickle: Update to 0.6.1. * gnu/packages/python.scm (python-cloudpickle): Update to 0.6.1. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 570cfb65e2..075741004d 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -14567,14 +14567,14 @@ pure-Python.") (define-public python-cloudpickle (package (name "python-cloudpickle") - (version "0.5.5") + (version "0.6.1") (source (origin (method url-fetch) (uri (pypi-uri "cloudpickle" version)) (sha256 (base32 - "0gdg5n025v4wqmdg65rm0n6fvp6731ip30ji0rmn2kqsyr4bb93f")))) + "1wdw89mlm7fqa3fm3ymskx05jrys66n8m1z1a8s0mss0799ahsgi")))) (build-system python-build-system) ;; FIXME: there are 5 errors in 122 tests: ;; ERROR: test_function_pickle_compat_0_4_0 (tests.cloudpickle_test.CloudPickleTest) -- cgit v1.2.3 From 947ee67d4bdce73fa726b72710b5b27307faf364 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 3 Dec 2018 13:46:01 +0100 Subject: gnu: python-dask: Update to 1.0.0. * gnu/packages/python.scm (python-dask): Update to 1.0.0. [arguments]: Disable one test for Python2, and override 'check' phase. --- gnu/packages/python.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 075741004d..7102106279 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -14676,14 +14676,14 @@ append on old values. Partd excels at shuffling operations.") (define-public python-dask (package (name "python-dask") - (version "0.19.0") + (version "1.0.0") (source (origin (method url-fetch) (uri (pypi-uri "dask" version)) (sha256 (base32 - "1pm1163qb6s22p8fnvj0zlfazihvs7hxjn8l2n52bzs7shw6kdz3")))) + "1xwz8h020ipwav2p5gcq9pskya1cvzd6hjyvd06dvr3w5lxlmym1")))) (build-system python-build-system) ;; A single test out of 5000+ fails. This test is marked as xfail when ;; pytest-xdist is used. @@ -14696,7 +14696,16 @@ append on old values. Partd excels at shuffling operations.") (("def test_interrupt\\(\\)" m) (string-append "@pytest.mark.skip(reason=\"Disabled by Guix\")\n" m))) - #t))))) + (when (which "python2") + ;; This test fails with recent Pandas: + ;; . + (substitute* "dask/dataframe/tests/test_dataframe.py" + (("def test_info\\(\\)" m) + (string-append "@pytest.mark.skip(reason=\"Disabled by Guix\")\n" + m)))) + #t)) + (replace 'check + (lambda _ (invoke "pytest" "-vv")))))) (propagated-inputs `(("python-cloudpickle" ,python-cloudpickle) ("python-numpy" ,python-numpy) -- cgit v1.2.3 From fcb5409438db65ac0b779def4df5542b36378e90 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 3 Dec 2018 14:04:13 +0100 Subject: gnu: python-scikit-image: Update to 0.14.1. Also add explicit Python2 variants for its dependency closure. * gnu/packages/python.scm (python-scikit-image): Update to 0.14.1. [source](uri): Use PYPI-URI. [propagated-inputs]: Add PYTHON-CLOUDPICKLE, PYTHON-DASK, PYTHON-MATPLOTLIB and PYTHON-PYWAVELETS. (python2-toolz, python2-cloudpickle, python2-locket, python2-blosc, python2-partd, python2-dask): New public variables. --- gnu/packages/python.scm | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 7102106279..ce91fbedba 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2822,25 +2822,26 @@ and is very extensible.") (define-public python-scikit-image (package (name "python-scikit-image") - (version "0.11.3") + (version "0.14.1") (source (origin (method url-fetch) - (uri (string-append - "https://pypi.python.org/packages/source/s/scikit-image/scikit-image-" - version ".tar.gz")) + (uri (pypi-uri "scikit-image" version)) (sha256 - (base32 "0jz416fqvpahqyffw8plmszzfj669w8wvf3y9clnr5lr6a7md3kn")))) + (base32 "0l1c3rl4s1jyv80i5hns4pgih09zrxfj7lygdc51w8sgyysb7ac6")))) (build-system python-build-system) (arguments ;; TODO: Some tests require running X11 server. Disable them? '(#:tests? #f)) ;; See DEPENDS.txt for the list of build and run time requiremnts (propagated-inputs - `(("python-matplotlib" ,python-matplotlib) + `(("python-cloudpickle" ,python-cloudpickle) + ("python-dask" ,python-dask) + ("python-matplotlib" ,python-matplotlib) ("python-networkx" ,python-networkx) - ("python-scipy" ,python-scipy) - ("python-pillow" ,python-pillow))) + ("python-pillow" ,python-pillow) + ("python-pywavelets" ,python-pywavelets) + ("python-scipy" ,python-scipy))) (native-inputs `(("python-numpy" ,python-numpy) ("python-cython" ,python-cython) @@ -14516,6 +14517,9 @@ library's @code{threading} module.") functions, and dictionaries.") (license license:bsd-3))) +(define-public python2-toolz + (package-with-python2 python-toolz)) + (define-public python-cytoolz (package (name "python-cytoolz") @@ -14598,6 +14602,9 @@ shipped over the network to execute on remote hosts, possibly close to the data.") (license license:bsd-3))) +(define-public python2-cloudpickle + (package-with-python2 python-cloudpickle)) + (define-public python-locket (package (name "python-locket") @@ -14617,6 +14624,9 @@ data.") they use the same path.") (license license:bsd-2))) +(define-public python2-locket + (package-with-python2 python-locket)) + (define-public python-blosc (package (name "python-blosc") @@ -14648,6 +14658,9 @@ regular-spaced values, etc. This Python package wraps the Blosc library.") (license license:bsd-3))) +(define-public python2-blosc + (package-with-python2 python-blosc)) + (define-public python-partd (package (name "python-partd") @@ -14673,6 +14686,9 @@ This Python package wraps the Blosc library.") append on old values. Partd excels at shuffling operations.") (license license:bsd-3))) +(define-public python2-partd + (package-with-python2 python-partd)) + (define-public python-dask (package (name "python-dask") @@ -14727,6 +14743,9 @@ larger-than-memory or distributed environments. These parallel collections run on top of the dynamic task schedulers. ") (license license:bsd-3))) +(define-public python2-dask + (package-with-python2 python-dask)) + (define-public python-ilinkedlist (package (name "python-ilinkedlist") -- cgit v1.2.3 From 635d29c24451284d1891f0be3acd95f2606cc6f1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 3 Dec 2018 14:08:13 +0100 Subject: gnu: python-scikit-image: Propagate six and numpy. * gnu/packages/python.scm (python-scikit-image)[native-inputs]: Move PYTHON-NUMPY and PYTHON-SIX ... [propagated-inputs]: ... here. --- gnu/packages/python.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ce91fbedba..d251468673 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2839,13 +2839,13 @@ and is very extensible.") ("python-dask" ,python-dask) ("python-matplotlib" ,python-matplotlib) ("python-networkx" ,python-networkx) + ("python-numpy" ,python-numpy) ("python-pillow" ,python-pillow) ("python-pywavelets" ,python-pywavelets) - ("python-scipy" ,python-scipy))) - (native-inputs - `(("python-numpy" ,python-numpy) - ("python-cython" ,python-cython) + ("python-scipy" ,python-scipy) ("python-six" ,python-six))) + (native-inputs + `(("python-cython" ,python-cython))) (home-page "http://scikit-image.org/") (synopsis "Image processing in Python") (description -- cgit v1.2.3 From 650bc9421620862c95f18f0712277f8607713781 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 3 Dec 2018 15:19:56 +0100 Subject: gnu: python-scikit-learn: Update source hash. The upstream git tag moved from 6ccb5e44b188059e9b7459ac02ec97e32a9ab7ba to 55bf5d93e5674f13a1134d93a11fd0cd11aabcd1 two days later... * gnu/packages/machine-learning.scm (python-scikit-learn)[source](sha256): Update for upstream tag change. --- gnu/packages/machine-learning.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 5fb375c98c..3f525e39a5 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -719,7 +719,7 @@ computing environments.") (file-name (git-file-name name version)) (sha256 (base32 - "0qv7ir1fy9vjar3llc72yxmfja3gxm5icdf0y3q57vsn3wcdglkz")))) + "0fkhwg3xn1s7ln9q1szq6kwc4jhwvjh8w4kmv9wcrqy7cq3lbv0d")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From cee3d7136b18d322ba1b1aa6b1d4ec4217092fa1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 3 Dec 2018 17:20:18 +0100 Subject: gnu: python-statsmodels: Update to 0.9.0. * gnu/packages/statistics.scm (python-statsmodels): Update to 0.9.0. [arguments]: Remove obsolete workaround. --- gnu/packages/statistics.scm | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 66f57ac879..cc879be99c 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1876,14 +1876,14 @@ building design matrices.") (define-public python-statsmodels (package (name "python-statsmodels") - (version "0.8.0") + (version "0.9.0") (source (origin (method url-fetch) (uri (pypi-uri "statsmodels" version)) (sha256 (base32 - "0j30v3932shnj9368c9jr3svkyrvfj90h2l7nxnqkbpv0svilhr6")))) + "0fxs8a7sp4d7jvqlm36yi45i2d28kjfvraf9q8i9jr1chhxgjqb4")))) (build-system python-build-system) (arguments `(;; The test suite is very large and rather brittle. Tests often fail @@ -1902,18 +1902,7 @@ building design matrices.") (("import matplotlib\\.pyplot as plt" line) (string-append "import matplotlib;matplotlib.use('Agg');" line))) - #t)) - ;; FIXME: This is a bug in version 0.8 since the upgrade to scipy 1.0. - ;; See https://github.com/statsmodels/statsmodels/issues/3931 - ;; This has been fixed in version 0.9. - (add-after 'unpack 'patch-for-scipy - (lambda _ - (substitute* "statsmodels/discrete/discrete_model.py" - (("return stats.chisqprob" match) - (string-append - "stats.chisqprob = lambda chisq, df: stats.chi2.sf(chisq, df);" - match))) - #t))))) + #t))))) (propagated-inputs `(("python-numpy" ,python-numpy) ("python-scipy" ,python-scipy) -- cgit v1.2.3 From 4f03aa23e805bd653de774e1d74ed2f50826899b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 3 Dec 2018 17:40:38 +0100 Subject: gnu: python-cryptography: Update to 2.4.2. * gnu/packages/python-crypto.scm (python-cryptography-vectors, python-cryptography): Update to 2.4.2. --- gnu/packages/python-crypto.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 1c7640ac5f..861715b569 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -362,14 +362,14 @@ is used by the Requests library to verify HTTPS requests.") (define-public python-cryptography-vectors (package (name "python-cryptography-vectors") - (version "2.3.1") + (version "2.4.2") (source (origin (method url-fetch) (uri (pypi-uri "cryptography_vectors" version)) (sha256 (base32 - "0ijdck30p7jv8a0zwv8b7d30ciqrmmps62lm63l4k776vihrnkdz")))) + "013qx2hz0jv79yzfzpn0r2kk33i5qy3sdnzgwiv5779d18snblwi")))) (build-system python-build-system) (home-page "https://github.com/pyca/cryptography") (synopsis "Test vectors for the cryptography package") @@ -384,14 +384,14 @@ is used by the Requests library to verify HTTPS requests.") (define-public python-cryptography (package (name "python-cryptography") - (version "2.3.1") + (version "2.4.2") (source (origin (method url-fetch) (uri (pypi-uri "cryptography" version)) (sha256 (base32 - "1mnzf168vlxirq7fw9dm9zbvma7z8phc9cl5bffw5916m0y1244d")))) + "1pc60dksi9w9mshl6cvn7gdjazbp3pmydy3qp9wgy5wzd8n0b9h5")))) (build-system python-build-system) (inputs `(("openssl" ,openssl))) -- cgit v1.2.3